From ab508e1ec9c4012a86588d735d68bc533f2e9d32 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Sat, 5 Nov 2022 17:17:24 -0400 Subject: [PATCH] Fix ImportError: cannot import name PYTHON_VERSION --- uncompyle6/parsers/parse26.py | 6 +++--- uncompyle6/parsers/parse27.py | 6 +++--- uncompyle6/parsers/parse30.py | 6 +++--- uncompyle6/parsers/parse31.py | 6 +++--- uncompyle6/parsers/parse34.py | 6 +++--- uncompyle6/parsers/parse35.py | 6 +++--- uncompyle6/parsers/parse36.py | 6 +++--- uncompyle6/parsers/parse37.py | 6 +++--- uncompyle6/parsers/parse38.py | 6 +++--- 9 files changed, 27 insertions(+), 27 deletions(-) diff --git a/uncompyle6/parsers/parse26.py b/uncompyle6/parsers/parse26.py index 679949b0..6b3e5b3f 100644 --- a/uncompyle6/parsers/parse26.py +++ b/uncompyle6/parsers/parse26.py @@ -546,13 +546,13 @@ if __name__ == "__main__": # Check grammar p = Python26Parser() p.check_grammar() - from uncompyle6 import PYTHON_VERSION, IS_PYPY + from xdis.version_info import PYTHON_VERSION_TRIPLE, IS_PYPY - if PYTHON_VERSION == 2.6: + if PYTHON_VERSION_TRIPLE[:2] == (2, 6): lhs, rhs, tokens, right_recursive, dup_rhs = p.check_sets() from uncompyle6.scanner import get_scanner - s = get_scanner(PYTHON_VERSION, IS_PYPY) + s = get_scanner(PYTHON_VERSION_TRIPLE, IS_PYPY) opcode_set = set(s.opc.opname).union( set( """JUMP_BACK CONTINUE RETURN_END_IF COME_FROM diff --git a/uncompyle6/parsers/parse27.py b/uncompyle6/parsers/parse27.py index 86986d7d..e08cc84b 100644 --- a/uncompyle6/parsers/parse27.py +++ b/uncompyle6/parsers/parse27.py @@ -375,11 +375,11 @@ if __name__ == "__main__": # Check grammar p = Python27Parser() p.check_grammar() - from uncompyle6 import PYTHON_VERSION, IS_PYPY - if PYTHON_VERSION == 2.7: + from xdis.version_info import PYTHON_VERSION_TRIPLE, IS_PYPY + if PYTHON_VERSION_TRIPLE[:2] == (2, 7): lhs, rhs, tokens, right_recursive, dup_rhs = p.check_sets() from uncompyle6.scanner import get_scanner - s = get_scanner(PYTHON_VERSION, IS_PYPY) + s = get_scanner(PYTHON_VERSION_TRIPLE, IS_PYPY) opcode_set = set(s.opc.opname).union(set( """JUMP_BACK CONTINUE RETURN_END_IF COME_FROM LOAD_GENEXPR LOAD_ASSERT LOAD_SETCOMP LOAD_DICTCOMP diff --git a/uncompyle6/parsers/parse30.py b/uncompyle6/parsers/parse30.py index 13fdb280..3eb44745 100644 --- a/uncompyle6/parsers/parse30.py +++ b/uncompyle6/parsers/parse30.py @@ -365,11 +365,11 @@ if __name__ == '__main__': p = Python30Parser() p.remove_rules_30() p.check_grammar() - from uncompyle6 import PYTHON_VERSION, IS_PYPY - if PYTHON_VERSION == 3.0: + from xdis.version_info import PYTHON_VERSION_TRIPLE, IS_PYPY + if PYTHON_VERSION_TRIPLE[:2] == (3, 0): lhs, rhs, tokens, right_recursive, dup_rhs = p.check_sets() from uncompyle6.scanner import get_scanner - s = get_scanner(PYTHON_VERSION, IS_PYPY) + s = get_scanner(PYTHON_VERSION_TRIPLE, IS_PYPY) opcode_set = set(s.opc.opname).union(set( """JUMP_BACK CONTINUE RETURN_END_IF COME_FROM LOAD_GENEXPR LOAD_ASSERT LOAD_SETCOMP LOAD_DICTCOMP LOAD_CLASSNAME diff --git a/uncompyle6/parsers/parse31.py b/uncompyle6/parsers/parse31.py index 8e04fae6..537c5a46 100644 --- a/uncompyle6/parsers/parse31.py +++ b/uncompyle6/parsers/parse31.py @@ -56,11 +56,11 @@ if __name__ == '__main__': p = Python31Parser() p.remove_rules_31() p.check_grammar() - from uncompyle6 import PYTHON_VERSION, IS_PYPY - if PYTHON_VERSION == 3.1: + from xdis.version_info import PYTHON_VERSION_TRIPLE, IS_PYPY + if PYTHON_VERSION_TRIPLE[:2] == (3, 1): lhs, rhs, tokens, right_recursive, dup_rhs = p.check_sets() from uncompyle6.scanner import get_scanner - s = get_scanner(PYTHON_VERSION, IS_PYPY) + s = get_scanner(PYTHON_VERSION_TRIPLE, IS_PYPY) opcode_set = set(s.opc.opname).union(set( """JUMP_BACK CONTINUE RETURN_END_IF COME_FROM LOAD_GENEXPR LOAD_ASSERT LOAD_SETCOMP LOAD_DICTCOMP LOAD_CLASSNAME diff --git a/uncompyle6/parsers/parse34.py b/uncompyle6/parsers/parse34.py index 8eff26dd..ecee62e6 100644 --- a/uncompyle6/parsers/parse34.py +++ b/uncompyle6/parsers/parse34.py @@ -70,11 +70,11 @@ if __name__ == '__main__': # Check grammar p = Python34Parser() p.check_grammar() - from uncompyle6 import PYTHON_VERSION, IS_PYPY - if PYTHON_VERSION == 3.4: + from xdis.version_info import PYTHON_VERSION_TRIPLE, IS_PYPY + if PYTHON_VERSION_TRIPLE[:2] == (3, 4): lhs, rhs, tokens, right_recursive, dup_rhs = p.check_sets() from uncompyle6.scanner import get_scanner - s = get_scanner(PYTHON_VERSION, IS_PYPY) + s = get_scanner(PYTHON_VERSION_TRIPLE, IS_PYPY) opcode_set = set(s.opc.opname).union(set( """JUMP_BACK CONTINUE RETURN_END_IF COME_FROM LOAD_GENEXPR LOAD_ASSERT LOAD_SETCOMP LOAD_DICTCOMP LOAD_CLASSNAME diff --git a/uncompyle6/parsers/parse35.py b/uncompyle6/parsers/parse35.py index 23d92416..86043ef2 100644 --- a/uncompyle6/parsers/parse35.py +++ b/uncompyle6/parsers/parse35.py @@ -273,11 +273,11 @@ if __name__ == '__main__': # Check grammar p = Python35Parser() p.check_grammar() - from uncompyle6 import PYTHON_VERSION, IS_PYPY - if PYTHON_VERSION == 3.5: + from xdis.version_info import PYTHON_VERSION_TRIPLE, IS_PYPY + if PYTHON_VERSION_TRIPLE[:2] == (3, 5): lhs, rhs, tokens, right_recursive, dup_rhs = p.check_sets() from uncompyle6.scanner import get_scanner - s = get_scanner(PYTHON_VERSION, IS_PYPY) + s = get_scanner(PYTHON_VERSION_TRIPLE, IS_PYPY) opcode_set = set(s.opc.opname).union(set( """JUMP_BACK CONTINUE RETURN_END_IF COME_FROM LOAD_GENEXPR LOAD_ASSERT LOAD_SETCOMP LOAD_DICTCOMP LOAD_CLASSNAME diff --git a/uncompyle6/parsers/parse36.py b/uncompyle6/parsers/parse36.py index a6a9bbf9..36d65c3c 100644 --- a/uncompyle6/parsers/parse36.py +++ b/uncompyle6/parsers/parse36.py @@ -673,11 +673,11 @@ if __name__ == '__main__': # Check grammar p = Python36Parser() p.check_grammar() - from uncompyle6 import PYTHON_VERSION, IS_PYPY - if PYTHON_VERSION == 3.6: + from xdis.version_info import PYTHON_VERSION_TRIPLE, IS_PYPY + if PYTHON_VERSION_TRIPLE[:2] == (3, 6): lhs, rhs, tokens, right_recursive, dup_rhs = p.check_sets() from uncompyle6.scanner import get_scanner - s = get_scanner(PYTHON_VERSION, IS_PYPY) + s = get_scanner(PYTHON_VERSION_TRIPLE, IS_PYPY) opcode_set = set(s.opc.opname).union(set( """JUMP_BACK CONTINUE RETURN_END_IF COME_FROM LOAD_GENEXPR LOAD_ASSERT LOAD_SETCOMP LOAD_DICTCOMP LOAD_CLASSNAME diff --git a/uncompyle6/parsers/parse37.py b/uncompyle6/parsers/parse37.py index 4302e247..265a131d 100644 --- a/uncompyle6/parsers/parse37.py +++ b/uncompyle6/parsers/parse37.py @@ -1740,13 +1740,13 @@ if __name__ == "__main__": # FIXME: DRY this with other parseXX.py routines p = Python37Parser() p.check_grammar() - from uncompyle6 import PYTHON_VERSION, IS_PYPY + from xdis.version_info import PYTHON_VERSION_TRIPLE, IS_PYPY - if PYTHON_VERSION == 3.7: + if PYTHON_VERSION_TRIPLE[:2] == (3, 7): lhs, rhs, tokens, right_recursive, dup_rhs = p.check_sets() from uncompyle6.scanner import get_scanner - s = get_scanner(PYTHON_VERSION, IS_PYPY) + s = get_scanner(PYTHON_VERSION_TRIPLE, IS_PYPY) opcode_set = set(s.opc.opname).union( set( """JUMP_BACK CONTINUE RETURN_END_IF COME_FROM diff --git a/uncompyle6/parsers/parse38.py b/uncompyle6/parsers/parse38.py index 69c2f4c6..e36e65d8 100644 --- a/uncompyle6/parsers/parse38.py +++ b/uncompyle6/parsers/parse38.py @@ -610,13 +610,13 @@ if __name__ == "__main__": p = Python38Parser() p.remove_rules_38() p.check_grammar() - from uncompyle6 import PYTHON_VERSION, IS_PYPY + from xdis.version_info import PYTHON_VERSION_TRIPLE, IS_PYPY - if PYTHON_VERSION == 3.8: + if PYTHON_VERSION_TRIPLE[:2] == (3, 8): lhs, rhs, tokens, right_recursive, dup_rhs = p.check_sets() from uncompyle6.scanner import get_scanner - s = get_scanner(PYTHON_VERSION, IS_PYPY) + s = get_scanner(PYTHON_VERSION_TRIPLE, IS_PYPY) opcode_set = set(s.opc.opname).union( set( """JUMP_BACK CONTINUE RETURN_END_IF COME_FROM