Skip to content

Commit 7ceb876

Browse files
theotherjimmytheotherjimmy
committed
Correct all linting errors
1 parent 801e555 commit 7ceb876

File tree

1 file changed

+93
-49
lines changed

1 file changed

+93
-49
lines changed

‎tools/memap.py‎

Lines changed: 93 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,6 @@
2424
from os import sep
2525
from os.path import (basename, dirname, join, relpath, abspath, commonprefix,
2626
splitext)
27-
28-
# Be sure that the tools directory is in the search path
29-
ROOT = abspath(join(dirname(__file__), ".."))
30-
path.insert(0, ROOT)
31-
3227
import re
3328
import csv
3429
import json
@@ -39,8 +34,16 @@
3934
from jinja2 import FileSystemLoader, StrictUndefined
4035
from jinja2.environment import Environment
4136

42-
from tools.utils import (argparse_filestring_type, argparse_lowercase_hyphen_type,
43-
argparse_uppercase_type)
37+
38+
# Be sure that the tools directory is in the search path
39+
ROOT = abspath(join(dirname(__file__), ".."))
40+
path.insert(0, ROOT)
41+
42+
from tools.utils import (
43+
argparse_filestring_type,
44+
argparse_lowercase_hyphen_type,
45+
argparse_uppercase_type
46+
) # noqa: E402
4447

4548

4649
class _Parser(object):
@@ -105,33 +108,36 @@ def parse_mapfile(self, mapfile):
105108

106109
class _GccParser(_Parser):
107110
RE_OBJECT_FILE = re.compile(r'^(.+\/.+\.o(bj)?)$')
108-
RE_LIBRARY_OBJECT = re.compile(r'^.+' + r''.format(sep) + r'lib((.+\.a)\((.+\.o(bj)?)\))$')
111+
RE_LIBRARY_OBJECT = re.compile(
112+
r'^.+' + r''.format(sep) + r'lib((.+\.a)\((.+\.o(bj)?)\))$'
113+
)
109114
RE_STD_SECTION = re.compile(r'^\s+.*0x(\w{8,16})\s+0x(\w+)\s(.+)$')
110115
RE_FILL_SECTION = re.compile(r'^\s*\*fill\*\s+0x(\w{8,16})\s+0x(\w+).*$')
111116
OBJECT_EXTENSIONS = (".o", ".obj")
112117

113-
ALL_SECTIONS = _Parser.SECTIONS + _Parser.OTHER_SECTIONS + \
114-
_Parser.MISC_FLASH_SECTIONS + ('unknown', 'OUTPUT')
118+
ALL_SECTIONS = (
119+
_Parser.SECTIONS
120+
+ _Parser.OTHER_SECTIONS
121+
+ _Parser.MISC_FLASH_SECTIONS
122+
+ ('unknown', 'OUTPUT')
123+
)
115124

116125
def check_new_section(self, line):
117126
""" Check whether a new section in a map file has been detected
118127
119128
Positional arguments:
120129
line - the line to check for a new section
121130
122-
return value - A section name, if a new section was found, False
131+
return value - A section name, if a new section was found, None
123132
otherwise
124133
"""
125134
for i in self.ALL_SECTIONS:
126135
if line.startswith(i):
127-
# should name of the section (assuming it's a known one)
128136
return i
129-
130137
if line.startswith('.'):
131-
return 'unknown' # all others are classified are unknown
138+
return 'unknown'
132139
else:
133-
return False # everything else, means no change in section
134-
140+
return None
135141

136142
def parse_object_name(self, line):
137143
""" Parse a path to object file
@@ -158,8 +164,10 @@ def parse_object_name(self, line):
158164
return join('[lib]', test_re_obj_name.group(2),
159165
test_re_obj_name.group(3))
160166
else:
161-
if (not line.startswith("LONG") and
162-
not line.startswith("linker stubs")):
167+
if (
168+
not line.startswith("LONG") and
169+
not line.startswith("linker stubs")
170+
):
163171
print("Unknown object name found in GCC map file: %s"
164172
% line)
165173
return '[misc]'
@@ -168,8 +176,8 @@ def parse_section(self, line):
168176
""" Parse data from a section of gcc map file
169177
170178
examples:
171-
0x00004308 0x7c ./BUILD/K64F/GCC_ARM/mbed-os/hal/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/spi_api.o
172-
.text 0x00000608 0x198 ./BUILD/K64F/GCC_ARM/mbed-os/core/mbed-rtos/rtx/TARGET_CORTEX_M/TARGET_RTOS_M4_M7/TOOLCHAIN/HAL_CM4.o
179+
0x00004308 0x7c ./BUILD/K64F/GCC_ARM/spi_api.o
180+
.text 0x00000608 0x198 ./BUILD/K64F/HAL_CM4.o
173181
174182
Positional arguments:
175183
line - the line to parse a section from
@@ -215,7 +223,11 @@ def parse_mapfile(self, file_desc):
215223
self.module_add(object_name, object_size, current_section)
216224

217225
common_prefix = dirname(commonprefix([
218-
o for o in self.modules.keys() if (o.endswith(self.OBJECT_EXTENSIONS) and not o.startswith("[lib]"))]))
226+
o for o in self.modules.keys()
227+
if (
228+
o.endswith(self.OBJECT_EXTENSIONS)
229+
and not o.startswith("[lib]")
230+
)]))
219231
new_modules = {}
220232
for name, stats in self.modules.items():
221233
if name.startswith("[lib]"):
@@ -245,9 +257,13 @@ def parse_object_name(self, line):
245257
else:
246258
is_obj = re.match(self.RE_OBJECT, line)
247259
if is_obj:
248-
return join('[lib]', basename(is_obj.group(1)), is_obj.group(3))
260+
return join(
261+
'[lib]', basename(is_obj.group(1)), is_obj.group(3)
262+
)
249263
else:
250-
print("Malformed input found when parsing ARMCC map: %s" % line)
264+
print(
265+
"Malformed input found when parsing ARMCC map: %s" % line
266+
)
251267
return '[misc]'
252268

253269
def parse_section(self, line):
@@ -260,7 +276,7 @@ def parse_section(self, line):
260276
261277
Positional arguments:
262278
line - the line to parse the section data from
263-
"""
279+
""" # noqa: E501
264280
test_re = re.match(self.RE, line)
265281

266282
if test_re:
@@ -276,8 +292,10 @@ def parse_section(self, line):
276292
elif test_re.group(3) == 'Code':
277293
section = '.text'
278294
else:
279-
print("Malformed input found when parsing armcc map: %s, %r"
280-
% (line, test_re.groups()))
295+
print(
296+
"Malformed input found when parsing armcc map: %s, %r"
297+
% (line, test_re.groups())
298+
)
281299

282300
return ["", 0, ""]
283301

@@ -307,10 +325,20 @@ def parse_mapfile(self, file_desc):
307325
self.module_add(*self.parse_section(line))
308326

309327
common_prefix = dirname(commonprefix([
310-
o for o in self.modules.keys() if (o.endswith(self.OBJECT_EXTENSIONS) and o != "anon$$obj.o" and o != "anon$$obj.obj" and not o.startswith("[lib]"))]))
328+
o for o in self.modules.keys()
329+
if (
330+
o.endswith(self.OBJECT_EXTENSIONS)
331+
and o != "anon$$obj.o"
332+
and o != "anon$$obj.obj"
333+
and not o.startswith("[lib]")
334+
)]))
311335
new_modules = {}
312336
for name, stats in self.modules.items():
313-
if name == "anon$$obj.o" or name == "anon$$obj.obj" or name.startswith("[lib]"):
337+
if (
338+
name == "anon$$obj.o"
339+
or name == "anon$$obj.obj"
340+
or name.startswith("[lib]")
341+
):
314342
new_modules[name] = stats
315343
elif name.endswith(self.OBJECT_EXTENSIONS):
316344
new_modules[relpath(name, common_prefix)] = stats
@@ -365,11 +393,13 @@ def parse_section(self, line):
365393
366394
Positional_arguments:
367395
line - the line to parse section data from
368-
"""
396+
""" # noqa: E501
369397
test_re = re.match(self.RE, line)
370398
if test_re:
371-
if (test_re.group(2) == 'const' or
372-
test_re.group(2) == 'ro code'):
399+
if (
400+
test_re.group(2) == 'const' or
401+
test_re.group(2) == 'ro code'
402+
):
373403
section = '.text'
374404
elif (test_re.group(2) == 'zero' or
375405
test_re.group(2) == 'uninit'):
@@ -378,7 +408,7 @@ def parse_section(self, line):
378408
elif test_re.group(1)[0:6] == 'CSTACK':
379409
section = '.stack'
380410
else:
381-
section = '.bss' # default section
411+
section = '.bss' # default section
382412

383413
elif test_re.group(2) == 'inited':
384414
section = '.data'
@@ -409,7 +439,8 @@ def check_new_library(self, line):
409439

410440
def check_new_object_lib(self, line):
411441
"""
412-
Searches for objects within a library section and returns name. Example:
442+
Searches for objects within a library section and returns name.
443+
Example:
413444
rt7M_tl.a: [44]
414445
ABImemclr4.o 6
415446
ABImemcpy_unaligned.o 118
@@ -435,7 +466,10 @@ def parse_command_line(self, lines):
435466
break
436467
for arg in line.split(" "):
437468
arg = arg.rstrip(" \n")
438-
if (not arg.startswith("-")) and arg.endswith(self.OBJECT_EXTENSIONS):
469+
if (
470+
not arg.startswith("-")
471+
and arg.endswith(self.OBJECT_EXTENSIONS)
472+
):
439473
self.cmd_modules[basename(arg)] = arg
440474

441475
common_prefix = dirname(commonprefix(list(self.cmd_modules.values())))
@@ -458,7 +492,7 @@ def parse_mapfile(self, file_desc):
458492
for line in infile:
459493
self.module_add(*self.parse_section(line))
460494

461-
if line.startswith('*** MODULE SUMMARY'): # finish section
495+
if line.startswith('*** MODULE SUMMARY'): # finish section
462496
break
463497

464498
current_library = ""
@@ -484,7 +518,6 @@ class MemapParser(object):
484518
print_sections = ('.text', '.data', '.bss')
485519
delta_sections = ('.text-delta', '.data-delta', '.bss-delta')
486520

487-
488521
# sections to print info (generic for all toolchains)
489522
sections = _Parser.SECTIONS
490523
misc_flash_sections = _Parser.MISC_FLASH_SECTIONS
@@ -498,7 +531,6 @@ def __init__(self):
498531
# short version with specific depth
499532
self.short_modules = dict()
500533

501-
502534
# Memory report (sections + summary)
503535
self.mem_report = []
504536

@@ -528,7 +560,7 @@ def reduce_depth(self, depth):
528560
mbed-os/drivers
529561
530562
"""
531-
if depth == 0 or depth == None:
563+
if depth == 0 or depth is None:
532564
self.short_modules = deepcopy(self.modules)
533565
else:
534566
self.short_modules = dict()
@@ -539,8 +571,9 @@ def reduce_depth(self, depth):
539571
new_name = join(*split_name[:depth])
540572
self.short_modules.setdefault(new_name, defaultdict(int))
541573
for section_idx, value in v.items():
542-
self.short_modules[new_name][section_idx] += self.modules[module_name][section_idx]
543-
self.short_modules[new_name][section_idx + '-delta'] += self.modules[module_name][section_idx]
574+
self.short_modules[new_name][section_idx] += value
575+
delta_name = section_idx + '-delta'
576+
self.short_modules[new_name][delta_name] += value
544577
if self.old_modules:
545578
for module_name, v in self.old_modules.items():
546579
split_name = module_name.split(sep)
@@ -549,7 +582,8 @@ def reduce_depth(self, depth):
549582
new_name = join(*split_name[:depth])
550583
self.short_modules.setdefault(new_name, defaultdict(int))
551584
for section_idx, value in v.items():
552-
self.short_modules[new_name][section_idx + '-delta'] -= self.old_modules[module_name][section_idx]
585+
delta_name = section_idx + '-delta'
586+
self.short_modules[new_name][delta_name] -= value
553587

554588
export_formats = ["json", "csv-ci", "html", "table"]
555589

@@ -657,7 +691,10 @@ def generate_html(self, file_desc):
657691
if not modules:
658692
break
659693
next_module = modules.pop(0)
660-
if not any(cld['name'] == next_module for cld in cur_text['children']):
694+
if not any(
695+
cld['name'] == next_module
696+
for cld in cur_text['children']
697+
):
661698
break
662699
cur_text = self._move_up_tree(cur_text, next_module)
663700
cur_data = self._move_up_tree(cur_data, next_module)
@@ -759,8 +796,10 @@ def generate_table(self, file_desc):
759796
row = [i]
760797

761798
for k in self.print_sections:
762-
row.append("{}({:+})".format(self.short_modules[i][k],
763-
self.short_modules[i][k + "-delta"]))
799+
row.append("{}({:+})".format(
800+
self.short_modules[i][k],
801+
self.short_modules[i][k + "-delta"]
802+
))
764803

765804
table.add_row(row)
766805

@@ -815,7 +854,7 @@ def compute_report(self):
815854
for name, sizes in sorted(self.short_modules.items()):
816855
self.mem_report.append({
817856
"module": name,
818-
"size":{
857+
"size": {
819858
k: sizes.get(k, 0) for k in (self.print_sections +
820859
self.delta_sections)
821860
}
@@ -855,6 +894,7 @@ def parse(self, mapfile, toolchain):
855894
print("I/O error({0}): {1}".format(error.errno, error.strerror))
856895
return False
857896

897+
858898
def main():
859899
"""Entry Point"""
860900
version = '0.4.0'
@@ -912,16 +952,20 @@ def main():
912952

913953
returned_string = None
914954
# Write output in file
915-
if args.output != None:
916-
returned_string = memap.generate_output(args.export, \
917-
depth, args.output)
918-
else: # Write output in screen
955+
if args.output is not None:
956+
returned_string = memap.generate_output(
957+
args.export,
958+
depth,
959+
args.output
960+
)
961+
else: # Write output in screen
919962
returned_string = memap.generate_output(args.export, depth)
920963

921964
if args.export == 'table' and returned_string:
922965
print(returned_string)
923966

924967
exit(0)
925968

969+
926970
if __name__ == "__main__":
927971
main()

0 commit comments

Comments
 (0)