Merge pull request #446 from rocky/do-not-quote-non-str-args

Use xdis pattr extraction for LOAD_NAME

Author: rocky

test/simple_source/bug27+/01_argument_quoting.py

@@ -0,0 +1,7 @@
+# Bug was erroneously putting quotes around Exception on decompilatoin
+# RUNNABLE!
+
+"""This program is self-checking!"""
+z = ["y", Exception]
+assert z[0] == "y"
+assert isinstance(z[1], Exception)

uncompyle6/scanners/scanner2.py

@@ -1,4 +1,4 @@
-#  Copyright (c) 2015-2022 by Rocky Bernstein
+#  Copyright (c) 2015-2023 by Rocky Bernstein
 #  Copyright (c) 2005 by Dan Pascu <[email protected]>
 #  Copyright (c) 2000-2002 by hartmut Goebel <[email protected]>
 #
@@ -38,7 +38,7 @@
 from copy import copy
 
 from xdis import code2num, iscode, op_has_argument, instruction_size
-from xdis.bytecode import _get_const_info
+from xdis.bytecode import _get_const_info, _get_name_info
 from uncompyle6.scanner import Scanner, Token
 
 from sys import intern
@@ -360,6 +360,7 @@ def ingest(self, co, classname=None, code_objects={}, show_asm=None):
                         pattr = const
                         pass
                 elif op in self.opc.NAME_OPS:
+                    _, pattr = _get_name_info(oparg, names)
                     pattr = names[oparg]
                 elif op in self.opc.JREL_OPS:
                     #  use instead: hasattr(self, 'patch_continue'): ?