Mailman 3 September 2023 - Python-checkins

gh-110119: Temporarily skip test_cppext on --disable-gil builds. (#110123)
by carljm Sept. 29, 2023

Sept. 29, 2023

https://github.com/python/cpython/commit/2973970af8fb3f117ab2e8ab2d82e8a541… commit: 2973970af8fb3f117ab2e8ab2d82e8a541fcb1da branch: main author: Sam Gross <colesbury(a)gmail.com> committer: carljm <carl(a)oddbird.net> date: 2023-09-29T13:50:51-07:00 summary: gh-110119: Temporarily skip test_cppext on --disable-gil builds. (#110123) The current version of pip does not support "t" in the ABI flags. Skip the test in `--disable-gil` builds until we can update pip. files: M Lib/test/test_cppext/__init__.py diff --git a/Lib/test/test_cppext/__init__.py b/Lib/test/test_cppext/__init__.py index 74bf420900367..25b6fc64a03a5 100644 --- a/Lib/test/test_cppext/__init__.py +++ b/Lib/test/test_cppext/__init__.py @@ -14,6 +14,10 @@ SETUP = os.path.join(os.path.dirname(__file__), 'setup.py') +# gh-110119: pip does not currently support 't' in the ABI flag use by +# --disable-gil builds. Once it does, we can remove this skip. +(a)unittest.skipIf(sysconfig.get_config_var('Py_NOGIL') == 1, + 'test does not work with --disable-gil') @support.requires_subprocess() class TestCPPExt(unittest.TestCase): @support.requires_resource('cpu')

1 0

gh-109566: regrtest --fast-ci no longer enables --nowindows (#110121)
by vstinner Sept. 29, 2023

Sept. 29, 2023

https://github.com/python/cpython/commit/5ae6c6d053311d411a077200f85698d51d… commit: 5ae6c6d053311d411a077200f85698d51d5fe8b9 branch: main author: Victor Stinner <vstinner(a)python.org> committer: vstinner <vstinner(a)python.org> date: 2023-09-29T19:49:39Z summary: gh-109566: regrtest --fast-ci no longer enables --nowindows (#110121) The --nowindows option is deprecated and does nothing but logs a warning. files: M Lib/test/libregrtest/cmdline.py M Lib/test/test_regrtest.py diff --git a/Lib/test/libregrtest/cmdline.py b/Lib/test/libregrtest/cmdline.py index 0a863561d5273..8562a48446b4a 100644 --- a/Lib/test/libregrtest/cmdline.py +++ b/Lib/test/libregrtest/cmdline.py @@ -4,8 +4,6 @@ import sys from test.support import os_helper -from .utils import MS_WINDOWS - USAGE = """\ python -m test [options] [test_name1 [test_name2 ...]] @@ -414,7 +412,7 @@ def _parse_args(args, **kwargs): # Similar to options: # # -j0 --randomize --fail-env-changed --fail-rerun --rerun - # --slowest --verbose3 --nowindows + # --slowest --verbose3 if ns.use_mp is None: ns.use_mp = 0 ns.randomize = True @@ -424,8 +422,6 @@ def _parse_args(args, **kwargs): ns.rerun = True ns.print_slow = True ns.verbose3 = True - if MS_WINDOWS: - ns.nowindows = True # Silence alerts under Windows else: ns._add_python_opts = False diff --git a/Lib/test/test_regrtest.py b/Lib/test/test_regrtest.py index da1406def5554..c98b05abcea98 100644 --- a/Lib/test/test_regrtest.py +++ b/Lib/test/test_regrtest.py @@ -376,8 +376,6 @@ def test_unknown_option(self): def check_ci_mode(self, args, use_resources, rerun=True): ns = cmdline._parse_args(args) - if utils.MS_WINDOWS: - self.assertTrue(ns.nowindows) # Check Regrtest attributes which are more reliable than Namespace # which has an unclear API

1 0

gh-109566: Remove make testall (#110122)
by vstinner Sept. 29, 2023

Sept. 29, 2023

https://github.com/python/cpython/commit/9c91141ffff0275cff99f50cbf805a0e9d… commit: 9c91141ffff0275cff99f50cbf805a0e9d645da8 branch: main author: Victor Stinner <vstinner(a)python.org> committer: vstinner <vstinner(a)python.org> date: 2023-09-29T21:36:03+02:00 summary: gh-109566: Remove make testall (#110122) Remove "make testall" target: use "make buildbottest" instead. files: A Misc/NEWS.d/next/Build/2023-09-29-21-01-48.gh-issue-109566._enldb.rst M Makefile.pre.in M README.rst diff --git a/Makefile.pre.in b/Makefile.pre.in index d62b4d24b3e18..fa5b9e6654c26 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -1853,21 +1853,6 @@ cleantest: all test: all $(TESTRUNNER) --fast-ci --timeout=$(TESTTIMEOUT) $(TESTOPTS) -# Run the full test suite twice - once without .pyc files, and once with. -# In the past, we've had problems where bugs in the marshalling or -# elsewhere caused bytecode read from .pyc files to behave differently -# than bytecode generated directly from a .py source file. Sometimes -# the bytecode read from a .pyc file had the bug, sometimes the directly -# generated bytecode. This is sometimes a very shy bug needing a lot of -# sample data. -.PHONY: testall -testall: all - -find $(srcdir)/Lib -name '*.py[co]' -exec rm -f {} ';' || true - $(TESTPYTHON) -E $(srcdir)/Lib/compileall.py - -find $(srcdir)/Lib -name '*.py[co]' -exec rm -f {} ';' || true - $(TESTRUNNER) --slow-ci --timeout=$(TESTTIMEOUT) $(TESTOPTS) - $(TESTRUNNER) --slow-ci --timeout=$(TESTTIMEOUT) $(TESTOPTS) - # Run the test suite for both architectures in a Universal build on OSX. # Must be run on an Intel box. .PHONY: testuniversal @@ -1880,8 +1865,9 @@ testuniversal: all $(RUNSHARED) /usr/libexec/oah/translate \ ./$(BUILDPYTHON) -E -m test -j 0 -u all $(TESTOPTS) -# Like testall, but with only one pass and without multiple processes. -# Run an optional script to include information about the build environment. +# Like test, but using --slow-ci which enables all test resources and use +# longer timeout. Run an optional pybuildbot.identify script to include +# information about the build environment. .PHONY: buildbottest buildbottest: all -@if which pybuildbot.identify >/dev/null 2>&1; then \ @@ -1889,7 +1875,7 @@ buildbottest: all fi $(TESTRUNNER) --slow-ci --timeout=$(TESTTIMEOUT) $(TESTOPTS) -# Like testall, but run Python tests with HOSTRUNNER directly. +# Like buildbottest, but run Python tests with HOSTRUNNER directly. .PHONY: hostrunnertest hostrunnertest: all $(RUNSHARED) $(HOSTRUNNER) ./$(BUILDPYTHON) -m test --slow-ci --timeout=$(TESTTIMEOUT) $(TESTOPTS) diff --git a/Misc/NEWS.d/next/Build/2023-09-29-21-01-48.gh-issue-109566._enldb.rst b/Misc/NEWS.d/next/Build/2023-09-29-21-01-48.gh-issue-109566._enldb.rst new file mode 100644 index 0000000000000..1141a4738b315 --- /dev/null +++ b/Misc/NEWS.d/next/Build/2023-09-29-21-01-48.gh-issue-109566._enldb.rst @@ -0,0 +1,2 @@ +Remove ``make testall`` target: use ``make buildbottest`` instead. Patch by +Victor Stinner. diff --git a/README.rst b/README.rst index 208bf8cec444a..921da30a92016 100644 --- a/README.rst +++ b/README.rst @@ -177,7 +177,7 @@ is printed about a failed test or a traceback or core dump is produced, something is wrong. By default, tests are prevented from overusing resources like disk space and -memory. To enable these tests, run ``make testall``. +memory. To enable these tests, run ``make buildbottest``. If any tests fail, you can re-run the failing test(s) in verbose mode. For example, if ``test_os`` and ``test_gdb`` failed, you can run::

1 0

gh-109047: concurrent.futures catches PythonFinalizationError (#109810)
by vstinner Sept. 29, 2023

Sept. 29, 2023

https://github.com/python/cpython/commit/635184212179b0511768ea1cd57256e134… commit: 635184212179b0511768ea1cd57256e134ba2d75 branch: main author: Victor Stinner <vstinner(a)python.org> committer: vstinner <vstinner(a)python.org> date: 2023-09-29T19:31:19Z summary: gh-109047: concurrent.futures catches PythonFinalizationError (#109810) concurrent.futures: The *executor manager thread* now catches exceptions when adding an item to the *call queue*. During Python finalization, creating a new thread can now raise RuntimeError. Catch the exception and call terminate_broken() in this case. Add test_python_finalization_error() to test_concurrent_futures. concurrent.futures._ExecutorManagerThread changes: * terminate_broken() no longer calls shutdown_workers() since the call queue is no longer working anymore (read and write ends of the queue pipe are closed). * terminate_broken() now terminates child processes, not only wait until they complete. * _ExecutorManagerThread.terminate_broken() now holds shutdown_lock to prevent race conditons with ProcessPoolExecutor.submit(). multiprocessing.Queue changes: * Add _terminate_broken() method. * _start_thread() sets _thread to None on exception to prevent leaking "dangling threads" even if the thread was not started yet. files: A Misc/NEWS.d/next/Library/2023-09-25-02-11-14.gh-issue-109047.b1TrqG.rst M Lib/concurrent/futures/process.py M Lib/multiprocessing/queues.py M Lib/test/test_concurrent_futures/test_process_pool.py diff --git a/Lib/concurrent/futures/process.py b/Lib/concurrent/futures/process.py index 73bdcbe869399..3990e6b1833d7 100644 --- a/Lib/concurrent/futures/process.py +++ b/Lib/concurrent/futures/process.py @@ -341,7 +341,14 @@ def run(self): # Main loop for the executor manager thread. while True: - self.add_call_item_to_queue() + # gh-109047: During Python finalization, self.call_queue.put() + # creation of a thread can fail with RuntimeError. + try: + self.add_call_item_to_queue() + except BaseException as exc: + cause = format_exception(exc) + self.terminate_broken(cause) + return result_item, is_broken, cause = self.wait_result_broken_or_wakeup() @@ -425,8 +432,8 @@ def wait_result_broken_or_wakeup(self): try: result_item = result_reader.recv() is_broken = False - except BaseException as e: - cause = format_exception(type(e), e, e.__traceback__) + except BaseException as exc: + cause = format_exception(exc) elif wakeup_reader in ready: is_broken = False @@ -463,7 +470,7 @@ def is_shutting_down(self): return (_global_shutdown or executor is None or executor._shutdown_thread) - def terminate_broken(self, cause): + def _terminate_broken(self, cause): # Terminate the executor because it is in a broken state. The cause # argument can be used to display more information on the error that # lead the executor into becoming broken. @@ -490,7 +497,7 @@ def terminate_broken(self, cause): for work_id, work_item in self.pending_work_items.items(): try: work_item.future.set_exception(bpe) - except _base.InvalidStateError as exc: + except _base.InvalidStateError: # set_exception() fails if the future is cancelled: ignore it. # Trying to check if the future is cancelled before calling # set_exception() would leave a race condition if the future is @@ -505,17 +512,14 @@ def terminate_broken(self, cause): for p in self.processes.values(): p.terminate() - # Prevent queue writing to a pipe which is no longer read. - # https://github.com/python/cpython/issues/94777 - self.call_queue._reader.close() - - # gh-107219: Close the connection writer which can unblock - # Queue._feed() if it was stuck in send_bytes(). - if sys.platform == 'win32': - self.call_queue._writer.close() + self.call_queue._terminate_broken() # clean up resources - self.join_executor_internals() + self._join_executor_internals(broken=True) + + def terminate_broken(self, cause): + with self.shutdown_lock: + self._terminate_broken(cause) def flag_executor_shutting_down(self): # Flag the executor as shutting down and cancel remaining tasks if @@ -558,15 +562,24 @@ def shutdown_workers(self): break def join_executor_internals(self): - self.shutdown_workers() + with self.shutdown_lock: + self._join_executor_internals() + + def _join_executor_internals(self, broken=False): + # If broken, call_queue was closed and so can no longer be used. + if not broken: + self.shutdown_workers() + # Release the queue's resources as soon as possible. self.call_queue.close() self.call_queue.join_thread() - with self.shutdown_lock: - self.thread_wakeup.close() + self.thread_wakeup.close() + # If .join() is not called on the created processes then # some ctx.Queue methods may deadlock on Mac OS X. for p in self.processes.values(): + if broken: + p.terminate() p.join() def get_n_children_alive(self): diff --git a/Lib/multiprocessing/queues.py b/Lib/multiprocessing/queues.py index daf9ee94a1943..852ae87b27686 100644 --- a/Lib/multiprocessing/queues.py +++ b/Lib/multiprocessing/queues.py @@ -158,6 +158,20 @@ def cancel_join_thread(self): except AttributeError: pass + def _terminate_broken(self): + # Close a Queue on error. + + # gh-94777: Prevent queue writing to a pipe which is no longer read. + self._reader.close() + + # gh-107219: Close the connection writer which can unblock + # Queue._feed() if it was stuck in send_bytes(). + if sys.platform == 'win32': + self._writer.close() + + self.close() + self.join_thread() + def _start_thread(self): debug('Queue._start_thread()') @@ -169,13 +183,19 @@ def _start_thread(self): self._wlock, self._reader.close, self._writer.close, self._ignore_epipe, self._on_queue_feeder_error, self._sem), - name='QueueFeederThread' + name='QueueFeederThread', + daemon=True, ) - self._thread.daemon = True - debug('doing self._thread.start()') - self._thread.start() - debug('... done self._thread.start()') + try: + debug('doing self._thread.start()') + self._thread.start() + debug('... done self._thread.start()') + except: + # gh-109047: During Python finalization, creating a thread + # can fail with RuntimeError. + self._thread = None + raise if not self._joincancelled: self._jointhread = Finalize( diff --git a/Lib/test/test_concurrent_futures/test_process_pool.py b/Lib/test/test_concurrent_futures/test_process_pool.py index 7763a4946f110..c73c2da1a0108 100644 --- a/Lib/test/test_concurrent_futures/test_process_pool.py +++ b/Lib/test/test_concurrent_futures/test_process_pool.py @@ -1,5 +1,6 @@ import os import sys +import threading import time import unittest from concurrent import futures @@ -187,6 +188,34 @@ def test_max_tasks_early_shutdown(self): for i, future in enumerate(futures): self.assertEqual(future.result(), mul(i, i)) + def test_python_finalization_error(self): + # gh-109047: Catch RuntimeError on thread creation + # during Python finalization. + + context = self.get_context() + + # gh-109047: Mock the threading.start_new_thread() function to inject + # RuntimeError: simulate the error raised during Python finalization. + # Block the second creation: create _ExecutorManagerThread, but block + # QueueFeederThread. + orig_start_new_thread = threading._start_new_thread + nthread = 0 + def mock_start_new_thread(func, *args): + nonlocal nthread + if nthread >= 1: + raise RuntimeError("can't create new thread at " + "interpreter shutdown") + nthread += 1 + return orig_start_new_thread(func, *args) + + with support.swap_attr(threading, '_start_new_thread', + mock_start_new_thread): + executor = self.executor_type(max_workers=2, mp_context=context) + with executor: + with self.assertRaises(BrokenProcessPool): + list(executor.map(mul, [(2, 3)] * 10)) + executor.shutdown() + create_executor_tests(globals(), ProcessPoolExecutorTest, executor_mixins=(ProcessPoolForkMixin, diff --git a/Misc/NEWS.d/next/Library/2023-09-25-02-11-14.gh-issue-109047.b1TrqG.rst b/Misc/NEWS.d/next/Library/2023-09-25-02-11-14.gh-issue-109047.b1TrqG.rst new file mode 100644 index 0000000000000..71cb5a80847d0 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2023-09-25-02-11-14.gh-issue-109047.b1TrqG.rst @@ -0,0 +1,4 @@ +:mod:`concurrent.futures`: The *executor manager thread* now catches exceptions +when adding an item to the *call queue*. During Python finalization, creating a +new thread can now raise :exc:`RuntimeError`. Catch the exception and call +``terminate_broken()`` in this case. Patch by Victor Stinner.

1 0

gh-109566: PCbuild/rt.bat now uses --fast-ci (#110120)
by vstinner Sept. 29, 2023

Sept. 29, 2023

https://github.com/python/cpython/commit/f3df8fa669158f89af69b5661e98314d98… commit: f3df8fa669158f89af69b5661e98314d98fb916f branch: main author: Victor Stinner <vstinner(a)python.org> committer: vstinner <vstinner(a)python.org> date: 2023-09-29T19:16:29Z summary: gh-109566: PCbuild/rt.bat now uses --fast-ci (#110120) Replace "--fail-env-changed --fail-rerun" with "--fast-ci". Tools/buildbot/test.bat pass --slow-ci which has the priority over --fast-ci. files: M PCbuild/rt.bat diff --git a/PCbuild/rt.bat b/PCbuild/rt.bat index 7ae7141bfc4ea..332ba5edcf408 100644 --- a/PCbuild/rt.bat +++ b/PCbuild/rt.bat @@ -32,7 +32,7 @@ set pcbuild=%~dp0 set suffix= set qmode= set dashO= -set regrtestargs=--fail-env-changed --fail-rerun +set regrtestargs=--fast-ci set exe= :CheckOpts

1 0

gh-66143: Allow copying and pickling of CodecInfo object (GH-109235)
by serhiy-storchaka Sept. 29, 2023

Sept. 29, 2023

https://github.com/python/cpython/commit/3439cb004943788d5e4698bfceec891e71… commit: 3439cb004943788d5e4698bfceec891e7118254c branch: main author: Furkan Onder <furkanonder(a)protonmail.com> committer: serhiy-storchaka <storchaka(a)gmail.com> date: 2023-09-29T20:07:09+03:00 summary: gh-66143: Allow copying and pickling of CodecInfo object (GH-109235) Co-authored-by: Robert Lehmann <mail(a)robertlehmann.de> files: A Misc/NEWS.d/next/Library/2023-09-10-20-23-20.gh-issue-66143.71xvgL.rst M Lib/codecs.py M Lib/test/test_codecs.py diff --git a/Lib/codecs.py b/Lib/codecs.py index 82f23983e719c..9b35b6127dd01 100644 --- a/Lib/codecs.py +++ b/Lib/codecs.py @@ -111,6 +111,9 @@ def __repr__(self): (self.__class__.__module__, self.__class__.__qualname__, self.name, id(self)) + def __getnewargs__(self): + return tuple(self) + class Codec: """ Defines the interface for stateless encoders/decoders. diff --git a/Lib/test/test_codecs.py b/Lib/test/test_codecs.py index b5e9271ac0c3c..c899111e1e4c1 100644 --- a/Lib/test/test_codecs.py +++ b/Lib/test/test_codecs.py @@ -1762,6 +1762,76 @@ def test_file_closes_if_lookup_error_raised(self): file().close.assert_called() + def test_copy(self): + orig = codecs.lookup('utf-8') + dup = copy.copy(orig) + self.assertIsNot(dup, orig) + self.assertEqual(dup, orig) + self.assertTrue(orig._is_text_encoding) + self.assertEqual(dup.encode, orig.encode) + self.assertEqual(dup.name, orig.name) + self.assertEqual(dup.incrementalencoder, orig.incrementalencoder) + + # Test a CodecInfo with _is_text_encoding equal to false. + orig = codecs.lookup("base64") + dup = copy.copy(orig) + self.assertIsNot(dup, orig) + self.assertEqual(dup, orig) + self.assertFalse(orig._is_text_encoding) + self.assertEqual(dup.encode, orig.encode) + self.assertEqual(dup.name, orig.name) + self.assertEqual(dup.incrementalencoder, orig.incrementalencoder) + + def test_deepcopy(self): + orig = codecs.lookup('utf-8') + dup = copy.deepcopy(orig) + self.assertIsNot(dup, orig) + self.assertEqual(dup, orig) + self.assertTrue(orig._is_text_encoding) + self.assertEqual(dup.encode, orig.encode) + self.assertEqual(dup.name, orig.name) + self.assertEqual(dup.incrementalencoder, orig.incrementalencoder) + + # Test a CodecInfo with _is_text_encoding equal to false. + orig = codecs.lookup("base64") + dup = copy.deepcopy(orig) + self.assertIsNot(dup, orig) + self.assertEqual(dup, orig) + self.assertFalse(orig._is_text_encoding) + self.assertEqual(dup.encode, orig.encode) + self.assertEqual(dup.name, orig.name) + self.assertEqual(dup.incrementalencoder, orig.incrementalencoder) + + def test_pickle(self): + codec_info = codecs.lookup('utf-8') + for proto in range(pickle.HIGHEST_PROTOCOL + 1): + with self.subTest(protocol=proto): + pickled_codec_info = pickle.dumps(codec_info) + unpickled_codec_info = pickle.loads(pickled_codec_info) + self.assertIsNot(codec_info, unpickled_codec_info) + self.assertEqual(codec_info, unpickled_codec_info) + self.assertEqual(codec_info.name, unpickled_codec_info.name) + self.assertEqual( + codec_info.incrementalencoder, + unpickled_codec_info.incrementalencoder + ) + self.assertTrue(unpickled_codec_info._is_text_encoding) + + # Test a CodecInfo with _is_text_encoding equal to false. + codec_info = codecs.lookup('base64') + for proto in range(pickle.HIGHEST_PROTOCOL + 1): + with self.subTest(protocol=proto): + pickled_codec_info = pickle.dumps(codec_info) + unpickled_codec_info = pickle.loads(pickled_codec_info) + self.assertIsNot(codec_info, unpickled_codec_info) + self.assertEqual(codec_info, unpickled_codec_info) + self.assertEqual(codec_info.name, unpickled_codec_info.name) + self.assertEqual( + codec_info.incrementalencoder, + unpickled_codec_info.incrementalencoder + ) + self.assertFalse(unpickled_codec_info._is_text_encoding) + class StreamReaderTest(unittest.TestCase): diff --git a/Misc/NEWS.d/next/Library/2023-09-10-20-23-20.gh-issue-66143.71xvgL.rst b/Misc/NEWS.d/next/Library/2023-09-10-20-23-20.gh-issue-66143.71xvgL.rst new file mode 100644 index 0000000000000..2769c05d93735 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2023-09-10-20-23-20.gh-issue-66143.71xvgL.rst @@ -0,0 +1,2 @@ +The :class:`codecs.CodecInfo` object has been made copyable and pickleable. +Patched by Robert Lehmann and Furkan Onder.

1 0

gh-109495: Remove unused slots from the Python implementation of datetime (GH-109494)
by serhiy-storchaka Sept. 29, 2023

Sept. 29, 2023

https://github.com/python/cpython/commit/7d57288f6d0e7fffb2002ceb460784d392… commit: 7d57288f6d0e7fffb2002ceb460784d39277584a branch: main author: James Hilton-Balfe <gobot1234yt(a)gmail.com> committer: serhiy-storchaka <storchaka(a)gmail.com> date: 2023-09-29T19:57:32+03:00 summary: gh-109495: Remove unused slots from the Python implementation of datetime (GH-109494) files: A Misc/NEWS.d/next/Library/2023-09-16-15-44-16.gh-issue-109495.m2H5Bk.rst M Lib/_pydatetime.py diff --git a/Lib/_pydatetime.py b/Lib/_pydatetime.py index 88275481e7002..bca2acf1fc88c 100644 --- a/Lib/_pydatetime.py +++ b/Lib/_pydatetime.py @@ -1684,7 +1684,7 @@ class datetime(date): The year, month and day arguments are required. tzinfo may be None, or an instance of a tzinfo subclass. The remaining arguments may be ints. """ - __slots__ = date.__slots__ + time.__slots__ + __slots__ = time.__slots__ def __new__(cls, year, month=None, day=None, hour=0, minute=0, second=0, microsecond=0, tzinfo=None, *, fold=0): diff --git a/Misc/NEWS.d/next/Library/2023-09-16-15-44-16.gh-issue-109495.m2H5Bk.rst b/Misc/NEWS.d/next/Library/2023-09-16-15-44-16.gh-issue-109495.m2H5Bk.rst new file mode 100644 index 0000000000000..a7e1b3a64fa78 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2023-09-16-15-44-16.gh-issue-109495.m2H5Bk.rst @@ -0,0 +1 @@ +Remove unnecessary extra ``__slots__`` in :py:class:`datetime`\'s pure python implementation to reduce memory size, as they are defined in the superclass. Patch by James Hilton-Balfe

1 0

gh-109615: Look for 'Modules' as landmark for test_copy_python_src_ignore (GH-110108)
by zooba Sept. 29, 2023

Sept. 29, 2023

https://github.com/python/cpython/commit/a95e8cf9081ef7ff7450d6060bd968ec79… commit: a95e8cf9081ef7ff7450d6060bd968ec79a275f9 branch: 3.11 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: zooba <steve.dower(a)microsoft.com> date: 2023-09-29T15:48:59Z summary: gh-109615: Look for 'Modules' as landmark for test_copy_python_src_ignore (GH-110108) (cherry picked from commit 20bc5f7c28a6f8a2e156c4a748ffabb5efc7c761) Co-authored-by: Steve Dower <steve.dower(a)python.org> files: M Lib/test/test_support.py diff --git a/Lib/test/test_support.py b/Lib/test/test_support.py index 2f70f919d4043..9894c2647d7c9 100644 --- a/Lib/test/test_support.py +++ b/Lib/test/test_support.py @@ -789,7 +789,9 @@ def test_copy_python_src_ignore(self): if not os.path.exists(src_dir): self.skipTest(f"cannot access Python source code directory:" f" {src_dir!r}") - landmark = os.path.join(src_dir, 'Lib', 'os.py') + # Check that the landmark copy_python_src_ignore() expects is available + # (Previously we looked for 'Lib\os.py', which is always present on Windows.) + landmark = os.path.join(src_dir, 'Modules') if not os.path.exists(landmark): self.skipTest(f"cannot access Python source code directory:" f" {landmark!r} landmark is missing")

1 0

gh-109615: Look for 'Modules' as landmark for test_copy_python_src_ignore (GH-110108)
by zooba Sept. 29, 2023

Sept. 29, 2023

https://github.com/python/cpython/commit/20bc5f7c28a6f8a2e156c4a748ffabb5ef… commit: 20bc5f7c28a6f8a2e156c4a748ffabb5efc7c761 branch: main author: Steve Dower <steve.dower(a)python.org> committer: zooba <steve.dower(a)microsoft.com> date: 2023-09-29T16:24:38+01:00 summary: gh-109615: Look for 'Modules' as landmark for test_copy_python_src_ignore (GH-110108) files: M Lib/test/test_support.py diff --git a/Lib/test/test_support.py b/Lib/test/test_support.py index e4a246ba3ddd4..902bec7845130 100644 --- a/Lib/test/test_support.py +++ b/Lib/test/test_support.py @@ -812,7 +812,9 @@ def test_copy_python_src_ignore(self): if not os.path.exists(src_dir): self.skipTest(f"cannot access Python source code directory:" f" {src_dir!r}") - landmark = os.path.join(src_dir, 'Lib', 'os.py') + # Check that the landmark copy_python_src_ignore() expects is available + # (Previously we looked for 'Lib\os.py', which is always present on Windows.) + landmark = os.path.join(src_dir, 'Modules') if not os.path.exists(landmark): self.skipTest(f"cannot access Python source code directory:" f" {landmark!r} landmark is missing")

1 0

gh-110024: Fix Pointer Type Warnings (gh-110053)
by ericsnowcurrently Sept. 29, 2023

Sept. 29, 2023

https://github.com/python/cpython/commit/6364873d2abe0973e21af7c8c7dddbb5f8… commit: 6364873d2abe0973e21af7c8c7dddbb5f8dc1e85 branch: main author: Eric Snow <ericsnowcurrently(a)gmail.com> committer: ericsnowcurrently <ericsnowcurrently(a)gmail.com> date: 2023-09-29T09:20:23-06:00 summary: gh-110024: Fix Pointer Type Warnings (gh-110053) The warnings were introduced by gh-109794 (for gh-109793). files: M Include/cpython/pyatomic.h diff --git a/Include/cpython/pyatomic.h b/Include/cpython/pyatomic.h index ce23e13bf3838..7a783058c173a 100644 --- a/Include/cpython/pyatomic.h +++ b/Include/cpython/pyatomic.h @@ -506,15 +506,23 @@ static inline void _Py_atomic_fence_release(void); // --- aliases --------------------------------------------------------------- #if SIZEOF_LONG == 8 -# define _Py_atomic_load_ulong _Py_atomic_load_uint64 -# define _Py_atomic_load_ulong_relaxed _Py_atomic_load_uint64_relaxed -# define _Py_atomic_store_ulong _Py_atomic_store_uint64 -# define _Py_atomic_store_ulong_relaxed _Py_atomic_store_uint64_relaxed +# define _Py_atomic_load_ulong(p) \ + _Py_atomic_load_uint64((uint64_t *)p) +# define _Py_atomic_load_ulong_relaxed(p) \ + _Py_atomic_load_uint64_relaxed((uint64_t *)p) +# define _Py_atomic_store_ulong(p, v) \ + _Py_atomic_store_uint64((uint64_t *)p, v) +# define _Py_atomic_store_ulong_relaxed(p, v) \ + _Py_atomic_store_uint64_relaxed((uint64_t *)p, v) #elif SIZEOF_LONG == 4 -# define _Py_atomic_load_ulong _Py_atomic_load_uint32 -# define _Py_atomic_load_ulong_relaxed _Py_atomic_load_uint32_relaxed -# define _Py_atomic_store_ulong _Py_atomic_store_uint32 -# define _Py_atomic_store_ulong_relaxed _Py_atomic_store_uint32_relaxed +# define _Py_atomic_load_ulong(p) \ + _Py_atomic_load_uint32((uint32_t *)p) +# define _Py_atomic_load_ulong_relaxed(p) \ + _Py_atomic_load_uint32_relaxed((uint32_t *)p) +# define _Py_atomic_store_ulong(p, v) \ + _Py_atomic_store_uint32((uint32_t *)p, v) +# define _Py_atomic_store_ulong_relaxed(p, v) \ + _Py_atomic_store_uint32_relaxed((uint32_t *)p, v) #else # error "long must be 4 or 8 bytes in size" #endif // SIZEOF_LONG

1 0