summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorent Xicluna <florent.xicluna@gmail.com>2012-06-16 15:16:00 +0200
committerFlorent Xicluna <florent.xicluna@gmail.com>2012-06-16 15:16:00 +0200
commite51a5d3f1bc9da91e6252c03b6b7245d037356ef (patch)
treefb88ded6bcd6ef0d55eb653eb33fd74429c0a5c2
parent11a80a3c36ea1541f26ab9975e50eb0971c35304 (diff)
downloadpep8-e51a5d3f1bc9da91e6252c03b6b7245d037356ef.tar.gz
Print options from the config file when verbose=2.
-rwxr-xr-xpep8.py10
1 files changed, 6 insertions, 4 deletions
diff --git a/pep8.py b/pep8.py
index 28065c0..f010209 100755
--- a/pep8.py
+++ b/pep8.py
@@ -1759,26 +1759,28 @@ def read_config(options, args, arglist, parser):
(None, 'config', 'diff', 'doctest', 'testsuite')])
# First, read the defaut values
- options, _ = parser.parse_args([])
+ new_options, _ = parser.parse_args([])
# Second, parse the configuration
for opt in config.options('pep8'):
+ if options.verbose > 1:
+ print(' %s = %s' % (opt, config.get('pep8', opt)))
opt_type = option_list.get(opt)
if not opt_type:
print('Unknown option: \'%s\'\n not in [%s]' %
(opt, ' '.join(sorted(option_list))))
sys.exit(1)
- elif opt_type in ('int', 'count'):
+ if opt_type in ('int', 'count'):
value = config.getint('pep8', opt)
elif opt_type == 'string':
value = config.get('pep8', opt)
else:
assert opt_type in ('store_true', 'store_false')
value = config.getboolean('pep8', opt)
- setattr(options, opt, value)
+ setattr(new_options, opt, value)
# Third, overwrite with the command-line options
- options, _ = parser.parse_args(arglist, values=options)
+ options, _ = parser.parse_args(arglist, values=new_options)
return options