michaelh/zephyr
1
0
Fork 0
Code Releases Activity

scripts: dictionary: rename parser module to avoid name collision

Browse source 
The parser module collides with a module in python called parser.
Doesn't seem to be a problem in Linux but for some reason the
search/include order in Windows causes python to import the wrong
parser. The change is to rename the module to dictionary_parser
to avoid the name space collision.

fixes: #36339

Signed-off-by: David Leach <david.leach@nxp.com>
This commit is contained in:
David Leach 2021-06-23 15:18:22 -05:00 • committed by Kumar Gala
commit f5b0f92bb7
7 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
scripts/logging/dictionary/database_gen.py
View file

@ -18,8 +18,8 @@ import os
import struct
import sys
import parser.log_database
from parser.log_database import LogDatabase
import dictionary_parser.log_database
from dictionary_parser.log_database import LogDatabase
import elftools
from elftools.elf.elffile import ELFFile
@ -175,7 +175,7 @@ def process_kconfigs(elf, database):
database.set_tgt_bits(64 if "CONFIG_64BIT" in kconfigs else 32)
# Architecture
for name, arch in parser.log_database.ARCHS.items():
for name, arch in dictionary_parser.log_database.ARCHS.items():
if arch['kconfig'] in kconfigs:
database.set_arch(name)
break
@ -194,7 +194,7 @@ def extract_static_string_sections(elf, database):
# Some architectures may put static strings into additional sections.
# So need to extract them too.
arch_data = parser.log_database.ARCHS[database.get_arch()]
arch_data = dictionary_parser.log_database.ARCHS[database.get_arch()]
if "extra_string_section" in arch_data:
string_sections.extend(arch_data['extra_string_section'])