Sat, 07 Sep 2013 14:50:51 +0200
Fixed a few issues in the PEP-8 fixer and made it PEP-8 compliant.
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 | |
2302
f29e9405c851
Updated copyright for 2013.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1509
diff
changeset
|
3 | # Copyright (c) 2011 - 2013 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 | """ |
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
7 | Module implementing a class to fix certain PEP 8 issues. |
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 | |
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
10 | import os |
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
11 | 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
|
12 | import tokenize |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
13 | import io |
849
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
14 | |
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
15 | from PyQt4.QtCore import QObject |
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
16 | |
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
17 | from E5Gui import E5MessageBox |
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
18 | |
2875
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
19 | from . import pep8 |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
20 | |
849
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
21 | import Utilities |
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
22 | |
2875
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
23 | Pep8FixableIssues = ["E101", "E111", "E121", "E122", "E123", "E124", |
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
|
24 | "E125", "E126", "E127", "E128", "E133", "W191", |
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
|
25 | "E201", "E202", "E203", "E211", "E221", "E222", |
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
|
26 | "E223", "E224", "E225", "E226", "E227", "E228", |
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
|
27 | "E231", "E241", "E242", "E251", "E261", "E262", |
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
|
28 | "E271", "E272", "E273", "E274", "W291", "W292", |
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
|
29 | "W293", "E301", "E302", "E303", "E304", "W391", |
2882
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
30 | "E401", "E501", "E502", "W603", "E701", "E702", |
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
31 | "E703", "E711", "E712" |
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
|
32 | ] |
849
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
33 | |
945
8cd4d08fa9f6
Made code mostly PEP 8 compliant (except all whitespace and line length).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
869
diff
changeset
|
34 | |
849
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
35 | class Pep8Fixer(QObject): |
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
36 | """ |
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
37 | Class implementing a fixer for certain PEP 8 issues. |
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
38 | """ |
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
|
39 | def __init__(self, project, filename, sourceLines, fixCodes, noFixCodes, |
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
|
40 | maxLineLength, inPlace): |
849
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
41 | """ |
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
42 | Constructor |
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
43 | |
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
44 | @param project reference to the project object (Project) |
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
45 | @param filename name of the file to be fixed (string) |
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
46 | @param sourceLines list of source lines including eol marker |
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
47 | (list of string) |
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
48 | @param fixCodes list of codes to be fixed as a comma separated |
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
49 | string (string) |
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
|
50 | @param noFixCodes list of codes not to be fixed as a comma |
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
|
51 | separated string (string) |
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
|
52 | @param maxLineLength maximum allowed line length (integer) |
849
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
53 | @param inPlace flag indicating to modify the file in place (boolean) |
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
54 | """ |
1131
7781e396c903
Changed the code to use super() to access the superclass.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1031
diff
changeset
|
55 | super().__init__() |
849
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
56 | |
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
57 | self.__project = project |
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
58 | self.__filename = filename |
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
59 | self.__origName = "" |
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
60 | 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
|
61 | 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
|
62 | self.__noFixCodes = [ |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
63 | 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
|
64 | self.__maxLineLength = maxLineLength |
853
ec7dd115e26b
Continued implementing a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
852
diff
changeset
|
65 | self.fixed = 0 |
849
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
66 | |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
67 | 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
|
68 | self.__eol = "" |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
69 | 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
|
70 | |
849
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
71 | if not inPlace: |
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
72 | 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
|
73 | 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
|
74 | 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
|
75 | "fixed_" + os.path.basename(self.__filename)) |
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
76 | |
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
77 | self.__fixes = { |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
78 | "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
|
79 | "E111": self.__fixE101, |
2875
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
80 | "E121": self.__fixE121, |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
81 | "E122": self.__fixE122, |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
82 | "E123": self.__fixE123, |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
83 | "E124": self.__fixE121, |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
84 | "E125": self.__fixE125, |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
85 | "E126": self.__fixE126, |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
86 | "E127": self.__fixE127, |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
87 | "E128": self.__fixE127, |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
88 | "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
|
89 | "W191": 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
|
90 | "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
|
91 | "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
|
92 | "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
|
93 | "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
|
94 | "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
|
95 | "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
|
96 | "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
|
97 | "E224": 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
|
98 | "E225": 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
|
99 | "E226": 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
|
100 | "E227": 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
|
101 | "E228": 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
|
102 | "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
|
103 | "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
|
104 | "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
|
105 | "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
|
106 | "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
|
107 | "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
|
108 | "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
|
109 | "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
|
110 | "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
|
111 | "E274": 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
|
112 | "W291": self.__fixW291, |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
113 | "W292": self.__fixW292, |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
114 | "W293": self.__fixW291, |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
115 | "E301": self.__fixE301, |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
116 | "E302": self.__fixE302, |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
117 | "E303": self.__fixE303, |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
118 | "E304": self.__fixE304, |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
119 | "W391": self.__fixW391, |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
120 | "E401": self.__fixE401, |
2882
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
121 | "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
|
122 | "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
|
123 | "W603": self.__fixW603, |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
124 | "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
|
125 | "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
|
126 | "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
|
127 | "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
|
128 | "E712": self.__fixE711, |
849
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
129 | } |
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
130 | self.__modified = False |
2875
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
131 | self.__stackLogical = [] # these need to be fixed before the file |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
132 | # is saved but after all other inline |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
133 | # fixes. These work with logical lines. |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
134 | self.__stack = [] # these need to be fixed before the file |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
135 | # is saved but after all inline fixes |
2882
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
136 | |
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
137 | self.__multiLineNumbers = None |
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
138 | 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
|
139 | |
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
|
140 | self.__lastID = 0 |
849
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
141 | |
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
142 | def saveFile(self, encoding): |
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
143 | """ |
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
144 | 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
|
145 | |
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
146 | @param encoding encoding of the source file (string) |
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
147 | @return flag indicating success (boolean) |
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
148 | """ |
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
149 | if not self.__modified: |
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
150 | # no need to write |
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
151 | return True |
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
152 | |
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
153 | txt = "".join(self.__source) |
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
154 | try: |
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
155 | Utilities.writeEncodedFile(self.__filename, txt, encoding) |
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
156 | except (IOError, Utilities.CodingError, UnicodeError) as err: |
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
|
157 | E5MessageBox.critical( |
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
|
158 | self, |
849
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
159 | self.trUtf8("Fix PEP 8 issues"), |
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
160 | self.trUtf8( |
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
161 | """<p>Could not save the file <b>{0}</b>.""" |
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
|
162 | """ Skipping it.</p><p>Reason: {1}</p>""") |
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
|
163 | .format(self.__filename, str(err)) |
849
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
164 | ) |
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
165 | return False |
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
166 | |
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
167 | return True |
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
168 | |
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
|
169 | 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
|
170 | """ |
61042247f793
Added a button to the PEP-8 dialog to reset the default values.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2876
diff
changeset
|
171 | 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
|
172 | |
61042247f793
Added a button to the PEP-8 dialog to reset the default values.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2876
diff
changeset
|
173 | @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
|
174 | @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
|
175 | """ |
61042247f793
Added a button to the PEP-8 dialog to reset the default values.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2876
diff
changeset
|
176 | 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
|
177 | """ |
61042247f793
Added a button to the PEP-8 dialog to reset the default values.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2876
diff
changeset
|
178 | 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
|
179 | 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
|
180 | |
61042247f793
Added a button to the PEP-8 dialog to reset the default values.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2876
diff
changeset
|
181 | @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
|
182 | (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
|
183 | """ |
61042247f793
Added a button to the PEP-8 dialog to reset the default values.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2876
diff
changeset
|
184 | 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
|
185 | |
61042247f793
Added a button to the PEP-8 dialog to reset the default values.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2876
diff
changeset
|
186 | 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
|
187 | 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
|
188 | 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
|
189 | 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
|
190 | |
61042247f793
Added a button to the PEP-8 dialog to reset the default values.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2876
diff
changeset
|
191 | 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
|
192 | 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
|
193 | 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
|
194 | 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
|
195 | 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
|
196 | |
61042247f793
Added a button to the PEP-8 dialog to reset the default values.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2876
diff
changeset
|
197 | 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
|
198 | |
849
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
199 | 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
|
200 | """ |
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
201 | 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
|
202 | |
1031
c0f795aa71a7
Fixed an issue in the PEP-8 fixer.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
945
diff
changeset
|
203 | @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
|
204 | @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
|
205 | @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
|
206 | @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
|
207 | 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
|
208 | fix (integer) |
849
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
209 | """ |
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
210 | code = message.split(None, 1)[0].strip() |
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
211 | |
1031
c0f795aa71a7
Fixed an issue in the PEP-8 fixer.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
945
diff
changeset
|
212 | 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
|
213 | self.__codeMatch(code) and \ |
849
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
214 | code in self.__fixes: |
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
215 | 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
|
216 | if res[0] == 1: |
849
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
217 | self.__modified = True |
853
ec7dd115e26b
Continued implementing a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
852
diff
changeset
|
218 | self.fixed += 1 |
849
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
219 | 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
|
220 | res = (0, "", 0) |
849
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
221 | |
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
222 | return res |
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
223 | |
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
|
224 | def finalize(self): |
849
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
225 | """ |
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
|
226 | Public method to apply all deferred fixes. |
849
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
227 | """ |
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
|
228 | 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
|
229 | |
2875
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
230 | # 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
|
231 | 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
|
232 | 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
|
233 | 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
|
234 | 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
|
235 | 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
|
236 | results[id_] = (res, msg) |
2875
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
237 | |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
238 | # 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
|
239 | 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
|
240 | 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
|
241 | 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
|
242 | 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
|
243 | 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
|
244 | 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
|
245 | |
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
|
246 | 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
|
247 | |
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
|
248 | 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
|
249 | """ |
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
|
250 | 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
|
251 | |
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
|
252 | @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
|
253 | """ |
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
|
254 | 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
|
255 | return self.__lastID |
849
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
256 | |
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
257 | def __getEol(self): |
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
258 | """ |
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
259 | Private method to get the applicable eol string. |
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
260 | |
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
261 | @return eol string (string) |
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
262 | """ |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
263 | if not self.__eol: |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
264 | if self.__origName: |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
265 | fn = self.__origName |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
266 | else: |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
267 | fn = self.__filename |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
268 | |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
269 | if self.__project.isOpen() and self.__project.isProjectFile(fn): |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
270 | self.__eol = self.__project.getEolString() |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
271 | else: |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
272 | self.__eol = Utilities.linesep() |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
273 | return self.__eol |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
274 | |
2875
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
275 | def __findLogical(self): |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
276 | """ |
2883
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
277 | 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
|
278 | lines. |
2875
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
279 | |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
280 | @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
|
281 | of lines |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
282 | """ |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
283 | logical_start = [] |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
284 | logical_end = [] |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
285 | last_newline = True |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
286 | sio = io.StringIO("".join(self.__source)) |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
287 | parens = 0 |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
288 | 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
|
289 | 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
|
290 | tokenize.INDENT, tokenize.NL, |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
291 | tokenize.ENDMARKER]: |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
292 | continue |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
293 | 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
|
294 | last_newline = True |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
295 | 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
|
296 | continue |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
297 | if last_newline and not parens: |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
298 | 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
|
299 | last_newline = False |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
300 | if t[0] == tokenize.OP: |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
301 | if t[1] in '([{': |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
302 | parens += 1 |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
303 | elif t[1] in '}])': |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
304 | parens -= 1 |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
305 | return logical_start, logical_end |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
306 | |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
307 | def __getLogical(self, line, pos): |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
308 | """ |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
309 | 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
|
310 | position. |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
311 | |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
312 | @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
|
313 | @param pos position inside line (integer) |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
314 | @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
|
315 | 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
|
316 | 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
|
317 | source lines |
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 | try: |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
320 | (logical_start, logical_end) = self.__findLogical() |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
321 | except (SyntaxError, tokenize.TokenError): |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
322 | return None |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
323 | |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
324 | line = line - 1 |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
325 | ls = None |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
326 | le = None |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
327 | 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
|
328 | x = logical_end[i] |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
329 | 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
|
330 | le = x |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
331 | ls = logical_start[i] |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
332 | break |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
333 | if ls is None: |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
334 | return None |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
335 | |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
336 | 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
|
337 | return ls, le, original |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
338 | |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
339 | 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
|
340 | """ |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
341 | 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
|
342 | |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
343 | @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
|
344 | """ |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
345 | sio = io.StringIO("".join(self.__source)) |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
346 | 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
|
347 | try: |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
348 | 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
|
349 | 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
|
350 | 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
|
351 | break |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
352 | 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
|
353 | pass |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
354 | 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
|
355 | |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
356 | 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
|
357 | """ |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
358 | 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
|
359 | |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
360 | @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
|
361 | @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
|
362 | """ |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
363 | 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
|
364 | |
2882
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
365 | def __multilineStringLines(self): |
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
366 | """ |
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
367 | 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
|
368 | 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
|
369 | |
2883
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
370 | @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
|
371 | 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
|
372 | 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
|
373 | """ |
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
374 | if self.__multiLineNumbers is None: |
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
375 | source = "".join(self.__source) |
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
376 | sio = io.StringIO(source) |
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
377 | self.__multiLineNumbers = set() |
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
378 | self.__docLineNumbers = set() |
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
379 | previousTokenType = '' |
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
380 | try: |
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
381 | 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
|
382 | tokenType = t[0] |
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
383 | startRow = t[2][0] |
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
384 | endRow = t[3][0] |
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
385 | |
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
386 | 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
|
387 | if previousTokenType != tokenize.INDENT: |
2883
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
388 | self.__multiLineNumbers |= set( |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
389 | range(startRow, 1 + endRow)) |
2882
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
390 | else: |
2883
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
391 | self.__docLineNumbers |= set( |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
392 | range(startRow, 1 + endRow)) |
2882
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
393 | |
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
394 | previousTokenType = tokenType |
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
395 | except (SyntaxError, tokenize.TokenError): |
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
396 | pass |
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
397 | |
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
398 | return self.__multiLineNumbers, self.__docLineNumbers |
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
399 | |
2875
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
400 | def __fixReindent(self, line, pos, logical): |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
401 | """ |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
402 | 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
|
403 | |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
404 | 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
|
405 | |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
406 | @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
|
407 | @param pos position inside line (integer) |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
408 | @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
|
409 | """ |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
410 | assert logical |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
411 | ls, _, original = logical |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
412 | |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
413 | rewrapper = Pep8IndentationWrapper(original) |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
414 | valid_indents = rewrapper.pep8Expected() |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
415 | if not rewrapper.rel_indent: |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
416 | return False |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
417 | |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
418 | if line > ls[0]: |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
419 | # got a valid continuation line number |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
420 | row = line - ls[0] - 1 |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
421 | # always pick the first option for this |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
422 | valid = valid_indents[row] |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
423 | got = rewrapper.rel_indent[row] |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
424 | else: |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
425 | return False |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
426 | |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
427 | line1 = ls[0] + row |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
428 | # always pick the expected indent, for now. |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
429 | indent_to = valid[0] |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
430 | |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
431 | if got != indent_to: |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
432 | orig_line = self.__source[line1] |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
433 | new_line = ' ' * (indent_to) + orig_line.lstrip() |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
434 | if new_line == orig_line: |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
435 | return False |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
436 | else: |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
437 | self.__source[line1] = new_line |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
438 | return True |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
439 | else: |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
440 | return False |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
441 | |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
442 | 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
|
443 | """ |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
444 | 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
|
445 | |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
446 | @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
|
447 | @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
|
448 | @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
|
449 | @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
|
450 | """ |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
451 | 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
|
452 | 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
|
453 | 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
|
454 | return line |
849
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
455 | 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
|
456 | return left + replacement + right |
849
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
457 | |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
458 | 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
|
459 | """ |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
460 | Private method to fix obsolete tab usage and indentation errors |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
461 | (E101, E111, W191). |
849
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
462 | |
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
463 | @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
|
464 | @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
|
465 | @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
|
466 | @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
|
467 | 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
|
468 | fix (integer) |
849
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
469 | """ |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
470 | if self.__reindenter is None: |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
471 | self.__reindenter = Pep8Reindenter(self.__source) |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
472 | 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
|
473 | 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
|
474 | 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
|
475 | 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
|
476 | if code in ["E101", "W191"]: |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
477 | msg = self.trUtf8("Tab converted to 4 spaces.") |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
478 | else: |
2883
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
479 | msg = self.trUtf8( |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
480 | "Indentation adjusted to be a multiple of four.") |
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
|
481 | 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
|
482 | 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
|
483 | return (0, "", 0) |
849
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
484 | |
2875
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
485 | 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
|
486 | """ |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
487 | Private method to fix the indentation of continuation lines and |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
488 | closing brackets (E121,E124). |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
489 | |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
490 | @param code code of the issue (string) |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
491 | @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
|
492 | @param pos position inside line (integer) |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
493 | @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
|
494 | (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
|
495 | @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
|
496 | 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
|
497 | fix (integer) |
2875
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
498 | """ |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
499 | if apply: |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
500 | logical = self.__getLogical(line, pos) |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
501 | if logical: |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
502 | # 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
|
503 | 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
|
504 | 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
|
505 | if code == "E121": |
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
|
506 | msg = self.trUtf8( |
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
|
507 | "Indentation of continuation line corrected.") |
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
|
508 | elif code == "E124": |
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
|
509 | msg = self.trUtf8( |
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
|
510 | "Indentation of closing bracket corrected.") |
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
|
511 | 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
|
512 | return (0, "", 0) |
2875
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
513 | 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
|
514 | id = self.__getID() |
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
|
515 | self.__stackLogical.append((id, code, line, pos)) |
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
|
516 | return (-1, "", id) |
2875
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
517 | |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
518 | 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
|
519 | """ |
2883
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
520 | Private method to fix a missing indentation of continuation lines |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
521 | (E122). |
2875
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
522 | |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
523 | @param code code of the issue (string) |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
524 | @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
|
525 | @param pos position inside line (integer) |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
526 | @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
|
527 | (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
|
528 | @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
|
529 | 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
|
530 | fix (integer) |
2875
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
531 | """ |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
532 | if apply: |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
533 | logical = self.__getLogical(line, pos) |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
534 | if logical: |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
535 | # Fix by adding an initial indent. |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
536 | modified = self.__fixReindent(line, pos, logical) |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
537 | if not modified: |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
538 | # fall back to simple method |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
539 | line = line - 1 |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
540 | text = self.__source[line] |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
541 | indentation = self.__getIndent(text) |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
542 | self.__source[line] = indentation + \ |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
543 | self.__indentWord + text.lstrip() |
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
|
544 | 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
|
545 | 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
|
546 | self.trUtf8( |
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
|
547 | "Missing indentation of continuation line corrected."), |
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
|
548 | 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
|
549 | return (0, "", 0) |
2875
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
550 | 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
|
551 | id = self.__getID() |
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
|
552 | self.__stackLogical.append((id, code, line, pos)) |
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
|
553 | return (-1, "", id) |
2875
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
554 | |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
555 | 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
|
556 | """ |
2883
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
557 | Private method to fix the indentation of a closing bracket lines |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
558 | (E123). |
2875
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
559 | |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
560 | @param code code of the issue (string) |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
561 | @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
|
562 | @param pos position inside line (integer) |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
563 | @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
|
564 | (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
|
565 | @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
|
566 | 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
|
567 | fix (integer) |
2875
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
568 | """ |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
569 | if apply: |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
570 | logical = self.__getLogical(line, pos) |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
571 | if logical: |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
572 | # 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
|
573 | logicalLines = logical[2] |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
574 | row = line - 1 |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
575 | text = self.__source[row] |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
576 | newText = self.__getIndent(logicalLines[0]) + text.lstrip() |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
577 | if newText == text: |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
578 | # 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
|
579 | changed = self.__fixReindent(line, pos, logical) |
2875
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
580 | else: |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
581 | 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
|
582 | 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
|
583 | 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
|
584 | return (1, self.trUtf8( |
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
|
585 | "Closing bracket aligned to opening bracket."), |
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
|
586 | 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
|
587 | return (0, "", 0) |
2875
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
588 | 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
|
589 | id = self.__getID() |
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
|
590 | self.__stackLogical.append((id, code, line, pos)) |
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
|
591 | return (-1, "", id) |
2875
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
592 | |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
593 | 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
|
594 | """ |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
595 | Private method to fix the indentation of continuation lines not |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
596 | distinguishable from next logical line (E125). |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
597 | |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
598 | @param code code of the issue (string) |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
599 | @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
|
600 | @param pos position inside line (integer) |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
601 | @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
|
602 | (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
|
603 | @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
|
604 | 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
|
605 | fix (integer) |
2875
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
606 | """ |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
607 | if apply: |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
608 | logical = self.__getLogical(line, pos) |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
609 | if logical: |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
610 | # Fix by adjusting initial indent level. |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
611 | modified = self.__fixReindent(line, pos, logical) |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
612 | if not modified: |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
613 | row = line - 1 |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
614 | text = self.__source[row] |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
615 | self.__source[row] = self.__getIndent(text) + \ |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
616 | self.__indentWord + text.lstrip() |
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
|
617 | return (1, self.trUtf8("Indentation level changed."), 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
|
618 | return (0, "", 0) |
2875
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
619 | 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
|
620 | id = self.__getID() |
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
|
621 | self.__stackLogical.append((id, code, line, pos)) |
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
|
622 | return (-1, "", id) |
2875
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
623 | |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
624 | 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
|
625 | """ |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
626 | Private method to fix over-indented/under-indented hanging |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
627 | indentation (E126, E133). |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
628 | |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
629 | @param code code of the issue (string) |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
630 | @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
|
631 | @param pos position inside line (integer) |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
632 | @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
|
633 | (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
|
634 | @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
|
635 | 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
|
636 | fix (integer) |
2875
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
637 | """ |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
638 | if apply: |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
639 | logical = self.__getLogical(line, pos) |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
640 | if logical: |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
641 | # Fix by deleting whitespace to the left. |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
642 | logicalLines = logical[2] |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
643 | row = line - 1 |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
644 | text = self.__source[row] |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
645 | newText = self.__getIndent(logicalLines[0]) + \ |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
646 | self.__indentWord + text.lstrip() |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
647 | if newText == text: |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
648 | # 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
|
649 | changed = self.__fixReindent(line, pos, logical) |
2875
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
650 | else: |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
651 | 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
|
652 | 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
|
653 | 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
|
654 | return (1, self.trUtf8( |
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
|
655 | "Indentation level of hanging indentation 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
|
656 | 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
|
657 | return (0, "", 0) |
2875
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
658 | 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
|
659 | id = self.__getID() |
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
|
660 | self.__stackLogical.append((id, code, line, pos)) |
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
|
661 | return (-1, "", id) |
2875
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
662 | |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
663 | 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
|
664 | """ |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
665 | Private method to fix over/under indented lines (E127, E128). |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
666 | |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
667 | @param code code of the issue (string) |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
668 | @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
|
669 | @param pos position inside line (integer) |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
670 | @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
|
671 | (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
|
672 | @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
|
673 | 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
|
674 | fix (integer) |
2875
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
675 | """ |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
676 | if apply: |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
677 | logical = self.__getLogical(line, pos) |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
678 | if logical: |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
679 | # 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
|
680 | logicalLines = logical[2] |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
681 | row = line - 1 |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
682 | text = self.__source[row] |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
683 | newText = text |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
684 | |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
685 | if logicalLines[0].rstrip().endswith('\\'): |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
686 | newText = self.__getIndent(logicalLines[0]) + \ |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
687 | self.__indentWord + text.lstrip() |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
688 | else: |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
689 | startIndex = None |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
690 | for symbol in '([{': |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
691 | if symbol in logicalLines[0]: |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
692 | foundIndex = logicalLines[0].find(symbol) + 1 |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
693 | if startIndex is None: |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
694 | startIndex = foundIndex |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
695 | else: |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
696 | startIndex = min(startIndex, foundIndex) |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
697 | |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
698 | if startIndex is not None: |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
699 | newText = startIndex * ' ' + text.lstrip() |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
700 | |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
701 | if newText == text: |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
702 | # 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
|
703 | changed = self.__fixReindent(line, pos, logical) |
2875
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
704 | else: |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
705 | 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
|
706 | 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
|
707 | 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
|
708 | return (1, self.trUtf8("Visual indentation corrected."), 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
|
709 | return (0, "", 0) |
2875
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
710 | 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
|
711 | id = self.__getID() |
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
|
712 | self.__stackLogical.append((id, code, line, pos)) |
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
|
713 | return (-1, "", id) |
2875
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
714 | |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
715 | 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
|
716 | """ |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
717 | Private method to fix extraneous whitespace (E201, E202, |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
718 | E203, E211). |
849
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
719 | |
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
720 | @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
|
721 | @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
|
722 | @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
|
723 | @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
|
724 | 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
|
725 | fix (integer) |
849
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
726 | """ |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
727 | 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
|
728 | 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
|
729 | |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
730 | 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
|
731 | 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
|
732 | |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
733 | 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
|
734 | 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
|
735 | 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
|
736 | |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
737 | self.__source[line] = newText |
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
|
738 | return (1, self.trUtf8("Extraneous whitespace removed."), 0) |
849
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
739 | |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
740 | 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
|
741 | """ |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
742 | Private method to fix extraneous whitespace around operator or |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
743 | keyword (E221, E222, E223, E224, E225, E226, E227, E228, E241, |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
744 | E242, E271, E272, E273, E274). |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
745 | |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
746 | @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
|
747 | @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
|
748 | @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
|
749 | @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
|
750 | 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
|
751 | fix (integer) |
849
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
752 | """ |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
753 | 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
|
754 | 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
|
755 | |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
756 | 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
|
757 | 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
|
758 | |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
759 | 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
|
760 | 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
|
761 | 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
|
762 | |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
763 | self.__source[line] = newText |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
764 | if code in ["E225", "E226", "E227", "E228"]: |
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
|
765 | return (1, self.trUtf8("Missing whitespace added."), 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
|
766 | 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
|
767 | return (1, self.trUtf8("Extraneous whitespace removed."), 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
|
768 | |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
769 | 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
|
770 | """ |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
771 | 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
|
772 | |
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
773 | @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
|
774 | @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
|
775 | @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
|
776 | @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
|
777 | 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
|
778 | fix (integer) |
849
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
779 | """ |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
780 | 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
|
781 | 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
|
782 | 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
|
783 | " " + self.__source[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
|
784 | return (1, self.trUtf8("Missing whitespace added."), 0) |
849
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
785 | |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
786 | 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
|
787 | """ |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
788 | Private method to fix extraneous whitespace around keyword and |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
789 | default parameter equals (E251). |
849
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
790 | |
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
791 | @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
|
792 | @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
|
793 | @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
|
794 | @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
|
795 | 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
|
796 | fix (integer) |
849
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
797 | """ |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
798 | 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
|
799 | 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
|
800 | |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
801 | # This is necessary since pep8 sometimes reports columns that goes |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
802 | # past the end of the physical line. This happens in cases like, |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
803 | # 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
|
804 | 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
|
805 | 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
|
806 | newText = text |
849
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
807 | 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
|
808 | 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
|
809 | |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
810 | # 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
|
811 | # |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
812 | # 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
|
813 | # 1) |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
814 | 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
|
815 | 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
|
816 | 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
|
817 | else: |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
818 | self.__source[line] = newText |
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
|
819 | return (1, self.trUtf8("Extraneous whitespace removed."), 0) |
849
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
820 | |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
821 | 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
|
822 | """ |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
823 | Private method to fix whitespace before or after inline comment |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
824 | (E261, E262). |
849
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
825 | |
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
826 | @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
|
827 | @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
|
828 | @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
|
829 | @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
|
830 | 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
|
831 | fix (integer) |
849
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
832 | """ |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
833 | 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
|
834 | 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
|
835 | 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
|
836 | 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
|
837 | 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
|
838 | self.__source[line] = newText |
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
|
839 | return (1, self.trUtf8("Whitespace around comment sign corrected."), 0) |
849
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
840 | |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
841 | def __fixE301(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
|
842 | """ |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
843 | Private method to fix the need for one blank line (E301). |
849
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
844 | |
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
845 | @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
|
846 | @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
|
847 | @param pos position inside line (integer) |
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
848 | @keyparam apply flag indicating, that the fix should be applied |
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
849 | (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
|
850 | @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
|
851 | 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
|
852 | fix (integer) |
849
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
853 | """ |
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
854 | if apply: |
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
855 | self.__source.insert(line - 1, self.__getEol()) |
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
|
856 | return (1, self.trUtf8("One blank line inserted."), 0) |
849
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
857 | 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
|
858 | id = self.__getID() |
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
|
859 | self.__stack.append((id, code, line, pos)) |
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
|
860 | return (-1, "", id) |
851
321d29b93238
Continued implementing a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
849
diff
changeset
|
861 | |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
862 | def __fixE302(self, code, line, pos, apply=False): |
853
ec7dd115e26b
Continued implementing a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
852
diff
changeset
|
863 | """ |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
864 | Private method to fix the need for two blank lines (E302). |
2875
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
865 | |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
866 | @param code code of the issue (string) |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
867 | @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
|
868 | @param pos position inside line (integer) |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
869 | @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
|
870 | (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
|
871 | @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
|
872 | 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
|
873 | fix (integer) |
853
ec7dd115e26b
Continued implementing a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
852
diff
changeset
|
874 | """ |
ec7dd115e26b
Continued implementing a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
852
diff
changeset
|
875 | if apply: |
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
|
876 | # 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
|
877 | 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
|
878 | 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
|
879 | 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
|
880 | 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
|
881 | 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
|
882 | 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
|
883 | 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
|
884 | break |
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
|
885 | delta = blanks - 2 |
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
|
886 | |
853
ec7dd115e26b
Continued implementing a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
852
diff
changeset
|
887 | line -= 1 |
ec7dd115e26b
Continued implementing a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
852
diff
changeset
|
888 | if delta < 0: |
ec7dd115e26b
Continued implementing a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
852
diff
changeset
|
889 | # 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
|
890 | while delta < 0: |
ec7dd115e26b
Continued implementing a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
852
diff
changeset
|
891 | self.__source.insert(line, self.__getEol()) |
ec7dd115e26b
Continued implementing a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
852
diff
changeset
|
892 | delta += 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
|
893 | changed = True |
853
ec7dd115e26b
Continued implementing a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
852
diff
changeset
|
894 | elif delta > 0: |
ec7dd115e26b
Continued implementing a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
852
diff
changeset
|
895 | # delete superfluous blank lines |
ec7dd115e26b
Continued implementing a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
852
diff
changeset
|
896 | while delta > 0: |
ec7dd115e26b
Continued implementing a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
852
diff
changeset
|
897 | del self.__source[line - 1] |
ec7dd115e26b
Continued implementing a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
852
diff
changeset
|
898 | line -= 1 |
ec7dd115e26b
Continued implementing a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
852
diff
changeset
|
899 | delta -= 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
|
900 | 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
|
901 | else: |
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
|
902 | changed = 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
|
903 | |
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
|
904 | 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
|
905 | if delta < 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
|
906 | msg = self.trUtf8( |
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
|
907 | "%n blank line(s) inserted.", "", -delta) |
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
|
908 | elif delta > 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
|
909 | msg = self.trUtf8( |
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
|
910 | "%n superfluous lines removed", "", delta) |
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
|
911 | else: |
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
|
912 | msg = "" |
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
|
913 | 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
|
914 | return (0, "", 0) |
853
ec7dd115e26b
Continued implementing a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
852
diff
changeset
|
915 | 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
|
916 | id = self.__getID() |
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
|
917 | self.__stack.append((id, code, line, pos)) |
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
|
918 | return (-1, "", id) |
853
ec7dd115e26b
Continued implementing a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
852
diff
changeset
|
919 | |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
920 | def __fixE303(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
|
921 | """ |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
922 | Private method to fix superfluous blank lines (E303). |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
923 | |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
924 | @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
|
925 | @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
|
926 | @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
|
927 | @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
|
928 | (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
|
929 | @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
|
930 | 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
|
931 | 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
|
932 | """ |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
933 | 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
|
934 | index = line - 3 |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
935 | 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
|
936 | 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
|
937 | 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
|
938 | 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
|
939 | else: |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
940 | break |
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
|
941 | return (1, self.trUtf8("Superfluous blank lines removed."), 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
|
942 | 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
|
943 | id = self.__getID() |
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
|
944 | self.__stack.append((id, code, line, pos)) |
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
|
945 | return (-1, "", id) |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
946 | |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
947 | 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
|
948 | """ |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
949 | Private method to fix superfluous blank lines after a function |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
950 | decorator (E304). |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
951 | |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
952 | @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
|
953 | @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
|
954 | @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
|
955 | @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
|
956 | (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
|
957 | @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
|
958 | 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
|
959 | 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
|
960 | """ |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
961 | 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
|
962 | 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
|
963 | 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
|
964 | 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
|
965 | 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
|
966 | 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
|
967 | else: |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
968 | break |
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
|
969 | return (1, self.trUtf8( |
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
|
970 | "Superfluous blank lines after function decorator removed."), |
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
|
971 | 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
|
972 | 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
|
973 | id = self.__getID() |
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
|
974 | self.__stack.append((id, code, line, pos)) |
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
|
975 | return (-1, "", id) |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
976 | |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
977 | 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
|
978 | """ |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
979 | Private method to fix multiple imports on one line (E401). |
851
321d29b93238
Continued implementing a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
849
diff
changeset
|
980 | |
321d29b93238
Continued implementing a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
849
diff
changeset
|
981 | @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
|
982 | @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
|
983 | @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
|
984 | @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
|
985 | (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
|
986 | @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
|
987 | 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
|
988 | fix (integer) |
851
321d29b93238
Continued implementing a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
849
diff
changeset
|
989 | """ |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
990 | 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
|
991 | 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
|
992 | 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
|
993 | 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
|
994 | 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
|
995 | |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
996 | # pep8 (1.3.1) reports false positive if there is an import |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
997 | # 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
|
998 | # 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
|
999 | 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
|
1000 | 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
|
1001 | |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1002 | newText = text[:pos].rstrip("\t ,") + self.__getEol() + \ |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1003 | 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
|
1004 | self.__source[line] = newText |
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
|
1005 | return (1, self.trUtf8("Imports were put on separate lines."), 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
|
1006 | 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
|
1007 | id = self.__getID() |
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
|
1008 | self.__stack.append((id, code, line, pos)) |
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
|
1009 | return (-1, "", id) |
851
321d29b93238
Continued implementing a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
849
diff
changeset
|
1010 | |
2882
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
1011 | 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
|
1012 | """ |
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
1013 | Private method to fix the long lines by breaking them (E501). |
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
1014 | |
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
|