From 684f19f5e3f7f62e58fe87adfaf6c44dc50ff43f Mon Sep 17 00:00:00 2001 From: Ian Cordasco Date: Sat, 9 Jan 2016 21:17:22 -0600 Subject: [PATCH] Re-factor normalization in parse_args --- flake8/options/manager.py | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/flake8/options/manager.py b/flake8/options/manager.py index 723a700..353ab55 100644 --- a/flake8/options/manager.py +++ b/flake8/options/manager.py @@ -111,6 +111,20 @@ class Option(object): return self.long_option_name[2:].replace('-', '_') return self.short_option_name[1] + def normalize(self, options): + dest = self.dest + if self.normalize_paths: + old_value = getattr(options, dest) + # Decide whether to parse a list of paths or a single path + normalize = utils.normalize_path + if self.comma_separated_list: + normalize = utils.normalize_paths + setattr(options, dest, normalize(old_value)) + elif self.comma_separated_list: + old_value = getattr(options, dest) + setattr(options, dest, + utils.parse_comma_separated_list(old_value)) + def to_optparse(self): """Convert a Flake8 Option to an optparse Option.""" if not hasattr(self, '_opt'): @@ -153,21 +167,6 @@ class OptionManager(object): """Simple proxy to calling the OptionParser's parse_args method.""" options, xargs = self.parser.parse_args(args, values) for option in self.options: - _normalize_option(options, option) + option.normalize(options) return options, xargs - - -def _normalize_option(options, option): - dest = option.dest - if option.normalize_paths: - old_value = getattr(options, dest) - # Decide whether to parse a list of paths or a single path - normalize = utils.normalize_path - if option.comma_separated_list: - normalize = utils.normalize_paths - setattr(options, dest, normalize(old_value)) - elif option.comma_separated_list: - old_value = getattr(options, dest) - setattr(options, dest, - utils.parse_comma_separated_list(old_value))