Merge pull request #4457 from mwichmann/py313-support

Initial Python 3.13 support

Author: bdbaddog

CHANGES.txt

@@ -42,7 +42,7 @@ RELEASE  VERSION/DATE TO BE FILLED IN LATER
     - Fix issue #4320: add an optional argument list string to configure's CheckFunc
       method so that the generated function argument list matches the function's
       prototype when including a header file.
-      
+
   From William Deegan:
     - Fix sphinx config to handle SCons versions with post such as: 4.6.0.post1
 
@@ -53,6 +53,10 @@ RELEASE  VERSION/DATE TO BE FILLED IN LATER
     - Fix of the --debug=sconscript option to return exist statements when using return
       statement with stop flag enabled
 
+  From Mats Wichmann:
+    - Add support for Python 3.13 (as of alpha 2). So far only affects
+      expected bytecodes in ActionTests.py.
+
 
 RELEASE 4.6.0 -  Sun, 19 Nov 2023 17:22:20 -0700
 

RELEASE.txt

@@ -32,6 +32,7 @@ CHANGED/ENHANCED EXISTING FUNCTIONALITY
 - Add an optional argument list string to configure's CheckFunc method so
   that the generated function argument list matches the function's
   prototype when including a header file. Fixes GH Issue #4320
+- Now supports pre-release Python 3.13
 
 FIXES
 -----

SCons/ActionTests.py

@@ -347,7 +347,7 @@ def test_ListAction(self) -> None:
         """Test the Action() factory's creation of ListAction objects."""
 
         a1 = SCons.Action.Action(["x", "y", "z", ["a", "b", "c"]])
-        assert isinstance(a1, SCons.Action.ListAction), a1
+        assert isinstance(a1, SCons.Action.ListAction), f"a1 is {type(a1)}"
         assert a1.varlist == (), a1.varlist
         assert isinstance(a1.list[0], SCons.Action.CommandAction), a1.list[0]
         assert a1.list[0].cmd_list == "x", a1.list[0].cmd_list
@@ -359,7 +359,7 @@ def test_ListAction(self) -> None:
         assert a1.list[3].cmd_list == ["a", "b", "c"], a1.list[3].cmd_list
 
         a2 = SCons.Action.Action("x\ny\nz")
-        assert isinstance(a2, SCons.Action.ListAction), a2
+        assert isinstance(a2, SCons.Action.ListAction), f"a2 is {type(a2)}"
         assert a2.varlist == (), a2.varlist
         assert isinstance(a2.list[0], SCons.Action.CommandAction), a2.list[0]
         assert a2.list[0].cmd_list == "x", a2.list[0].cmd_list
@@ -372,7 +372,7 @@ def foo() -> None:
             pass
 
         a3 = SCons.Action.Action(["x", foo, "z"])
-        assert isinstance(a3, SCons.Action.ListAction), a3
+        assert isinstance(a3, SCons.Action.ListAction), f"a3 is {type(a3)}"
         assert a3.varlist == (), a3.varlist
         assert isinstance(a3.list[0], SCons.Action.CommandAction), a3.list[0]
         assert a3.list[0].cmd_list == "x", a3.list[0].cmd_list
@@ -382,7 +382,7 @@ def foo() -> None:
         assert a3.list[2].cmd_list == "z", a3.list[2].cmd_list
 
         a4 = SCons.Action.Action(["x", "y"], strfunction=foo)
-        assert isinstance(a4, SCons.Action.ListAction), a4
+        assert isinstance(a4, SCons.Action.ListAction), f"a4 is {type(a4)}"
         assert a4.varlist == (), a4.varlist
         assert isinstance(a4.list[0], SCons.Action.CommandAction), a4.list[0]
         assert a4.list[0].cmd_list == "x", a4.list[0].cmd_list
@@ -392,7 +392,7 @@ def foo() -> None:
         assert a4.list[1].strfunction == foo, a4.list[1].strfunction
 
         a5 = SCons.Action.Action("x\ny", strfunction=foo)
-        assert isinstance(a5, SCons.Action.ListAction), a5
+        assert isinstance(a5, SCons.Action.ListAction), f"a5 is {type(a5)}"
         assert a5.varlist == (), a5.varlist
         assert isinstance(a5.list[0], SCons.Action.CommandAction), a5.list[0]
         assert a5.list[0].cmd_list == "x", a5.list[0].cmd_list
@@ -401,6 +401,9 @@ def foo() -> None:
         assert a5.list[1].cmd_list == "y", a5.list[1].cmd_list
         assert a5.list[1].strfunction == foo, a5.list[1].strfunction
 
+        a6 = SCons.Action.Action(["action with space"])
+        assert isinstance(a6, SCons.Action.CommandAction), f"a6 is {type(a6)}"
+
     def test_CommandGeneratorAction(self) -> None:
         """Test the Action factory's creation of CommandGeneratorAction objects."""
 
@@ -1544,6 +1547,7 @@ def LocalFunc() -> None:
             (3, 10): bytearray(b'0, 0, 0, 0,(),(),(d\x00S\x00),(),()'),
             (3, 11): bytearray(b'0, 0, 0, 0,(),(),(\x97\x00d\x00S\x00),(),()'),
             (3, 12): bytearray(b'0, 0, 0, 0,(),(),(\x97\x00y\x00),(),()'),
+            (3, 13): bytearray(b'0, 0, 0, 0,(),(),(\x95\x00g\x00),(),()'),
         }
 
         meth_matches = [
@@ -1725,6 +1729,7 @@ def LocalFunc() -> None:
             (3, 10): bytearray(b'0, 0, 0, 0,(),(),(d\x00S\x00),(),()'),
             (3, 11): bytearray(b'0, 0, 0, 0,(),(),(\x97\x00d\x00S\x00),(),()'),
             (3, 12): bytearray(b'0, 0, 0, 0,(),(),(\x97\x00y\x00),(),()'),
+            (3, 13): bytearray(b'0, 0, 0, 0,(),(),(\x95\x00g\x00),(),()'),
 
         }
 
@@ -1737,6 +1742,7 @@ def LocalFunc() -> None:
             (3, 10): bytearray(b'1, 1, 0, 0,(),(),(d\x00S\x00),(),()'),
             (3, 11): bytearray(b'1, 1, 0, 0,(),(),(\x97\x00d\x00S\x00),(),()'),
             (3, 12): bytearray(b'1, 1, 0, 0,(),(),(\x97\x00y\x00),(),()'),
+            (3, 13): bytearray(b'1, 1, 0, 0,(),(),(\x95\x00g\x00),(),()'),
         }
 
         def factory(act, **kw):
@@ -1978,6 +1984,7 @@ def LocalFunc() -> None:
             (3, 10): bytearray(b'0, 0, 0, 0,(),(),(d\x00S\x00),(),()'),
             (3, 11): bytearray(b'0, 0, 0, 0,(),(),(\x97\x00d\x00S\x00),(),()'),
             (3, 12): bytearray(b'0, 0, 0, 0,(),(),(\x97\x00y\x00),(),()'),
+            (3, 13): bytearray(b'0, 0, 0, 0,(),(),(\x95\x00g\x00),(),()'),
         }
 
         meth_matches = [
@@ -2041,6 +2048,7 @@ def LocalFunc() -> None:
             (3, 10): b'd\x00S\x00',
             (3, 11): b'\x97\x00d\x00S\x00',
             (3, 12): b'\x97\x00y\x00',
+            (3, 13): b'\x95\x00g\x00',
         }
 
         with self.subTest():
@@ -2247,6 +2255,7 @@ def func1(a, b, c):
             ),
             (3, 11): (bytearray(b'3, 3, 0, 0,(),(),(\x97\x00|\x00S\x00),(),()'),),
             (3, 12): (bytearray(b'3, 3, 0, 0,(),(),(\x97\x00|\x00S\x00),(),()'),),
+            (3, 13): (bytearray(b'3, 3, 0, 0,(),(),(\x95\x00U\x00$\x00),(),()'),),
         }
 
         c = SCons.Action._function_contents(func1)
@@ -2288,6 +2297,9 @@ def test_object_contents(self) -> None:
             (3, 12): bytearray(
                 b"{TestClass:__main__}[[[(<class \'object\'>, ()), [(<class \'__main__.TestClass\'>, (<class \'object\'>,))]]]]{{1, 1, 0, 0,(a,b),(a,b),(\x97\x00d\x01|\x00_\x00\x00\x00\x00\x00\x00\x00\x00\x00d\x02|\x00_\x01\x00\x00\x00\x00\x00\x00\x00\x00y\x00),(),(),2, 2, 0, 0,(),(),(\x97\x00y\x00),(),()}}{{{a=a,b=b}}}"
             ),
+            (3, 13): bytearray(
+                b"{TestClass:__main__}[[[(<class \'object\'>, ()), [(<class \'__main__.TestClass\'>, (<class \'object\'>,))]]]]{{1, 1, 0, 0,(a,b),(a,b),(\x95\x00S\x01U\x00l\x00\x00\x00\x00\x00\x00\x00\x00\x00S\x02U\x00l\x01\x00\x00\x00\x00\x00\x00\x00\x00g\x00),(),(),2, 2, 0, 0,(),(),(\x95\x00g\x00),(),()}}{{{a=a,b=b}}}"
+            ),
         }
 
         self.assertEqual(c, expected[sys.version_info[:2]])
@@ -2324,6 +2336,9 @@ def test_code_contents(self) -> None:
             (3, 12): bytearray(
                 b'0, 0, 0, 0,(Hello, World!),(print),(\x97\x00\x02\x00e\x00d\x00\xab\x01\x00\x00\x00\x00\x00\x00\x01\x00y\x01)'
             ),
+            (3, 13): bytearray(
+                b'0, 0, 0, 0,(Hello, World!),(print),(\x95\x00\\\x00"\x00S\x005\x01\x00\x00\x00\x00\x00\x00 \x00g\x01)'
+            ),
         }
 
         self.assertEqual(c, expected[sys.version_info[:2]])

setup.cfg

@@ -33,6 +33,7 @@ classifiers =
     Programming Language :: Python :: 3.10
     Programming Language :: Python :: 3.11
     Programming Language :: Python :: 3.12
+    Programming Language :: Python :: 3.13
     Environment :: Console
     Intended Audience :: Developers
     License :: OSI Approved :: MIT License