Modernize

"make check" for 3.8+ is make check-3.8

Author: rocky

Makefile

@@ -43,8 +43,8 @@ check-3.0 check-3.1 check-3.2 check-3.6:
 check-3.7: pytest
 	$(MAKE) -C test check
 
-check-3.8:
-	$(MAKE) -C test check
+check-3.8 check-3.9 check-3.10 check-3.11 check-3.12 check-3.13:
+	$(MAKE) -C test check-3.8
 
 #:PyPy 2.6.1 PyPy 5.0.1, or PyPy 5.8.0-beta0
 # Skip for now

uncompyle6/semantics/fragments.py

@@ -1,4 +1,4 @@
-#  Copyright (c) 2015-2019, 2021-2024 by Rocky Bernstein
+#  Copyright (c) 2015-2019, 2021-2025 by 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
@@ -73,10 +73,9 @@
 from xdis import iscode
 from xdis.version_info import IS_PYPY, PYTHON_VERSION_TRIPLE
 
-import uncompyle6.parser as python_parser
+from uncompyle6.parser import ParserError as ParserError, parse
 from uncompyle6.parsers.treenode import SyntaxTree
 from uncompyle6.scanner import Code, Token, get_scanner
-from uncompyle6.semantics import pysource
 from uncompyle6.semantics.check_ast import checker
 from uncompyle6.semantics.consts import (
     INDENT_PER_LEVEL,
@@ -90,8 +89,9 @@
 from uncompyle6.semantics.pysource import (
     DEFAULT_DEBUG_OPTS,
     TREE_DEFAULT_DEBUG,
-    ParserError,
+    SourceWalker,
     StringIO,
+    find_globals_and_nonlocals,
 )
 from uncompyle6.show import maybe_show_asm, maybe_show_tree
 
@@ -147,7 +147,7 @@
 }
 
 
-class FragmentsWalker(pysource.SourceWalker, object):
+class FragmentsWalker(SourceWalker, object):
     MAP_DIRECT_FRAGMENT = ()
 
     stacked_params = ("f", "indent", "is_lambda", "_globals")
@@ -163,7 +163,7 @@ def __init__(
         linestarts={},
         tolerate_errors=True,
     ):
-        pysource.SourceWalker.__init__(
+        SourceWalker.__init__(
             self,
             version=version,
             out=StringIO(),
@@ -237,7 +237,7 @@ def set_pos_info(self, node, start, finish, name=None):
 
     def preorder(self, node=None):
         start = len(self.f.getvalue())
-        super(pysource.SourceWalker, self).preorder(node)
+        super(SourceWalker, self).preorder(node)
         self.set_pos_info(node, start, len(self.f.getvalue()))
 
         return
@@ -1177,11 +1177,11 @@ def build_ast(
                 p_insts = self.p.insts
                 self.p.insts = self.scanner.insts
                 self.p.offset2inst_index = self.scanner.offset2inst_index
-                ast = python_parser.parse(self.p, tokens, customize, code)
+                ast = parse(self.p, tokens, customize, code)
                 self.customize(customize)
                 self.p.insts = p_insts
 
-            except (python_parser.ParserError, AssertionError) as e:
+            except (ParserError, AssertionError) as e:
                 raise ParserError(e, tokens)
             transform_tree = self.treeTransform.transform(ast, code)
             maybe_show_tree(self, ast)
@@ -1219,9 +1219,9 @@ def build_ast(
             self.p.insts = self.scanner.insts
             self.p.offset2inst_index = self.scanner.offset2inst_index
             self.p.opc = self.scanner.opc
-            ast = python_parser.parse(self.p, tokens, customize, code)
+            ast = parse(self.p, tokens, customize, code)
             self.p.insts = p_insts
-        except (python_parser.ParserError, AssertionError) as e:
+        except (ParserError, AssertionError) as e:
             raise ParserError(e, tokens, {})
 
         checker(ast, False, self.ast_errors)
@@ -2116,7 +2116,7 @@ def code_deparse(
         debug_parser["errorstack"] = True
 
     # Build Syntax Tree from tokenized and massaged disassembly.
-    # deparsed = pysource.FragmentsWalker(out, scanner, showast=showast)
+    # deparsed = FragmentsWalker(out, scanner, showast=showast)
     show_tree = debug_opts.get("tree", False)
     linestarts = dict(scanner.opc.findlinestarts(co))
     deparsed = walker(
@@ -2142,7 +2142,7 @@ def code_deparse(
     # convert leading '__doc__ = "..." into doc string
     assert deparsed.ast == "stmts"
 
-    (deparsed.mod_globs, _) = pysource.find_globals_and_nonlocals(
+    (deparsed.mod_globs, _) = find_globals_and_nonlocals(
         deparsed.ast, set(), set(), co, version
     )