Merge branch 'main' into SE-notes

Author: AlexWaygood

Doc/library/itertools.rst

@@ -1030,13 +1030,16 @@ The following recipes have a more mathematical flavor:
    def sieve(n):
        "Primes less than n."
        # sieve(30) --> 2 3 5 7 11 13 17 19 23 29
+       if n > 2:
+           yield 2
+       start = 3
        data = bytearray((0, 1)) * (n // 2)
-       data[:3] = 0, 0, 0
        limit = math.isqrt(n) + 1
-       for p in compress(range(limit), data):
+       for p in iter_index(data, 1, start, limit):
+           yield from iter_index(data, 1, start, p*p)
            data[p*p : n : p+p] = bytes(len(range(p*p, n, p+p)))
-       data[2] = 1
-       return iter_index(data, 1) if n > 2 else iter([])
+           start = p*p
+       yield from iter_index(data, 1, start)
 
    def factor(n):
        "Prime factors of n."

Lib/test/libregrtest/runtest.py

@@ -249,6 +249,12 @@ def iter_tests(self):
         else:
             yield from self.tests
 
+    @staticmethod
+    def from_json_dict(json_dict):
+        if json_dict['hunt_refleak']:
+            json_dict['hunt_refleak'] = HuntRefleak(**json_dict['hunt_refleak'])
+        return RunTests(**json_dict)
+
 
 # Minimum duration of a test to display its duration or to mention that
 # the test is running in background

Lib/test/libregrtest/runtest_mp.py

@@ -68,7 +68,7 @@ def default(self, o: Any) -> dict[str, Any]:
 def _decode_worker_job(d: dict[str, Any]) -> WorkerJob | dict[str, Any]:
     if "__worker_job__" in d:
         d.pop('__worker_job__')
-        d['runtests'] = RunTests(**d['runtests'])
+        d['runtests'] = RunTests.from_json_dict(d['runtests'])
         return WorkerJob(**d)
     if "__namespace__" in d:
         d.pop('__namespace__')

Lib/test/test_regrtest.py

@@ -1018,12 +1018,16 @@ def test_run(self):
                                   stats=TestStats(4, 1),
                                   forever=True)
 
-    def check_leak(self, code, what):
+    def check_leak(self, code, what, *, multiprocessing=False):
         test = self.create_test('huntrleaks', code=code)
 
         filename = 'reflog.txt'
         self.addCleanup(os_helper.unlink, filename)
-        output = self.run_tests('--huntrleaks', '6:3:', test,
+        cmd = ['--huntrleaks', '6:3:']
+        if multiprocessing:
+            cmd.append('-j1')
+        cmd.append(test)
+        output = self.run_tests(*cmd,
                                 exitcode=EXITCODE_BAD_TEST,
                                 stderr=subprocess.STDOUT)
         self.check_executed_tests(output, [test], failed=test, stats=1)
@@ -1039,7 +1043,7 @@ def check_leak(self, code, what):
             self.assertIn(line2, reflog)
 
     @unittest.skipUnless(support.Py_DEBUG, 'need a debug build')
-    def test_huntrleaks(self):
+    def check_huntrleaks(self, *, multiprocessing: bool):
         # test --huntrleaks
         code = textwrap.dedent("""
             import unittest
@@ -1050,7 +1054,13 @@ class RefLeakTest(unittest.TestCase):
                 def test_leak(self):
                     GLOBAL_LIST.append(object())
         """)
-        self.check_leak(code, 'references')
+        self.check_leak(code, 'references', multiprocessing=multiprocessing)
+
+    def test_huntrleaks(self):
+        self.check_huntrleaks(multiprocessing=False)
+
+    def test_huntrleaks_mp(self):
+        self.check_huntrleaks(multiprocessing=True)
 
     @unittest.skipUnless(support.Py_DEBUG, 'need a debug build')
     def test_huntrleaks_fd_leak(self):