Sun, 05 Jan 2014 23:22:17 +0100
Merge with default branch.
842
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1 | # -*- coding: utf-8 -*- |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
2 | |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
3 | # |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
4 | # pep8.py - Check Python source code formatting, according to PEP 8 |
2864
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
5 | # Copyright (C) 2006-2009 Johann C. Rocholl <johann@rocholl.net> |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
6 | # Copyright (C) 2009-2013 Florent Xicluna <florent.xicluna@gmail.com> |
842
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
7 | # |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
8 | # Permission is hereby granted, free of charge, to any person |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
9 | # obtaining a copy of this software and associated documentation files |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
10 | # (the "Software"), to deal in the Software without restriction, |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
11 | # including without limitation the rights to use, copy, modify, merge, |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
12 | # publish, distribute, sublicense, and/or sell copies of the Software, |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
13 | # and to permit persons to whom the Software is furnished to do so, |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
14 | # subject to the following conditions: |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
15 | # |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
16 | # The above copyright notice and this permission notice shall be |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
17 | # included in all copies or substantial portions of the Software. |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
18 | # |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
19 | # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
20 | # EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
21 | # MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
22 | # NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
23 | # BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
24 | # ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
25 | # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
26 | # SOFTWARE. |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
27 | |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
28 | """ |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
29 | Check Python source code formatting, according to PEP 8: |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
30 | http://www.python.org/dev/peps/pep-0008/ |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
31 | |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
32 | For usage and a list of options, try this: |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
33 | $ python pep8.py -h |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
34 | |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
35 | This program and its regression test suite live here: |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
36 | http://github.com/jcrocholl/pep8 |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
37 | |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
38 | Groups of errors and warnings: |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
39 | E errors |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
40 | W warnings |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
41 | 100 indentation |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
42 | 200 whitespace |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
43 | 300 blank lines |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
44 | 400 imports |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
45 | 500 line length |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
46 | 600 deprecation |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
47 | 700 statements |
2864
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
48 | 900 syntax error |
842
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
49 | """ |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
50 | |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
51 | # |
2861
cdcbca0cea82
Fixed a typo in the included pep8.py modules.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2799
diff
changeset
|
52 | # This is a modified version to make the original pep8.py better suitable |
842
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
53 | # for being called from within the eric5 IDE. The modifications are as |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
54 | # follows: |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
55 | # |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
56 | # - made messages translatable via Qt |
2864
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
57 | # - added code for eric5 integration |
842
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
58 | # |
3160
209a07d7e401
Updated copyright for 2014.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2913
diff
changeset
|
59 | # Copyright (c) 2011 - 2014 Detlev Offenbach <detlev@die-offenbachs.de> |
842
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
60 | # |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
61 | |
2864
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
62 | __version__ = '1.4.6' |
842
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
63 | |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
64 | import os |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
65 | import sys |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
66 | import re |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
67 | import time |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
68 | import inspect |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
69 | import keyword |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
70 | import tokenize |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
71 | from optparse import OptionParser |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
72 | from fnmatch import fnmatch |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
73 | try: |
2864
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
74 | from configparser import RawConfigParser |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
75 | from io import TextIOWrapper |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
76 | except ImportError: |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
77 | from ConfigParser import RawConfigParser # __IGNORE_WARNING__ |
842
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
78 | |
2864
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
79 | DEFAULT_EXCLUDE = '.svn,CVS,.bzr,.hg,.git,__pycache__' |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
80 | DEFAULT_IGNORE = 'E123,E226,E24' |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
81 | if sys.platform == 'win32': |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
82 | DEFAULT_CONFIG = os.path.expanduser(r'~\.pep8') |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
83 | else: |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
84 | DEFAULT_CONFIG = os.path.join(os.getenv('XDG_CONFIG_HOME') or |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
85 | os.path.expanduser('~/.config'), 'pep8') |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
86 | PROJECT_CONFIG = ('setup.cfg', 'tox.ini', '.pep8') |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
87 | TESTSUITE_PATH = os.path.join(os.path.dirname(__file__), 'testsuite') |
842
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
88 | MAX_LINE_LENGTH = 79 |
2864
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
89 | REPORT_FORMAT = { |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
90 | 'default': '%(path)s:%(row)d:%(col)d: %(code)s %(text)s', |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
91 | 'pylint': '%(path)s:%(row)d: [%(code)s] %(text)s', |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
92 | } |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
93 | |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
94 | PyCF_ONLY_AST = 1024 |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
95 | SINGLETONS = frozenset(['False', 'None', 'True']) |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
96 | KEYWORDS = frozenset(keyword.kwlist + ['print']) - SINGLETONS |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
97 | UNARY_OPERATORS = frozenset(['>>', '**', '*', '+', '-']) |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
98 | ARITHMETIC_OP = frozenset(['**', '*', '/', '//', '+', '-']) |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
99 | WS_OPTIONAL_OPERATORS = ARITHMETIC_OP.union(['^', '&', '|', '<<', '>>', '%']) |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
100 | WS_NEEDED_OPERATORS = frozenset([ |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
101 | '**=', '*=', '/=', '//=', '+=', '-=', '!=', '<>', '<', '>', |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
102 | '%=', '^=', '&=', '|=', '==', '<=', '>=', '<<=', '>>=', '=']) |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
103 | WHITESPACE = frozenset(' \t') |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
104 | SKIP_TOKENS = frozenset([tokenize.COMMENT, tokenize.NL, tokenize.NEWLINE, |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
105 | tokenize.INDENT, tokenize.DEDENT]) |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
106 | BENCHMARK_KEYS = ['directories', 'files', 'logical lines', 'physical lines'] |
842
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
107 | |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
108 | INDENT_REGEX = re.compile(r'([ \t]*)') |
2864
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
109 | RAISE_COMMA_REGEX = re.compile(r'raise\s+\w+\s*,') |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
110 | RERAISE_COMMA_REGEX = re.compile(r'raise\s+\w+\s*,\s*\w+\s*,\s*\w+') |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
111 | ERRORCODE_REGEX = re.compile(r'\b[A-Z]\d{3}\b') |
842
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
112 | DOCSTRING_REGEX = re.compile(r'u?r?["\']') |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
113 | EXTRANEOUS_WHITESPACE_REGEX = re.compile(r'[[({] | []}),;:]') |
2864
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
114 | WHITESPACE_AFTER_COMMA_REGEX = re.compile(r'[,;:]\s*(?: |\t)') |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
115 | COMPARE_SINGLETON_REGEX = re.compile(r'([=!]=)\s*(None|False|True)') |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
116 | COMPARE_TYPE_REGEX = re.compile(r'(?:[=!]=|is(?:\s+not)?)\s*type(?:s.\w+Type' |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
117 | r'|\s*\(\s*([^)]*[^ )])\s*\))') |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
118 | KEYWORD_REGEX = re.compile(r'(\s*)\b(?:%s)\b(\s*)' % r'|'.join(KEYWORDS)) |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
119 | OPERATOR_REGEX = re.compile(r'(?:[^,\s])(\s*)(?:[-+*/|!<=>%&^]+)(\s*)') |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
120 | LAMBDA_REGEX = re.compile(r'\blambda\b') |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
121 | HUNK_REGEX = re.compile(r'^@@ -\d+(?:,\d+)? \+(\d+)(?:,(\d+))? @@.*$') |
842
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
122 | |
2864
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
123 | # Work around Python < 2.6 behaviour, which does not generate NL after |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
124 | # a comment which is on a line by itself. |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
125 | COMMENT_WITH_NL = tokenize.generate_tokens(['#\n'].pop).send(None)[1] == '#\n' |
842
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
126 | |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
127 | |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
128 | ############################################################################## |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
129 | # Plugins (check functions) for physical lines |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
130 | ############################################################################## |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
131 | |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
132 | |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
133 | def tabs_or_spaces(physical_line, indent_char): |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
134 | r""" |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
135 | Never mix tabs and spaces. |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
136 | |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
137 | The most popular way of indenting Python is with spaces only. The |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
138 | second-most popular way is with tabs only. Code indented with a mixture |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
139 | of tabs and spaces should be converted to using spaces exclusively. When |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
140 | invoking the Python command line interpreter with the -t option, it issues |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
141 | warnings about code that illegally mixes tabs and spaces. When using -tt |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
142 | these warnings become errors. These options are highly recommended! |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
143 | |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
144 | Okay: if a == 0:\n a = 1\n b = 1 |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
145 | E101: if a == 0:\n a = 1\n\tb = 1 |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
146 | """ |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
147 | indent = INDENT_REGEX.match(physical_line).group(1) |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
148 | for offset, char in enumerate(indent): |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
149 | if char != indent_char: |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
150 | return offset, "E101" |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
151 | |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
152 | |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
153 | def tabs_obsolete(physical_line): |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
154 | r""" |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
155 | For new projects, spaces-only are strongly recommended over tabs. Most |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
156 | editors have features that make this easy to do. |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
157 | |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
158 | Okay: if True:\n return |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
159 | W191: if True:\n\treturn |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
160 | """ |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
161 | indent = INDENT_REGEX.match(physical_line).group(1) |
2864
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
162 | if '\t' in indent: |
842
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
163 | return indent.index('\t'), "W191" |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
164 | |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
165 | |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
166 | def trailing_whitespace(physical_line): |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
167 | r""" |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
168 | JCR: Trailing whitespace is superfluous. |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
169 | FBM: Except when it occurs as part of a blank line (i.e. the line is |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
170 | nothing but whitespace). According to Python docs[1] a line with only |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
171 | whitespace is considered a blank line, and is to be ignored. However, |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
172 | matching a blank line to its indentation level avoids mistakenly |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
173 | terminating a multi-line statement (e.g. class declaration) when |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
174 | pasting code into the standard Python interpreter. |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
175 | |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
176 | [1] http://docs.python.org/reference/lexical_analysis.html#blank-lines |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
177 | |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
178 | The warning returned varies on whether the line itself is blank, for easier |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
179 | filtering for those who want to indent their blank lines. |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
180 | |
2864
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
181 | Okay: spam(1)\n# |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
182 | W291: spam(1) \n# |
842
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
183 | W293: class Foo(object):\n \n bang = 12 |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
184 | """ |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
185 | physical_line = physical_line.rstrip('\n') # chr(10), newline |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
186 | physical_line = physical_line.rstrip('\r') # chr(13), carriage return |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
187 | physical_line = physical_line.rstrip('\x0c') # chr(12), form feed, ^L |
2864
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
188 | stripped = physical_line.rstrip(' \t\v') |
842
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
189 | if physical_line != stripped: |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
190 | if stripped: |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
191 | return len(stripped), "W291" |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
192 | else: |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
193 | return 0, "W293" |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
194 | |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
195 | |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
196 | def trailing_blank_lines(physical_line, lines, line_number): |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
197 | r""" |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
198 | JCR: Trailing blank lines are superfluous. |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
199 | |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
200 | Okay: spam(1) |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
201 | W391: spam(1)\n |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
202 | """ |
2864
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
203 | if not physical_line.rstrip() and line_number == len(lines): |
842
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
204 | return 0, "W391" |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
205 | |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
206 | |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
207 | def missing_newline(physical_line): |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
208 | """ |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
209 | JCR: The last line should have a newline. |
2864
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
210 | |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
211 | Reports warning W292. |
842
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
212 | """ |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
213 | if physical_line.rstrip() == physical_line: |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
214 | return len(physical_line), "W292" |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
215 | |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
216 | |
2864
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
217 | def maximum_line_length(physical_line, max_line_length): |
842
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
218 | """ |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
219 | Limit all lines to a maximum of 79 characters. |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
220 | |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
221 | There are still many devices around that are limited to 80 character |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
222 | lines; plus, limiting windows to 80 characters makes it possible to have |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
223 | several windows side-by-side. The default wrapping on such devices looks |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
224 | ugly. Therefore, please limit all lines to a maximum of 79 characters. |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
225 | For flowing long blocks of text (docstrings or comments), limiting the |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
226 | length to 72 characters is recommended. |
2864
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
227 | |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
228 | Reports error E501. |
842
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
229 | """ |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
230 | line = physical_line.rstrip() |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
231 | length = len(line) |
2864
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
232 | if length > max_line_length and not noqa(line): |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
233 | if hasattr(line, 'decode'): # Python 2 |
842
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
234 | # The line could contain multi-byte characters |
2864
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
235 | try: |
1145
2a16484e65c2
Fix for the PEP-8 checker to handle unicode better.
detlev@die-offenbachs.de
parents:
945
diff
changeset
|
236 | length = len(line.decode('utf-8')) |
2864
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
237 | except UnicodeError: |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
238 | pass |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
239 | if length > max_line_length: |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
240 | return max_line_length, "E501", length, max_line_length |
842
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
241 | |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
242 | |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
243 | ############################################################################## |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
244 | # Plugins (check functions) for logical lines |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
245 | ############################################################################## |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
246 | |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
247 | |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
248 | def blank_lines(logical_line, blank_lines, indent_level, line_number, |
2864
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
249 | previous_logical, previous_indent_level): |
842
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
250 | r""" |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
251 | Separate top-level function and class definitions with two blank lines. |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
252 | |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
253 | Method definitions inside a class are separated by a single blank line. |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
254 | |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
255 | Extra blank lines may be used (sparingly) to separate groups of related |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
256 | functions. Blank lines may be omitted between a bunch of related |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
257 | one-liners (e.g. a set of dummy implementations). |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
258 | |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
259 | Use blank lines in functions, sparingly, to indicate logical sections. |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
260 | |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
261 | Okay: def a():\n pass\n\n\ndef b():\n pass |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
262 | Okay: def a():\n pass\n\n\n# Foo\n# Bar\n\ndef b():\n pass |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
263 | |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
264 | E301: class Foo:\n b = 0\n def bar():\n pass |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
265 | E302: def a():\n pass\n\ndef b(n):\n pass |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
266 | E303: def a():\n pass\n\n\n\ndef b(n):\n pass |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
267 | E303: def a():\n\n\n\n pass |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
268 | E304: @decorator\n\ndef a():\n pass |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
269 | """ |
2864
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
270 | if line_number < 3 and not previous_logical: |
842
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
271 | return # Don't expect blank lines before the first line |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
272 | if previous_logical.startswith('@'): |
2864
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
273 | if blank_lines: |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
274 | yield 0, "E304" |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
275 | elif blank_lines > 2 or (indent_level and blank_lines == 2): |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
276 | yield 0, "E303", blank_lines |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
277 | elif logical_line.startswith(('def ', 'class ', '@')): |
842
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
278 | if indent_level: |
2864
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
279 | if not (blank_lines or previous_indent_level < indent_level or |
842
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
280 | DOCSTRING_REGEX.match(previous_logical)): |
2864
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
281 | yield 0, "E301" |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
282 | elif blank_lines != 2: |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
283 | yield 0, "E302", blank_lines |
842
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
284 | |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
285 | |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
286 | def extraneous_whitespace(logical_line): |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
287 | """ |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
288 | Avoid extraneous whitespace in the following situations: |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
289 | |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
290 | - Immediately inside parentheses, brackets or braces. |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
291 | |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
292 | - Immediately before a comma, semicolon, or colon. |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
293 | |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
294 | Okay: spam(ham[1], {eggs: 2}) |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
295 | E201: spam( ham[1], {eggs: 2}) |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
296 | E201: spam(ham[ 1], {eggs: 2}) |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
297 | E201: spam(ham[1], { eggs: 2}) |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
298 | E202: spam(ham[1], {eggs: 2} ) |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
299 | E202: spam(ham[1 ], {eggs: 2}) |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
300 | E202: spam(ham[1], {eggs: 2 }) |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
301 | |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
302 | E203: if x == 4: print x, y; x, y = y , x |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
303 | E203: if x == 4: print x, y ; x, y = y, x |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
304 | E203: if x == 4 : print x, y; x, y = y, x |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
305 | """ |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
306 | line = logical_line |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
307 | for match in EXTRANEOUS_WHITESPACE_REGEX.finditer(line): |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
308 | text = match.group() |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
309 | char = text.strip() |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
310 | found = match.start() |
2864
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
311 | if text == char + ' ': |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
312 | # assert char in '([{' |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
313 | yield found + 1, "E201", char |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
314 | elif line[found - 1] != ',': |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
315 | code = ('E202' if char in '}])' else 'E203') # if char in ',;:' |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
316 | yield found, code, char |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
317 | |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
318 | |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
319 | def whitespace_around_keywords(logical_line): |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
320 | r""" |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
321 | Avoid extraneous whitespace around keywords. |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
322 | |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
323 | Okay: True and False |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
324 | E271: True and False |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
325 | E272: True and False |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
326 | E273: True and\tFalse |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
327 | E274: True\tand False |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
328 | """ |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
329 | for match in KEYWORD_REGEX.finditer(logical_line): |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
330 | before, after = match.groups() |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
331 | |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
332 | if '\t' in before: |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
333 | yield match.start(1), "E274" |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
334 | elif len(before) > 1: |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
335 | yield match.start(1), "E272" |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
336 | |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
337 | if '\t' in after: |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
338 | yield match.start(2), "E273" |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
339 | elif len(after) > 1: |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
340 | yield match.start(2), "E271" |
842
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
341 | |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
342 | |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
343 | def missing_whitespace(logical_line): |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
344 | """ |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
345 | JCR: Each comma, semicolon or colon should be followed by whitespace. |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
346 | |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
347 | Okay: [a, b] |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
348 | Okay: (3,) |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
349 | Okay: a[1:4] |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
350 | Okay: a[:4] |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
351 | Okay: a[1:] |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
352 | Okay: a[1:4:2] |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
353 | E231: ['a','b'] |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
354 | E231: foo(bar,baz) |
2864
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
355 | E231: [{'a':'b'}] |
842
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
356 | """ |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
357 | line = logical_line |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
358 | for index in range(len(line) - 1): |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
359 | char = line[index] |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
360 | if char in ',;:' and line[index + 1] not in WHITESPACE: |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
361 | before = line[:index] |
2864
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
362 | if char == ':' and before.count('[') > before.count(']') and \ |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
363 | before.rfind('{') < before.rfind('['): |
842
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
364 | continue # Slice syntax, no space required |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
365 | if char == ',' and line[index + 1] == ')': |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
366 | continue # Allow tuple with only one element: (3,) |
2864
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
367 | yield index, "E231", char |
842
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
368 | |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
369 | |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
370 | def indentation(logical_line, previous_logical, indent_char, |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
371 | indent_level, previous_indent_level): |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
372 | r""" |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
373 | Use 4 spaces per indentation level. |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
374 | |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
375 | For really old code that you don't want to mess up, you can continue to |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
376 | use 8-space tabs. |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
377 | |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
378 | Okay: a = 1 |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
379 | Okay: if a == 0:\n a = 1 |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
380 | E111: a = 1 |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
381 | |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
382 | Okay: for item in items:\n pass |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
383 | E112: for item in items:\npass |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
384 | |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
385 | Okay: a = 1\nb = 2 |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
386 | E113: a = 1\n b = 2 |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
387 | """ |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
388 | if indent_char == ' ' and indent_level % 4: |
2864
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
389 | yield 0, "E111" |
842
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
390 | indent_expect = previous_logical.endswith(':') |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
391 | if indent_expect and indent_level <= previous_indent_level: |
2864
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
392 | yield 0, "E112" |
842
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
393 | if indent_level > previous_indent_level and not indent_expect: |
2864
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
394 | yield 0, "E113" |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
395 | |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
396 | |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
397 | def continued_indentation(logical_line, tokens, indent_level, hang_closing, |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
398 | noqa, verbose): |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
399 | r""" |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
400 | Continuation lines should align wrapped elements either vertically using |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
401 | Python's implicit line joining inside parentheses, brackets and braces, or |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
402 | using a hanging indent. |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
403 | |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
404 | When using a hanging indent the following considerations should be applied: |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
405 | |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
406 | - there should be no arguments on the first line, and |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
407 | |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
408 | - further indentation should be used to clearly distinguish itself as a |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
409 | continuation line. |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
410 | |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
411 | Okay: a = (\n) |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
412 | E123: a = (\n ) |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
413 | |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
414 | Okay: a = (\n 42) |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
415 | E121: a = (\n 42) |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
416 | E122: a = (\n42) |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
417 | E123: a = (\n 42\n ) |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
418 | E124: a = (24,\n 42\n) |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
419 | E125: if (a or\n b):\n pass |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
420 | E126: a = (\n 42) |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
421 | E127: a = (24,\n 42) |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
422 | E128: a = (24,\n 42) |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
423 | """ |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
424 | first_row = tokens[0][2][0] |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
425 | nrows = 1 + tokens[-1][2][0] - first_row |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
426 | if noqa or nrows == 1: |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
427 | return |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
428 | |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
429 | # indent_next tells us whether the next block is indented; assuming |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
430 | # that it is indented by 4 spaces, then we should not allow 4-space |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
431 | # indents on the final continuation line; in turn, some other |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
432 | # indents are allowed to have an extra 4 spaces. |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
433 | indent_next = logical_line.endswith(':') |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
434 | |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
435 | row = depth = 0 |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
436 | # remember how many brackets were opened on each line |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
437 | parens = [0] * nrows |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
438 | # relative indents of physical lines |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
439 | rel_indent = [0] * nrows |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
440 | # visual indents |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
441 | indent_chances = {} |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
442 | last_indent = tokens[0][2] |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
443 | indent = [last_indent[1]] |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
444 | if verbose >= 3: |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
445 | print(">>> " + tokens[0][4].rstrip()) |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
446 | |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
447 | for token_type, text, start, end, line in tokens: |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
448 | |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
449 | last_token_multiline = (start[0] != end[0]) |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
450 | newline = row < start[0] - first_row |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
451 | if newline: |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
452 | row = start[0] - first_row |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
453 | newline = (not last_token_multiline and |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
454 | token_type not in (tokenize.NL, tokenize.NEWLINE)) |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
455 | |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
456 | if newline: |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
457 | # this is the beginning of a continuation line. |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
458 | last_indent = start |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
459 | if verbose >= 3: |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
460 | print("... " + line.rstrip()) |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
461 | |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
462 | # record the initial indent. |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
463 | rel_indent[row] = expand_indent(line) - indent_level |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
464 | |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
465 | if depth: |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
466 | # a bracket expression in a continuation line. |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
467 | # find the line that it was opened on |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
468 | for open_row in range(row - 1, -1, -1): |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
469 | if parens[open_row]: |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
470 | break |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
471 | else: |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
472 | # an unbracketed continuation line (ie, backslash) |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
473 | open_row = 0 |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
474 | hang = rel_indent[row] - rel_indent[open_row] |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
475 | close_bracket = (token_type == tokenize.OP and text in ']})') |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
476 | visual_indent = (not close_bracket and hang > 0 and |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
477 | indent_chances.get(start[1])) |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
478 | |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
479 | if close_bracket and indent[depth]: |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
480 | # closing bracket for visual indent |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
481 | if start[1] != indent[depth]: |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
482 | yield start, "E124" |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
483 | elif close_bracket and not hang: |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
484 | # closing bracket matches indentation of opening bracket's line |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
485 | if hang_closing: |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
486 | yield start, "E133" |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
487 | elif visual_indent is True: |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
488 | # visual indent is verified |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
489 | if not indent[depth]: |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
490 | indent[depth] = start[1] |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
491 | elif visual_indent in (text, str): |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
492 | # ignore token lined up with matching one from a previous line |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
493 | pass |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
494 | elif indent[depth] and start[1] < indent[depth]: |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
495 | # visual indent is broken |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
496 | yield start, "E128" |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
497 | elif hang == 4 or (indent_next and rel_indent[row] == 8): |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
498 | # hanging indent is verified |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
499 | if close_bracket and not hang_closing: |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
500 | yield (start, "E123") |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
501 | else: |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
502 | # indent is broken |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
503 | if hang <= 0: |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
504 | error = "E122" |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
505 | elif indent[depth]: |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
506 | error = "E127" |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
507 | elif hang % 4: |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
508 | error = "E121" |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
509 | else: |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
510 | error = "E126" |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
511 | yield start, error |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
512 | |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
513 | # look for visual indenting |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
514 | if (parens[row] and token_type not in (tokenize.NL, tokenize.COMMENT) |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
515 | and not indent[depth]): |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
516 | indent[depth] = start[1] |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
517 | indent_chances[start[1]] = True |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
518 | if verbose >= 4: |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
519 | print("bracket depth %s indent to %s" % (depth, start[1])) |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
520 | # deal with implicit string concatenation |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
521 | elif (token_type in (tokenize.STRING, tokenize.COMMENT) or |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
522 | text in ('u', 'ur', 'b', 'br')): |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
523 | indent_chances[start[1]] = str |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
524 | # special case for the "if" statement because len("if (") == 4 |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
525 | elif not indent_chances and not row and not depth and text == 'if': |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
526 | indent_chances[end[1] + 1] = True |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
527 | |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
528 | # keep track of bracket depth |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
529 | if token_type == tokenize.OP: |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
530 | if text in '([{': |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
531 | depth += 1 |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
532 | indent.append(0) |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
533 | parens[row] += 1 |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
534 | if verbose >= 4: |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
535 | print("bracket depth %s seen, col %s, visual min = %s" % |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
536 | (depth, start[1], indent[depth])) |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
537 | elif text in ')]}' and depth > 0: |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
538 | # parent indents should not be more than this one |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
539 | prev_indent = indent.pop() or last_indent[1] |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
540 | for d in range(depth): |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
541 | if indent[d] > prev_indent: |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
542 | indent[d] = 0 |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
543 | for ind in list(indent_chances): |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
544 | if ind >= prev_indent: |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
545 | del indent_chances[ind] |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
546 | depth -= 1 |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
547 | if depth: |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
548 | indent_chances[indent[depth]] = True |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
549 | for idx in range(row, -1, -1): |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
550 | if parens[idx]: |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
551 | parens[idx] -= 1 |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
552 | rel_indent[row] = rel_indent[idx] |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
553 | break |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
554 | assert len(indent) == depth + 1 |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
555 | if start[1] not in indent_chances: |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
556 | # allow to line up tokens |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
557 | indent_chances[start[1]] = text |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
558 | |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
559 | if indent_next and expand_indent(line) == indent_level + 4: |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
560 | yield last_indent, "E125" |
842
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
561 | |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
562 | |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
563 | def whitespace_before_parameters(logical_line, tokens): |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
564 | """ |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
565 | Avoid extraneous whitespace in the following situations: |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
566 | |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
567 | - Immediately before the open parenthesis that starts the argument |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
568 | list of a function call. |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
569 | |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
570 | - Immediately before the open parenthesis that starts an indexing or |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
571 | slicing. |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
572 | |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
573 | Okay: spam(1) |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
574 | E211: spam (1) |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
575 | |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
576 | Okay: dict['key'] = list[index] |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
577 | E211: dict ['key'] = list[index] |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
578 | E211: dict['key'] = list [index] |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
579 | """ |
2864
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
580 | prev_type, prev_text, __, prev_end, __ = tokens[0] |
842
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
581 | for index in range(1, len(tokens)): |
2864
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
582 | token_type, text, start, end, __ = tokens[index] |
842
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
583 | if (token_type == tokenize.OP and |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
584 | text in '([' and |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
585 | start != prev_end and |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
586 | (prev_type == tokenize.NAME or prev_text in '}])') and |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
587 | # Syntax "class A (B):" is allowed, but avoid it |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
588 | (index < 2 or tokens[index - 2][1] != 'class') and |
2864
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
589 | # Allow "return (a.foo for a in range(5))" |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
590 | not keyword.iskeyword(prev_text)): |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
591 | yield prev_end, "E211", text |
842
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
592 | prev_type = token_type |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
593 | prev_text = text |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
594 | prev_end = end |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
595 | |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
596 | |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
597 | def whitespace_around_operator(logical_line): |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
598 | """ |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
599 | Avoid extraneous whitespace in the following situations: |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
600 | |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
601 | - More than one space around an assignment (or other) operator to |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
602 | align it with another. |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
603 | |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
604 | Okay: a = 12 + 3 |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
605 | E221: a = 4 + 5 |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
606 | E222: a = 4 + 5 |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
607 | E223: a = 4\t+ 5 |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
608 | E224: a = 4 +\t5 |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
609 | """ |
2864
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
610 | for match in OPERATOR_REGEX.finditer(logical_line): |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
611 | before, after = match.groups() |
842
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
612 | |
2864
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
613 | if '\t' in before: |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
614 | yield match.start(1), "E223" |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
615 | elif len(before) > 1: |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
616 | yield match.start(1), "E221" |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
617 | |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
618 | if '\t' in after: |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
619 | yield match.start(2), "E224" |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
620 | elif len(after) > 1: |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
621 | yield match.start(2), "E222" |
842
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
622 | |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
623 | def missing_whitespace_around_operator(logical_line, tokens): |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
624 | r""" |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
625 | - Always surround these binary operators with a single space on |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
626 | either side: assignment (=), augmented assignment (+=, -= etc.), |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
627 | comparisons (==, <, >, !=, <>, <=, >=, in, not in, is, is not), |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
628 | Booleans (and, or, not). |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
629 | |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
630 | - Use spaces around arithmetic operators. |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
631 | |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
632 | Okay: i = i + 1 |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
633 | Okay: submitted += 1 |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
634 | Okay: x = x * 2 - 1 |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
635 | Okay: hypot2 = x * x + y * y |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
636 | Okay: c = (a + b) * (a - b) |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
637 | Okay: foo(bar, key='word', *args, **kwargs) |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
638 | Okay: alpha[:-i] |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
639 | |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
640 | E225: i=i+1 |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
641 | E225: submitted +=1 |
2864
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
642 | E225: x = x /2 - 1 |
842
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
643 | E225: z = x **y |
2864
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
644 | E226: c = (a+b) * (a-b) |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
645 | E226: hypot2 = x*x + y*y |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
646 | E227: c = a|b |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
647 | E228: msg = fmt%(errno, errmsg) |
842
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
648 | """ |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
649 | parens = 0 |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
650 | need_space = False |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
651 | prev_type = tokenize.OP |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
652 | prev_text = prev_end = None |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
653 | for token_type, text, start, end, line in tokens: |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
654 | if token_type in (tokenize.NL, tokenize.NEWLINE, tokenize.ERRORTOKEN): |
2864
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
655 | # ERRORTOKEN is triggered by backticks in Python 3 |
842
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
656 | continue |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
657 | if text in ('(', 'lambda'): |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
658 | parens += 1 |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
659 | elif text == ')': |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
660 | parens -= 1 |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
661 | if need_space: |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
662 | if start != prev_end: |
2864
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
663 | # Found a (probably) needed space |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
664 | if need_space is not True and not need_space[1]: |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
665 | yield need_space[0], "E225" |
842
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
666 | need_space = False |
2864
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
667 | elif text == '>' and prev_text in ('<', '-'): |
842
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
668 | # Tolerate the "<>" operator, even if running Python 3 |
2864
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
669 | # Deal with Python 3's annotated return value "->" |
842
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
670 | pass |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
671 | else: |
2864
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
672 | if need_space is True or need_space[1]: |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
673 | # A needed trailing space was not found |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
674 | yield prev_end, "E225" |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
675 | else: |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
676 | code = 'E226' |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
677 | if prev_text == '%': |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
678 | code = 'E228' |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
679 | elif prev_text not in ARITHMETIC_OP: |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
680 | code = 'E227' |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
681 | yield need_space[0], code |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
682 | need_space = False |
842
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
683 | elif token_type == tokenize.OP and prev_end is not None: |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
684 | if text == '=' and parens: |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
685 | # Allow keyword args or defaults: foo(bar=None). |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
686 | pass |
2864
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
687 | elif text in WS_NEEDED_OPERATORS: |
842
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
688 | need_space = True |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
689 | elif text in UNARY_OPERATORS: |
2864
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
690 | # Check if the operator is being used as a binary operator |
842
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
691 | # Allow unary operators: -123, -x, +1. |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
692 | # Allow argument unpacking: foo(*args, **kwargs). |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
693 | if prev_type == tokenize.OP: |
2864
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
694 | binary_usage = (prev_text in '}])') |
842
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
695 | elif prev_type == tokenize.NAME: |
2864
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
696 | binary_usage = (prev_text not in KEYWORDS) |
842
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
697 | else: |
2864
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
698 | binary_usage = (prev_type not in SKIP_TOKENS) |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
699 | |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
700 | if binary_usage: |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
701 | need_space = None |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
702 | elif text in WS_OPTIONAL_OPERATORS: |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
703 | need_space = None |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
704 | |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
705 | if need_space is None: |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
706 | # Surrounding space is optional, but ensure that |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
707 | # trailing space matches opening space |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
708 | need_space = (prev_end, start != prev_end) |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
709 | elif need_space and start == prev_end: |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
710 | # A needed opening space was not found |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
711 | yield prev_end, "E225" |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
712 | need_space = False |
842
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
713 | prev_type = token_type |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
714 | prev_text = text |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
715 | prev_end = end |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
716 | |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
717 | |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
718 | def whitespace_around_comma(logical_line): |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
719 | """ |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
720 | Avoid extraneous whitespace in the following situations: |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
721 | |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
722 | - More than one space around an assignment (or other) operator to |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
723 | align it with another. |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
724 | |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
725 | JCR: This should also be applied around comma etc. |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
726 | Note: these checks are disabled by default |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
727 | |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
728 | Okay: a = (1, 2) |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
729 | E241: a = (1, 2) |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
730 | E242: a = (1,\t2) |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
731 | """ |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
732 | line = logical_line |
2864
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
733 | for m in WHITESPACE_AFTER_COMMA_REGEX.finditer(line): |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
734 | found = m.start() + 1 |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
735 | if '\t' in m.group(): |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
736 | yield found, "E242", m.group()[0] |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
737 | else: |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
738 | yield found, "E241", m.group()[0] |
842
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
739 | |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
740 | |
2864
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
741 | def whitespace_around_named_parameter_equals(logical_line, tokens): |
842
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
742 | """ |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
743 | Don't use spaces around the '=' sign when used to indicate a |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
744 | keyword argument or a default parameter value. |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
745 | |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
746 | Okay: def complex(real, imag=0.0): |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
747 | Okay: return magic(r=real, i=imag) |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
748 | Okay: boolean(a == b) |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
749 | Okay: boolean(a != b) |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
750 | Okay: boolean(a <= b) |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
751 | Okay: boolean(a >= b) |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
752 | |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
753 | E251: def complex(real, imag = 0.0): |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
754 | E251: return magic(r = real, i = imag) |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
755 | """ |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
756 | parens = 0 |
2864
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
757 | no_space = False |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
758 | prev_end = None |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
759 | message = "E251" |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
760 | for token_type, text, start, end, line in tokens: |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
761 | if no_space: |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
762 | no_space = False |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
763 | if start != prev_end: |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
764 | yield prev_end, message |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
765 | elif token_type == tokenize.OP: |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
766 | if text == '(': |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
767 | parens += 1 |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
768 | elif text == ')': |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
769 | parens -= 1 |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
770 | elif parens and text == '=': |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
771 | no_space = True |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
772 | if start != prev_end: |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
773 | yield prev_end, message |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
774 | prev_end = end |
842
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
775 | |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
776 | |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
777 | def whitespace_before_inline_comment(logical_line, tokens): |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
778 | """ |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
779 | Separate inline comments by at least two spaces. |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
780 | |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
781 | An inline comment is a comment on the same line as a statement. Inline |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
782 | comments should be separated by at least two spaces from the statement. |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
783 | They should start with a # and a single space. |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
784 | |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
785 | Okay: x = x + 1 # Increment x |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
786 | Okay: x = x + 1 # Increment x |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
787 | E261: x = x + 1 # Increment x |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
788 | E262: x = x + 1 #Increment x |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
789 | E262: x = x + 1 # Increment x |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
790 | """ |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
791 | prev_end = (0, 0) |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
792 | for token_type, text, start, end, line in tokens: |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
793 | if token_type == tokenize.COMMENT: |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
794 | if not line[:start[1]].strip(): |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
795 | continue |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
796 | if prev_end[0] == start[0] and start[1] < prev_end[1] + 2: |
2864
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
797 | yield prev_end, "E261" |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
798 | symbol, sp, comment = text.partition(' ') |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
799 | if symbol not in ('#', '#:') or comment[:1].isspace(): |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
800 | yield start, "E262" |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
801 | elif token_type != tokenize.NL: |
842
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
802 | prev_end = end |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
803 | |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
804 | |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
805 | def imports_on_separate_lines(logical_line): |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
806 | r""" |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
807 | Imports should usually be on separate lines. |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
808 | |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
809 | Okay: import os\nimport sys |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
810 | E401: import sys, os |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
811 | |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
812 | Okay: from subprocess import Popen, PIPE |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
813 | Okay: from myclas import MyClass |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
814 | Okay: from foo.bar.yourclass import YourClass |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
815 | Okay: import myclass |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
816 | Okay: import foo.bar.yourclass |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
817 | """ |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
818 | line = logical_line |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
819 | if line.startswith('import '): |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
820 | found = line.find(',') |
2864
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
821 | if -1 < found and ';' not in line[:found]: |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
822 | yield found, "E401" |
842
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
823 | |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
824 | |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
825 | def compound_statements(logical_line): |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
826 | r""" |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
827 | Compound statements (multiple statements on the same line) are |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
828 | generally discouraged. |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
829 | |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
830 | While sometimes it's okay to put an if/for/while with a small body |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
831 | on the same line, never do this for multi-clause statements. Also |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
832 | avoid folding such long lines! |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
833 | |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
834 | Okay: if foo == 'blah':\n do_blah_thing() |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
835 | Okay: do_one() |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
836 | Okay: do_two() |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
837 | Okay: do_three() |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
838 | |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
839 | E701: if foo == 'blah': do_blah_thing() |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
840 | E701: for x in lst: total += x |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
841 | E701: while t < 10: t = delay() |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
842 | E701: if foo == 'blah': do_blah_thing() |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
843 | E701: else: do_non_blah_thing() |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
844 | E701: try: something() |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
845 | E701: finally: cleanup() |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
846 | E701: if foo == 'blah': one(); two(); three() |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
847 | |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
848 | E702: do_one(); do_two(); do_three() |
2864
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
849 | E703: do_four(); # useless semicolon |
842
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
850 | """ |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
851 | line = logical_line |
2864
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
852 | last_char = len(line) - 1 |
842
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
853 | found = line.find(':') |
2864
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
854 | while -1 < found < last_char: |
842
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
855 | before = line[:found] |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
856 | if (before.count('{') <= before.count('}') and # {'a': 1} (dict) |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
857 | before.count('[') <= before.count(']') and # [1:2] (slice) |
2864
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
858 | before.count('(') <= before.count(')') and # (Python 3 annotation) |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
859 | not LAMBDA_REGEX.search(before)): # lambda x: x |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
860 | yield found, "E701" |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
861 | found = line.find(':', found + 1) |
842
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
862 | found = line.find(';') |
2864
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
863 | while -1 < found: |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
864 | if found < last_char: |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
865 | yield found, "E702" |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
866 | else: |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
867 | yield found, "E703" |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
868 | found = line.find(';', found + 1) |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
869 | |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
870 | |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
871 | def explicit_line_join(logical_line, tokens): |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
872 | r""" |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
873 | Avoid explicit line join between brackets. |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
874 | |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
875 | The preferred way of wrapping long lines is by using Python's implied line |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
876 | continuation inside parentheses, brackets and braces. Long lines can be |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
877 | broken over multiple lines by wrapping expressions in parentheses. These |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
878 | should be used in preference to using a backslash for line continuation. |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
879 | |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
880 | E502: aaa = [123, \\n 123] |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
881 | E502: aaa = ("bbb " \\n "ccc") |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
882 | |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
883 | Okay: aaa = [123,\n 123] |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
884 | Okay: aaa = ("bbb "\n "ccc") |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
885 | Okay: aaa = "bbb " \\n "ccc" |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
886 | """ |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
887 | prev_start = prev_end = parens = 0 |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
888 | backslash = None |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
889 | for token_type, text, start, end, line in tokens: |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
890 | if start[0] != prev_start and parens and backslash: |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
891 | yield backslash, "E502" |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
892 | if end[0] != prev_end: |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
893 | if line.rstrip('\r\n').endswith('\\'): |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
894 | backslash = (end[0], len(line.splitlines()[-1]) - 1) |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
895 | else: |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
896 | backslash = None |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
897 | prev_start = prev_end = end[0] |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
898 | else: |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
899 | prev_start = start[0] |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
900 | if token_type == tokenize.OP: |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
901 | if text in '([{': |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
902 | parens += 1 |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
903 | elif text in ')]}': |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
904 | parens -= 1 |
842
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
905 | |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
906 | |
2864
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
907 | def comparison_to_singleton(logical_line, noqa): |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
908 | """ |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
909 | Comparisons to singletons like None should always be done |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
910 | with "is" or "is not", never the equality operators. |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
911 | |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
912 | Okay: if arg is not None: |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
913 | E711: if arg != None: |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
914 | E712: if arg == True: |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
915 | |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
916 | Also, beware of writing if x when you really mean if x is not None -- |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
917 | e.g. when testing whether a variable or argument that defaults to None was |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
918 | set to some other value. The other value might have a type (such as a |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
919 | container) that could be false in a boolean context! |
842
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
920 | """ |
2864
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
921 | match = not noqa and COMPARE_SINGLETON_REGEX.search(logical_line) |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
922 | if match: |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
923 | same = (match.group(1) == '==') |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
924 | singleton = match.group(2) |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
925 | msg = "'if cond is %s:'" % (('' if same else 'not ') + singleton) |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
926 | if singleton in ('None',): |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
927 | code = 'E711' |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
928 | else: |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
929 | code = 'E712' |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
930 | nonzero = ((singleton == 'True' and same) or |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
931 | (singleton == 'False' and not same)) |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
932 | msg += " or 'if %scond:'" % ('' if nonzero else 'not ') |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
933 | yield match.start(1), code, singleton, msg |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
934 | |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
935 | |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
936 | def comparison_type(logical_line): |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
937 | """ |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
938 | Object type comparisons should always use isinstance() instead of |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
939 | comparing types directly. |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
940 | |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
941 | Okay: if isinstance(obj, int): |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
942 | E721: if type(obj) is type(1): |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
943 | |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
944 | When checking if an object is a string, keep in mind that it might be a |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
945 | unicode string too! In Python 2.3, str and unicode have a common base |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
946 | class, basestring, so you can do: |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
947 | |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
948 | Okay: if isinstance(obj, basestring): |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
949 | Okay: if type(a1) is type(b1): |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
950 | """ |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
951 | match = COMPARE_TYPE_REGEX.search(logical_line) |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
952 | if match: |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
953 | inst = match.group(1) |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
954 | if inst and isidentifier(inst) and inst not in SINGLETONS: |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
955 | return # Allow comparison for types which are not obvious |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
956 | yield match.start(), "E721" |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
957 | |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
958 | |
2866
c77e08c38a5c
Extended the PEP-8 dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2864
diff
changeset
|
959 | def python_3000_has_key(logical_line): |
2864
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
960 | r""" |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
961 | The {}.has_key() method is removed in the Python 3. |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
962 | Use the 'in' operation instead. |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
963 | |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
964 | Okay: if "alph" in d:\n print d["alph"] |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
965 | W601: assert d.has_key('alph') |
842
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
966 | """ |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
967 | pos = logical_line.find('.has_key(') |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
968 | if pos > -1: |
2864
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
969 | yield pos, "W601" |
842
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
970 | |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
971 | |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
972 | def python_3000_raise_comma(logical_line): |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
973 | """ |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
974 | When raising an exception, use "raise ValueError('message')" |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
975 | instead of the older form "raise ValueError, 'message'". |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
976 | |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
977 | The paren-using form is preferred because when the exception arguments |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
978 | are long or include string formatting, you don't need to use line |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
979 | continuation characters thanks to the containing parentheses. The older |
2864
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
980 | form is removed in Python 3. |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
981 | |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
982 | Okay: raise DummyError("Message") |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
983 | W602: raise DummyError, "Message" |
842
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
984 | """ |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
985 | match = RAISE_COMMA_REGEX.match(logical_line) |
2864
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
986 | if match and not RERAISE_COMMA_REGEX.match(logical_line): |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
987 | yield match.end() - 1, "W602" |
842
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
988 | |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
989 | |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
990 | def python_3000_not_equal(logical_line): |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
991 | """ |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
992 | != can also be written <>, but this is an obsolete usage kept for |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
993 | backwards compatibility only. New code should always use !=. |
2864
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
994 | The older syntax is removed in Python 3. |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
995 | |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
996 | Okay: if a != 'no': |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
997 | W603: if a <> 'no': |
842
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
998 | """ |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
999 | pos = logical_line.find('<>') |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1000 | if pos > -1: |
2864
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1001 | yield pos, "W603" |
842
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1002 | |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1003 | |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1004 | def python_3000_backticks(logical_line): |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1005 | """ |
2864
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1006 | Backticks are removed in Python 3. |
842
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1007 | Use repr() instead. |
2864
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1008 | |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1009 | Okay: val = repr(1 + 2) |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1010 | W604: val = `1 + 2` |
842
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1011 | """ |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1012 | pos = logical_line.find('`') |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1013 | if pos > -1: |
2864
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1014 | yield pos, "W604" |
842
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1015 | |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1016 | |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1017 | ############################################################################## |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1018 | # Helper functions |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1019 | ############################################################################## |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1020 | |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1021 | |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1022 | if '' == ''.encode(): |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1023 | # Python 2: implicit encoding. |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1024 | def readlines(filename): |
2864
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1025 | f = open(filename) |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1026 | try: |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1027 | return f.readlines() |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1028 | finally: |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1029 | f.close() |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1030 | isidentifier = re.compile(r'[a-zA-Z_]\w*').match |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1031 | stdin_get_value = sys.stdin.read |
842
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1032 | else: |
2864
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1033 | # Python 3 |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1034 | def readlines(filename): # __IGNORE_WARNING__ |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1035 | f = open(filename, 'rb') |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1036 | try: |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1037 | coding, lines = tokenize.detect_encoding(f.readline) |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1038 | f = TextIOWrapper(f, coding, line_buffering=True) |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1039 | return [l.decode(coding) for l in lines] + f.readlines() |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1040 | except (LookupError, SyntaxError, UnicodeError): |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1041 | f.close() |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1042 | # Fall back if files are improperly declared |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1043 | f = open(filename, encoding='latin-1') |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1044 | return f.readlines() |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1045 | finally: |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1046 | f.close() |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1047 | isidentifier = str.isidentifier |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1048 | |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1049 | def stdin_get_value(): |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1050 | return TextIOWrapper(sys.stdin.buffer, errors='ignore').read() |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1051 | readlines.__doc__ = " Read the source code." |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1052 | noqa = re.compile(r'# no(?:qa|pep8)\b', re.I).search |
842
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1053 | |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1054 | |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1055 | def expand_indent(line): |
2864
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1056 | r""" |
842
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1057 | Return the amount of indentation. |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1058 | Tabs are expanded to the next multiple of 8. |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1059 | |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1060 | >>> expand_indent(' ') |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1061 | 4 |
2864
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1062 | >>> expand_indent('\t') |
842
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1063 | 8 |
2864
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1064 | >>> expand_indent(' \t') |
842
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1065 | 8 |
2864
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1066 | >>> expand_indent(' \t') |
842
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1067 | 8 |
2864
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1068 | >>> expand_indent(' \t') |
842
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1069 | 16 |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1070 | """ |
2864
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1071 | if '\t' not in line: |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1072 | return len(line) - len(line.lstrip()) |
842
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1073 | result = 0 |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1074 | for char in line: |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1075 | if char == '\t': |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1076 | result = result // 8 * 8 + 8 |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1077 | elif char == ' ': |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1078 | result += 1 |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1079 | else: |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1080 | break |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1081 | return result |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1082 | |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1083 | |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1084 | def mute_string(text): |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1085 | """ |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1086 | Replace contents with 'xxx' to prevent syntax matching. |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1087 | |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1088 | >>> mute_string('"abc"') |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1089 | '"xxx"' |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1090 | >>> mute_string("'''abc'''") |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1091 | "'''xxx'''" |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1092 | >>> mute_string("r'abc'") |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1093 | "r'xxx'" |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1094 | """ |
2864
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1095 | # String modifiers (e.g. u or r) |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1096 | start = text.index(text[-1]) + 1 |
842
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1097 | end = len(text) - 1 |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1098 | # Triple quotes |
2864
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1099 | if text[-3:] in ('"""', "'''"): |
842
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1100 | start += 2 |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1101 | end -= 2 |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1102 | return text[:start] + 'x' * (end - start) + text[end:] |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1103 | |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1104 | |
2864
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1105 | def parse_udiff(diff, patterns=None, parent='.'): |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1106 | """Return a dictionary of matching lines.""" |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1107 | # For each file of the diff, the entry key is the filename, |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1108 | # and the value is a set of row numbers to consider. |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1109 | rv = {} |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1110 | path = nrows = None |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1111 | for line in diff.splitlines(): |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1112 | if nrows: |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1113 | if line[:1] != '-': |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1114 | nrows -= 1 |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1115 | continue |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1116 | if line[:3] == '@@ ': |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1117 | hunk_match = HUNK_REGEX.match(line) |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1118 | row, nrows = [int(g or '1') for g in hunk_match.groups()] |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1119 | rv[path].update(range(row, row + nrows)) |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1120 | elif line[:3] == '+++': |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1121 | path = line[4:].split('\t', 1)[0] |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1122 | if path[:2] == 'b/': |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1123 | path = path[2:] |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1124 | rv[path] = set() |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1125 | return dict([(os.path.join(parent, path), rows) |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1126 | for (path, rows) in rv.items() |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1127 | if rows and filename_match(path, patterns)]) |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1128 | |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1129 | |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1130 | def filename_match(filename, patterns, default=True): |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1131 | """ |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1132 | Check if patterns contains a pattern that matches filename. |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1133 | If patterns is unspecified, this always returns True. |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1134 | """ |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1135 | if not patterns: |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1136 | return default |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1137 | return any(fnmatch(filename, pattern) for pattern in patterns) |
842
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1138 | |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1139 | |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1140 | ############################################################################## |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1141 | # Framework to run all checks |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1142 | ############################################################################## |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1143 | |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1144 | |
2864
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1145 | _checks = {'physical_line': {}, 'logical_line': {}, 'tree': {}} |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1146 | |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1147 | |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1148 | def register_check(check, codes=None): |
842
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1149 | """ |
2864
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1150 | Register a new check object. |
842
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1151 | """ |
2864
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1152 | def _add_check(check, kind, codes, args): |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1153 | if check in _checks[kind]: |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1154 | _checks[kind][check][0].extend(codes or []) |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1155 | else: |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1156 | _checks[kind][check] = (codes or [''], args) |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1157 | if inspect.isfunction(check): |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1158 | args = inspect.getargspec(check)[0] |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1159 | if args and args[0] in ('physical_line', 'logical_line'): |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1160 | if codes is None: |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1161 | codes = ERRORCODE_REGEX.findall(check.__doc__ or '') |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1162 | _add_check(check, args[0], codes, args) |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1163 | elif inspect.isclass(check): |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1164 | if inspect.getargspec(check.__init__)[0][:2] == ['self', 'tree']: |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1165 | _add_check(check, 'tree', codes, None) |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1166 | |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1167 | |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1168 | def init_checks_registry(): |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1169 | """ |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1170 | Register all globally visible functions where the first argument name |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1171 | is 'physical_line' or 'logical_line'. |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1172 | """ |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1173 | mod = inspect.getmodule(register_check) |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1174 | for (name, function) in inspect.getmembers(mod, inspect.isfunction): |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1175 | register_check(function) |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1176 | init_checks_registry() |
842
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1177 | |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1178 | |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1179 | class Checker(object): |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1180 | """ |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1181 | Load a Python source file, tokenize it, check coding style. |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1182 | """ |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1183 | |
2864
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1184 | def __init__(self, filename=None, lines=None, |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1185 | options=None, report=None, **kwargs): |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1186 | if options is None: |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1187 | options = StyleGuide(kwargs).options |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1188 | else: |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1189 | assert not kwargs |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1190 | self._io_error = None |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1191 | self._physical_checks = options.physical_checks |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1192 | self._logical_checks = options.logical_checks |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1193 | self._ast_checks = options.ast_checks |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1194 | self.max_line_length = options.max_line_length |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1195 | self.hang_closing = options.hang_closing |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1196 | self.verbose = options.verbose |
842
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1197 | self.filename = filename |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1198 | if filename is None: |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1199 | self.filename = 'stdin' |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1200 | self.lines = lines or [] |
2864
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1201 | elif filename == '-': |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1202 | self.filename = 'stdin' |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1203 | self.lines = stdin_get_value().splitlines(True) |
842
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1204 | elif lines is None: |
2864
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1205 | try: |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1206 | self.lines = readlines(filename) |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1207 | except IOError: |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1208 | exc_type, exc = sys.exc_info()[:2] |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1209 | self._io_error = '%s: %s' % (exc_type.__name__, exc) |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1210 | self.lines = [] |
842
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1211 | else: |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1212 | self.lines = lines |
2864
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1213 | if self.lines: |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1214 | ord0 = ord(self.lines[0][0]) |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1215 | if ord0 in (0xef, 0xfeff): # Strip the UTF-8 BOM |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1216 | if ord0 == 0xfeff: |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1217 | self.lines[0] = self.lines[0][1:] |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1218 | elif self.lines[0][:3] == '\xef\xbb\xbf': |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1219 | self.lines[0] = self.lines[0][3:] |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1220 | self.report = report or options.report |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1221 | self.report_error = self.report.error |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1222 | self.report_error_args = self.report.error_args |
2913
4e395efc0ef9
Optimized the PEP-8 naming checker (Python2 variant).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2899
diff
changeset
|
1223 | |
4e395efc0ef9
Optimized the PEP-8 naming checker (Python2 variant).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2899
diff
changeset
|
1224 | # added for eric5 integration |
4e395efc0ef9
Optimized the PEP-8 naming checker (Python2 variant).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2899
diff
changeset
|
1225 | self.options = options |
2864
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1226 | |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1227 | def report_invalid_syntax(self): |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1228 | exc_type, exc = sys.exc_info()[:2] |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1229 | if len(exc.args) > 1: |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1230 | offset = exc.args[1] |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1231 | if len(offset) > 2: |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1232 | offset = offset[1:3] |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1233 | else: |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1234 | offset = (1, 0) |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1235 | self.report_error_args(offset[0], offset[1] or 0, |
2899
88d2458a4739
Fixed an issue in the pep8.py checkers.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2866
diff
changeset
|
1236 | 'E901', self.report_invalid_syntax, |
88d2458a4739
Fixed an issue in the pep8.py checkers.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2866
diff
changeset
|
1237 | exc_type.__name__, exc.args[0]) |
2864
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1238 | report_invalid_syntax.__doc__ = " Check if the syntax is valid." |
842
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1239 | |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1240 | def readline(self): |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1241 | """ |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1242 | Get the next line from the input buffer. |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1243 | """ |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1244 | self.line_number += 1 |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1245 | if self.line_number > len(self.lines): |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1246 | return '' |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1247 | return self.lines[self.line_number - 1] |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1248 | |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1249 | def readline_check_physical(self): |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1250 | """ |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1251 | Check and return the next physical line. This method can be |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1252 | used to feed tokenize.generate_tokens. |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1253 | """ |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1254 | line = self.readline() |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1255 | if line: |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1256 | self.check_physical(line) |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1257 | return line |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1258 | |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1259 | def run_check(self, check, argument_names): |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1260 | """ |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1261 | Run a check plugin. |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1262 | """ |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1263 | arguments = [] |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1264 | for name in argument_names: |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1265 | arguments.append(getattr(self, name)) |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1266 | return check(*arguments) |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1267 | |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1268 | def check_physical(self, line): |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1269 | """ |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1270 | Run all physical checks on a raw input line. |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1271 | """ |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1272 | self.physical_line = line |
2864
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1273 | if self.indent_char is None and line[:1] in WHITESPACE: |
842
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1274 | self.indent_char = line[0] |
2864
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1275 | for name, check, argument_names in self._physical_checks: |
842
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1276 | result = self.run_check(check, argument_names) |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1277 | if result is not None: |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1278 | offset, code = result[:2] |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1279 | args = result[2:] |
945
8cd4d08fa9f6
Made code mostly PEP 8 compliant (except all whitespace and line length).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
842
diff
changeset
|
1280 | self.report_error_args(self.line_number, offset, code, check, |
842
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1281 | *args) |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1282 | |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1283 | def build_tokens_line(self): |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1284 | """ |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1285 | Build a logical line from tokens. |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1286 | """ |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1287 | self.mapping = [] |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1288 | logical = [] |
2864
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1289 | comments = [] |
842
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1290 | length = 0 |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1291 | previous = None |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1292 | for token in self.tokens: |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1293 | token_type, text = token[0:2] |
2864
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1294 | if token_type == tokenize.COMMENT: |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1295 | comments.append(text) |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1296 | continue |
842
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1297 | if token_type in SKIP_TOKENS: |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1298 | continue |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1299 | if token_type == tokenize.STRING: |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1300 | text = mute_string(text) |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1301 | if previous: |
2864
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1302 | end_row, end = previous[3] |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1303 | start_row, start = token[2] |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1304 | if end_row != start_row: # different row |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1305 | prev_text = self.lines[end_row - 1][end - 1] |
842
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1306 | if prev_text == ',' or (prev_text not in '{[(' |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1307 | and text not in '}])'): |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1308 | logical.append(' ') |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1309 | length += 1 |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1310 | elif end != start: # different column |
2864
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1311 | fill = self.lines[end_row - 1][end:start] |
842
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1312 | logical.append(fill) |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1313 | length += len(fill) |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1314 | self.mapping.append((length, token)) |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1315 | logical.append(text) |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1316 | length += len(text) |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1317 | previous = token |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1318 | self.logical_line = ''.join(logical) |
2864
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1319 | self.noqa = comments and noqa(''.join(comments)) |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1320 | # With Python 2, if the line ends with '\r\r\n' the assertion fails |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1321 | # assert self.logical_line.strip() == self.logical_line |
842
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1322 | |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1323 | def check_logical(self): |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1324 | """ |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1325 | Build a line from tokens and run all logical checks on it. |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1326 | """ |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1327 | self.build_tokens_line() |
2864
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1328 | self.report.increment_logical_line() |
842
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1329 | first_line = self.lines[self.mapping[0][1][2][0] - 1] |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1330 | indent = first_line[:self.mapping[0][1][2][1]] |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1331 | self.previous_indent_level = self.indent_level |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1332 | self.indent_level = expand_indent(indent) |
2864
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1333 | if self.verbose >= 2: |
842
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1334 | print(self.logical_line[:80].rstrip()) |
2864
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1335 | for name, check, argument_names in self._logical_checks: |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1336 | if self.verbose >= 4: |
842
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1337 | print(' ' + name) |
2864
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1338 | for result in self.run_check(check, argument_names): |
842
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1339 | offset, code = result[:2] |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1340 | args = result[2:] |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1341 | if isinstance(offset, tuple): |
2864
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1342 | orig_number, orig_offset = offset |
842
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1343 | else: |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1344 | for token_offset, token in self.mapping: |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1345 | if offset >= token_offset: |
2864
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1346 | orig_number = token[2][0] |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1347 | orig_offset = (token[2][1] + offset - token_offset) |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1348 | self.report_error_args(orig_number, orig_offset, code, check, |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1349 | *args) |
842
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1350 | self.previous_logical = self.logical_line |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1351 | |
2864
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1352 | def check_ast(self): |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1353 | try: |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1354 | tree = compile(''.join(self.lines), '', 'exec', PyCF_ONLY_AST) |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1355 | except (SyntaxError, TypeError): |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1356 | return self.report_invalid_syntax() |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1357 | for name, cls, _ in self._ast_checks: |
2913
4e395efc0ef9
Optimized the PEP-8 naming checker (Python2 variant).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2899
diff
changeset
|
1358 | # extended API for eric5 integration |
4e395efc0ef9
Optimized the PEP-8 naming checker (Python2 variant).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2899
diff
changeset
|
1359 | checker = cls(tree, self.filename, self.options) |
2864
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1360 | for result in checker.run(): |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1361 | lineno, offset, code, check = result[:4] |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1362 | args = result[4:] |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1363 | if not noqa(self.lines[lineno - 1]): |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1364 | self.report_error_args(lineno, offset, code, check, *args) |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1365 | |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1366 | def generate_tokens(self): |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1367 | if self._io_error: |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1368 | self.report_error(1, 0, 'E902 %s' % self._io_error, readlines) |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1369 | tokengen = tokenize.generate_tokens(self.readline_check_physical) |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1370 | try: |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1371 | for token in tokengen: |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1372 | yield token |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1373 | except (SyntaxError, tokenize.TokenError): |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1374 | self.report_invalid_syntax() |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1375 | |
842
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1376 | def check_all(self, expected=None, line_offset=0): |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1377 | """ |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1378 | Run all checks on the input file. |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1379 | """ |
2864
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1380 | self.report.init_file(self.filename, self.lines, expected, line_offset) |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1381 | if self._ast_checks: |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1382 | self.check_ast() |
842
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1383 | self.line_number = 0 |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1384 | self.indent_char = None |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1385 | self.indent_level = 0 |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1386 | self.previous_logical = '' |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1387 | self.tokens = [] |
2864
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1388 | self.blank_lines = blank_lines_before_comment = 0 |
842
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1389 | parens = 0 |
2864
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1390 | for token in self.generate_tokens(): |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1391 | self.tokens.append(token) |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1392 | token_type, text = token[0:2] |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1393 | if self.verbose >= 3: |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1394 | if token[2][0] == token[3][0]: |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1395 | pos = '[%s:%s]' % (token[2][1] or '', token[3][1]) |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1396 | else: |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1397 | pos = 'l.%s' % token[3][0] |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1398 | print('l.%s\t%s\t%s\t%r' % |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1399 | (token[2][0], pos, tokenize.tok_name[token[0]], text)) |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1400 | if token_type == tokenize.OP: |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1401 | if text in '([{': |
2799
ec8c717e80f5
Fixed an issue in the pep8 checker tokenising a bad file.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1402 | parens += 1 |
2864
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1403 | elif text in '}])': |
2799
ec8c717e80f5
Fixed an issue in the pep8 checker tokenising a bad file.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1404 | parens -= 1 |
2864
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1405 | elif not parens: |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1406 | if token_type == tokenize.NEWLINE: |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1407 | if self.blank_lines < blank_lines_before_comment: |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1408 | self.blank_lines = blank_lines_before_comment |
2799
ec8c717e80f5
Fixed an issue in the pep8 checker tokenising a bad file.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1409 | self.check_logical() |
ec8c717e80f5
Fixed an issue in the pep8 checker tokenising a bad file.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1410 | self.tokens = [] |
2864
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1411 | self.blank_lines = blank_lines_before_comment = 0 |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1412 | elif token_type == tokenize.NL: |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1413 | if len(self.tokens) == 1: |
2799
ec8c717e80f5
Fixed an issue in the pep8 checker tokenising a bad file.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1414 | # The physical line contains only this token. |
ec8c717e80f5
Fixed an issue in the pep8 checker tokenising a bad file.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1415 | self.blank_lines += 1 |
842
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1416 | self.tokens = [] |
2864
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1417 | elif token_type == tokenize.COMMENT and len(self.tokens) == 1: |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1418 | if blank_lines_before_comment < self.blank_lines: |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1419 | blank_lines_before_comment = self.blank_lines |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1420 | self.blank_lines = 0 |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1421 | if COMMENT_WITH_NL: |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1422 | # The comment also ends a physical line |
2799
ec8c717e80f5
Fixed an issue in the pep8 checker tokenising a bad file.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1423 | self.tokens = [] |
2864
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1424 | return self.report.get_file_results() |
842
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1425 | |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1426 | |
2864
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1427 | class BaseReport(object): |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1428 | """Collect the results of the checks.""" |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1429 | print_filename = False |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1430 | |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1431 | def __init__(self, options): |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1432 | self._benchmark_keys = options.benchmark_keys |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1433 | self._ignore_code = options.ignore_code |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1434 | # Results |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1435 | self.elapsed = 0 |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1436 | self.total_errors = 0 |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1437 | self.counters = dict.fromkeys(self._benchmark_keys, 0) |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1438 | self.messages = {} |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1439 | |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1440 | def start(self): |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1441 | """Start the timer.""" |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1442 | self._start_time = time.time() |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1443 | |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1444 | def stop(self): |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1445 | """Stop the timer.""" |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1446 | self.elapsed = time.time() - self._start_time |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1447 | |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1448 | def init_file(self, filename, lines, expected, line_offset): |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1449 | """Signal a new file.""" |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1450 | self.filename = filename |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1451 | self.lines = lines |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1452 | self.expected = expected or () |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1453 | self.line_offset = line_offset |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1454 | self.file_errors = 0 |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1455 | self.counters['files'] += 1 |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1456 | self.counters['physical lines'] += len(lines) |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1457 | |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1458 | def increment_logical_line(self): |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1459 | """Signal a new logical line.""" |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1460 | self.counters['logical lines'] += 1 |
842
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1461 | |
2864
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1462 | def error(self, line_number, offset, text, check): |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1463 | """Report an error, according to options.""" |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1464 | code = text[:4] |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1465 | if self._ignore_code(code): |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1466 | return |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1467 | if code in self.counters: |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1468 | self.counters[code] += 1 |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1469 | else: |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1470 | self.counters[code] = 1 |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1471 | self.messages[code] = text[5:] |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1472 | # Don't care about expected errors or warnings |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1473 | if code in self.expected: |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1474 | return |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1475 | if self.print_filename and not self.file_errors: |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1476 | print(self.filename) |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1477 | self.file_errors += 1 |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1478 | self.total_errors += 1 |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1479 | return code |
842
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1480 | |
2864
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1481 | def error_args(self, line_number, offset, code, check, *args): |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1482 | """Report an error, according to options.""" |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1483 | if self._ignore_code(code): |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1484 | return |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1485 | if code in self.counters: |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1486 | self.counters[code] += 1 |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1487 | else: |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1488 | self.counters[code] = 1 |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1489 | # Don't care about expected errors or warnings |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1490 | if code in self.expected: |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1491 | return |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1492 | if self.print_filename and not self.file_errors: |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1493 | print(self.filename) |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1494 | self.file_errors += 1 |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1495 | self.total_errors += 1 |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1496 | return code |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1497 | |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1498 | def get_file_results(self): |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1499 | """Return the count of errors and warnings for this file.""" |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1500 | return self.file_errors |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1501 | |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1502 | def get_count(self, prefix=''): |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1503 | """Return the total count of errors and warnings.""" |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1504 | return sum([self.counters[key] |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1505 | for key in self.messages if key.startswith(prefix)]) |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1506 | |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1507 | def get_statistics(self, prefix=''): |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1508 | """ |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1509 | Get statistics for message codes that start with the prefix. |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1510 | |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1511 | prefix='' matches all errors and warnings |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1512 | prefix='E' matches all errors |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1513 | prefix='W' matches all warnings |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1514 | prefix='E4' matches all errors that have to do with imports |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1515 | """ |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1516 | return ['%-7s %s %s' % (self.counters[key], key, self.messages[key]) |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1517 | for key in sorted(self.messages) if key.startswith(prefix)] |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1518 | |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1519 | def print_statistics(self, prefix=''): |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1520 | """Print overall statistics (number of errors and warnings).""" |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1521 | for line in self.get_statistics(prefix): |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1522 | print(line) |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1523 | |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1524 | def print_benchmark(self): |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1525 | """Print benchmark numbers.""" |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1526 | print('%-7.2f %s' % (self.elapsed, 'seconds elapsed')) |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1527 | if self.elapsed: |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1528 | for key in self._benchmark_keys: |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1529 | print('%-7d %s per second (%d total)' % |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1530 | (self.counters[key] / self.elapsed, key, |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1531 | self.counters[key])) |
842
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1532 | |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1533 | |
2864
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1534 | class FileReport(BaseReport): |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1535 | """Collect the results of the checks and print only the filenames.""" |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1536 | print_filename = True |
842
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1537 | |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1538 | |
2864
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1539 | class StandardReport(BaseReport): |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1540 | """Collect and print the results of the checks.""" |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1541 | |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1542 | def __init__(self, options): |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1543 | super(StandardReport, self).__init__(options) |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1544 | self._fmt = REPORT_FORMAT.get(options.format.lower(), |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1545 | options.format) |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1546 | self._repeat = options.repeat |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1547 | self._show_source = options.show_source |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1548 | self._show_pep8 = options.show_pep8 |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1549 | |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1550 | def init_file(self, filename, lines, expected, line_offset): |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1551 | """Signal a new file.""" |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1552 | self._deferred_print = [] |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1553 | return super(StandardReport, self).init_file( |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1554 | filename, lines, expected, line_offset) |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1555 | |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1556 | def error(self, line_number, offset, text, check): |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1557 | """Report an error, according to options.""" |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1558 | code = super(StandardReport, self).error(line_number, offset, |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1559 | text, check) |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1560 | if code and (self.counters[code] == 1 or self._repeat): |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1561 | self._deferred_print.append( |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1562 | (line_number, offset, code, text[5:], check.__doc__)) |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1563 | return code |
842
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1564 | |
2864
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1565 | def error_args(self, line_number, offset, code, check, *args): |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1566 | """Report an error, according to options.""" |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1567 | code = super(StandardReport, self).error_args(line_number, offset, |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1568 | code, check, *args) |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1569 | if code and (self.counters[code] == 1 or self._repeat): |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1570 | self._deferred_print.append( |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1571 | (line_number, offset, code, "", check.__doc__)) |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1572 | return code |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1573 | |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1574 | def get_file_results(self): |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1575 | """Print the result and return the overall count for this file.""" |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1576 | self._deferred_print.sort() |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1577 | for line_number, offset, code, text, doc in self._deferred_print: |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1578 | print(self._fmt % { |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1579 | 'path': self.filename, |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1580 | 'row': self.line_offset + line_number, 'col': offset + 1, |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1581 | 'code': code, 'text': text, |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1582 | }) |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1583 | if self._show_source: |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1584 | if line_number > len(self.lines): |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1585 | line = '' |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1586 | else: |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1587 | line = self.lines[line_number - 1] |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1588 | print(line.rstrip()) |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1589 | print(' ' * offset + '^') |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1590 | if self._show_pep8 and doc: |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1591 | print(doc.lstrip('\n').rstrip()) |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1592 | return self.file_errors |
842
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1593 | |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1594 | |
2864
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1595 | class DiffReport(StandardReport): |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1596 | """Collect and print the results for the changed lines only.""" |
842
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1597 | |
2864
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1598 | def __init__(self, options): |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1599 | super(DiffReport, self).__init__(options) |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1600 | self._selected = options.selected_lines |
842
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1601 | |
2864
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1602 | def error(self, line_number, offset, text, check): |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1603 | if line_number not in self._selected[self.filename]: |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1604 | return |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1605 | return super(DiffReport, self).error(line_number, offset, text, check) |
842
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1606 | |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1607 | |
2864
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1608 | class StyleGuide(object): |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1609 | """Initialize a PEP-8 instance with few options.""" |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1610 | |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1611 | def __init__(self, *args, **kwargs): |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1612 | # build options from the command line |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1613 | self.checker_class = kwargs.pop('checker_class', Checker) |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1614 | parse_argv = kwargs.pop('parse_argv', False) |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1615 | config_file = kwargs.pop('config_file', None) |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1616 | parser = kwargs.pop('parser', None) |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1617 | options, self.paths = process_options( |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1618 | parse_argv=parse_argv, config_file=config_file, parser=parser) |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1619 | if args or kwargs: |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1620 | # build options from dict |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1621 | options_dict = dict(*args, **kwargs) |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1622 | options.__dict__.update(options_dict) |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1623 | if 'paths' in options_dict: |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1624 | self.paths = options_dict['paths'] |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1625 | |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1626 | self.runner = self.input_file |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1627 | self.options = options |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1628 | |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1629 | if not options.reporter: |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1630 | options.reporter = BaseReport if options.quiet else StandardReport |
842
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1631 | |
2864
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1632 | for index, value in enumerate(options.exclude): |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1633 | options.exclude[index] = value.rstrip('/') |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1634 | options.select = tuple(options.select or ()) |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1635 | if not (options.select or options.ignore or |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1636 | options.testsuite or options.doctest) and DEFAULT_IGNORE: |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1637 | # The default choice: ignore controversial checks |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1638 | options.ignore = tuple(DEFAULT_IGNORE.split(',')) |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1639 | else: |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1640 | # Ignore all checks which are not explicitly selected |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1641 | options.ignore = ('',) if options.select else tuple(options.ignore) |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1642 | options.benchmark_keys = BENCHMARK_KEYS[:] |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1643 | options.ignore_code = self.ignore_code |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1644 | options.physical_checks = self.get_checks('physical_line') |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1645 | options.logical_checks = self.get_checks('logical_line') |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1646 | options.ast_checks = self.get_checks('tree') |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1647 | self.init_report() |
842
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1648 | |
2864
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1649 | def init_report(self, reporter=None): |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1650 | """Initialize the report instance.""" |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1651 | self.options.report = (reporter or self.options.reporter)(self.options) |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1652 | return self.options.report |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1653 | |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1654 | def check_files(self, paths=None): |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1655 | """Run all checks on the paths.""" |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1656 | if paths is None: |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1657 | paths = self.paths |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1658 | report = self.options.report |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1659 | runner = self.runner |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1660 | report.start() |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1661 | try: |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1662 | for path in paths: |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1663 | if os.path.isdir(path): |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1664 | self.input_dir(path) |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1665 | elif not self.excluded(path): |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1666 | runner(path) |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1667 | except KeyboardInterrupt: |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1668 | print('... stopped') |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1669 | report.stop() |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1670 | return report |
842
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1671 | |
2864
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1672 | def input_file(self, filename, lines=None, expected=None, line_offset=0): |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1673 | """Run all checks on a Python source file.""" |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1674 | if self.options.verbose: |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1675 | print('checking %s' % filename) |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1676 | fchecker = self.checker_class( |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1677 | filename, lines=lines, options=self.options) |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1678 | return fchecker.check_all(expected=expected, line_offset=line_offset) |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1679 | |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1680 | def input_dir(self, dirname): |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1681 | """Check all files in this directory and all subdirectories.""" |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1682 | dirname = dirname.rstrip('/') |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1683 | if self.excluded(dirname): |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1684 | return 0 |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1685 | counters = self.options.report.counters |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1686 | verbose = self.options.verbose |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1687 | filepatterns = self.options.filename |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1688 | runner = self.runner |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1689 | for root, dirs, files in os.walk(dirname): |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1690 | if verbose: |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1691 | print('directory ' + root) |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1692 | counters['directories'] += 1 |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1693 | for subdir in sorted(dirs): |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1694 | if self.excluded(subdir, root): |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1695 | dirs.remove(subdir) |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1696 | for filename in sorted(files): |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1697 | # contain a pattern that matches? |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1698 | if ((filename_match(filename, filepatterns) and |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1699 | not self.excluded(filename, root))): |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1700 | runner(os.path.join(root, filename)) |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1701 | |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1702 | def excluded(self, filename, parent=None): |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1703 | """ |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1704 | Check if options.exclude contains a pattern that matches filename. |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1705 | """ |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1706 | if not self.options.exclude: |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1707 | return False |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1708 | basename = os.path.basename(filename) |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1709 | if filename_match(basename, self.options.exclude): |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1710 | return True |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1711 | if parent: |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1712 | filename = os.path.join(parent, filename) |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1713 | return filename_match(filename, self.options.exclude) |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1714 | |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1715 | def ignore_code(self, code): |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1716 | """ |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1717 | Check if the error code should be ignored. |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1718 | |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1719 | If 'options.select' contains a prefix of the error code, |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1720 | return False. Else, if 'options.ignore' contains a prefix of |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1721 | the error code, return True. |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1722 | """ |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1723 | return (code.startswith(self.options.ignore) and |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1724 | not code.startswith(self.options.select)) |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1725 | |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1726 | def get_checks(self, argument_name): |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1727 | """ |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1728 | Find all globally visible functions where the first argument name |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1729 | starts with argument_name and which contain selected tests. |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1730 | """ |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1731 | checks = [] |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1732 | for check, attrs in _checks[argument_name].items(): |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1733 | (codes, args) = attrs |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1734 | if any(not (code and self.ignore_code(code)) for code in codes): |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1735 | checks.append((check.__name__, check, args)) |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1736 | return sorted(checks) |
842
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1737 | |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1738 | |
2864
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1739 | def get_parser(prog='pep8', version=__version__): |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1740 | parser = OptionParser(prog=prog, version=version, |
842
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1741 | usage="%prog [options] input ...") |
2864
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1742 | parser.config_options = [ |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1743 | 'exclude', 'filename', 'select', 'ignore', 'max-line-length', |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1744 | 'hang-closing', 'count', 'format', 'quiet', 'show-pep8', |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1745 | 'show-source', 'statistics', 'verbose'] |
842
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1746 | parser.add_option('-v', '--verbose', default=0, action='count', |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1747 | help="print status messages, or debug with -vv") |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1748 | parser.add_option('-q', '--quiet', default=0, action='count', |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1749 | help="report only file names, or nothing with -qq") |
2864
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1750 | parser.add_option('-r', '--repeat', default=True, action='store_true', |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1751 | help="(obsolete) show all occurrences of the same error") |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1752 | parser.add_option('--first', action='store_false', dest='repeat', |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1753 | help="show first occurrence of each error") |
842
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1754 | parser.add_option('--exclude', metavar='patterns', default=DEFAULT_EXCLUDE, |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1755 | help="exclude files or directories which match these " |
2864
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1756 | "comma separated patterns (default: %default)") |
842
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1757 | parser.add_option('--filename', metavar='patterns', default='*.py', |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1758 | help="when parsing directories, only check filenames " |
2864
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1759 | "matching these comma separated patterns " |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1760 | "(default: %default)") |
842
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1761 | parser.add_option('--select', metavar='errors', default='', |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1762 | help="select errors and warnings (e.g. E,W6)") |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1763 | parser.add_option('--ignore', metavar='errors', default='', |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1764 | help="skip errors and warnings (e.g. E4,W)") |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1765 | parser.add_option('--show-source', action='store_true', |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1766 | help="show source code for each error") |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1767 | parser.add_option('--show-pep8', action='store_true', |
2864
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1768 | help="show text of PEP 8 for each error " |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1769 | "(implies --first)") |
842
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1770 | parser.add_option('--statistics', action='store_true', |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1771 | help="count errors and warnings") |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1772 | parser.add_option('--count', action='store_true', |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1773 | help="print total number of errors and warnings " |
2864
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1774 | "to standard error and set exit code to 1 if " |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1775 | "total is not null") |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1776 | parser.add_option('--max-line-length', type='int', metavar='n', |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1777 | default=MAX_LINE_LENGTH, |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1778 | help="set maximum allowed line length " |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1779 | "(default: %default)") |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1780 | parser.add_option('--hang-closing', action='store_true', |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1781 | help="hang closing bracket instead of matching " |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1782 | "indentation of opening bracket's line") |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1783 | parser.add_option('--format', metavar='format', default='default', |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1784 | help="set the error format [default|pylint|<custom>]") |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1785 | parser.add_option('--diff', action='store_true', |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1786 | help="report only lines changed according to the " |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1787 | "unified diff received on STDIN") |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1788 | group = parser.add_option_group("Testing Options") |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1789 | if os.path.exists(TESTSUITE_PATH): |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1790 | group.add_option('--testsuite', metavar='dir', |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1791 | help="run regression tests from dir") |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1792 | group.add_option('--doctest', action='store_true', |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1793 | help="run doctest on myself") |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1794 | group.add_option('--benchmark', action='store_true', |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1795 | help="measure processing speed") |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1796 | return parser |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1797 | |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1798 | |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1799 | def read_config(options, args, arglist, parser): |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1800 | """Read both user configuration and local configuration.""" |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1801 | config = RawConfigParser() |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1802 | |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1803 | user_conf = options.config |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1804 | if user_conf and os.path.isfile(user_conf): |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1805 | if options.verbose: |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1806 | print('user configuration: %s' % user_conf) |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1807 | config.read(user_conf) |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1808 | |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1809 | parent = tail = args and os.path.abspath(os.path.commonprefix(args)) |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1810 | while tail: |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1811 | if config.read([os.path.join(parent, fn) for fn in PROJECT_CONFIG]): |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1812 | if options.verbose: |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1813 | print('local configuration: in %s' % parent) |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1814 | break |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1815 | parent, tail = os.path.split(parent) |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1816 | |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1817 | pep8_section = parser.prog |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1818 | if config.has_section(pep8_section): |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1819 | option_list = dict([(o.dest, o.type or o.action) |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1820 | for o in parser.option_list]) |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1821 | |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1822 | # First, read the default values |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1823 | new_options, _ = parser.parse_args([]) |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1824 | |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1825 | # Second, parse the configuration |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1826 | for opt in config.options(pep8_section): |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1827 | if options.verbose > 1: |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1828 | print(" %s = %s" % (opt, config.get(pep8_section, opt))) |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1829 | if opt.replace('_', '-') not in parser.config_options: |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1830 | print("Unknown option: '%s'\n not in [%s]" % |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1831 | (opt, ' '.join(parser.config_options))) |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1832 | sys.exit(1) |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1833 | normalized_opt = opt.replace('-', '_') |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1834 | opt_type = option_list[normalized_opt] |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1835 | if opt_type in ('int', 'count'): |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1836 | value = config.getint(pep8_section, opt) |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1837 | elif opt_type == 'string': |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1838 | value = config.get(pep8_section, opt) |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1839 | else: |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1840 | assert opt_type in ('store_true', 'store_false') |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1841 | value = config.getboolean(pep8_section, opt) |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1842 | setattr(new_options, normalized_opt, value) |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1843 | |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1844 | # Third, overwrite with the command-line options |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1845 | options, _ = parser.parse_args(arglist, values=new_options) |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1846 | options.doctest = options.testsuite = False |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1847 | return options |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1848 | |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1849 | |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1850 | def process_options(arglist=None, parse_argv=False, config_file=None, |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1851 | parser=None): |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1852 | """Process options passed either via arglist or via command line args.""" |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1853 | if not arglist and not parse_argv: |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1854 | # Don't read the command line if the module is used as a library. |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1855 | arglist = [] |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1856 | if not parser: |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1857 | parser = get_parser() |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1858 | if not parser.has_option('--config'): |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1859 | if config_file is True: |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1860 | config_file = DEFAULT_CONFIG |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1861 | group = parser.add_option_group("Configuration", description=( |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1862 | "The project options are read from the [%s] section of the " |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1863 | "tox.ini file or the setup.cfg file located in any parent folder " |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1864 | "of the path(s) being processed. Allowed options are: %s." % |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1865 | (parser.prog, ', '.join(parser.config_options)))) |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1866 | group.add_option('--config', metavar='path', default=config_file, |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1867 | help="user config file location (default: %default)") |
842
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1868 | options, args = parser.parse_args(arglist) |
2864
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1869 | options.reporter = None |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1870 | |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1871 | if options.ensure_value('testsuite', False): |
842
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1872 | args.append(options.testsuite) |
2864
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1873 | elif not options.ensure_value('doctest', False): |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1874 | if parse_argv and not args: |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1875 | if options.diff or any(os.path.exists(name) |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1876 | for name in PROJECT_CONFIG): |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1877 | args = ['.'] |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1878 | else: |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1879 | parser.error('input not specified') |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1880 | options = read_config(options, args, arglist, parser) |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1881 | options.reporter = parse_argv and options.quiet == 1 and FileReport |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1882 | |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1883 | options.filename = options.filename and options.filename.split(',') |
842
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1884 | options.exclude = options.exclude.split(',') |
2864
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1885 | options.select = options.select and options.select.split(',') |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1886 | options.ignore = options.ignore and options.ignore.split(',') |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1887 | |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1888 | if options.diff: |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1889 | options.reporter = DiffReport |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1890 | stdin = stdin_get_value() |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1891 | options.selected_lines = parse_udiff(stdin, options.filename, args[0]) |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1892 | args = sorted(options.selected_lines) |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1893 | |
842
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1894 | return options, args |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1895 | |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1896 | |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1897 | def _main(): |
2864
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1898 | """Parse options and run checks on Python source.""" |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1899 | pep8style = StyleGuide(parse_argv=True, config_file=True) |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1900 | options = pep8style.options |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1901 | if options.doctest or options.testsuite: |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1902 | from testsuite.support import run_tests |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1903 | report = run_tests(pep8style) |
842
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1904 | else: |
2864
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1905 | report = pep8style.check_files() |
842
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1906 | if options.statistics: |
2864
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1907 | report.print_statistics() |
842
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1908 | if options.benchmark: |
2864
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1909 | report.print_benchmark() |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1910 | if options.testsuite and not options.quiet: |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1911 | report.print_results() |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1912 | if report.total_errors: |
842
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1913 | if options.count: |
2864
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1914 | sys.stderr.write(str(report.total_errors) + '\n') |
842
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1915 | sys.exit(1) |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1916 | |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1917 | if __name__ == '__main__': |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1918 | _main() |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1919 | |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1920 | # |
984b5535cd26
Started to add the PEP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1921 | # eflag: FileType = Python2 |