From 16f338efd6295539d6c9d94855af2b35c774daa4 Mon Sep 17 00:00:00 2001 From: Ian Cordasco Date: Thu, 29 Nov 2012 10:55:53 -0500 Subject: [PATCH] Incorporate @phd's builtins change. Closes #31 --- flake8/pep8.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/flake8/pep8.py b/flake8/pep8.py index 5eedef3..d513b5a 100644 --- a/flake8/pep8.py +++ b/flake8/pep8.py @@ -1822,9 +1822,11 @@ def process_options(arglist=None, parse_argv=False, config_file=None): parser = OptionParser(version=version, usage="%prog [options] input ...") parser.config_options = [ - 'exclude', 'filename', 'select', 'ignore', 'max-line-length', 'count', - 'format', 'quiet', 'show-pep8', 'show-source', 'statistics', 'verbose'] - parser.add_option('--builtins', default=[], action="append", + 'builtins', 'count', 'exclude', 'filename', 'format', 'ignore', + 'max-line-length', 'quiet', 'select', 'show-pep8', 'show-source', + 'statistics', 'verbose', + ] + parser.add_option('--builtins', default='', help="append builtin function (pyflakes " "_MAGIC_GLOBALS)") parser.add_option('-v', '--verbose', default=0, action='count', @@ -1899,6 +1901,8 @@ def process_options(arglist=None, parse_argv=False, config_file=None): options = read_config(options, args, arglist, parser) options.reporter = parse_argv and options.quiet == 1 and FileReport + if options.builtins: + options.builtins = options.builtins.split(',') if options.filename: options.filename = options.filename.split(',') options.exclude = options.exclude.split(',')