espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-02 12:14:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/parseexception_msg' into 'master'

Browse Source 
ldgen: change exception message access

See merge request espressif/esp-idf!9121
This commit is contained in:
Angus Gratton
2020-06-16 12:16:26 +08:00
parent 61ab64439b ea07ce1a5a
commit 1a9509a47f
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tools/ldgen/fragments.py
View File

@@ -107,7 +107,7 @@ class FragmentFile():
try: try:
parse_ctx.fragment.set_key_value(parse_ctx.key, stmts) parse_ctx.fragment.set_key_value(parse_ctx.key, stmts)
except Exception as e: except Exception as e:
raise ParseFatalException(pstr, loc, "unable to add key '%s'; %s" % (parse_ctx.key, e.message)) raise ParseFatalException(pstr, loc, "unable to add key '%s'; %s" % (parse_ctx.key, str(e)))
return None return None
key = Word(alphanums + "_") + Suppress(":") key = Word(alphanums + "_") + Suppress(":")
@@ -139,7 +139,7 @@ class FragmentFile():
except KeyError: except KeyError:
raise ParseFatalException(pstr, loc, "key '%s' is not supported by fragment" % key) raise ParseFatalException(pstr, loc, "key '%s' is not supported by fragment" % key)
except Exception as e: except Exception as e:
raise ParseFatalException(pstr, loc, "unable to parse key '%s'; %s" % (key, e.message)) raise ParseFatalException(pstr, loc, "unable to parse key '%s'; %s" % (key, str(e)))
key_stmt << (conditional | Group(key_grammar).setResultsName("value")) key_stmt << (conditional | Group(key_grammar).setResultsName("value"))

4
tools/ldgen/generation.py
View File

@@ -591,7 +591,7 @@ class SectionsInfo(dict):
try: try:
results = parser.parseString(first_line) results = parser.parseString(first_line)
except ParseException as p: except ParseException as p:
raise ParseException("Parsing sections info for library " + sections_info_dump.name + " failed. " + p.message) raise ParseException("Parsing sections info for library " + sections_info_dump.name + " failed. " + p.msg)
archive = os.path.basename(results.archive_path) archive = os.path.basename(results.archive_path)
self.sections[archive] = SectionsInfo.__info(sections_info_dump.name, sections_info_dump.read()) self.sections[archive] = SectionsInfo.__info(sections_info_dump.name, sections_info_dump.read())
@@ -618,7 +618,7 @@ class SectionsInfo(dict):
try: try:
results = parser.parseString(sections_info_text) results = parser.parseString(sections_info_text)
except ParseException as p: except ParseException as p:
raise ParseException("Unable to parse section info file " + info.filename + ". " + p.message) raise ParseException("Unable to parse section info file " + info.filename + ". " + p.msg)
return results return results