Python 3.13 packaging

Author: rocky

pyproject.toml

@@ -1,9 +1,5 @@
 [build-system]
-requires = [
-    "setuptools",
-    # "setuptools>=59.6.0", # for 3.6
-]
-
+requires = ["setuptools>=61.0"]
 build-backend = "setuptools.build_meta"
 
 [project]
@@ -44,6 +40,7 @@ classifiers = [
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
 ]
 dynamic = ["version"]
 
@@ -63,3 +60,6 @@ uncompyle6-tokenize = "uncompyle6.bin.pydisassemble:main"
 
 [tool.setuptools.dynamic]
 version = {attr = "uncompyle6.version.__version__"}
+
+[tool.setuptools.packages.find]
+include = ["uncompyle6*"]  # Include all subpackages

setup.py

@@ -30,27 +30,26 @@
 
 __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 fragments, pysource
+# from uncompyle6.semantics import semantics
 
-# Export some functions
-from uncompyle6.main import decompile_file  # noqa
+# # 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
+# from uncompyle6.semantics.pysource import code_deparse, deparse_code2str
 
-__all__ = [
-    "__version__",
-    "code_deparse",
-    "decompile_file",
-    "deparse_code2str",
-    "fragments",
-    "pysource",
-]
+# # __all__ = [
+# #     "__version__",
+# #     "code_deparse",
+# #     "decompile_file",
+# #     "deparse_code2str",
+# #     "semantics",
+# # ]

uncompyle6/__init__.py

@@ -29,10 +29,13 @@
 
 from uncompyle6.code_fns import check_object_path
 from uncompyle6.parser import ParserError
-from uncompyle6.semantics import pysource
 from uncompyle6.semantics.fragments import code_deparse as code_deparse_fragments
 from uncompyle6.semantics.linemap import deparse_code_with_map
-from uncompyle6.semantics.pysource import PARSER_DEFAULT_DEBUG, code_deparse
+from uncompyle6.semantics.pysource import (
+    PARSER_DEFAULT_DEBUG,
+    SourceWalkerError,
+    code_deparse,
+)
 from uncompyle6.version import __version__
 
 # from uncompyle6.linenumbers import line_number_mapping
@@ -173,9 +176,9 @@ def write(s):
             pass
         real_out.write("\n")
         return deparsed
-    except pysource.SourceWalkerError as e:
+    except SourceWalkerError as e:
         # deparsing failed
-        raise pysource.SourceWalkerError(str(e))
+        raise SourceWalkerError(str(e))
 
 
 def compile_file(source_path: str) -> str:
@@ -412,7 +415,7 @@ def main(
                     # sys.stderr.write(f"Ran {deparsed_object.f.name}\n")
                 pass
             tot_files += 1
-        except (ValueError, SyntaxError, ParserError, pysource.SourceWalkerError) as e:
+        except (ValueError, SyntaxError, ParserError, SourceWalkerError) as e:
             sys.stdout.write("\n")
             sys.stderr.write(f"\n# file {infile}\n# {e}\n")
             failed_files += 1