Wed, 25 Sep 2013 19:50:48 +0200
Started implementing fixer method for eric style docstring issues.
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 | """ |
2912
9ff696796092
Changed some display and source docu strings in the code style checker to make them more universal because the scope goes beyond PEP-8.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2895
diff
changeset
|
7 | Module implementing a class to fix certain code style issues. |
849
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
8 | """ |
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
9 | |
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 | |
2936
2ff273068a10
Started implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2925
diff
changeset
|
23 | # TODO: add fixers for these issues |
2ff273068a10
Started implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2925
diff
changeset
|
24 | # D221, D231, D246, |
2ff273068a10
Started implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2925
diff
changeset
|
25 | |
2925
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
26 | Pep8FixableIssues = ["D111", "D112", "D113", "D121", "D131", "D141", |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
27 | "D142", "D143", "D144", "D145", |
2936
2ff273068a10
Started implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2925
diff
changeset
|
28 | "D242", "D243", "D244", "D245", "D247", |
2923
01ac1f364b38
Started extending the PEP-8 fixer to correct PEP-257 issues as well.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2921
diff
changeset
|
29 | "E101", "E111", "E121", "E122", "E123", "E124", |
2895
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
30 | "E125", "E126", "E127", "E128", "E133", "E201", |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
31 | "E202", "E203", "E211", "E221", "E222", "E223", |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
32 | "E224", "E225", "E226", "E227", "E228", "E231", |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
33 | "E241", "E242", "E251", "E261", "E262", "E271", |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
34 | "E272", "E273", "E274", "E301", "E302", "E303", |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
35 | "E304", "E401", "E501", "E502", "E701", "E702", |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
36 | "E703", "E711", "E712", |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
37 | "N804", "N805", "N806", |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
38 | "W191", "W291", "W292", "W293", "W391", "W603", |
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
|
39 | ] |
849
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
40 | |
945
8cd4d08fa9f6
Made code mostly PEP 8 compliant (except all whitespace and line length).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
869
diff
changeset
|
41 | |
849
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
42 | class Pep8Fixer(QObject): |
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
43 | """ |
2912
9ff696796092
Changed some display and source docu strings in the code style checker to make them more universal because the scope goes beyond PEP-8.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2895
diff
changeset
|
44 | Class implementing a fixer for certain code style issues. |
849
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
45 | """ |
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
|
46 | 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
|
47 | maxLineLength, inPlace): |
849
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
48 | """ |
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
49 | Constructor |
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
50 | |
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
51 | @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
|
52 | @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
|
53 | @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
|
54 | (list of string) |
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
55 | @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
|
56 | 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
|
57 | @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
|
58 | 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
|
59 | @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
|
60 | @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
|
61 | """ |
1131
7781e396c903
Changed the code to use super() to access the superclass.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1031
diff
changeset
|
62 | super().__init__() |
849
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
63 | |
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
64 | self.__project = project |
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
65 | self.__filename = filename |
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
66 | self.__origName = "" |
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
67 | 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
|
68 | 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
|
69 | self.__noFixCodes = [ |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
70 | 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
|
71 | self.__maxLineLength = maxLineLength |
853
ec7dd115e26b
Continued implementing a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
852
diff
changeset
|
72 | self.fixed = 0 |
849
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
73 | |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
74 | 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
|
75 | 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
|
76 | 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
|
77 | |
849
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
78 | if not inPlace: |
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
79 | 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
|
80 | 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
|
81 | 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
|
82 | "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
|
83 | |
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
84 | self.__fixes = { |
2925
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
85 | "D111": self.__fixD111, |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
86 | "D112": self.__fixD112, |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
87 | "D113": self.__fixD112, |
2923
01ac1f364b38
Started extending the PEP-8 fixer to correct PEP-257 issues as well.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2921
diff
changeset
|
88 | "D121": self.__fixD121, |
01ac1f364b38
Started extending the PEP-8 fixer to correct PEP-257 issues as well.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2921
diff
changeset
|
89 | "D131": self.__fixD131, |
01ac1f364b38
Started extending the PEP-8 fixer to correct PEP-257 issues as well.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2921
diff
changeset
|
90 | "D141": self.__fixD141, |
01ac1f364b38
Started extending the PEP-8 fixer to correct PEP-257 issues as well.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2921
diff
changeset
|
91 | "D142": self.__fixD142, |
01ac1f364b38
Started extending the PEP-8 fixer to correct PEP-257 issues as well.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2921
diff
changeset
|
92 | "D143": self.__fixD143, |
01ac1f364b38
Started extending the PEP-8 fixer to correct PEP-257 issues as well.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2921
diff
changeset
|
93 | "D144": self.__fixD144, |
01ac1f364b38
Started extending the PEP-8 fixer to correct PEP-257 issues as well.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2921
diff
changeset
|
94 | "D145": self.__fixD145, |
2936
2ff273068a10
Started implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2925
diff
changeset
|
95 | "D242": self.__fixD242, |
2ff273068a10
Started implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2925
diff
changeset
|
96 | "D243": self.__fixD243, |
2ff273068a10
Started implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2925
diff
changeset
|
97 | "D244": self.__fixD242, |
2ff273068a10
Started implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2925
diff
changeset
|
98 | "D245": self.__fixD243, |
2ff273068a10
Started implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2925
diff
changeset
|
99 | "D247": self.__fixD247, |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
100 | "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
|
101 | "E111": self.__fixE101, |
2875
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
102 | "E121": self.__fixE121, |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
103 | "E122": self.__fixE122, |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
104 | "E123": self.__fixE123, |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
105 | "E124": self.__fixE121, |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
106 | "E125": self.__fixE125, |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
107 | "E126": self.__fixE126, |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
108 | "E127": self.__fixE127, |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
109 | "E128": self.__fixE127, |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
110 | "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
|
111 | "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
|
112 | "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
|
113 | "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
|
114 | "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
|
115 | "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
|
116 | "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
|
117 | "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
|
118 | "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
|
119 | "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
|
120 | "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
|
121 | "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
|
122 | "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
|
123 | "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
|
124 | "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
|
125 | "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
|
126 | "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
|
127 | "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
|
128 | "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
|
129 | "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
|
130 | "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
|
131 | "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
|
132 | "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
|
133 | "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
|
134 | "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
|
135 | "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
|
136 | "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
|
137 | "E401": self.__fixE401, |
2882
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
138 | "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
|
139 | "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
|
140 | "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
|
141 | "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
|
142 | "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
|
143 | "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
|
144 | "E712": self.__fixE711, |
2895
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
145 | "N804": self.__fixN804, |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
146 | "N805": self.__fixN804, |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
147 | "N806": self.__fixN806, |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
148 | "W191": self.__fixE101, |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
149 | "W291": self.__fixW291, |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
150 | "W292": self.__fixW292, |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
151 | "W293": self.__fixW291, |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
152 | "W391": self.__fixW391, |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
153 | "W603": self.__fixW603, |
849
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
154 | } |
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
155 | self.__modified = False |
2875
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
156 | 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
|
157 | # is saved but after all other inline |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
158 | # fixes. These work with logical lines. |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
159 | 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
|
160 | # 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
|
161 | |
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
162 | self.__multiLineNumbers = None |
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
163 | 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
|
164 | |
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
165 | self.__lastID = 0 |
849
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 | def saveFile(self, encoding): |
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
168 | """ |
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
169 | 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
|
170 | |
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
171 | @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
|
172 | @return flag indicating success (boolean) |
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
173 | """ |
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
174 | if not self.__modified: |
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
175 | # no need to write |
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
176 | return True |
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
177 | |
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
178 | txt = "".join(self.__source) |
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
179 | try: |
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
180 | 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
|
181 | 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
|
182 | 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
|
183 | self, |
2912
9ff696796092
Changed some display and source docu strings in the code style checker to make them more universal because the scope goes beyond PEP-8.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2895
diff
changeset
|
184 | self.trUtf8("Fix Code Style Issues"), |
849
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
185 | self.trUtf8( |
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
186 | """<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
|
187 | """ 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
|
188 | .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
|
189 | ) |
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
190 | return False |
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
191 | |
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
192 | return True |
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
193 | |
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
|
194 | 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
|
195 | """ |
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 | 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
|
197 | |
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 | @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
|
199 | @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
|
200 | """ |
61042247f793
Added a button to the PEP-8 dialog to reset the default values.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2876
diff
changeset
|
201 | 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
|
202 | """ |
61042247f793
Added a button to the PEP-8 dialog to reset the default values.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2876
diff
changeset
|
203 | 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
|
204 | 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
|
205 | |
61042247f793
Added a button to the PEP-8 dialog to reset the default values.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2876
diff
changeset
|
206 | @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
|
207 | (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
|
208 | """ |
61042247f793
Added a button to the PEP-8 dialog to reset the default values.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2876
diff
changeset
|
209 | 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
|
210 | |
61042247f793
Added a button to the PEP-8 dialog to reset the default values.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2876
diff
changeset
|
211 | 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
|
212 | 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
|
213 | 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
|
214 | 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
|
215 | |
61042247f793
Added a button to the PEP-8 dialog to reset the default values.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2876
diff
changeset
|
216 | 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
|
217 | 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
|
218 | 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
|
219 | 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
|
220 | 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
|
221 | |
61042247f793
Added a button to the PEP-8 dialog to reset the default values.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2876
diff
changeset
|
222 | 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
|
223 | |
849
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
224 | 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
|
225 | """ |
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
226 | 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
|
227 | |
1031
c0f795aa71a7
Fixed an issue in the PEP-8 fixer.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
945
diff
changeset
|
228 | @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
|
229 | @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
|
230 | @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
|
231 | @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
|
232 | 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
|
233 | fix (integer) |
849
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
234 | """ |
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
235 | 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
|
236 | |
1031
c0f795aa71a7
Fixed an issue in the PEP-8 fixer.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
945
diff
changeset
|
237 | 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
|
238 | self.__codeMatch(code) and \ |
849
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
239 | code in self.__fixes: |
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
240 | 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
|
241 | if res[0] == 1: |
849
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
242 | self.__modified = True |
853
ec7dd115e26b
Continued implementing a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
852
diff
changeset
|
243 | self.fixed += 1 |
849
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
244 | 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
|
245 | res = (0, "", 0) |
849
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
246 | |
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
247 | return res |
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
248 | |
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
|
249 | def finalize(self): |
849
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
250 | """ |
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
|
251 | 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
|
252 | """ |
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
|
253 | 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
|
254 | |
2875
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
255 | # 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
|
256 | 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
|
257 | 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
|
258 | 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
|
259 | 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
|
260 | 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
|
261 | results[id_] = (res, msg) |
2875
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
262 | |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
263 | # 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
|
264 | 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
|
265 | 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
|
266 | 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
|
267 | 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
|
268 | 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
|
269 | 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
|
270 | |
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
271 | 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
|
272 | |
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
273 | 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
|
274 | """ |
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
275 | 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
|
276 | |
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
277 | @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
|
278 | """ |
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
279 | 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
|
280 | return self.__lastID |
849
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
281 | |
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
282 | def __getEol(self): |
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
283 | """ |
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
284 | 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
|
285 | |
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
286 | @return eol string (string) |
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
287 | """ |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
288 | 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
|
289 | 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
|
290 | 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
|
291 | else: |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
292 | 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
|
293 | |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
294 | 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
|
295 | 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
|
296 | else: |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
297 | 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
|
298 | 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
|
299 | |
2875
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
300 | def __findLogical(self): |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
301 | """ |
2883
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
302 | 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
|
303 | lines. |
2875
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
304 | |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
305 | @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
|
306 | of lines |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
307 | """ |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
308 | logical_start = [] |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
309 | logical_end = [] |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
310 | last_newline = True |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
311 | sio = io.StringIO("".join(self.__source)) |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
312 | parens = 0 |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
313 | 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
|
314 | 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
|
315 | tokenize.INDENT, tokenize.NL, |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
316 | tokenize.ENDMARKER]: |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
317 | continue |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
318 | 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
|
319 | last_newline = True |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
320 | 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
|
321 | continue |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
322 | if last_newline and not parens: |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
323 | 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
|
324 | last_newline = False |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
325 | if t[0] == tokenize.OP: |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
326 | if t[1] in '([{': |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
327 | parens += 1 |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
328 | elif t[1] in '}])': |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
329 | parens -= 1 |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
330 | return logical_start, logical_end |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
331 | |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
332 | def __getLogical(self, line, pos): |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
333 | """ |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
334 | 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
|
335 | position. |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
336 | |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
337 | @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
|
338 | @param pos position inside line (integer) |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
339 | @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
|
340 | 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
|
341 | 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
|
342 | source lines |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
343 | """ |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
344 | try: |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
345 | (logical_start, logical_end) = self.__findLogical() |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
346 | except (SyntaxError, tokenize.TokenError): |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
347 | return None |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
348 | |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
349 | line = line - 1 |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
350 | ls = None |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
351 | le = None |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
352 | 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
|
353 | x = logical_end[i] |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
354 | 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
|
355 | le = x |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
356 | ls = logical_start[i] |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
357 | break |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
358 | if ls is None: |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
359 | return None |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
360 | |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
361 | 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
|
362 | return ls, le, original |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
363 | |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
364 | 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
|
365 | """ |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
366 | 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
|
367 | |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
368 | @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
|
369 | """ |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
370 | 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
|
371 | 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
|
372 | try: |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
373 | 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
|
374 | 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
|
375 | 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
|
376 | break |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
377 | 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
|
378 | pass |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
379 | 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
|
380 | |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
381 | 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
|
382 | """ |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
383 | 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
|
384 | |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
385 | @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
|
386 | @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
|
387 | """ |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
388 | 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
|
389 | |
2882
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
390 | def __multilineStringLines(self): |
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
391 | """ |
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
392 | 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
|
393 | 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
|
394 | |
2883
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
395 | @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
|
396 | 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
|
397 | 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
|
398 | """ |
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
399 | if self.__multiLineNumbers is None: |
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
400 | source = "".join(self.__source) |
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
401 | sio = io.StringIO(source) |
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
402 | self.__multiLineNumbers = set() |
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
403 | self.__docLineNumbers = set() |
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
404 | previousTokenType = '' |
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
405 | try: |
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
406 | 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
|
407 | tokenType = t[0] |
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
408 | startRow = t[2][0] |
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
409 | endRow = t[3][0] |
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
410 | |
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
411 | 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
|
412 | if previousTokenType != tokenize.INDENT: |
2883
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
413 | self.__multiLineNumbers |= set( |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
414 | range(startRow, 1 + endRow)) |
2882
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
415 | else: |
2883
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
416 | self.__docLineNumbers |= set( |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
417 | range(startRow, 1 + endRow)) |
2882
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
418 | |
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
419 | previousTokenType = tokenType |
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
420 | except (SyntaxError, tokenize.TokenError): |
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
421 | pass |
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
422 | |
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
423 | return self.__multiLineNumbers, self.__docLineNumbers |
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
424 | |
2875
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
425 | def __fixReindent(self, line, pos, logical): |
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 | 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
|
428 | |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
429 | 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
|
430 | |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
431 | @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
|
432 | @param pos position inside line (integer) |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
433 | @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
|
434 | """ |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
435 | assert logical |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
436 | ls, _, original = logical |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
437 | |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
438 | rewrapper = Pep8IndentationWrapper(original) |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
439 | valid_indents = rewrapper.pep8Expected() |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
440 | if not rewrapper.rel_indent: |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
441 | return False |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
442 | |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
443 | if line > ls[0]: |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
444 | # got a valid continuation line number |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
445 | row = line - ls[0] - 1 |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
446 | # always pick the first option for this |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
447 | valid = valid_indents[row] |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
448 | got = rewrapper.rel_indent[row] |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
449 | else: |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
450 | return False |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
451 | |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
452 | line1 = ls[0] + row |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
453 | # always pick the expected indent, for now. |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
454 | indent_to = valid[0] |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
455 | |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
456 | if got != indent_to: |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
457 | orig_line = self.__source[line1] |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
458 | new_line = ' ' * (indent_to) + orig_line.lstrip() |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
459 | if new_line == orig_line: |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
460 | return False |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
461 | else: |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
462 | self.__source[line1] = new_line |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
463 | return True |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
464 | else: |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
465 | return False |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
466 | |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
467 | 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
|
468 | """ |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
469 | 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
|
470 | |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
471 | @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
|
472 | @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
|
473 | @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
|
474 | @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
|
475 | """ |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
476 | 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
|
477 | 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
|
478 | 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
|
479 | return line |
849
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
480 | 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
|
481 | return left + replacement + right |
849
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
482 | |
2925
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
483 | def __fixD111(self, code, line, pos): |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
484 | """ |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
485 | Private method to fix docstring enclosed in wrong quotes (D111). |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
486 | |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
487 | @param code code of the issue (string) |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
488 | @param line line number of the issue (integer) |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
489 | @param pos position inside line (integer) |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
490 | @return value indicating an applied/deferred fix (-1, 0, 1), |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
491 | a message for the fix (string) and an ID for a deferred |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
492 | fix (integer) |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
493 | """ |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
494 | line = line - 1 |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
495 | left, right = self.__source[line].split("'''", 1) |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
496 | self.__source[line] = left + '"""' + right |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
497 | while line < len(self.__source): |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
498 | if self.__source[line].rstrip().endswith("'''"): |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
499 | left, right = self.__source[line].rsplit("'''", 1) |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
500 | self.__source[line] = left + '"""' + right |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
501 | break |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
502 | line += 1 |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
503 | |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
504 | return ( |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
505 | 1, |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
506 | self.trUtf8( |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
507 | "Triple single quotes converted to triple double quotes."), |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
508 | 0) |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
509 | |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
510 | def __fixD112(self, code, line, pos): |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
511 | """ |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
512 | Private method to fix docstring 'r' or 'u' in leading quotes |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
513 | (D112, D113). |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
514 | |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
515 | @param code code of the issue (string) |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
516 | @param line line number of the issue (integer) |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
517 | @param pos position inside line (integer) |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
518 | @return value indicating an applied/deferred fix (-1, 0, 1), |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
519 | a message for the fix (string) and an ID for a deferred |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
520 | fix (integer) |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
521 | """ |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
522 | line = line - 1 |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
523 | if code == "D112": |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
524 | insertChar = "r" |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
525 | elif code == "D113": |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
526 | insertChar = "u" |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
527 | else: |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
528 | return (0, "", 0) |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
529 | |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
530 | newText = self.__getIndent(self.__source[line]) + \ |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
531 | insertChar + self.__source[line].lstrip() |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
532 | self.__source[line] = newText |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
533 | return ( |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
534 | 1, |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
535 | self.trUtf8('Introductory quotes corrected to be {0}"""') |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
536 | .format(insertChar), |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
537 | 0) |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
538 | |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
539 | def __fixD121(self, code, line, pos, apply=False): |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
540 | """ |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
541 | Private method to fix a single line docstring on multiple lines (D121). |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
542 | |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
543 | @param code code of the issue (string) |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
544 | @param line line number of the issue (integer) |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
545 | @param pos position inside line (integer) |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
546 | @keyparam apply flag indicating, that the fix should be applied |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
547 | (boolean) |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
548 | @return value indicating an applied/deferred fix (-1, 0, 1), |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
549 | a message for the fix (string) and an ID for a deferred |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
550 | fix (integer) |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
551 | """ |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
552 | if apply: |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
553 | line = line - 1 |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
554 | if not self.__source[line].lstrip().startswith( |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
555 | ('"""', 'r"""', 'u"""')): |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
556 | # only correctly formatted docstrings will be fixed |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
557 | return (0, "", 0) |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
558 | |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
559 | docstring = self.__source[line].rstrip() + \ |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
560 | self.__source[line + 1].strip() |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
561 | if docstring.endswith('"""'): |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
562 | docstring += self.__getEol() |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
563 | else: |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
564 | docstring += self.__source[line + 2].lstrip() |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
565 | self.__source[line + 2] = "" |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
566 | |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
567 | self.__source[line] = docstring |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
568 | self.__source[line + 1] = "" |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
569 | return ( |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
570 | 1, |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
571 | self.trUtf8("Single line docstring put on one line."), |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
572 | 0) |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
573 | else: |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
574 | id = self.__getID() |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
575 | self.__stack.append((id, code, line, pos)) |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
576 | return (-1, "", id) |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
577 | |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
578 | def __fixD131(self, code, line, pos): |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
579 | """ |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
580 | Private method to fix a single line docstring on multiple lines (D121). |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
581 | |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
582 | @param code code of the issue (string) |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
583 | @param line line number of the issue (integer) |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
584 | @param pos position inside line (integer) |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
585 | @return value indicating an applied/deferred fix (-1, 0, 1), |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
586 | a message for the fix (string) and an ID for a deferred |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
587 | fix (integer) |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
588 | """ |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
589 | line = line - 1 |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
590 | newText = "" |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
591 | if self.__source[line].rstrip().endswith(('"""', "'''")) and \ |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
592 | self.__source[line].lstrip().startswith(('"""', 'r"""', 'u"""')): |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
593 | # it is a one-liner |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
594 | newText = self.__source[line].rstrip()[:-3] + "." + \ |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
595 | self.__source[line].rstrip()[-3:] + self.__getEol() |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
596 | else: |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
597 | if line < len(self.__source) - 1 and \ |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
598 | (not self.__source[line + 1].strip() or |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
599 | self.__source[line + 1].strip() in ('"""', "'''")): |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
600 | newText = self.__source[line].rstrip() + "." + self.__getEol() |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
601 | |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
602 | if newText: |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
603 | self.__source[line] = newText |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
604 | return (1, self.trUtf8("Period added to summary line."), 0) |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
605 | else: |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
606 | return (0, "", 0) |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
607 | |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
608 | def __fixD141(self, code, line, pos, apply=False): |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
609 | """ |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
610 | Private method to fix a function/method docstring preceded by a |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
611 | blank line (D141). |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
612 | |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
613 | @param code code of the issue (string) |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
614 | @param line line number of the issue (integer) |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
615 | @param pos position inside line (integer) |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
616 | @keyparam apply flag indicating, that the fix should be applied |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
617 | (boolean) |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
618 | @return value indicating an applied/deferred fix (-1, 0, 1), |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
619 | a message for the fix (string) and an ID for a deferred |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
620 | fix (integer) |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
621 | """ |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
622 | if apply: |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
623 | line = line - 1 |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
624 | self.__source[line - 1] = "" |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
625 | return ( |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
626 | 1, |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
627 | self.trUtf8( |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
628 | "Blank line before function/method docstring removed."), |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
629 | 0) |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
630 | else: |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
631 | id = self.__getID() |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
632 | self.__stack.append((id, code, line, pos)) |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
633 | return (-1, "", id) |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
634 | |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
635 | def __fixD142(self, code, line, pos, apply=False): |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
636 | """ |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
637 | Private method to fix a class docstring not preceded by a |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
638 | blank line (D142). |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
639 | |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
640 | @param code code of the issue (string) |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
641 | @param line line number of the issue (integer) |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
642 | @param pos position inside line (integer) |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
643 | @keyparam apply flag indicating, that the fix should be applied |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
644 | (boolean) |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
645 | @return value indicating an applied/deferred fix (-1, 0, 1), |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
646 | a message for the fix (string) and an ID for a deferred |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
647 | fix (integer) |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
648 | """ |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
649 | if apply: |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
650 | line = line - 1 |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
651 | self.__source[line] = self.__getEol() + self.__source[line] |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
652 | return ( |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
653 | 1, |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
654 | self.trUtf8("Blank line inserted before class docstring."), |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
655 | 0) |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
656 | else: |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
657 | id = self.__getID() |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
658 | self.__stack.append((id, code, line, pos)) |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
659 | return (-1, "", id) |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
660 | |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
661 | def __fixD143(self, code, line, pos, apply=False): |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
662 | """ |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
663 | Private method to fix a class docstring not followed by a |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
664 | blank line (D143). |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
665 | |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
666 | @param code code of the issue (string) |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
667 | @param line line number of the issue (integer) |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
668 | @param pos position inside line (integer) |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
669 | @keyparam apply flag indicating, that the fix should be applied |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
670 | (boolean) |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
671 | @return value indicating an applied/deferred fix (-1, 0, 1), |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
672 | a message for the fix (string) and an ID for a deferred |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
673 | fix (integer) |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
674 | """ |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
675 | if apply: |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
676 | line = line - 1 |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
677 | self.__source[line] += self.__getEol() |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
678 | return ( |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
679 | 1, |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
680 | self.trUtf8("Blank line inserted after class docstring."), |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
681 | 0) |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
682 | else: |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
683 | id = self.__getID() |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
684 | self.__stack.append((id, code, line, pos)) |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
685 | return (-1, "", id) |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
686 | |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
687 | def __fixD144(self, code, line, pos, apply=False): |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
688 | """ |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
689 | Private method to fix a docstring summary not followed by a |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
690 | blank line (D144). |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
691 | |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
692 | @param code code of the issue (string) |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
693 | @param line line number of the issue (integer) |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
694 | @param pos position inside line (integer) |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
695 | @keyparam apply flag indicating, that the fix should be applied |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
696 | (boolean) |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
697 | @return value indicating an applied/deferred fix (-1, 0, 1), |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
698 | a message for the fix (string) and an ID for a deferred |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
699 | fix (integer) |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
700 | """ |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
701 | if apply: |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
702 | line = line - 1 |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
703 | if not self.__source[line].rstrip().endswith("."): |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
704 | # only correct summary lines can be fixed here |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
705 | return (0, "", 0) |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
706 | |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
707 | self.__source[line] += self.__getEol() |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
708 | return ( |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
709 | 1, |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
710 | self.trUtf8("Blank line inserted after docstring summary."), |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
711 | 0) |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
712 | else: |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
713 | id = self.__getID() |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
714 | self.__stack.append((id, code, line, pos)) |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
715 | return (-1, "", id) |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
716 | |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
717 | def __fixD145(self, code, line, pos, apply=False): |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
718 | """ |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
719 | Private method to fix the last paragraph of a multi-line docstring |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
720 | not followed by a blank line (D143). |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
721 | |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
722 | @param code code of the issue (string) |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
723 | @param line line number of the issue (integer) |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
724 | @param pos position inside line (integer) |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
725 | @keyparam apply flag indicating, that the fix should be applied |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
726 | (boolean) |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
727 | @return value indicating an applied/deferred fix (-1, 0, 1), |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
728 | a message for the fix (string) and an ID for a deferred |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
729 | fix (integer) |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
730 | """ |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
731 | if apply: |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
732 | line = line - 1 |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
733 | self.__source[line] = self.__getEol() + self.__source[line] |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
734 | return ( |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
735 | 1, |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
736 | self.trUtf8("Blank line inserted after last paragraph" |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
737 | " of docstring."), |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
738 | 0) |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
739 | else: |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
740 | id = self.__getID() |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
741 | self.__stack.append((id, code, line, pos)) |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
742 | return (-1, "", id) |
04896af1b0e1
Completed the PEP-257 fixes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2923
diff
changeset
|
743 | |
2936
2ff273068a10
Started implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2925
diff
changeset
|
744 | def __fixD242(self, code, line, pos, apply=False): |
2ff273068a10
Started implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2925
diff
changeset
|
745 | """ |
2ff273068a10
Started implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2925
diff
changeset
|
746 | Private method to fix a class or function/method docstring preceded |
2ff273068a10
Started implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2925
diff
changeset
|
747 | by a blank line (D242, D244). |
2ff273068a10
Started implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2925
diff
changeset
|
748 | |
2ff273068a10
Started implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2925
diff
changeset
|
749 | @param code code of the issue (string) |
2ff273068a10
Started implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2925
diff
changeset
|
750 | @param line line number of the issue (integer) |
2ff273068a10
Started implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2925
diff
changeset
|
751 | @param pos position inside line (integer) |
2ff273068a10
Started implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2925
diff
changeset
|
752 | @keyparam apply flag indicating, that the fix should be applied |
2ff273068a10
Started implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2925
diff
changeset
|
753 | (boolean) |
2ff273068a10
Started implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2925
diff
changeset
|
754 | @return value indicating an applied/deferred fix (-1, 0, 1), |
2ff273068a10
Started implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2925
diff
changeset
|
755 | a message for the fix (string) and an ID for a deferred |
2ff273068a10
Started implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2925
diff
changeset
|
756 | fix (integer) |
2ff273068a10
Started implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2925
diff
changeset
|
757 | """ |
2ff273068a10
Started implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2925
diff
changeset
|
758 | if apply: |
2ff273068a10
Started implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2925
diff
changeset
|
759 | line = line - 1 |
2ff273068a10
Started implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2925
diff
changeset
|
760 | self.__source[line - 1] = "" |
2ff273068a10
Started implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2925
diff
changeset
|
761 | if code == "D242": |
2ff273068a10
Started implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2925
diff
changeset
|
762 | msg = self.trUtf8("Blank line before class docstring removed.") |
2ff273068a10
Started implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2925
diff
changeset
|
763 | else: |
2ff273068a10
Started implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2925
diff
changeset
|
764 | msg = self.trUtf8( |
2ff273068a10
Started implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2925
diff
changeset
|
765 | "Blank line before function/method docstring removed.") |
2ff273068a10
Started implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2925
diff
changeset
|
766 | return (1, msg, 0) |
2ff273068a10
Started implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2925
diff
changeset
|
767 | else: |
2ff273068a10
Started implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2925
diff
changeset
|
768 | id = self.__getID() |
2ff273068a10
Started implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2925
diff
changeset
|
769 | self.__stack.append((id, code, line, pos)) |
2ff273068a10
Started implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2925
diff
changeset
|
770 | return (-1, "", id) |
2ff273068a10
Started implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2925
diff
changeset
|
771 | |
2ff273068a10
Started implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2925
diff
changeset
|
772 | def __fixD243(self, code, line, pos, apply=False): |
2ff273068a10
Started implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2925
diff
changeset
|
773 | """ |
2ff273068a10
Started implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2925
diff
changeset
|
774 | Private method to fix a class or function/method docstring followed |
2ff273068a10
Started implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2925
diff
changeset
|
775 | by a blank line (D243, D245). |
2ff273068a10
Started implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2925
diff
changeset
|
776 | |
2ff273068a10
Started implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2925
diff
changeset
|
777 | @param code code of the issue (string) |
2ff273068a10
Started implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2925
diff
changeset
|
778 | @param line line number of the issue (integer) |
2ff273068a10
Started implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2925
diff
changeset
|
779 | @param pos position inside line (integer) |
2ff273068a10
Started implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2925
diff
changeset
|
780 | @keyparam apply flag indicating, that the fix should be applied |
2ff273068a10
Started implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2925
diff
changeset
|
781 | (boolean) |
2ff273068a10
Started implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2925
diff
changeset
|
782 | @return value indicating an applied/deferred fix (-1, 0, 1), |
2ff273068a10
Started implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2925
diff
changeset
|
783 | a message for the fix (string) and an ID for a deferred |
2ff273068a10
Started implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2925
diff
changeset
|
784 | fix (integer) |
2ff273068a10
Started implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2925
diff
changeset
|
785 | """ |
2ff273068a10
Started implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2925
diff
changeset
|
786 | if apply: |
2ff273068a10
Started implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2925
diff
changeset
|
787 | line = line - 1 |
2ff273068a10
Started implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2925
diff
changeset
|
788 | self.__source[line + 1] = "" |
2ff273068a10
Started implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2925
diff
changeset
|
789 | if code == "D243": |
2ff273068a10
Started implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2925
diff
changeset
|
790 | msg = self.trUtf8("Blank line after class docstring removed.") |
2ff273068a10
Started implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2925
diff
changeset
|
791 | else: |
2ff273068a10
Started implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2925
diff
changeset
|
792 | msg = self.trUtf8( |
2ff273068a10
Started implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2925
diff
changeset
|
793 | "Blank line after function/method docstring removed.") |
2ff273068a10
Started implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2925
diff
changeset
|
794 | return (1, msg, 0) |
2ff273068a10
Started implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2925
diff
changeset
|
795 | else: |
2ff273068a10
Started implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2925
diff
changeset
|
796 | id = self.__getID() |
2ff273068a10
Started implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2925
diff
changeset
|
797 | self.__stack.append((id, code, line, pos)) |
2ff273068a10
Started implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2925
diff
changeset
|
798 | return (-1, "", id) |
2ff273068a10
Started implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2925
diff
changeset
|
799 | |
2ff273068a10
Started implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2925
diff
changeset
|
800 | def __fixD247(self, code, line, pos, apply=False): |
2ff273068a10
Started implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2925
diff
changeset
|
801 | """ |
2ff273068a10
Started implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2925
diff
changeset
|
802 | Private method to fix a last paragraph of a docstring followed |
2ff273068a10
Started implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2925
diff
changeset
|
803 | by a blank line (D247). |
2ff273068a10
Started implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2925
diff
changeset
|
804 | |
2ff273068a10
Started implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2925
diff
changeset
|
805 | @param code code of the issue (string) |
2ff273068a10
Started implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2925
diff
changeset
|
806 | @param line line number of the issue (integer) |
2ff273068a10
Started implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2925
diff
changeset
|
807 | @param pos position inside line (integer) |
2ff273068a10
Started implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2925
diff
changeset
|
808 | @keyparam apply flag indicating, that the fix should be applied |
2ff273068a10
Started implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2925
diff
changeset
|
809 | (boolean) |
2ff273068a10
Started implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2925
diff
changeset
|
810 | @return value indicating an applied/deferred fix (-1, 0, 1), |
2ff273068a10
Started implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2925
diff
changeset
|
811 | a message for the fix (string) and an ID for a deferred |
2ff273068a10
Started implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2925
diff
changeset
|
812 | fix (integer) |
2ff273068a10
Started implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2925
diff
changeset
|
813 | """ |
2ff273068a10
Started implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2925
diff
changeset
|
814 | if apply: |
2ff273068a10
Started implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2925
diff
changeset
|
815 | line = line - 1 |
2ff273068a10
Started implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2925
diff
changeset
|
816 | self.__source[line - 1] = "" |
2ff273068a10
Started implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2925
diff
changeset
|
817 | return ( |
2ff273068a10
Started implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2925
diff
changeset
|
818 | 1, |
2ff273068a10
Started implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2925
diff
changeset
|
819 | self.trUtf8("Blank line after last paragraph removed."), |
2ff273068a10
Started implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2925
diff
changeset
|
820 | 0) |
2ff273068a10
Started implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2925
diff
changeset
|
821 | else: |
2ff273068a10
Started implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2925
diff
changeset
|
822 | id = self.__getID() |
2ff273068a10
Started implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2925
diff
changeset
|
823 | self.__stack.append((id, code, line, pos)) |
2ff273068a10
Started implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2925
diff
changeset
|
824 | return (-1, "", id) |
2ff273068a10
Started implementing fixer method for eric style docstring issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2925
diff
changeset
|
825 | |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
826 | 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
|
827 | """ |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
828 | 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
|
829 | (E101, E111, W191). |
849
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
830 | |
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
831 | @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
|
832 | @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
|
833 | @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
|
834 | @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
|
835 | 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
|
836 | fix (integer) |
849
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
837 | """ |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
838 | 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
|
839 | 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
|
840 | 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
|
841 | 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
|
842 | 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
|
843 | 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
|
844 | 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
|
845 | 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
|
846 | else: |
2883
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
847 | msg = self.trUtf8( |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
848 | "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
|
849 | 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
|
850 | 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
|
851 | return (0, "", 0) |
849
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
852 | |
2875
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
853 | 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
|
854 | """ |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
855 | Private method to fix the indentation of continuation lines and |
2895
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
856 | closing brackets (E121, E124). |
2875
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
857 | |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
858 | @param code code of the issue (string) |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
859 | @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
|
860 | @param pos position inside line (integer) |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
861 | @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
|
862 | (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
|
863 | @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
|
864 | 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
|
865 | fix (integer) |
2875
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
866 | """ |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
867 | if apply: |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
868 | logical = self.__getLogical(line, pos) |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
869 | if logical: |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
870 | # 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
|
871 | 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
|
872 | 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
|
873 | 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
|
874 | 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
|
875 | "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
|
876 | 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
|
877 | 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
|
878 | "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
|
879 | 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
|
880 | return (0, "", 0) |
2875
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
881 | 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
|
882 | 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
|
883 | 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
|
884 | return (-1, "", id) |
2875
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
885 | |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
886 | 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
|
887 | """ |
2883
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
888 | 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
|
889 | (E122). |
2875
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
890 | |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
891 | @param code code of the issue (string) |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
892 | @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
|
893 | @param pos position inside line (integer) |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
894 | @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
|
895 | (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
|
896 | @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
|
897 | 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
|
898 | fix (integer) |
2875
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
899 | """ |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
900 | if apply: |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
901 | logical = self.__getLogical(line, pos) |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
902 | if logical: |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
903 | # Fix by adding an initial indent. |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
904 | modified = self.__fixReindent(line, pos, logical) |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
905 | if not modified: |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
906 | # fall back to simple method |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
907 | line = line - 1 |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
908 | text = self.__source[line] |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
909 | indentation = self.__getIndent(text) |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
910 | self.__source[line] = indentation + \ |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
911 | 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
|
912 | 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
|
913 | 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
|
914 | 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
|
915 | "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
|
916 | 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
|
917 | return (0, "", 0) |
2875
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
918 | 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
|
919 | 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
|
920 | 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
|
921 | return (-1, "", id) |
2875
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
922 | |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
923 | 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
|
924 | """ |
2883
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
925 | 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
|
926 | (E123). |
2875
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
927 | |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
928 | @param code code of the issue (string) |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
929 | @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
|
930 | @param pos position inside line (integer) |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
931 | @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
|
932 | (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
|
933 | @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
|
934 | 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
|
935 | fix (integer) |
2875
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
936 | """ |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
937 | if apply: |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
938 | logical = self.__getLogical(line, pos) |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
939 | if logical: |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
940 | # 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
|
941 | logicalLines = logical[2] |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
942 | row = line - 1 |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
943 | text = self.__source[row] |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
944 | newText = self.__getIndent(logicalLines[0]) + text.lstrip() |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
945 | if newText == text: |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
946 | # 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
|
947 | changed = self.__fixReindent(line, pos, logical) |
2875
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
948 | else: |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
949 | 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
|
950 | 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
|
951 | 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
|
952 | 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
|
953 | "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
|
954 | 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
|
955 | return (0, "", 0) |
2875
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
956 | 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
|
957 | 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
|
958 | 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
|
959 | return (-1, "", id) |
2875
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
960 | |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
961 | 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
|
962 | """ |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
963 | 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
|
964 | distinguishable from next logical line (E125). |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
965 | |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
966 | @param code code of the issue (string) |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
967 | @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
|
968 | @param pos position inside line (integer) |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
969 | @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
|
970 | (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
|
971 | @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
|
972 | 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
|
973 | fix (integer) |
2875
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
974 | """ |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
975 | if apply: |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
976 | logical = self.__getLogical(line, pos) |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
977 | if logical: |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
978 | # Fix by adjusting initial indent level. |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
979 | modified = self.__fixReindent(line, pos, logical) |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
980 | if not modified: |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
981 | row = line - 1 |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
982 | text = self.__source[row] |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
983 | self.__source[row] = self.__getIndent(text) + \ |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
984 | 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
|
985 | 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
|
986 | return (0, "", 0) |
2875
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
987 | 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
|
988 | 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
|
989 | 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
|
990 | return (-1, "", id) |
2875
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
991 | |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
992 | 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
|
993 | """ |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
994 | 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
|
995 | indentation (E126, E133). |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
996 | |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
997 | @param code code of the issue (string) |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
998 | @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
|
999 | @param pos position inside line (integer) |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1000 | @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
|
1001 | (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
|
1002 | @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
|
1003 | 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
|
1004 | fix (integer) |
2875
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1005 | """ |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1006 | if apply: |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1007 | logical = self.__getLogical(line, pos) |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1008 | if logical: |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1009 | # Fix by deleting whitespace to the left. |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1010 | logicalLines = logical[2] |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1011 | row = line - 1 |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1012 | text = self.__source[row] |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1013 | newText = self.__getIndent(logicalLines[0]) + \ |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1014 | self.__indentWord + text.lstrip() |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1015 | if newText == text: |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1016 | # 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
|
1017 | changed = self.__fixReindent(line, pos, logical) |
2875
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1018 | else: |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1019 | 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
|
1020 | 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
|
1021 | 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
|
1022 | 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
|
1023 | "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
|
1024 | 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
|
1025 | return (0, "", 0) |
2875
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1026 | 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
|
1027 | 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
|
1028 | 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
|
1029 | return (-1, "", id) |
2875
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1030 | |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1031 | 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
|
1032 | """ |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1033 | 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
|
1034 | |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1035 | @param code code of the issue (string) |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1036 | @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
|
1037 | @param pos position inside line (integer) |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1038 | @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
|
1039 | (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
|
1040 | @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
|
1041 | 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
|
1042 | fix (integer) |
2875
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1043 | """ |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1044 | if apply: |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1045 | logical = self.__getLogical(line, pos) |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1046 | if logical: |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1047 | # 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
|
1048 | logicalLines = logical[2] |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1049 | row = line - 1 |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1050 | text = self.__source[row] |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1051 | newText = text |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1052 | |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1053 | if logicalLines[0].rstrip().endswith('\\'): |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1054 | newText = self.__getIndent(logicalLines[0]) + \ |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1055 | self.__indentWord + text.lstrip() |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1056 | else: |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1057 | startIndex = None |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1058 | for symbol in '([{': |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1059 | if symbol in logicalLines[0]: |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1060 | foundIndex = logicalLines[0].find(symbol) + 1 |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1061 | if startIndex is None: |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1062 | startIndex = foundIndex |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1063 | else: |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1064 | startIndex = min(startIndex, foundIndex) |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1065 | |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1066 | if startIndex is not None: |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1067 | newText = startIndex * ' ' + text.lstrip() |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1068 | |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1069 | if newText == text: |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1070 | # 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
|
1071 | changed = self.__fixReindent(line, pos, logical) |
2875
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1072 | else: |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1073 | 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
|
1074 | 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
|
1075 | 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
|
1076 | 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
|
1077 | return (0, "", 0) |
2875
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1078 | 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
|
1079 | 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
|
1080 | 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
|
1081 | return (-1, "", id) |
2875
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1082 | |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1083 | 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
|
1084 | """ |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1085 | 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
|
1086 | E203, E211). |
849
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1087 | |
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1088 | @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
|
1089 | @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
|
1090 | @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
|
1091 | @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
|
1092 | 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
|
1093 | fix (integer) |
849
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1094 | """ |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1095 | 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
|
1096 | 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
|
1097 | |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1098 | 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
|
1099 | 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
|
1100 | |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1101 | 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
|
1102 | 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
|
1103 | 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
|
1104 | |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1105 | 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
|
1106 | 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
|
1107 | |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1108 | 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
|
1109 | """ |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1110 | 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
|
1111 | 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
|
1112 | 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
|
1113 | |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1114 | @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
|
1115 | @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
|
1116 | @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
|
1117 | @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
|
1118 | 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
|
1119 | fix (integer) |
849
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1120 | """ |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1121 | 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
|
1122 | 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
|
1123 | |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1124 | 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
|
1125 | 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
|
1126 | |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1127 | 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
|
1128 | 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
|
1129 | 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
|
1130 | |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1131 | 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
|
1132 | 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
|
1133 | 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
|
1134 | 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
|
1135 | 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
|
1136 | |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1137 | 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
|
1138 | """ |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1139 | 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
|
1140 | |
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1141 | @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
|
1142 | @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
|
1143 | @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
|
1144 | @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
|
1145 | 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
|
1146 | fix (integer) |
849
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1147 | """ |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1148 | 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
|
1149 | 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
|
1150 | 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
|
1151 | " " + 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
|
1152 | 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
|
1153 | |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1154 | 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
|
1155 | """ |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1156 | 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
|
1157 | default parameter equals (E251). |
849
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1158 | |
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1159 | @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
|
1160 | @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
|
1161 | @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
|
1162 | @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
|
1163 | 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
|
1164 | fix (integer) |
849
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1165 | """ |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1166 | 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
|
1167 | 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
|
1168 | |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1169 | # 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
|
1170 | # 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
|
1171 | # 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
|
1172 | 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
|
1173 | 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
|
1174 | newText = text |
849
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1175 | 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
|
1176 | 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
|
1177 | |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1178 | # 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
|
1179 | # |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1180 | # 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
|
1181 | # 1) |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1182 | 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
|
1183 | 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
|
1184 | 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
|
1185 | else: |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1186 | 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
|
1187 | 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
|
1188 | |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1189 | 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
|
1190 | """ |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1191 | 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
|
1192 | (E261, E262). |
849
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1193 | |
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1194 | @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
|
1195 | @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
|
1196 | @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
|
1197 | @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
|
1198 | 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
|
1199 | fix (integer) |
849
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1200 | """ |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1201 | 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
|
1202 | 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
|
1203 | 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
|
1204 | 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
|
1205 | 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
|
1206 | 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
|
1207 | 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
|
1208 | |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1209 | 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
|
1210 | """ |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1211 | 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
|
1212 | |
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1213 | @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
|
1214 | @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
|
1215 | @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
|
1216 | @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
|
1217 | (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
|
1218 | @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
|
1219 | 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
|
1220 | fix (integer) |
849
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1221 | """ |
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1222 | if apply: |
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1223 | 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
|
1224 | 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
|
1225 | 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
|
1226 | 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
|
1227 | 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
|
1228 | return (-1, "", id) |
851
321d29b93238
Continued implementing a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
849
diff
changeset
|
1229 | |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1230 | 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
|
1231 | """ |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1232 | 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
|
1233 | |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1234 | @param code code of the issue (string) |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1235 | @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
|
1236 | @param pos position inside line (integer) |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1237 | @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
|
1238 | (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
|
1239 | @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
|
1240 | 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
|
1241 | fix (integer) |
853
ec7dd115e26b
Continued implementing a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
852
diff
changeset
|
1242 | """ |
ec7dd115e26b
Continued implementing a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
852
diff
changeset
|
1243 | 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
|
1244 | # 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
|
1245 | 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
|
1246 | 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
|
1247 | 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
|
1248 | 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
|
1249 | 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
|
1250 | 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
|
1251 | 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
|
1252 | 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
|
1253 | 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
|
1254 | |
853
ec7dd115e26b
Continued implementing a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
852
diff
changeset
|
1255 | line -= 1 |
ec7dd115e26b
Continued implementing a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
852
diff
changeset
|
1256 | if delta < 0: |
ec7dd115e26b
Continued implementing a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
852
diff
changeset
|
1257 | # 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
|
1258 | while delta < 0: |
ec7dd115e26b
Continued implementing a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
852
diff
changeset
|
1259 | 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
|
1260 | 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
|
1261 | changed = True |
853
ec7dd115e26b
Continued implementing a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
852
diff
changeset
|
1262 | elif delta > 0: |
ec7dd115e26b
Continued implementing a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
852
diff
changeset
|
1263 | # delete superfluous blank lines |
ec7dd115e26b
Continued implementing a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
852
diff
changeset
|
1264 | while delta > 0: |
ec7dd115e26b
Continued implementing a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
852
diff
changeset
|
1265 | del self.__source[line - 1] |
ec7dd115e26b
Continued implementing a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
852
diff
changeset
|
1266 | line -= 1 |
ec7dd115e26b
Continued implementing a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
852
diff
changeset
|
1267 | 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
|
1268 | 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
|
1269 | 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
|
1270 | 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
|
1271 | |
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
|
1272 | 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
|
1273 | 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
|
1274 | 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
|
1275 | "%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
|
1276 | 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
|
1277 | 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
|
1278 | "%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
|
1279 | 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
|
1280 | 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
|
1281 | 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
|
1282 | return (0, "", 0) |
853
ec7dd115e26b
Continued implementing a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
852
diff
changeset
|
1283 | 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
|
1284 | 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
|
1285 | 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
|
1286 | return (-1, "", id) |
853
ec7dd115e26b
Continued implementing a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
852
diff
changeset
|
1287 | |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1288 | 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
|
1289 | """ |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1290 | 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
|
1291 | |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1292 | @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
|
1293 | @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
|
1294 | @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
|
1295 | @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
|
1296 | (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
|
1297 | @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
|
1298 | 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
|
1299 | 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
|
1300 | """ |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1301 | 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
|
1302 | 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
|
1303 | 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
|
1304 | 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
|
1305 | 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
|
1306 | 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
|
1307 | else: |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1308 | 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
|
1309 | 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
|
1310 | 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
|
1311 | 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
|
1312 | 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
|
1313 | 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
|
1314 | |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1315 | 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
|
1316 | """ |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1317 | 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
|
1318 | 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
|
1319 | |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1320 | @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
|
1321 | @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
|
1322 | @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
|
1323 | @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
|
1324 | (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
|
1325 | @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
|
1326 | 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
|
1327 | 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
|
1328 | """ |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1329 | if apply: |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1330 | 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
|
1331 | 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
|
1332 | 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
|
1333 | 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
|
1334 | 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
|
1335 | else: |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1336 | 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
|
1337 | 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
|
1338 | "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
|
1339 | 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
|
1340 | 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
|
1341 | 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
|
1342 | 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
|
1343 | 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
|
1344 | |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1345 | 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
|
1346 | """ |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1347 | 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
|
1348 | |
321d29b93238
Continued implementing a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
849
diff
changeset
|
1349 | @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
|
1350 | @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
|
1351 | @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
|
1352 | @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
|
1353 | (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
|
1354 | @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
|
1355 | 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
|
1356 | fix (integer) |
851
321d29b93238
Continued implementing a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
849
diff
changeset
|
1357 | """ |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1358 | 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
|
1359 | 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
|
1360 | 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
|
1361 | 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
|
1362 | 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
|
1363 | |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1364 | # 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
|
1365 | # 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
|
1366 | # 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
|
1367 | 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
|
1368 | 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
|
1369 | |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1370 | 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
|
1371 | 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
|
1372 | 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
|
1373 | 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
|
1374 | 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
|
1375 | 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
|
1376 | 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
|
1377 | return (-1, "", id) |
851
321d29b93238
Continued implementing a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
849
diff
changeset
|
1378 | |
2882
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
1379 | 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
|
1380 | """ |
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
1381 | 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
|
1382 | |
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
1383 | @param code code of the issue (string) |
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
1384 | @param line line number of the issue (integer) |
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
1385 | @param pos position inside line (integer) |
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
1386 | @keyparam apply flag indicating, that the fix should be applied |
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
1387 | (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
|
1388 | @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
|
1389 | 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
|
1390 | fix (integer) |
2882
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
1391 | """ |
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
1392 | multilineStringLines, docStringLines = self.__multilineStringLines() |
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
1393 | if apply: |
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
1394 | isDocString = line in docStringLines |
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
1395 | line = line - 1 |
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
1396 | text = self.__source[line] |
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
1397 | if line > 0: |
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
1398 | prevText = self.__source[line - 1] |
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
1399 | else: |
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
1400 | prevText = "" |
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
1401 | if line < len(self.__source) - 1: |
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
1402 | nextText = self.__source[line + 1] |
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
1403 | else: |
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
1404 | nextText = "" |
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
|
1405 | shortener = Pep8LineShortener( |
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
|
1406 | text, prevText, nextText, |
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
|
1407 | maxLength=self.__maxLineLength, eol=self.__getEol(), |
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
|
1408 | indentWord=self.__indentWord, isDocString=isDocString) |
2882
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
1409 | changed, newText, newNextText = shortener.shorten() |
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
1410 | if changed: |
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
1411 | if newText != text: |
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
1412 | self.__source[line] = newText |
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
1413 | if newNextText and newNextText != nextText: |
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
1414 | self.__source[line + 1] = newNextText |
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
|
1415 | return (1, self.trUtf8("Long lines have been shortened."), 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
|
1416 | 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
|
1417 | return (0, "", 0) |
2882
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
1418 | 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
|
1419 | 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
|
1420 | 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
|
1421 | return (-1, "", id) |
2882
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
1422 | |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1423 | def __fixE502(self, code, line, pos): |
851
321d29b93238
Continued implementing a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
849
diff
changeset
|
1424 | """ |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1425 | Private method to fix redundant backslash within brackets (E502). |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1426 | |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1427 | @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
|
1428 | @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
|
1429 | @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
|
1430 | @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
|
1431 | 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
|
1432 | 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
|
1433 | """ |
2883
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
1434 | self.__source[line - 1] = \ |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
1435 | self.__source[line - 1].rstrip("\n\r \t\\") + 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
|
1436 | return (1, self.trUtf8("Redundant backslash in brackets 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
|
1437 | |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1438 | def __fixE701(self, code, line, pos, apply=False): |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1439 | """ |
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
|
1440 | Private method to fix colon-separated compound statements (E701). |
851
321d29b93238
Continued implementing a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
849
diff
changeset
|
1441 | |
321d29b93238
Continued implementing a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
849
diff
changeset
|
1442 | @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
|
1443 | @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
|
1444 | @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
|
1445 | @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
|
1446 | (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
|
1447 | @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
|
1448 | 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
|
1449 | fix (integer) |
851
321d29b93238
Continued implementing a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
849
diff
changeset
|
1450 | """ |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1451 | 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
|
1452 | 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
|
1453 | 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
|
1454 | 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
|
1455 | |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1456 | newText = text[:pos] + self.__getEol() + self.__getIndent(text) + \ |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1457 | self.__indentWord + text[pos:].lstrip("\n\r \t\\") + \ |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1458 | 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
|
1459 | 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
|
1460 | return (1, self.trUtf8("Compound statement corrected."), 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
|
1461 | 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
|
1462 | 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
|
1463 | 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
|
1464 | return (-1, "", id) |
852
257a6f80b96c
Continued implementing a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
851
diff
changeset
|
1465 | |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1466 | def __fixE702(self, code, line, pos, apply=False): |
852
257a6f80b96c
Continued implementing a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
851
diff
changeset
|
1467 | """ |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1468 | Private method to fix semicolon-separated compound statements |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1469 | (E702, E703). |
852
257a6f80b96c
Continued implementing a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
851
diff
changeset
|
1470 | |
257a6f80b96c
Continued implementing a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
851
diff
changeset
|
1471 | @param code code of the issue (string) |
257a6f80b96c
Continued implementing a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
851
diff
changeset
|
1472 | @param line line number of the issue (integer) |
257a6f80b96c
Continued implementing a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
851
diff
changeset
|
1473 | @param pos position inside line (integer) |
257a6f80b96c
Continued implementing a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
851
diff
changeset
|
1474 | @keyparam apply flag indicating, that the fix should be applied |
257a6f80b96c
Continued implementing a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
851
diff
changeset
|
1475 | (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
|
1476 | @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
|
1477 | 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
|
1478 | fix (integer) |
852
257a6f80b96c
Continued implementing a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
851
diff
changeset
|
1479 | """ |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1480 | 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
|
1481 | 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
|
1482 | 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
|
1483 | |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1484 | if text.rstrip().endswith("\\"): |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1485 | # normalize '1; \\\n2' into '1; 2' |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1486 | self.__source[line] = text.rstrip("\n\r \t\\") |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1487 | 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
|
1488 | elif text.rstrip().endswith(";"): |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1489 | self.__source[line] = text.rstrip("\n\r \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
|
1490 | else: |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1491 | first = text[:pos].rstrip("\n\r \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
|
1492 | second = text[pos:].lstrip("\n\r \t;") |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1493 | self.__source[line] = first + self.__getIndent(text) + second |
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
|
1494 | return (1, self.trUtf8("Compound statement corrected."), 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
|
1495 | 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
|
1496 | 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
|
1497 | 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
|
1498 | return (-1, "", id) |
852
257a6f80b96c
Continued implementing a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
851
diff
changeset
|
1499 | |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1500 | def __fixE711(self, code, line, pos): |
852
257a6f80b96c
Continued implementing a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
851
diff
changeset
|
1501 | """ |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1502 | Private method to fix comparison with None (E711, E712). |
852
257a6f80b96c
Continued implementing a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
851
diff
changeset
|
1503 | |
257a6f80b96c
Continued implementing a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
851
diff
changeset
|
1504 | @param code code of the issue (string) |
257a6f80b96c
Continued implementing a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
851
diff
changeset
|
1505 | @param line line number of the issue (integer) |
257a6f80b96c
Continued implementing a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
851
diff
changeset
|
1506 | @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
|
1507 | @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
|
1508 | 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
|
1509 | fix (integer) |
852
257a6f80b96c
Continued implementing a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
851
diff
changeset
|
1510 | """ |
257a6f80b96c
Continued implementing a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
851
diff
changeset
|
1511 | line = line - 1 |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1512 | 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
|
1513 | |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1514 | rightPos = pos + 2 |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1515 | if rightPos >= len(text): |
2891
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
1516 | 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
|
1517 | |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1518 | left = text[:pos].rstrip() |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1519 | center = text[pos:rightPos] |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1520 | right = text[rightPos:].lstrip() |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1521 | |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1522 | if not right.startswith(("None", "True", "False")): |
2891
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
1523 | 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
|
1524 | |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1525 | if center.strip() == "==": |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1526 | center = "is" |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1527 | elif center.strip() == "!=": |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1528 | center = "is not" |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1529 | 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
|
1530 | 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
|
1531 | |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1532 | self.__source[line] = " ".join([left, center, right]) |
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
|
1533 | return (1, self.trUtf8("Comparison to None/True/False corrected."), 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
|
1534 | |
2895
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1535 | def __fixN804(self, code, line, pos, apply=False): |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1536 | """ |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1537 | Private method to fix a wrong first argument of normal and |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1538 | class methods (N804, N805). |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1539 | |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1540 | @param code code of the issue (string) |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1541 | @param line line number of the issue (integer) |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1542 | @param pos position inside line (integer) |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1543 | @keyparam apply flag indicating, that the fix should be applied |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1544 | (boolean) |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1545 | @return value indicating an applied/deferred fix (-1, 0, 1), |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1546 | a message for the fix (string) and an ID for a deferred |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1547 | fix (integer) |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1548 | """ |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1549 | if apply: |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1550 | line = line - 1 |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1551 | text = self.__source[line] |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1552 | if code == "N804": |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1553 | arg = "cls" |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1554 | else: |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1555 | arg = "self" |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1556 | |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1557 | if text.rstrip().endswith("("): |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1558 | newText = text + self.__getIndent(text) + \ |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1559 | self.__indentWord + arg + "," + self.__getEol() |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1560 | else: |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1561 | index = text.find("(") + 1 |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1562 | left = text[:index] |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1563 | right = text[index:] |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1564 | if right.startswith(")"): |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1565 | center = arg |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1566 | else: |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1567 | center = arg + ", " |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1568 | newText = left + center + right |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1569 | self.__source[line] = newText |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1570 | return (1, self.trUtf8("'{0}' argument added.").format(arg), 0) |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1571 | else: |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1572 | id = self.__getID() |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1573 | self.__stack.append((id, code, line, pos)) |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1574 | return (-1, "", id) |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1575 | |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1576 | def __fixN806(self, code, line, pos, apply=False): |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1577 | """ |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1578 | Private method to fix a wrong first argument of static methods |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1579 | (N806). |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1580 | |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1581 | @param code code of the issue (string) |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1582 | @param line line number of the issue (integer) |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1583 | @param pos position inside line (integer) |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1584 | @keyparam apply flag indicating, that the fix should be applied |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1585 | (boolean) |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1586 | @return value indicating an applied/deferred fix (-1, 0, 1), |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1587 | a message for the fix (string) and an ID for a deferred |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1588 | fix (integer) |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1589 | """ |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1590 | if apply: |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1591 | line = line - 1 |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1592 | text = self.__source[line] |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1593 | index = text.find("(") + 1 |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1594 | left = text[:index] |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1595 | right = text[index:] |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1596 | |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1597 | if right.startswith(("cls", "self")): |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1598 | # cls or self are on the definition line |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1599 | if right.startswith("cls"): |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1600 | right = right[3:] |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1601 | arg = "cls" |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1602 | else: |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1603 | right = right[4:] |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1604 | arg = "self" |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1605 | right = right.lstrip(", ") |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1606 | newText = left + right |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1607 | self.__source[line] = newText |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1608 | else: |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1609 | # they are on the next line |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1610 | line = line + 1 |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1611 | text = self.__source[line] |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1612 | indent = self.__getIndent(text) |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1613 | right = text.lstrip() |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1614 | if right.startswith("cls"): |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1615 | right = right[3:] |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1616 | arg = "cls" |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1617 | else: |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1618 | right = right[4:] |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1619 | arg = "self" |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1620 | right = right.lstrip(", ") |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1621 | if right.startswith("):"): |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1622 | # merge with previous line |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1623 | self.__source[line - 1] = \ |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1624 | self.__source[line - 1].rstrip() + right |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1625 | self.__source[line] = "" |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1626 | else: |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1627 | self.__source[line] = indent + right |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1628 | |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1629 | return (1, self.trUtf8("'{0}' argument removed.").format(arg), 0) |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1630 | else: |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1631 | id = self.__getID() |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1632 | self.__stack.append((id, code, line, pos)) |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1633 | return (-1, "", id) |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
1634 | |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1635 | def __fixW291(self, code, line, pos): |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1636 | """ |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1637 | Private method to fix trailing whitespace (W291, W293). |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1638 | |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1639 | @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
|
1640 | @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
|
1641 | @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
|
1642 | @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
|
1643 | 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
|
1644 | 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
|
1645 | """ |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1646 | self.__source[line - 1] = re.sub(r'[\t ]+(\r?)$', r"\1", |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1647 | self.__source[line - 1]) |
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
|
1648 | return (1, self.trUtf8("Whitespace stripped from end of line."), 0) |
852
257a6f80b96c
Continued implementing a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
851
diff
changeset
|
1649 | |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1650 | def __fixW292(self, code, line, pos): |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1651 | """ |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1652 | Private method to fix a missing newline at the end of file (W292). |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1653 | |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1654 | @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
|
1655 | @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
|
1656 | @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
|
1657 | @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
|
1658 | 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
|
1659 | 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
|
1660 | """ |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1661 | self.__source[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
|
1662 | return (1, self.trUtf8("newline added to end of file."), 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
|
1663 | |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1664 | def __fixW391(self, code, line, pos): |
852
257a6f80b96c
Continued implementing a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
851
diff
changeset
|
1665 | """ |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1666 | Private method to fix trailing blank lines (W391). |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1667 | |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1668 | @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
|
1669 | @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
|
1670 | @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
|
1671 | @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
|
1672 | 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
|
1673 | 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
|
1674 | """ |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1675 | index = line - 1 |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1676 | 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
|
1677 | 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
|
1678 | 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
|
1679 | 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
|
1680 | else: |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1681 | 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
|
1682 | return (1, self.trUtf8( |
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
1683 | "Superfluous trailing blank lines removed from end of file."), 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
|
1684 | |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1685 | def __fixW603(self, code, line, pos): |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1686 | """ |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1687 | Private method to fix the not equal notation (W603). |
852
257a6f80b96c
Continued implementing a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
851
diff
changeset
|
1688 | |
257a6f80b96c
Continued implementing a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
851
diff
changeset
|
1689 | @param code code of the issue (string) |
257a6f80b96c
Continued implementing a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
851
diff
changeset
|
1690 | @param line line number of the issue (integer) |
257a6f80b96c
Continued implementing a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
851
diff
changeset
|
1691 | @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
|
1692 | @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
|
1693 | 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
|
1694 | fix (integer) |
852
257a6f80b96c
Continued implementing a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
851
diff
changeset
|
1695 | """ |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1696 | self.__source[line - 1] = self.__source[line - 1].replace("<>", "!=") |
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
|
1697 | return (1, self.trUtf8("'<>' replaced by '!='."), 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
|
1698 | |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1699 | |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1700 | class Pep8Reindenter(object): |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1701 | """ |
2883
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
1702 | Class to reindent badly-indented code to uniformly use four-space |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
1703 | indentation. |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1704 | |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1705 | Released to the public domain, by Tim Peters, 03 October 2000. |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1706 | """ |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1707 | def __init__(self, sourceLines): |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1708 | """ |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1709 | Constructor |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1710 | |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1711 | @param sourceLines list of source lines including eol marker |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1712 | (list of string) |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1713 | """ |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1714 | # Raw file lines. |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1715 | self.raw = sourceLines |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1716 | self.after = [] |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1717 | |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1718 | # File lines, rstripped & tab-expanded. Dummy at start is so |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1719 | # that we can use tokenize's 1-based line numbering easily. |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1720 | # Note that a line is all-blank iff it's "\n". |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1721 | self.lines = [line.rstrip().expandtabs() + "\n" |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1722 | for line in self.raw] |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1723 | self.lines.insert(0, None) |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1724 | self.index = 1 # index into self.lines of next line |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1725 | |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1726 | # List of (lineno, indentlevel) pairs, one for each stmt and |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1727 | # comment line. indentlevel is -1 for comment lines, as a |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1728 | # signal that tokenize doesn't know what to do about them; |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1729 | # indeed, they're our headache! |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1730 | self.stats = [] |
852
257a6f80b96c
Continued implementing a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
851
diff
changeset
|
1731 | |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1732 | def run(self): |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1733 | """ |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1734 | Public method to run the re-indenter. |
852
257a6f80b96c
Continued implementing a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
851
diff
changeset
|
1735 | """ |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1736 | try: |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1737 | stats = self.__genStats(tokenize.generate_tokens(self.getline)) |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1738 | 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
|
1739 | return False |
852
257a6f80b96c
Continued implementing a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
851
diff
changeset
|
1740 | |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1741 | # Remove trailing empty lines. |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1742 | lines = self.lines |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1743 | while lines and lines[-1] == "\n": |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1744 | lines.pop() |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1745 | # Sentinel. |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1746 | stats.append((len(lines), 0)) |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1747 | # Map count of leading spaces to # we want. |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1748 | have2want = {} |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1749 | # Program after transformation. |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1750 | after = self.after = [] |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1751 | # Copy over initial empty lines -- there's nothing to do until |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1752 | # we see a line with *something* on it. |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1753 | i = stats[0][0] |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1754 | after.extend(lines[1:i]) |
2876
bfa39cf40277
Extended the PEP-8 dialog to select fixable issues manually (i.e. fix only the selected issues).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2875
diff
changeset
|
1755 | for i in range(len(stats) - 1): |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1756 | thisstmt, thislevel = stats[i] |
2876
bfa39cf40277
Extended the PEP-8 dialog to select fixable issues manually (i.e. fix only the selected issues).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2875
diff
changeset
|
1757 | nextstmt = stats[i + 1][0] |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1758 | have = self.__getlspace(lines[thisstmt]) |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1759 | want = thislevel * 4 |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1760 | if want < 0: |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1761 | # A comment line. |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1762 | if have: |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1763 | # An indented comment line. If we saw the same |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1764 | # indentation before, reuse what it most recently |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1765 | # mapped to. |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1766 | want = have2want.get(have, -1) |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1767 | if want < 0: |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1768 | # Then it probably belongs to the next real stmt. |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1769 | for j in range(i + 1, len(stats) - 1): |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1770 | jline, jlevel = stats[j] |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1771 | if jlevel >= 0: |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1772 | if have == self.__getlspace(lines[jline]): |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1773 | want = jlevel * 4 |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1774 | break |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1775 | if want < 0: # Maybe it's a hanging |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1776 | # comment like this one, |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1777 | # in which case we should shift it like its base |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1778 | # line got shifted. |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1779 | for j in range(i - 1, -1, -1): |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1780 | jline, jlevel = stats[j] |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1781 | if jlevel >= 0: |
2883
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
1782 | want = \ |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
1783 | have + \ |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
1784 | self.__getlspace(after[jline - 1]) - \ |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
1785 | self.__getlspace(lines[jline]) |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1786 | break |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1787 | if want < 0: |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1788 | # Still no luck -- leave it alone. |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1789 | want = have |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1790 | else: |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1791 | want = 0 |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1792 | assert want >= 0 |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1793 | have2want[have] = want |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1794 | diff = want - have |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1795 | if diff == 0 or have == 0: |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1796 | after.extend(lines[thisstmt:nextstmt]) |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1797 | else: |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1798 | for line in lines[thisstmt:nextstmt]: |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1799 | if diff > 0: |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1800 | if line == "\n": |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1801 | after.append(line) |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1802 | else: |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1803 | after.append(" " * diff + line) |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1804 | else: |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1805 | remove = min(self.__getlspace(line), -diff) |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1806 | after.append(line[remove:]) |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1807 | return self.raw != self.after |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1808 | |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1809 | def fixedLine(self, line): |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1810 | """ |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1811 | Public method to get a fixed line. |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1812 | |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1813 | @param line number of the line to retrieve (integer) |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1814 | @return fixed line (string) |
852
257a6f80b96c
Continued implementing a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
851
diff
changeset
|
1815 | """ |
2868
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1816 | if line < len(self.after): |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1817 | return self.after[line] |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1818 | |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1819 | def getline(self): |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1820 | """ |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1821 | Public method to get a line of text for tokenize. |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1822 | |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1823 | @return line of text (string) |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1824 | """ |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1825 | if self.index >= len(self.lines): |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1826 | line = "" |
852
257a6f80b96c
Continued implementing a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
851
diff
changeset
|
1827 | 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
|
1828 | line = self.lines[self.index] |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1829 | self.index += 1 |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1830 | return line |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1831 | |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1832 | def __genStats(self, tokens): |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1833 | """ |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1834 | Private method to generate the re-indent statistics. |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1835 | |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1836 | @param tokens tokens generator (tokenize._tokenize) |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1837 | """ |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1838 | find_stmt = True # next token begins a fresh stmt? |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1839 | level = 0 # current indent level |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1840 | stats = [] |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1841 | |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1842 | for t in tokens: |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1843 | token_type = t[0] |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1844 | sline = t[2][0] |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1845 | line = t[4] |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1846 | |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1847 | if token_type == tokenize.NEWLINE: |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1848 | # A program statement, or ENDMARKER, will eventually follow, |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1849 | # after some (possibly empty) run of tokens of the form |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1850 | # (NL | COMMENT)* (INDENT | DEDENT+)? |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1851 | self.find_stmt = True |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1852 | |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1853 | elif token_type == tokenize.INDENT: |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1854 | find_stmt = True |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1855 | level += 1 |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1856 | |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1857 | elif token_type == tokenize.DEDENT: |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1858 | find_stmt = True |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1859 | level -= 1 |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1860 | |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1861 | elif token_type == tokenize.COMMENT: |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1862 | if find_stmt: |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1863 | stats.append((sline, -1)) |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1864 | # but we're still looking for a new stmt, so leave |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1865 | # find_stmt alone |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1866 | |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1867 | elif token_type == tokenize.NL: |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1868 | pass |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1869 | |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1870 | elif find_stmt: |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1871 | # This is the first "real token" following a NEWLINE, so it |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1872 | # must be the first token of the next program statement, or an |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1873 | # ENDMARKER. |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1874 | find_stmt = False |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1875 | if line: # not endmarker |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1876 | stats.append((sline, level)) |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1877 | |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1878 | return stats |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1879 | |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1880 | def __getlspace(self, line): |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1881 | """ |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1882 | Private method to count number of leading blanks. |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1883 | |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1884 | @param line line to check (string) |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1885 | @return number of leading blanks (integer) |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1886 | """ |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1887 | i = 0 |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1888 | n = len(line) |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1889 | while i < n and line[i] == " ": |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1890 | i += 1 |
8d30ec21e9c7
Extended the PEP8 fixer and adjusted it to the updated PEP8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
1891 | return i |
2875
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1892 | |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1893 | |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1894 | class Pep8IndentationWrapper(object): |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1895 | """ |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1896 | Class used by fixers dealing with indentation. |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1897 | |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1898 | Each instance operates on a single logical line. |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1899 | """ |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1900 | |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1901 | SKIP_TOKENS = frozenset([ |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1902 | tokenize.COMMENT, tokenize.NL, tokenize.INDENT, |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1903 | tokenize.DEDENT, tokenize.NEWLINE, tokenize.ENDMARKER |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1904 | ]) |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1905 | |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1906 | def __init__(self, physical_lines): |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1907 | """ |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1908 | Constructor |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1909 | |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1910 | @param physical_lines list of physical lines to operate on |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1911 | (list of strings) |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1912 | """ |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1913 | self.lines = physical_lines |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1914 | self.tokens = [] |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1915 | self.rel_indent = None |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1916 | sio = io.StringIO(''.join(physical_lines)) |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1917 | 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
|
1918 | if not len(self.tokens) and t[0] in self.SKIP_TOKENS: |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1919 | continue |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1920 | if t[0] != tokenize.ENDMARKER: |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1921 | self.tokens.append(t) |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1922 | |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1923 | self.logical_line = self.__buildTokensLogical(self.tokens) |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1924 | |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1925 | def __buildTokensLogical(self, tokens): |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1926 | """ |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1927 | Private method to build a logical line from a list of tokens. |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1928 | |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1929 | @param tokens list of tokens as generated by tokenize.generate_tokens |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1930 | @return logical line (string) |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1931 | """ |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1932 | # from pep8.py with minor modifications |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1933 | logical = [] |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1934 | previous = None |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1935 | for t in tokens: |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1936 | token_type, text = t[0:2] |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1937 | if token_type in self.SKIP_TOKENS: |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1938 | continue |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1939 | if previous: |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1940 | end_line, end = previous[3] |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1941 | start_line, start = t[2] |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1942 | if end_line != start_line: # different row |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1943 | prev_text = self.lines[end_line - 1][end - 1] |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1944 | if prev_text == ',' or (prev_text not in '{[(' |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1945 | and text not in '}])'): |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1946 | logical.append(' ') |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1947 | elif end != start: # different column |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1948 | fill = self.lines[end_line - 1][end:start] |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1949 | logical.append(fill) |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1950 | logical.append(text) |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1951 | previous = t |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1952 | logical_line = ''.join(logical) |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1953 | assert logical_line.lstrip() == logical_line |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1954 | assert logical_line.rstrip() == logical_line |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1955 | return logical_line |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1956 | |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1957 | def pep8Expected(self): |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1958 | """ |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1959 | Public method to replicate logic in pep8.py, to know what level to |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1960 | indent things to. |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1961 | |
2883
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
1962 | @return list of lists, where each list represents valid indent levels |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
1963 | for the line in question, relative from the initial indent. However, |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
1964 | the first entry is the indent level which was expected. |
2875
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1965 | """ |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1966 | # What follows is an adjusted version of |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1967 | # pep8.py:continuation_line_indentation. All of the comments have been |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1968 | # stripped and the 'yield' statements replaced with 'pass'. |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1969 | if not self.tokens: |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1970 | return |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1971 | |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1972 | first_row = self.tokens[0][2][0] |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1973 | nrows = 1 + self.tokens[-1][2][0] - first_row |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1974 | |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1975 | # here are the return values |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1976 | valid_indents = [list()] * nrows |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1977 | indent_level = self.tokens[0][2][1] |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1978 | valid_indents[0].append(indent_level) |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1979 | |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1980 | if nrows == 1: |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1981 | # bug, really. |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1982 | return valid_indents |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1983 | |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1984 | indent_next = self.logical_line.endswith(':') |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1985 | |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1986 | row = depth = 0 |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1987 | parens = [0] * nrows |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1988 | self.rel_indent = rel_indent = [0] * nrows |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1989 | indent = [indent_level] |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1990 | indent_chances = {} |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1991 | last_indent = (0, 0) |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1992 | last_token_multiline = None |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1993 | |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1994 | for token_type, text, start, end, line in self.tokens: |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1995 | newline = row < start[0] - first_row |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1996 | if newline: |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1997 | row = start[0] - first_row |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1998 | newline = (not last_token_multiline and |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
1999 | token_type not in (tokenize.NL, tokenize.NEWLINE)) |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2000 | |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2001 | if newline: |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2002 | # This is where the differences start. Instead of looking at |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2003 | # the line and determining whether the observed indent matches |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2004 | # our expectations, we decide which type of indentation is in |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2005 | # use at the given indent level, and return the offset. This |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2006 | # algorithm is susceptible to "carried errors", but should |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2007 | # through repeated runs eventually solve indentation for |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2008 | # multiline expressions. |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2009 | |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2010 | if depth: |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2011 | for open_row in range(row - 1, -1, -1): |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2012 | if parens[open_row]: |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2013 | break |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2014 | else: |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2015 | open_row = 0 |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2016 | |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2017 | # That's all we get to work with. This code attempts to |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2018 | # "reverse" the below logic, and place into the valid indents |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2019 | # list |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2020 | vi = [] |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2021 | add_second_chances = False |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2022 | if token_type == tokenize.OP and text in ']})': |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2023 | # this line starts with a closing bracket, so it needs to |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2024 | # be closed at the same indent as the opening one. |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2025 | if indent[depth]: |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2026 | # hanging indent |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2027 | vi.append(indent[depth]) |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2028 | else: |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2029 | # visual indent |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2030 | vi.append(indent_level + rel_indent[open_row]) |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2031 | elif depth and indent[depth]: |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2032 | # visual indent was previously confirmed. |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2033 | vi.append(indent[depth]) |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2034 | add_second_chances = True |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2035 | elif depth and True in indent_chances.values(): |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2036 | # visual indent happened before, so stick to |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2037 | # visual indent this time. |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2038 | if depth > 1 and indent[depth - 1]: |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2039 | vi.append(indent[depth - 1]) |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2040 | else: |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2041 | # stupid fallback |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2042 | vi.append(indent_level + 4) |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2043 | add_second_chances = True |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2044 | elif not depth: |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2045 | vi.append(indent_level + 4) |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2046 | else: |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2047 | # must be in hanging indent |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2048 | hang = rel_indent[open_row] + 4 |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2049 | vi.append(indent_level + hang) |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2050 | |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2051 | # about the best we can do without look-ahead |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2052 | if (indent_next and vi[0] == indent_level + 4 and |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2053 | nrows == row + 1): |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2054 | vi[0] += 4 |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2055 | |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2056 | if add_second_chances: |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2057 | # visual indenters like to line things up. |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2058 | min_indent = vi[0] |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2059 | for col, what in indent_chances.items(): |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2060 | if col > min_indent and ( |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2061 | what is True or |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2062 | (what == str and token_type == tokenize.STRING) or |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2063 | (what == text and token_type == tokenize.OP) |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2064 | ): |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2065 | vi.append(col) |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2066 | vi = sorted(vi) |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2067 | |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2068 | valid_indents[row] = vi |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2069 | |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2070 | # Returning to original continuation_line_indentation() from |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2071 | # pep8. |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2072 | visual_indent = indent_chances.get(start[1]) |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2073 | last_indent = start |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2074 | rel_indent[row] = pep8.expand_indent(line) - indent_level |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2075 | hang = rel_indent[row] - rel_indent[open_row] |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2076 | |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2077 | if token_type == tokenize.OP and text in ']})': |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2078 | pass |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2079 | elif visual_indent is True: |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2080 | if not indent[depth]: |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2081 | indent[depth] = start[1] |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2082 | |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2083 | # line altered: comments shouldn't define a visual indent |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2084 | if parens[row] and not indent[depth] and token_type not in ( |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2085 | tokenize.NL, tokenize.COMMENT |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2086 | ): |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2087 | indent[depth] = start[1] |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2088 | indent_chances[start[1]] = True |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2089 | elif token_type == tokenize.STRING or text in ( |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2090 | 'u', 'ur', 'b', 'br' |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2091 | ): |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2092 | indent_chances[start[1]] = str |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2093 | |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2094 | if token_type == tokenize.OP: |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2095 | if text in '([{': |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2096 | depth += 1 |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2097 | indent.append(0) |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2098 | parens[row] += 1 |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2099 | elif text in ')]}' and depth > 0: |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2100 | prev_indent = indent.pop() or last_indent[1] |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2101 | for d in range(depth): |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2102 | if indent[d] > prev_indent: |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2103 | indent[d] = 0 |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2104 | for ind in list(indent_chances): |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2105 | if ind >= prev_indent: |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2106 | del indent_chances[ind] |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2107 | depth -= 1 |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2108 | if depth and indent[depth]: # modified |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2109 | indent_chances[indent[depth]] = True |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2110 | for idx in range(row, -1, -1): |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2111 | if parens[idx]: |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2112 | parens[idx] -= 1 |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2113 | break |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2114 | assert len(indent) == depth + 1 |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2115 | if start[1] not in indent_chances: |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2116 | indent_chances[start[1]] = text |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2117 | |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2118 | last_token_multiline = (start[0] != end[0]) |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2119 | |
1267f0663801
Continued implementing PEP-8 fixer methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2868
diff
changeset
|
2120 | return valid_indents |
2879
12e6e199d0cf
Started implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2878
diff
changeset
|
2121 | |
12e6e199d0cf
Started implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2878
diff
changeset
|
2122 | |
12e6e199d0cf
Started implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2878
diff
changeset
|
2123 | class Pep8LineShortener(object): |
12e6e199d0cf
Started implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2878
diff
changeset
|
2124 | """ |
12e6e199d0cf
Started implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2878
diff
changeset
|
2125 | Class used to shorten lines to a given maximum of characters. |
12e6e199d0cf
Started implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2878
diff
changeset
|
2126 | """ |
2882
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
2127 | def __init__(self, curLine, prevLine, nextLine, maxLength=79, eol="\n", |
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
2128 | indentWord=" ", isDocString=False): |
2879
12e6e199d0cf
Started implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2878
diff
changeset
|
2129 | """ |
12e6e199d0cf
Started implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2878
diff
changeset
|
2130 | Constructor |
12e6e199d0cf
Started implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2878
diff
changeset
|
2131 | |
12e6e199d0cf
Started implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2878
diff
changeset
|
2132 | @param curLine text to work on (string) |
12e6e199d0cf
Started implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2878
diff
changeset
|
2133 | @param prevLine line before the text to work on (string) |
12e6e199d0cf
Started implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2878
diff
changeset
|
2134 | @param nextLine line after the text to work on (string) |
12e6e199d0cf
Started implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2878
diff
changeset
|
2135 | @keyparam maxLength maximum allowed line length (integer) |
12e6e199d0cf
Started implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2878
diff
changeset
|
2136 | @keyparam eol eond-of-line marker (string) |
12e6e199d0cf
Started implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2878
diff
changeset
|
2137 | @keyparam indentWord string used for indentation (string) |
2882
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
2138 | @keyparam isDocString flag indicating that the line belongs to |
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
2139 | a documentation string (boolean) |
2879
12e6e199d0cf
Started implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2878
diff
changeset
|
2140 | """ |
12e6e199d0cf
Started implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2878
diff
changeset
|
2141 | self.__text = curLine |
12e6e199d0cf
Started implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2878
diff
changeset
|
2142 | self.__prevText = prevLine |
12e6e199d0cf
Started implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2878
diff
changeset
|
2143 | self.__nextText = nextLine |
12e6e199d0cf
Started implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2878
diff
changeset
|
2144 | self.__maxLength = maxLength |
12e6e199d0cf
Started implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2878
diff
changeset
|
2145 | self.__eol = eol |
12e6e199d0cf
Started implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2878
diff
changeset
|
2146 | self.__indentWord = indentWord |
2882
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
2147 | self.__isDocString = isDocString |
2879
12e6e199d0cf
Started implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2878
diff
changeset
|
2148 | |
12e6e199d0cf
Started implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2878
diff
changeset
|
2149 | def shorten(self): |
12e6e199d0cf
Started implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2878
diff
changeset
|
2150 | """ |
12e6e199d0cf
Started implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2878
diff
changeset
|
2151 | Public method to shorten the line wrapped by the class instance. |
12e6e199d0cf
Started implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2878
diff
changeset
|
2152 | |
2883
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2153 | @return tuple of a flag indicating successful shortening, the |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2154 | shortened line and the changed next line (boolean, string, string) |
2879
12e6e199d0cf
Started implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2878
diff
changeset
|
2155 | """ |
12e6e199d0cf
Started implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2878
diff
changeset
|
2156 | # 1. check for comment |
12e6e199d0cf
Started implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2878
diff
changeset
|
2157 | if self.__text.lstrip().startswith('#'): |
12e6e199d0cf
Started implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2878
diff
changeset
|
2158 | lastComment = True |
12e6e199d0cf
Started implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2878
diff
changeset
|
2159 | if self.__nextText.lstrip().startswith('#'): |
12e6e199d0cf
Started implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2878
diff
changeset
|
2160 | lastComment = False |
12e6e199d0cf
Started implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2878
diff
changeset
|
2161 | |
12e6e199d0cf
Started implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2878
diff
changeset
|
2162 | # Wrap commented lines. |
12e6e199d0cf
Started implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2878
diff
changeset
|
2163 | newText = self.__shortenComment(lastComment) |
2880
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2164 | if newText == self.__text: |
2882
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
2165 | return False, "", "" |
2880
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2166 | else: |
2882
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
2167 | return True, newText, "" |
2883
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2168 | elif '#' in self.__text: |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2169 | pos = self.__text.rfind("#") |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2170 | newText = self.__text[:pos].rstrip() + self.__eol + \ |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2171 | self.__getIndent(self.__text) + self.__text[pos:] |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2172 | if newText == self.__text: |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2173 | return False, "", "" |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2174 | else: |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2175 | return True, newText, "" |
2879
12e6e199d0cf
Started implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2878
diff
changeset
|
2176 | |
2882
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
2177 | # Do multi line doc strings |
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
2178 | if self.__isDocString: |
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
2179 | source = self.__text.rstrip() |
2883
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2180 | blank = source.rfind(" ") |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2181 | while blank > self.__maxLength and blank != -1: |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2182 | blank = source.rfind(" ", 0, blank) |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2183 | if blank == -1: |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2184 | # Cannot break |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2185 | return False, "", "" |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2186 | else: |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2187 | first = self.__text[:blank] |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2188 | second = self.__text[blank:].lstrip() |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2189 | if self.__nextText.strip(): |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2190 | if self.__nextText.lstrip().startswith("@"): |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2191 | # eric doc comment |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2192 | # create a new line and indent it |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2193 | newText = first + self.__eol + \ |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2194 | self.__getIndent(first) + self.__indentWord + \ |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2195 | second |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2196 | newNext = "" |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2197 | else: |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2198 | newText = first + self.__eol |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2199 | newNext = self.__getIndent(self.__nextText) + \ |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2200 | second.rstrip() + " " + self.__nextText.lstrip() |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2201 | else: |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2202 | # empty line, add a new line |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2203 | newText = first + self.__eol + self.__getIndent(first) + \ |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2204 | second |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2205 | newNext = "" |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2206 | return True, newText, newNext |
2882
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
2207 | |
2879
12e6e199d0cf
Started implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2878
diff
changeset
|
2208 | indent = self.__getIndent(self.__text) |
12e6e199d0cf
Started implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2878
diff
changeset
|
2209 | source = self.__text[len(indent):] |
12e6e199d0cf
Started implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2878
diff
changeset
|
2210 | assert source.lstrip() == source |
12e6e199d0cf
Started implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2878
diff
changeset
|
2211 | sio = io.StringIO(source) |
2882
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
2212 | |
2880
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2213 | # Check for multi line string. |
2879
12e6e199d0cf
Started implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2878
diff
changeset
|
2214 | try: |
12e6e199d0cf
Started implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2878
diff
changeset
|
2215 | tokens = list(tokenize.generate_tokens(sio.readline)) |
12e6e199d0cf
Started implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2878
diff
changeset
|
2216 | except (SyntaxError, tokenize.TokenError): |
2883
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2217 | if source.rstrip().endswith("\\"): |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2218 | # just join the continuation line and let the next run |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2219 | # handle it once it tokenizes ok |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2220 | newText = indent + source.rstrip()[:-1].rstrip() + " " + \ |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2221 | self.__nextText.lstrip() |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2222 | if indent: |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2223 | newNext = indent |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2224 | else: |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2225 | newNext = " " |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2226 | return True, newText, newNext |
2879
12e6e199d0cf
Started implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2878
diff
changeset
|
2227 | else: |
2883
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2228 | multilineCandidate = self.__breakMultiline() |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2229 | if multilineCandidate: |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2230 | return True, multilineCandidate[0], multilineCandidate[1] |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2231 | else: |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2232 | return False, "", "" |
2879
12e6e199d0cf
Started implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2878
diff
changeset
|
2233 | |
12e6e199d0cf
Started implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2878
diff
changeset
|
2234 | # Handle statements by putting the right hand side on a line by itself. |
12e6e199d0cf
Started implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2878
diff
changeset
|
2235 | # This should let the next pass shorten it. |
12e6e199d0cf
Started implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2878
diff
changeset
|
2236 | if source.startswith('return '): |
12e6e199d0cf
Started implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2878
diff
changeset
|
2237 | newText = ( |
12e6e199d0cf
Started implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2878
diff
changeset
|
2238 | indent + |
12e6e199d0cf
Started implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2878
diff
changeset
|
2239 | 'return (' + |
12e6e199d0cf
Started implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2878
diff
changeset
|
2240 | self.__eol + |
12e6e199d0cf
Started implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2878
diff
changeset
|
2241 | indent + self.__indentWord + re.sub('^return ', '', source) + |
12e6e199d0cf
Started implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2878
diff
changeset
|
2242 | indent + ')' + self.__eol |
12e6e199d0cf
Started implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2878
diff
changeset
|
2243 | ) |
2882
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
2244 | return True, newText, "" |
2883
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2245 | |
2879
12e6e199d0cf
Started implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2878
diff
changeset
|
2246 | candidates = self.__shortenLine(tokens, source, indent) |
12e6e199d0cf
Started implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2878
diff
changeset
|
2247 | if candidates: |
2883
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2248 | candidates = list(sorted( |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2249 | set(candidates).union([self.__text]), |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2250 | key=lambda x: self.__lineShorteningRank(x))) |
2891
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
2251 | if candidates[0] == self.__text: |
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
2252 | return False, "", "" |
2882
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
2253 | return True, candidates[0], "" |
2879
12e6e199d0cf
Started implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2878
diff
changeset
|
2254 | |
2883
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2255 | source = self.__text |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2256 | rs = source.rstrip() |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2257 | if rs.endswith(("'", '"')) and " " in source: |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2258 | if rs.endswith(('"""', "'''")): |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2259 | quote = rs[-3:] |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2260 | else: |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2261 | quote = rs[-1] |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2262 | blank = source.rfind(" ") |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2263 | maxLen = self.__maxLength - 2 - len(quote) |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2264 | while blank > maxLen and blank != -1: |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2265 | blank = source.rfind(" ", 0, blank) |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2266 | if blank != -1: |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2267 | if source[blank + 1:].startswith(quote): |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2268 | first = source[:maxLen] |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2269 | second = source[maxLen:] |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2270 | else: |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2271 | first = source[:blank] |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2272 | second = source[blank + 1:] |
2892
b601ede6dbbf
Fixed a few issues in the PEP-8 fixer and made it PEP-8 compliant.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2891
diff
changeset
|
2273 | 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
|
2274 | True, |
2883
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2275 | first + quote + " \\" + self.__eol + |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2276 | indent + self.__indentWord + quote + second, |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2277 | "") |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2278 | else: |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2279 | # Cannot break |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2280 | return False, "", "" |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2281 | |
2882
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
2282 | return False, "", "" |
2879
12e6e199d0cf
Started implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2878
diff
changeset
|
2283 | |
12e6e199d0cf
Started implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2878
diff
changeset
|
2284 | def __shortenComment(self, isLast): |
12e6e199d0cf
Started implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2878
diff
changeset
|
2285 | """ |
12e6e199d0cf
Started implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2878
diff
changeset
|
2286 | Private method to shorten a comment line. |
12e6e199d0cf
Started implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2878
diff
changeset
|
2287 | |
12e6e199d0cf
Started implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2878
diff
changeset
|
2288 | @param isLast flag indicating, that the line is the last comment line |
12e6e199d0cf
Started implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2878
diff
changeset
|
2289 | (boolean) |
12e6e199d0cf
Started implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2878
diff
changeset
|
2290 | @return shortened comment line (string) |
12e6e199d0cf
Started implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2878
diff
changeset
|
2291 | """ |
2880
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2292 | if len(self.__text) <= self.__maxLength: |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2293 | return self.__text |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2294 | |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2295 | newText = self.__text.rstrip() |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2296 | |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2297 | # PEP 8 recommends 72 characters for comment text. |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2298 | indentation = self.__getIndent(newText) + '# ' |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2299 | maxLength = min(self.__maxLength, |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2300 | len(indentation) + 72) |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2301 | |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2302 | MIN_CHARACTER_REPEAT = 5 |
2892
b601ede6dbbf
Fixed a few issues in the PEP-8 fixer and made it PEP-8 compliant.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2891
diff
changeset
|
2303 | if len(newText) - len(newText.rstrip(newText[-1])) >= \ |
b601ede6dbbf
Fixed a few issues in the PEP-8 fixer and made it PEP-8 compliant.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2891
diff
changeset
|
2304 | MIN_CHARACTER_REPEAT and \ |
b601ede6dbbf
Fixed a few issues in the PEP-8 fixer and made it PEP-8 compliant.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2891
diff
changeset
|
2305 | not newText[-1].isalnum(): |
2880
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2306 | # Trim comments that end with things like --------- |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2307 | return newText[:maxLength] + self.__eol |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2308 | elif isLast and re.match(r"\s*#+\s*\w+", newText): |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2309 | import textwrap |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2310 | splitLines = textwrap.wrap(newText.lstrip(" \t#"), |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2311 | initial_indent=indentation, |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2312 | subsequent_indent=indentation, |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2313 | width=maxLength, |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2314 | break_long_words=False, |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2315 | break_on_hyphens=False) |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2316 | return self.__eol.join(splitLines) + self.__eol |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2317 | else: |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2318 | return newText + self.__eol |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2319 | |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2320 | def __breakMultiline(self): |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2321 | """ |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2322 | Private method to break multi line strings. |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2323 | |
2883
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2324 | @return tuple of the shortened line and the changed next line |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2325 | (string, string) |
2880
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2326 | """ |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2327 | indentation = self.__getIndent(self.__text) |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2328 | |
2883
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2329 | # Handle special case. |
2880
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2330 | for symbol in '([{': |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2331 | # Only valid if symbol is not on a line by itself. |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2332 | if ( |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2333 | symbol in self.__text and |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2334 | self.__text.strip() != symbol and |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2335 | self.__text.rstrip().endswith((',', '%')) |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2336 | ): |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2337 | index = 1 + self.__text.find(symbol) |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2338 | |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2339 | if index <= len(self.__indentWord) + len(indentation): |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2340 | continue |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2341 | |
2883
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2342 | if self.__isProbablyInsideStringOrComment( |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2343 | self.__text, index - 1): |
2880
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2344 | continue |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2345 | |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2346 | return (self.__text[:index].rstrip() + self.__eol + |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2347 | indentation + self.__indentWord + |
2883
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2348 | self.__text[index:].lstrip(), "") |
2882
9b97bc92fdda
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2880
diff
changeset
|
2349 | |
2883
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2350 | newText = self.__text |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2351 | newNext = self.__nextText |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2352 | blank = newText.rfind(" ") |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2353 | while blank > self.__maxLength and blank != -1: |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2354 | blank = newText.rfind(" ", 0, blank) |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2355 | if blank != -1: |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2356 | first = self.__text[:blank] |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2357 | second = self.__text[blank:].strip() |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2358 | if newNext.strip(): |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2359 | newText = first + self.__eol |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2360 | newNext = self.__getIndent(newNext) + \ |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2361 | second + " " + newNext.lstrip() |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2362 | else: |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2363 | # empty line, add a new line |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2364 | newText = first + self.__eol |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2365 | newNext = self.__getIndent(newNext) + \ |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2366 | second + self.__eol + newNext.lstrip() |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2367 | return newText, newNext |
2880
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2368 | |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2369 | def __isProbablyInsideStringOrComment(self, line, index): |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2370 | """ |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2371 | Private method to check, if the given string might be inside a string |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2372 | or comment. |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2373 | |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2374 | @param line line to check (string) |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2375 | @param index position inside line to check (integer) |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2376 | @return flag indicating the possibility of being inside a string |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2377 | or comment |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2378 | """ |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2379 | # Check against being in a string. |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2380 | for quote in ['"', "'"]: |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2381 | pos = line.find(quote) |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2382 | if pos != -1 and pos <= index: |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2383 | return True |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2384 | |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2385 | # Check against being in a comment. |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2386 | pos = line.find('#') |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2387 | if pos != -1 and pos <= index: |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2388 | return True |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2389 | |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2390 | return False |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2391 | |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2392 | def __shortenLine(self, tokens, source, indent): |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2393 | """ |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2394 | Private method to shorten a line of code at an operator. |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2395 | |
2883
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2396 | @param tokens tokens of the line as generated by tokenize |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2397 | (list of token) |
2880
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2398 | @param source code string to work at (string) |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2399 | @param indent indentation string of the code line (string) |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2400 | @return list of candidates (list of string) |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2401 | """ |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2402 | candidates = [] |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2403 | |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2404 | for tkn in tokens: |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2405 | tokenType = tkn[0] |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2406 | tokenString = tkn[1] |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2407 | |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2408 | if ( |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2409 | tokenType == tokenize.COMMENT and |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2410 | not self.__prevText.rstrip().endswith('\\') |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2411 | ): |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2412 | # Move inline comments to previous line. |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2413 | offset = tkn[2][1] |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2414 | first = source[:offset] |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2415 | second = source[offset:] |
2892
b601ede6dbbf
Fixed a few issues in the PEP-8 fixer and made it PEP-8 compliant.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2891
diff
changeset
|
2416 | candidates.append( |
b601ede6dbbf
Fixed a few issues in the PEP-8 fixer and made it PEP-8 compliant.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2891
diff
changeset
|
2417 | indent + second.strip() + self.__eol + |
b601ede6dbbf
Fixed a few issues in the PEP-8 fixer and made it PEP-8 compliant.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2891
diff
changeset
|
2418 | indent + first.strip() + self.__eol) |
2880
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2419 | elif tokenType == tokenize.OP and tokenString != '=': |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2420 | # Don't break on '=' after keyword as this violates PEP 8. |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2421 | |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2422 | assert tokenType != tokenize.INDENT |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2423 | |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2424 | offset = tkn[2][1] + 1 |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2425 | first = source[:offset] |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2426 | |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2427 | secondIndent = indent |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2428 | if first.rstrip().endswith('('): |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2429 | secondIndent += self.__indentWord |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2430 | elif '(' in first: |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2431 | secondIndent += ' ' * (1 + first.find('(')) |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2432 | else: |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2433 | secondIndent += self.__indentWord |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2434 | |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2435 | second = (secondIndent + source[offset:].lstrip()) |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2436 | if not second.strip(): |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2437 | continue |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2438 | |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2439 | # Do not begin a line with a comma |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2440 | if second.lstrip().startswith(','): |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2441 | continue |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2442 | |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2443 | # Do end a line with a dot |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2444 | if first.rstrip().endswith('.'): |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2445 | continue |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2446 | |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2447 | if tokenString in '+-*/': |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2448 | newText = first + ' \\' + self.__eol + second |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2449 | else: |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2450 | newText = first + self.__eol + second |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2451 | |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2452 | # Only fix if syntax is okay. |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2453 | if self.__checkSyntax(self.__normalizeMultiline(newText)): |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2454 | candidates.append(indent + newText) |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2455 | |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2456 | return candidates |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2457 | |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2458 | def __normalizeMultiline(self, text): |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2459 | """ |
2883
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2460 | Private method to remove multiline-related code that will cause syntax |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2461 | error. |
2880
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2462 | |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2463 | @param line code line to work on (string) |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2464 | @return normalized code line (string) |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2465 | """ |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2466 | for quote in '\'"': |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2467 | dictPattern = r"^{q}[^{q}]*{q} *: *".format(q=quote) |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2468 | if re.match(dictPattern, text): |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2469 | if not text.strip().endswith('}'): |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2470 | text += '}' |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2471 | return '{' + text |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2472 | |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2473 | if text.startswith('def ') and text.rstrip().endswith(':'): |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2474 | # Do not allow ':' to be alone. That is invalid. |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2475 | splitText = [item.strip() for item in text.split(self.__eol)] |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2476 | if ':' not in splitText and 'def' not in splitText: |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2477 | return text[len('def'):].strip().rstrip(':') |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2478 | |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2479 | return text |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2480 | |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2481 | def __lineShorteningRank(self, candidate): |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2482 | """ |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2483 | Private method to rank a candidate. |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2484 | |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2485 | @param candidate candidate line to rank (string) |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2486 | @return rank of the candidate (integer) |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2487 | """ |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2488 | rank = 0 |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2489 | if candidate.strip(): |
2891
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
2490 | if candidate == self.__text: |
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
2491 | # give the original a disadvantage |
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
2492 | rank += 50 |
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
2493 | |
2880
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2494 | lines = candidate.split(self.__eol) |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2495 | |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2496 | offset = 0 |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2497 | if lines[0].rstrip()[-1] not in '([{': |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2498 | for symbol in '([{': |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2499 | offset = max(offset, 1 + lines[0].find(symbol)) |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2500 | |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2501 | maxLength = max([offset + len(x.strip()) for x in lines]) |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2502 | rank += maxLength |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2503 | rank += len(lines) |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2504 | |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2505 | badStartingSymbol = { |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2506 | '(': ')', |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2507 | '[': ']', |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2508 | '{': '}'}.get(lines[0][-1], None) |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2509 | |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2510 | if len(lines) > 1: |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2511 | if (badStartingSymbol and |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2512 | lines[1].lstrip().startswith(badStartingSymbol)): |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2513 | rank += 20 |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2514 | |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2515 | if re.match(r".*[+\-\*/] \($", lines[0]): |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2516 | # "1 * (\n" is ugly as hell. |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2517 | rank += 100 |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2518 | |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2519 | for currentLine in lines: |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2520 | for badStart in ['.', '%', '+', '-', '/']: |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2521 | if currentLine.startswith(badStart): |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2522 | rank += 100 |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2523 | |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2524 | for ending in '([{': |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2525 | # Avoid lonely opening. They result in longer lines. |
2892
b601ede6dbbf
Fixed a few issues in the PEP-8 fixer and made it PEP-8 compliant.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2891
diff
changeset
|
2526 | if currentLine.endswith(ending) and \ |
b601ede6dbbf
Fixed a few issues in the PEP-8 fixer and made it PEP-8 compliant.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2891
diff
changeset
|
2527 | len(currentLine.strip()) <= len(self.__indentWord): |
2880
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2528 | rank += 100 |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2529 | |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2530 | if currentLine.endswith('%'): |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2531 | rank -= 20 |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2532 | |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2533 | # Try to break list comprehensions at the "for". |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2534 | if currentLine.lstrip().startswith('for'): |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2535 | rank -= 50 |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2536 | |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2537 | rank += 10 * self.__countUnbalancedBrackets(currentLine) |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2538 | else: |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2539 | rank = 100000 |
2883
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2540 | |
2880
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2541 | return max(0, rank) |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2542 | |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2543 | def __countUnbalancedBrackets(self, line): |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2544 | """ |
2883
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2545 | Private method to determine the number of unmatched open/close |
3c99a1db1506
Finished the PEP-8 line shortener.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2882
diff
changeset
|
2546 | brackets. |
2880
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2547 | |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2548 | @param line line to work at (string) |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2549 | @return number of unmatched open/close brackets (integer) |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2550 | """ |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2551 | count = 0 |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2552 | for opening, closing in ['()', '[]', '{}']: |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2553 | count += abs(line.count(opening) - line.count(closing)) |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2554 | |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2555 | return count |
2879
12e6e199d0cf
Started implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2878
diff
changeset
|
2556 | |
12e6e199d0cf
Started implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2878
diff
changeset
|
2557 | def __getIndent(self, line): |
12e6e199d0cf
Started implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2878
diff
changeset
|
2558 | """ |
12e6e199d0cf
Started implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2878
diff
changeset
|
2559 | Private method to get the indentation string. |
12e6e199d0cf
Started implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2878
diff
changeset
|
2560 | |
12e6e199d0cf
Started implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2878
diff
changeset
|
2561 | @param line line to determine the indentation string from (string) |
12e6e199d0cf
Started implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2878
diff
changeset
|
2562 | @return indentation string (string) |
12e6e199d0cf
Started implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2878
diff
changeset
|
2563 | """ |
12e6e199d0cf
Started implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2878
diff
changeset
|
2564 | # copied from Pep8Fixer |
12e6e199d0cf
Started implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2878
diff
changeset
|
2565 | return line.replace(line.lstrip(), "") |
2880
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2566 | |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2567 | def __checkSyntax(self, code): |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2568 | """ |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2569 | Private method to check the syntax of the given code fragment. |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2570 | |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2571 | @param code code fragment to check (string) |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2572 | @return flag indicating syntax is ok (boolean) |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2573 | """ |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2574 | code = code.replace("\r\n", "\n").replace("\r", "\n") |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2575 | try: |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2576 | return compile(code, '<string>', 'exec') |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2577 | except (SyntaxError, TypeError, UnicodeDecodeError): |
a45c59bddc79
Continued implementing the PEP-8 line shortener class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2879
diff
changeset
|
2578 | return False |