summaryrefslogtreecommitdiff
path: root/src/flake8
diff options
context:
space:
mode:
authorIan Cordasco <graffatcolmingov@gmail.com>2016-06-28 05:47:14 -0500
committerIan Cordasco <graffatcolmingov@gmail.com>2016-06-28 05:47:14 -0500
commit31c32e3327c50ff713445280c061bf2c255feb19 (patch)
tree4c41a4469331bc6f9cb152dab581143a3153bf8b /src/flake8
parent95c373cf112d7415341e97116abacf32757a9391 (diff)
downloadflake8-31c32e3327c50ff713445280c061bf2c255feb19.tar.gz
Parse hyphenated config names also
Previously Flake8 parsed both max-line-length = 110 And max_line_length = 110 From the config file without issue. When we updated our logic, I forgot to test for that and we lost that behaviour temporarily. Closes #152
Diffstat (limited to 'src/flake8')
-rw-r--r--src/flake8/options/config.py2
-rw-r--r--src/flake8/options/manager.py4
2 files changed, 4 insertions, 2 deletions
diff --git a/src/flake8/options/config.py b/src/flake8/options/config.py
index 4556ab1..1d18c2e 100644
--- a/src/flake8/options/config.py
+++ b/src/flake8/options/config.py
@@ -192,7 +192,7 @@ class MergedConfigParser(object):
LOG.debug('Option "%s" returned value: %r', option_name, value)
final_value = self._normalize_value(option, value)
- config_dict[option_name] = final_value
+ config_dict[option.config_name] = final_value
return config_dict
diff --git a/src/flake8/options/manager.py b/src/flake8/options/manager.py
index 439cba2..8c3b6bb 100644
--- a/src/flake8/options/manager.py
+++ b/src/flake8/options/manager.py
@@ -186,7 +186,9 @@ class OptionManager(object):
self.parser.add_option(option.to_optparse())
self.options.append(option)
if option.parse_from_config:
- self.config_options_dict[option.config_name] = option
+ name = option.config_name
+ self.config_options_dict[name] = option
+ self.config_options_dict[name.replace('_', '-')] = option
LOG.debug('Registered option "%s".', option)
def remove_from_default_ignore(self, error_codes):