Merge branch 'master' into python-3.6-to-3.10

Author: rocky

uncompyle6/show.py

@@ -1,4 +1,4 @@
-# Copyright (C) 2018, 2020, 2023 Rocky Bernstein <rocky@gnu.org>
+# Copyright (C) 2018, 2020, 2023, 2026 Rocky Bernstein <rocky@gnu.org>
 #
 #  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
@@ -13,9 +13,10 @@
 #  You should have received a copy of the GNU General Public License
 #  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 import sys
+from typing import Any
 
 
-def maybe_show_asm(showasm, tokens):
+def maybe_show_asm(showasm: Any, tokens: list) -> None:
     """
     Show the asm based on the showasm flag (or file object), writing to the
     appropriate stream depending on the type of the flag.
@@ -32,15 +33,15 @@ def maybe_show_asm(showasm, tokens):
             stream.write("\n")
 
 
-def maybe_show_tree(walker, ast):
+def maybe_show_tree(walker, tree) -> None:
     """
-    Show the ast based on the showast flag (or file object), writing to the
+    Show the tree based on the tree flag (or file object), writing to the
     appropriate stream depending on the type of the flag.
 
     :param show_tree: Flag which determines whether the parse tree is
                       written to sys.stdout or not. (It is also to pass a file
                       like object, into which the ast will be written).
-    :param ast:     The ast to show.
+    :param tree:     The tree to show.
     """
     if walker.showast:
         if hasattr(walker.showast, "write"):
@@ -51,14 +52,15 @@ def maybe_show_tree(walker, ast):
             isinstance(walker.showast, dict)
             and walker.showast.get("after", False)
             and hasattr(walker, "str_with_template")
+            and walker.str_with_template
         ):
-            walker.str_with_template(ast)
+            walker.str_with_template(tree)
         else:
-            stream.write(str(ast))
+            stream.write(str(tree))
         stream.write("\n")
 
 
-def maybe_show_tree_param_default(show_tree, name, default):
+def maybe_show_tree_param_default(show_tree, name: str, default):
     """
     Show a function parameter with default for an grammar-tree based on the show_tree flag
     (or file object), writing to the appropriate stream depending on the type

uncompyle6/util.py

@@ -3,15 +3,17 @@
 # More could be done here though.
 
 from math import copysign
+
 from xdis.cross_types import UnicodeForPython3
-from xdis.version_info import PYTHON_VERSION_TRIPLE
+
 
 def get_code_name(code) -> str:
     code_name = code.co_name
     if isinstance(code_name, UnicodeForPython3):
         return code_name.value.decode("utf-8")
     return code_name
 
+
 def is_negative_zero(n):
     """Returns true if n is -0.0"""
     return n == 0.0 and copysign(1, n) == -1
@@ -42,12 +44,6 @@ def better_repr(v, version):
         if len(v) == 1:
             return "(%s,)" % better_repr(v[0], version)
         return "(%s)" % ", ".join(better_repr(i, version) for i in v)
-    elif PYTHON_VERSION_TRIPLE < (3, 0) and isinstance(v, long):
-        s = repr(v)
-        if version >= 3.0 and s[-1] == "L":
-            return s[:-1]
-        else:
-            return s
     elif isinstance(v, list):
         if len(v) == 1:
             return "[%s,]" % better_repr(v[0], version)