CVS commit: pkgsrc/lang

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Fri Dec  8 09:22:42 UTC 2023

Modified Files:
        pkgsrc/lang/py312-html-docs: Makefile PLIST distinfo
        pkgsrc/lang/python312: Makefile PLIST dist.mk distinfo options.mk
        pkgsrc/lang/python312/patches: patch-Modules_socketmodule.c
            patch-configure

Log Message:
python312 py312-html-docs: updated to 3.12.1

Python 3.12.1 final

Core and Builtins

gh-112125: Fix None.__ne__(None) returning NotImplemented instead of False
gh-112625: Fixes a bug where a bytearray object could be cleared while iterating over an argument in the bytearray.join() method that could result in reading memory after it was freed.
gh-105967: Workaround a bug in Apple’s macOS platform zlib library where zlib.crc32() and binascii.crc32() could produce incorrect results on multi-gigabyte inputs. Including when using zipfile on 
zips containing large data.
gh-112356: Stopped erroneously deleting a LOAD_NULL bytecode instruction when optimized twice.
gh-111058: Change coro.cr_frame/gen.gi_frame to return None after the coroutine/generator has been closed. This fixes a bug where getcoroutinestate() and getgeneratorstate() return the wrong state 
for a closed coroutine/generator.
gh-112388: Fix an error that was causing the parser to try to overwrite tokenizer errors. Patch by pablo Galindo
gh-112387: Fix error positions for decoded strings with backwards tokenize errors. Patch by Pablo Galindo
gh-112367: Avoid undefined behaviour when using the perf trampolines by not freeing the code arenas until shutdown. Patch by Pablo Galindo
gh-112243: Don’t include comments in f-string debug expressions. Patch by Pablo Galindo
gh-112266: Change docstrings of __dict__ and __weakref__.
gh-111654: Fix runtime crash when some error happens in opcode LOAD_FROM_DICT_OR_DEREF.
gh-109181: Speed up Traceback object creation by lazily compute the line number. Patch by Pablo Galindo
gh-102388: Fix a bug where iso2022_jp_3 and iso2022_jp_2004 codecs read out of bounds
gh-111366: Fix an issue in the codeop that was causing SyntaxError exceptions raised in the presence of invalid syntax to not contain precise error messages. Patch by Pablo Galindo
gh-111380: Fix a bug that was causing SyntaxWarning to appear twice when parsing if invalid syntax is encountered later. Patch by Pablo galindo
gh-94438: Fix a regression that prevented jumping across is None and is not None when debugging. Patch by Savannah Ostrowski.
gh-110938: Fix error messages for indented blocks with functions and classes with generic type parameters. Patch by Pablo Galindo
gh-109894: Fixed crash due to improperly initialized static MemoryError in subinterpreter.
gh-110782: Fix crash when typing.TypeVar is constructed with a keyword argument. Patch by Jelle Zijlstra.
gh-110696: Fix incorrect error message for invalid argument unpacking. Patch by Pablo Galindo
gh-110543: Fix regression in Python 3.12 where types.CodeType.replace() would produce a broken code object if called on a module or class code object that contains a comprehension. Patch by Jelle 
Zijlstra.
gh-110514: Add PY_THROW to sys.setprofile() events
gh-110455: Guard assert(tstate->thread_id > 0) with #ifndef HAVE_PTHREAD_STUBS. This allows for for pydebug builds to work under WASI which (currently) lacks thread support.
gh-110259: Correctly identify the format spec in f-strings (with single or triple quotes) that have multiple lines in the expression part and include a formatting spec. Patch by Pablo Galindo
gh-110237: Fix missing error checks for calls to PyList_Append in _PyEval_MatchClass.
gh-109889: Fix the compiler’s redundant NOP detection algorithm to skip over NOPs with no line number when looking for the next instruction’s lineno.
gh-109853: sys.path[0] is now set correctly for subinterpreters.
gh-105716: Subinterpreters now correctly handle the case where they have threads running in the background. Before, such threads would interfere with cleaning up and destroying them, as well as 
prevent running another script.
gh-109793: The main thread no longer exits prematurely when a subinterpreter is cleaned up during runtime finalization. The bug was a problem particularly because, when triggered, the Python process 
would always return with a 0 exitcode, even if it failed.
gh-109596: Fix some tokens in the grammar that were incorrectly marked as soft keywords. Also fix some repeated rule names and ensure that repeated rules are not allowed. Patch by Pablo Galindo
gh-109351: Fix crash when compiling an invalid AST involving a named (walrus) expression.
gh-109216: Fix possible memory leak in BUILD_MAP.
gh-109207: Fix a SystemError in __repr__ of symtable entry object.
gh-109179: Fix bug where the C traceback display drops notes from SyntaxError.
gh-109052: Use the base opcode when comparing code objects to avoid interference from instrumentation
gh-88943: Improve syntax error for non-ASCII character that follows a numerical literal. It now points on the invalid non-ASCII character, not on the valid numerical literal.
gh-106931: Statically allocated string objects are now interned globally instead of per-interpreter. This fixes a situation where such a string would only be interned in a single interpreter. Normal 
string objects are unaffected.

Library

gh-79325: Fix an infinite recursion error in tempfile.TemporaryDirectory() cleanup on Windows.

gh-112645: Remove deprecation error on passing onerror to shutil.rmtree().

gh-112618: Fix a caching bug relating to typing.Annotated. Annotated[str, True] is no longer identical to Annotated[str, 1].

gh-112334: Fixed a performance regression in 3.12’s subprocess on Linux where it would no longer use the fast-path vfork() system call when it should have due to a logic bug, instead always falling 
back to the safe but slower fork().

Also fixed a related 3.12 security regression: If a value of extra_groups=[] was passed to subprocess.Popen or related APIs, the underlying setgroups(0, NULL) system call to clear the groups list 
would not be made in the child process prior to exec(). This has been assigned CVE-2023-6507.

This was identified via code inspection in the process of fixing the first bug.

gh-110190: Fix ctypes structs with array on Arm platform by setting MAX_STRUCT_SIZE to 32 in stgdict. Patch by Diego Russo.

gh-112578: Fix a spurious RuntimeWarning when executing the zipfile module.

gh-112509: Fix edge cases that could cause a key to be present in both the __required_keys__ and __optional_keys__ attributes of a typing.TypedDict. Patch by Jelle Zijlstra.

gh-112414: Fix regression in Python 3.12 where calling repr() on a module that had been imported using a custom loader could fail with AttributeError. Patch by Alex Waygood.

gh-112358: Revert change to struct.Struct initialization that broke some cases of subclassing.

gh-94722: Fix bug where comparison between instances of DocTest fails if one of them has None as its lineno.

gh-112105: Make readline.set_completer_delims() work with libedit

gh-111942: Fix SystemError in the TextIOWrapper constructor with non-encodable “errors” argument in non-debug mode.

gh-109538: Issue warning message instead of having RuntimeError be displayed when event loop has already been closed at StreamWriter.__del__().

gh-111942: Fix crashes in io.TextIOWrapper.reconfigure() when pass invalid arguments, e.g. non-string encoding.

gh-111460: curses: restore wide character support (including curses.unget_wch() and get_wch()) on macOS, which was unavailable due to a regression in Python 3.12.

gh-103791: contextlib.suppress now supports suppressing exceptions raised as part of a BaseExceptionGroup, in addition to the recent support for ExceptionGroup.

gh-111804: Remove posix.fallocate() under WASI as the underlying posix_fallocate() is not available in WASI preview2.

gh-111841: Fix truncating arguments on an embedded null character in os.putenv() and os.unsetenv() on Windows.

gh-111541: Fix doctest for SyntaxError not-builtin subclasses.

gh-110894: Call loop exception handler for exceptions in client_connected_cb of asyncio.start_server() so that applications can handle it. Patch by Kumar Aditya.

gh-111531: Fix reference leaks in bind_class() and bind_all() methods of tkinter widgets.

gh-111356: Added io.text_encoding(), io.DEFAULT_BUFFER_SIZE, and io.IncrementalNewlineDecoder to io.__all__.

gh-111342: Fixed typo in math.sumprod().

gh-68166: Remove mention of not supported “vsapi” element type in tkinter.ttk.Style.element_create(). Add tests for element_create() and other ttk.Style methods. Add examples for element_create() in 
the documentation.

gh-75666: Fix the behavior of tkinter widget’s unbind() method with two arguments. Previously, widget.unbind(sequence, funcid) destroyed the current binding for sequence, leaving sequence unbound, 
and deleted the funcid command. Now it removes only funcid from the binding for sequence, keeping other commands, and deletes the funcid command. It leaves sequence unbound only if funcid was the 
last bound command.

gh-79033: Another attempt at fixing asyncio.Server.wait_closed(). It now blocks until both conditions are true: the server is closed, and there are no more active connections. (This means that in 
some cases where in 3.12.0 this function would incorrectly have returned immediately, it will now block; in particular, when there are no active connections but the server hasn’t been closed yet.)

gh-111295: Fix time not checking for errors when initializing.

gh-111253: Add error checking during _socket module init.

gh-111251: Fix _blake2 not checking for errors when initializing.

gh-111174: Fix crash in io.BytesIO.getbuffer() called repeatedly for empty BytesIO.

gh-111187: Postpone removal version for locale.getdefaultlocale() to Python 3.15.

gh-111159: Fix doctest output comparison for exceptions with notes.

gh-110910: Fix invalid state handling in asyncio.TaskGroup and asyncio.Timeout. They now raise proper RuntimeError if they are improperly used and are left in consistent state after this.

gh-111092: Make turtledemo run without default root enabled.

gh-110488: Fix a couple of issues in pathlib.PurePath.with_name(): a single dot was incorrectly considered a valid name, and in PureWindowsPath, a name with an NTFS alternate data stream, like a:b, 
was incorrectly considered invalid.

gh-110392: Fix tty.setraw() and tty.setcbreak(): previously they returned partially modified list of the original tty attributes. tty.cfmakeraw() and tty.cfmakecbreak() now make a copy of the list of 
special characters before modifying it.

gh-110590: Fix a bug in _sre.compile() where TypeError would be overwritten by OverflowError when the code argument was a list of non-ints.

gh-65052: Prevent pdb from crashing when trying to display undisplayable objects

gh-110519: Deprecation warning about non-integer number in gettext now alwais refers to the line in the user code where gettext function or method is used. Previously it could refer to a line in 
gettext code.

gh-110395: Ensure that select.kqueue() objects correctly appear as closed in forked children, to prevent operations on an invalid file descriptor.

gh-110378: contextmanager() and asynccontextmanager() context managers now close an invalid underlying generator object that yields more then one value.

gh-110365: Fix termios.tcsetattr() bug that was overwritting existing errors during parsing integers from term list.

gh-109653: Fix a Python 3.12 regression in the import time of random. Patch by Alex Waygood.

gh-110196: Add __reduce__ method to IPv6Address in order to keep scope_id

gh-110036: On Windows, multiprocessing Popen.terminate() now catchs PermissionError and get the process exit code. If the process is still running, raise again the PermissionError. Otherwise, the 
process terminated as expected: store its exit code. Patch by Victor Stinner.

gh-110038: Fixed an issue that caused KqueueSelector.select() to not return all the ready events in some cases when a file descriptor is registered for both read and write.

gh-109631: re functions such as re.findall(), re.split(), re.search() and re.sub() which perform short repeated matches can now be interrupted by user.

gh-109747: Improve errors for unsupported look-behind patterns. Now re.error is raised instead of OverflowError or RuntimeError for too large width of look-behind pattern.

gh-109818: Fix reprlib.recursive_repr() not copying __type_params__ from decorated function.

gh-109047: 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. Patch by Victor Stinner.

gh-109782: Ensure the signature of os.path.isdir() is identical on all platforms. Patch by Amin Alaee.

gh-109590: shutil.which() will prefer files with an extension in PATHEXT if the given mode includes os.X_OK on win32. If no PATHEXT match is found, a file without an extension in PATHEXT can be 
returned. This change will have shutil.which() act more similarly to previous behavior in Python 3.11.

gh-109786: Fix possible reference leaks and crash when re-enter the __next__() method of itertools.pairwise.

gh-109593: Avoid deadlocking on a reentrant call to the multiprocessing resource tracker. Such a reentrant call, though unlikely, can happen if a GC pass invokes the finalizer for a multiprocessing 
object such as SemLock.

gh-109613: Fix os.stat() and os.DirEntry.stat(): check for exceptions. Previously, on Python built in debug mode, these functions could trigger a fatal Python error (and abort the process) when a 
function succeeded with an exception set. Patch by Victor Stinner.

gh-109375: The pdb alias command now prevents registering aliases without arguments.

gh-107219: Fix a race condition in concurrent.futures. When a process in the process pool was terminated abruptly (while the future was running or pending), close the connection write end. If the 
call queue is blocked on sending bytes to a worker process, closing the connection write end interrupts the send, so the queue can be closed. Patch by Victor Stinner.

gh-50644: Attempts to pickle or create a shallow or deep copy of codecs streams now raise a TypeError. Previously, copying failed with a RecursionError, while pickling produced wrong results that 
eventually caused unpickling to fail with a RecursionError.

gh-108987: Fix _thread.start_new_thread() race condition. If a thread is created during Python finalization, the newly spawned thread now exits immediately instead of trying to access freed memory 
and lead to a crash. Patch by Victor Stinner.

gh-108791: Improved error handling in pdb command line interface, making it produce more concise error messages.

gh-105829: Fix concurrent.futures.ProcessPoolExecutor deadlock

gh-106584: Fix exit code for unittest if all tests are skipped. Patch by Egor Eliseev.

gh-102956: Fix returning of empty byte strings after seek in zipfile module

gh-84867: unittest.TestLoader no longer loads test cases from exact unittest.TestCase and unittest.FunctionTestCase classes.

gh-91133: Fix a bug in tempfile.TemporaryDirectory cleanup, which now no longer dereferences symlinks when working around file system permission errors.

gh-73561: Omit the interface scope from an IPv6 address when used as Host header by http.client.

gh-86826: zipinfo now supports the full range of values in the TZ string determined by RFC 8536 and detects all invalid formats. Both Python and C implementations now raise exceptions of the same 
type on invalid data.

bpo-43153: On Windows, tempfile.TemporaryDirectory previously masked a PermissionError with NotADirectoryError during directory cleanup. It now correctly raises PermissionError if errors are not 
ignored. Patch by Andrei Kulakov and Ken Jin.

bpo-35332: The shutil.rmtree() function now ignores errors when calling os.close() when ignore_errors is True, and os.close() no longer retried after error.

bpo-41422: Fixed memory leaks of pickle.Pickler and pickle.Unpickler involving cyclic references via the internal memo mapping.

bpo-40262: The ssl.SSLSocket.recv_into() method no longer requires the buffer argument to implement __len__ and supports buffers with arbitrary item size.

Documentation

gh-111699: Relocate smtpd deprecation notice to its own section rather than under locale in What’s New in Python 3.12 document
gh-108826: dis module command-line interface is now mentioned in documentation.

Tests

gh-112769: The tests now correctly compare zlib version when zlib.ZLIB_RUNTIME_VERSION contains non-integer suffixes. For example zlib-ng defines the version as 1.3.0.zlib-ng.
gh-110367: Make regrtest --verbose3 option compatible with --huntrleaks -jN options. The ./python -m test -j1 -R 3:3 --verbose3 command now works as expected. Patch by Victor Stinner.
gh-111165: Remove no longer used functions run_unittest() and run_doctest() from the test.support module.
gh-110932: Fix regrtest if the SOURCE_DATE_EPOCH environment variable is defined: use the variable value as the random seed. Patch by Victor Stinner.
gh-110995: test_gdb: Fix detection of gdb built without Python scripting support. Patch by Victor Stinner.
gh-110918: Test case matching patterns specified by options --match, --ignore, --matchfile and --ignorefile are now tested in the order of specification, and the last match determines whether the 
test case be run or ignored.
gh-110647: Fix test_stress_modifying_handlers() of test_signal. Patch by Victor Stinner.
gh-103053: Fix test_tools.test_freeze on FreeBSD: run “make distclean” instead of “make clean” in the copied source directory to remove also the “python” program. Patch by Victor Stinner.
gh-110167: Fix a deadlock in test_socket when server fails with a timeout but the client is still running in its thread. Don’t hold a lock to call cleanup functions in doCleanups(). One of the 
cleanup function waits until the client completes, whereas the client could deadlock if it called addCleanup() in such situation. Patch by Victor Stinner.
gh-110388: Add tests for tty.
gh-81002: Add tests for termios.
gh-110267: Add tests for pickling and copying PyStructSequence objects. Patched by Xuehai Pan.
gh-110031: Skip test_threading tests using thread+fork if Python is built with Address Sanitizer (ASAN). Patch by Victor Stinner.
gh-110088: Fix test_asyncio timeouts: don’t measure the maximum duration, a test should not measure a CI performance. Only measure the minimum duration when a task has a timeout or delay. Add 
CLOCK_RES to test_asyncio.utils. Patch by Victor Stinner.
gh-109974: Fix race conditions in test_threading lock tests. Wait until a condition is met rather than using time.sleep() with a hardcoded number of seconds. Patch by Victor Stinner.
gh-110033: Fix test_interprocess_signal() of test_signal. Make sure that the subprocess.Popen object is deleted before the test raising an exception in a signal handler. Otherwise, Popen.__del__() 
can get the exception which is logged as Exception ignored in: ... and the test fails. Patch by Victor Stinner.
gh-109594: Fix test_timeout() of test_concurrent_futures.test_wait. Remove the future which may or may not complete depending if it takes longer than the timeout ot not. Keep the second future which 
does not complete before wait() timeout. Patch by Victor Stinner.
gh-109972: Split test_gdb.py file into a test_gdb package made of multiple tests, so tests can now be run in parallel. Patch by Victor Stinner.
gh-103053: Skip test_freeze_simple_script() of test_tools.test_freeze if Python is built with ./configure --enable-optimizations, which means with Profile Guided Optimization (PGO): it just makes the 
test too slow. The freeze tool is tested by many other CIs with other (faster) compiler flags. Patch by Victor Stinner.
gh-109580: Skip test_perf_profiler if Python is built with ASAN, MSAN or UBSAN sanitizer. Python does crash randomly in this test on such build. Patch by Victor Stinner.
gh-104736: Fix test_gdb on Python built with LLVM clang 16 on Linux ppc64le (ex: Fedora 38). Search patterns in gdb “bt” command output to detect when gdb fails to retrieve the traceback. For 
example, skip a test if Backtrace stopped: frame did not save the PC is found. Patch by Victor Stinner.
gh-108927: Fixed order dependence in running tests in the same process when a test that has submodules (e.g. test_importlib) follows a test that imports its submodule (e.g. test_importlib.util) and 
precedes a test (e.g. test_unittest or test_compileall) that uses that submodule.

Build

gh-112088: Add Tools/build/regen-configure.sh script to regenerate the configure with an Ubuntu container image. The quay.io/tiran/cpython_autoconf:271 container image (tiran/cpython_autoconf) is no 
longer used. Patch by Victor Stinner.
gh-111046: For wasi-threads, memory is now exported to fix compatibility issues with some wasm runtimes.
gh-103053: “make check-clean-src” now also checks if the “python” program is found in the source directory: fail with an error if it does exist. Patch by Victor Stinner.
gh-109191: Fix compile error when building with recent versions of libedit.

Windows

gh-111856: Fixes fstat() on file systems that do not support file ID requests. This includes FAT32 and exFAT.
gh-111293: Fix os.DirEntry.inode dropping higher 64 bits of a file id on some filesystems on Windows.
gh-110913: WindowsConsoleIO now correctly chunks large buffers without splitting up UTF-8 sequences.
gh-110437: Allows overriding the source of VC redistributables so that releases can be guaranteed to never downgrade between updates.
gh-109286: Update Windows installer to use SQLite 3.43.1.

macOS

gh-109981: Use /dev/fd on macOS to determine the number of open files in test.support.os_helper.fd_count to avoid a crash with “guarded” file descriptors when probing for open files.
gh-110950: Update macOS installer to include an upstream Tcl/Tk fix for the Secure coding is not enabled for restorable state! warning encountered in Tkinter on macOS 14 Sonoma.
gh-111015: Ensure that IDLE.app and Python Launcher.app are installed with appropriate permissions on macOS builds.
gh-109286: Update macOS installer to use SQLite 3.43.1.
gh-71383: Update macOS installer to include an upstream Tcl/Tk fix for the ttk::ThemeChanged error encountered in Tkinter.
gh-92603: Update macOS installer to include a fix accepted by upstream Tcl/Tk for a crash encountered after the first tkinter.Tk() instance is destroyed.

IDLE

bpo-35668: Add docstrings to the IDLE debugger module. Fix two bugs: initialize Idb.botframe (should be in Bdb); in Idb.in_rpc_code, check whether prev_frame is None before trying to use it. Greatly 
expand test_debugger.

C API

gh-106560: Fix redundant declarations in the public C API. Declare PyBool_Type and PyLong_Type only once. Patch by Victor Stinner.
gh-112438: Fix support of format units “es”, “et”, “es#”, and “et#” in nested tuples in PyArg_ParseTuple()-like functions.
gh-109521: PyImport_GetImporter() now sets RuntimeError if it fails to get sys.path_hooks or sys.path_importer_cache or they are not list and dict correspondingly. Previously it could return NULL 
without setting error in obscure cases, crash or raise SystemError if these attributes have wrong type.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/py312-html-docs/Makefile \
    pkgsrc/lang/py312-html-docs/PLIST pkgsrc/lang/py312-html-docs/distinfo
cvs rdiff -u -r1.11 -r1.12 pkgsrc/lang/python312/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/lang/python312/PLIST \
    pkgsrc/lang/python312/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/python312/dist.mk \
    pkgsrc/lang/python312/options.mk
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/lang/python312/patches/patch-Modules_socketmodule.c
cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/python312/patches/patch-configure

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/py312-html-docs/Makefile
diff -u pkgsrc/lang/py312-html-docs/Makefile:1.1 pkgsrc/lang/py312-html-docs/Makefile:1.2
--- pkgsrc/lang/py312-html-docs/Makefile:1.1    Mon Oct  2 20:07:15 2023
+++ pkgsrc/lang/py312-html-docs/Makefile        Fri Dec  8 09:22:42 2023
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.1 2023/10/02 20:07:15 adam Exp $
+# $NetBSD: Makefile,v 1.2 2023/12/08 09:22:42 adam Exp $
 
-VERS=          3.12.0
+VERS=          3.12.1
 DISTNAME=      python-${VERS}-docs-html
 PKGNAME=       py312-html-docs-${VERS}
 CATEGORIES=    lang python
Index: pkgsrc/lang/py312-html-docs/PLIST
diff -u pkgsrc/lang/py312-html-docs/PLIST:1.1 pkgsrc/lang/py312-html-docs/PLIST:1.2
--- pkgsrc/lang/py312-html-docs/PLIST:1.1       Mon Oct  2 20:07:15 2023
+++ pkgsrc/lang/py312-html-docs/PLIST   Fri Dec  8 09:22:42 2023
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2023/10/02 20:07:15 adam Exp $
+@comment $NetBSD: PLIST,v 1.2 2023/12/08 09:22:42 adam Exp $
 share/doc/python3.12/.buildinfo
 share/doc/python3.12/_downloads/6dc1f3f4f0e6ca13cb42ddf4d6cbc8af/tzinfo_examples.py
 share/doc/python3.12/_images/hashlib-blake2-tree.png
@@ -161,6 +161,7 @@ share/doc/python3.12/_sources/library/cg
 share/doc/python3.12/_sources/library/chunk.rst.txt
 share/doc/python3.12/_sources/library/cmath.rst.txt
 share/doc/python3.12/_sources/library/cmd.rst.txt
+share/doc/python3.12/_sources/library/cmdline.rst.txt
 share/doc/python3.12/_sources/library/code.rst.txt
 share/doc/python3.12/_sources/library/codecs.rst.txt
 share/doc/python3.12/_sources/library/codeop.rst.txt
@@ -512,6 +513,7 @@ share/doc/python3.12/_static/pydoctheme.
 share/doc/python3.12/_static/pydoctheme_dark.css
 share/doc/python3.12/_static/pygments.css
 share/doc/python3.12/_static/pygments_dark.css
+share/doc/python3.12/_static/search-focus.js
 share/doc/python3.12/_static/searchtools.js
 share/doc/python3.12/_static/sidebar.js
 share/doc/python3.12/_static/themetoggle.js
@@ -702,6 +704,7 @@ share/doc/python3.12/library/cgitb.html
 share/doc/python3.12/library/chunk.html
 share/doc/python3.12/library/cmath.html
 share/doc/python3.12/library/cmd.html
+share/doc/python3.12/library/cmdline.html
 share/doc/python3.12/library/code.html
 share/doc/python3.12/library/codecs.html
 share/doc/python3.12/library/codeop.html
Index: pkgsrc/lang/py312-html-docs/distinfo
diff -u pkgsrc/lang/py312-html-docs/distinfo:1.1 pkgsrc/lang/py312-html-docs/distinfo:1.2
--- pkgsrc/lang/py312-html-docs/distinfo:1.1    Mon Oct  2 20:07:15 2023
+++ pkgsrc/lang/py312-html-docs/distinfo        Fri Dec  8 09:22:42 2023
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1 2023/10/02 20:07:15 adam Exp $
+$NetBSD: distinfo,v 1.2 2023/12/08 09:22:42 adam Exp $
 
-BLAKE2s (python-3.12.0-docs-html.tar.bz2) = 23bf28c145cda9bc5db31e519726e5494d6bbc5aeb0fe4b438c715c554082fb9
-SHA512 (python-3.12.0-docs-html.tar.bz2) = 4fa12af1d1280455063e7c37b479136483478296bcc99302b0bdd4696a84cee82456d1de37cc378fede97f3681bc75ffa535034da5bb76e86d01cb283c425733
-Size (python-3.12.0-docs-html.tar.bz2) = 8200382 bytes
+BLAKE2s (python-3.12.1-docs-html.tar.bz2) = 089c13026ce694f06ff3a5352a746643008428546ec7f302e71b5e876c25cfb4
+SHA512 (python-3.12.1-docs-html.tar.bz2) = 605085ebdac199dfcaf39e909c69cea0c2247aa90dface5c8192312dc2f228ee4ece61eb905e9557e7d1786d338c318eee6a780f6398f07ba4db7d50c4e84bb2
+Size (python-3.12.1-docs-html.tar.bz2) = 8189226 bytes

Index: pkgsrc/lang/python312/Makefile
diff -u pkgsrc/lang/python312/Makefile:1.11 pkgsrc/lang/python312/Makefile:1.12
--- pkgsrc/lang/python312/Makefile:1.11 Thu Nov 23 12:43:35 2023
+++ pkgsrc/lang/python312/Makefile      Fri Dec  8 09:22:42 2023
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2023/11/23 12:43:35 jperkin Exp $
+# $NetBSD: Makefile,v 1.12 2023/12/08 09:22:42 adam Exp $
 
 .include "dist.mk"
 
 PKGNAME=       python312-${PY_DISTVERSION}
-PKGREVISION=   4
 CATEGORIES=    lang python
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
@@ -44,7 +43,6 @@ CONFIGURE_ARGS+=      --without-ensurepip
 CONFIGURE_ENV+=                OPT=${CFLAGS:M*:Q}
 CONFIGURE_ENV+=                ac_cv_path_mkdir=${TOOLS_PATH.mkdir}
 CONFIGURE_ENV+=                py_cv_module__gdbm="n/a"
-CONFIGURE_ENV+=                py_cv_module__tkinter="n/a"
 # example module
 CONFIGURE_ENV+=                py_cv_module_xxlimited="n/a"
 PKGCONFIG_OVERRIDE+=   Misc/python.pc.in Misc/python-embed.pc.in
@@ -111,7 +109,7 @@ CFLAGS+=    -I${OSX_SDK_PATH:Q}/usr/include
 
 LDFLAGS.SunOS+=        -lresolv
 
-PLIST_VARS+=   dbm nis
+PLIST_VARS+=   dbm nis tkinter
 .if ${OPSYS} != "Linux"
 PLIST.dbm=     yes
 .endif

Index: pkgsrc/lang/python312/PLIST
diff -u pkgsrc/lang/python312/PLIST:1.2 pkgsrc/lang/python312/PLIST:1.3
--- pkgsrc/lang/python312/PLIST:1.2     Mon Oct 23 06:36:00 2023
+++ pkgsrc/lang/python312/PLIST Fri Dec  8 09:22:42 2023
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2023/10/23 06:36:00 wiz Exp $
+@comment $NetBSD: PLIST,v 1.3 2023/12/08 09:22:42 adam Exp $
 bin/2to3-${PY_VER_SUFFIX}
 bin/idle${PY_VER_SUFFIX}
 bin/pydoc${PY_VER_SUFFIX}
@@ -1676,6 +1676,7 @@ lib/python${PY_VER_SUFFIX}/lib-dynload/_
 lib/python${PY_VER_SUFFIX}/lib-dynload/_testinternalcapi.so
 lib/python${PY_VER_SUFFIX}/lib-dynload/_testmultiphase.so
 lib/python${PY_VER_SUFFIX}/lib-dynload/_testsinglephase.so
+${PLIST.tkinter}lib/python${PY_VER_SUFFIX}/lib-dynload/_tkinter.so
 lib/python${PY_VER_SUFFIX}/lib-dynload/_uuid.so
 lib/python${PY_VER_SUFFIX}/lib-dynload/_xxinterpchannels.so
 lib/python${PY_VER_SUFFIX}/lib-dynload/_xxsubinterpreters.so
@@ -2268,34 +2269,6 @@ lib/python${PY_VER_SUFFIX}/test/_test_mu
 lib/python${PY_VER_SUFFIX}/test/_test_venv_multiprocessing.py
 lib/python${PY_VER_SUFFIX}/test/_test_venv_multiprocessing.pyc
 lib/python${PY_VER_SUFFIX}/test/_test_venv_multiprocessing.pyo
-lib/python${PY_VER_SUFFIX}/test/_typed_dict_helper.py
-lib/python${PY_VER_SUFFIX}/test/_typed_dict_helper.pyc
-lib/python${PY_VER_SUFFIX}/test/_typed_dict_helper.pyo
-lib/python${PY_VER_SUFFIX}/test/allsans.pem
-lib/python${PY_VER_SUFFIX}/test/ann_module.py
-lib/python${PY_VER_SUFFIX}/test/ann_module.pyc
-lib/python${PY_VER_SUFFIX}/test/ann_module.pyo
-lib/python${PY_VER_SUFFIX}/test/ann_module2.py
-lib/python${PY_VER_SUFFIX}/test/ann_module2.pyc
-lib/python${PY_VER_SUFFIX}/test/ann_module2.pyo
-lib/python${PY_VER_SUFFIX}/test/ann_module3.py
-lib/python${PY_VER_SUFFIX}/test/ann_module3.pyc
-lib/python${PY_VER_SUFFIX}/test/ann_module3.pyo
-lib/python${PY_VER_SUFFIX}/test/ann_module4.py
-lib/python${PY_VER_SUFFIX}/test/ann_module4.pyc
-lib/python${PY_VER_SUFFIX}/test/ann_module4.pyo
-lib/python${PY_VER_SUFFIX}/test/ann_module5.py
-lib/python${PY_VER_SUFFIX}/test/ann_module5.pyc
-lib/python${PY_VER_SUFFIX}/test/ann_module5.pyo
-lib/python${PY_VER_SUFFIX}/test/ann_module6.py
-lib/python${PY_VER_SUFFIX}/test/ann_module6.pyc
-lib/python${PY_VER_SUFFIX}/test/ann_module6.pyo
-lib/python${PY_VER_SUFFIX}/test/ann_module7.py
-lib/python${PY_VER_SUFFIX}/test/ann_module7.pyc
-lib/python${PY_VER_SUFFIX}/test/ann_module7.pyo
-lib/python${PY_VER_SUFFIX}/test/ann_module8.py
-lib/python${PY_VER_SUFFIX}/test/ann_module8.pyc
-lib/python${PY_VER_SUFFIX}/test/ann_module8.pyo
 lib/python${PY_VER_SUFFIX}/test/audiodata/pluck-alaw.aifc
 lib/python${PY_VER_SUFFIX}/test/audiodata/pluck-pcm16.aiff
 lib/python${PY_VER_SUFFIX}/test/audiodata/pluck-pcm16.au
@@ -2322,32 +2295,43 @@ lib/python${PY_VER_SUFFIX}/test/audit-te
 lib/python${PY_VER_SUFFIX}/test/autotest.py
 lib/python${PY_VER_SUFFIX}/test/autotest.pyc
 lib/python${PY_VER_SUFFIX}/test/autotest.pyo
-lib/python${PY_VER_SUFFIX}/test/bad_coding.py
-lib/python${PY_VER_SUFFIX}/test/bad_coding2.py
-lib/python${PY_VER_SUFFIX}/test/badcert.pem
-lib/python${PY_VER_SUFFIX}/test/badkey.pem
-lib/python${PY_VER_SUFFIX}/test/badsyntax_3131.py
-lib/python${PY_VER_SUFFIX}/test/badsyntax_future10.py
-lib/python${PY_VER_SUFFIX}/test/badsyntax_future3.py
-lib/python${PY_VER_SUFFIX}/test/badsyntax_future4.py
-lib/python${PY_VER_SUFFIX}/test/badsyntax_future5.py
-lib/python${PY_VER_SUFFIX}/test/badsyntax_future6.py
-lib/python${PY_VER_SUFFIX}/test/badsyntax_future7.py
-lib/python${PY_VER_SUFFIX}/test/badsyntax_future8.py
-lib/python${PY_VER_SUFFIX}/test/badsyntax_future9.py
 lib/python${PY_VER_SUFFIX}/test/badsyntax_pep3120.py
 lib/python${PY_VER_SUFFIX}/test/bisect_cmd.py
 lib/python${PY_VER_SUFFIX}/test/bisect_cmd.pyc
 lib/python${PY_VER_SUFFIX}/test/bisect_cmd.pyo
-lib/python${PY_VER_SUFFIX}/test/capath/4e1295a3.0
-lib/python${PY_VER_SUFFIX}/test/capath/5ed36f99.0
-lib/python${PY_VER_SUFFIX}/test/capath/6e88d7b8.0
-lib/python${PY_VER_SUFFIX}/test/capath/99d0fa06.0
-lib/python${PY_VER_SUFFIX}/test/capath/b1930218.0
-lib/python${PY_VER_SUFFIX}/test/capath/ceff1710.0
-lib/python${PY_VER_SUFFIX}/test/cfgparser.1
-lib/python${PY_VER_SUFFIX}/test/cfgparser.2
-lib/python${PY_VER_SUFFIX}/test/cfgparser.3
+lib/python${PY_VER_SUFFIX}/test/certdata/allsans.pem
+lib/python${PY_VER_SUFFIX}/test/certdata/badcert.pem
+lib/python${PY_VER_SUFFIX}/test/certdata/badkey.pem
+lib/python${PY_VER_SUFFIX}/test/certdata/capath/4e1295a3.0
+lib/python${PY_VER_SUFFIX}/test/certdata/capath/5ed36f99.0
+lib/python${PY_VER_SUFFIX}/test/certdata/capath/6e88d7b8.0
+lib/python${PY_VER_SUFFIX}/test/certdata/capath/99d0fa06.0
+lib/python${PY_VER_SUFFIX}/test/certdata/capath/b1930218.0
+lib/python${PY_VER_SUFFIX}/test/certdata/capath/ceff1710.0
+lib/python${PY_VER_SUFFIX}/test/certdata/ffdh3072.pem
+lib/python${PY_VER_SUFFIX}/test/certdata/idnsans.pem
+lib/python${PY_VER_SUFFIX}/test/certdata/keycert.passwd.pem
+lib/python${PY_VER_SUFFIX}/test/certdata/keycert.pem
+lib/python${PY_VER_SUFFIX}/test/certdata/keycert2.pem
+lib/python${PY_VER_SUFFIX}/test/certdata/keycert3.pem
+lib/python${PY_VER_SUFFIX}/test/certdata/keycert4.pem
+lib/python${PY_VER_SUFFIX}/test/certdata/keycertecc.pem
+lib/python${PY_VER_SUFFIX}/test/certdata/make_ssl_certs.py
+lib/python${PY_VER_SUFFIX}/test/certdata/make_ssl_certs.pyc
+lib/python${PY_VER_SUFFIX}/test/certdata/make_ssl_certs.pyo
+lib/python${PY_VER_SUFFIX}/test/certdata/nokia.pem
+lib/python${PY_VER_SUFFIX}/test/certdata/nosan.pem
+lib/python${PY_VER_SUFFIX}/test/certdata/nullbytecert.pem
+lib/python${PY_VER_SUFFIX}/test/certdata/nullcert.pem
+lib/python${PY_VER_SUFFIX}/test/certdata/pycacert.pem
+lib/python${PY_VER_SUFFIX}/test/certdata/pycakey.pem
+lib/python${PY_VER_SUFFIX}/test/certdata/revocation.crl
+lib/python${PY_VER_SUFFIX}/test/certdata/secp384r1.pem
+lib/python${PY_VER_SUFFIX}/test/certdata/selfsigned_pythontestdotnet.pem
+lib/python${PY_VER_SUFFIX}/test/certdata/ssl_cert.pem
+lib/python${PY_VER_SUFFIX}/test/certdata/ssl_key.passwd.pem
+lib/python${PY_VER_SUFFIX}/test/certdata/ssl_key.pem
+lib/python${PY_VER_SUFFIX}/test/certdata/talos-2019-0758.pem
 lib/python${PY_VER_SUFFIX}/test/cjkencodings/big5-utf8.txt
 lib/python${PY_VER_SUFFIX}/test/cjkencodings/big5.txt
 lib/python${PY_VER_SUFFIX}/test/cjkencodings/big5hkscs-utf8.txt
@@ -2380,9 +2364,9 @@ lib/python${PY_VER_SUFFIX}/test/cjkencod
 lib/python${PY_VER_SUFFIX}/test/cjkencodings/shift_jisx0213.txt
 lib/python${PY_VER_SUFFIX}/test/clinic.test.c
 lib/python${PY_VER_SUFFIX}/test/cmath_testcases.txt
-lib/python${PY_VER_SUFFIX}/test/coding20731.py
-lib/python${PY_VER_SUFFIX}/test/coding20731.pyc
-lib/python${PY_VER_SUFFIX}/test/coding20731.pyo
+lib/python${PY_VER_SUFFIX}/test/configdata/cfgparser.1
+lib/python${PY_VER_SUFFIX}/test/configdata/cfgparser.2
+lib/python${PY_VER_SUFFIX}/test/configdata/cfgparser.3
 lib/python${PY_VER_SUFFIX}/test/crashers/README
 lib/python${PY_VER_SUFFIX}/test/crashers/bogus_code_obj.py
 lib/python${PY_VER_SUFFIX}/test/crashers/bogus_code_obj.pyc
@@ -2409,21 +2393,6 @@ lib/python${PY_VER_SUFFIX}/test/curses_t
 lib/python${PY_VER_SUFFIX}/test/curses_tests.pyc
 lib/python${PY_VER_SUFFIX}/test/curses_tests.pyo
 lib/python${PY_VER_SUFFIX}/test/data/README
-lib/python${PY_VER_SUFFIX}/test/dataclass_module_1.py
-lib/python${PY_VER_SUFFIX}/test/dataclass_module_1.pyc
-lib/python${PY_VER_SUFFIX}/test/dataclass_module_1.pyo
-lib/python${PY_VER_SUFFIX}/test/dataclass_module_1_str.py
-lib/python${PY_VER_SUFFIX}/test/dataclass_module_1_str.pyc
-lib/python${PY_VER_SUFFIX}/test/dataclass_module_1_str.pyo
-lib/python${PY_VER_SUFFIX}/test/dataclass_module_2.py
-lib/python${PY_VER_SUFFIX}/test/dataclass_module_2.pyc
-lib/python${PY_VER_SUFFIX}/test/dataclass_module_2.pyo
-lib/python${PY_VER_SUFFIX}/test/dataclass_module_2_str.py
-lib/python${PY_VER_SUFFIX}/test/dataclass_module_2_str.pyc
-lib/python${PY_VER_SUFFIX}/test/dataclass_module_2_str.pyo
-lib/python${PY_VER_SUFFIX}/test/dataclass_textanno.py
-lib/python${PY_VER_SUFFIX}/test/dataclass_textanno.pyc
-lib/python${PY_VER_SUFFIX}/test/dataclass_textanno.pyo
 lib/python${PY_VER_SUFFIX}/test/datetimetester.py
 lib/python${PY_VER_SUFFIX}/test/datetimetester.pyc
 lib/python${PY_VER_SUFFIX}/test/datetimetester.pyo
@@ -2617,28 +2586,11 @@ lib/python${PY_VER_SUFFIX}/test/encoded_
 lib/python${PY_VER_SUFFIX}/test/encoded_modules/module_koi8_r.pyc
 lib/python${PY_VER_SUFFIX}/test/encoded_modules/module_koi8_r.pyo
 lib/python${PY_VER_SUFFIX}/test/exception_hierarchy.txt
-lib/python${PY_VER_SUFFIX}/test/ffdh3072.pem
-lib/python${PY_VER_SUFFIX}/test/final_a.py
-lib/python${PY_VER_SUFFIX}/test/final_a.pyc
-lib/python${PY_VER_SUFFIX}/test/final_a.pyo
-lib/python${PY_VER_SUFFIX}/test/final_b.py
-lib/python${PY_VER_SUFFIX}/test/final_b.pyc
-lib/python${PY_VER_SUFFIX}/test/final_b.pyo
 lib/python${PY_VER_SUFFIX}/test/floating_points.txt
 lib/python${PY_VER_SUFFIX}/test/fork_wait.py
 lib/python${PY_VER_SUFFIX}/test/fork_wait.pyc
 lib/python${PY_VER_SUFFIX}/test/fork_wait.pyo
 lib/python${PY_VER_SUFFIX}/test/formatfloat_testcases.txt
-lib/python${PY_VER_SUFFIX}/test/future_test1.py
-lib/python${PY_VER_SUFFIX}/test/future_test1.pyc
-lib/python${PY_VER_SUFFIX}/test/future_test1.pyo
-lib/python${PY_VER_SUFFIX}/test/future_test2.py
-lib/python${PY_VER_SUFFIX}/test/future_test2.pyc
-lib/python${PY_VER_SUFFIX}/test/future_test2.pyo
-lib/python${PY_VER_SUFFIX}/test/gdb_sample.py
-lib/python${PY_VER_SUFFIX}/test/gdb_sample.pyc
-lib/python${PY_VER_SUFFIX}/test/gdb_sample.pyo
-lib/python${PY_VER_SUFFIX}/test/idnsans.pem
 lib/python${PY_VER_SUFFIX}/test/ieee754.txt
 lib/python${PY_VER_SUFFIX}/test/imghdrdata/python-raw.jpg
 lib/python${PY_VER_SUFFIX}/test/imghdrdata/python.bmp
@@ -2654,30 +2606,6 @@ lib/python${PY_VER_SUFFIX}/test/imghdrda
 lib/python${PY_VER_SUFFIX}/test/imghdrdata/python.tiff
 lib/python${PY_VER_SUFFIX}/test/imghdrdata/python.webp
 lib/python${PY_VER_SUFFIX}/test/imghdrdata/python.xbm
-lib/python${PY_VER_SUFFIX}/test/imp_dummy.py
-lib/python${PY_VER_SUFFIX}/test/imp_dummy.pyc
-lib/python${PY_VER_SUFFIX}/test/imp_dummy.pyo
-lib/python${PY_VER_SUFFIX}/test/inspect_fodder.py
-lib/python${PY_VER_SUFFIX}/test/inspect_fodder.pyc
-lib/python${PY_VER_SUFFIX}/test/inspect_fodder.pyo
-lib/python${PY_VER_SUFFIX}/test/inspect_fodder2.py
-lib/python${PY_VER_SUFFIX}/test/inspect_fodder2.pyc
-lib/python${PY_VER_SUFFIX}/test/inspect_fodder2.pyo
-lib/python${PY_VER_SUFFIX}/test/inspect_stock_annotations.py
-lib/python${PY_VER_SUFFIX}/test/inspect_stock_annotations.pyc
-lib/python${PY_VER_SUFFIX}/test/inspect_stock_annotations.pyo
-lib/python${PY_VER_SUFFIX}/test/inspect_stringized_annotations.py
-lib/python${PY_VER_SUFFIX}/test/inspect_stringized_annotations.pyc
-lib/python${PY_VER_SUFFIX}/test/inspect_stringized_annotations.pyo
-lib/python${PY_VER_SUFFIX}/test/inspect_stringized_annotations_2.py
-lib/python${PY_VER_SUFFIX}/test/inspect_stringized_annotations_2.pyc
-lib/python${PY_VER_SUFFIX}/test/inspect_stringized_annotations_2.pyo
-lib/python${PY_VER_SUFFIX}/test/keycert.passwd.pem
-lib/python${PY_VER_SUFFIX}/test/keycert.pem
-lib/python${PY_VER_SUFFIX}/test/keycert2.pem
-lib/python${PY_VER_SUFFIX}/test/keycert3.pem
-lib/python${PY_VER_SUFFIX}/test/keycert4.pem
-lib/python${PY_VER_SUFFIX}/test/keycertecc.pem
 lib/python${PY_VER_SUFFIX}/test/leakers/README.txt
 lib/python${PY_VER_SUFFIX}/test/leakers/__init__.py
 lib/python${PY_VER_SUFFIX}/test/leakers/__init__.pyc
@@ -2695,33 +2623,58 @@ lib/python${PY_VER_SUFFIX}/test/libregrt
 lib/python${PY_VER_SUFFIX}/test/libregrtest/cmdline.py
 lib/python${PY_VER_SUFFIX}/test/libregrtest/cmdline.pyc
 lib/python${PY_VER_SUFFIX}/test/libregrtest/cmdline.pyo
+lib/python${PY_VER_SUFFIX}/test/libregrtest/filter.py
+lib/python${PY_VER_SUFFIX}/test/libregrtest/filter.pyc
+lib/python${PY_VER_SUFFIX}/test/libregrtest/filter.pyo
+lib/python${PY_VER_SUFFIX}/test/libregrtest/findtests.py
+lib/python${PY_VER_SUFFIX}/test/libregrtest/findtests.pyc
+lib/python${PY_VER_SUFFIX}/test/libregrtest/findtests.pyo
+lib/python${PY_VER_SUFFIX}/test/libregrtest/logger.py
+lib/python${PY_VER_SUFFIX}/test/libregrtest/logger.pyc
+lib/python${PY_VER_SUFFIX}/test/libregrtest/logger.pyo
 lib/python${PY_VER_SUFFIX}/test/libregrtest/main.py
 lib/python${PY_VER_SUFFIX}/test/libregrtest/main.pyc
 lib/python${PY_VER_SUFFIX}/test/libregrtest/main.pyo
+lib/python${PY_VER_SUFFIX}/test/libregrtest/mypy.ini
 lib/python${PY_VER_SUFFIX}/test/libregrtest/pgo.py
 lib/python${PY_VER_SUFFIX}/test/libregrtest/pgo.pyc
 lib/python${PY_VER_SUFFIX}/test/libregrtest/pgo.pyo
 lib/python${PY_VER_SUFFIX}/test/libregrtest/refleak.py
 lib/python${PY_VER_SUFFIX}/test/libregrtest/refleak.pyc
 lib/python${PY_VER_SUFFIX}/test/libregrtest/refleak.pyo
-lib/python${PY_VER_SUFFIX}/test/libregrtest/runtest.py
-lib/python${PY_VER_SUFFIX}/test/libregrtest/runtest.pyc
-lib/python${PY_VER_SUFFIX}/test/libregrtest/runtest.pyo
-lib/python${PY_VER_SUFFIX}/test/libregrtest/runtest_mp.py
-lib/python${PY_VER_SUFFIX}/test/libregrtest/runtest_mp.pyc
-lib/python${PY_VER_SUFFIX}/test/libregrtest/runtest_mp.pyo
+lib/python${PY_VER_SUFFIX}/test/libregrtest/result.py
+lib/python${PY_VER_SUFFIX}/test/libregrtest/result.pyc
+lib/python${PY_VER_SUFFIX}/test/libregrtest/result.pyo
+lib/python${PY_VER_SUFFIX}/test/libregrtest/results.py
+lib/python${PY_VER_SUFFIX}/test/libregrtest/results.pyc
+lib/python${PY_VER_SUFFIX}/test/libregrtest/results.pyo
+lib/python${PY_VER_SUFFIX}/test/libregrtest/run_workers.py
+lib/python${PY_VER_SUFFIX}/test/libregrtest/run_workers.pyc
+lib/python${PY_VER_SUFFIX}/test/libregrtest/run_workers.pyo
+lib/python${PY_VER_SUFFIX}/test/libregrtest/runtests.py
+lib/python${PY_VER_SUFFIX}/test/libregrtest/runtests.pyc
+lib/python${PY_VER_SUFFIX}/test/libregrtest/runtests.pyo
 lib/python${PY_VER_SUFFIX}/test/libregrtest/save_env.py
 lib/python${PY_VER_SUFFIX}/test/libregrtest/save_env.pyc
 lib/python${PY_VER_SUFFIX}/test/libregrtest/save_env.pyo
 lib/python${PY_VER_SUFFIX}/test/libregrtest/setup.py
 lib/python${PY_VER_SUFFIX}/test/libregrtest/setup.pyc
 lib/python${PY_VER_SUFFIX}/test/libregrtest/setup.pyo
+lib/python${PY_VER_SUFFIX}/test/libregrtest/single.py
+lib/python${PY_VER_SUFFIX}/test/libregrtest/single.pyc
+lib/python${PY_VER_SUFFIX}/test/libregrtest/single.pyo
+lib/python${PY_VER_SUFFIX}/test/libregrtest/testresult.py
+lib/python${PY_VER_SUFFIX}/test/libregrtest/testresult.pyc
+lib/python${PY_VER_SUFFIX}/test/libregrtest/testresult.pyo
 lib/python${PY_VER_SUFFIX}/test/libregrtest/utils.py
 lib/python${PY_VER_SUFFIX}/test/libregrtest/utils.pyc
 lib/python${PY_VER_SUFFIX}/test/libregrtest/utils.pyo
 lib/python${PY_VER_SUFFIX}/test/libregrtest/win_utils.py
 lib/python${PY_VER_SUFFIX}/test/libregrtest/win_utils.pyc
 lib/python${PY_VER_SUFFIX}/test/libregrtest/win_utils.pyo
+lib/python${PY_VER_SUFFIX}/test/libregrtest/worker.py
+lib/python${PY_VER_SUFFIX}/test/libregrtest/worker.pyc
+lib/python${PY_VER_SUFFIX}/test/libregrtest/worker.pyo
 lib/python${PY_VER_SUFFIX}/test/list_tests.py
 lib/python${PY_VER_SUFFIX}/test/list_tests.pyc
 lib/python${PY_VER_SUFFIX}/test/list_tests.pyo
@@ -2729,9 +2682,6 @@ lib/python${PY_VER_SUFFIX}/test/lock_tes
 lib/python${PY_VER_SUFFIX}/test/lock_tests.pyc
 lib/python${PY_VER_SUFFIX}/test/lock_tests.pyo
 lib/python${PY_VER_SUFFIX}/test/mailcap.txt
-lib/python${PY_VER_SUFFIX}/test/make_ssl_certs.py
-lib/python${PY_VER_SUFFIX}/test/make_ssl_certs.pyc
-lib/python${PY_VER_SUFFIX}/test/make_ssl_certs.pyo
 lib/python${PY_VER_SUFFIX}/test/mapping_tests.py
 lib/python${PY_VER_SUFFIX}/test/mapping_tests.pyc
 lib/python${PY_VER_SUFFIX}/test/mapping_tests.pyo
@@ -2743,9 +2693,6 @@ lib/python${PY_VER_SUFFIX}/test/mime.typ
 lib/python${PY_VER_SUFFIX}/test/mock_socket.py
 lib/python${PY_VER_SUFFIX}/test/mock_socket.pyc
 lib/python${PY_VER_SUFFIX}/test/mock_socket.pyo
-lib/python${PY_VER_SUFFIX}/test/mod_generics_cache.py
-lib/python${PY_VER_SUFFIX}/test/mod_generics_cache.pyc
-lib/python${PY_VER_SUFFIX}/test/mod_generics_cache.pyo
 lib/python${PY_VER_SUFFIX}/test/mp_fork_bomb.py
 lib/python${PY_VER_SUFFIX}/test/mp_fork_bomb.pyc
 lib/python${PY_VER_SUFFIX}/test/mp_fork_bomb.pyo
@@ -2755,10 +2702,6 @@ lib/python${PY_VER_SUFFIX}/test/mp_prelo
 lib/python${PY_VER_SUFFIX}/test/multibytecodec_support.py
 lib/python${PY_VER_SUFFIX}/test/multibytecodec_support.pyc
 lib/python${PY_VER_SUFFIX}/test/multibytecodec_support.pyo
-lib/python${PY_VER_SUFFIX}/test/nokia.pem
-lib/python${PY_VER_SUFFIX}/test/nosan.pem
-lib/python${PY_VER_SUFFIX}/test/nullbytecert.pem
-lib/python${PY_VER_SUFFIX}/test/nullcert.pem
 lib/python${PY_VER_SUFFIX}/test/pickletester.py
 lib/python${PY_VER_SUFFIX}/test/pickletester.pyc
 lib/python${PY_VER_SUFFIX}/test/pickletester.pyo
@@ -2766,8 +2709,6 @@ lib/python${PY_VER_SUFFIX}/test/profilee
 lib/python${PY_VER_SUFFIX}/test/profilee.pyc
 lib/python${PY_VER_SUFFIX}/test/profilee.pyo
 lib/python${PY_VER_SUFFIX}/test/pstats.pck
-lib/python${PY_VER_SUFFIX}/test/pycacert.pem
-lib/python${PY_VER_SUFFIX}/test/pycakey.pem
 lib/python${PY_VER_SUFFIX}/test/pyclbr_input.py
 lib/python${PY_VER_SUFFIX}/test/pyclbr_input.pyc
 lib/python${PY_VER_SUFFIX}/test/pyclbr_input.pyo
@@ -2790,13 +2731,24 @@ lib/python${PY_VER_SUFFIX}/test/recursio
 lib/python${PY_VER_SUFFIX}/test/regrtest.py
 lib/python${PY_VER_SUFFIX}/test/regrtest.pyc
 lib/python${PY_VER_SUFFIX}/test/regrtest.pyo
+lib/python${PY_VER_SUFFIX}/test/regrtestdata/import_from_tests/test_regrtest_a.py
+lib/python${PY_VER_SUFFIX}/test/regrtestdata/import_from_tests/test_regrtest_a.pyc
+lib/python${PY_VER_SUFFIX}/test/regrtestdata/import_from_tests/test_regrtest_a.pyo
+lib/python${PY_VER_SUFFIX}/test/regrtestdata/import_from_tests/test_regrtest_b/__init__.py
+lib/python${PY_VER_SUFFIX}/test/regrtestdata/import_from_tests/test_regrtest_b/__init__.pyc
+lib/python${PY_VER_SUFFIX}/test/regrtestdata/import_from_tests/test_regrtest_b/__init__.pyo
+lib/python${PY_VER_SUFFIX}/test/regrtestdata/import_from_tests/test_regrtest_b/util.py
+lib/python${PY_VER_SUFFIX}/test/regrtestdata/import_from_tests/test_regrtest_b/util.pyc
+lib/python${PY_VER_SUFFIX}/test/regrtestdata/import_from_tests/test_regrtest_b/util.pyo
+lib/python${PY_VER_SUFFIX}/test/regrtestdata/import_from_tests/test_regrtest_c.py
+lib/python${PY_VER_SUFFIX}/test/regrtestdata/import_from_tests/test_regrtest_c.pyc
+lib/python${PY_VER_SUFFIX}/test/regrtestdata/import_from_tests/test_regrtest_c.pyo
 lib/python${PY_VER_SUFFIX}/test/relimport.py
 lib/python${PY_VER_SUFFIX}/test/relimport.pyc
 lib/python${PY_VER_SUFFIX}/test/relimport.pyo
 lib/python${PY_VER_SUFFIX}/test/reperf.py
 lib/python${PY_VER_SUFFIX}/test/reperf.pyc
 lib/python${PY_VER_SUFFIX}/test/reperf.pyo
-lib/python${PY_VER_SUFFIX}/test/revocation.crl
 lib/python${PY_VER_SUFFIX}/test/sample_doctest.py
 lib/python${PY_VER_SUFFIX}/test/sample_doctest.pyc
 lib/python${PY_VER_SUFFIX}/test/sample_doctest.pyo
@@ -2806,13 +2758,10 @@ lib/python${PY_VER_SUFFIX}/test/sample_d
 lib/python${PY_VER_SUFFIX}/test/sample_doctest_no_doctests.py
 lib/python${PY_VER_SUFFIX}/test/sample_doctest_no_doctests.pyc
 lib/python${PY_VER_SUFFIX}/test/sample_doctest_no_doctests.pyo
-lib/python${PY_VER_SUFFIX}/test/secp384r1.pem
-lib/python${PY_VER_SUFFIX}/test/selfsigned_pythontestdotnet.pem
 lib/python${PY_VER_SUFFIX}/test/seq_tests.py
 lib/python${PY_VER_SUFFIX}/test/seq_tests.pyc
 lib/python${PY_VER_SUFFIX}/test/seq_tests.pyo
 lib/python${PY_VER_SUFFIX}/test/setuptools-67.6.1-py3-none-any.whl
-lib/python${PY_VER_SUFFIX}/test/sgml_input.html
 lib/python${PY_VER_SUFFIX}/test/shadowed_super.py
 lib/python${PY_VER_SUFFIX}/test/shadowed_super.pyc
 lib/python${PY_VER_SUFFIX}/test/shadowed_super.pyo
@@ -2834,9 +2783,6 @@ lib/python${PY_VER_SUFFIX}/test/sndhdrda
 lib/python${PY_VER_SUFFIX}/test/sortperf.py
 lib/python${PY_VER_SUFFIX}/test/sortperf.pyc
 lib/python${PY_VER_SUFFIX}/test/sortperf.pyo
-lib/python${PY_VER_SUFFIX}/test/ssl_cert.pem
-lib/python${PY_VER_SUFFIX}/test/ssl_key.passwd.pem
-lib/python${PY_VER_SUFFIX}/test/ssl_key.pem
 lib/python${PY_VER_SUFFIX}/test/ssl_servers.py
 lib/python${PY_VER_SUFFIX}/test/ssl_servers.pyc
 lib/python${PY_VER_SUFFIX}/test/ssl_servers.pyo
@@ -2903,6 +2849,9 @@ lib/python${PY_VER_SUFFIX}/test/support/
 lib/python${PY_VER_SUFFIX}/test/support/os_helper.py
 lib/python${PY_VER_SUFFIX}/test/support/os_helper.pyc
 lib/python${PY_VER_SUFFIX}/test/support/os_helper.pyo
+lib/python${PY_VER_SUFFIX}/test/support/pty_helper.py
+lib/python${PY_VER_SUFFIX}/test/support/pty_helper.pyc
+lib/python${PY_VER_SUFFIX}/test/support/pty_helper.pyo
 lib/python${PY_VER_SUFFIX}/test/support/script_helper.py
 lib/python${PY_VER_SUFFIX}/test/support/script_helper.pyc
 lib/python${PY_VER_SUFFIX}/test/support/script_helper.pyo
@@ -2912,22 +2861,15 @@ lib/python${PY_VER_SUFFIX}/test/support/
 lib/python${PY_VER_SUFFIX}/test/support/testcase.py
 lib/python${PY_VER_SUFFIX}/test/support/testcase.pyc
 lib/python${PY_VER_SUFFIX}/test/support/testcase.pyo
-lib/python${PY_VER_SUFFIX}/test/support/testresult.py
-lib/python${PY_VER_SUFFIX}/test/support/testresult.pyc
-lib/python${PY_VER_SUFFIX}/test/support/testresult.pyo
 lib/python${PY_VER_SUFFIX}/test/support/threading_helper.py
 lib/python${PY_VER_SUFFIX}/test/support/threading_helper.pyc
 lib/python${PY_VER_SUFFIX}/test/support/threading_helper.pyo
 lib/python${PY_VER_SUFFIX}/test/support/warnings_helper.py
 lib/python${PY_VER_SUFFIX}/test/support/warnings_helper.pyc
 lib/python${PY_VER_SUFFIX}/test/support/warnings_helper.pyo
-lib/python${PY_VER_SUFFIX}/test/talos-2019-0758.pem
 lib/python${PY_VER_SUFFIX}/test/test___all__.py
 lib/python${PY_VER_SUFFIX}/test/test___all__.pyc
 lib/python${PY_VER_SUFFIX}/test/test___all__.pyo
-lib/python${PY_VER_SUFFIX}/test/test___future__.py
-lib/python${PY_VER_SUFFIX}/test/test___future__.pyc
-lib/python${PY_VER_SUFFIX}/test/test___future__.pyo
 lib/python${PY_VER_SUFFIX}/test/test__locale.py
 lib/python${PY_VER_SUFFIX}/test/test__locale.pyc
 lib/python${PY_VER_SUFFIX}/test/test__locale.pyo
@@ -3153,9 +3095,18 @@ lib/python${PY_VER_SUFFIX}/test/test_cap
 lib/python${PY_VER_SUFFIX}/test/test_capi/test_abstract.py
 lib/python${PY_VER_SUFFIX}/test/test_capi/test_abstract.pyc
 lib/python${PY_VER_SUFFIX}/test/test_capi/test_abstract.pyo
+lib/python${PY_VER_SUFFIX}/test/test_capi/test_bytearray.py
+lib/python${PY_VER_SUFFIX}/test/test_capi/test_bytearray.pyc
+lib/python${PY_VER_SUFFIX}/test/test_capi/test_bytearray.pyo
+lib/python${PY_VER_SUFFIX}/test/test_capi/test_bytes.py
+lib/python${PY_VER_SUFFIX}/test/test_capi/test_bytes.pyc
+lib/python${PY_VER_SUFFIX}/test/test_capi/test_bytes.pyo
 lib/python${PY_VER_SUFFIX}/test/test_capi/test_codecs.py
 lib/python${PY_VER_SUFFIX}/test/test_capi/test_codecs.pyc
 lib/python${PY_VER_SUFFIX}/test/test_capi/test_codecs.pyo
+lib/python${PY_VER_SUFFIX}/test/test_capi/test_complex.py
+lib/python${PY_VER_SUFFIX}/test/test_capi/test_complex.pyc
+lib/python${PY_VER_SUFFIX}/test/test_capi/test_complex.pyo
 lib/python${PY_VER_SUFFIX}/test/test_capi/test_dict.py
 lib/python${PY_VER_SUFFIX}/test/test_capi/test_dict.pyc
 lib/python${PY_VER_SUFFIX}/test/test_capi/test_dict.pyo
@@ -3165,12 +3116,18 @@ lib/python${PY_VER_SUFFIX}/test/test_cap
 lib/python${PY_VER_SUFFIX}/test/test_capi/test_exceptions.py
 lib/python${PY_VER_SUFFIX}/test/test_capi/test_exceptions.pyc
 lib/python${PY_VER_SUFFIX}/test/test_capi/test_exceptions.pyo
+lib/python${PY_VER_SUFFIX}/test/test_capi/test_float.py
+lib/python${PY_VER_SUFFIX}/test/test_capi/test_float.pyc
+lib/python${PY_VER_SUFFIX}/test/test_capi/test_float.pyo
 lib/python${PY_VER_SUFFIX}/test/test_capi/test_getargs.py
 lib/python${PY_VER_SUFFIX}/test/test_capi/test_getargs.pyc
 lib/python${PY_VER_SUFFIX}/test/test_capi/test_getargs.pyo
 lib/python${PY_VER_SUFFIX}/test/test_capi/test_immortal.py
 lib/python${PY_VER_SUFFIX}/test/test_capi/test_immortal.pyc
 lib/python${PY_VER_SUFFIX}/test/test_capi/test_immortal.pyo
+lib/python${PY_VER_SUFFIX}/test/test_capi/test_list.py
+lib/python${PY_VER_SUFFIX}/test/test_capi/test_list.pyc
+lib/python${PY_VER_SUFFIX}/test/test_capi/test_list.pyo
 lib/python${PY_VER_SUFFIX}/test/test_capi/test_long.py
 lib/python${PY_VER_SUFFIX}/test/test_capi/test_long.pyc
 lib/python${PY_VER_SUFFIX}/test/test_capi/test_long.pyo
@@ -3180,9 +3137,15 @@ lib/python${PY_VER_SUFFIX}/test/test_cap
 lib/python${PY_VER_SUFFIX}/test/test_capi/test_misc.py
 lib/python${PY_VER_SUFFIX}/test/test_capi/test_misc.pyc
 lib/python${PY_VER_SUFFIX}/test/test_capi/test_misc.pyo
+lib/python${PY_VER_SUFFIX}/test/test_capi/test_set.py
+lib/python${PY_VER_SUFFIX}/test/test_capi/test_set.pyc
+lib/python${PY_VER_SUFFIX}/test/test_capi/test_set.pyo
 lib/python${PY_VER_SUFFIX}/test/test_capi/test_structmembers.py
 lib/python${PY_VER_SUFFIX}/test/test_capi/test_structmembers.pyc
 lib/python${PY_VER_SUFFIX}/test/test_capi/test_structmembers.pyo
+lib/python${PY_VER_SUFFIX}/test/test_capi/test_sys.py
+lib/python${PY_VER_SUFFIX}/test/test_capi/test_sys.pyc
+lib/python${PY_VER_SUFFIX}/test/test_capi/test_sys.pyo
 lib/python${PY_VER_SUFFIX}/test/test_capi/test_unicode.py
 lib/python${PY_VER_SUFFIX}/test/test_capi/test_unicode.pyc
 lib/python${PY_VER_SUFFIX}/test/test_capi/test_unicode.pyo
@@ -3493,9 +3456,24 @@ lib/python${PY_VER_SUFFIX}/test/test_cty
 lib/python${PY_VER_SUFFIX}/test/test_curses.py
 lib/python${PY_VER_SUFFIX}/test/test_curses.pyc
 lib/python${PY_VER_SUFFIX}/test/test_curses.pyo
-lib/python${PY_VER_SUFFIX}/test/test_dataclasses.py
-lib/python${PY_VER_SUFFIX}/test/test_dataclasses.pyc
-lib/python${PY_VER_SUFFIX}/test/test_dataclasses.pyo
+lib/python${PY_VER_SUFFIX}/test/test_dataclasses/__init__.py
+lib/python${PY_VER_SUFFIX}/test/test_dataclasses/__init__.pyc
+lib/python${PY_VER_SUFFIX}/test/test_dataclasses/__init__.pyo
+lib/python${PY_VER_SUFFIX}/test/test_dataclasses/dataclass_module_1.py
+lib/python${PY_VER_SUFFIX}/test/test_dataclasses/dataclass_module_1.pyc
+lib/python${PY_VER_SUFFIX}/test/test_dataclasses/dataclass_module_1.pyo
+lib/python${PY_VER_SUFFIX}/test/test_dataclasses/dataclass_module_1_str.py
+lib/python${PY_VER_SUFFIX}/test/test_dataclasses/dataclass_module_1_str.pyc
+lib/python${PY_VER_SUFFIX}/test/test_dataclasses/dataclass_module_1_str.pyo
+lib/python${PY_VER_SUFFIX}/test/test_dataclasses/dataclass_module_2.py
+lib/python${PY_VER_SUFFIX}/test/test_dataclasses/dataclass_module_2.pyc
+lib/python${PY_VER_SUFFIX}/test/test_dataclasses/dataclass_module_2.pyo
+lib/python${PY_VER_SUFFIX}/test/test_dataclasses/dataclass_module_2_str.py
+lib/python${PY_VER_SUFFIX}/test/test_dataclasses/dataclass_module_2_str.pyc
+lib/python${PY_VER_SUFFIX}/test/test_dataclasses/dataclass_module_2_str.pyo
+lib/python${PY_VER_SUFFIX}/test/test_dataclasses/dataclass_textanno.py
+lib/python${PY_VER_SUFFIX}/test/test_dataclasses/dataclass_textanno.pyc
+lib/python${PY_VER_SUFFIX}/test/test_dataclasses/dataclass_textanno.pyo
 lib/python${PY_VER_SUFFIX}/test/test_datetime.py
 lib/python${PY_VER_SUFFIX}/test/test_datetime.pyc
 lib/python${PY_VER_SUFFIX}/test/test_datetime.pyo
@@ -3794,24 +3772,65 @@ lib/python${PY_VER_SUFFIX}/test/test_fun
 lib/python${PY_VER_SUFFIX}/test/test_functools.py
 lib/python${PY_VER_SUFFIX}/test/test_functools.pyc
 lib/python${PY_VER_SUFFIX}/test/test_functools.pyo
-lib/python${PY_VER_SUFFIX}/test/test_future.py
-lib/python${PY_VER_SUFFIX}/test/test_future.pyc
-lib/python${PY_VER_SUFFIX}/test/test_future.pyo
-lib/python${PY_VER_SUFFIX}/test/test_future3.py
-lib/python${PY_VER_SUFFIX}/test/test_future3.pyc
-lib/python${PY_VER_SUFFIX}/test/test_future3.pyo
-lib/python${PY_VER_SUFFIX}/test/test_future4.py
-lib/python${PY_VER_SUFFIX}/test/test_future4.pyc
-lib/python${PY_VER_SUFFIX}/test/test_future4.pyo
-lib/python${PY_VER_SUFFIX}/test/test_future5.py
-lib/python${PY_VER_SUFFIX}/test/test_future5.pyc
-lib/python${PY_VER_SUFFIX}/test/test_future5.pyo
+lib/python${PY_VER_SUFFIX}/test/test_future_stmt/__init__.py
+lib/python${PY_VER_SUFFIX}/test/test_future_stmt/__init__.pyc
+lib/python${PY_VER_SUFFIX}/test/test_future_stmt/__init__.pyo
+lib/python${PY_VER_SUFFIX}/test/test_future_stmt/badsyntax_future10.py
+lib/python${PY_VER_SUFFIX}/test/test_future_stmt/badsyntax_future3.py
+lib/python${PY_VER_SUFFIX}/test/test_future_stmt/badsyntax_future4.py
+lib/python${PY_VER_SUFFIX}/test/test_future_stmt/badsyntax_future5.py
+lib/python${PY_VER_SUFFIX}/test/test_future_stmt/badsyntax_future6.py
+lib/python${PY_VER_SUFFIX}/test/test_future_stmt/badsyntax_future7.py
+lib/python${PY_VER_SUFFIX}/test/test_future_stmt/badsyntax_future8.py
+lib/python${PY_VER_SUFFIX}/test/test_future_stmt/badsyntax_future9.py
+lib/python${PY_VER_SUFFIX}/test/test_future_stmt/future_test1.py
+lib/python${PY_VER_SUFFIX}/test/test_future_stmt/future_test1.pyc
+lib/python${PY_VER_SUFFIX}/test/test_future_stmt/future_test1.pyo
+lib/python${PY_VER_SUFFIX}/test/test_future_stmt/future_test2.py
+lib/python${PY_VER_SUFFIX}/test/test_future_stmt/future_test2.pyc
+lib/python${PY_VER_SUFFIX}/test/test_future_stmt/future_test2.pyo
+lib/python${PY_VER_SUFFIX}/test/test_future_stmt/test_future.py
+lib/python${PY_VER_SUFFIX}/test/test_future_stmt/test_future.pyc
+lib/python${PY_VER_SUFFIX}/test/test_future_stmt/test_future.pyo
+lib/python${PY_VER_SUFFIX}/test/test_future_stmt/test_future_flags.py
+lib/python${PY_VER_SUFFIX}/test/test_future_stmt/test_future_flags.pyc
+lib/python${PY_VER_SUFFIX}/test/test_future_stmt/test_future_flags.pyo
+lib/python${PY_VER_SUFFIX}/test/test_future_stmt/test_future_multiple_features.py
+lib/python${PY_VER_SUFFIX}/test/test_future_stmt/test_future_multiple_features.pyc
+lib/python${PY_VER_SUFFIX}/test/test_future_stmt/test_future_multiple_features.pyo
+lib/python${PY_VER_SUFFIX}/test/test_future_stmt/test_future_multiple_imports.py
+lib/python${PY_VER_SUFFIX}/test/test_future_stmt/test_future_multiple_imports.pyc
+lib/python${PY_VER_SUFFIX}/test/test_future_stmt/test_future_multiple_imports.pyo
+lib/python${PY_VER_SUFFIX}/test/test_future_stmt/test_future_single_import.py
+lib/python${PY_VER_SUFFIX}/test/test_future_stmt/test_future_single_import.pyc
+lib/python${PY_VER_SUFFIX}/test/test_future_stmt/test_future_single_import.pyo
 lib/python${PY_VER_SUFFIX}/test/test_gc.py
 lib/python${PY_VER_SUFFIX}/test/test_gc.pyc
 lib/python${PY_VER_SUFFIX}/test/test_gc.pyo
-lib/python${PY_VER_SUFFIX}/test/test_gdb.py
-lib/python${PY_VER_SUFFIX}/test/test_gdb.pyc
-lib/python${PY_VER_SUFFIX}/test/test_gdb.pyo
+lib/python${PY_VER_SUFFIX}/test/test_gdb/__init__.py
+lib/python${PY_VER_SUFFIX}/test/test_gdb/__init__.pyc
+lib/python${PY_VER_SUFFIX}/test/test_gdb/__init__.pyo
+lib/python${PY_VER_SUFFIX}/test/test_gdb/gdb_sample.py
+lib/python${PY_VER_SUFFIX}/test/test_gdb/gdb_sample.pyc
+lib/python${PY_VER_SUFFIX}/test/test_gdb/gdb_sample.pyo
+lib/python${PY_VER_SUFFIX}/test/test_gdb/test_backtrace.py
+lib/python${PY_VER_SUFFIX}/test/test_gdb/test_backtrace.pyc
+lib/python${PY_VER_SUFFIX}/test/test_gdb/test_backtrace.pyo
+lib/python${PY_VER_SUFFIX}/test/test_gdb/test_cfunction.py
+lib/python${PY_VER_SUFFIX}/test/test_gdb/test_cfunction.pyc
+lib/python${PY_VER_SUFFIX}/test/test_gdb/test_cfunction.pyo
+lib/python${PY_VER_SUFFIX}/test/test_gdb/test_cfunction_full.py
+lib/python${PY_VER_SUFFIX}/test/test_gdb/test_cfunction_full.pyc
+lib/python${PY_VER_SUFFIX}/test/test_gdb/test_cfunction_full.pyo
+lib/python${PY_VER_SUFFIX}/test/test_gdb/test_misc.py
+lib/python${PY_VER_SUFFIX}/test/test_gdb/test_misc.pyc
+lib/python${PY_VER_SUFFIX}/test/test_gdb/test_misc.pyo
+lib/python${PY_VER_SUFFIX}/test/test_gdb/test_pretty_print.py
+lib/python${PY_VER_SUFFIX}/test/test_gdb/test_pretty_print.pyc
+lib/python${PY_VER_SUFFIX}/test/test_gdb/test_pretty_print.pyo
+lib/python${PY_VER_SUFFIX}/test/test_gdb/util.py
+lib/python${PY_VER_SUFFIX}/test/test_gdb/util.pyc
+lib/python${PY_VER_SUFFIX}/test/test_gdb/util.pyo
 lib/python${PY_VER_SUFFIX}/test/test_generator_stop.py
 lib/python${PY_VER_SUFFIX}/test/test_generator_stop.pyc
 lib/python${PY_VER_SUFFIX}/test/test_generator_stop.pyo
@@ -4273,9 +4292,27 @@ lib/python${PY_VER_SUFFIX}/test/test_imp
 lib/python${PY_VER_SUFFIX}/test/test_index.py
 lib/python${PY_VER_SUFFIX}/test/test_index.pyc
 lib/python${PY_VER_SUFFIX}/test/test_index.pyo
-lib/python${PY_VER_SUFFIX}/test/test_inspect.py
-lib/python${PY_VER_SUFFIX}/test/test_inspect.pyc
-lib/python${PY_VER_SUFFIX}/test/test_inspect.pyo
+lib/python${PY_VER_SUFFIX}/test/test_inspect/__init__.py
+lib/python${PY_VER_SUFFIX}/test/test_inspect/__init__.pyc
+lib/python${PY_VER_SUFFIX}/test/test_inspect/__init__.pyo
+lib/python${PY_VER_SUFFIX}/test/test_inspect/inspect_fodder.py
+lib/python${PY_VER_SUFFIX}/test/test_inspect/inspect_fodder.pyc
+lib/python${PY_VER_SUFFIX}/test/test_inspect/inspect_fodder.pyo
+lib/python${PY_VER_SUFFIX}/test/test_inspect/inspect_fodder2.py
+lib/python${PY_VER_SUFFIX}/test/test_inspect/inspect_fodder2.pyc
+lib/python${PY_VER_SUFFIX}/test/test_inspect/inspect_fodder2.pyo
+lib/python${PY_VER_SUFFIX}/test/test_inspect/inspect_stock_annotations.py
+lib/python${PY_VER_SUFFIX}/test/test_inspect/inspect_stock_annotations.pyc
+lib/python${PY_VER_SUFFIX}/test/test_inspect/inspect_stock_annotations.pyo
+lib/python${PY_VER_SUFFIX}/test/test_inspect/inspect_stringized_annotations.py
+lib/python${PY_VER_SUFFIX}/test/test_inspect/inspect_stringized_annotations.pyc
+lib/python${PY_VER_SUFFIX}/test/test_inspect/inspect_stringized_annotations.pyo
+lib/python${PY_VER_SUFFIX}/test/test_inspect/inspect_stringized_annotations_2.py
+lib/python${PY_VER_SUFFIX}/test/test_inspect/inspect_stringized_annotations_2.pyc
+lib/python${PY_VER_SUFFIX}/test/test_inspect/inspect_stringized_annotations_2.pyo
+lib/python${PY_VER_SUFFIX}/test/test_inspect/test_inspect.py
+lib/python${PY_VER_SUFFIX}/test/test_inspect/test_inspect.pyc
+lib/python${PY_VER_SUFFIX}/test/test_inspect/test_inspect.pyo
 lib/python${PY_VER_SUFFIX}/test/test_int.py
 lib/python${PY_VER_SUFFIX}/test/test_int.pyc
 lib/python${PY_VER_SUFFIX}/test/test_int.pyo
@@ -4500,6 +4537,12 @@ lib/python${PY_VER_SUFFIX}/test/test_mod
 lib/python${PY_VER_SUFFIX}/test/test_module/bad_getattr3.py
 lib/python${PY_VER_SUFFIX}/test/test_module/bad_getattr3.pyc
 lib/python${PY_VER_SUFFIX}/test/test_module/bad_getattr3.pyo
+lib/python${PY_VER_SUFFIX}/test/test_module/final_a.py
+lib/python${PY_VER_SUFFIX}/test/test_module/final_a.pyc
+lib/python${PY_VER_SUFFIX}/test/test_module/final_a.pyo
+lib/python${PY_VER_SUFFIX}/test/test_module/final_b.py
+lib/python${PY_VER_SUFFIX}/test/test_module/final_b.pyc
+lib/python${PY_VER_SUFFIX}/test/test_module/final_b.pyo
 lib/python${PY_VER_SUFFIX}/test/test_module/good_getattr.py
 lib/python${PY_VER_SUFFIX}/test/test_module/good_getattr.pyc
 lib/python${PY_VER_SUFFIX}/test/test_module/good_getattr.pyo
@@ -4926,6 +4969,9 @@ lib/python${PY_VER_SUFFIX}/test/test_tel
 lib/python${PY_VER_SUFFIX}/test/test_tempfile.py
 lib/python${PY_VER_SUFFIX}/test/test_tempfile.pyc
 lib/python${PY_VER_SUFFIX}/test/test_tempfile.pyo
+lib/python${PY_VER_SUFFIX}/test/test_termios.py
+lib/python${PY_VER_SUFFIX}/test/test_termios.pyc
+lib/python${PY_VER_SUFFIX}/test/test_termios.pyo
 lib/python${PY_VER_SUFFIX}/test/test_textwrap.py
 lib/python${PY_VER_SUFFIX}/test/test_textwrap.pyc
 lib/python${PY_VER_SUFFIX}/test/test_textwrap.pyo
@@ -5142,6 +5188,9 @@ lib/python${PY_VER_SUFFIX}/test/test_ttk
 lib/python${PY_VER_SUFFIX}/test/test_ttk_textonly.py
 lib/python${PY_VER_SUFFIX}/test/test_ttk_textonly.pyc
 lib/python${PY_VER_SUFFIX}/test/test_ttk_textonly.pyo
+lib/python${PY_VER_SUFFIX}/test/test_tty.py
+lib/python${PY_VER_SUFFIX}/test/test_tty.pyc
+lib/python${PY_VER_SUFFIX}/test/test_tty.pyo
 lib/python${PY_VER_SUFFIX}/test/test_tuple.py
 lib/python${PY_VER_SUFFIX}/test/test_tuple.pyc
 lib/python${PY_VER_SUFFIX}/test/test_tuple.pyo
@@ -5496,11 +5545,20 @@ lib/python${PY_VER_SUFFIX}/test/tf_inher
 lib/python${PY_VER_SUFFIX}/test/time_hashlib.py
 lib/python${PY_VER_SUFFIX}/test/time_hashlib.pyc
 lib/python${PY_VER_SUFFIX}/test/time_hashlib.pyo
-lib/python${PY_VER_SUFFIX}/test/tokenize_tests-latin1-coding-cookie-and-utf8-bom-sig.txt
-lib/python${PY_VER_SUFFIX}/test/tokenize_tests-no-coding-cookie-and-utf8-bom-sig-only.txt
-lib/python${PY_VER_SUFFIX}/test/tokenize_tests-utf8-coding-cookie-and-no-utf8-bom-sig.txt
-lib/python${PY_VER_SUFFIX}/test/tokenize_tests-utf8-coding-cookie-and-utf8-bom-sig.txt
-lib/python${PY_VER_SUFFIX}/test/tokenize_tests.txt
+lib/python${PY_VER_SUFFIX}/test/tokenizedata/__init__.py
+lib/python${PY_VER_SUFFIX}/test/tokenizedata/__init__.pyc
+lib/python${PY_VER_SUFFIX}/test/tokenizedata/__init__.pyo
+lib/python${PY_VER_SUFFIX}/test/tokenizedata/bad_coding.py
+lib/python${PY_VER_SUFFIX}/test/tokenizedata/bad_coding2.py
+lib/python${PY_VER_SUFFIX}/test/tokenizedata/badsyntax_3131.py
+lib/python${PY_VER_SUFFIX}/test/tokenizedata/coding20731.py
+lib/python${PY_VER_SUFFIX}/test/tokenizedata/coding20731.pyc
+lib/python${PY_VER_SUFFIX}/test/tokenizedata/coding20731.pyo
+lib/python${PY_VER_SUFFIX}/test/tokenizedata/tokenize_tests-latin1-coding-cookie-and-utf8-bom-sig.txt
+lib/python${PY_VER_SUFFIX}/test/tokenizedata/tokenize_tests-no-coding-cookie-and-utf8-bom-sig-only.txt
+lib/python${PY_VER_SUFFIX}/test/tokenizedata/tokenize_tests-utf8-coding-cookie-and-no-utf8-bom-sig.txt
+lib/python${PY_VER_SUFFIX}/test/tokenizedata/tokenize_tests-utf8-coding-cookie-and-utf8-bom-sig.txt
+lib/python${PY_VER_SUFFIX}/test/tokenizedata/tokenize_tests.txt
 lib/python${PY_VER_SUFFIX}/test/tracedmodules/__init__.py
 lib/python${PY_VER_SUFFIX}/test/tracedmodules/__init__.pyc
 lib/python${PY_VER_SUFFIX}/test/tracedmodules/__init__.pyo
@@ -5510,9 +5568,39 @@ lib/python${PY_VER_SUFFIX}/test/tracedmo
 lib/python${PY_VER_SUFFIX}/test/typinganndata/__init__.py
 lib/python${PY_VER_SUFFIX}/test/typinganndata/__init__.pyc
 lib/python${PY_VER_SUFFIX}/test/typinganndata/__init__.pyo
+lib/python${PY_VER_SUFFIX}/test/typinganndata/_typed_dict_helper.py
+lib/python${PY_VER_SUFFIX}/test/typinganndata/_typed_dict_helper.pyc
+lib/python${PY_VER_SUFFIX}/test/typinganndata/_typed_dict_helper.pyo
+lib/python${PY_VER_SUFFIX}/test/typinganndata/ann_module.py
+lib/python${PY_VER_SUFFIX}/test/typinganndata/ann_module.pyc
+lib/python${PY_VER_SUFFIX}/test/typinganndata/ann_module.pyo
+lib/python${PY_VER_SUFFIX}/test/typinganndata/ann_module2.py
+lib/python${PY_VER_SUFFIX}/test/typinganndata/ann_module2.pyc
+lib/python${PY_VER_SUFFIX}/test/typinganndata/ann_module2.pyo
+lib/python${PY_VER_SUFFIX}/test/typinganndata/ann_module3.py
+lib/python${PY_VER_SUFFIX}/test/typinganndata/ann_module3.pyc
+lib/python${PY_VER_SUFFIX}/test/typinganndata/ann_module3.pyo
+lib/python${PY_VER_SUFFIX}/test/typinganndata/ann_module4.py
+lib/python${PY_VER_SUFFIX}/test/typinganndata/ann_module4.pyc
+lib/python${PY_VER_SUFFIX}/test/typinganndata/ann_module4.pyo
+lib/python${PY_VER_SUFFIX}/test/typinganndata/ann_module5.py
+lib/python${PY_VER_SUFFIX}/test/typinganndata/ann_module5.pyc
+lib/python${PY_VER_SUFFIX}/test/typinganndata/ann_module5.pyo
+lib/python${PY_VER_SUFFIX}/test/typinganndata/ann_module6.py
+lib/python${PY_VER_SUFFIX}/test/typinganndata/ann_module6.pyc
+lib/python${PY_VER_SUFFIX}/test/typinganndata/ann_module6.pyo
+lib/python${PY_VER_SUFFIX}/test/typinganndata/ann_module7.py
+lib/python${PY_VER_SUFFIX}/test/typinganndata/ann_module7.pyc
+lib/python${PY_VER_SUFFIX}/test/typinganndata/ann_module7.pyo
+lib/python${PY_VER_SUFFIX}/test/typinganndata/ann_module8.py
+lib/python${PY_VER_SUFFIX}/test/typinganndata/ann_module8.pyc
+lib/python${PY_VER_SUFFIX}/test/typinganndata/ann_module8.pyo
 lib/python${PY_VER_SUFFIX}/test/typinganndata/ann_module9.py
 lib/python${PY_VER_SUFFIX}/test/typinganndata/ann_module9.pyc
 lib/python${PY_VER_SUFFIX}/test/typinganndata/ann_module9.pyo
+lib/python${PY_VER_SUFFIX}/test/typinganndata/mod_generics_cache.py
+lib/python${PY_VER_SUFFIX}/test/typinganndata/mod_generics_cache.pyc
+lib/python${PY_VER_SUFFIX}/test/typinganndata/mod_generics_cache.pyo
 lib/python${PY_VER_SUFFIX}/test/wheel-0.40.0-py3-none-any.whl
 lib/python${PY_VER_SUFFIX}/test/win_console_handler.py
 lib/python${PY_VER_SUFFIX}/test/win_console_handler.pyc
Index: pkgsrc/lang/python312/distinfo
diff -u pkgsrc/lang/python312/distinfo:1.2 pkgsrc/lang/python312/distinfo:1.3
--- pkgsrc/lang/python312/distinfo:1.2  Wed Oct  4 13:19:49 2023
+++ pkgsrc/lang/python312/distinfo      Fri Dec  8 09:22:42 2023
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.2 2023/10/04 13:19:49 jperkin Exp $
+$NetBSD: distinfo,v 1.3 2023/12/08 09:22:42 adam Exp $
 
-BLAKE2s (Python-3.12.0.tar.xz) = d99d0b678e02814643fcf2977b1a85992441e78c88c5624b7d5ed9d50e72c82c
-SHA512 (Python-3.12.0.tar.xz) = 4d5353151fd1dad80fe96bd2a668cec27287a0dad85086239597166f8189d4edf6c4800ed14f39c8e54816076fec13ba405d6bfa1123ad2dada8cf85c60025e6
-Size (Python-3.12.0.tar.xz) = 20575020 bytes
+BLAKE2s (Python-3.12.1.tar.xz) = d9c7be46d41c971dee442ca63e0d47afa9cb4b40cd665a26ea9c4a25374c934a
+SHA512 (Python-3.12.1.tar.xz) = 44cf06b89ade692d87ca3105d8e3de5c7ce3f5fb318690fff513cf56f909ff5e0d0f6a0b22ae270b12e1fe3051b1bde3ec786506ec87c810b1d02e92e45dff07
+Size (Python-3.12.1.tar.xz) = 20583448 bytes
 SHA1 (patch-Include_pymacro.h) = 271a891892dca1a3aaa3bedcae626a68a36cae0b
 SHA1 (patch-Lib_ctypes_util.py) = 3dec1b6b7a36e46cbfa0dfcd71c5e7fac9f60764
 SHA1 (patch-Lib_lib2to3_pgen2_driver.py) = 593c4e93c5653ab400f0a98b91db92630c0a7390
 SHA1 (patch-Lib_sysconfig.py) = bc6d91bf8f7121456b26ea7f080f588c96f2596f
 SHA1 (patch-Makefile.pre.in) = 03403a42fc77e4d244fe22335563927f97be6980
-SHA1 (patch-Modules_socketmodule.c) = 87e02460d54a6879e1e5a3029ad1068909f63961
-SHA1 (patch-configure) = dee9b26930232c58f0edff884a94031c014387e5
+SHA1 (patch-Modules_socketmodule.c) = 9d88a801af6e2cbd36b9935a46c8a86727222d56
+SHA1 (patch-configure) = b040e4ddffa12d4f1512e8fd8cd2e914e22d5118

Index: pkgsrc/lang/python312/dist.mk
diff -u pkgsrc/lang/python312/dist.mk:1.1 pkgsrc/lang/python312/dist.mk:1.2
--- pkgsrc/lang/python312/dist.mk:1.1   Mon Oct  2 20:07:14 2023
+++ pkgsrc/lang/python312/dist.mk       Fri Dec  8 09:22:42 2023
@@ -1,6 +1,6 @@
-# $NetBSD: dist.mk,v 1.1 2023/10/02 20:07:14 adam Exp $
+# $NetBSD: dist.mk,v 1.2 2023/12/08 09:22:42 adam Exp $
 
-PY_DISTVERSION=        3.12.0
+PY_DISTVERSION=        3.12.1
 DISTNAME=      Python-${PY_DISTVERSION}
 EXTRACT_SUFX=  .tar.xz
 DISTINFO_FILE= ${.CURDIR}/../../lang/python312/distinfo
Index: pkgsrc/lang/python312/options.mk
diff -u pkgsrc/lang/python312/options.mk:1.1 pkgsrc/lang/python312/options.mk:1.2
--- pkgsrc/lang/python312/options.mk:1.1        Mon Oct  2 20:07:14 2023
+++ pkgsrc/lang/python312/options.mk    Fri Dec  8 09:22:42 2023
@@ -1,7 +1,7 @@
-# $NetBSD: options.mk,v 1.1 2023/10/02 20:07:14 adam Exp $
+# $NetBSD: options.mk,v 1.2 2023/12/08 09:22:42 adam Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.python312
-PKG_SUPPORTED_OPTIONS= dtrace pymalloc x11
+PKG_SUPPORTED_OPTIONS= dtrace pymalloc tkinter x11
 PKG_SUGGESTED_OPTIONS= x11
 
 .include "../../mk/bsd.prefs.mk"
@@ -14,6 +14,14 @@ CONFIGURE_ARGS+=     --with-dtrace
 PLIST.dtrace=          yes
 .endif
 
+.if !empty(PKG_OPTIONS:Mtkinter)
+PLIST.tkinter= yes
+.include "../../lang/tcl/buildlink3.mk"
+.include "../../x11/tk/buildlink3.mk"
+.else
+CONFIGURE_ENV+=                py_cv_module__tkinter="n/a"
+.endif
+
 .if !empty(PKG_OPTIONS:Mx11)
 # Support for native X11 paths as an option
 # This code is no-op for modular X11, however for simplicity don't make it conditional.

Index: pkgsrc/lang/python312/patches/patch-Modules_socketmodule.c
diff -u pkgsrc/lang/python312/patches/patch-Modules_socketmodule.c:1.2 pkgsrc/lang/python312/patches/patch-Modules_socketmodule.c:1.3
--- pkgsrc/lang/python312/patches/patch-Modules_socketmodule.c:1.2      Wed Oct  4 13:19:49 2023
+++ pkgsrc/lang/python312/patches/patch-Modules_socketmodule.c  Fri Dec  8 09:22:42 2023
@@ -1,8 +1,8 @@
-$NetBSD: patch-Modules_socketmodule.c,v 1.2 2023/10/04 13:19:49 jperkin Exp $
+$NetBSD: patch-Modules_socketmodule.c,v 1.3 2023/12/08 09:22:42 adam Exp $
 
 SunOS needs _XOPEN_SOURCE for sendmsg bits that are now required.
 
---- Modules/socketmodule.c.orig        2023-10-02 11:48:14.000000000 +0000
+--- Modules/socketmodule.c.orig        2023-12-07 20:45:44.000000000 +0000
 +++ Modules/socketmodule.c
 @@ -89,6 +89,9 @@ Local naming conventions:
  #  define Py_BUILD_CORE_MODULE 1
@@ -14,12 +14,3 @@ SunOS needs _XOPEN_SOURCE for sendmsg bi
  #ifdef __APPLE__
  // Issue #35569: Expose RFC 3542 socket options.
  #define __APPLE_USE_RFC_3542 1
-@@ -5655,7 +5658,7 @@ socket_sethostname(PyObject *self, PyObj
-     Py_buffer buf;
-     int res, flag = 0;
- 
--#ifdef _AIX
-+#if defined(_AIX) || (defined(__sun) && PKGSRC_OPSYS_VERSION < 051100)
- /* issue #18259, not declared in any useful header file */
- extern int sethostname(const char *, size_t);
- #endif

Index: pkgsrc/lang/python312/patches/patch-configure
diff -u pkgsrc/lang/python312/patches/patch-configure:1.1 pkgsrc/lang/python312/patches/patch-configure:1.2
--- pkgsrc/lang/python312/patches/patch-configure:1.1   Mon Oct  2 20:07:15 2023
+++ pkgsrc/lang/python312/patches/patch-configure       Fri Dec  8 09:22:42 2023
@@ -1,11 +1,11 @@
-$NetBSD: patch-configure,v 1.1 2023/10/02 20:07:15 adam Exp $
+$NetBSD: patch-configure,v 1.2 2023/12/08 09:22:42 adam Exp $
 
 Fix linking on Darwin; don't use -stack_size.
 Changes for consistency across pkgsrc platforms.
 Simplify _sysconfigdata to include only platform name.
 Disable barrier to cross-compilation.
 
---- configure.orig     2023-08-05 12:11:26.000000000 +0000
+--- configure.orig     2023-12-07 20:45:44.000000000 +0000
 +++ configure
 @@ -3686,7 +3686,7 @@ fi
      fi
@@ -16,7 +16,7 @@ Disable barrier to cross-compilation.
      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_build_python" >&5
  printf "%s\n" "$with_build_python" >&6; }
  
-@@ -4309,7 +4309,7 @@ fi
+@@ -4318,7 +4318,7 @@ fi
  printf "%s\n" "\"$MACHDEP\"" >&6; }
  
  
@@ -25,7 +25,7 @@ Disable barrier to cross-compilation.
        case "$host" in
        *-*-linux*)
                case "$host_cpu" in
-@@ -9480,7 +9480,7 @@ fi
+@@ -9494,7 +9494,7 @@ fi
  
  case $GCC in
  yes)
@@ -34,7 +34,7 @@ Disable barrier to cross-compilation.
  
  
  
-@@ -23488,10 +23488,10 @@ if ac_fn_c_try_compile "$LINENO"
+@@ -23502,10 +23502,10 @@ if ac_fn_c_try_compile "$LINENO"
  then :
  
  
@@ -47,7 +47,7 @@ Disable barrier to cross-compilation.
    if test "$ax_cv_c_float_words_bigendian" = unknown; then
      ax_cv_c_float_words_bigendian=no
    else
-@@ -24352,7 +24352,7 @@ printf "%s\n" "#define ALT_SOABI \"${ALT
+@@ -24366,7 +24366,7 @@ printf "%s\n" "#define ALT_SOABI \"${ALT
  fi
  
  
@@ -56,7 +56,7 @@ Disable barrier to cross-compilation.
  
  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking LDVERSION" >&5
  printf %s "checking LDVERSION... " >&6; }
-@@ -24406,11 +24406,7 @@ fi
+@@ -24420,11 +24420,7 @@ fi
  
  
  
@@ -69,3 +69,12 @@ Disable barrier to cross-compilation.
  
  
  # Check for --with-wheel-pkg-dir=PATH
+@@ -26079,7 +26075,7 @@ fi
+ fi
+ CURSES_CFLAGS=$(echo $CURSES_CFLAGS | sed 's/-D_XOPEN_SOURCE=600//g')
+ 
+-if test "$have_curses" != no -a "$ac_sys_system" = "Darwin"; then
++if test "$have_curses" = no -a "$ac_sys_system" = "Darwin"; then
+ 
+   as_fn_append CURSES_CFLAGS " -D_XOPEN_SOURCE_EXTENDED=1"
+   printf "%s\n" "#define HAVE_NCURSESW 1" >>confdefs.h