From 999eee4b5f326b5b22146954e9c7408b01d63a38 Mon Sep 17 00:00:00 2001 From: rocky Date: Sat, 18 Apr 2020 22:26:24 -0400 Subject: [PATCH] More xdis upgrade fixes... LOAD_CONST of unicode in 2.7- is the same thing as LOAD_STR. I guess previously there was no unicode. --- .../{05_abc_test.pyc-notyet => 05_abc_test.pyc} | Bin uncompyle6/scanners/scanner3.py | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename test/bytecode_3.0/{05_abc_test.pyc-notyet => 05_abc_test.pyc} (100%) diff --git a/test/bytecode_3.0/05_abc_test.pyc-notyet b/test/bytecode_3.0/05_abc_test.pyc similarity index 100% rename from test/bytecode_3.0/05_abc_test.pyc-notyet rename to test/bytecode_3.0/05_abc_test.pyc diff --git a/uncompyle6/scanners/scanner3.py b/uncompyle6/scanners/scanner3.py index cd9cd164..c9b8ee2c 100644 --- a/uncompyle6/scanners/scanner3.py +++ b/uncompyle6/scanners/scanner3.py @@ -379,7 +379,7 @@ class Scanner3(Scanner): # pattr = 'code_object @ 0x%x %s->%s' %\ # (id(const), const.co_filename, const.co_name) pattr = "" - elif isinstance(const, str): + elif isinstance(const, str) or xdis.PYTHON_VERSION <= 2.7 and isinstance(const, unicode): opname = "LOAD_STR" else: if isinstance(inst.arg, int) and inst.arg < len(co.co_consts):