Sat, 26 Apr 2025 12:34:32 +0200
MicroPython
- Added a configuration option to disable the support for the no longer produced Pimoroni Pico Wireless Pack.
0
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1 | # -*- coding: utf-8 -*- |
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
2 | |
11090
f5f5f5803935
Updated copyright for 2025.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10704
diff
changeset
|
3 | # Copyright (c) 2005 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> |
0
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
4 | # |
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
5 | |
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
6 | """ |
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
7 | Parse a Python file and retrieve classes, functions/methods and attributes. |
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
8 | |
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
9 | Parse enough of a Python file to recognize class and method definitions and |
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
10 | to find out the superclasses of a class as well as its attributes. |
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
11 | """ |
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
12 | |
10216
c07a1ef5c5d3
Extended the Python code scanners to be compatible with Python 3.12.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10050
diff
changeset
|
13 | import keyword |
9473
3f23dbf37dbe
Resorted the import statements using isort.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9413
diff
changeset
|
14 | import re |
0
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
15 | import sys |
9473
3f23dbf37dbe
Resorted the import statements using isort.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9413
diff
changeset
|
16 | |
9500
5771348ded12
Corrected some code style issues and changed some suppressed code style issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9490
diff
changeset
|
17 | from dataclasses import dataclass |
7699
d338c533f5f0
Class browsers: improved endline detection for the Python, IDL and ProtoBuf source code browsers and the Python module parser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7698
diff
changeset
|
18 | from functools import reduce |
0
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
19 | |
9693
a7e9fd398e5a
Fixed an issue causing eric to freeze if a file had a certain contents by replacing the use of Python re with QRegularExpression.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9653
diff
changeset
|
20 | from PyQt6.QtCore import QRegularExpression |
a7e9fd398e5a
Fixed an issue causing eric to freeze if a file had a certain contents by replacing the use of Python re with QRegularExpression.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9653
diff
changeset
|
21 | |
9413
80c06d472826
Changed the eric7 import statements to include the package name (i.e. eric7) in order to not fiddle with sys.path.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9221
diff
changeset
|
22 | from eric7 import Utilities |
10592
2bada76be1a6
Adapted the file browser incl. the class browsers to support the 'eric-ide' server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10477
diff
changeset
|
23 | from eric7.EricWidgets.EricApplication import ericApp |
2bada76be1a6
Adapted the file browser incl. the class browsers to support the 'eric-ide' server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10477
diff
changeset
|
24 | from eric7.SystemUtilities import FileSystemUtilities |
9413
80c06d472826
Changed the eric7 import statements to include the package name (i.e. eric7) in order to not fiddle with sys.path.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9221
diff
changeset
|
25 | from eric7.Utilities import ClassBrowsers |
9473
3f23dbf37dbe
Resorted the import statements using isort.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9413
diff
changeset
|
26 | |
12
1d8dd9706f46
First commit after changing to Python 3.1.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
0
diff
changeset
|
27 | from . import ClbrBaseClasses |
0
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
28 | |
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
29 | TABWIDTH = 4 |
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
30 | |
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
31 | SUPPORTED_TYPES = [ClassBrowsers.PY_SOURCE, ClassBrowsers.PTL_SOURCE] |
4461
3634459f8011
Added TODOs for Python 3.5.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4435
diff
changeset
|
32 | |
9693
a7e9fd398e5a
Fixed an issue causing eric to freeze if a file had a certain contents by replacing the use of Python re with QRegularExpression.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9653
diff
changeset
|
33 | _getnext = QRegularExpression( |
4830
f609a22f43bd
Fixed a few code style issues detected by the updated pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4631
diff
changeset
|
34 | r""" |
7690
a59680062837
Continued implementing the editor outline widget.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7685
diff
changeset
|
35 | (?P<CodingLine> |
a59680062837
Continued implementing the editor outline widget.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7685
diff
changeset
|
36 | ^ \# \s* [*_-]* \s* coding[:=] \s* (?P<Coding> [-\w_.]+ ) \s* [*_-]* $ |
a59680062837
Continued implementing the editor outline widget.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7685
diff
changeset
|
37 | ) |
a59680062837
Continued implementing the editor outline widget.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7685
diff
changeset
|
38 | |
a59680062837
Continued implementing the editor outline widget.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7685
diff
changeset
|
39 | | (?P<String> |
6815
b1b833693a38
pyclbr, ModuleParser: reworked the fix contributed by Tobias and fixed an issue introduced by it.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6813
diff
changeset
|
40 | \# .*? $ # ignore everything in comments |
6813
7f4cfe76b90c
Ignore triple quotes in comments.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
41 | | |
7f4cfe76b90c
Ignore triple quotes in comments.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
42 | \""" [^"\\]* (?: |
0
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
43 | (?: \\. | "(?!"") ) |
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
44 | [^"\\]* |
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
45 | )* |
6813
7f4cfe76b90c
Ignore triple quotes in comments.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
6645
diff
changeset
|
46 | \""" |
0
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
47 | |
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
48 | | ''' [^'\\]* (?: |
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
49 | (?: \\. | '(?!'') ) |
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
50 | [^'\\]* |
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
51 | )* |
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
52 | ''' |
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
53 | |
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
54 | | " [^"\\\n]* (?: \\. [^"\\\n]*)* " |
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
55 | |
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
56 | | ' [^'\\\n]* (?: \\. [^'\\\n]*)* ' |
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
57 | ) |
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
58 | |
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
59 | | (?P<Publics> |
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
60 | ^ |
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
61 | [ \t]* __all__ [ \t]* = [ \t]* \[ |
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
62 | (?P<Identifiers> [^\]]*? ) |
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
63 | \] |
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
64 | ) |
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
65 | |
1227
c5db073a124f
Added support for class attributes, class methods and static methods to the class browsers and the source documentor.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
945
diff
changeset
|
66 | | (?P<MethodModifier> |
c5db073a124f
Added support for class attributes, class methods and static methods to the class browsers and the source documentor.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
945
diff
changeset
|
67 | ^ |
c5db073a124f
Added support for class attributes, class methods and static methods to the class browsers and the source documentor.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
945
diff
changeset
|
68 | (?P<MethodModifierIndent> [ \t]* ) |
c5db073a124f
Added support for class attributes, class methods and static methods to the class browsers and the source documentor.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
945
diff
changeset
|
69 | (?P<MethodModifierType> @classmethod | @staticmethod ) |
c5db073a124f
Added support for class attributes, class methods and static methods to the class browsers and the source documentor.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
945
diff
changeset
|
70 | ) |
c5db073a124f
Added support for class attributes, class methods and static methods to the class browsers and the source documentor.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
945
diff
changeset
|
71 | |
0
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
72 | | (?P<Method> |
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
73 | ^ |
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
74 | (?P<MethodIndent> [ \t]* ) |
8131 | 75 | (?: async [ \t]+ )? (?: cdef | cpdef | def) [ \t]+ |
10477
11b5d533e4a2
pyclbr, ModuleParser
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10471
diff
changeset
|
76 | (?P<MethodName> [\pL_] \w* ) |
10216
c07a1ef5c5d3
Extended the Python code scanners to be compatible with Python 3.12.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10050
diff
changeset
|
77 | (?: [ \t]* \[ [^\]]+ \] )? |
0
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
78 | [ \t]* \( |
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
79 | (?P<MethodSignature> (?: [^)] | \)[ \t]*,? )*? ) |
3966
969a3d41c402
Added code to correctly parse Python methods/functions containing return annotations.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3591
diff
changeset
|
80 | \) [ \t]* |
969a3d41c402
Added code to correctly parse Python methods/functions containing return annotations.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3591
diff
changeset
|
81 | (?P<MethodReturnAnnotation> (?: -> [ \t]* [^:]+ )? ) |
969a3d41c402
Added code to correctly parse Python methods/functions containing return annotations.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3591
diff
changeset
|
82 | [ \t]* : |
0
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
83 | ) |
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
84 | |
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
85 | | (?P<Class> |
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
86 | ^ |
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
87 | (?P<ClassIndent> [ \t]* ) |
8131 | 88 | (?: cdef [ \t]+ )? |
0
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
89 | class [ \t]+ |
10477
11b5d533e4a2
pyclbr, ModuleParser
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10471
diff
changeset
|
90 | (?P<ClassName> [\pL_] \w* ) |
10216
c07a1ef5c5d3
Extended the Python code scanners to be compatible with Python 3.12.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10050
diff
changeset
|
91 | (?: [ \t]* \[ [^\]]+ \] )? |
0
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
92 | [ \t]* |
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
93 | (?P<ClassSupers> \( [^)]* \) )? |
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
94 | [ \t]* : |
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
95 | ) |
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
96 | |
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
97 | | (?P<Attribute> |
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
98 | ^ |
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
99 | (?P<AttributeIndent> [ \t]* ) |
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
100 | self [ \t]* \. [ \t]* |
10477
11b5d533e4a2
pyclbr, ModuleParser
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10471
diff
changeset
|
101 | (?P<AttributeName> [\pL_] \w* ) |
0
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
102 | [ \t]* = |
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
103 | ) |
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
104 | |
10477
11b5d533e4a2
pyclbr, ModuleParser
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10471
diff
changeset
|
105 | | (?P<TypedAttribute> |
11b5d533e4a2
pyclbr, ModuleParser
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10471
diff
changeset
|
106 | ^ |
11b5d533e4a2
pyclbr, ModuleParser
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10471
diff
changeset
|
107 | (?P<TypedAttributeIndent> [ \t]* ) |
11b5d533e4a2
pyclbr, ModuleParser
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10471
diff
changeset
|
108 | self [ \t]* \. [ \t]* |
11b5d533e4a2
pyclbr, ModuleParser
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10471
diff
changeset
|
109 | (?P<TypedAttributeName> [\pL_] \w* ) |
11b5d533e4a2
pyclbr, ModuleParser
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10471
diff
changeset
|
110 | [ \t]* : [ \t]+ |
11b5d533e4a2
pyclbr, ModuleParser
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10471
diff
changeset
|
111 | ) |
11b5d533e4a2
pyclbr, ModuleParser
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10471
diff
changeset
|
112 | |
0
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
113 | | (?P<Variable> |
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
114 | ^ |
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
115 | (?P<VariableIndent> [ \t]* ) |
10477
11b5d533e4a2
pyclbr, ModuleParser
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10471
diff
changeset
|
116 | (?P<VariableName> [\pL_] \w* ) |
0
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
117 | [ \t]* = |
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
118 | ) |
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
119 | |
10216
c07a1ef5c5d3
Extended the Python code scanners to be compatible with Python 3.12.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10050
diff
changeset
|
120 | | (?P<TypedVariable> |
c07a1ef5c5d3
Extended the Python code scanners to be compatible with Python 3.12.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10050
diff
changeset
|
121 | ^ |
c07a1ef5c5d3
Extended the Python code scanners to be compatible with Python 3.12.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10050
diff
changeset
|
122 | (?P<TypedVariableIndent> [ \t]* ) |
10477
11b5d533e4a2
pyclbr, ModuleParser
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10471
diff
changeset
|
123 | (?P<TypedVariableName> [\pL_] \w* ) |
10471
28d4780d6a66
Reverted two changes done yesterday.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10468
diff
changeset
|
124 | [ \t]* : |
10216
c07a1ef5c5d3
Extended the Python code scanners to be compatible with Python 3.12.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10050
diff
changeset
|
125 | ) |
c07a1ef5c5d3
Extended the Python code scanners to be compatible with Python 3.12.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10050
diff
changeset
|
126 | |
6552
ea16b851fdab
ModuleParser, pyclbr: fixed an issue parsing Python source files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6048
diff
changeset
|
127 | | (?P<Main> |
ea16b851fdab
ModuleParser, pyclbr: fixed an issue parsing Python source files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6048
diff
changeset
|
128 | ^ |
ea16b851fdab
ModuleParser, pyclbr: fixed an issue parsing Python source files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6048
diff
changeset
|
129 | if \s+ __name__ \s* == \s* [^:]+ : $ |
ea16b851fdab
ModuleParser, pyclbr: fixed an issue parsing Python source files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6048
diff
changeset
|
130 | ) |
ea16b851fdab
ModuleParser, pyclbr: fixed an issue parsing Python source files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6048
diff
changeset
|
131 | |
0
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
132 | | (?P<ConditionalDefine> |
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
133 | ^ |
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
134 | (?P<ConditionalDefineIndent> [ \t]* ) |
4465
2fbb5bdb8ddf
Prepared eric for Python 3.5 to support the new 'async def' function definition.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4461
diff
changeset
|
135 | (?: (?: if | elif ) [ \t]+ [^:]* | else [ \t]* ) : |
2fbb5bdb8ddf
Prepared eric for Python 3.5 to support the new 'async def' function definition.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4461
diff
changeset
|
136 | (?= \s* (?: async [ \t]+ )? def) |
0
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
137 | ) |
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
138 | |
4183
856ba07de877
Added capability to show imports of a Python script.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
139 | | (?P<Import> |
8131 | 140 | ^ [ \t]* (?: c? import | from [ \t]+ \. [ \t]+ c? import ) [ \t]+ |
4183
856ba07de877
Added capability to show imports of a Python script.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
141 | (?P<ImportList> (?: [^#;\\\n]* (?: \\\n )* )* ) |
856ba07de877
Added capability to show imports of a Python script.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
142 | ) |
856ba07de877
Added capability to show imports of a Python script.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
143 | |
856ba07de877
Added capability to show imports of a Python script.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
144 | | (?P<ImportFrom> |
856ba07de877
Added capability to show imports of a Python script.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
145 | ^ [ \t]* from [ \t]+ |
856ba07de877
Added capability to show imports of a Python script.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
146 | (?P<ImportFromPath> |
856ba07de877
Added capability to show imports of a Python script.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
147 | \.* \w+ |
856ba07de877
Added capability to show imports of a Python script.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
148 | (?: |
856ba07de877
Added capability to show imports of a Python script.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
149 | [ \t]* \. [ \t]* \w+ |
856ba07de877
Added capability to show imports of a Python script.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
150 | )* |
856ba07de877
Added capability to show imports of a Python script.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
151 | ) |
856ba07de877
Added capability to show imports of a Python script.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
152 | [ \t]+ |
8131 | 153 | c? import [ \t]+ |
4183
856ba07de877
Added capability to show imports of a Python script.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
154 | (?P<ImportFromList> |
856ba07de877
Added capability to show imports of a Python script.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
155 | (?: \( \s* .*? \s* \) ) |
856ba07de877
Added capability to show imports of a Python script.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
156 | | |
856ba07de877
Added capability to show imports of a Python script.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
157 | (?: [^#;\\\n]* (?: \\\n )* )* ) |
4435
9f6555d3c3c0
Fixed some code style issues and removed code no longer needed.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4183
diff
changeset
|
158 | )""", |
9693
a7e9fd398e5a
Fixed an issue causing eric to freeze if a file had a certain contents by replacing the use of Python re with QRegularExpression.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9653
diff
changeset
|
159 | QRegularExpression.PatternOption.MultilineOption |
a7e9fd398e5a
Fixed an issue causing eric to freeze if a file had a certain contents by replacing the use of Python re with QRegularExpression.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9653
diff
changeset
|
160 | | QRegularExpression.PatternOption.DotMatchesEverythingOption |
a7e9fd398e5a
Fixed an issue causing eric to freeze if a file had a certain contents by replacing the use of Python re with QRegularExpression.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9653
diff
changeset
|
161 | | QRegularExpression.PatternOption.ExtendedPatternSyntaxOption |
a7e9fd398e5a
Fixed an issue causing eric to freeze if a file had a certain contents by replacing the use of Python re with QRegularExpression.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9653
diff
changeset
|
162 | | QRegularExpression.PatternOption.UseUnicodePropertiesOption, |
a7e9fd398e5a
Fixed an issue causing eric to freeze if a file had a certain contents by replacing the use of Python re with QRegularExpression.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9653
diff
changeset
|
163 | ).match |
0
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
164 | |
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
165 | _commentsub = re.compile(r"""#[^\n]*\n|#[^\n]*$""").sub |
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
166 | |
9490
77b8d3a635b7
Changed class browser imports to use importlib.import_module().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9473
diff
changeset
|
167 | |
0
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
168 | class VisibilityMixin(ClbrBaseClasses.ClbrVisibilityMixinBase): |
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
169 | """ |
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
170 | Mixin class implementing the notion of visibility. |
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
171 | """ |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
172 | |
0
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
173 | def __init__(self): |
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
174 | """ |
3591
2f2a4a76dd22
Corrected a bunch of source docu issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3539
diff
changeset
|
175 | Constructor |
0
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
176 | """ |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
177 | if self.name.startswith("__"): |
0
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
178 | self.setPrivate() |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
179 | elif self.name.startswith("_"): |
0
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
180 | self.setProtected() |
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
181 | else: |
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
182 | self.setPublic() |
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
183 | |
945
8cd4d08fa9f6
Made code mostly PEP 8 compliant (except all whitespace and line length).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
791
diff
changeset
|
184 | |
0
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
185 | class Class(ClbrBaseClasses.Class, VisibilityMixin): |
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
186 | """ |
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
187 | Class to represent a Python class. |
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
188 | """ |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
189 | |
10677
6ee2e475490c
Editor Outline, File Browser, Project Browser
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10477
diff
changeset
|
190 | def __init__(self, module, name, superClasses, file, lineno, col_offset=0): |
0
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
191 | """ |
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
192 | Constructor |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
193 | |
0
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
194 | @param module name of the module containing this class |
10433
328f3ec4b77a
Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10216
diff
changeset
|
195 | @type str |
0
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
196 | @param name name of this class |
10433
328f3ec4b77a
Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10216
diff
changeset
|
197 | @type str |
5604
b047181a4a33
Continued fixing code style issues detected by the extended style checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5389
diff
changeset
|
198 | @param superClasses list of class names this class is inherited from |
10433
328f3ec4b77a
Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10216
diff
changeset
|
199 | @type list of str |
10677
6ee2e475490c
Editor Outline, File Browser, Project Browser
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10477
diff
changeset
|
200 | @param file file name containing this class |
10433
328f3ec4b77a
Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10216
diff
changeset
|
201 | @type str |
10677
6ee2e475490c
Editor Outline, File Browser, Project Browser
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10477
diff
changeset
|
202 | @param lineno line number of the class definition |
10433
328f3ec4b77a
Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10216
diff
changeset
|
203 | @type int |
10677
6ee2e475490c
Editor Outline, File Browser, Project Browser
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10477
diff
changeset
|
204 | @param col_offset column number of the class definition (defaults to 0) |
6ee2e475490c
Editor Outline, File Browser, Project Browser
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10477
diff
changeset
|
205 | @type int (optional) |
0
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
206 | """ |
10677
6ee2e475490c
Editor Outline, File Browser, Project Browser
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10477
diff
changeset
|
207 | ClbrBaseClasses.Class.__init__( |
6ee2e475490c
Editor Outline, File Browser, Project Browser
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10477
diff
changeset
|
208 | self, module, name, superClasses, file, lineno, col_offset=col_offset |
6ee2e475490c
Editor Outline, File Browser, Project Browser
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10477
diff
changeset
|
209 | ) |
0
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
210 | VisibilityMixin.__init__(self) |
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
211 | |
945
8cd4d08fa9f6
Made code mostly PEP 8 compliant (except all whitespace and line length).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
791
diff
changeset
|
212 | |
0
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
213 | class Function(ClbrBaseClasses.Function, VisibilityMixin): |
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
214 | """ |
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
215 | Class to represent a Python function. |
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
216 | """ |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
217 | |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
218 | def __init__( |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
219 | self, |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
220 | module, |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
221 | name, |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
222 | file, |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
223 | lineno, |
10677
6ee2e475490c
Editor Outline, File Browser, Project Browser
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10477
diff
changeset
|
224 | col_offset=0, |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
225 | signature="", |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
226 | separator=",", |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
227 | modifierType=ClbrBaseClasses.Function.General, |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
228 | annotation="", |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
229 | ): |
0
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
230 | """ |
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
231 | Constructor |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
232 | |
0
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
233 | @param module name of the module containing this function |
10433
328f3ec4b77a
Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10216
diff
changeset
|
234 | @type str |
0
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
235 | @param name name of this function |
10433
328f3ec4b77a
Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10216
diff
changeset
|
236 | @type str |
10677
6ee2e475490c
Editor Outline, File Browser, Project Browser
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10477
diff
changeset
|
237 | @param file file name containing this function |
10433
328f3ec4b77a
Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10216
diff
changeset
|
238 | @type str |
10677
6ee2e475490c
Editor Outline, File Browser, Project Browser
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10477
diff
changeset
|
239 | @param lineno line number of the function definition |
10433
328f3ec4b77a
Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10216
diff
changeset
|
240 | @type int |
10677
6ee2e475490c
Editor Outline, File Browser, Project Browser
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10477
diff
changeset
|
241 | @param col_offset column number of the function definition (defaults to 0) |
6ee2e475490c
Editor Outline, File Browser, Project Browser
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10477
diff
changeset
|
242 | @type int (optional) |
6ee2e475490c
Editor Outline, File Browser, Project Browser
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10477
diff
changeset
|
243 | @param signature parameter list of the function |
10433
328f3ec4b77a
Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10216
diff
changeset
|
244 | @type str |
0
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
245 | @param separator string separating the parameters |
10433
328f3ec4b77a
Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10216
diff
changeset
|
246 | @type str |
1227
c5db073a124f
Added support for class attributes, class methods and static methods to the class browsers and the source documentor.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
945
diff
changeset
|
247 | @param modifierType type of the function |
10433
328f3ec4b77a
Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10216
diff
changeset
|
248 | @type int |
3966
969a3d41c402
Added code to correctly parse Python methods/functions containing return annotations.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3591
diff
changeset
|
249 | @param annotation return annotation |
10433
328f3ec4b77a
Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10216
diff
changeset
|
250 | @type str |
0
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
251 | """ |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
252 | ClbrBaseClasses.Function.__init__( |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
253 | self, |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
254 | module, |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
255 | name, |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
256 | file, |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
257 | lineno, |
10677
6ee2e475490c
Editor Outline, File Browser, Project Browser
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10477
diff
changeset
|
258 | col_offset=col_offset, |
6ee2e475490c
Editor Outline, File Browser, Project Browser
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10477
diff
changeset
|
259 | signature=signature, |
6ee2e475490c
Editor Outline, File Browser, Project Browser
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10477
diff
changeset
|
260 | separator=separator, |
6ee2e475490c
Editor Outline, File Browser, Project Browser
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10477
diff
changeset
|
261 | modifierType=modifierType, |
6ee2e475490c
Editor Outline, File Browser, Project Browser
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10477
diff
changeset
|
262 | annotation=annotation, |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
263 | ) |
0
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
264 | VisibilityMixin.__init__(self) |
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
265 | |
945
8cd4d08fa9f6
Made code mostly PEP 8 compliant (except all whitespace and line length).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
791
diff
changeset
|
266 | |
0
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
267 | class Attribute(ClbrBaseClasses.Attribute, VisibilityMixin): |
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
268 | """ |
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
269 | Class to represent a class attribute. |
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
270 | """ |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
271 | |
10677
6ee2e475490c
Editor Outline, File Browser, Project Browser
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10477
diff
changeset
|
272 | def __init__(self, module, name, file, lineno, col_offset=0): |
0
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
273 | """ |
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
274 | Constructor |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
275 | |
0
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
276 | @param module name of the module containing this class |
10433
328f3ec4b77a
Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10216
diff
changeset
|
277 | @type str |
0
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
278 | @param name name of this class |
10433
328f3ec4b77a
Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10216
diff
changeset
|
279 | @type str |
10677
6ee2e475490c
Editor Outline, File Browser, Project Browser
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10477
diff
changeset
|
280 | @param file file name containing this attribute |
10433
328f3ec4b77a
Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10216
diff
changeset
|
281 | @type str |
10677
6ee2e475490c
Editor Outline, File Browser, Project Browser
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10477
diff
changeset
|
282 | @param lineno line number of the attribute definition |
10433
328f3ec4b77a
Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10216
diff
changeset
|
283 | @type int |
10677
6ee2e475490c
Editor Outline, File Browser, Project Browser
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10477
diff
changeset
|
284 | @param col_offset column number of the attribute definition (defaults to 0) |
6ee2e475490c
Editor Outline, File Browser, Project Browser
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10477
diff
changeset
|
285 | @type int (optional) |
0
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
286 | """ |
10677
6ee2e475490c
Editor Outline, File Browser, Project Browser
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10477
diff
changeset
|
287 | ClbrBaseClasses.Attribute.__init__( |
6ee2e475490c
Editor Outline, File Browser, Project Browser
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10477
diff
changeset
|
288 | self, module, name, file, lineno, col_offset=col_offset |
6ee2e475490c
Editor Outline, File Browser, Project Browser
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10477
diff
changeset
|
289 | ) |
0
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
290 | VisibilityMixin.__init__(self) |
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
291 | |
945
8cd4d08fa9f6
Made code mostly PEP 8 compliant (except all whitespace and line length).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
791
diff
changeset
|
292 | |
9500
5771348ded12
Corrected some code style issues and changed some suppressed code style issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9490
diff
changeset
|
293 | @dataclass |
8207
d359172d11be
Applied some more code simplifications suggested by the new Simplify checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8205
diff
changeset
|
294 | class Publics: |
0
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
295 | """ |
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
296 | Class to represent the list of public identifiers. |
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
297 | """ |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
298 | |
9500
5771348ded12
Corrected some code style issues and changed some suppressed code style issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9490
diff
changeset
|
299 | module: str |
5771348ded12
Corrected some code style issues and changed some suppressed code style issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9490
diff
changeset
|
300 | file: str |
5771348ded12
Corrected some code style issues and changed some suppressed code style issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9490
diff
changeset
|
301 | lineno: int |
9510
b1c92d588478
Fixed a compatibility issue with older Python releases.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9502
diff
changeset
|
302 | identifiers: list |
9500
5771348ded12
Corrected some code style issues and changed some suppressed code style issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9490
diff
changeset
|
303 | name: str = "__all__" |
4183
856ba07de877
Added capability to show imports of a Python script.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
304 | |
856ba07de877
Added capability to show imports of a Python script.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
305 | |
8207
d359172d11be
Applied some more code simplifications suggested by the new Simplify checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8205
diff
changeset
|
306 | class Imports: |
4183
856ba07de877
Added capability to show imports of a Python script.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
307 | """ |
856ba07de877
Added capability to show imports of a Python script.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
308 | Class to represent the list of imported modules. |
856ba07de877
Added capability to show imports of a Python script.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
309 | """ |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
310 | |
4183
856ba07de877
Added capability to show imports of a Python script.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
311 | def __init__(self, module, file): |
856ba07de877
Added capability to show imports of a Python script.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
312 | """ |
856ba07de877
Added capability to show imports of a Python script.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
313 | Constructor |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
314 | |
10433
328f3ec4b77a
Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10216
diff
changeset
|
315 | @param module name of the module containing the import |
328f3ec4b77a
Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10216
diff
changeset
|
316 | @type str |
328f3ec4b77a
Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10216
diff
changeset
|
317 | @param file file name containing the import |
328f3ec4b77a
Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10216
diff
changeset
|
318 | @type str |
4183
856ba07de877
Added capability to show imports of a Python script.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
319 | """ |
856ba07de877
Added capability to show imports of a Python script.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
320 | self.module = module |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
321 | self.name = "import" |
4183
856ba07de877
Added capability to show imports of a Python script.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
322 | self.file = file |
856ba07de877
Added capability to show imports of a Python script.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
323 | self.imports = {} |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
324 | |
4183
856ba07de877
Added capability to show imports of a Python script.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
325 | def addImport(self, moduleName, names, lineno): |
856ba07de877
Added capability to show imports of a Python script.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
326 | """ |
856ba07de877
Added capability to show imports of a Python script.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
327 | Public method to add a list of imported names. |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
328 | |
10433
328f3ec4b77a
Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10216
diff
changeset
|
329 | @param moduleName name of the imported module |
328f3ec4b77a
Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10216
diff
changeset
|
330 | @type str |
328f3ec4b77a
Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10216
diff
changeset
|
331 | @param names list of names |
328f3ec4b77a
Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10216
diff
changeset
|
332 | @type list of str |
4183
856ba07de877
Added capability to show imports of a Python script.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
333 | @param lineno line number of the import |
10433
328f3ec4b77a
Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10216
diff
changeset
|
334 | @type int |
4183
856ba07de877
Added capability to show imports of a Python script.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
335 | """ |
856ba07de877
Added capability to show imports of a Python script.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
336 | if moduleName not in self.imports: |
856ba07de877
Added capability to show imports of a Python script.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
337 | module = ImportedModule(self.module, self.file, moduleName) |
856ba07de877
Added capability to show imports of a Python script.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
338 | self.imports[moduleName] = module |
856ba07de877
Added capability to show imports of a Python script.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
339 | else: |
856ba07de877
Added capability to show imports of a Python script.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
340 | module = self.imports[moduleName] |
856ba07de877
Added capability to show imports of a Python script.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
341 | module.addImport(lineno, names) |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
342 | |
4183
856ba07de877
Added capability to show imports of a Python script.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
343 | def getImport(self, moduleName): |
856ba07de877
Added capability to show imports of a Python script.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
344 | """ |
856ba07de877
Added capability to show imports of a Python script.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
345 | Public method to get an imported module item. |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
346 | |
10433
328f3ec4b77a
Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10216
diff
changeset
|
347 | @param moduleName name of the imported module |
328f3ec4b77a
Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10216
diff
changeset
|
348 | @type str |
328f3ec4b77a
Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10216
diff
changeset
|
349 | @return imported module item |
328f3ec4b77a
Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10216
diff
changeset
|
350 | @rtype ImportedModule |
4183
856ba07de877
Added capability to show imports of a Python script.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
351 | """ |
856ba07de877
Added capability to show imports of a Python script.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
352 | if moduleName in self.imports: |
856ba07de877
Added capability to show imports of a Python script.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
353 | return self.imports[moduleName] |
856ba07de877
Added capability to show imports of a Python script.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
354 | else: |
856ba07de877
Added capability to show imports of a Python script.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
355 | return None |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
356 | |
4183
856ba07de877
Added capability to show imports of a Python script.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
357 | def getImports(self): |
856ba07de877
Added capability to show imports of a Python script.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
358 | """ |
856ba07de877
Added capability to show imports of a Python script.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
359 | Public method to get all imported module names. |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
360 | |
4183
856ba07de877
Added capability to show imports of a Python script.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
361 | @return dictionary of imported module names with name as key and list |
856ba07de877
Added capability to show imports of a Python script.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
362 | of line numbers of imports as value |
10433
328f3ec4b77a
Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10216
diff
changeset
|
363 | @rtype dict |
4183
856ba07de877
Added capability to show imports of a Python script.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
364 | """ |
856ba07de877
Added capability to show imports of a Python script.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
365 | return self.imports |
856ba07de877
Added capability to show imports of a Python script.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
366 | |
856ba07de877
Added capability to show imports of a Python script.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
367 | |
8207
d359172d11be
Applied some more code simplifications suggested by the new Simplify checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8205
diff
changeset
|
368 | class ImportedModule: |
4183
856ba07de877
Added capability to show imports of a Python script.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
369 | """ |
856ba07de877
Added capability to show imports of a Python script.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
370 | Class to represent an imported module. |
856ba07de877
Added capability to show imports of a Python script.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
371 | """ |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
372 | |
4183
856ba07de877
Added capability to show imports of a Python script.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
373 | def __init__(self, module, file, importedModule): |
856ba07de877
Added capability to show imports of a Python script.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
374 | """ |
856ba07de877
Added capability to show imports of a Python script.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
375 | Constructor |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
376 | |
10433
328f3ec4b77a
Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10216
diff
changeset
|
377 | @param module name of the module containing the import |
328f3ec4b77a
Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10216
diff
changeset
|
378 | @type str |
328f3ec4b77a
Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10216
diff
changeset
|
379 | @param file file name containing the import |
328f3ec4b77a
Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10216
diff
changeset
|
380 | @type str |
328f3ec4b77a
Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10216
diff
changeset
|
381 | @param importedModule name of the imported module |
328f3ec4b77a
Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10216
diff
changeset
|
382 | @type str |
4183
856ba07de877
Added capability to show imports of a Python script.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
383 | """ |
856ba07de877
Added capability to show imports of a Python script.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
384 | self.module = module |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
385 | self.name = "import" |
4183
856ba07de877
Added capability to show imports of a Python script.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
386 | self.file = file |
856ba07de877
Added capability to show imports of a Python script.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
387 | self.importedModuleName = importedModule |
856ba07de877
Added capability to show imports of a Python script.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
388 | self.linenos = [] |
856ba07de877
Added capability to show imports of a Python script.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
389 | self.importedNames = {} |
856ba07de877
Added capability to show imports of a Python script.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
390 | # dictionary of imported names with name as key and list of line |
856ba07de877
Added capability to show imports of a Python script.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
391 | # numbers as value |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
392 | |
4183
856ba07de877
Added capability to show imports of a Python script.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
393 | def addImport(self, lineno, importedNames): |
856ba07de877
Added capability to show imports of a Python script.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
394 | """ |
856ba07de877
Added capability to show imports of a Python script.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
395 | Public method to add a list of imported names. |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
396 | |
4183
856ba07de877
Added capability to show imports of a Python script.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
397 | @param lineno line number of the import |
10433
328f3ec4b77a
Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10216
diff
changeset
|
398 | @type int |
328f3ec4b77a
Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10216
diff
changeset
|
399 | @param importedNames list of imported names |
328f3ec4b77a
Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10216
diff
changeset
|
400 | @type list of str |
4183
856ba07de877
Added capability to show imports of a Python script.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
401 | """ |
856ba07de877
Added capability to show imports of a Python script.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
402 | if lineno not in self.linenos: |
856ba07de877
Added capability to show imports of a Python script.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
403 | self.linenos.append(lineno) |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
404 | |
4183
856ba07de877
Added capability to show imports of a Python script.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
405 | for name in importedNames: |
856ba07de877
Added capability to show imports of a Python script.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
406 | if name not in self.importedNames: |
856ba07de877
Added capability to show imports of a Python script.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
407 | self.importedNames[name] = [lineno] |
856ba07de877
Added capability to show imports of a Python script.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
408 | else: |
856ba07de877
Added capability to show imports of a Python script.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
409 | self.importedNames[name].append(lineno) |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
410 | |
945
8cd4d08fa9f6
Made code mostly PEP 8 compliant (except all whitespace and line length).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
791
diff
changeset
|
411 | |
10592
2bada76be1a6
Adapted the file browser incl. the class browsers to support the 'eric-ide' server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10477
diff
changeset
|
412 | def readmodule_ex(module, searchPath=None, isTypeFile=False): |
2965
d133c7edd88a
Continued correcting doc strings by using the new doc string checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2769
diff
changeset
|
413 | """ |
0
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
414 | Read a module file and return a dictionary of classes. |
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
415 | |
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
416 | Search for MODULE in PATH and sys.path, read and parse the |
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
417 | module and return a dictionary with one entry for each class |
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
418 | found in the module. |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
419 | |
7690
a59680062837
Continued implementing the editor outline widget.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7685
diff
changeset
|
420 | @param module name of the module file |
a59680062837
Continued implementing the editor outline widget.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7685
diff
changeset
|
421 | @type str |
10592
2bada76be1a6
Adapted the file browser incl. the class browsers to support the 'eric-ide' server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10477
diff
changeset
|
422 | @param searchPath path the module should be searched in |
7690
a59680062837
Continued implementing the editor outline widget.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7685
diff
changeset
|
423 | @type list of str |
9490
77b8d3a635b7
Changed class browser imports to use importlib.import_module().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9473
diff
changeset
|
424 | @param isTypeFile flag indicating a file of this type |
7690
a59680062837
Continued implementing the editor outline widget.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7685
diff
changeset
|
425 | @type bool |
0
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
426 | @return the resulting dictionary |
7690
a59680062837
Continued implementing the editor outline widget.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7685
diff
changeset
|
427 | @rtype dict |
2965
d133c7edd88a
Continued correcting doc strings by using the new doc string checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2769
diff
changeset
|
428 | """ |
10592
2bada76be1a6
Adapted the file browser incl. the class browsers to support the 'eric-ide' server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10477
diff
changeset
|
429 | fsInterface = ericApp().getObject("EricServer").getServiceInterface("FileSystem") |
2bada76be1a6
Adapted the file browser incl. the class browsers to support the 'eric-ide' server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10477
diff
changeset
|
430 | |
2bada76be1a6
Adapted the file browser incl. the class browsers to support the 'eric-ide' server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10477
diff
changeset
|
431 | if searchPath and FileSystemUtilities.isRemoteFileName(searchPath[0]): |
10596
ea35c92a3c7c
Implemented first stage of remote project support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10592
diff
changeset
|
432 | sourceType = ClassBrowsers.determineSourceType(module, isTypeFile) |
10592
2bada76be1a6
Adapted the file browser incl. the class browsers to support the 'eric-ide' server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10477
diff
changeset
|
433 | file = fsInterface.join(searchPath[0], module) |
2bada76be1a6
Adapted the file browser incl. the class browsers to support the 'eric-ide' server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10477
diff
changeset
|
434 | else: |
2bada76be1a6
Adapted the file browser incl. the class browsers to support the 'eric-ide' server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10477
diff
changeset
|
435 | # search the path for the module |
2bada76be1a6
Adapted the file browser incl. the class browsers to support the 'eric-ide' server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10477
diff
changeset
|
436 | searchPath = [] if searchPath is None else searchPath[:] |
2bada76be1a6
Adapted the file browser incl. the class browsers to support the 'eric-ide' server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10477
diff
changeset
|
437 | fullpath = searchPath[:] + sys.path[:] |
10704
27d21e5163b8
Merged with branch 'eric7' in order to track these changes.
Detlev Offenbach <detlev@die-offenbachs.de>
diff
changeset
|
438 | f, file, (_suff, mode, sourceType) = ClassBrowsers.find_module( |
9490
77b8d3a635b7
Changed class browser imports to use importlib.import_module().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9473
diff
changeset
|
439 | module, fullpath, isTypeFile |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
440 | ) |
10592
2bada76be1a6
Adapted the file browser incl. the class browsers to support the 'eric-ide' server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10477
diff
changeset
|
441 | if f: |
2bada76be1a6
Adapted the file browser incl. the class browsers to support the 'eric-ide' server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10477
diff
changeset
|
442 | f.close() |
2bada76be1a6
Adapted the file browser incl. the class browsers to support the 'eric-ide' server.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10477
diff
changeset
|
443 | |
10596
ea35c92a3c7c
Implemented first stage of remote project support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10592
diff
changeset
|
444 | if sourceType not in SUPPORTED_TYPES: |
0
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
445 | # not Python source, can't do anything with this module |
7685
0b6e8c0d6403
Started implementing the editor outline widget.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7676
diff
changeset
|
446 | return {} |
0b6e8c0d6403
Started implementing the editor outline widget.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7676
diff
changeset
|
447 | |
0b6e8c0d6403
Started implementing the editor outline widget.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7676
diff
changeset
|
448 | try: |
10596
ea35c92a3c7c
Implemented first stage of remote project support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10592
diff
changeset
|
449 | src = ( |
ea35c92a3c7c
Implemented first stage of remote project support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10592
diff
changeset
|
450 | fsInterface.readEncodedFile(file)[0] |
ea35c92a3c7c
Implemented first stage of remote project support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10592
diff
changeset
|
451 | if FileSystemUtilities.isRemoteFileName(file) |
ea35c92a3c7c
Implemented first stage of remote project support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10592
diff
changeset
|
452 | else Utilities.readEncodedFile(file)[0] |
ea35c92a3c7c
Implemented first stage of remote project support.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10592
diff
changeset
|
453 | ) |
10050
3750abc45d5e
Corrected some code style issues detected by the extended checkers.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9733
diff
changeset
|
454 | except (OSError, UnicodeError): |
7685
0b6e8c0d6403
Started implementing the editor outline widget.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7676
diff
changeset
|
455 | # can't do anything with this module |
0b6e8c0d6403
Started implementing the editor outline widget.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7676
diff
changeset
|
456 | return {} |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
457 | |
9612
93b496cc3c88
Class Browsers
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9510
diff
changeset
|
458 | return scan(src, file, module) |
7685
0b6e8c0d6403
Started implementing the editor outline widget.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7676
diff
changeset
|
459 | |
0
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
460 | |
7685
0b6e8c0d6403
Started implementing the editor outline widget.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7676
diff
changeset
|
461 | def scan(src, file, module): |
0b6e8c0d6403
Started implementing the editor outline widget.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7676
diff
changeset
|
462 | """ |
0b6e8c0d6403
Started implementing the editor outline widget.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7676
diff
changeset
|
463 | Public method to scan the given source text. |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
464 | |
7685
0b6e8c0d6403
Started implementing the editor outline widget.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7676
diff
changeset
|
465 | @param src source text to be scanned |
0b6e8c0d6403
Started implementing the editor outline widget.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7676
diff
changeset
|
466 | @type str |
0b6e8c0d6403
Started implementing the editor outline widget.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7676
diff
changeset
|
467 | @param file file name associated with the source text |
0b6e8c0d6403
Started implementing the editor outline widget.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7676
diff
changeset
|
468 | @type str |
0b6e8c0d6403
Started implementing the editor outline widget.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7676
diff
changeset
|
469 | @param module module name associated with the source text |
0b6e8c0d6403
Started implementing the editor outline widget.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7676
diff
changeset
|
470 | @type str |
0b6e8c0d6403
Started implementing the editor outline widget.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7676
diff
changeset
|
471 | @return dictionary containing the extracted data |
0b6e8c0d6403
Started implementing the editor outline widget.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7676
diff
changeset
|
472 | @rtype dict |
0b6e8c0d6403
Started implementing the editor outline widget.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7676
diff
changeset
|
473 | """ |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
474 | |
7698
12cb12380a6a
pyclbr: improved determination of the last line of a class, method or function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7690
diff
changeset
|
475 | def calculateEndline(lineno, lines, indent): |
12cb12380a6a
pyclbr: improved determination of the last line of a class, method or function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7690
diff
changeset
|
476 | """ |
12cb12380a6a
pyclbr: improved determination of the last line of a class, method or function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7690
diff
changeset
|
477 | Function to calculate the end line of a class or method/function. |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
478 | |
7699
d338c533f5f0
Class browsers: improved endline detection for the Python, IDL and ProtoBuf source code browsers and the Python module parser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7698
diff
changeset
|
479 | @param lineno line number to start at (one based) |
7698
12cb12380a6a
pyclbr: improved determination of the last line of a class, method or function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7690
diff
changeset
|
480 | @type int |
12cb12380a6a
pyclbr: improved determination of the last line of a class, method or function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7690
diff
changeset
|
481 | @param lines list of source lines |
12cb12380a6a
pyclbr: improved determination of the last line of a class, method or function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7690
diff
changeset
|
482 | @type list of str |
12cb12380a6a
pyclbr: improved determination of the last line of a class, method or function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7690
diff
changeset
|
483 | @param indent indent length the class/method/function definition |
12cb12380a6a
pyclbr: improved determination of the last line of a class, method or function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7690
diff
changeset
|
484 | @type int |
7699
d338c533f5f0
Class browsers: improved endline detection for the Python, IDL and ProtoBuf source code browsers and the Python module parser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7698
diff
changeset
|
485 | @return end line of the class/method/function (one based) |
7698
12cb12380a6a
pyclbr: improved determination of the last line of a class, method or function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7690
diff
changeset
|
486 | @rtype int |
12cb12380a6a
pyclbr: improved determination of the last line of a class, method or function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7690
diff
changeset
|
487 | """ |
12cb12380a6a
pyclbr: improved determination of the last line of a class, method or function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7690
diff
changeset
|
488 | # start with zero based line after start line |
12cb12380a6a
pyclbr: improved determination of the last line of a class, method or function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7690
diff
changeset
|
489 | while lineno < len(lines): |
12cb12380a6a
pyclbr: improved determination of the last line of a class, method or function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7690
diff
changeset
|
490 | line = lines[lineno] |
8495
e8278859d9fd
Fixed an issue parsing Python source code for documentation and navigation purposes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8312
diff
changeset
|
491 | if line.strip() and not line.lstrip().startswith("#"): |
e8278859d9fd
Fixed an issue parsing Python source code for documentation and navigation purposes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8312
diff
changeset
|
492 | # line contains some text and does not start with |
e8278859d9fd
Fixed an issue parsing Python source code for documentation and navigation purposes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8312
diff
changeset
|
493 | # a comment sign |
7698
12cb12380a6a
pyclbr: improved determination of the last line of a class, method or function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7690
diff
changeset
|
494 | lineIndent = _indent(line.replace(line.lstrip(), "")) |
12cb12380a6a
pyclbr: improved determination of the last line of a class, method or function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7690
diff
changeset
|
495 | if lineIndent <= indent: |
12cb12380a6a
pyclbr: improved determination of the last line of a class, method or function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7690
diff
changeset
|
496 | return lineno |
12cb12380a6a
pyclbr: improved determination of the last line of a class, method or function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7690
diff
changeset
|
497 | lineno += 1 |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
498 | |
7698
12cb12380a6a
pyclbr: improved determination of the last line of a class, method or function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7690
diff
changeset
|
499 | # nothing found |
12cb12380a6a
pyclbr: improved determination of the last line of a class, method or function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7690
diff
changeset
|
500 | return -1 |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
501 | |
7685
0b6e8c0d6403
Started implementing the editor outline widget.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7676
diff
changeset
|
502 | # convert eol markers the Python style |
0b6e8c0d6403
Started implementing the editor outline widget.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7676
diff
changeset
|
503 | src = src.replace("\r\n", "\n").replace("\r", "\n") |
7698
12cb12380a6a
pyclbr: improved determination of the last line of a class, method or function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7690
diff
changeset
|
504 | srcLines = src.splitlines() |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
505 | |
7685
0b6e8c0d6403
Started implementing the editor outline widget.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7676
diff
changeset
|
506 | dictionary = {} |
0b6e8c0d6403
Started implementing the editor outline widget.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7676
diff
changeset
|
507 | dict_counts = {} |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
508 | |
9612
93b496cc3c88
Class Browsers
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9510
diff
changeset
|
509 | modules = {} |
93b496cc3c88
Class Browsers
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9510
diff
changeset
|
510 | |
945
8cd4d08fa9f6
Made code mostly PEP 8 compliant (except all whitespace and line length).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
791
diff
changeset
|
511 | classstack = [] # stack of (class, indent) pairs |
8cd4d08fa9f6
Made code mostly PEP 8 compliant (except all whitespace and line length).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
791
diff
changeset
|
512 | conditionalsstack = [] # stack of indents of conditional defines |
0
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
513 | deltastack = [] |
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
514 | deltaindent = 0 |
8087
db518728761c
Utilities: fixed an issue related to parsing 'conditional defines'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7973
diff
changeset
|
515 | deltaindentcalculated = False |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
516 | |
0
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
517 | lineno, last_lineno_pos = 1, 0 |
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
518 | i = 0 |
1227
c5db073a124f
Added support for class attributes, class methods and static methods to the class browsers and the source documentor.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
945
diff
changeset
|
519 | modifierType = ClbrBaseClasses.Function.General |
c5db073a124f
Added support for class attributes, class methods and static methods to the class browsers and the source documentor.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
945
diff
changeset
|
520 | modifierIndent = -1 |
12
1d8dd9706f46
First commit after changing to Python 3.1.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
0
diff
changeset
|
521 | while True: |
0
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
522 | m = _getnext(src, i) |
9693
a7e9fd398e5a
Fixed an issue causing eric to freeze if a file had a certain contents by replacing the use of Python re with QRegularExpression.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9653
diff
changeset
|
523 | if not m.hasMatch(): |
0
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
524 | break |
9693
a7e9fd398e5a
Fixed an issue causing eric to freeze if a file had a certain contents by replacing the use of Python re with QRegularExpression.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9653
diff
changeset
|
525 | start, i = m.capturedStart(), m.capturedEnd() |
0
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
526 | |
9733
c5c2a74e9382
Corrected a Qt 6.2 incompatibility by replacing 'hasCaptured()' with 'captured()'. The former is only available in Qt 6.3 and newer.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9693
diff
changeset
|
527 | if m.captured("MethodModifier"): |
9693
a7e9fd398e5a
Fixed an issue causing eric to freeze if a file had a certain contents by replacing the use of Python re with QRegularExpression.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9653
diff
changeset
|
528 | modifierIndent = _indent(m.captured("MethodModifierIndent")) |
a7e9fd398e5a
Fixed an issue causing eric to freeze if a file had a certain contents by replacing the use of Python re with QRegularExpression.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9653
diff
changeset
|
529 | modifierType = m.captured("MethodModifierType") |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
530 | |
9733
c5c2a74e9382
Corrected a Qt 6.2 incompatibility by replacing 'hasCaptured()' with 'captured()'. The former is only available in Qt 6.3 and newer.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9693
diff
changeset
|
531 | elif m.captured("Method"): |
0
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
532 | # found a method definition or function |
9693
a7e9fd398e5a
Fixed an issue causing eric to freeze if a file had a certain contents by replacing the use of Python re with QRegularExpression.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9653
diff
changeset
|
533 | thisindent = _indent(m.captured("MethodIndent")) |
a7e9fd398e5a
Fixed an issue causing eric to freeze if a file had a certain contents by replacing the use of Python re with QRegularExpression.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9653
diff
changeset
|
534 | meth_name = m.captured("MethodName") |
a7e9fd398e5a
Fixed an issue causing eric to freeze if a file had a certain contents by replacing the use of Python re with QRegularExpression.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9653
diff
changeset
|
535 | meth_sig = m.captured("MethodSignature") |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
536 | meth_sig = meth_sig.replace("\\\n", "") |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
537 | meth_sig = _commentsub("", meth_sig) |
9693
a7e9fd398e5a
Fixed an issue causing eric to freeze if a file had a certain contents by replacing the use of Python re with QRegularExpression.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9653
diff
changeset
|
538 | meth_ret = m.captured("MethodReturnAnnotation") |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
539 | meth_ret = meth_ret.replace("\\\n", "") |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
540 | meth_ret = _commentsub("", meth_ret) |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
541 | lineno += src.count("\n", last_lineno_pos, start) |
0
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
542 | last_lineno_pos = start |
10677
6ee2e475490c
Editor Outline, File Browser, Project Browser
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10477
diff
changeset
|
543 | col_offset = m.capturedStart("MethodName") - m.capturedStart() |
1227
c5db073a124f
Added support for class attributes, class methods and static methods to the class browsers and the source documentor.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
945
diff
changeset
|
544 | if modifierType and modifierIndent == thisindent: |
c5db073a124f
Added support for class attributes, class methods and static methods to the class browsers and the source documentor.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
945
diff
changeset
|
545 | if modifierType == "@staticmethod": |
c5db073a124f
Added support for class attributes, class methods and static methods to the class browsers and the source documentor.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
945
diff
changeset
|
546 | modifier = ClbrBaseClasses.Function.Static |
c5db073a124f
Added support for class attributes, class methods and static methods to the class browsers and the source documentor.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
945
diff
changeset
|
547 | elif modifierType == "@classmethod": |
c5db073a124f
Added support for class attributes, class methods and static methods to the class browsers and the source documentor.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
945
diff
changeset
|
548 | modifier = ClbrBaseClasses.Function.Class |
c5db073a124f
Added support for class attributes, class methods and static methods to the class browsers and the source documentor.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
945
diff
changeset
|
549 | else: |
c5db073a124f
Added support for class attributes, class methods and static methods to the class browsers and the source documentor.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
945
diff
changeset
|
550 | modifier = ClbrBaseClasses.Function.General |
c5db073a124f
Added support for class attributes, class methods and static methods to the class browsers and the source documentor.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
945
diff
changeset
|
551 | else: |
c5db073a124f
Added support for class attributes, class methods and static methods to the class browsers and the source documentor.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
945
diff
changeset
|
552 | modifier = ClbrBaseClasses.Function.General |
0
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
553 | # modify indentation level for conditional defines |
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
554 | if conditionalsstack: |
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
555 | if thisindent > conditionalsstack[-1]: |
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
556 | if not deltaindentcalculated: |
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
557 | deltastack.append(thisindent - conditionalsstack[-1]) |
3539
0c2dc1446ebf
Fixed a few code style issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3178
diff
changeset
|
558 | deltaindent = reduce(lambda x, y: x + y, deltastack) |
8087
db518728761c
Utilities: fixed an issue related to parsing 'conditional defines'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7973
diff
changeset
|
559 | deltaindentcalculated = True |
0
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
560 | thisindent -= deltaindent |
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
561 | else: |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
562 | while conditionalsstack and conditionalsstack[-1] >= thisindent: |
0
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
563 | del conditionalsstack[-1] |
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
564 | if deltastack: |
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
565 | del deltastack[-1] |
8087
db518728761c
Utilities: fixed an issue related to parsing 'conditional defines'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7973
diff
changeset
|
566 | deltaindentcalculated = False |
0
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
567 | # close all classes indented at least as much |
7259
7c017076c12e
Continued to resolve code style issue M841.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7249
diff
changeset
|
568 | while classstack and classstack[-1][1] >= thisindent: |
10468
fcae57045733
Editor, File Browser, Project Browser
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10458
diff
changeset
|
569 | classstack.pop() |
0
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
570 | if classstack: |
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
571 | # it's a class method |
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
572 | cur_class = classstack[-1][0] |
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
573 | if cur_class: |
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
574 | # it's a method/nested def |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
575 | f = Function( |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
576 | None, |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
577 | meth_name, |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
578 | file, |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
579 | lineno, |
10677
6ee2e475490c
Editor Outline, File Browser, Project Browser
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10477
diff
changeset
|
580 | col_offset=col_offset, |
6ee2e475490c
Editor Outline, File Browser, Project Browser
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10477
diff
changeset
|
581 | signature=meth_sig, |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
582 | annotation=meth_ret, |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
583 | modifierType=modifier, |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
584 | ) |
0
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
585 | cur_class._addmethod(meth_name, f) |
7699
d338c533f5f0
Class browsers: improved endline detection for the Python, IDL and ProtoBuf source code browsers and the Python module parser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7698
diff
changeset
|
586 | else: |
d338c533f5f0
Class browsers: improved endline detection for the Python, IDL and ProtoBuf source code browsers and the Python module parser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7698
diff
changeset
|
587 | f = None |
0
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
588 | else: |
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
589 | # it's a function |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
590 | f = Function( |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
591 | module, |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
592 | meth_name, |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
593 | file, |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
594 | lineno, |
10677
6ee2e475490c
Editor Outline, File Browser, Project Browser
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10477
diff
changeset
|
595 | col_offset=col_offset, |
6ee2e475490c
Editor Outline, File Browser, Project Browser
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10477
diff
changeset
|
596 | signature=meth_sig, |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
597 | annotation=meth_ret, |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
598 | modifierType=modifier, |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
599 | ) |
12
1d8dd9706f46
First commit after changing to Python 3.1.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
0
diff
changeset
|
600 | if meth_name in dict_counts: |
0
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
601 | dict_counts[meth_name] += 1 |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
602 | meth_name = "{0}_{1:d}".format(meth_name, dict_counts[meth_name]) |
0
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
603 | else: |
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
604 | dict_counts[meth_name] = 0 |
5604
b047181a4a33
Continued fixing code style issues detected by the extended style checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5389
diff
changeset
|
605 | dictionary[meth_name] = f |
7699
d338c533f5f0
Class browsers: improved endline detection for the Python, IDL and ProtoBuf source code browsers and the Python module parser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7698
diff
changeset
|
606 | if f: |
d338c533f5f0
Class browsers: improved endline detection for the Python, IDL and ProtoBuf source code browsers and the Python module parser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7698
diff
changeset
|
607 | endlineno = calculateEndline(lineno, srcLines, thisindent) |
d338c533f5f0
Class browsers: improved endline detection for the Python, IDL and ProtoBuf source code browsers and the Python module parser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7698
diff
changeset
|
608 | f.setEndLine(endlineno) |
d338c533f5f0
Class browsers: improved endline detection for the Python, IDL and ProtoBuf source code browsers and the Python module parser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7698
diff
changeset
|
609 | classstack.append((f, thisindent)) # Marker for nested fns |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
610 | |
1227
c5db073a124f
Added support for class attributes, class methods and static methods to the class browsers and the source documentor.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
945
diff
changeset
|
611 | # reset the modifier settings |
c5db073a124f
Added support for class attributes, class methods and static methods to the class browsers and the source documentor.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
945
diff
changeset
|
612 | modifierType = ClbrBaseClasses.Function.General |
c5db073a124f
Added support for class attributes, class methods and static methods to the class browsers and the source documentor.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
945
diff
changeset
|
613 | modifierIndent = -1 |
0
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
614 | |
9733
c5c2a74e9382
Corrected a Qt 6.2 incompatibility by replacing 'hasCaptured()' with 'captured()'. The former is only available in Qt 6.3 and newer.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9693
diff
changeset
|
615 | elif m.captured("String"): |
0
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
616 | pass |
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
617 | |
9733
c5c2a74e9382
Corrected a Qt 6.2 incompatibility by replacing 'hasCaptured()' with 'captured()'. The former is only available in Qt 6.3 and newer.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9693
diff
changeset
|
618 | elif m.captured("Class"): |
0
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
619 | # we found a class definition |
9693
a7e9fd398e5a
Fixed an issue causing eric to freeze if a file had a certain contents by replacing the use of Python re with QRegularExpression.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9653
diff
changeset
|
620 | thisindent = _indent(m.captured("ClassIndent")) |
0
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
621 | # close all classes indented at least as much |
7259
7c017076c12e
Continued to resolve code style issue M841.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7249
diff
changeset
|
622 | while classstack and classstack[-1][1] >= thisindent: |
10468
fcae57045733
Editor, File Browser, Project Browser
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10458
diff
changeset
|
623 | classstack.pop() |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
624 | lineno += src.count("\n", last_lineno_pos, start) |
0
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
625 | last_lineno_pos = start |
10677
6ee2e475490c
Editor Outline, File Browser, Project Browser
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10477
diff
changeset
|
626 | col_offset = m.capturedStart("ClassName") - m.capturedStart() |
9693
a7e9fd398e5a
Fixed an issue causing eric to freeze if a file had a certain contents by replacing the use of Python re with QRegularExpression.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9653
diff
changeset
|
627 | class_name = m.captured("ClassName") |
a7e9fd398e5a
Fixed an issue causing eric to freeze if a file had a certain contents by replacing the use of Python re with QRegularExpression.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9653
diff
changeset
|
628 | inherit = m.captured("ClassSupers") |
0
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
629 | if inherit: |
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
630 | # the class inherits from other classes |
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
631 | inherit = inherit[1:-1].strip() |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
632 | inherit = _commentsub("", inherit) |
0
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
633 | names = [] |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
634 | for n in inherit.split(","): |
0
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
635 | n = n.strip() |
5604
b047181a4a33
Continued fixing code style issues detected by the extended style checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5389
diff
changeset
|
636 | if n in dictionary: |
0
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
637 | # we know this super class |
5604
b047181a4a33
Continued fixing code style issues detected by the extended style checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5389
diff
changeset
|
638 | n = dictionary[n] |
0
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
639 | else: |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
640 | c = n.split(".") |
0
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
641 | if len(c) > 1: |
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
642 | # super class |
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
643 | # is of the |
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
644 | # form module.class: |
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
645 | # look in |
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
646 | # module for class |
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
647 | m = c[-2] |
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
648 | c = c[-1] |
9612
93b496cc3c88
Class Browsers
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9510
diff
changeset
|
649 | if m in modules: |
93b496cc3c88
Class Browsers
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9510
diff
changeset
|
650 | d = modules[m] |
8217
385f60c94548
Applied some more code simplifications suggested by the new Simplify checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8207
diff
changeset
|
651 | n = d.get(c, n) |
0
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
652 | names.append(n) |
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
653 | inherit = names |
8087
db518728761c
Utilities: fixed an issue related to parsing 'conditional defines'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7973
diff
changeset
|
654 | # modify indentation level for conditional defines |
db518728761c
Utilities: fixed an issue related to parsing 'conditional defines'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7973
diff
changeset
|
655 | if conditionalsstack: |
db518728761c
Utilities: fixed an issue related to parsing 'conditional defines'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7973
diff
changeset
|
656 | if thisindent > conditionalsstack[-1]: |
db518728761c
Utilities: fixed an issue related to parsing 'conditional defines'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7973
diff
changeset
|
657 | if not deltaindentcalculated: |
db518728761c
Utilities: fixed an issue related to parsing 'conditional defines'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7973
diff
changeset
|
658 | deltastack.append(thisindent - conditionalsstack[-1]) |
db518728761c
Utilities: fixed an issue related to parsing 'conditional defines'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7973
diff
changeset
|
659 | deltaindent = reduce(lambda x, y: x + y, deltastack) |
db518728761c
Utilities: fixed an issue related to parsing 'conditional defines'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7973
diff
changeset
|
660 | deltaindentcalculated = True |
db518728761c
Utilities: fixed an issue related to parsing 'conditional defines'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7973
diff
changeset
|
661 | thisindent -= deltaindent |
db518728761c
Utilities: fixed an issue related to parsing 'conditional defines'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7973
diff
changeset
|
662 | else: |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
663 | while conditionalsstack and conditionalsstack[-1] >= thisindent: |
8087
db518728761c
Utilities: fixed an issue related to parsing 'conditional defines'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7973
diff
changeset
|
664 | del conditionalsstack[-1] |
db518728761c
Utilities: fixed an issue related to parsing 'conditional defines'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7973
diff
changeset
|
665 | if deltastack: |
db518728761c
Utilities: fixed an issue related to parsing 'conditional defines'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7973
diff
changeset
|
666 | del deltastack[-1] |
db518728761c
Utilities: fixed an issue related to parsing 'conditional defines'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7973
diff
changeset
|
667 | deltaindentcalculated = False |
0
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
668 | # remember this class |
10677
6ee2e475490c
Editor Outline, File Browser, Project Browser
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10477
diff
changeset
|
669 | cur_class = Class( |
6ee2e475490c
Editor Outline, File Browser, Project Browser
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10477
diff
changeset
|
670 | module, class_name, inherit, file, lineno, col_offset=col_offset |
6ee2e475490c
Editor Outline, File Browser, Project Browser
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10477
diff
changeset
|
671 | ) |
7698
12cb12380a6a
pyclbr: improved determination of the last line of a class, method or function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7690
diff
changeset
|
672 | endlineno = calculateEndline(lineno, srcLines, thisindent) |
12cb12380a6a
pyclbr: improved determination of the last line of a class, method or function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7690
diff
changeset
|
673 | cur_class.setEndLine(endlineno) |
0
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
674 | if not classstack: |
12
1d8dd9706f46
First commit after changing to Python 3.1.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
0
diff
changeset
|
675 | if class_name in dict_counts: |
0
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
676 | dict_counts[class_name] += 1 |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
677 | class_name = "{0}_{1:d}".format(class_name, dict_counts[class_name]) |
0
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
678 | else: |
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
679 | dict_counts[class_name] = 0 |
5604
b047181a4a33
Continued fixing code style issues detected by the extended style checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5389
diff
changeset
|
680 | dictionary[class_name] = cur_class |
0
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
681 | else: |
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
682 | classstack[-1][0]._addclass(class_name, cur_class) |
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
683 | classstack.append((cur_class, thisindent)) |
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
684 | |
10477
11b5d533e4a2
pyclbr, ModuleParser
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10471
diff
changeset
|
685 | elif m.captured("Attribute") or m.captured("TypedAttribute"): |
11b5d533e4a2
pyclbr, ModuleParser
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10471
diff
changeset
|
686 | if m.captured("Attribute"): |
11b5d533e4a2
pyclbr, ModuleParser
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10471
diff
changeset
|
687 | attribute_name = m.captured("AttributeName") |
10677
6ee2e475490c
Editor Outline, File Browser, Project Browser
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10477
diff
changeset
|
688 | col_offset = m.capturedStart("AttributeName") - m.capturedStart() |
10477
11b5d533e4a2
pyclbr, ModuleParser
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10471
diff
changeset
|
689 | else: |
11b5d533e4a2
pyclbr, ModuleParser
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10471
diff
changeset
|
690 | attribute_name = m.captured("TypedAttributeName") |
10677
6ee2e475490c
Editor Outline, File Browser, Project Browser
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10477
diff
changeset
|
691 | col_offset = m.capturedStart("TypedAttributeName") - m.capturedStart() |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
692 | lineno += src.count("\n", last_lineno_pos, start) |
0
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
693 | last_lineno_pos = start |
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
694 | index = -1 |
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
695 | while index >= -len(classstack): |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
696 | if classstack[index][0] is not None and not isinstance( |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
697 | classstack[index][0], Function |
7259
7c017076c12e
Continued to resolve code style issue M841.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7249
diff
changeset
|
698 | ): |
10677
6ee2e475490c
Editor Outline, File Browser, Project Browser
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10477
diff
changeset
|
699 | attr = Attribute( |
6ee2e475490c
Editor Outline, File Browser, Project Browser
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10477
diff
changeset
|
700 | module, attribute_name, file, lineno, col_offset=col_offset |
6ee2e475490c
Editor Outline, File Browser, Project Browser
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10477
diff
changeset
|
701 | ) |
0
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
702 | classstack[index][0]._addattribute(attr) |
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
703 | break |
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
704 | else: |
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
705 | index -= 1 |
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
706 | |
9733
c5c2a74e9382
Corrected a Qt 6.2 incompatibility by replacing 'hasCaptured()' with 'captured()'. The former is only available in Qt 6.3 and newer.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9693
diff
changeset
|
707 | elif m.captured("Main"): |
6552
ea16b851fdab
ModuleParser, pyclbr: fixed an issue parsing Python source files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6048
diff
changeset
|
708 | # 'main' part of the script, reset class stack |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
709 | lineno += src.count("\n", last_lineno_pos, start) |
6552
ea16b851fdab
ModuleParser, pyclbr: fixed an issue parsing Python source files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6048
diff
changeset
|
710 | last_lineno_pos = start |
ea16b851fdab
ModuleParser, pyclbr: fixed an issue parsing Python source files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6048
diff
changeset
|
711 | classstack = [] |
ea16b851fdab
ModuleParser, pyclbr: fixed an issue parsing Python source files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6048
diff
changeset
|
712 | |
10477
11b5d533e4a2
pyclbr, ModuleParser
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10471
diff
changeset
|
713 | elif m.captured("Variable") or m.captured("TypedVariable"): |
11b5d533e4a2
pyclbr, ModuleParser
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10471
diff
changeset
|
714 | if m.captured("Variable"): |
11b5d533e4a2
pyclbr, ModuleParser
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10471
diff
changeset
|
715 | thisindent = _indent(m.captured("VariableIndent")) |
11b5d533e4a2
pyclbr, ModuleParser
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10471
diff
changeset
|
716 | variable_name = m.captured("VariableName") |
10677
6ee2e475490c
Editor Outline, File Browser, Project Browser
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10477
diff
changeset
|
717 | col_offset = m.capturedStart("VariableName") - m.capturedStart() |
10477
11b5d533e4a2
pyclbr, ModuleParser
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10471
diff
changeset
|
718 | else: |
11b5d533e4a2
pyclbr, ModuleParser
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10471
diff
changeset
|
719 | thisindent = _indent(m.captured("TypedVariableIndent")) |
11b5d533e4a2
pyclbr, ModuleParser
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10471
diff
changeset
|
720 | variable_name = m.captured("TypedVariableName") |
11b5d533e4a2
pyclbr, ModuleParser
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10471
diff
changeset
|
721 | if keyword.iskeyword(variable_name): |
11b5d533e4a2
pyclbr, ModuleParser
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10471
diff
changeset
|
722 | # only if the determined name is not a keyword (e.g. else, except) |
11b5d533e4a2
pyclbr, ModuleParser
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10471
diff
changeset
|
723 | continue |
10677
6ee2e475490c
Editor Outline, File Browser, Project Browser
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10477
diff
changeset
|
724 | col_offset = m.capturedStart("TypedVariableName") - m.capturedStart() |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
725 | lineno += src.count("\n", last_lineno_pos, start) |
0
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
726 | last_lineno_pos = start |
6552
ea16b851fdab
ModuleParser, pyclbr: fixed an issue parsing Python source files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6048
diff
changeset
|
727 | if thisindent == 0 or not classstack: |
ea16b851fdab
ModuleParser, pyclbr: fixed an issue parsing Python source files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6048
diff
changeset
|
728 | # global variable, reset class stack first |
ea16b851fdab
ModuleParser, pyclbr: fixed an issue parsing Python source files.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6048
diff
changeset
|
729 | classstack = [] |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
730 | |
5604
b047181a4a33
Continued fixing code style issues detected by the extended style checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5389
diff
changeset
|
731 | if "@@Globals@@" not in dictionary: |
b047181a4a33
Continued fixing code style issues detected by the extended style checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5389
diff
changeset
|
732 | dictionary["@@Globals@@"] = ClbrBaseClasses.ClbrBase( |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
733 | module, "Globals", file, lineno |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
734 | ) |
5604
b047181a4a33
Continued fixing code style issues detected by the extended style checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5389
diff
changeset
|
735 | dictionary["@@Globals@@"]._addglobal( |
10677
6ee2e475490c
Editor Outline, File Browser, Project Browser
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10477
diff
changeset
|
736 | Attribute( |
6ee2e475490c
Editor Outline, File Browser, Project Browser
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10477
diff
changeset
|
737 | module, variable_name, file, lineno, col_offset=col_offset |
6ee2e475490c
Editor Outline, File Browser, Project Browser
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10477
diff
changeset
|
738 | ) |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
739 | ) |
0
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
740 | else: |
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
741 | index = -1 |
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
742 | while index >= -len(classstack): |
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
743 | if classstack[index][1] >= thisindent: |
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
744 | index -= 1 |
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
745 | else: |
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
746 | if isinstance(classstack[index][0], Class): |
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
747 | classstack[index][0]._addglobal( |
10677
6ee2e475490c
Editor Outline, File Browser, Project Browser
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10477
diff
changeset
|
748 | Attribute( |
6ee2e475490c
Editor Outline, File Browser, Project Browser
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10477
diff
changeset
|
749 | module, |
6ee2e475490c
Editor Outline, File Browser, Project Browser
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10477
diff
changeset
|
750 | variable_name, |
6ee2e475490c
Editor Outline, File Browser, Project Browser
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10477
diff
changeset
|
751 | file, |
6ee2e475490c
Editor Outline, File Browser, Project Browser
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10477
diff
changeset
|
752 | lineno, |
6ee2e475490c
Editor Outline, File Browser, Project Browser
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10477
diff
changeset
|
753 | col_offset=col_offset, |
6ee2e475490c
Editor Outline, File Browser, Project Browser
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10477
diff
changeset
|
754 | ) |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
755 | ) |
10468
fcae57045733
Editor, File Browser, Project Browser
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10458
diff
changeset
|
756 | elif isinstance(classstack[index][0], Function): |
fcae57045733
Editor, File Browser, Project Browser
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10458
diff
changeset
|
757 | classstack[index][0]._addattribute( |
10677
6ee2e475490c
Editor Outline, File Browser, Project Browser
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10477
diff
changeset
|
758 | Attribute( |
6ee2e475490c
Editor Outline, File Browser, Project Browser
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10477
diff
changeset
|
759 | module, |
6ee2e475490c
Editor Outline, File Browser, Project Browser
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10477
diff
changeset
|
760 | variable_name, |
6ee2e475490c
Editor Outline, File Browser, Project Browser
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10477
diff
changeset
|
761 | file, |
6ee2e475490c
Editor Outline, File Browser, Project Browser
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10477
diff
changeset
|
762 | lineno, |
6ee2e475490c
Editor Outline, File Browser, Project Browser
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10477
diff
changeset
|
763 | col_offset=col_offset, |
6ee2e475490c
Editor Outline, File Browser, Project Browser
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10477
diff
changeset
|
764 | ) |
10468
fcae57045733
Editor, File Browser, Project Browser
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10458
diff
changeset
|
765 | ) |
0
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
766 | break |
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
767 | |
9733
c5c2a74e9382
Corrected a Qt 6.2 incompatibility by replacing 'hasCaptured()' with 'captured()'. The former is only available in Qt 6.3 and newer.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9693
diff
changeset
|
768 | elif m.captured("Publics"): |
9693
a7e9fd398e5a
Fixed an issue causing eric to freeze if a file had a certain contents by replacing the use of Python re with QRegularExpression.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9653
diff
changeset
|
769 | idents = m.captured("Identifiers") |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
770 | lineno += src.count("\n", last_lineno_pos, start) |
0
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
771 | last_lineno_pos = start |
9500
5771348ded12
Corrected some code style issues and changed some suppressed code style issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9490
diff
changeset
|
772 | pubs = Publics( |
5771348ded12
Corrected some code style issues and changed some suppressed code style issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9490
diff
changeset
|
773 | module=module, |
5771348ded12
Corrected some code style issues and changed some suppressed code style issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9490
diff
changeset
|
774 | file=file, |
5771348ded12
Corrected some code style issues and changed some suppressed code style issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9490
diff
changeset
|
775 | lineno=lineno, |
5771348ded12
Corrected some code style issues and changed some suppressed code style issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9490
diff
changeset
|
776 | identifiers=[ |
5771348ded12
Corrected some code style issues and changed some suppressed code style issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9490
diff
changeset
|
777 | e.replace('"', "").replace("'", "").strip() |
5771348ded12
Corrected some code style issues and changed some suppressed code style issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9490
diff
changeset
|
778 | for e in idents.split(",") |
9502
6091145e189e
'Blacked' the code.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9500
diff
changeset
|
779 | ], |
9500
5771348ded12
Corrected some code style issues and changed some suppressed code style issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9490
diff
changeset
|
780 | ) |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
781 | dictionary["__all__"] = pubs |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
782 | |
9733
c5c2a74e9382
Corrected a Qt 6.2 incompatibility by replacing 'hasCaptured()' with 'captured()'. The former is only available in Qt 6.3 and newer.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9693
diff
changeset
|
783 | elif m.captured("Import"): |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
784 | # - import module |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
785 | names = [ |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
786 | n.strip() |
9693
a7e9fd398e5a
Fixed an issue causing eric to freeze if a file had a certain contents by replacing the use of Python re with QRegularExpression.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9653
diff
changeset
|
787 | for n in "".join(m.captured("ImportList").splitlines()) |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
788 | .replace("\\", "") |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
789 | .split(",") |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
790 | ] |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
791 | lineno += src.count("\n", last_lineno_pos, start) |
4183
856ba07de877
Added capability to show imports of a Python script.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
792 | last_lineno_pos = start |
5604
b047181a4a33
Continued fixing code style issues detected by the extended style checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5389
diff
changeset
|
793 | if "@@Import@@" not in dictionary: |
b047181a4a33
Continued fixing code style issues detected by the extended style checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5389
diff
changeset
|
794 | dictionary["@@Import@@"] = Imports(module, file) |
4183
856ba07de877
Added capability to show imports of a Python script.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
795 | for name in names: |
5604
b047181a4a33
Continued fixing code style issues detected by the extended style checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5389
diff
changeset
|
796 | dictionary["@@Import@@"].addImport(name, [], lineno) |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
797 | |
9733
c5c2a74e9382
Corrected a Qt 6.2 incompatibility by replacing 'hasCaptured()' with 'captured()'. The former is only available in Qt 6.3 and newer.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9693
diff
changeset
|
798 | elif m.captured("ImportFrom"): |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
799 | # - from module import stuff |
9693
a7e9fd398e5a
Fixed an issue causing eric to freeze if a file had a certain contents by replacing the use of Python re with QRegularExpression.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9653
diff
changeset
|
800 | mod = m.captured("ImportFromPath") |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
801 | namesLines = ( |
9693
a7e9fd398e5a
Fixed an issue causing eric to freeze if a file had a certain contents by replacing the use of Python re with QRegularExpression.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9653
diff
changeset
|
802 | m.captured("ImportFromList") |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
803 | .replace("(", "") |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
804 | .replace(")", "") |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
805 | .replace("\\", "") |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
806 | .strip() |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
807 | .splitlines() |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
808 | ) |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
809 | namesLines = [line.split("#")[0].strip() for line in namesLines] |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
810 | names = [n.strip() for n in "".join(namesLines).split(",")] |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
811 | lineno += src.count("\n", last_lineno_pos, start) |
4183
856ba07de877
Added capability to show imports of a Python script.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4021
diff
changeset
|
812 | last_lineno_pos = start |
5604
b047181a4a33
Continued fixing code style issues detected by the extended style checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5389
diff
changeset
|
813 | if "@@Import@@" not in dictionary: |
b047181a4a33
Continued fixing code style issues detected by the extended style checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5389
diff
changeset
|
814 | dictionary["@@Import@@"] = Imports(module, file) |
b047181a4a33
Continued fixing code style issues detected by the extended style checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5389
diff
changeset
|
815 | dictionary["@@Import@@"].addImport(mod, names, lineno) |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
816 | |
9733
c5c2a74e9382
Corrected a Qt 6.2 incompatibility by replacing 'hasCaptured()' with 'captured()'. The former is only available in Qt 6.3 and newer.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9693
diff
changeset
|
817 | elif m.captured("ConditionalDefine"): |
0
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
818 | # a conditional function/method definition |
9693
a7e9fd398e5a
Fixed an issue causing eric to freeze if a file had a certain contents by replacing the use of Python re with QRegularExpression.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9653
diff
changeset
|
819 | thisindent = _indent(m.captured("ConditionalDefineIndent")) |
7259
7c017076c12e
Continued to resolve code style issue M841.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7249
diff
changeset
|
820 | while conditionalsstack and conditionalsstack[-1] >= thisindent: |
0
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
821 | del conditionalsstack[-1] |
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
822 | if deltastack: |
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
823 | del deltastack[-1] |
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
824 | conditionalsstack.append(thisindent) |
8087
db518728761c
Utilities: fixed an issue related to parsing 'conditional defines'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7973
diff
changeset
|
825 | deltaindentcalculated = False |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
826 | |
9733
c5c2a74e9382
Corrected a Qt 6.2 incompatibility by replacing 'hasCaptured()' with 'captured()'. The former is only available in Qt 6.3 and newer.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9693
diff
changeset
|
827 | elif m.captured("CodingLine"): |
0
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
828 | # a coding statement |
9693
a7e9fd398e5a
Fixed an issue causing eric to freeze if a file had a certain contents by replacing the use of Python re with QRegularExpression.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9653
diff
changeset
|
829 | coding = m.captured("Coding") |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
830 | lineno += src.count("\n", last_lineno_pos, start) |
0
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
831 | last_lineno_pos = start |
5604
b047181a4a33
Continued fixing code style issues detected by the extended style checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5389
diff
changeset
|
832 | if "@@Coding@@" not in dictionary: |
b047181a4a33
Continued fixing code style issues detected by the extended style checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5389
diff
changeset
|
833 | dictionary["@@Coding@@"] = ClbrBaseClasses.Coding( |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
834 | module, file, lineno, coding |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
835 | ) |
0
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
836 | |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
837 | if "__all__" in dictionary: |
0
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
838 | # set visibility of all top level elements |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
839 | pubs = dictionary["__all__"] |
8205
4a0f1f896341
Applied some code simplifications suggested by the new Simplify checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8131
diff
changeset
|
840 | for key in dictionary: |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
841 | if key == "__all__" or key.startswith("@@"): |
0
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
842 | continue |
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
843 | if key in pubs.identifiers: |
5604
b047181a4a33
Continued fixing code style issues detected by the extended style checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5389
diff
changeset
|
844 | dictionary[key].setPublic() |
0
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
845 | else: |
5604
b047181a4a33
Continued fixing code style issues detected by the extended style checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5389
diff
changeset
|
846 | dictionary[key].setPrivate() |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
847 | del dictionary["__all__"] |
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
848 | |
5604
b047181a4a33
Continued fixing code style issues detected by the extended style checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5389
diff
changeset
|
849 | return dictionary |
0
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
850 | |
945
8cd4d08fa9f6
Made code mostly PEP 8 compliant (except all whitespace and line length).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
791
diff
changeset
|
851 | |
0
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
852 | def _indent(ws): |
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
853 | """ |
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
854 | Module function to return the indentation depth. |
9221
bf71ee032bb4
Reformatted the source code using the 'Black' utility.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
9209
diff
changeset
|
855 | |
10433
328f3ec4b77a
Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10216
diff
changeset
|
856 | @param ws the whitespace to be checked |
10458
2074b8393649
Corrected some code documentation style and code formatting issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10439
diff
changeset
|
857 | @type str |
10433
328f3ec4b77a
Converted some source code documentation to the new style.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10216
diff
changeset
|
858 | @return length of the whitespace string |
10458
2074b8393649
Corrected some code documentation style and code formatting issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10439
diff
changeset
|
859 | @rtype int |
0
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
860 | """ |
de9c2efb9d02
Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
861 | return len(ws.expandtabs(TABWIDTH)) |