Fri, 13 Apr 2018 22:32:32 +0200
Updated pycodestyle to 2.4.0
3616 | 1 | #!/usr/bin/env python |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
2 | # -*- coding: utf-8 -*- |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
3 | |
5146
f96c32abd120
Updated the pep8 checker to version 2.1.0dev0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4828
diff
changeset
|
4 | # pycodestyle.py - Check Python source code formatting, according to PEP 8 |
5288
ff831e3e383e
Update pycodestyle to official 2.1.0 version.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
5147
diff
changeset
|
5 | # |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
6 | # Copyright (C) 2006-2009 Johann C. Rocholl <johann@rocholl.net> |
3616 | 7 | # Copyright (C) 2009-2014 Florent Xicluna <florent.xicluna@gmail.com> |
4828 | 8 | # Copyright (C) 2014-2016 Ian Lee <ianlee1521@gmail.com> |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
9 | # |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
10 | # Permission is hereby granted, free of charge, to any person |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
11 | # obtaining a copy of this software and associated documentation files |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
12 | # (the "Software"), to deal in the Software without restriction, |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
13 | # including without limitation the rights to use, copy, modify, merge, |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
14 | # publish, distribute, sublicense, and/or sell copies of the Software, |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
15 | # and to permit persons to whom the Software is furnished to do so, |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
16 | # subject to the following conditions: |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
17 | # |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
18 | # The above copyright notice and this permission notice shall be |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
19 | # included in all copies or substantial portions of the Software. |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
20 | # |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
21 | # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
22 | # EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
23 | # MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
24 | # NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
25 | # BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
26 | # ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
27 | # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
28 | # SOFTWARE. |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
29 | |
3616 | 30 | r""" |
31 | Check Python source code formatting, according to PEP 8. | |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
32 | |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
33 | For usage and a list of options, try this: |
5146
f96c32abd120
Updated the pep8 checker to version 2.1.0dev0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4828
diff
changeset
|
34 | $ python pycodestyle.py -h |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
35 | |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
36 | This program and its regression test suite live here: |
5146
f96c32abd120
Updated the pep8 checker to version 2.1.0dev0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4828
diff
changeset
|
37 | https://github.com/pycqa/pycodestyle |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
38 | |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
39 | Groups of errors and warnings: |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
40 | E errors |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
41 | W warnings |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
42 | 100 indentation |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
43 | 200 whitespace |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
44 | 300 blank lines |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
45 | 400 imports |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
46 | 500 line length |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
47 | 600 deprecation |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
48 | 700 statements |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
49 | 900 syntax error |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
50 | """ |
3616 | 51 | from __future__ import with_statement |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
52 | |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
53 | # |
5147
d39dd5cee0c8
Renamed pep8.py to pycodestyle.py in order to track the upstream renaming.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5146
diff
changeset
|
54 | # This is a modified version to make the original pycodestyle.py better suitable |
3670
f0cb7579c0b4
Finished renaming eric5 for PyQt5 to eric6.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3629
diff
changeset
|
55 | # for being called from within the eric6 IDE. The modifications are as |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
56 | # follows: |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
57 | # |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
58 | # - made messages translatable via Qt |
3670
f0cb7579c0b4
Finished renaming eric5 for PyQt5 to eric6.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3629
diff
changeset
|
59 | # - added code for eric6 integration |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
60 | # |
6048
82ad8ec9548c
Updated copyright for 2018.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5509
diff
changeset
|
61 | # Copyright (c) 2011 - 2018 Detlev Offenbach <detlev@die-offenbachs.de> |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
62 | # |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
63 | |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
64 | import inspect |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
65 | import keyword |
5146
f96c32abd120
Updated the pep8 checker to version 2.1.0dev0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4828
diff
changeset
|
66 | import os |
f96c32abd120
Updated the pep8 checker to version 2.1.0dev0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4828
diff
changeset
|
67 | import re |
f96c32abd120
Updated the pep8 checker to version 2.1.0dev0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4828
diff
changeset
|
68 | import sys |
f96c32abd120
Updated the pep8 checker to version 2.1.0dev0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4828
diff
changeset
|
69 | import time |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
70 | import tokenize |
5288
ff831e3e383e
Update pycodestyle to official 2.1.0 version.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
5147
diff
changeset
|
71 | import warnings |
6246
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
72 | import bisect |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
73 | |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
74 | try: |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
75 | from functools import lru_cache |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
76 | except ImportError: |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
77 | def lru_cache(maxsize=128): # noqa as it's a fake implementation. |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
78 | """Does not really need a real a lru_cache, it's just optimization, so |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
79 | let's just do nothing here. Python 3.2+ will just get better |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
80 | performances, time to upgrade? |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
81 | """ |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
82 | return lambda function: function |
5288
ff831e3e383e
Update pycodestyle to official 2.1.0 version.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
5147
diff
changeset
|
83 | |
5146
f96c32abd120
Updated the pep8 checker to version 2.1.0dev0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4828
diff
changeset
|
84 | from fnmatch import fnmatch |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
85 | from optparse import OptionParser |
5288
ff831e3e383e
Update pycodestyle to official 2.1.0 version.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
5147
diff
changeset
|
86 | |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
87 | try: |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
88 | from configparser import RawConfigParser |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
89 | from io import TextIOWrapper |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
90 | except ImportError: |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
91 | from ConfigParser import RawConfigParser # __IGNORE_WARNING__ |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
92 | |
6246
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
93 | __version__ = '2.4.0-eric' |
4828 | 94 | |
95 | DEFAULT_EXCLUDE = '.svn,CVS,.bzr,.hg,.git,__pycache__,.tox' | |
6246
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
96 | DEFAULT_IGNORE = 'E121,E123,E126,E226,E24,E704,W503,W504' |
4828 | 97 | try: |
98 | if sys.platform == 'win32': | |
5146
f96c32abd120
Updated the pep8 checker to version 2.1.0dev0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4828
diff
changeset
|
99 | USER_CONFIG = os.path.expanduser(r'~\.pycodestyle') |
4828 | 100 | else: |
101 | USER_CONFIG = os.path.join( | |
102 | os.getenv('XDG_CONFIG_HOME') or os.path.expanduser('~/.config'), | |
5146
f96c32abd120
Updated the pep8 checker to version 2.1.0dev0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4828
diff
changeset
|
103 | 'pycodestyle' |
4828 | 104 | ) |
105 | except ImportError: | |
106 | USER_CONFIG = None | |
107 | ||
5146
f96c32abd120
Updated the pep8 checker to version 2.1.0dev0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4828
diff
changeset
|
108 | PROJECT_CONFIG = ('setup.cfg', 'tox.ini') |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
109 | TESTSUITE_PATH = os.path.join(os.path.dirname(__file__), 'testsuite') |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
110 | MAX_LINE_LENGTH = 79 |
6246
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
111 | # Number of blank lines between various code parts. |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
112 | BLANK_LINES_CONFIG = { |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
113 | # Top level class and function. |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
114 | 'top_level': 2, |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
115 | # Methods and nested class and function. |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
116 | 'method': 1, |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
117 | } |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
118 | REPORT_FORMAT = { |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
119 | 'default': '%(path)s:%(row)d:%(col)d: %(code)s %(text)s', |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
120 | 'pylint': '%(path)s:%(row)d: [%(code)s] %(text)s', |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
121 | } |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
122 | |
5146
f96c32abd120
Updated the pep8 checker to version 2.1.0dev0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4828
diff
changeset
|
123 | PyCF_ONLY_AST = 1024 |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
124 | SINGLETONS = frozenset(['False', 'None', 'True']) |
6246
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
125 | KEYWORDS = frozenset(keyword.kwlist + ['print', 'async']) - SINGLETONS |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
126 | UNARY_OPERATORS = frozenset(['>>', '**', '*', '+', '-']) |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
127 | ARITHMETIC_OP = frozenset(['**', '*', '/', '//', '+', '-']) |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
128 | WS_OPTIONAL_OPERATORS = ARITHMETIC_OP.union(['^', '&', '|', '<<', '>>', '%']) |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
129 | WS_NEEDED_OPERATORS = frozenset([ |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
130 | '**=', '*=', '/=', '//=', '+=', '-=', '!=', '<>', '<', '>', |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
131 | '%=', '^=', '&=', '|=', '==', '<=', '>=', '<<=', '>>=', '=']) |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
132 | WHITESPACE = frozenset(' \t') |
3616 | 133 | NEWLINE = frozenset([tokenize.NL, tokenize.NEWLINE]) |
134 | SKIP_TOKENS = NEWLINE.union([tokenize.INDENT, tokenize.DEDENT]) | |
135 | # ERRORTOKEN is triggered by backticks in Python 3 | |
136 | SKIP_COMMENTS = SKIP_TOKENS.union([tokenize.COMMENT, tokenize.ERRORTOKEN]) | |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
137 | BENCHMARK_KEYS = ['directories', 'files', 'logical lines', 'physical lines'] |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
138 | |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
139 | INDENT_REGEX = re.compile(r'([ \t]*)') |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
140 | RAISE_COMMA_REGEX = re.compile(r'raise\s+\w+\s*,') |
3616 | 141 | RERAISE_COMMA_REGEX = re.compile(r'raise\s+\w+\s*,.*,\s*\w+\s*$') |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
142 | ERRORCODE_REGEX = re.compile(r'\b[A-Z]\d{3}\b') |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
143 | DOCSTRING_REGEX = re.compile(r'u?r?["\']') |
6246
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
144 | EXTRANEOUS_WHITESPACE_REGEX = re.compile(r'[\[({] | [\]}),;:]') |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
145 | WHITESPACE_AFTER_COMMA_REGEX = re.compile(r'[,;:]\s*(?: |\t)') |
4828 | 146 | COMPARE_SINGLETON_REGEX = re.compile(r'(\bNone|\bFalse|\bTrue)?\s*([=!]=)' |
147 | r'\s*(?(1)|(None|False|True))\b') | |
148 | COMPARE_NEGATIVE_REGEX = re.compile(r'\b(not)\s+[^][)(}{ ]+\s+(in|is)\s') | |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
149 | COMPARE_TYPE_REGEX = re.compile(r'(?:[=!]=|is(?:\s+not)?)\s*type(?:s.\w+Type' |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
150 | r'|\s*\(\s*([^)]*[^ )])\s*\))') |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
151 | KEYWORD_REGEX = re.compile(r'(\s*)\b(?:%s)\b(\s*)' % r'|'.join(KEYWORDS)) |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
152 | OPERATOR_REGEX = re.compile(r'(?:[^,\s])(\s*)(?:[-+*/|!<=>%&^]+)(\s*)') |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
153 | LAMBDA_REGEX = re.compile(r'\blambda\b') |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
154 | HUNK_REGEX = re.compile(r'^@@ -\d+(?:,\d+)? \+(\d+)(?:,(\d+))? @@.*$') |
6246
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
155 | STARTSWITH_DEF_REGEX = re.compile(r'^(async\s+def|def)\b') |
5509
d4c4763b46ee
Upgraded pycodestyle to version 2.3.1
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
5435
diff
changeset
|
156 | STARTSWITH_TOP_LEVEL_REGEX = re.compile(r'^(async\s+def\s+|def\s+|class\s+|@)') |
d4c4763b46ee
Upgraded pycodestyle to version 2.3.1
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
5435
diff
changeset
|
157 | STARTSWITH_INDENT_STATEMENT_REGEX = re.compile( |
6246
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
158 | r'^\s*({0})\b'.format('|'.join(s.replace(' ', r'\s+') for s in ( |
5509
d4c4763b46ee
Upgraded pycodestyle to version 2.3.1
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
5435
diff
changeset
|
159 | 'def', 'async def', |
d4c4763b46ee
Upgraded pycodestyle to version 2.3.1
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
5435
diff
changeset
|
160 | 'for', 'async for', |
d4c4763b46ee
Upgraded pycodestyle to version 2.3.1
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
5435
diff
changeset
|
161 | 'if', 'elif', 'else', |
d4c4763b46ee
Upgraded pycodestyle to version 2.3.1
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
5435
diff
changeset
|
162 | 'try', 'except', 'finally', |
d4c4763b46ee
Upgraded pycodestyle to version 2.3.1
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
5435
diff
changeset
|
163 | 'with', 'async with', |
d4c4763b46ee
Upgraded pycodestyle to version 2.3.1
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
5435
diff
changeset
|
164 | 'class', |
d4c4763b46ee
Upgraded pycodestyle to version 2.3.1
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
5435
diff
changeset
|
165 | 'while', |
d4c4763b46ee
Upgraded pycodestyle to version 2.3.1
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
5435
diff
changeset
|
166 | ))) |
d4c4763b46ee
Upgraded pycodestyle to version 2.3.1
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
5435
diff
changeset
|
167 | ) |
d4c4763b46ee
Upgraded pycodestyle to version 2.3.1
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
5435
diff
changeset
|
168 | DUNDER_REGEX = re.compile(r'^__([^\s]+)__ = ') |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
169 | |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
170 | # Work around Python < 2.6 behaviour, which does not generate NL after |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
171 | # a comment which is on a line by itself. |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
172 | COMMENT_WITH_NL = tokenize.generate_tokens(['#\n'].pop).send(None)[1] == '#\n' |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
173 | |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
174 | |
6246
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
175 | _checks = {'physical_line': {}, 'logical_line': {}, 'tree': {}} |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
176 | |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
177 | |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
178 | def _get_parameters(function): |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
179 | if sys.version_info >= (3, 3): |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
180 | return [parameter.name |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
181 | for parameter |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
182 | in inspect.signature(function).parameters.values() |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
183 | if parameter.kind == parameter.POSITIONAL_OR_KEYWORD] |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
184 | else: |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
185 | return inspect.getargspec(function)[0] |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
186 | |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
187 | def register_check(check, codes=None): |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
188 | """Register a new check object.""" |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
189 | def _add_check(check, kind, codes, args): |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
190 | if check in _checks[kind]: |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
191 | _checks[kind][check][0].extend(codes or []) |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
192 | else: |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
193 | _checks[kind][check] = (codes or [''], args) |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
194 | if inspect.isfunction(check): |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
195 | args = _get_parameters(check) |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
196 | if args and args[0] in ('physical_line', 'logical_line'): |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
197 | if codes is None: |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
198 | codes = ERRORCODE_REGEX.findall(check.__doc__ or '') |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
199 | _add_check(check, args[0], codes, args) |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
200 | elif inspect.isclass(check): |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
201 | if _get_parameters(check.__init__)[:2] == ['self', 'tree']: |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
202 | _add_check(check, 'tree', codes, None) |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
203 | return check |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
204 | |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
205 | |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
206 | ############################################################################## |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
207 | # Plugins (check functions) for physical lines |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
208 | ############################################################################## |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
209 | |
6246
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
210 | @register_check |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
211 | def tabs_or_spaces(physical_line, indent_char): |
3616 | 212 | r"""Never mix tabs and spaces. |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
213 | |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
214 | The most popular way of indenting Python is with spaces only. The |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
215 | second-most popular way is with tabs only. Code indented with a mixture |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
216 | of tabs and spaces should be converted to using spaces exclusively. When |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
217 | invoking the Python command line interpreter with the -t option, it issues |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
218 | warnings about code that illegally mixes tabs and spaces. When using -tt |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
219 | these warnings become errors. These options are highly recommended! |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
220 | |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
221 | Okay: if a == 0:\n a = 1\n b = 1 |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
222 | E101: if a == 0:\n a = 1\n\tb = 1 |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
223 | """ |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
224 | indent = INDENT_REGEX.match(physical_line).group(1) |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
225 | for offset, char in enumerate(indent): |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
226 | if char != indent_char: |
3616 | 227 | return offset, "E101 indentation contains mixed spaces and tabs" |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
228 | |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
229 | |
6246
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
230 | @register_check |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
231 | def tabs_obsolete(physical_line): |
3616 | 232 | r"""For new projects, spaces-only are strongly recommended over tabs. |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
233 | |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
234 | Okay: if True:\n return |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
235 | W191: if True:\n\treturn |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
236 | """ |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
237 | indent = INDENT_REGEX.match(physical_line).group(1) |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
238 | if '\t' in indent: |
3616 | 239 | return indent.index('\t'), "W191 indentation contains tabs" |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
240 | |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
241 | |
6246
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
242 | @register_check |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
243 | def trailing_whitespace(physical_line): |
3616 | 244 | r"""Trailing whitespace is superfluous. |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
245 | |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
246 | The warning returned varies on whether the line itself is blank, for easier |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
247 | filtering for those who want to indent their blank lines. |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
248 | |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
249 | Okay: spam(1)\n# |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
250 | W291: spam(1) \n# |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
251 | W293: class Foo(object):\n \n bang = 12 |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
252 | """ |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
253 | physical_line = physical_line.rstrip('\n') # chr(10), newline |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
254 | physical_line = physical_line.rstrip('\r') # chr(13), carriage return |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
255 | physical_line = physical_line.rstrip('\x0c') # chr(12), form feed, ^L |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
256 | stripped = physical_line.rstrip(' \t\v') |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
257 | if physical_line != stripped: |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
258 | if stripped: |
3616 | 259 | return len(stripped), "W291 trailing whitespace" |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
260 | else: |
3616 | 261 | return 0, "W293 blank line contains whitespace" |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
262 | |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
263 | |
6246
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
264 | @register_check |
3616 | 265 | def trailing_blank_lines(physical_line, lines, line_number, total_lines): |
266 | r"""Trailing blank lines are superfluous. | |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
267 | |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
268 | Okay: spam(1) |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
269 | W391: spam(1)\n |
3616 | 270 | |
271 | However the last line should end with a new line (warning W292). | |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
272 | """ |
3616 | 273 | if line_number == total_lines: |
274 | stripped_last_line = physical_line.rstrip() | |
275 | if not stripped_last_line: | |
276 | return 0, "W391 blank line at end of file" | |
277 | if stripped_last_line == physical_line: | |
278 | return len(physical_line), "W292 no newline at end of file" | |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
279 | |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
280 | |
6246
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
281 | @register_check |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
282 | def maximum_line_length(physical_line, max_line_length, multiline, |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
283 | line_number, noqa): |
3616 | 284 | r"""Limit all lines to a maximum of 79 characters. |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
285 | |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
286 | There are still many devices around that are limited to 80 character |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
287 | lines; plus, limiting windows to 80 characters makes it possible to have |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
288 | several windows side-by-side. The default wrapping on such devices looks |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
289 | ugly. Therefore, please limit all lines to a maximum of 79 characters. |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
290 | For flowing long blocks of text (docstrings or comments), limiting the |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
291 | length to 72 characters is recommended. |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
292 | |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
293 | Reports error E501. |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
294 | """ |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
295 | line = physical_line.rstrip() |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
296 | length = len(line) |
5146
f96c32abd120
Updated the pep8 checker to version 2.1.0dev0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4828
diff
changeset
|
297 | if length > max_line_length and not noqa: |
6246
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
298 | # Special case: ignore long shebang lines. |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
299 | if line_number == 1 and line.startswith('#!'): |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
300 | return |
3616 | 301 | # Special case for long URLs in multi-line docstrings or comments, |
302 | # but still report the error when the 72 first chars are whitespaces. | |
303 | chunks = line.split() | |
304 | if ((len(chunks) == 1 and multiline) or | |
305 | (len(chunks) == 2 and chunks[0] == '#')) and \ | |
306 | len(line) - len(chunks[-1]) < max_line_length - 7: | |
307 | return | |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
308 | if hasattr(line, 'decode'): # Python 2 |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
309 | # The line could contain multi-byte characters |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
310 | try: |
1145
2a16484e65c2
Fix for the PEP-8 checker to handle unicode better.
detlev@die-offenbachs.de
parents:
945
diff
changeset
|
311 | length = len(line.decode('utf-8')) |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
312 | except UnicodeError: |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
313 | pass |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
314 | if length > max_line_length: |
4828 | 315 | return (max_line_length, "E501 line too long " |
316 | "(%d > %d characters)" % (length, max_line_length), | |
317 | length, max_line_length) | |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
318 | |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
319 | |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
320 | ############################################################################## |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
321 | # Plugins (check functions) for logical lines |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
322 | ############################################################################## |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
323 | |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
324 | |
6246
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
325 | @register_check |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
326 | def blank_lines(logical_line, blank_lines, indent_level, line_number, |
5146
f96c32abd120
Updated the pep8 checker to version 2.1.0dev0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4828
diff
changeset
|
327 | blank_before, previous_logical, |
f96c32abd120
Updated the pep8 checker to version 2.1.0dev0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4828
diff
changeset
|
328 | previous_unindented_logical_line, previous_indent_level, |
f96c32abd120
Updated the pep8 checker to version 2.1.0dev0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4828
diff
changeset
|
329 | lines): |
3616 | 330 | r"""Separate top-level function and class definitions with two blank lines. |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
331 | |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
332 | Method definitions inside a class are separated by a single blank line. |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
333 | |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
334 | Extra blank lines may be used (sparingly) to separate groups of related |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
335 | functions. Blank lines may be omitted between a bunch of related |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
336 | one-liners (e.g. a set of dummy implementations). |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
337 | |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
338 | Use blank lines in functions, sparingly, to indicate logical sections. |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
339 | |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
340 | Okay: def a():\n pass\n\n\ndef b():\n pass |
5146
f96c32abd120
Updated the pep8 checker to version 2.1.0dev0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4828
diff
changeset
|
341 | Okay: def a():\n pass\n\n\nasync def b():\n pass |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
342 | Okay: def a():\n pass\n\n\n# Foo\n# Bar\n\ndef b():\n pass |
5303
83ab5275f255
Take over pull request #593 to ignore variables starting with "def" or "class" on code E305.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
5290
diff
changeset
|
343 | Okay: default = 1\nfoo = 1 |
83ab5275f255
Take over pull request #593 to ignore variables starting with "def" or "class" on code E305.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
5290
diff
changeset
|
344 | Okay: classify = 1\nfoo = 1 |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
345 | |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
346 | E301: class Foo:\n b = 0\n def bar():\n pass |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
347 | E302: def a():\n pass\n\ndef b(n):\n pass |
5146
f96c32abd120
Updated the pep8 checker to version 2.1.0dev0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4828
diff
changeset
|
348 | E302: def a():\n pass\n\nasync def b(n):\n pass |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
349 | E303: def a():\n pass\n\n\n\ndef b(n):\n pass |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
350 | E303: def a():\n\n\n\n pass |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
351 | E304: @decorator\n\ndef a():\n pass |
5146
f96c32abd120
Updated the pep8 checker to version 2.1.0dev0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4828
diff
changeset
|
352 | E305: def a():\n pass\na() |
5509
d4c4763b46ee
Upgraded pycodestyle to version 2.3.1
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
5435
diff
changeset
|
353 | E306: def a():\n def b():\n pass\n def c():\n pass |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
354 | """ |
6246
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
355 | top_level_lines = BLANK_LINES_CONFIG['top_level'] |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
356 | method_lines = BLANK_LINES_CONFIG['method'] |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
357 | |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
358 | if line_number < top_level_lines + 1 and not previous_logical: |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
359 | return # Don't expect blank lines before the first line |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
360 | if previous_logical.startswith('@'): |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
361 | if blank_lines: |
3616 | 362 | yield 0, "E304 blank lines found after function decorator" |
6246
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
363 | elif (blank_lines > top_level_lines or |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
364 | (indent_level and blank_lines == method_lines + 1) |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
365 | ): |
3616 | 366 | yield 0, "E303 too many blank lines (%d)", blank_lines |
5509
d4c4763b46ee
Upgraded pycodestyle to version 2.3.1
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
5435
diff
changeset
|
367 | elif STARTSWITH_TOP_LEVEL_REGEX.match(logical_line): |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
368 | if indent_level: |
6246
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
369 | if not (blank_before == method_lines or |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
370 | previous_indent_level < indent_level or |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
371 | DOCSTRING_REGEX.match(previous_logical) |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
372 | ): |
5146
f96c32abd120
Updated the pep8 checker to version 2.1.0dev0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4828
diff
changeset
|
373 | ancestor_level = indent_level |
f96c32abd120
Updated the pep8 checker to version 2.1.0dev0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4828
diff
changeset
|
374 | nested = False |
f96c32abd120
Updated the pep8 checker to version 2.1.0dev0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4828
diff
changeset
|
375 | # Search backwards for a def ancestor or tree root (top level). |
6246
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
376 | for line in lines[line_number - top_level_lines::-1]: |
5146
f96c32abd120
Updated the pep8 checker to version 2.1.0dev0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4828
diff
changeset
|
377 | if line.strip() and expand_indent(line) < ancestor_level: |
f96c32abd120
Updated the pep8 checker to version 2.1.0dev0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4828
diff
changeset
|
378 | ancestor_level = expand_indent(line) |
f96c32abd120
Updated the pep8 checker to version 2.1.0dev0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4828
diff
changeset
|
379 | nested = line.lstrip().startswith('def ') |
f96c32abd120
Updated the pep8 checker to version 2.1.0dev0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4828
diff
changeset
|
380 | if nested or ancestor_level == 0: |
f96c32abd120
Updated the pep8 checker to version 2.1.0dev0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4828
diff
changeset
|
381 | break |
f96c32abd120
Updated the pep8 checker to version 2.1.0dev0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4828
diff
changeset
|
382 | if nested: |
6246
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
383 | yield 0, "E306 expected %s blank line before a " \ |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
384 | "nested definition, found 0", method_lines |
5146
f96c32abd120
Updated the pep8 checker to version 2.1.0dev0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4828
diff
changeset
|
385 | else: |
6246
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
386 | yield (0, "E301 expected %s blank line, found 0", |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
387 | method_lines) |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
388 | elif blank_before != top_level_lines: |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
389 | yield (0, "E302 expected %s blank lines, found %d", |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
390 | top_level_lines, blank_before) |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
391 | elif (logical_line and |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
392 | not indent_level and |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
393 | blank_before != top_level_lines and |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
394 | previous_unindented_logical_line.startswith(('def ', 'class ')) |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
395 | ): |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
396 | yield (0, "E305 expected %s blank lines after " \ |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
397 | "class or function definition, found %d", |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
398 | top_level_lines, blank_before) |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
399 | |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
400 | |
6246
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
401 | @register_check |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
402 | def extraneous_whitespace(logical_line): |
3616 | 403 | r"""Avoid extraneous whitespace. |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
404 | |
3616 | 405 | Avoid extraneous whitespace in these situations: |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
406 | - Immediately inside parentheses, brackets or braces. |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
407 | - Immediately before a comma, semicolon, or colon. |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
408 | |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
409 | Okay: spam(ham[1], {eggs: 2}) |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
410 | E201: spam( ham[1], {eggs: 2}) |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
411 | E201: spam(ham[ 1], {eggs: 2}) |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
412 | E201: spam(ham[1], { eggs: 2}) |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
413 | E202: spam(ham[1], {eggs: 2} ) |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
414 | E202: spam(ham[1 ], {eggs: 2}) |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
415 | E202: spam(ham[1], {eggs: 2 }) |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
416 | |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
417 | E203: if x == 4: print x, y; x, y = y , x |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
418 | E203: if x == 4: print x, y ; x, y = y, x |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
419 | E203: if x == 4 : print x, y; x, y = y, x |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
420 | """ |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
421 | line = logical_line |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
422 | for match in EXTRANEOUS_WHITESPACE_REGEX.finditer(line): |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
423 | text = match.group() |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
424 | char = text.strip() |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
425 | found = match.start() |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
426 | if text == char + ' ': |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
427 | # assert char in '([{' |
3616 | 428 | yield found + 1, "E201 whitespace after '%s'", char |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
429 | elif line[found - 1] != ',': |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
430 | code = ('E202' if char in '}])' else 'E203') # if char in ',;:' |
3616 | 431 | yield found, "%s whitespace before '%s'" % (code, char), char |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
432 | |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
433 | |
6246
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
434 | @register_check |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
435 | def whitespace_around_keywords(logical_line): |
3616 | 436 | r"""Avoid extraneous whitespace around keywords. |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
437 | |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
438 | Okay: True and False |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
439 | E271: True and False |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
440 | E272: True and False |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
441 | E273: True and\tFalse |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
442 | E274: True\tand False |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
443 | """ |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
444 | for match in KEYWORD_REGEX.finditer(logical_line): |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
445 | before, after = match.groups() |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
446 | |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
447 | if '\t' in before: |
3616 | 448 | yield match.start(1), "E274 tab before keyword" |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
449 | elif len(before) > 1: |
3616 | 450 | yield match.start(1), "E272 multiple spaces before keyword" |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
451 | |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
452 | if '\t' in after: |
3616 | 453 | yield match.start(2), "E273 tab after keyword" |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
454 | elif len(after) > 1: |
3616 | 455 | yield match.start(2), "E271 multiple spaces after keyword" |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
456 | |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
457 | |
6246
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
458 | @register_check |
5146
f96c32abd120
Updated the pep8 checker to version 2.1.0dev0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4828
diff
changeset
|
459 | def missing_whitespace_after_import_keyword(logical_line): |
f96c32abd120
Updated the pep8 checker to version 2.1.0dev0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4828
diff
changeset
|
460 | r"""Multiple imports in form from x import (a, b, c) should have space |
f96c32abd120
Updated the pep8 checker to version 2.1.0dev0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4828
diff
changeset
|
461 | between import statement and parenthesised name list. |
f96c32abd120
Updated the pep8 checker to version 2.1.0dev0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4828
diff
changeset
|
462 | |
f96c32abd120
Updated the pep8 checker to version 2.1.0dev0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4828
diff
changeset
|
463 | Okay: from foo import (bar, baz) |
f96c32abd120
Updated the pep8 checker to version 2.1.0dev0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4828
diff
changeset
|
464 | E275: from foo import(bar, baz) |
f96c32abd120
Updated the pep8 checker to version 2.1.0dev0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4828
diff
changeset
|
465 | E275: from importable.module import(bar, baz) |
f96c32abd120
Updated the pep8 checker to version 2.1.0dev0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4828
diff
changeset
|
466 | """ |
f96c32abd120
Updated the pep8 checker to version 2.1.0dev0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4828
diff
changeset
|
467 | line = logical_line |
f96c32abd120
Updated the pep8 checker to version 2.1.0dev0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4828
diff
changeset
|
468 | indicator = ' import(' |
f96c32abd120
Updated the pep8 checker to version 2.1.0dev0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4828
diff
changeset
|
469 | if line.startswith('from '): |
f96c32abd120
Updated the pep8 checker to version 2.1.0dev0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4828
diff
changeset
|
470 | found = line.find(indicator) |
f96c32abd120
Updated the pep8 checker to version 2.1.0dev0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4828
diff
changeset
|
471 | if -1 < found: |
f96c32abd120
Updated the pep8 checker to version 2.1.0dev0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4828
diff
changeset
|
472 | pos = found + len(indicator) - 1 |
f96c32abd120
Updated the pep8 checker to version 2.1.0dev0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4828
diff
changeset
|
473 | yield pos, "E275 missing whitespace after keyword" |
f96c32abd120
Updated the pep8 checker to version 2.1.0dev0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4828
diff
changeset
|
474 | |
f96c32abd120
Updated the pep8 checker to version 2.1.0dev0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4828
diff
changeset
|
475 | |
6246
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
476 | @register_check |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
477 | def missing_whitespace(logical_line): |
3616 | 478 | r"""Each comma, semicolon or colon should be followed by whitespace. |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
479 | |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
480 | Okay: [a, b] |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
481 | Okay: (3,) |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
482 | Okay: a[1:4] |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
483 | Okay: a[:4] |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
484 | Okay: a[1:] |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
485 | Okay: a[1:4:2] |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
486 | E231: ['a','b'] |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
487 | E231: foo(bar,baz) |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
488 | E231: [{'a':'b'}] |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
489 | """ |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
490 | line = logical_line |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
491 | for index in range(len(line) - 1): |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
492 | char = line[index] |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
493 | if char in ',;:' and line[index + 1] not in WHITESPACE: |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
494 | before = line[:index] |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
495 | if char == ':' and before.count('[') > before.count(']') and \ |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
496 | before.rfind('{') < before.rfind('['): |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
497 | continue # Slice syntax, no space required |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
498 | if char == ',' and line[index + 1] == ')': |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
499 | continue # Allow tuple with only one element: (3,) |
3616 | 500 | yield index, "E231 missing whitespace after '%s'", char |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
501 | |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
502 | |
6246
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
503 | @register_check |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
504 | def indentation(logical_line, previous_logical, indent_char, |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
505 | indent_level, previous_indent_level): |
3616 | 506 | r"""Use 4 spaces per indentation level. |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
507 | |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
508 | For really old code that you don't want to mess up, you can continue to |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
509 | use 8-space tabs. |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
510 | |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
511 | Okay: a = 1 |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
512 | Okay: if a == 0:\n a = 1 |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
513 | E111: a = 1 |
4828 | 514 | E114: # a = 1 |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
515 | |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
516 | Okay: for item in items:\n pass |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
517 | E112: for item in items:\npass |
4828 | 518 | E115: for item in items:\n# Hi\n pass |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
519 | |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
520 | Okay: a = 1\nb = 2 |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
521 | E113: a = 1\n b = 2 |
4828 | 522 | E116: a = 1\n # b = 2 |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
523 | """ |
4828 | 524 | c = 0 if logical_line else 3 |
525 | tmpl = "E11%d %s" if logical_line else "E11%d %s (comment)" | |
526 | if indent_level % 4: | |
527 | yield 0, tmpl % (1 + c, "indentation is not a multiple of four") | |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
528 | indent_expect = previous_logical.endswith(':') |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
529 | if indent_expect and indent_level <= previous_indent_level: |
4828 | 530 | yield 0, tmpl % (2 + c, "expected an indented block") |
531 | elif not indent_expect and indent_level > previous_indent_level: | |
532 | yield 0, tmpl % (3 + c, "unexpected indentation") | |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
533 | |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
534 | |
6246
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
535 | @register_check |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
536 | def continued_indentation(logical_line, tokens, indent_level, hang_closing, |
3616 | 537 | indent_char, noqa, verbose): |
538 | r"""Continuation lines indentation. | |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
539 | |
3616 | 540 | Continuation lines should align wrapped elements either vertically |
541 | using Python's implicit line joining inside parentheses, brackets | |
542 | and braces, or using a hanging indent. | |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
543 | |
3616 | 544 | When using a hanging indent these considerations should be applied: |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
545 | - there should be no arguments on the first line, and |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
546 | - further indentation should be used to clearly distinguish itself as a |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
547 | continuation line. |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
548 | |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
549 | Okay: a = (\n) |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
550 | E123: a = (\n ) |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
551 | |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
552 | Okay: a = (\n 42) |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
553 | E121: a = (\n 42) |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
554 | E122: a = (\n42) |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
555 | E123: a = (\n 42\n ) |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
556 | E124: a = (24,\n 42\n) |
3616 | 557 | E125: if (\n b):\n pass |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
558 | E126: a = (\n 42) |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
559 | E127: a = (24,\n 42) |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
560 | E128: a = (24,\n 42) |
3616 | 561 | E129: if (a or\n b):\n pass |
562 | E131: a = (\n 42\n 24) | |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
563 | """ |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
564 | first_row = tokens[0][2][0] |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
565 | nrows = 1 + tokens[-1][2][0] - first_row |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
566 | if noqa or nrows == 1: |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
567 | return |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
568 | |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
569 | # indent_next tells us whether the next block is indented; assuming |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
570 | # that it is indented by 4 spaces, then we should not allow 4-space |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
571 | # indents on the final continuation line; in turn, some other |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
572 | # indents are allowed to have an extra 4 spaces. |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
573 | indent_next = logical_line.endswith(':') |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
574 | |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
575 | row = depth = 0 |
3616 | 576 | valid_hangs = (4,) if indent_char != '\t' else (4, 8) |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
577 | # remember how many brackets were opened on each line |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
578 | parens = [0] * nrows |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
579 | # relative indents of physical lines |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
580 | rel_indent = [0] * nrows |
3616 | 581 | # for each depth, collect a list of opening rows |
582 | open_rows = [[0]] | |
583 | # for each depth, memorize the hanging indentation | |
584 | hangs = [None] | |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
585 | # visual indents |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
586 | indent_chances = {} |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
587 | last_indent = tokens[0][2] |
3616 | 588 | visual_indent = None |
4828 | 589 | last_token_multiline = False |
3616 | 590 | # for each depth, memorize the visual indent column |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
591 | indent = [last_indent[1]] |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
592 | if verbose >= 3: |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
593 | print(">>> " + tokens[0][4].rstrip()) |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
594 | |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
595 | for token_type, text, start, end, line in tokens: |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
596 | |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
597 | newline = row < start[0] - first_row |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
598 | if newline: |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
599 | row = start[0] - first_row |
3616 | 600 | newline = not last_token_multiline and token_type not in NEWLINE |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
601 | |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
602 | if newline: |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
603 | # this is the beginning of a continuation line. |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
604 | last_indent = start |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
605 | if verbose >= 3: |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
606 | print("... " + line.rstrip()) |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
607 | |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
608 | # record the initial indent. |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
609 | rel_indent[row] = expand_indent(line) - indent_level |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
610 | |
3616 | 611 | # identify closing bracket |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
612 | close_bracket = (token_type == tokenize.OP and text in ']})') |
3616 | 613 | |
614 | # is the indent relative to an opening bracket line? | |
615 | for open_row in reversed(open_rows[depth]): | |
616 | hang = rel_indent[row] - rel_indent[open_row] | |
617 | hanging_indent = hang in valid_hangs | |
618 | if hanging_indent: | |
619 | break | |
620 | if hangs[depth]: | |
621 | hanging_indent = (hang == hangs[depth]) | |
622 | # is there any chance of visual indent? | |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
623 | visual_indent = (not close_bracket and hang > 0 and |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
624 | indent_chances.get(start[1])) |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
625 | |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
626 | if close_bracket and indent[depth]: |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
627 | # closing bracket for visual indent |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
628 | if start[1] != indent[depth]: |
3616 | 629 | yield (start, "E124 closing bracket does not match " |
630 | "visual indentation") | |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
631 | elif close_bracket and not hang: |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
632 | # closing bracket matches indentation of opening bracket's line |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
633 | if hang_closing: |
3616 | 634 | yield start, "E133 closing bracket is missing indentation" |
635 | elif indent[depth] and start[1] < indent[depth]: | |
636 | if visual_indent is not True: | |
637 | # visual indent is broken | |
638 | yield (start, "E128 continuation line " | |
639 | "under-indented for visual indent") | |
640 | elif hanging_indent or (indent_next and rel_indent[row] == 8): | |
641 | # hanging indent is verified | |
642 | if close_bracket and not hang_closing: | |
643 | yield (start, "E123 closing bracket does not match " | |
644 | "indentation of opening bracket's line") | |
645 | hangs[depth] = hang | |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
646 | elif visual_indent is True: |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
647 | # visual indent is verified |
3616 | 648 | indent[depth] = start[1] |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
649 | elif visual_indent in (text, str): |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
650 | # ignore token lined up with matching one from a previous line |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
651 | pass |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
652 | else: |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
653 | # indent is broken |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
654 | if hang <= 0: |
3616 | 655 | error = "E122", "missing indentation or outdented" |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
656 | elif indent[depth]: |
3616 | 657 | error = "E127", "over-indented for visual indent" |
658 | elif not close_bracket and hangs[depth]: | |
659 | error = "E131", "unaligned for hanging indent" | |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
660 | else: |
3616 | 661 | hangs[depth] = hang |
662 | if hang > 4: | |
663 | error = "E126", "over-indented for hanging indent" | |
664 | else: | |
665 | error = "E121", "under-indented for hanging indent" | |
666 | yield start, "%s continuation line %s" % error | |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
667 | |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
668 | # look for visual indenting |
4828 | 669 | if (parens[row] and |
670 | token_type not in (tokenize.NL, tokenize.COMMENT) and | |
671 | not indent[depth]): | |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
672 | indent[depth] = start[1] |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
673 | indent_chances[start[1]] = True |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
674 | if verbose >= 4: |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
675 | print("bracket depth %s indent to %s" % (depth, start[1])) |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
676 | # deal with implicit string concatenation |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
677 | elif (token_type in (tokenize.STRING, tokenize.COMMENT) or |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
678 | text in ('u', 'ur', 'b', 'br')): |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
679 | indent_chances[start[1]] = str |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
680 | # special case for the "if" statement because len("if (") == 4 |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
681 | elif not indent_chances and not row and not depth and text == 'if': |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
682 | indent_chances[end[1] + 1] = True |
3616 | 683 | elif text == ':' and line[end[1]:].isspace(): |
684 | open_rows[depth].append(row) | |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
685 | |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
686 | # keep track of bracket depth |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
687 | if token_type == tokenize.OP: |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
688 | if text in '([{': |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
689 | depth += 1 |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
690 | indent.append(0) |
3616 | 691 | hangs.append(None) |
692 | if len(open_rows) == depth: | |
693 | open_rows.append([]) | |
694 | open_rows[depth].append(row) | |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
695 | parens[row] += 1 |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
696 | if verbose >= 4: |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
697 | print("bracket depth %s seen, col %s, visual min = %s" % |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
698 | (depth, start[1], indent[depth])) |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
699 | elif text in ')]}' and depth > 0: |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
700 | # parent indents should not be more than this one |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
701 | prev_indent = indent.pop() or last_indent[1] |
3616 | 702 | hangs.pop() |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
703 | for d in range(depth): |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
704 | if indent[d] > prev_indent: |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
705 | indent[d] = 0 |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
706 | for ind in list(indent_chances): |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
707 | if ind >= prev_indent: |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
708 | del indent_chances[ind] |
3616 | 709 | del open_rows[depth + 1:] |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
710 | depth -= 1 |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
711 | if depth: |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
712 | indent_chances[indent[depth]] = True |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
713 | for idx in range(row, -1, -1): |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
714 | if parens[idx]: |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
715 | parens[idx] -= 1 |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
716 | break |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
717 | assert len(indent) == depth + 1 |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
718 | if start[1] not in indent_chances: |
5146
f96c32abd120
Updated the pep8 checker to version 2.1.0dev0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4828
diff
changeset
|
719 | # allow lining up tokens |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
720 | indent_chances[start[1]] = text |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
721 | |
4828 | 722 | last_token_multiline = (start[0] != end[0]) |
3616 | 723 | if last_token_multiline: |
724 | rel_indent[end[0] - first_row] = rel_indent[row] | |
725 | ||
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
726 | if indent_next and expand_indent(line) == indent_level + 4: |
3616 | 727 | pos = (start[0], indent[0] + 4) |
728 | if visual_indent: | |
729 | code = "E129 visually indented line" | |
730 | else: | |
731 | code = "E125 continuation line" | |
732 | yield pos, "%s with same indent as next logical line" % code | |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
733 | |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
734 | |
6246
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
735 | @register_check |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
736 | def whitespace_before_parameters(logical_line, tokens): |
3616 | 737 | r"""Avoid extraneous whitespace. |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
738 | |
3616 | 739 | Avoid extraneous whitespace in the following situations: |
740 | - before the open parenthesis that starts the argument list of a | |
741 | function call. | |
742 | - before the open parenthesis that starts an indexing or slicing. | |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
743 | |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
744 | Okay: spam(1) |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
745 | E211: spam (1) |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
746 | |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
747 | Okay: dict['key'] = list[index] |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
748 | E211: dict ['key'] = list[index] |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
749 | E211: dict['key'] = list [index] |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
750 | """ |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
751 | prev_type, prev_text, __, prev_end, __ = tokens[0] |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
752 | for index in range(1, len(tokens)): |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
753 | token_type, text, start, end, __ = tokens[index] |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
754 | if (token_type == tokenize.OP and |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
755 | text in '([' and |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
756 | start != prev_end and |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
757 | (prev_type == tokenize.NAME or prev_text in '}])') and |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
758 | # Syntax "class A (B):" is allowed, but avoid it |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
759 | (index < 2 or tokens[index - 2][1] != 'class') and |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
760 | # Allow "return (a.foo for a in range(5))" |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
761 | not keyword.iskeyword(prev_text)): |
3616 | 762 | yield prev_end, "E211 whitespace before '%s'", text |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
763 | prev_type = token_type |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
764 | prev_text = text |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
765 | prev_end = end |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
766 | |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
767 | |
6246
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
768 | @register_check |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
769 | def whitespace_around_operator(logical_line): |
3616 | 770 | r"""Avoid extraneous whitespace around an operator. |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
771 | |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
772 | Okay: a = 12 + 3 |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
773 | E221: a = 4 + 5 |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
774 | E222: a = 4 + 5 |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
775 | E223: a = 4\t+ 5 |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
776 | E224: a = 4 +\t5 |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
777 | """ |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
778 | for match in OPERATOR_REGEX.finditer(logical_line): |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
779 | before, after = match.groups() |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
780 | |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
781 | if '\t' in before: |
3616 | 782 | yield match.start(1), "E223 tab before operator" |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
783 | elif len(before) > 1: |
3616 | 784 | yield match.start(1), "E221 multiple spaces before operator" |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
785 | |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
786 | if '\t' in after: |
3616 | 787 | yield match.start(2), "E224 tab after operator" |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
788 | elif len(after) > 1: |
3616 | 789 | yield match.start(2), "E222 multiple spaces after operator" |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
790 | |
3209
c5432abceb25
CodeStyleChecker moved to background service and done a little cleanup.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3145
diff
changeset
|
791 | |
6246
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
792 | @register_check |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
793 | def missing_whitespace_around_operator(logical_line, tokens): |
3616 | 794 | r"""Surround operators with a single space on either side. |
795 | ||
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
796 | - Always surround these binary operators with a single space on |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
797 | either side: assignment (=), augmented assignment (+=, -= etc.), |
3616 | 798 | comparisons (==, <, >, !=, <=, >=, in, not in, is, is not), |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
799 | Booleans (and, or, not). |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
800 | |
3616 | 801 | - If operators with different priorities are used, consider adding |
802 | whitespace around the operators with the lowest priorities. | |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
803 | |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
804 | Okay: i = i + 1 |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
805 | Okay: submitted += 1 |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
806 | Okay: x = x * 2 - 1 |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
807 | Okay: hypot2 = x * x + y * y |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
808 | Okay: c = (a + b) * (a - b) |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
809 | Okay: foo(bar, key='word', *args, **kwargs) |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
810 | Okay: alpha[:-i] |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
811 | |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
812 | E225: i=i+1 |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
813 | E225: submitted +=1 |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
814 | E225: x = x /2 - 1 |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
815 | E225: z = x **y |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
816 | E226: c = (a+b) * (a-b) |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
817 | E226: hypot2 = x*x + y*y |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
818 | E227: c = a|b |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
819 | E228: msg = fmt%(errno, errmsg) |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
820 | """ |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
821 | parens = 0 |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
822 | need_space = False |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
823 | prev_type = tokenize.OP |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
824 | prev_text = prev_end = None |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
825 | for token_type, text, start, end, line in tokens: |
3616 | 826 | if token_type in SKIP_COMMENTS: |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
827 | continue |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
828 | if text in ('(', 'lambda'): |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
829 | parens += 1 |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
830 | elif text == ')': |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
831 | parens -= 1 |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
832 | if need_space: |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
833 | if start != prev_end: |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
834 | # Found a (probably) needed space |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
835 | if need_space is not True and not need_space[1]: |
3616 | 836 | yield (need_space[0], |
837 | "E225 missing whitespace around operator") | |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
838 | need_space = False |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
839 | elif text == '>' and prev_text in ('<', '-'): |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
840 | # Tolerate the "<>" operator, even if running Python 3 |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
841 | # Deal with Python 3's annotated return value "->" |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
842 | pass |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
843 | else: |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
844 | if need_space is True or need_space[1]: |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
845 | # A needed trailing space was not found |
3616 | 846 | yield prev_end, "E225 missing whitespace around operator" |
4828 | 847 | elif prev_text != '**': |
3616 | 848 | code, optype = 'E226', 'arithmetic' |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
849 | if prev_text == '%': |
3616 | 850 | code, optype = 'E228', 'modulo' |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
851 | elif prev_text not in ARITHMETIC_OP: |
3616 | 852 | code, optype = 'E227', 'bitwise or shift' |
853 | yield (need_space[0], "%s missing whitespace " | |
854 | "around %s operator" % (code, optype)) | |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
855 | need_space = False |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
856 | elif token_type == tokenize.OP and prev_end is not None: |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
857 | if text == '=' and parens: |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
858 | # Allow keyword args or defaults: foo(bar=None). |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
859 | pass |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
860 | elif text in WS_NEEDED_OPERATORS: |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
861 | need_space = True |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
862 | elif text in UNARY_OPERATORS: |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
863 | # Check if the operator is being used as a binary operator |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
864 | # Allow unary operators: -123, -x, +1. |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
865 | # Allow argument unpacking: foo(*args, **kwargs). |
3616 | 866 | if (prev_text in '}])' if prev_type == tokenize.OP |
867 | else prev_text not in KEYWORDS): | |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
868 | need_space = None |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
869 | elif text in WS_OPTIONAL_OPERATORS: |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
870 | need_space = None |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
871 | |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
872 | if need_space is None: |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
873 | # Surrounding space is optional, but ensure that |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
874 | # trailing space matches opening space |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
875 | need_space = (prev_end, start != prev_end) |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
876 | elif need_space and start == prev_end: |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
877 | # A needed opening space was not found |
3616 | 878 | yield prev_end, "E225 missing whitespace around operator" |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
879 | need_space = False |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
880 | prev_type = token_type |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
881 | prev_text = text |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
882 | prev_end = end |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
883 | |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
884 | |
6246
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
885 | @register_check |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
886 | def whitespace_around_comma(logical_line): |
3616 | 887 | r"""Avoid extraneous whitespace after a comma or a colon. |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
888 | |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
889 | Note: these checks are disabled by default |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
890 | |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
891 | Okay: a = (1, 2) |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
892 | E241: a = (1, 2) |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
893 | E242: a = (1,\t2) |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
894 | """ |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
895 | line = logical_line |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
896 | for m in WHITESPACE_AFTER_COMMA_REGEX.finditer(line): |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
897 | found = m.start() + 1 |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
898 | if '\t' in m.group(): |
3616 | 899 | yield found, "E242 tab after '%s'", m.group()[0] |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
900 | else: |
3616 | 901 | yield found, "E241 multiple spaces after '%s'", m.group()[0] |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
902 | |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
903 | |
6246
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
904 | @register_check |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
905 | def whitespace_around_named_parameter_equals(logical_line, tokens): |
3616 | 906 | r"""Don't use spaces around the '=' sign in function arguments. |
907 | ||
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
908 | Don't use spaces around the '=' sign when used to indicate a |
6246
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
909 | keyword argument or a default parameter value, except when using a type |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
910 | annotation. |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
911 | |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
912 | Okay: def complex(real, imag=0.0): |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
913 | Okay: return magic(r=real, i=imag) |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
914 | Okay: boolean(a == b) |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
915 | Okay: boolean(a != b) |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
916 | Okay: boolean(a <= b) |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
917 | Okay: boolean(a >= b) |
4828 | 918 | Okay: def foo(arg: int = 42): |
5146
f96c32abd120
Updated the pep8 checker to version 2.1.0dev0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4828
diff
changeset
|
919 | Okay: async def foo(arg: int = 42): |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
920 | |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
921 | E251: def complex(real, imag = 0.0): |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
922 | E251: return magic(r = real, i = imag) |
6246
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
923 | E252: def complex(real, image: float=0.0): |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
924 | """ |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
925 | parens = 0 |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
926 | no_space = False |
6246
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
927 | require_space = False |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
928 | prev_end = None |
4828 | 929 | annotated_func_arg = False |
5509
d4c4763b46ee
Upgraded pycodestyle to version 2.3.1
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
5435
diff
changeset
|
930 | in_def = bool(STARTSWITH_DEF_REGEX.match(logical_line)) |
6246
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
931 | |
3616 | 932 | message = "E251 unexpected spaces around keyword / parameter equals" |
6246
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
933 | missing_message = "E252 missing whitespace around parameter equals" |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
934 | |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
935 | for token_type, text, start, end, line in tokens: |
3616 | 936 | if token_type == tokenize.NL: |
937 | continue | |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
938 | if no_space: |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
939 | no_space = False |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
940 | if start != prev_end: |
3616 | 941 | yield (prev_end, message) |
6246
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
942 | if require_space: |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
943 | require_space = False |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
944 | if start == prev_end: |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
945 | yield (prev_end, missing_message) |
4828 | 946 | if token_type == tokenize.OP: |
5146
f96c32abd120
Updated the pep8 checker to version 2.1.0dev0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4828
diff
changeset
|
947 | if text in '([': |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
948 | parens += 1 |
5146
f96c32abd120
Updated the pep8 checker to version 2.1.0dev0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4828
diff
changeset
|
949 | elif text in ')]': |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
950 | parens -= 1 |
4828 | 951 | elif in_def and text == ':' and parens == 1: |
952 | annotated_func_arg = True | |
953 | elif parens and text == ',' and parens == 1: | |
954 | annotated_func_arg = False | |
6246
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
955 | elif parens and text == '=': |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
956 | if not annotated_func_arg: |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
957 | no_space = True |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
958 | if start != prev_end: |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
959 | yield (prev_end, message) |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
960 | else: |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
961 | require_space = True |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
962 | if start == prev_end: |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
963 | yield (prev_end, missing_message) |
4828 | 964 | if not parens: |
965 | annotated_func_arg = False | |
966 | ||
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
967 | prev_end = end |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
968 | |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
969 | |
6246
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
970 | @register_check |
3616 | 971 | def whitespace_before_comment(logical_line, tokens): |
972 | r"""Separate inline comments by at least two spaces. | |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
973 | |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
974 | An inline comment is a comment on the same line as a statement. Inline |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
975 | comments should be separated by at least two spaces from the statement. |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
976 | They should start with a # and a single space. |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
977 | |
3616 | 978 | Each line of a block comment starts with a # and a single space |
979 | (unless it is indented text inside the comment). | |
980 | ||
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
981 | Okay: x = x + 1 # Increment x |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
982 | Okay: x = x + 1 # Increment x |
3616 | 983 | Okay: # Block comment |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
984 | E261: x = x + 1 # Increment x |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
985 | E262: x = x + 1 #Increment x |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
986 | E262: x = x + 1 # Increment x |
3616 | 987 | E265: #Block comment |
4828 | 988 | E266: ### Block comment |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
989 | """ |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
990 | prev_end = (0, 0) |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
991 | for token_type, text, start, end, line in tokens: |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
992 | if token_type == tokenize.COMMENT: |
3616 | 993 | inline_comment = line[:start[1]].strip() |
994 | if inline_comment: | |
995 | if prev_end[0] == start[0] and start[1] < prev_end[1] + 2: | |
996 | yield (prev_end, | |
997 | "E261 at least two spaces before inline comment") | |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
998 | symbol, sp, comment = text.partition(' ') |
4828 | 999 | bad_prefix = symbol not in '#:' and (symbol.lstrip('#')[:1] or '#') |
3616 | 1000 | if inline_comment: |
4828 | 1001 | if bad_prefix or comment[:1] in WHITESPACE: |
3616 | 1002 | yield start, "E262 inline comment should start with '# '" |
4828 | 1003 | elif bad_prefix and (bad_prefix != '!' or start[0] > 1): |
1004 | if bad_prefix != '#': | |
3616 | 1005 | yield start, "E265 block comment should start with '# '" |
4828 | 1006 | elif comment: |
1007 | yield start, "E266 too many leading '#' for block comment" | |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1008 | elif token_type != tokenize.NL: |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1009 | prev_end = end |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1010 | |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1011 | |
6246
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1012 | @register_check |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1013 | def imports_on_separate_lines(logical_line): |
5146
f96c32abd120
Updated the pep8 checker to version 2.1.0dev0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4828
diff
changeset
|
1014 | r"""Place imports on separate lines. |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1015 | |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1016 | Okay: import os\nimport sys |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1017 | E401: import sys, os |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1018 | |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1019 | Okay: from subprocess import Popen, PIPE |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1020 | Okay: from myclas import MyClass |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1021 | Okay: from foo.bar.yourclass import YourClass |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1022 | Okay: import myclass |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1023 | Okay: import foo.bar.yourclass |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1024 | """ |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1025 | line = logical_line |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1026 | if line.startswith('import '): |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1027 | found = line.find(',') |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1028 | if -1 < found and ';' not in line[:found]: |
3616 | 1029 | yield found, "E401 multiple imports on one line" |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1030 | |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1031 | |
6246
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1032 | @register_check |
4828 | 1033 | def module_imports_on_top_of_file( |
1034 | logical_line, indent_level, checker_state, noqa): | |
5146
f96c32abd120
Updated the pep8 checker to version 2.1.0dev0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4828
diff
changeset
|
1035 | r"""Place imports at the top of the file. |
f96c32abd120
Updated the pep8 checker to version 2.1.0dev0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4828
diff
changeset
|
1036 | |
f96c32abd120
Updated the pep8 checker to version 2.1.0dev0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4828
diff
changeset
|
1037 | Always put imports at the top of the file, just after any module comments |
f96c32abd120
Updated the pep8 checker to version 2.1.0dev0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4828
diff
changeset
|
1038 | and docstrings, and before module globals and constants. |
4828 | 1039 | |
1040 | Okay: import os | |
1041 | Okay: # this is a comment\nimport os | |
1042 | Okay: '''this is a module docstring'''\nimport os | |
1043 | Okay: r'''this is a module docstring'''\nimport os | |
5435
44a6fc2828bc
Upgraded pycodestyle to version 2.2.0+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5389
diff
changeset
|
1044 | Okay: |
44a6fc2828bc
Upgraded pycodestyle to version 2.2.0+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5389
diff
changeset
|
1045 | try:\n\timport x\nexcept ImportError:\n\tpass\nelse:\n\tpass\nimport y |
44a6fc2828bc
Upgraded pycodestyle to version 2.2.0+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5389
diff
changeset
|
1046 | Okay: |
44a6fc2828bc
Upgraded pycodestyle to version 2.2.0+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5389
diff
changeset
|
1047 | try:\n\timport x\nexcept ImportError:\n\tpass\nfinally:\n\tpass\nimport y |
44a6fc2828bc
Upgraded pycodestyle to version 2.2.0+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5389
diff
changeset
|
1048 | |
4828 | 1049 | E402: a=1\nimport os |
1050 | E402: 'One string'\n"Two string"\nimport os | |
1051 | E402: a=1\nfrom sys import x | |
1052 | ||
1053 | Okay: if x:\n import os | |
1054 | """ | |
1055 | def is_string_literal(line): | |
1056 | if line[0] in 'uUbB': | |
1057 | line = line[1:] | |
1058 | if line and line[0] in 'rR': | |
1059 | line = line[1:] | |
1060 | return line and (line[0] == '"' or line[0] == "'") | |
1061 | ||
1062 | allowed_try_keywords = ('try', 'except', 'else', 'finally') | |
1063 | ||
1064 | if indent_level: # Allow imports in conditional statements or functions | |
1065 | return | |
1066 | if not logical_line: # Allow empty lines or comments | |
1067 | return | |
1068 | if noqa: | |
1069 | return | |
1070 | line = logical_line | |
1071 | if line.startswith('import ') or line.startswith('from '): | |
1072 | if checker_state.get('seen_non_imports', False): | |
1073 | yield 0, "E402 module level import not at top of file" | |
5509
d4c4763b46ee
Upgraded pycodestyle to version 2.3.1
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
5435
diff
changeset
|
1074 | elif re.match(DUNDER_REGEX, line): |
d4c4763b46ee
Upgraded pycodestyle to version 2.3.1
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
5435
diff
changeset
|
1075 | return |
4828 | 1076 | elif any(line.startswith(kw) for kw in allowed_try_keywords): |
1077 | # Allow try, except, else, finally keywords intermixed with imports in | |
1078 | # order to support conditional importing | |
1079 | return | |
1080 | elif is_string_literal(line): | |
1081 | # The first literal is a docstring, allow it. Otherwise, report error. | |
1082 | if checker_state.get('seen_docstring', False): | |
1083 | checker_state['seen_non_imports'] = True | |
1084 | else: | |
1085 | checker_state['seen_docstring'] = True | |
1086 | else: | |
1087 | checker_state['seen_non_imports'] = True | |
1088 | ||
1089 | ||
6246
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1090 | @register_check |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1091 | def compound_statements(logical_line): |
3616 | 1092 | r"""Compound statements (on the same line) are generally discouraged. |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1093 | |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1094 | While sometimes it's okay to put an if/for/while with a small body |
3616 | 1095 | on the same line, never do this for multi-clause statements. |
1096 | Also avoid folding such long lines! | |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1097 | |
4828 | 1098 | Always use a def statement instead of an assignment statement that |
1099 | binds a lambda expression directly to a name. | |
1100 | ||
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1101 | Okay: if foo == 'blah':\n do_blah_thing() |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1102 | Okay: do_one() |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1103 | Okay: do_two() |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1104 | Okay: do_three() |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1105 | |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1106 | E701: if foo == 'blah': do_blah_thing() |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1107 | E701: for x in lst: total += x |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1108 | E701: while t < 10: t = delay() |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1109 | E701: if foo == 'blah': do_blah_thing() |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1110 | E701: else: do_non_blah_thing() |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1111 | E701: try: something() |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1112 | E701: finally: cleanup() |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1113 | E701: if foo == 'blah': one(); two(); three() |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1114 | E702: do_one(); do_two(); do_three() |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1115 | E703: do_four(); # useless semicolon |
4828 | 1116 | E704: def f(x): return 2*x |
1117 | E731: f = lambda x: 2*x | |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1118 | """ |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1119 | line = logical_line |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1120 | last_char = len(line) - 1 |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1121 | found = line.find(':') |
5146
f96c32abd120
Updated the pep8 checker to version 2.1.0dev0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4828
diff
changeset
|
1122 | prev_found = 0 |
f96c32abd120
Updated the pep8 checker to version 2.1.0dev0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4828
diff
changeset
|
1123 | counts = dict((char, 0) for char in '{}[]()') |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1124 | while -1 < found < last_char: |
5146
f96c32abd120
Updated the pep8 checker to version 2.1.0dev0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4828
diff
changeset
|
1125 | update_counts(line[prev_found:found], counts) |
f96c32abd120
Updated the pep8 checker to version 2.1.0dev0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4828
diff
changeset
|
1126 | if ((counts['{'] <= counts['}'] and # {'a': 1} (dict) |
f96c32abd120
Updated the pep8 checker to version 2.1.0dev0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4828
diff
changeset
|
1127 | counts['['] <= counts[']'] and # [1:2] (slice) |
f96c32abd120
Updated the pep8 checker to version 2.1.0dev0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4828
diff
changeset
|
1128 | counts['('] <= counts[')'])): # (annotation) |
f96c32abd120
Updated the pep8 checker to version 2.1.0dev0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4828
diff
changeset
|
1129 | lambda_kw = LAMBDA_REGEX.search(line, 0, found) |
4828 | 1130 | if lambda_kw: |
1131 | before = line[:lambda_kw.start()].rstrip() | |
1132 | if before[-1:] == '=' and isidentifier(before[:-1].strip()): | |
1133 | yield 0, ("E731 do not assign a lambda expression, use a " | |
1134 | "def") | |
1135 | break | |
5509
d4c4763b46ee
Upgraded pycodestyle to version 2.3.1
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
5435
diff
changeset
|
1136 | if STARTSWITH_DEF_REGEX.match(line): |
4828 | 1137 | yield 0, "E704 multiple statements on one line (def)" |
5509
d4c4763b46ee
Upgraded pycodestyle to version 2.3.1
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
5435
diff
changeset
|
1138 | elif STARTSWITH_INDENT_STATEMENT_REGEX.match(line): |
4828 | 1139 | yield found, "E701 multiple statements on one line (colon)" |
5146
f96c32abd120
Updated the pep8 checker to version 2.1.0dev0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4828
diff
changeset
|
1140 | prev_found = found |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1141 | found = line.find(':', found + 1) |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1142 | found = line.find(';') |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1143 | while -1 < found: |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1144 | if found < last_char: |
3616 | 1145 | yield found, "E702 multiple statements on one line (semicolon)" |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1146 | else: |
3616 | 1147 | yield found, "E703 statement ends with a semicolon" |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1148 | found = line.find(';', found + 1) |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1149 | |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1150 | |
6246
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1151 | @register_check |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1152 | def explicit_line_join(logical_line, tokens): |
3616 | 1153 | r"""Avoid explicit line join between brackets. |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1154 | |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1155 | The preferred way of wrapping long lines is by using Python's implied line |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1156 | continuation inside parentheses, brackets and braces. Long lines can be |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1157 | broken over multiple lines by wrapping expressions in parentheses. These |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1158 | should be used in preference to using a backslash for line continuation. |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1159 | |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1160 | E502: aaa = [123, \\n 123] |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1161 | E502: aaa = ("bbb " \\n "ccc") |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1162 | |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1163 | Okay: aaa = [123,\n 123] |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1164 | Okay: aaa = ("bbb "\n "ccc") |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1165 | Okay: aaa = "bbb " \\n "ccc" |
4828 | 1166 | Okay: aaa = 123 # \\ |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1167 | """ |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1168 | prev_start = prev_end = parens = 0 |
4828 | 1169 | comment = False |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1170 | backslash = None |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1171 | for token_type, text, start, end, line in tokens: |
4828 | 1172 | if token_type == tokenize.COMMENT: |
1173 | comment = True | |
1174 | if start[0] != prev_start and parens and backslash and not comment: | |
3616 | 1175 | yield backslash, "E502 the backslash is redundant between brackets" |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1176 | if end[0] != prev_end: |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1177 | if line.rstrip('\r\n').endswith('\\'): |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1178 | backslash = (end[0], len(line.splitlines()[-1]) - 1) |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1179 | else: |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1180 | backslash = None |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1181 | prev_start = prev_end = end[0] |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1182 | else: |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1183 | prev_start = start[0] |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1184 | if token_type == tokenize.OP: |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1185 | if text in '([{': |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1186 | parens += 1 |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1187 | elif text in ')]}': |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1188 | parens -= 1 |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1189 | |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1190 | |
6246
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1191 | def _is_binary_operator(token_type, text): |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1192 | is_op_token = token_type == tokenize.OP |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1193 | is_conjunction = text in ['and', 'or'] |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1194 | # NOTE(sigmavirus24): Previously the not_a_symbol check was executed |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1195 | # conditionally. Since it is now *always* executed, text may be None. |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1196 | # In that case we get a TypeError for `text not in str`. |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1197 | not_a_symbol = text and text not in "()[]{},:.;@=%~" |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1198 | # The % character is strictly speaking a binary operator, but the |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1199 | # common usage seems to be to put it next to the format parameters, |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1200 | # after a line break. |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1201 | return ((is_op_token or is_conjunction) and not_a_symbol) |
4828 | 1202 | |
6246
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1203 | |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1204 | def _break_around_binary_operators(tokens): |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1205 | """Private function to reduce duplication. |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1206 | |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1207 | This factors out the shared details between |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1208 | :func:`break_before_binary_operator` and |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1209 | :func:`break_after_binary_operator`. |
4828 | 1210 | """ |
1211 | line_break = False | |
1212 | unary_context = True | |
5146
f96c32abd120
Updated the pep8 checker to version 2.1.0dev0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4828
diff
changeset
|
1213 | # Previous non-newline token types and text |
f96c32abd120
Updated the pep8 checker to version 2.1.0dev0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4828
diff
changeset
|
1214 | previous_token_type = None |
f96c32abd120
Updated the pep8 checker to version 2.1.0dev0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4828
diff
changeset
|
1215 | previous_text = None |
4828 | 1216 | for token_type, text, start, end, line in tokens: |
1217 | if token_type == tokenize.COMMENT: | |
1218 | continue | |
1219 | if ('\n' in text or '\r' in text) and token_type != tokenize.STRING: | |
1220 | line_break = True | |
1221 | else: | |
6246
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1222 | yield (token_type, text, previous_token_type, previous_text, |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1223 | line_break, unary_context, start) |
4828 | 1224 | unary_context = text in '([{,;' |
1225 | line_break = False | |
5146
f96c32abd120
Updated the pep8 checker to version 2.1.0dev0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4828
diff
changeset
|
1226 | previous_token_type = token_type |
f96c32abd120
Updated the pep8 checker to version 2.1.0dev0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4828
diff
changeset
|
1227 | previous_text = text |
4828 | 1228 | |
1229 | ||
6246
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1230 | @register_check |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1231 | def break_before_binary_operator(logical_line, tokens): |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1232 | r""" |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1233 | Avoid breaks before binary operators. |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1234 | |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1235 | The preferred place to break around a binary operator is after the |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1236 | operator, not before it. |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1237 | |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1238 | W503: (width == 0\n + height == 0) |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1239 | W503: (width == 0\n and height == 0) |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1240 | W503: var = (1\n & ~2) |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1241 | W503: var = (1\n / -2) |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1242 | W503: var = (1\n + -1\n + -2) |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1243 | |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1244 | Okay: foo(\n -x) |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1245 | Okay: foo(x\n []) |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1246 | Okay: x = '''\n''' + '' |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1247 | Okay: foo(x,\n -y) |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1248 | Okay: foo(x, # comment\n -y) |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1249 | """ |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1250 | for context in _break_around_binary_operators(tokens): |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1251 | (token_type, text, previous_token_type, previous_text, |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1252 | line_break, unary_context, start) = context |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1253 | if (_is_binary_operator(token_type, text) and line_break and |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1254 | not unary_context and |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1255 | not _is_binary_operator(previous_token_type, |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1256 | previous_text)): |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1257 | yield start, "W503 line break before binary operator" |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1258 | |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1259 | |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1260 | @register_check |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1261 | def break_after_binary_operator(logical_line, tokens): |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1262 | r""" |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1263 | Avoid breaks after binary operators. |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1264 | |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1265 | The preferred place to break around a binary operator is before the |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1266 | operator, not after it. |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1267 | |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1268 | W504: (width == 0 +\n height == 0) |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1269 | W504: (width == 0 and\n height == 0) |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1270 | W504: var = (1 &\n ~2) |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1271 | |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1272 | Okay: foo(\n -x) |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1273 | Okay: foo(x\n []) |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1274 | Okay: x = '''\n''' + '' |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1275 | Okay: x = '' + '''\n''' |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1276 | Okay: foo(x,\n -y) |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1277 | Okay: foo(x, # comment\n -y) |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1278 | |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1279 | The following should be W504 but unary_context is tricky with these |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1280 | Okay: var = (1 /\n -2) |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1281 | Okay: var = (1 +\n -1 +\n -2) |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1282 | """ |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1283 | for context in _break_around_binary_operators(tokens): |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1284 | (token_type, text, previous_token_type, previous_text, |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1285 | line_break, unary_context, start) = context |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1286 | if (_is_binary_operator(previous_token_type, previous_text) and |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1287 | line_break and |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1288 | not unary_context and |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1289 | not _is_binary_operator(token_type, text)): |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1290 | error_pos = (start[0] - 1, start[1]) |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1291 | yield error_pos, "W504 line break after binary operator" |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1292 | |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1293 | |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1294 | @register_check |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1295 | def comparison_to_singleton(logical_line, noqa): |
3616 | 1296 | r"""Comparison to singletons should use "is" or "is not". |
1297 | ||
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1298 | Comparisons to singletons like None should always be done |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1299 | with "is" or "is not", never the equality operators. |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1300 | |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1301 | Okay: if arg is not None: |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1302 | E711: if arg != None: |
4828 | 1303 | E711: if None == arg: |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1304 | E712: if arg == True: |
4828 | 1305 | E712: if False == arg: |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1306 | |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1307 | Also, beware of writing if x when you really mean if x is not None -- |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1308 | e.g. when testing whether a variable or argument that defaults to None was |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1309 | set to some other value. The other value might have a type (such as a |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1310 | container) that could be false in a boolean context! |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1311 | """ |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1312 | match = not noqa and COMPARE_SINGLETON_REGEX.search(logical_line) |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1313 | if match: |
4828 | 1314 | singleton = match.group(1) or match.group(3) |
1315 | same = (match.group(2) == '==') | |
1316 | ||
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1317 | msg = "'if cond is %s:'" % (('' if same else 'not ') + singleton) |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1318 | if singleton in ('None',): |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1319 | code = 'E711' |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1320 | else: |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1321 | code = 'E712' |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1322 | nonzero = ((singleton == 'True' and same) or |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1323 | (singleton == 'False' and not same)) |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1324 | msg += " or 'if %scond:'" % ('' if nonzero else 'not ') |
5146
f96c32abd120
Updated the pep8 checker to version 2.1.0dev0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4828
diff
changeset
|
1325 | yield (match.start(2), ("%s comparison to %s should be %s" % |
f96c32abd120
Updated the pep8 checker to version 2.1.0dev0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4828
diff
changeset
|
1326 | (code, singleton, msg)), singleton, msg) |
3616 | 1327 | |
1328 | ||
6246
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1329 | @register_check |
3616 | 1330 | def comparison_negative(logical_line): |
1331 | r"""Negative comparison should be done using "not in" and "is not". | |
1332 | ||
1333 | Okay: if x not in y:\n pass | |
1334 | Okay: assert (X in Y or X is Z) | |
1335 | Okay: if not (X in Y):\n pass | |
1336 | Okay: zz = x is not y | |
1337 | E713: Z = not X in Y | |
1338 | E713: if not X.B in Y:\n pass | |
1339 | E714: if not X is Y:\n pass | |
1340 | E714: Z = not X.B is Y | |
1341 | """ | |
1342 | match = COMPARE_NEGATIVE_REGEX.search(logical_line) | |
1343 | if match: | |
1344 | pos = match.start(1) | |
1345 | if match.group(2) == 'in': | |
1346 | yield pos, "E713 test for membership should be 'not in'" | |
1347 | else: | |
1348 | yield pos, "E714 test for object identity should be 'is not'" | |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1349 | |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1350 | |
6246
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1351 | @register_check |
4828 | 1352 | def comparison_type(logical_line, noqa): |
3616 | 1353 | r"""Object type comparisons should always use isinstance(). |
1354 | ||
1355 | Do not compare types directly. | |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1356 | |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1357 | Okay: if isinstance(obj, int): |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1358 | E721: if type(obj) is type(1): |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1359 | |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1360 | When checking if an object is a string, keep in mind that it might be a |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1361 | unicode string too! In Python 2.3, str and unicode have a common base |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1362 | class, basestring, so you can do: |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1363 | |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1364 | Okay: if isinstance(obj, basestring): |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1365 | Okay: if type(a1) is type(b1): |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1366 | """ |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1367 | match = COMPARE_TYPE_REGEX.search(logical_line) |
4828 | 1368 | if match and not noqa: |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1369 | inst = match.group(1) |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1370 | if inst and isidentifier(inst) and inst not in SINGLETONS: |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1371 | return # Allow comparison for types which are not obvious |
3616 | 1372 | yield match.start(), "E721 do not compare types, use 'isinstance()'" |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1373 | |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1374 | |
6246
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1375 | @register_check |
5435
44a6fc2828bc
Upgraded pycodestyle to version 2.2.0+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5389
diff
changeset
|
1376 | def bare_except(logical_line, noqa): |
6246
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1377 | r"""When catching exceptions, mention specific exceptions when possible. |
5435
44a6fc2828bc
Upgraded pycodestyle to version 2.2.0+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5389
diff
changeset
|
1378 | |
44a6fc2828bc
Upgraded pycodestyle to version 2.2.0+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5389
diff
changeset
|
1379 | Okay: except Exception: |
44a6fc2828bc
Upgraded pycodestyle to version 2.2.0+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5389
diff
changeset
|
1380 | Okay: except BaseException: |
44a6fc2828bc
Upgraded pycodestyle to version 2.2.0+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5389
diff
changeset
|
1381 | E722: except: |
44a6fc2828bc
Upgraded pycodestyle to version 2.2.0+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5389
diff
changeset
|
1382 | """ |
44a6fc2828bc
Upgraded pycodestyle to version 2.2.0+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5389
diff
changeset
|
1383 | if noqa: |
44a6fc2828bc
Upgraded pycodestyle to version 2.2.0+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5389
diff
changeset
|
1384 | return |
44a6fc2828bc
Upgraded pycodestyle to version 2.2.0+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5389
diff
changeset
|
1385 | |
44a6fc2828bc
Upgraded pycodestyle to version 2.2.0+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5389
diff
changeset
|
1386 | regex = re.compile(r"except\s*:") |
44a6fc2828bc
Upgraded pycodestyle to version 2.2.0+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5389
diff
changeset
|
1387 | match = regex.match(logical_line) |
44a6fc2828bc
Upgraded pycodestyle to version 2.2.0+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5389
diff
changeset
|
1388 | if match: |
6246
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1389 | yield match.start(), "E722 do not use bare 'except'" |
5435
44a6fc2828bc
Upgraded pycodestyle to version 2.2.0+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5389
diff
changeset
|
1390 | |
44a6fc2828bc
Upgraded pycodestyle to version 2.2.0+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5389
diff
changeset
|
1391 | |
6246
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1392 | @register_check |
5146
f96c32abd120
Updated the pep8 checker to version 2.1.0dev0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4828
diff
changeset
|
1393 | def ambiguous_identifier(logical_line, tokens): |
f96c32abd120
Updated the pep8 checker to version 2.1.0dev0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4828
diff
changeset
|
1394 | r"""Never use the characters 'l', 'O', or 'I' as variable names. |
f96c32abd120
Updated the pep8 checker to version 2.1.0dev0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4828
diff
changeset
|
1395 | |
f96c32abd120
Updated the pep8 checker to version 2.1.0dev0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4828
diff
changeset
|
1396 | In some fonts, these characters are indistinguishable from the numerals |
f96c32abd120
Updated the pep8 checker to version 2.1.0dev0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4828
diff
changeset
|
1397 | one and zero. When tempted to use 'l', use 'L' instead. |
f96c32abd120
Updated the pep8 checker to version 2.1.0dev0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4828
diff
changeset
|
1398 | |
f96c32abd120
Updated the pep8 checker to version 2.1.0dev0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4828
diff
changeset
|
1399 | Okay: L = 0 |
f96c32abd120
Updated the pep8 checker to version 2.1.0dev0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4828
diff
changeset
|
1400 | Okay: o = 123 |
f96c32abd120
Updated the pep8 checker to version 2.1.0dev0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4828
diff
changeset
|
1401 | Okay: i = 42 |
f96c32abd120
Updated the pep8 checker to version 2.1.0dev0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4828
diff
changeset
|
1402 | E741: l = 0 |
f96c32abd120
Updated the pep8 checker to version 2.1.0dev0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4828
diff
changeset
|
1403 | E741: O = 123 |
f96c32abd120
Updated the pep8 checker to version 2.1.0dev0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4828
diff
changeset
|
1404 | E741: I = 42 |
f96c32abd120
Updated the pep8 checker to version 2.1.0dev0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4828
diff
changeset
|
1405 | |
f96c32abd120
Updated the pep8 checker to version 2.1.0dev0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4828
diff
changeset
|
1406 | Variables can be bound in several other contexts, including class and |
f96c32abd120
Updated the pep8 checker to version 2.1.0dev0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4828
diff
changeset
|
1407 | function definitions, 'global' and 'nonlocal' statements, exception |
f96c32abd120
Updated the pep8 checker to version 2.1.0dev0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4828
diff
changeset
|
1408 | handlers, and 'with' statements. |
f96c32abd120
Updated the pep8 checker to version 2.1.0dev0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4828
diff
changeset
|
1409 | |
f96c32abd120
Updated the pep8 checker to version 2.1.0dev0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4828
diff
changeset
|
1410 | Okay: except AttributeError as o: |
f96c32abd120
Updated the pep8 checker to version 2.1.0dev0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4828
diff
changeset
|
1411 | Okay: with lock as L: |
f96c32abd120
Updated the pep8 checker to version 2.1.0dev0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4828
diff
changeset
|
1412 | E741: except AttributeError as O: |
f96c32abd120
Updated the pep8 checker to version 2.1.0dev0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4828
diff
changeset
|
1413 | E741: with lock as l: |
f96c32abd120
Updated the pep8 checker to version 2.1.0dev0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4828
diff
changeset
|
1414 | E741: global I |
f96c32abd120
Updated the pep8 checker to version 2.1.0dev0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4828
diff
changeset
|
1415 | E741: nonlocal l |
f96c32abd120
Updated the pep8 checker to version 2.1.0dev0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4828
diff
changeset
|
1416 | E742: class I(object): |
f96c32abd120
Updated the pep8 checker to version 2.1.0dev0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4828
diff
changeset
|
1417 | E743: def l(x): |
f96c32abd120
Updated the pep8 checker to version 2.1.0dev0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4828
diff
changeset
|
1418 | """ |
f96c32abd120
Updated the pep8 checker to version 2.1.0dev0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4828
diff
changeset
|
1419 | idents_to_avoid = ('l', 'O', 'I') |
f96c32abd120
Updated the pep8 checker to version 2.1.0dev0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4828
diff
changeset
|
1420 | prev_type, prev_text, prev_start, prev_end, __ = tokens[0] |
f96c32abd120
Updated the pep8 checker to version 2.1.0dev0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4828
diff
changeset
|
1421 | for token_type, text, start, end, line in tokens[1:]: |
f96c32abd120
Updated the pep8 checker to version 2.1.0dev0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4828
diff
changeset
|
1422 | ident = pos = None |
f96c32abd120
Updated the pep8 checker to version 2.1.0dev0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4828
diff
changeset
|
1423 | # identifiers on the lhs of an assignment operator |
f96c32abd120
Updated the pep8 checker to version 2.1.0dev0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4828
diff
changeset
|
1424 | if token_type == tokenize.OP and '=' in text: |
f96c32abd120
Updated the pep8 checker to version 2.1.0dev0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4828
diff
changeset
|
1425 | if prev_text in idents_to_avoid: |
f96c32abd120
Updated the pep8 checker to version 2.1.0dev0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4828
diff
changeset
|
1426 | ident = prev_text |
f96c32abd120
Updated the pep8 checker to version 2.1.0dev0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4828
diff
changeset
|
1427 | pos = prev_start |
f96c32abd120
Updated the pep8 checker to version 2.1.0dev0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4828
diff
changeset
|
1428 | # identifiers bound to a value with 'as', 'global', or 'nonlocal' |
f96c32abd120
Updated the pep8 checker to version 2.1.0dev0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4828
diff
changeset
|
1429 | if prev_text in ('as', 'global', 'nonlocal'): |
f96c32abd120
Updated the pep8 checker to version 2.1.0dev0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4828
diff
changeset
|
1430 | if text in idents_to_avoid: |
f96c32abd120
Updated the pep8 checker to version 2.1.0dev0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4828
diff
changeset
|
1431 | ident = text |
f96c32abd120
Updated the pep8 checker to version 2.1.0dev0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4828
diff
changeset
|
1432 | pos = start |
f96c32abd120
Updated the pep8 checker to version 2.1.0dev0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4828
diff
changeset
|
1433 | if prev_text == 'class': |
f96c32abd120
Updated the pep8 checker to version 2.1.0dev0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4828
diff
changeset
|
1434 | if text in idents_to_avoid: |
f96c32abd120
Updated the pep8 checker to version 2.1.0dev0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4828
diff
changeset
|
1435 | yield start, "E742 ambiguous class definition '%s'", text |
f96c32abd120
Updated the pep8 checker to version 2.1.0dev0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4828
diff
changeset
|
1436 | if prev_text == 'def': |
f96c32abd120
Updated the pep8 checker to version 2.1.0dev0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4828
diff
changeset
|
1437 | if text in idents_to_avoid: |
f96c32abd120
Updated the pep8 checker to version 2.1.0dev0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4828
diff
changeset
|
1438 | yield start, "E743 ambiguous function definition '%s'", text |
f96c32abd120
Updated the pep8 checker to version 2.1.0dev0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4828
diff
changeset
|
1439 | if ident: |
f96c32abd120
Updated the pep8 checker to version 2.1.0dev0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4828
diff
changeset
|
1440 | yield pos, "E741 ambiguous variable name '%s'", ident |
f96c32abd120
Updated the pep8 checker to version 2.1.0dev0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4828
diff
changeset
|
1441 | prev_text = text |
f96c32abd120
Updated the pep8 checker to version 2.1.0dev0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4828
diff
changeset
|
1442 | prev_start = start |
f96c32abd120
Updated the pep8 checker to version 2.1.0dev0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4828
diff
changeset
|
1443 | |
f96c32abd120
Updated the pep8 checker to version 2.1.0dev0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4828
diff
changeset
|
1444 | |
6246
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1445 | @register_check |
3616 | 1446 | def python_3000_has_key(logical_line, noqa): |
1447 | r"""The {}.has_key() method is removed in Python 3: use the 'in' operator. | |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1448 | |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1449 | Okay: if "alph" in d:\n print d["alph"] |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1450 | W601: assert d.has_key('alph') |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1451 | """ |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1452 | pos = logical_line.find('.has_key(') |
3616 | 1453 | if pos > -1 and not noqa: |
1454 | yield pos, "W601 .has_key() is deprecated, use 'in'" | |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1455 | |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1456 | |
6246
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1457 | @register_check |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1458 | def python_3000_raise_comma(logical_line): |
3616 | 1459 | r"""When raising an exception, use "raise ValueError('message')". |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1460 | |
3616 | 1461 | The older form is removed in Python 3. |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1462 | |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1463 | Okay: raise DummyError("Message") |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1464 | W602: raise DummyError, "Message" |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1465 | """ |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1466 | match = RAISE_COMMA_REGEX.match(logical_line) |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1467 | if match and not RERAISE_COMMA_REGEX.match(logical_line): |
3616 | 1468 | yield match.end() - 1, "W602 deprecated form of raising exception" |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1469 | |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1470 | |
6246
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1471 | @register_check |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1472 | def python_3000_not_equal(logical_line): |
3616 | 1473 | r"""New code should always use != instead of <>. |
1474 | ||
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1475 | The older syntax is removed in Python 3. |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1476 | |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1477 | Okay: if a != 'no': |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1478 | W603: if a <> 'no': |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1479 | """ |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1480 | pos = logical_line.find('<>') |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1481 | if pos > -1: |
3616 | 1482 | yield pos, "W603 '<>' is deprecated, use '!='" |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1483 | |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1484 | |
6246
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1485 | @register_check |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1486 | def python_3000_backticks(logical_line): |
5146
f96c32abd120
Updated the pep8 checker to version 2.1.0dev0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4828
diff
changeset
|
1487 | r"""Use repr() instead of backticks in Python 3. |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1488 | |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1489 | Okay: val = repr(1 + 2) |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1490 | W604: val = `1 + 2` |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1491 | """ |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1492 | pos = logical_line.find('`') |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1493 | if pos > -1: |
3616 | 1494 | yield pos, "W604 backticks are deprecated, use 'repr()'" |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1495 | |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1496 | |
6246
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1497 | @register_check |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1498 | def python_3000_invalid_escape_sequence(logical_line, tokens): |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1499 | r"""Invalid escape sequences are deprecated in Python 3.6. |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1500 | |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1501 | Okay: regex = r'\.png$' |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1502 | W605: regex = '\.png$' |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1503 | """ |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1504 | # https://docs.python.org/3/reference/lexical_analysis.html#string-and-bytes-literals |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1505 | valid = [ |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1506 | '\n', |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1507 | '\\', |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1508 | '\'', |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1509 | '"', |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1510 | 'a', |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1511 | 'b', |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1512 | 'f', |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1513 | 'n', |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1514 | 'r', |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1515 | 't', |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1516 | 'v', |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1517 | '0', '1', '2', '3', '4', '5', '6', '7', |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1518 | 'x', |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1519 | |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1520 | # Escape sequences only recognized in string literals |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1521 | 'N', |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1522 | 'u', |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1523 | 'U', |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1524 | ] |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1525 | |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1526 | for token_type, text, start, end, line in tokens: |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1527 | if token_type == tokenize.STRING: |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1528 | quote = text[-3:] if text[-3:] in ('"""', "'''") else text[-1] |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1529 | # Extract string modifiers (e.g. u or r) |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1530 | quote_pos = text.index(quote) |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1531 | prefix = text[:quote_pos].lower() |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1532 | start = quote_pos + len(quote) |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1533 | string = text[start:-len(quote)] |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1534 | |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1535 | if 'r' not in prefix: |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1536 | pos = string.find('\\') |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1537 | while pos >= 0: |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1538 | pos += 1 |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1539 | if string[pos] not in valid: |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1540 | yield ( |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1541 | pos, |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1542 | "W605 invalid escape sequence '\\%s'", |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1543 | string[pos], |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1544 | ) |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1545 | pos = string.find('\\', pos + 1) |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1546 | |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1547 | |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1548 | @register_check |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1549 | def python_3000_async_await_keywords(logical_line, tokens): |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1550 | """'async' and 'await' are reserved keywords starting with Python 3.7 |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1551 | |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1552 | W606: async = 42 |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1553 | W606: await = 42 |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1554 | Okay: async def read_data(db):\n data = await db.fetch('SELECT ...') |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1555 | """ |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1556 | # The Python tokenize library before Python 3.5 recognizes async/await as a |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1557 | # NAME token. Therefore, use a state machine to look for the possible |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1558 | # async/await constructs as defined by the Python grammar: |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1559 | # https://docs.python.org/3/reference/grammar.html |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1560 | |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1561 | state = None |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1562 | for token_type, text, start, end, line in tokens: |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1563 | error = False |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1564 | |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1565 | if state is None: |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1566 | if token_type == tokenize.NAME: |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1567 | if text == 'async': |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1568 | state = ('async_stmt', start) |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1569 | elif text == 'await': |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1570 | state = ('await', start) |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1571 | elif state[0] == 'async_stmt': |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1572 | if token_type == tokenize.NAME and text in ('def', 'with', 'for'): |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1573 | # One of funcdef, with_stmt, or for_stmt. Return to looking |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1574 | # for async/await names. |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1575 | state = None |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1576 | else: |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1577 | error = True |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1578 | elif state[0] == 'await': |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1579 | if token_type in (tokenize.NAME, tokenize.NUMBER, tokenize.STRING): |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1580 | # An await expression. Return to looking for async/await names. |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1581 | state = None |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1582 | else: |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1583 | error = True |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1584 | |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1585 | if error: |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1586 | yield ( |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1587 | state[1], |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1588 | "W606 'async' and 'await' are reserved keywords starting with " |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1589 | "Python 3.7", |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1590 | ) |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1591 | state = None |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1592 | |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1593 | # Last token |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1594 | if state is not None: |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1595 | yield ( |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1596 | state[1], |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1597 | "W606 'async' and 'await' are reserved keywords starting with " |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1598 | "Python 3.7", |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1599 | ) |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1600 | |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1601 | |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1602 | ############################################################################## |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1603 | # Helper functions |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1604 | ############################################################################## |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1605 | |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1606 | |
4828 | 1607 | if sys.version_info < (3,): |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1608 | # Python 2: implicit encoding. |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1609 | def readlines(filename): |
3616 | 1610 | """Read the source code.""" |
4828 | 1611 | with open(filename, 'rU') as f: |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1612 | return f.readlines() |
4828 | 1613 | isidentifier = re.compile(r'[a-zA-Z_]\w*$').match |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1614 | stdin_get_value = sys.stdin.read |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1615 | else: |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1616 | # Python 3 |
3616 | 1617 | def readlines(filename): |
1618 | """Read the source code.""" | |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1619 | try: |
3616 | 1620 | with open(filename, 'rb') as f: |
1621 | (coding, lines) = tokenize.detect_encoding(f.readline) | |
1622 | f = TextIOWrapper(f, coding, line_buffering=True) | |
5146
f96c32abd120
Updated the pep8 checker to version 2.1.0dev0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4828
diff
changeset
|
1623 | return [line.decode(coding) for line in lines] + f.readlines() |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1624 | except (LookupError, SyntaxError, UnicodeError): |
3616 | 1625 | # Fall back if file encoding is improperly declared |
1626 | with open(filename, encoding='latin-1') as f: | |
1627 | return f.readlines() | |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1628 | isidentifier = str.isidentifier |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1629 | |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1630 | def stdin_get_value(): |
5146
f96c32abd120
Updated the pep8 checker to version 2.1.0dev0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4828
diff
changeset
|
1631 | """Read the value from stdin.""" |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1632 | return TextIOWrapper(sys.stdin.buffer, errors='ignore').read() |
5146
f96c32abd120
Updated the pep8 checker to version 2.1.0dev0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4828
diff
changeset
|
1633 | |
6246
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1634 | noqa = lru_cache(512)(re.compile(r'# no(?:qa|pep8)\b', re.I).search) |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1635 | |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1636 | |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1637 | def expand_indent(line): |
3616 | 1638 | r"""Return the amount of indentation. |
1639 | ||
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1640 | Tabs are expanded to the next multiple of 8. |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1641 | |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1642 | >>> expand_indent(' ') |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1643 | 4 |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1644 | >>> expand_indent('\t') |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1645 | 8 |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1646 | >>> expand_indent(' \t') |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1647 | 8 |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1648 | >>> expand_indent(' \t') |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1649 | 16 |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1650 | """ |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1651 | if '\t' not in line: |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1652 | return len(line) - len(line.lstrip()) |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1653 | result = 0 |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1654 | for char in line: |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1655 | if char == '\t': |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1656 | result = result // 8 * 8 + 8 |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1657 | elif char == ' ': |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1658 | result += 1 |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1659 | else: |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1660 | break |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1661 | return result |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1662 | |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1663 | |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1664 | def mute_string(text): |
3616 | 1665 | """Replace contents with 'xxx' to prevent syntax matching. |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1666 | |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1667 | >>> mute_string('"abc"') |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1668 | '"xxx"' |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1669 | >>> mute_string("'''abc'''") |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1670 | "'''xxx'''" |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1671 | >>> mute_string("r'abc'") |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1672 | "r'xxx'" |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1673 | """ |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1674 | # String modifiers (e.g. u or r) |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1675 | start = text.index(text[-1]) + 1 |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1676 | end = len(text) - 1 |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1677 | # Triple quotes |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1678 | if text[-3:] in ('"""', "'''"): |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1679 | start += 2 |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1680 | end -= 2 |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1681 | return text[:start] + 'x' * (end - start) + text[end:] |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1682 | |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1683 | |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1684 | def parse_udiff(diff, patterns=None, parent='.'): |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1685 | """Return a dictionary of matching lines.""" |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1686 | # For each file of the diff, the entry key is the filename, |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1687 | # and the value is a set of row numbers to consider. |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1688 | rv = {} |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1689 | path = nrows = None |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1690 | for line in diff.splitlines(): |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1691 | if nrows: |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1692 | if line[:1] != '-': |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1693 | nrows -= 1 |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1694 | continue |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1695 | if line[:3] == '@@ ': |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1696 | hunk_match = HUNK_REGEX.match(line) |
3616 | 1697 | (row, nrows) = [int(g or '1') for g in hunk_match.groups()] |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1698 | rv[path].update(range(row, row + nrows)) |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1699 | elif line[:3] == '+++': |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1700 | path = line[4:].split('\t', 1)[0] |
6246
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1701 | # Git diff will use (i)ndex, (w)ork tree, (c)ommit and (o)bject |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1702 | # instead of a/b/c/d as prefixes for patches |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1703 | if path[:2] in ('b/', 'w/', 'i/'): |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1704 | path = path[2:] |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1705 | rv[path] = set() |
4828 | 1706 | return dict([(os.path.join(parent, path), rows) |
1707 | for (path, rows) in rv.items() | |
1708 | if rows and filename_match(path, patterns)]) | |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1709 | |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1710 | |
3616 | 1711 | def normalize_paths(value, parent=os.curdir): |
1712 | """Parse a comma-separated list of paths. | |
1713 | ||
1714 | Return a list of absolute paths. | |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1715 | """ |
4828 | 1716 | if not value: |
1717 | return [] | |
1718 | if isinstance(value, list): | |
3616 | 1719 | return value |
1720 | paths = [] | |
1721 | for path in value.split(','): | |
4828 | 1722 | path = path.strip() |
3616 | 1723 | if '/' in path: |
1724 | path = os.path.abspath(os.path.join(parent, path)) | |
1725 | paths.append(path.rstrip('/')) | |
1726 | return paths | |
1727 | ||
1728 | ||
1729 | def filename_match(filename, patterns, default=True): | |
1730 | """Check if patterns contains a pattern that matches filename. | |
1731 | ||
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1732 | If patterns is unspecified, this always returns True. |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1733 | """ |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1734 | if not patterns: |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1735 | return default |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1736 | return any(fnmatch(filename, pattern) for pattern in patterns) |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1737 | |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1738 | |
5146
f96c32abd120
Updated the pep8 checker to version 2.1.0dev0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4828
diff
changeset
|
1739 | def update_counts(s, counts): |
f96c32abd120
Updated the pep8 checker to version 2.1.0dev0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4828
diff
changeset
|
1740 | r"""Adds one to the counts of each appearance of characters in s, |
f96c32abd120
Updated the pep8 checker to version 2.1.0dev0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4828
diff
changeset
|
1741 | for characters in counts""" |
f96c32abd120
Updated the pep8 checker to version 2.1.0dev0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4828
diff
changeset
|
1742 | for char in s: |
f96c32abd120
Updated the pep8 checker to version 2.1.0dev0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4828
diff
changeset
|
1743 | if char in counts: |
f96c32abd120
Updated the pep8 checker to version 2.1.0dev0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4828
diff
changeset
|
1744 | counts[char] += 1 |
f96c32abd120
Updated the pep8 checker to version 2.1.0dev0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4828
diff
changeset
|
1745 | |
f96c32abd120
Updated the pep8 checker to version 2.1.0dev0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4828
diff
changeset
|
1746 | |
4828 | 1747 | def _is_eol_token(token): |
1748 | return token[0] in NEWLINE or token[4][token[3][1]:].lstrip() == '\\\n' | |
5146
f96c32abd120
Updated the pep8 checker to version 2.1.0dev0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4828
diff
changeset
|
1749 | |
f96c32abd120
Updated the pep8 checker to version 2.1.0dev0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4828
diff
changeset
|
1750 | |
3616 | 1751 | if COMMENT_WITH_NL: |
4828 | 1752 | def _is_eol_token(token, _eol_token=_is_eol_token): |
1753 | return _eol_token(token) or (token[0] == tokenize.COMMENT and | |
1754 | token[1] == token[4]) | |
3616 | 1755 | |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1756 | ############################################################################## |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1757 | # Framework to run all checks |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1758 | ############################################################################## |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1759 | |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1760 | |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1761 | class Checker(object): |
3616 | 1762 | """Load a Python source file, tokenize it, check coding style.""" |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1763 | |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1764 | def __init__(self, filename=None, lines=None, |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1765 | options=None, report=None, **kwargs): |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1766 | if options is None: |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1767 | options = StyleGuide(kwargs).options |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1768 | else: |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1769 | assert not kwargs |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1770 | self._io_error = None |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1771 | self._physical_checks = options.physical_checks |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1772 | self._logical_checks = options.logical_checks |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1773 | self._ast_checks = options.ast_checks |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1774 | self.max_line_length = options.max_line_length |
3616 | 1775 | self.multiline = False # in a multiline string? |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1776 | self.hang_closing = options.hang_closing |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1777 | self.verbose = options.verbose |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1778 | self.filename = filename |
4828 | 1779 | # Dictionary where a checker can store its custom state. |
1780 | self._checker_states = {} | |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1781 | if filename is None: |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1782 | self.filename = 'stdin' |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1783 | self.lines = lines or [] |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1784 | elif filename == '-': |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1785 | self.filename = 'stdin' |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1786 | self.lines = stdin_get_value().splitlines(True) |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1787 | elif lines is None: |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1788 | try: |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1789 | self.lines = readlines(filename) |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1790 | except IOError: |
3616 | 1791 | (exc_type, exc) = sys.exc_info()[:2] |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1792 | self._io_error = '%s: %s' % (exc_type.__name__, exc) |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1793 | self.lines = [] |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1794 | else: |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1795 | self.lines = lines |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1796 | if self.lines: |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1797 | ord0 = ord(self.lines[0][0]) |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1798 | if ord0 in (0xef, 0xfeff): # Strip the UTF-8 BOM |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1799 | if ord0 == 0xfeff: |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1800 | self.lines[0] = self.lines[0][1:] |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1801 | elif self.lines[0][:3] == '\xef\xbb\xbf': |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1802 | self.lines[0] = self.lines[0][3:] |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1803 | self.report = report or options.report |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1804 | self.report_error = self.report.error |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1805 | self.report_error_args = self.report.error_args |
5146
f96c32abd120
Updated the pep8 checker to version 2.1.0dev0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4828
diff
changeset
|
1806 | self.noqa = False |
2910
cdc56e9d9f12
Optimized the PEP-8 naming checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2899
diff
changeset
|
1807 | |
3670
f0cb7579c0b4
Finished renaming eric5 for PyQt5 to eric6.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3629
diff
changeset
|
1808 | # added for eric6 integration |
2910
cdc56e9d9f12
Optimized the PEP-8 naming checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2899
diff
changeset
|
1809 | self.options = options |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1810 | |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1811 | def report_invalid_syntax(self): |
3616 | 1812 | """Check if the syntax is valid.""" |
1813 | (exc_type, exc) = sys.exc_info()[:2] | |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1814 | if len(exc.args) > 1: |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1815 | offset = exc.args[1] |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1816 | if len(offset) > 2: |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1817 | offset = offset[1:3] |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1818 | else: |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1819 | offset = (1, 0) |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1820 | 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
|
1821 | 'E901', self.report_invalid_syntax, |
88d2458a4739
Fixed an issue in the pep8.py checkers.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2866
diff
changeset
|
1822 | exc_type.__name__, exc.args[0]) |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1823 | |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1824 | def readline(self): |
3616 | 1825 | """Get the next line from the input buffer.""" |
1826 | if self.line_number >= self.total_lines: | |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1827 | return '' |
3616 | 1828 | line = self.lines[self.line_number] |
1829 | self.line_number += 1 | |
1830 | if self.indent_char is None and line[:1] in WHITESPACE: | |
1831 | self.indent_char = line[0] | |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1832 | return line |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1833 | |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1834 | def run_check(self, check, argument_names): |
3616 | 1835 | """Run a check plugin.""" |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1836 | arguments = [] |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1837 | for name in argument_names: |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1838 | arguments.append(getattr(self, name)) |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1839 | return check(*arguments) |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1840 | |
4828 | 1841 | def init_checker_state(self, name, argument_names): |
5288
ff831e3e383e
Update pycodestyle to official 2.1.0 version.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
5147
diff
changeset
|
1842 | """Prepare custom state for the specific checker plugin.""" |
4828 | 1843 | if 'checker_state' in argument_names: |
1844 | self.checker_state = self._checker_states.setdefault(name, {}) | |
1845 | ||
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1846 | def check_physical(self, line): |
3616 | 1847 | """Run all physical checks on a raw input line.""" |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1848 | self.physical_line = line |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1849 | for name, check, argument_names in self._physical_checks: |
4828 | 1850 | self.init_checker_state(name, argument_names) |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1851 | result = self.run_check(check, argument_names) |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1852 | if result is not None: |
3616 | 1853 | (offset, text) = result[:2] |
2607
e5115553185a
Fixes and consolidation for PEP8-checker.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
2302
diff
changeset
|
1854 | args = result[2:] |
3209
c5432abceb25
CodeStyleChecker moved to background service and done a little cleanup.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3145
diff
changeset
|
1855 | self.report_error_args( |
3616 | 1856 | self.line_number, offset, text, check, *args) |
1857 | if text[:4] == 'E101': | |
1858 | self.indent_char = line[0] | |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1859 | |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1860 | def build_tokens_line(self): |
3616 | 1861 | """Build a logical line from tokens.""" |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1862 | logical = [] |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1863 | comments = [] |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1864 | length = 0 |
3616 | 1865 | prev_row = prev_col = mapping = None |
1866 | for token_type, text, start, end, line in self.tokens: | |
1867 | if token_type in SKIP_TOKENS: | |
1868 | continue | |
1869 | if not mapping: | |
1870 | mapping = [(0, start)] | |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1871 | if token_type == tokenize.COMMENT: |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1872 | comments.append(text) |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1873 | continue |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1874 | if token_type == tokenize.STRING: |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1875 | text = mute_string(text) |
3616 | 1876 | if prev_row: |
1877 | (start_row, start_col) = start | |
1878 | if prev_row != start_row: # different row | |
1879 | prev_text = self.lines[prev_row - 1][prev_col - 1] | |
4828 | 1880 | if prev_text == ',' or (prev_text not in '{[(' and |
1881 | text not in '}])'): | |
3616 | 1882 | text = ' ' + text |
1883 | elif prev_col != start_col: # different column | |
1884 | text = line[prev_col:start_col] + text | |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1885 | logical.append(text) |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1886 | length += len(text) |
3616 | 1887 | mapping.append((length, end)) |
1888 | (prev_row, prev_col) = end | |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1889 | self.logical_line = ''.join(logical) |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1890 | self.noqa = comments and noqa(''.join(comments)) |
3616 | 1891 | return mapping |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1892 | |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1893 | def check_logical(self): |
3616 | 1894 | """Build a line from tokens and run all logical checks on it.""" |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1895 | self.report.increment_logical_line() |
3616 | 1896 | mapping = self.build_tokens_line() |
4828 | 1897 | if not mapping: |
1898 | return | |
1899 | ||
6246
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1900 | mapping_offsets = [offset for offset, _ in mapping] |
3616 | 1901 | (start_row, start_col) = mapping[0][1] |
1902 | start_line = self.lines[start_row - 1] | |
1903 | self.indent_level = expand_indent(start_line[:start_col]) | |
1904 | if self.blank_before < self.blank_lines: | |
1905 | self.blank_before = self.blank_lines | |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1906 | if self.verbose >= 2: |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1907 | print(self.logical_line[:80].rstrip()) |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1908 | for name, check, argument_names in self._logical_checks: |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1909 | if self.verbose >= 4: |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1910 | print(' ' + name) |
4828 | 1911 | self.init_checker_state(name, argument_names) |
1912 | for result in self.run_check(check, argument_names) or (): | |
3616 | 1913 | offset, text = result[:2] |
2607
e5115553185a
Fixes and consolidation for PEP8-checker.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
2302
diff
changeset
|
1914 | args = result[2:] |
3616 | 1915 | if not isinstance(offset, tuple): |
6246
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1916 | # As mappings are ordered, bisecting is a fast way |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1917 | # to find a given offset in them. |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1918 | token_offset, pos = mapping[bisect.bisect_left( |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1919 | mapping_offsets, offset)] |
3616 | 1920 | offset = (pos[0], pos[1] + offset - token_offset) |
3209
c5432abceb25
CodeStyleChecker moved to background service and done a little cleanup.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3145
diff
changeset
|
1921 | self.report_error_args( |
3616 | 1922 | offset[0], offset[1], text, check, *args) |
1923 | if self.logical_line: | |
1924 | self.previous_indent_level = self.indent_level | |
1925 | self.previous_logical = self.logical_line | |
5146
f96c32abd120
Updated the pep8 checker to version 2.1.0dev0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4828
diff
changeset
|
1926 | if not self.indent_level: |
f96c32abd120
Updated the pep8 checker to version 2.1.0dev0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4828
diff
changeset
|
1927 | self.previous_unindented_logical_line = self.logical_line |
3616 | 1928 | self.blank_lines = 0 |
1929 | self.tokens = [] | |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1930 | |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1931 | def check_ast(self): |
3616 | 1932 | """Build the file's AST and run all AST checks.""" |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1933 | try: |
5146
f96c32abd120
Updated the pep8 checker to version 2.1.0dev0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4828
diff
changeset
|
1934 | tree = compile(''.join(self.lines), '', 'exec', PyCF_ONLY_AST) |
4828 | 1935 | except (ValueError, SyntaxError, TypeError): |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1936 | return self.report_invalid_syntax() |
3616 | 1937 | for name, cls, __ in self._ast_checks: |
3670
f0cb7579c0b4
Finished renaming eric5 for PyQt5 to eric6.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3629
diff
changeset
|
1938 | # extended API for eric6 integration |
2910
cdc56e9d9f12
Optimized the PEP-8 naming checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2899
diff
changeset
|
1939 | checker = cls(tree, self.filename, self.options) |
2911 | 1940 | for args in checker.run(): |
3056
9986ec0e559a
Merge with default branch before style changes.
T.Rzepka <Tobias.Rzepka@gmail.com>
diff
changeset
|
1941 | lineno = args[0] |
3616 | 1942 | if not self.lines or not noqa(self.lines[lineno - 1]): |
3056
9986ec0e559a
Merge with default branch before style changes.
T.Rzepka <Tobias.Rzepka@gmail.com>
diff
changeset
|
1943 | self.report_error_args(lineno, *args[1:]) |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1944 | |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1945 | def generate_tokens(self): |
3616 | 1946 | """Tokenize the file, run physical line checks and yield tokens.""" |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1947 | if self._io_error: |
3616 | 1948 | self.report_error_args(1, 0, 'E902', self._io_error, readlines) |
1949 | tokengen = tokenize.generate_tokens(self.readline) | |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1950 | try: |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1951 | for token in tokengen: |
4828 | 1952 | if token[2][0] > self.total_lines: |
1953 | return | |
5146
f96c32abd120
Updated the pep8 checker to version 2.1.0dev0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4828
diff
changeset
|
1954 | self.noqa = token[4] and noqa(token[4]) |
3616 | 1955 | self.maybe_check_physical(token) |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1956 | yield token |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1957 | except (SyntaxError, tokenize.TokenError): |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1958 | self.report_invalid_syntax() |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1959 | |
3616 | 1960 | def maybe_check_physical(self, token): |
1961 | """If appropriate (based on token), check current physical line(s).""" | |
1962 | # Called after every token, but act only on end of line. | |
1963 | if _is_eol_token(token): | |
1964 | # Obviously, a newline token ends a single physical line. | |
1965 | self.check_physical(token[4]) | |
1966 | elif token[0] == tokenize.STRING and '\n' in token[1]: | |
1967 | # Less obviously, a string that contains newlines is a | |
1968 | # multiline string, either triple-quoted or with internal | |
1969 | # newlines backslash-escaped. Check every physical line in the | |
1970 | # string *except* for the last one: its newline is outside of | |
1971 | # the multiline string, so we consider it a regular physical | |
1972 | # line, and will check it like any other physical line. | |
1973 | # | |
1974 | # Subtleties: | |
1975 | # - we don't *completely* ignore the last line; if it contains | |
1976 | # the magical "# noqa" comment, we disable all physical | |
1977 | # checks for the entire multiline string | |
1978 | # - have to wind self.line_number back because initially it | |
1979 | # points to the last line of the string, and we want | |
1980 | # check_physical() to give accurate feedback | |
1981 | if noqa(token[4]): | |
1982 | return | |
1983 | self.multiline = True | |
1984 | self.line_number = token[2][0] | |
6246
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1985 | _, src, (_, offset), _, _ = token |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1986 | src = self.lines[self.line_number - 1][:offset] + src |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1987 | for line in src.split('\n')[:-1]: |
3616 | 1988 | self.check_physical(line + '\n') |
1989 | self.line_number += 1 | |
1990 | self.multiline = False | |
1991 | ||
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1992 | def check_all(self, expected=None, line_offset=0): |
3616 | 1993 | """Run all checks on the input file.""" |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1994 | self.report.init_file(self.filename, self.lines, expected, line_offset) |
3616 | 1995 | self.total_lines = len(self.lines) |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1996 | if self._ast_checks: |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
1997 | self.check_ast() |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1998 | self.line_number = 0 |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1999 | self.indent_char = None |
3616 | 2000 | self.indent_level = self.previous_indent_level = 0 |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
2001 | self.previous_logical = '' |
5146
f96c32abd120
Updated the pep8 checker to version 2.1.0dev0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4828
diff
changeset
|
2002 | self.previous_unindented_logical_line = '' |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
2003 | self.tokens = [] |
3616 | 2004 | self.blank_lines = self.blank_before = 0 |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
2005 | parens = 0 |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2006 | for token in self.generate_tokens(): |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2007 | self.tokens.append(token) |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2008 | token_type, text = token[0:2] |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2009 | if self.verbose >= 3: |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2010 | if token[2][0] == token[3][0]: |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2011 | pos = '[%s:%s]' % (token[2][1] or '', token[3][1]) |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2012 | else: |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2013 | pos = 'l.%s' % token[3][0] |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2014 | print('l.%s\t%s\t%s\t%r' % |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2015 | (token[2][0], pos, tokenize.tok_name[token[0]], text)) |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2016 | if token_type == tokenize.OP: |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2017 | 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
|
2018 | parens += 1 |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2019 | 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
|
2020 | parens -= 1 |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2021 | elif not parens: |
3616 | 2022 | if token_type in NEWLINE: |
2023 | if token_type == tokenize.NEWLINE: | |
2024 | self.check_logical() | |
2025 | self.blank_before = 0 | |
2026 | elif 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
|
2027 | # 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
|
2028 | self.blank_lines += 1 |
3616 | 2029 | del self.tokens[0] |
2030 | else: | |
2031 | self.check_logical() | |
2032 | elif COMMENT_WITH_NL and token_type == tokenize.COMMENT: | |
2033 | if len(self.tokens) == 1: | |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2034 | # The comment also ends a physical line |
3616 | 2035 | token = list(token) |
2036 | token[1] = text.rstrip('\r\n') | |
2037 | token[3] = (token[2][0], token[2][1] + len(token[1])) | |
2038 | self.tokens = [tuple(token)] | |
2039 | self.check_logical() | |
4828 | 2040 | if self.tokens: |
2041 | self.check_physical(self.lines[-1]) | |
3616 | 2042 | self.check_logical() |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2043 | return self.report.get_file_results() |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2044 | |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2045 | |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2046 | class BaseReport(object): |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2047 | """Collect the results of the checks.""" |
3616 | 2048 | |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2049 | print_filename = False |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2050 | |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2051 | def __init__(self, options): |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2052 | self._benchmark_keys = options.benchmark_keys |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2053 | self._ignore_code = options.ignore_code |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2054 | # Results |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2055 | self.elapsed = 0 |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2056 | self.total_errors = 0 |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2057 | self.counters = dict.fromkeys(self._benchmark_keys, 0) |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2058 | self.messages = {} |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2059 | |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2060 | def start(self): |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2061 | """Start the timer.""" |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2062 | self._start_time = time.time() |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2063 | |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2064 | def stop(self): |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2065 | """Stop the timer.""" |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2066 | self.elapsed = time.time() - self._start_time |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2067 | |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2068 | def init_file(self, filename, lines, expected, line_offset): |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2069 | """Signal a new file.""" |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2070 | self.filename = filename |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2071 | self.lines = lines |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2072 | self.expected = expected or () |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2073 | self.line_offset = line_offset |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2074 | self.file_errors = 0 |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2075 | self.counters['files'] += 1 |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2076 | self.counters['physical lines'] += len(lines) |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2077 | |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2078 | def increment_logical_line(self): |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2079 | """Signal a new logical line.""" |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2080 | self.counters['logical lines'] += 1 |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2081 | |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2082 | def error(self, line_number, offset, text, check): |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2083 | """Report an error, according to options.""" |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2084 | code = text[:4] |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2085 | if self._ignore_code(code): |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2086 | return |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2087 | if code in self.counters: |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2088 | self.counters[code] += 1 |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2089 | else: |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2090 | self.counters[code] = 1 |
3413
5e63f809732a
Code style checker: Translations extracted and refactored.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3209
diff
changeset
|
2091 | self.messages[code] = [] |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2092 | # Don't care about expected errors or warnings |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2093 | if code in self.expected: |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2094 | return |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2095 | if self.print_filename and not self.file_errors: |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2096 | print(self.filename) |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2097 | self.file_errors += 1 |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2098 | self.total_errors += 1 |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2099 | return code |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2100 | |
3616 | 2101 | def error_args(self, line_number, offset, text, check, *args): |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2102 | """Report an error, according to options.""" |
3616 | 2103 | code = text[:4] |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2104 | if self._ignore_code(code): |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2105 | return |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2106 | if code in self.counters: |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2107 | self.counters[code] += 1 |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2108 | else: |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2109 | self.counters[code] = 1 |
3413
5e63f809732a
Code style checker: Translations extracted and refactored.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3209
diff
changeset
|
2110 | self.messages[code] = args |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2111 | # Don't care about expected errors or warnings |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2112 | if code in self.expected: |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2113 | return |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2114 | if self.print_filename and not self.file_errors: |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2115 | print(self.filename) |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2116 | self.file_errors += 1 |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2117 | self.total_errors += 1 |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2118 | return code |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2119 | |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2120 | def get_file_results(self): |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2121 | """Return the count of errors and warnings for this file.""" |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
2122 | return self.file_errors |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
2123 | |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2124 | def get_count(self, prefix=''): |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2125 | """Return the total count of errors and warnings.""" |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2126 | return sum([self.counters[key] |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2127 | for key in self.messages if key.startswith(prefix)]) |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2128 | |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2129 | def get_statistics(self, prefix=''): |
3616 | 2130 | """Get statistics for message codes that start with the prefix. |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2131 | |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2132 | prefix='' matches all errors and warnings |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2133 | prefix='E' matches all errors |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2134 | prefix='W' matches all warnings |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2135 | prefix='E4' matches all errors that have to do with imports |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
2136 | """ |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2137 | return ['%-7s %s %s' % (self.counters[key], key, self.messages[key]) |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2138 | for key in sorted(self.messages) if key.startswith(prefix)] |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2139 | |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2140 | def print_statistics(self, prefix=''): |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2141 | """Print overall statistics (number of errors and warnings).""" |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2142 | for line in self.get_statistics(prefix): |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2143 | print(line) |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2144 | |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2145 | def print_benchmark(self): |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2146 | """Print benchmark numbers.""" |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2147 | print('%-7.2f %s' % (self.elapsed, 'seconds elapsed')) |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2148 | if self.elapsed: |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2149 | for key in self._benchmark_keys: |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2150 | print('%-7d %s per second (%d total)' % |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2151 | (self.counters[key] / self.elapsed, key, |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2152 | self.counters[key])) |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
2153 | |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
2154 | |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2155 | class FileReport(BaseReport): |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2156 | """Collect the results of the checks and print only the filenames.""" |
5288
ff831e3e383e
Update pycodestyle to official 2.1.0 version.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
5147
diff
changeset
|
2157 | |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2158 | print_filename = True |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
2159 | |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
2160 | |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2161 | class StandardReport(BaseReport): |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2162 | """Collect and print the results of the checks.""" |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2163 | |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2164 | def __init__(self, options): |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2165 | super(StandardReport, self).__init__(options) |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2166 | self._fmt = REPORT_FORMAT.get(options.format.lower(), |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2167 | options.format) |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2168 | self._repeat = options.repeat |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2169 | self._show_source = options.show_source |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2170 | self._show_pep8 = options.show_pep8 |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2171 | |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2172 | def init_file(self, filename, lines, expected, line_offset): |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2173 | """Signal a new file.""" |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2174 | self._deferred_print = [] |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2175 | return super(StandardReport, self).init_file( |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2176 | filename, lines, expected, line_offset) |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2177 | |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2178 | def error(self, line_number, offset, text, check): |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2179 | """Report an error, according to options.""" |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2180 | code = super(StandardReport, self).error(line_number, offset, |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2181 | text, check) |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2182 | if code and (self.counters[code] == 1 or self._repeat): |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2183 | self._deferred_print.append( |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2184 | (line_number, offset, code, text[5:], check.__doc__)) |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2185 | return code |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2186 | |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2187 | def error_args(self, line_number, offset, code, check, *args): |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2188 | """Report an error, according to options.""" |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2189 | code = super(StandardReport, self).error_args(line_number, offset, |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2190 | code, check, *args) |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2191 | if code and (self.counters[code] == 1 or self._repeat): |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2192 | self._deferred_print.append( |
3413
5e63f809732a
Code style checker: Translations extracted and refactored.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3209
diff
changeset
|
2193 | (line_number, offset, code, args, check.__doc__)) |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2194 | return code |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2195 | |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2196 | def get_file_results(self): |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2197 | """Print the result and return the overall count for this file.""" |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2198 | self._deferred_print.sort() |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2199 | for line_number, offset, code, text, doc in self._deferred_print: |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2200 | print(self._fmt % { |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2201 | 'path': self.filename, |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2202 | 'row': self.line_offset + line_number, 'col': offset + 1, |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2203 | 'code': code, 'text': text, |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2204 | }) |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2205 | if self._show_source: |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2206 | if line_number > len(self.lines): |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2207 | line = '' |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2208 | else: |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2209 | line = self.lines[line_number - 1] |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2210 | print(line.rstrip()) |
3616 | 2211 | print(re.sub(r'\S', ' ', line[:offset]) + '^') |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2212 | if self._show_pep8 and doc: |
3616 | 2213 | print(' ' + doc.strip()) |
4828 | 2214 | |
2215 | # stdout is block buffered when not stdout.isatty(). | |
2216 | # line can be broken where buffer boundary since other processes | |
2217 | # write to same file. | |
2218 | # flush() after print() to avoid buffer boundary. | |
2219 | # Typical buffer size is 8192. line written safely when | |
2220 | # len(line) < 8192. | |
2221 | sys.stdout.flush() | |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2222 | return self.file_errors |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
2223 | |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
2224 | |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2225 | class DiffReport(StandardReport): |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2226 | """Collect and print the results for the changed lines only.""" |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2227 | |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2228 | def __init__(self, options): |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2229 | super(DiffReport, self).__init__(options) |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2230 | self._selected = options.selected_lines |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2231 | |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2232 | def error(self, line_number, offset, text, check): |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2233 | if line_number not in self._selected[self.filename]: |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2234 | return |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2235 | return super(DiffReport, self).error(line_number, offset, text, check) |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
2236 | |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
2237 | |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2238 | class StyleGuide(object): |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2239 | """Initialize a PEP-8 instance with few options.""" |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2240 | |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2241 | def __init__(self, *args, **kwargs): |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2242 | # build options from the command line |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2243 | self.checker_class = kwargs.pop('checker_class', Checker) |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2244 | parse_argv = kwargs.pop('parse_argv', False) |
4828 | 2245 | config_file = kwargs.pop('config_file', False) |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2246 | parser = kwargs.pop('parser', None) |
3616 | 2247 | # build options from dict |
2248 | options_dict = dict(*args, **kwargs) | |
2249 | arglist = None if parse_argv else options_dict.get('paths', None) | |
6246
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
2250 | verbose = options_dict.get('verbose', None) |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2251 | options, self.paths = process_options( |
6246
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
2252 | arglist, parse_argv, config_file, parser, verbose) |
3616 | 2253 | if options_dict: |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2254 | options.__dict__.update(options_dict) |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2255 | if 'paths' in options_dict: |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2256 | self.paths = options_dict['paths'] |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2257 | |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2258 | self.runner = self.input_file |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2259 | self.options = options |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2260 | |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2261 | if not options.reporter: |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2262 | options.reporter = BaseReport if options.quiet else StandardReport |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2263 | |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2264 | options.select = tuple(options.select or ()) |
3617
2f859c5dcfb4
Avoid fallback to default ignore list if not messages explicitly selected or ignored
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3616
diff
changeset
|
2265 | # if not (options.select or options.ignore or |
2f859c5dcfb4
Avoid fallback to default ignore list if not messages explicitly selected or ignored
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3616
diff
changeset
|
2266 | # options.testsuite or options.doctest) and DEFAULT_IGNORE: |
2f859c5dcfb4
Avoid fallback to default ignore list if not messages explicitly selected or ignored
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3616
diff
changeset
|
2267 | # # The default choice: ignore controversial checks |
2f859c5dcfb4
Avoid fallback to default ignore list if not messages explicitly selected or ignored
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3616
diff
changeset
|
2268 | # options.ignore = tuple(DEFAULT_IGNORE.split(',')) |
2f859c5dcfb4
Avoid fallback to default ignore list if not messages explicitly selected or ignored
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3616
diff
changeset
|
2269 | # else: |
5146
f96c32abd120
Updated the pep8 checker to version 2.1.0dev0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4828
diff
changeset
|
2270 | # # Ignore all checks which are not explicitly selected or all if no |
f96c32abd120
Updated the pep8 checker to version 2.1.0dev0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4828
diff
changeset
|
2271 | # options.ignore = ('',) if options.select else tuple(options.ignore) |
4828 | 2272 | |
3617
2f859c5dcfb4
Avoid fallback to default ignore list if not messages explicitly selected or ignored
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3616
diff
changeset
|
2273 | # check is ignored or explicitly selected |
2f859c5dcfb4
Avoid fallback to default ignore list if not messages explicitly selected or ignored
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3616
diff
changeset
|
2274 | options.ignore = ('',) if options.select else tuple(options.ignore) |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2275 | options.benchmark_keys = BENCHMARK_KEYS[:] |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2276 | options.ignore_code = self.ignore_code |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2277 | options.physical_checks = self.get_checks('physical_line') |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2278 | options.logical_checks = self.get_checks('logical_line') |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2279 | options.ast_checks = self.get_checks('tree') |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2280 | self.init_report() |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2281 | |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2282 | def init_report(self, reporter=None): |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2283 | """Initialize the report instance.""" |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2284 | self.options.report = (reporter or self.options.reporter)(self.options) |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2285 | return self.options.report |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
2286 | |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2287 | def check_files(self, paths=None): |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2288 | """Run all checks on the paths.""" |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2289 | if paths is None: |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2290 | paths = self.paths |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2291 | report = self.options.report |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2292 | runner = self.runner |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2293 | report.start() |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2294 | try: |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2295 | for path in paths: |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2296 | if os.path.isdir(path): |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2297 | self.input_dir(path) |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2298 | elif not self.excluded(path): |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2299 | runner(path) |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2300 | except KeyboardInterrupt: |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2301 | print('... stopped') |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2302 | report.stop() |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2303 | return report |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
2304 | |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2305 | def input_file(self, filename, lines=None, expected=None, line_offset=0): |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2306 | """Run all checks on a Python source file.""" |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2307 | if self.options.verbose: |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2308 | print('checking %s' % filename) |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2309 | fchecker = self.checker_class( |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2310 | filename, lines=lines, options=self.options) |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2311 | return fchecker.check_all(expected=expected, line_offset=line_offset) |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2312 | |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2313 | def input_dir(self, dirname): |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2314 | """Check all files in this directory and all subdirectories.""" |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2315 | dirname = dirname.rstrip('/') |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2316 | if self.excluded(dirname): |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2317 | return 0 |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2318 | counters = self.options.report.counters |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2319 | verbose = self.options.verbose |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2320 | filepatterns = self.options.filename |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2321 | runner = self.runner |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2322 | for root, dirs, files in os.walk(dirname): |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2323 | if verbose: |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2324 | print('directory ' + root) |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2325 | counters['directories'] += 1 |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2326 | for subdir in sorted(dirs): |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2327 | if self.excluded(subdir, root): |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2328 | dirs.remove(subdir) |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2329 | for filename in sorted(files): |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2330 | # contain a pattern that matches? |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2331 | if ((filename_match(filename, filepatterns) and |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2332 | not self.excluded(filename, root))): |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2333 | runner(os.path.join(root, filename)) |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2334 | |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2335 | def excluded(self, filename, parent=None): |
3616 | 2336 | """Check if the file should be excluded. |
2337 | ||
2338 | Check if 'options.exclude' contains a pattern that matches filename. | |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2339 | """ |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2340 | if not self.options.exclude: |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
2341 | return False |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2342 | basename = os.path.basename(filename) |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2343 | if filename_match(basename, self.options.exclude): |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
2344 | return True |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2345 | if parent: |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2346 | filename = os.path.join(parent, filename) |
3616 | 2347 | filename = os.path.abspath(filename) |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2348 | return filename_match(filename, self.options.exclude) |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
2349 | |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2350 | def ignore_code(self, code): |
3616 | 2351 | """Check if the error code should be ignored. |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
2352 | |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2353 | If 'options.select' contains a prefix of the error code, |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2354 | return False. Else, if 'options.ignore' contains a prefix of |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2355 | the error code, return True. |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2356 | """ |
3616 | 2357 | if len(code) < 4 and any(s.startswith(code) |
2358 | for s in self.options.select): | |
2359 | return False | |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2360 | return (code.startswith(self.options.ignore) and |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2361 | not code.startswith(self.options.select)) |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
2362 | |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2363 | def get_checks(self, argument_name): |
3616 | 2364 | """Get all the checks for this category. |
2365 | ||
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2366 | Find all globally visible functions where the first argument name |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2367 | starts with argument_name and which contain selected tests. |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2368 | """ |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2369 | checks = [] |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2370 | for check, attrs in _checks[argument_name].items(): |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2371 | (codes, args) = attrs |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2372 | if any(not (code and self.ignore_code(code)) for code in codes): |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2373 | checks.append((check.__name__, check, args)) |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2374 | return sorted(checks) |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
2375 | |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
2376 | |
5146
f96c32abd120
Updated the pep8 checker to version 2.1.0dev0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4828
diff
changeset
|
2377 | def get_parser(prog='pycodestyle', version=__version__): |
f96c32abd120
Updated the pep8 checker to version 2.1.0dev0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4828
diff
changeset
|
2378 | """Create the parser for the program.""" |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2379 | parser = OptionParser(prog=prog, version=version, |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
2380 | usage="%prog [options] input ...") |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2381 | parser.config_options = [ |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2382 | 'exclude', 'filename', 'select', 'ignore', 'max-line-length', |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2383 | 'hang-closing', 'count', 'format', 'quiet', 'show-pep8', |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2384 | 'show-source', 'statistics', 'verbose'] |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
2385 | parser.add_option('-v', '--verbose', default=0, action='count', |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
2386 | help="print status messages, or debug with -vv") |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
2387 | parser.add_option('-q', '--quiet', default=0, action='count', |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
2388 | help="report only file names, or nothing with -qq") |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2389 | parser.add_option('-r', '--repeat', default=True, action='store_true', |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2390 | help="(obsolete) show all occurrences of the same error") |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2391 | parser.add_option('--first', action='store_false', dest='repeat', |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2392 | help="show first occurrence of each error") |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
2393 | parser.add_option('--exclude', metavar='patterns', default=DEFAULT_EXCLUDE, |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
2394 | help="exclude files or directories which match these " |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2395 | "comma separated patterns (default: %default)") |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
2396 | parser.add_option('--filename', metavar='patterns', default='*.py', |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
2397 | help="when parsing directories, only check filenames " |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2398 | "matching these comma separated patterns " |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2399 | "(default: %default)") |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
2400 | parser.add_option('--select', metavar='errors', default='', |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
2401 | help="select errors and warnings (e.g. E,W6)") |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
2402 | parser.add_option('--ignore', metavar='errors', default='', |
4828 | 2403 | help="skip errors and warnings (e.g. E4,W) " |
2404 | "(default: %s)" % DEFAULT_IGNORE) | |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
2405 | parser.add_option('--show-source', action='store_true', |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
2406 | help="show source code for each error") |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
2407 | parser.add_option('--show-pep8', action='store_true', |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2408 | help="show text of PEP 8 for each error " |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2409 | "(implies --first)") |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
2410 | parser.add_option('--statistics', action='store_true', |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
2411 | help="count errors and warnings") |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
2412 | parser.add_option('--count', action='store_true', |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
2413 | help="print total number of errors and warnings " |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2414 | "to standard error and set exit code to 1 if " |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2415 | "total is not null") |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2416 | parser.add_option('--max-line-length', type='int', metavar='n', |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2417 | default=MAX_LINE_LENGTH, |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2418 | help="set maximum allowed line length " |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2419 | "(default: %default)") |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2420 | parser.add_option('--hang-closing', action='store_true', |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2421 | help="hang closing bracket instead of matching " |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2422 | "indentation of opening bracket's line") |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2423 | parser.add_option('--format', metavar='format', default='default', |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2424 | help="set the error format [default|pylint|<custom>]") |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2425 | parser.add_option('--diff', action='store_true', |
4828 | 2426 | help="report changes only within line number ranges in " |
2427 | "the unified diff received on STDIN") | |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2428 | group = parser.add_option_group("Testing Options") |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2429 | if os.path.exists(TESTSUITE_PATH): |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2430 | group.add_option('--testsuite', metavar='dir', |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2431 | help="run regression tests from dir") |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2432 | group.add_option('--doctest', action='store_true', |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2433 | help="run doctest on myself") |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2434 | group.add_option('--benchmark', action='store_true', |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2435 | help="measure processing speed") |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2436 | return parser |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2437 | |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2438 | |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2439 | def read_config(options, args, arglist, parser): |
5288
ff831e3e383e
Update pycodestyle to official 2.1.0 version.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
5147
diff
changeset
|
2440 | """Read and parse configurations. |
4828 | 2441 | |
2442 | If a config file is specified on the command line with the "--config" | |
2443 | option, then only it is used for configuration. | |
2444 | ||
5146
f96c32abd120
Updated the pep8 checker to version 2.1.0dev0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4828
diff
changeset
|
2445 | Otherwise, the user configuration (~/.config/pycodestyle) and any local |
4828 | 2446 | configurations in the current directory or above will be merged together |
2447 | (in that order) using the read method of ConfigParser. | |
2448 | """ | |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2449 | config = RawConfigParser() |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2450 | |
4828 | 2451 | cli_conf = options.config |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2452 | |
3616 | 2453 | local_dir = os.curdir |
4828 | 2454 | |
2455 | if USER_CONFIG and os.path.isfile(USER_CONFIG): | |
2456 | if options.verbose: | |
2457 | print('user configuration: %s' % USER_CONFIG) | |
2458 | config.read(USER_CONFIG) | |
2459 | ||
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2460 | parent = tail = args and os.path.abspath(os.path.commonprefix(args)) |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2461 | while tail: |
4828 | 2462 | if config.read(os.path.join(parent, fn) for fn in PROJECT_CONFIG): |
3616 | 2463 | local_dir = parent |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2464 | if options.verbose: |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2465 | print('local configuration: in %s' % parent) |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2466 | break |
3616 | 2467 | (parent, tail) = os.path.split(parent) |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2468 | |
4828 | 2469 | if cli_conf and os.path.isfile(cli_conf): |
2470 | if options.verbose: | |
2471 | print('cli configuration: %s' % cli_conf) | |
2472 | config.read(cli_conf) | |
2473 | ||
5288
ff831e3e383e
Update pycodestyle to official 2.1.0 version.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
5147
diff
changeset
|
2474 | pycodestyle_section = None |
ff831e3e383e
Update pycodestyle to official 2.1.0 version.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
5147
diff
changeset
|
2475 | if config.has_section(parser.prog): |
ff831e3e383e
Update pycodestyle to official 2.1.0 version.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
5147
diff
changeset
|
2476 | pycodestyle_section = parser.prog |
ff831e3e383e
Update pycodestyle to official 2.1.0 version.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
5147
diff
changeset
|
2477 | elif config.has_section('pep8'): |
ff831e3e383e
Update pycodestyle to official 2.1.0 version.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
5147
diff
changeset
|
2478 | pycodestyle_section = 'pep8' # Deprecated |
ff831e3e383e
Update pycodestyle to official 2.1.0 version.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
5147
diff
changeset
|
2479 | warnings.warn('[pep8] section is deprecated. Use [pycodestyle].') |
ff831e3e383e
Update pycodestyle to official 2.1.0 version.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
5147
diff
changeset
|
2480 | |
ff831e3e383e
Update pycodestyle to official 2.1.0 version.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
5147
diff
changeset
|
2481 | if pycodestyle_section: |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2482 | option_list = dict([(o.dest, o.type or o.action) |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2483 | for o in parser.option_list]) |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2484 | |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2485 | # First, read the default values |
3616 | 2486 | (new_options, __) = parser.parse_args([]) |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2487 | |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2488 | # Second, parse the configuration |
5288
ff831e3e383e
Update pycodestyle to official 2.1.0 version.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
5147
diff
changeset
|
2489 | for opt in config.options(pycodestyle_section): |
4828 | 2490 | if opt.replace('_', '-') not in parser.config_options: |
2491 | print(" unknown option '%s' ignored" % opt) | |
2492 | continue | |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2493 | if options.verbose > 1: |
5288
ff831e3e383e
Update pycodestyle to official 2.1.0 version.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
5147
diff
changeset
|
2494 | print(" %s = %s" % (opt, |
ff831e3e383e
Update pycodestyle to official 2.1.0 version.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
5147
diff
changeset
|
2495 | config.get(pycodestyle_section, opt))) |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2496 | normalized_opt = opt.replace('-', '_') |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2497 | opt_type = option_list[normalized_opt] |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2498 | if opt_type in ('int', 'count'): |
5288
ff831e3e383e
Update pycodestyle to official 2.1.0 version.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
5147
diff
changeset
|
2499 | value = config.getint(pycodestyle_section, opt) |
5146
f96c32abd120
Updated the pep8 checker to version 2.1.0dev0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4828
diff
changeset
|
2500 | elif opt_type in ('store_true', 'store_false'): |
5288
ff831e3e383e
Update pycodestyle to official 2.1.0 version.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
5147
diff
changeset
|
2501 | value = config.getboolean(pycodestyle_section, opt) |
5146
f96c32abd120
Updated the pep8 checker to version 2.1.0dev0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4828
diff
changeset
|
2502 | else: |
5288
ff831e3e383e
Update pycodestyle to official 2.1.0 version.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
5147
diff
changeset
|
2503 | value = config.get(pycodestyle_section, opt) |
3616 | 2504 | if normalized_opt == 'exclude': |
2505 | value = normalize_paths(value, local_dir) | |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2506 | setattr(new_options, normalized_opt, value) |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2507 | |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2508 | # Third, overwrite with the command-line options |
3616 | 2509 | (options, __) = parser.parse_args(arglist, values=new_options) |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2510 | options.doctest = options.testsuite = False |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2511 | return options |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2512 | |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2513 | |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2514 | def process_options(arglist=None, parse_argv=False, config_file=None, |
6246
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
2515 | parser=None, verbose=None): |
4828 | 2516 | """Process options passed either via arglist or via command line args. |
2517 | ||
2518 | Passing in the ``config_file`` parameter allows other tools, such as flake8 | |
5146
f96c32abd120
Updated the pep8 checker to version 2.1.0dev0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4828
diff
changeset
|
2519 | to specify their own options to be processed in pycodestyle. |
4828 | 2520 | """ |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2521 | if not parser: |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2522 | parser = get_parser() |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2523 | if not parser.has_option('--config'): |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2524 | group = parser.add_option_group("Configuration", description=( |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2525 | "The project options are read from the [%s] section of the " |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2526 | "tox.ini file or the setup.cfg file located in any parent folder " |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2527 | "of the path(s) being processed. Allowed options are: %s." % |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2528 | (parser.prog, ', '.join(parser.config_options)))) |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2529 | group.add_option('--config', metavar='path', default=config_file, |
4828 | 2530 | help="user config file location") |
3616 | 2531 | # Don't read the command line if the module is used as a library. |
2532 | if not arglist and not parse_argv: | |
2533 | arglist = [] | |
2534 | # If parse_argv is True and arglist is None, arguments are | |
2535 | # parsed from the command line (sys.argv) | |
2536 | (options, args) = parser.parse_args(arglist) | |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2537 | options.reporter = None |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2538 | |
6246
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
2539 | # If explicity specified verbosity, override any `-v` CLI flag |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
2540 | if verbose is not None: |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
2541 | options.verbose = verbose |
fe07a9f16f23
Updated pycodestyle to 2.4.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
2542 | |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2543 | if options.ensure_value('testsuite', False): |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
2544 | args.append(options.testsuite) |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2545 | elif not options.ensure_value('doctest', False): |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2546 | if parse_argv and not args: |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2547 | if options.diff or any(os.path.exists(name) |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2548 | for name in PROJECT_CONFIG): |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2549 | args = ['.'] |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2550 | else: |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2551 | parser.error('input not specified') |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2552 | options = read_config(options, args, arglist, parser) |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2553 | options.reporter = parse_argv and options.quiet == 1 and FileReport |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2554 | |
4828 | 2555 | options.filename = _parse_multi_options(options.filename) |
3616 | 2556 | options.exclude = normalize_paths(options.exclude) |
4828 | 2557 | options.select = _parse_multi_options(options.select) |
2558 | options.ignore = _parse_multi_options(options.ignore) | |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2559 | |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2560 | if options.diff: |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2561 | options.reporter = DiffReport |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2562 | stdin = stdin_get_value() |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2563 | options.selected_lines = parse_udiff(stdin, options.filename, args[0]) |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2564 | args = sorted(options.selected_lines) |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2565 | |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
2566 | return options, args |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
2567 | |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
2568 | |
4828 | 2569 | def _parse_multi_options(options, split_token=','): |
2570 | r"""Split and strip and discard empties. | |
2571 | ||
2572 | Turns the following: | |
2573 | ||
2574 | A, | |
2575 | B, | |
2576 | ||
2577 | into ["A", "B"] | |
2578 | """ | |
2579 | if options: | |
2580 | return [o.strip() for o in options.split(split_token) if o.strip()] | |
2581 | else: | |
2582 | return options | |
2583 | ||
2584 | ||
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
2585 | def _main(): |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2586 | """Parse options and run checks on Python source.""" |
4828 | 2587 | import signal |
2588 | ||
2589 | # Handle "Broken pipe" gracefully | |
2590 | try: | |
2591 | signal.signal(signal.SIGPIPE, lambda signum, frame: sys.exit(1)) | |
2592 | except AttributeError: | |
2593 | pass # not supported on Windows | |
2594 | ||
5146
f96c32abd120
Updated the pep8 checker to version 2.1.0dev0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4828
diff
changeset
|
2595 | style_guide = StyleGuide(parse_argv=True) |
f96c32abd120
Updated the pep8 checker to version 2.1.0dev0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4828
diff
changeset
|
2596 | options = style_guide.options |
4828 | 2597 | |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2598 | if options.doctest or options.testsuite: |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2599 | from testsuite.support import run_tests |
5146
f96c32abd120
Updated the pep8 checker to version 2.1.0dev0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4828
diff
changeset
|
2600 | report = run_tests(style_guide) |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
2601 | else: |
5146
f96c32abd120
Updated the pep8 checker to version 2.1.0dev0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4828
diff
changeset
|
2602 | report = style_guide.check_files() |
4828 | 2603 | |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
2604 | if options.statistics: |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2605 | report.print_statistics() |
4828 | 2606 | |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
2607 | if options.benchmark: |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2608 | report.print_benchmark() |
4828 | 2609 | |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2610 | if options.testsuite and not options.quiet: |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2611 | report.print_results() |
4828 | 2612 | |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2613 | if report.total_errors: |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
2614 | if options.count: |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2861
diff
changeset
|
2615 | sys.stderr.write(str(report.total_errors) + '\n') |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
2616 | sys.exit(1) |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
2617 | |
5288
ff831e3e383e
Update pycodestyle to official 2.1.0 version.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
5147
diff
changeset
|
2618 | |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
2619 | if __name__ == '__main__': |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
2620 | _main() |
4555
861e1741985c
Adjustments to future imports for Python 2 compatibility.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
4331
diff
changeset
|
2621 | # |
5288
ff831e3e383e
Update pycodestyle to official 2.1.0 version.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
5147
diff
changeset
|
2622 | # eflag: noqa = D2, M601, M701, M702, M801 |