jinx/python-uncompyle6
1
Fork 0
mirror of https://github.com/rocky/python-uncompyle6.git synced 2025-08-04 01:09:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

3.7+ "from import" vs "import as" disambiguation

Browse Source
This commit is contained in:
rocky
2020-01-02 09:36:16 -05:00
parent c42e16fafe
commit 7bd81efe9b
4 changed files with 49 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
uncompyle6/parsers/parse37base.py
View File

@@ -974,6 +974,7 @@ class Python37BaseParser(PythonParser):
pass
self.check_reduce["and"] = "AST"
self.check_reduce["annotate_tuple"] = "noAST"
self.check_reduce["aug_assign1"] = "AST"
self.check_reduce["aug_assign2"] = "AST"
self.check_reduce["while1stmt"] = "noAST"
@@ -984,7 +985,7 @@ class Python37BaseParser(PythonParser):
self.check_reduce["iflaststmtl"] = "AST"
self.check_reduce["ifstmt"] = "AST"
self.check_reduce["ifstmtl"] = "AST"
self.check_reduce["annotate_tuple"] = "noAST"
self.check_reduce["import_from37"] = "AST"
self.check_reduce["or"] = "tokens"
# FIXME: remove parser errors caused by the below
@@ -1462,5 +1463,13 @@ class Python37BaseParser(PythonParser):
] != "JUMP_FORWARD"
return False
elif lhs == "import_from37":
importlist37 = ast[3]
alias37 = importlist37[0]
if importlist37 == "importlist37" and alias37 == "alias37":
store = alias37[1]
assert store == "store"
return alias37[0].attr != store[0].attr
return False
return False