Get ready for release 3.7.7

NEWS.md

@@ -1,3 +1,10 @@
+3.7.7
+=====
+
+* Better handling of invalid bytecode magic
+* Python 3.8 "try" with a "return" in "finally". Issue #67
+* Support running from 3.9 and 3.10 although we do not support those bytecodes
+
 3.7.6
 =====
 

__pkginfo__.py

@@ -47,7 +47,7 @@
     ]
 }
 ftp_url = None
-install_requires = ["spark-parser >= 1.8.9, < 1.9.0", "xdis >= 6.0.1,<6.1.0"]
+install_requires = ["spark-parser >= 1.8.9, < 1.9.0", "xdis >= 6.0.2,<6.1.0"]
 
 license = "GPL3"
 mailing_list = "python-debugger@googlegroups.com"

decompyle3/scanner.py

@@ -75,11 +75,10 @@ def __init__(self, version: tuple, show_asm=None, is_pypy=False):
         self.is_pypy = is_pypy
 
         if version in PYTHON_VERSIONS:
+            v_str = f"""opcode_{version_tuple_to_str(version, start=0, end=2, delimiter="")}"""
             if is_pypy:
-                v_str = "opcode_%spypy" % ("".join([str(v) for v in version]))
-            else:
-                v_str = "opcode_%s" % ("".join([str(v) for v in version]))
-            exec("from xdis.opcodes import %s" % v_str)
+                v_str += "pypy"
+            exec(f"""from xdis.opcodes import {v_str}""")
             exec("self.opc = %s" % v_str)
         else:
             raise TypeError("%s is not a Python version I know about" % version)
@@ -506,7 +505,7 @@ def get_scanner(version, is_pypy=False, show_asm=None):
 
     # Pick up appropriate scanner
     if version[:2] in PYTHON_VERSIONS:
-        v_str = "".join([str(v) for v in version[:2]])
+        v_str = version_tuple_to_str(version, start=0, end=2, delimiter="")
         try:
             import importlib
 

decompyle3/version.py

@@ -13,4 +13,4 @@
 # This file is suitable for sourcing inside bash as
 # well as importing into Python
 # fmt: off
-__version__="3.7.6"  # noqa
+__version__="3.7.7"  # noqa