Thu, 28 Jul 2022 14:19:57 +0200
Code Style Checker
- updated the annotations checker to support more cases
8186 | 1 | # -*- coding: utf-8 -*- |
2 | ||
8881
54e42bc2437a
Updated copyright for 2022.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8312
diff
changeset
|
3 | # Copyright (c) 2021 - 2022 Detlev Offenbach <detlev@die-offenbachs.de> |
8186 | 4 | # |
5 | ||
6 | """ | |
7 | Module implementing the checker for simplifying Python code. | |
8 | """ | |
9 | ||
10 | import ast | |
8198
1c765dc90c21
Code Style Checker: changed code such, that the AST tree is built only once and passed to each checker module.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8195
diff
changeset
|
11 | import copy |
8186 | 12 | |
8189
17df5c8df8c1
Code Style Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8186
diff
changeset
|
13 | from .SimplifyNodeVisitor import SimplifyNodeVisitor |
8186 | 14 | |
15 | ||
8207
d359172d11be
Applied some more code simplifications suggested by the new Simplify checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8202
diff
changeset
|
16 | class SimplifyChecker: |
8186 | 17 | """ |
18 | Class implementing a checker for to help simplifying Python code. | |
19 | """ | |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
20 | |
8186 | 21 | Codes = [ |
8189
17df5c8df8c1
Code Style Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8186
diff
changeset
|
22 | # Python-specifics |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
23 | "Y101", |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
24 | "Y102", |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
25 | "Y103", |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
26 | "Y104", |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
27 | "Y105", |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
28 | "Y106", |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
29 | "Y107", |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
30 | "Y108", |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
31 | "Y109", |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
32 | "Y110", |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
33 | "Y111", |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
34 | "Y112", |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
35 | "Y113", |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
36 | "Y114", |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
37 | "Y115", |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
38 | "Y116", |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
39 | "Y117", |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
40 | "Y118", |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
41 | "Y119", |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
42 | "Y120", |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
43 | "Y121", |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
44 | "Y122", |
8209
14470a65a52e
Code Style Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8207
diff
changeset
|
45 | # Python-specifics not part of flake8-simplify |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
46 | "Y181", |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
47 | "Y182", |
8189
17df5c8df8c1
Code Style Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8186
diff
changeset
|
48 | # Comparations |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
49 | "Y201", |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
50 | "Y202", |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
51 | "Y203", |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
52 | "Y204", |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
53 | "Y205", |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
54 | "Y206", |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
55 | "Y207", |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
56 | "Y208", |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
57 | "Y211", |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
58 | "Y212", |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
59 | "Y213", |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
60 | "Y221", |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
61 | "Y222", |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
62 | "Y223", |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
63 | "Y224", |
8195
db7f2badd374
Code Style Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8194
diff
changeset
|
64 | # Opinionated |
db7f2badd374
Code Style Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8194
diff
changeset
|
65 | "Y301", |
8211
8322a6f219ff
Code Style Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8210
diff
changeset
|
66 | # General Code Style |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
67 | "Y401", |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
68 | "Y402", |
8186 | 69 | ] |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
70 | |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
71 | def __init__(self, source, filename, tree, selected, ignored, expected, repeat): |
8186 | 72 | """ |
73 | Constructor | |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
74 | |
8186 | 75 | @param source source code to be checked |
76 | @type list of str | |
77 | @param filename name of the source file | |
78 | @type str | |
8198
1c765dc90c21
Code Style Checker: changed code such, that the AST tree is built only once and passed to each checker module.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8195
diff
changeset
|
79 | @param tree AST tree of the source code |
1c765dc90c21
Code Style Checker: changed code such, that the AST tree is built only once and passed to each checker module.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8195
diff
changeset
|
80 | @type ast.Module |
8186 | 81 | @param selected list of selected codes |
82 | @type list of str | |
83 | @param ignored list of codes to be ignored | |
84 | @type list of str | |
85 | @param expected list of expected codes | |
86 | @type list of str | |
87 | @param repeat flag indicating to report each occurrence of a code | |
88 | @type bool | |
89 | """ | |
90 | self.__select = tuple(selected) | |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
91 | self.__ignore = ("",) if selected else tuple(ignored) |
8186 | 92 | self.__expected = expected[:] |
93 | self.__repeat = repeat | |
94 | self.__filename = filename | |
95 | self.__source = source[:] | |
8198
1c765dc90c21
Code Style Checker: changed code such, that the AST tree is built only once and passed to each checker module.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8195
diff
changeset
|
96 | self.__tree = copy.deepcopy(tree) |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
97 | |
8186 | 98 | # statistics counters |
99 | self.counters = {} | |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
100 | |
8186 | 101 | # collection of detected errors |
102 | self.errors = [] | |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
103 | |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
104 | self.__checkCodes = (code for code in self.Codes if not self.__ignoreCode(code)) |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
105 | |
8186 | 106 | def __ignoreCode(self, code): |
107 | """ | |
108 | Private method to check if the message code should be ignored. | |
109 | ||
110 | @param code message code to check for | |
111 | @type str | |
112 | @return flag indicating to ignore the given code | |
113 | @rtype bool | |
114 | """ | |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
115 | return code.startswith(self.__ignore) and not code.startswith(self.__select) |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
116 | |
8186 | 117 | def __error(self, lineNumber, offset, code, *args): |
118 | """ | |
119 | Private method to record an issue. | |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
120 | |
8186 | 121 | @param lineNumber line number of the issue |
122 | @type int | |
123 | @param offset position within line of the issue | |
124 | @type int | |
125 | @param code message code | |
126 | @type str | |
127 | @param args arguments for the message | |
128 | @type list | |
129 | """ | |
130 | if self.__ignoreCode(code): | |
131 | return | |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
132 | |
8225
811b7fa1b8a9
SimplifyChecker: added code to prevent duplicate error counting.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8224
diff
changeset
|
133 | # record the issue with one based line number |
811b7fa1b8a9
SimplifyChecker: added code to prevent duplicate error counting.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8224
diff
changeset
|
134 | errorInfo = { |
811b7fa1b8a9
SimplifyChecker: added code to prevent duplicate error counting.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8224
diff
changeset
|
135 | "file": self.__filename, |
811b7fa1b8a9
SimplifyChecker: added code to prevent duplicate error counting.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8224
diff
changeset
|
136 | "line": lineNumber + 1, |
811b7fa1b8a9
SimplifyChecker: added code to prevent duplicate error counting.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8224
diff
changeset
|
137 | "offset": offset, |
811b7fa1b8a9
SimplifyChecker: added code to prevent duplicate error counting.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8224
diff
changeset
|
138 | "code": code, |
811b7fa1b8a9
SimplifyChecker: added code to prevent duplicate error counting.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8224
diff
changeset
|
139 | "args": args, |
811b7fa1b8a9
SimplifyChecker: added code to prevent duplicate error counting.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8224
diff
changeset
|
140 | } |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
141 | |
8225
811b7fa1b8a9
SimplifyChecker: added code to prevent duplicate error counting.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8224
diff
changeset
|
142 | if errorInfo not in self.errors: |
811b7fa1b8a9
SimplifyChecker: added code to prevent duplicate error counting.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8224
diff
changeset
|
143 | # this issue was not seen before |
811b7fa1b8a9
SimplifyChecker: added code to prevent duplicate error counting.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8224
diff
changeset
|
144 | if code in self.counters: |
811b7fa1b8a9
SimplifyChecker: added code to prevent duplicate error counting.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8224
diff
changeset
|
145 | self.counters[code] += 1 |
811b7fa1b8a9
SimplifyChecker: added code to prevent duplicate error counting.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8224
diff
changeset
|
146 | else: |
811b7fa1b8a9
SimplifyChecker: added code to prevent duplicate error counting.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8224
diff
changeset
|
147 | self.counters[code] = 1 |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
148 | |
8225
811b7fa1b8a9
SimplifyChecker: added code to prevent duplicate error counting.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8224
diff
changeset
|
149 | # Don't care about expected codes |
811b7fa1b8a9
SimplifyChecker: added code to prevent duplicate error counting.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8224
diff
changeset
|
150 | if code in self.__expected: |
811b7fa1b8a9
SimplifyChecker: added code to prevent duplicate error counting.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8224
diff
changeset
|
151 | return |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
152 | |
8225
811b7fa1b8a9
SimplifyChecker: added code to prevent duplicate error counting.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8224
diff
changeset
|
153 | if code and (self.counters[code] == 1 or self.__repeat): |
8224
e0ecde23e7b2
SimplifyChecker: added code to prevent duplicate error reports.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8216
diff
changeset
|
154 | self.errors.append(errorInfo) |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
155 | |
8186 | 156 | def run(self): |
157 | """ | |
158 | Public method to check the given source against functions | |
159 | to be replaced by 'pathlib' equivalents. | |
160 | """ | |
161 | if not self.__filename: | |
162 | # don't do anything, if essential data is missing | |
163 | return | |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
164 | |
8186 | 165 | if not self.__checkCodes: |
166 | # don't do anything, if no codes were selected | |
167 | return | |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
168 | |
8191
9125da0c227e
Code Style Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8189
diff
changeset
|
169 | # Add parent information |
9125da0c227e
Code Style Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8189
diff
changeset
|
170 | for node in ast.walk(self.__tree): |
9125da0c227e
Code Style Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8189
diff
changeset
|
171 | for child in ast.iter_child_nodes(node): |
9125da0c227e
Code Style Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8189
diff
changeset
|
172 | child.parent = node # type: ignore |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
173 | |
8189
17df5c8df8c1
Code Style Checker
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8186
diff
changeset
|
174 | visitor = SimplifyNodeVisitor(self.__error) |
8186 | 175 | visitor.visit(self.__tree) |