Sun, 14 Apr 2019 15:09:21 +0200
Major restructuring of the source tree to get prepared for a setup.py based installation.
849
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1 | # -*- coding: utf-8 -*- |
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
2 | |
6645
ad476851d7e0
Updated copyright for 2019.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6265
diff
changeset
|
3 | # Copyright (c) 2011 - 2019 Detlev Offenbach <detlev@die-offenbachs.de> |
849
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
4 | # |
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
5 | |
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
6 | """ |
2912
9ff696796092
Changed some display and source docu strings in the code style checker to make them more universal because the scope goes beyond PEP-8.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2895
diff
changeset
|
7 | Module implementing a class to fix certain code style issues. |
849
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
8 | """ |
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
9 | |
3745
4c6f1782f530
Possible exception on fixing code styles fixed (only Python2).
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3621
diff
changeset
|
10 | from __future__ import unicode_literals |
3209
c5432abceb25
CodeStyleChecker moved to background service and done a little cleanup.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3145
diff
changeset
|
11 | try: |
c5432abceb25
CodeStyleChecker moved to background service and done a little cleanup.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3145
diff
changeset
|
12 | # Python 2 |
c5432abceb25
CodeStyleChecker moved to background service and done a little cleanup.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3145
diff
changeset
|
13 | from StringIO import StringIO # __IGNORE_EXCEPTION__ |
c5432abceb25
CodeStyleChecker moved to background service and done a little cleanup.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3145
diff
changeset
|
14 | except ImportError: |
c5432abceb25
CodeStyleChecker moved to background service and done a little cleanup.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3145
diff
changeset
|
15 | # Python 3 |
c5432abceb25
CodeStyleChecker moved to background service and done a little cleanup.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3145
diff
changeset
|
16 | from io import StringIO # __IGNORE_WARNING__ |
849
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
17 | import os |
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
18 | import re |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
19 | import tokenize |
849
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
20 | |
3228
f489068e51e8
Bugfixes to work under Python3 and unicode issues for Python2 fixed.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3209
diff
changeset
|
21 | # CodeStyleCheckerDialog tries to import FixableCodeStyleIssues what fail under |
f489068e51e8
Bugfixes to work under Python3 and unicode issues for Python2 fixed.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3209
diff
changeset
|
22 | # Python3. So ignore it. |
f489068e51e8
Bugfixes to work under Python3 and unicode issues for Python2 fixed.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3209
diff
changeset
|
23 | try: |
5147
d39dd5cee0c8
Renamed pep8.py to pycodestyle.py in order to track the upstream renaming.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4830
diff
changeset
|
24 | import pycodestyle |
3228
f489068e51e8
Bugfixes to work under Python3 and unicode issues for Python2 fixed.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3209
diff
changeset
|
25 | except ImportError: |
f489068e51e8
Bugfixes to work under Python3 and unicode issues for Python2 fixed.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3209
diff
changeset
|
26 | pass |
849
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
27 | |
2978
9d63132a23e0
Continued changing the names of the various code style checkers to make them more appropriate to the broadened scope.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2976
diff
changeset
|
28 | FixableCodeStyleIssues = [ |
9d63132a23e0
Continued changing the names of the various code style checkers to make them more appropriate to the broadened scope.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2976
diff
changeset
|
29 | "D111", "D112", "D113", "D121", "D131", "D141", |
9d63132a23e0
Continued changing the names of the various code style checkers to make them more appropriate to the broadened scope.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2976
diff
changeset
|
30 | "D142", "D143", "D144", "D145", |
9d63132a23e0
Continued changing the names of the various code style checkers to make them more appropriate to the broadened scope.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2976
diff
changeset
|
31 | "D221", "D222", "D231", "D242", "D243", "D244", |
9d63132a23e0
Continued changing the names of the various code style checkers to make them more appropriate to the broadened scope.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2976
diff
changeset
|
32 | "D245", "D246", "D247", |
9d63132a23e0
Continued changing the names of the various code style checkers to make them more appropriate to the broadened scope.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2976
diff
changeset
|
33 | "E101", "E111", "E121", "E122", "E123", "E124", |
9d63132a23e0
Continued changing the names of the various code style checkers to make them more appropriate to the broadened scope.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2976
diff
changeset
|
34 | "E125", "E126", "E127", "E128", "E133", "E201", |
9d63132a23e0
Continued changing the names of the various code style checkers to make them more appropriate to the broadened scope.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2976
diff
changeset
|
35 | "E202", "E203", "E211", "E221", "E222", "E223", |
9d63132a23e0
Continued changing the names of the various code style checkers to make them more appropriate to the broadened scope.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2976
diff
changeset
|
36 | "E224", "E225", "E226", "E227", "E228", "E231", |
9d63132a23e0
Continued changing the names of the various code style checkers to make them more appropriate to the broadened scope.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2976
diff
changeset
|
37 | "E241", "E242", "E251", "E261", "E262", "E271", |
9d63132a23e0
Continued changing the names of the various code style checkers to make them more appropriate to the broadened scope.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2976
diff
changeset
|
38 | "E272", "E273", "E274", "E301", "E302", "E303", |
6264
04a671fa4adb
code style checker: extended the dialog to be able to define the number of blank lines before class and function/method definitions
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6188
diff
changeset
|
39 | "E304", "E305", "E306", "E307", "E308", "E401", |
04a671fa4adb
code style checker: extended the dialog to be able to define the number of blank lines before class and function/method definitions
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6188
diff
changeset
|
40 | "E501", "E502", "E701", "E702", "E703", "E711", |
04a671fa4adb
code style checker: extended the dialog to be able to define the number of blank lines before class and function/method definitions
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6188
diff
changeset
|
41 | "E712", |
2978
9d63132a23e0
Continued changing the names of the various code style checkers to make them more appropriate to the broadened scope.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2976
diff
changeset
|
42 | "N804", "N805", "N806", |
9d63132a23e0
Continued changing the names of the various code style checkers to make them more appropriate to the broadened scope.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2976
diff
changeset
|
43 | "W191", "W291", "W292", "W293", "W391", "W603", |
9d63132a23e0
Continued changing the names of the various code style checkers to make them more appropriate to the broadened scope.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2976
diff
changeset
|
44 | ] |
849
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
45 | |
945
8cd4d08fa9f6
Made code mostly PEP 8 compliant (except all whitespace and line length).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
869
diff
changeset
|
46 | |
3209
c5432abceb25
CodeStyleChecker moved to background service and done a little cleanup.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3145
diff
changeset
|
47 | class CodeStyleFixer(object): |
849
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
48 | """ |
2912
9ff696796092
Changed some display and source docu strings in the code style checker to make them more universal because the scope goes beyond PEP-8.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2895
diff
changeset
|
49 | Class implementing a fixer for certain code style issues. |
849
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
50 | """ |
3209
c5432abceb25
CodeStyleChecker moved to background service and done a little cleanup.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3145
diff
changeset
|
51 | def __init__(self, filename, sourceLines, fixCodes, noFixCodes, |
6264
04a671fa4adb
code style checker: extended the dialog to be able to define the number of blank lines before class and function/method definitions
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6188
diff
changeset
|
52 | maxLineLength, blankLines, inPlace, eol, backup=False): |
849
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
53 | """ |
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
54 | Constructor |
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
55 | |
6264
04a671fa4adb
code style checker: extended the dialog to be able to define the number of blank lines before class and function/method definitions
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6188
diff
changeset
|
56 | @param filename name of the file to be fixed |
04a671fa4adb
code style checker: extended the dialog to be able to define the number of blank lines before class and function/method definitions
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6188
diff
changeset
|
57 | @type str |
849
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
58 | @param sourceLines list of source lines including eol marker |
6264
04a671fa4adb
code style checker: extended the dialog to be able to define the number of blank lines before class and function/method definitions
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6188
diff
changeset
|
59 | @type list of str |
849
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
60 | @param fixCodes list of codes to be fixed as a comma separated |
6264
04a671fa4adb
code style checker: extended the dialog to be able to define the number of blank lines before class and function/method definitions
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6188
diff
changeset
|
61 | string |
04a671fa4adb
code style checker: extended the dialog to be able to define the number of blank lines before class and function/method definitions
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6188
diff
changeset
|
62 | @type str |
2876
bfa39cf40277
Extended the PEP-8 dialog to select fixable issues manually (i.e. fix only the selected issues).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2875
diff
changeset
|
63 | @param noFixCodes list of codes not to be fixed as a comma |
6264
04a671fa4adb
code style checker: extended the dialog to be able to define the number of blank lines before class and function/method definitions
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6188
diff
changeset
|
64 | separated string |
04a671fa4adb
code style checker: extended the dialog to be able to define the number of blank lines before class and function/method definitions
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6188
diff
changeset
|
65 | @type str |
04a671fa4adb
code style checker: extended the dialog to be able to define the number of blank lines before class and function/method definitions
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6188
diff
changeset
|
66 | @param maxLineLength maximum allowed line length |
04a671fa4adb
code style checker: extended the dialog to be able to define the number of blank lines before class and function/method definitions
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6188
diff
changeset
|
67 | @type int |
6265
56bd09c4c297
Fixed some code style issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6264
diff
changeset
|
68 | @param blankLines tuple containg the number of blank lines before |
6264
04a671fa4adb
code style checker: extended the dialog to be able to define the number of blank lines before class and function/method definitions
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6188
diff
changeset
|
69 | a top level class or function and before a method or nested class |
04a671fa4adb
code style checker: extended the dialog to be able to define the number of blank lines before class and function/method definitions
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6188
diff
changeset
|
70 | or function |
04a671fa4adb
code style checker: extended the dialog to be able to define the number of blank lines before class and function/method definitions
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6188
diff
changeset
|
71 | @type tuple of (int, int) |
04a671fa4adb
code style checker: extended the dialog to be able to define the number of blank lines before class and function/method definitions
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6188
diff
changeset
|
72 | @param inPlace flag indicating to modify the file in place |
04a671fa4adb
code style checker: extended the dialog to be able to define the number of blank lines before class and function/method definitions
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6188
diff
changeset
|
73 | @type bool |
04a671fa4adb
code style checker: extended the dialog to be able to define the number of blank lines before class and function/method definitions
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6188
diff
changeset
|
74 | @param eol end of line character(s) |
04a671fa4adb
code style checker: extended the dialog to be able to define the number of blank lines before class and function/method definitions
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6188
diff
changeset
|
75 | @type str |
3549
96ebf42cd960
Added the file backup functionality in the code style fixer.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3546
diff
changeset
|
76 | @param backup flag indicating to create a backup before fixing |
6264
04a671fa4adb
code style checker: extended the dialog to be able to define the number of blank lines before class and function/method definitions
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6188
diff
changeset
|
77 | anything |
04a671fa4adb
code style checker: extended the dialog to be able to define the number of blank lines before class and function/method definitions
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6188
diff
changeset
|
78 | @type bool |
849
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
79 | """ |
3057
10516539f238
Merge with default branch after shorten the code lines to max. 79 characters.
T.Rzepka <Tobias.Rzepka@gmail.com>
diff
changeset
|
80 | super(CodeStyleFixer, self).__init__() |
849
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
81 | |
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
82 | self.__filename = filename |
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
83 | self.__origName = "" |
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
84 | self.__source = sourceLines[:] # save a copy |
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
85 | self.__fixCodes = [c.strip() for c in fixCodes.split(",") if c.strip()] |
2883
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
86 | self.__noFixCodes = [ |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
87 | c.strip() for c in noFixCodes.split(",") if c.strip()] |
2876
bfa39cf40277
Extended the PEP-8 dialog to select fixable issues manually (i.e. fix only the selected issues).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2875
diff
changeset
|
88 | self.__maxLineLength = maxLineLength |
6264
04a671fa4adb
code style checker: extended the dialog to be able to define the number of blank lines before class and function/method definitions
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6188
diff
changeset
|
89 | self.__blankLines = { |
04a671fa4adb
code style checker: extended the dialog to be able to define the number of blank lines before class and function/method definitions
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6188
diff
changeset
|
90 | "toplevel": blankLines[0], |
04a671fa4adb
code style checker: extended the dialog to be able to define the number of blank lines before class and function/method definitions
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6188
diff
changeset
|
91 | "method": blankLines[1], |
04a671fa4adb
code style checker: extended the dialog to be able to define the number of blank lines before class and function/method definitions
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6188
diff
changeset
|
92 | } |
853
ec7dd115e26b
Continued implementing a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
852
diff
changeset
|
93 | self.fixed = 0 |
849
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
94 | |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
95 | self.__reindenter = None |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
96 | self.__indentWord = self.__getIndentWord() |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
97 | |
3209
c5432abceb25
CodeStyleChecker moved to background service and done a little cleanup.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3145
diff
changeset
|
98 | if inPlace: |
3549
96ebf42cd960
Added the file backup functionality in the code style fixer.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3546
diff
changeset
|
99 | self.__createBackup = backup |
3209
c5432abceb25
CodeStyleChecker moved to background service and done a little cleanup.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3145
diff
changeset
|
100 | else: |
849
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
101 | self.__origName = self.__filename |
2892
b601ede6dbbf
Fixed a few issues in the PEP-8 fixer and made it PEP-8 compliant.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2891
diff
changeset
|
102 | self.__filename = os.path.join( |
b601ede6dbbf
Fixed a few issues in the PEP-8 fixer and made it PEP-8 compliant.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2891
diff
changeset
|
103 | os.path.dirname(self.__filename), |
849
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
104 | "fixed_" + os.path.basename(self.__filename)) |
3549
96ebf42cd960
Added the file backup functionality in the code style fixer.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3546
diff
changeset
|
105 | self.__createBackup = False |
3209
c5432abceb25
CodeStyleChecker moved to background service and done a little cleanup.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3145
diff
changeset
|
106 | self.__eol = eol |
c5432abceb25
CodeStyleChecker moved to background service and done a little cleanup.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3145
diff
changeset
|
107 | |
849
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
108 | self.__fixes = { |
2925
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
109 | "D111": self.__fixD111, |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
110 | "D112": self.__fixD112, |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
111 | "D113": self.__fixD112, |
2923
01ac1f364b38
Started extending the PEP-8 fixer to correct PEP-257 issues as well.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2921
diff
changeset
|
112 | "D121": self.__fixD121, |
01ac1f364b38
Started extending the PEP-8 fixer to correct PEP-257 issues as well.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2921
diff
changeset
|
113 | "D131": self.__fixD131, |
01ac1f364b38
Started extending the PEP-8 fixer to correct PEP-257 issues as well.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2921
diff
changeset
|
114 | "D141": self.__fixD141, |
01ac1f364b38
Started extending the PEP-8 fixer to correct PEP-257 issues as well.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2921
diff
changeset
|
115 | "D142": self.__fixD142, |
01ac1f364b38
Started extending the PEP-8 fixer to correct PEP-257 issues as well.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2921
diff
changeset
|
116 | "D143": self.__fixD143, |
01ac1f364b38
Started extending the PEP-8 fixer to correct PEP-257 issues as well.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2921
diff
changeset
|
117 | "D144": self.__fixD144, |
01ac1f364b38
Started extending the PEP-8 fixer to correct PEP-257 issues as well.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2921
diff
changeset
|
118 | "D145": self.__fixD145, |
2937
de26bc76d6ee
Finished implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2936
diff
changeset
|
119 | "D221": self.__fixD221, |
de26bc76d6ee
Finished implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2936
diff
changeset
|
120 | "D222": self.__fixD221, |
de26bc76d6ee
Finished implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2936
diff
changeset
|
121 | "D231": self.__fixD131, |
2936
2ff273068a10
Started implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2925
diff
changeset
|
122 | "D242": self.__fixD242, |
2ff273068a10
Started implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2925
diff
changeset
|
123 | "D243": self.__fixD243, |
2ff273068a10
Started implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2925
diff
changeset
|
124 | "D244": self.__fixD242, |
2ff273068a10
Started implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2925
diff
changeset
|
125 | "D245": self.__fixD243, |
2937
de26bc76d6ee
Finished implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2936
diff
changeset
|
126 | "D246": self.__fixD144, |
2936
2ff273068a10
Started implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2925
diff
changeset
|
127 | "D247": self.__fixD247, |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
128 | "E101": self.__fixE101, |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
129 | "E111": self.__fixE101, |
2875
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
130 | "E121": self.__fixE121, |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
131 | "E122": self.__fixE122, |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
132 | "E123": self.__fixE123, |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
133 | "E124": self.__fixE121, |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
134 | "E125": self.__fixE125, |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
135 | "E126": self.__fixE126, |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
136 | "E127": self.__fixE127, |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
137 | "E128": self.__fixE127, |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
138 | "E133": self.__fixE126, |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
139 | "E201": self.__fixE201, |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
140 | "E202": self.__fixE201, |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
141 | "E203": self.__fixE201, |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
142 | "E211": self.__fixE201, |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
143 | "E221": self.__fixE221, |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
144 | "E222": self.__fixE221, |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
145 | "E223": self.__fixE221, |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
146 | "E224": self.__fixE221, |
4445
5636dc48e1a0
Own fixer for missing whitespaces around operators (1 pass fix) implemented.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
4150
diff
changeset
|
147 | "E225": self.__fixE225, |
5636dc48e1a0
Own fixer for missing whitespaces around operators (1 pass fix) implemented.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
4150
diff
changeset
|
148 | "E226": self.__fixE225, |
5636dc48e1a0
Own fixer for missing whitespaces around operators (1 pass fix) implemented.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
4150
diff
changeset
|
149 | "E227": self.__fixE225, |
5636dc48e1a0
Own fixer for missing whitespaces around operators (1 pass fix) implemented.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
4150
diff
changeset
|
150 | "E228": self.__fixE225, |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
151 | "E231": self.__fixE231, |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
152 | "E241": self.__fixE221, |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
153 | "E242": self.__fixE221, |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
154 | "E251": self.__fixE251, |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
155 | "E261": self.__fixE261, |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
156 | "E262": self.__fixE261, |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
157 | "E271": self.__fixE221, |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
158 | "E272": self.__fixE221, |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
159 | "E273": self.__fixE221, |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
160 | "E274": self.__fixE221, |
6264
04a671fa4adb
code style checker: extended the dialog to be able to define the number of blank lines before class and function/method definitions
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6188
diff
changeset
|
161 | "E301": self.__fixBlankLinesBefore, |
04a671fa4adb
code style checker: extended the dialog to be able to define the number of blank lines before class and function/method definitions
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6188
diff
changeset
|
162 | "E302": self.__fixBlankLinesBefore, |
04a671fa4adb
code style checker: extended the dialog to be able to define the number of blank lines before class and function/method definitions
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6188
diff
changeset
|
163 | "E303": self.__fixBlankLinesBefore, |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
164 | "E304": self.__fixE304, |
6264
04a671fa4adb
code style checker: extended the dialog to be able to define the number of blank lines before class and function/method definitions
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6188
diff
changeset
|
165 | "E305": self.__fixBlankLinesBefore, |
04a671fa4adb
code style checker: extended the dialog to be able to define the number of blank lines before class and function/method definitions
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6188
diff
changeset
|
166 | "E306": self.__fixBlankLinesBefore, |
04a671fa4adb
code style checker: extended the dialog to be able to define the number of blank lines before class and function/method definitions
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6188
diff
changeset
|
167 | "E307": self.__fixBlankLinesBefore, |
04a671fa4adb
code style checker: extended the dialog to be able to define the number of blank lines before class and function/method definitions
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6188
diff
changeset
|
168 | "E308": self.__fixBlankLinesBefore, |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
169 | "E401": self.__fixE401, |
2882
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
170 | "E501": self.__fixE501, |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
171 | "E502": self.__fixE502, |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
172 | "E701": self.__fixE701, |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
173 | "E702": self.__fixE702, |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
174 | "E703": self.__fixE702, |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
175 | "E711": self.__fixE711, |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
176 | "E712": self.__fixE711, |
2895
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
177 | "N804": self.__fixN804, |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
178 | "N805": self.__fixN804, |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
179 | "N806": self.__fixN806, |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
180 | "W191": self.__fixE101, |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
181 | "W291": self.__fixW291, |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
182 | "W292": self.__fixW292, |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
183 | "W293": self.__fixW291, |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
184 | "W391": self.__fixW391, |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
185 | "W603": self.__fixW603, |
849
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
186 | } |
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
187 | self.__modified = False |
3621
15f23ed3f216
Fixed a few source code style issues found by the updated pe8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3549
diff
changeset
|
188 | self.__stackLogical = [] |
15f23ed3f216
Fixed a few source code style issues found by the updated pe8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3549
diff
changeset
|
189 | # These need to be fixed before the file is saved but after all |
15f23ed3f216
Fixed a few source code style issues found by the updated pe8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3549
diff
changeset
|
190 | # other inline fixes. These work with logical lines. |
15f23ed3f216
Fixed a few source code style issues found by the updated pe8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3549
diff
changeset
|
191 | self.__stack = [] |
15f23ed3f216
Fixed a few source code style issues found by the updated pe8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3549
diff
changeset
|
192 | # These need to be fixed before the file is saved but after all |
15f23ed3f216
Fixed a few source code style issues found by the updated pe8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3549
diff
changeset
|
193 | # inline fixes. |
2882
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
194 | |
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
195 | self.__multiLineNumbers = None |
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
196 | self.__docLineNumbers = None |
2891
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
197 | |
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
198 | self.__lastID = 0 |
849
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
199 | |
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
200 | def saveFile(self, encoding): |
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
201 | """ |
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
202 | Public method to save the modified file. |
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
203 | |
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
204 | @param encoding encoding of the source file (string) |
3413
5e63f809732a
Code style checker: Translations extracted and refactored.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3228
diff
changeset
|
205 | @return error message on failure (tuple of str) |
849
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
206 | """ |
3209
c5432abceb25
CodeStyleChecker moved to background service and done a little cleanup.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3145
diff
changeset
|
207 | import codecs |
c5432abceb25
CodeStyleChecker moved to background service and done a little cleanup.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3145
diff
changeset
|
208 | |
849
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
209 | if not self.__modified: |
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
210 | # no need to write |
6891
93f82da09f22
Fixed some code style issues detected by the new 'return' checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6645
diff
changeset
|
211 | return None |
849
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
212 | |
3549
96ebf42cd960
Added the file backup functionality in the code style fixer.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3546
diff
changeset
|
213 | if self.__createBackup: |
96ebf42cd960
Added the file backup functionality in the code style fixer.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3546
diff
changeset
|
214 | # create a backup file before writing any changes |
96ebf42cd960
Added the file backup functionality in the code style fixer.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3546
diff
changeset
|
215 | if os.path.islink(self.__filename): |
96ebf42cd960
Added the file backup functionality in the code style fixer.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3546
diff
changeset
|
216 | bfn = '{0}~'.format(os.path.realpath(self.__filename)) |
96ebf42cd960
Added the file backup functionality in the code style fixer.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3546
diff
changeset
|
217 | else: |
96ebf42cd960
Added the file backup functionality in the code style fixer.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3546
diff
changeset
|
218 | bfn = '{0}~'.format(self.__filename) |
96ebf42cd960
Added the file backup functionality in the code style fixer.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3546
diff
changeset
|
219 | try: |
96ebf42cd960
Added the file backup functionality in the code style fixer.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3546
diff
changeset
|
220 | os.remove(bfn) |
96ebf42cd960
Added the file backup functionality in the code style fixer.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3546
diff
changeset
|
221 | except EnvironmentError: |
96ebf42cd960
Added the file backup functionality in the code style fixer.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3546
diff
changeset
|
222 | # if there was an error, ignore it |
96ebf42cd960
Added the file backup functionality in the code style fixer.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3546
diff
changeset
|
223 | pass |
96ebf42cd960
Added the file backup functionality in the code style fixer.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3546
diff
changeset
|
224 | try: |
96ebf42cd960
Added the file backup functionality in the code style fixer.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3546
diff
changeset
|
225 | os.rename(self.__filename, bfn) |
96ebf42cd960
Added the file backup functionality in the code style fixer.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3546
diff
changeset
|
226 | except EnvironmentError: |
96ebf42cd960
Added the file backup functionality in the code style fixer.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3546
diff
changeset
|
227 | # if there was an error, ignore it |
96ebf42cd960
Added the file backup functionality in the code style fixer.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3546
diff
changeset
|
228 | pass |
96ebf42cd960
Added the file backup functionality in the code style fixer.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3546
diff
changeset
|
229 | |
849
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
230 | txt = "".join(self.__source) |
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
231 | try: |
3745
4c6f1782f530
Possible exception on fixing code styles fixed (only Python2).
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3621
diff
changeset
|
232 | enc = 'utf-8' if encoding == 'utf-8-bom' else encoding |
4c6f1782f530
Possible exception on fixing code styles fixed (only Python2).
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3621
diff
changeset
|
233 | txt = txt.encode(enc) |
3209
c5432abceb25
CodeStyleChecker moved to background service and done a little cleanup.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3145
diff
changeset
|
234 | if encoding == 'utf-8-bom': |
c5432abceb25
CodeStyleChecker moved to background service and done a little cleanup.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3145
diff
changeset
|
235 | txt = codecs.BOM_UTF8 + txt |
c5432abceb25
CodeStyleChecker moved to background service and done a little cleanup.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3145
diff
changeset
|
236 | |
c5432abceb25
CodeStyleChecker moved to background service and done a little cleanup.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3145
diff
changeset
|
237 | with open(self.__filename, "wb") as fp: |
c5432abceb25
CodeStyleChecker moved to background service and done a little cleanup.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3145
diff
changeset
|
238 | fp.write(txt) |
3413
5e63f809732a
Code style checker: Translations extracted and refactored.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3228
diff
changeset
|
239 | except (IOError, UnicodeError) as err: |
5e63f809732a
Code style checker: Translations extracted and refactored.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3228
diff
changeset
|
240 | # Could not save the file! Skipping it. Reason: {0} |
5e63f809732a
Code style checker: Translations extracted and refactored.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3228
diff
changeset
|
241 | return ("FWRITE_ERROR", (str(err),)) |
6891
93f82da09f22
Fixed some code style issues detected by the new 'return' checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6645
diff
changeset
|
242 | |
93f82da09f22
Fixed some code style issues detected by the new 'return' checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6645
diff
changeset
|
243 | return None |
849
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
244 | |
2878
61042247f793
Added a button to the PEP-8 dialog to reset the default values.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2876
diff
changeset
|
245 | def __codeMatch(self, code): |
61042247f793
Added a button to the PEP-8 dialog to reset the default values.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2876
diff
changeset
|
246 | """ |
61042247f793
Added a button to the PEP-8 dialog to reset the default values.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2876
diff
changeset
|
247 | Private method to check, if the code should be fixed. |
61042247f793
Added a button to the PEP-8 dialog to reset the default values.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2876
diff
changeset
|
248 | |
61042247f793
Added a button to the PEP-8 dialog to reset the default values.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2876
diff
changeset
|
249 | @param code to check (string) |
61042247f793
Added a button to the PEP-8 dialog to reset the default values.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2876
diff
changeset
|
250 | @return flag indicating it should be fixed (boolean) |
61042247f793
Added a button to the PEP-8 dialog to reset the default values.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2876
diff
changeset
|
251 | """ |
61042247f793
Added a button to the PEP-8 dialog to reset the default values.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2876
diff
changeset
|
252 | def mutualStartswith(a, b): |
61042247f793
Added a button to the PEP-8 dialog to reset the default values.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2876
diff
changeset
|
253 | """ |
61042247f793
Added a button to the PEP-8 dialog to reset the default values.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2876
diff
changeset
|
254 | Local helper method to compare the beginnings of two strings |
61042247f793
Added a button to the PEP-8 dialog to reset the default values.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2876
diff
changeset
|
255 | against each other. |
61042247f793
Added a button to the PEP-8 dialog to reset the default values.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2876
diff
changeset
|
256 | |
61042247f793
Added a button to the PEP-8 dialog to reset the default values.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2876
diff
changeset
|
257 | @return flag indicating that one string starts with the other |
61042247f793
Added a button to the PEP-8 dialog to reset the default values.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2876
diff
changeset
|
258 | (boolean) |
61042247f793
Added a button to the PEP-8 dialog to reset the default values.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2876
diff
changeset
|
259 | """ |
61042247f793
Added a button to the PEP-8 dialog to reset the default values.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2876
diff
changeset
|
260 | return b.startswith(a) or a.startswith(b) |
61042247f793
Added a button to the PEP-8 dialog to reset the default values.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2876
diff
changeset
|
261 | |
61042247f793
Added a button to the PEP-8 dialog to reset the default values.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2876
diff
changeset
|
262 | if self.__noFixCodes: |
61042247f793
Added a button to the PEP-8 dialog to reset the default values.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2876
diff
changeset
|
263 | for noFixCode in [c.strip() for c in self.__noFixCodes]: |
61042247f793
Added a button to the PEP-8 dialog to reset the default values.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2876
diff
changeset
|
264 | if mutualStartswith(code.lower(), noFixCode.lower()): |
61042247f793
Added a button to the PEP-8 dialog to reset the default values.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2876
diff
changeset
|
265 | return False |
61042247f793
Added a button to the PEP-8 dialog to reset the default values.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2876
diff
changeset
|
266 | |
61042247f793
Added a button to the PEP-8 dialog to reset the default values.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2876
diff
changeset
|
267 | if self.__fixCodes: |
61042247f793
Added a button to the PEP-8 dialog to reset the default values.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2876
diff
changeset
|
268 | for fixCode in [c.strip() for c in self.__fixCodes]: |
61042247f793
Added a button to the PEP-8 dialog to reset the default values.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2876
diff
changeset
|
269 | if mutualStartswith(code.lower(), fixCode.lower()): |
61042247f793
Added a button to the PEP-8 dialog to reset the default values.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2876
diff
changeset
|
270 | return True |
61042247f793
Added a button to the PEP-8 dialog to reset the default values.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2876
diff
changeset
|
271 | return False |
61042247f793
Added a button to the PEP-8 dialog to reset the default values.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2876
diff
changeset
|
272 | |
61042247f793
Added a button to the PEP-8 dialog to reset the default values.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2876
diff
changeset
|
273 | return True |
61042247f793
Added a button to the PEP-8 dialog to reset the default values.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2876
diff
changeset
|
274 | |
849
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
275 | def fixIssue(self, line, pos, message): |
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
276 | """ |
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
277 | Public method to fix the fixable issues. |
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
278 | |
1031
c0f795aa71a7
Fixed an issue in the PEP-8 fixer.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
945
diff
changeset
|
279 | @param line line number of issue (integer) |
c0f795aa71a7
Fixed an issue in the PEP-8 fixer.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
945
diff
changeset
|
280 | @param pos character position of issue (integer) |
849
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
281 | @param message message text (string) |
2891
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
282 | @return value indicating an applied/deferred fix (-1, 0, 1), |
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
283 | a message for the fix (string) and an ID for a deferred |
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
284 | fix (integer) |
849
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
285 | """ |
3413
5e63f809732a
Code style checker: Translations extracted and refactored.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3228
diff
changeset
|
286 | if isinstance(message, (tuple, list)): |
5e63f809732a
Code style checker: Translations extracted and refactored.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3228
diff
changeset
|
287 | code = message[0].strip() |
5e63f809732a
Code style checker: Translations extracted and refactored.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3228
diff
changeset
|
288 | else: |
5e63f809732a
Code style checker: Translations extracted and refactored.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3228
diff
changeset
|
289 | code = message.split(None, 1)[0].strip() |
849
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
290 | |
1031
c0f795aa71a7
Fixed an issue in the PEP-8 fixer.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
945
diff
changeset
|
291 | if line <= len(self.__source) and \ |
2878
61042247f793
Added a button to the PEP-8 dialog to reset the default values.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2876
diff
changeset
|
292 | self.__codeMatch(code) and \ |
849
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
293 | code in self.__fixes: |
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
294 | res = self.__fixes[code](code, line, pos) |
2891
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
295 | if res[0] == 1: |
849
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
296 | self.__modified = True |
853
ec7dd115e26b
Continued implementing a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
852
diff
changeset
|
297 | self.fixed += 1 |
849
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
298 | else: |
2891
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
299 | res = (0, "", 0) |
849
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
300 | |
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
301 | return res |
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
302 | |
2891
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
303 | def finalize(self): |
849
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
304 | """ |
2891
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
305 | Public method to apply all deferred fixes. |
2960
9453efa25fd5
Continued correcting doc strings by using the new doc string checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2937
diff
changeset
|
306 | |
9453efa25fd5
Continued correcting doc strings by using the new doc string checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2937
diff
changeset
|
307 | @return dictionary containing the fix results |
849
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
308 | """ |
2891
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
309 | results = {} |
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
310 | |
2875
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
311 | # step 1: do fixes operating on logical lines first |
2891
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
312 | for id_, code, line, pos in self.__stackLogical: |
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
313 | res, msg, _ = self.__fixes[code](code, line, pos, apply=True) |
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
314 | if res == 1: |
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
315 | self.__modified = True |
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
316 | self.fixed += 1 |
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
317 | results[id_] = (res, msg) |
2875
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
318 | |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
319 | # step 2: do fixes that change the number of lines |
2891
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
320 | for id_, code, line, pos in reversed(self.__stack): |
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
321 | res, msg, _ = self.__fixes[code](code, line, pos, apply=True) |
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
322 | if res == 1: |
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
323 | self.__modified = True |
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
324 | self.fixed += 1 |
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
325 | results[id_] = (res, msg) |
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
326 | |
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
327 | return results |
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
328 | |
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
329 | def __getID(self): |
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
330 | """ |
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
331 | Private method to get the ID for a deferred fix. |
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
332 | |
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
333 | @return ID for a deferred fix (integer) |
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
334 | """ |
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
335 | self.__lastID += 1 |
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
336 | return self.__lastID |
849
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
337 | |
2875
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
338 | def __findLogical(self): |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
339 | """ |
2883
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
340 | Private method to extract the index of all the starts and ends of |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
341 | lines. |
2875
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
342 | |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
343 | @return tuple containing two lists of integer with start and end tuples |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
344 | of lines |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
345 | """ |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
346 | logical_start = [] |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
347 | logical_end = [] |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
348 | last_newline = True |
3209
c5432abceb25
CodeStyleChecker moved to background service and done a little cleanup.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3145
diff
changeset
|
349 | sio = StringIO("".join(self.__source)) |
2875
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
350 | parens = 0 |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
351 | for t in tokenize.generate_tokens(sio.readline): |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
352 | if t[0] in [tokenize.COMMENT, tokenize.DEDENT, |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
353 | tokenize.INDENT, tokenize.NL, |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
354 | tokenize.ENDMARKER]: |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
355 | continue |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
356 | if not parens and t[0] in [tokenize.NEWLINE, tokenize.SEMI]: |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
357 | last_newline = True |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
358 | logical_end.append((t[3][0] - 1, t[2][1])) |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
359 | continue |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
360 | if last_newline and not parens: |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
361 | logical_start.append((t[2][0] - 1, t[2][1])) |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
362 | last_newline = False |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
363 | if t[0] == tokenize.OP: |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
364 | if t[1] in '([{': |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
365 | parens += 1 |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
366 | elif t[1] in '}])': |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
367 | parens -= 1 |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
368 | return logical_start, logical_end |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
369 | |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
370 | def __getLogical(self, line, pos): |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
371 | """ |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
372 | Private method to get the logical line corresponding to the given |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
373 | position. |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
374 | |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
375 | @param line line number of the issue (integer) |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
376 | @param pos position inside line (integer) |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
377 | @return tuple of a tuple of two integers giving the start of the |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
378 | logical line, another tuple of two integers giving the end |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
379 | of the logical line and a list of strings with the original |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
380 | source lines |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
381 | """ |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
382 | try: |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
383 | (logical_start, logical_end) = self.__findLogical() |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
384 | except (SyntaxError, tokenize.TokenError): |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
385 | return None |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
386 | |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
387 | line = line - 1 |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
388 | ls = None |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
389 | le = None |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
390 | for i in range(0, len(logical_start)): |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
391 | x = logical_end[i] |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
392 | if x[0] > line or (x[0] == line and x[1] > pos): |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
393 | le = x |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
394 | ls = logical_start[i] |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
395 | break |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
396 | if ls is None: |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
397 | return None |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
398 | |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
399 | original = self.__source[ls[0]:le[0] + 1] |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
400 | return ls, le, original |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
401 | |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
402 | def __getIndentWord(self): |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
403 | """ |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
404 | Private method to determine the indentation type. |
849
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
405 | |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
406 | @return string to be used for an indentation (string) |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
407 | """ |
3209
c5432abceb25
CodeStyleChecker moved to background service and done a little cleanup.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3145
diff
changeset
|
408 | sio = StringIO("".join(self.__source)) |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
409 | indentWord = " " # default in case of failure |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
410 | try: |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
411 | for token in tokenize.generate_tokens(sio.readline): |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
412 | if token[0] == tokenize.INDENT: |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
413 | indentWord = token[1] |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
414 | break |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
415 | except (SyntaxError, tokenize.TokenError): |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
416 | pass |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
417 | return indentWord |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
418 | |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
419 | def __getIndent(self, line): |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
420 | """ |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
421 | Private method to get the indentation string. |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
422 | |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
423 | @param line line to determine the indentation string from (string) |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
424 | @return indentation string (string) |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
425 | """ |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
426 | return line.replace(line.lstrip(), "") |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
427 | |
2882
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
428 | def __multilineStringLines(self): |
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
429 | """ |
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
430 | Private method to determine the line numbers that are within multi line |
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
431 | strings and these which are part of a documentation string. |
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
432 | |
2883
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
433 | @return tuple of a set of line numbers belonging to a multi line |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
434 | string and a set of line numbers belonging to a multi line |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
435 | documentation string (tuple of two set of integer) |
2882
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
436 | """ |
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
437 | if self.__multiLineNumbers is None: |
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
438 | source = "".join(self.__source) |
3209
c5432abceb25
CodeStyleChecker moved to background service and done a little cleanup.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3145
diff
changeset
|
439 | sio = StringIO(source) |
2882
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
440 | self.__multiLineNumbers = set() |
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
441 | self.__docLineNumbers = set() |
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
442 | previousTokenType = '' |
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
443 | try: |
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
444 | for t in tokenize.generate_tokens(sio.readline): |
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
445 | tokenType = t[0] |
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
446 | startRow = t[2][0] |
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
447 | endRow = t[3][0] |
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
448 | |
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
449 | if (tokenType == tokenize.STRING and startRow != endRow): |
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
450 | if previousTokenType != tokenize.INDENT: |
2883
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
451 | self.__multiLineNumbers |= set( |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
452 | range(startRow, 1 + endRow)) |
2882
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
453 | else: |
2883
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
454 | self.__docLineNumbers |= set( |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
455 | range(startRow, 1 + endRow)) |
2882
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
456 | |
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
457 | previousTokenType = tokenType |
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
458 | except (SyntaxError, tokenize.TokenError): |
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
459 | pass |
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
460 | |
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
461 | return self.__multiLineNumbers, self.__docLineNumbers |
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
462 | |
2875
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
463 | def __fixReindent(self, line, pos, logical): |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
464 | """ |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
465 | Private method to fix a badly indented line. |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
466 | |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
467 | This is done by adding or removing from its initial indent only. |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
468 | |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
469 | @param line line number of the issue (integer) |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
470 | @param pos position inside line (integer) |
2960
9453efa25fd5
Continued correcting doc strings by using the new doc string checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2937
diff
changeset
|
471 | @param logical logical line structure |
2875
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
472 | @return flag indicating a change was done (boolean) |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
473 | """ |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
474 | assert logical |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
475 | ls, _, original = logical |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
476 | |
2978
9d63132a23e0
Continued changing the names of the various code style checkers to make them more appropriate to the broadened scope.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2976
diff
changeset
|
477 | rewrapper = IndentationWrapper(original) |
2875
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
478 | valid_indents = rewrapper.pep8Expected() |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
479 | if not rewrapper.rel_indent: |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
480 | return False |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
481 | |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
482 | if line > ls[0]: |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
483 | # got a valid continuation line number |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
484 | row = line - ls[0] - 1 |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
485 | # always pick the first option for this |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
486 | valid = valid_indents[row] |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
487 | got = rewrapper.rel_indent[row] |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
488 | else: |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
489 | return False |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
490 | |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
491 | line1 = ls[0] + row |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
492 | # always pick the expected indent, for now. |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
493 | indent_to = valid[0] |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
494 | |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
495 | if got != indent_to: |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
496 | orig_line = self.__source[line1] |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
497 | new_line = ' ' * (indent_to) + orig_line.lstrip() |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
498 | if new_line == orig_line: |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
499 | return False |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
500 | else: |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
501 | self.__source[line1] = new_line |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
502 | return True |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
503 | else: |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
504 | return False |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
505 | |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
506 | def __fixWhitespace(self, line, offset, replacement): |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
507 | """ |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
508 | Private method to correct whitespace at the given offset. |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
509 | |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
510 | @param line line to be corrected (string) |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
511 | @param offset offset within line (integer) |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
512 | @param replacement replacement string (string) |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
513 | @return corrected line |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
514 | """ |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
515 | left = line[:offset].rstrip(" \t") |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
516 | right = line[offset:].lstrip(" \t") |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
517 | if right.startswith("#"): |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
518 | return line |
849
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
519 | else: |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
520 | return left + replacement + right |
849
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
521 | |
2925
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
522 | def __fixD111(self, code, line, pos): |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
523 | """ |
2960
9453efa25fd5
Continued correcting doc strings by using the new doc string checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2937
diff
changeset
|
524 | Private method to fix docstring enclosed in wrong quotes. |
9453efa25fd5
Continued correcting doc strings by using the new doc string checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2937
diff
changeset
|
525 | |
9453efa25fd5
Continued correcting doc strings by using the new doc string checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2937
diff
changeset
|
526 | Codes: D111 |
2925
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
527 | |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
528 | @param code code of the issue (string) |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
529 | @param line line number of the issue (integer) |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
530 | @param pos position inside line (integer) |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
531 | @return value indicating an applied/deferred fix (-1, 0, 1), |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
532 | a message for the fix (string) and an ID for a deferred |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
533 | fix (integer) |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
534 | """ |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
535 | line = line - 1 |
4150
a0cece581ad0
Fixed an issue in the code style fixer related to docstrings enclosed in ' or " quotes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
536 | quotes = re.match(r"""\s*[ru]?('''|'|\")""", |
a0cece581ad0
Fixed an issue in the code style fixer related to docstrings enclosed in ' or " quotes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
537 | self.__source[line]).group(1) |
a0cece581ad0
Fixed an issue in the code style fixer related to docstrings enclosed in ' or " quotes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
538 | left, right = self.__source[line].split(quotes, 1) |
2925
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
539 | self.__source[line] = left + '"""' + right |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
540 | while line < len(self.__source): |
4150
a0cece581ad0
Fixed an issue in the code style fixer related to docstrings enclosed in ' or " quotes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
541 | if self.__source[line].rstrip().endswith(quotes): |
a0cece581ad0
Fixed an issue in the code style fixer related to docstrings enclosed in ' or " quotes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
542 | left, right = self.__source[line].rsplit(quotes, 1) |
2925
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
543 | self.__source[line] = left + '"""' + right |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
544 | break |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
545 | line += 1 |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
546 | |
3413
5e63f809732a
Code style checker: Translations extracted and refactored.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3228
diff
changeset
|
547 | # Triple single quotes converted to triple double quotes. |
5e63f809732a
Code style checker: Translations extracted and refactored.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3228
diff
changeset
|
548 | return (1, "FD111", 0) |
2925
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
549 | |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
550 | def __fixD112(self, code, line, pos): |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
551 | """ |
2960
9453efa25fd5
Continued correcting doc strings by using the new doc string checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2937
diff
changeset
|
552 | Private method to fix docstring 'r' or 'u' in leading quotes. |
9453efa25fd5
Continued correcting doc strings by using the new doc string checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2937
diff
changeset
|
553 | |
9453efa25fd5
Continued correcting doc strings by using the new doc string checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2937
diff
changeset
|
554 | Codes: D112, D113 |
2925
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
555 | |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
556 | @param code code of the issue (string) |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
557 | @param line line number of the issue (integer) |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
558 | @param pos position inside line (integer) |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
559 | @return value indicating an applied/deferred fix (-1, 0, 1), |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
560 | a message for the fix (string) and an ID for a deferred |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
561 | fix (integer) |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
562 | """ |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
563 | line = line - 1 |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
564 | if code == "D112": |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
565 | insertChar = "r" |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
566 | elif code == "D113": |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
567 | insertChar = "u" |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
568 | else: |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
569 | return (0, "", 0) |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
570 | |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
571 | newText = self.__getIndent(self.__source[line]) + \ |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
572 | insertChar + self.__source[line].lstrip() |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
573 | self.__source[line] = newText |
3413
5e63f809732a
Code style checker: Translations extracted and refactored.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3228
diff
changeset
|
574 | # Introductory quotes corrected to be {0}""" |
5e63f809732a
Code style checker: Translations extracted and refactored.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3228
diff
changeset
|
575 | return (1, ('FD112', (insertChar,)), 0) |
2925
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
576 | |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
577 | def __fixD121(self, code, line, pos, apply=False): |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
578 | """ |
2960
9453efa25fd5
Continued correcting doc strings by using the new doc string checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2937
diff
changeset
|
579 | Private method to fix a single line docstring on multiple lines. |
9453efa25fd5
Continued correcting doc strings by using the new doc string checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2937
diff
changeset
|
580 | |
9453efa25fd5
Continued correcting doc strings by using the new doc string checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2937
diff
changeset
|
581 | Codes: D121 |
2925
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
582 | |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
583 | @param code code of the issue (string) |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
584 | @param line line number of the issue (integer) |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
585 | @param pos position inside line (integer) |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
586 | @keyparam apply flag indicating, that the fix should be applied |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
587 | (boolean) |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
588 | @return value indicating an applied/deferred fix (-1, 0, 1), |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
589 | a message for the fix (string) and an ID for a deferred |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
590 | fix (integer) |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
591 | """ |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
592 | if apply: |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
593 | line = line - 1 |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
594 | if not self.__source[line].lstrip().startswith( |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
595 | ('"""', 'r"""', 'u"""')): |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
596 | # only correctly formatted docstrings will be fixed |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
597 | return (0, "", 0) |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
598 | |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
599 | docstring = self.__source[line].rstrip() + \ |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
600 | self.__source[line + 1].strip() |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
601 | if docstring.endswith('"""'): |
3209
c5432abceb25
CodeStyleChecker moved to background service and done a little cleanup.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3145
diff
changeset
|
602 | docstring += self.__eol |
2925
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
603 | else: |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
604 | docstring += self.__source[line + 2].lstrip() |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
605 | self.__source[line + 2] = "" |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
606 | |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
607 | self.__source[line] = docstring |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
608 | self.__source[line + 1] = "" |
3413
5e63f809732a
Code style checker: Translations extracted and refactored.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3228
diff
changeset
|
609 | # Single line docstring put on one line. |
5e63f809732a
Code style checker: Translations extracted and refactored.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3228
diff
changeset
|
610 | return (1, "FD121", 0) |
2925
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
611 | else: |
5588
6ba512d9f46a
Continued fixing code style issues detected by the extended style checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5389
diff
changeset
|
612 | fixId = self.__getID() |
6ba512d9f46a
Continued fixing code style issues detected by the extended style checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5389
diff
changeset
|
613 | self.__stack.append((fixId, code, line, pos)) |
6ba512d9f46a
Continued fixing code style issues detected by the extended style checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5389
diff
changeset
|
614 | return (-1, "", fixId) |
2925
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
615 | |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
616 | def __fixD131(self, code, line, pos): |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
617 | """ |
2937
de26bc76d6ee
Finished implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2936
diff
changeset
|
618 | Private method to fix a docstring summary not ending with a |
2960
9453efa25fd5
Continued correcting doc strings by using the new doc string checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2937
diff
changeset
|
619 | period. |
9453efa25fd5
Continued correcting doc strings by using the new doc string checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2937
diff
changeset
|
620 | |
9453efa25fd5
Continued correcting doc strings by using the new doc string checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2937
diff
changeset
|
621 | Codes: D131 |
2925
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
622 | |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
623 | @param code code of the issue (string) |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
624 | @param line line number of the issue (integer) |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
625 | @param pos position inside line (integer) |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
626 | @return value indicating an applied/deferred fix (-1, 0, 1), |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
627 | a message for the fix (string) and an ID for a deferred |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
628 | fix (integer) |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
629 | """ |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
630 | line = line - 1 |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
631 | newText = "" |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
632 | if self.__source[line].rstrip().endswith(('"""', "'''")) and \ |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
633 | self.__source[line].lstrip().startswith(('"""', 'r"""', 'u"""')): |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
634 | # it is a one-liner |
2937
de26bc76d6ee
Finished implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2936
diff
changeset
|
635 | newText = self.__source[line].rstrip()[:-3].rstrip() + "." + \ |
3209
c5432abceb25
CodeStyleChecker moved to background service and done a little cleanup.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3145
diff
changeset
|
636 | self.__source[line].rstrip()[-3:] + self.__eol |
2925
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
637 | else: |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
638 | if line < len(self.__source) - 1 and \ |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
639 | (not self.__source[line + 1].strip() or |
2937
de26bc76d6ee
Finished implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2936
diff
changeset
|
640 | self.__source[line + 1].lstrip().startswith("@") or |
de26bc76d6ee
Finished implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2936
diff
changeset
|
641 | (self.__source[line + 1].strip() in ('"""', "'''") and |
de26bc76d6ee
Finished implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2936
diff
changeset
|
642 | not self.__source[line].lstrip().startswith("@"))): |
3209
c5432abceb25
CodeStyleChecker moved to background service and done a little cleanup.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3145
diff
changeset
|
643 | newText = self.__source[line].rstrip() + "." + self.__eol |
2925
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
644 | |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
645 | if newText: |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
646 | self.__source[line] = newText |
3413
5e63f809732a
Code style checker: Translations extracted and refactored.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3228
diff
changeset
|
647 | # Period added to summary line. |
5e63f809732a
Code style checker: Translations extracted and refactored.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3228
diff
changeset
|
648 | return (1, "FD131", 0) |
2925
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
649 | else: |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
650 | return (0, "", 0) |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
651 | |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
652 | def __fixD141(self, code, line, pos, apply=False): |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
653 | """ |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
654 | Private method to fix a function/method docstring preceded by a |
2960
9453efa25fd5
Continued correcting doc strings by using the new doc string checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2937
diff
changeset
|
655 | blank line. |
9453efa25fd5
Continued correcting doc strings by using the new doc string checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2937
diff
changeset
|
656 | |
9453efa25fd5
Continued correcting doc strings by using the new doc string checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2937
diff
changeset
|
657 | Codes: D141 |
2925
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
658 | |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
659 | @param code code of the issue (string) |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
660 | @param line line number of the issue (integer) |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
661 | @param pos position inside line (integer) |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
662 | @keyparam apply flag indicating, that the fix should be applied |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
663 | (boolean) |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
664 | @return value indicating an applied/deferred fix (-1, 0, 1), |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
665 | a message for the fix (string) and an ID for a deferred |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
666 | fix (integer) |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
667 | """ |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
668 | if apply: |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
669 | line = line - 1 |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
670 | self.__source[line - 1] = "" |
3413
5e63f809732a
Code style checker: Translations extracted and refactored.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3228
diff
changeset
|
671 | # Blank line before function/method docstring removed. |
5e63f809732a
Code style checker: Translations extracted and refactored.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3228
diff
changeset
|
672 | return (1, "FD141", 0) |
2925
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
673 | else: |
5588
6ba512d9f46a
Continued fixing code style issues detected by the extended style checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5389
diff
changeset
|
674 | fixId = self.__getID() |
6ba512d9f46a
Continued fixing code style issues detected by the extended style checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5389
diff
changeset
|
675 | self.__stack.append((fixId, code, line, pos)) |
6ba512d9f46a
Continued fixing code style issues detected by the extended style checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5389
diff
changeset
|
676 | return (-1, "", fixId) |
2925
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
677 | |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
678 | def __fixD142(self, code, line, pos, apply=False): |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
679 | """ |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
680 | Private method to fix a class docstring not preceded by a |
2960
9453efa25fd5
Continued correcting doc strings by using the new doc string checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2937
diff
changeset
|
681 | blank line. |
9453efa25fd5
Continued correcting doc strings by using the new doc string checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2937
diff
changeset
|
682 | |
9453efa25fd5
Continued correcting doc strings by using the new doc string checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2937
diff
changeset
|
683 | Codes: D142 |
2925
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
684 | |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
685 | @param code code of the issue (string) |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
686 | @param line line number of the issue (integer) |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
687 | @param pos position inside line (integer) |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
688 | @keyparam apply flag indicating, that the fix should be applied |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
689 | (boolean) |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
690 | @return value indicating an applied/deferred fix (-1, 0, 1), |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
691 | a message for the fix (string) and an ID for a deferred |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
692 | fix (integer) |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
693 | """ |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
694 | if apply: |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
695 | line = line - 1 |
3209
c5432abceb25
CodeStyleChecker moved to background service and done a little cleanup.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3145
diff
changeset
|
696 | self.__source[line] = self.__eol + self.__source[line] |
3413
5e63f809732a
Code style checker: Translations extracted and refactored.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3228
diff
changeset
|
697 | # Blank line inserted before class docstring. |
5e63f809732a
Code style checker: Translations extracted and refactored.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3228
diff
changeset
|
698 | return (1, "FD142", 0) |
2925
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
699 | else: |
5588
6ba512d9f46a
Continued fixing code style issues detected by the extended style checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5389
diff
changeset
|
700 | fixId = self.__getID() |
6ba512d9f46a
Continued fixing code style issues detected by the extended style checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5389
diff
changeset
|
701 | self.__stack.append((fixId, code, line, pos)) |
6ba512d9f46a
Continued fixing code style issues detected by the extended style checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5389
diff
changeset
|
702 | return (-1, "", fixId) |
2925
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
703 | |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
704 | def __fixD143(self, code, line, pos, apply=False): |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
705 | """ |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
706 | Private method to fix a class docstring not followed by a |
2960
9453efa25fd5
Continued correcting doc strings by using the new doc string checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2937
diff
changeset
|
707 | blank line. |
9453efa25fd5
Continued correcting doc strings by using the new doc string checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2937
diff
changeset
|
708 | |
9453efa25fd5
Continued correcting doc strings by using the new doc string checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2937
diff
changeset
|
709 | Codes: D143 |
2925
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
710 | |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
711 | @param code code of the issue (string) |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
712 | @param line line number of the issue (integer) |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
713 | @param pos position inside line (integer) |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
714 | @keyparam apply flag indicating, that the fix should be applied |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
715 | (boolean) |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
716 | @return value indicating an applied/deferred fix (-1, 0, 1), |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
717 | a message for the fix (string) and an ID for a deferred |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
718 | fix (integer) |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
719 | """ |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
720 | if apply: |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
721 | line = line - 1 |
3209
c5432abceb25
CodeStyleChecker moved to background service and done a little cleanup.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3145
diff
changeset
|
722 | self.__source[line] += self.__eol |
3413
5e63f809732a
Code style checker: Translations extracted and refactored.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3228
diff
changeset
|
723 | # Blank line inserted after class docstring. |
5e63f809732a
Code style checker: Translations extracted and refactored.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3228
diff
changeset
|
724 | return (1, "FD143", 0) |
2925
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
725 | else: |
5588
6ba512d9f46a
Continued fixing code style issues detected by the extended style checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5389
diff
changeset
|
726 | fixId = self.__getID() |
6ba512d9f46a
Continued fixing code style issues detected by the extended style checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5389
diff
changeset
|
727 | self.__stack.append((fixId, code, line, pos)) |
6ba512d9f46a
Continued fixing code style issues detected by the extended style checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5389
diff
changeset
|
728 | return (-1, "", fixId) |
2925
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
729 | |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
730 | def __fixD144(self, code, line, pos, apply=False): |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
731 | """ |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
732 | Private method to fix a docstring summary not followed by a |
2960
9453efa25fd5
Continued correcting doc strings by using the new doc string checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2937
diff
changeset
|
733 | blank line. |
9453efa25fd5
Continued correcting doc strings by using the new doc string checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2937
diff
changeset
|
734 | |
9453efa25fd5
Continued correcting doc strings by using the new doc string checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2937
diff
changeset
|
735 | Codes: D144 |
2925
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
736 | |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
737 | @param code code of the issue (string) |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
738 | @param line line number of the issue (integer) |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
739 | @param pos position inside line (integer) |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
740 | @keyparam apply flag indicating, that the fix should be applied |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
741 | (boolean) |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
742 | @return value indicating an applied/deferred fix (-1, 0, 1), |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
743 | a message for the fix (string) and an ID for a deferred |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
744 | fix (integer) |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
745 | """ |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
746 | if apply: |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
747 | line = line - 1 |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
748 | if not self.__source[line].rstrip().endswith("."): |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
749 | # only correct summary lines can be fixed here |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
750 | return (0, "", 0) |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
751 | |
3209
c5432abceb25
CodeStyleChecker moved to background service and done a little cleanup.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3145
diff
changeset
|
752 | self.__source[line] += self.__eol |
3413
5e63f809732a
Code style checker: Translations extracted and refactored.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3228
diff
changeset
|
753 | # Blank line inserted after docstring summary. |
5e63f809732a
Code style checker: Translations extracted and refactored.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3228
diff
changeset
|
754 | return (1, "FD144", 0) |
2925
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
755 | else: |
5588
6ba512d9f46a
Continued fixing code style issues detected by the extended style checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5389
diff
changeset
|
756 | fixId = self.__getID() |
6ba512d9f46a
Continued fixing code style issues detected by the extended style checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5389
diff
changeset
|
757 | self.__stack.append((fixId, code, line, pos)) |
6ba512d9f46a
Continued fixing code style issues detected by the extended style checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5389
diff
changeset
|
758 | return (-1, "", fixId) |
2925
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
759 | |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
760 | def __fixD145(self, code, line, pos, apply=False): |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
761 | """ |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
762 | Private method to fix the last paragraph of a multi-line docstring |
2960
9453efa25fd5
Continued correcting doc strings by using the new doc string checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2937
diff
changeset
|
763 | not followed by a blank line. |
9453efa25fd5
Continued correcting doc strings by using the new doc string checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2937
diff
changeset
|
764 | |
9453efa25fd5
Continued correcting doc strings by using the new doc string checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2937
diff
changeset
|
765 | Codes: D143 |
2925
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
766 | |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
767 | @param code code of the issue (string) |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
768 | @param line line number of the issue (integer) |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
769 | @param pos position inside line (integer) |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
770 | @keyparam apply flag indicating, that the fix should be applied |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
771 | (boolean) |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
772 | @return value indicating an applied/deferred fix (-1, 0, 1), |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
773 | a message for the fix (string) and an ID for a deferred |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
774 | fix (integer) |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
775 | """ |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
776 | if apply: |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
777 | line = line - 1 |
3209
c5432abceb25
CodeStyleChecker moved to background service and done a little cleanup.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3145
diff
changeset
|
778 | self.__source[line] = self.__eol + self.__source[line] |
3413
5e63f809732a
Code style checker: Translations extracted and refactored.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3228
diff
changeset
|
779 | # Blank line inserted after last paragraph of docstring. |
5e63f809732a
Code style checker: Translations extracted and refactored.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3228
diff
changeset
|
780 | return (1, "FD145", 0) |
2925
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
781 | else: |
5588
6ba512d9f46a
Continued fixing code style issues detected by the extended style checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5389
diff
changeset
|
782 | fixId = self.__getID() |
6ba512d9f46a
Continued fixing code style issues detected by the extended style checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5389
diff
changeset
|
783 | self.__stack.append((fixId, code, line, pos)) |
6ba512d9f46a
Continued fixing code style issues detected by the extended style checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5389
diff
changeset
|
784 | return (-1, "", fixId) |
2925
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
785 | |
2937
de26bc76d6ee
Finished implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2936
diff
changeset
|
786 | def __fixD221(self, code, line, pos, apply=False): |
de26bc76d6ee
Finished implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2936
diff
changeset
|
787 | """ |
de26bc76d6ee
Finished implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2936
diff
changeset
|
788 | Private method to fix leading and trailing quotes of docstring |
2960
9453efa25fd5
Continued correcting doc strings by using the new doc string checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2937
diff
changeset
|
789 | not on separate lines. |
9453efa25fd5
Continued correcting doc strings by using the new doc string checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2937
diff
changeset
|
790 | |
9453efa25fd5
Continued correcting doc strings by using the new doc string checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2937
diff
changeset
|
791 | Codes: D221, D222 |
2937
de26bc76d6ee
Finished implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2936
diff
changeset
|
792 | |
de26bc76d6ee
Finished implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2936
diff
changeset
|
793 | @param code code of the issue (string) |
de26bc76d6ee
Finished implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2936
diff
changeset
|
794 | @param line line number of the issue (integer) |
de26bc76d6ee
Finished implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2936
diff
changeset
|
795 | @param pos position inside line (integer) |
de26bc76d6ee
Finished implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2936
diff
changeset
|
796 | @keyparam apply flag indicating, that the fix should be applied |
de26bc76d6ee
Finished implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2936
diff
changeset
|
797 | (boolean) |
de26bc76d6ee
Finished implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2936
diff
changeset
|
798 | @return value indicating an applied/deferred fix (-1, 0, 1), |
de26bc76d6ee
Finished implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2936
diff
changeset
|
799 | a message for the fix (string) and an ID for a deferred |
de26bc76d6ee
Finished implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2936
diff
changeset
|
800 | fix (integer) |
de26bc76d6ee
Finished implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2936
diff
changeset
|
801 | """ |
de26bc76d6ee
Finished implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2936
diff
changeset
|
802 | if apply: |
de26bc76d6ee
Finished implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2936
diff
changeset
|
803 | line = line - 1 |
de26bc76d6ee
Finished implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2936
diff
changeset
|
804 | indent = self.__getIndent(self.__source[line]) |
de26bc76d6ee
Finished implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2936
diff
changeset
|
805 | source = self.__source[line].strip() |
de26bc76d6ee
Finished implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2936
diff
changeset
|
806 | if code == "D221": |
de26bc76d6ee
Finished implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2936
diff
changeset
|
807 | # leading |
de26bc76d6ee
Finished implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2936
diff
changeset
|
808 | if source.startswith(("r", "u")): |
de26bc76d6ee
Finished implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2936
diff
changeset
|
809 | first, second = source[:4], source[4:].strip() |
de26bc76d6ee
Finished implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2936
diff
changeset
|
810 | else: |
de26bc76d6ee
Finished implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2936
diff
changeset
|
811 | first, second = source[:3], source[3:].strip() |
de26bc76d6ee
Finished implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2936
diff
changeset
|
812 | else: |
de26bc76d6ee
Finished implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2936
diff
changeset
|
813 | # trailing |
de26bc76d6ee
Finished implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2936
diff
changeset
|
814 | first, second = source[:-3].strip(), source[-3:] |
3209
c5432abceb25
CodeStyleChecker moved to background service and done a little cleanup.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3145
diff
changeset
|
815 | newText = indent + first + self.__eol + \ |
c5432abceb25
CodeStyleChecker moved to background service and done a little cleanup.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3145
diff
changeset
|
816 | indent + second + self.__eol |
2937
de26bc76d6ee
Finished implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2936
diff
changeset
|
817 | self.__source[line] = newText |
de26bc76d6ee
Finished implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2936
diff
changeset
|
818 | if code == "D221": |
3413
5e63f809732a
Code style checker: Translations extracted and refactored.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3228
diff
changeset
|
819 | # Leading quotes put on separate line. |
5e63f809732a
Code style checker: Translations extracted and refactored.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3228
diff
changeset
|
820 | msg = "FD221" |
2937
de26bc76d6ee
Finished implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2936
diff
changeset
|
821 | else: |
3413
5e63f809732a
Code style checker: Translations extracted and refactored.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3228
diff
changeset
|
822 | # Trailing quotes put on separate line. |
5e63f809732a
Code style checker: Translations extracted and refactored.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3228
diff
changeset
|
823 | msg = "FD222" |
2937
de26bc76d6ee
Finished implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2936
diff
changeset
|
824 | return (1, msg, 0) |
de26bc76d6ee
Finished implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2936
diff
changeset
|
825 | else: |
5588
6ba512d9f46a
Continued fixing code style issues detected by the extended style checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5389
diff
changeset
|
826 | fixId = self.__getID() |
6ba512d9f46a
Continued fixing code style issues detected by the extended style checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5389
diff
changeset
|
827 | self.__stack.append((fixId, code, line, pos)) |
6ba512d9f46a
Continued fixing code style issues detected by the extended style checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5389
diff
changeset
|
828 | return (-1, "", fixId) |
2937
de26bc76d6ee
Finished implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2936
diff
changeset
|
829 | |
2936
2ff273068a10
Started implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2925
diff
changeset
|
830 | def __fixD242(self, code, line, pos, apply=False): |
2ff273068a10
Started implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2925
diff
changeset
|
831 | """ |
2ff273068a10
Started implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2925
diff
changeset
|
832 | Private method to fix a class or function/method docstring preceded |
2960
9453efa25fd5
Continued correcting doc strings by using the new doc string checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2937
diff
changeset
|
833 | by a blank line. |
9453efa25fd5
Continued correcting doc strings by using the new doc string checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2937
diff
changeset
|
834 | |
9453efa25fd5
Continued correcting doc strings by using the new doc string checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2937
diff
changeset
|
835 | Codes: D242, D244 |
2936
2ff273068a10
Started implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2925
diff
changeset
|
836 | |
2ff273068a10
Started implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2925
diff
changeset
|
837 | @param code code of the issue (string) |
2ff273068a10
Started implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2925
diff
changeset
|
838 | @param line line number of the issue (integer) |
2ff273068a10
Started implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2925
diff
changeset
|
839 | @param pos position inside line (integer) |
2ff273068a10
Started implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2925
diff
changeset
|
840 | @keyparam apply flag indicating, that the fix should be applied |
2ff273068a10
Started implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2925
diff
changeset
|
841 | (boolean) |
2ff273068a10
Started implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2925
diff
changeset
|
842 | @return value indicating an applied/deferred fix (-1, 0, 1), |
2ff273068a10
Started implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2925
diff
changeset
|
843 | a message for the fix (string) and an ID for a deferred |
2ff273068a10
Started implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2925
diff
changeset
|
844 | fix (integer) |
2ff273068a10
Started implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2925
diff
changeset
|
845 | """ |
2ff273068a10
Started implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2925
diff
changeset
|
846 | if apply: |
2ff273068a10
Started implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2925
diff
changeset
|
847 | line = line - 1 |
2ff273068a10
Started implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2925
diff
changeset
|
848 | self.__source[line - 1] = "" |
2ff273068a10
Started implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2925
diff
changeset
|
849 | if code == "D242": |
3413
5e63f809732a
Code style checker: Translations extracted and refactored.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3228
diff
changeset
|
850 | # Blank line before class docstring removed. |
5e63f809732a
Code style checker: Translations extracted and refactored.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3228
diff
changeset
|
851 | msg = "FD242" |
2936
2ff273068a10
Started implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2925
diff
changeset
|
852 | else: |
3413
5e63f809732a
Code style checker: Translations extracted and refactored.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3228
diff
changeset
|
853 | # Blank line before function/method docstring removed. |
5e63f809732a
Code style checker: Translations extracted and refactored.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3228
diff
changeset
|
854 | msg = "FD244" |
2936
2ff273068a10
Started implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2925
diff
changeset
|
855 | return (1, msg, 0) |
2ff273068a10
Started implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2925
diff
changeset
|
856 | else: |
5588
6ba512d9f46a
Continued fixing code style issues detected by the extended style checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5389
diff
changeset
|
857 | fixId = self.__getID() |
6ba512d9f46a
Continued fixing code style issues detected by the extended style checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5389
diff
changeset
|
858 | self.__stack.append((fixId, code, line, pos)) |
6ba512d9f46a
Continued fixing code style issues detected by the extended style checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5389
diff
changeset
|
859 | return (-1, "", fixId) |
2936
2ff273068a10
Started implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2925
diff
changeset
|
860 | |
2ff273068a10
Started implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2925
diff
changeset
|
861 | def __fixD243(self, code, line, pos, apply=False): |
2ff273068a10
Started implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2925
diff
changeset
|
862 | """ |
2ff273068a10
Started implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2925
diff
changeset
|
863 | Private method to fix a class or function/method docstring followed |
2960
9453efa25fd5
Continued correcting doc strings by using the new doc string checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2937
diff
changeset
|
864 | by a blank line. |
9453efa25fd5
Continued correcting doc strings by using the new doc string checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2937
diff
changeset
|
865 | |
9453efa25fd5
Continued correcting doc strings by using the new doc string checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2937
diff
changeset
|
866 | Codes: D243, D245 |
2936
2ff273068a10
Started implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2925
diff
changeset
|
867 | |
2ff273068a10
Started implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2925
diff
changeset
|
868 | @param code code of the issue (string) |
2ff273068a10
Started implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2925
diff
changeset
|
869 | @param line line number of the issue (integer) |
2ff273068a10
Started implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2925
diff
changeset
|
870 | @param pos position inside line (integer) |
2ff273068a10
Started implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2925
diff
changeset
|
871 | @keyparam apply flag indicating, that the fix should be applied |
2ff273068a10
Started implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2925
diff
changeset
|
872 | (boolean) |
2ff273068a10
Started implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2925
diff
changeset
|
873 | @return value indicating an applied/deferred fix (-1, 0, 1), |
2ff273068a10
Started implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2925
diff
changeset
|
874 | a message for the fix (string) and an ID for a deferred |
2ff273068a10
Started implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2925
diff
changeset
|
875 | fix (integer) |
2ff273068a10
Started implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2925
diff
changeset
|
876 | """ |
2ff273068a10
Started implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2925
diff
changeset
|
877 | if apply: |
2ff273068a10
Started implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2925
diff
changeset
|
878 | line = line - 1 |
2ff273068a10
Started implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2925
diff
changeset
|
879 | self.__source[line + 1] = "" |
2ff273068a10
Started implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2925
diff
changeset
|
880 | if code == "D243": |
3413
5e63f809732a
Code style checker: Translations extracted and refactored.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3228
diff
changeset
|
881 | # Blank line after class docstring removed. |
5e63f809732a
Code style checker: Translations extracted and refactored.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3228
diff
changeset
|
882 | msg = "FD243" |
2936
2ff273068a10
Started implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2925
diff
changeset
|
883 | else: |
3413
5e63f809732a
Code style checker: Translations extracted and refactored.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3228
diff
changeset
|
884 | # Blank line after function/method docstring removed. |
5e63f809732a
Code style checker: Translations extracted and refactored.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3228
diff
changeset
|
885 | msg = "FD245" |
2936
2ff273068a10
Started implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2925
diff
changeset
|
886 | return (1, msg, 0) |
2ff273068a10
Started implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2925
diff
changeset
|
887 | else: |
5588
6ba512d9f46a
Continued fixing code style issues detected by the extended style checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5389
diff
changeset
|
888 | fixId = self.__getID() |
6ba512d9f46a
Continued fixing code style issues detected by the extended style checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5389
diff
changeset
|
889 | self.__stack.append((fixId, code, line, pos)) |
6ba512d9f46a
Continued fixing code style issues detected by the extended style checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5389
diff
changeset
|
890 | return (-1, "", fixId) |
2936
2ff273068a10
Started implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2925
diff
changeset
|
891 | |
2ff273068a10
Started implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2925
diff
changeset
|
892 | def __fixD247(self, code, line, pos, apply=False): |
2ff273068a10
Started implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2925
diff
changeset
|
893 | """ |
2ff273068a10
Started implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2925
diff
changeset
|
894 | Private method to fix a last paragraph of a docstring followed |
2960
9453efa25fd5
Continued correcting doc strings by using the new doc string checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2937
diff
changeset
|
895 | by a blank line. |
9453efa25fd5
Continued correcting doc strings by using the new doc string checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2937
diff
changeset
|
896 | |
9453efa25fd5
Continued correcting doc strings by using the new doc string checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2937
diff
changeset
|
897 | Codes: D247 |
2936
2ff273068a10
Started implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2925
diff
changeset
|
898 | |
2ff273068a10
Started implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2925
diff
changeset
|
899 | @param code code of the issue (string) |
2ff273068a10
Started implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2925
diff
changeset
|
900 | @param line line number of the issue (integer) |
2ff273068a10
Started implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2925
diff
changeset
|
901 | @param pos position inside line (integer) |
2ff273068a10
Started implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2925
diff
changeset
|
902 | @keyparam apply flag indicating, that the fix should be applied |
2ff273068a10
Started implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2925
diff
changeset
|
903 | (boolean) |
2ff273068a10
Started implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2925
diff
changeset
|
904 | @return value indicating an applied/deferred fix (-1, 0, 1), |
2ff273068a10
Started implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2925
diff
changeset
|
905 | a message for the fix (string) and an ID for a deferred |
2ff273068a10
Started implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2925
diff
changeset
|
906 | fix (integer) |
2ff273068a10
Started implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2925
diff
changeset
|
907 | """ |
2ff273068a10
Started implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2925
diff
changeset
|
908 | if apply: |
2ff273068a10
Started implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2925
diff
changeset
|
909 | line = line - 1 |
2ff273068a10
Started implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2925
diff
changeset
|
910 | self.__source[line - 1] = "" |
3413
5e63f809732a
Code style checker: Translations extracted and refactored.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3228
diff
changeset
|
911 | # Blank line after last paragraph removed. |
5e63f809732a
Code style checker: Translations extracted and refactored.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3228
diff
changeset
|
912 | return (1, "FD247", 0) |
2936
2ff273068a10
Started implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2925
diff
changeset
|
913 | else: |
5588
6ba512d9f46a
Continued fixing code style issues detected by the extended style checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5389
diff
changeset
|
914 | fixId = self.__getID() |
6ba512d9f46a
Continued fixing code style issues detected by the extended style checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5389
diff
changeset
|
915 | self.__stack.append((fixId, code, line, pos)) |
6ba512d9f46a
Continued fixing code style issues detected by the extended style checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5389
diff
changeset
|
916 | return (-1, "", fixId) |
2936
2ff273068a10
Started implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2925
diff
changeset
|
917 | |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
918 | def __fixE101(self, code, line, pos): |
849
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
919 | """ |
2960
9453efa25fd5
Continued correcting doc strings by using the new doc string checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2937
diff
changeset
|
920 | Private method to fix obsolete tab usage and indentation errors. |
9453efa25fd5
Continued correcting doc strings by using the new doc string checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2937
diff
changeset
|
921 | |
9453efa25fd5
Continued correcting doc strings by using the new doc string checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2937
diff
changeset
|
922 | Codes: E101, E111, W191 |
849
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
923 | |
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
924 | @param code code of the issue (string) |
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
925 | @param line line number of the issue (integer) |
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
926 | @param pos position inside line (integer) |
2891
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
927 | @return value indicating an applied/deferred fix (-1, 0, 1), |
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
928 | a message for the fix (string) and an ID for a deferred |
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
929 | fix (integer) |
849
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
930 | """ |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
931 | if self.__reindenter is None: |
2978
9d63132a23e0
Continued changing the names of the various code style checkers to make them more appropriate to the broadened scope.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2976
diff
changeset
|
932 | self.__reindenter = Reindenter(self.__source) |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
933 | self.__reindenter.run() |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
934 | fixedLine = self.__reindenter.fixedLine(line - 1) |
2892
b601ede6dbbf
Fixed a few issues in the PEP-8 fixer and made it PEP-8 compliant.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2891
diff
changeset
|
935 | if fixedLine is not None and fixedLine != self.__source[line - 1]: |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
936 | self.__source[line - 1] = fixedLine |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
937 | if code in ["E101", "W191"]: |
3413
5e63f809732a
Code style checker: Translations extracted and refactored.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3228
diff
changeset
|
938 | # Tab converted to 4 spaces. |
5e63f809732a
Code style checker: Translations extracted and refactored.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3228
diff
changeset
|
939 | msg = "FE101" |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
940 | else: |
3413
5e63f809732a
Code style checker: Translations extracted and refactored.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3228
diff
changeset
|
941 | # Indentation adjusted to be a multiple of four. |
5e63f809732a
Code style checker: Translations extracted and refactored.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3228
diff
changeset
|
942 | msg = "FE111" |
2891
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
943 | return (1, msg, 0) |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
944 | else: |
2892
b601ede6dbbf
Fixed a few issues in the PEP-8 fixer and made it PEP-8 compliant.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2891
diff
changeset
|
945 | return (0, "", 0) |
849
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
946 | |
2875
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
947 | def __fixE121(self, code, line, pos, apply=False): |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
948 | """ |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
949 | Private method to fix the indentation of continuation lines and |
2960
9453efa25fd5
Continued correcting doc strings by using the new doc string checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2937
diff
changeset
|
950 | closing brackets. |
9453efa25fd5
Continued correcting doc strings by using the new doc string checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2937
diff
changeset
|
951 | |
9453efa25fd5
Continued correcting doc strings by using the new doc string checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2937
diff
changeset
|
952 | Codes: E121, E124 |
2875
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
953 | |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
954 | @param code code of the issue (string) |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
955 | @param line line number of the issue (integer) |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
956 | @param pos position inside line (integer) |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
957 | @keyparam apply flag indicating, that the fix should be applied |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
958 | (boolean) |
2891
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
959 | @return value indicating an applied/deferred fix (-1, 0, 1), |
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
960 | a message for the fix (string) and an ID for a deferred |
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
961 | fix (integer) |
2875
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
962 | """ |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
963 | if apply: |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
964 | logical = self.__getLogical(line, pos) |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
965 | if logical: |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
966 | # Fix by adjusting initial indent level. |
2892
b601ede6dbbf
Fixed a few issues in the PEP-8 fixer and made it PEP-8 compliant.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2891
diff
changeset
|
967 | changed = self.__fixReindent(line, pos, logical) |
b601ede6dbbf
Fixed a few issues in the PEP-8 fixer and made it PEP-8 compliant.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2891
diff
changeset
|
968 | if changed: |
b601ede6dbbf
Fixed a few issues in the PEP-8 fixer and made it PEP-8 compliant.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2891
diff
changeset
|
969 | if code == "E121": |
3413
5e63f809732a
Code style checker: Translations extracted and refactored.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3228
diff
changeset
|
970 | # Indentation of continuation line corrected. |
5e63f809732a
Code style checker: Translations extracted and refactored.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3228
diff
changeset
|
971 | msg = "FE121" |
2892
b601ede6dbbf
Fixed a few issues in the PEP-8 fixer and made it PEP-8 compliant.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2891
diff
changeset
|
972 | elif code == "E124": |
3413
5e63f809732a
Code style checker: Translations extracted and refactored.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3228
diff
changeset
|
973 | # Indentation of closing bracket corrected. |
5e63f809732a
Code style checker: Translations extracted and refactored.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3228
diff
changeset
|
974 | msg = "FE124" |
2892
b601ede6dbbf
Fixed a few issues in the PEP-8 fixer and made it PEP-8 compliant.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2891
diff
changeset
|
975 | return (1, msg, 0) |
b601ede6dbbf
Fixed a few issues in the PEP-8 fixer and made it PEP-8 compliant.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2891
diff
changeset
|
976 | return (0, "", 0) |
2875
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
977 | else: |
5588
6ba512d9f46a
Continued fixing code style issues detected by the extended style checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5389
diff
changeset
|
978 | fixId = self.__getID() |
6ba512d9f46a
Continued fixing code style issues detected by the extended style checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5389
diff
changeset
|
979 | self.__stackLogical.append((fixId, code, line, pos)) |
6ba512d9f46a
Continued fixing code style issues detected by the extended style checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5389
diff
changeset
|
980 | return (-1, "", fixId) |
2875
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
981 | |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
982 | def __fixE122(self, code, line, pos, apply=False): |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
983 | """ |
2960
9453efa25fd5
Continued correcting doc strings by using the new doc string checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2937
diff
changeset
|
984 | Private method to fix a missing indentation of continuation lines. |
9453efa25fd5
Continued correcting doc strings by using the new doc string checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2937
diff
changeset
|
985 | |
9453efa25fd5
Continued correcting doc strings by using the new doc string checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2937
diff
changeset
|
986 | Codes: E122 |
2875
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
987 | |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
988 | @param code code of the issue (string) |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
989 | @param line line number of the issue (integer) |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
990 | @param pos position inside line (integer) |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
991 | @keyparam apply flag indicating, that the fix should be applied |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
992 | (boolean) |
2891
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
993 | @return value indicating an applied/deferred fix (-1, 0, 1), |
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
994 | a message for the fix (string) and an ID for a deferred |
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
995 | fix (integer) |
2875
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
996 | """ |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
997 | if apply: |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
998 | logical = self.__getLogical(line, pos) |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
999 | if logical: |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1000 | # Fix by adding an initial indent. |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1001 | modified = self.__fixReindent(line, pos, logical) |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1002 | if not modified: |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1003 | # fall back to simple method |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1004 | line = line - 1 |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1005 | text = self.__source[line] |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1006 | indentation = self.__getIndent(text) |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1007 | self.__source[line] = indentation + \ |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1008 | self.__indentWord + text.lstrip() |
3413
5e63f809732a
Code style checker: Translations extracted and refactored.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3228
diff
changeset
|
1009 | # Missing indentation of continuation line corrected. |
5e63f809732a
Code style checker: Translations extracted and refactored.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3228
diff
changeset
|
1010 | return (1, "FE122", 0) |
2892
b601ede6dbbf
Fixed a few issues in the PEP-8 fixer and made it PEP-8 compliant.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2891
diff
changeset
|
1011 | return (0, "", 0) |
2875
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1012 | else: |
5588
6ba512d9f46a
Continued fixing code style issues detected by the extended style checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5389
diff
changeset
|
1013 | fixId = self.__getID() |
6ba512d9f46a
Continued fixing code style issues detected by the extended style checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5389
diff
changeset
|
1014 | self.__stackLogical.append((fixId, code, line, pos)) |
6ba512d9f46a
Continued fixing code style issues detected by the extended style checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5389
diff
changeset
|
1015 | return (-1, "", fixId) |
2875
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1016 | |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1017 | def __fixE123(self, code, line, pos, apply=False): |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1018 | """ |
2960
9453efa25fd5
Continued correcting doc strings by using the new doc string checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2937
diff
changeset
|
1019 | Private method to fix the indentation of a closing bracket lines. |
9453efa25fd5
Continued correcting doc strings by using the new doc string checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2937
diff
changeset
|
1020 | |
9453efa25fd5
Continued correcting doc strings by using the new doc string checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2937
diff
changeset
|
1021 | Codes: E123 |
2875
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1022 | |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1023 | @param code code of the issue (string) |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1024 | @param line line number of the issue (integer) |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1025 | @param pos position inside line (integer) |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1026 | @keyparam apply flag indicating, that the fix should be applied |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1027 | (boolean) |
2891
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
1028 | @return value indicating an applied/deferred fix (-1, 0, 1), |
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
1029 | a message for the fix (string) and an ID for a deferred |
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
1030 | fix (integer) |
2875
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1031 | """ |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1032 | if apply: |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1033 | logical = self.__getLogical(line, pos) |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1034 | if logical: |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1035 | # Fix by deleting whitespace to the correct level. |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1036 | logicalLines = logical[2] |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1037 | row = line - 1 |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1038 | text = self.__source[row] |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1039 | newText = self.__getIndent(logicalLines[0]) + text.lstrip() |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1040 | if newText == text: |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1041 | # fall back to slower method |
2892
b601ede6dbbf
Fixed a few issues in the PEP-8 fixer and made it PEP-8 compliant.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2891
diff
changeset
|
1042 | changed = self.__fixReindent(line, pos, logical) |
2875
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1043 | else: |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1044 | self.__source[row] = newText |
2892
b601ede6dbbf
Fixed a few issues in the PEP-8 fixer and made it PEP-8 compliant.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2891
diff
changeset
|
1045 | changed = True |
b601ede6dbbf
Fixed a few issues in the PEP-8 fixer and made it PEP-8 compliant.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2891
diff
changeset
|
1046 | if changed: |
3413
5e63f809732a
Code style checker: Translations extracted and refactored.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3228
diff
changeset
|
1047 | # Closing bracket aligned to opening bracket. |
5e63f809732a
Code style checker: Translations extracted and refactored.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3228
diff
changeset
|
1048 | return (1, "FE123", 0) |
2892
b601ede6dbbf
Fixed a few issues in the PEP-8 fixer and made it PEP-8 compliant.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2891
diff
changeset
|
1049 | return (0, "", 0) |
2875
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1050 | else: |
5588
6ba512d9f46a
Continued fixing code style issues detected by the extended style checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5389
diff
changeset
|
1051 | fixId = self.__getID() |
6ba512d9f46a
Continued fixing code style issues detected by the extended style checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5389
diff
changeset
|
1052 | self.__stackLogical.append((fixId, code, line, pos)) |
6ba512d9f46a
Continued fixing code style issues detected by the extended style checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5389
diff
changeset
|
1053 | return (-1, "", fixId) |
2875
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1054 | |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1055 | def __fixE125(self, code, line, pos, apply=False): |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1056 | """ |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1057 | Private method to fix the indentation of continuation lines not |
2960
9453efa25fd5
Continued correcting doc strings by using the new doc string checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2937
diff
changeset
|
1058 | distinguishable from next logical line. |
9453efa25fd5
Continued correcting doc strings by using the new doc string checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2937
diff
changeset
|
1059 | |
9453efa25fd5
Continued correcting doc strings by using the new doc string checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2937
diff
changeset
|
1060 | Codes: E125 |
2875
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1061 | |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1062 | @param code code of the issue (string) |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1063 | @param line line number of the issue (integer) |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1064 | @param pos position inside line (integer) |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1065 | @keyparam apply flag indicating, that the fix should be applied |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1066 | (boolean) |
2891
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
1067 | @return value indicating an applied/deferred fix (-1, 0, 1), |
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
1068 | a message for the fix (string) and an ID for a deferred |
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
1069 | fix (integer) |
2875
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1070 | """ |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1071 | if apply: |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1072 | logical = self.__getLogical(line, pos) |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1073 | if logical: |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1074 | # Fix by adjusting initial indent level. |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1075 | modified = self.__fixReindent(line, pos, logical) |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1076 | if not modified: |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1077 | row = line - 1 |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1078 | text = self.__source[row] |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1079 | self.__source[row] = self.__getIndent(text) + \ |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1080 | self.__indentWord + text.lstrip() |
3413
5e63f809732a
Code style checker: Translations extracted and refactored.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3228
diff
changeset
|
1081 | # Indentation level changed. |
5e63f809732a
Code style checker: Translations extracted and refactored.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3228
diff
changeset
|
1082 | return (1, "FE125", 0) |
2892
b601ede6dbbf
Fixed a few issues in the PEP-8 fixer and made it PEP-8 compliant.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2891
diff
changeset
|
1083 | return (0, "", 0) |
2875
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1084 | else: |
5588
6ba512d9f46a
Continued fixing code style issues detected by the extended style checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5389
diff
changeset
|
1085 | fixId = self.__getID() |
6ba512d9f46a
Continued fixing code style issues detected by the extended style checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5389
diff
changeset
|
1086 | self.__stackLogical.append((fixId, code, line, pos)) |
6ba512d9f46a
Continued fixing code style issues detected by the extended style checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5389
diff
changeset
|
1087 | return (-1, "", fixId) |
2875
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1088 | |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1089 | def __fixE126(self, code, line, pos, apply=False): |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1090 | """ |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1091 | Private method to fix over-indented/under-indented hanging |
2960
9453efa25fd5
Continued correcting doc strings by using the new doc string checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2937
diff
changeset
|
1092 | indentation. |
9453efa25fd5
Continued correcting doc strings by using the new doc string checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2937
diff
changeset
|
1093 | |
9453efa25fd5
Continued correcting doc strings by using the new doc string checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2937
diff
changeset
|
1094 | Codes: E126, E133 |
2875
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1095 | |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1096 | @param code code of the issue (string) |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1097 | @param line line number of the issue (integer) |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1098 | @param pos position inside line (integer) |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1099 | @keyparam apply flag indicating, that the fix should be applied |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1100 | (boolean) |
2891
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
1101 | @return value indicating an applied/deferred fix (-1, 0, 1), |
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
1102 | a message for the fix (string) and an ID for a deferred |
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
1103 | fix (integer) |
2875
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1104 | """ |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1105 | if apply: |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1106 | logical = self.__getLogical(line, pos) |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1107 | if logical: |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1108 | # Fix by deleting whitespace to the left. |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1109 | logicalLines = logical[2] |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1110 | row = line - 1 |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1111 | text = self.__source[row] |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1112 | newText = self.__getIndent(logicalLines[0]) + \ |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1113 | self.__indentWord + text.lstrip() |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1114 | if newText == text: |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1115 | # fall back to slower method |
2892
b601ede6dbbf
Fixed a few issues in the PEP-8 fixer and made it PEP-8 compliant.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2891
diff
changeset
|
1116 | changed = self.__fixReindent(line, pos, logical) |
2875
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1117 | else: |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1118 | self.__source[row] = newText |
2892
b601ede6dbbf
Fixed a few issues in the PEP-8 fixer and made it PEP-8 compliant.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2891
diff
changeset
|
1119 | changed = True |
b601ede6dbbf
Fixed a few issues in the PEP-8 fixer and made it PEP-8 compliant.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2891
diff
changeset
|
1120 | if changed: |
3413
5e63f809732a
Code style checker: Translations extracted and refactored.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3228
diff
changeset
|
1121 | # Indentation level of hanging indentation changed. |
5e63f809732a
Code style checker: Translations extracted and refactored.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3228
diff
changeset
|
1122 | return (1, "FE126", 0) |
2892
b601ede6dbbf
Fixed a few issues in the PEP-8 fixer and made it PEP-8 compliant.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2891
diff
changeset
|
1123 | return (0, "", 0) |
2875
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1124 | else: |
5588
6ba512d9f46a
Continued fixing code style issues detected by the extended style checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5389
diff
changeset
|
1125 | fixId = self.__getID() |
6ba512d9f46a
Continued fixing code style issues detected by the extended style checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5389
diff
changeset
|
1126 | self.__stackLogical.append((fixId, code, line, pos)) |
6ba512d9f46a
Continued fixing code style issues detected by the extended style checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5389
diff
changeset
|
1127 | return (-1, "", fixId) |
2875
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1128 | |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1129 | def __fixE127(self, code, line, pos, apply=False): |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1130 | """ |
2960
9453efa25fd5
Continued correcting doc strings by using the new doc string checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2937
diff
changeset
|
1131 | Private method to fix over/under indented lines. |
9453efa25fd5
Continued correcting doc strings by using the new doc string checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2937
diff
changeset
|
1132 | |
9453efa25fd5
Continued correcting doc strings by using the new doc string checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2937
diff
changeset
|
1133 | Codes: E127, E128 |
2875
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1134 | |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1135 | @param code code of the issue (string) |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1136 | @param line line number of the issue (integer) |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1137 | @param pos position inside line (integer) |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1138 | @keyparam apply flag indicating, that the fix should be applied |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1139 | (boolean) |
2891
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
1140 | @return value indicating an applied/deferred fix (-1, 0, 1), |
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
1141 | a message for the fix (string) and an ID for a deferred |
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
1142 | fix (integer) |
2875
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1143 | """ |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1144 | if apply: |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1145 | logical = self.__getLogical(line, pos) |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1146 | if logical: |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1147 | # Fix by inserting/deleting whitespace to the correct level. |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1148 | logicalLines = logical[2] |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1149 | row = line - 1 |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1150 | text = self.__source[row] |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1151 | newText = text |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1152 | |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1153 | if logicalLines[0].rstrip().endswith('\\'): |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1154 | newText = self.__getIndent(logicalLines[0]) + \ |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1155 | self.__indentWord + text.lstrip() |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1156 | else: |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1157 | startIndex = None |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1158 | for symbol in '([{': |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1159 | if symbol in logicalLines[0]: |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1160 | foundIndex = logicalLines[0].find(symbol) + 1 |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1161 | if startIndex is None: |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1162 | startIndex = foundIndex |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1163 | else: |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1164 | startIndex = min(startIndex, foundIndex) |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1165 | |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1166 | if startIndex is not None: |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1167 | newText = startIndex * ' ' + text.lstrip() |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1168 | |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1169 | if newText == text: |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1170 | # fall back to slower method |
2892
b601ede6dbbf
Fixed a few issues in the PEP-8 fixer and made it PEP-8 compliant.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2891
diff
changeset
|
1171 | changed = self.__fixReindent(line, pos, logical) |
2875
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1172 | else: |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1173 | self.__source[row] = newText |
2892
b601ede6dbbf
Fixed a few issues in the PEP-8 fixer and made it PEP-8 compliant.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2891
diff
changeset
|
1174 | changed = True |
b601ede6dbbf
Fixed a few issues in the PEP-8 fixer and made it PEP-8 compliant.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2891
diff
changeset
|
1175 | if changed: |
3413
5e63f809732a
Code style checker: Translations extracted and refactored.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3228
diff
changeset
|
1176 | # Visual indentation corrected. |
5e63f809732a
Code style checker: Translations extracted and refactored.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3228
diff
changeset
|
1177 | return (1, "FE127", 0) |
2892
b601ede6dbbf
Fixed a few issues in the PEP-8 fixer and made it PEP-8 compliant.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2891
diff
changeset
|
1178 | return (0, "", 0) |
2875
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1179 | else: |
5588
6ba512d9f46a
Continued fixing code style issues detected by the extended style checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5389
diff
changeset
|
1180 | fixId = self.__getID() |
6ba512d9f46a
Continued fixing code style issues detected by the extended style checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5389
diff
changeset
|
1181 | self.__stackLogical.append((fixId, code, line, pos)) |
6ba512d9f46a
Continued fixing code style issues detected by the extended style checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5389
diff
changeset
|
1182 | return (-1, "", fixId) |
2875
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1183 | |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1184 | def __fixE201(self, code, line, pos): |
849
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1185 | """ |
2960
9453efa25fd5
Continued correcting doc strings by using the new doc string checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2937
diff
changeset
|
1186 | Private method to fix extraneous whitespace. |
9453efa25fd5
Continued correcting doc strings by using the new doc string checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2937
diff
changeset
|
1187 | |
9453efa25fd5
Continued correcting doc strings by using the new doc string checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2937
diff
changeset
|
1188 | Codes: E201, E202, E203, E211 |
849
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1189 | |
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1190 | @param code code of the issue (string) |
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1191 | @param line line number of the issue (integer) |
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1192 | @param pos position inside line (integer) |
2891
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
1193 | @return value indicating an applied/deferred fix (-1, 0, 1), |
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
1194 | a message for the fix (string) and an ID for a deferred |
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
1195 | fix (integer) |
849
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1196 | """ |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1197 | line = line - 1 |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1198 | text = self.__source[line] |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1199 | |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1200 | if '"""' in text or "'''" in text or text.rstrip().endswith('\\'): |
2892
b601ede6dbbf
Fixed a few issues in the PEP-8 fixer and made it PEP-8 compliant.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2891
diff
changeset
|
1201 | return (0, "", 0) |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1202 | |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1203 | newText = self.__fixWhitespace(text, pos, '') |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1204 | if newText == text: |
2891
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
1205 | return (0, "", 0) |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1206 | |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1207 | self.__source[line] = newText |
3413
5e63f809732a
Code style checker: Translations extracted and refactored.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3228
diff
changeset
|
1208 | # Extraneous whitespace removed. |
5e63f809732a
Code style checker: Translations extracted and refactored.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3228
diff
changeset
|
1209 | return (1, "FE201", 0) |
849
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1210 | |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1211 | def __fixE221(self, code, line, pos): |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1212 | """ |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1213 | Private method to fix extraneous whitespace around operator or |
2960
9453efa25fd5
Continued correcting doc strings by using the new doc string checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2937
diff
changeset
|
1214 | keyword. |
9453efa25fd5
Continued correcting doc strings by using the new doc string checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2937
diff
changeset
|
1215 | |
4445
5636dc48e1a0
Own fixer for missing whitespaces around operators (1 pass fix) implemented.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
4150
diff
changeset
|
1216 | Codes: E221, E222, E223, E224, E241, E242, E271, E272, E273, E274 |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1217 | |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1218 | @param code code of the issue (string) |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1219 | @param line line number of the issue (integer) |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1220 | @param pos position inside line (integer) |
2891
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
1221 | @return value indicating an applied/deferred fix (-1, 0, 1), |
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
1222 | a message for the fix (string) and an ID for a deferred |
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
1223 | fix (integer) |
849
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1224 | """ |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1225 | line = line - 1 |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1226 | text = self.__source[line] |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1227 | |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1228 | if '"""' in text or "'''" in text or text.rstrip().endswith('\\'): |
2892
b601ede6dbbf
Fixed a few issues in the PEP-8 fixer and made it PEP-8 compliant.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2891
diff
changeset
|
1229 | return (0, "", 0) |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1230 | |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1231 | newText = self.__fixWhitespace(text, pos, ' ') |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1232 | if newText == text: |
2891
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
1233 | return (0, "", 0) |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1234 | |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1235 | self.__source[line] = newText |
4445
5636dc48e1a0
Own fixer for missing whitespaces around operators (1 pass fix) implemented.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
4150
diff
changeset
|
1236 | return (1, "FE221", 0) |
5636dc48e1a0
Own fixer for missing whitespaces around operators (1 pass fix) implemented.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
4150
diff
changeset
|
1237 | |
5636dc48e1a0
Own fixer for missing whitespaces around operators (1 pass fix) implemented.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
4150
diff
changeset
|
1238 | def __fixE225(self, code, line, pos): |
5636dc48e1a0
Own fixer for missing whitespaces around operators (1 pass fix) implemented.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
4150
diff
changeset
|
1239 | """ |
5636dc48e1a0
Own fixer for missing whitespaces around operators (1 pass fix) implemented.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
4150
diff
changeset
|
1240 | Private method to fix extraneous whitespaces around operator. |
5636dc48e1a0
Own fixer for missing whitespaces around operators (1 pass fix) implemented.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
4150
diff
changeset
|
1241 | |
5636dc48e1a0
Own fixer for missing whitespaces around operators (1 pass fix) implemented.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
4150
diff
changeset
|
1242 | Codes: E225, E226, E227, E228 |
5636dc48e1a0
Own fixer for missing whitespaces around operators (1 pass fix) implemented.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
4150
diff
changeset
|
1243 | |
5636dc48e1a0
Own fixer for missing whitespaces around operators (1 pass fix) implemented.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
4150
diff
changeset
|
1244 | @param code code of the issue (string) |
5636dc48e1a0
Own fixer for missing whitespaces around operators (1 pass fix) implemented.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
4150
diff
changeset
|
1245 | @param line line number of the issue (integer) |
5636dc48e1a0
Own fixer for missing whitespaces around operators (1 pass fix) implemented.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
4150
diff
changeset
|
1246 | @param pos position inside line (integer) |
5636dc48e1a0
Own fixer for missing whitespaces around operators (1 pass fix) implemented.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
4150
diff
changeset
|
1247 | @return value indicating an applied/deferred fix (-1, 0, 1), |
5636dc48e1a0
Own fixer for missing whitespaces around operators (1 pass fix) implemented.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
4150
diff
changeset
|
1248 | a message for the fix (string) and an ID for a deferred |
5636dc48e1a0
Own fixer for missing whitespaces around operators (1 pass fix) implemented.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
4150
diff
changeset
|
1249 | fix (integer) |
5636dc48e1a0
Own fixer for missing whitespaces around operators (1 pass fix) implemented.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
4150
diff
changeset
|
1250 | """ |
5636dc48e1a0
Own fixer for missing whitespaces around operators (1 pass fix) implemented.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
4150
diff
changeset
|
1251 | line = line - 1 |
5636dc48e1a0
Own fixer for missing whitespaces around operators (1 pass fix) implemented.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
4150
diff
changeset
|
1252 | text = self.__source[line] |
5636dc48e1a0
Own fixer for missing whitespaces around operators (1 pass fix) implemented.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
4150
diff
changeset
|
1253 | |
5636dc48e1a0
Own fixer for missing whitespaces around operators (1 pass fix) implemented.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
4150
diff
changeset
|
1254 | if '"""' in text or "'''" in text or text.rstrip().endswith('\\'): |
5636dc48e1a0
Own fixer for missing whitespaces around operators (1 pass fix) implemented.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
4150
diff
changeset
|
1255 | return (0, "", 0) |
5636dc48e1a0
Own fixer for missing whitespaces around operators (1 pass fix) implemented.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
4150
diff
changeset
|
1256 | |
5636dc48e1a0
Own fixer for missing whitespaces around operators (1 pass fix) implemented.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
4150
diff
changeset
|
1257 | newText = text |
5636dc48e1a0
Own fixer for missing whitespaces around operators (1 pass fix) implemented.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
4150
diff
changeset
|
1258 | # determine length of operator |
5636dc48e1a0
Own fixer for missing whitespaces around operators (1 pass fix) implemented.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
4150
diff
changeset
|
1259 | tokens = '<>*/=^&|%!+-' |
5636dc48e1a0
Own fixer for missing whitespaces around operators (1 pass fix) implemented.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
4150
diff
changeset
|
1260 | pos2 = pos |
5636dc48e1a0
Own fixer for missing whitespaces around operators (1 pass fix) implemented.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
4150
diff
changeset
|
1261 | token_delimiter = len(tokens) |
6188
5a6ae3be31e6
Fixed some loop related coding issues detected by the extended code style checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6048
diff
changeset
|
1262 | for _ in range(3): |
4445
5636dc48e1a0
Own fixer for missing whitespaces around operators (1 pass fix) implemented.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
4150
diff
changeset
|
1263 | if pos2 < len(text) and text[pos2] in tokens[:token_delimiter]: |
5636dc48e1a0
Own fixer for missing whitespaces around operators (1 pass fix) implemented.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
4150
diff
changeset
|
1264 | pos2 += 1 |
5636dc48e1a0
Own fixer for missing whitespaces around operators (1 pass fix) implemented.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
4150
diff
changeset
|
1265 | # only the first five could be repeated |
5636dc48e1a0
Own fixer for missing whitespaces around operators (1 pass fix) implemented.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
4150
diff
changeset
|
1266 | token_delimiter = 5 |
5636dc48e1a0
Own fixer for missing whitespaces around operators (1 pass fix) implemented.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
4150
diff
changeset
|
1267 | else: |
5636dc48e1a0
Own fixer for missing whitespaces around operators (1 pass fix) implemented.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
4150
diff
changeset
|
1268 | break |
5636dc48e1a0
Own fixer for missing whitespaces around operators (1 pass fix) implemented.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
4150
diff
changeset
|
1269 | if pos2 < len(text) and text[pos2] not in ' \t': |
5636dc48e1a0
Own fixer for missing whitespaces around operators (1 pass fix) implemented.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
4150
diff
changeset
|
1270 | newText = self.__fixWhitespace(newText, pos2, ' ') |
5636dc48e1a0
Own fixer for missing whitespaces around operators (1 pass fix) implemented.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
4150
diff
changeset
|
1271 | newText = self.__fixWhitespace(newText, pos, ' ') |
5636dc48e1a0
Own fixer for missing whitespaces around operators (1 pass fix) implemented.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
4150
diff
changeset
|
1272 | if newText == text: |
5636dc48e1a0
Own fixer for missing whitespaces around operators (1 pass fix) implemented.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
4150
diff
changeset
|
1273 | return (0, "", 0) |
5636dc48e1a0
Own fixer for missing whitespaces around operators (1 pass fix) implemented.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
4150
diff
changeset
|
1274 | |
5636dc48e1a0
Own fixer for missing whitespaces around operators (1 pass fix) implemented.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
4150
diff
changeset
|
1275 | self.__source[line] = newText |
5636dc48e1a0
Own fixer for missing whitespaces around operators (1 pass fix) implemented.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
4150
diff
changeset
|
1276 | # Missing whitespaces added. |
5636dc48e1a0
Own fixer for missing whitespaces around operators (1 pass fix) implemented.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
4150
diff
changeset
|
1277 | return (1, "FE225", 0) |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1278 | |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1279 | def __fixE231(self, code, line, pos): |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1280 | """ |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1281 | Private method to fix missing whitespace after ',;:'. |
849
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1282 | |
2960
9453efa25fd5
Continued correcting doc strings by using the new doc string checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2937
diff
changeset
|
1283 | Codes: E231 |
9453efa25fd5
Continued correcting doc strings by using the new doc string checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2937
diff
changeset
|
1284 | |
849
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1285 | @param code code of the issue (string) |
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1286 | @param line line number of the issue (integer) |
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1287 | @param pos position inside line (integer) |
2891
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
1288 | @return value indicating an applied/deferred fix (-1, 0, 1), |
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
1289 | a message for the fix (string) and an ID for a deferred |
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
1290 | fix (integer) |
849
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1291 | """ |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1292 | line = line - 1 |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1293 | pos = pos + 1 |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1294 | self.__source[line] = self.__source[line][:pos] + \ |
2892
b601ede6dbbf
Fixed a few issues in the PEP-8 fixer and made it PEP-8 compliant.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2891
diff
changeset
|
1295 | " " + self.__source[line][pos:] |
3413
5e63f809732a
Code style checker: Translations extracted and refactored.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3228
diff
changeset
|
1296 | # Missing whitespace added. |
5e63f809732a
Code style checker: Translations extracted and refactored.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3228
diff
changeset
|
1297 | return (1, "FE231", 0) |
849
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1298 | |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1299 | def __fixE251(self, code, line, pos): |
849
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1300 | """ |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1301 | Private method to fix extraneous whitespace around keyword and |
2960
9453efa25fd5
Continued correcting doc strings by using the new doc string checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2937
diff
changeset
|
1302 | default parameter equals. |
9453efa25fd5
Continued correcting doc strings by using the new doc string checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2937
diff
changeset
|
1303 | |
9453efa25fd5
Continued correcting doc strings by using the new doc string checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2937
diff
changeset
|
1304 | Codes: E251 |
849
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1305 | |
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1306 | @param code code of the issue (string) |
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1307 | @param line line number of the issue (integer) |
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1308 | @param pos position inside line (integer) |
2891
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
1309 | @return value indicating an applied/deferred fix (-1, 0, 1), |
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
1310 | a message for the fix (string) and an ID for a deferred |
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
1311 | fix (integer) |
849
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1312 | """ |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1313 | line = line - 1 |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1314 | text = self.__source[line] |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1315 | |
5147
d39dd5cee0c8
Renamed pep8.py to pycodestyle.py in order to track the upstream renaming.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4830
diff
changeset
|
1316 | # This is necessary since pycodestyle sometimes reports columns that |
d39dd5cee0c8
Renamed pep8.py to pycodestyle.py in order to track the upstream renaming.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4830
diff
changeset
|
1317 | # goes past the end of the physical line. This happens in cases like, |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1318 | # foo(bar\n=None) |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1319 | col = min(pos, len(text) - 1) |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1320 | if text[col].strip(): |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1321 | newText = text |
849
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1322 | else: |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1323 | newText = text[:col].rstrip() + text[col:].lstrip() |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1324 | |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1325 | # There could be an escaped newline |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1326 | # |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1327 | # def foo(a=\ |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1328 | # 1) |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1329 | if newText.endswith(('=\\\n', '=\\\r\n', '=\\\r')): |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1330 | self.__source[line] = newText.rstrip("\n\r \t\\") |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1331 | self.__source[line + 1] = self.__source[line + 1].lstrip() |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1332 | else: |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1333 | self.__source[line] = newText |
3413
5e63f809732a
Code style checker: Translations extracted and refactored.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3228
diff
changeset
|
1334 | # Extraneous whitespace removed. |
5e63f809732a
Code style checker: Translations extracted and refactored.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3228
diff
changeset
|
1335 | return (1, "FE251", 0) |
849
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1336 | |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1337 | def __fixE261(self, code, line, pos): |
849
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1338 | """ |
2960
9453efa25fd5
Continued correcting doc strings by using the new doc string checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2937
diff
changeset
|
1339 | Private method to fix whitespace before or after inline comment. |
9453efa25fd5
Continued correcting doc strings by using the new doc string checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2937
diff
changeset
|
1340 | |
9453efa25fd5
Continued correcting doc strings by using the new doc string checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2937
diff
changeset
|
1341 | Codes: E261, E262 |
849
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1342 | |
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1343 | @param code code of the issue (string) |
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1344 | @param line line number of the issue (integer) |
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1345 | @param pos position inside line (integer) |
2891
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
1346 | @return value indicating an applied/deferred fix (-1, 0, 1), |
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
1347 | a message for the fix (string) and an ID for a deferred |
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
1348 | fix (integer) |
849
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1349 | """ |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1350 | line = line - 1 |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1351 | text = self.__source[line] |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1352 | left = text[:pos].rstrip(' \t#') |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1353 | right = text[pos:].lstrip(' \t#') |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1354 | newText = left + (" # " + right if right.strip() else right) |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1355 | self.__source[line] = newText |
3413
5e63f809732a
Code style checker: Translations extracted and refactored.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3228
diff
changeset
|
1356 | # Whitespace around comment sign corrected. |
5e63f809732a
Code style checker: Translations extracted and refactored.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3228
diff
changeset
|
1357 | return (1, "FE261", 0) |
849
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1358 | |
6264
04a671fa4adb
code style checker: extended the dialog to be able to define the number of blank lines before class and function/method definitions
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6188
diff
changeset
|
1359 | def __fixBlankLinesBefore(self, code, line, pos, apply=False): |
849
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1360 | """ |
6264
04a671fa4adb
code style checker: extended the dialog to be able to define the number of blank lines before class and function/method definitions
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6188
diff
changeset
|
1361 | Private method to fix the need for blank lines before class, function |
04a671fa4adb
code style checker: extended the dialog to be able to define the number of blank lines before class and function/method definitions
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6188
diff
changeset
|
1362 | and method definitions. |
2960
9453efa25fd5
Continued correcting doc strings by using the new doc string checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2937
diff
changeset
|
1363 | |
6264
04a671fa4adb
code style checker: extended the dialog to be able to define the number of blank lines before class and function/method definitions
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6188
diff
changeset
|
1364 | Codes: E301, E302, E303, E305, E306, E307, E308 |
2875
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1365 | |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1366 | @param code code of the issue (string) |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1367 | @param line line number of the issue (integer) |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1368 | @param pos position inside line (integer) |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1369 | @keyparam apply flag indicating, that the fix should be applied |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1370 | (boolean) |
2891
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
1371 | @return value indicating an applied/deferred fix (-1, 0, 1), |
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
1372 | a message for the fix (string) and an ID for a deferred |
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
1373 | fix (integer) |
853
ec7dd115e26b
Continued implementing a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
852
diff
changeset
|
1374 | """ |
ec7dd115e26b
Continued implementing a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
852
diff
changeset
|
1375 | if apply: |
6264
04a671fa4adb
code style checker: extended the dialog to be able to define the number of blank lines before class and function/method definitions
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6188
diff
changeset
|
1376 | if code in ["E301", "E306", "E307"]: |
04a671fa4adb
code style checker: extended the dialog to be able to define the number of blank lines before class and function/method definitions
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6188
diff
changeset
|
1377 | blankLinesBefore = self.__blankLines["method"] |
04a671fa4adb
code style checker: extended the dialog to be able to define the number of blank lines before class and function/method definitions
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6188
diff
changeset
|
1378 | elif code == "E308": |
04a671fa4adb
code style checker: extended the dialog to be able to define the number of blank lines before class and function/method definitions
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6188
diff
changeset
|
1379 | blankLinesBefore = 1 |
04a671fa4adb
code style checker: extended the dialog to be able to define the number of blank lines before class and function/method definitions
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6188
diff
changeset
|
1380 | else: |
04a671fa4adb
code style checker: extended the dialog to be able to define the number of blank lines before class and function/method definitions
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6188
diff
changeset
|
1381 | blankLinesBefore = self.__blankLines["toplevel"] |
04a671fa4adb
code style checker: extended the dialog to be able to define the number of blank lines before class and function/method definitions
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6188
diff
changeset
|
1382 | |
2891
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
1383 | # count blank lines |
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
1384 | index = line - 1 |
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
1385 | blanks = 0 |
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
1386 | while index: |
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
1387 | if self.__source[index - 1].strip() == "": |
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
1388 | blanks += 1 |
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
1389 | index -= 1 |
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
1390 | else: |
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
1391 | break |
6264
04a671fa4adb
code style checker: extended the dialog to be able to define the number of blank lines before class and function/method definitions
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6188
diff
changeset
|
1392 | delta = blanks - blankLinesBefore |
2891
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
1393 | |
853
ec7dd115e26b
Continued implementing a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
852
diff
changeset
|
1394 | line -= 1 |
ec7dd115e26b
Continued implementing a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
852
diff
changeset
|
1395 | if delta < 0: |
ec7dd115e26b
Continued implementing a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
852
diff
changeset
|
1396 | # insert blank lines (one or two) |
ec7dd115e26b
Continued implementing a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
852
diff
changeset
|
1397 | while delta < 0: |
3209
c5432abceb25
CodeStyleChecker moved to background service and done a little cleanup.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3145
diff
changeset
|
1398 | self.__source.insert(line, self.__eol) |
853
ec7dd115e26b
Continued implementing a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
852
diff
changeset
|
1399 | delta += 1 |
3413
5e63f809732a
Code style checker: Translations extracted and refactored.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3228
diff
changeset
|
1400 | # %n blank line(s) inserted. |
6264
04a671fa4adb
code style checker: extended the dialog to be able to define the number of blank lines before class and function/method definitions
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6188
diff
changeset
|
1401 | return (1, ("FE302+", blankLinesBefore - blanks), 0) |
853
ec7dd115e26b
Continued implementing a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
852
diff
changeset
|
1402 | elif delta > 0: |
ec7dd115e26b
Continued implementing a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
852
diff
changeset
|
1403 | # delete superfluous blank lines |
ec7dd115e26b
Continued implementing a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
852
diff
changeset
|
1404 | while delta > 0: |
ec7dd115e26b
Continued implementing a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
852
diff
changeset
|
1405 | del self.__source[line - 1] |
ec7dd115e26b
Continued implementing a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
852
diff
changeset
|
1406 | line -= 1 |
ec7dd115e26b
Continued implementing a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
852
diff
changeset
|
1407 | delta -= 1 |
3413
5e63f809732a
Code style checker: Translations extracted and refactored.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3228
diff
changeset
|
1408 | # %n superfluous line(s) removed. |
6264
04a671fa4adb
code style checker: extended the dialog to be able to define the number of blank lines before class and function/method definitions
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6188
diff
changeset
|
1409 | return (1, ("FE302-", blanks - blankLinesBefore), 0) |
2892
b601ede6dbbf
Fixed a few issues in the PEP-8 fixer and made it PEP-8 compliant.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2891
diff
changeset
|
1410 | else: |
3413
5e63f809732a
Code style checker: Translations extracted and refactored.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3228
diff
changeset
|
1411 | return (0, "", 0) |
853
ec7dd115e26b
Continued implementing a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
852
diff
changeset
|
1412 | else: |
5588
6ba512d9f46a
Continued fixing code style issues detected by the extended style checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5389
diff
changeset
|
1413 | fixId = self.__getID() |
6ba512d9f46a
Continued fixing code style issues detected by the extended style checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5389
diff
changeset
|
1414 | self.__stack.append((fixId, code, line, pos)) |
6ba512d9f46a
Continued fixing code style issues detected by the extended style checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5389
diff
changeset
|
1415 | return (-1, "", fixId) |
853
ec7dd115e26b
Continued implementing a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
852
diff
changeset
|
1416 | |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1417 | def __fixE304(self, code, line, pos, apply=False): |
851
321d29b93238
Continued implementing a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
849
diff
changeset
|
1418 | """ |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1419 | Private method to fix superfluous blank lines after a function |
2960
9453efa25fd5
Continued correcting doc strings by using the new doc string checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2937
diff
changeset
|
1420 | decorator. |
9453efa25fd5
Continued correcting doc strings by using the new doc string checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2937
diff
changeset
|
1421 | |
9453efa25fd5
Continued correcting doc strings by using the new doc string checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2937
diff
changeset
|
1422 | Codes: E304 |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1423 | |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1424 | @param code code of the issue (string) |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1425 | @param line line number of the issue (integer) |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1426 | @param pos position inside line (integer) |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1427 | @keyparam apply flag indicating, that the fix should be applied |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1428 | (boolean) |
2891
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
1429 | @return value indicating an applied/deferred fix (-1, 0, 1), |
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
1430 | a message for the fix (string) and an ID for a deferred |
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
1431 | fix (integer) |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1432 | """ |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1433 | if apply: |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1434 | index = line - 2 |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1435 | while index: |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1436 | if self.__source[index].strip() == "": |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1437 | del self.__source[index] |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1438 | index -= 1 |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1439 | else: |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1440 | break |
3413
5e63f809732a
Code style checker: Translations extracted and refactored.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3228
diff
changeset
|
1441 | # Superfluous blank lines after function decorator removed. |
5e63f809732a
Code style checker: Translations extracted and refactored.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3228
diff
changeset
|
1442 | return (1, "FE304", 0) |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1443 | else: |
5588
6ba512d9f46a
Continued fixing code style issues detected by the extended style checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5389
diff
changeset
|
1444 | fixId = self.__getID() |
6ba512d9f46a
Continued fixing code style issues detected by the extended style checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5389
diff
changeset
|
1445 | self.__stack.append((fixId, code, line, pos)) |
6ba512d9f46a
Continued fixing code style issues detected by the extended style checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5389
diff
changeset
|
1446 | return (-1, "", fixId) |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1447 | |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1448 | def __fixE401(self, code, line, pos, apply=False): |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1449 | """ |
2960
9453efa25fd5
Continued correcting doc strings by using the new doc string checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2937
diff
changeset
|
1450 | Private method to fix multiple imports on one line. |
9453efa25fd5
Continued correcting doc strings by using the new doc string checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2937
diff
changeset
|
1451 | |
9453efa25fd5
Continued correcting doc strings by using the new doc string checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2937
diff
changeset
|
1452 | Codes: E401 |
851
321d29b93238
Continued implementing a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
849
diff
changeset
|
1453 | |
321d29b93238
Continued implementing a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
849
diff
changeset
|
1454 | @param code code of the issue (string) |
321d29b93238
Continued implementing a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
849
diff
changeset
|
1455 | @param line line number of the issue (integer) |
321d29b93238
Continued implementing a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
849
diff
changeset
|
1456 | @param pos position inside line (integer) |
321d29b93238
Continued implementing a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
849
diff
changeset
|
1457 | @keyparam apply flag indicating, that the fix should be applied |
321d29b93238
Continued implementing a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
849
diff
changeset
|
1458 | (boolean) |
2891
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
1459 | @return value indicating an applied/deferred fix (-1, 0, 1), |
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
1460 | a message for the fix (string) and an ID for a deferred |
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
1461 | fix (integer) |
851
321d29b93238
Continued implementing a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
849
diff
changeset
|
1462 | """ |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1463 | if apply: |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1464 | line = line - 1 |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1465 | text = self.__source[line] |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1466 | if not text.lstrip().startswith("import"): |
2891
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
1467 | return (0, "", 0) |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1468 | |
5147
d39dd5cee0c8
Renamed pep8.py to pycodestyle.py in order to track the upstream renaming.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4830
diff
changeset
|
1469 | # pycodestyle (1.3.1) reports false positive if there is an import |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1470 | # statement followed by a semicolon and some unrelated |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1471 | # statement with commas in it. |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1472 | if ';' in text: |
2891
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
1473 | return (0, "", 0) |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1474 | |
3209
c5432abceb25
CodeStyleChecker moved to background service and done a little cleanup.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3145
diff
changeset
|
1475 | newText = text[:pos].rstrip("\t ,") + self.__eol + \ |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1476 | self.__getIndent(text) + "import " + text[pos:].lstrip("\t ,") |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1477 | self.__source[line] = newText |
3413
5e63f809732a
Code style checker: Translations extracted and refactored.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3228
diff
changeset
|
1478 | # Imports were put on separate lines. |
5e63f809732a
Code style checker: Translations extracted and refactored.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3228
diff
changeset
|
1479 | return (1, "FE401", 0) |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1480 | else: |
5588
6ba512d9f46a
Continued fixing code style issues detected by the extended style checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5389
diff
changeset
|
1481 | fixId = self.__getID() |
6ba512d9f46a
Continued fixing code style issues detected by the extended style checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5389
diff
changeset
|
1482 | self.__stack.append((fixId, code, line, pos)) |
6ba512d9f46a
Continued fixing code style issues detected by the extended style checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5389
diff
changeset
|
1483 | return (-1, "", fixId) |
851
321d29b93238
Continued implementing a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
849
diff
changeset
|
1484 | |
2882
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
1485 | def __fixE501(self, code, line, pos, apply=False): |
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
1486 | """ |
2960
9453efa25fd5
Continued correcting doc strings by using the new doc string checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2937
diff
changeset
|
1487 | Private method to fix the long lines by breaking them. |
9453efa25fd5
Continued correcting doc strings by using the new doc string checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2937
diff
changeset
|
1488 | |
9453efa25fd5
Continued correcting doc strings by using the new doc string checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2937
diff
changeset
|
1489 | Codes: E501 |
2882
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
1490 | |
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
1491 | @param code code of the issue (string) |
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
1492 | @param line line number of the issue (integer) |
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
1493 | @param pos position inside line (integer) |
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
1494 | @keyparam apply flag indicating, that the fix should be applied |
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
1495 | (boolean) |
2891
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
1496 | @return value indicating an applied/deferred fix (-1, 0, 1), |
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
1497 | a message for the fix (string) and an ID for a deferred |
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
1498 | fix (integer) |
2882
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
1499 | """ |
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
1500 | if apply: |
2976
393f5faaa017
A little optimazation to the code style fixer.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2962
diff
changeset
|
1501 | multilineStringLines, docStringLines = \ |
393f5faaa017
A little optimazation to the code style fixer.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2962
diff
changeset
|
1502 | self.__multilineStringLines() |
2882
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
1503 | isDocString = line in docStringLines |
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
1504 | line = line - 1 |
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
1505 | text = self.__source[line] |
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
1506 | if line > 0: |
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
1507 | prevText = self.__source[line - 1] |
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
1508 | else: |
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
1509 | prevText = "" |
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
1510 | if line < len(self.__source) - 1: |
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
1511 | nextText = self.__source[line + 1] |
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
1512 | else: |
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
1513 | nextText = "" |
2978
9d63132a23e0
Continued changing the names of the various code style checkers to make them more appropriate to the broadened scope.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2976
diff
changeset
|
1514 | shortener = LineShortener( |
2892
b601ede6dbbf
Fixed a few issues in the PEP-8 fixer and made it PEP-8 compliant.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2891
diff
changeset
|
1515 | text, prevText, nextText, |
3209
c5432abceb25
CodeStyleChecker moved to background service and done a little cleanup.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3145
diff
changeset
|
1516 | maxLength=self.__maxLineLength, eol=self.__eol, |
2892
b601ede6dbbf
Fixed a few issues in the PEP-8 fixer and made it PEP-8 compliant.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2891
diff
changeset
|
1517 | indentWord=self.__indentWord, isDocString=isDocString) |
2882
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
1518 | changed, newText, newNextText = shortener.shorten() |
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
1519 | if changed: |
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
1520 | if newText != text: |
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
1521 | self.__source[line] = newText |
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
1522 | if newNextText and newNextText != nextText: |
2981
0c5205aa7a5a
Fixed some issues in the code style fixer.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2978
diff
changeset
|
1523 | if newNextText == " ": |
0c5205aa7a5a
Fixed some issues in the code style fixer.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2978
diff
changeset
|
1524 | newNextText = "" |
2882
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
1525 | self.__source[line + 1] = newNextText |
3413
5e63f809732a
Code style checker: Translations extracted and refactored.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3228
diff
changeset
|
1526 | # Long lines have been shortened. |
5e63f809732a
Code style checker: Translations extracted and refactored.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3228
diff
changeset
|
1527 | return (1, "FE501", 0) |
2891
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
1528 | else: |
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
1529 | return (0, "", 0) |
2882
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
1530 | else: |
5588
6ba512d9f46a
Continued fixing code style issues detected by the extended style checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5389
diff
changeset
|
1531 | fixId = self.__getID() |
6ba512d9f46a
Continued fixing code style issues detected by the extended style checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5389
diff
changeset
|
1532 | self.__stack.append((fixId, code, line, pos)) |
6ba512d9f46a
Continued fixing code style issues detected by the extended style checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5389
diff
changeset
|
1533 | return (-1, "", fixId) |
2882
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
1534 | |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1535 | def __fixE502(self, code, line, pos): |
851
321d29b93238
Continued implementing a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
849
diff
changeset
|
1536 | """ |
2960
9453efa25fd5
Continued correcting doc strings by using the new doc string checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2937
diff
changeset
|
1537 | Private method to fix redundant backslash within brackets. |
9453efa25fd5
Continued correcting doc strings by using the new doc string checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2937
diff
changeset
|
1538 | |
9453efa25fd5
Continued correcting doc strings by using the new doc string checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2937
diff
changeset
|
1539 | Codes: E502 |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1540 | |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1541 | @param code code of the issue (string) |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1542 | @param line line number of the issue (integer) |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1543 | @param pos position inside line (integer) |
2891
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
1544 | @return value indicating an applied/deferred fix (-1, 0, 1), |
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
1545 | a message for the fix (string) and an ID for a deferred |
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
1546 | fix (integer) |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1547 | """ |
2883
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
1548 | self.__source[line - 1] = \ |
3209
c5432abceb25
CodeStyleChecker moved to background service and done a little cleanup.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3145
diff
changeset
|
1549 | self.__source[line - 1].rstrip("\n\r \t\\") + self.__eol |
3413
5e63f809732a
Code style checker: Translations extracted and refactored.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3228
diff
changeset
|
1550 | # Redundant backslash in brackets removed. |
5e63f809732a
Code style checker: Translations extracted and refactored.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3228
diff
changeset
|
1551 | return (1, "FE502", 0) |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1552 | |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1553 | def __fixE701(self, code, line, pos, apply=False): |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1554 | """ |
2960
9453efa25fd5
Continued correcting doc strings by using the new doc string checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2937
diff
changeset
|
1555 | Private method to fix colon-separated compound statements. |
9453efa25fd5
Continued correcting doc strings by using the new doc string checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2937
diff
changeset
|
1556 | |
9453efa25fd5
Continued correcting doc strings by using the new doc string checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2937
diff
changeset
|
1557 | Codes: E701 |
851
321d29b93238
Continued implementing a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
849
diff
changeset
|
1558 | |
321d29b93238
Continued implementing a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
849
diff
changeset
|
1559 | @param code code of the issue (string) |
321d29b93238
Continued implementing a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
849
diff
changeset
|
1560 | @param line line number of the issue (integer) |
321d29b93238
Continued implementing a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
849
diff
changeset
|
1561 | @param pos position inside line (integer) |
321d29b93238
Continued implementing a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
849
diff
changeset
|
1562 | @keyparam apply flag indicating, that the fix should be applied |
321d29b93238
Continued implementing a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
849
diff
changeset
|
1563 | (boolean) |
2891
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
1564 | @return value indicating an applied/deferred fix (-1, 0, 1), |
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
1565 | a message for the fix (string) and an ID for a deferred |
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
1566 | fix (integer) |
851
321d29b93238
Continued implementing a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
849
diff
changeset
|
1567 | """ |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1568 | if apply: |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1569 | line = line - 1 |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1570 | text = self.__source[line] |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1571 | pos = pos + 1 |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1572 | |
3209
c5432abceb25
CodeStyleChecker moved to background service and done a little cleanup.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3145
diff
changeset
|
1573 | newText = text[:pos] + self.__eol + self.__getIndent(text) + \ |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1574 | self.__indentWord + text[pos:].lstrip("\n\r \t\\") + \ |
3209
c5432abceb25
CodeStyleChecker moved to background service and done a little cleanup.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3145
diff
changeset
|
1575 | self.__eol |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1576 | self.__source[line] = newText |
3413
5e63f809732a
Code style checker: Translations extracted and refactored.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3228
diff
changeset
|
1577 | # Compound statement corrected. |
5e63f809732a
Code style checker: Translations extracted and refactored.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3228
diff
changeset
|
1578 | return (1, "FE701", 0) |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1579 | else: |
5588
6ba512d9f46a
Continued fixing code style issues detected by the extended style checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5389
diff
changeset
|
1580 | fixId = self.__getID() |
6ba512d9f46a
Continued fixing code style issues detected by the extended style checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5389
diff
changeset
|
1581 | self.__stack.append((fixId, code, line, pos)) |
6ba512d9f46a
Continued fixing code style issues detected by the extended style checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5389
diff
changeset
|
1582 | return (-1, "", fixId) |
852
257a6f80b96c
Continued implementing a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
851
diff
changeset
|
1583 | |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1584 | def __fixE702(self, code, line, pos, apply=False): |
852
257a6f80b96c
Continued implementing a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
851
diff
changeset
|
1585 | """ |
2960
9453efa25fd5
Continued correcting doc strings by using the new doc string checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2937
diff
changeset
|
1586 | Private method to fix semicolon-separated compound statements. |
9453efa25fd5
Continued correcting doc strings by using the new doc string checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2937
diff
changeset
|
1587 | |
9453efa25fd5
Continued correcting doc strings by using the new doc string checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2937
diff
changeset
|
1588 | Codes: E702, E703 |
852
257a6f80b96c
Continued implementing a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
851
diff
changeset
|
1589 | |
257a6f80b96c
Continued implementing a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
851
diff
changeset
|
1590 | @param code code of the issue (string) |
257a6f80b96c
Continued implementing a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
851
diff
changeset
|
1591 | @param line line number of the issue (integer) |
257a6f80b96c
Continued implementing a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
851
diff
changeset
|
1592 | @param pos position inside line (integer) |
257a6f80b96c
Continued implementing a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
851
diff
changeset
|
1593 | @keyparam apply flag indicating, that the fix should be applied |
257a6f80b96c
Continued implementing a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
851
diff
changeset
|
1594 | (boolean) |
2891
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
1595 | @return value indicating an applied/deferred fix (-1, 0, 1), |
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
1596 | a message for the fix (string) and an ID for a deferred |
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
1597 | fix (integer) |
852
257a6f80b96c
Continued implementing a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
851
diff
changeset
|
1598 | """ |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1599 | if apply: |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1600 | line = line - 1 |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1601 | text = self.__source[line] |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1602 | |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1603 | if text.rstrip().endswith("\\"): |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1604 | # normalize '1; \\\n2' into '1; 2' |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1605 | self.__source[line] = text.rstrip("\n\r \t\\") |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1606 | self.__source[line + 1] = self.__source[line + 1].lstrip() |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1607 | elif text.rstrip().endswith(";"): |
3209
c5432abceb25
CodeStyleChecker moved to background service and done a little cleanup.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3145
diff
changeset
|
1608 | self.__source[line] = text.rstrip("\n\r \t;") + self.__eol |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1609 | else: |
3209
c5432abceb25
CodeStyleChecker moved to background service and done a little cleanup.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3145
diff
changeset
|
1610 | first = text[:pos].rstrip("\n\r \t;") + self.__eol |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1611 | second = text[pos:].lstrip("\n\r \t;") |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1612 | self.__source[line] = first + self.__getIndent(text) + second |
3413
5e63f809732a
Code style checker: Translations extracted and refactored.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3228
diff
changeset
|
1613 | # Compound statement corrected. |
5e63f809732a
Code style checker: Translations extracted and refactored.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3228
diff
changeset
|
1614 | return (1, "FE702", 0) |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1615 | else: |
5588
6ba512d9f46a
Continued fixing code style issues detected by the extended style checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5389
diff
changeset
|
1616 | fixId = self.__getID() |
6ba512d9f46a
Continued fixing code style issues detected by the extended style checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5389
diff
changeset
|
1617 | self.__stack.append((fixId, code, line, pos)) |
6ba512d9f46a
Continued fixing code style issues detected by the extended style checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5389
diff
changeset
|
1618 | return (-1, "", fixId) |
852
257a6f80b96c
Continued implementing a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
851
diff
changeset
|
1619 | |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1620 | def __fixE711(self, code, line, pos): |
852
257a6f80b96c
Continued implementing a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
851
diff
changeset
|
1621 | """ |
2960
9453efa25fd5
Continued correcting doc strings by using the new doc string checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2937
diff
changeset
|
1622 | Private method to fix comparison with None. |
9453efa25fd5
Continued correcting doc strings by using the new doc string checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2937
diff
changeset
|
1623 | |
9453efa25fd5
Continued correcting doc strings by using the new doc string checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2937
diff
changeset
|
1624 | Codes: E711, E712 |
852
257a6f80b96c
Continued implementing a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
851
diff
changeset
|
1625 | |
257a6f80b96c
Continued implementing a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
851
diff
changeset
|
1626 | @param code code of the issue (string) |
257a6f80b96c
Continued implementing a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
851
diff
changeset
|
1627 | @param line line number of the issue (integer) |
257a6f80b96c
Continued implementing a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
851
diff
changeset
|
1628 | @param pos position inside line (integer) |
2891
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
1629 | @return value indicating an applied/deferred fix (-1, 0, 1), |
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
1630 | a message for the fix (string) and an ID for a deferred |
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
1631 | fix (integer) |
852
257a6f80b96c
Continued implementing a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
851
diff
changeset
|
1632 | """ |
257a6f80b96c
Continued implementing a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
851
diff
changeset
|
1633 | line = line - 1 |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1634 | text = self.__source[line] |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1635 | |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1636 | rightPos = pos + 2 |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1637 | if rightPos >= len(text): |
2891
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
1638 | return (0, "", 0) |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1639 | |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1640 | left = text[:pos].rstrip() |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1641 | center = text[pos:rightPos] |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1642 | right = text[rightPos:].lstrip() |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1643 | |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1644 | if not right.startswith(("None", "True", "False")): |
2891
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
1645 | return (0, "", 0) |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1646 | |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1647 | if center.strip() == "==": |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1648 | center = "is" |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1649 | elif center.strip() == "!=": |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1650 | center = "is not" |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1651 | else: |
2891
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
1652 | return (0, "", 0) |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1653 | |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1654 | self.__source[line] = " ".join([left, center, right]) |
3413
5e63f809732a
Code style checker: Translations extracted and refactored.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3228
diff
changeset
|
1655 | # Comparison to None/True/False corrected. |
5e63f809732a
Code style checker: Translations extracted and refactored.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3228
diff
changeset
|
1656 | return (1, "FE711", 0) |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1657 | |
2895
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1658 | def __fixN804(self, code, line, pos, apply=False): |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1659 | """ |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1660 | Private method to fix a wrong first argument of normal and |
2960
9453efa25fd5
Continued correcting doc strings by using the new doc string checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2937
diff
changeset
|
1661 | class methods. |
9453efa25fd5
Continued correcting doc strings by using the new doc string checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2937
diff
changeset
|
1662 | |
9453efa25fd5
Continued correcting doc strings by using the new doc string checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2937
diff
changeset
|
1663 | Codes: N804, N805 |
2895
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1664 | |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1665 | @param code code of the issue (string) |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1666 | @param line line number of the issue (integer) |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1667 | @param pos position inside line (integer) |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1668 | @keyparam apply flag indicating, that the fix should be applied |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1669 | (boolean) |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1670 | @return value indicating an applied/deferred fix (-1, 0, 1), |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1671 | a message for the fix (string) and an ID for a deferred |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1672 | fix (integer) |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1673 | """ |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1674 | if apply: |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1675 | line = line - 1 |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1676 | text = self.__source[line] |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1677 | if code == "N804": |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1678 | arg = "cls" |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1679 | else: |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1680 | arg = "self" |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1681 | |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1682 | if text.rstrip().endswith("("): |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1683 | newText = text + self.__getIndent(text) + \ |
3209
c5432abceb25
CodeStyleChecker moved to background service and done a little cleanup.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3145
diff
changeset
|
1684 | self.__indentWord + arg + "," + self.__eol |
2895
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1685 | else: |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1686 | index = text.find("(") + 1 |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1687 | left = text[:index] |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1688 | right = text[index:] |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1689 | if right.startswith(")"): |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1690 | center = arg |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1691 | else: |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1692 | center = arg + ", " |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1693 | newText = left + center + right |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1694 | self.__source[line] = newText |
3413
5e63f809732a
Code style checker: Translations extracted and refactored.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3228
diff
changeset
|
1695 | # '{0}' argument added. |
5e63f809732a
Code style checker: Translations extracted and refactored.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3228
diff
changeset
|
1696 | return (1, ("FN804", (arg,)), 0) |
2895
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1697 | else: |
5588
6ba512d9f46a
Continued fixing code style issues detected by the extended style checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5389
diff
changeset
|
1698 | fixId = self.__getID() |
6ba512d9f46a
Continued fixing code style issues detected by the extended style checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5389
diff
changeset
|
1699 | self.__stack.append((fixId, code, line, pos)) |
6ba512d9f46a
Continued fixing code style issues detected by the extended style checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5389
diff
changeset
|
1700 | return (-1, "", fixId) |
2895
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1701 | |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1702 | def __fixN806(self, code, line, pos, apply=False): |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1703 | """ |
2960
9453efa25fd5
Continued correcting doc strings by using the new doc string checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2937
diff
changeset
|
1704 | Private method to fix a wrong first argument of static methods. |
9453efa25fd5
Continued correcting doc strings by using the new doc string checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2937
diff
changeset
|
1705 | |
9453efa25fd5
Continued correcting doc strings by using the new doc string checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2937
diff
changeset
|
1706 | Codes: N806 |
2895
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1707 | |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1708 | @param code code of the issue (string) |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1709 | @param line line number of the issue (integer) |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1710 | @param pos position inside line (integer) |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1711 | @keyparam apply flag indicating, that the fix should be applied |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1712 | (boolean) |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1713 | @return value indicating an applied/deferred fix (-1, 0, 1), |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1714 | a message for the fix (string) and an ID for a deferred |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1715 | fix (integer) |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1716 | """ |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1717 | if apply: |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1718 | line = line - 1 |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1719 | text = self.__source[line] |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1720 | index = text.find("(") + 1 |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1721 | left = text[:index] |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1722 | right = text[index:] |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1723 | |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1724 | if right.startswith(("cls", "self")): |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1725 | # cls or self are on the definition line |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1726 | if right.startswith("cls"): |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1727 | right = right[3:] |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1728 | arg = "cls" |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1729 | else: |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1730 | right = right[4:] |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1731 | arg = "self" |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1732 | right = right.lstrip(", ") |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1733 | newText = left + right |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1734 | self.__source[line] = newText |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1735 | else: |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1736 | # they are on the next line |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1737 | line = line + 1 |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1738 | text = self.__source[line] |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1739 | indent = self.__getIndent(text) |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1740 | right = text.lstrip() |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1741 | if right.startswith("cls"): |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1742 | right = right[3:] |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1743 | arg = "cls" |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1744 | else: |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1745 | right = right[4:] |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1746 | arg = "self" |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1747 | right = right.lstrip(", ") |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1748 | if right.startswith("):"): |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1749 | # merge with previous line |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1750 | self.__source[line - 1] = \ |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1751 | self.__source[line - 1].rstrip() + right |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1752 | self.__source[line] = "" |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1753 | else: |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1754 | self.__source[line] = indent + right |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1755 | |
3413
5e63f809732a
Code style checker: Translations extracted and refactored.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3228
diff
changeset
|
1756 | # '{0}' argument removed. |
5e63f809732a
Code style checker: Translations extracted and refactored.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3228
diff
changeset
|
1757 | return (1, ("FN806", arg), 0) |
2895
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1758 | else: |
5588
6ba512d9f46a
Continued fixing code style issues detected by the extended style checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5389
diff
changeset
|
1759 | fixId = self.__getID() |
6ba512d9f46a
Continued fixing code style issues detected by the extended style checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5389
diff
changeset
|
1760 | self.__stack.append((fixId, code, line, pos)) |
6ba512d9f46a
Continued fixing code style issues detected by the extended style checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5389
diff
changeset
|
1761 | return (-1, "", fixId) |
2895
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1762 | |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1763 | def __fixW291(self, code, line, pos): |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1764 | """ |
2960
9453efa25fd5
Continued correcting doc strings by using the new doc string checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2937
diff
changeset
|
1765 | Private method to fix trailing whitespace. |
9453efa25fd5
Continued correcting doc strings by using the new doc string checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2937
diff
changeset
|
1766 | |
9453efa25fd5
Continued correcting doc strings by using the new doc string checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2937
diff
changeset
|
1767 | Codes: W291, W293 |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1768 | |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1769 | @param code code of the issue (string) |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1770 | @param line line number of the issue (integer) |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1771 | @param pos position inside line (integer) |
2891
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
1772 | @return value indicating an applied/deferred fix (-1, 0, 1), |
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
1773 | a message for the fix (string) and an ID for a deferred |
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
1774 | fix (integer) |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1775 | """ |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1776 | self.__source[line - 1] = re.sub(r'[\t ]+(\r?)$', r"\1", |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1777 | self.__source[line - 1]) |
3413
5e63f809732a
Code style checker: Translations extracted and refactored.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3228
diff
changeset
|
1778 | # Whitespace stripped from end of line. |
5e63f809732a
Code style checker: Translations extracted and refactored.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3228
diff
changeset
|
1779 | return (1, "FW291", 0) |
852
257a6f80b96c
Continued implementing a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
851
diff
changeset
|
1780 | |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1781 | def __fixW292(self, code, line, pos): |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1782 | """ |
2960
9453efa25fd5
Continued correcting doc strings by using the new doc string checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2937
diff
changeset
|
1783 | Private method to fix a missing newline at the end of file. |
9453efa25fd5
Continued correcting doc strings by using the new doc string checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2937
diff
changeset
|
1784 | |
9453efa25fd5
Continued correcting doc strings by using the new doc string checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2937
diff
changeset
|
1785 | Codes: W292 |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1786 | |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1787 | @param code code of the issue (string) |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1788 | @param line line number of the issue (integer) |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1789 | @param pos position inside line (integer) |
2891
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
1790 | @return value indicating an applied/deferred fix (-1, 0, 1), |
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
1791 | a message for the fix (string) and an ID for a deferred |
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
1792 | fix (integer) |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1793 | """ |
3209
c5432abceb25
CodeStyleChecker moved to background service and done a little cleanup.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3145
diff
changeset
|
1794 | self.__source[line - 1] += self.__eol |
3413
5e63f809732a
Code style checker: Translations extracted and refactored.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3228
diff
changeset
|
1795 | # newline added to end of file. |
5e63f809732a
Code style checker: Translations extracted and refactored.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3228
diff
changeset
|
1796 | return (1, "FW292", 0) |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1797 | |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1798 | def __fixW391(self, code, line, pos): |
852
257a6f80b96c
Continued implementing a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
851
diff
changeset
|
1799 | """ |
2960
9453efa25fd5
Continued correcting doc strings by using the new doc string checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2937
diff
changeset
|
1800 | Private method to fix trailing blank lines. |
9453efa25fd5
Continued correcting doc strings by using the new doc string checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2937
diff
changeset
|
1801 | |
9453efa25fd5
Continued correcting doc strings by using the new doc string checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2937
diff
changeset
|
1802 | Codes: W391 |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1803 | |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1804 | @param code code of the issue (string) |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1805 | @param line line number of the issue (integer) |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1806 | @param pos position inside line (integer) |
2891
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
1807 | @return value indicating an applied/deferred fix (-1, 0, 1), |
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
1808 | a message for the fix (string) and an ID for a deferred |
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
1809 | fix (integer) |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1810 | """ |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1811 | index = line - 1 |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1812 | while index: |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1813 | if self.__source[index].strip() == "": |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1814 | del self.__source[index] |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1815 | index -= 1 |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1816 | else: |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1817 | break |
3413
5e63f809732a
Code style checker: Translations extracted and refactored.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3228
diff
changeset
|
1818 | # Superfluous trailing blank lines removed from end of file. |
5e63f809732a
Code style checker: Translations extracted and refactored.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3228
diff
changeset
|
1819 | return (1, "FW391", 0) |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1820 | |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1821 | def __fixW603(self, code, line, pos): |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1822 | """ |
2960
9453efa25fd5
Continued correcting doc strings by using the new doc string checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2937
diff
changeset
|
1823 | Private method to fix the not equal notation. |
9453efa25fd5
Continued correcting doc strings by using the new doc string checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2937
diff
changeset
|
1824 | |
9453efa25fd5
Continued correcting doc strings by using the new doc string checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2937
diff
changeset
|
1825 | Codes: W603 |
852
257a6f80b96c
Continued implementing a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
851
diff
changeset
|
1826 | |
257a6f80b96c
Continued implementing a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
851
diff
changeset
|
1827 | @param code code of the issue (string) |
257a6f80b96c
Continued implementing a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
851
diff
changeset
|
1828 | @param line line number of the issue (integer) |
257a6f80b96c
Continued implementing a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
851
diff
changeset
|
1829 | @param pos position inside line (integer) |
2891
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
1830 | @return value indicating an applied/deferred fix (-1, 0, 1), |
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
1831 | a message for the fix (string) and an ID for a deferred |
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
1832 | fix (integer) |
852
257a6f80b96c
Continued implementing a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
851
diff
changeset
|
1833 | """ |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1834 | self.__source[line - 1] = self.__source[line - 1].replace("<>", "!=") |
3413
5e63f809732a
Code style checker: Translations extracted and refactored.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3228
diff
changeset
|
1835 | # '<>' replaced by '!='. |
5e63f809732a
Code style checker: Translations extracted and refactored.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3228
diff
changeset
|
1836 | return (1, "FW603", 0) |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1837 | |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1838 | |
2978
9d63132a23e0
Continued changing the names of the various code style checkers to make them more appropriate to the broadened scope.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2976
diff
changeset
|
1839 | class Reindenter(object): |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1840 | """ |
2883
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
1841 | Class to reindent badly-indented code to uniformly use four-space |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
1842 | indentation. |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1843 | |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1844 | Released to the public domain, by Tim Peters, 03 October 2000. |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1845 | """ |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1846 | def __init__(self, sourceLines): |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1847 | """ |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1848 | Constructor |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1849 | |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1850 | @param sourceLines list of source lines including eol marker |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1851 | (list of string) |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1852 | """ |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1853 | # Raw file lines. |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1854 | self.raw = sourceLines |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1855 | self.after = [] |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1856 | |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1857 | # File lines, rstripped & tab-expanded. Dummy at start is so |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1858 | # that we can use tokenize's 1-based line numbering easily. |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1859 | # Note that a line is all-blank iff it's "\n". |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1860 | self.lines = [line.rstrip().expandtabs() + "\n" |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1861 | for line in self.raw] |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1862 | self.lines.insert(0, None) |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1863 | self.index = 1 # index into self.lines of next line |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1864 | |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1865 | # List of (lineno, indentlevel) pairs, one for each stmt and |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1866 | # comment line. indentlevel is -1 for comment lines, as a |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1867 | # signal that tokenize doesn't know what to do about them; |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1868 | # indeed, they're our headache! |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1869 | self.stats = [] |
852
257a6f80b96c
Continued implementing a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
851
diff
changeset
|
1870 | |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1871 | def run(self): |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1872 | """ |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1873 | Public method to run the re-indenter. |
2960
9453efa25fd5
Continued correcting doc strings by using the new doc string checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2937
diff
changeset
|
1874 | |
9453efa25fd5
Continued correcting doc strings by using the new doc string checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2937
diff
changeset
|
1875 | @return flag indicating that a change was done (boolean) |
852
257a6f80b96c
Continued implementing a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
851
diff
changeset
|
1876 | """ |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1877 | try: |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1878 | stats = self.__genStats(tokenize.generate_tokens(self.getline)) |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1879 | except (SyntaxError, tokenize.TokenError): |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1880 | return False |
852
257a6f80b96c
Continued implementing a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
851
diff
changeset
|
1881 | |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1882 | # Remove trailing empty lines. |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1883 | lines = self.lines |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1884 | while lines and lines[-1] == "\n": |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1885 | lines.pop() |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1886 | # Sentinel. |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1887 | stats.append((len(lines), 0)) |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1888 | # Map count of leading spaces to # we want. |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1889 | have2want = {} |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1890 | # Program after transformation. |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1891 | after = self.after = [] |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1892 | # Copy over initial empty lines -- there's nothing to do until |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1893 | # we see a line with *something* on it. |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1894 | i = stats[0][0] |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1895 | after.extend(lines[1:i]) |
2876
bfa39cf40277
Extended the PEP-8 dialog to select fixable issues manually (i.e. fix only the selected issues).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2875
diff
changeset
|
1896 | for i in range(len(stats) - 1): |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1897 | thisstmt, thislevel = stats[i] |
2876
bfa39cf40277
Extended the PEP-8 dialog to select fixable issues manually (i.e. fix only the selected issues).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2875
diff
changeset
|
1898 | nextstmt = stats[i + 1][0] |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1899 | have = self.__getlspace(lines[thisstmt]) |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1900 | want = thislevel * 4 |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1901 | if want < 0: |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1902 | # A comment line. |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1903 | if have: |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1904 | # An indented comment line. If we saw the same |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1905 | # indentation before, reuse what it most recently |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1906 | # mapped to. |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1907 | want = have2want.get(have, -1) |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1908 | if want < 0: |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1909 | # Then it probably belongs to the next real stmt. |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1910 | for j in range(i + 1, len(stats) - 1): |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1911 | jline, jlevel = stats[j] |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1912 | if jlevel >= 0: |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1913 | if have == self.__getlspace(lines[jline]): |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1914 | want = jlevel * 4 |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1915 | break |
3621
15f23ed3f216
Fixed a few source code style issues found by the updated pe8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3549
diff
changeset
|
1916 | if want < 0: # Maybe it's a hanging comment like this one, |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1917 | # in which case we should shift it like its base |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1918 | # line got shifted. |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1919 | for j in range(i - 1, -1, -1): |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1920 | jline, jlevel = stats[j] |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1921 | if jlevel >= 0: |
2883
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
1922 | want = \ |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
1923 | have + \ |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
1924 | self.__getlspace(after[jline - 1]) - \ |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
1925 | self.__getlspace(lines[jline]) |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1926 | break |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1927 | if want < 0: |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1928 | # Still no luck -- leave it alone. |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1929 | want = have |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1930 | else: |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1931 | want = 0 |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1932 | assert want >= 0 |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1933 | have2want[have] = want |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1934 | diff = want - have |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1935 | if diff == 0 or have == 0: |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1936 | after.extend(lines[thisstmt:nextstmt]) |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1937 | else: |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1938 | for line in lines[thisstmt:nextstmt]: |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1939 | if diff > 0: |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1940 | if line == "\n": |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1941 | after.append(line) |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1942 | else: |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1943 | after.append(" " * diff + line) |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1944 | else: |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1945 | remove = min(self.__getlspace(line), -diff) |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1946 | after.append(line[remove:]) |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1947 | return self.raw != self.after |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1948 | |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1949 | def fixedLine(self, line): |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1950 | """ |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1951 | Public method to get a fixed line. |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1952 | |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1953 | @param line number of the line to retrieve (integer) |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1954 | @return fixed line (string) |
852
257a6f80b96c
Continued implementing a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
851
diff
changeset
|
1955 | """ |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1956 | if line < len(self.after): |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1957 | return self.after[line] |
6891
93f82da09f22
Fixed some code style issues detected by the new 'return' checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6645
diff
changeset
|
1958 | |
93f82da09f22
Fixed some code style issues detected by the new 'return' checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6645
diff
changeset
|
1959 | return "" |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1960 | |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1961 | def getline(self): |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1962 | """ |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1963 | Public method to get a line of text for tokenize. |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1964 | |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1965 | @return line of text (string) |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1966 | """ |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1967 | if self.index >= len(self.lines): |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1968 | line = "" |
852
257a6f80b96c
Continued implementing a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
851
diff
changeset
|
1969 | else: |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1970 | line = self.lines[self.index] |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1971 | self.index += 1 |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1972 | return line |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1973 | |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1974 | def __genStats(self, tokens): |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1975 | """ |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1976 | Private method to generate the re-indent statistics. |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1977 | |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1978 | @param tokens tokens generator (tokenize._tokenize) |
2960
9453efa25fd5
Continued correcting doc strings by using the new doc string checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2937
diff
changeset
|
1979 | @return reference to the generated statistics |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1980 | """ |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1981 | find_stmt = True # next token begins a fresh stmt? |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1982 | level = 0 # current indent level |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1983 | stats = [] |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1984 | |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1985 | for t in tokens: |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1986 | token_type = t[0] |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1987 | sline = t[2][0] |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1988 | line = t[4] |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1989 | |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1990 | if token_type == tokenize.NEWLINE: |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1991 | # A program statement, or ENDMARKER, will eventually follow, |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1992 | # after some (possibly empty) run of tokens of the form |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1993 | # (NL | COMMENT)* (INDENT | DEDENT+)? |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1994 | self.find_stmt = True |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1995 | |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1996 | elif token_type == tokenize.INDENT: |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1997 | find_stmt = True |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1998 | level += 1 |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1999 | |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
2000 | elif token_type == tokenize.DEDENT: |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
2001 | find_stmt = True |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
2002 | level -= 1 |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
2003 | |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
2004 | elif token_type == tokenize.COMMENT: |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
2005 | if find_stmt: |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
2006 | stats.append((sline, -1)) |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
2007 | # but we're still looking for a new stmt, so leave |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
2008 | # find_stmt alone |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
2009 | |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
2010 | elif token_type == tokenize.NL: |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
2011 | pass |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
2012 | |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
2013 | elif find_stmt: |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
2014 | # This is the first "real token" following a NEWLINE, so it |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
2015 | # must be the first token of the next program statement, or an |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
2016 | # ENDMARKER. |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
2017 | find_stmt = False |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
2018 | if line: # not endmarker |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
2019 | stats.append((sline, level)) |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
2020 | |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
2021 | return stats |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
2022 | |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
2023 | def __getlspace(self, line): |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
2024 | """ |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
2025 | Private method to count number of leading blanks. |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
2026 | |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
2027 | @param line line to check (string) |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
2028 | @return number of leading blanks (integer) |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
2029 | """ |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
2030 | i = 0 |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
2031 | n = len(line) |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
2032 | while i < n and line[i] == " ": |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
2033 | i += 1 |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
2034 | return i |
2875
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2035 | |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2036 | |
2978
9d63132a23e0
Continued changing the names of the various code style checkers to make them more appropriate to the broadened scope.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2976
diff
changeset
|
2037 | class IndentationWrapper(object): |
2875
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2038 | """ |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2039 | Class used by fixers dealing with indentation. |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2040 | |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2041 | Each instance operates on a single logical line. |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2042 | """ |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2043 | SKIP_TOKENS = frozenset([ |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2044 | tokenize.COMMENT, tokenize.NL, tokenize.INDENT, |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2045 | tokenize.DEDENT, tokenize.NEWLINE, tokenize.ENDMARKER |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2046 | ]) |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2047 | |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2048 | def __init__(self, physical_lines): |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2049 | """ |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2050 | Constructor |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2051 | |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2052 | @param physical_lines list of physical lines to operate on |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2053 | (list of strings) |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2054 | """ |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2055 | self.lines = physical_lines |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2056 | self.tokens = [] |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2057 | self.rel_indent = None |
3209
c5432abceb25
CodeStyleChecker moved to background service and done a little cleanup.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3145
diff
changeset
|
2058 | sio = StringIO(''.join(physical_lines)) |
2875
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2059 | for t in tokenize.generate_tokens(sio.readline): |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2060 | if not len(self.tokens) and t[0] in self.SKIP_TOKENS: |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2061 | continue |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2062 | if t[0] != tokenize.ENDMARKER: |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2063 | self.tokens.append(t) |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2064 | |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2065 | self.logical_line = self.__buildTokensLogical(self.tokens) |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2066 | |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2067 | def __buildTokensLogical(self, tokens): |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2068 | """ |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2069 | Private method to build a logical line from a list of tokens. |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2070 | |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2071 | @param tokens list of tokens as generated by tokenize.generate_tokens |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2072 | @return logical line (string) |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2073 | """ |
5147
d39dd5cee0c8
Renamed pep8.py to pycodestyle.py in order to track the upstream renaming.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4830
diff
changeset
|
2074 | # from pycodestyle.py with minor modifications |
2875
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2075 | logical = [] |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2076 | previous = None |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2077 | for t in tokens: |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2078 | token_type, text = t[0:2] |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2079 | if token_type in self.SKIP_TOKENS: |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2080 | continue |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2081 | if previous: |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2082 | end_line, end = previous[3] |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2083 | start_line, start = t[2] |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2084 | if end_line != start_line: # different row |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2085 | prev_text = self.lines[end_line - 1][end - 1] |
4830
f609a22f43bd
Fixed a few code style issues detected by the updated pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4631
diff
changeset
|
2086 | if prev_text == ',' or (prev_text not in '{[(' and |
f609a22f43bd
Fixed a few code style issues detected by the updated pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4631
diff
changeset
|
2087 | text not in '}])'): |
2875
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2088 | logical.append(' ') |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2089 | elif end != start: # different column |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2090 | fill = self.lines[end_line - 1][end:start] |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2091 | logical.append(fill) |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2092 | logical.append(text) |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2093 | previous = t |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2094 | logical_line = ''.join(logical) |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2095 | assert logical_line.lstrip() == logical_line |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2096 | assert logical_line.rstrip() == logical_line |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2097 | return logical_line |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2098 | |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2099 | def pep8Expected(self): |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2100 | """ |
5147
d39dd5cee0c8
Renamed pep8.py to pycodestyle.py in order to track the upstream renaming.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4830
diff
changeset
|
2101 | Public method to replicate logic in pycodestyle.py, to know what level |
d39dd5cee0c8
Renamed pep8.py to pycodestyle.py in order to track the upstream renaming.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4830
diff
changeset
|
2102 | to indent things to. |
2875
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2103 | |
2883
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2104 | @return list of lists, where each list represents valid indent levels |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2105 | for the line in question, relative from the initial indent. However, |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2106 | the first entry is the indent level which was expected. |
2875
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2107 | """ |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2108 | # What follows is an adjusted version of |
5147
d39dd5cee0c8
Renamed pep8.py to pycodestyle.py in order to track the upstream renaming.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4830
diff
changeset
|
2109 | # pycodestyle.py:continuation_line_indentation. All of the comments |
d39dd5cee0c8
Renamed pep8.py to pycodestyle.py in order to track the upstream renaming.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4830
diff
changeset
|
2110 | # have been stripped and the 'yield' statements replaced with 'pass'. |
2875
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2111 | if not self.tokens: |
6891
93f82da09f22
Fixed some code style issues detected by the new 'return' checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6645
diff
changeset
|
2112 | return [] |
2875
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2113 | |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2114 | first_row = self.tokens[0][2][0] |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2115 | nrows = 1 + self.tokens[-1][2][0] - first_row |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2116 | |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2117 | # here are the return values |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2118 | valid_indents = [list()] * nrows |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2119 | indent_level = self.tokens[0][2][1] |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2120 | valid_indents[0].append(indent_level) |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2121 | |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2122 | if nrows == 1: |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2123 | # bug, really. |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2124 | return valid_indents |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2125 | |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2126 | indent_next = self.logical_line.endswith(':') |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2127 | |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2128 | row = depth = 0 |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2129 | parens = [0] * nrows |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2130 | self.rel_indent = rel_indent = [0] * nrows |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2131 | indent = [indent_level] |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2132 | indent_chances = {} |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2133 | last_indent = (0, 0) |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2134 | last_token_multiline = None |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2135 | |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2136 | for token_type, text, start, end, line in self.tokens: |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2137 | newline = row < start[0] - first_row |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2138 | if newline: |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2139 | row = start[0] - first_row |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2140 | newline = (not last_token_multiline and |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2141 | token_type not in (tokenize.NL, tokenize.NEWLINE)) |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2142 | |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2143 | if newline: |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2144 | # This is where the differences start. Instead of looking at |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2145 | # the line and determining whether the observed indent matches |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2146 | # our expectations, we decide which type of indentation is in |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2147 | # use at the given indent level, and return the offset. This |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2148 | # algorithm is susceptible to "carried errors", but should |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2149 | # through repeated runs eventually solve indentation for |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2150 | # multiline expressions. |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2151 | |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2152 | if depth: |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2153 | for open_row in range(row - 1, -1, -1): |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2154 | if parens[open_row]: |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2155 | break |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2156 | else: |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2157 | open_row = 0 |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2158 | |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2159 | # That's all we get to work with. This code attempts to |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2160 | # "reverse" the below logic, and place into the valid indents |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2161 | # list |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2162 | vi = [] |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2163 | add_second_chances = False |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2164 | if token_type == tokenize.OP and text in ']})': |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2165 | # this line starts with a closing bracket, so it needs to |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2166 | # be closed at the same indent as the opening one. |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2167 | if indent[depth]: |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2168 | # hanging indent |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2169 | vi.append(indent[depth]) |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2170 | else: |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2171 | # visual indent |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2172 | vi.append(indent_level + rel_indent[open_row]) |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2173 | elif depth and indent[depth]: |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2174 | # visual indent was previously confirmed. |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2175 | vi.append(indent[depth]) |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2176 | add_second_chances = True |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2177 | elif depth and True in indent_chances.values(): |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2178 | # visual indent happened before, so stick to |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2179 | # visual indent this time. |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2180 | if depth > 1 and indent[depth - 1]: |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2181 | vi.append(indent[depth - 1]) |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2182 | else: |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2183 | # stupid fallback |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2184 | vi.append(indent_level + 4) |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2185 | add_second_chances = True |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2186 | elif not depth: |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2187 | vi.append(indent_level + 4) |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2188 | else: |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2189 | # must be in hanging indent |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2190 | hang = rel_indent[open_row] + 4 |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2191 | vi.append(indent_level + hang) |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2192 | |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2193 | # about the best we can do without look-ahead |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2194 | if (indent_next and vi[0] == indent_level + 4 and |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2195 | nrows == row + 1): |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2196 | vi[0] += 4 |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2197 | |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2198 | if add_second_chances: |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2199 | # visual indenters like to line things up. |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2200 | min_indent = vi[0] |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2201 | for col, what in indent_chances.items(): |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2202 | if col > min_indent and ( |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2203 | what is True or |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2204 | (what == str and token_type == tokenize.STRING) or |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2205 | (what == text and token_type == tokenize.OP) |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2206 | ): |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2207 | vi.append(col) |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2208 | vi = sorted(vi) |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2209 | |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2210 | valid_indents[row] = vi |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2211 | |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2212 | # Returning to original continuation_line_indentation() from |
5147
d39dd5cee0c8
Renamed pep8.py to pycodestyle.py in order to track the upstream renaming.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4830
diff
changeset
|
2213 | # pycodestyle. |
2875
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2214 | visual_indent = indent_chances.get(start[1]) |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2215 | last_indent = start |
5147
d39dd5cee0c8
Renamed pep8.py to pycodestyle.py in order to track the upstream renaming.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4830
diff
changeset
|
2216 | rel_indent[row] = \ |
d39dd5cee0c8
Renamed pep8.py to pycodestyle.py in order to track the upstream renaming.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4830
diff
changeset
|
2217 | pycodestyle.expand_indent(line) - indent_level |
2875
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2218 | hang = rel_indent[row] - rel_indent[open_row] |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2219 | |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2220 | if token_type == tokenize.OP and text in ']})': |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2221 | pass |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2222 | elif visual_indent is True: |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2223 | if not indent[depth]: |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2224 | indent[depth] = start[1] |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2225 | |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2226 | # line altered: comments shouldn't define a visual indent |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2227 | if parens[row] and not indent[depth] and token_type not in ( |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2228 | tokenize.NL, tokenize.COMMENT |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2229 | ): |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2230 | indent[depth] = start[1] |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2231 | indent_chances[start[1]] = True |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2232 | elif token_type == tokenize.STRING or text in ( |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2233 | 'u', 'ur', 'b', 'br' |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2234 | ): |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2235 | indent_chances[start[1]] = str |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2236 | |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2237 | if token_type == tokenize.OP: |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2238 | if text in '([{': |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2239 | depth += 1 |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2240 | indent.append(0) |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2241 | parens[row] += 1 |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2242 | elif text in ')]}' and depth > 0: |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2243 | prev_indent = indent.pop() or last_indent[1] |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2244 | for d in range(depth): |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2245 | if indent[d] > prev_indent: |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2246 | indent[d] = 0 |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2247 | for ind in list(indent_chances): |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2248 | if ind >= prev_indent: |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2249 | del indent_chances[ind] |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2250 | depth -= 1 |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2251 | if depth and indent[depth]: # modified |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2252 | indent_chances[indent[depth]] = True |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2253 | for idx in range(row, -1, -1): |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2254 | if parens[idx]: |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2255 | parens[idx] -= 1 |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2256 | break |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2257 | assert len(indent) == depth + 1 |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2258 | if start[1] not in indent_chances: |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2259 | indent_chances[start[1]] = text |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2260 | |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2261 | last_token_multiline = (start[0] != end[0]) |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2262 | |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2263 | return valid_indents |
2879
12e6e199d0cf
Started implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2878
diff
changeset
|
2264 | |
12e6e199d0cf
Started implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2878
diff
changeset
|
2265 | |
2978
9d63132a23e0
Continued changing the names of the various code style checkers to make them more appropriate to the broadened scope.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2976
diff
changeset
|
2266 | class LineShortener(object): |
2879
12e6e199d0cf
Started implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2878
diff
changeset
|
2267 | """ |
12e6e199d0cf
Started implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2878
diff
changeset
|
2268 | Class used to shorten lines to a given maximum of characters. |
12e6e199d0cf
Started implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2878
diff
changeset
|
2269 | """ |
2882
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
2270 | def __init__(self, curLine, prevLine, nextLine, maxLength=79, eol="\n", |
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
2271 | indentWord=" ", isDocString=False): |
2879
12e6e199d0cf
Started implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2878
diff
changeset
|
2272 | """ |
12e6e199d0cf
Started implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2878
diff
changeset
|
2273 | Constructor |
12e6e199d0cf
Started implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2878
diff
changeset
|
2274 | |
12e6e199d0cf
Started implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2878
diff
changeset
|
2275 | @param curLine text to work on (string) |
12e6e199d0cf
Started implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2878
diff
changeset
|
2276 | @param prevLine line before the text to work on (string) |
12e6e199d0cf
Started implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2878
diff
changeset
|
2277 | @param nextLine line after the text to work on (string) |
12e6e199d0cf
Started implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2878
diff
changeset
|
2278 | @keyparam maxLength maximum allowed line length (integer) |
12e6e199d0cf
Started implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2878
diff
changeset
|
2279 | @keyparam eol eond-of-line marker (string) |
12e6e199d0cf
Started implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2878
diff
changeset
|
2280 | @keyparam indentWord string used for indentation (string) |
2882
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
2281 | @keyparam isDocString flag indicating that the line belongs to |
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
2282 | a documentation string (boolean) |
2879
12e6e199d0cf
Started implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2878
diff
changeset
|
2283 | """ |
12e6e199d0cf
Started implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2878
diff
changeset
|
2284 | self.__text = curLine |
12e6e199d0cf
Started implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2878
diff
changeset
|
2285 | self.__prevText = prevLine |
12e6e199d0cf
Started implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2878
diff
changeset
|
2286 | self.__nextText = nextLine |
12e6e199d0cf
Started implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2878
diff
changeset
|
2287 | self.__maxLength = maxLength |
12e6e199d0cf
Started implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2878
diff
changeset
|
2288 | self.__eol = eol |
12e6e199d0cf
Started implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2878
diff
changeset
|
2289 | self.__indentWord = indentWord |
2882
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
2290 | self.__isDocString = isDocString |
2879
12e6e199d0cf
Started implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2878
diff
changeset
|
2291 | |
12e6e199d0cf
Started implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2878
diff
changeset
|
2292 | def shorten(self): |
12e6e199d0cf
Started implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2878
diff
changeset
|
2293 | """ |
12e6e199d0cf
Started implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2878
diff
changeset
|
2294 | Public method to shorten the line wrapped by the class instance. |
12e6e199d0cf
Started implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2878
diff
changeset
|
2295 | |
2883
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2296 | @return tuple of a flag indicating successful shortening, the |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2297 | shortened line and the changed next line (boolean, string, string) |
2879
12e6e199d0cf
Started implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2878
diff
changeset
|
2298 | """ |
12e6e199d0cf
Started implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2878
diff
changeset
|
2299 | # 1. check for comment |
12e6e199d0cf
Started implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2878
diff
changeset
|
2300 | if self.__text.lstrip().startswith('#'): |
12e6e199d0cf
Started implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2878
diff
changeset
|
2301 | lastComment = True |
12e6e199d0cf
Started implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2878
diff
changeset
|
2302 | if self.__nextText.lstrip().startswith('#'): |
12e6e199d0cf
Started implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2878
diff
changeset
|
2303 | lastComment = False |
12e6e199d0cf
Started implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2878
diff
changeset
|
2304 | |
12e6e199d0cf
Started implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2878
diff
changeset
|
2305 | # Wrap commented lines. |
12e6e199d0cf
Started implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2878
diff
changeset
|
2306 | newText = self.__shortenComment(lastComment) |
2880
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2307 | if newText == self.__text: |
2882
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
2308 | return False, "", "" |
2880
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2309 | else: |
2882
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
2310 | return True, newText, "" |
2883
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2311 | elif '#' in self.__text: |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2312 | pos = self.__text.rfind("#") |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2313 | newText = self.__text[:pos].rstrip() + self.__eol + \ |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2314 | self.__getIndent(self.__text) + self.__text[pos:] |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2315 | if newText == self.__text: |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2316 | return False, "", "" |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2317 | else: |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2318 | return True, newText, "" |
2879
12e6e199d0cf
Started implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2878
diff
changeset
|
2319 | |
2882
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
2320 | # Do multi line doc strings |
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
2321 | if self.__isDocString: |
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
2322 | source = self.__text.rstrip() |
2883
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2323 | blank = source.rfind(" ") |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2324 | while blank > self.__maxLength and blank != -1: |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2325 | blank = source.rfind(" ", 0, blank) |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2326 | if blank == -1: |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2327 | # Cannot break |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2328 | return False, "", "" |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2329 | else: |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2330 | first = self.__text[:blank] |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2331 | second = self.__text[blank:].lstrip() |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2332 | if self.__nextText.strip(): |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2333 | if self.__nextText.lstrip().startswith("@"): |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2334 | # eric doc comment |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2335 | # create a new line and indent it |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2336 | newText = first + self.__eol + \ |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2337 | self.__getIndent(first) + self.__indentWord + \ |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2338 | second |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2339 | newNext = "" |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2340 | else: |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2341 | newText = first + self.__eol |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2342 | newNext = self.__getIndent(self.__nextText) + \ |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2343 | second.rstrip() + " " + self.__nextText.lstrip() |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2344 | else: |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2345 | # empty line, add a new line |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2346 | newText = first + self.__eol + self.__getIndent(first) + \ |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2347 | second |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2348 | newNext = "" |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2349 | return True, newText, newNext |
2882
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
2350 | |
2879
12e6e199d0cf
Started implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2878
diff
changeset
|
2351 | indent = self.__getIndent(self.__text) |
12e6e199d0cf
Started implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2878
diff
changeset
|
2352 | source = self.__text[len(indent):] |
12e6e199d0cf
Started implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2878
diff
changeset
|
2353 | assert source.lstrip() == source |
3209
c5432abceb25
CodeStyleChecker moved to background service and done a little cleanup.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3145
diff
changeset
|
2354 | sio = StringIO(source) |
2882
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
2355 | |
2880
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2356 | # Check for multi line string. |
2879
12e6e199d0cf
Started implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2878
diff
changeset
|
2357 | try: |
12e6e199d0cf
Started implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2878
diff
changeset
|
2358 | tokens = list(tokenize.generate_tokens(sio.readline)) |
12e6e199d0cf
Started implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2878
diff
changeset
|
2359 | except (SyntaxError, tokenize.TokenError): |
2883
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2360 | if source.rstrip().endswith("\\"): |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2361 | # just join the continuation line and let the next run |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2362 | # handle it once it tokenizes ok |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2363 | newText = indent + source.rstrip()[:-1].rstrip() + " " + \ |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2364 | self.__nextText.lstrip() |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2365 | if indent: |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2366 | newNext = indent |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2367 | else: |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2368 | newNext = " " |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2369 | return True, newText, newNext |
2879
12e6e199d0cf
Started implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2878
diff
changeset
|
2370 | else: |
2883
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2371 | multilineCandidate = self.__breakMultiline() |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2372 | if multilineCandidate: |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2373 | return True, multilineCandidate[0], multilineCandidate[1] |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2374 | else: |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2375 | return False, "", "" |
2879
12e6e199d0cf
Started implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2878
diff
changeset
|
2376 | |
12e6e199d0cf
Started implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2878
diff
changeset
|
2377 | # Handle statements by putting the right hand side on a line by itself. |
12e6e199d0cf
Started implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2878
diff
changeset
|
2378 | # This should let the next pass shorten it. |
12e6e199d0cf
Started implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2878
diff
changeset
|
2379 | if source.startswith('return '): |
12e6e199d0cf
Started implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2878
diff
changeset
|
2380 | newText = ( |
12e6e199d0cf
Started implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2878
diff
changeset
|
2381 | indent + |
12e6e199d0cf
Started implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2878
diff
changeset
|
2382 | 'return (' + |
12e6e199d0cf
Started implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2878
diff
changeset
|
2383 | self.__eol + |
12e6e199d0cf
Started implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2878
diff
changeset
|
2384 | indent + self.__indentWord + re.sub('^return ', '', source) + |
12e6e199d0cf
Started implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2878
diff
changeset
|
2385 | indent + ')' + self.__eol |
12e6e199d0cf
Started implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2878
diff
changeset
|
2386 | ) |
2882
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
2387 | return True, newText, "" |
2883
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2388 | |
2879
12e6e199d0cf
Started implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2878
diff
changeset
|
2389 | candidates = self.__shortenLine(tokens, source, indent) |
12e6e199d0cf
Started implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2878
diff
changeset
|
2390 | if candidates: |
2883
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2391 | candidates = list(sorted( |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2392 | set(candidates).union([self.__text]), |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2393 | key=lambda x: self.__lineShorteningRank(x))) |
2891
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
2394 | if candidates[0] == self.__text: |
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
2395 | return False, "", "" |
2882
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
2396 | return True, candidates[0], "" |
2879
12e6e199d0cf
Started implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2878
diff
changeset
|
2397 | |
2883
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2398 | source = self.__text |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2399 | rs = source.rstrip() |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2400 | if rs.endswith(("'", '"')) and " " in source: |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2401 | if rs.endswith(('"""', "'''")): |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2402 | quote = rs[-3:] |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2403 | else: |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2404 | quote = rs[-1] |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2405 | blank = source.rfind(" ") |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2406 | maxLen = self.__maxLength - 2 - len(quote) |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2407 | while blank > maxLen and blank != -1: |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2408 | blank = source.rfind(" ", 0, blank) |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2409 | if blank != -1: |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2410 | if source[blank + 1:].startswith(quote): |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2411 | first = source[:maxLen] |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2412 | second = source[maxLen:] |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2413 | else: |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2414 | first = source[:blank] |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2415 | second = source[blank + 1:] |
2892
b601ede6dbbf
Fixed a few issues in the PEP-8 fixer and made it PEP-8 compliant.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2891
diff
changeset
|
2416 | return ( |
b601ede6dbbf
Fixed a few issues in the PEP-8 fixer and made it PEP-8 compliant.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2891
diff
changeset
|
2417 | True, |
2883
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2418 | first + quote + " \\" + self.__eol + |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2419 | indent + self.__indentWord + quote + second, |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2420 | "") |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2421 | else: |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2422 | # Cannot break |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2423 | return False, "", "" |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2424 | |
2882
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
2425 | return False, "", "" |
2879
12e6e199d0cf
Started implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2878
diff
changeset
|
2426 | |
12e6e199d0cf
Started implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2878
diff
changeset
|
2427 | def __shortenComment(self, isLast): |
12e6e199d0cf
Started implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2878
diff
changeset
|
2428 | """ |
12e6e199d0cf
Started implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2878
diff
changeset
|
2429 | Private method to shorten a comment line. |
12e6e199d0cf
Started implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2878
diff
changeset
|
2430 | |
12e6e199d0cf
Started implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2878
diff
changeset
|
2431 | @param isLast flag indicating, that the line is the last comment line |
12e6e199d0cf
Started implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2878
diff
changeset
|
2432 | (boolean) |
12e6e199d0cf
Started implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2878
diff
changeset
|
2433 | @return shortened comment line (string) |
12e6e199d0cf
Started implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2878
diff
changeset
|
2434 | """ |
2880
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2435 | if len(self.__text) <= self.__maxLength: |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2436 | return self.__text |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2437 | |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2438 | newText = self.__text.rstrip() |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2439 | |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2440 | # PEP 8 recommends 72 characters for comment text. |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2441 | indentation = self.__getIndent(newText) + '# ' |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2442 | maxLength = min(self.__maxLength, |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2443 | len(indentation) + 72) |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2444 | |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2445 | MIN_CHARACTER_REPEAT = 5 |
2892
b601ede6dbbf
Fixed a few issues in the PEP-8 fixer and made it PEP-8 compliant.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2891
diff
changeset
|
2446 | if len(newText) - len(newText.rstrip(newText[-1])) >= \ |
b601ede6dbbf
Fixed a few issues in the PEP-8 fixer and made it PEP-8 compliant.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2891
diff
changeset
|
2447 | MIN_CHARACTER_REPEAT and \ |
b601ede6dbbf
Fixed a few issues in the PEP-8 fixer and made it PEP-8 compliant.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2891
diff
changeset
|
2448 | not newText[-1].isalnum(): |
2880
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2449 | # Trim comments that end with things like --------- |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2450 | return newText[:maxLength] + self.__eol |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2451 | elif isLast and re.match(r"\s*#+\s*\w+", newText): |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2452 | import textwrap |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2453 | splitLines = textwrap.wrap(newText.lstrip(" \t#"), |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2454 | initial_indent=indentation, |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2455 | subsequent_indent=indentation, |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2456 | width=maxLength, |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2457 | break_long_words=False, |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2458 | break_on_hyphens=False) |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2459 | return self.__eol.join(splitLines) + self.__eol |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2460 | else: |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2461 | return newText + self.__eol |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2462 | |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2463 | def __breakMultiline(self): |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2464 | """ |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2465 | Private method to break multi line strings. |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2466 | |
2883
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2467 | @return tuple of the shortened line and the changed next line |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2468 | (string, string) |
2880
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2469 | """ |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2470 | indentation = self.__getIndent(self.__text) |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2471 | |
2883
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2472 | # Handle special case. |
2880
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2473 | for symbol in '([{': |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2474 | # Only valid if symbol is not on a line by itself. |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2475 | if ( |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2476 | symbol in self.__text and |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2477 | self.__text.strip() != symbol and |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2478 | self.__text.rstrip().endswith((',', '%')) |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2479 | ): |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2480 | index = 1 + self.__text.find(symbol) |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2481 | |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2482 | if index <= len(self.__indentWord) + len(indentation): |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2483 | continue |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2484 | |
2883
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2485 | if self.__isProbablyInsideStringOrComment( |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2486 | self.__text, index - 1): |
2880
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2487 | continue |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2488 | |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2489 | return (self.__text[:index].rstrip() + self.__eol + |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2490 | indentation + self.__indentWord + |
2883
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2491 | self.__text[index:].lstrip(), "") |
2882
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
2492 | |
2883
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2493 | newText = self.__text |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2494 | newNext = self.__nextText |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2495 | blank = newText.rfind(" ") |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2496 | while blank > self.__maxLength and blank != -1: |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2497 | blank = newText.rfind(" ", 0, blank) |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2498 | if blank != -1: |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2499 | first = self.__text[:blank] |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2500 | second = self.__text[blank:].strip() |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2501 | if newNext.strip(): |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2502 | newText = first + self.__eol |
2981
0c5205aa7a5a
Fixed some issues in the code style fixer.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2978
diff
changeset
|
2503 | if second.endswith(")"): |
0c5205aa7a5a
Fixed some issues in the code style fixer.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2978
diff
changeset
|
2504 | # don't merge with next line |
0c5205aa7a5a
Fixed some issues in the code style fixer.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2978
diff
changeset
|
2505 | newText += self.__getIndent(newText) + second + self.__eol |
0c5205aa7a5a
Fixed some issues in the code style fixer.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2978
diff
changeset
|
2506 | newNext = "" |
0c5205aa7a5a
Fixed some issues in the code style fixer.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2978
diff
changeset
|
2507 | else: |
0c5205aa7a5a
Fixed some issues in the code style fixer.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2978
diff
changeset
|
2508 | newNext = self.__getIndent(newNext) + \ |
0c5205aa7a5a
Fixed some issues in the code style fixer.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2978
diff
changeset
|
2509 | second + " " + newNext.lstrip() |
2883
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2510 | else: |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2511 | # empty line, add a new line |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2512 | newText = first + self.__eol |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2513 | newNext = self.__getIndent(newNext) + \ |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2514 | second + self.__eol + newNext.lstrip() |
2981
0c5205aa7a5a
Fixed some issues in the code style fixer.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2978
diff
changeset
|
2515 | return newText, newNext |
0c5205aa7a5a
Fixed some issues in the code style fixer.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2978
diff
changeset
|
2516 | else: |
0c5205aa7a5a
Fixed some issues in the code style fixer.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2978
diff
changeset
|
2517 | return None |
2880
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2518 | |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2519 | def __isProbablyInsideStringOrComment(self, line, index): |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2520 | """ |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2521 | Private method to check, if the given string might be inside a string |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2522 | or comment. |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2523 | |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2524 | @param line line to check (string) |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2525 | @param index position inside line to check (integer) |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2526 | @return flag indicating the possibility of being inside a string |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2527 | or comment |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2528 | """ |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2529 | # Check against being in a string. |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2530 | for quote in ['"', "'"]: |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2531 | pos = line.find(quote) |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2532 | if pos != -1 and pos <= index: |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2533 | return True |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2534 | |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2535 | # Check against being in a comment. |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2536 | pos = line.find('#') |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2537 | if pos != -1 and pos <= index: |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2538 | return True |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2539 | |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2540 | return False |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2541 | |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2542 | def __shortenLine(self, tokens, source, indent): |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2543 | """ |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2544 | Private method to shorten a line of code at an operator. |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2545 | |
2883
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2546 | @param tokens tokens of the line as generated by tokenize |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2547 | (list of token) |
2880
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2548 | @param source code string to work at (string) |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2549 | @param indent indentation string of the code line (string) |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2550 | @return list of candidates (list of string) |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2551 | """ |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2552 | candidates = [] |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2553 | |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2554 | for tkn in tokens: |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2555 | tokenType = tkn[0] |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2556 | tokenString = tkn[1] |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2557 | |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2558 | if ( |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2559 | tokenType == tokenize.COMMENT and |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2560 | not self.__prevText.rstrip().endswith('\\') |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2561 | ): |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2562 | # Move inline comments to previous line. |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2563 | offset = tkn[2][1] |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2564 | first = source[:offset] |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2565 | second = source[offset:] |
2892
b601ede6dbbf
Fixed a few issues in the PEP-8 fixer and made it PEP-8 compliant.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2891
diff
changeset
|
2566 | candidates.append( |
b601ede6dbbf
Fixed a few issues in the PEP-8 fixer and made it PEP-8 compliant.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2891
diff
changeset
|
2567 | indent + second.strip() + self.__eol + |
b601ede6dbbf
Fixed a few issues in the PEP-8 fixer and made it PEP-8 compliant.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2891
diff
changeset
|
2568 | indent + first.strip() + self.__eol) |
2880
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2569 | elif tokenType == tokenize.OP and tokenString != '=': |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2570 | # Don't break on '=' after keyword as this violates PEP 8. |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2571 | |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2572 | assert tokenType != tokenize.INDENT |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2573 | |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2574 | offset = tkn[2][1] + 1 |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2575 | first = source[:offset] |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2576 | |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2577 | secondIndent = indent |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2578 | if first.rstrip().endswith('('): |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2579 | secondIndent += self.__indentWord |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2580 | elif '(' in first: |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2581 | secondIndent += ' ' * (1 + first.find('(')) |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2582 | else: |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2583 | secondIndent += self.__indentWord |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2584 | |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2585 | second = (secondIndent + source[offset:].lstrip()) |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2586 | if not second.strip(): |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2587 | continue |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2588 | |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2589 | # Do not begin a line with a comma |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2590 | if second.lstrip().startswith(','): |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2591 | continue |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2592 | |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2593 | # Do end a line with a dot |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2594 | if first.rstrip().endswith('.'): |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2595 | continue |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2596 | |
2981
0c5205aa7a5a
Fixed some issues in the code style fixer.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2978
diff
changeset
|
2597 | if tokenString in '+-*/,': |
2880
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2598 | newText = first + ' \\' + self.__eol + second |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2599 | else: |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2600 | newText = first + self.__eol + second |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2601 | |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2602 | # Only fix if syntax is okay. |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2603 | if self.__checkSyntax(self.__normalizeMultiline(newText)): |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2604 | candidates.append(indent + newText) |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2605 | |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2606 | return candidates |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2607 | |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2608 | def __normalizeMultiline(self, text): |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2609 | """ |
2883
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2610 | Private method to remove multiline-related code that will cause syntax |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2611 | error. |
2880
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2612 | |
2962
d6c9d1ca2da4
Continued correcting doc strings by using the new doc string checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2960
diff
changeset
|
2613 | @param text code line to work on (string) |
2880
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2614 | @return normalized code line (string) |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2615 | """ |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2616 | for quote in '\'"': |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2617 | dictPattern = r"^{q}[^{q}]*{q} *: *".format(q=quote) |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2618 | if re.match(dictPattern, text): |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2619 | if not text.strip().endswith('}'): |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2620 | text += '}' |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2621 | return '{' + text |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2622 | |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2623 | if text.startswith('def ') and text.rstrip().endswith(':'): |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2624 | # Do not allow ':' to be alone. That is invalid. |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2625 | splitText = [item.strip() for item in text.split(self.__eol)] |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2626 | if ':' not in splitText and 'def' not in splitText: |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2627 | return text[len('def'):].strip().rstrip(':') |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2628 | |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2629 | return text |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2630 | |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2631 | def __lineShorteningRank(self, candidate): |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2632 | """ |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2633 | Private method to rank a candidate. |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2634 | |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2635 | @param candidate candidate line to rank (string) |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2636 | @return rank of the candidate (integer) |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2637 | """ |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2638 | rank = 0 |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2639 | if candidate.strip(): |
2891
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
2640 | if candidate == self.__text: |
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
2641 | # give the original a disadvantage |
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
2642 | rank += 50 |
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
2643 | |
2880
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2644 | lines = candidate.split(self.__eol) |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2645 | |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2646 | offset = 0 |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2647 | if lines[0].rstrip()[-1] not in '([{': |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2648 | for symbol in '([{': |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2649 | offset = max(offset, 1 + lines[0].find(symbol)) |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2650 | |
5588
6ba512d9f46a
Continued fixing code style issues detected by the extended style checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5389
diff
changeset
|
2651 | maxLength = max(offset + len(x.strip()) for x in lines) |
2880
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2652 | rank += maxLength |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2653 | rank += len(lines) |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2654 | |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2655 | badStartingSymbol = { |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2656 | '(': ')', |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2657 | '[': ']', |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2658 | '{': '}'}.get(lines[0][-1], None) |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2659 | |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2660 | if len(lines) > 1: |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2661 | if (badStartingSymbol and |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2662 | lines[1].lstrip().startswith(badStartingSymbol)): |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2663 | rank += 20 |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2664 | |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2665 | if re.match(r".*[+\-\*/] \($", lines[0]): |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2666 | # "1 * (\n" is ugly as hell. |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2667 | rank += 100 |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2668 | |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2669 | for currentLine in lines: |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2670 | for badStart in ['.', '%', '+', '-', '/']: |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2671 | if currentLine.startswith(badStart): |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2672 | rank += 100 |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2673 | |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2674 | for ending in '([{': |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2675 | # Avoid lonely opening. They result in longer lines. |
2892
b601ede6dbbf
Fixed a few issues in the PEP-8 fixer and made it PEP-8 compliant.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2891
diff
changeset
|
2676 | if currentLine.endswith(ending) and \ |
b601ede6dbbf
Fixed a few issues in the PEP-8 fixer and made it PEP-8 compliant.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2891
diff
changeset
|
2677 | len(currentLine.strip()) <= len(self.__indentWord): |
2880
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2678 | rank += 100 |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2679 | |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2680 | if currentLine.endswith('%'): |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2681 | rank -= 20 |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2682 | |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2683 | # Try to break list comprehensions at the "for". |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2684 | if currentLine.lstrip().startswith('for'): |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2685 | rank -= 50 |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2686 | |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2687 | rank += 10 * self.__countUnbalancedBrackets(currentLine) |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2688 | else: |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2689 | rank = 100000 |
2883
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2690 | |
2880
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2691 | return max(0, rank) |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2692 | |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2693 | def __countUnbalancedBrackets(self, line): |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2694 | """ |
2883
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2695 | Private method to determine the number of unmatched open/close |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2696 | brackets. |
2880
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2697 | |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2698 | @param line line to work at (string) |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2699 | @return number of unmatched open/close brackets (integer) |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2700 | """ |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2701 | count = 0 |
5616
adcffadf4962
Reworked some __IGNORE_WARNING__ comments to be more specific.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5588
diff
changeset
|
2702 | for opening, closing in ['()', '[]', '{}']: |
adcffadf4962
Reworked some __IGNORE_WARNING__ comments to be more specific.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5588
diff
changeset
|
2703 | # __IGNORE_WARNING_M613__ |
2880
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2704 | count += abs(line.count(opening) - line.count(closing)) |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2705 | |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2706 | return count |
2879
12e6e199d0cf
Started implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2878
diff
changeset
|
2707 | |
12e6e199d0cf
Started implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2878
diff
changeset
|
2708 | def __getIndent(self, line): |
12e6e199d0cf
Started implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2878
diff
changeset
|
2709 | """ |
12e6e199d0cf
Started implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2878
diff
changeset
|
2710 | Private method to get the indentation string. |
12e6e199d0cf
Started implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2878
diff
changeset
|
2711 | |
12e6e199d0cf
Started implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2878
diff
changeset
|
2712 | @param line line to determine the indentation string from (string) |
12e6e199d0cf
Started implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2878
diff
changeset
|
2713 | @return indentation string (string) |
12e6e199d0cf
Started implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2878
diff
changeset
|
2714 | """ |
2978
9d63132a23e0
Continued changing the names of the various code style checkers to make them more appropriate to the broadened scope.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2976
diff
changeset
|
2715 | # copied from CodeStyleFixer |
2879
12e6e199d0cf
Started implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2878
diff
changeset
|
2716 | return line.replace(line.lstrip(), "") |
2880
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2717 | |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2718 | def __checkSyntax(self, code): |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2719 | """ |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2720 | Private method to check the syntax of the given code fragment. |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2721 | |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2722 | @param code code fragment to check (string) |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2723 | @return flag indicating syntax is ok (boolean) |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2724 | """ |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2725 | code = code.replace("\r\n", "\n").replace("\r", "\n") |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2726 | try: |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2727 | return compile(code, '<string>', 'exec') |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2728 | except (SyntaxError, TypeError, UnicodeDecodeError): |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2729 | return False |