eric: comparison Plugins/CheckerPlugins/CodeStyleChecker/pycodestyle.py

-:971f24c89e6b
+:ff831e3e383e
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 # pycodestyle.py - Check Python source code formatting, according to PEP 8
+#
 # Copyright (C) 2006-2009 Johann C. Rocholl <johann@rocholl.net>
 # Copyright (C) 2009-2014 Florent Xicluna <florent.xicluna@gmail.com>
 # Copyright (C) 2014-2016 Ian Lee <ianlee1521@gmail.com>
 #
 # Permission is hereby granted, free of charge, to any person
 import os
 import re
 import sys
 import time
 import tokenize
-##import ast
+import warnings
 from fnmatch import fnmatch
 from optparse import OptionParser
 try:
 from configparser import RawConfigParser
 from io import TextIOWrapper
 except ImportError:
 from ConfigParser import RawConfigParser            # __IGNORE_WARNING__
-__version__ = '2.1.0.dev0'
+__version__ = '2.1.0'
 DEFAULT_EXCLUDE = '.svn,CVS,.bzr,.hg,.git,__pycache__,.tox'
 DEFAULT_IGNORE = 'E121,E123,E126,E226,E24,E704,W503'
 try:
 if sys.platform == 'win32':
 if previous_logical.startswith('@'):
 if blank_lines:
 yield 0, "E304 blank lines found after function decorator"
 elif blank_lines > 2 or (indent_level and blank_lines == 2):
 yield 0, "E303 too many blank lines (%d)", blank_lines
-elif logical_line.startswith(('def ', 'async def ', 'class ', '@')):
+elif logical_line.startswith(('def ', 'async def', 'class ', '@')):
 if indent_level:
 if not (blank_before or previous_indent_level < indent_level or
 DOCSTRING_REGEX.match(previous_logical)):
 ancestor_level = indent_level
 nested = False
 E701: finally: cleanup()
 E701: if foo == 'blah': one(); two(); three()
 E702: do_one(); do_two(); do_three()
 E703: do_four();  # useless semicolon
 E704: def f(x): return 2*x
-E705: async def f(x): return 2*x
 E731: f = lambda x: 2*x
 """
 line = logical_line
 last_char = len(line) - 1
 found = line.find(':')
 yield 0, ("E731 do not assign a lambda expression, use a "
 "def")
 break
 if line.startswith('def '):
 yield 0, "E704 multiple statements on one line (def)"
-elif line.startswith('async def '):
-yield 0, "E705 multiple statements on one line (async def)"
 else:
 yield found, "E701 multiple statements on one line (colon)"
 prev_found = found
 found = line.find(':', found + 1)
 found = line.find(';')
 for name in argument_names:
 arguments.append(getattr(self, name))
 return check(*arguments)
 def init_checker_state(self, name, argument_names):
-""" Prepare custom state for the specific checker plugin."""
+"""Prepare custom state for the specific checker plugin."""
 if 'checker_state' in argument_names:
 self.checker_state = self._checker_states.setdefault(name, {})
 def check_physical(self, line):
 """Run all physical checks on a raw input line."""
 self.counters[key]))
 class FileReport(BaseReport):
 """Collect the results of the checks and print only the filenames."""
 print_filename = True
 class StandardReport(BaseReport):
 """Collect and print the results of the checks."""
 help="measure processing speed")
 return parser
 def read_config(options, args, arglist, parser):
-"""Read and parse configurations
+"""Read and parse configurations.
 If a config file is specified on the command line with the "--config"
 option, then only it is used for configuration.
 Otherwise, the user configuration (~/.config/pycodestyle) and any local
 if cli_conf and os.path.isfile(cli_conf):
 if options.verbose:
 print('cli configuration: %s' % cli_conf)
 config.read(cli_conf)
-pep8_section = parser.prog
+pycodestyle_section = None
-if config.has_section(pep8_section):
+if config.has_section(parser.prog):
+pycodestyle_section = parser.prog
+elif config.has_section('pep8'):
+pycodestyle_section = 'pep8'  # Deprecated
+warnings.warn('[pep8] section is deprecated. Use [pycodestyle].')
+if pycodestyle_section:
 option_list = dict([(o.dest, o.type or o.action)
 for o in parser.option_list])
 # First, read the default values
 (new_options, __) = parser.parse_args([])
 # Second, parse the configuration
-for opt in config.options(pep8_section):
+for opt in config.options(pycodestyle_section):
 if opt.replace('_', '-') not in parser.config_options:
 print("  unknown option '%s' ignored" % opt)
 continue
 if options.verbose > 1:
-print("  %s = %s" % (opt, config.get(pep8_section, opt)))
+print("  %s = %s" % (opt,
+config.get(pycodestyle_section, opt)))
 normalized_opt = opt.replace('-', '_')
 opt_type = option_list[normalized_opt]
 if opt_type in ('int', 'count'):
-value = config.getint(pep8_section, opt)
+value = config.getint(pycodestyle_section, opt)
 elif opt_type in ('store_true', 'store_false'):
-value = config.getboolean(pep8_section, opt)
+value = config.getboolean(pycodestyle_section, opt)
 else:
-value = config.get(pep8_section, opt)
+value = config.get(pycodestyle_section, opt)
 if normalized_opt == 'exclude':
 value = normalize_paths(value, local_dir)
 setattr(new_options, normalized_opt, value)
 # Third, overwrite with the command-line options
 if report.total_errors:
 if options.count:
 sys.stderr.write(str(report.total_errors) + '\n')
 sys.exit(1)
 if __name__ == '__main__':
 _main()
 #
-# eflag: noqa = M702
+# eflag: noqa = D2, M601, M701, M702, M801

Mercurial Repositories > eric / file comparison

comparison: Plugins/CheckerPlugins/CodeStyleChecker/pycodestyle.py

Plugins/CheckerPlugins/CodeStyleChecker/pycodestyle.py