From b4b59a96279da897d2a0fc545682051d46c0dc43 Mon Sep 17 00:00:00 2001 From: Ian Cordasco Date: Sat, 9 Jan 2016 21:29:08 -0600 Subject: [PATCH] Make Option#normalize more reusable --- flake8/options/manager.py | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/flake8/options/manager.py b/flake8/options/manager.py index e249ffb..fafc1e9 100644 --- a/flake8/options/manager.py +++ b/flake8/options/manager.py @@ -114,19 +114,17 @@ class Option(object): return self.long_option_name[2:].replace('-', '_') return self.short_option_name[1] - def normalize(self, options): - dest = self.dest + def normalize(self, value): + """Normalize the value based on the option configuration.""" 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)) + return normalize(value) elif self.comma_separated_list: - old_value = getattr(options, dest) - setattr(options, dest, - utils.parse_comma_separated_list(old_value)) + return utils.parse_comma_separated_list(value) + return value def to_optparse(self): """Convert a Flake8 Option to an optparse Option.""" @@ -181,6 +179,7 @@ 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: - option.normalize(options) + old_value = getattr(options, option.dest) + setattr(options, option.dest, option.normalize(old_value)) return options, xargs