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