Remove float version tests

Author: rocky

__pkginfo__.py

@@ -47,7 +47,7 @@
     ]
 }
 ftp_url = None
-install_requires = ["spark-parser >= 1.8.9, < 1.9.0", "xdis >= 6.0.2,<6.1.0"]
+install_requires = ["spark-parser >= 1.8.9, < 1.9.0", "xdis >= 6.0.3,<6.1.0"]
 
 license = "GPL3"
 mailing_list = "[email protected]"

decompyle3/parsers/dump.py

@@ -1,4 +1,4 @@
-#  Copyright (c) 2020 Rocky Bernstein
+#  Copyright (c) 2020-2021 Rocky Bernstein
 #
 #  This program is free software: you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -14,21 +14,22 @@
 #  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 """Common grammar dump and check routine"""
 
-def dump_and_check(p, version: float, modified_tokens: set) -> None:
+
+def dump_and_check(p, version: tuple, modified_tokens: set) -> None:
 
     p.dump_grammar()
     print("=" * 50, "\n")
 
     p.check_grammar()
-    from decompyle3 import PYTHON_VERSION, IS_PYPY
+    from xdis.version_info import PYTHON_VERSION_TRIPLE, IS_PYPY
 
-    if PYTHON_VERSION == version:
+    if PYTHON_VERSION_TRIPLE[:2] == version[:2]:
         lhs, rhs, tokens, right_recursive, dup_rhs = p.check_sets()
         from decompyle3.scanner import get_scanner
 
-        s = get_scanner(PYTHON_VERSION, IS_PYPY)
+        s = get_scanner(PYTHON_VERSION_TRIPLE, IS_PYPY)
         modified_tokens = set(
-                """JUMP_BACK CONTINUE RETURN_END_IF COME_FROM
+            """JUMP_BACK CONTINUE RETURN_END_IF COME_FROM
                LOAD_GENEXPR LOAD_ASSERT LOAD_SETCOMP LOAD_DICTCOMP LOAD_CLASSNAME
                LAMBDA_MARKER RETURN_LAST
             """.split()

decompyle3/parsers/p38/base.py

@@ -1,4 +1,4 @@
-#  Copyright (c) 2020 Rocky Bernstein
+#  Copyright (c) 2020-2021 Rocky Bernstein
 #
 #  This program is free software: you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -16,11 +16,8 @@
 from decompyle3.parsers.main import PythonParserSingle
 from spark_parser import DEFAULT_DEBUG as PARSER_DEFAULT_DEBUG
 from decompyle3.parsers.p38.full import Python38FullParser
-from decompyle3.parsers.reducecheck import (
-    break_check,
-    for38_check,
-    pop_return_check
-)
+from decompyle3.parsers.reducecheck import break_check, for38_check, pop_return_check
+
 
 class Python38Parser(Python38FullParser):
     def __init__(self, debug_parser=PARSER_DEFAULT_DEBUG, compile_mode="exec"):
@@ -127,20 +124,22 @@ def reduce_is_invalid(self, rule, ast, tokens, first, last):
 
         return False
 
+
 class Python38ParserSingle(Python38Parser, PythonParserSingle):
     pass
 
 
 if __name__ == "__main__":
     # Check grammar
     from decompyle3.parsers.dump import dump_and_check
+
     p = Python38Parser()
     modified_tokens = set(
         """JUMP_BACK CONTINUE RETURN_END_IF COME_FROM
            LOAD_GENEXPR LOAD_ASSERT LOAD_SETCOMP LOAD_DICTCOMP LOAD_CLASSNAME
            LAMBDA_MARKER RETURN_LAST
         """.split()
-        )
+    )
 
     p.remove_rules_38()
-    dump_and_check(p, 3.8, modified_tokens)
+    dump_and_check(p, (3, 8), modified_tokens)

decompyle3/parsers/p38/full.py

@@ -303,4 +303,4 @@ class Python38ParserEval(Python38LambdaParser, PythonParserEval):
         """.split()
     )
 
-    dump_and_check(p, 3.8, modified_tokens)
+    dump_and_check(p, (3, 8), modified_tokens)

decompyle3/parsers/p38/lambda_expr.py

@@ -1,4 +1,4 @@
-#  Copyright (c) 2020 Rocky Bernstein
+#  Copyright (c) 2020-2021 Rocky Bernstein
 #
 #  This program is free software: you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -20,6 +20,7 @@
 from spark_parser import DEFAULT_DEBUG as PARSER_DEFAULT_DEBUG
 from decompyle3.parsers.p37 import Python37LambdaParser
 
+
 class Python38LambdaParser(Python37LambdaParser):
     def p_38walrus(self, args):
         """
@@ -29,18 +30,22 @@ def p_38walrus(self, args):
         """
 
     def __init__(self, debug_parser=PARSER_DEFAULT_DEBUG, compile_mode="lambda"):
-        super(Python38LambdaParser, self).__init__(debug_parser, compile_mode=compile_mode)
+        super(Python38LambdaParser, self).__init__(
+            debug_parser, compile_mode=compile_mode
+        )
         self.customized = {}
 
+
 if __name__ == "__main__":
     # Check grammar
     from decompyle3.parsers.dump import dump_and_check
+
     p = Python38LambdaParser()
     modified_tokens = set(
         """JUMP_BACK CONTINUE RETURN_END_IF COME_FROM
            LOAD_GENEXPR LOAD_ASSERT LOAD_SETCOMP LOAD_DICTCOMP LOAD_CLASSNAME
            LAMBDA_MARKER RETURN_LAST
         """.split()
-        )
+    )
 
-    dump_and_check(p, 3.8, modified_tokens)
+    dump_and_check(p, (3, 8), modified_tokens)

decompyle3/scanner.py

@@ -546,10 +546,10 @@ def get_scanner(version, is_pypy=False, show_asm=None):
 
 
 if __name__ == "__main__":
-    import inspect, decompyle3
+    import inspect
 
     co = inspect.currentframe().f_code
     from xdis.version_info import PYTHON_VERSION_TRIPLE
 
-    scanner = get_scanner(decompyle3.PYTHON_VERSION_TRIPLE, IS_PYPY, True)
+    scanner = get_scanner(PYTHON_VERSION_TRIPLE, IS_PYPY, True)
     tokens, customize = scanner.ingest(co, {}, show_asm="after")

decompyle3/scanners/scanner37.py

@@ -66,9 +66,9 @@ def ingest(self, co, classname=None, code_objects={}, show_asm=None) -> tuple:
 
 
 if __name__ == "__main__":
-    from decompyle3 import PYTHON_VERSION
+    from xdis.version_info import PYTHON_VERSION_TRIPLE, version_tuple_to_str
 
-    if PYTHON_VERSION == 3.7:
+    if PYTHON_VERSION_TRIPLE[:2] == (3, 7):
         import inspect
 
         co = inspect.currentframe().f_code  # type: ignore
@@ -77,4 +77,4 @@ def ingest(self, co, classname=None, code_objects={}, show_asm=None) -> tuple:
             print(t.format())
         pass
     else:
-        print(f"Need to be Python 3.7 to demo; I am version {PYTHON_VERSION}.")
+        print(f"Need to be Python 3.7 to demo; I am version {version_tuple_to_str}.")

decompyle3/scanners/scanner37base.py

@@ -924,9 +924,9 @@ def next_except_jump(self, start):
 
 
 if __name__ == "__main__":
-    from decompyle3 import PYTHON_VERSION
+    from xdis.version_info import PYTHON_VERSION_TRIPLE, version_tuple_to_str
 
-    if PYTHON_VERSION >= 3.7:
+    if PYTHON_VERSION_TRIPLE[:2] == (3, 7):
         import inspect
 
         co = inspect.currentframe().f_code  # type: ignore
@@ -936,7 +936,5 @@ def next_except_jump(self, start):
         for t in tokens:
             print(t)
     else:
-        print(
-            f"Need to be Python 3.7 or greater to demo; I am version {PYTHON_VERSION}."
-        )
+        print(f"Need to be Python 3.7 to demo; I am version {version_tuple_to_str}.")
     pass

decompyle3/scanners/scanner38.py

@@ -137,9 +137,9 @@ def ingest(
 
 
 if __name__ == "__main__":
-    from decompyle3 import PYTHON_VERSION
+    from xdis.version_info import PYTHON_VERSION_TRIPLE, version_tuple_to_str
 
-    if PYTHON_VERSION == 3.8:
+    if PYTHON_VERSION_TRIPLE[:2] == (3, 8):
         import inspect
 
         co = inspect.currentframe().f_code  # type: ignore
@@ -148,4 +148,4 @@ def ingest(
             print(t.format())
         pass
     else:
-        print(f"Need to be Python 3.8 to demo; I am {PYTHON_VERSION}.")
+        print(f"Need to be Python 3.8 to demo; I am version {version_tuple_to_str}.")

test/simple_source/expression/14_mixed_expressions.py

@@ -3,9 +3,10 @@
 # This code is RUNNABLE!
 
 import sys
-PYTHON_VERSION = sys.version_info[0] + (sys.version_info[1] / 10.0)
 
-assert PYTHON_VERSION >= 3.7
+PYTHON_VERSION_TRIPLE = sys.version_info[:3]
+
+assert PYTHON_VERSION_TRIPLE >= (3, 7)
 
 # some floats (from 01_float.py)
 
@@ -20,7 +21,7 @@
 y = 5j
 assert y ** 2 == -25
 y **= 3
-assert y == (-0-125j)
+assert y == (-0 - 125j)
 
 
 # Tests BINARY_TRUE_DIVIDE and INPLACE_TRUE_DIVIDE (from 02_try_divide.py)