Sat, 10 Apr 2021 18:38:27 +0200
Applied some more code simplifications suggested by the new Simplify checker (super(Foo, self) => super()).
2571
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
1 | # -*- coding: utf-8 -*- |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
2 | |
7923
91e843545d9a
Updated copyright for 2021.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7639
diff
changeset
|
3 | # Copyright (c) 2010 - 2021 Detlev Offenbach <detlev@die-offenbachs.de> |
2571
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
4 | # |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
5 | # Original (c) 2005-2010 Divmod, Inc. |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
6 | # |
7960
e8fc383322f7
Harmonized some user visible strings and changed the term 'eric6' to the more generic 'eric'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7923
diff
changeset
|
7 | # This module is based on pyflakes but was modified to work with eric |
3177
5af61402d74d
Update pyflakes to 0.7.3
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3159
diff
changeset
|
8 | """ |
5af61402d74d
Update pyflakes to 0.7.3
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3159
diff
changeset
|
9 | Main module. |
2571
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
10 | |
3177
5af61402d74d
Update pyflakes to 0.7.3
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3159
diff
changeset
|
11 | Implement the central Checker class. |
5af61402d74d
Update pyflakes to 0.7.3
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3159
diff
changeset
|
12 | Also, it models the Bindings and Scopes. |
5af61402d74d
Update pyflakes to 0.7.3
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3159
diff
changeset
|
13 | """ |
5067
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
14 | import __future__ |
6353
6a0f3abd6878
upgraded pyflakes to version 2.0.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
15 | import ast |
6742
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
16 | import bisect |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
17 | import collections |
7617
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
18 | import contextlib |
3177
5af61402d74d
Update pyflakes to 0.7.3
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3159
diff
changeset
|
19 | import doctest |
6742
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
20 | import functools |
3177
5af61402d74d
Update pyflakes to 0.7.3
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3159
diff
changeset
|
21 | import os |
6742
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
22 | import re |
7395
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
23 | import string |
3177
5af61402d74d
Update pyflakes to 0.7.3
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3159
diff
changeset
|
24 | import sys |
6742
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
25 | import tokenize |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
26 | |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
27 | from . import messages |
3544
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
28 | |
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
29 | PY2 = sys.version_info < (3, 0) |
6742
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
30 | PY35_PLUS = sys.version_info >= (3, 5) # Python 3.5 and above |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
31 | PY36_PLUS = sys.version_info >= (3, 6) # Python 3.6 and above |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
32 | PY38_PLUS = sys.version_info >= (3, 8) |
5067
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
33 | try: |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
34 | sys.pypy_version_info |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
35 | PYPY = True |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
36 | except AttributeError: |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
37 | PYPY = False |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
38 | |
3544
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
39 | builtin_vars = dir(__import__('__builtin__' if PY2 else 'builtins')) |
2571
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
40 | |
7395
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
41 | parse_format_string = string.Formatter().parse |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
42 | |
6742
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
43 | if PY2: |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
44 | tokenize_tokenize = tokenize.generate_tokens |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
45 | else: |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
46 | tokenize_tokenize = tokenize.tokenize |
2571
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
47 | |
3177
5af61402d74d
Update pyflakes to 0.7.3
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3159
diff
changeset
|
48 | if PY2: |
5af61402d74d
Update pyflakes to 0.7.3
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3159
diff
changeset
|
49 | def getNodeType(node_class): |
5af61402d74d
Update pyflakes to 0.7.3
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3159
diff
changeset
|
50 | # workaround str.upper() which is locale-dependent |
5af61402d74d
Update pyflakes to 0.7.3
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3159
diff
changeset
|
51 | return str(unicode(node_class.__name__).upper()) # __IGNORE_WARNING__ |
6353
6a0f3abd6878
upgraded pyflakes to version 2.0.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
52 | |
6a0f3abd6878
upgraded pyflakes to version 2.0.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
53 | def get_raise_argument(node): |
6a0f3abd6878
upgraded pyflakes to version 2.0.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
54 | return node.type |
6a0f3abd6878
upgraded pyflakes to version 2.0.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
55 | |
3177
5af61402d74d
Update pyflakes to 0.7.3
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3159
diff
changeset
|
56 | else: |
5af61402d74d
Update pyflakes to 0.7.3
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3159
diff
changeset
|
57 | def getNodeType(node_class): |
5af61402d74d
Update pyflakes to 0.7.3
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3159
diff
changeset
|
58 | return node_class.__name__.upper() |
5af61402d74d
Update pyflakes to 0.7.3
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3159
diff
changeset
|
59 | |
6353
6a0f3abd6878
upgraded pyflakes to version 2.0.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
60 | def get_raise_argument(node): |
6a0f3abd6878
upgraded pyflakes to version 2.0.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
61 | return node.exc |
6a0f3abd6878
upgraded pyflakes to version 2.0.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
62 | |
6a0f3abd6878
upgraded pyflakes to version 2.0.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
63 | # Silence `pyflakes` from reporting `undefined name 'unicode'` in Python 3. |
6a0f3abd6878
upgraded pyflakes to version 2.0.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
64 | unicode = str |
6a0f3abd6878
upgraded pyflakes to version 2.0.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
65 | |
3544
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
66 | # Python >= 3.3 uses ast.Try instead of (ast.TryExcept + ast.TryFinally) |
6353
6a0f3abd6878
upgraded pyflakes to version 2.0.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
67 | if PY2: |
3544
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
68 | def getAlternatives(n): |
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
69 | if isinstance(n, (ast.If, ast.TryFinally)): |
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
70 | return [n.body] |
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
71 | if isinstance(n, ast.TryExcept): |
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
72 | return [n.body + n.orelse] + [[hdl] for hdl in n.handlers] |
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
73 | else: |
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
74 | def getAlternatives(n): |
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
75 | if isinstance(n, ast.If): |
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
76 | return [n.body] |
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
77 | if isinstance(n, ast.Try): |
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
78 | return [n.body + n.orelse] + [[hdl] for hdl in n.handlers] |
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
79 | |
6742
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
80 | if PY35_PLUS: |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
81 | FOR_TYPES = (ast.For, ast.AsyncFor) |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
82 | LOOP_TYPES = (ast.While, ast.For, ast.AsyncFor) |
7395
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
83 | FUNCTION_TYPES = (ast.FunctionDef, ast.AsyncFunctionDef) |
6742
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
84 | else: |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
85 | FOR_TYPES = (ast.For,) |
5067
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
86 | LOOP_TYPES = (ast.While, ast.For) |
7395
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
87 | FUNCTION_TYPES = (ast.FunctionDef,) |
6742
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
88 | |
8208
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
89 | if PY36_PLUS: |
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
90 | ANNASSIGN_TYPES = (ast.AnnAssign,) |
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
91 | else: |
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
92 | ANNASSIGN_TYPES = () |
7617
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
93 | |
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
94 | if PY38_PLUS: |
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
95 | def _is_singleton(node): # type: (ast.AST) -> bool |
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
96 | return ( |
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
97 | isinstance(node, ast.Constant) and |
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
98 | isinstance(node.value, (bool, type(Ellipsis), type(None))) |
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
99 | ) |
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
100 | elif not PY2: |
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
101 | def _is_singleton(node): # type: (ast.AST) -> bool |
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
102 | return isinstance(node, (ast.NameConstant, ast.Ellipsis)) |
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
103 | else: |
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
104 | def _is_singleton(node): # type: (ast.AST) -> bool |
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
105 | return ( |
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
106 | isinstance(node, ast.Name) and |
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
107 | node.id in {'True', 'False', 'Ellipsis', 'None'} |
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
108 | ) |
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
109 | |
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
110 | |
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
111 | def _is_tuple_constant(node): # type: (ast.AST) -> bool |
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
112 | return ( |
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
113 | isinstance(node, ast.Tuple) and |
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
114 | all(_is_constant(elt) for elt in node.elts) |
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
115 | ) |
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
116 | |
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
117 | |
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
118 | if PY38_PLUS: |
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
119 | def _is_constant(node): |
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
120 | return isinstance(node, ast.Constant) or _is_tuple_constant(node) |
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
121 | else: |
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
122 | _const_tps = (ast.Str, ast.Num) |
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
123 | if not PY2: |
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
124 | _const_tps += (ast.Bytes,) |
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
125 | |
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
126 | def _is_constant(node): |
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
127 | return ( |
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
128 | isinstance(node, _const_tps) or |
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
129 | _is_singleton(node) or |
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
130 | _is_tuple_constant(node) |
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
131 | ) |
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
132 | |
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
133 | |
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
134 | def _is_const_non_singleton(node): # type: (ast.AST) -> bool |
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
135 | return _is_constant(node) and not _is_singleton(node) |
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
136 | |
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
137 | |
8208
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
138 | def _is_name_or_attr(node, name): # type: (ast.Ast, str) -> bool |
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
139 | return ( |
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
140 | (isinstance(node, ast.Name) and node.id == name) or |
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
141 | (isinstance(node, ast.Attribute) and node.attr == name) |
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
142 | ) |
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
143 | |
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
144 | |
7395
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
145 | # https://github.com/python/typed_ast/blob/1.4.0/ast27/Parser/tokenizer.c#L102-L104 |
6742
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
146 | TYPE_COMMENT_RE = re.compile(r'^#\s*type:\s*') |
7395
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
147 | # https://github.com/python/typed_ast/blob/1.4.0/ast27/Parser/tokenizer.c#L1408-L1413 |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
148 | ASCII_NON_ALNUM = ''.join([chr(i) for i in range(128) if not chr(i).isalnum()]) |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
149 | TYPE_IGNORE_RE = re.compile( |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
150 | TYPE_COMMENT_RE.pattern + r'ignore([{}]|$)'.format(ASCII_NON_ALNUM)) |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
151 | # https://github.com/python/typed_ast/blob/1.4.0/ast27/Grammar/Grammar#L147 |
6742
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
152 | TYPE_FUNC_RE = re.compile(r'^(\(.*?\))\s*->\s*(.*)$') |
5067
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
153 | |
3544
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
154 | |
7395
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
155 | MAPPING_KEY_RE = re.compile(r'\(([^()]*)\)') |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
156 | CONVERSION_FLAG_RE = re.compile('[#0+ -]*') |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
157 | WIDTH_RE = re.compile(r'(?:\*|\d*)') |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
158 | PRECISION_RE = re.compile(r'(?:\.(?:\*|\d*))?') |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
159 | LENGTH_RE = re.compile('[hlL]?') |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
160 | # https://docs.python.org/3/library/stdtypes.html#old-string-formatting |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
161 | VALID_CONVERSIONS = frozenset('diouxXeEfFgGcrsa%') |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
162 | |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
163 | |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
164 | def _must_match(regex, string, pos): |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
165 | # type: (Pattern[str], str, int) -> Match[str] |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
166 | match = regex.match(string, pos) |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
167 | assert match is not None |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
168 | return match |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
169 | |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
170 | |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
171 | def parse_percent_format(s): # type: (str) -> Tuple[PercentFormat, ...] |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
172 | """Parses the string component of a `'...' % ...` format call |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
173 | |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
174 | Copied from https://github.com/asottile/pyupgrade at v1.20.1 |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
175 | """ |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
176 | |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
177 | def _parse_inner(): |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
178 | # type: () -> Generator[PercentFormat, None, None] |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
179 | string_start = 0 |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
180 | string_end = 0 |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
181 | in_fmt = False |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
182 | |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
183 | i = 0 |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
184 | while i < len(s): |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
185 | if not in_fmt: |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
186 | try: |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
187 | i = s.index('%', i) |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
188 | except ValueError: # no more % fields! |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
189 | yield s[string_start:], None |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
190 | return |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
191 | else: |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
192 | string_end = i |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
193 | i += 1 |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
194 | in_fmt = True |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
195 | else: |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
196 | key_match = MAPPING_KEY_RE.match(s, i) |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
197 | if key_match: |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
198 | key = key_match.group(1) # type: Optional[str] |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
199 | i = key_match.end() |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
200 | else: |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
201 | key = None |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
202 | |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
203 | conversion_flag_match = _must_match(CONVERSION_FLAG_RE, s, i) |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
204 | conversion_flag = conversion_flag_match.group() or None |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
205 | i = conversion_flag_match.end() |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
206 | |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
207 | width_match = _must_match(WIDTH_RE, s, i) |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
208 | width = width_match.group() or None |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
209 | i = width_match.end() |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
210 | |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
211 | precision_match = _must_match(PRECISION_RE, s, i) |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
212 | precision = precision_match.group() or None |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
213 | i = precision_match.end() |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
214 | |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
215 | # length modifier is ignored |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
216 | i = _must_match(LENGTH_RE, s, i).end() |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
217 | |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
218 | try: |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
219 | conversion = s[i] |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
220 | except IndexError: |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
221 | raise ValueError('end-of-string while parsing format') |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
222 | i += 1 |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
223 | |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
224 | fmt = (key, conversion_flag, width, precision, conversion) |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
225 | yield s[string_start:string_end], fmt |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
226 | |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
227 | in_fmt = False |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
228 | string_start = i |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
229 | |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
230 | if in_fmt: |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
231 | raise ValueError('end-of-string while parsing format') |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
232 | |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
233 | return tuple(_parse_inner()) |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
234 | |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
235 | |
3544
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
236 | class _FieldsOrder(dict): |
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
237 | """Fix order of AST node fields.""" |
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
238 | |
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
239 | def _get_fields(self, node_class): |
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
240 | # handle iter before target, and generators before element |
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
241 | fields = node_class._fields |
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
242 | if 'iter' in fields: |
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
243 | key_first = 'iter'.find |
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
244 | elif 'generators' in fields: |
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
245 | key_first = 'generators'.find |
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
246 | else: |
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
247 | key_first = 'value'.find |
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
248 | return tuple(sorted(fields, key=key_first, reverse=True)) |
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
249 | |
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
250 | def __missing__(self, node_class): |
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
251 | self[node_class] = fields = self._get_fields(node_class) |
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
252 | return fields |
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
253 | |
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
254 | |
5067
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
255 | def counter(items): |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
256 | """ |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
257 | Simplest required implementation of collections.Counter. Required as 2.6 |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
258 | does not have Counter in collections. |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
259 | """ |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
260 | results = {} |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
261 | for item in items: |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
262 | results[item] = results.get(item, 0) + 1 |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
263 | return results |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
264 | |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
265 | |
3544
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
266 | def iter_child_nodes(node, omit=None, _fields_order=_FieldsOrder()): |
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
267 | """ |
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
268 | Yield all direct child nodes of *node*, that is, all fields that |
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
269 | are nodes and all items of fields that are lists of nodes. |
6742
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
270 | |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
271 | :param node: AST node to be iterated upon |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
272 | :param omit: String or tuple of strings denoting the |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
273 | attributes of the node to be omitted from |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
274 | further parsing |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
275 | :param _fields_order: Order of AST node fields |
3544
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
276 | """ |
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
277 | for name in _fields_order[node.__class__]: |
6742
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
278 | if omit and name in omit: |
3544
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
279 | continue |
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
280 | field = getattr(node, name, None) |
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
281 | if isinstance(field, ast.AST): |
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
282 | yield field |
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
283 | elif isinstance(field, list): |
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
284 | for item in field: |
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
285 | yield item |
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
286 | |
3177
5af61402d74d
Update pyflakes to 0.7.3
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3159
diff
changeset
|
287 | |
5067
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
288 | def convert_to_value(item): |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
289 | if isinstance(item, ast.Str): |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
290 | return item.s |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
291 | elif hasattr(ast, 'Bytes') and isinstance(item, ast.Bytes): |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
292 | return item.s |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
293 | elif isinstance(item, ast.Tuple): |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
294 | return tuple(convert_to_value(i) for i in item.elts) |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
295 | elif isinstance(item, ast.Num): |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
296 | return item.n |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
297 | elif isinstance(item, ast.Name): |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
298 | result = VariableKey(item=item) |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
299 | constants_lookup = { |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
300 | 'True': True, |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
301 | 'False': False, |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
302 | 'None': None, |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
303 | } |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
304 | return constants_lookup.get( |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
305 | result.name, |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
306 | result, |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
307 | ) |
6353
6a0f3abd6878
upgraded pyflakes to version 2.0.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
308 | elif (not PY2) and isinstance(item, ast.NameConstant): |
5067
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
309 | # None, True, False are nameconstants in python3, but names in 2 |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
310 | return item.value |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
311 | else: |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
312 | return UnhandledKeyType() |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
313 | |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
314 | |
6353
6a0f3abd6878
upgraded pyflakes to version 2.0.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
315 | def is_notimplemented_name_node(node): |
6a0f3abd6878
upgraded pyflakes to version 2.0.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
316 | return isinstance(node, ast.Name) and getNodeName(node) == 'NotImplemented' |
6a0f3abd6878
upgraded pyflakes to version 2.0.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
317 | |
6a0f3abd6878
upgraded pyflakes to version 2.0.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
318 | |
2571
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
319 | class Binding(object): |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
320 | """ |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
321 | Represents the binding of a value to a name. |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
322 | |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
323 | The checker uses this to keep track of which names have been bound and |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
324 | which names have not. See L{Assignment} for a special type of binding that |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
325 | is checked with stricter rules. |
3177
5af61402d74d
Update pyflakes to 0.7.3
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3159
diff
changeset
|
326 | |
5067
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
327 | @ivar used: pair of (L{Scope}, node) indicating the scope and |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
328 | the node that this binding was last used. |
2571
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
329 | """ |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
330 | |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
331 | def __init__(self, name, source): |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
332 | self.name = name |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
333 | self.source = source |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
334 | self.used = False |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
335 | |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
336 | def __str__(self): |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
337 | return self.name |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
338 | |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
339 | def __repr__(self): |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
340 | return '<%s object %r from line %r at 0x%x>' % (self.__class__.__name__, |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
341 | self.name, |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
342 | self.source.lineno, |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
343 | id(self)) |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
344 | |
3544
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
345 | def redefines(self, other): |
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
346 | return isinstance(other, Definition) and self.name == other.name |
2571
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
347 | |
3544
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
348 | |
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
349 | class Definition(Binding): |
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
350 | """ |
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
351 | A binding that defines a function or a class. |
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
352 | """ |
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
353 | |
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
354 | |
6742
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
355 | class Builtin(Definition): |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
356 | """A definition created for all Python builtins.""" |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
357 | |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
358 | def __init__(self, name): |
8218
7c09585bd960
Applied some more code simplifications suggested by the new Simplify checker (super(Foo, self) => super()).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8208
diff
changeset
|
359 | super().__init__(name, None) |
6742
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
360 | |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
361 | def __repr__(self): |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
362 | return '<%s object %r at 0x%x>' % (self.__class__.__name__, |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
363 | self.name, |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
364 | id(self)) |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
365 | |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
366 | |
5067
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
367 | class UnhandledKeyType(object): |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
368 | """ |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
369 | A dictionary key of a type that we cannot or do not check for duplicates. |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
370 | """ |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
371 | |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
372 | |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
373 | class VariableKey(object): |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
374 | """ |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
375 | A dictionary key which is a variable. |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
376 | |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
377 | @ivar item: The variable AST object. |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
378 | """ |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
379 | def __init__(self, item): |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
380 | self.name = item.id |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
381 | |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
382 | def __eq__(self, compare): |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
383 | return ( |
6742
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
384 | compare.__class__ == self.__class__ and |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
385 | compare.name == self.name |
5067
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
386 | ) |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
387 | |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
388 | def __hash__(self): |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
389 | return hash(self.name) |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
390 | |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
391 | |
3544
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
392 | class Importation(Definition): |
2571
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
393 | """ |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
394 | A binding created by an import statement. |
3177
5af61402d74d
Update pyflakes to 0.7.3
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3159
diff
changeset
|
395 | |
5af61402d74d
Update pyflakes to 0.7.3
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3159
diff
changeset
|
396 | @ivar fullName: The complete name given to the import statement, |
5af61402d74d
Update pyflakes to 0.7.3
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3159
diff
changeset
|
397 | possibly including multiple dotted components. |
5af61402d74d
Update pyflakes to 0.7.3
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3159
diff
changeset
|
398 | @type fullName: C{str} |
2571
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
399 | """ |
3544
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
400 | |
5067
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
401 | def __init__(self, name, source, full_name=None): |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
402 | self.fullName = full_name or name |
3544
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
403 | self.redefined = [] |
8218
7c09585bd960
Applied some more code simplifications suggested by the new Simplify checker (super(Foo, self) => super()).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8208
diff
changeset
|
404 | super().__init__(name, source) |
2571
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
405 | |
3544
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
406 | def redefines(self, other): |
5067
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
407 | if isinstance(other, SubmoduleImportation): |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
408 | # See note in SubmoduleImportation about RedefinedWhileUnused |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
409 | return self.fullName == other.fullName |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
410 | return isinstance(other, Definition) and self.name == other.name |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
411 | |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
412 | def _has_alias(self): |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
413 | """Return whether importation needs an as clause.""" |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
414 | return not self.fullName.split('.')[-1] == self.name |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
415 | |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
416 | @property |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
417 | def source_statement(self): |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
418 | """Generate a source statement equivalent to the import.""" |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
419 | if self._has_alias(): |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
420 | return 'import %s as %s' % (self.fullName, self.name) |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
421 | else: |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
422 | return 'import %s' % self.fullName |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
423 | |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
424 | def __str__(self): |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
425 | """Return import full name with alias.""" |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
426 | if self._has_alias(): |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
427 | return self.fullName + ' as ' + self.name |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
428 | else: |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
429 | return self.fullName |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
430 | |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
431 | |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
432 | class SubmoduleImportation(Importation): |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
433 | """ |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
434 | A binding created by a submodule import statement. |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
435 | |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
436 | A submodule import is a special case where the root module is implicitly |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
437 | imported, without an 'as' clause, and the submodule is also imported. |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
438 | Python does not restrict which attributes of the root module may be used. |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
439 | |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
440 | This class is only used when the submodule import is without an 'as' clause. |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
441 | |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
442 | pyflakes handles this case by registering the root module name in the scope, |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
443 | allowing any attribute of the root module to be accessed. |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
444 | |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
445 | RedefinedWhileUnused is suppressed in `redefines` unless the submodule |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
446 | name is also the same, to avoid false positives. |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
447 | """ |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
448 | |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
449 | def __init__(self, name, source): |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
450 | # A dot should only appear in the name when it is a submodule import |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
451 | assert '.' in name and (not source or isinstance(source, ast.Import)) |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
452 | package_name = name.split('.')[0] |
8218
7c09585bd960
Applied some more code simplifications suggested by the new Simplify checker (super(Foo, self) => super()).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8208
diff
changeset
|
453 | super().__init__(package_name, source) |
5067
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
454 | self.fullName = name |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
455 | |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
456 | def redefines(self, other): |
3544
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
457 | if isinstance(other, Importation): |
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
458 | return self.fullName == other.fullName |
8218
7c09585bd960
Applied some more code simplifications suggested by the new Simplify checker (super(Foo, self) => super()).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8208
diff
changeset
|
459 | return super().redefines(other) |
5067
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
460 | |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
461 | def __str__(self): |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
462 | return self.fullName |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
463 | |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
464 | @property |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
465 | def source_statement(self): |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
466 | return 'import ' + self.fullName |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
467 | |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
468 | |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
469 | class ImportationFrom(Importation): |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
470 | |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
471 | def __init__(self, name, source, module, real_name=None): |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
472 | self.module = module |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
473 | self.real_name = real_name or name |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
474 | |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
475 | if module.endswith('.'): |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
476 | full_name = module + self.real_name |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
477 | else: |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
478 | full_name = module + '.' + self.real_name |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
479 | |
8218
7c09585bd960
Applied some more code simplifications suggested by the new Simplify checker (super(Foo, self) => super()).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8208
diff
changeset
|
480 | super().__init__(name, source, full_name) |
5067
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
481 | |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
482 | def __str__(self): |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
483 | """Return import full name with alias.""" |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
484 | if self.real_name != self.name: |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
485 | return self.fullName + ' as ' + self.name |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
486 | else: |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
487 | return self.fullName |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
488 | |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
489 | @property |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
490 | def source_statement(self): |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
491 | if self.real_name != self.name: |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
492 | return 'from %s import %s as %s' % (self.module, |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
493 | self.real_name, |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
494 | self.name) |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
495 | else: |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
496 | return 'from %s import %s' % (self.module, self.name) |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
497 | |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
498 | |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
499 | class StarImportation(Importation): |
5510
cdcd0cd34e79
Upgraded pyflakes to version 1.5.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
5389
diff
changeset
|
500 | """A binding created by a 'from x import *' statement.""" |
5067
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
501 | |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
502 | def __init__(self, name, source): |
8218
7c09585bd960
Applied some more code simplifications suggested by the new Simplify checker (super(Foo, self) => super()).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8208
diff
changeset
|
503 | super().__init__('*', source) |
5067
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
504 | # Each star importation needs a unique name, and |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
505 | # may not be the module name otherwise it will be deemed imported |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
506 | self.name = name + '.*' |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
507 | self.fullName = name |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
508 | |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
509 | @property |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
510 | def source_statement(self): |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
511 | return 'from ' + self.fullName + ' import *' |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
512 | |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
513 | def __str__(self): |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
514 | # When the module ends with a ., avoid the ambiguous '..*' |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
515 | if self.fullName.endswith('.'): |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
516 | return self.source_statement |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
517 | else: |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
518 | return self.name |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
519 | |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
520 | |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
521 | class FutureImportation(ImportationFrom): |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
522 | """ |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
523 | A binding created by a from `__future__` import statement. |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
524 | |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
525 | `__future__` imports are implicitly used. |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
526 | """ |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
527 | |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
528 | def __init__(self, name, source, scope): |
8218
7c09585bd960
Applied some more code simplifications suggested by the new Simplify checker (super(Foo, self) => super()).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8208
diff
changeset
|
529 | super().__init__(name, source, '__future__') |
5067
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
530 | self.used = (scope, source) |
3544
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
531 | |
2571
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
532 | |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
533 | class Argument(Binding): |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
534 | """ |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
535 | Represents binding a name as an argument. |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
536 | """ |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
537 | |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
538 | |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
539 | class Assignment(Binding): |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
540 | """ |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
541 | Represents binding a name with an explicit assignment. |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
542 | |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
543 | The checker will raise warnings for any Assignment that isn't used. Also, |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
544 | the checker does not consider assignments in tuple/list unpacking to be |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
545 | Assignments, rather it treats them as simple Bindings. |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
546 | """ |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
547 | |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
548 | |
8208
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
549 | class Annotation(Binding): |
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
550 | """ |
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
551 | Represents binding a name to a type without an associated value. |
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
552 | |
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
553 | As long as this name is not assigned a value in another binding, it is considered |
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
554 | undefined for most purposes. One notable exception is using the name as a type |
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
555 | annotation. |
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
556 | """ |
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
557 | |
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
558 | def redefines(self, other): |
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
559 | """An Annotation doesn't define any name, so it cannot redefine one.""" |
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
560 | return False |
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
561 | |
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
562 | |
2571
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
563 | class FunctionDefinition(Definition): |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
564 | pass |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
565 | |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
566 | |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
567 | class ClassDefinition(Definition): |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
568 | pass |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
569 | |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
570 | |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
571 | class ExportBinding(Binding): |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
572 | """ |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
573 | A binding created by an C{__all__} assignment. If the names in the list |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
574 | can be determined statically, they will be treated as names for export and |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
575 | additional checking applied to them. |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
576 | |
8208
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
577 | The only recognized C{__all__} assignment via list/tuple concatenation is in the |
6742
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
578 | following format: |
2571
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
579 | |
6742
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
580 | __all__ = ['a'] + ['b'] + ['c'] |
2571
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
581 | |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
582 | Names which are imported and not otherwise used but appear in the value of |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
583 | C{__all__} will not have an unused import warning reported for them. |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
584 | """ |
3544
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
585 | |
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
586 | def __init__(self, name, source, scope): |
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
587 | if '__all__' in scope and isinstance(source, ast.AugAssign): |
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
588 | self.names = list(scope['__all__'].names) |
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
589 | else: |
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
590 | self.names = [] |
6742
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
591 | |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
592 | def _add_to_names(container): |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
593 | for node in container.elts: |
2571
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
594 | if isinstance(node, ast.Str): |
3544
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
595 | self.names.append(node.s) |
6742
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
596 | |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
597 | if isinstance(source.value, (ast.List, ast.Tuple)): |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
598 | _add_to_names(source.value) |
8208
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
599 | # If concatenating lists or tuples |
6742
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
600 | elif isinstance(source.value, ast.BinOp): |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
601 | currentValue = source.value |
8208
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
602 | while isinstance(currentValue.right, (ast.List, ast.Tuple)): |
6742
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
603 | left = currentValue.left |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
604 | right = currentValue.right |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
605 | _add_to_names(right) |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
606 | # If more lists are being added |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
607 | if isinstance(left, ast.BinOp): |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
608 | currentValue = left |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
609 | # If just two lists are being added |
8208
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
610 | elif isinstance(left, (ast.List, ast.Tuple)): |
6742
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
611 | _add_to_names(left) |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
612 | # All lists accounted for - done |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
613 | break |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
614 | # If not list concatenation |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
615 | else: |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
616 | break |
8218
7c09585bd960
Applied some more code simplifications suggested by the new Simplify checker (super(Foo, self) => super()).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8208
diff
changeset
|
617 | super().__init__(name, source) |
2571
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
618 | |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
619 | |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
620 | class Scope(dict): |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
621 | importStarred = False # set to True when import * is found |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
622 | |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
623 | def __repr__(self): |
3177
5af61402d74d
Update pyflakes to 0.7.3
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3159
diff
changeset
|
624 | scope_cls = self.__class__.__name__ |
5af61402d74d
Update pyflakes to 0.7.3
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3159
diff
changeset
|
625 | return '<%s at 0x%x %s>' % (scope_cls, id(self), dict.__repr__(self)) |
2571
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
626 | |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
627 | |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
628 | class ClassScope(Scope): |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
629 | pass |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
630 | |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
631 | |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
632 | class FunctionScope(Scope): |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
633 | """ |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
634 | I represent a name scope for a function. |
3177
5af61402d74d
Update pyflakes to 0.7.3
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3159
diff
changeset
|
635 | |
5af61402d74d
Update pyflakes to 0.7.3
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3159
diff
changeset
|
636 | @ivar globals: Names declared 'global' in this function. |
2571
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
637 | """ |
3177
5af61402d74d
Update pyflakes to 0.7.3
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3159
diff
changeset
|
638 | usesLocals = False |
6353
6a0f3abd6878
upgraded pyflakes to version 2.0.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
639 | alwaysUsed = {'__tracebackhide__', '__traceback_info__', |
6a0f3abd6878
upgraded pyflakes to version 2.0.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
640 | '__traceback_supplement__'} |
3177
5af61402d74d
Update pyflakes to 0.7.3
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3159
diff
changeset
|
641 | |
2571
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
642 | def __init__(self): |
8218
7c09585bd960
Applied some more code simplifications suggested by the new Simplify checker (super(Foo, self) => super()).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8208
diff
changeset
|
643 | super().__init__() |
3177
5af61402d74d
Update pyflakes to 0.7.3
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3159
diff
changeset
|
644 | # Simplify: manage the special locals as globals |
5af61402d74d
Update pyflakes to 0.7.3
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3159
diff
changeset
|
645 | self.globals = self.alwaysUsed.copy() |
3544
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
646 | self.returnValue = None # First non-empty return |
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
647 | self.isGenerator = False # Detect a generator |
3177
5af61402d74d
Update pyflakes to 0.7.3
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3159
diff
changeset
|
648 | |
5af61402d74d
Update pyflakes to 0.7.3
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3159
diff
changeset
|
649 | def unusedAssignments(self): |
5af61402d74d
Update pyflakes to 0.7.3
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3159
diff
changeset
|
650 | """ |
5af61402d74d
Update pyflakes to 0.7.3
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3159
diff
changeset
|
651 | Return a generator for the assignments which have not been used. |
5af61402d74d
Update pyflakes to 0.7.3
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3159
diff
changeset
|
652 | """ |
5af61402d74d
Update pyflakes to 0.7.3
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3159
diff
changeset
|
653 | for name, binding in self.items(): |
6742
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
654 | if (not binding.used and |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
655 | name != '_' and # see issue #202 |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
656 | name not in self.globals and |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
657 | not self.usesLocals and |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
658 | isinstance(binding, Assignment)): |
3177
5af61402d74d
Update pyflakes to 0.7.3
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3159
diff
changeset
|
659 | yield name, binding |
5af61402d74d
Update pyflakes to 0.7.3
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3159
diff
changeset
|
660 | |
5af61402d74d
Update pyflakes to 0.7.3
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3159
diff
changeset
|
661 | |
5af61402d74d
Update pyflakes to 0.7.3
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3159
diff
changeset
|
662 | class GeneratorScope(Scope): |
5af61402d74d
Update pyflakes to 0.7.3
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3159
diff
changeset
|
663 | pass |
2571
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
664 | |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
665 | |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
666 | class ModuleScope(Scope): |
5067
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
667 | """Scope for a module.""" |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
668 | _futures_allowed = True |
6742
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
669 | _annotations_future_enabled = False |
5067
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
670 | |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
671 | |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
672 | class DoctestScope(ModuleScope): |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
673 | """Scope for a doctest.""" |
2571
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
674 | |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
675 | |
7064
1010f737def2
pyflakes: upgraded to version 2.1.1 plus repository changes to fix some issues (until 2019-07-09).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7060
diff
changeset
|
676 | class DummyNode(object): |
1010f737def2
pyflakes: upgraded to version 2.1.1 plus repository changes to fix some issues (until 2019-07-09).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7060
diff
changeset
|
677 | """Used in place of an `ast.AST` to set error message positions""" |
1010f737def2
pyflakes: upgraded to version 2.1.1 plus repository changes to fix some issues (until 2019-07-09).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7060
diff
changeset
|
678 | def __init__(self, lineno, col_offset): |
1010f737def2
pyflakes: upgraded to version 2.1.1 plus repository changes to fix some issues (until 2019-07-09).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7060
diff
changeset
|
679 | self.lineno = lineno |
1010f737def2
pyflakes: upgraded to version 2.1.1 plus repository changes to fix some issues (until 2019-07-09).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7060
diff
changeset
|
680 | self.col_offset = col_offset |
1010f737def2
pyflakes: upgraded to version 2.1.1 plus repository changes to fix some issues (until 2019-07-09).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7060
diff
changeset
|
681 | |
1010f737def2
pyflakes: upgraded to version 2.1.1 plus repository changes to fix some issues (until 2019-07-09).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7060
diff
changeset
|
682 | |
8208
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
683 | class DetectClassScopedMagic: |
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
684 | names = dir() |
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
685 | |
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
686 | |
2571
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
687 | # Globally defined names which are not attributes of the builtins module, or |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
688 | # are only present on some platforms. |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
689 | _MAGIC_GLOBALS = ['__file__', '__builtins__', 'WindowsError'] |
6742
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
690 | # module scope annotation will store in `__annotations__`, see also PEP 526. |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
691 | if PY36_PLUS: |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
692 | _MAGIC_GLOBALS.append('__annotations__') |
2571
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
693 | |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
694 | |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
695 | def getNodeName(node): |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
696 | # Returns node.id, or node.name, or None |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
697 | if hasattr(node, 'id'): # One of the many nodes with an id |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
698 | return node.id |
5067
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
699 | if hasattr(node, 'name'): # an ExceptHandler node |
2571
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
700 | return node.name |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
701 | |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
702 | |
7617
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
703 | TYPING_MODULES = frozenset(('typing', 'typing_extensions')) |
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
704 | |
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
705 | |
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
706 | def _is_typing_helper(node, is_name_match_fn, scope_stack): |
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
707 | """ |
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
708 | Internal helper to determine whether or not something is a member of a |
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
709 | typing module. This is used as part of working out whether we are within a |
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
710 | type annotation context. |
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
711 | |
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
712 | Note: you probably don't want to use this function directly. Instead see the |
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
713 | utils below which wrap it (`_is_typing` and `_is_any_typing_member`). |
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
714 | """ |
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
715 | |
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
716 | def _bare_name_is_attr(name): |
7064
1010f737def2
pyflakes: upgraded to version 2.1.1 plus repository changes to fix some issues (until 2019-07-09).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7060
diff
changeset
|
717 | for scope in reversed(scope_stack): |
1010f737def2
pyflakes: upgraded to version 2.1.1 plus repository changes to fix some issues (until 2019-07-09).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7060
diff
changeset
|
718 | if name in scope: |
1010f737def2
pyflakes: upgraded to version 2.1.1 plus repository changes to fix some issues (until 2019-07-09).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7060
diff
changeset
|
719 | return ( |
1010f737def2
pyflakes: upgraded to version 2.1.1 plus repository changes to fix some issues (until 2019-07-09).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7060
diff
changeset
|
720 | isinstance(scope[name], ImportationFrom) and |
7617
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
721 | scope[name].module in TYPING_MODULES and |
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
722 | is_name_match_fn(scope[name].real_name) |
7064
1010f737def2
pyflakes: upgraded to version 2.1.1 plus repository changes to fix some issues (until 2019-07-09).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7060
diff
changeset
|
723 | ) |
7395
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
724 | |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
725 | return False |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
726 | |
7617
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
727 | return ( |
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
728 | ( |
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
729 | isinstance(node, ast.Name) and |
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
730 | _bare_name_is_attr(node.id) |
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
731 | ) or ( |
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
732 | isinstance(node, ast.Attribute) and |
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
733 | isinstance(node.value, ast.Name) and |
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
734 | node.value.id in TYPING_MODULES and |
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
735 | is_name_match_fn(node.attr) |
6742
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
736 | ) |
7617
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
737 | ) |
6742
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
738 | |
7617
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
739 | |
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
740 | def _is_typing(node, typing_attr, scope_stack): |
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
741 | """ |
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
742 | Determine whether `node` represents the member of a typing module specified |
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
743 | by `typing_attr`. |
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
744 | |
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
745 | This is used as part of working out whether we are within a type annotation |
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
746 | context. |
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
747 | """ |
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
748 | return _is_typing_helper(node, lambda x: x == typing_attr, scope_stack) |
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
749 | |
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
750 | |
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
751 | def _is_any_typing_member(node, scope_stack): |
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
752 | """ |
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
753 | Determine whether `node` represents any member of a typing module. |
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
754 | |
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
755 | This is used as part of working out whether we are within a type annotation |
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
756 | context. |
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
757 | """ |
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
758 | return _is_typing_helper(node, lambda x: True, scope_stack) |
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
759 | |
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
760 | |
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
761 | def is_typing_overload(value, scope_stack): |
6742
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
762 | return ( |
7395
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
763 | isinstance(value.source, FUNCTION_TYPES) and |
7064
1010f737def2
pyflakes: upgraded to version 2.1.1 plus repository changes to fix some issues (until 2019-07-09).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7060
diff
changeset
|
764 | any( |
7617
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
765 | _is_typing(dec, 'overload', scope_stack) |
7064
1010f737def2
pyflakes: upgraded to version 2.1.1 plus repository changes to fix some issues (until 2019-07-09).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7060
diff
changeset
|
766 | for dec in value.source.decorator_list |
1010f737def2
pyflakes: upgraded to version 2.1.1 plus repository changes to fix some issues (until 2019-07-09).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7060
diff
changeset
|
767 | ) |
6742
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
768 | ) |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
769 | |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
770 | |
8208
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
771 | class AnnotationState: |
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
772 | NONE = 0 |
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
773 | STRING = 1 |
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
774 | BARE = 2 |
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
775 | |
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
776 | |
7617
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
777 | def in_annotation(func): |
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
778 | @functools.wraps(func) |
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
779 | def in_annotation_func(self, *args, **kwargs): |
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
780 | with self._enter_annotation(): |
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
781 | return func(self, *args, **kwargs) |
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
782 | return in_annotation_func |
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
783 | |
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
784 | |
8208
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
785 | def in_string_annotation(func): |
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
786 | @functools.wraps(func) |
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
787 | def in_annotation_func(self, *args, **kwargs): |
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
788 | with self._enter_annotation(AnnotationState.STRING): |
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
789 | return func(self, *args, **kwargs) |
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
790 | return in_annotation_func |
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
791 | |
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
792 | |
6742
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
793 | def make_tokens(code): |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
794 | # PY3: tokenize.tokenize requires readline of bytes |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
795 | if not isinstance(code, bytes): |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
796 | code = code.encode('UTF-8') |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
797 | lines = iter(code.splitlines(True)) |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
798 | # next(lines, b'') is to prevent an error in pypy3 |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
799 | return tuple(tokenize_tokenize(lambda: next(lines, b''))) |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
800 | |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
801 | |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
802 | class _TypeableVisitor(ast.NodeVisitor): |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
803 | """Collect the line number and nodes which are deemed typeable by |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
804 | PEP 484 |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
805 | |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
806 | https://www.python.org/dev/peps/pep-0484/#type-comments |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
807 | """ |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
808 | def __init__(self): |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
809 | self.typeable_lines = [] # type: List[int] |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
810 | self.typeable_nodes = {} # type: Dict[int, ast.AST] |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
811 | |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
812 | def _typeable(self, node): |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
813 | # if there is more than one typeable thing on a line last one wins |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
814 | self.typeable_lines.append(node.lineno) |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
815 | self.typeable_nodes[node.lineno] = node |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
816 | |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
817 | self.generic_visit(node) |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
818 | |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
819 | visit_Assign = visit_For = visit_FunctionDef = visit_With = _typeable |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
820 | visit_AsyncFor = visit_AsyncFunctionDef = visit_AsyncWith = _typeable |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
821 | |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
822 | |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
823 | def _collect_type_comments(tree, tokens): |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
824 | visitor = _TypeableVisitor() |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
825 | visitor.visit(tree) |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
826 | |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
827 | type_comments = collections.defaultdict(list) |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
828 | for tp, text, start, _, _ in tokens: |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
829 | if ( |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
830 | tp != tokenize.COMMENT or # skip non comments |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
831 | not TYPE_COMMENT_RE.match(text) or # skip non-type comments |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
832 | TYPE_IGNORE_RE.match(text) # skip ignores |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
833 | ): |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
834 | continue |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
835 | |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
836 | # search for the typeable node at or before the line number of the |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
837 | # type comment. |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
838 | # if the bisection insertion point is before any nodes this is an |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
839 | # invalid type comment which is ignored. |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
840 | lineno, _ = start |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
841 | idx = bisect.bisect_right(visitor.typeable_lines, lineno) |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
842 | if idx == 0: |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
843 | continue |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
844 | node = visitor.typeable_nodes[visitor.typeable_lines[idx - 1]] |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
845 | type_comments[node].append((start, text)) |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
846 | |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
847 | return type_comments |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
848 | |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
849 | |
2571
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
850 | class Checker(object): |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
851 | """ |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
852 | I check the cleanliness and sanity of Python code. |
3177
5af61402d74d
Update pyflakes to 0.7.3
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3159
diff
changeset
|
853 | |
5af61402d74d
Update pyflakes to 0.7.3
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3159
diff
changeset
|
854 | @ivar _deferredFunctions: Tracking list used by L{deferFunction}. Elements |
5af61402d74d
Update pyflakes to 0.7.3
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3159
diff
changeset
|
855 | of the list are two-tuples. The first element is the callable passed |
5af61402d74d
Update pyflakes to 0.7.3
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3159
diff
changeset
|
856 | to L{deferFunction}. The second element is a copy of the scope stack |
5af61402d74d
Update pyflakes to 0.7.3
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3159
diff
changeset
|
857 | at the time L{deferFunction} was called. |
5af61402d74d
Update pyflakes to 0.7.3
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3159
diff
changeset
|
858 | |
5af61402d74d
Update pyflakes to 0.7.3
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3159
diff
changeset
|
859 | @ivar _deferredAssignments: Similar to C{_deferredFunctions}, but for |
5af61402d74d
Update pyflakes to 0.7.3
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3159
diff
changeset
|
860 | callables which are deferred assignment checks. |
2571
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
861 | """ |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
862 | |
6742
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
863 | _ast_node_scope = { |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
864 | ast.Module: ModuleScope, |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
865 | ast.ClassDef: ClassScope, |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
866 | ast.FunctionDef: FunctionScope, |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
867 | ast.Lambda: FunctionScope, |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
868 | ast.ListComp: GeneratorScope, |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
869 | ast.SetComp: GeneratorScope, |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
870 | ast.GeneratorExp: GeneratorScope, |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
871 | ast.DictComp: GeneratorScope, |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
872 | } |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
873 | if PY35_PLUS: |
7617
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
874 | _ast_node_scope[ast.AsyncFunctionDef] = FunctionScope |
6742
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
875 | |
2571
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
876 | nodeDepth = 0 |
3177
5af61402d74d
Update pyflakes to 0.7.3
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3159
diff
changeset
|
877 | offset = None |
2571
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
878 | traceTree = False |
8208
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
879 | _in_annotation = AnnotationState.NONE |
7617
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
880 | _in_deferred = False |
3177
5af61402d74d
Update pyflakes to 0.7.3
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3159
diff
changeset
|
881 | |
5af61402d74d
Update pyflakes to 0.7.3
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3159
diff
changeset
|
882 | builtIns = set(builtin_vars).union(_MAGIC_GLOBALS) |
5af61402d74d
Update pyflakes to 0.7.3
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3159
diff
changeset
|
883 | _customBuiltIns = os.environ.get('PYFLAKES_BUILTINS') |
5af61402d74d
Update pyflakes to 0.7.3
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3159
diff
changeset
|
884 | if _customBuiltIns: |
5af61402d74d
Update pyflakes to 0.7.3
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3159
diff
changeset
|
885 | builtIns.update(_customBuiltIns.split(',')) |
5af61402d74d
Update pyflakes to 0.7.3
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3159
diff
changeset
|
886 | del _customBuiltIns |
2571
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
887 | |
6742
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
888 | # TODO: file_tokens= is required to perform checks on type comments, |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
889 | # eventually make this a required positional argument. For now it |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
890 | # is defaulted to `()` for api compatibility. |
3544
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
891 | def __init__(self, tree, filename='(none)', builtins=None, |
6742
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
892 | withDoctest='PYFLAKES_DOCTEST' in os.environ, file_tokens=()): |
3177
5af61402d74d
Update pyflakes to 0.7.3
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3159
diff
changeset
|
893 | self._nodeHandlers = {} |
2571
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
894 | self._deferredFunctions = [] |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
895 | self._deferredAssignments = [] |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
896 | self.deadScopes = [] |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
897 | self.messages = [] |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
898 | self.filename = filename |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
899 | if builtins: |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
900 | self.builtIns = self.builtIns.union(builtins) |
3544
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
901 | self.withDoctest = withDoctest |
6742
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
902 | try: |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
903 | self.scopeStack = [Checker._ast_node_scope[type(tree)]()] |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
904 | except KeyError: |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
905 | raise RuntimeError('No scope implemented for the node %r' % tree) |
3177
5af61402d74d
Update pyflakes to 0.7.3
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3159
diff
changeset
|
906 | self.exceptHandlers = [()] |
2571
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
907 | self.root = tree |
6742
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
908 | self._type_comments = _collect_type_comments(tree, file_tokens) |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
909 | for builtin in self.builtIns: |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
910 | self.addBinding(None, Builtin(builtin)) |
2571
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
911 | self.handleChildren(tree) |
7617
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
912 | self._in_deferred = True |
2571
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
913 | self.runDeferred(self._deferredFunctions) |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
914 | # Set _deferredFunctions to None so that deferFunction will fail |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
915 | # noisily if called after we've run through the deferred functions. |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
916 | self._deferredFunctions = None |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
917 | self.runDeferred(self._deferredAssignments) |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
918 | # Set _deferredAssignments to None so that deferAssignment will fail |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
919 | # noisily if called after we've run through the deferred assignments. |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
920 | self._deferredAssignments = None |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
921 | del self.scopeStack[1:] |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
922 | self.popScope() |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
923 | self.checkDeadScopes() |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
924 | |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
925 | def deferFunction(self, callable): |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
926 | """ |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
927 | Schedule a function handler to be called just before completion. |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
928 | |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
929 | This is used for handling function bodies, which must be deferred |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
930 | because code later in the file might modify the global scope. When |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
931 | `callable` is called, the scope at the time this is called will be |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
932 | restored, however it will contain any new bindings added to it. |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
933 | """ |
3177
5af61402d74d
Update pyflakes to 0.7.3
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3159
diff
changeset
|
934 | self._deferredFunctions.append((callable, self.scopeStack[:], self.offset)) |
2571
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
935 | |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
936 | def deferAssignment(self, callable): |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
937 | """ |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
938 | Schedule an assignment handler to be called just after deferred |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
939 | function handlers. |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
940 | """ |
3177
5af61402d74d
Update pyflakes to 0.7.3
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3159
diff
changeset
|
941 | self._deferredAssignments.append((callable, self.scopeStack[:], self.offset)) |
2571
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
942 | |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
943 | def runDeferred(self, deferred): |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
944 | """ |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
945 | Run the callables in C{deferred} using their associated scope stack. |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
946 | """ |
3177
5af61402d74d
Update pyflakes to 0.7.3
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3159
diff
changeset
|
947 | for handler, scope, offset in deferred: |
2571
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
948 | self.scopeStack = scope |
3177
5af61402d74d
Update pyflakes to 0.7.3
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3159
diff
changeset
|
949 | self.offset = offset |
2571
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
950 | handler() |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
951 | |
5067
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
952 | def _in_doctest(self): |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
953 | return (len(self.scopeStack) >= 2 and |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
954 | isinstance(self.scopeStack[1], DoctestScope)) |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
955 | |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
956 | @property |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
957 | def futuresAllowed(self): |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
958 | if not all(isinstance(scope, ModuleScope) |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
959 | for scope in self.scopeStack): |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
960 | return False |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
961 | |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
962 | return self.scope._futures_allowed |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
963 | |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
964 | @futuresAllowed.setter |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
965 | def futuresAllowed(self, value): |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
966 | assert value is False |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
967 | if isinstance(self.scope, ModuleScope): |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
968 | self.scope._futures_allowed = False |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
969 | |
2571
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
970 | @property |
6742
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
971 | def annotationsFutureEnabled(self): |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
972 | scope = self.scopeStack[0] |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
973 | if not isinstance(scope, ModuleScope): |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
974 | return False |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
975 | return scope._annotations_future_enabled |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
976 | |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
977 | @annotationsFutureEnabled.setter |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
978 | def annotationsFutureEnabled(self, value): |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
979 | assert value is True |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
980 | assert isinstance(self.scope, ModuleScope) |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
981 | self.scope._annotations_future_enabled = True |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
982 | |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
983 | @property |
2571
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
984 | def scope(self): |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
985 | return self.scopeStack[-1] |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
986 | |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
987 | def popScope(self): |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
988 | self.deadScopes.append(self.scopeStack.pop()) |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
989 | |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
990 | def checkDeadScopes(self): |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
991 | """ |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
992 | Look at scopes which have been fully examined and report names in them |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
993 | which were imported but unused. |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
994 | """ |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
995 | for scope in self.deadScopes: |
5067
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
996 | # imports in classes are public members |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
997 | if isinstance(scope, ClassScope): |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
998 | continue |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
999 | |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
1000 | all_binding = scope.get('__all__') |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
1001 | if all_binding and not isinstance(all_binding, ExportBinding): |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
1002 | all_binding = None |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
1003 | |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
1004 | if all_binding: |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
1005 | all_names = set(all_binding.names) |
8208
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
1006 | undefined = [ |
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
1007 | name for name in all_binding.names |
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
1008 | if name not in scope |
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
1009 | ] |
5067
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
1010 | else: |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
1011 | all_names = undefined = [] |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
1012 | |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
1013 | if undefined: |
3177
5af61402d74d
Update pyflakes to 0.7.3
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3159
diff
changeset
|
1014 | if not scope.importStarred and \ |
5af61402d74d
Update pyflakes to 0.7.3
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3159
diff
changeset
|
1015 | os.path.basename(self.filename) != '__init__.py': |
2571
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
1016 | # Look for possible mistakes in the export list |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
1017 | for name in undefined: |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
1018 | self.report(messages.UndefinedExport, |
3177
5af61402d74d
Update pyflakes to 0.7.3
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3159
diff
changeset
|
1019 | scope['__all__'].source, name) |
5067
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
1020 | |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
1021 | # mark all import '*' as used by the undefined in __all__ |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
1022 | if scope.importStarred: |
6742
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
1023 | from_list = [] |
5067
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
1024 | for binding in scope.values(): |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
1025 | if isinstance(binding, StarImportation): |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
1026 | binding.used = all_binding |
6742
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
1027 | from_list.append(binding.fullName) |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
1028 | # report * usage, with a list of possible sources |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
1029 | from_list = ', '.join(sorted(from_list)) |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
1030 | for name in undefined: |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
1031 | self.report(messages.ImportStarUsage, |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
1032 | scope['__all__'].source, name, from_list) |
2571
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
1033 | |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
1034 | # Look for imported names that aren't used. |
3544
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
1035 | for value in scope.values(): |
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
1036 | if isinstance(value, Importation): |
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
1037 | used = value.used or value.name in all_names |
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
1038 | if not used: |
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
1039 | messg = messages.UnusedImport |
5067
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
1040 | self.report(messg, value.source, str(value)) |
3544
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
1041 | for node in value.redefined: |
6742
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
1042 | if isinstance(self.getParent(node), FOR_TYPES): |
3544
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
1043 | messg = messages.ImportShadowedByLoopVar |
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
1044 | elif used: |
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
1045 | continue |
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
1046 | else: |
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
1047 | messg = messages.RedefinedWhileUnused |
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
1048 | self.report(messg, node, value.name, value.source) |
3177
5af61402d74d
Update pyflakes to 0.7.3
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3159
diff
changeset
|
1049 | |
5af61402d74d
Update pyflakes to 0.7.3
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3159
diff
changeset
|
1050 | def pushScope(self, scopeClass=FunctionScope): |
5af61402d74d
Update pyflakes to 0.7.3
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3159
diff
changeset
|
1051 | self.scopeStack.append(scopeClass()) |
2571
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
1052 | |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
1053 | def report(self, messageClass, *args, **kwargs): |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
1054 | self.messages.append(messageClass(self.filename, *args, **kwargs)) |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
1055 | |
3544
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
1056 | def getParent(self, node): |
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
1057 | # Lookup the first parent which is not Tuple, List or Starred |
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
1058 | while True: |
7395
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1059 | node = node._pyflakes_parent |
3544
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
1060 | if not hasattr(node, 'elts') and not hasattr(node, 'ctx'): |
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
1061 | return node |
2571
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
1062 | |
3544
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
1063 | def getCommonAncestor(self, lnode, rnode, stop): |
7395
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1064 | if ( |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1065 | stop in (lnode, rnode) or |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1066 | not ( |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1067 | hasattr(lnode, '_pyflakes_parent') and |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1068 | hasattr(rnode, '_pyflakes_parent') |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1069 | ) |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1070 | ): |
3544
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
1071 | return None |
2571
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
1072 | if lnode is rnode: |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
1073 | return lnode |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
1074 | |
7395
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1075 | if (lnode._pyflakes_depth > rnode._pyflakes_depth): |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1076 | return self.getCommonAncestor(lnode._pyflakes_parent, rnode, stop) |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1077 | if (lnode._pyflakes_depth < rnode._pyflakes_depth): |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1078 | return self.getCommonAncestor(lnode, rnode._pyflakes_parent, stop) |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1079 | return self.getCommonAncestor( |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1080 | lnode._pyflakes_parent, |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1081 | rnode._pyflakes_parent, |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1082 | stop, |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1083 | ) |
2571
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
1084 | |
3544
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
1085 | def descendantOf(self, node, ancestors, stop): |
2571
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
1086 | for a in ancestors: |
3544
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
1087 | if self.getCommonAncestor(node, a, stop): |
2571
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
1088 | return True |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
1089 | return False |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
1090 | |
6742
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
1091 | def _getAncestor(self, node, ancestor_type): |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
1092 | parent = node |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
1093 | while True: |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
1094 | if parent is self.root: |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
1095 | return None |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
1096 | parent = self.getParent(parent) |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
1097 | if isinstance(parent, ancestor_type): |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
1098 | return parent |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
1099 | |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
1100 | def getScopeNode(self, node): |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
1101 | return self._getAncestor(node, tuple(Checker._ast_node_scope.keys())) |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
1102 | |
2571
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
1103 | def differentForks(self, lnode, rnode): |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
1104 | """True, if lnode and rnode are located on different forks of IF/TRY""" |
3544
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
1105 | ancestor = self.getCommonAncestor(lnode, rnode, self.root) |
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
1106 | parts = getAlternatives(ancestor) |
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
1107 | if parts: |
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
1108 | for items in parts: |
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
1109 | if self.descendantOf(lnode, items, ancestor) ^ \ |
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
1110 | self.descendantOf(rnode, items, ancestor): |
2571
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
1111 | return True |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
1112 | return False |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
1113 | |
3544
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
1114 | def addBinding(self, node, value): |
2571
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
1115 | """ |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
1116 | Called when a binding is altered. |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
1117 | |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
1118 | - `node` is the statement responsible for the change |
3544
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
1119 | - `value` is the new value, a Binding instance |
2571
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
1120 | """ |
7395
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1121 | # assert value.source in (node, node._pyflakes_parent): |
3544
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
1122 | for scope in self.scopeStack[::-1]: |
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
1123 | if value.name in scope: |
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
1124 | break |
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
1125 | existing = scope.get(value.name) |
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
1126 | |
6742
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
1127 | if (existing and not isinstance(existing, Builtin) and |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
1128 | not self.differentForks(node, existing.source)): |
3544
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
1129 | |
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
1130 | parent_stmt = self.getParent(value.source) |
6742
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
1131 | if isinstance(existing, Importation) and isinstance(parent_stmt, FOR_TYPES): |
3544
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
1132 | self.report(messages.ImportShadowedByLoopVar, |
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
1133 | node, value.name, existing.source) |
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
1134 | |
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
1135 | elif scope is self.scope: |
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
1136 | if (isinstance(parent_stmt, ast.comprehension) and |
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
1137 | not isinstance(self.getParent(existing.source), |
6742
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
1138 | (FOR_TYPES, ast.comprehension))): |
3544
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
1139 | self.report(messages.RedefinedInListComp, |
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
1140 | node, value.name, existing.source) |
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
1141 | elif not existing.used and value.redefines(existing): |
6353
6a0f3abd6878
upgraded pyflakes to version 2.0.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1142 | if value.name != '_' or isinstance(existing, Importation): |
7064
1010f737def2
pyflakes: upgraded to version 2.1.1 plus repository changes to fix some issues (until 2019-07-09).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7060
diff
changeset
|
1143 | if not is_typing_overload(existing, self.scopeStack): |
6742
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
1144 | self.report(messages.RedefinedWhileUnused, |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
1145 | node, value.name, existing.source) |
2571
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
1146 | |
3544
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
1147 | elif isinstance(existing, Importation) and value.redefines(existing): |
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
1148 | existing.redefined.append(node) |
2571
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
1149 | |
4502
76f2b46437a6
Updated to pyflakes 1.0.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4465
diff
changeset
|
1150 | if value.name in self.scope: |
76f2b46437a6
Updated to pyflakes 1.0.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4465
diff
changeset
|
1151 | # then assume the rebound name is used as a global or within a loop |
76f2b46437a6
Updated to pyflakes 1.0.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4465
diff
changeset
|
1152 | value.used = self.scope[value.name].used |
76f2b46437a6
Updated to pyflakes 1.0.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4465
diff
changeset
|
1153 | |
8208
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
1154 | # don't treat annotations as assignments if there is an existing value |
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
1155 | # in scope |
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
1156 | if value.name not in self.scope or not isinstance(value, Annotation): |
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
1157 | self.scope[value.name] = value |
2571
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
1158 | |
7617
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
1159 | def _unknown_handler(self, node): |
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
1160 | # this environment variable configures whether to error on unknown |
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
1161 | # ast types. |
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
1162 | # |
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
1163 | # this is silent by default but the error is enabled for the pyflakes |
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
1164 | # testsuite. |
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
1165 | # |
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
1166 | # this allows new syntax to be added to python without *requiring* |
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
1167 | # changes from the pyflakes side. but will still produce an error |
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
1168 | # in the pyflakes testsuite (so more specific handling can be added if |
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
1169 | # needed). |
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
1170 | if os.environ.get('PYFLAKES_ERROR_UNKNOWN'): |
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
1171 | raise NotImplementedError('Unexpected type: {}'.format(type(node))) |
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
1172 | else: |
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
1173 | self.handleChildren(node) |
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
1174 | |
3177
5af61402d74d
Update pyflakes to 0.7.3
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3159
diff
changeset
|
1175 | def getNodeHandler(self, node_class): |
5af61402d74d
Update pyflakes to 0.7.3
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3159
diff
changeset
|
1176 | try: |
5af61402d74d
Update pyflakes to 0.7.3
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3159
diff
changeset
|
1177 | return self._nodeHandlers[node_class] |
5af61402d74d
Update pyflakes to 0.7.3
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3159
diff
changeset
|
1178 | except KeyError: |
5af61402d74d
Update pyflakes to 0.7.3
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3159
diff
changeset
|
1179 | nodeType = getNodeType(node_class) |
7617
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
1180 | self._nodeHandlers[node_class] = handler = getattr( |
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
1181 | self, nodeType, self._unknown_handler, |
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
1182 | ) |
3177
5af61402d74d
Update pyflakes to 0.7.3
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3159
diff
changeset
|
1183 | return handler |
5af61402d74d
Update pyflakes to 0.7.3
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3159
diff
changeset
|
1184 | |
2571
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
1185 | def handleNodeLoad(self, node): |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
1186 | name = getNodeName(node) |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
1187 | if not name: |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
1188 | return |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
1189 | |
5067
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
1190 | in_generators = None |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
1191 | importStarred = None |
3177
5af61402d74d
Update pyflakes to 0.7.3
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3159
diff
changeset
|
1192 | |
5af61402d74d
Update pyflakes to 0.7.3
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3159
diff
changeset
|
1193 | # try enclosing function scopes and global scope |
5067
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
1194 | for scope in self.scopeStack[-1::-1]: |
6353
6a0f3abd6878
upgraded pyflakes to version 2.0.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1195 | if isinstance(scope, ClassScope): |
6a0f3abd6878
upgraded pyflakes to version 2.0.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1196 | if not PY2 and name == '__class__': |
6a0f3abd6878
upgraded pyflakes to version 2.0.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1197 | return |
6a0f3abd6878
upgraded pyflakes to version 2.0.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1198 | elif in_generators is False: |
6a0f3abd6878
upgraded pyflakes to version 2.0.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1199 | # only generators used in a class scope can access the |
6a0f3abd6878
upgraded pyflakes to version 2.0.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1200 | # names of the class. this is skipped during the first |
6a0f3abd6878
upgraded pyflakes to version 2.0.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1201 | # iteration |
6a0f3abd6878
upgraded pyflakes to version 2.0.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1202 | continue |
5067
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
1203 | |
8208
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
1204 | binding = scope.get(name, None) |
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
1205 | if isinstance(binding, Annotation) and not self._in_postponed_annotation: |
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
1206 | continue |
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
1207 | |
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
1208 | if name == 'print' and isinstance(binding, Builtin): |
6742
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
1209 | parent = self.getParent(node) |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
1210 | if (isinstance(parent, ast.BinOp) and |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
1211 | isinstance(parent.op, ast.RShift)): |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
1212 | self.report(messages.InvalidPrintSyntax, node) |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
1213 | |
2571
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
1214 | try: |
3177
5af61402d74d
Update pyflakes to 0.7.3
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3159
diff
changeset
|
1215 | scope[name].used = (self.scope, node) |
6742
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
1216 | |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
1217 | # if the name of SubImportation is same as |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
1218 | # alias of other Importation and the alias |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
1219 | # is used, SubImportation also should be marked as used. |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
1220 | n = scope[name] |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
1221 | if isinstance(n, Importation) and n._has_alias(): |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
1222 | try: |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
1223 | scope[n.fullName].used = (self.scope, node) |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
1224 | except KeyError: |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
1225 | pass |
2571
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
1226 | except KeyError: |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
1227 | pass |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
1228 | else: |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
1229 | return |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
1230 | |
5067
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
1231 | importStarred = importStarred or scope.importStarred |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
1232 | |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
1233 | if in_generators is not False: |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
1234 | in_generators = isinstance(scope, GeneratorScope) |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
1235 | |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
1236 | if importStarred: |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
1237 | from_list = [] |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
1238 | |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
1239 | for scope in self.scopeStack[-1::-1]: |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
1240 | for binding in scope.values(): |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
1241 | if isinstance(binding, StarImportation): |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
1242 | # mark '*' imports as used for each scope |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
1243 | binding.used = (self.scope, node) |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
1244 | from_list.append(binding.fullName) |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
1245 | |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
1246 | # report * usage, with a list of possible sources |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
1247 | from_list = ', '.join(sorted(from_list)) |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
1248 | self.report(messages.ImportStarUsage, node, name, from_list) |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
1249 | return |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
1250 | |
3177
5af61402d74d
Update pyflakes to 0.7.3
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3159
diff
changeset
|
1251 | if name == '__path__' and os.path.basename(self.filename) == '__init__.py': |
5af61402d74d
Update pyflakes to 0.7.3
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3159
diff
changeset
|
1252 | # the special name __path__ is valid only in packages |
5af61402d74d
Update pyflakes to 0.7.3
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3159
diff
changeset
|
1253 | return |
5af61402d74d
Update pyflakes to 0.7.3
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3159
diff
changeset
|
1254 | |
8208
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
1255 | if name in DetectClassScopedMagic.names and isinstance(self.scope, ClassScope): |
6742
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
1256 | return |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
1257 | |
3177
5af61402d74d
Update pyflakes to 0.7.3
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3159
diff
changeset
|
1258 | # protected with a NameError handler? |
5af61402d74d
Update pyflakes to 0.7.3
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3159
diff
changeset
|
1259 | if 'NameError' not in self.exceptHandlers[-1]: |
5af61402d74d
Update pyflakes to 0.7.3
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3159
diff
changeset
|
1260 | self.report(messages.UndefinedName, node, name) |
2571
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
1261 | |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
1262 | def handleNodeStore(self, node): |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
1263 | name = getNodeName(node) |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
1264 | if not name: |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
1265 | return |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
1266 | # if the name hasn't already been defined in the current scope |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
1267 | if isinstance(self.scope, FunctionScope) and name not in self.scope: |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
1268 | # for each function or module scope above us |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
1269 | for scope in self.scopeStack[:-1]: |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
1270 | if not isinstance(scope, (FunctionScope, ModuleScope)): |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
1271 | continue |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
1272 | # if the name was defined in that scope, and the name has |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
1273 | # been accessed already in the current scope, and hasn't |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
1274 | # been declared global |
3177
5af61402d74d
Update pyflakes to 0.7.3
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3159
diff
changeset
|
1275 | used = name in scope and scope[name].used |
5af61402d74d
Update pyflakes to 0.7.3
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3159
diff
changeset
|
1276 | if used and used[0] is self.scope and name not in self.scope.globals: |
2571
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
1277 | # then it's probably a mistake |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
1278 | self.report(messages.UndefinedLocal, |
3177
5af61402d74d
Update pyflakes to 0.7.3
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3159
diff
changeset
|
1279 | scope[name].used[1], name, scope[name].source) |
2571
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
1280 | break |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
1281 | |
3544
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
1282 | parent_stmt = self.getParent(node) |
8208
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
1283 | if isinstance(parent_stmt, ANNASSIGN_TYPES) and parent_stmt.value is None: |
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
1284 | binding = Annotation(name, node) |
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
1285 | elif isinstance(parent_stmt, (FOR_TYPES, ast.comprehension)) or ( |
7395
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1286 | parent_stmt != node._pyflakes_parent and |
3544
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
1287 | not self.isLiteralTupleUnpacking(parent_stmt)): |
2571
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
1288 | binding = Binding(name, node) |
3544
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
1289 | elif name == '__all__' and isinstance(self.scope, ModuleScope): |
7395
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1290 | binding = ExportBinding(name, node._pyflakes_parent, self.scope) |
7617
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
1291 | elif PY2 and isinstance(getattr(node, 'ctx', None), ast.Param): |
6742
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
1292 | binding = Argument(name, self.getScopeNode(node)) |
2571
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
1293 | else: |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
1294 | binding = Assignment(name, node) |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
1295 | self.addBinding(node, binding) |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
1296 | |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
1297 | def handleNodeDelete(self, node): |
4502
76f2b46437a6
Updated to pyflakes 1.0.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4465
diff
changeset
|
1298 | |
76f2b46437a6
Updated to pyflakes 1.0.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4465
diff
changeset
|
1299 | def on_conditional_branch(): |
76f2b46437a6
Updated to pyflakes 1.0.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4465
diff
changeset
|
1300 | """ |
76f2b46437a6
Updated to pyflakes 1.0.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4465
diff
changeset
|
1301 | Return `True` if node is part of a conditional body. |
76f2b46437a6
Updated to pyflakes 1.0.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4465
diff
changeset
|
1302 | """ |
7395
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1303 | current = getattr(node, '_pyflakes_parent', None) |
4502
76f2b46437a6
Updated to pyflakes 1.0.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4465
diff
changeset
|
1304 | while current: |
76f2b46437a6
Updated to pyflakes 1.0.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4465
diff
changeset
|
1305 | if isinstance(current, (ast.If, ast.While, ast.IfExp)): |
76f2b46437a6
Updated to pyflakes 1.0.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4465
diff
changeset
|
1306 | return True |
7395
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1307 | current = getattr(current, '_pyflakes_parent', None) |
4502
76f2b46437a6
Updated to pyflakes 1.0.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4465
diff
changeset
|
1308 | return False |
76f2b46437a6
Updated to pyflakes 1.0.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4465
diff
changeset
|
1309 | |
2571
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
1310 | name = getNodeName(node) |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
1311 | if not name: |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
1312 | return |
4502
76f2b46437a6
Updated to pyflakes 1.0.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4465
diff
changeset
|
1313 | |
76f2b46437a6
Updated to pyflakes 1.0.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4465
diff
changeset
|
1314 | if on_conditional_branch(): |
5510
cdcd0cd34e79
Upgraded pyflakes to version 1.5.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
5389
diff
changeset
|
1315 | # We cannot predict if this conditional branch is going to |
4502
76f2b46437a6
Updated to pyflakes 1.0.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4465
diff
changeset
|
1316 | # be executed. |
76f2b46437a6
Updated to pyflakes 1.0.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4465
diff
changeset
|
1317 | return |
76f2b46437a6
Updated to pyflakes 1.0.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4465
diff
changeset
|
1318 | |
2571
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
1319 | if isinstance(self.scope, FunctionScope) and name in self.scope.globals: |
3177
5af61402d74d
Update pyflakes to 0.7.3
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3159
diff
changeset
|
1320 | self.scope.globals.remove(name) |
2571
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
1321 | else: |
3177
5af61402d74d
Update pyflakes to 0.7.3
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3159
diff
changeset
|
1322 | try: |
5af61402d74d
Update pyflakes to 0.7.3
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3159
diff
changeset
|
1323 | del self.scope[name] |
5af61402d74d
Update pyflakes to 0.7.3
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3159
diff
changeset
|
1324 | except KeyError: |
5af61402d74d
Update pyflakes to 0.7.3
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3159
diff
changeset
|
1325 | self.report(messages.UndefinedName, node, name) |
2571
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
1326 | |
7617
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
1327 | @contextlib.contextmanager |
8208
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
1328 | def _enter_annotation(self, ann_type=AnnotationState.BARE): |
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
1329 | orig, self._in_annotation = self._in_annotation, ann_type |
7617
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
1330 | try: |
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
1331 | yield |
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
1332 | finally: |
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
1333 | self._in_annotation = orig |
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
1334 | |
8208
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
1335 | @property |
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
1336 | def _in_postponed_annotation(self): |
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
1337 | return ( |
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
1338 | self._in_annotation == AnnotationState.STRING or |
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
1339 | self.annotationsFutureEnabled |
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
1340 | ) |
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
1341 | |
6742
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
1342 | def _handle_type_comments(self, node): |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
1343 | for (lineno, col_offset), comment in self._type_comments.get(node, ()): |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
1344 | comment = comment.split(':', 1)[1].strip() |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
1345 | func_match = TYPE_FUNC_RE.match(comment) |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
1346 | if func_match: |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
1347 | parts = ( |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
1348 | func_match.group(1).replace('*', ''), |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
1349 | func_match.group(2).strip(), |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
1350 | ) |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
1351 | else: |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
1352 | parts = (comment,) |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
1353 | |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
1354 | for part in parts: |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
1355 | if PY2: |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
1356 | part = part.replace('...', 'Ellipsis') |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
1357 | self.deferFunction(functools.partial( |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
1358 | self.handleStringAnnotation, |
7064
1010f737def2
pyflakes: upgraded to version 2.1.1 plus repository changes to fix some issues (until 2019-07-09).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7060
diff
changeset
|
1359 | part, DummyNode(lineno, col_offset), lineno, col_offset, |
6742
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
1360 | messages.CommentAnnotationSyntaxError, |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
1361 | )) |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
1362 | |
3544
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
1363 | def handleChildren(self, tree, omit=None): |
6742
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
1364 | self._handle_type_comments(tree) |
3544
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
1365 | for node in iter_child_nodes(tree, omit=omit): |
2571
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
1366 | self.handleNode(node, tree) |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
1367 | |
3544
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
1368 | def isLiteralTupleUnpacking(self, node): |
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
1369 | if isinstance(node, ast.Assign): |
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
1370 | for child in node.targets + [node.value]: |
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
1371 | if not hasattr(child, 'elts'): |
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
1372 | return False |
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
1373 | return True |
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
1374 | |
2571
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
1375 | def isDocstring(self, node): |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
1376 | """ |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
1377 | Determine if the given node is a docstring, as long as it is at the |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
1378 | correct place in the node tree. |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
1379 | """ |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
1380 | return isinstance(node, ast.Str) or (isinstance(node, ast.Expr) and |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
1381 | isinstance(node.value, ast.Str)) |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
1382 | |
3177
5af61402d74d
Update pyflakes to 0.7.3
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3159
diff
changeset
|
1383 | def getDocstring(self, node): |
5af61402d74d
Update pyflakes to 0.7.3
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3159
diff
changeset
|
1384 | if isinstance(node, ast.Expr): |
5af61402d74d
Update pyflakes to 0.7.3
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3159
diff
changeset
|
1385 | node = node.value |
5af61402d74d
Update pyflakes to 0.7.3
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3159
diff
changeset
|
1386 | if not isinstance(node, ast.Str): |
5af61402d74d
Update pyflakes to 0.7.3
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3159
diff
changeset
|
1387 | return (None, None) |
5067
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
1388 | |
6742
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
1389 | if PYPY or PY38_PLUS: |
5067
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
1390 | doctest_lineno = node.lineno - 1 |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
1391 | else: |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
1392 | # Computed incorrectly if the docstring has backslash |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
1393 | doctest_lineno = node.lineno - node.s.count('\n') - 1 |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
1394 | |
3177
5af61402d74d
Update pyflakes to 0.7.3
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3159
diff
changeset
|
1395 | return (node.s, doctest_lineno) |
5af61402d74d
Update pyflakes to 0.7.3
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3159
diff
changeset
|
1396 | |
2571
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
1397 | def handleNode(self, node, parent): |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
1398 | if node is None: |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
1399 | return |
3177
5af61402d74d
Update pyflakes to 0.7.3
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3159
diff
changeset
|
1400 | if self.offset and getattr(node, 'lineno', None) is not None: |
5af61402d74d
Update pyflakes to 0.7.3
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3159
diff
changeset
|
1401 | node.lineno += self.offset[0] |
5af61402d74d
Update pyflakes to 0.7.3
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3159
diff
changeset
|
1402 | node.col_offset += self.offset[1] |
2571
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
1403 | if self.traceTree: |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
1404 | print(' ' * self.nodeDepth + node.__class__.__name__) |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
1405 | if self.futuresAllowed and not (isinstance(node, ast.ImportFrom) or |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
1406 | self.isDocstring(node)): |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
1407 | self.futuresAllowed = False |
3177
5af61402d74d
Update pyflakes to 0.7.3
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3159
diff
changeset
|
1408 | self.nodeDepth += 1 |
7395
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1409 | node._pyflakes_depth = self.nodeDepth |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1410 | node._pyflakes_parent = parent |
2571
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
1411 | try: |
3177
5af61402d74d
Update pyflakes to 0.7.3
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3159
diff
changeset
|
1412 | handler = self.getNodeHandler(node.__class__) |
2571
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
1413 | handler(node) |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
1414 | finally: |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
1415 | self.nodeDepth -= 1 |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
1416 | if self.traceTree: |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
1417 | print(' ' * self.nodeDepth + 'end ' + node.__class__.__name__) |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
1418 | |
3177
5af61402d74d
Update pyflakes to 0.7.3
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3159
diff
changeset
|
1419 | _getDoctestExamples = doctest.DocTestParser().get_examples |
5af61402d74d
Update pyflakes to 0.7.3
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3159
diff
changeset
|
1420 | |
5af61402d74d
Update pyflakes to 0.7.3
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3159
diff
changeset
|
1421 | def handleDoctests(self, node): |
5af61402d74d
Update pyflakes to 0.7.3
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3159
diff
changeset
|
1422 | try: |
6353
6a0f3abd6878
upgraded pyflakes to version 2.0.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1423 | if hasattr(node, 'docstring'): |
6a0f3abd6878
upgraded pyflakes to version 2.0.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1424 | docstring = node.docstring |
6a0f3abd6878
upgraded pyflakes to version 2.0.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1425 | |
6a0f3abd6878
upgraded pyflakes to version 2.0.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1426 | # This is just a reasonable guess. In Python 3.7, docstrings no |
6a0f3abd6878
upgraded pyflakes to version 2.0.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1427 | # longer have line numbers associated with them. This will be |
6a0f3abd6878
upgraded pyflakes to version 2.0.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1428 | # incorrect if there are empty lines between the beginning |
6a0f3abd6878
upgraded pyflakes to version 2.0.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1429 | # of the function and the docstring. |
6a0f3abd6878
upgraded pyflakes to version 2.0.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1430 | node_lineno = node.lineno |
6a0f3abd6878
upgraded pyflakes to version 2.0.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1431 | if hasattr(node, 'args'): |
6a0f3abd6878
upgraded pyflakes to version 2.0.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1432 | node_lineno = max([node_lineno] + |
6a0f3abd6878
upgraded pyflakes to version 2.0.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1433 | [arg.lineno for arg in node.args.args]) |
6a0f3abd6878
upgraded pyflakes to version 2.0.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1434 | else: |
6a0f3abd6878
upgraded pyflakes to version 2.0.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1435 | (docstring, node_lineno) = self.getDocstring(node.body[0]) |
3544
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
1436 | examples = docstring and self._getDoctestExamples(docstring) |
3177
5af61402d74d
Update pyflakes to 0.7.3
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3159
diff
changeset
|
1437 | except (ValueError, IndexError): |
5af61402d74d
Update pyflakes to 0.7.3
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3159
diff
changeset
|
1438 | # e.g. line 6 of the docstring for <string> has inconsistent |
5af61402d74d
Update pyflakes to 0.7.3
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3159
diff
changeset
|
1439 | # leading whitespace: ... |
5af61402d74d
Update pyflakes to 0.7.3
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3159
diff
changeset
|
1440 | return |
3544
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
1441 | if not examples: |
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
1442 | return |
5067
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
1443 | |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
1444 | # Place doctest in module scope |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
1445 | saved_stack = self.scopeStack |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
1446 | self.scopeStack = [self.scopeStack[0]] |
3177
5af61402d74d
Update pyflakes to 0.7.3
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3159
diff
changeset
|
1447 | node_offset = self.offset or (0, 0) |
5067
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
1448 | self.pushScope(DoctestScope) |
7060
d04e8965af91
checker.py: added a fix taken from pyflakes (2019-07-09)
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6942
diff
changeset
|
1449 | if '_' not in self.scopeStack[0]: |
d04e8965af91
checker.py: added a fix taken from pyflakes (2019-07-09)
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6942
diff
changeset
|
1450 | self.addBinding(None, Builtin('_')) |
3177
5af61402d74d
Update pyflakes to 0.7.3
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3159
diff
changeset
|
1451 | for example in examples: |
5af61402d74d
Update pyflakes to 0.7.3
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3159
diff
changeset
|
1452 | try: |
6742
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
1453 | tree = ast.parse(example.source, "<doctest>") |
3177
5af61402d74d
Update pyflakes to 0.7.3
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3159
diff
changeset
|
1454 | except SyntaxError: |
5af61402d74d
Update pyflakes to 0.7.3
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3159
diff
changeset
|
1455 | e = sys.exc_info()[1] |
5067
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
1456 | if PYPY: |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
1457 | e.offset += 1 |
3177
5af61402d74d
Update pyflakes to 0.7.3
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3159
diff
changeset
|
1458 | position = (node_lineno + example.lineno + e.lineno, |
3544
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
1459 | example.indent + 4 + (e.offset or 0)) |
3177
5af61402d74d
Update pyflakes to 0.7.3
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3159
diff
changeset
|
1460 | self.report(messages.DoctestSyntaxError, node, position) |
5af61402d74d
Update pyflakes to 0.7.3
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3159
diff
changeset
|
1461 | else: |
5af61402d74d
Update pyflakes to 0.7.3
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3159
diff
changeset
|
1462 | self.offset = (node_offset[0] + node_lineno + example.lineno, |
5af61402d74d
Update pyflakes to 0.7.3
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3159
diff
changeset
|
1463 | node_offset[1] + example.indent + 4) |
5af61402d74d
Update pyflakes to 0.7.3
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3159
diff
changeset
|
1464 | self.handleChildren(tree) |
5af61402d74d
Update pyflakes to 0.7.3
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3159
diff
changeset
|
1465 | self.offset = node_offset |
5af61402d74d
Update pyflakes to 0.7.3
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3159
diff
changeset
|
1466 | self.popScope() |
5067
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
1467 | self.scopeStack = saved_stack |
3177
5af61402d74d
Update pyflakes to 0.7.3
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3159
diff
changeset
|
1468 | |
8208
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
1469 | @in_string_annotation |
6742
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
1470 | def handleStringAnnotation(self, s, node, ref_lineno, ref_col_offset, err): |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
1471 | try: |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
1472 | tree = ast.parse(s) |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
1473 | except SyntaxError: |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
1474 | self.report(err, node, s) |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
1475 | return |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
1476 | |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
1477 | body = tree.body |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
1478 | if len(body) != 1 or not isinstance(body[0], ast.Expr): |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
1479 | self.report(err, node, s) |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
1480 | return |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
1481 | |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
1482 | parsed_annotation = tree.body[0].value |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
1483 | for descendant in ast.walk(parsed_annotation): |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
1484 | if ( |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
1485 | 'lineno' in descendant._attributes and |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
1486 | 'col_offset' in descendant._attributes |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
1487 | ): |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
1488 | descendant.lineno = ref_lineno |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
1489 | descendant.col_offset = ref_col_offset |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
1490 | |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
1491 | self.handleNode(parsed_annotation, node) |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
1492 | |
7617
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
1493 | @in_annotation |
6353
6a0f3abd6878
upgraded pyflakes to version 2.0.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1494 | def handleAnnotation(self, annotation, node): |
6a0f3abd6878
upgraded pyflakes to version 2.0.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1495 | if isinstance(annotation, ast.Str): |
6a0f3abd6878
upgraded pyflakes to version 2.0.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1496 | # Defer handling forward annotation. |
6742
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
1497 | self.deferFunction(functools.partial( |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
1498 | self.handleStringAnnotation, |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
1499 | annotation.s, |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
1500 | node, |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
1501 | annotation.lineno, |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
1502 | annotation.col_offset, |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
1503 | messages.ForwardAnnotationSyntaxError, |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
1504 | )) |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
1505 | elif self.annotationsFutureEnabled: |
7617
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
1506 | fn = in_annotation(Checker.handleNode) |
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
1507 | self.deferFunction(lambda: fn(self, annotation, node)) |
6353
6a0f3abd6878
upgraded pyflakes to version 2.0.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1508 | else: |
6a0f3abd6878
upgraded pyflakes to version 2.0.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1509 | self.handleNode(annotation, node) |
6a0f3abd6878
upgraded pyflakes to version 2.0.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1510 | |
2571
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
1511 | def ignore(self, node): |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
1512 | pass |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
1513 | |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
1514 | # "stmt" type nodes |
7617
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
1515 | DELETE = PRINT = FOR = ASYNCFOR = WHILE = WITH = WITHITEM = \ |
6353
6a0f3abd6878
upgraded pyflakes to version 2.0.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1516 | ASYNCWITH = ASYNCWITHITEM = TRYFINALLY = EXEC = \ |
4502
76f2b46437a6
Updated to pyflakes 1.0.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4465
diff
changeset
|
1517 | EXPR = ASSIGN = handleChildren |
2571
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
1518 | |
5067
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
1519 | PASS = ignore |
2571
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
1520 | |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
1521 | # "expr" type nodes |
7617
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
1522 | BOOLOP = UNARYOP = SET = \ |
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
1523 | REPR = ATTRIBUTE = \ |
7395
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1524 | STARRED = NAMECONSTANT = NAMEDEXPR = handleChildren |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1525 | |
7617
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
1526 | def SUBSCRIPT(self, node): |
8208
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
1527 | if _is_name_or_attr(node.value, 'Literal'): |
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
1528 | with self._enter_annotation(AnnotationState.NONE): |
7617
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
1529 | self.handleChildren(node) |
8208
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
1530 | elif _is_name_or_attr(node.value, 'Annotated'): |
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
1531 | self.handleNode(node.value, node) |
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
1532 | |
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
1533 | # py39+ |
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
1534 | if isinstance(node.slice, ast.Tuple): |
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
1535 | slice_tuple = node.slice |
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
1536 | # <py39 |
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
1537 | elif ( |
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
1538 | isinstance(node.slice, ast.Index) and |
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
1539 | isinstance(node.slice.value, ast.Tuple) |
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
1540 | ): |
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
1541 | slice_tuple = node.slice.value |
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
1542 | else: |
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
1543 | slice_tuple = None |
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
1544 | |
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
1545 | # not a multi-arg `Annotated` |
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
1546 | if slice_tuple is None or len(slice_tuple.elts) < 2: |
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
1547 | self.handleNode(node.slice, node) |
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
1548 | else: |
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
1549 | # the first argument is the type |
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
1550 | self.handleNode(slice_tuple.elts[0], node) |
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
1551 | # the rest of the arguments are not |
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
1552 | with self._enter_annotation(AnnotationState.NONE): |
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
1553 | for arg in slice_tuple.elts[1:]: |
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
1554 | self.handleNode(arg, node) |
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
1555 | |
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
1556 | self.handleNode(node.ctx, node) |
7617
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
1557 | else: |
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
1558 | if _is_any_typing_member(node.value, self.scopeStack): |
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
1559 | with self._enter_annotation(): |
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
1560 | self.handleChildren(node) |
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
1561 | else: |
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
1562 | self.handleChildren(node) |
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
1563 | |
7395
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1564 | def _handle_string_dot_format(self, node): |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1565 | try: |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1566 | placeholders = tuple(parse_format_string(node.func.value.s)) |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1567 | except ValueError as e: |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1568 | self.report(messages.StringDotFormatInvalidFormat, node, e) |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1569 | return |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1570 | |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1571 | class state: # py2-compatible `nonlocal` |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1572 | auto = None |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1573 | next_auto = 0 |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1574 | |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1575 | placeholder_positional = set() |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1576 | placeholder_named = set() |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1577 | |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1578 | def _add_key(fmtkey): |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1579 | """Returns True if there is an error which should early-exit""" |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1580 | if fmtkey is None: # end of string or `{` / `}` escapes |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1581 | return False |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1582 | |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1583 | # attributes / indices are allowed in `.format(...)` |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1584 | fmtkey, _, _ = fmtkey.partition('.') |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1585 | fmtkey, _, _ = fmtkey.partition('[') |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1586 | |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1587 | try: |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1588 | fmtkey = int(fmtkey) |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1589 | except ValueError: |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1590 | pass |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1591 | else: # fmtkey was an integer |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1592 | if state.auto is True: |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1593 | self.report(messages.StringDotFormatMixingAutomatic, node) |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1594 | return True |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1595 | else: |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1596 | state.auto = False |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1597 | |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1598 | if fmtkey == '': |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1599 | if state.auto is False: |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1600 | self.report(messages.StringDotFormatMixingAutomatic, node) |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1601 | return True |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1602 | else: |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1603 | state.auto = True |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1604 | |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1605 | fmtkey = state.next_auto |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1606 | state.next_auto += 1 |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1607 | |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1608 | if isinstance(fmtkey, int): |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1609 | placeholder_positional.add(fmtkey) |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1610 | else: |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1611 | placeholder_named.add(fmtkey) |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1612 | |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1613 | return False |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1614 | |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1615 | for _, fmtkey, spec, _ in placeholders: |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1616 | if _add_key(fmtkey): |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1617 | return |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1618 | |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1619 | # spec can also contain format specifiers |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1620 | if spec is not None: |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1621 | try: |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1622 | spec_placeholders = tuple(parse_format_string(spec)) |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1623 | except ValueError as e: |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1624 | self.report(messages.StringDotFormatInvalidFormat, node, e) |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1625 | return |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1626 | |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1627 | for _, spec_fmtkey, spec_spec, _ in spec_placeholders: |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1628 | # can't recurse again |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1629 | if spec_spec is not None and '{' in spec_spec: |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1630 | self.report( |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1631 | messages.StringDotFormatInvalidFormat, |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1632 | node, |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1633 | 'Max string recursion exceeded', |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1634 | ) |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1635 | return |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1636 | if _add_key(spec_fmtkey): |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1637 | return |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1638 | |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1639 | # bail early if there is *args or **kwargs |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1640 | if ( |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1641 | # python 2.x *args / **kwargs |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1642 | getattr(node, 'starargs', None) or |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1643 | getattr(node, 'kwargs', None) or |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1644 | # python 3.x *args |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1645 | any( |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1646 | isinstance(arg, getattr(ast, 'Starred', ())) |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1647 | for arg in node.args |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1648 | ) or |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1649 | # python 3.x **kwargs |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1650 | any(kwd.arg is None for kwd in node.keywords) |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1651 | ): |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1652 | return |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1653 | |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1654 | substitution_positional = set(range(len(node.args))) |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1655 | substitution_named = {kwd.arg for kwd in node.keywords} |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1656 | |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1657 | extra_positional = substitution_positional - placeholder_positional |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1658 | extra_named = substitution_named - placeholder_named |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1659 | |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1660 | missing_arguments = ( |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1661 | (placeholder_positional | placeholder_named) - |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1662 | (substitution_positional | substitution_named) |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1663 | ) |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1664 | |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1665 | if extra_positional: |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1666 | self.report( |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1667 | messages.StringDotFormatExtraPositionalArguments, |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1668 | node, |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1669 | ', '.join(sorted(str(x) for x in extra_positional)), |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1670 | ) |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1671 | if extra_named: |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1672 | self.report( |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1673 | messages.StringDotFormatExtraNamedArguments, |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1674 | node, |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1675 | ', '.join(sorted(extra_named)), |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1676 | ) |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1677 | if missing_arguments: |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1678 | self.report( |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1679 | messages.StringDotFormatMissingArgument, |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1680 | node, |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1681 | ', '.join(sorted(str(x) for x in missing_arguments)), |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1682 | ) |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1683 | |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1684 | def CALL(self, node): |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1685 | if ( |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1686 | isinstance(node.func, ast.Attribute) and |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1687 | isinstance(node.func.value, ast.Str) and |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1688 | node.func.attr == 'format' |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1689 | ): |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1690 | self._handle_string_dot_format(node) |
7617
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
1691 | |
8208
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
1692 | omit = [] |
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
1693 | annotated = [] |
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
1694 | not_annotated = [] |
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
1695 | |
7617
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
1696 | if ( |
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
1697 | _is_typing(node.func, 'cast', self.scopeStack) and |
8208
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
1698 | len(node.args) >= 1 |
7617
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
1699 | ): |
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
1700 | with self._enter_annotation(): |
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
1701 | self.handleNode(node.args[0], node) |
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
1702 | |
8208
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
1703 | elif _is_typing(node.func, 'TypeVar', self.scopeStack): |
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
1704 | |
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
1705 | # TypeVar("T", "int", "str") |
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
1706 | omit += ["args"] |
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
1707 | annotated += [arg for arg in node.args[1:]] |
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
1708 | |
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
1709 | # TypeVar("T", bound="str") |
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
1710 | omit += ["keywords"] |
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
1711 | annotated += [k.value for k in node.keywords if k.arg == "bound"] |
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
1712 | not_annotated += [ |
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
1713 | (k, ["value"] if k.arg == "bound" else None) |
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
1714 | for k in node.keywords |
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
1715 | ] |
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
1716 | |
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
1717 | elif _is_typing(node.func, "TypedDict", self.scopeStack): |
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
1718 | # TypedDict("a", {"a": int}) |
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
1719 | if len(node.args) > 1 and isinstance(node.args[1], ast.Dict): |
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
1720 | omit += ["args"] |
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
1721 | annotated += node.args[1].values |
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
1722 | not_annotated += [ |
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
1723 | (arg, ["values"] if i == 1 else None) |
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
1724 | for i, arg in enumerate(node.args) |
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
1725 | ] |
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
1726 | |
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
1727 | # TypedDict("a", a=int) |
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
1728 | omit += ["keywords"] |
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
1729 | annotated += [k.value for k in node.keywords] |
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
1730 | not_annotated += [(k, ["value"]) for k in node.keywords] |
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
1731 | |
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
1732 | elif _is_typing(node.func, "NamedTuple", self.scopeStack): |
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
1733 | # NamedTuple("a", [("a", int)]) |
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
1734 | if ( |
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
1735 | len(node.args) > 1 and |
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
1736 | isinstance(node.args[1], (ast.Tuple, ast.List)) and |
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
1737 | all(isinstance(x, (ast.Tuple, ast.List)) and |
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
1738 | len(x.elts) == 2 for x in node.args[1].elts) |
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
1739 | ): |
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
1740 | omit += ["args"] |
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
1741 | annotated += [elt.elts[1] for elt in node.args[1].elts] |
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
1742 | not_annotated += [(elt.elts[0], None) for elt in node.args[1].elts] |
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
1743 | not_annotated += [ |
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
1744 | (arg, ["elts"] if i == 1 else None) |
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
1745 | for i, arg in enumerate(node.args) |
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
1746 | ] |
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
1747 | not_annotated += [(elt, "elts") for elt in node.args[1].elts] |
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
1748 | |
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
1749 | # NamedTuple("a", a=int) |
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
1750 | omit += ["keywords"] |
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
1751 | annotated += [k.value for k in node.keywords] |
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
1752 | not_annotated += [(k, ["value"]) for k in node.keywords] |
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
1753 | |
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
1754 | if omit: |
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
1755 | with self._enter_annotation(AnnotationState.NONE): |
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
1756 | for na_node, na_omit in not_annotated: |
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
1757 | self.handleChildren(na_node, omit=na_omit) |
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
1758 | self.handleChildren(node, omit=omit) |
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
1759 | |
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
1760 | with self._enter_annotation(): |
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
1761 | for annotated_node in annotated: |
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
1762 | self.handleNode(annotated_node, node) |
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
1763 | else: |
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
1764 | self.handleChildren(node) |
7395
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1765 | |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1766 | def _handle_percent_format(self, node): |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1767 | try: |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1768 | placeholders = parse_percent_format(node.left.s) |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1769 | except ValueError: |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1770 | self.report( |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1771 | messages.PercentFormatInvalidFormat, |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1772 | node, |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1773 | 'incomplete format', |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1774 | ) |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1775 | return |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1776 | |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1777 | named = set() |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1778 | positional_count = 0 |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1779 | positional = None |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1780 | for _, placeholder in placeholders: |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1781 | if placeholder is None: |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1782 | continue |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1783 | name, _, width, precision, conversion = placeholder |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1784 | |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1785 | if conversion == '%': |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1786 | continue |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1787 | |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1788 | if conversion not in VALID_CONVERSIONS: |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1789 | self.report( |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1790 | messages.PercentFormatUnsupportedFormatCharacter, |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1791 | node, |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1792 | conversion, |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1793 | ) |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1794 | |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1795 | if positional is None and conversion: |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1796 | positional = name is None |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1797 | |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1798 | for part in (width, precision): |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1799 | if part is not None and '*' in part: |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1800 | if not positional: |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1801 | self.report( |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1802 | messages.PercentFormatStarRequiresSequence, |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1803 | node, |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1804 | ) |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1805 | else: |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1806 | positional_count += 1 |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1807 | |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1808 | if positional and name is not None: |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1809 | self.report( |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1810 | messages.PercentFormatMixedPositionalAndNamed, |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1811 | node, |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1812 | ) |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1813 | return |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1814 | elif not positional and name is None: |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1815 | self.report( |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1816 | messages.PercentFormatMixedPositionalAndNamed, |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1817 | node, |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1818 | ) |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1819 | return |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1820 | |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1821 | if positional: |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1822 | positional_count += 1 |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1823 | else: |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1824 | named.add(name) |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1825 | |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1826 | if ( |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1827 | isinstance(node.right, (ast.List, ast.Tuple)) and |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1828 | # does not have any *splats (py35+ feature) |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1829 | not any( |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1830 | isinstance(elt, getattr(ast, 'Starred', ())) |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1831 | for elt in node.right.elts |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1832 | ) |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1833 | ): |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1834 | substitution_count = len(node.right.elts) |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1835 | if positional and positional_count != substitution_count: |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1836 | self.report( |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1837 | messages.PercentFormatPositionalCountMismatch, |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1838 | node, |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1839 | positional_count, |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1840 | substitution_count, |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1841 | ) |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1842 | elif not positional: |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1843 | self.report(messages.PercentFormatExpectedMapping, node) |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1844 | |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1845 | if ( |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1846 | isinstance(node.right, ast.Dict) and |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1847 | all(isinstance(k, ast.Str) for k in node.right.keys) |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1848 | ): |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1849 | if positional and positional_count > 1: |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1850 | self.report(messages.PercentFormatExpectedSequence, node) |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1851 | return |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1852 | |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1853 | substitution_keys = {k.s for k in node.right.keys} |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1854 | extra_keys = substitution_keys - named |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1855 | missing_keys = named - substitution_keys |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1856 | if not positional and extra_keys: |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1857 | self.report( |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1858 | messages.PercentFormatExtraNamedArguments, |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1859 | node, |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1860 | ', '.join(sorted(extra_keys)), |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1861 | ) |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1862 | if not positional and missing_keys: |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1863 | self.report( |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1864 | messages.PercentFormatMissingArgument, |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1865 | node, |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1866 | ', '.join(sorted(missing_keys)), |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1867 | ) |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1868 | |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1869 | def BINOP(self, node): |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1870 | if ( |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1871 | isinstance(node.op, ast.Mod) and |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1872 | isinstance(node.left, ast.Str) |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1873 | ): |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1874 | self._handle_percent_format(node) |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1875 | self.handleChildren(node) |
2571
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
1876 | |
7617
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
1877 | def STR(self, node): |
8208
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
1878 | if self._in_annotation: |
7617
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
1879 | fn = functools.partial( |
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
1880 | self.handleStringAnnotation, |
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
1881 | node.s, |
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
1882 | node, |
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
1883 | node.lineno, |
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
1884 | node.col_offset, |
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
1885 | messages.ForwardAnnotationSyntaxError, |
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
1886 | ) |
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
1887 | if self._in_deferred: |
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
1888 | fn() |
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
1889 | else: |
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
1890 | self.deferFunction(fn) |
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
1891 | |
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
1892 | if PY38_PLUS: |
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
1893 | def CONSTANT(self, node): |
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
1894 | if isinstance(node.value, str): |
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
1895 | return self.STR(node) |
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
1896 | else: |
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
1897 | NUM = BYTES = ELLIPSIS = CONSTANT = ignore |
2571
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
1898 | |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
1899 | # "slice" type nodes |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
1900 | SLICE = EXTSLICE = INDEX = handleChildren |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
1901 | |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
1902 | # expression contexts are node instances too, though being constants |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
1903 | LOAD = STORE = DEL = AUGLOAD = AUGSTORE = PARAM = ignore |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
1904 | |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
1905 | # same for operators |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
1906 | AND = OR = ADD = SUB = MULT = DIV = MOD = POW = LSHIFT = RSHIFT = \ |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
1907 | BITOR = BITXOR = BITAND = FLOORDIV = INVERT = NOT = UADD = USUB = \ |
5067
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
1908 | EQ = NOTEQ = LT = LTE = GT = GTE = IS = ISNOT = IN = NOTIN = \ |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
1909 | MATMULT = ignore |
2571
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
1910 | |
6353
6a0f3abd6878
upgraded pyflakes to version 2.0.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1911 | def RAISE(self, node): |
6a0f3abd6878
upgraded pyflakes to version 2.0.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1912 | self.handleChildren(node) |
6a0f3abd6878
upgraded pyflakes to version 2.0.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1913 | |
6a0f3abd6878
upgraded pyflakes to version 2.0.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1914 | arg = get_raise_argument(node) |
6a0f3abd6878
upgraded pyflakes to version 2.0.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1915 | |
6a0f3abd6878
upgraded pyflakes to version 2.0.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1916 | if isinstance(arg, ast.Call): |
6a0f3abd6878
upgraded pyflakes to version 2.0.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1917 | if is_notimplemented_name_node(arg.func): |
6a0f3abd6878
upgraded pyflakes to version 2.0.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1918 | # Handle "raise NotImplemented(...)" |
6a0f3abd6878
upgraded pyflakes to version 2.0.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1919 | self.report(messages.RaiseNotImplemented, node) |
6a0f3abd6878
upgraded pyflakes to version 2.0.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1920 | elif is_notimplemented_name_node(arg): |
6a0f3abd6878
upgraded pyflakes to version 2.0.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1921 | # Handle "raise NotImplemented" |
6a0f3abd6878
upgraded pyflakes to version 2.0.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1922 | self.report(messages.RaiseNotImplemented, node) |
6a0f3abd6878
upgraded pyflakes to version 2.0.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
1923 | |
2571
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
1924 | # additional node types |
7395
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1925 | COMPREHENSION = KEYWORD = FORMATTEDVALUE = handleChildren |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1926 | |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1927 | _in_fstring = False |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1928 | |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1929 | def JOINEDSTR(self, node): |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1930 | if ( |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1931 | # the conversion / etc. flags are parsed as f-strings without |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1932 | # placeholders |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1933 | not self._in_fstring and |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1934 | not any(isinstance(x, ast.FormattedValue) for x in node.values) |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1935 | ): |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1936 | self.report(messages.FStringMissingPlaceholders, node) |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1937 | |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1938 | self._in_fstring, orig = True, self._in_fstring |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1939 | try: |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1940 | self.handleChildren(node) |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1941 | finally: |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
1942 | self._in_fstring = orig |
5067
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
1943 | |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
1944 | def DICT(self, node): |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
1945 | # Complain if there are duplicate keys with different values |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
1946 | # If they have the same value it's not going to cause potentially |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
1947 | # unexpected behaviour so we'll not complain. |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
1948 | keys = [ |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
1949 | convert_to_value(key) for key in node.keys |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
1950 | ] |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
1951 | |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
1952 | key_counts = counter(keys) |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
1953 | duplicate_keys = [ |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
1954 | key for key, count in key_counts.items() |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
1955 | if count > 1 |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
1956 | ] |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
1957 | |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
1958 | for key in duplicate_keys: |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
1959 | key_indices = [i for i, i_key in enumerate(keys) if i_key == key] |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
1960 | |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
1961 | values = counter( |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
1962 | convert_to_value(node.values[index]) |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
1963 | for index in key_indices |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
1964 | ) |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
1965 | if any(count == 1 for value, count in values.items()): |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
1966 | for key_index in key_indices: |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
1967 | key_node = node.keys[key_index] |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
1968 | if isinstance(key, VariableKey): |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
1969 | self.report(messages.MultiValueRepeatedKeyVariable, |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
1970 | key_node, |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
1971 | key.name) |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
1972 | else: |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
1973 | self.report( |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
1974 | messages.MultiValueRepeatedKeyLiteral, |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
1975 | key_node, |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
1976 | key, |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
1977 | ) |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
1978 | self.handleChildren(node) |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
1979 | |
7617
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
1980 | def IF(self, node): |
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
1981 | if isinstance(node.test, ast.Tuple) and node.test.elts != []: |
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
1982 | self.report(messages.IfTuple, node) |
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
1983 | self.handleChildren(node) |
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
1984 | |
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
1985 | IFEXP = IF |
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
1986 | |
5067
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
1987 | def ASSERT(self, node): |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
1988 | if isinstance(node.test, ast.Tuple) and node.test.elts != []: |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
1989 | self.report(messages.AssertTuple, node) |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
1990 | self.handleChildren(node) |
2571
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
1991 | |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
1992 | def GLOBAL(self, node): |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
1993 | """ |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
1994 | Keep track of globals declarations. |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
1995 | """ |
5067
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
1996 | global_scope_index = 1 if self._in_doctest() else 0 |
4502
76f2b46437a6
Updated to pyflakes 1.0.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4465
diff
changeset
|
1997 | global_scope = self.scopeStack[global_scope_index] |
76f2b46437a6
Updated to pyflakes 1.0.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4465
diff
changeset
|
1998 | |
76f2b46437a6
Updated to pyflakes 1.0.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4465
diff
changeset
|
1999 | # Ignore 'global' statement in global scope. |
76f2b46437a6
Updated to pyflakes 1.0.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4465
diff
changeset
|
2000 | if self.scope is not global_scope: |
76f2b46437a6
Updated to pyflakes 1.0.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4465
diff
changeset
|
2001 | |
76f2b46437a6
Updated to pyflakes 1.0.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4465
diff
changeset
|
2002 | # One 'global' statement can bind multiple (comma-delimited) names. |
76f2b46437a6
Updated to pyflakes 1.0.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4465
diff
changeset
|
2003 | for node_name in node.names: |
76f2b46437a6
Updated to pyflakes 1.0.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4465
diff
changeset
|
2004 | node_value = Assignment(node_name, node) |
76f2b46437a6
Updated to pyflakes 1.0.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4465
diff
changeset
|
2005 | |
76f2b46437a6
Updated to pyflakes 1.0.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4465
diff
changeset
|
2006 | # Remove UndefinedName messages already reported for this name. |
7064
1010f737def2
pyflakes: upgraded to version 2.1.1 plus repository changes to fix some issues (until 2019-07-09).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7060
diff
changeset
|
2007 | # TODO: if the global is not used in this scope, it does not |
5067
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
2008 | # become a globally defined name. See test_unused_global. |
4502
76f2b46437a6
Updated to pyflakes 1.0.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4465
diff
changeset
|
2009 | self.messages = [ |
76f2b46437a6
Updated to pyflakes 1.0.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4465
diff
changeset
|
2010 | m for m in self.messages if not |
5065
39f27a2a2ea3
Little fix in the pyflakes checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4631
diff
changeset
|
2011 | isinstance(m, messages.UndefinedName) or |
39f27a2a2ea3
Little fix in the pyflakes checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4631
diff
changeset
|
2012 | m.message_args[0] != node_name] |
4502
76f2b46437a6
Updated to pyflakes 1.0.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4465
diff
changeset
|
2013 | |
76f2b46437a6
Updated to pyflakes 1.0.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4465
diff
changeset
|
2014 | # Bind name to global scope if it doesn't exist already. |
76f2b46437a6
Updated to pyflakes 1.0.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4465
diff
changeset
|
2015 | global_scope.setdefault(node_name, node_value) |
76f2b46437a6
Updated to pyflakes 1.0.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4465
diff
changeset
|
2016 | |
76f2b46437a6
Updated to pyflakes 1.0.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4465
diff
changeset
|
2017 | # Bind name to non-global scopes, but as already "used". |
76f2b46437a6
Updated to pyflakes 1.0.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4465
diff
changeset
|
2018 | node_value.used = (global_scope, node) |
76f2b46437a6
Updated to pyflakes 1.0.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4465
diff
changeset
|
2019 | for scope in self.scopeStack[global_scope_index + 1:]: |
76f2b46437a6
Updated to pyflakes 1.0.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4465
diff
changeset
|
2020 | scope[node_name] = node_value |
2571
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
2021 | |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
2022 | NONLOCAL = GLOBAL |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
2023 | |
3177
5af61402d74d
Update pyflakes to 0.7.3
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3159
diff
changeset
|
2024 | def GENERATOREXP(self, node): |
5af61402d74d
Update pyflakes to 0.7.3
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3159
diff
changeset
|
2025 | self.pushScope(GeneratorScope) |
3544
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
2026 | self.handleChildren(node) |
3177
5af61402d74d
Update pyflakes to 0.7.3
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3159
diff
changeset
|
2027 | self.popScope() |
2571
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
2028 | |
4502
76f2b46437a6
Updated to pyflakes 1.0.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4465
diff
changeset
|
2029 | LISTCOMP = handleChildren if PY2 else GENERATOREXP |
76f2b46437a6
Updated to pyflakes 1.0.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4465
diff
changeset
|
2030 | |
3544
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
2031 | DICTCOMP = SETCOMP = GENERATOREXP |
2571
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
2032 | |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
2033 | def NAME(self, node): |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
2034 | """ |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
2035 | Handle occurrence of Name (which can be a load/store/delete access.) |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
2036 | """ |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
2037 | # Locate the name in locals / function / globals scopes. |
7617
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
2038 | if isinstance(node.ctx, ast.Load): |
2571
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
2039 | self.handleNodeLoad(node) |
6742
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
2040 | if (node.id == 'locals' and isinstance(self.scope, FunctionScope) and |
7395
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
2041 | isinstance(node._pyflakes_parent, ast.Call)): |
3177
5af61402d74d
Update pyflakes to 0.7.3
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3159
diff
changeset
|
2042 | # we are doing locals() call in current scope |
5af61402d74d
Update pyflakes to 0.7.3
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3159
diff
changeset
|
2043 | self.scope.usesLocals = True |
7617
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
2044 | elif isinstance(node.ctx, ast.Store): |
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
2045 | self.handleNodeStore(node) |
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
2046 | elif PY2 and isinstance(node.ctx, ast.Param): |
2571
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
2047 | self.handleNodeStore(node) |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
2048 | elif isinstance(node.ctx, ast.Del): |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
2049 | self.handleNodeDelete(node) |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
2050 | else: |
6742
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
2051 | # Unknown context |
2571
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
2052 | raise RuntimeError("Got impossible expression context: %r" % (node.ctx,)) |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
2053 | |
5067
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
2054 | def CONTINUE(self, node): |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
2055 | # Walk the tree up until we see a loop (OK), a function or class |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
2056 | # definition (not OK), for 'continue', a finally block (not OK), or |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
2057 | # the top module scope (not OK) |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
2058 | n = node |
7395
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
2059 | while hasattr(n, '_pyflakes_parent'): |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
2060 | n, n_child = n._pyflakes_parent, n |
5067
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
2061 | if isinstance(n, LOOP_TYPES): |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
2062 | # Doesn't apply unless it's in the loop itself |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
2063 | if n_child not in n.orelse: |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
2064 | return |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
2065 | if isinstance(n, (ast.FunctionDef, ast.ClassDef)): |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
2066 | break |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
2067 | # Handle Try/TryFinally difference in Python < and >= 3.3 |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
2068 | if hasattr(n, 'finalbody') and isinstance(node, ast.Continue): |
7395
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
2069 | if n_child in n.finalbody and not PY38_PLUS: |
5067
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
2070 | self.report(messages.ContinueInFinally, node) |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
2071 | return |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
2072 | if isinstance(node, ast.Continue): |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
2073 | self.report(messages.ContinueOutsideLoop, node) |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
2074 | else: # ast.Break |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
2075 | self.report(messages.BreakOutsideLoop, node) |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
2076 | |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
2077 | BREAK = CONTINUE |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
2078 | |
3544
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
2079 | def RETURN(self, node): |
5067
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
2080 | if isinstance(self.scope, (ClassScope, ModuleScope)): |
4502
76f2b46437a6
Updated to pyflakes 1.0.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4465
diff
changeset
|
2081 | self.report(messages.ReturnOutsideFunction, node) |
76f2b46437a6
Updated to pyflakes 1.0.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4465
diff
changeset
|
2082 | return |
76f2b46437a6
Updated to pyflakes 1.0.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4465
diff
changeset
|
2083 | |
3889
9357550095a1
Fixed an issue in the pyflakes checker module (taken from Github).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3670
diff
changeset
|
2084 | if ( |
9357550095a1
Fixed an issue in the pyflakes checker module (taken from Github).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3670
diff
changeset
|
2085 | node.value and |
9357550095a1
Fixed an issue in the pyflakes checker module (taken from Github).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3670
diff
changeset
|
2086 | hasattr(self.scope, 'returnValue') and |
9357550095a1
Fixed an issue in the pyflakes checker module (taken from Github).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3670
diff
changeset
|
2087 | not self.scope.returnValue |
9357550095a1
Fixed an issue in the pyflakes checker module (taken from Github).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3670
diff
changeset
|
2088 | ): |
3544
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
2089 | self.scope.returnValue = node.value |
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
2090 | self.handleNode(node.value, node) |
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
2091 | |
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
2092 | def YIELD(self, node): |
5067
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
2093 | if isinstance(self.scope, (ClassScope, ModuleScope)): |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
2094 | self.report(messages.YieldOutsideFunction, node) |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
2095 | return |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
2096 | |
3544
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
2097 | self.scope.isGenerator = True |
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
2098 | self.handleNode(node.value, node) |
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
2099 | |
4502
76f2b46437a6
Updated to pyflakes 1.0.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4465
diff
changeset
|
2100 | AWAIT = YIELDFROM = YIELD |
3544
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
2101 | |
2571
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
2102 | def FUNCTIONDEF(self, node): |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
2103 | for deco in node.decorator_list: |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
2104 | self.handleNode(deco, node) |
3544
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
2105 | self.LAMBDA(node) |
2571
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
2106 | self.addBinding(node, FunctionDefinition(node.name, node)) |
5067
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
2107 | # doctest does not process doctest within a doctest, |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
2108 | # or in nested functions. |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
2109 | if (self.withDoctest and |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
2110 | not self._in_doctest() and |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
2111 | not isinstance(self.scope, FunctionScope)): |
3177
5af61402d74d
Update pyflakes to 0.7.3
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3159
diff
changeset
|
2112 | self.deferFunction(lambda: self.handleDoctests(node)) |
2571
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
2113 | |
4465
2fbb5bdb8ddf
Prepared eric for Python 3.5 to support the new 'async def' function definition.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
2114 | ASYNCFUNCTIONDEF = FUNCTIONDEF |
2fbb5bdb8ddf
Prepared eric for Python 3.5 to support the new 'async def' function definition.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
2115 | |
2571
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
2116 | def LAMBDA(self, node): |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
2117 | args = [] |
3544
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
2118 | annotations = [] |
2571
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
2119 | |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
2120 | if PY2: |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
2121 | def addArgs(arglist): |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
2122 | for arg in arglist: |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
2123 | if isinstance(arg, ast.Tuple): |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
2124 | addArgs(arg.elts) |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
2125 | else: |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
2126 | args.append(arg.id) |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
2127 | addArgs(node.args.args) |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
2128 | defaults = node.args.defaults |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
2129 | else: |
7395
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
2130 | if PY38_PLUS: |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
2131 | for arg in node.args.posonlyargs: |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
2132 | args.append(arg.arg) |
dd50d0f4c588
pyflakes: updated to repository as of 2020-02-03.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7360
diff
changeset
|
2133 | annotations.append(arg.annotation) |
2571
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
2134 | for arg in node.args.args + node.args.kwonlyargs: |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
2135 | args.append(arg.arg) |
3544
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
2136 | annotations.append(arg.annotation) |
2571
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
2137 | defaults = node.args.defaults + node.args.kw_defaults |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
2138 | |
3544
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
2139 | # Only for Python3 FunctionDefs |
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
2140 | is_py3_func = hasattr(node, 'returns') |
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
2141 | |
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
2142 | for arg_name in ('vararg', 'kwarg'): |
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
2143 | wildcard = getattr(node.args, arg_name) |
2571
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
2144 | if not wildcard: |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
2145 | continue |
6353
6a0f3abd6878
upgraded pyflakes to version 2.0.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
2146 | args.append(wildcard if PY2 else wildcard.arg) |
3544
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
2147 | if is_py3_func: |
6353
6a0f3abd6878
upgraded pyflakes to version 2.0.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
2148 | if PY2: # Python 2.7 |
3544
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
2149 | argannotation = arg_name + 'annotation' |
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
2150 | annotations.append(getattr(node.args, argannotation)) |
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
2151 | else: # Python >= 3.4 |
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
2152 | annotations.append(wildcard.annotation) |
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
2153 | |
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
2154 | if is_py3_func: |
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
2155 | annotations.append(node.returns) |
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
2156 | |
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
2157 | if len(set(args)) < len(args): |
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
2158 | for (idx, arg) in enumerate(args): |
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
2159 | if arg in args[:idx]: |
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
2160 | self.report(messages.DuplicateArgument, node, arg) |
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
2161 | |
6353
6a0f3abd6878
upgraded pyflakes to version 2.0.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
2162 | for annotation in annotations: |
6a0f3abd6878
upgraded pyflakes to version 2.0.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
2163 | self.handleAnnotation(annotation, node) |
6a0f3abd6878
upgraded pyflakes to version 2.0.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
2164 | |
6a0f3abd6878
upgraded pyflakes to version 2.0.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
2165 | for default in defaults: |
6a0f3abd6878
upgraded pyflakes to version 2.0.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
2166 | self.handleNode(default, node) |
2571
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
2167 | |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
2168 | def runFunction(): |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
2169 | |
3177
5af61402d74d
Update pyflakes to 0.7.3
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3159
diff
changeset
|
2170 | self.pushScope() |
6742
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
2171 | |
7064
1010f737def2
pyflakes: upgraded to version 2.1.1 plus repository changes to fix some issues (until 2019-07-09).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7060
diff
changeset
|
2172 | self.handleChildren(node, omit=['decorator_list', 'returns']) |
2571
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
2173 | |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
2174 | def checkUnusedAssignments(): |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
2175 | """ |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
2176 | Check to see if any assignments have not been used. |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
2177 | """ |
3177
5af61402d74d
Update pyflakes to 0.7.3
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3159
diff
changeset
|
2178 | for name, binding in self.scope.unusedAssignments(): |
5af61402d74d
Update pyflakes to 0.7.3
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3159
diff
changeset
|
2179 | self.report(messages.UnusedVariable, binding.source, name) |
2571
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
2180 | self.deferAssignment(checkUnusedAssignments) |
3544
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
2181 | |
6353
6a0f3abd6878
upgraded pyflakes to version 2.0.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
2182 | if PY2: |
3544
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
2183 | def checkReturnWithArgumentInsideGenerator(): |
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
2184 | """ |
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
2185 | Check to see if there is any return statement with |
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
2186 | arguments but the function is a generator. |
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
2187 | """ |
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
2188 | if self.scope.isGenerator and self.scope.returnValue: |
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
2189 | self.report(messages.ReturnWithArgsInsideGenerator, |
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
2190 | self.scope.returnValue) |
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
2191 | self.deferAssignment(checkReturnWithArgumentInsideGenerator) |
2571
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
2192 | self.popScope() |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
2193 | |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
2194 | self.deferFunction(runFunction) |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
2195 | |
6742
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
2196 | def ARGUMENTS(self, node): |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
2197 | self.handleChildren(node, omit=('defaults', 'kw_defaults')) |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
2198 | if PY2: |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
2199 | scope_node = self.getScopeNode(node) |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
2200 | if node.vararg: |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
2201 | self.addBinding(node, Argument(node.vararg, scope_node)) |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
2202 | if node.kwarg: |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
2203 | self.addBinding(node, Argument(node.kwarg, scope_node)) |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
2204 | |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
2205 | def ARG(self, node): |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
2206 | self.addBinding(node, Argument(node.arg, self.getScopeNode(node))) |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
2207 | |
2571
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
2208 | def CLASSDEF(self, node): |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
2209 | """ |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
2210 | Check names used in a class definition, including its decorators, base |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
2211 | classes, and the body of its definition. Additionally, add its name to |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
2212 | the current scope. |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
2213 | """ |
3177
5af61402d74d
Update pyflakes to 0.7.3
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3159
diff
changeset
|
2214 | for deco in node.decorator_list: |
2571
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
2215 | self.handleNode(deco, node) |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
2216 | for baseNode in node.bases: |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
2217 | self.handleNode(baseNode, node) |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
2218 | if not PY2: |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
2219 | for keywordNode in node.keywords: |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
2220 | self.handleNode(keywordNode, node) |
3177
5af61402d74d
Update pyflakes to 0.7.3
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3159
diff
changeset
|
2221 | self.pushScope(ClassScope) |
5067
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
2222 | # doctest does not process doctest within a doctest |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
2223 | # classes within classes are processed. |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
2224 | if (self.withDoctest and |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
2225 | not self._in_doctest() and |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
2226 | not isinstance(self.scope, FunctionScope)): |
3177
5af61402d74d
Update pyflakes to 0.7.3
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3159
diff
changeset
|
2227 | self.deferFunction(lambda: self.handleDoctests(node)) |
2571
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
2228 | for stmt in node.body: |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
2229 | self.handleNode(stmt, node) |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
2230 | self.popScope() |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
2231 | self.addBinding(node, ClassDefinition(node.name, node)) |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
2232 | |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
2233 | def AUGASSIGN(self, node): |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
2234 | self.handleNodeLoad(node.target) |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
2235 | self.handleNode(node.value, node) |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
2236 | self.handleNode(node.target, node) |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
2237 | |
5067
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
2238 | def TUPLE(self, node): |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
2239 | if not PY2 and isinstance(node.ctx, ast.Store): |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
2240 | # Python 3 advanced tuple unpacking: a, *b, c = d. |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
2241 | # Only one starred expression is allowed, and no more than 1<<8 |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
2242 | # assignments are allowed before a stared expression. There is |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
2243 | # also a limit of 1<<24 expressions after the starred expression, |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
2244 | # which is impossible to test due to memory restrictions, but we |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
2245 | # add it here anyway |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
2246 | has_starred = False |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
2247 | star_loc = -1 |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
2248 | for i, n in enumerate(node.elts): |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
2249 | if isinstance(n, ast.Starred): |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
2250 | if has_starred: |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
2251 | self.report(messages.TwoStarredExpressions, node) |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
2252 | # The SyntaxError doesn't distinguish two from more |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
2253 | # than two. |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
2254 | break |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
2255 | has_starred = True |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
2256 | star_loc = i |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
2257 | if star_loc >= 1 << 8 or len(node.elts) - star_loc - 1 >= 1 << 24: |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
2258 | self.report(messages.TooManyExpressionsInStarredAssignment, node) |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
2259 | self.handleChildren(node) |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
2260 | |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
2261 | LIST = TUPLE |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
2262 | |
2571
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
2263 | def IMPORT(self, node): |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
2264 | for alias in node.names: |
5067
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
2265 | if '.' in alias.name and not alias.asname: |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
2266 | importation = SubmoduleImportation(alias.name, node) |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
2267 | else: |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
2268 | name = alias.asname or alias.name |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
2269 | importation = Importation(name, node, alias.name) |
2571
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
2270 | self.addBinding(node, importation) |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
2271 | |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
2272 | def IMPORTFROM(self, node): |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
2273 | if node.module == '__future__': |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
2274 | if not self.futuresAllowed: |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
2275 | self.report(messages.LateFutureImport, |
3177
5af61402d74d
Update pyflakes to 0.7.3
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3159
diff
changeset
|
2276 | node, [n.name for n in node.names]) |
2571
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
2277 | else: |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
2278 | self.futuresAllowed = False |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
2279 | |
5067
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
2280 | module = ('.' * node.level) + (node.module or '') |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
2281 | |
2571
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
2282 | for alias in node.names: |
5067
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
2283 | name = alias.asname or alias.name |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
2284 | if node.module == '__future__': |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
2285 | importation = FutureImportation(name, node, self.scope) |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
2286 | if alias.name not in __future__.all_feature_names: |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
2287 | self.report(messages.FutureFeatureNotDefined, |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
2288 | node, alias.name) |
6742
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
2289 | if alias.name == 'annotations': |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
2290 | self.annotationsFutureEnabled = True |
5067
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
2291 | elif alias.name == '*': |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
2292 | # Only Python 2, local import * is a SyntaxWarning |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
2293 | if not PY2 and not isinstance(self.scope, ModuleScope): |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
2294 | self.report(messages.ImportStarNotPermitted, |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
2295 | node, module) |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
2296 | continue |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
2297 | |
2571
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
2298 | self.scope.importStarred = True |
5067
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
2299 | self.report(messages.ImportStarUsed, node, module) |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
2300 | importation = StarImportation(module, node) |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
2301 | else: |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
2302 | importation = ImportationFrom(name, node, |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
2303 | module, alias.name) |
2571
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
2304 | self.addBinding(node, importation) |
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
2305 | |
3177
5af61402d74d
Update pyflakes to 0.7.3
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3159
diff
changeset
|
2306 | def TRY(self, node): |
5af61402d74d
Update pyflakes to 0.7.3
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3159
diff
changeset
|
2307 | handler_names = [] |
5af61402d74d
Update pyflakes to 0.7.3
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3159
diff
changeset
|
2308 | # List the exception handlers |
5067
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
2309 | for i, handler in enumerate(node.handlers): |
3177
5af61402d74d
Update pyflakes to 0.7.3
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3159
diff
changeset
|
2310 | if isinstance(handler.type, ast.Tuple): |
5af61402d74d
Update pyflakes to 0.7.3
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3159
diff
changeset
|
2311 | for exc_type in handler.type.elts: |
5af61402d74d
Update pyflakes to 0.7.3
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3159
diff
changeset
|
2312 | handler_names.append(getNodeName(exc_type)) |
5af61402d74d
Update pyflakes to 0.7.3
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3159
diff
changeset
|
2313 | elif handler.type: |
5af61402d74d
Update pyflakes to 0.7.3
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3159
diff
changeset
|
2314 | handler_names.append(getNodeName(handler.type)) |
5067
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
2315 | |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
2316 | if handler.type is None and i < len(node.handlers) - 1: |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
2317 | self.report(messages.DefaultExceptNotLast, handler) |
3177
5af61402d74d
Update pyflakes to 0.7.3
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3159
diff
changeset
|
2318 | # Memorize the except handlers and process the body |
5af61402d74d
Update pyflakes to 0.7.3
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3159
diff
changeset
|
2319 | self.exceptHandlers.append(handler_names) |
5af61402d74d
Update pyflakes to 0.7.3
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3159
diff
changeset
|
2320 | for child in node.body: |
5af61402d74d
Update pyflakes to 0.7.3
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3159
diff
changeset
|
2321 | self.handleNode(child, node) |
5af61402d74d
Update pyflakes to 0.7.3
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3159
diff
changeset
|
2322 | self.exceptHandlers.pop() |
5af61402d74d
Update pyflakes to 0.7.3
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3159
diff
changeset
|
2323 | # Process the other nodes: "except:", "else:", "finally:" |
3544
431c842fd09a
updated pyflakes to version 0.8.1 (Python 3.4.0 compatible)
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3456
diff
changeset
|
2324 | self.handleChildren(node, omit='body') |
3177
5af61402d74d
Update pyflakes to 0.7.3
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3159
diff
changeset
|
2325 | |
5af61402d74d
Update pyflakes to 0.7.3
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3159
diff
changeset
|
2326 | TRYEXCEPT = TRY |
5af61402d74d
Update pyflakes to 0.7.3
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3159
diff
changeset
|
2327 | |
2571
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
2328 | def EXCEPTHANDLER(self, node): |
5067
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
2329 | if PY2 or node.name is None: |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
2330 | self.handleChildren(node) |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
2331 | return |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
2332 | |
6353
6a0f3abd6878
upgraded pyflakes to version 2.0.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
2333 | # If the name already exists in the scope, modify state of existing |
6a0f3abd6878
upgraded pyflakes to version 2.0.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
2334 | # binding. |
6a0f3abd6878
upgraded pyflakes to version 2.0.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
2335 | if node.name in self.scope: |
6a0f3abd6878
upgraded pyflakes to version 2.0.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
2336 | self.handleNodeStore(node) |
6a0f3abd6878
upgraded pyflakes to version 2.0.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
2337 | |
6a0f3abd6878
upgraded pyflakes to version 2.0.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
2338 | # 3.x: the name of the exception, which is not a Name node, but a |
6a0f3abd6878
upgraded pyflakes to version 2.0.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
2339 | # simple string, creates a local that is only bound within the scope of |
6a0f3abd6878
upgraded pyflakes to version 2.0.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
2340 | # the except: block. As such, temporarily remove the existing binding |
6a0f3abd6878
upgraded pyflakes to version 2.0.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
2341 | # to more accurately determine if the name is used in the except: |
6a0f3abd6878
upgraded pyflakes to version 2.0.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
2342 | # block. |
5067
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
2343 | |
6742
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
2344 | try: |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
2345 | prev_definition = self.scope.pop(node.name) |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
2346 | except KeyError: |
6353
6a0f3abd6878
upgraded pyflakes to version 2.0.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
2347 | prev_definition = None |
5067
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
2348 | |
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
2349 | self.handleNodeStore(node) |
2571
e6bb19eb87ea
Fixes for autocodecheck with pyflakes and update of py2flakes to 0.6.1.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
diff
changeset
|
2350 | self.handleChildren(node) |
6353
6a0f3abd6878
upgraded pyflakes to version 2.0.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
2351 | |
6a0f3abd6878
upgraded pyflakes to version 2.0.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
2352 | # See discussion on https://github.com/PyCQA/pyflakes/pull/59 |
6a0f3abd6878
upgraded pyflakes to version 2.0.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
2353 | |
6a0f3abd6878
upgraded pyflakes to version 2.0.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
2354 | # We're removing the local name since it's being unbound after leaving |
6a0f3abd6878
upgraded pyflakes to version 2.0.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
2355 | # the except: block and it's always unbound if the except: block is |
6a0f3abd6878
upgraded pyflakes to version 2.0.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
2356 | # never entered. This will cause an "undefined name" error raised if |
6a0f3abd6878
upgraded pyflakes to version 2.0.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
2357 | # the checked code tries to use the name afterwards. |
6a0f3abd6878
upgraded pyflakes to version 2.0.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
2358 | # |
6a0f3abd6878
upgraded pyflakes to version 2.0.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
2359 | # Unless it's been removed already. Then do nothing. |
5067
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
2360 | |
6353
6a0f3abd6878
upgraded pyflakes to version 2.0.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
2361 | try: |
6a0f3abd6878
upgraded pyflakes to version 2.0.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
2362 | binding = self.scope.pop(node.name) |
6a0f3abd6878
upgraded pyflakes to version 2.0.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
2363 | except KeyError: |
6a0f3abd6878
upgraded pyflakes to version 2.0.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
2364 | pass |
6a0f3abd6878
upgraded pyflakes to version 2.0.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
2365 | else: |
6a0f3abd6878
upgraded pyflakes to version 2.0.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
2366 | if not binding.used: |
6a0f3abd6878
upgraded pyflakes to version 2.0.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
2367 | self.report(messages.UnusedVariable, node, node.name) |
5067
e2f171f08af8
Updated pyflakes to 1.2.3+.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5065
diff
changeset
|
2368 | |
6353
6a0f3abd6878
upgraded pyflakes to version 2.0.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
2369 | # Restore. |
6a0f3abd6878
upgraded pyflakes to version 2.0.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
2370 | if prev_definition: |
6742
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
2371 | self.scope[node.name] = prev_definition |
4555
861e1741985c
Adjustments to future imports for Python 2 compatibility.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
4502
diff
changeset
|
2372 | |
5510
cdcd0cd34e79
Upgraded pyflakes to version 1.5.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
5389
diff
changeset
|
2373 | def ANNASSIGN(self, node): |
8208
37836fa8e4ea
Updated pyflakes to 2.3.1 and pycodestyle to 2.7.0.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
7960
diff
changeset
|
2374 | self.handleNode(node.target, node) |
6353
6a0f3abd6878
upgraded pyflakes to version 2.0.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6048
diff
changeset
|
2375 | self.handleAnnotation(node.annotation, node) |
5510
cdcd0cd34e79
Upgraded pyflakes to version 1.5.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
5389
diff
changeset
|
2376 | if node.value: |
cdcd0cd34e79
Upgraded pyflakes to version 1.5.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
5389
diff
changeset
|
2377 | # If the assignment has value, handle the *value* now. |
cdcd0cd34e79
Upgraded pyflakes to version 1.5.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
5389
diff
changeset
|
2378 | self.handleNode(node.value, node) |
cdcd0cd34e79
Upgraded pyflakes to version 1.5.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
5389
diff
changeset
|
2379 | |
6742
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
2380 | def COMPARE(self, node): |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
2381 | left = node.left |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
2382 | for op, right in zip(node.ops, node.comparators): |
7617
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
2383 | if ( |
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
2384 | isinstance(op, (ast.Is, ast.IsNot)) and ( |
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
2385 | _is_const_non_singleton(left) or |
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
2386 | _is_const_non_singleton(right) |
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
2387 | ) |
a0e162a50ad7
Syntax Checker: updated pyflakes to version 2.2.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7395
diff
changeset
|
2388 | ): |
6742
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
2389 | self.report(messages.IsLiteral, node) |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
2390 | left = right |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
2391 | |
7cb30f7f94f6
Upgraded pyflakes to 2.1.0
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
2392 | self.handleChildren(node) |