Misc lint

Author: rocky

Makefile

@@ -68,8 +68,6 @@ pytest:
 
 #: Clean up temporary files and .pyc files
 clean: clean_pyc
-	$(PYTHON) ./setup.py $@
-	(cd test && $(MAKE) clean)
 
 #: Create source (tarball) and wheel distribution
 dist: distcheck

uncompyle6/__init__.py

@@ -1,5 +1,5 @@
 """
-  Copyright (c) 2015, 2018, 2021-2022 by Rocky Bernstein
+  Copyright (c) 2015, 2018, 2021-2022, 2025 by Rocky Bernstein
   Copyright (c) 2000 by hartmut Goebel <h.goebel@crazy-compilers.com>
   Copyright (c) 1999 John Aycock
 
@@ -30,26 +30,23 @@
 
 __docformat__ = "restructuredtext"
 
-# from uncompyle6.version import __version__  # noqa
+from uncompyle6.version import __version__  # noqa
 
-# if hasattr(sys, "setrecursionlimit"):
-#     # pyston doesn't have setrecursionlimit
-#     sys.setrecursionlimit(5000)
+if hasattr(sys, "setrecursionlimit"):
+    # pyston doesn't have setrecursionlimit
+    sys.setrecursionlimit(5000)
 
-# from uncompyle6.semantics import semantics
+# Export some functions
+from uncompyle6.main import decompile_file  # noqa
+from uncompyle6.semantics.pysource import code_deparse, deparse_code2str
 
-# # Export some functions
-# from uncompyle6.main import decompile_file  # noqa
+# Convenience functions so you can say:
+# from uncompyle6 import (code_deparse, deparse_code2str)
 
-# # Convenience functions so you can say:
-# # from uncompyle6 import (code_deparse, deparse_code2str)
 
-# from uncompyle6.semantics.pysource import code_deparse, deparse_code2str
-
-# # __all__ = [
-# #     "__version__",
-# #     "code_deparse",
-# #     "decompile_file",
-# #     "deparse_code2str",
-# #     "semantics",
-# # ]
+__all__ = [
+    "__version__",
+    "code_deparse",
+    "decompile_file",
+    "deparse_code2str",
+]

uncompyle6/main.py

@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 Rocky Bernstein <rocky@gnu.org>
+# Copyright (C) 2018-2025 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

uncompyle6/parsers/reducecheck/and_not_check.py

@@ -1,9 +1,7 @@
-#  Copyright (c) 2020 Rocky Bernstein
+#  Copyright (c) 2020, 2025 Rocky Bernstein
 
 
-def and_not_check(
-    self, lhs, n, rule, ast, tokens, first, last
-) -> bool:
+def and_not_check(self, lhs, n, rule, ast, tokens: list, first: int, last: int) -> bool:
     jmp = ast[1]
     if jmp.kind.startswith("jmp_"):
         if last == n:

uncompyle6/parsers/reducecheck/except_handler.py

@@ -1,7 +1,7 @@
-#  Copyright (c) 2020 Rocky Bernstein
+#  Copyright (c) 2020, 2025 Rocky Bernstein
 
 
-def except_handler(self, lhs, n, rule, ast, tokens, first, last):
+def except_handler(self, lhs, n: int, rule, ast, tokens: list, first: int, last: int):
     end_token = tokens[last - 1]
 
     # print("XXX", first, last)
@@ -15,6 +15,6 @@ def except_handler(self, lhs, n, rule, ast, tokens, first, last):
         return False
 
     # Make sure COME_FROMs froms come from within "except_handler".
-    if end_token != "COME_FROM":
+    if end_token.kind != "COME_FROM":
         return False
-    return end_token.attr < tokens[first].offset
+    return end_token.attr is not None and end_token.attr < tokens[first].offset

uncompyle6/scanners/tok.py

@@ -1,4 +1,4 @@
-#  Copyright (c) 2016-2021, 2023-2024 by Rocky Bernstein
+#  Copyright (c) 2016-2021, 2023-2025 by Rocky Bernstein
 #  Copyright (c) 2000-2002 by hartmut Goebel <h.goebel@crazy-compilers.com>
 #  Copyright (c) 1999 John Aycock
 #
@@ -17,9 +17,9 @@
 
 import re
 import sys
+from typing import Optional, Union
 
 intern = sys.intern
-from typing import Union
 
 
 def off2int(offset, prefer_last=True):
@@ -71,7 +71,7 @@ def __init__(
     ):
         self.kind = intern(opname)
         self.has_arg = has_arg
-        self.attr = attr
+        self.attr: Optional[int] = attr
         self.pattr = pattr
         self.optype = optype
         if has_extended_arg: