Fix Python 3.7+ "import as" but keep "import from" working

This commit is contained in:
rocky
2019-12-28 11:09:31 -05:00
parent 62c249d6b2
commit b2e1edb434
12 changed files with 36 additions and 9 deletions

View File

@@ -358,6 +358,10 @@ class Scanner37Base(Scanner):
# other parts like n_LOAD_CONST in pysource.py for example.
pattr = const
pass
elif opname == "IMPORT_NAME":
if "." in inst.argval:
opname = "IMPORT_NAME_ATTR"
pass
elif opname in ("MAKE_FUNCTION", "MAKE_CLOSURE"):
flags = argval
opname = "MAKE_FUNCTION_%d" % (flags)
@@ -888,6 +892,7 @@ class Scanner37Base(Scanner):
elif op in self.setup_opts_no_loop:
count_SETUP_ += 1
if __name__ == "__main__":
from uncompyle6 import PYTHON_VERSION