Merge remote-tracking branch 'upstream/main' into stackref_all

Fidget-Spinner · Fidget-Spinner · commit 09a3848082a1 · 2024-06-18T17:11:41.000+08:00
diff --git a/Lib/test/_test_embed_set_config.py b/Lib/test/_test_embed_set_config.py
@@ -6,7 +6,6 @@
 # (before the site module is run).
 
 import _testinternalcapi
-import os
 import sys
 import unittest
 from test import support
diff --git a/Lib/test/support/__init__.py b/Lib/test/support/__init__.py
@@ -4,7 +4,6 @@
     raise ImportError('support must be imported from the test package')
 
 import contextlib
-import dataclasses
 import functools
 import _opcode
 import os
diff --git a/Lib/test/test___all__.py b/Lib/test/test___all__.py
@@ -3,7 +3,6 @@
 from test.support import warnings_helper
 import os
 import sys
-import types
 
 
 if support.check_sanitizer(address=True, memory=True):
diff --git a/Lib/test/test_bdb.py b/Lib/test/test_bdb.py
@@ -1046,8 +1046,9 @@ def main():
                 ('return', 1, '<module>'), ('quit', ),
             ]
             import test_module_for_bdb
+            ns = {'test_module_for_bdb': test_module_for_bdb}
             with TracerRun(self) as tracer:
-                tracer.runeval('test_module_for_bdb.main()', globals(), locals())
+                tracer.runeval('test_module_for_bdb.main()', ns, ns)
 
 class IssuesTestCase(BaseTestCase):
     """Test fixed bdb issues."""
diff --git a/Lib/test/test_call.py b/Lib/test/test_call.py
@@ -1,6 +1,6 @@
 import unittest
 from test.support import (cpython_only, is_wasi, requires_limited_api, Py_DEBUG,
-                          set_recursion_limit, skip_on_s390x, import_helper)
+                          set_recursion_limit, skip_on_s390x)
 try:
     import _testcapi
 except ImportError:
@@ -14,7 +14,6 @@
 import itertools
 import gc
 import contextlib
-import sys
 import types
 
 
diff --git a/Lib/test/test_capi/test_list.py b/Lib/test/test_capi/test_list.py
@@ -1,5 +1,3 @@
-import gc
-import weakref
 import unittest
 from test.support import import_helper
 from collections import UserList
diff --git a/Lib/test/test_capi/test_misc.py b/Lib/test/test_capi/test_misc.py
@@ -17,7 +17,6 @@
 import time
 import types
 import unittest
-import warnings
 import weakref
 import operator
 from test import support
diff --git a/Lib/test/test_capi/test_structmembers.py b/Lib/test/test_capi/test_structmembers.py
@@ -1,6 +1,5 @@
 import unittest
 from test.support import import_helper
-from test.support import warnings_helper
 
 # Skip this test if the _testcapi module isn't available.
 import_helper.import_module('_testcapi')
diff --git a/Lib/test/test_concurrent_futures/executor.py b/Lib/test/test_concurrent_futures/executor.py
@@ -1,6 +1,5 @@
 import threading
 import time
-import unittest
 import weakref
 from concurrent import futures
 from test import support
diff --git a/Lib/test/test_ctypes/test_generated_structs.py b/Lib/test/test_ctypes/test_generated_structs.py
@@ -14,10 +14,9 @@
 import re
 from dataclasses import dataclass
 from functools import cached_property
-import sys
 
 import ctypes
-from ctypes import Structure, Union, _SimpleCData
+from ctypes import Structure, Union
 from ctypes import sizeof, alignment, pointer, string_at
 _ctypes_test = import_helper.import_module("_ctypes_test")
 
diff --git a/Lib/test/test_ctypes/test_structures.py b/Lib/test/test_ctypes/test_structures.py
@@ -2,7 +2,7 @@
 import struct
 import sys
 import unittest
-from ctypes import (CDLL, Array, Structure, Union, POINTER, sizeof, byref, alignment,
+from ctypes import (CDLL, Structure, Union, POINTER, sizeof, byref, alignment,
                     c_void_p, c_char, c_wchar, c_byte, c_ubyte,
                     c_uint8, c_uint16, c_uint32,
                     c_short, c_ushort, c_int, c_uint,
diff --git a/Lib/test/test_dbm_sqlite3.py b/Lib/test/test_dbm_sqlite3.py
@@ -1,10 +1,9 @@
 import sys
-import test.support
 import unittest
 from contextlib import closing
 from functools import partial
 from pathlib import Path
-from test.support import cpython_only, import_helper, os_helper
+from test.support import import_helper, os_helper
 
 dbm_sqlite3 = import_helper.import_module("dbm.sqlite3")
 # N.B. The test will fail on some platforms without sqlite3
diff --git a/Lib/test/test_decorators.py b/Lib/test/test_decorators.py
@@ -1,5 +1,5 @@
 import unittest
-from types import MethodType
+
 
 def funcattrs(**kwds):
     def decorate(func):
diff --git a/Lib/test/test_descr.py b/Lib/test/test_descr.py
@@ -1314,7 +1314,7 @@ class X(object):
         # Inherit from object on purpose to check some backwards compatibility paths
         class X(object):
             __slots__ = "a"
-        with self.assertRaisesRegex(AttributeError, "'X' object has no attribute 'a'"):
+        with self.assertRaisesRegex(AttributeError, "'test.test_descr.ClassPropertiesAndMethods.test_slots.<locals>.X' object has no attribute 'a'"):
             X().a
 
         # Test string subclass in `__slots__`, see gh-98783
diff --git a/Lib/test/test_email/test_headerregistry.py b/Lib/test/test_email/test_headerregistry.py
@@ -7,7 +7,6 @@
 from test.test_email import TestEmailBase, parameterize
 from email import headerregistry
 from email.headerregistry import Address, Group
-from email.header import decode_header
 from test.support import ALWAYS_EQ, is_wasi, Py_DEBUG
 
 
diff --git a/Lib/test/test_email/test_utils.py b/Lib/test/test_email/test_utils.py
@@ -3,9 +3,7 @@
 import test.support
 import time
 import unittest
-import sys
-import os.path
-import zoneinfo
+
 
 class DateTimeTests(unittest.TestCase):
 
diff --git a/Lib/test/test_ensurepip.py b/Lib/test/test_ensurepip.py
@@ -6,7 +6,6 @@
 import test.support
 import unittest
 import unittest.mock
-from importlib.resources.abc import Traversable
 from pathlib import Path
 
 import ensurepip
diff --git a/Lib/test/test_fractions.py b/Lib/test/test_fractions.py
@@ -1,6 +1,5 @@
 """Tests for Lib/fractions.py."""
 
-import cmath
 from decimal import Decimal
 from test.support import requires_IEEE_754
 import math
diff --git a/Lib/test/test_frame.py b/Lib/test/test_frame.py
@@ -1,11 +1,9 @@
 import copy
-import gc
 import operator
 import re
 import sys
 import textwrap
 import threading
-import types
 import unittest
 import weakref
 try:
@@ -14,7 +12,7 @@
     _testcapi = None
 
 from test import support
-from test.support import import_helper, threading_helper, Py_GIL_DISABLED
+from test.support import import_helper, threading_helper
 from test.support.script_helper import assert_python_ok
 
 
diff --git a/Lib/test/test_free_threading/test_slots.py b/Lib/test/test_free_threading/test_slots.py
@@ -0,0 +1,43 @@
+import threading
+from test.support import threading_helper
+from unittest import TestCase
+
+
+def run_in_threads(targets):
+    """Run `targets` in separate threads"""
+    threads = [
+        threading.Thread(target=target)
+        for target in targets
+    ]
+    for thread in threads:
+        thread.start()
+    for thread in threads:
+        thread.join()
+
+
+@threading_helper.requires_working_threading()
+class TestSlots(TestCase):
+
+    def test_object(self):
+        class Spam:
+            __slots__ = [
+                "eggs",
+            ]
+
+            def __init__(self, initial_value):
+                self.eggs = initial_value
+
+        spam = Spam(0)
+        iters = 20_000
+
+        def writer():
+            for _ in range(iters):
+                spam.eggs += 1
+
+        def reader():
+            for _ in range(iters):
+                eggs = spam.eggs
+                assert type(eggs) is int
+                assert 0 <= eggs <= iters
+
+        run_in_threads([writer, reader, reader, reader])
diff --git a/Lib/test/test_free_threading/test_str.py b/Lib/test/test_free_threading/test_str.py
@@ -1,4 +1,3 @@
-import sys
 import unittest
 
 from itertools import cycle
diff --git a/Lib/test/test_free_threading/test_type.py b/Lib/test/test_free_threading/test_type.py
@@ -5,7 +5,7 @@
 from threading import Thread
 from unittest import TestCase
 
-from test.support import threading_helper, import_helper
+from test.support import threading_helper
 
 
 
diff --git a/Lib/test/test_fstring.py b/Lib/test/test_fstring.py
@@ -14,7 +14,6 @@
 import types
 import decimal
 import unittest
-import warnings
 from test import support
 from test.support.os_helper import temp_cwd
 from test.support.script_helper import assert_python_failure, assert_python_ok
diff --git a/Lib/test/test_imaplib.py b/Lib/test/test_imaplib.py
@@ -11,7 +11,7 @@
 import re
 import socket
 
-from test.support import verbose, run_with_tz, run_with_locale, cpython_only, requires_resource
+from test.support import verbose, run_with_tz, run_with_locale, cpython_only
 from test.support import hashlib_helper
 from test.support import threading_helper
 import unittest
diff --git a/Lib/test/test_inspect/test_inspect.py b/Lib/test/test_inspect/test_inspect.py
@@ -40,7 +40,7 @@
 from test.support.import_helper import DirsOnSysPath, ready_to_import
 from test.support.os_helper import TESTFN, temp_cwd
 from test.support.script_helper import assert_python_ok, assert_python_failure, kill_python
-from test.support import has_subprocess_support, SuppressCrashReport
+from test.support import has_subprocess_support
 from test import support
 
 from test.test_inspect import inspect_fodder as mod
diff --git a/Lib/test/test_int.py b/Lib/test/test_int.py
@@ -1,5 +1,4 @@
 import sys
-import time
 
 import unittest
 from unittest import mock
diff --git a/Lib/test/test_interpreters/test_api.py b/Lib/test/test_interpreters/test_api.py
@@ -1,7 +1,6 @@
 import os
 import pickle
-import sys
-from textwrap import dedent, indent
+from textwrap import dedent
 import threading
 import types
 import unittest
diff --git a/Lib/test/test_interpreters/test_queues.py b/Lib/test/test_interpreters/test_queues.py
@@ -3,7 +3,6 @@
 import threading
 from textwrap import dedent
 import unittest
-import time
 
 from test.support import import_helper, Py_DEBUG
 # Raise SkipTest if subinterpreters not supported.
diff --git a/Lib/test/test_interpreters/test_stress.py b/Lib/test/test_interpreters/test_stress.py
@@ -22,7 +22,6 @@ def test_create_many_sequential(self):
             interp = interpreters.create()
             alive.append(interp)
 
-    @unittest.skip('(temporary) gh-120524: there is a race that needs fixing')
     @support.requires_resource('cpu')
     def test_create_many_threaded(self):
         alive = []
diff --git a/Lib/test/test_interpreters/utils.py b/Lib/test/test_interpreters/utils.py
@@ -1,16 +1,13 @@
 from collections import namedtuple
 import contextlib
 import json
-import io
 import os
 import os.path
-import pickle
-import queue
 #import select
 import subprocess
 import sys
 import tempfile
-from textwrap import dedent, indent
+from textwrap import dedent
 import threading
 import types
 import unittest
diff --git a/Lib/test/test_mailbox.py b/Lib/test/test_mailbox.py
@@ -1,7 +1,6 @@
 import os
 import sys
 import time
-import stat
 import socket
 import email
 import email.message
diff --git a/Lib/test/test_monitoring.py b/Lib/test/test_monitoring.py
@@ -9,7 +9,6 @@
 import textwrap
 import types
 import unittest
-import asyncio
 
 import test.support
 from test.support import requires_specialization, script_helper
diff --git a/Lib/test/test_peepholer.py b/Lib/test/test_peepholer.py
@@ -1,6 +1,5 @@
 import dis
 from itertools import combinations, product
-import opcode
 import sys
 import textwrap
 import unittest
diff --git a/Lib/test/test_perf_profiler.py b/Lib/test/test_perf_profiler.py
@@ -5,7 +5,6 @@
 import sysconfig
 import os
 import pathlib
-import shutil
 from test import support
 from test.support.script_helper import (
     make_script,
diff --git a/Lib/test/test_zipimport.py b/Lib/test/test_zipimport.py
@@ -807,10 +807,12 @@ def testLargestPossibleComment(self):
         files = {TESTMOD + ".py": (NOW, test_src)}
         self.doTest(".py", files, TESTMOD, comment=b"c" * ((1 << 16) - 1))
 
+    @support.requires_resource('cpu')
     def testZip64(self):
         files = self.getZip64Files()
         self.doTest(".py", files, "f6")
 
+    @support.requires_resource('cpu')
     def testZip64CruftAndComment(self):
         files = self.getZip64Files()
         self.doTest(".py", files, "f65536", comment=b"c" * ((1 << 16) - 1))
diff --git a/Objects/typeobject.c b/Objects/typeobject.c
@@ -246,7 +246,8 @@ managed_static_type_state_init(PyInterpreterState *interp, PyTypeObject *self,
 
     assert((initial == 1) ==
             (_PyRuntime.types.managed_static.types[full_index].interp_count == 0));
-    _PyRuntime.types.managed_static.types[full_index].interp_count += 1;
+    (void)_Py_atomic_add_int64(
+            &_PyRuntime.types.managed_static.types[full_index].interp_count, 1);
 
     if (initial) {
         assert(_PyRuntime.types.managed_static.types[full_index].type == NULL);
@@ -300,7 +301,8 @@ managed_static_type_state_clear(PyInterpreterState *interp, PyTypeObject *self,
     state->type = NULL;
     assert(state->tp_weaklist == NULL);  // It was already cleared out.
 
-    _PyRuntime.types.managed_static.types[full_index].interp_count -= 1;
+    (void)_Py_atomic_add_int64(
+            &_PyRuntime.types.managed_static.types[full_index].interp_count, -1);
     if (final) {
         assert(!_PyRuntime.types.managed_static.types[full_index].interp_count);
         _PyRuntime.types.managed_static.types[full_index].type = NULL;
diff --git a/Python/fileutils.c b/Python/fileutils.c
diff --git a/Python/structmember.c b/Python/structmember.c
diff --git a/Tools/cases_generator/analyzer.py b/Tools/cases_generator/analyzer.py
diff --git a/Tools/cases_generator/generators_common.py b/Tools/cases_generator/generators_common.py
diff --git a/Tools/cases_generator/opcode_id_generator.py b/Tools/cases_generator/opcode_id_generator.py
diff --git a/Tools/cases_generator/opcode_metadata_generator.py b/Tools/cases_generator/opcode_metadata_generator.py
diff --git a/Tools/cases_generator/optimizer_generator.py b/Tools/cases_generator/optimizer_generator.py
diff --git a/Tools/cases_generator/parser.py b/Tools/cases_generator/parser.py
diff --git a/Tools/cases_generator/py_metadata_generator.py b/Tools/cases_generator/py_metadata_generator.py
diff --git a/Tools/cases_generator/target_generator.py b/Tools/cases_generator/target_generator.py
diff --git a/Tools/cases_generator/tier1_generator.py b/Tools/cases_generator/tier1_generator.py
diff --git a/Tools/cases_generator/tier2_generator.py b/Tools/cases_generator/tier2_generator.py
diff --git a/Tools/cases_generator/uop_id_generator.py b/Tools/cases_generator/uop_id_generator.py
diff --git a/Tools/tsan/suppressions_free_threading.txt b/Tools/tsan/suppressions_free_threading.txt

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-import gc`
`2`		`-import weakref`
`3`	`1`	`import unittest`
`4`	`2`	`from test.support import import_helper`
`5`	`3`	`from collections import UserList`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-import sys`
`2`	`1`	`import unittest`
`3`	`2`
`4`	`3`	`from itertools import cycle`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`import sys`
`2`		`-import time`
`3`	`2`
`4`	`3`	`import unittest`
`5`	`4`	`from unittest import mock`