From 1bcd21a6f4d288eda8b1711afa40b566f3d4c91a Mon Sep 17 00:00:00 2001 From: rocky Date: Sat, 23 Oct 2021 10:04:58 -0400 Subject: [PATCH] More version conversion bugs --- uncompyle6/scanner.py | 2 +- uncompyle6/semantics/pysource.py | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/uncompyle6/scanner.py b/uncompyle6/scanner.py index b31b04d5..d11adbfa 100755 --- a/uncompyle6/scanner.py +++ b/uncompyle6/scanner.py @@ -26,7 +26,7 @@ from collections import namedtuple import sys from uncompyle6.scanners.tok import Token -from xdis.version_info import PYTHON3, IS_PYPY, version_tuple_to_str +from xdis.version_info import IS_PYPY, PYTHON3, version_tuple_to_str import xdis from xdis import Bytecode, canonic_python_version, code2num, instruction_size, extended_arg_val, next_offset diff --git a/uncompyle6/semantics/pysource.py b/uncompyle6/semantics/pysource.py index 232bbf7b..734967c8 100644 --- a/uncompyle6/semantics/pysource.py +++ b/uncompyle6/semantics/pysource.py @@ -135,7 +135,8 @@ import sys IS_PYPY = "__pypy__" in sys.builtin_module_names PYTHON3 = sys.version_info >= (3, 0) -from xdis import iscode, COMPILER_FLAG_BIT, sysinfo2float +from xdis import iscode, COMPILER_FLAG_BIT +from xdis.version_info import PYTHON_VERSION_TRIPLE from uncompyle6.parser import get_python_parser from uncompyle6.parsers.treenode import SyntaxTree @@ -2567,7 +2568,7 @@ def code_deparse( assert iscode(co) if version is None: - version = sysinfo2float() + version = PYTHON_VERSION_TRIPLE # store final output stream for case of error scanner = get_scanner(version, is_pypy=is_pypy)