From webhook-mailer at python.org  Fri Jul  1 03:23:49 2022
From: webhook-mailer at python.org (tiran)
Date: Fri, 01 Jul 2022 07:23:49 -0000
Subject: [Python-checkins] gh-90005-ffi: Fix building _ctypes without
 pkg-config (GH-94451)
Message-ID: <mailman.2031.1656660231.20746.python-checkins@python.org>

https://github.com/python/cpython/commit/d6acdc1b60de4f6fd05c6654a9661b7edddf0448
commit: d6acdc1b60de4f6fd05c6654a9661b7edddf0448
branch: main
author: Christian Heimes <christian at python.org>
committer: tiran <christian at python.org>
date: 2022-07-01T09:23:41+02:00
summary:

gh-90005-ffi: Fix building _ctypes without pkg-config (GH-94451)

The fallback path did not set LIBFFI_LIBS variable to link with ``-lffi``.

files:
A Misc/NEWS.d/next/Build/2022-06-30-17-00-54.gh-issue-90005.iiq5qD.rst
M configure
M configure.ac

diff --git a/Misc/NEWS.d/next/Build/2022-06-30-17-00-54.gh-issue-90005.iiq5qD.rst b/Misc/NEWS.d/next/Build/2022-06-30-17-00-54.gh-issue-90005.iiq5qD.rst
new file mode 100644
index 0000000000000..62f40b8f95f6c
--- /dev/null
+++ b/Misc/NEWS.d/next/Build/2022-06-30-17-00-54.gh-issue-90005.iiq5qD.rst
@@ -0,0 +1 @@
+Fix building ``_ctypes`` extension without ``pkg-config``.
diff --git a/configure b/configure
index 014d2cefb47f9..9144ee1903617 100755
--- a/configure
+++ b/configure
@@ -12133,7 +12133,10 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ffi_ffi_call" >&5
 $as_echo "$ac_cv_lib_ffi_ffi_call" >&6; }
 if test "x$ac_cv_lib_ffi_ffi_call" = xyes; then :
-  have_libffi=yes
+
+          have_libffi=yes
+          LIBFFI_LIBS="-lffi"
+
 else
   have_libffi=no
 fi
@@ -12200,7 +12203,10 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ffi_ffi_call" >&5
 $as_echo "$ac_cv_lib_ffi_ffi_call" >&6; }
 if test "x$ac_cv_lib_ffi_ffi_call" = xyes; then :
-  have_libffi=yes
+
+          have_libffi=yes
+          LIBFFI_LIBS="-lffi"
+
 else
   have_libffi=no
 fi
diff --git a/configure.ac b/configure.ac
index ab1c6873f731d..12ae2ae8d87eb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3605,7 +3605,10 @@ AS_VAR_IF([with_system_ffi], [yes], [
   PKG_CHECK_MODULES([LIBFFI], [libffi], [have_libffi=yes], [
     AC_CHECK_HEADER([ffi.h], [
       WITH_SAVE_ENV([
-        AC_CHECK_LIB([ffi], [ffi_call], [have_libffi=yes], [have_libffi=no])
+        AC_CHECK_LIB([ffi], [ffi_call], [
+          have_libffi=yes
+          LIBFFI_LIBS="-lffi"
+        ], [have_libffi=no])
       ])
     ])
   ])


From webhook-mailer at python.org  Fri Jul  1 04:33:17 2022
From: webhook-mailer at python.org (ezio-melotti)
Date: Fri, 01 Jul 2022 08:33:17 -0000
Subject: [Python-checkins] Add a workflow to add issues/PRs to projects.
 (#94447)
Message-ID: <mailman.2032.1656664397.20746.python-checkins@python.org>

https://github.com/python/cpython/commit/5f2c91a343fb20f8c2fc78cbb3e68234bcba40a8
commit: 5f2c91a343fb20f8c2fc78cbb3e68234bcba40a8
branch: main
author: Ezio Melotti <ezio.melotti at gmail.com>
committer: ezio-melotti <ezio.melotti at gmail.com>
date: 2022-07-01T10:33:10+02:00
summary:

Add a workflow to add issues/PRs to projects. (#94447)

* Add a workflow to add issues/PRs to projects.

* Apply suggestions from code review

Co-authored-by: CAM Gerlach <CAM.Gerlach at Gerlach.CAM>

Co-authored-by: CAM Gerlach <CAM.Gerlach at Gerlach.CAM>

files:
A .github/workflows/project-updater.yml

diff --git a/.github/workflows/project-updater.yml b/.github/workflows/project-updater.yml
new file mode 100644
index 0000000000000..4231b03870d6e
--- /dev/null
+++ b/.github/workflows/project-updater.yml
@@ -0,0 +1,23 @@
+name: Update GH projects
+
+on:
+  issues:
+    types:
+      - opened
+      - labeled
+  pull_request:
+    types:
+      - opened
+      - labeled
+
+jobs:
+  add-to-project:
+    name: Add to the Release and Deferred Blocker project
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/add-to-project at v0.1.0
+        with:
+          project-url: https://github.com/orgs/python/projects/2
+          github-token: ${{ secrets.ADD_TO_PROJECT_PAT }}
+          labeled: release-blocker, deferred-blocker
+          label-operator: OR


From webhook-mailer at python.org  Fri Jul  1 05:53:25 2022
From: webhook-mailer at python.org (tiran)
Date: Fri, 01 Jul 2022 09:53:25 -0000
Subject: [Python-checkins] gh-84461: Improve WebAssembly in-browser demo
 (#91879)
Message-ID: <mailman.2033.1656669207.20746.python-checkins@python.org>

https://github.com/python/cpython/commit/a8e333d79aa639417e496181bcbad2cb801a7a56
commit: a8e333d79aa639417e496181bcbad2cb801a7a56
branch: main
author: Trey Hunner <trey at treyhunner.com>
committer: tiran <christian at python.org>
date: 2022-07-01T11:52:58+02:00
summary:

gh-84461: Improve WebAssembly in-browser demo (#91879)

* Buffer standard input line-by-line

* Add non-root .editorconfig for JS & HTML indent

* Add support for clearing REPL with CTRL+L

* Support unicode in stdout and stderr

* Remove \r\n normalization

* Note that local .editorconfig file extends root

* Only normalize lone \r characters (convert to \n)

* Skip non-printable characters in buffered input

* Fix Safari bug (regex lookbehind not supported)

Co-authored-by: Christian Heimes <christian at python.org>

files:
A Tools/wasm/.editorconfig
M Tools/wasm/python.html
M Tools/wasm/python.worker.js

diff --git a/Tools/wasm/.editorconfig b/Tools/wasm/.editorconfig
new file mode 100644
index 0000000000000..da1aa6acaccc7
--- /dev/null
+++ b/Tools/wasm/.editorconfig
@@ -0,0 +1,7 @@
+root = false  # This extends the root .editorconfig
+
+[*.{html,js}]
+trim_trailing_whitespace = true
+insert_final_newline = true
+indent_style = space
+indent_size = 4
diff --git a/Tools/wasm/python.html b/Tools/wasm/python.html
index c8d17488b2e70..41cf5fcf6b6df 100644
--- a/Tools/wasm/python.html
+++ b/Tools/wasm/python.html
@@ -100,6 +100,7 @@
 class WasmTerminal {
 
     constructor() {
+        this.inputBuffer = new BufferQueue();
         this.input = ''
         this.resolveInput = null
         this.activeInput = false
@@ -123,28 +124,47 @@
         this.xterm.open(container);
     }
 
-    handleReadComplete(lastChar) {
-        this.resolveInput(this.input + lastChar)
-        this.activeInput = false
-    }
-
     handleTermData = (data) => {
-        if (!this.activeInput) {
-            return
-        }
         const ord = data.charCodeAt(0);
-        let ofs;
+        data = data.replace(/\r(?!\n)/g, "\n")  // Convert lone CRs to LF
 
+        // Handle pasted data
+        if (data.length > 1 && data.includes("\n")) {
+            let alreadyWrittenChars = 0;
+            // If line already had data on it, merge pasted data with it
+            if (this.input != '') {
+                this.inputBuffer.addData(this.input);
+                alreadyWrittenChars = this.input.length;
+                this.input = '';
+            }
+            this.inputBuffer.addData(data);
+            // If input is active, write the first line
+            if (this.activeInput) {
+                let line = this.inputBuffer.nextLine();
+                this.writeLine(line.slice(alreadyWrittenChars));
+                this.resolveInput(line);
+                this.activeInput = false;
+            }
+        // When input isn't active, add to line buffer
+        } else if (!this.activeInput) {
+            // Skip non-printable characters
+            if (!(ord === 0x1b || ord == 0x7f || ord < 32)) {
+                this.inputBuffer.addData(data);
+            }
         // TODO: Handle ANSI escape sequences
-        if (ord === 0x1b) {
+        } else if (ord === 0x1b) {
         // Handle special characters
         } else if (ord < 32 || ord === 0x7f) {
             switch (data) {
-                case "\r": // ENTER
+                case "\x0c": // CTRL+L
+                    this.clear();
+                    break;
+                case "\n": // ENTER
                 case "\x0a": // CTRL+J
                 case "\x0d": // CTRL+M
-                    this.xterm.write('\r\n');
-                    this.handleReadComplete('\n');
+                    this.resolveInput(this.input + this.writeLine('\n'));
+                    this.input = '';
+                    this.activeInput = false;
                     break;
                 case "\x7F": // BACKSPACE
                 case "\x08": // CTRL+H
@@ -157,6 +177,12 @@
         }
     }
 
+    writeLine(line) {
+        this.xterm.write(line.slice(0, -1))
+        this.xterm.write('\r\n');
+        return line;
+    }
+
     handleCursorInsert(data) {
         this.input += data;
         this.xterm.write(data)
@@ -176,9 +202,19 @@
         this.activeInput = true
         // Hack to allow stdout/stderr to finish before we figure out where input starts
         setTimeout(() => {this.inputStartCursor = this.xterm.buffer.active.cursorX}, 1)
+        // If line buffer has a line ready, send it immediately
+        if (this.inputBuffer.hasLineReady()) {
+            return new Promise((resolve, reject) => {
+                resolve(this.writeLine(this.inputBuffer.nextLine()));
+                this.activeInput = false;
+            })
+        // If line buffer has an incomplete line, use it for the active line
+        } else if (this.inputBuffer.lastLineIsIncomplete()) {
+            // Hack to ensure cursor input start doesn't end up after user input
+            setTimeout(() => {this.handleCursorInsert(this.inputBuffer.nextLine())}, 1);
+        }
         return new Promise((resolve, reject) => {
             this.resolveInput = (value) => {
-                this.input = ''
                 resolve(value)
             }
         })
@@ -188,9 +224,44 @@
         this.xterm.clear();
     }
 
-    print(message) {
-        const normInput = message.replace(/[\r\n]+/g, "\n").replace(/\n/g, "\r\n");
-        this.xterm.write(normInput);
+    print(charCode) {
+        let array = [charCode];
+        if (charCode == 10) {
+            array = [13, 10];  // Replace \n with \r\n
+        }
+        this.xterm.write(new Uint8Array(array));
+    }
+}
+
+class BufferQueue {
+    constructor(xterm) {
+        this.buffer = []
+    }
+
+    isEmpty() {
+        return this.buffer.length == 0
+    }
+
+    lastLineIsIncomplete() {
+        return !this.isEmpty() && !this.buffer[this.buffer.length-1].endsWith("\n")
+    }
+
+    hasLineReady() {
+        return !this.isEmpty() && this.buffer[0].endsWith("\n")
+    }
+
+    addData(data) {
+        let lines = data.match(/.*(\n|$)/g)
+        if (this.lastLineIsIncomplete()) {
+            this.buffer[this.buffer.length-1] += lines.shift()
+        }
+        for (let line of lines) {
+            this.buffer.push(line)
+        }
+    }
+
+    nextLine() {
+        return this.buffer.shift()
     }
 }
 
@@ -202,8 +273,8 @@
     terminal.open(document.getElementById('terminal'))
 
     const stdio = {
-        stdout: (s) => { terminal.print(s) },
-        stderr: (s) => { terminal.print(s) },
+        stdout: (charCode) => { terminal.print(charCode) },
+        stderr: (charCode) => { terminal.print(charCode) },
         stdin: async () => {
             return await terminal.prompt()
         }
diff --git a/Tools/wasm/python.worker.js b/Tools/wasm/python.worker.js
index c3a8bdf7d2fc2..1b794608fffe7 100644
--- a/Tools/wasm/python.worker.js
+++ b/Tools/wasm/python.worker.js
@@ -35,15 +35,11 @@ class StdinBuffer {
     }
 }
 
-const stdoutBufSize = 128;
-const stdoutBuf = new Int32Array()
-let index = 0;
-
 const stdout = (charCode) => {
     if (charCode) {
         postMessage({
             type: 'stdout',
-            stdout: String.fromCharCode(charCode),
+            stdout: charCode,
         })
     } else {
         console.log(typeof charCode, charCode)
@@ -54,7 +50,7 @@ const stderr = (charCode) => {
     if (charCode) {
         postMessage({
             type: 'stderr',
-            stderr: String.fromCharCode(charCode),
+            stderr: charCode,
         })
     } else {
         console.log(typeof charCode, charCode)


From webhook-mailer at python.org  Fri Jul  1 05:54:34 2022
From: webhook-mailer at python.org (tiran)
Date: Fri, 01 Jul 2022 09:54:34 -0000
Subject: [Python-checkins] gh-84461: Tool/wasm/python.html: Add subresource
 integrity hashes (#93953)
Message-ID: <mailman.2034.1656669275.20746.python-checkins@python.org>

https://github.com/python/cpython/commit/1df9449db24f16c9c96bdd7dc283a5062bca68e6
commit: 1df9449db24f16c9c96bdd7dc283a5062bca68e6
branch: main
author: Petr Viktorin <encukou at gmail.com>
committer: tiran <christian at python.org>
date: 2022-07-01T11:54:30+02:00
summary:

gh-84461: Tool/wasm/python.html: Add subresource integrity hashes (#93953)

files:
M Tools/wasm/python.html

diff --git a/Tools/wasm/python.html b/Tools/wasm/python.html
index 41cf5fcf6b6df..17ffa0ea8bfef 100644
--- a/Tools/wasm/python.html
+++ b/Tools/wasm/python.html
@@ -7,7 +7,7 @@
     <meta name="author" content="Katie Bell">
     <meta name="description" content="Simple REPL for Python WASM">
     <title>wasm-python terminal</title>
-    <link rel="stylesheet" href="https://unpkg.com/xterm at 4.18.0/css/xterm.css" crossorigin/>
+    <link rel="stylesheet" href="https://unpkg.com/xterm at 4.18.0/css/xterm.css" crossorigin integrity="sha384-4eEEn/eZgVHkElpKAzzPx/Kow/dTSgFk1BNe+uHdjHa+NkZJDh5Vqkq31+y7Eycd"/>
     <style>
         body {
             font-family: arial;
@@ -32,7 +32,7 @@
             padding: 6px 18px;
         }
     </style>
-    <script src="https://unpkg.com/xterm at 4.18.0/lib/xterm.js" crossorigin></script>
+    <script src="https://unpkg.com/xterm at 4.18.0/lib/xterm.js" crossorigin integrity="sha384-yYdNmem1ioP5Onm7RpXutin5A8TimLheLNQ6tnMi01/ZpxXdAwIm2t4fJMx1Djs+"/></script>
     <script type="module">
 class WorkerManager {
     constructor(workerURL, standardIO, readyCallBack) {


From webhook-mailer at python.org  Fri Jul  1 06:08:25 2022
From: webhook-mailer at python.org (markshannon)
Date: Fri, 01 Jul 2022 10:08:25 -0000
Subject: [Python-checkins] GH-94262: Don't create frame objects for frames
 that aren't yet complete. (GH-94371)
Message-ID: <mailman.2035.1656670107.20746.python-checkins@python.org>

https://github.com/python/cpython/commit/544531de23d69f5b23883794fc7bb23a958a0fcb
commit: 544531de23d69f5b23883794fc7bb23a958a0fcb
branch: main
author: Mark Shannon <mark at hotpy.org>
committer: markshannon <mark at hotpy.org>
date: 2022-07-01T11:08:20+01:00
summary:

GH-94262: Don't create frame objects for frames that aren't yet complete. (GH-94371)

files:
A Misc/NEWS.d/next/Core and Builtins/2022-06-28-10-08-06.gh-issue-94262.m-HWUZ.rst
M Include/internal/pycore_frame.h
M Lib/test/test_generators.py
M Objects/codeobject.c
M Objects/frameobject.c
M Python/frame.c
M Python/sysmodule.c

diff --git a/Include/internal/pycore_frame.h b/Include/internal/pycore_frame.h
index eed26fbb06218..994c205c3d164 100644
--- a/Include/internal/pycore_frame.h
+++ b/Include/internal/pycore_frame.h
@@ -134,6 +134,21 @@ _PyFrame_SetStackPointer(_PyInterpreterFrame *frame, PyObject **stack_pointer)
     frame->stacktop = (int)(stack_pointer - frame->localsplus);
 }
 
+/* Determine whether a frame is incomplete.
+ * A frame is incomplete if it is part way through
+ * creating cell objects or a generator or coroutine.
+ *
+ * Frames on the frame stack are incomplete until the
+ * first RESUME instruction.
+ * Frames owned by a generator are always complete.
+ */
+static inline bool
+_PyFrame_IsIncomplete(_PyInterpreterFrame *frame)
+{
+    return frame->owner != FRAME_OWNED_BY_GENERATOR &&
+    frame->prev_instr < _PyCode_CODE(frame->f_code) + frame->f_code->_co_firsttraceable;
+}
+
 /* For use by _PyFrame_GetFrameObject
   Do not call directly. */
 PyFrameObject *
@@ -145,6 +160,8 @@ _PyFrame_MakeAndSetFrameObject(_PyInterpreterFrame *frame);
 static inline PyFrameObject *
 _PyFrame_GetFrameObject(_PyInterpreterFrame *frame)
 {
+
+    assert(!_PyFrame_IsIncomplete(frame));
     PyFrameObject *res =  frame->frame_obj;
     if (res != NULL) {
         return res;
diff --git a/Lib/test/test_generators.py b/Lib/test/test_generators.py
index 87a7dd69d106c..e5aa7da1e0df1 100644
--- a/Lib/test/test_generators.py
+++ b/Lib/test/test_generators.py
@@ -170,6 +170,43 @@ def f():
             g.send(0)
         self.assertEqual(next(g), 1)
 
+    def test_handle_frame_object_in_creation(self):
+
+        #Attempt to expose partially constructed frames
+        #See https://github.com/python/cpython/issues/94262
+
+        def cb(*args):
+            inspect.stack()
+
+        def gen():
+            yield 1
+
+        thresholds = gc.get_threshold()
+
+        gc.callbacks.append(cb)
+        gc.set_threshold(1, 0, 0)
+        try:
+            gen()
+        finally:
+            gc.set_threshold(*thresholds)
+            gc.callbacks.pop()
+
+        class Sneaky:
+            def __del__(self):
+                inspect.stack()
+
+        sneaky = Sneaky()
+        sneaky._s = Sneaky()
+        sneaky._s._s = sneaky
+
+        gc.set_threshold(1, 0, 0)
+        try:
+            del sneaky
+            gen()
+        finally:
+            gc.set_threshold(*thresholds)
+
+
 
 class ExceptionTest(unittest.TestCase):
     # Tests for the issue #23353: check that the currently handled exception
diff --git a/Misc/NEWS.d/next/Core and Builtins/2022-06-28-10-08-06.gh-issue-94262.m-HWUZ.rst b/Misc/NEWS.d/next/Core and Builtins/2022-06-28-10-08-06.gh-issue-94262.m-HWUZ.rst
new file mode 100644
index 0000000000000..7ba39bbcfe21d
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2022-06-28-10-08-06.gh-issue-94262.m-HWUZ.rst	
@@ -0,0 +1,3 @@
+Don't create frame objects for incomplete frames. Prevents the creation of
+generators and closures from being observable to Python and C extensions,
+restoring the behavior of 3.10 and earlier.
diff --git a/Objects/codeobject.c b/Objects/codeobject.c
index 6f2a837240384..d4fa0e38aed62 100644
--- a/Objects/codeobject.c
+++ b/Objects/codeobject.c
@@ -638,11 +638,10 @@ PyCode_New(int argcount, int kwonlyargcount,
                                      exceptiontable);
 }
 
-static const char assert0[4] = {
-    LOAD_ASSERTION_ERROR,
-    0,
-    RAISE_VARARGS,
-    1
+static const char assert0[6] = {
+    RESUME, 0,
+    LOAD_ASSERTION_ERROR, 0,
+    RAISE_VARARGS, 1
 };
 
 PyCodeObject *
@@ -666,7 +665,7 @@ PyCode_NewEmpty(const char *filename, const char *funcname, int firstlineno)
     if (filename_ob == NULL) {
         goto failed;
     }
-    code_ob = PyBytes_FromStringAndSize(assert0, 4);
+    code_ob = PyBytes_FromStringAndSize(assert0, 6);
     if (code_ob == NULL) {
         goto failed;
     }
diff --git a/Objects/frameobject.c b/Objects/frameobject.c
index 9ff0443e4558f..44cc06205a623 100644
--- a/Objects/frameobject.c
+++ b/Objects/frameobject.c
@@ -1169,8 +1169,14 @@ PyFrame_GetBack(PyFrameObject *frame)
 {
     assert(frame != NULL);
     PyFrameObject *back = frame->f_back;
-    if (back == NULL && frame->f_frame->previous != NULL) {
-        back = _PyFrame_GetFrameObject(frame->f_frame->previous);
+    if (back == NULL) {
+        _PyInterpreterFrame *prev = frame->f_frame->previous;
+        while (prev && _PyFrame_IsIncomplete(prev)) {
+            prev = prev->previous;
+        }
+        if (prev) {
+            back = _PyFrame_GetFrameObject(prev);
+        }
     }
     Py_XINCREF(back);
     return back;
diff --git a/Python/frame.c b/Python/frame.c
index 206ecab44c1b8..7c6705e208f3d 100644
--- a/Python/frame.c
+++ b/Python/frame.c
@@ -68,9 +68,13 @@ take_ownership(PyFrameObject *f, _PyInterpreterFrame *frame)
     f->f_frame = frame;
     frame->owner = FRAME_OWNED_BY_FRAME_OBJECT;
     assert(f->f_back == NULL);
-    if (frame->previous != NULL) {
+    _PyInterpreterFrame *prev = frame->previous;
+    while (prev && _PyFrame_IsIncomplete(prev)) {
+        prev = prev->previous;
+    }
+    if (prev) {
         /* Link PyFrameObjects.f_back and remove link through _PyInterpreterFrame.previous */
-        PyFrameObject *back = _PyFrame_GetFrameObject(frame->previous);
+        PyFrameObject *back = _PyFrame_GetFrameObject(prev);
         if (back == NULL) {
             /* Memory error here. */
             assert(PyErr_ExceptionMatches(PyExc_MemoryError));
diff --git a/Python/sysmodule.c b/Python/sysmodule.c
index 444042f82d947..93120071b400f 100644
--- a/Python/sysmodule.c
+++ b/Python/sysmodule.c
@@ -1776,9 +1776,17 @@ sys__getframe_impl(PyObject *module, int depth)
         return NULL;
     }
 
-    while (depth > 0 && frame != NULL) {
-        frame = frame->previous;
-        --depth;
+    if (frame != NULL) {
+        while (depth > 0) {
+            frame = frame->previous;
+            if (frame == NULL) {
+                break;
+            }
+            if (_PyFrame_IsIncomplete(frame)) {
+                continue;
+            }
+            --depth;
+        }
     }
     if (frame == NULL) {
         _PyErr_SetString(tstate, PyExc_ValueError,


From webhook-mailer at python.org  Fri Jul  1 06:16:40 2022
From: webhook-mailer at python.org (miss-islington)
Date: Fri, 01 Jul 2022 10:16:40 -0000
Subject: [Python-checkins] gh-84461: Improve WebAssembly in-browser demo
 (GH-91879)
Message-ID: <mailman.2036.1656670602.20746.python-checkins@python.org>

https://github.com/python/cpython/commit/ca58ca8641267c67dc6a7e67ee4009906b350bbb
commit: ca58ca8641267c67dc6a7e67ee4009906b350bbb
branch: 3.11
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-01T03:16:25-07:00
summary:

gh-84461: Improve WebAssembly in-browser demo (GH-91879)


* Buffer standard input line-by-line

* Add non-root .editorconfig for JS & HTML indent

* Add support for clearing REPL with CTRL+L

* Support unicode in stdout and stderr

* Remove \r\n normalization

* Note that local .editorconfig file extends root

* Only normalize lone \r characters (convert to \n)

* Skip non-printable characters in buffered input

* Fix Safari bug (regex lookbehind not supported)

Co-authored-by: Christian Heimes <christian at python.org>
(cherry picked from commit a8e333d79aa639417e496181bcbad2cb801a7a56)

Co-authored-by: Trey Hunner <trey at treyhunner.com>

files:
A Tools/wasm/.editorconfig
M Tools/wasm/python.html
M Tools/wasm/python.worker.js

diff --git a/Tools/wasm/.editorconfig b/Tools/wasm/.editorconfig
new file mode 100644
index 0000000000000..da1aa6acaccc7
--- /dev/null
+++ b/Tools/wasm/.editorconfig
@@ -0,0 +1,7 @@
+root = false  # This extends the root .editorconfig
+
+[*.{html,js}]
+trim_trailing_whitespace = true
+insert_final_newline = true
+indent_style = space
+indent_size = 4
diff --git a/Tools/wasm/python.html b/Tools/wasm/python.html
index c8d17488b2e70..41cf5fcf6b6df 100644
--- a/Tools/wasm/python.html
+++ b/Tools/wasm/python.html
@@ -100,6 +100,7 @@
 class WasmTerminal {
 
     constructor() {
+        this.inputBuffer = new BufferQueue();
         this.input = ''
         this.resolveInput = null
         this.activeInput = false
@@ -123,28 +124,47 @@
         this.xterm.open(container);
     }
 
-    handleReadComplete(lastChar) {
-        this.resolveInput(this.input + lastChar)
-        this.activeInput = false
-    }
-
     handleTermData = (data) => {
-        if (!this.activeInput) {
-            return
-        }
         const ord = data.charCodeAt(0);
-        let ofs;
+        data = data.replace(/\r(?!\n)/g, "\n")  // Convert lone CRs to LF
 
+        // Handle pasted data
+        if (data.length > 1 && data.includes("\n")) {
+            let alreadyWrittenChars = 0;
+            // If line already had data on it, merge pasted data with it
+            if (this.input != '') {
+                this.inputBuffer.addData(this.input);
+                alreadyWrittenChars = this.input.length;
+                this.input = '';
+            }
+            this.inputBuffer.addData(data);
+            // If input is active, write the first line
+            if (this.activeInput) {
+                let line = this.inputBuffer.nextLine();
+                this.writeLine(line.slice(alreadyWrittenChars));
+                this.resolveInput(line);
+                this.activeInput = false;
+            }
+        // When input isn't active, add to line buffer
+        } else if (!this.activeInput) {
+            // Skip non-printable characters
+            if (!(ord === 0x1b || ord == 0x7f || ord < 32)) {
+                this.inputBuffer.addData(data);
+            }
         // TODO: Handle ANSI escape sequences
-        if (ord === 0x1b) {
+        } else if (ord === 0x1b) {
         // Handle special characters
         } else if (ord < 32 || ord === 0x7f) {
             switch (data) {
-                case "\r": // ENTER
+                case "\x0c": // CTRL+L
+                    this.clear();
+                    break;
+                case "\n": // ENTER
                 case "\x0a": // CTRL+J
                 case "\x0d": // CTRL+M
-                    this.xterm.write('\r\n');
-                    this.handleReadComplete('\n');
+                    this.resolveInput(this.input + this.writeLine('\n'));
+                    this.input = '';
+                    this.activeInput = false;
                     break;
                 case "\x7F": // BACKSPACE
                 case "\x08": // CTRL+H
@@ -157,6 +177,12 @@
         }
     }
 
+    writeLine(line) {
+        this.xterm.write(line.slice(0, -1))
+        this.xterm.write('\r\n');
+        return line;
+    }
+
     handleCursorInsert(data) {
         this.input += data;
         this.xterm.write(data)
@@ -176,9 +202,19 @@
         this.activeInput = true
         // Hack to allow stdout/stderr to finish before we figure out where input starts
         setTimeout(() => {this.inputStartCursor = this.xterm.buffer.active.cursorX}, 1)
+        // If line buffer has a line ready, send it immediately
+        if (this.inputBuffer.hasLineReady()) {
+            return new Promise((resolve, reject) => {
+                resolve(this.writeLine(this.inputBuffer.nextLine()));
+                this.activeInput = false;
+            })
+        // If line buffer has an incomplete line, use it for the active line
+        } else if (this.inputBuffer.lastLineIsIncomplete()) {
+            // Hack to ensure cursor input start doesn't end up after user input
+            setTimeout(() => {this.handleCursorInsert(this.inputBuffer.nextLine())}, 1);
+        }
         return new Promise((resolve, reject) => {
             this.resolveInput = (value) => {
-                this.input = ''
                 resolve(value)
             }
         })
@@ -188,9 +224,44 @@
         this.xterm.clear();
     }
 
-    print(message) {
-        const normInput = message.replace(/[\r\n]+/g, "\n").replace(/\n/g, "\r\n");
-        this.xterm.write(normInput);
+    print(charCode) {
+        let array = [charCode];
+        if (charCode == 10) {
+            array = [13, 10];  // Replace \n with \r\n
+        }
+        this.xterm.write(new Uint8Array(array));
+    }
+}
+
+class BufferQueue {
+    constructor(xterm) {
+        this.buffer = []
+    }
+
+    isEmpty() {
+        return this.buffer.length == 0
+    }
+
+    lastLineIsIncomplete() {
+        return !this.isEmpty() && !this.buffer[this.buffer.length-1].endsWith("\n")
+    }
+
+    hasLineReady() {
+        return !this.isEmpty() && this.buffer[0].endsWith("\n")
+    }
+
+    addData(data) {
+        let lines = data.match(/.*(\n|$)/g)
+        if (this.lastLineIsIncomplete()) {
+            this.buffer[this.buffer.length-1] += lines.shift()
+        }
+        for (let line of lines) {
+            this.buffer.push(line)
+        }
+    }
+
+    nextLine() {
+        return this.buffer.shift()
     }
 }
 
@@ -202,8 +273,8 @@
     terminal.open(document.getElementById('terminal'))
 
     const stdio = {
-        stdout: (s) => { terminal.print(s) },
-        stderr: (s) => { terminal.print(s) },
+        stdout: (charCode) => { terminal.print(charCode) },
+        stderr: (charCode) => { terminal.print(charCode) },
         stdin: async () => {
             return await terminal.prompt()
         }
diff --git a/Tools/wasm/python.worker.js b/Tools/wasm/python.worker.js
index c3a8bdf7d2fc2..1b794608fffe7 100644
--- a/Tools/wasm/python.worker.js
+++ b/Tools/wasm/python.worker.js
@@ -35,15 +35,11 @@ class StdinBuffer {
     }
 }
 
-const stdoutBufSize = 128;
-const stdoutBuf = new Int32Array()
-let index = 0;
-
 const stdout = (charCode) => {
     if (charCode) {
         postMessage({
             type: 'stdout',
-            stdout: String.fromCharCode(charCode),
+            stdout: charCode,
         })
     } else {
         console.log(typeof charCode, charCode)
@@ -54,7 +50,7 @@ const stderr = (charCode) => {
     if (charCode) {
         postMessage({
             type: 'stderr',
-            stderr: String.fromCharCode(charCode),
+            stderr: charCode,
         })
     } else {
         console.log(typeof charCode, charCode)


From webhook-mailer at python.org  Fri Jul  1 06:17:43 2022
From: webhook-mailer at python.org (miss-islington)
Date: Fri, 01 Jul 2022 10:17:43 -0000
Subject: [Python-checkins] gh-84461: Tool/wasm/python.html: Add subresource
 integrity hashes (GH-93953)
Message-ID: <mailman.2037.1656670664.20746.python-checkins@python.org>

https://github.com/python/cpython/commit/9fa966136fd026ecb74a21b4d63b699d3d40b977
commit: 9fa966136fd026ecb74a21b4d63b699d3d40b977
branch: 3.11
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-01T03:17:38-07:00
summary:

gh-84461: Tool/wasm/python.html: Add subresource integrity hashes (GH-93953)

(cherry picked from commit 1df9449db24f16c9c96bdd7dc283a5062bca68e6)

Co-authored-by: Petr Viktorin <encukou at gmail.com>

files:
M Tools/wasm/python.html

diff --git a/Tools/wasm/python.html b/Tools/wasm/python.html
index 41cf5fcf6b6df..17ffa0ea8bfef 100644
--- a/Tools/wasm/python.html
+++ b/Tools/wasm/python.html
@@ -7,7 +7,7 @@
     <meta name="author" content="Katie Bell">
     <meta name="description" content="Simple REPL for Python WASM">
     <title>wasm-python terminal</title>
-    <link rel="stylesheet" href="https://unpkg.com/xterm at 4.18.0/css/xterm.css" crossorigin/>
+    <link rel="stylesheet" href="https://unpkg.com/xterm at 4.18.0/css/xterm.css" crossorigin integrity="sha384-4eEEn/eZgVHkElpKAzzPx/Kow/dTSgFk1BNe+uHdjHa+NkZJDh5Vqkq31+y7Eycd"/>
     <style>
         body {
             font-family: arial;
@@ -32,7 +32,7 @@
             padding: 6px 18px;
         }
     </style>
-    <script src="https://unpkg.com/xterm at 4.18.0/lib/xterm.js" crossorigin></script>
+    <script src="https://unpkg.com/xterm at 4.18.0/lib/xterm.js" crossorigin integrity="sha384-yYdNmem1ioP5Onm7RpXutin5A8TimLheLNQ6tnMi01/ZpxXdAwIm2t4fJMx1Djs+"/></script>
     <script type="module">
 class WorkerManager {
     constructor(workerURL, standardIO, readyCallBack) {


From webhook-mailer at python.org  Fri Jul  1 07:06:14 2022
From: webhook-mailer at python.org (ezio-melotti)
Date: Fri, 01 Jul 2022 11:06:14 -0000
Subject: [Python-checkins] Remove pr trigger from project-updater GHA.
 (#94483)
Message-ID: <mailman.2038.1656673575.20746.python-checkins@python.org>

https://github.com/python/cpython/commit/022800253f254ba681a9f1093501a9fd1c15bed7
commit: 022800253f254ba681a9f1093501a9fd1c15bed7
branch: main
author: Ezio Melotti <ezio.melotti at gmail.com>
committer: ezio-melotti <ezio.melotti at gmail.com>
date: 2022-07-01T13:06:09+02:00
summary:

Remove pr trigger from project-updater GHA. (#94483)

files:
M .github/workflows/project-updater.yml

diff --git a/.github/workflows/project-updater.yml b/.github/workflows/project-updater.yml
index 4231b03870d6e..716ed7841feae 100644
--- a/.github/workflows/project-updater.yml
+++ b/.github/workflows/project-updater.yml
@@ -5,10 +5,6 @@ on:
     types:
       - opened
       - labeled
-  pull_request:
-    types:
-      - opened
-      - labeled
 
 jobs:
   add-to-project:


From webhook-mailer at python.org  Fri Jul  1 09:01:32 2022
From: webhook-mailer at python.org (markshannon)
Date: Fri, 01 Jul 2022 13:01:32 -0000
Subject: [Python-checkins] GH-94438: Account for NULLs on evaluation stack
 when jumping lines. (GH-94444)
Message-ID: <mailman.2039.1656680492.20746.python-checkins@python.org>

https://github.com/python/cpython/commit/be80db14c432c621e44920f8fd95a3f3191aca9b
commit: be80db14c432c621e44920f8fd95a3f3191aca9b
branch: main
author: Mark Shannon <mark at hotpy.org>
committer: markshannon <mark at hotpy.org>
date: 2022-07-01T14:01:14+01:00
summary:

GH-94438: Account for NULLs on evaluation stack when jumping lines. (GH-94444)

files:
A Misc/NEWS.d/next/Core and Builtins/2022-06-30-15-07-26.gh-issue-94438.btzHSk.rst
M Lib/test/test_sys_settrace.py
M Objects/frameobject.c

diff --git a/Lib/test/test_sys_settrace.py b/Lib/test/test_sys_settrace.py
index 162fd8328582c..fd2740ea19f0c 100644
--- a/Lib/test/test_sys_settrace.py
+++ b/Lib/test/test_sys_settrace.py
@@ -2264,25 +2264,25 @@ async def test_no_jump_backwards_into_async_for_block(output):
             output.append(2)
         output.append(3)
 
-    @jump_test(1, 3, [], (ValueError, 'depth'))
+    @jump_test(1, 3, [], (ValueError, 'stack'))
     def test_no_jump_forwards_into_with_block(output):
         output.append(1)
         with tracecontext(output, 2):
             output.append(3)
 
-    @async_jump_test(1, 3, [], (ValueError, 'depth'))
+    @async_jump_test(1, 3, [], (ValueError, 'stack'))
     async def test_no_jump_forwards_into_async_with_block(output):
         output.append(1)
         async with asynctracecontext(output, 2):
             output.append(3)
 
-    @jump_test(3, 2, [1, 2, -1], (ValueError, 'depth'))
+    @jump_test(3, 2, [1, 2, -1], (ValueError, 'stack'))
     def test_no_jump_backwards_into_with_block(output):
         with tracecontext(output, 1):
             output.append(2)
         output.append(3)
 
-    @async_jump_test(3, 2, [1, 2, -1], (ValueError, 'depth'))
+    @async_jump_test(3, 2, [1, 2, -1], (ValueError, 'stack'))
     async def test_no_jump_backwards_into_async_with_block(output):
         async with asynctracecontext(output, 1):
             output.append(2)
@@ -2584,6 +2584,63 @@ async def test_jump_backward_over_async_listcomp_v2(output):
         output.append(7)
         output.append(8)
 
+    # checking for segfaults.
+    @jump_test(3, 7, [], error=(ValueError, "stack"))
+    def test_jump_with_null_on_stack_load_global(output):
+        a = 1
+        print(
+            output.append(3)
+        )
+        output.append(5)
+        (
+            ( # 7
+                a
+                +
+                10
+            )
+            +
+            13
+        )
+        output.append(15)
+
+    # checking for segfaults.
+    @jump_test(4, 8, [], error=(ValueError, "stack"))
+    def test_jump_with_null_on_stack_push_null(output):
+        a = 1
+        f = print
+        f(
+            output.append(4)
+        )
+        output.append(6)
+        (
+            ( # 8
+                a
+                +
+                11
+            )
+            +
+            14
+        )
+        output.append(16)
+
+    # checking for segfaults.
+    @jump_test(3, 7, [], error=(ValueError, "stack"))
+    def test_jump_with_null_on_stack_load_attr(output):
+        a = 1
+        list.append(
+            output, 3
+        )
+        output.append(5)
+        (
+            ( # 7
+                a
+                +
+                10
+            )
+            +
+            13
+        )
+        output.append(15)
 
 class TestExtendedArgs(unittest.TestCase):
 
diff --git a/Misc/NEWS.d/next/Core and Builtins/2022-06-30-15-07-26.gh-issue-94438.btzHSk.rst b/Misc/NEWS.d/next/Core and Builtins/2022-06-30-15-07-26.gh-issue-94438.btzHSk.rst
new file mode 100644
index 0000000000000..b08dd8f2ad160
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2022-06-30-15-07-26.gh-issue-94438.btzHSk.rst	
@@ -0,0 +1,2 @@
+Account for instructions that can push NULL to the stack when setting line
+number in a frame. Prevents some (unlikely) crashes.
diff --git a/Objects/frameobject.c b/Objects/frameobject.c
index 44cc06205a623..34a6c46c6b57f 100644
--- a/Objects/frameobject.c
+++ b/Objects/frameobject.c
@@ -137,9 +137,24 @@ typedef enum kind {
     Iterator = 1,
     Except = 2,
     Object = 3,
+    Null = 4,
 } Kind;
 
-#define BITS_PER_BLOCK 2
+static int
+compatible_kind(Kind from, Kind to) {
+    if (to == 0) {
+        return 0;
+    }
+    if (to == Object) {
+        return from != Null;
+    }
+    if (to == Null) {
+        return 1;
+    }
+    return from == to;
+}
+
+#define BITS_PER_BLOCK 3
 
 #define UNINITIALIZED -2
 #define OVERFLOWED -1
@@ -298,6 +313,31 @@ mark_stacks(PyCodeObject *code_obj, int len)
                 case RERAISE:
                     /* End of block */
                     break;
+                case PUSH_NULL:
+                    next_stack = push_value(next_stack, Null);
+                    stacks[i+1] = next_stack;
+                    break;
+                case LOAD_GLOBAL:
+                {
+                    int j = get_arg(code, i);
+                    if (j & 1) {
+                        next_stack = push_value(next_stack, Null);
+                    }
+                    next_stack = push_value(next_stack, Object);
+                    stacks[i+1] = next_stack;
+                    break;
+                }
+                case LOAD_ATTR:
+                {
+                    int j = get_arg(code, i);
+                    if (j & 1) {
+                        next_stack = pop_value(next_stack);
+                        next_stack = push_value(next_stack, Null);
+                        next_stack = push_value(next_stack, Object);
+                    }
+                    stacks[i+1] = next_stack;
+                    break;
+                }
                 default:
                 {
                     int delta = PyCompile_OpcodeStackEffect(opcode, _Py_OPARG(code[i]));
@@ -318,17 +358,6 @@ mark_stacks(PyCodeObject *code_obj, int len)
     return stacks;
 }
 
-static int
-compatible_kind(Kind from, Kind to) {
-    if (to == 0) {
-        return 0;
-    }
-    if (to == Object) {
-        return 1;
-    }
-    return from == to;
-}
-
 static int
 compatible_stack(int64_t from_stack, int64_t to_stack)
 {
@@ -365,7 +394,8 @@ explain_incompatible_stack(int64_t to_stack)
         case Except:
             return "can't jump into an 'except' block as there's no exception";
         case Object:
-            return "differing stack depth";
+        case Null:
+            return "incompatible stacks";
         case Iterator:
             return "can't jump into the body of a for loop";
         default:


From webhook-mailer at python.org  Fri Jul  1 10:33:41 2022
From: webhook-mailer at python.org (iritkatriel)
Date: Fri, 01 Jul 2022 14:33:41 -0000
Subject: [Python-checkins] gh-94216: add pseudo instructions to the
 dis/opcodes modules (GH-94241)
Message-ID: <mailman.2040.1656686022.20746.python-checkins@python.org>

https://github.com/python/cpython/commit/c57aad777afc6c0b382981ee9e4bc94c03bf5f68
commit: c57aad777afc6c0b382981ee9e4bc94c03bf5f68
branch: main
author: Irit Katriel <1055913+iritkatriel at users.noreply.github.com>
committer: iritkatriel <1055913+iritkatriel at users.noreply.github.com>
date: 2022-07-01T15:33:35+01:00
summary:

gh-94216: add pseudo instructions to the dis/opcodes modules (GH-94241)

files:
A Misc/NEWS.d/next/Library/2022-06-24-20-00-57.gh-issue-94216.hxnQPu.rst
M Doc/library/dis.rst
M Doc/whatsnew/3.12.rst
M Include/internal/pycore_opcode.h
M Include/opcode.h
M Lib/dis.py
M Lib/opcode.py
M Lib/test/test__opcode.py
M Lib/test/test_dis.py
M Modules/_opcode.c
M Python/compile.c
M Python/makeopcodetargets.py
M Tools/scripts/generate_opcode_h.py

diff --git a/Doc/library/dis.rst b/Doc/library/dis.rst
index d2c3c1a0966d7..9173c1bcf5e7b 100644
--- a/Doc/library/dis.rst
+++ b/Doc/library/dis.rst
@@ -1351,13 +1351,74 @@ iterations of the loop.
 .. opcode:: HAVE_ARGUMENT
 
    This is not really an opcode.  It identifies the dividing line between
-   opcodes which don't use their argument and those that do
-   (``< HAVE_ARGUMENT`` and ``>= HAVE_ARGUMENT``, respectively).
+   opcodes in the range [0,255] which don't use their argument and those
+   that do (``< HAVE_ARGUMENT`` and ``>= HAVE_ARGUMENT``, respectively).
+
+   If your application uses pseudo instructions, use the :data:`hasarg`
+   collection instead.
 
    .. versionchanged:: 3.6
       Now every instruction has an argument, but opcodes ``< HAVE_ARGUMENT``
       ignore it. Before, only opcodes ``>= HAVE_ARGUMENT`` had an argument.
 
+   .. versionchanged:: 3.12
+      Pseudo instructions were added to the :mod:`dis` module, and for them
+      it is not true that comparison with ``HAVE_ARGUMENT`` indicates whether
+      they use their arg.
+
+
+**Pseudo-instructions**
+
+These opcodes do not appear in python bytecode, they are used by the compiler
+but are replaced by real opcodes or removed before bytecode is generated.
+
+.. opcode:: SETUP_FINALLY (target)
+
+   Set up an exception handler for the following code block. If an exception
+   occurs, the value stack level is restored to its current state and control
+   is transferred to the exception handler at ``target``.
+
+
+.. opcode:: SETUP_CLEANUP (target)
+
+   Like ``SETUP_FINALLY``, but in case of exception also pushes the last
+   instruction (``lasti``) to the stack so that ``RERAISE`` can restore it.
+   If an exception occurs, the value stack level and the last instruction on
+   the frame are restored to their current state, and control is transferred
+   to the exception handler at ``target``.
+
+
+.. opcode:: SETUP_WITH (target)
+
+   Like ``SETUP_CLEANUP``, but in case of exception one more item is popped
+   from the stack before control is transferred to the exception handler at
+   ``target``.
+
+   This variant is used in :keyword:`with` and :keyword:`async with`
+   constructs, which push the return value of the context manager's
+   :meth:`~object.__enter__` or :meth:`~object.__aenter__` to the stack.
+
+
+.. opcode:: POP_BLOCK
+
+   Marks the end of the code block associated with the last ``SETUP_FINALLY``,
+   ``SETUP_CLEANUP`` or ``SETUP_WITH``.
+
+.. opcode:: JUMP
+.. opcode:: JUMP_NO_INTERRUPT
+.. opcode:: POP_JUMP_IF_FALSE
+.. opcode:: POP_JUMP_IF_TRUE
+.. opcode:: POP_JUMP_IF_NONE
+.. opcode:: POP_JUMP_IF_NOT_NONE
+
+   Undirected relative jump instructions which are replaced by their
+   directed (forward/backward) counterparts by the assembler.
+
+.. opcode:: LOAD_METHOD
+
+   Optimized unbound method lookup. Emitted as a ``LOAD_ATTR`` opcode
+   with a flag set in the arg.
+
 
 .. _opcode_collections:
 
@@ -1367,6 +1428,10 @@ Opcode collections
 These collections are provided for automatic introspection of bytecode
 instructions:
 
+   .. versionchanged:: 3.12
+      The collections now contain pseudo instructions as well. These are
+      opcodes with values ``>= MIN_PSEUDO_OPCODE``.
+
 .. data:: opname
 
    Sequence of operation names, indexable using the bytecode.
@@ -1382,6 +1447,13 @@ instructions:
    Sequence of all compare operation names.
 
 
+.. data:: hasarg
+
+   Sequence of bytecodes that use their argument.
+
+    .. versionadded:: 3.12
+
+
 .. data:: hasconst
 
    Sequence of bytecodes that access a constant.
@@ -1418,3 +1490,9 @@ instructions:
 .. data:: hascompare
 
    Sequence of bytecodes of Boolean operations.
+
+.. data:: hasexc
+
+   Sequence of bytecodes that set an exception handler.
+
+    .. versionadded:: 3.12
diff --git a/Doc/whatsnew/3.12.rst b/Doc/whatsnew/3.12.rst
index 11e8b87f02881..620aa91f6da22 100644
--- a/Doc/whatsnew/3.12.rst
+++ b/Doc/whatsnew/3.12.rst
@@ -93,6 +93,17 @@ New Modules
 Improved Modules
 ================
 
+dis
+---
+
+* Pseudo instruction opcodes (which are used by the compiler but
+  do not appear in executable bytecode) are now exposed in the
+  :mod:`dis` module.
+  :data:`~dis.HAVE_ARGUMENT` is still relevant to real opcodes,
+  but it is not useful for pseudo instrcutions. Use the new
+  :data:`~dis.hasarg` collection instead.
+  (Contributed by Irit Katriel in :gh:`94216`.)
+
 os
 --
 
diff --git a/Include/internal/pycore_opcode.h b/Include/internal/pycore_opcode.h
index 7e3c6420b0317..3ca678d3dd85b 100644
--- a/Include/internal/pycore_opcode.h
+++ b/Include/internal/pycore_opcode.h
@@ -19,7 +19,7 @@ extern const uint8_t _PyOpcode_Deopt[256];
 extern const uint8_t _PyOpcode_Original[256];
 
 #ifdef NEED_OPCODE_TABLES
-static const uint32_t _PyOpcode_RelativeJump[8] = {
+static const uint32_t _PyOpcode_RelativeJump[9] = {
     0U,
     0U,
     536870912U,
@@ -28,8 +28,9 @@ static const uint32_t _PyOpcode_RelativeJump[8] = {
     122880U,
     0U,
     0U,
+    1008U,
 };
-static const uint32_t _PyOpcode_Jump[8] = {
+static const uint32_t _PyOpcode_Jump[9] = {
     0U,
     0U,
     536870912U,
@@ -38,6 +39,7 @@ static const uint32_t _PyOpcode_Jump[8] = {
     122880U,
     0U,
     0U,
+    1008U,
 };
 
 const uint8_t _PyOpcode_Caches[256] = {
@@ -427,7 +429,7 @@ const uint8_t _PyOpcode_Original[256] = {
 #endif   // NEED_OPCODE_TABLES
 
 #ifdef Py_DEBUG
-static const char *const _PyOpcode_OpName[256] = {
+static const char *const _PyOpcode_OpName[267] = {
     [CACHE] = "CACHE",
     [POP_TOP] = "POP_TOP",
     [PUSH_NULL] = "PUSH_NULL",
@@ -684,6 +686,17 @@ static const char *const _PyOpcode_OpName[256] = {
     [253] = "<253>",
     [254] = "<254>",
     [DO_TRACING] = "DO_TRACING",
+    [SETUP_FINALLY] = "SETUP_FINALLY",
+    [SETUP_CLEANUP] = "SETUP_CLEANUP",
+    [SETUP_WITH] = "SETUP_WITH",
+    [POP_BLOCK] = "POP_BLOCK",
+    [JUMP] = "JUMP",
+    [JUMP_NO_INTERRUPT] = "JUMP_NO_INTERRUPT",
+    [POP_JUMP_IF_FALSE] = "POP_JUMP_IF_FALSE",
+    [POP_JUMP_IF_TRUE] = "POP_JUMP_IF_TRUE",
+    [POP_JUMP_IF_NONE] = "POP_JUMP_IF_NONE",
+    [POP_JUMP_IF_NOT_NONE] = "POP_JUMP_IF_NOT_NONE",
+    [LOAD_METHOD] = "LOAD_METHOD",
 };
 #endif
 
diff --git a/Include/opcode.h b/Include/opcode.h
index 66e8c9e8cf82c..f90ebb1d6e01c 100644
--- a/Include/opcode.h
+++ b/Include/opcode.h
@@ -120,6 +120,19 @@ extern "C" {
 #define POP_JUMP_BACKWARD_IF_NONE              174
 #define POP_JUMP_BACKWARD_IF_FALSE             175
 #define POP_JUMP_BACKWARD_IF_TRUE              176
+#define MIN_PSEUDO_OPCODE                      256
+#define SETUP_FINALLY                          256
+#define SETUP_CLEANUP                          257
+#define SETUP_WITH                             258
+#define POP_BLOCK                              259
+#define JUMP                                   260
+#define JUMP_NO_INTERRUPT                      261
+#define POP_JUMP_IF_FALSE                      262
+#define POP_JUMP_IF_TRUE                       263
+#define POP_JUMP_IF_NONE                       264
+#define POP_JUMP_IF_NOT_NONE                   265
+#define LOAD_METHOD                            266
+#define MAX_PSEUDO_OPCODE                      266
 #define BINARY_OP_ADAPTIVE                       3
 #define BINARY_OP_ADD_FLOAT                      4
 #define BINARY_OP_ADD_INT                        5
@@ -194,9 +207,19 @@ extern "C" {
 #define UNPACK_SEQUENCE_TWO_TUPLE              182
 #define DO_TRACING                             255
 
+#define HAS_ARG(op) ((((op) >= HAVE_ARGUMENT) && (!IS_PSEUDO_OPCODE(op)))\
+    || ((op) == JUMP) \
+    || ((op) == JUMP_NO_INTERRUPT) \
+    || ((op) == POP_JUMP_IF_FALSE) \
+    || ((op) == POP_JUMP_IF_TRUE) \
+    || ((op) == POP_JUMP_IF_NONE) \
+    || ((op) == POP_JUMP_IF_NOT_NONE) \
+    || ((op) == LOAD_METHOD) \
+    )
+
 #define HAS_CONST(op) (false\
-    || ((op) == 100) \
-    || ((op) == 172) \
+    || ((op) == LOAD_CONST) \
+    || ((op) == KW_NAMES) \
     )
 
 #define NB_ADD                                   0
@@ -226,11 +249,8 @@ extern "C" {
 #define NB_INPLACE_TRUE_DIVIDE                  24
 #define NB_INPLACE_XOR                          25
 
-#define HAS_ARG(op) ((op) >= HAVE_ARGUMENT)
 
-/* Reserve some bytecodes for internal use in the compiler.
- * The value of 240 is arbitrary. */
-#define IS_ARTIFICIAL(op) ((op) > 240)
+#define IS_PSEUDO_OPCODE(op) (((op) >= MIN_PSEUDO_OPCODE) && ((op) <= MAX_PSEUDO_OPCODE))
 
 #ifdef __cplusplus
 }
diff --git a/Lib/dis.py b/Lib/dis.py
index bd87de97fc9ce..d63f35a42b246 100644
--- a/Lib/dis.py
+++ b/Lib/dis.py
@@ -610,7 +610,7 @@ def _unpack_opargs(code):
         op = code[i]
         deop = _deoptop(op)
         caches = _inline_cache_entries[deop]
-        if deop >= HAVE_ARGUMENT:
+        if deop in hasarg:
             arg = code[i+1] | extended_arg
             extended_arg = (arg << 8) if deop == EXTENDED_ARG else 0
             # The oparg is stored as a signed integer
diff --git a/Lib/opcode.py b/Lib/opcode.py
index c7bc12a1fbacc..8a07fb75b2e97 100644
--- a/Lib/opcode.py
+++ b/Lib/opcode.py
@@ -4,9 +4,9 @@
 operate on bytecodes (e.g. peephole optimizers).
 """
 
-__all__ = ["cmp_op", "hasconst", "hasname", "hasjrel", "hasjabs",
-           "haslocal", "hascompare", "hasfree", "opname", "opmap",
-           "HAVE_ARGUMENT", "EXTENDED_ARG", "hasnargs"]
+__all__ = ["cmp_op", "hasarg", "hasconst", "hasname", "hasjrel", "hasjabs",
+           "haslocal", "hascompare", "hasfree", "hasexc", "opname", "opmap",
+           "HAVE_ARGUMENT", "EXTENDED_ARG"]
 
 # It's a chicken-and-egg I'm afraid:
 # We're imported before _opcode's made.
@@ -23,6 +23,7 @@
 
 cmp_op = ('<', '<=', '==', '!=', '>', '>=')
 
+hasarg = []
 hasconst = []
 hasname = []
 hasjrel = []
@@ -30,13 +31,21 @@
 haslocal = []
 hascompare = []
 hasfree = []
-hasnargs = [] # unused
+hasexc = []
+
+def is_pseudo(op):
+    return op >= MIN_PSEUDO_OPCODE and op <= MAX_PSEUDO_OPCODE
+
+oplists = [hasarg, hasconst, hasname, hasjrel, hasjabs,
+           haslocal, hascompare, hasfree, hasexc]
 
 opmap = {}
-opname = ['<%r>' % (op,) for op in range(256)]
+
+## pseudo opcodes (used in the compiler) mapped to the values
+##?they can become in the actual code.
+_pseudo_ops = {}
 
 def def_op(name, op):
-    opname[op] = name
     opmap[name] = op
 
 def name_op(name, op):
@@ -51,6 +60,17 @@ def jabs_op(name, op):
     def_op(name, op)
     hasjabs.append(op)
 
+def pseudo_op(name, op, real_ops):
+    def_op(name, op)
+    _pseudo_ops[name] = real_ops
+    # add the pseudo opcode to the lists its targets are in
+    for oplist in oplists:
+        res = [opmap[rop] in oplist for rop in real_ops]
+        if any(res):
+            assert all(res)
+            oplist.append(op)
+
+
 # Instruction opcodes for compiled code
 # Blank lines correspond to available opcodes
 
@@ -105,7 +125,7 @@ def jabs_op(name, op):
 def_op('PREP_RERAISE_STAR', 88)
 def_op('POP_EXCEPT', 89)
 
-HAVE_ARGUMENT = 90              # Opcodes from here have an argument:
+HAVE_ARGUMENT = 90             # real opcodes from here have an argument:
 
 name_op('STORE_NAME', 90)       # Index in name list
 name_op('DELETE_NAME', 91)      # ""
@@ -200,8 +220,34 @@ def jabs_op(name, op):
 jrel_op('POP_JUMP_BACKWARD_IF_FALSE', 175)
 jrel_op('POP_JUMP_BACKWARD_IF_TRUE', 176)
 
+hasarg.extend([op for op in opmap.values() if op >= HAVE_ARGUMENT])
+
+MIN_PSEUDO_OPCODE = 256
+
+pseudo_op('SETUP_FINALLY', 256, ['NOP'])
+hasexc.append(256)
+pseudo_op('SETUP_CLEANUP', 257, ['NOP'])
+hasexc.append(257)
+pseudo_op('SETUP_WITH', 258, ['NOP'])
+hasexc.append(258)
+pseudo_op('POP_BLOCK', 259, ['NOP'])
+
+pseudo_op('JUMP', 260, ['JUMP_FORWARD', 'JUMP_BACKWARD'])
+pseudo_op('JUMP_NO_INTERRUPT', 261, ['JUMP_FORWARD', 'JUMP_BACKWARD_NO_INTERRUPT'])
+pseudo_op('POP_JUMP_IF_FALSE', 262, ['POP_JUMP_FORWARD_IF_FALSE', 'POP_JUMP_BACKWARD_IF_FALSE'])
+pseudo_op('POP_JUMP_IF_TRUE', 263, ['POP_JUMP_FORWARD_IF_TRUE', 'POP_JUMP_BACKWARD_IF_TRUE'])
+pseudo_op('POP_JUMP_IF_NONE', 264, ['POP_JUMP_FORWARD_IF_NONE', 'POP_JUMP_BACKWARD_IF_NONE'])
+pseudo_op('POP_JUMP_IF_NOT_NONE', 265, ['POP_JUMP_FORWARD_IF_NOT_NONE', 'POP_JUMP_BACKWARD_IF_NOT_NONE'])
+pseudo_op('LOAD_METHOD', 266, ['LOAD_ATTR'])
+
+MAX_PSEUDO_OPCODE = MIN_PSEUDO_OPCODE + len(_pseudo_ops) - 1
+
+del def_op, name_op, jrel_op, jabs_op, pseudo_op
+
+opname = ['<%r>' % (op,) for op in range(MAX_PSEUDO_OPCODE + 1)]
+for op, i in opmap.items():
+    opname[i] = op
 
-del def_op, name_op, jrel_op, jabs_op
 
 _nb_ops = [
     ("NB_ADD", "+"),
diff --git a/Lib/test/test__opcode.py b/Lib/test/test__opcode.py
index 2a4c0d2eeb656..f548e3647b31c 100644
--- a/Lib/test/test__opcode.py
+++ b/Lib/test/test__opcode.py
@@ -18,9 +18,10 @@ def test_stack_effect(self):
         self.assertRaises(ValueError, stack_effect, dis.opmap['BUILD_SLICE'])
         self.assertRaises(ValueError, stack_effect, dis.opmap['POP_TOP'], 0)
         # All defined opcodes
+        has_arg = dis.hasarg
         for name, code in filter(lambda item: item[0] not in dis.deoptmap, dis.opmap.items()):
             with self.subTest(opname=name):
-                if code < dis.HAVE_ARGUMENT:
+                if code not in has_arg:
                     stack_effect(code)
                     self.assertRaises(ValueError, stack_effect, code, 0)
                 else:
@@ -46,10 +47,12 @@ def test_stack_effect_jump(self):
         self.assertEqual(stack_effect(JUMP_FORWARD, 0, jump=True), 0)
         self.assertEqual(stack_effect(JUMP_FORWARD, 0, jump=False), 0)
         # All defined opcodes
+        has_arg = dis.hasarg
+        has_exc = dis.hasexc
         has_jump = dis.hasjabs + dis.hasjrel
         for name, code in filter(lambda item: item[0] not in dis.deoptmap, dis.opmap.items()):
             with self.subTest(opname=name):
-                if code < dis.HAVE_ARGUMENT:
+                if code not in has_arg:
                     common = stack_effect(code)
                     jump = stack_effect(code, jump=True)
                     nojump = stack_effect(code, jump=False)
@@ -57,7 +60,7 @@ def test_stack_effect_jump(self):
                     common = stack_effect(code, 0)
                     jump = stack_effect(code, 0, jump=True)
                     nojump = stack_effect(code, 0, jump=False)
-                if code in has_jump:
+                if code in has_jump or code in has_exc:
                     self.assertEqual(common, max(jump, nojump))
                 else:
                     self.assertEqual(jump, common)
diff --git a/Lib/test/test_dis.py b/Lib/test/test_dis.py
index 255425302f428..07f1203ff0688 100644
--- a/Lib/test/test_dis.py
+++ b/Lib/test/test_dis.py
@@ -897,7 +897,7 @@ def test_widths(self):
                 continue
             with self.subTest(opname=opname):
                 width = dis._OPNAME_WIDTH
-                if opcode < dis.HAVE_ARGUMENT:
+                if opcode in dis.hasarg:
                     width += 1 + dis._OPARG_WIDTH
                 self.assertLessEqual(len(opname), width)
 
diff --git a/Misc/NEWS.d/next/Library/2022-06-24-20-00-57.gh-issue-94216.hxnQPu.rst b/Misc/NEWS.d/next/Library/2022-06-24-20-00-57.gh-issue-94216.hxnQPu.rst
new file mode 100644
index 0000000000000..ae3c2e7e71f35
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2022-06-24-20-00-57.gh-issue-94216.hxnQPu.rst
@@ -0,0 +1 @@
+The :mod:`dis` module now has the opcodes for pseudo instructions (those which are used by the compiler during code generation but then removed or replaced by real opcodes before the final bytecode is emitted).
diff --git a/Modules/_opcode.c b/Modules/_opcode.c
index 4812716c67271..99be977417743 100644
--- a/Modules/_opcode.c
+++ b/Modules/_opcode.c
@@ -60,12 +60,7 @@ _opcode_stack_effect_impl(PyObject *module, int opcode, PyObject *oparg,
                 "stack_effect: jump must be False, True or None");
         return -1;
     }
-    if (IS_ARTIFICIAL(opcode)) {
-        effect = PY_INVALID_STACK_EFFECT;
-    }
-    else {
-        effect = PyCompile_OpcodeStackEffectWithJump(opcode, oparg_int, jump_int);
-    }
+    effect = PyCompile_OpcodeStackEffectWithJump(opcode, oparg_int, jump_int);
     if (effect == PY_INVALID_STACK_EFFECT) {
             PyErr_SetString(PyExc_ValueError,
                     "invalid opcode or oparg");
diff --git a/Python/compile.c b/Python/compile.c
index 2d3b5717eeab5..5ae1e345201ce 100644
--- a/Python/compile.c
+++ b/Python/compile.c
@@ -71,40 +71,14 @@
 #define MAX_ALLOWED_STACK_USE (STACK_USE_GUIDELINE * 100)
 
 
-/* Pseudo-instructions used in the compiler,
- * but turned into NOPs or other instructions
- * by the assembler. */
-#define SETUP_FINALLY -1
-#define SETUP_CLEANUP -2
-#define SETUP_WITH -3
-#define POP_BLOCK -4
-#define JUMP -5
-#define JUMP_NO_INTERRUPT -6
-#define POP_JUMP_IF_FALSE -7
-#define POP_JUMP_IF_TRUE -8
-#define POP_JUMP_IF_NONE -9
-#define POP_JUMP_IF_NOT_NONE -10
-#define LOAD_METHOD -11
-
-#define MIN_VIRTUAL_OPCODE -11
-#define MAX_ALLOWED_OPCODE 254
+#define MAX_REAL_OPCODE 254
 
 #define IS_WITHIN_OPCODE_RANGE(opcode) \
-        ((opcode) >= MIN_VIRTUAL_OPCODE && (opcode) <= MAX_ALLOWED_OPCODE)
-
-#define IS_VIRTUAL_OPCODE(opcode) ((opcode) < 0)
-
-#define IS_VIRTUAL_JUMP_OPCODE(opcode) \
-        ((opcode) == JUMP || \
-         (opcode) == JUMP_NO_INTERRUPT || \
-         (opcode) == POP_JUMP_IF_NONE || \
-         (opcode) == POP_JUMP_IF_NOT_NONE || \
-         (opcode) == POP_JUMP_IF_FALSE || \
-         (opcode) == POP_JUMP_IF_TRUE)
+        (((opcode) >= 0 && (opcode) <= MAX_REAL_OPCODE) || \
+         IS_PSEUDO_OPCODE(opcode))
 
 #define IS_JUMP_OPCODE(opcode) \
-        (IS_VIRTUAL_JUMP_OPCODE(opcode) || \
-         is_bit_set_in_table(_PyOpcode_Jump, opcode))
+         is_bit_set_in_table(_PyOpcode_Jump, opcode)
 
 #define IS_BLOCK_PUSH_OPCODE(opcode) \
         ((opcode) == SETUP_FINALLY || \
@@ -125,7 +99,6 @@
          (opcode) == POP_JUMP_FORWARD_IF_FALSE || \
          (opcode) == POP_JUMP_BACKWARD_IF_FALSE)
 
-
 #define IS_BACKWARDS_JUMP_OPCODE(opcode) \
         ((opcode) == JUMP_BACKWARD || \
          (opcode) == JUMP_BACKWARD_NO_INTERRUPT || \
@@ -183,11 +156,11 @@ typedef struct exceptstack {
 static inline int
 is_bit_set_in_table(const uint32_t *table, int bitindex) {
     /* Is the relevant bit set in the relevant word? */
-    /* 256 bits fit into 8 32-bits words.
+    /* 512 bits fit into 9 32-bits words.
      * Word is indexed by (bitindex>>ln(size of int in bits)).
      * Bit within word is the low bits of bitindex.
      */
-    if (bitindex >= 0 && bitindex < 256) {
+    if (bitindex >= 0 && bitindex < 512) {
         uint32_t word = table[bitindex >> LOG_BITS_PER_INT];
         return (word >> (bitindex & MASK_LOW_LOG_BITS)) & 1;
     }
@@ -218,7 +191,7 @@ static int
 instr_size(struct instr *instruction)
 {
     int opcode = instruction->i_opcode;
-    assert(!IS_VIRTUAL_OPCODE(opcode));
+    assert(!IS_PSEUDO_OPCODE(opcode));
     int oparg = HAS_ARG(opcode) ? instruction->i_oparg : 0;
     int extended_args = (0xFFFFFF < oparg) + (0xFFFF < oparg) + (0xFF < oparg);
     int caches = _PyOpcode_Caches[opcode];
@@ -229,7 +202,7 @@ static void
 write_instr(_Py_CODEUNIT *codestr, struct instr *instruction, int ilen)
 {
     int opcode = instruction->i_opcode;
-    assert(!IS_VIRTUAL_OPCODE(opcode));
+    assert(!IS_PSEUDO_OPCODE(opcode));
     int oparg = HAS_ARG(opcode) ? instruction->i_oparg : 0;
     int caches = _PyOpcode_Caches[opcode];
     switch (ilen - caches) {
@@ -1274,7 +1247,7 @@ static int
 is_end_of_basic_block(struct instr *instr)
 {
     int opcode = instr->i_opcode;
-    return is_jump(instr) || IS_SCOPE_EXIT_OPCODE(opcode);
+    return IS_JUMP_OPCODE(opcode) || IS_SCOPE_EXIT_OPCODE(opcode);
 }
 
 static int
@@ -1324,7 +1297,7 @@ basicblock_addop(basicblock *b, int opcode, int oparg,
 static int
 compiler_addop(struct compiler *c, int opcode, bool line)
 {
-    assert(!HAS_ARG(opcode) || IS_ARTIFICIAL(opcode));
+    assert(!HAS_ARG(opcode));
     if (compiler_use_new_implicit_block_if_needed(c) < 0) {
         return -1;
     }
@@ -8990,7 +8963,6 @@ apply_static_swaps(basicblock *block, int i)
 static bool
 jump_thread(struct instr *inst, struct instr *target, int opcode)
 {
-    assert(!IS_VIRTUAL_OPCODE(opcode) || IS_VIRTUAL_JUMP_OPCODE(opcode));
     assert(is_jump(inst));
     assert(is_jump(target));
     // bpo-45773: If inst->i_target == target->i_target, then nothing actually
diff --git a/Python/makeopcodetargets.py b/Python/makeopcodetargets.py
index 3bf2e35ccb6da..33a4b4a76a125 100755
--- a/Python/makeopcodetargets.py
+++ b/Python/makeopcodetargets.py
@@ -34,7 +34,8 @@ def write_contents(f):
     targets = ['_unknown_opcode'] * 256
     targets[255] = "TARGET_DO_TRACING"
     for opname, op in opcode.opmap.items():
-        targets[op] = "TARGET_%s" % opname
+        if not opcode.is_pseudo(op):
+            targets[op] = "TARGET_%s" % opname
     next_op = 1
     for opname in opcode._specialized_instructions:
         while targets[next_op] != '_unknown_opcode':
diff --git a/Tools/scripts/generate_opcode_h.py b/Tools/scripts/generate_opcode_h.py
index e1f4f01ae1de0..1d21af8cac281 100644
--- a/Tools/scripts/generate_opcode_h.py
+++ b/Tools/scripts/generate_opcode_h.py
@@ -20,11 +20,8 @@
 """.lstrip()
 
 footer = """
-#define HAS_ARG(op) ((op) >= HAVE_ARGUMENT)
 
-/* Reserve some bytecodes for internal use in the compiler.
- * The value of 240 is arbitrary. */
-#define IS_ARTIFICIAL(op) ((op) > 240)
+#define IS_PSEUDO_OPCODE(op) (((op) >= MIN_PSEUDO_OPCODE) && ((op) <= MAX_PSEUDO_OPCODE))
 
 #ifdef __cplusplus
 }
@@ -63,8 +60,8 @@ def write_int_array_from_ops(name, ops, out):
     bits = 0
     for op in ops:
         bits |= 1<<op
-    out.write(f"static const uint32_t {name}[8] = {{\n")
-    for i in range(8):
+    out.write(f"static const uint32_t {name}[9] = {{\n")
+    for i in range(9):
         out.write(f"    {bits & UINT32_MASK}U,\n")
         bits >>= 32
     assert bits == 0
@@ -81,10 +78,19 @@ def main(opcode_py, outfile='Include/opcode.h', internaloutfile='Include/interna
     exec(code, opcode)
     opmap = opcode['opmap']
     opname = opcode['opname']
+    hasarg = opcode['hasarg']
     hasconst = opcode['hasconst']
     hasjrel = opcode['hasjrel']
     hasjabs = opcode['hasjabs']
-    used = [ False ] * 256
+    is_pseudo = opcode['is_pseudo']
+    _pseudo_ops = opcode['_pseudo_ops']
+
+    HAVE_ARGUMENT = opcode["HAVE_ARGUMENT"]
+    MIN_PSEUDO_OPCODE = opcode["MIN_PSEUDO_OPCODE"]
+    MAX_PSEUDO_OPCODE = opcode["MAX_PSEUDO_OPCODE"]
+
+    NUM_OPCODES = len(opname)
+    used = [ False ] * len(opname)
     next_op = 1
 
     for name, op in opmap.items():
@@ -108,9 +114,17 @@ def main(opcode_py, outfile='Include/opcode.h', internaloutfile='Include/interna
 
         for name in opname:
             if name in opmap:
-                fobj.write(DEFINE.format(name, opmap[name]))
-            if name == 'POP_EXCEPT': # Special entry for HAVE_ARGUMENT
-                fobj.write(DEFINE.format("HAVE_ARGUMENT", opcode["HAVE_ARGUMENT"]))
+                op = opmap[name]
+                if op == HAVE_ARGUMENT:
+                    fobj.write(DEFINE.format("HAVE_ARGUMENT", HAVE_ARGUMENT))
+                if op == MIN_PSEUDO_OPCODE:
+                    fobj.write(DEFINE.format("MIN_PSEUDO_OPCODE", MIN_PSEUDO_OPCODE))
+
+                fobj.write(DEFINE.format(name, op))
+
+                if op == MAX_PSEUDO_OPCODE:
+                    fobj.write(DEFINE.format("MAX_PSEUDO_OPCODE", MAX_PSEUDO_OPCODE))
+
 
         for name, op in specialized_opmap.items():
             fobj.write(DEFINE.format(name, op))
@@ -129,8 +143,9 @@ def main(opcode_py, outfile='Include/opcode.h', internaloutfile='Include/interna
         iobj.write("};\n")
 
         deoptcodes = {}
-        for basic in opmap:
-            deoptcodes[basic] = basic
+        for basic, op in opmap.items():
+            if not is_pseudo(op):
+                deoptcodes[basic] = basic
         for basic, family in opcode["_specializations"].items():
             for specialized in family:
                 deoptcodes[specialized] = basic
@@ -146,10 +161,17 @@ def main(opcode_py, outfile='Include/opcode.h', internaloutfile='Include/interna
         iobj.write("};\n")
         iobj.write("#endif   // NEED_OPCODE_TABLES\n")
 
+        fobj.write("\n")
+        fobj.write("#define HAS_ARG(op) ((((op) >= HAVE_ARGUMENT) && (!IS_PSEUDO_OPCODE(op)))\\")
+        for op in _pseudo_ops:
+            if opmap[op] in hasarg:
+                fobj.write(f"\n    || ((op) == {op}) \\")
+        fobj.write("\n    )\n")
+
         fobj.write("\n")
         fobj.write("#define HAS_CONST(op) (false\\")
         for op in hasconst:
-            fobj.write(f"\n    || ((op) == {op}) \\")
+            fobj.write(f"\n    || ((op) == {opname[op]}) \\")
         fobj.write("\n    )\n")
 
         fobj.write("\n")
@@ -158,7 +180,7 @@ def main(opcode_py, outfile='Include/opcode.h', internaloutfile='Include/interna
 
         iobj.write("\n")
         iobj.write("#ifdef Py_DEBUG\n")
-        iobj.write("static const char *const _PyOpcode_OpName[256] = {\n")
+        iobj.write(f"static const char *const _PyOpcode_OpName[{NUM_OPCODES}] = {{\n")
         for op, name in enumerate(opname_including_specialized):
             if name[0] != "<":
                 op = name


From webhook-mailer at python.org  Fri Jul  1 10:44:41 2022
From: webhook-mailer at python.org (markshannon)
Date: Fri, 01 Jul 2022 14:44:41 -0000
Subject: [Python-checkins] [3.11] GH-94438: Backport GH-94444 (#94486)
Message-ID: <mailman.2041.1656686681.20746.python-checkins@python.org>

https://github.com/python/cpython/commit/02b30a8ef8fe591e7f5ebc00a885811a98f1d357
commit: 02b30a8ef8fe591e7f5ebc00a885811a98f1d357
branch: 3.11
author: Mark Shannon <mark at hotpy.org>
committer: markshannon <mark at hotpy.org>
date: 2022-07-01T15:44:30+01:00
summary:

[3.11] GH-94438: Backport GH-94444 (#94486)

* Account for NULLs on evaluation stack when jumping lines.

files:
A Misc/NEWS.d/next/Core and Builtins/2022-06-30-15-07-26.gh-issue-94438.btzHSk.rst
M Lib/test/test_sys_settrace.py
M Objects/frameobject.c

diff --git a/Lib/test/test_sys_settrace.py b/Lib/test/test_sys_settrace.py
index 162fd8328582c..fd2740ea19f0c 100644
--- a/Lib/test/test_sys_settrace.py
+++ b/Lib/test/test_sys_settrace.py
@@ -2264,25 +2264,25 @@ async def test_no_jump_backwards_into_async_for_block(output):
             output.append(2)
         output.append(3)
 
-    @jump_test(1, 3, [], (ValueError, 'depth'))
+    @jump_test(1, 3, [], (ValueError, 'stack'))
     def test_no_jump_forwards_into_with_block(output):
         output.append(1)
         with tracecontext(output, 2):
             output.append(3)
 
-    @async_jump_test(1, 3, [], (ValueError, 'depth'))
+    @async_jump_test(1, 3, [], (ValueError, 'stack'))
     async def test_no_jump_forwards_into_async_with_block(output):
         output.append(1)
         async with asynctracecontext(output, 2):
             output.append(3)
 
-    @jump_test(3, 2, [1, 2, -1], (ValueError, 'depth'))
+    @jump_test(3, 2, [1, 2, -1], (ValueError, 'stack'))
     def test_no_jump_backwards_into_with_block(output):
         with tracecontext(output, 1):
             output.append(2)
         output.append(3)
 
-    @async_jump_test(3, 2, [1, 2, -1], (ValueError, 'depth'))
+    @async_jump_test(3, 2, [1, 2, -1], (ValueError, 'stack'))
     async def test_no_jump_backwards_into_async_with_block(output):
         async with asynctracecontext(output, 1):
             output.append(2)
@@ -2584,6 +2584,63 @@ async def test_jump_backward_over_async_listcomp_v2(output):
         output.append(7)
         output.append(8)
 
+    # checking for segfaults.
+    @jump_test(3, 7, [], error=(ValueError, "stack"))
+    def test_jump_with_null_on_stack_load_global(output):
+        a = 1
+        print(
+            output.append(3)
+        )
+        output.append(5)
+        (
+            ( # 7
+                a
+                +
+                10
+            )
+            +
+            13
+        )
+        output.append(15)
+
+    # checking for segfaults.
+    @jump_test(4, 8, [], error=(ValueError, "stack"))
+    def test_jump_with_null_on_stack_push_null(output):
+        a = 1
+        f = print
+        f(
+            output.append(4)
+        )
+        output.append(6)
+        (
+            ( # 8
+                a
+                +
+                11
+            )
+            +
+            14
+        )
+        output.append(16)
+
+    # checking for segfaults.
+    @jump_test(3, 7, [], error=(ValueError, "stack"))
+    def test_jump_with_null_on_stack_load_attr(output):
+        a = 1
+        list.append(
+            output, 3
+        )
+        output.append(5)
+        (
+            ( # 7
+                a
+                +
+                10
+            )
+            +
+            13
+        )
+        output.append(15)
 
 class TestExtendedArgs(unittest.TestCase):
 
diff --git a/Misc/NEWS.d/next/Core and Builtins/2022-06-30-15-07-26.gh-issue-94438.btzHSk.rst b/Misc/NEWS.d/next/Core and Builtins/2022-06-30-15-07-26.gh-issue-94438.btzHSk.rst
new file mode 100644
index 0000000000000..b08dd8f2ad160
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2022-06-30-15-07-26.gh-issue-94438.btzHSk.rst	
@@ -0,0 +1,2 @@
+Account for instructions that can push NULL to the stack when setting line
+number in a frame. Prevents some (unlikely) crashes.
diff --git a/Objects/frameobject.c b/Objects/frameobject.c
index 8be41d4ae06c3..85cc4a2cbcb1e 100644
--- a/Objects/frameobject.c
+++ b/Objects/frameobject.c
@@ -137,9 +137,24 @@ typedef enum kind {
     Iterator = 1,
     Except = 2,
     Object = 3,
+    Null = 4,
 } Kind;
 
-#define BITS_PER_BLOCK 2
+static int
+compatible_kind(Kind from, Kind to) {
+    if (to == 0) {
+        return 0;
+    }
+    if (to == Object) {
+        return from != Null;
+    }
+    if (to == Null) {
+        return 1;
+    }
+    return from == to;
+}
+
+#define BITS_PER_BLOCK 3
 
 #define UNINITIALIZED -2
 #define OVERFLOWED -1
@@ -298,6 +313,23 @@ mark_stacks(PyCodeObject *code_obj, int len)
                 case RERAISE:
                     /* End of block */
                     break;
+                case PUSH_NULL:
+                    next_stack = push_value(next_stack, Null);
+                    stacks[i+1] = next_stack;
+                    break;
+                case LOAD_GLOBAL:
+                    if (_Py_OPARG(code[i]) & 1) {
+                        next_stack = push_value(next_stack, Null);
+                    }
+                    next_stack = push_value(next_stack, Object);
+                    stacks[i+1] = next_stack;
+                    break;
+                case LOAD_METHOD:
+                    next_stack = pop_value(next_stack);
+                    next_stack = push_value(next_stack, Null);
+                    next_stack = push_value(next_stack, Object);
+                    stacks[i+1] = next_stack;
+                    break;
                 default:
                 {
                     int delta = PyCompile_OpcodeStackEffect(opcode, _Py_OPARG(code[i]));
@@ -318,17 +350,6 @@ mark_stacks(PyCodeObject *code_obj, int len)
     return stacks;
 }
 
-static int
-compatible_kind(Kind from, Kind to) {
-    if (to == 0) {
-        return 0;
-    }
-    if (to == Object) {
-        return 1;
-    }
-    return from == to;
-}
-
 static int
 compatible_stack(int64_t from_stack, int64_t to_stack)
 {
@@ -365,7 +386,8 @@ explain_incompatible_stack(int64_t to_stack)
         case Except:
             return "can't jump into an 'except' block as there's no exception";
         case Object:
-            return "differing stack depth";
+        case Null:
+            return "incompatible stacks";
         case Iterator:
             return "can't jump into the body of a for loop";
         default:


From webhook-mailer at python.org  Fri Jul  1 11:18:16 2022
From: webhook-mailer at python.org (ambv)
Date: Fri, 01 Jul 2022 15:18:16 -0000
Subject: [Python-checkins] gh-75372: Specify major version in README for
 installation (GH-92759)
Message-ID: <mailman.2042.1656688697.20746.python-checkins@python.org>

https://github.com/python/cpython/commit/3abda7a38a2a6803d4dbf70c6ae097ad5b59c58d
commit: 3abda7a38a2a6803d4dbf70c6ae097ad5b59c58d
branch: main
author: Stanley <46876382+slateny at users.noreply.github.com>
committer: ambv <lukasz at langa.pl>
date: 2022-07-01T17:18:07+02:00
summary:

gh-75372: Specify major version in README for installation (GH-92759)

files:
M README.rst

diff --git a/README.rst b/README.rst
index 90061a886a6ec..4ae5dfd1bb252 100644
--- a/README.rst
+++ b/README.rst
@@ -201,7 +201,7 @@ script) you must take care that your primary python executable is not
 overwritten by the installation of a different version.  All files and
 directories installed using ``make altinstall`` contain the major and minor
 version and can thus live side-by-side.  ``make install`` also creates
-``${prefix}/bin/python3`` which refers to ``${prefix}/bin/pythonX.Y``.  If you
+``${prefix}/bin/python3`` which refers to ``${prefix}/bin/python3.X``.  If you
 intend to install multiple versions using the same prefix you must decide which
 version (if any) is your "primary" version.  Install that version using ``make
 install``.  Install all other versions using ``make altinstall``.


From webhook-mailer at python.org  Fri Jul  1 11:33:01 2022
From: webhook-mailer at python.org (ambv)
Date: Fri, 01 Jul 2022 15:33:01 -0000
Subject: [Python-checkins] [3.11] gh-93975: Provide nicer error reporting
 from subprocesses in test_venv.EnsurePipTest.test_with_pip (GH-93959)
 (GH-94003)
Message-ID: <mailman.2043.1656689582.20746.python-checkins@python.org>

https://github.com/python/cpython/commit/c4f82ea0de37edee2aca60c0c32df2539a098d7e
commit: c4f82ea0de37edee2aca60c0c32df2539a098d7e
branch: 3.11
author: Jason R. Coombs <jaraco at jaraco.com>
committer: ambv <lukasz at langa.pl>
date: 2022-07-01T17:32:56+02:00
summary:

[3.11] gh-93975: Provide nicer error reporting from subprocesses in test_venv.EnsurePipTest.test_with_pip (GH-93959) (GH-94003)

This change does three things:

1. Extract a function for trapping output in subprocesses.
2. Emit both stdout and stderr when encountering an error.
3. Apply the change to `ensurepip._uninstall` check.
(cherry picked from commit 6066f450b91f1cbebf33a245c14e660052ccd90a)

Co-authored-by: Jason R. Coombs <jaraco at jaraco.com>

files:
A Misc/NEWS.d/next/Tests/2022-06-17-13-55-11.gh-issue-93957.X4ovYV.rst
M Lib/test/test_venv.py

diff --git a/Lib/test/test_venv.py b/Lib/test/test_venv.py
index 37b61a780cb07..4440fceace206 100644
--- a/Lib/test/test_venv.py
+++ b/Lib/test/test_venv.py
@@ -5,6 +5,7 @@
 Licensed to the PSF under a contributor agreement.
 """
 
+import contextlib
 import ensurepip
 import os
 import os.path
@@ -558,16 +559,10 @@ def do_test_with_pip(self, system_site_packages):
 
                 # Actually run the create command with all that unhelpful
                 # config in place to ensure we ignore it
-                try:
+                with self.nicer_error():
                     self.run_with_capture(venv.create, self.env_dir,
                                           system_site_packages=system_site_packages,
                                           with_pip=True)
-                except subprocess.CalledProcessError as exc:
-                    # The output this produces can be a little hard to read,
-                    # but at least it has all the details
-                    details = exc.output.decode(errors="replace")
-                    msg = "{}\n\n**Subprocess Output**\n{}"
-                    self.fail(msg.format(exc, details))
         # Ensure pip is available in the virtual environment
         envpy = os.path.join(os.path.realpath(self.env_dir), self.bindir, self.exe)
         # Ignore DeprecationWarning since pip code is not part of Python
@@ -588,13 +583,14 @@ def do_test_with_pip(self, system_site_packages):
         # Check the private uninstall command provided for the Windows
         # installers works (at least in a virtual environment)
         with EnvironmentVarGuard() as envvars:
-            # It seems ensurepip._uninstall calls subprocesses which do not
-            # inherit the interpreter settings.
-            envvars["PYTHONWARNINGS"] = "ignore"
-            out, err = check_output([envpy,
-                '-W', 'ignore::DeprecationWarning',
-                '-W', 'ignore::ImportWarning', '-I',
-                '-m', 'ensurepip._uninstall'])
+            with self.nicer_error():
+                # It seems ensurepip._uninstall calls subprocesses which do not
+                # inherit the interpreter settings.
+                envvars["PYTHONWARNINGS"] = "ignore"
+                out, err = check_output([envpy,
+                    '-W', 'ignore::DeprecationWarning',
+                    '-W', 'ignore::ImportWarning', '-I',
+                    '-m', 'ensurepip._uninstall'])
         # We force everything to text, so unittest gives the detailed diff
         # if we get unexpected results
         err = err.decode("latin-1") # Force to text, prevent decoding errors
@@ -620,10 +616,30 @@ def do_test_with_pip(self, system_site_packages):
         if not system_site_packages:
             self.assert_pip_not_installed()
 
+    @contextlib.contextmanager
+    def nicer_error(self):
+        """
+        Capture output from a failed subprocess for easier debugging.
+
+        The output this handler produces can be a little hard to read,
+        but at least it has all the details.
+        """
+        try:
+            yield
+        except subprocess.CalledProcessError as exc:
+            out = exc.output.decode(errors="replace")
+            err = exc.stderr.decode(errors="replace")
+            self.fail(
+                f"{exc}\n\n"
+                f"**Subprocess Output**\n{out}\n\n"
+                f"**Subprocess Error**\n{err}"
+            )
+
     @requires_venv_with_pip()
     def test_with_pip(self):
         self.do_test_with_pip(False)
         self.do_test_with_pip(True)
 
+
 if __name__ == "__main__":
     unittest.main()
diff --git a/Misc/NEWS.d/next/Tests/2022-06-17-13-55-11.gh-issue-93957.X4ovYV.rst b/Misc/NEWS.d/next/Tests/2022-06-17-13-55-11.gh-issue-93957.X4ovYV.rst
new file mode 100644
index 0000000000000..2719933f6b94c
--- /dev/null
+++ b/Misc/NEWS.d/next/Tests/2022-06-17-13-55-11.gh-issue-93957.X4ovYV.rst
@@ -0,0 +1,2 @@
+Provide nicer error reporting from subprocesses in
+test_venv.EnsurePipTest.test_with_pip.


From webhook-mailer at python.org  Fri Jul  1 11:34:20 2022
From: webhook-mailer at python.org (ambv)
Date: Fri, 01 Jul 2022 15:34:20 -0000
Subject: [Python-checkins] [3.10] gh-93975: Provide nicer error reporting
 from subprocesses in test_venv.EnsurePipTest.test_with_pip (GH-93959)
 (GH-94004)
Message-ID: <mailman.2044.1656689661.20746.python-checkins@python.org>

https://github.com/python/cpython/commit/259dd7ee8af54e3328ebf41131364b811c055814
commit: 259dd7ee8af54e3328ebf41131364b811c055814
branch: 3.10
author: Jason R. Coombs <jaraco at jaraco.com>
committer: ambv <lukasz at langa.pl>
date: 2022-07-01T17:34:11+02:00
summary:

[3.10] gh-93975: Provide nicer error reporting from subprocesses in test_venv.EnsurePipTest.test_with_pip (GH-93959) (GH-94004)

This change does three things:

1. Extract a function for trapping output in subprocesses.
2. Emit both stdout and stderr when encountering an error.
3. Apply the change to `ensurepip._uninstall` check.
(cherry picked from commit 6066f450b91f1cbebf33a245c14e660052ccd90a)

Co-authored-by: Jason R. Coombs <jaraco at jaraco.com>

files:
A Misc/NEWS.d/next/Tests/2022-06-17-13-55-11.gh-issue-93957.X4ovYV.rst
M Lib/test/test_venv.py

diff --git a/Lib/test/test_venv.py b/Lib/test/test_venv.py
index 94d626598bac3..eca35ec4bfd1a 100644
--- a/Lib/test/test_venv.py
+++ b/Lib/test/test_venv.py
@@ -5,6 +5,7 @@
 Licensed to the PSF under a contributor agreement.
 """
 
+import contextlib
 import ensurepip
 import os
 import os.path
@@ -478,16 +479,10 @@ def do_test_with_pip(self, system_site_packages):
 
                 # Actually run the create command with all that unhelpful
                 # config in place to ensure we ignore it
-                try:
+                with self.nicer_error():
                     self.run_with_capture(venv.create, self.env_dir,
                                           system_site_packages=system_site_packages,
                                           with_pip=True)
-                except subprocess.CalledProcessError as exc:
-                    # The output this produces can be a little hard to read,
-                    # but at least it has all the details
-                    details = exc.output.decode(errors="replace")
-                    msg = "{}\n\n**Subprocess Output**\n{}"
-                    self.fail(msg.format(exc, details))
         # Ensure pip is available in the virtual environment
         envpy = os.path.join(os.path.realpath(self.env_dir), self.bindir, self.exe)
         # Ignore DeprecationWarning since pip code is not part of Python
@@ -508,13 +503,14 @@ def do_test_with_pip(self, system_site_packages):
         # Check the private uninstall command provided for the Windows
         # installers works (at least in a virtual environment)
         with EnvironmentVarGuard() as envvars:
-            # It seems ensurepip._uninstall calls subprocesses which do not
-            # inherit the interpreter settings.
-            envvars["PYTHONWARNINGS"] = "ignore"
-            out, err = check_output([envpy,
-                '-W', 'ignore::DeprecationWarning',
-                '-W', 'ignore::ImportWarning', '-I',
-                '-m', 'ensurepip._uninstall'])
+            with self.nicer_error():
+                # It seems ensurepip._uninstall calls subprocesses which do not
+                # inherit the interpreter settings.
+                envvars["PYTHONWARNINGS"] = "ignore"
+                out, err = check_output([envpy,
+                    '-W', 'ignore::DeprecationWarning',
+                    '-W', 'ignore::ImportWarning', '-I',
+                    '-m', 'ensurepip._uninstall'])
         # We force everything to text, so unittest gives the detailed diff
         # if we get unexpected results
         err = err.decode("latin-1") # Force to text, prevent decoding errors
@@ -540,6 +536,25 @@ def do_test_with_pip(self, system_site_packages):
         if not system_site_packages:
             self.assert_pip_not_installed()
 
+    @contextlib.contextmanager
+    def nicer_error(self):
+        """
+        Capture output from a failed subprocess for easier debugging.
+
+        The output this handler produces can be a little hard to read,
+        but at least it has all the details.
+        """
+        try:
+            yield
+        except subprocess.CalledProcessError as exc:
+            out = exc.output.decode(errors="replace")
+            err = exc.stderr.decode(errors="replace")
+            self.fail(
+                f"{exc}\n\n"
+                f"**Subprocess Output**\n{out}\n\n"
+                f"**Subprocess Error**\n{err}"
+            )
+
     # Issue #26610: pip/pep425tags.py requires ctypes
     @unittest.skipUnless(ctypes, 'pip requires ctypes')
     @requires_zlib()
@@ -547,5 +562,6 @@ def test_with_pip(self):
         self.do_test_with_pip(False)
         self.do_test_with_pip(True)
 
+
 if __name__ == "__main__":
     unittest.main()
diff --git a/Misc/NEWS.d/next/Tests/2022-06-17-13-55-11.gh-issue-93957.X4ovYV.rst b/Misc/NEWS.d/next/Tests/2022-06-17-13-55-11.gh-issue-93957.X4ovYV.rst
new file mode 100644
index 0000000000000..2719933f6b94c
--- /dev/null
+++ b/Misc/NEWS.d/next/Tests/2022-06-17-13-55-11.gh-issue-93957.X4ovYV.rst
@@ -0,0 +1,2 @@
+Provide nicer error reporting from subprocesses in
+test_venv.EnsurePipTest.test_with_pip.


From webhook-mailer at python.org  Fri Jul  1 11:51:55 2022
From: webhook-mailer at python.org (ambv)
Date: Fri, 01 Jul 2022 15:51:55 -0000
Subject: [Python-checkins] Update code sample when importing modules in
 queue doc (GH-94244)
Message-ID: <mailman.2045.1656690716.20746.python-checkins@python.org>

https://github.com/python/cpython/commit/ad55147c1d5dbfc23d2ec4554f5e82c18984158c
commit: ad55147c1d5dbfc23d2ec4554f5e82c18984158c
branch: main
author: Mariatta Wijaya <Mariatta at users.noreply.github.com>
committer: ambv <lukasz at langa.pl>
date: 2022-07-01T17:51:46+02:00
summary:

Update code sample when importing modules in queue doc (GH-94244)

In the queue documentation, the code snippet shows the import to be not PEP 8 compliant.

Since people typically copy-paste from such code samples, I think it's important to show best-practices here.

files:
M Doc/library/queue.rst

diff --git a/Doc/library/queue.rst b/Doc/library/queue.rst
index 540dde9e154e8..c67f15e953bcc 100644
--- a/Doc/library/queue.rst
+++ b/Doc/library/queue.rst
@@ -190,7 +190,8 @@ fully processed by daemon consumer threads.
 
 Example of how to wait for enqueued tasks to be completed::
 
-    import threading, queue
+    import threading
+    import queue
 
     q = queue.Queue()
 


From webhook-mailer at python.org  Fri Jul  1 12:14:49 2022
From: webhook-mailer at python.org (ambv)
Date: Fri, 01 Jul 2022 16:14:49 -0000
Subject: [Python-checkins] Update code sample when importing modules in
 queue doc (GH-94244) (GH-94490)
Message-ID: <mailman.2046.1656692089.20746.python-checkins@python.org>

https://github.com/python/cpython/commit/1b46df1e3d8bcf2ce690fc71d053e7fede9d21b3
commit: 1b46df1e3d8bcf2ce690fc71d053e7fede9d21b3
branch: 3.11
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: ambv <lukasz at langa.pl>
date: 2022-07-01T18:14:39+02:00
summary:

Update code sample when importing modules in queue doc (GH-94244) (GH-94490)

In the queue documentation, the code snippet shows the import to be not PEP 8 compliant.

Since people typically copy-paste from such code samples, I think it's important to show best-practices here.
(cherry picked from commit ad55147c1d5dbfc23d2ec4554f5e82c18984158c)

Co-authored-by: Mariatta Wijaya <Mariatta at users.noreply.github.com>

files:
M Doc/library/queue.rst

diff --git a/Doc/library/queue.rst b/Doc/library/queue.rst
index 540dde9e154e8..c67f15e953bcc 100644
--- a/Doc/library/queue.rst
+++ b/Doc/library/queue.rst
@@ -190,7 +190,8 @@ fully processed by daemon consumer threads.
 
 Example of how to wait for enqueued tasks to be completed::
 
-    import threading, queue
+    import threading
+    import queue
 
     q = queue.Queue()
 


From webhook-mailer at python.org  Fri Jul  1 12:15:13 2022
From: webhook-mailer at python.org (ambv)
Date: Fri, 01 Jul 2022 16:15:13 -0000
Subject: [Python-checkins] Update code sample when importing modules in
 queue doc (GH-94244) (GH-94491)
Message-ID: <mailman.2047.1656692114.20746.python-checkins@python.org>

https://github.com/python/cpython/commit/e55cd03c156e6e95d3ef70cd6dbb254b3869fd77
commit: e55cd03c156e6e95d3ef70cd6dbb254b3869fd77
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: ambv <lukasz at langa.pl>
date: 2022-07-01T18:15:06+02:00
summary:

Update code sample when importing modules in queue doc (GH-94244) (GH-94491)

In the queue documentation, the code snippet shows the import to be not PEP 8 compliant.

Since people typically copy-paste from such code samples, I think it's important to show best-practices here.
(cherry picked from commit ad55147c1d5dbfc23d2ec4554f5e82c18984158c)

Co-authored-by: Mariatta Wijaya <Mariatta at users.noreply.github.com>

files:
M Doc/library/queue.rst

diff --git a/Doc/library/queue.rst b/Doc/library/queue.rst
index 540dde9e154e8..c67f15e953bcc 100644
--- a/Doc/library/queue.rst
+++ b/Doc/library/queue.rst
@@ -190,7 +190,8 @@ fully processed by daemon consumer threads.
 
 Example of how to wait for enqueued tasks to be completed::
 
-    import threading, queue
+    import threading
+    import queue
 
     q = queue.Queue()
 


From webhook-mailer at python.org  Fri Jul  1 12:21:32 2022
From: webhook-mailer at python.org (ambv)
Date: Fri, 01 Jul 2022 16:21:32 -0000
Subject: [Python-checkins] gh-81054: Document that SimpleHTTPRequestHandler
 follows symbolic links (GH-94416)
Message-ID: <mailman.2048.1656692493.20746.python-checkins@python.org>

https://github.com/python/cpython/commit/80aaeabb8bd1e6b49598a7e23e0f8d99b3fcecaf
commit: 80aaeabb8bd1e6b49598a7e23e0f8d99b3fcecaf
branch: main
author: Sam Ezeh <sam.z.ezeh at gmail.com>
committer: ambv <lukasz at langa.pl>
date: 2022-07-01T18:21:27+02:00
summary:

gh-81054: Document that SimpleHTTPRequestHandler follows symbolic links (GH-94416)

files:
M Doc/library/http.server.rst
M Doc/library/security_warnings.rst

diff --git a/Doc/library/http.server.rst b/Doc/library/http.server.rst
index 9d5e5e3a75b19..3bb7294ebb4a7 100644
--- a/Doc/library/http.server.rst
+++ b/Doc/library/http.server.rst
@@ -20,7 +20,7 @@ This module defines classes for implementing HTTP servers.
 .. warning::
 
     :mod:`http.server` is not recommended for production. It only implements
-    basic security checks.
+    :ref:`basic security checks <http.server-security>`.
 
 One class, :class:`HTTPServer`, is a :class:`socketserver.TCPServer` subclass.
 It creates and listens at the HTTP socket, dispatching the requests to a
@@ -499,3 +499,14 @@ following command runs an HTTP/1.1 conformant server::
 the ``--cgi`` option::
 
         python -m http.server --cgi
+
+.. _http.server-security:
+
+Security Considerations
+-----------------------
+
+.. index:: pair: http.server; security
+
+:class:`SimpleHTTPRequestHandler` will follow symbolic links when handling
+requests, this makes it possible for files outside of the specified directory
+to be served.
diff --git a/Doc/library/security_warnings.rst b/Doc/library/security_warnings.rst
index f985dc4acd11c..284f365832062 100644
--- a/Doc/library/security_warnings.rst
+++ b/Doc/library/security_warnings.rst
@@ -14,7 +14,7 @@ The following modules have specific security considerations:
   argument disabling known insecure and blocked algorithms
   <hashlib-usedforsecurity>`
 * :mod:`http.server` is not suitable for production use, only implementing
-  basic security checks
+  basic security checks. See the :ref:`security considerations <http.server-security>`.
 * :mod:`logging`: :ref:`Logging configuration uses eval()
   <logging-eval-security>`
 * :mod:`multiprocessing`: :ref:`Connection.recv() uses pickle


From webhook-mailer at python.org  Fri Jul  1 12:22:07 2022
From: webhook-mailer at python.org (ambv)
Date: Fri, 01 Jul 2022 16:22:07 -0000
Subject: [Python-checkins] gh-75372: Specify major version in README for
 installation (GH-92759) (GH-94487)
Message-ID: <mailman.2049.1656692528.20746.python-checkins@python.org>

https://github.com/python/cpython/commit/227e0d69edf50bead48ee36fb2a9662e3b77ad50
commit: 227e0d69edf50bead48ee36fb2a9662e3b77ad50
branch: 3.11
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: ambv <lukasz at langa.pl>
date: 2022-07-01T18:22:02+02:00
summary:

gh-75372: Specify major version in README for installation (GH-92759) (GH-94487)

(cherry picked from commit 3abda7a38a2a6803d4dbf70c6ae097ad5b59c58d)

Co-authored-by: Stanley <46876382+slateny at users.noreply.github.com>

files:
M README.rst

diff --git a/README.rst b/README.rst
index 802f9528cb8ab..24fdcfbd91959 100644
--- a/README.rst
+++ b/README.rst
@@ -201,7 +201,7 @@ script) you must take care that your primary python executable is not
 overwritten by the installation of a different version.  All files and
 directories installed using ``make altinstall`` contain the major and minor
 version and can thus live side-by-side.  ``make install`` also creates
-``${prefix}/bin/python3`` which refers to ``${prefix}/bin/pythonX.Y``.  If you
+``${prefix}/bin/python3`` which refers to ``${prefix}/bin/python3.X``.  If you
 intend to install multiple versions using the same prefix you must decide which
 version (if any) is your "primary" version.  Install that version using ``make
 install``.  Install all other versions using ``make altinstall``.


From webhook-mailer at python.org  Fri Jul  1 12:22:33 2022
From: webhook-mailer at python.org (ambv)
Date: Fri, 01 Jul 2022 16:22:33 -0000
Subject: [Python-checkins] gh-75372: Specify major version in README for
 installation (GH-92759) (GH-94488)
Message-ID: <mailman.2050.1656692554.20746.python-checkins@python.org>

https://github.com/python/cpython/commit/7ab1bb1733bf4ac3e13beb46eeebe41f01096c3f
commit: 7ab1bb1733bf4ac3e13beb46eeebe41f01096c3f
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: ambv <lukasz at langa.pl>
date: 2022-07-01T18:22:28+02:00
summary:

gh-75372: Specify major version in README for installation (GH-92759) (GH-94488)

(cherry picked from commit 3abda7a38a2a6803d4dbf70c6ae097ad5b59c58d)

Co-authored-by: Stanley <46876382+slateny at users.noreply.github.com>

files:
M README.rst

diff --git a/README.rst b/README.rst
index 99db9b30c8fff..0ccd54cbed72d 100644
--- a/README.rst
+++ b/README.rst
@@ -204,7 +204,7 @@ script) you must take care that your primary python executable is not
 overwritten by the installation of a different version.  All files and
 directories installed using ``make altinstall`` contain the major and minor
 version and can thus live side-by-side.  ``make install`` also creates
-``${prefix}/bin/python3`` which refers to ``${prefix}/bin/pythonX.Y``.  If you
+``${prefix}/bin/python3`` which refers to ``${prefix}/bin/python3.X``.  If you
 intend to install multiple versions using the same prefix you must decide which
 version (if any) is your "primary" version.  Install that version using ``make
 install``.  Install all other versions using ``make altinstall``.


From webhook-mailer at python.org  Fri Jul  1 12:41:28 2022
From: webhook-mailer at python.org (ambv)
Date: Fri, 01 Jul 2022 16:41:28 -0000
Subject: [Python-checkins] gh-81054: Document that SimpleHTTPRequestHandler
 follows symbolic links (GH-94416) (GH-94492)
Message-ID: <mailman.2051.1656693689.20746.python-checkins@python.org>

https://github.com/python/cpython/commit/abf5f5c5d7071c5dd5a3cfd8fd1989af8df4cd6d
commit: abf5f5c5d7071c5dd5a3cfd8fd1989af8df4cd6d
branch: 3.11
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: ambv <lukasz at langa.pl>
date: 2022-07-01T18:41:24+02:00
summary:

gh-81054: Document that SimpleHTTPRequestHandler follows symbolic links (GH-94416) (GH-94492)

(cherry picked from commit 80aaeabb8bd1e6b49598a7e23e0f8d99b3fcecaf)

Co-authored-by: Sam Ezeh <sam.z.ezeh at gmail.com>

files:
M Doc/library/http.server.rst
M Doc/library/security_warnings.rst

diff --git a/Doc/library/http.server.rst b/Doc/library/http.server.rst
index 9d5e5e3a75b19..3bb7294ebb4a7 100644
--- a/Doc/library/http.server.rst
+++ b/Doc/library/http.server.rst
@@ -20,7 +20,7 @@ This module defines classes for implementing HTTP servers.
 .. warning::
 
     :mod:`http.server` is not recommended for production. It only implements
-    basic security checks.
+    :ref:`basic security checks <http.server-security>`.
 
 One class, :class:`HTTPServer`, is a :class:`socketserver.TCPServer` subclass.
 It creates and listens at the HTTP socket, dispatching the requests to a
@@ -499,3 +499,14 @@ following command runs an HTTP/1.1 conformant server::
 the ``--cgi`` option::
 
         python -m http.server --cgi
+
+.. _http.server-security:
+
+Security Considerations
+-----------------------
+
+.. index:: pair: http.server; security
+
+:class:`SimpleHTTPRequestHandler` will follow symbolic links when handling
+requests, this makes it possible for files outside of the specified directory
+to be served.
diff --git a/Doc/library/security_warnings.rst b/Doc/library/security_warnings.rst
index f985dc4acd11c..284f365832062 100644
--- a/Doc/library/security_warnings.rst
+++ b/Doc/library/security_warnings.rst
@@ -14,7 +14,7 @@ The following modules have specific security considerations:
   argument disabling known insecure and blocked algorithms
   <hashlib-usedforsecurity>`
 * :mod:`http.server` is not suitable for production use, only implementing
-  basic security checks
+  basic security checks. See the :ref:`security considerations <http.server-security>`.
 * :mod:`logging`: :ref:`Logging configuration uses eval()
   <logging-eval-security>`
 * :mod:`multiprocessing`: :ref:`Connection.recv() uses pickle


From webhook-mailer at python.org  Fri Jul  1 12:41:44 2022
From: webhook-mailer at python.org (ambv)
Date: Fri, 01 Jul 2022 16:41:44 -0000
Subject: [Python-checkins] gh-81054: Document that SimpleHTTPRequestHandler
 follows symbolic links (GH-94416) (GH-94493)
Message-ID: <mailman.2052.1656693705.20746.python-checkins@python.org>

https://github.com/python/cpython/commit/cf1732619a61f7b7b5223ebaf6be6455d28257f2
commit: cf1732619a61f7b7b5223ebaf6be6455d28257f2
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: ambv <lukasz at langa.pl>
date: 2022-07-01T18:41:40+02:00
summary:

gh-81054: Document that SimpleHTTPRequestHandler follows symbolic links (GH-94416) (GH-94493)

(cherry picked from commit 80aaeabb8bd1e6b49598a7e23e0f8d99b3fcecaf)

Co-authored-by: Sam Ezeh <sam.z.ezeh at gmail.com>

files:
M Doc/library/http.server.rst
M Doc/library/security_warnings.rst

diff --git a/Doc/library/http.server.rst b/Doc/library/http.server.rst
index 0de02834401aa..8584f99d1567b 100644
--- a/Doc/library/http.server.rst
+++ b/Doc/library/http.server.rst
@@ -20,7 +20,7 @@ This module defines classes for implementing HTTP servers.
 .. warning::
 
     :mod:`http.server` is not recommended for production. It only implements
-    basic security checks.
+    :ref:`basic security checks <http.server-security>`.
 
 One class, :class:`HTTPServer`, is a :class:`socketserver.TCPServer` subclass.
 It creates and listens at the HTTP socket, dispatching the requests to a
@@ -488,3 +488,14 @@ the following command uses a specific directory::
 the ``--cgi`` option::
 
         python -m http.server --cgi
+
+.. _http.server-security:
+
+Security Considerations
+-----------------------
+
+.. index:: pair: http.server; security
+
+:class:`SimpleHTTPRequestHandler` will follow symbolic links when handling
+requests, this makes it possible for files outside of the specified directory
+to be served.
diff --git a/Doc/library/security_warnings.rst b/Doc/library/security_warnings.rst
index 26b015c0f8fc7..3cc79413871f2 100644
--- a/Doc/library/security_warnings.rst
+++ b/Doc/library/security_warnings.rst
@@ -14,7 +14,7 @@ The following modules have specific security considerations:
   argument disabling known insecure and blocked algorithms
   <hashlib-usedforsecurity>`
 * :mod:`http.server` is not suitable for production use, only implementing
-  basic security checks
+  basic security checks. See the :ref:`security considerations <http.server-security>`.
 * :mod:`logging`: :ref:`Logging configuration uses eval()
   <logging-eval-security>`
 * :mod:`multiprocessing`: :ref:`Connection.recv() uses pickle


From webhook-mailer at python.org  Fri Jul  1 12:41:58 2022
From: webhook-mailer at python.org (ambv)
Date: Fri, 01 Jul 2022 16:41:58 -0000
Subject: [Python-checkins] gh-81054: Document that SimpleHTTPRequestHandler
 follows symbolic links (GH-94416) (GH-94494)
Message-ID: <mailman.2053.1656693720.20746.python-checkins@python.org>

https://github.com/python/cpython/commit/224cd0c3bf2e24f7731fb0b6f31b3839641307d7
commit: 224cd0c3bf2e24f7731fb0b6f31b3839641307d7
branch: 3.9
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: ambv <lukasz at langa.pl>
date: 2022-07-01T18:41:54+02:00
summary:

gh-81054: Document that SimpleHTTPRequestHandler follows symbolic links (GH-94416) (GH-94494)

(cherry picked from commit 80aaeabb8bd1e6b49598a7e23e0f8d99b3fcecaf)

Co-authored-by: Sam Ezeh <sam.z.ezeh at gmail.com>

files:
M Doc/library/http.server.rst
M Doc/library/security_warnings.rst

diff --git a/Doc/library/http.server.rst b/Doc/library/http.server.rst
index dea79108d34f2..4aa10e26f6191 100644
--- a/Doc/library/http.server.rst
+++ b/Doc/library/http.server.rst
@@ -20,7 +20,7 @@ This module defines classes for implementing HTTP servers (Web servers).
 .. warning::
 
     :mod:`http.server` is not recommended for production. It only implements
-    basic security checks.
+    :ref:`basic security checks <http.server-security>`.
 
 One class, :class:`HTTPServer`, is a :class:`socketserver.TCPServer` subclass.
 It creates and listens at the HTTP socket, dispatching the requests to a
@@ -488,3 +488,14 @@ the following command uses a specific directory::
 the ``--cgi`` option::
 
         python -m http.server --cgi
+
+.. _http.server-security:
+
+Security Considerations
+-----------------------
+
+.. index:: pair: http.server; security
+
+:class:`SimpleHTTPRequestHandler` will follow symbolic links when handling
+requests, this makes it possible for files outside of the specified directory
+to be served.
diff --git a/Doc/library/security_warnings.rst b/Doc/library/security_warnings.rst
index 61fd4e6e487f7..8432248d639c6 100644
--- a/Doc/library/security_warnings.rst
+++ b/Doc/library/security_warnings.rst
@@ -12,7 +12,7 @@ The following modules have specific security considerations:
   argument disabling known insecure and blocked algorithms
   <hashlib-usedforsecurity>`
 * :mod:`http.server` is not suitable for production use, only implementing
-  basic security checks
+  basic security checks. See the :ref:`security considerations <http.server-security>`.
 * :mod:`logging`: :ref:`Logging configuration uses eval()
   <logging-eval-security>`
 * :mod:`multiprocessing`: :ref:`Connection.recv() uses pickle


From webhook-mailer at python.org  Fri Jul  1 12:42:18 2022
From: webhook-mailer at python.org (ambv)
Date: Fri, 01 Jul 2022 16:42:18 -0000
Subject: [Python-checkins] [3.8] gh-81054: Document that
 SimpleHTTPRequestHandler follows symbolic links (GH-94416) (GH-94495)
Message-ID: <mailman.2054.1656693740.20746.python-checkins@python.org>

https://github.com/python/cpython/commit/bd0f2a1955f99dc504d6c7bed495ec2a0ee74859
commit: bd0f2a1955f99dc504d6c7bed495ec2a0ee74859
branch: 3.8
author: ?ukasz Langa <lukasz at langa.pl>
committer: ambv <lukasz at langa.pl>
date: 2022-07-01T18:42:13+02:00
summary:

[3.8] gh-81054: Document that SimpleHTTPRequestHandler follows symbolic links (GH-94416) (GH-94495)

(cherry picked from commit 80aaeabb8bd1e6b49598a7e23e0f8d99b3fcecaf)

Co-authored-by: Sam Ezeh <sam.z.ezeh at gmail.com>

files:
M Doc/library/http.server.rst

diff --git a/Doc/library/http.server.rst b/Doc/library/http.server.rst
index d54bd05cddded..0ba509181acd1 100644
--- a/Doc/library/http.server.rst
+++ b/Doc/library/http.server.rst
@@ -20,7 +20,7 @@ This module defines classes for implementing HTTP servers (Web servers).
 .. warning::
 
     :mod:`http.server` is not recommended for production. It only implements
-    basic security checks.
+    :ref:`basic security checks <http.server-security>`.
 
 One class, :class:`HTTPServer`, is a :class:`socketserver.TCPServer` subclass.
 It creates and listens at the HTTP socket, dispatching the requests to a
@@ -477,3 +477,14 @@ the following command uses a specific directory::
 the ``--cgi`` option::
 
         python -m http.server --cgi 8000
+
+.. _http.server-security:
+
+Security Considerations
+-----------------------
+
+.. index:: pair: http.server; security
+
+:class:`SimpleHTTPRequestHandler` will follow symbolic links when handling
+requests, this makes it possible for files outside of the specified directory
+to be served.


From webhook-mailer at python.org  Fri Jul  1 12:50:45 2022
From: webhook-mailer at python.org (ambv)
Date: Fri, 01 Jul 2022 16:50:45 -0000
Subject: [Python-checkins] [3.7] gh-81054: Document that
 SimpleHTTPRequestHandler follows symbolic links (GH-94416) (GH-94496)
Message-ID: <mailman.2055.1656694245.20746.python-checkins@python.org>

https://github.com/python/cpython/commit/239b2d9b4703ea5301dab698fe922de997973476
commit: 239b2d9b4703ea5301dab698fe922de997973476
branch: 3.7
author: ?ukasz Langa <lukasz at langa.pl>
committer: ambv <lukasz at langa.pl>
date: 2022-07-01T18:50:36+02:00
summary:

[3.7] gh-81054: Document that SimpleHTTPRequestHandler follows symbolic links (GH-94416) (GH-94496)

(cherry picked from commit 80aaeabb8bd1e6b49598a7e23e0f8d99b3fcecaf)

Co-authored-by: Sam Ezeh <sam.z.ezeh at gmail.com>

files:
M Doc/library/http.server.rst

diff --git a/Doc/library/http.server.rst b/Doc/library/http.server.rst
index 7e317cd8bc2ba..a93362d96f13f 100644
--- a/Doc/library/http.server.rst
+++ b/Doc/library/http.server.rst
@@ -19,7 +19,7 @@ This module defines classes for implementing HTTP servers (Web servers).
 .. warning::
 
     :mod:`http.server` is not recommended for production. It only implements
-    basic security checks.
+    :ref:`basic security checks <http.server-security>`.
 
 One class, :class:`HTTPServer`, is a :class:`socketserver.TCPServer` subclass.
 It creates and listens at the HTTP socket, dispatching the requests to a
@@ -470,3 +470,14 @@ the following command uses a specific directory::
 the ``--cgi`` option::
 
         python -m http.server --cgi 8000
+
+.. _http.server-security:
+
+Security Considerations
+-----------------------
+
+.. index:: pair: http.server; security
+
+:class:`SimpleHTTPRequestHandler` will follow symbolic links when handling
+requests, this makes it possible for files outside of the specified directory
+to be served.


From webhook-mailer at python.org  Fri Jul  1 15:49:02 2022
From: webhook-mailer at python.org (tiran)
Date: Fri, 01 Jul 2022 19:49:02 -0000
Subject: [Python-checkins] gh-90005: Port _dbm module to PY_STDLIB_MOD
 (GH-94433)
Message-ID: <mailman.2056.1656704943.20746.python-checkins@python.org>

https://github.com/python/cpython/commit/ec5e253556875640b1ac514e85c545346ac3f1e0
commit: ec5e253556875640b1ac514e85c545346ac3f1e0
branch: main
author: Christian Heimes <christian at python.org>
committer: tiran <christian at python.org>
date: 2022-07-01T21:48:38+02:00
summary:

gh-90005: Port _dbm module to PY_STDLIB_MOD (GH-94433)

files:
A Misc/NEWS.d/next/Build/2022-06-30-09-57-39.gh-issue-90005.9-pQyR.rst
M Modules/Setup.stdlib.in
M configure
M configure.ac
M pyconfig.h.in
M setup.py

diff --git a/Misc/NEWS.d/next/Build/2022-06-30-09-57-39.gh-issue-90005.9-pQyR.rst b/Misc/NEWS.d/next/Build/2022-06-30-09-57-39.gh-issue-90005.9-pQyR.rst
new file mode 100644
index 00000000000000..9b14f767847dad
--- /dev/null
+++ b/Misc/NEWS.d/next/Build/2022-06-30-09-57-39.gh-issue-90005.9-pQyR.rst
@@ -0,0 +1 @@
+``_dbm`` module dependencies are now detected by configure.
diff --git a/Modules/Setup.stdlib.in b/Modules/Setup.stdlib.in
index a199aefc510114..ad34f85e254514 100644
--- a/Modules/Setup.stdlib.in
+++ b/Modules/Setup.stdlib.in
@@ -68,7 +68,7 @@
 
 # dbm/gdbm
 # dbm needs either libndbm, libgdbm_compat, or libdb 5.x
-#@MODULE__DBM_TRUE at _dbm _dbmmodule.c
+ at MODULE__DBM_TRUE@_dbm _dbmmodule.c
 # gdbm module needs -lgdbm
 @MODULE__GDBM_TRUE at _gdbm _gdbmmodule.c
 
diff --git a/configure b/configure
index 9144ee19036178..8d0ba9740b8eaf 100755
--- a/configure
+++ b/configure
@@ -664,6 +664,8 @@ MODULE_NIS_FALSE
 MODULE_NIS_TRUE
 MODULE__GDBM_FALSE
 MODULE__GDBM_TRUE
+MODULE__DBM_FALSE
+MODULE__DBM_TRUE
 MODULE__DECIMAL_FALSE
 MODULE__DECIMAL_TRUE
 MODULE__CTYPES_FALSE
@@ -14040,7 +14042,6 @@ LIBS=$save_LIBS
 
 
 
-# check for _dbmmodule.c dependencies
 for ac_header in ndbm.h
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "ndbm.h" "ac_cv_header_ndbm_h" "$ac_includes_default"
@@ -14049,14 +14050,18 @@ if test "x$ac_cv_header_ndbm_h" = xyes; then :
 #define HAVE_NDBM_H 1
 _ACEOF
 
-  LIBS_SAVE="$LIBS"
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dbm_open in -lndbm" >&5
-$as_echo_n "checking for dbm_open in -lndbm... " >&6; }
-if ${ac_cv_lib_ndbm_dbm_open+:} false; then :
+  save_CFLAGS=$CFLAGS
+save_CPPFLAGS=$CPPFLAGS
+save_LDFLAGS=$LDFLAGS
+save_LIBS=$LIBS
+
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing dbm_open" >&5
+$as_echo_n "checking for library containing dbm_open... " >&6; }
+if ${ac_cv_search_dbm_open+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lndbm  $LIBS"
+  ac_func_search_save_LIBS=$LIBS
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -14075,81 +14080,73 @@ return dbm_open ();
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_ndbm_dbm_open=yes
-else
-  ac_cv_lib_ndbm_dbm_open=no
+for ac_lib in '' ndbm gdbm_compat; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+  fi
+  if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_search_dbm_open=$ac_res
 fi
 rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ndbm_dbm_open" >&5
-$as_echo "$ac_cv_lib_ndbm_dbm_open" >&6; }
-if test "x$ac_cv_lib_ndbm_dbm_open" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBNDBM 1
-_ACEOF
-
-  LIBS="-lndbm $LIBS"
-
+    conftest$ac_exeext
+  if ${ac_cv_search_dbm_open+:} false; then :
+  break
 fi
+done
+if ${ac_cv_search_dbm_open+:} false; then :
 
-  LIBS="$LIBS_SAVE"
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dbm_open in -lgdbm_compat" >&5
-$as_echo_n "checking for dbm_open in -lgdbm_compat... " >&6; }
-if ${ac_cv_lib_gdbm_compat_dbm_open+:} false; then :
-  $as_echo_n "(cached) " >&6
 else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lgdbm_compat  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dbm_open ();
-int
-main ()
-{
-return dbm_open ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_gdbm_compat_dbm_open=yes
-else
-  ac_cv_lib_gdbm_compat_dbm_open=no
+  ac_cv_search_dbm_open=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gdbm_compat_dbm_open" >&5
-$as_echo "$ac_cv_lib_gdbm_compat_dbm_open" >&6; }
-if test "x$ac_cv_lib_gdbm_compat_dbm_open" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBGDBM_COMPAT 1
-_ACEOF
-
-  LIBS="-lgdbm_compat $LIBS"
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_dbm_open" >&5
+$as_echo "$ac_cv_search_dbm_open" >&6; }
+ac_res=$ac_cv_search_dbm_open
+if test "$ac_res" != no; then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
 
 fi
 
-  LIBS="$LIBS_SAVE"
+
+CFLAGS=$save_CFLAGS
+CPPFLAGS=$save_CPPFLAGS
+LDFLAGS=$save_LDFLAGS
+LIBS=$save_LIBS
+
+
 
 fi
 
 done
 
 
-# "gdbm-ndbm.h" and "gdbm/ndbm.h" are both normalized to "gdbm_ndbm_h"
-# unset ac_cv_header_gdbm_ndbm_h to prevent false positive cache hits.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ndbm presence and linker args" >&5
+$as_echo_n "checking for ndbm presence and linker args... " >&6; }
+case $ac_cv_search_dbm_open in #(
+  *ndbm*|*gdbm_compat*) :
+
+    dbm_ndbm="$ac_cv_search_dbm_open"
+    have_ndbm=yes
+   ;; #(
+  none*) :
+
+    dbm_ndbm=""
+    have_ndbm=yes
+   ;; #(
+  no) :
+    have_ndbm=no
+ ;; #(
+  *) :
+     ;;
+esac
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_ndbm ($dbm_ndbm)" >&5
+$as_echo "$have_ndbm ($dbm_ndbm)" >&6; }
+
 { ac_cv_header_gdbm_ndbm_h=; unset ac_cv_header_gdbm_ndbm_h;}
 if ${ac_cv_header_gdbm_slash_ndbm_h+:} false; then :
   $as_echo_n "(cached) " >&6
@@ -14202,14 +14199,18 @@ fi
 { ac_cv_header_gdbm_ndbm_h=; unset ac_cv_header_gdbm_ndbm_h;}
 
 if test "$ac_cv_header_gdbm_slash_ndbm_h" = yes -o "$ac_cv_header_gdbm_dash_ndbm_h" = yes; then
-  LIBS_SAVE="$LIBS"
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dbm_open in -lgdbm_compat" >&5
-$as_echo_n "checking for dbm_open in -lgdbm_compat... " >&6; }
-if ${ac_cv_lib_gdbm_compat_dbm_open+:} false; then :
+  save_CFLAGS=$CFLAGS
+save_CPPFLAGS=$CPPFLAGS
+save_LDFLAGS=$LDFLAGS
+save_LIBS=$LIBS
+
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing dbm_open" >&5
+$as_echo_n "checking for library containing dbm_open... " >&6; }
+if ${ac_cv_search_dbm_open+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lgdbm_compat  $LIBS"
+  ac_func_search_save_LIBS=$LIBS
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -14228,27 +14229,45 @@ return dbm_open ();
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_gdbm_compat_dbm_open=yes
-else
-  ac_cv_lib_gdbm_compat_dbm_open=no
+for ac_lib in '' gdbm_compat; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+  fi
+  if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_search_dbm_open=$ac_res
 fi
 rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
+    conftest$ac_exeext
+  if ${ac_cv_search_dbm_open+:} false; then :
+  break
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gdbm_compat_dbm_open" >&5
-$as_echo "$ac_cv_lib_gdbm_compat_dbm_open" >&6; }
-if test "x$ac_cv_lib_gdbm_compat_dbm_open" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBGDBM_COMPAT 1
-_ACEOF
+done
+if ${ac_cv_search_dbm_open+:} false; then :
 
-  LIBS="-lgdbm_compat $LIBS"
+else
+  ac_cv_search_dbm_open=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_dbm_open" >&5
+$as_echo "$ac_cv_search_dbm_open" >&6; }
+ac_res=$ac_cv_search_dbm_open
+if test "$ac_res" != no; then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
 
 fi
 
-  LIBS="$LIBS_SAVE"
+
+CFLAGS=$save_CFLAGS
+CPPFLAGS=$save_CPPFLAGS
+LDFLAGS=$save_LDFLAGS
+LIBS=$save_LIBS
+
+
 fi
 
 # Check for libdb >= 5 with dbm_open()
@@ -14267,16 +14286,21 @@ if ${ac_cv_have_libdb+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
-    LIBS_SAVE="$LIBS"
-    LIBS="$LIBS -ldb"
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+    save_CFLAGS=$CFLAGS
+save_CPPFLAGS=$CPPFLAGS
+save_LDFLAGS=$LDFLAGS
+save_LIBS=$LIBS
+
+
+      LIBS="$LIBS -ldb"
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
-      #define DB_DBM_HSEARCH 1
-      #include <db.h>
-      #if DB_VERSION_MAJOR < 5
-        #error "dh.h: DB_VERSION_MAJOR < 5 is not supported."
-      #endif
+        #define DB_DBM_HSEARCH 1
+        #include <db.h>
+        #if DB_VERSION_MAJOR < 5
+          #error "dh.h: DB_VERSION_MAJOR < 5 is not supported."
+        #endif
 
 int
 main ()
@@ -14294,7 +14318,13 @@ else
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-    LIBS="$LIBS_SAVE"
+
+CFLAGS=$save_CFLAGS
+CPPFLAGS=$save_CPPFLAGS
+LDFLAGS=$save_LDFLAGS
+LIBS=$save_LIBS
+
+
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_libdb" >&5
@@ -14349,6 +14379,43 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_dbmliborder" >&5
 $as_echo "$with_dbmliborder" >&6; }
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for _dbm module CFLAGS and LIBS" >&5
+$as_echo_n "checking for _dbm module CFLAGS and LIBS... " >&6; }
+have_dbm=no
+as_save_IFS=$IFS
+IFS=:
+for db in $with_dbmliborder; do
+  case "$db" in
+    ndbm)
+      if test "$have_ndbm" = yes; then
+        DBM_CFLAGS="-DUSE_NDBM"
+        DBM_LIBS="$dbm_ndbm"
+        have_dbm=yes
+        break
+      fi
+      ;;
+    gdbm)
+      if test "$have_gdbm_compat" = yes; then
+        DBM_CFLAGS="-DUSE_GDBM_COMPAT"
+        DBM_LIBS="-lgdbm_compat"
+        have_dbm=yes
+        break
+      fi
+      ;;
+    bdb)
+      if test "$ac_cv_have_libdb" = yes; then
+        DBM_CFLAGS="-DUSE_BERKDB"
+        DBM_LIBS="-ldb"
+        have_dbm=yes
+        break
+      fi
+     ;;
+  esac
+done
+IFS=$as_save_IFS
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $DBM_CFLAGS $DBM_LIBS" >&5
+$as_echo "$DBM_CFLAGS $DBM_LIBS" >&6; }
+
 # Templates for things AC_DEFINEd more than once.
 # For a single AC_DEFINE, no template is needed.
 
@@ -24604,6 +24671,40 @@ fi
 $as_echo "$py_cv_module__decimal" >&6; }
 
 
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for stdlib extension module _dbm" >&5
+$as_echo_n "checking for stdlib extension module _dbm... " >&6; }
+        if test "$py_cv_module__dbm" != "n/a"; then :
+
+    if test -n "$with_dbmliborder"; then :
+  if test "$have_dbm" != "no"; then :
+  py_cv_module__dbm=yes
+else
+  py_cv_module__dbm=missing
+fi
+else
+  py_cv_module__dbm=disabled
+fi
+
+fi
+  as_fn_append MODULE_BLOCK "MODULE__DBM_STATE=$py_cv_module__dbm$as_nl"
+  if test "x$py_cv_module__dbm" = xyes; then :
+
+    as_fn_append MODULE_BLOCK "MODULE__DBM_CFLAGS=$DBM_CFLAGS$as_nl"
+    as_fn_append MODULE_BLOCK "MODULE__DBM_LDFLAGS=$DBM_LIBS$as_nl"
+
+fi
+   if test "$py_cv_module__dbm" = yes; then
+  MODULE__DBM_TRUE=
+  MODULE__DBM_FALSE='#'
+else
+  MODULE__DBM_TRUE='#'
+  MODULE__DBM_FALSE=
+fi
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $py_cv_module__dbm" >&5
+$as_echo "$py_cv_module__dbm" >&6; }
+
+
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for stdlib extension module _gdbm" >&5
 $as_echo_n "checking for stdlib extension module _gdbm... " >&6; }
         if test "$py_cv_module__gdbm" != "n/a"; then :
@@ -25622,6 +25723,10 @@ if test -z "${MODULE__DECIMAL_TRUE}" && test -z "${MODULE__DECIMAL_FALSE}"; then
   as_fn_error $? "conditional \"MODULE__DECIMAL\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${MODULE__DBM_TRUE}" && test -z "${MODULE__DBM_FALSE}"; then
+  as_fn_error $? "conditional \"MODULE__DBM\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${MODULE__GDBM_TRUE}" && test -z "${MODULE__GDBM_FALSE}"; then
   as_fn_error $? "conditional \"MODULE__GDBM\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
diff --git a/configure.ac b/configure.ac
index 12ae2ae8d87eb3..b03ead3bdefa04 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3956,17 +3956,30 @@ WITH_SAVE_ENV([
   ], [have_gdbm=no])
 ])
 
-# check for _dbmmodule.c dependencies
+dnl check for _dbmmodule.c dependencies
+dnl ndbm, gdbm_compat, libdb
 AC_CHECK_HEADERS([ndbm.h], [
-  LIBS_SAVE="$LIBS"
-  AC_CHECK_LIB([ndbm], [dbm_open])
-  LIBS="$LIBS_SAVE"
-  AC_CHECK_LIB([gdbm_compat], [dbm_open])
-  LIBS="$LIBS_SAVE"
+  WITH_SAVE_ENV([
+    AC_SEARCH_LIBS([dbm_open], [ndbm gdbm_compat])
+  ])
 ])
 
-# "gdbm-ndbm.h" and "gdbm/ndbm.h" are both normalized to "gdbm_ndbm_h"
-# unset ac_cv_header_gdbm_ndbm_h to prevent false positive cache hits.
+AC_MSG_CHECKING([for ndbm presence and linker args])
+AS_CASE([$ac_cv_search_dbm_open],
+  [*ndbm*|*gdbm_compat*], [
+    dbm_ndbm="$ac_cv_search_dbm_open"
+    have_ndbm=yes
+  ],
+  [none*], [
+    dbm_ndbm=""
+    have_ndbm=yes
+  ],
+  [no], [have_ndbm=no]
+)
+AC_MSG_RESULT([$have_ndbm ($dbm_ndbm)])
+
+dnl "gdbm-ndbm.h" and "gdbm/ndbm.h" are both normalized to "gdbm_ndbm_h"
+dnl unset ac_cv_header_gdbm_ndbm_h to prevent false positive cache hits.
 AS_UNSET([ac_cv_header_gdbm_ndbm_h])
 AC_CACHE_VAL([ac_cv_header_gdbm_slash_ndbm_h], [
   AC_CHECK_HEADER(
@@ -3991,26 +4004,26 @@ AS_VAR_IF([ac_cv_header_gdbm_dash_ndbm_h], [yes], [
 AS_UNSET([ac_cv_header_gdbm_ndbm_h])
 
 if test "$ac_cv_header_gdbm_slash_ndbm_h" = yes -o "$ac_cv_header_gdbm_dash_ndbm_h" = yes; then
-  LIBS_SAVE="$LIBS"
-  AC_CHECK_LIB([gdbm_compat], [dbm_open])
-  LIBS="$LIBS_SAVE"
+  WITH_SAVE_ENV([
+    AC_SEARCH_LIBS([dbm_open], [gdbm_compat])
+  ])
 fi
 
 # Check for libdb >= 5 with dbm_open()
 # db.h re-defines the name of the function
 AC_CHECK_HEADERS([db.h], [
   AC_CACHE_CHECK([for libdb], [ac_cv_have_libdb], [
-    LIBS_SAVE="$LIBS"
-    LIBS="$LIBS -ldb"
-    AC_LINK_IFELSE([AC_LANG_PROGRAM([
-      #define DB_DBM_HSEARCH 1
-      #include <db.h>
-      #if DB_VERSION_MAJOR < 5
-        #error "dh.h: DB_VERSION_MAJOR < 5 is not supported."
-      #endif
-      ], [DBM *dbm = dbm_open(NULL, 0, 0)])
-    ], [ac_cv_have_libdb=yes], [ac_cv_have_libdb=no])
-    LIBS="$LIBS_SAVE"
+    WITH_SAVE_ENV([
+      LIBS="$LIBS -ldb"
+      AC_LINK_IFELSE([AC_LANG_PROGRAM([
+        #define DB_DBM_HSEARCH 1
+        #include <db.h>
+        #if DB_VERSION_MAJOR < 5
+          #error "dh.h: DB_VERSION_MAJOR < 5 is not supported."
+        #endif
+        ], [DBM *dbm = dbm_open(NULL, 0, 0)])
+      ], [ac_cv_have_libdb=yes], [ac_cv_have_libdb=no])
+    ])
   ])
   AS_VAR_IF([ac_cv_have_libdb], [yes], [
     AC_DEFINE([HAVE_LIBDB], [1], [Define to 1 if you have the `db' library (-ldb).])
@@ -4018,7 +4031,7 @@ AC_CHECK_HEADERS([db.h], [
 ])
 
 # Check for --with-dbmliborder
-AC_MSG_CHECKING(for --with-dbmliborder)
+AC_MSG_CHECKING([for --with-dbmliborder])
 AC_ARG_WITH(dbmliborder,
             AS_HELP_STRING([--with-dbmliborder=db1:db2:...], [override order to check db backends for dbm; a valid value is a colon separated string with the backend names `ndbm', `gdbm' and `bdb'.]),
 [], [with_dbmliborder=gdbm:ndbm:bdb])
@@ -4038,7 +4051,42 @@ IFS=$as_save_IFS
 AS_VAR_IF([with_dbmliborder], [error], [
   AC_MSG_ERROR([proper usage is --with-dbmliborder=db1:db2:... (gdbm:ndbm:bdb)])
 ])
-AC_MSG_RESULT($with_dbmliborder)
+AC_MSG_RESULT([$with_dbmliborder])
+
+AC_MSG_CHECKING([for _dbm module CFLAGS and LIBS])
+have_dbm=no
+as_save_IFS=$IFS
+IFS=:
+for db in $with_dbmliborder; do
+  case "$db" in
+    ndbm)
+      if test "$have_ndbm" = yes; then
+        DBM_CFLAGS="-DUSE_NDBM"
+        DBM_LIBS="$dbm_ndbm"
+        have_dbm=yes
+        break
+      fi
+      ;;
+    gdbm)
+      if test "$have_gdbm_compat" = yes; then
+        DBM_CFLAGS="-DUSE_GDBM_COMPAT"
+        DBM_LIBS="-lgdbm_compat"
+        have_dbm=yes
+        break
+      fi
+      ;;
+    bdb)
+      if test "$ac_cv_have_libdb" = yes; then
+        DBM_CFLAGS="-DUSE_BERKDB"
+        DBM_LIBS="-ldb"
+        have_dbm=yes
+        break
+      fi
+     ;;
+  esac
+done
+IFS=$as_save_IFS
+AC_MSG_RESULT([$DBM_CFLAGS $DBM_LIBS])
 
 # Templates for things AC_DEFINEd more than once.
 # For a single AC_DEFINE, no template is needed.
@@ -6940,7 +6988,9 @@ PY_STDLIB_MOD([_ctypes],
 dnl PY_STDLIB_MOD([_curses], [], [], [], [])
 dnl PY_STDLIB_MOD([_curses_panel], [], [], [], [])
 PY_STDLIB_MOD([_decimal], [], [], [$LIBMPDEC_CFLAGS], [$LIBMPDEC_LDFLAGS])
-dnl PY_STDLIB_MOD([_dbm], [], [], [], [])
+PY_STDLIB_MOD([_dbm],
+  [test -n "$with_dbmliborder"], [test "$have_dbm" != "no"],
+  [$DBM_CFLAGS], [$DBM_LIBS])
 PY_STDLIB_MOD([_gdbm],
   [test "$have_gdbm_dbmliborder" = yes], [test "$have_gdbm" = yes],
   [$GDBM_CFLAGS], [$GDBM_LIBS])
diff --git a/pyconfig.h.in b/pyconfig.h.in
index 15933e75b1b079..b05ddd41c2bba3 100644
--- a/pyconfig.h.in
+++ b/pyconfig.h.in
@@ -640,18 +640,12 @@
 /* Define to 1 if you have the `dld' library (-ldld). */
 #undef HAVE_LIBDLD
 
-/* Define to 1 if you have the `gdbm_compat' library (-lgdbm_compat). */
-#undef HAVE_LIBGDBM_COMPAT
-
 /* Define to 1 if you have the `ieee' library (-lieee). */
 #undef HAVE_LIBIEEE
 
 /* Define to 1 if you have the <libintl.h> header file. */
 #undef HAVE_LIBINTL_H
 
-/* Define to 1 if you have the `ndbm' library (-lndbm). */
-#undef HAVE_LIBNDBM
-
 /* Define to build the readline module. */
 #undef HAVE_LIBREADLINE
 
diff --git a/setup.py b/setup.py
index 843ec35effe109..cc11dedee1b2e2 100644
--- a/setup.py
+++ b/setup.py
@@ -1163,77 +1163,7 @@ def detect_crypt(self):
         self.addext(Extension('_crypt', ['_cryptmodule.c']))
 
     def detect_dbm_gdbm(self):
-        # Modules that provide persistent dictionary-like semantics.  You will
-        # probably want to arrange for at least one of them to be available on
-        # your machine, though none are defined by default because of library
-        # dependencies.  The Python module dbm/__init__.py provides an
-        # implementation independent wrapper for these; dbm/dumb.py provides
-        # similar functionality (but slower of course) implemented in Python.
-
-        dbm_setup_debug = False   # verbose debug prints from this script?
-        dbm_order = ['gdbm']
-
-        # libdb, gdbm and ndbm headers and libraries
-        have_ndbm_h = sysconfig.get_config_var("HAVE_NDBM_H")
-        have_gdbm_ndbm_h = sysconfig.get_config_var("HAVE_GDBM_NDBM_H")
-        have_gdbm_dash_ndbm_h = sysconfig.get_config_var("HAVE_GDBM_DASH_NDBM_H")
-        have_libndbm = sysconfig.get_config_var("HAVE_LIBNDBM")
-        have_libgdbm_compat = sysconfig.get_config_var("HAVE_LIBGDBM_COMPAT")
-        have_libdb = sysconfig.get_config_var("HAVE_LIBDB")
-
-        # The standard Unix dbm module:
-        if not CYGWIN:
-            config_args = [arg.strip("'")
-                           for arg in sysconfig.get_config_var("CONFIG_ARGS").split()]
-            dbm_args = [arg for arg in config_args
-                        if arg.startswith('--with-dbmliborder=')]
-            if dbm_args:
-                dbm_order = [arg.split('=')[-1] for arg in dbm_args][-1].split(":")
-            else:
-                dbm_order = "gdbm:ndbm:bdb".split(":")
-            dbmext = None
-            for cand in dbm_order:
-                if cand == "ndbm":
-                    if have_ndbm_h:
-                        # Some systems have -lndbm, others have -lgdbm_compat,
-                        # others don't have either
-                        if have_libndbm:
-                            ndbm_libs = ['ndbm']
-                        elif have_libgdbm_compat:
-                            ndbm_libs = ['gdbm_compat']
-                        else:
-                            ndbm_libs = []
-                        if dbm_setup_debug: print("building dbm using ndbm")
-                        dbmext = Extension(
-                            '_dbm', ['_dbmmodule.c'],
-                            define_macros=[('USE_NDBM', None)],
-                            libraries=ndbm_libs
-                        )
-                        break
-                elif cand == "gdbm":
-                    # dbm_open() is provided by libgdbm_compat, which wraps libgdbm
-                    if have_libgdbm_compat and (have_gdbm_ndbm_h or have_gdbm_dash_ndbm_h):
-                        if dbm_setup_debug: print("building dbm using gdbm")
-                        dbmext = Extension(
-                            '_dbm', ['_dbmmodule.c'],
-                            define_macros=[('USE_GDBM_COMPAT', None)],
-                            libraries=['gdbm_compat']
-                        )
-                        break
-                elif cand == "bdb":
-                    if have_libdb:
-                        if dbm_setup_debug: print("building dbm using bdb")
-                        dbmext = Extension(
-                            '_dbm', ['_dbmmodule.c'],
-                            define_macros=[('USE_BERKDB', None)],
-                            libraries=['db']
-                        )
-                        break
-            if dbmext is not None:
-                self.add(dbmext)
-            else:
-                self.missing.append('_dbm')
-
+        self.addext(Extension('_dbm', ['_dbmmodule.c']))
         # Anthony Baxter's gdbm module.  GNU dbm(3) will require -lgdbm:
         self.addext(Extension('_gdbm', ['_gdbmmodule.c']))
 


From webhook-mailer at python.org  Sat Jul  2 01:45:42 2022
From: webhook-mailer at python.org (corona10)
Date: Sat, 02 Jul 2022 05:45:42 -0000
Subject: [Python-checkins] gh-93096: Remove `python -m codecs` (gh-94233)
Message-ID: <mailman.2057.1656740743.20746.python-checkins@python.org>

https://github.com/python/cpython/commit/1bc8a38d8b39f87d0d5c7a03b903bf5071732a75
commit: 1bc8a38d8b39f87d0d5c7a03b903bf5071732a75
branch: main
author: Oleg Iarygin <oleg at arhadthedev.net>
committer: corona10 <donghee.na92 at gmail.com>
date: 2022-07-02T14:45:31+09:00
summary:

gh-93096: Remove `python -m codecs` (gh-94233)

files:
A Misc/NEWS.d/next/Library/2022-06-24-19-40-40.gh-issue-93096.3RlK2d.rst
M Lib/codecs.py

diff --git a/Lib/codecs.py b/Lib/codecs.py
index e6ad6e3a05236..5a1e7ec804009 100644
--- a/Lib/codecs.py
+++ b/Lib/codecs.py
@@ -1114,13 +1114,3 @@ def make_encoding_map(decoding_map):
 _false = 0
 if _false:
     import encodings
-
-### Tests
-
-if __name__ == '__main__':
-
-    # Make stdout translate Latin-1 output into UTF-8 output
-    sys.stdout = EncodedFile(sys.stdout, 'latin-1', 'utf-8')
-
-    # Have stdin translate Latin-1 input into UTF-8 input
-    sys.stdin = EncodedFile(sys.stdin, 'utf-8', 'latin-1')
diff --git a/Misc/NEWS.d/next/Library/2022-06-24-19-40-40.gh-issue-93096.3RlK2d.rst b/Misc/NEWS.d/next/Library/2022-06-24-19-40-40.gh-issue-93096.3RlK2d.rst
new file mode 100644
index 0000000000000..f7d9e33eb414d
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2022-06-24-19-40-40.gh-issue-93096.3RlK2d.rst
@@ -0,0 +1,2 @@
+Removed undocumented ``python -m codecs``. Use ``python -m unittest
+test.test_codecs.EncodedFileTest`` instead.


From webhook-mailer at python.org  Sat Jul  2 02:24:24 2022
From: webhook-mailer at python.org (erlend-aasland)
Date: Sat, 02 Jul 2022 06:24:24 -0000
Subject: [Python-checkins] gh-94393: Remove unneeded module state from _json
 (#94394)
Message-ID: <mailman.2058.1656743065.20746.python-checkins@python.org>

https://github.com/python/cpython/commit/3a2e61524faf00657c16a321c880e1191cfdad1e
commit: 3a2e61524faf00657c16a321c880e1191cfdad1e
branch: main
author: Erlend Egeberg Aasland <erlend.aasland at innova.no>
committer: erlend-aasland <erlend.aasland at protonmail.com>
date: 2022-07-02T08:24:19+02:00
summary:

gh-94393: Remove unneeded module state from _json (#94394)

files:
M Modules/_json.c

diff --git a/Modules/_json.c b/Modules/_json.c
index 9464b9f498ede..89f55047abe42 100644
--- a/Modules/_json.c
+++ b/Modules/_json.c
@@ -14,19 +14,6 @@
 #include "structmember.h"         // PyMemberDef
 #include "pycore_accu.h"
 
-typedef struct {
-    PyObject *PyScannerType;
-    PyObject *PyEncoderType;
-} _jsonmodulestate;
-
-static inline _jsonmodulestate*
-get_json_state(PyObject *module)
-{
-    void *state = PyModule_GetState(module);
-    assert(state != NULL);
-    return (_jsonmodulestate *)state;
-}
-
 
 typedef struct _PyScannerObject {
     PyObject_HEAD
@@ -1815,70 +1802,40 @@ PyDoc_STRVAR(module_doc,
 static int
 _json_exec(PyObject *module)
 {
-    _jsonmodulestate *state = get_json_state(module);
-
-    state->PyScannerType = PyType_FromSpec(&PyScannerType_spec);
-    if (state->PyScannerType == NULL) {
+    PyObject *PyScannerType = PyType_FromSpec(&PyScannerType_spec);
+    if (PyScannerType == NULL) {
         return -1;
     }
-    Py_INCREF(state->PyScannerType);
-    if (PyModule_AddObject(module, "make_scanner", state->PyScannerType) < 0) {
-        Py_DECREF(state->PyScannerType);
+    int rc = PyModule_AddObjectRef(module, "make_scanner", PyScannerType);
+    Py_DECREF(PyScannerType);
+    if (rc < 0) {
         return -1;
     }
 
-    state->PyEncoderType = PyType_FromSpec(&PyEncoderType_spec);
-    if (state->PyEncoderType == NULL) {
+    PyObject *PyEncoderType = PyType_FromSpec(&PyEncoderType_spec);
+    if (PyEncoderType == NULL) {
         return -1;
     }
-    Py_INCREF(state->PyEncoderType);
-    if (PyModule_AddObject(module, "make_encoder", state->PyEncoderType) < 0) {
-        Py_DECREF(state->PyEncoderType);
+    rc = PyModule_AddObjectRef(module, "make_encoder", PyEncoderType);
+    Py_DECREF(PyEncoderType);
+    if (rc < 0) {
         return -1;
     }
 
     return 0;
 }
 
-static int
-_jsonmodule_traverse(PyObject *module, visitproc visit, void *arg)
-{
-    _jsonmodulestate *state = get_json_state(module);
-    Py_VISIT(state->PyScannerType);
-    Py_VISIT(state->PyEncoderType);
-    return 0;
-}
-
-static int
-_jsonmodule_clear(PyObject *module)
-{
-    _jsonmodulestate *state = get_json_state(module);
-    Py_CLEAR(state->PyScannerType);
-    Py_CLEAR(state->PyEncoderType);
-    return 0;
-}
-
-static void
-_jsonmodule_free(void *module)
-{
-    _jsonmodule_clear((PyObject *)module);
-}
-
 static PyModuleDef_Slot _json_slots[] = {
     {Py_mod_exec, _json_exec},
     {0, NULL}
 };
 
 static struct PyModuleDef jsonmodule = {
-        PyModuleDef_HEAD_INIT,
-        "_json",
-        module_doc,
-        sizeof(_jsonmodulestate),
-        speedups_methods,
-        _json_slots,
-        _jsonmodule_traverse,
-        _jsonmodule_clear,
-        _jsonmodule_free,
+    .m_base = PyModuleDef_HEAD_INIT,
+    .m_name = "_json",
+    .m_doc = module_doc,
+    .m_methods = speedups_methods,
+    .m_slots = _json_slots,
 };
 
 PyMODINIT_FUNC


From webhook-mailer at python.org  Sat Jul  2 02:35:52 2022
From: webhook-mailer at python.org (erlend-aasland)
Date: Sat, 02 Jul 2022 06:35:52 -0000
Subject: [Python-checkins] Doc: fix sqlite3 blob reference anchor (#94505)
Message-ID: <mailman.2059.1656743752.20746.python-checkins@python.org>

https://github.com/python/cpython/commit/cc81962e6975f9b45901efd05a2d156a7864b527
commit: cc81962e6975f9b45901efd05a2d156a7864b527
branch: main
author: Erlend Egeberg Aasland <erlend.aasland at innova.no>
committer: erlend-aasland <erlend.aasland at protonmail.com>
date: 2022-07-02T08:35:48+02:00
summary:

Doc: fix sqlite3 blob reference anchor (#94505)

files:
M Doc/library/sqlite3.rst

diff --git a/Doc/library/sqlite3.rst b/Doc/library/sqlite3.rst
index a99485b6ba7bc..33dfafd493099 100644
--- a/Doc/library/sqlite3.rst
+++ b/Doc/library/sqlite3.rst
@@ -1069,6 +1069,8 @@ Now we plug :class:`Row` in::
    35.14
 
 
+.. _sqlite3-blob-objects:
+
 Blob Objects
 ------------
 
@@ -1211,8 +1213,6 @@ The exception hierarchy is defined by the DB-API 2.0 (:pep:`249`).
    ``NotSupportedError`` is a subclass of :exc:`DatabaseError`.
 
 
-.. _sqlite3-blob-objects:
-
 .. _sqlite3-types:
 
 SQLite and Python types


From webhook-mailer at python.org  Sat Jul  2 02:53:54 2022
From: webhook-mailer at python.org (corona10)
Date: Sat, 02 Jul 2022 06:53:54 -0000
Subject: [Python-checkins] gh-93096: Remove `python -m base64 -t` (gh-94230)
Message-ID: <mailman.2060.1656744835.20746.python-checkins@python.org>

https://github.com/python/cpython/commit/7db1d2eaf367a1073191c80c7baeee41ae1f2f21
commit: 7db1d2eaf367a1073191c80c7baeee41ae1f2f21
branch: main
author: Oleg Iarygin <oleg at arhadthedev.net>
committer: corona10 <donghee.na92 at gmail.com>
date: 2022-07-02T15:53:43+09:00
summary:

gh-93096: Remove `python -m base64 -t` (gh-94230)

files:
A Misc/NEWS.d/next/Library/2022-06-24-19-16-09.gh-issue-93096.r1_oIc.rst
M Lib/base64.py
M Lib/test/test_base64.py

diff --git a/Lib/base64.py b/Lib/base64.py
index 7e9c2a2ca477f..30796a6fd6d05 100755
--- a/Lib/base64.py
+++ b/Lib/base64.py
@@ -567,11 +567,10 @@ def decodebytes(s):
 def main():
     """Small main program"""
     import sys, getopt
-    usage = """usage: %s [-h|-d|-e|-u|-t] [file|-]
+    usage = f"""usage: {sys.argv[0]} [-h|-d|-e|-u|-t] [file|-]
         -h: print this help message and exit
         -d, -u: decode
-        -e: encode (default)
-        -t: encode and decode string 'Aladdin:open sesame'"""%sys.argv[0]
+        -e: encode (default)"""
     try:
         opts, args = getopt.getopt(sys.argv[1:], 'hdeut')
     except getopt.error as msg:
@@ -584,7 +583,6 @@ def main():
         if o == '-e': func = encode
         if o == '-d': func = decode
         if o == '-u': func = decode
-        if o == '-t': test(); return
         if o == '-h': print(usage); return
     if args and args[0] != '-':
         with open(args[0], 'rb') as f:
@@ -593,15 +591,5 @@ def main():
         func(sys.stdin.buffer, sys.stdout.buffer)
 
 
-def test():
-    s0 = b"Aladdin:open sesame"
-    print(repr(s0))
-    s1 = encodebytes(s0)
-    print(repr(s1))
-    s2 = decodebytes(s1)
-    print(repr(s2))
-    assert s0 == s2
-
-
 if __name__ == '__main__':
     main()
diff --git a/Lib/test/test_base64.py b/Lib/test/test_base64.py
index 217f294546884..fa03fa1d61cea 100644
--- a/Lib/test/test_base64.py
+++ b/Lib/test/test_base64.py
@@ -31,6 +31,8 @@ def test_encodebytes(self):
            b"YWJjZGVmZ2hpamtsbW5vcHFyc3R1dnd4eXpBQkNE"
            b"RUZHSElKS0xNTk9QUVJTVFVWV1hZWjAxMjM0\nNT"
            b"Y3ODkhQCMwXiYqKCk7Ojw+LC4gW117fQ==\n")
+        eq(base64.encodebytes(b"Aladdin:open sesame"),
+                              b"QWxhZGRpbjpvcGVuIHNlc2FtZQ==\n")
         # Non-bytes
         eq(base64.encodebytes(bytearray(b'abc')), b'YWJj\n')
         eq(base64.encodebytes(memoryview(b'abc')), b'YWJj\n')
@@ -50,6 +52,8 @@ def test_decodebytes(self):
            b"ABCDEFGHIJKLMNOPQRSTUVWXYZ"
            b"0123456789!@#0^&*();:<>,. []{}")
         eq(base64.decodebytes(b''), b'')
+        eq(base64.decodebytes(b"QWxhZGRpbjpvcGVuIHNlc2FtZQ==\n"),
+                              b"Aladdin:open sesame")
         # Non-bytes
         eq(base64.decodebytes(bytearray(b'YWJj\n')), b'abc')
         eq(base64.decodebytes(memoryview(b'YWJj\n')), b'abc')
@@ -762,14 +766,6 @@ def tearDown(self):
     def get_output(self, *args):
         return script_helper.assert_python_ok('-m', 'base64', *args).out
 
-    def test_encode_decode(self):
-        output = self.get_output('-t')
-        self.assertSequenceEqual(output.splitlines(), (
-            b"b'Aladdin:open sesame'",
-            br"b'QWxhZGRpbjpvcGVuIHNlc2FtZQ==\n'",
-            b"b'Aladdin:open sesame'",
-        ))
-
     def test_encode_file(self):
         with open(os_helper.TESTFN, 'wb') as fp:
             fp.write(b'a\xffb\n')
diff --git a/Misc/NEWS.d/next/Library/2022-06-24-19-16-09.gh-issue-93096.r1_oIc.rst b/Misc/NEWS.d/next/Library/2022-06-24-19-16-09.gh-issue-93096.r1_oIc.rst
new file mode 100644
index 0000000000000..536a9d7cab1b8
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2022-06-24-19-16-09.gh-issue-93096.r1_oIc.rst
@@ -0,0 +1,3 @@
+Removed undocumented ``-t`` argument of ``python -m base64``. Use
+``python -m unittest test.test_base64.LegacyBase64TestCase.test_encodebytes``
+instead.


From webhook-mailer at python.org  Sun Jul  3 12:56:49 2022
From: webhook-mailer at python.org (terryjreedy)
Date: Sun, 03 Jul 2022 16:56:49 -0000
Subject: [Python-checkins] IDLE doc: Tweek RESTART and Windows console start
 (#94530)
Message-ID: <mailman.2061.1656867410.20746.python-checkins@python.org>

https://github.com/python/cpython/commit/39c29f753e6d6f390dce5a36613c1e03f43d28ea
commit: 39c29f753e6d6f390dce5a36613c1e03f43d28ea
branch: main
author: Terry Jan Reedy <tjreedy at udel.edu>
committer: terryjreedy <tjreedy at udel.edu>
date: 2022-07-03T12:56:44-04:00
summary:

IDLE doc: Tweek RESTART and Windows console start (#94530)

files:
M Doc/library/idle.rst
M Lib/idlelib/help.html

diff --git a/Doc/library/idle.rst b/Doc/library/idle.rst
index a4c9b1df8eb46..e91ec40c9add0 100644
--- a/Doc/library/idle.rst
+++ b/Doc/library/idle.rst
@@ -594,7 +594,7 @@ One may edit pasted code first.
 If one pastes more than one statement into Shell, the result will be a
 :exc:`SyntaxError` when multiple statements are compiled as if they were one.
 
-Lines containing ``'RESTART'`` mean that the user execution process has been
+Lines containing ``RESTART`` mean that the user execution process has been
 re-started.  This occurs when the user execution process has crashed,
 when one requests a restart on the Shell menu, or when one runs code
 in an editor window.
@@ -775,7 +775,9 @@ IDLE's standard stream replacements are not inherited by subprocesses
 created in the execution process, whether directly by user code or by
 modules such as multiprocessing.  If such subprocess use ``input`` from
 sys.stdin or ``print`` or ``write`` to sys.stdout or sys.stderr,
-IDLE should be started in a command line window.  The secondary subprocess
+IDLE should be started in a command line window.  (On Windows,
+use ``python`` or ``py`` rather than ``pythonw`` or ``pyw``.)
+The secondary subprocess
 will then be attached to that window for input and output.
 
 If ``sys`` is reset by user code, such as with ``importlib.reload(sys)``,
diff --git a/Lib/idlelib/help.html b/Lib/idlelib/help.html
index 95b59b91d70a6..e8e7d2876097a 100644
--- a/Lib/idlelib/help.html
+++ b/Lib/idlelib/help.html
@@ -664,7 +664,7 @@ <h3>Shell window<a class="headerlink" href="#shell-window" title="Permalink to t
 One may edit pasted code first.
 If one pastes more than one statement into Shell, the result will be a
 <a class="reference internal" href="exceptions.html#SyntaxError" title="SyntaxError"><code class="xref py py-exc docutils literal notranslate"><span class="pre">SyntaxError</span></code></a> when multiple statements are compiled as if they were one.</p>
-<p>Lines containing`?RESTART?` mean that the user execution process has been
+<p>Lines containing <code class="docutils literal notranslate"><span class="pre">RESTART</span></code> mean that the user execution process has been
 re-started.  This occurs when the user execution process has crashed,
 when one requests a restart on the Shell menu, or when one runs code
 in an editor window.</p>
@@ -821,7 +821,9 @@ <h3>Running user code<a class="headerlink" href="#running-user-code" title="Perm
 created in the execution process, whether directly by user code or by
 modules such as multiprocessing.  If such subprocess use <code class="docutils literal notranslate"><span class="pre">input</span></code> from
 sys.stdin or <code class="docutils literal notranslate"><span class="pre">print</span></code> or <code class="docutils literal notranslate"><span class="pre">write</span></code> to sys.stdout or sys.stderr,
-IDLE should be started in a command line window.  The secondary subprocess
+IDLE should be started in a command line window.  (On Windows,
+use <code class="docutils literal notranslate"><span class="pre">python</span></code> or <code class="docutils literal notranslate"><span class="pre">py</span></code> rather than <code class="docutils literal notranslate"><span class="pre">pythonw</span></code> or <code class="docutils literal notranslate"><span class="pre">pyw</span></code>.)
+The secondary subprocess
 will then be attached to that window for input and output.</p>
 <p>If <code class="docutils literal notranslate"><span class="pre">sys</span></code> is reset by user code, such as with <code class="docutils literal notranslate"><span class="pre">importlib.reload(sys)</span></code>,
 IDLE?s changes are lost and input from the keyboard and output to the screen
@@ -1139,7 +1141,7 @@ <h3>Navigation</h3>
 <br />
     <br />
 
-    Last updated on Jun 26, 2022.
+    Last updated on Jul 03, 2022.
     <a href="/bugs.html">Found a bug</a>?
     <br />
 


From webhook-mailer at python.org  Sun Jul  3 13:20:54 2022
From: webhook-mailer at python.org (miss-islington)
Date: Sun, 03 Jul 2022 17:20:54 -0000
Subject: [Python-checkins] IDLE doc: Tweek RESTART and Windows console start
 (GH-94530)
Message-ID: <mailman.2062.1656868854.20746.python-checkins@python.org>

https://github.com/python/cpython/commit/1e7efbc449cc56d567948d74c3c38236b407b690
commit: 1e7efbc449cc56d567948d74c3c38236b407b690
branch: 3.11
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-03T10:20:48-07:00
summary:

IDLE doc: Tweek RESTART and Windows console start (GH-94530)

(cherry picked from commit 39c29f753e6d6f390dce5a36613c1e03f43d28ea)

Co-authored-by: Terry Jan Reedy <tjreedy at udel.edu>

files:
M Doc/library/idle.rst
M Lib/idlelib/help.html

diff --git a/Doc/library/idle.rst b/Doc/library/idle.rst
index a4c9b1df8eb46..e91ec40c9add0 100644
--- a/Doc/library/idle.rst
+++ b/Doc/library/idle.rst
@@ -594,7 +594,7 @@ One may edit pasted code first.
 If one pastes more than one statement into Shell, the result will be a
 :exc:`SyntaxError` when multiple statements are compiled as if they were one.
 
-Lines containing ``'RESTART'`` mean that the user execution process has been
+Lines containing ``RESTART`` mean that the user execution process has been
 re-started.  This occurs when the user execution process has crashed,
 when one requests a restart on the Shell menu, or when one runs code
 in an editor window.
@@ -775,7 +775,9 @@ IDLE's standard stream replacements are not inherited by subprocesses
 created in the execution process, whether directly by user code or by
 modules such as multiprocessing.  If such subprocess use ``input`` from
 sys.stdin or ``print`` or ``write`` to sys.stdout or sys.stderr,
-IDLE should be started in a command line window.  The secondary subprocess
+IDLE should be started in a command line window.  (On Windows,
+use ``python`` or ``py`` rather than ``pythonw`` or ``pyw``.)
+The secondary subprocess
 will then be attached to that window for input and output.
 
 If ``sys`` is reset by user code, such as with ``importlib.reload(sys)``,
diff --git a/Lib/idlelib/help.html b/Lib/idlelib/help.html
index 95b59b91d70a6..e8e7d2876097a 100644
--- a/Lib/idlelib/help.html
+++ b/Lib/idlelib/help.html
@@ -664,7 +664,7 @@ <h3>Shell window<a class="headerlink" href="#shell-window" title="Permalink to t
 One may edit pasted code first.
 If one pastes more than one statement into Shell, the result will be a
 <a class="reference internal" href="exceptions.html#SyntaxError" title="SyntaxError"><code class="xref py py-exc docutils literal notranslate"><span class="pre">SyntaxError</span></code></a> when multiple statements are compiled as if they were one.</p>
-<p>Lines containing`?RESTART?` mean that the user execution process has been
+<p>Lines containing <code class="docutils literal notranslate"><span class="pre">RESTART</span></code> mean that the user execution process has been
 re-started.  This occurs when the user execution process has crashed,
 when one requests a restart on the Shell menu, or when one runs code
 in an editor window.</p>
@@ -821,7 +821,9 @@ <h3>Running user code<a class="headerlink" href="#running-user-code" title="Perm
 created in the execution process, whether directly by user code or by
 modules such as multiprocessing.  If such subprocess use <code class="docutils literal notranslate"><span class="pre">input</span></code> from
 sys.stdin or <code class="docutils literal notranslate"><span class="pre">print</span></code> or <code class="docutils literal notranslate"><span class="pre">write</span></code> to sys.stdout or sys.stderr,
-IDLE should be started in a command line window.  The secondary subprocess
+IDLE should be started in a command line window.  (On Windows,
+use <code class="docutils literal notranslate"><span class="pre">python</span></code> or <code class="docutils literal notranslate"><span class="pre">py</span></code> rather than <code class="docutils literal notranslate"><span class="pre">pythonw</span></code> or <code class="docutils literal notranslate"><span class="pre">pyw</span></code>.)
+The secondary subprocess
 will then be attached to that window for input and output.</p>
 <p>If <code class="docutils literal notranslate"><span class="pre">sys</span></code> is reset by user code, such as with <code class="docutils literal notranslate"><span class="pre">importlib.reload(sys)</span></code>,
 IDLE?s changes are lost and input from the keyboard and output to the screen
@@ -1139,7 +1141,7 @@ <h3>Navigation</h3>
 <br />
     <br />
 
-    Last updated on Jun 26, 2022.
+    Last updated on Jul 03, 2022.
     <a href="/bugs.html">Found a bug</a>?
     <br />
 


From webhook-mailer at python.org  Sun Jul  3 13:39:24 2022
From: webhook-mailer at python.org (miss-islington)
Date: Sun, 03 Jul 2022 17:39:24 -0000
Subject: [Python-checkins] IDLE doc: Tweek RESTART and Windows console start
 (GH-94530)
Message-ID: <mailman.2063.1656869965.20746.python-checkins@python.org>

https://github.com/python/cpython/commit/d793ebc11dd248d626bf2da14775703307b47887
commit: d793ebc11dd248d626bf2da14775703307b47887
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-03T10:39:20-07:00
summary:

IDLE doc: Tweek RESTART and Windows console start (GH-94530)

(cherry picked from commit 39c29f753e6d6f390dce5a36613c1e03f43d28ea)

Co-authored-by: Terry Jan Reedy <tjreedy at udel.edu>

files:
M Doc/library/idle.rst
M Lib/idlelib/help.html

diff --git a/Doc/library/idle.rst b/Doc/library/idle.rst
index a4c9b1df8eb46..e91ec40c9add0 100644
--- a/Doc/library/idle.rst
+++ b/Doc/library/idle.rst
@@ -594,7 +594,7 @@ One may edit pasted code first.
 If one pastes more than one statement into Shell, the result will be a
 :exc:`SyntaxError` when multiple statements are compiled as if they were one.
 
-Lines containing ``'RESTART'`` mean that the user execution process has been
+Lines containing ``RESTART`` mean that the user execution process has been
 re-started.  This occurs when the user execution process has crashed,
 when one requests a restart on the Shell menu, or when one runs code
 in an editor window.
@@ -775,7 +775,9 @@ IDLE's standard stream replacements are not inherited by subprocesses
 created in the execution process, whether directly by user code or by
 modules such as multiprocessing.  If such subprocess use ``input`` from
 sys.stdin or ``print`` or ``write`` to sys.stdout or sys.stderr,
-IDLE should be started in a command line window.  The secondary subprocess
+IDLE should be started in a command line window.  (On Windows,
+use ``python`` or ``py`` rather than ``pythonw`` or ``pyw``.)
+The secondary subprocess
 will then be attached to that window for input and output.
 
 If ``sys`` is reset by user code, such as with ``importlib.reload(sys)``,
diff --git a/Lib/idlelib/help.html b/Lib/idlelib/help.html
index 95b59b91d70a6..e8e7d2876097a 100644
--- a/Lib/idlelib/help.html
+++ b/Lib/idlelib/help.html
@@ -664,7 +664,7 @@ <h3>Shell window<a class="headerlink" href="#shell-window" title="Permalink to t
 One may edit pasted code first.
 If one pastes more than one statement into Shell, the result will be a
 <a class="reference internal" href="exceptions.html#SyntaxError" title="SyntaxError"><code class="xref py py-exc docutils literal notranslate"><span class="pre">SyntaxError</span></code></a> when multiple statements are compiled as if they were one.</p>
-<p>Lines containing`?RESTART?` mean that the user execution process has been
+<p>Lines containing <code class="docutils literal notranslate"><span class="pre">RESTART</span></code> mean that the user execution process has been
 re-started.  This occurs when the user execution process has crashed,
 when one requests a restart on the Shell menu, or when one runs code
 in an editor window.</p>
@@ -821,7 +821,9 @@ <h3>Running user code<a class="headerlink" href="#running-user-code" title="Perm
 created in the execution process, whether directly by user code or by
 modules such as multiprocessing.  If such subprocess use <code class="docutils literal notranslate"><span class="pre">input</span></code> from
 sys.stdin or <code class="docutils literal notranslate"><span class="pre">print</span></code> or <code class="docutils literal notranslate"><span class="pre">write</span></code> to sys.stdout or sys.stderr,
-IDLE should be started in a command line window.  The secondary subprocess
+IDLE should be started in a command line window.  (On Windows,
+use <code class="docutils literal notranslate"><span class="pre">python</span></code> or <code class="docutils literal notranslate"><span class="pre">py</span></code> rather than <code class="docutils literal notranslate"><span class="pre">pythonw</span></code> or <code class="docutils literal notranslate"><span class="pre">pyw</span></code>.)
+The secondary subprocess
 will then be attached to that window for input and output.</p>
 <p>If <code class="docutils literal notranslate"><span class="pre">sys</span></code> is reset by user code, such as with <code class="docutils literal notranslate"><span class="pre">importlib.reload(sys)</span></code>,
 IDLE?s changes are lost and input from the keyboard and output to the screen
@@ -1139,7 +1141,7 @@ <h3>Navigation</h3>
 <br />
     <br />
 
-    Last updated on Jun 26, 2022.
+    Last updated on Jul 03, 2022.
     <a href="/bugs.html">Found a bug</a>?
     <br />
 


From webhook-mailer at python.org  Sun Jul  3 14:58:11 2022
From: webhook-mailer at python.org (gpshead)
Date: Sun, 03 Jul 2022 18:58:11 -0000
Subject: [Python-checkins] gh-92869: ctypes: Add c_time_t (#92870)
Message-ID: <mailman.2064.1656874692.20746.python-checkins@python.org>

https://github.com/python/cpython/commit/b296c7442be97600dc87819e885e037313883d8e
commit: b296c7442be97600dc87819e885e037313883d8e
branch: main
author: Thomas Perl <m at thp.io>
committer: gpshead <greg at krypto.org>
date: 2022-07-03T11:58:02-07:00
summary:

gh-92869: ctypes: Add c_time_t (#92870)

Adds `ctypes.c_time_t` to represent the C `time_t` type accurately as its size varies.

Primarily-authored-by: Adam Turner <9087854+AA-Turner at users.noreply.github.com>
Co-authored-by: Gregory P. Smith <greg at krypto.org> [Google]

files:
A Misc/NEWS.d/next/Library/2022-05-17-06-27-39.gh-issue-92869.t8oBkw.rst
M Doc/library/ctypes.rst
M Lib/ctypes/__init__.py
M Lib/test/test_ctypes/test_sizes.py
M Modules/_ctypes/_ctypes.c

diff --git a/Doc/library/ctypes.rst b/Doc/library/ctypes.rst
index 52950b551b756..475737144d40c 100644
--- a/Doc/library/ctypes.rst
+++ b/Doc/library/ctypes.rst
@@ -148,15 +148,14 @@ Calling functions
 ^^^^^^^^^^^^^^^^^
 
 You can call these functions like any other Python callable. This example uses
-the ``time()`` function, which returns system time in seconds since the Unix
-epoch, and the ``GetModuleHandleA()`` function, which returns a win32 module
-handle.
+the ``rand()`` function, which takes no arguments and returns a pseudo-random integer::
 
-This example calls both functions with a ``NULL`` pointer (``None`` should be used
-as the ``NULL`` pointer)::
+   >>> print(libc.rand())  # doctest: +SKIP
+   1804289383
+
+On Windows, you can call the ``GetModuleHandleA()`` function, which returns a win32 module
+handle (passing ``None`` as single argument to call it with a ``NULL`` pointer)::
 
-   >>> print(libc.time(None))  # doctest: +SKIP
-   1150640792
    >>> print(hex(windll.kernel32.GetModuleHandleA(None)))  # doctest: +WINDOWS
    0x1d000000
    >>>
@@ -247,6 +246,8 @@ Fundamental data types
 | :class:`c_ssize_t`   | :c:type:`ssize_t` or                     | int                        |
 |                      | :c:type:`Py_ssize_t`                     |                            |
 +----------------------+------------------------------------------+----------------------------+
+| :class:`c_time_t`    | :c:type:`time_t`                         | int                        |
++----------------------+------------------------------------------+----------------------------+
 | :class:`c_float`     | :c:type:`float`                          | float                      |
 +----------------------+------------------------------------------+----------------------------+
 | :class:`c_double`    | :c:type:`double`                         | float                      |
@@ -447,6 +448,21 @@ By default functions are assumed to return the C :c:type:`int` type.  Other
 return types can be specified by setting the :attr:`restype` attribute of the
 function object.
 
+The C prototype of ``time()`` is ``time_t time(time_t *)``. Because ``time_t``
+might be of a different type than the default return type ``int``, you should
+specify the ``restype``::
+
+   >>> libc.time.restype = c_time_t
+
+The argument types can be specified using ``argtypes``::
+
+   >>> libc.time.argtypes = (POINTER(c_time_t),)
+
+To call the function with a ``NULL`` pointer as first argument, use ``None``::
+
+   >>> print(libc.time(None))  # doctest: +SKIP
+   1150640792
+
 Here is a more advanced example, it uses the ``strchr`` function, which expects
 a string pointer and a char, and returns a pointer to a string::
 
@@ -2275,6 +2291,13 @@ These are the fundamental ctypes data types:
    .. versionadded:: 3.2
 
 
+.. class:: c_time_t
+
+   Represents the C :c:type:`time_t` datatype.
+
+   .. versionadded:: 3.12
+
+
 .. class:: c_ubyte
 
    Represents the C :c:type:`unsigned char` datatype, it interprets the value as
diff --git a/Lib/ctypes/__init__.py b/Lib/ctypes/__init__.py
index 26135ad96296a..b94b337a3157b 100644
--- a/Lib/ctypes/__init__.py
+++ b/Lib/ctypes/__init__.py
@@ -11,6 +11,7 @@
 from _ctypes import __version__ as _ctypes_version
 from _ctypes import RTLD_LOCAL, RTLD_GLOBAL
 from _ctypes import ArgumentError
+from _ctypes import SIZEOF_TIME_T
 
 from struct import calcsize as _calcsize
 
@@ -563,4 +564,11 @@ def DllCanUnloadNow():
     elif sizeof(kind) == 8: c_uint64 = kind
 del(kind)
 
+if SIZEOF_TIME_T == 8:
+    c_time_t = c_int64
+elif SIZEOF_TIME_T == 4:
+    c_time_t = c_int32
+else:
+    raise SystemError(f"Unexpected sizeof(time_t): {SIZEOF_TIME_T=}")
+
 _reset_cache()
diff --git a/Lib/test/test_ctypes/test_sizes.py b/Lib/test/test_ctypes/test_sizes.py
index 4ceacbc290080..bf8d6ea35aa39 100644
--- a/Lib/test/test_ctypes/test_sizes.py
+++ b/Lib/test/test_ctypes/test_sizes.py
@@ -28,6 +28,9 @@ def test_size_t(self):
     def test_ssize_t(self):
         self.assertEqual(sizeof(c_void_p), sizeof(c_ssize_t))
 
+    def test_time_t(self):
+        self.assertEqual(sizeof(c_time_t), SIZEOF_TIME_T)
+
 
 if __name__ == "__main__":
     unittest.main()
diff --git a/Misc/NEWS.d/next/Library/2022-05-17-06-27-39.gh-issue-92869.t8oBkw.rst b/Misc/NEWS.d/next/Library/2022-05-17-06-27-39.gh-issue-92869.t8oBkw.rst
new file mode 100644
index 0000000000000..7787f3419de60
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2022-05-17-06-27-39.gh-issue-92869.t8oBkw.rst
@@ -0,0 +1,2 @@
+Added :class:`~ctypes.c_time_t` to :mod:`ctypes`, which has the same size as
+the :c:type:`time_t` type in C.
diff --git a/Modules/_ctypes/_ctypes.c b/Modules/_ctypes/_ctypes.c
index 2c629d76beb3b..a3c7c8c471e58 100644
--- a/Modules/_ctypes/_ctypes.c
+++ b/Modules/_ctypes/_ctypes.c
@@ -5784,6 +5784,7 @@ _ctypes_add_objects(PyObject *mod)
     MOD_ADD("RTLD_GLOBAL", PyLong_FromLong(RTLD_GLOBAL));
     MOD_ADD("CTYPES_MAX_ARGCOUNT", PyLong_FromLong(CTYPES_MAX_ARGCOUNT));
     MOD_ADD("ArgumentError", Py_NewRef(PyExc_ArgError));
+    MOD_ADD("SIZEOF_TIME_T", PyLong_FromSsize_t(SIZEOF_TIME_T));
     return 0;
 #undef MOD_ADD
 }


From webhook-mailer at python.org  Sun Jul  3 15:17:32 2022
From: webhook-mailer at python.org (miss-islington)
Date: Sun, 03 Jul 2022 19:17:32 -0000
Subject: [Python-checkins] gh-93963: Officially deprecate abcs and warn
 about their usage. (GH-93965)
Message-ID: <mailman.2065.1656875853.20746.python-checkins@python.org>

https://github.com/python/cpython/commit/71848c960927af801656026203371c41ad139b5a
commit: 71848c960927af801656026203371c41ad139b5a
branch: main
author: Jason R. Coombs <jaraco at jaraco.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-03T12:17:27-07:00
summary:

gh-93963: Officially deprecate abcs and warn about their usage. (GH-93965)



Fixes #93963

Automerge-Triggered-By: GH:jaraco

files:
A Misc/NEWS.d/next/Library/2022-06-17-16-00-55.gh-issue-93963.8YYZ-2.rst
M Lib/importlib/abc.py

diff --git a/Lib/importlib/abc.py b/Lib/importlib/abc.py
index 3fa151f390ba7..8fa9a0f3bc1e4 100644
--- a/Lib/importlib/abc.py
+++ b/Lib/importlib/abc.py
@@ -15,20 +15,29 @@
 import abc
 import warnings
 
-# for compatibility with Python 3.10
-from .resources.abc import ResourceReader, Traversable, TraversableResources
+from .resources import abc as _resources_abc
 
 
 __all__ = [
     'Loader', 'Finder', 'MetaPathFinder', 'PathEntryFinder',
     'ResourceLoader', 'InspectLoader', 'ExecutionLoader',
     'FileLoader', 'SourceLoader',
-
-    # for compatibility with Python 3.10
-    'ResourceReader', 'Traversable', 'TraversableResources',
 ]
 
 
+def __getattr__(name):
+    """
+    For backwards compatibility, continue to make names
+    from _resources_abc available through this module. #93963
+    """
+    if name in _resources_abc.__all__:
+        obj = getattr(_resources_abc, name)
+        warnings._deprecated(f"{__name__}.{name}", remove=(3, 14))
+        globals()[name] = obj
+        return obj
+    raise AttributeError(f'module {__name__!r} has no attribute {name!r}')
+
+
 def _register(abstract_cls, *classes):
     for cls in classes:
         abstract_cls.register(cls)
diff --git a/Misc/NEWS.d/next/Library/2022-06-17-16-00-55.gh-issue-93963.8YYZ-2.rst b/Misc/NEWS.d/next/Library/2022-06-17-16-00-55.gh-issue-93963.8YYZ-2.rst
new file mode 100644
index 0000000000000..0973982dfeeff
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2022-06-17-16-00-55.gh-issue-93963.8YYZ-2.rst
@@ -0,0 +1,2 @@
+Officially deprecate from ``importlib.abc`` classes moved to
+``importlib.resources.abc``.


From webhook-mailer at python.org  Mon Jul  4 01:07:13 2022
From: webhook-mailer at python.org (vsajip)
Date: Mon, 04 Jul 2022 05:07:13 -0000
Subject: [Python-checkins] =?utf-8?q?Update_logging_documentation=3A_chan?=
 =?utf-8?q?ge_cross-reference_and_add_webapp_r=E2=80=A6_=28GH-94540=29?=
Message-ID: <mailman.2066.1656911234.20746.python-checkins@python.org>

https://github.com/python/cpython/commit/a391b74dbed085e4c8b922c79dcf7a9d9e72d3df
commit: a391b74dbed085e4c8b922c79dcf7a9d9e72d3df
branch: main
author: Vinay Sajip <vinay_sajip at yahoo.co.uk>
committer: vsajip <vinay_sajip at yahoo.co.uk>
date: 2022-07-04T06:06:43+01:00
summary:

Update logging documentation: change cross-reference and add webapp r? (GH-94540)

files:
M Doc/howto/logging-cookbook.rst
M Doc/library/logging.rst

diff --git a/Doc/howto/logging-cookbook.rst b/Doc/howto/logging-cookbook.rst
index 79b4069f03507..7f4fe3a63a702 100644
--- a/Doc/howto/logging-cookbook.rst
+++ b/Doc/howto/logging-cookbook.rst
@@ -714,6 +714,228 @@ which, when run, produces something like:
     2010-09-06 22:38:15,301 d.e.f DEBUG    IP: 123.231.231.123 User: fred     A message at DEBUG level with 2 parameters
     2010-09-06 22:38:15,301 d.e.f INFO     IP: 123.231.231.123 User: fred     A message at INFO level with 2 parameters
 
+Use of ``contextvars``
+----------------------
+
+Since Python 3.7, the :mod:`contextvars` module has provided context-local storage
+which works for both :mod:`threading` and :mod:`asyncio` processing needs. This type
+of storage may thus be generally preferable to thread-locals. The following example
+shows how, in a multi-threaded environment, logs can populated with contextual
+information such as, for example, request attributes handled by web applications.
+
+For the purposes of illustration, say that you have different web applications, each
+independent of the other but running in the same Python process and using a library
+common to them. How can each of these applications have their own log, where all
+logging messages from the library (and other request processing code) are directed to
+the appropriate application's log file, while including in the log additional
+contextual information such as client IP, HTTP request method and client username?
+
+Let's assume that the library can be simulated by the following code:
+
+.. code-block:: python
+
+    # webapplib.py
+    import logging
+    import time
+
+    logger = logging.getLogger(__name__)
+
+    def useful():
+        # Just a representative event logged from the library
+        logger.debug('Hello from webapplib!')
+        # Just sleep for a bit so other threads get to run
+        time.sleep(0.01)
+
+We can simulate the multiple web applications by means of two simple classes,
+``Request`` and ``WebApp``. These simulate how real threaded web applications work -
+each request is handled by a thread:
+
+.. code-block:: python
+
+    # main.py
+    import argparse
+    from contextvars import ContextVar
+    import logging
+    import os
+    from random import choice
+    import threading
+    import webapplib
+
+    logger = logging.getLogger(__name__)
+    root = logging.getLogger()
+    root.setLevel(logging.DEBUG)
+
+    class Request:
+        """
+        A simple dummy request class which just holds dummy HTTP request method,
+        client IP address and client username
+        """
+        def __init__(self, method, ip, user):
+            self.method = method
+            self.ip = ip
+            self.user = user
+
+    # A dummy set of requests which will be used in the simulation - we'll just pick
+    # from this list randomly. Note that all GET requests are from 192.168.2.XXX
+    # addresses, whereas POST requests are from 192.16.3.XXX addresses. Three users
+    # are represented in the sample requests.
+
+    REQUESTS = [
+        Request('GET', '192.168.2.20', 'jim'),
+        Request('POST', '192.168.3.20', 'fred'),
+        Request('GET', '192.168.2.21', 'sheila'),
+        Request('POST', '192.168.3.21', 'jim'),
+        Request('GET', '192.168.2.22', 'fred'),
+        Request('POST', '192.168.3.22', 'sheila'),
+    ]
+
+    # Note that the format string includes references to request context information
+    # such as HTTP method, client IP and username
+
+    formatter = logging.Formatter('%(threadName)-11s %(appName)s %(name)-9s %(user)-6s %(ip)s %(method)-4s %(message)s')
+
+    # Create our context variables. These will be filled at the start of request
+    # processing, and used in the logging that happens during that processing
+
+    ctx_request = ContextVar('request')
+    ctx_appname = ContextVar('appname')
+
+    class InjectingFilter(logging.Filter):
+        """
+        A filter which injects context-specific information into logs and ensures
+        that only information for a specific webapp is included in its log
+        """
+        def __init__(self, app):
+            self.app = app
+
+        def filter(self, record):
+            request = ctx_request.get()
+            record.method = request.method
+            record.ip = request.ip
+            record.user = request.user
+            record.appName = appName = ctx_appname.get()
+            return appName == self.app.name
+
+    class WebApp:
+        """
+        A dummy web application class which has its own handler and filter for a
+        webapp-specific log.
+        """
+        def __init__(self, name):
+            self.name = name
+            handler = logging.FileHandler(name + '.log', 'w')
+            f = InjectingFilter(self)
+            handler.setFormatter(formatter)
+            handler.addFilter(f)
+            root.addHandler(handler)
+            self.num_requests = 0
+
+        def process_request(self, request):
+            """
+            This is the dummy method for processing a request. It's called on a
+            different thread for every request. We store the context information into
+            the context vars before doing anything else.
+            """
+            ctx_request.set(request)
+            ctx_appname.set(self.name)
+            self.num_requests += 1
+            logger.debug('Request processing started')
+            webapplib.useful()
+            logger.debug('Request processing finished')
+
+    def main():
+        fn = os.path.splitext(os.path.basename(__file__))[0]
+        adhf = argparse.ArgumentDefaultsHelpFormatter
+        ap = argparse.ArgumentParser(formatter_class=adhf, prog=fn,
+                                     description='Simulate a couple of web '
+                                                 'applications handling some '
+                                                 'requests, showing how request '
+                                                 'context can be used to '
+                                                 'populate logs')
+        aa = ap.add_argument
+        aa('--count', '-c', default=100, help='How many requests to simulate')
+        options = ap.parse_args()
+
+        # Create the dummy webapps and put them in a list which we can use to select
+        # from randomly
+        app1 = WebApp('app1')
+        app2 = WebApp('app2')
+        apps = [app1, app2]
+        threads = []
+        # Add a common handler which will capture all events
+        handler = logging.FileHandler('app.log', 'w')
+        handler.setFormatter(formatter)
+        root.addHandler(handler)
+
+        # Generate calls to process requests
+        for i in range(options.count):
+            try:
+                # Pick an app at random and a request for it to process
+                app = choice(apps)
+                request = choice(REQUESTS)
+                # Process the request in its own thread
+                t = threading.Thread(target=app.process_request, args=(request,))
+                threads.append(t)
+                t.start()
+            except KeyboardInterrupt:
+                break
+
+        # Wait for the threads to terminate
+        for t in threads:
+            t.join()
+
+        for app in apps:
+            print('%s processed %s requests' % (app.name, app.num_requests))
+
+    if __name__ == '__main__':
+        main()
+
+If you run the above, you should find that roughly half the requests go
+into :file:`app1.log` and the rest into :file:`app2.log`, and the all the requests are
+logged to :file:`app.log`. Each webapp-specific log will contain only log entries for
+only that webapp, and the request information will be displayed consistently in the
+log (i.e. the information in each dummy request will always appear together in a log
+line). This is illustrated by the following shell output:
+
+.. code-block:: shell
+
+    ~/logging-contextual-webapp$ python main.py
+    app1 processed 51 requests
+    app2 processed 49 requests
+    ~/logging-contextual-webapp$ wc -l *.log
+      153 app1.log
+      147 app2.log
+      300 app.log
+      600 total
+    ~/logging-contextual-webapp$ head -3 app1.log
+    Thread-3 (process_request) app1 __main__  jim    192.168.3.21 POST Request processing started
+    Thread-3 (process_request) app1 webapplib jim    192.168.3.21 POST Hello from webapplib!
+    Thread-5 (process_request) app1 __main__  jim    192.168.3.21 POST Request processing started
+    ~/logging-contextual-webapp$ head -3 app2.log
+    Thread-1 (process_request) app2 __main__  sheila 192.168.2.21 GET  Request processing started
+    Thread-1 (process_request) app2 webapplib sheila 192.168.2.21 GET  Hello from webapplib!
+    Thread-2 (process_request) app2 __main__  jim    192.168.2.20 GET  Request processing started
+    ~/logging-contextual-webapp$ head app.log
+    Thread-1 (process_request) app2 __main__  sheila 192.168.2.21 GET  Request processing started
+    Thread-1 (process_request) app2 webapplib sheila 192.168.2.21 GET  Hello from webapplib!
+    Thread-2 (process_request) app2 __main__  jim    192.168.2.20 GET  Request processing started
+    Thread-3 (process_request) app1 __main__  jim    192.168.3.21 POST Request processing started
+    Thread-2 (process_request) app2 webapplib jim    192.168.2.20 GET  Hello from webapplib!
+    Thread-3 (process_request) app1 webapplib jim    192.168.3.21 POST Hello from webapplib!
+    Thread-4 (process_request) app2 __main__  fred   192.168.2.22 GET  Request processing started
+    Thread-5 (process_request) app1 __main__  jim    192.168.3.21 POST Request processing started
+    Thread-4 (process_request) app2 webapplib fred   192.168.2.22 GET  Hello from webapplib!
+    Thread-6 (process_request) app1 __main__  jim    192.168.3.21 POST Request processing started
+    ~/logging-contextual-webapp$ grep app1 app1.log | wc -l
+    153
+    ~/logging-contextual-webapp$ grep app2 app2.log | wc -l
+    147
+    ~/logging-contextual-webapp$ grep app1 app.log | wc -l
+    153
+    ~/logging-contextual-webapp$ grep app2 app.log | wc -l
+    147
+
+
 Imparting contextual information in handlers
 --------------------------------------------
 
diff --git a/Doc/library/logging.rst b/Doc/library/logging.rst
index 51b5f86e69efe..8716724af5625 100644
--- a/Doc/library/logging.rst
+++ b/Doc/library/logging.rst
@@ -233,7 +233,7 @@ is the module's name in the Python package namespace.
          2006-02-08 22:20:02,165 192.168.0.1 fbloggs  Protocol problem: connection reset
 
       The keys in the dictionary passed in *extra* should not clash with the keys used
-      by the logging system. (See the :class:`Formatter` documentation for more
+      by the logging system. (See the section on :ref:`logrecord-attributes` for more
       information on which keys are used by the logging system.)
 
       If you choose to use these attributes in logged messages, you need to exercise


From webhook-mailer at python.org  Mon Jul  4 04:10:21 2022
From: webhook-mailer at python.org (vsajip)
Date: Mon, 04 Jul 2022 08:10:21 -0000
Subject: [Python-checkins] =?utf-8?q?=5B3=2E11=5D_Update_logging_document?=
 =?utf-8?q?ation=3A_change_cross-reference_and_add_webapp_r=E2=80=A6_=28GH?=
 =?utf-8?q?-94541=29?=
Message-ID: <mailman.2067.1656922222.20746.python-checkins@python.org>

https://github.com/python/cpython/commit/8fe0b1d8fa3451e923d7632263be6145a0734468
commit: 8fe0b1d8fa3451e923d7632263be6145a0734468
branch: 3.11
author: Vinay Sajip <vinay_sajip at yahoo.co.uk>
committer: vsajip <vinay_sajip at yahoo.co.uk>
date: 2022-07-04T09:09:40+01:00
summary:

[3.11] Update logging documentation: change cross-reference and add webapp r? (GH-94541)

files:
M Doc/howto/logging-cookbook.rst
M Doc/library/logging.rst

diff --git a/Doc/howto/logging-cookbook.rst b/Doc/howto/logging-cookbook.rst
index 45b48fc904cee..7f4fe3a63a702 100644
--- a/Doc/howto/logging-cookbook.rst
+++ b/Doc/howto/logging-cookbook.rst
@@ -7,7 +7,8 @@ Logging Cookbook
 :Author: Vinay Sajip <vinay_sajip at red-dove dot com>
 
 This page contains a number of recipes related to logging, which have been found
-useful in the past.
+useful in the past. For links to tutorial and reference information, please see
+:ref:`cookbook-ref-links`.
 
 .. currentmodule:: logging
 
@@ -713,6 +714,254 @@ which, when run, produces something like:
     2010-09-06 22:38:15,301 d.e.f DEBUG    IP: 123.231.231.123 User: fred     A message at DEBUG level with 2 parameters
     2010-09-06 22:38:15,301 d.e.f INFO     IP: 123.231.231.123 User: fred     A message at INFO level with 2 parameters
 
+Use of ``contextvars``
+----------------------
+
+Since Python 3.7, the :mod:`contextvars` module has provided context-local storage
+which works for both :mod:`threading` and :mod:`asyncio` processing needs. This type
+of storage may thus be generally preferable to thread-locals. The following example
+shows how, in a multi-threaded environment, logs can populated with contextual
+information such as, for example, request attributes handled by web applications.
+
+For the purposes of illustration, say that you have different web applications, each
+independent of the other but running in the same Python process and using a library
+common to them. How can each of these applications have their own log, where all
+logging messages from the library (and other request processing code) are directed to
+the appropriate application's log file, while including in the log additional
+contextual information such as client IP, HTTP request method and client username?
+
+Let's assume that the library can be simulated by the following code:
+
+.. code-block:: python
+
+    # webapplib.py
+    import logging
+    import time
+
+    logger = logging.getLogger(__name__)
+
+    def useful():
+        # Just a representative event logged from the library
+        logger.debug('Hello from webapplib!')
+        # Just sleep for a bit so other threads get to run
+        time.sleep(0.01)
+
+We can simulate the multiple web applications by means of two simple classes,
+``Request`` and ``WebApp``. These simulate how real threaded web applications work -
+each request is handled by a thread:
+
+.. code-block:: python
+
+    # main.py
+    import argparse
+    from contextvars import ContextVar
+    import logging
+    import os
+    from random import choice
+    import threading
+    import webapplib
+
+    logger = logging.getLogger(__name__)
+    root = logging.getLogger()
+    root.setLevel(logging.DEBUG)
+
+    class Request:
+        """
+        A simple dummy request class which just holds dummy HTTP request method,
+        client IP address and client username
+        """
+        def __init__(self, method, ip, user):
+            self.method = method
+            self.ip = ip
+            self.user = user
+
+    # A dummy set of requests which will be used in the simulation - we'll just pick
+    # from this list randomly. Note that all GET requests are from 192.168.2.XXX
+    # addresses, whereas POST requests are from 192.16.3.XXX addresses. Three users
+    # are represented in the sample requests.
+
+    REQUESTS = [
+        Request('GET', '192.168.2.20', 'jim'),
+        Request('POST', '192.168.3.20', 'fred'),
+        Request('GET', '192.168.2.21', 'sheila'),
+        Request('POST', '192.168.3.21', 'jim'),
+        Request('GET', '192.168.2.22', 'fred'),
+        Request('POST', '192.168.3.22', 'sheila'),
+    ]
+
+    # Note that the format string includes references to request context information
+    # such as HTTP method, client IP and username
+
+    formatter = logging.Formatter('%(threadName)-11s %(appName)s %(name)-9s %(user)-6s %(ip)s %(method)-4s %(message)s')
+
+    # Create our context variables. These will be filled at the start of request
+    # processing, and used in the logging that happens during that processing
+
+    ctx_request = ContextVar('request')
+    ctx_appname = ContextVar('appname')
+
+    class InjectingFilter(logging.Filter):
+        """
+        A filter which injects context-specific information into logs and ensures
+        that only information for a specific webapp is included in its log
+        """
+        def __init__(self, app):
+            self.app = app
+
+        def filter(self, record):
+            request = ctx_request.get()
+            record.method = request.method
+            record.ip = request.ip
+            record.user = request.user
+            record.appName = appName = ctx_appname.get()
+            return appName == self.app.name
+
+    class WebApp:
+        """
+        A dummy web application class which has its own handler and filter for a
+        webapp-specific log.
+        """
+        def __init__(self, name):
+            self.name = name
+            handler = logging.FileHandler(name + '.log', 'w')
+            f = InjectingFilter(self)
+            handler.setFormatter(formatter)
+            handler.addFilter(f)
+            root.addHandler(handler)
+            self.num_requests = 0
+
+        def process_request(self, request):
+            """
+            This is the dummy method for processing a request. It's called on a
+            different thread for every request. We store the context information into
+            the context vars before doing anything else.
+            """
+            ctx_request.set(request)
+            ctx_appname.set(self.name)
+            self.num_requests += 1
+            logger.debug('Request processing started')
+            webapplib.useful()
+            logger.debug('Request processing finished')
+
+    def main():
+        fn = os.path.splitext(os.path.basename(__file__))[0]
+        adhf = argparse.ArgumentDefaultsHelpFormatter
+        ap = argparse.ArgumentParser(formatter_class=adhf, prog=fn,
+                                     description='Simulate a couple of web '
+                                                 'applications handling some '
+                                                 'requests, showing how request '
+                                                 'context can be used to '
+                                                 'populate logs')
+        aa = ap.add_argument
+        aa('--count', '-c', default=100, help='How many requests to simulate')
+        options = ap.parse_args()
+
+        # Create the dummy webapps and put them in a list which we can use to select
+        # from randomly
+        app1 = WebApp('app1')
+        app2 = WebApp('app2')
+        apps = [app1, app2]
+        threads = []
+        # Add a common handler which will capture all events
+        handler = logging.FileHandler('app.log', 'w')
+        handler.setFormatter(formatter)
+        root.addHandler(handler)
+
+        # Generate calls to process requests
+        for i in range(options.count):
+            try:
+                # Pick an app at random and a request for it to process
+                app = choice(apps)
+                request = choice(REQUESTS)
+                # Process the request in its own thread
+                t = threading.Thread(target=app.process_request, args=(request,))
+                threads.append(t)
+                t.start()
+            except KeyboardInterrupt:
+                break
+
+        # Wait for the threads to terminate
+        for t in threads:
+            t.join()
+
+        for app in apps:
+            print('%s processed %s requests' % (app.name, app.num_requests))
+
+    if __name__ == '__main__':
+        main()
+
+If you run the above, you should find that roughly half the requests go
+into :file:`app1.log` and the rest into :file:`app2.log`, and the all the requests are
+logged to :file:`app.log`. Each webapp-specific log will contain only log entries for
+only that webapp, and the request information will be displayed consistently in the
+log (i.e. the information in each dummy request will always appear together in a log
+line). This is illustrated by the following shell output:
+
+.. code-block:: shell
+
+    ~/logging-contextual-webapp$ python main.py
+    app1 processed 51 requests
+    app2 processed 49 requests
+    ~/logging-contextual-webapp$ wc -l *.log
+      153 app1.log
+      147 app2.log
+      300 app.log
+      600 total
+    ~/logging-contextual-webapp$ head -3 app1.log
+    Thread-3 (process_request) app1 __main__  jim    192.168.3.21 POST Request processing started
+    Thread-3 (process_request) app1 webapplib jim    192.168.3.21 POST Hello from webapplib!
+    Thread-5 (process_request) app1 __main__  jim    192.168.3.21 POST Request processing started
+    ~/logging-contextual-webapp$ head -3 app2.log
+    Thread-1 (process_request) app2 __main__  sheila 192.168.2.21 GET  Request processing started
+    Thread-1 (process_request) app2 webapplib sheila 192.168.2.21 GET  Hello from webapplib!
+    Thread-2 (process_request) app2 __main__  jim    192.168.2.20 GET  Request processing started
+    ~/logging-contextual-webapp$ head app.log
+    Thread-1 (process_request) app2 __main__  sheila 192.168.2.21 GET  Request processing started
+    Thread-1 (process_request) app2 webapplib sheila 192.168.2.21 GET  Hello from webapplib!
+    Thread-2 (process_request) app2 __main__  jim    192.168.2.20 GET  Request processing started
+    Thread-3 (process_request) app1 __main__  jim    192.168.3.21 POST Request processing started
+    Thread-2 (process_request) app2 webapplib jim    192.168.2.20 GET  Hello from webapplib!
+    Thread-3 (process_request) app1 webapplib jim    192.168.3.21 POST Hello from webapplib!
+    Thread-4 (process_request) app2 __main__  fred   192.168.2.22 GET  Request processing started
+    Thread-5 (process_request) app1 __main__  jim    192.168.3.21 POST Request processing started
+    Thread-4 (process_request) app2 webapplib fred   192.168.2.22 GET  Hello from webapplib!
+    Thread-6 (process_request) app1 __main__  jim    192.168.3.21 POST Request processing started
+    ~/logging-contextual-webapp$ grep app1 app1.log | wc -l
+    153
+    ~/logging-contextual-webapp$ grep app2 app2.log | wc -l
+    147
+    ~/logging-contextual-webapp$ grep app1 app.log | wc -l
+    153
+    ~/logging-contextual-webapp$ grep app2 app.log | wc -l
+    147
+
+
+Imparting contextual information in handlers
+--------------------------------------------
+
+Each :class:`~Handler` has its own chain of filters.
+If you want to add contextual information to a :class:`LogRecord` without leaking
+it to other handlers, you can use a filter that returns
+a new :class:`~LogRecord` instead of modifying it in-place, as shown in the following script::
+
+    import copy
+    import logging
+
+    def filter(record: logging.LogRecord):
+        record = copy.copy(record)
+        record.user = 'jim'
+        return record
+
+    if __name__ == '__main__':
+        logger = logging.getLogger()
+        logger.setLevel(logging.INFO)
+        handler = logging.StreamHandler()
+        formatter = logging.Formatter('%(message)s from %(user)-8s')
+        handler.setFormatter(formatter)
+        handler.addFilter(filter)
+        logger.addHandler(handler)
+
+        logger.info('A log message')
 
 .. _multiple-processes:
 
@@ -3164,3 +3413,23 @@ the :ref:`existing mechanisms <context-info>` for passing contextual
 information into your logs and restrict the loggers created to those describing
 areas within your application (generally modules, but occasionally slightly
 more fine-grained than that).
+
+.. _cookbook-ref-links:
+
+Other resources
+---------------
+
+.. seealso::
+
+   Module :mod:`logging`
+      API reference for the logging module.
+
+   Module :mod:`logging.config`
+      Configuration API for the logging module.
+
+   Module :mod:`logging.handlers`
+      Useful handlers included with the logging module.
+
+   :ref:`Basic Tutorial <logging-basic-tutorial>`
+
+   :ref:`Advanced Tutorial <logging-advanced-tutorial>`
diff --git a/Doc/library/logging.rst b/Doc/library/logging.rst
index 6df821cbe4545..0b8057c759a6f 100644
--- a/Doc/library/logging.rst
+++ b/Doc/library/logging.rst
@@ -233,7 +233,7 @@ is the module's name in the Python package namespace.
          2006-02-08 22:20:02,165 192.168.0.1 fbloggs  Protocol problem: connection reset
 
       The keys in the dictionary passed in *extra* should not clash with the keys used
-      by the logging system. (See the :class:`Formatter` documentation for more
+      by the logging system. (See the section on :ref:`logrecord-attributes` for more
       information on which keys are used by the logging system.)
 
       If you choose to use these attributes in logged messages, you need to exercise


From webhook-mailer at python.org  Mon Jul  4 04:10:21 2022
From: webhook-mailer at python.org (vsajip)
Date: Mon, 04 Jul 2022 08:10:21 -0000
Subject: [Python-checkins] =?utf-8?q?=5B3=2E10=5D_Update_logging_document?=
 =?utf-8?q?ation=3A_change_cross-reference_and_add_webapp_r=E2=80=A6_=28GH?=
 =?utf-8?q?-94542=29?=
Message-ID: <mailman.2068.1656922222.20746.python-checkins@python.org>

https://github.com/python/cpython/commit/817414321c236a77e05c621911d6f694db1262e2
commit: 817414321c236a77e05c621911d6f694db1262e2
branch: 3.10
author: Vinay Sajip <vinay_sajip at yahoo.co.uk>
committer: vsajip <vinay_sajip at yahoo.co.uk>
date: 2022-07-04T09:10:13+01:00
summary:

[3.10] Update logging documentation: change cross-reference and add webapp r? (GH-94542)

files:
M Doc/howto/logging-cookbook.rst
M Doc/library/logging.rst

diff --git a/Doc/howto/logging-cookbook.rst b/Doc/howto/logging-cookbook.rst
index 2bf9df847b7d9..7f4fe3a63a702 100644
--- a/Doc/howto/logging-cookbook.rst
+++ b/Doc/howto/logging-cookbook.rst
@@ -7,7 +7,8 @@ Logging Cookbook
 :Author: Vinay Sajip <vinay_sajip at red-dove dot com>
 
 This page contains a number of recipes related to logging, which have been found
-useful in the past.
+useful in the past. For links to tutorial and reference information, please see
+:ref:`cookbook-ref-links`.
 
 .. currentmodule:: logging
 
@@ -713,6 +714,254 @@ which, when run, produces something like:
     2010-09-06 22:38:15,301 d.e.f DEBUG    IP: 123.231.231.123 User: fred     A message at DEBUG level with 2 parameters
     2010-09-06 22:38:15,301 d.e.f INFO     IP: 123.231.231.123 User: fred     A message at INFO level with 2 parameters
 
+Use of ``contextvars``
+----------------------
+
+Since Python 3.7, the :mod:`contextvars` module has provided context-local storage
+which works for both :mod:`threading` and :mod:`asyncio` processing needs. This type
+of storage may thus be generally preferable to thread-locals. The following example
+shows how, in a multi-threaded environment, logs can populated with contextual
+information such as, for example, request attributes handled by web applications.
+
+For the purposes of illustration, say that you have different web applications, each
+independent of the other but running in the same Python process and using a library
+common to them. How can each of these applications have their own log, where all
+logging messages from the library (and other request processing code) are directed to
+the appropriate application's log file, while including in the log additional
+contextual information such as client IP, HTTP request method and client username?
+
+Let's assume that the library can be simulated by the following code:
+
+.. code-block:: python
+
+    # webapplib.py
+    import logging
+    import time
+
+    logger = logging.getLogger(__name__)
+
+    def useful():
+        # Just a representative event logged from the library
+        logger.debug('Hello from webapplib!')
+        # Just sleep for a bit so other threads get to run
+        time.sleep(0.01)
+
+We can simulate the multiple web applications by means of two simple classes,
+``Request`` and ``WebApp``. These simulate how real threaded web applications work -
+each request is handled by a thread:
+
+.. code-block:: python
+
+    # main.py
+    import argparse
+    from contextvars import ContextVar
+    import logging
+    import os
+    from random import choice
+    import threading
+    import webapplib
+
+    logger = logging.getLogger(__name__)
+    root = logging.getLogger()
+    root.setLevel(logging.DEBUG)
+
+    class Request:
+        """
+        A simple dummy request class which just holds dummy HTTP request method,
+        client IP address and client username
+        """
+        def __init__(self, method, ip, user):
+            self.method = method
+            self.ip = ip
+            self.user = user
+
+    # A dummy set of requests which will be used in the simulation - we'll just pick
+    # from this list randomly. Note that all GET requests are from 192.168.2.XXX
+    # addresses, whereas POST requests are from 192.16.3.XXX addresses. Three users
+    # are represented in the sample requests.
+
+    REQUESTS = [
+        Request('GET', '192.168.2.20', 'jim'),
+        Request('POST', '192.168.3.20', 'fred'),
+        Request('GET', '192.168.2.21', 'sheila'),
+        Request('POST', '192.168.3.21', 'jim'),
+        Request('GET', '192.168.2.22', 'fred'),
+        Request('POST', '192.168.3.22', 'sheila'),
+    ]
+
+    # Note that the format string includes references to request context information
+    # such as HTTP method, client IP and username
+
+    formatter = logging.Formatter('%(threadName)-11s %(appName)s %(name)-9s %(user)-6s %(ip)s %(method)-4s %(message)s')
+
+    # Create our context variables. These will be filled at the start of request
+    # processing, and used in the logging that happens during that processing
+
+    ctx_request = ContextVar('request')
+    ctx_appname = ContextVar('appname')
+
+    class InjectingFilter(logging.Filter):
+        """
+        A filter which injects context-specific information into logs and ensures
+        that only information for a specific webapp is included in its log
+        """
+        def __init__(self, app):
+            self.app = app
+
+        def filter(self, record):
+            request = ctx_request.get()
+            record.method = request.method
+            record.ip = request.ip
+            record.user = request.user
+            record.appName = appName = ctx_appname.get()
+            return appName == self.app.name
+
+    class WebApp:
+        """
+        A dummy web application class which has its own handler and filter for a
+        webapp-specific log.
+        """
+        def __init__(self, name):
+            self.name = name
+            handler = logging.FileHandler(name + '.log', 'w')
+            f = InjectingFilter(self)
+            handler.setFormatter(formatter)
+            handler.addFilter(f)
+            root.addHandler(handler)
+            self.num_requests = 0
+
+        def process_request(self, request):
+            """
+            This is the dummy method for processing a request. It's called on a
+            different thread for every request. We store the context information into
+            the context vars before doing anything else.
+            """
+            ctx_request.set(request)
+            ctx_appname.set(self.name)
+            self.num_requests += 1
+            logger.debug('Request processing started')
+            webapplib.useful()
+            logger.debug('Request processing finished')
+
+    def main():
+        fn = os.path.splitext(os.path.basename(__file__))[0]
+        adhf = argparse.ArgumentDefaultsHelpFormatter
+        ap = argparse.ArgumentParser(formatter_class=adhf, prog=fn,
+                                     description='Simulate a couple of web '
+                                                 'applications handling some '
+                                                 'requests, showing how request '
+                                                 'context can be used to '
+                                                 'populate logs')
+        aa = ap.add_argument
+        aa('--count', '-c', default=100, help='How many requests to simulate')
+        options = ap.parse_args()
+
+        # Create the dummy webapps and put them in a list which we can use to select
+        # from randomly
+        app1 = WebApp('app1')
+        app2 = WebApp('app2')
+        apps = [app1, app2]
+        threads = []
+        # Add a common handler which will capture all events
+        handler = logging.FileHandler('app.log', 'w')
+        handler.setFormatter(formatter)
+        root.addHandler(handler)
+
+        # Generate calls to process requests
+        for i in range(options.count):
+            try:
+                # Pick an app at random and a request for it to process
+                app = choice(apps)
+                request = choice(REQUESTS)
+                # Process the request in its own thread
+                t = threading.Thread(target=app.process_request, args=(request,))
+                threads.append(t)
+                t.start()
+            except KeyboardInterrupt:
+                break
+
+        # Wait for the threads to terminate
+        for t in threads:
+            t.join()
+
+        for app in apps:
+            print('%s processed %s requests' % (app.name, app.num_requests))
+
+    if __name__ == '__main__':
+        main()
+
+If you run the above, you should find that roughly half the requests go
+into :file:`app1.log` and the rest into :file:`app2.log`, and the all the requests are
+logged to :file:`app.log`. Each webapp-specific log will contain only log entries for
+only that webapp, and the request information will be displayed consistently in the
+log (i.e. the information in each dummy request will always appear together in a log
+line). This is illustrated by the following shell output:
+
+.. code-block:: shell
+
+    ~/logging-contextual-webapp$ python main.py
+    app1 processed 51 requests
+    app2 processed 49 requests
+    ~/logging-contextual-webapp$ wc -l *.log
+      153 app1.log
+      147 app2.log
+      300 app.log
+      600 total
+    ~/logging-contextual-webapp$ head -3 app1.log
+    Thread-3 (process_request) app1 __main__  jim    192.168.3.21 POST Request processing started
+    Thread-3 (process_request) app1 webapplib jim    192.168.3.21 POST Hello from webapplib!
+    Thread-5 (process_request) app1 __main__  jim    192.168.3.21 POST Request processing started
+    ~/logging-contextual-webapp$ head -3 app2.log
+    Thread-1 (process_request) app2 __main__  sheila 192.168.2.21 GET  Request processing started
+    Thread-1 (process_request) app2 webapplib sheila 192.168.2.21 GET  Hello from webapplib!
+    Thread-2 (process_request) app2 __main__  jim    192.168.2.20 GET  Request processing started
+    ~/logging-contextual-webapp$ head app.log
+    Thread-1 (process_request) app2 __main__  sheila 192.168.2.21 GET  Request processing started
+    Thread-1 (process_request) app2 webapplib sheila 192.168.2.21 GET  Hello from webapplib!
+    Thread-2 (process_request) app2 __main__  jim    192.168.2.20 GET  Request processing started
+    Thread-3 (process_request) app1 __main__  jim    192.168.3.21 POST Request processing started
+    Thread-2 (process_request) app2 webapplib jim    192.168.2.20 GET  Hello from webapplib!
+    Thread-3 (process_request) app1 webapplib jim    192.168.3.21 POST Hello from webapplib!
+    Thread-4 (process_request) app2 __main__  fred   192.168.2.22 GET  Request processing started
+    Thread-5 (process_request) app1 __main__  jim    192.168.3.21 POST Request processing started
+    Thread-4 (process_request) app2 webapplib fred   192.168.2.22 GET  Hello from webapplib!
+    Thread-6 (process_request) app1 __main__  jim    192.168.3.21 POST Request processing started
+    ~/logging-contextual-webapp$ grep app1 app1.log | wc -l
+    153
+    ~/logging-contextual-webapp$ grep app2 app2.log | wc -l
+    147
+    ~/logging-contextual-webapp$ grep app1 app.log | wc -l
+    153
+    ~/logging-contextual-webapp$ grep app2 app.log | wc -l
+    147
+
+
+Imparting contextual information in handlers
+--------------------------------------------
+
+Each :class:`~Handler` has its own chain of filters.
+If you want to add contextual information to a :class:`LogRecord` without leaking
+it to other handlers, you can use a filter that returns
+a new :class:`~LogRecord` instead of modifying it in-place, as shown in the following script::
+
+    import copy
+    import logging
+
+    def filter(record: logging.LogRecord):
+        record = copy.copy(record)
+        record.user = 'jim'
+        return record
+
+    if __name__ == '__main__':
+        logger = logging.getLogger()
+        logger.setLevel(logging.INFO)
+        handler = logging.StreamHandler()
+        formatter = logging.Formatter('%(message)s from %(user)-8s')
+        handler.setFormatter(formatter)
+        handler.addFilter(filter)
+        logger.addHandler(handler)
+
+        logger.info('A log message')
 
 .. _multiple-processes:
 
@@ -1788,22 +2037,15 @@ Python used.
 If you need more specialised processing, you can use a custom JSON encoder,
 as in the following complete example::
 
-    from __future__ import unicode_literals
-
     import json
     import logging
 
-    # This next bit is to ensure the script runs unchanged on 2.x and 3.x
-    try:
-        unicode
-    except NameError:
-        unicode = str
 
     class Encoder(json.JSONEncoder):
         def default(self, o):
             if isinstance(o, set):
                 return tuple(o)
-            elif isinstance(o, unicode):
+            elif isinstance(o, str):
                 return o.encode('unicode_escape').decode('ascii')
             return super().default(o)
 
@@ -3133,7 +3375,9 @@ lead to a number of problems in practice:
 * An attempt to delete a file (e.g. during file rotation) silently fails,
   because there is another reference pointing to it. This can lead to confusion
   and wasted debugging time - log entries end up in unexpected places, or are
-  lost altogether.
+  lost altogether. Or a file that was supposed to be moved remains in place,
+  and grows in size unexpectedly despite size-based rotation being supposedly
+  in place.
 
 Use the techniques outlined in :ref:`multiple-processes` to circumvent such
 issues.
@@ -3169,3 +3413,23 @@ the :ref:`existing mechanisms <context-info>` for passing contextual
 information into your logs and restrict the loggers created to those describing
 areas within your application (generally modules, but occasionally slightly
 more fine-grained than that).
+
+.. _cookbook-ref-links:
+
+Other resources
+---------------
+
+.. seealso::
+
+   Module :mod:`logging`
+      API reference for the logging module.
+
+   Module :mod:`logging.config`
+      Configuration API for the logging module.
+
+   Module :mod:`logging.handlers`
+      Useful handlers included with the logging module.
+
+   :ref:`Basic Tutorial <logging-basic-tutorial>`
+
+   :ref:`Advanced Tutorial <logging-advanced-tutorial>`
diff --git a/Doc/library/logging.rst b/Doc/library/logging.rst
index ed2d97698d3f6..6885c4f86c7ef 100644
--- a/Doc/library/logging.rst
+++ b/Doc/library/logging.rst
@@ -233,7 +233,7 @@ is the module's name in the Python package namespace.
          2006-02-08 22:20:02,165 192.168.0.1 fbloggs  Protocol problem: connection reset
 
       The keys in the dictionary passed in *extra* should not clash with the keys used
-      by the logging system. (See the :class:`Formatter` documentation for more
+      by the logging system. (See the section on :ref:`logrecord-attributes` for more
       information on which keys are used by the logging system.)
 
       If you choose to use these attributes in logged messages, you need to exercise


From webhook-mailer at python.org  Mon Jul  4 09:09:46 2022
From: webhook-mailer at python.org (zooba)
Date: Mon, 04 Jul 2022 13:09:46 -0000
Subject: [Python-checkins] gh-94512: Fix forced arg format in AC-processed
 msvcrtmodule (GH-94514)
Message-ID: <mailman.2069.1656940187.20746.python-checkins@python.org>

https://github.com/python/cpython/commit/21f6b4d7838fa16341faf735456b05f8ede9e4f9
commit: 21f6b4d7838fa16341faf735456b05f8ede9e4f9
branch: main
author: Oleg Iarygin <oleg at arhadthedev.net>
committer: zooba <steve.dower at microsoft.com>
date: 2022-07-04T14:09:34+01:00
summary:

gh-94512: Fix forced arg format in AC-processed msvcrtmodule (GH-94514)

files:
M PC/clinic/msvcrtmodule.c.h
M PC/msvcrtmodule.c

diff --git a/PC/clinic/msvcrtmodule.c.h b/PC/clinic/msvcrtmodule.c.h
index ea95897590fe4..e60fbd0b623cd 100644
--- a/PC/clinic/msvcrtmodule.c.h
+++ b/PC/clinic/msvcrtmodule.c.h
@@ -141,8 +141,15 @@ msvcrt_open_osfhandle(PyObject *module, PyObject *const *args, Py_ssize_t nargs)
     int flags;
     long _return_value;
 
-    if (!_PyArg_ParseStack(args, nargs, ""_Py_PARSE_UINTPTR"i:open_osfhandle",
-        &handle, &flags)) {
+    if (!_PyArg_CheckPositional("open_osfhandle", nargs, 2, 2)) {
+        goto exit;
+    }
+    handle = PyLong_AsVoidPtr(args[0]);
+    if (!handle && PyErr_Occurred()) {
+        goto exit;
+    }
+    flags = _PyLong_AsInt(args[1]);
+    if (flags == -1 && PyErr_Occurred()) {
         goto exit;
     }
     _return_value = msvcrt_open_osfhandle_impl(module, handle, flags);
@@ -488,8 +495,15 @@ msvcrt_CrtSetReportFile(PyObject *module, PyObject *const *args, Py_ssize_t narg
     void *file;
     void *_return_value;
 
-    if (!_PyArg_ParseStack(args, nargs, "i"_Py_PARSE_UINTPTR":CrtSetReportFile",
-        &type, &file)) {
+    if (!_PyArg_CheckPositional("CrtSetReportFile", nargs, 2, 2)) {
+        goto exit;
+    }
+    type = _PyLong_AsInt(args[0]);
+    if (type == -1 && PyErr_Occurred()) {
+        goto exit;
+    }
+    file = PyLong_AsVoidPtr(args[1]);
+    if (!file && PyErr_Occurred()) {
         goto exit;
     }
     _return_value = msvcrt_CrtSetReportFile_impl(module, type, file);
@@ -647,4 +661,4 @@ msvcrt_SetErrorMode(PyObject *module, PyObject *arg)
 #ifndef MSVCRT_SET_ERROR_MODE_METHODDEF
     #define MSVCRT_SET_ERROR_MODE_METHODDEF
 #endif /* !defined(MSVCRT_SET_ERROR_MODE_METHODDEF) */
-/*[clinic end generated code: output=b543933cad520f2b input=a9049054013a1b77]*/
+/*[clinic end generated code: output=9d89e9414484d28c input=a9049054013a1b77]*/
diff --git a/PC/msvcrtmodule.c b/PC/msvcrtmodule.c
index 1f78d99c790ff..988d9c95aaa22 100644
--- a/PC/msvcrtmodule.c
+++ b/PC/msvcrtmodule.c
@@ -38,6 +38,14 @@ class HANDLE_converter(CConverter):
     type = 'void *'
     format_unit = '"_Py_PARSE_UINTPTR"'
 
+    def parse_arg(self, argname, displayname):
+        return """
+            {paramname} = PyLong_AsVoidPtr({argname});
+            if (!{paramname} && PyErr_Occurred()) {{{{
+                goto exit;
+            }}}}
+            """.format(argname=argname, paramname=self.parser_name)
+
 class HANDLE_return_converter(CReturnConverter):
     type = 'void *'
 
@@ -66,7 +74,7 @@ class wchar_t_return_converter(CReturnConverter):
         data.return_conversion.append(
             'return_value = PyUnicode_FromOrdinal(_return_value);\n')
 [python start generated code]*/
-/*[python end generated code: output=da39a3ee5e6b4b0d input=d102511df3cda2eb]*/
+/*[python end generated code: output=da39a3ee5e6b4b0d input=1e8e9fa3538ec08f]*/
 
 /*[clinic input]
 module msvcrt


From webhook-mailer at python.org  Mon Jul  4 09:10:15 2022
From: webhook-mailer at python.org (zooba)
Date: Mon, 04 Jul 2022 13:10:15 -0000
Subject: [Python-checkins] gh-94512: Fix forced arg format in AC-processed
 winreg (GH-94513)
Message-ID: <mailman.2070.1656940216.20746.python-checkins@python.org>

https://github.com/python/cpython/commit/9b50f76fcdb48cae10fe954ab6f659a4ceff4c0c
commit: 9b50f76fcdb48cae10fe954ab6f659a4ceff4c0c
branch: main
author: Oleg Iarygin <oleg at arhadthedev.net>
committer: zooba <steve.dower at microsoft.com>
date: 2022-07-04T14:10:10+01:00
summary:

gh-94512: Fix forced arg format in AC-processed winreg (GH-94513)

files:
M PC/clinic/winreg.c.h
M PC/winreg.c

diff --git a/PC/clinic/winreg.c.h b/PC/clinic/winreg.c.h
index 6af24af539b0b..1e64b1eedeb3e 100644
--- a/PC/clinic/winreg.c.h
+++ b/PC/clinic/winreg.c.h
@@ -287,17 +287,52 @@ winreg_CreateKeyEx(PyObject *module, PyObject *const *args, Py_ssize_t nargs, Py
 {
     PyObject *return_value = NULL;
     static const char * const _keywords[] = {"key", "sub_key", "reserved", "access", NULL};
-    static _PyArg_Parser _parser = {"O&O&|ii:CreateKeyEx", _keywords, 0};
+    static _PyArg_Parser _parser = {NULL, _keywords, "CreateKeyEx", 0};
+    PyObject *argsbuf[4];
+    Py_ssize_t noptargs = nargs + (kwnames ? PyTuple_GET_SIZE(kwnames) : 0) - 2;
     HKEY key;
     const Py_UNICODE *sub_key;
     int reserved = 0;
     REGSAM access = KEY_WRITE;
     HKEY _return_value;
 
-    if (!_PyArg_ParseStackAndKeywords(args, nargs, kwnames, &_parser,
-        clinic_HKEY_converter, &key, _PyUnicode_WideCharString_Opt_Converter, &sub_key, &reserved, &access)) {
+    args = _PyArg_UnpackKeywords(args, nargs, NULL, kwnames, &_parser, 2, 4, 0, argsbuf);
+    if (!args) {
+        goto exit;
+    }
+    if (!clinic_HKEY_converter(args[0], &key)) {
+        goto exit;
+    }
+    if (args[1] == Py_None) {
+        sub_key = NULL;
+    }
+    else if (PyUnicode_Check(args[1])) {
+        sub_key = PyUnicode_AsWideCharString(args[1], NULL);
+        if (sub_key == NULL) {
+            goto exit;
+        }
+    }
+    else {
+        _PyArg_BadArgument("CreateKeyEx", "argument 'sub_key'", "str or None", args[1]);
         goto exit;
     }
+    if (!noptargs) {
+        goto skip_optional_pos;
+    }
+    if (args[2]) {
+        reserved = _PyLong_AsInt(args[2]);
+        if (reserved == -1 && PyErr_Occurred()) {
+            goto exit;
+        }
+        if (!--noptargs) {
+            goto skip_optional_pos;
+        }
+    }
+    access = _PyLong_AsInt(args[3]);
+    if (access == -1 && PyErr_Occurred()) {
+        goto exit;
+    }
+skip_optional_pos:
     _return_value = winreg_CreateKeyEx_impl(module, key, sub_key, reserved, access);
     if (_return_value == NULL) {
         goto exit;
@@ -403,16 +438,46 @@ winreg_DeleteKeyEx(PyObject *module, PyObject *const *args, Py_ssize_t nargs, Py
 {
     PyObject *return_value = NULL;
     static const char * const _keywords[] = {"key", "sub_key", "access", "reserved", NULL};
-    static _PyArg_Parser _parser = {"O&O&|ii:DeleteKeyEx", _keywords, 0};
+    static _PyArg_Parser _parser = {NULL, _keywords, "DeleteKeyEx", 0};
+    PyObject *argsbuf[4];
+    Py_ssize_t noptargs = nargs + (kwnames ? PyTuple_GET_SIZE(kwnames) : 0) - 2;
     HKEY key;
     const Py_UNICODE *sub_key;
     REGSAM access = KEY_WOW64_64KEY;
     int reserved = 0;
 
-    if (!_PyArg_ParseStackAndKeywords(args, nargs, kwnames, &_parser,
-        clinic_HKEY_converter, &key, _PyUnicode_WideCharString_Converter, &sub_key, &access, &reserved)) {
+    args = _PyArg_UnpackKeywords(args, nargs, NULL, kwnames, &_parser, 2, 4, 0, argsbuf);
+    if (!args) {
         goto exit;
     }
+    if (!clinic_HKEY_converter(args[0], &key)) {
+        goto exit;
+    }
+    if (!PyUnicode_Check(args[1])) {
+        _PyArg_BadArgument("DeleteKeyEx", "argument 'sub_key'", "str", args[1]);
+        goto exit;
+    }
+    sub_key = PyUnicode_AsWideCharString(args[1], NULL);
+    if (sub_key == NULL) {
+        goto exit;
+    }
+    if (!noptargs) {
+        goto skip_optional_pos;
+    }
+    if (args[2]) {
+        access = _PyLong_AsInt(args[2]);
+        if (access == -1 && PyErr_Occurred()) {
+            goto exit;
+        }
+        if (!--noptargs) {
+            goto skip_optional_pos;
+        }
+    }
+    reserved = _PyLong_AsInt(args[3]);
+    if (reserved == -1 && PyErr_Occurred()) {
+        goto exit;
+    }
+skip_optional_pos:
     return_value = winreg_DeleteKeyEx_impl(module, key, sub_key, access, reserved);
 
 exit:
@@ -754,17 +819,52 @@ winreg_OpenKey(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObje
 {
     PyObject *return_value = NULL;
     static const char * const _keywords[] = {"key", "sub_key", "reserved", "access", NULL};
-    static _PyArg_Parser _parser = {"O&O&|ii:OpenKey", _keywords, 0};
+    static _PyArg_Parser _parser = {NULL, _keywords, "OpenKey", 0};
+    PyObject *argsbuf[4];
+    Py_ssize_t noptargs = nargs + (kwnames ? PyTuple_GET_SIZE(kwnames) : 0) - 2;
     HKEY key;
     const Py_UNICODE *sub_key;
     int reserved = 0;
     REGSAM access = KEY_READ;
     HKEY _return_value;
 
-    if (!_PyArg_ParseStackAndKeywords(args, nargs, kwnames, &_parser,
-        clinic_HKEY_converter, &key, _PyUnicode_WideCharString_Opt_Converter, &sub_key, &reserved, &access)) {
+    args = _PyArg_UnpackKeywords(args, nargs, NULL, kwnames, &_parser, 2, 4, 0, argsbuf);
+    if (!args) {
+        goto exit;
+    }
+    if (!clinic_HKEY_converter(args[0], &key)) {
+        goto exit;
+    }
+    if (args[1] == Py_None) {
+        sub_key = NULL;
+    }
+    else if (PyUnicode_Check(args[1])) {
+        sub_key = PyUnicode_AsWideCharString(args[1], NULL);
+        if (sub_key == NULL) {
+            goto exit;
+        }
+    }
+    else {
+        _PyArg_BadArgument("OpenKey", "argument 'sub_key'", "str or None", args[1]);
+        goto exit;
+    }
+    if (!noptargs) {
+        goto skip_optional_pos;
+    }
+    if (args[2]) {
+        reserved = _PyLong_AsInt(args[2]);
+        if (reserved == -1 && PyErr_Occurred()) {
+            goto exit;
+        }
+        if (!--noptargs) {
+            goto skip_optional_pos;
+        }
+    }
+    access = _PyLong_AsInt(args[3]);
+    if (access == -1 && PyErr_Occurred()) {
         goto exit;
     }
+skip_optional_pos:
     _return_value = winreg_OpenKey_impl(module, key, sub_key, reserved, access);
     if (_return_value == NULL) {
         goto exit;
@@ -809,17 +909,52 @@ winreg_OpenKeyEx(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyOb
 {
     PyObject *return_value = NULL;
     static const char * const _keywords[] = {"key", "sub_key", "reserved", "access", NULL};
-    static _PyArg_Parser _parser = {"O&O&|ii:OpenKeyEx", _keywords, 0};
+    static _PyArg_Parser _parser = {NULL, _keywords, "OpenKeyEx", 0};
+    PyObject *argsbuf[4];
+    Py_ssize_t noptargs = nargs + (kwnames ? PyTuple_GET_SIZE(kwnames) : 0) - 2;
     HKEY key;
     const Py_UNICODE *sub_key;
     int reserved = 0;
     REGSAM access = KEY_READ;
     HKEY _return_value;
 
-    if (!_PyArg_ParseStackAndKeywords(args, nargs, kwnames, &_parser,
-        clinic_HKEY_converter, &key, _PyUnicode_WideCharString_Opt_Converter, &sub_key, &reserved, &access)) {
+    args = _PyArg_UnpackKeywords(args, nargs, NULL, kwnames, &_parser, 2, 4, 0, argsbuf);
+    if (!args) {
         goto exit;
     }
+    if (!clinic_HKEY_converter(args[0], &key)) {
+        goto exit;
+    }
+    if (args[1] == Py_None) {
+        sub_key = NULL;
+    }
+    else if (PyUnicode_Check(args[1])) {
+        sub_key = PyUnicode_AsWideCharString(args[1], NULL);
+        if (sub_key == NULL) {
+            goto exit;
+        }
+    }
+    else {
+        _PyArg_BadArgument("OpenKeyEx", "argument 'sub_key'", "str or None", args[1]);
+        goto exit;
+    }
+    if (!noptargs) {
+        goto skip_optional_pos;
+    }
+    if (args[2]) {
+        reserved = _PyLong_AsInt(args[2]);
+        if (reserved == -1 && PyErr_Occurred()) {
+            goto exit;
+        }
+        if (!--noptargs) {
+            goto skip_optional_pos;
+        }
+    }
+    access = _PyLong_AsInt(args[3]);
+    if (access == -1 && PyErr_Occurred()) {
+        goto exit;
+    }
+skip_optional_pos:
     _return_value = winreg_OpenKeyEx_impl(module, key, sub_key, reserved, access);
     if (_return_value == NULL) {
         goto exit;
@@ -1086,10 +1221,36 @@ winreg_SetValue(PyObject *module, PyObject *const *args, Py_ssize_t nargs)
     DWORD type;
     PyObject *value_obj;
 
-    if (!_PyArg_ParseStack(args, nargs, "O&O&kU:SetValue",
-        clinic_HKEY_converter, &key, _PyUnicode_WideCharString_Opt_Converter, &sub_key, &type, &value_obj)) {
+    if (!_PyArg_CheckPositional("SetValue", nargs, 4, 4)) {
         goto exit;
     }
+    if (!clinic_HKEY_converter(args[0], &key)) {
+        goto exit;
+    }
+    if (args[1] == Py_None) {
+        sub_key = NULL;
+    }
+    else if (PyUnicode_Check(args[1])) {
+        sub_key = PyUnicode_AsWideCharString(args[1], NULL);
+        if (sub_key == NULL) {
+            goto exit;
+        }
+    }
+    else {
+        _PyArg_BadArgument("SetValue", "argument 2", "str or None", args[1]);
+        goto exit;
+    }
+    if (!_PyLong_UnsignedLong_Converter(args[2], &type)) {
+        goto exit;
+    }
+    if (!PyUnicode_Check(args[3])) {
+        _PyArg_BadArgument("SetValue", "argument 4", "str", args[3]);
+        goto exit;
+    }
+    if (PyUnicode_READY(args[3]) == -1) {
+        goto exit;
+    }
+    value_obj = args[3];
     return_value = winreg_SetValue_impl(module, key, sub_key, type, value_obj);
 
 exit:
@@ -1160,10 +1321,30 @@ winreg_SetValueEx(PyObject *module, PyObject *const *args, Py_ssize_t nargs)
     DWORD type;
     PyObject *value;
 
-    if (!_PyArg_ParseStack(args, nargs, "O&O&OkO:SetValueEx",
-        clinic_HKEY_converter, &key, _PyUnicode_WideCharString_Opt_Converter, &value_name, &reserved, &type, &value)) {
+    if (!_PyArg_CheckPositional("SetValueEx", nargs, 5, 5)) {
+        goto exit;
+    }
+    if (!clinic_HKEY_converter(args[0], &key)) {
+        goto exit;
+    }
+    if (args[1] == Py_None) {
+        value_name = NULL;
+    }
+    else if (PyUnicode_Check(args[1])) {
+        value_name = PyUnicode_AsWideCharString(args[1], NULL);
+        if (value_name == NULL) {
+            goto exit;
+        }
+    }
+    else {
+        _PyArg_BadArgument("SetValueEx", "argument 2", "str or None", args[1]);
+        goto exit;
+    }
+    reserved = args[2];
+    if (!_PyLong_UnsignedLong_Converter(args[3], &type)) {
         goto exit;
     }
+    value = args[4];
     return_value = winreg_SetValueEx_impl(module, key, value_name, reserved, type, value);
 
 exit:
@@ -1274,4 +1455,4 @@ winreg_QueryReflectionKey(PyObject *module, PyObject *arg)
 exit:
     return return_value;
 }
-/*[clinic end generated code: output=9782b1630b59e201 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=504fc17ae25a7c75 input=a9049054013a1b77]*/
diff --git a/PC/winreg.c b/PC/winreg.c
index 92d05f5144a3c..b326c3dfd2c78 100644
--- a/PC/winreg.c
+++ b/PC/winreg.c
@@ -217,13 +217,11 @@ class winreg.HKEYType "PyHKEYObject *" "&PyHKEY_Type"
 /*[clinic end generated code: output=da39a3ee5e6b4b0d input=4c964eba3bf914d6]*/
 
 /*[python input]
-class REGSAM_converter(CConverter):
+class REGSAM_converter(int_converter):
     type = 'REGSAM'
-    format_unit = 'i'
 
-class DWORD_converter(CConverter):
+class DWORD_converter(unsigned_long_converter):
     type = 'DWORD'
-    format_unit = 'k'
 
 class HKEY_converter(CConverter):
     type = 'HKEY'
@@ -249,7 +247,7 @@ class self_return_converter(CReturnConverter):
         data.return_conversion.append(
             'return_value = (PyObject *)_return_value;\n')
 [python start generated code]*/
-/*[python end generated code: output=da39a3ee5e6b4b0d input=22f7aedc6d68e80e]*/
+/*[python end generated code: output=da39a3ee5e6b4b0d input=2ebb7a4922d408d6]*/
 
 #include "clinic/winreg.c.h"
 


From webhook-mailer at python.org  Mon Jul  4 09:11:16 2022
From: webhook-mailer at python.org (zooba)
Date: Mon, 04 Jul 2022 13:11:16 -0000
Subject: [Python-checkins] gh-94512: Fix forced arg format in AC-processed
 multiprocessing (GH-94517)
Message-ID: <mailman.2071.1656940277.20746.python-checkins@python.org>

https://github.com/python/cpython/commit/670f7f10cf9cd7bdde9e62660d85506823f5bf7c
commit: 670f7f10cf9cd7bdde9e62660d85506823f5bf7c
branch: main
author: Oleg Iarygin <oleg at arhadthedev.net>
committer: zooba <steve.dower at microsoft.com>
date: 2022-07-04T14:11:11+01:00
summary:

gh-94512: Fix forced arg format in AC-processed multiprocessing (GH-94517)

files:
M Modules/_multiprocessing/clinic/multiprocessing.c.h
M Modules/_multiprocessing/multiprocessing.c

diff --git a/Modules/_multiprocessing/clinic/multiprocessing.c.h b/Modules/_multiprocessing/clinic/multiprocessing.c.h
index e9953215aca7d..3a30833904792 100644
--- a/Modules/_multiprocessing/clinic/multiprocessing.c.h
+++ b/Modules/_multiprocessing/clinic/multiprocessing.c.h
@@ -21,7 +21,8 @@ _multiprocessing_closesocket(PyObject *module, PyObject *arg)
     PyObject *return_value = NULL;
     HANDLE handle;
 
-    if (!PyArg_Parse(arg, ""F_HANDLE":closesocket", &handle)) {
+    handle = PyLong_AsVoidPtr(arg);
+    if (!handle && PyErr_Occurred()) {
         goto exit;
     }
     return_value = _multiprocessing_closesocket_impl(module, handle);
@@ -52,8 +53,15 @@ _multiprocessing_recv(PyObject *module, PyObject *const *args, Py_ssize_t nargs)
     HANDLE handle;
     int size;
 
-    if (!_PyArg_ParseStack(args, nargs, ""F_HANDLE"i:recv",
-        &handle, &size)) {
+    if (!_PyArg_CheckPositional("recv", nargs, 2, 2)) {
+        goto exit;
+    }
+    handle = PyLong_AsVoidPtr(args[0]);
+    if (!handle && PyErr_Occurred()) {
+        goto exit;
+    }
+    size = _PyLong_AsInt(args[1]);
+    if (size == -1 && PyErr_Occurred()) {
         goto exit;
     }
     return_value = _multiprocessing_recv_impl(module, handle, size);
@@ -84,8 +92,18 @@ _multiprocessing_send(PyObject *module, PyObject *const *args, Py_ssize_t nargs)
     HANDLE handle;
     Py_buffer buf = {NULL, NULL};
 
-    if (!_PyArg_ParseStack(args, nargs, ""F_HANDLE"y*:send",
-        &handle, &buf)) {
+    if (!_PyArg_CheckPositional("send", nargs, 2, 2)) {
+        goto exit;
+    }
+    handle = PyLong_AsVoidPtr(args[0]);
+    if (!handle && PyErr_Occurred()) {
+        goto exit;
+    }
+    if (PyObject_GetBuffer(args[1], &buf, PyBUF_SIMPLE) != 0) {
+        goto exit;
+    }
+    if (!PyBuffer_IsContiguous(&buf, 'C')) {
+        _PyArg_BadArgument("send", "argument 2", "contiguous buffer", args[1]);
         goto exit;
     }
     return_value = _multiprocessing_send_impl(module, handle, &buf);
@@ -148,4 +166,4 @@ _multiprocessing_sem_unlink(PyObject *module, PyObject *arg)
 #ifndef _MULTIPROCESSING_SEND_METHODDEF
     #define _MULTIPROCESSING_SEND_METHODDEF
 #endif /* !defined(_MULTIPROCESSING_SEND_METHODDEF) */
-/*[clinic end generated code: output=d3bbf69de578db7b input=a9049054013a1b77]*/
+/*[clinic end generated code: output=ab64ce752f933c55 input=a9049054013a1b77]*/
diff --git a/Modules/_multiprocessing/multiprocessing.c b/Modules/_multiprocessing/multiprocessing.c
index 0809c2455dbeb..ed89a1e29a433 100644
--- a/Modules/_multiprocessing/multiprocessing.c
+++ b/Modules/_multiprocessing/multiprocessing.c
@@ -14,8 +14,16 @@ class HANDLE_converter(CConverter):
     type = "HANDLE"
     format_unit = '"F_HANDLE"'
 
+    def parse_arg(self, argname, displayname):
+        return """
+            {paramname} = PyLong_AsVoidPtr({argname});
+            if (!{paramname} && PyErr_Occurred()) {{{{
+                goto exit;
+            }}}}
+            """.format(argname=argname, paramname=self.parser_name)
+
 [python start generated code]*/
-/*[python end generated code: output=da39a3ee5e6b4b0d input=9fad6080b79ace91]*/
+/*[python end generated code: output=da39a3ee5e6b4b0d input=3e537d244034affb]*/
 
 /*[clinic input]
 module _multiprocessing


From webhook-mailer at python.org  Mon Jul  4 09:29:28 2022
From: webhook-mailer at python.org (vstinner)
Date: Mon, 04 Jul 2022 13:29:28 -0000
Subject: [Python-checkins] gh-94352: shlex.split() no longer accepts None
 (#94353)
Message-ID: <mailman.2072.1656941370.20746.python-checkins@python.org>

https://github.com/python/cpython/commit/fbcee570d1e15e5260a456cb71c8b0897dc76237
commit: fbcee570d1e15e5260a456cb71c8b0897dc76237
branch: main
author: Victor Stinner <vstinner at python.org>
committer: vstinner <vstinner at python.org>
date: 2022-07-04T15:29:19+02:00
summary:

gh-94352: shlex.split() no longer accepts None (#94353)

shlex.split(): Passing None for s argument now raises an exception,
rather than reading sys.stdin. The feature was deprecated in Python
3.9.

files:
A Misc/NEWS.d/next/Library/2022-06-28-00-24-48.gh-issue-94352.JY1Ayt.rst
M Doc/library/shlex.rst
M Doc/whatsnew/3.12.rst
M Lib/shlex.py
M Lib/test/test_shlex.py

diff --git a/Doc/library/shlex.rst b/Doc/library/shlex.rst
index aab6a54379209..0bad51833aae1 100644
--- a/Doc/library/shlex.rst
+++ b/Doc/library/shlex.rst
@@ -36,9 +36,9 @@ The :mod:`shlex` module defines the following functions:
       instance, passing ``None`` for *s* will read the string to split from
       standard input.
 
-   .. deprecated:: 3.9
-      Passing ``None`` for *s* will raise an exception in future Python
-      versions.
+   .. versionchanged:: 3.12
+      Passing ``None`` for *s* argument now raises an exception, rather than
+      reading :data:`sys.stdin`.
 
 .. function:: join(split_command)
 
diff --git a/Doc/whatsnew/3.12.rst b/Doc/whatsnew/3.12.rst
index 620aa91f6da22..ed21abaeb6dc1 100644
--- a/Doc/whatsnew/3.12.rst
+++ b/Doc/whatsnew/3.12.rst
@@ -324,6 +324,11 @@ Changes in the Python API
   to :term:`filesystem encoding and error handler`.
   Argument files should be encoded in UTF-8 instead of ANSI Codepage on Windows.
 
+* :func:`shlex.split`: Passing ``None`` for *s* argument now raises an
+  exception, rather than reading :data:`sys.stdin`. The feature was deprecated
+  in Python 3.9.
+  (Contributed by Victor Stinner in :gh:`94352`.)
+
 
 Build Changes
 =============
diff --git a/Lib/shlex.py b/Lib/shlex.py
index 4801a6c1d47bd..a91c9b022627b 100644
--- a/Lib/shlex.py
+++ b/Lib/shlex.py
@@ -305,9 +305,7 @@ def __next__(self):
 def split(s, comments=False, posix=True):
     """Split the string *s* using shell-like syntax."""
     if s is None:
-        import warnings
-        warnings.warn("Passing None for 's' to shlex.split() is deprecated.",
-                      DeprecationWarning, stacklevel=2)
+        raise ValueError("s argument must not be None")
     lex = shlex(s, posix=posix)
     lex.whitespace_split = True
     if not comments:
diff --git a/Lib/test/test_shlex.py b/Lib/test/test_shlex.py
index 3081a785204ed..92598dbbd5f29 100644
--- a/Lib/test/test_shlex.py
+++ b/Lib/test/test_shlex.py
@@ -162,9 +162,8 @@ def oldSplit(self, s):
             tok = lex.get_token()
         return ret
 
-    @mock.patch('sys.stdin', io.StringIO())
-    def testSplitNoneDeprecation(self):
-        with self.assertWarns(DeprecationWarning):
+    def testSplitNone(self):
+        with self.assertRaises(ValueError):
             shlex.split(None)
 
     def testSplitPosix(self):
diff --git a/Misc/NEWS.d/next/Library/2022-06-28-00-24-48.gh-issue-94352.JY1Ayt.rst b/Misc/NEWS.d/next/Library/2022-06-28-00-24-48.gh-issue-94352.JY1Ayt.rst
new file mode 100644
index 0000000000000..3a166abdcc320
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2022-06-28-00-24-48.gh-issue-94352.JY1Ayt.rst
@@ -0,0 +1,3 @@
+:func:`shlex.split`: Passing ``None`` for *s* argument now raises an exception,
+rather than reading :data:`sys.stdin`. The feature was deprecated in Python
+3.9. Patch by Victor Stinner.


From webhook-mailer at python.org  Mon Jul  4 09:51:11 2022
From: webhook-mailer at python.org (vstinner)
Date: Mon, 04 Jul 2022 13:51:11 -0000
Subject: [Python-checkins] gh-94383: Remove ElementTree.Element.copy()
 method (#94384)
Message-ID: <mailman.2073.1656942672.20746.python-checkins@python.org>

https://github.com/python/cpython/commit/fd76eb547dd5d2c8307a89422049b6c3c80541ab
commit: fd76eb547dd5d2c8307a89422049b6c3c80541ab
branch: main
author: Victor Stinner <vstinner at python.org>
committer: vstinner <vstinner at python.org>
date: 2022-07-04T15:51:01+02:00
summary:

gh-94383: Remove ElementTree.Element.copy() method (#94384)

xml.etree: Remove the ElementTree.Element.copy() method of the pure
Python implementation, deprecated in Python 3.10, use the copy.copy()
function instead. The C implementation of xml.etree has no copy()
method, only a __copy__() method.

files:
A Misc/NEWS.d/next/Library/2022-06-28-14-41-22.gh-issue-94383.CXnquo.rst
M Doc/whatsnew/3.12.rst
M Lib/test/test_xml_etree.py
M Lib/xml/etree/ElementTree.py

diff --git a/Doc/whatsnew/3.12.rst b/Doc/whatsnew/3.12.rst
index ed21abaeb6dc1..43239a75f701a 100644
--- a/Doc/whatsnew/3.12.rst
+++ b/Doc/whatsnew/3.12.rst
@@ -293,6 +293,12 @@ Removed
   a C implementation of :func:`~hashlib.pbkdf2_hmac()` which is faster.
   (Contributed by Victor Stinner in :gh:`94199`.)
 
+* :mod:`xml.etree`: Remove the ``ElementTree.Element.copy()`` method of the
+  pure Python implementation, deprecated in Python 3.10, use the
+  :func:`copy.copy` function instead.  The C implementation of :mod:`xml.etree`
+  has no ``copy()`` method, only a ``__copy__()`` method.
+  (Contributed by Victor Stinner in :gh:`94383`.)
+
 
 Porting to Python 3.12
 ======================
diff --git a/Lib/test/test_xml_etree.py b/Lib/test/test_xml_etree.py
index afa4641e6906b..839955695b800 100644
--- a/Lib/test/test_xml_etree.py
+++ b/Lib/test/test_xml_etree.py
@@ -2333,35 +2333,6 @@ def test___init__(self):
         self.assertIsNot(element_foo.attrib, attrib)
         self.assertNotEqual(element_foo.attrib, attrib)
 
-    def test_copy(self):
-        # Only run this test if Element.copy() is defined.
-        if "copy" not in dir(ET.Element):
-            raise unittest.SkipTest("Element.copy() not present")
-
-        element_foo = ET.Element("foo", { "zix": "wyp" })
-        element_foo.append(ET.Element("bar", { "baz": "qix" }))
-
-        with self.assertWarns(DeprecationWarning):
-            element_foo2 = element_foo.copy()
-
-        # elements are not the same
-        self.assertIsNot(element_foo2, element_foo)
-
-        # string attributes are equal
-        self.assertEqual(element_foo2.tag, element_foo.tag)
-        self.assertEqual(element_foo2.text, element_foo.text)
-        self.assertEqual(element_foo2.tail, element_foo.tail)
-
-        # number of children is the same
-        self.assertEqual(len(element_foo2), len(element_foo))
-
-        # children are the same
-        for (child1, child2) in itertools.zip_longest(element_foo, element_foo2):
-            self.assertIs(child1, child2)
-
-        # attrib is a copy
-        self.assertEqual(element_foo2.attrib, element_foo.attrib)
-
     def test___copy__(self):
         element_foo = ET.Element("foo", { "zix": "wyp" })
         element_foo.append(ET.Element("bar", { "baz": "qix" }))
diff --git a/Lib/xml/etree/ElementTree.py b/Lib/xml/etree/ElementTree.py
index 1dc80351bf7dd..ebbe2b703bfd8 100644
--- a/Lib/xml/etree/ElementTree.py
+++ b/Lib/xml/etree/ElementTree.py
@@ -188,19 +188,6 @@ def makeelement(self, tag, attrib):
         """
         return self.__class__(tag, attrib)
 
-    def copy(self):
-        """Return copy of current element.
-
-        This creates a shallow copy. Subelements will be shared with the
-        original tree.
-
-        """
-        warnings.warn(
-            "elem.copy() is deprecated. Use copy.copy(elem) instead.",
-            DeprecationWarning
-            )
-        return self.__copy__()
-
     def __copy__(self):
         elem = self.makeelement(self.tag, self.attrib)
         elem.text = self.text
diff --git a/Misc/NEWS.d/next/Library/2022-06-28-14-41-22.gh-issue-94383.CXnquo.rst b/Misc/NEWS.d/next/Library/2022-06-28-14-41-22.gh-issue-94383.CXnquo.rst
new file mode 100644
index 0000000000000..9ed476b717f33
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2022-06-28-14-41-22.gh-issue-94383.CXnquo.rst
@@ -0,0 +1,5 @@
+:mod:`xml.etree`: Remove the ``ElementTree.Element.copy()`` method of the
+pure Python implementation, deprecated in Python 3.10, use the
+:func:`copy.copy` function instead. The C implementation of :mod:`xml.etree`
+has no ``copy()`` method, only a ``__copy__()`` method. Patch by Victor
+Stinner.


From webhook-mailer at python.org  Mon Jul  4 14:43:22 2022
From: webhook-mailer at python.org (pablogsal)
Date: Mon, 04 Jul 2022 18:43:22 -0000
Subject: [Python-checkins] [3.11] GH-94262: Don't create frame objects for
 frames that aren't yet complete. (GH-94371) (#94482)
Message-ID: <mailman.2074.1656960203.20746.python-checkins@python.org>

https://github.com/python/cpython/commit/68f5fa668343341b79ce1e23f1d9e773b98fd312
commit: 68f5fa668343341b79ce1e23f1d9e773b98fd312
branch: 3.11
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: pablogsal <Pablogsal at gmail.com>
date: 2022-07-04T19:43:12+01:00
summary:

[3.11] GH-94262: Don't create frame objects for frames that aren't yet complete. (GH-94371) (#94482)

Co-authored-by: Mark Shannon <mark at hotpy.org>

files:
A Misc/NEWS.d/next/Core and Builtins/2022-06-28-10-08-06.gh-issue-94262.m-HWUZ.rst
M Include/internal/pycore_frame.h
M Lib/test/test_generators.py
M Objects/codeobject.c
M Objects/frameobject.c
M Python/frame.c
M Python/sysmodule.c

diff --git a/Include/internal/pycore_frame.h b/Include/internal/pycore_frame.h
index 405afd67d2274..efdcdbcf8df80 100644
--- a/Include/internal/pycore_frame.h
+++ b/Include/internal/pycore_frame.h
@@ -133,6 +133,21 @@ _PyFrame_SetStackPointer(_PyInterpreterFrame *frame, PyObject **stack_pointer)
     frame->stacktop = (int)(stack_pointer - frame->localsplus);
 }
 
+/* Determine whether a frame is incomplete.
+ * A frame is incomplete if it is part way through
+ * creating cell objects or a generator or coroutine.
+ *
+ * Frames on the frame stack are incomplete until the
+ * first RESUME instruction.
+ * Frames owned by a generator are always complete.
+ */
+static inline bool
+_PyFrame_IsIncomplete(_PyInterpreterFrame *frame)
+{
+    return frame->owner != FRAME_OWNED_BY_GENERATOR &&
+    frame->prev_instr < _PyCode_CODE(frame->f_code) + frame->f_code->_co_firsttraceable;
+}
+
 /* For use by _PyFrame_GetFrameObject
   Do not call directly. */
 PyFrameObject *
@@ -144,6 +159,8 @@ _PyFrame_MakeAndSetFrameObject(_PyInterpreterFrame *frame);
 static inline PyFrameObject *
 _PyFrame_GetFrameObject(_PyInterpreterFrame *frame)
 {
+
+    assert(!_PyFrame_IsIncomplete(frame));
     PyFrameObject *res =  frame->frame_obj;
     if (res != NULL) {
         return res;
diff --git a/Lib/test/test_generators.py b/Lib/test/test_generators.py
index 87a7dd69d106c..e5aa7da1e0df1 100644
--- a/Lib/test/test_generators.py
+++ b/Lib/test/test_generators.py
@@ -170,6 +170,43 @@ def f():
             g.send(0)
         self.assertEqual(next(g), 1)
 
+    def test_handle_frame_object_in_creation(self):
+
+        #Attempt to expose partially constructed frames
+        #See https://github.com/python/cpython/issues/94262
+
+        def cb(*args):
+            inspect.stack()
+
+        def gen():
+            yield 1
+
+        thresholds = gc.get_threshold()
+
+        gc.callbacks.append(cb)
+        gc.set_threshold(1, 0, 0)
+        try:
+            gen()
+        finally:
+            gc.set_threshold(*thresholds)
+            gc.callbacks.pop()
+
+        class Sneaky:
+            def __del__(self):
+                inspect.stack()
+
+        sneaky = Sneaky()
+        sneaky._s = Sneaky()
+        sneaky._s._s = sneaky
+
+        gc.set_threshold(1, 0, 0)
+        try:
+            del sneaky
+            gen()
+        finally:
+            gc.set_threshold(*thresholds)
+
+
 
 class ExceptionTest(unittest.TestCase):
     # Tests for the issue #23353: check that the currently handled exception
diff --git a/Misc/NEWS.d/next/Core and Builtins/2022-06-28-10-08-06.gh-issue-94262.m-HWUZ.rst b/Misc/NEWS.d/next/Core and Builtins/2022-06-28-10-08-06.gh-issue-94262.m-HWUZ.rst
new file mode 100644
index 0000000000000..7ba39bbcfe21d
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2022-06-28-10-08-06.gh-issue-94262.m-HWUZ.rst	
@@ -0,0 +1,3 @@
+Don't create frame objects for incomplete frames. Prevents the creation of
+generators and closures from being observable to Python and C extensions,
+restoring the behavior of 3.10 and earlier.
diff --git a/Objects/codeobject.c b/Objects/codeobject.c
index 2471006cabb03..4859b1ecebe50 100644
--- a/Objects/codeobject.c
+++ b/Objects/codeobject.c
@@ -636,11 +636,10 @@ PyCode_New(int argcount, int kwonlyargcount,
                                      exceptiontable);
 }
 
-static const char assert0[4] = {
-    LOAD_ASSERTION_ERROR,
-    0,
-    RAISE_VARARGS,
-    1
+static const char assert0[6] = {
+    RESUME, 0,
+    LOAD_ASSERTION_ERROR, 0,
+    RAISE_VARARGS, 1
 };
 
 PyCodeObject *
@@ -664,7 +663,7 @@ PyCode_NewEmpty(const char *filename, const char *funcname, int firstlineno)
     if (filename_ob == NULL) {
         goto failed;
     }
-    code_ob = PyBytes_FromStringAndSize(assert0, 4);
+    code_ob = PyBytes_FromStringAndSize(assert0, 6);
     if (code_ob == NULL) {
         goto failed;
     }
diff --git a/Objects/frameobject.c b/Objects/frameobject.c
index 85cc4a2cbcb1e..cb822a1119709 100644
--- a/Objects/frameobject.c
+++ b/Objects/frameobject.c
@@ -1155,8 +1155,14 @@ PyFrame_GetBack(PyFrameObject *frame)
 {
     assert(frame != NULL);
     PyFrameObject *back = frame->f_back;
-    if (back == NULL && frame->f_frame->previous != NULL) {
-        back = _PyFrame_GetFrameObject(frame->f_frame->previous);
+    if (back == NULL) {
+        _PyInterpreterFrame *prev = frame->f_frame->previous;
+        while (prev && _PyFrame_IsIncomplete(prev)) {
+            prev = prev->previous;
+        }
+        if (prev) {
+            back = _PyFrame_GetFrameObject(prev);
+        }
     }
     Py_XINCREF(back);
     return back;
diff --git a/Python/frame.c b/Python/frame.c
index b6674edfd1e08..c4e93492e081a 100644
--- a/Python/frame.c
+++ b/Python/frame.c
@@ -66,9 +66,13 @@ take_ownership(PyFrameObject *f, _PyInterpreterFrame *frame)
     f->f_frame = frame;
     frame->owner = FRAME_OWNED_BY_FRAME_OBJECT;
     assert(f->f_back == NULL);
-    if (frame->previous != NULL) {
+    _PyInterpreterFrame *prev = frame->previous;
+    while (prev && _PyFrame_IsIncomplete(prev)) {
+        prev = prev->previous;
+    }
+    if (prev) {
         /* Link PyFrameObjects.f_back and remove link through _PyInterpreterFrame.previous */
-        PyFrameObject *back = _PyFrame_GetFrameObject(frame->previous);
+        PyFrameObject *back = _PyFrame_GetFrameObject(prev);
         if (back == NULL) {
             /* Memory error here. */
             assert(PyErr_ExceptionMatches(PyExc_MemoryError));
diff --git a/Python/sysmodule.c b/Python/sysmodule.c
index 769864196036e..261ebb96ba285 100644
--- a/Python/sysmodule.c
+++ b/Python/sysmodule.c
@@ -1784,9 +1784,17 @@ sys__getframe_impl(PyObject *module, int depth)
         return NULL;
     }
 
-    while (depth > 0 && frame != NULL) {
-        frame = frame->previous;
-        --depth;
+    if (frame != NULL) {
+        while (depth > 0) {
+            frame = frame->previous;
+            if (frame == NULL) {
+                break;
+            }
+            if (_PyFrame_IsIncomplete(frame)) {
+                continue;
+            }
+            --depth;
+        }
     }
     if (frame == NULL) {
         _PyErr_SetString(tstate, PyExc_ValueError,


From webhook-mailer at python.org  Tue Jul  5 03:25:55 2022
From: webhook-mailer at python.org (tiran)
Date: Tue, 05 Jul 2022 07:25:55 -0000
Subject: [Python-checkins] gh-93939: Add script to check extension modules
 (#94545)
Message-ID: <mailman.2075.1657005956.20746.python-checkins@python.org>

https://github.com/python/cpython/commit/7bd67d1d88383bb6d156ac9ca816e56085ca5ec8
commit: 7bd67d1d88383bb6d156ac9ca816e56085ca5ec8
branch: main
author: Christian Heimes <christian at python.org>
committer: tiran <christian at python.org>
date: 2022-07-05T09:25:45+02:00
summary:

gh-93939: Add script to check extension modules (#94545)

Add script ``Tools/scripts/check_modules.py`` to check and validate builtin
and shared extension modules. The script also handles ``Modules/Setup`` and
will eventually replace ``setup.py``.

Co-authored-by: Victor Stinner <vstinner at python.org>
Co-authored-by: Erlend Egeberg Aasland <erlend.aasland at protonmail.com>

files:
A Misc/NEWS.d/next/Tools-Demos/2022-07-04-10-02-02.gh-issue-93939.U6sW6H.rst
A Tools/scripts/check_extension_modules.py
M Makefile.pre.in
M Tools/scripts/generate_stdlib_module_names.py

diff --git a/Makefile.pre.in b/Makefile.pre.in
index 14e7f6035578b..ee67a015f74bb 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -918,6 +918,9 @@ oldsharedmods: $(SHAREDMODS) pybuilddir.txt
 		fi; \
 	done
 
+checksharedmods: oldsharedmods sharedmods $(PYTHON_FOR_BUILD_DEPS)
+	@$(RUNSHARED) $(PYTHON_FOR_BUILD) $(srcdir)/Tools/scripts/check_extension_modules.py
+
 Modules/Setup.local:
 	@# Create empty Setup.local when file was deleted by user
 	echo "# Edit this file for local setup changes" > $@
@@ -2531,7 +2534,8 @@ update-config:
 Python/thread.o: @THREADHEADERS@ $(srcdir)/Python/condvar.h
 
 # Declare targets that aren't real files
-.PHONY: all build_all build_wasm sharedmods check-clean-src oldsharedmods test quicktest
+.PHONY: all build_all build_wasm sharedmods check-clean-src
+.PHONY: oldsharedmods checksharedmods test quicktest
 .PHONY: install altinstall oldsharedinstall bininstall altbininstall
 .PHONY: maninstall libinstall inclinstall libainstall sharedinstall
 .PHONY: frameworkinstall frameworkinstallframework frameworkinstallstructure
diff --git a/Misc/NEWS.d/next/Tools-Demos/2022-07-04-10-02-02.gh-issue-93939.U6sW6H.rst b/Misc/NEWS.d/next/Tools-Demos/2022-07-04-10-02-02.gh-issue-93939.U6sW6H.rst
new file mode 100644
index 0000000000000..a129d6800c360
--- /dev/null
+++ b/Misc/NEWS.d/next/Tools-Demos/2022-07-04-10-02-02.gh-issue-93939.U6sW6H.rst
@@ -0,0 +1,3 @@
+Add script ``Tools/scripts/check_modules.py`` to check and validate builtin
+and shared extension modules. The script also handles ``Modules/Setup`` and
+will eventually replace ``setup.py``.
diff --git a/Tools/scripts/check_extension_modules.py b/Tools/scripts/check_extension_modules.py
new file mode 100644
index 0000000000000..b3f43abf637bd
--- /dev/null
+++ b/Tools/scripts/check_extension_modules.py
@@ -0,0 +1,489 @@
+"""Check extension modules
+
+The script checks shared and built-in extension modules. It verifies that the
+modules have been built and that they can be imported successfully. Missing
+modules and failed imports are reported to the user. Shared extension
+files are renamed on failed import.
+
+Module information is parsed from several sources:
+
+- core modules hard-coded in Modules/config.c.in
+- Windows-specific modules that are hard-coded in PC/config.c
+- MODULE_{name}_STATE entries in Makefile (provided through sysconfig)
+- Various makesetup files:
+  - $(srcdir)/Modules/Setup
+  - Modules/Setup.[local|bootstrap|stdlib] files, which are generated
+    from $(srcdir)/Modules/Setup.*.in files
+
+See --help for more information
+"""
+import argparse
+import collections
+import enum
+import logging
+import os
+import pathlib
+import re
+import sys
+import sysconfig
+import warnings
+
+from importlib._bootstrap import _load as bootstrap_load
+from importlib.machinery import BuiltinImporter, ExtensionFileLoader, ModuleSpec
+from importlib.util import spec_from_file_location, spec_from_loader
+from typing import Iterable
+
+SRC_DIR = pathlib.Path(__file__).parent.parent.parent
+
+# core modules, hard-coded in Modules/config.h.in
+CORE_MODULES = {
+    "_ast",
+    "_imp",
+    "_string",
+    "_tokenize",
+    "_warnings",
+    "builtins",
+    "gc",
+    "marshal",
+    "sys",
+}
+
+# Windows-only modules
+WINDOWS_MODULES = {
+    "_msi",
+    "_overlapped",
+    "_testconsole",
+    "_winapi",
+    "msvcrt",
+    "nt",
+    "winreg",
+    "winsound",
+}
+
+
+logger = logging.getLogger(__name__)
+
+parser = argparse.ArgumentParser(
+    prog="check_extension_modules",
+    description=__doc__,
+    formatter_class=argparse.RawDescriptionHelpFormatter,
+)
+
+parser.add_argument(
+    "--verbose",
+    action="store_true",
+    help="Verbose, report builtin, shared, and unavailable modules",
+)
+
+parser.add_argument(
+    "--debug",
+    action="store_true",
+    help="Enable debug logging",
+)
+
+parser.add_argument(
+    "--strict",
+    action=argparse.BooleanOptionalAction,
+    help=(
+        "Strict check, fail when a module is missing or fails to import"
+        "(default: no, unless env var PYTHONSTRICTEXTENSIONBUILD is set)"
+    ),
+    default=bool(os.environ.get("PYTHONSTRICTEXTENSIONBUILD")),
+)
+
+parser.add_argument(
+    "--cross-compiling",
+    action=argparse.BooleanOptionalAction,
+    help=(
+        "Use cross-compiling checks "
+        "(default: no, unless env var _PYTHON_HOST_PLATFORM is set)."
+    ),
+    default="_PYTHON_HOST_PLATFORM" in os.environ,
+)
+
+parser.add_argument(
+    "--list-module-names",
+    action="store_true",
+    help="Print a list of module names to stdout and exit",
+)
+
+
+class ModuleState(enum.Enum):
+    # Makefile state "yes"
+    BUILTIN = "builtin"
+    SHARED = "shared"
+
+    DISABLED = "disabled"
+    MISSING = "missing"
+    NA = "n/a"
+    # disabled by Setup / makesetup rule
+    DISABLED_SETUP = "disabled_setup"
+
+    def __bool__(self):
+        return self.value in {"builtin", "shared"}
+
+
+ModuleInfo = collections.namedtuple("ModuleInfo", "name state")
+
+
+class ModuleChecker:
+    pybuilddir_txt = "pybuilddir.txt"
+
+    setup_files = (
+        SRC_DIR / "Modules/Setup",
+        "Modules/Setup.local",
+        "Modules/Setup.bootstrap",
+        "Modules/Setup.stdlib",
+    )
+
+    def __init__(self, cross_compiling: bool = False, strict: bool = False):
+        self.cross_compiling = cross_compiling
+        self.strict_extensions_build = strict
+        self.ext_suffix = sysconfig.get_config_var("EXT_SUFFIX")
+        self.platform = sysconfig.get_platform()
+        self.builddir = self.get_builddir()
+        self.modules = self.get_modules()
+
+        self.builtin_ok = []
+        self.shared_ok = []
+        self.failed_on_import = []
+        self.missing = []
+        self.disabled_configure = []
+        self.disabled_setup = []
+        self.notavailable = []
+
+    def check(self):
+        for modinfo in self.modules:
+            logger.debug("Checking '%s' (%s)", modinfo.name, self.get_location(modinfo))
+            if modinfo.state == ModuleState.DISABLED:
+                self.disabled_configure.append(modinfo)
+            elif modinfo.state == ModuleState.DISABLED_SETUP:
+                self.disabled_setup.append(modinfo)
+            elif modinfo.state == ModuleState.MISSING:
+                self.missing.append(modinfo)
+            elif modinfo.state == ModuleState.NA:
+                self.notavailable.append(modinfo)
+            else:
+                try:
+                    if self.cross_compiling:
+                        self.check_module_cross(modinfo)
+                    else:
+                        self.check_module_import(modinfo)
+                except (ImportError, FileNotFoundError):
+                    self.rename_module(modinfo)
+                    self.failed_on_import.append(modinfo)
+                else:
+                    if modinfo.state == ModuleState.BUILTIN:
+                        self.builtin_ok.append(modinfo)
+                    else:
+                        assert modinfo.state == ModuleState.SHARED
+                        self.shared_ok.append(modinfo)
+
+    def summary(self, *, verbose: bool = False):
+        longest = max([len(e.name) for e in self.modules], default=0)
+
+        def print_three_column(modinfos: list[ModuleInfo]):
+            names = [modinfo.name for modinfo in modinfos]
+            names.sort(key=str.lower)
+            # guarantee zip() doesn't drop anything
+            while len(names) % 3:
+                names.append("")
+            for l, m, r in zip(names[::3], names[1::3], names[2::3]):
+                print("%-*s   %-*s   %-*s" % (longest, l, longest, m, longest, r))
+
+        if verbose and self.builtin_ok:
+            print("The following *built-in* modules have been successfully built:")
+            print_three_column(self.builtin_ok)
+            print()
+
+        if verbose and self.shared_ok:
+            print("The following *shared* modules have been successfully built:")
+            print_three_column(self.shared_ok)
+            print()
+
+        if self.disabled_configure:
+            print("The following modules are *disabled* in configure script:")
+            print_three_column(self.disabled_configure)
+            print()
+
+        if self.disabled_setup:
+            print("The following modules are *disabled* in Modules/Setup files:")
+            print_three_column(self.disabled_setup)
+            print()
+
+        if verbose and self.notavailable:
+            print(
+                f"The following modules are not available on platform '{self.platform}':"
+            )
+            print_three_column(self.notavailable)
+            print()
+
+        if self.missing:
+            print("The necessary bits to build these optional modules were not found:")
+            print_three_column(self.missing)
+            print("To find the necessary bits, look in configure.ac and config.log.")
+            print()
+
+        if self.failed_on_import:
+            print(
+                "Following modules built successfully "
+                "but were removed because they could not be imported:"
+            )
+            print_three_column(self.failed_on_import)
+            print()
+
+        if any(
+            modinfo.name == "_ssl" for modinfo in self.missing + self.failed_on_import
+        ):
+            print("Could not build the ssl module!")
+            print("Python requires a OpenSSL 1.1.1 or newer")
+            if sysconfig.get_config_var("OPENSSL_LDFLAGS"):
+                print("Custom linker flags may require --with-openssl-rpath=auto")
+            print()
+
+        disabled = len(self.disabled_configure) + len(self.disabled_setup)
+        print(
+            f"Checked {len(self.modules)} modules ("
+            f"{len(self.builtin_ok)} built-in, "
+            f"{len(self.shared_ok)} shared, "
+            f"{len(self.notavailable)} n/a on {self.platform}, "
+            f"{disabled} disabled, "
+            f"{len(self.missing)} missing, "
+            f"{len(self.failed_on_import)} failed on import)"
+        )
+
+    def check_strict_build(self):
+        """Fail if modules are missing and it's a strict build"""
+        if self.strict_extensions_build and (self.failed_on_import or self.missing):
+            raise RuntimeError("Failed to build some stdlib modules")
+
+    def list_module_names(self, *, all: bool = False) -> set:
+        names = {modinfo.name for modinfo in self.modules}
+        if all:
+            names.update(WINDOWS_MODULES)
+        return names
+
+    def get_builddir(self) -> pathlib.Path:
+        try:
+            with open(self.pybuilddir_txt, encoding="utf-8") as f:
+                builddir = f.read()
+        except FileNotFoundError:
+            logger.error("%s must be run from the top build directory", __file__)
+            raise
+        builddir = pathlib.Path(builddir)
+        logger.debug("%s: %s", self.pybuilddir_txt, builddir)
+        return builddir
+
+    def get_modules(self) -> list[ModuleInfo]:
+        """Get module info from sysconfig and Modules/Setup* files"""
+        seen = set()
+        modules = []
+        # parsing order is important, first entry wins
+        for modinfo in self.get_core_modules():
+            modules.append(modinfo)
+            seen.add(modinfo.name)
+        for setup_file in self.setup_files:
+            for modinfo in self.parse_setup_file(setup_file):
+                if modinfo.name not in seen:
+                    modules.append(modinfo)
+                    seen.add(modinfo.name)
+        for modinfo in self.get_sysconfig_modules():
+            if modinfo.name not in seen:
+                modules.append(modinfo)
+                seen.add(modinfo.name)
+        logger.debug("Found %i modules in total", len(modules))
+        modules.sort()
+        return modules
+
+    def get_core_modules(self) -> Iterable[ModuleInfo]:
+        """Get hard-coded core modules"""
+        for name in CORE_MODULES:
+            modinfo = ModuleInfo(name, ModuleState.BUILTIN)
+            logger.debug("Found core module %s", modinfo)
+            yield modinfo
+
+    def get_sysconfig_modules(self) -> Iterable[ModuleInfo]:
+        """Get modules defined in Makefile through sysconfig
+
+        MODBUILT_NAMES: modules in *static* block
+        MODSHARED_NAMES: modules in *shared* block
+        MODDISABLED_NAMES: modules in *disabled* block
+
+        Modules built by setup.py addext() have a MODULE_{modname}_STATE entry,
+        but are not listed in MODSHARED_NAMES.
+
+        Modules built by old-style setup.py add() have neither a  MODULE_{modname}
+        entry nor an entry in MODSHARED_NAMES.
+        """
+        moddisabled = set(sysconfig.get_config_var("MODDISABLED_NAMES").split())
+        if self.cross_compiling:
+            modbuiltin = set(sysconfig.get_config_var("MODBUILT_NAMES").split())
+        else:
+            modbuiltin = set(sys.builtin_module_names)
+
+        for key, value in sysconfig.get_config_vars().items():
+            if not key.startswith("MODULE_") or not key.endswith("_STATE"):
+                continue
+            if value not in {"yes", "disabled", "missing", "n/a"}:
+                raise ValueError(f"Unsupported value '{value}' for {key}")
+
+            modname = key[7:-6].lower()
+            if modname in moddisabled:
+                # Setup "*disabled*" rule
+                state = ModuleState.DISABLED_SETUP
+            elif value in {"disabled", "missing", "n/a"}:
+                state = ModuleState(value)
+            elif modname in modbuiltin:
+                assert value == "yes"
+                state = ModuleState.BUILTIN
+            else:
+                assert value == "yes"
+                state = ModuleState.SHARED
+
+            modinfo = ModuleInfo(modname, state)
+            logger.debug("Found %s in Makefile", modinfo)
+            yield modinfo
+
+    def parse_setup_file(self, setup_file: pathlib.Path) -> Iterable[ModuleInfo]:
+        """Parse a Modules/Setup file"""
+        assign_var = re.compile(r"^\w+=")  # EGG_SPAM=foo
+        # default to static module
+        state = ModuleState.BUILTIN
+        logger.debug("Parsing Setup file %s", setup_file)
+        with open(setup_file, encoding="utf-8") as f:
+            for line in f:
+                line = line.strip()
+                if not line or line.startswith("#") or assign_var.match(line):
+                    continue
+                match line.split():
+                    case ["*shared*"]:
+                        state = ModuleState.SHARED
+                    case ["*static*"]:
+                        state = ModuleState.BUILTIN
+                    case ["*disabled*"]:
+                        state = ModuleState.DISABLED
+                    case ["*noconfig*"]:
+                        state = None
+                    case [*items]:
+                        if state == ModuleState.DISABLED:
+                            # *disabled* can disable multiple modules per line
+                            for item in items:
+                                modinfo = ModuleInfo(item, state)
+                                logger.debug("Found %s in %s", modinfo, setup_file)
+                                yield modinfo
+                        elif state in {ModuleState.SHARED, ModuleState.BUILTIN}:
+                            # *shared* and *static*, first item is the name of the module.
+                            modinfo = ModuleInfo(items[0], state)
+                            logger.debug("Found %s in %s", modinfo, setup_file)
+                            yield modinfo
+
+    def get_spec(self, modinfo: ModuleInfo) -> ModuleSpec:
+        """Get ModuleSpec for builtin or extension module"""
+        if modinfo.state == ModuleState.SHARED:
+            location = os.fspath(self.get_location(modinfo))
+            loader = ExtensionFileLoader(modinfo.name, location)
+            return spec_from_file_location(modinfo.name, location, loader=loader)
+        elif modinfo.state == ModuleState.BUILTIN:
+            return spec_from_loader(modinfo.name, loader=BuiltinImporter)
+        else:
+            raise ValueError(modinfo)
+
+    def get_location(self, modinfo: ModuleInfo) -> pathlib.Path:
+        """Get shared library location in build directory"""
+        if modinfo.state == ModuleState.SHARED:
+            return self.builddir / f"{modinfo.name}{self.ext_suffix}"
+        else:
+            return None
+
+    def _check_file(self, modinfo: ModuleInfo, spec: ModuleSpec):
+        """Check that the module file is present and not empty"""
+        if spec.loader is BuiltinImporter:
+            return
+        try:
+            st = os.stat(spec.origin)
+        except FileNotFoundError:
+            logger.error("%s (%s) is missing", modinfo.name, spec.origin)
+            raise
+        if not st.st_size:
+            raise ImportError(f"{spec.origin} is an empty file")
+
+    def check_module_import(self, modinfo: ModuleInfo):
+        """Attempt to import module and report errors"""
+        spec = self.get_spec(modinfo)
+        self._check_file(modinfo, spec)
+        try:
+            with warnings.catch_warnings():
+                # ignore deprecation warning from deprecated modules
+                warnings.simplefilter("ignore", DeprecationWarning)
+                bootstrap_load(spec)
+        except ImportError as e:
+            logger.error("%s failed to import: %s", modinfo.name, e)
+            raise
+        except Exception as e:
+            logger.exception("Importing extension '%s' failed!", modinfo.name)
+            raise
+
+    def check_module_cross(self, modinfo: ModuleInfo):
+        """Sanity check for cross compiling"""
+        spec = self.get_spec(modinfo)
+        self._check_file(modinfo, spec)
+
+    def rename_module(self, modinfo: ModuleInfo) -> None:
+        """Rename module file"""
+        if modinfo.state == ModuleState.BUILTIN:
+            logger.error("Cannot mark builtin module '%s' as failed!", modinfo.name)
+            return
+
+        failed_name = f"{modinfo.name}_failed{self.ext_suffix}"
+        builddir_path = self.get_location(modinfo)
+        if builddir_path.is_symlink():
+            symlink = builddir_path
+            module_path = builddir_path.resolve().relative_to(os.getcwd())
+            failed_path = module_path.parent / failed_name
+        else:
+            symlink = None
+            module_path = builddir_path
+            failed_path = self.builddir / failed_name
+
+        # remove old failed file
+        failed_path.unlink(missing_ok=True)
+        # remove symlink
+        if symlink is not None:
+            symlink.unlink(missing_ok=True)
+        # rename shared extension file
+        try:
+            module_path.rename(failed_path)
+        except FileNotFoundError:
+            logger.debug("Shared extension file '%s' does not exist.", module_path)
+        else:
+            logger.debug("Rename '%s' -> '%s'", module_path, failed_path)
+
+
+def main():
+    args = parser.parse_args()
+    if args.debug:
+        args.verbose = True
+    logging.basicConfig(
+        level=logging.DEBUG if args.debug else logging.INFO,
+        format="[%(levelname)s] %(message)s",
+    )
+
+    checker = ModuleChecker(
+        cross_compiling=args.cross_compiling,
+        strict=args.strict,
+    )
+    if args.list_module_names:
+        names = checker.list_module_names(all=True)
+        for name in sorted(names):
+            print(name)
+    else:
+        checker.check()
+        checker.summary(verbose=args.verbose)
+        try:
+            checker.check_strict_build()
+        except RuntimeError as e:
+            parser.exit(1, f"\nError: {e}\n")
+
+
+if __name__ == "__main__":
+    main()
diff --git a/Tools/scripts/generate_stdlib_module_names.py b/Tools/scripts/generate_stdlib_module_names.py
index 6f864c317da6c..82f10948b1b95 100644
--- a/Tools/scripts/generate_stdlib_module_names.py
+++ b/Tools/scripts/generate_stdlib_module_names.py
@@ -7,10 +7,11 @@
 import sys
 import sysconfig
 
+from check_extension_modules import ModuleChecker
+
 
 SRC_DIR = os.path.dirname(os.path.dirname(os.path.dirname(__file__)))
 STDLIB_PATH = os.path.join(SRC_DIR, 'Lib')
-MODULES_SETUP = os.path.join(SRC_DIR, 'Modules', 'Setup')
 SETUP_PY = os.path.join(SRC_DIR, 'setup.py')
 
 IGNORE = {
@@ -41,23 +42,6 @@
     'xxsubtype',
 }
 
-# Windows extension modules
-WINDOWS_MODULES = (
-    '_msi',
-    '_overlapped',
-    '_testconsole',
-    '_winapi',
-    'msvcrt',
-    'nt',
-    'winreg',
-    'winsound'
-)
-
-# macOS extension modules
-MACOS_MODULES = (
-    '_scproxy',
-)
-
 # Pure Python modules (Lib/*.py)
 def list_python_modules(names):
     for filename in os.listdir(STDLIB_PATH):
@@ -89,28 +73,11 @@ def list_setup_extensions(names):
     names |= set(extensions)
 
 
-# Built-in and extension modules built by Modules/Setup
+# Built-in and extension modules built by Modules/Setup*
+# includes Windows and macOS extensions.
 def list_modules_setup_extensions(names):
-    assign_var = re.compile("^[A-Z]+=")
-
-    with open(MODULES_SETUP, encoding="utf-8") as modules_fp:
-        for line in modules_fp:
-            # Strip comment
-            line = line.partition("#")[0]
-            line = line.rstrip()
-            if not line:
-                continue
-            if assign_var.match(line):
-                # Ignore "VAR=VALUE"
-                continue
-            if line in ("*disabled*", "*shared*"):
-                continue
-            parts = line.split()
-            if len(parts) < 2:
-                continue
-            # "errno errnomodule.c" => write "errno"
-            name = parts[0]
-            names.add(name)
+    checker = ModuleChecker()
+    names.update(checker.list_module_names(all=True))
 
 
 # List frozen modules of the PyImport_FrozenModules list (Python/frozen.c).
@@ -134,7 +101,7 @@ def list_frozen(names):
 
 
 def list_modules():
-    names = set(sys.builtin_module_names) | set(WINDOWS_MODULES) | set(MACOS_MODULES)
+    names = set(sys.builtin_module_names)
     list_modules_setup_extensions(names)
     list_setup_extensions(names)
     list_packages(names)


From webhook-mailer at python.org  Tue Jul  5 04:47:26 2022
From: webhook-mailer at python.org (ambv)
Date: Tue, 05 Jul 2022 08:47:26 -0000
Subject: [Python-checkins] gh-93626: Set the release for
 `__future__.annotations` to `None` (GH-93628)
Message-ID: <mailman.2076.1657010848.20746.python-checkins@python.org>

https://github.com/python/cpython/commit/4791a8a8357e67431cb686d9559aa419074b8e33
commit: 4791a8a8357e67431cb686d9559aa419074b8e33
branch: main
author: KotlinIsland <65446343+KotlinIsland at users.noreply.github.com>
committer: ambv <lukasz at langa.pl>
date: 2022-07-05T10:46:39+02:00
summary:

gh-93626: Set the release for `__future__.annotations` to `None` (GH-93628)

Co-authored-by: Guido van Rossum <gvanrossum at gmail.com>

files:
A Misc/NEWS.d/next/Library/2022-06-09-14-44-21.gh-issue-93626.sfghs46.rst
M Doc/whatsnew/3.11.rst
M Lib/__future__.py

diff --git a/Doc/whatsnew/3.11.rst b/Doc/whatsnew/3.11.rst
index 9eafd6da13fa5..d9a5efa34b414 100644
--- a/Doc/whatsnew/3.11.rst
+++ b/Doc/whatsnew/3.11.rst
@@ -336,6 +336,13 @@ See :pep:`681` for more details.
 (Contributed by Jelle Zijlstra in :gh:`91860`. PEP written by
 Erik De Bonte and Eric Traut.)
 
+PEP 563 May Not Be the Future
+-----------------------------
+
+* :pep:`563` Postponed Evaluation of Annotations, ``__future__.annotations``
+  that was planned for this release has been indefinitely postponed.
+  See `this message <https://mail.python.org/archives/list/python-dev at python.org/message/VIZEBX5EYMSYIJNDBF6DMUMZOCWHARSO/>`_ for more information.
+
 Other Language Changes
 ======================
 
diff --git a/Lib/__future__.py b/Lib/__future__.py
index 97dc90c6e4644..39720a5e4126c 100644
--- a/Lib/__future__.py
+++ b/Lib/__future__.py
@@ -33,7 +33,7 @@
 to use the feature in question, but may continue to use such imports.
 
 MandatoryRelease may also be None, meaning that a planned feature got
-dropped.
+dropped or that the release version is undetermined.
 
 Instances of class _Feature have two corresponding methods,
 .getOptionalRelease() and .getMandatoryRelease().
@@ -96,7 +96,7 @@ def getMandatoryRelease(self):
         """Return release in which this feature will become mandatory.
 
         This is a 5-tuple, of the same form as sys.version_info, or, if
-        the feature was dropped, is None.
+        the feature was dropped, or the release date is undetermined, is None.
         """
         return self.mandatory
 
@@ -143,5 +143,5 @@ def __repr__(self):
                           CO_FUTURE_GENERATOR_STOP)
 
 annotations = _Feature((3, 7, 0, "beta", 1),
-                       (3, 11, 0, "alpha", 0),
+                       None,
                        CO_FUTURE_ANNOTATIONS)
diff --git a/Misc/NEWS.d/next/Library/2022-06-09-14-44-21.gh-issue-93626.sfghs46.rst b/Misc/NEWS.d/next/Library/2022-06-09-14-44-21.gh-issue-93626.sfghs46.rst
new file mode 100644
index 0000000000000..c6fa103706e9c
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2022-06-09-14-44-21.gh-issue-93626.sfghs46.rst
@@ -0,0 +1 @@
+Set ``__future__.annotations`` to have a ``None`` mandatoryRelease to indicate that it is currently 'TBD'.


From webhook-mailer at python.org  Tue Jul  5 05:06:19 2022
From: webhook-mailer at python.org (ambv)
Date: Tue, 05 Jul 2022 09:06:19 -0000
Subject: [Python-checkins] gh-94538: Fix Argument Clinic output to custom
 file (#94539)
Message-ID: <mailman.2077.1657011980.20746.python-checkins@python.org>

https://github.com/python/cpython/commit/2b8ed4d3d4741811da31fc774a202d535755c0a9
commit: 2b8ed4d3d4741811da31fc774a202d535755c0a9
branch: main
author: Erlend Egeberg Aasland <erlend.aasland at protonmail.com>
committer: ambv <lukasz at langa.pl>
date: 2022-07-05T11:06:04+02:00
summary:

gh-94538: Fix Argument Clinic output to custom file (#94539)

files:
A Misc/NEWS.d/next/Tools-Demos/2022-07-04-01-37-42.gh-issue-94538.1rgy1Y.rst
M Tools/clinic/clinic.py

diff --git a/Misc/NEWS.d/next/Tools-Demos/2022-07-04-01-37-42.gh-issue-94538.1rgy1Y.rst b/Misc/NEWS.d/next/Tools-Demos/2022-07-04-01-37-42.gh-issue-94538.1rgy1Y.rst
new file mode 100644
index 0000000000000..e39ae3950c0fe
--- /dev/null
+++ b/Misc/NEWS.d/next/Tools-Demos/2022-07-04-01-37-42.gh-issue-94538.1rgy1Y.rst
@@ -0,0 +1,2 @@
+Fix Argument Clinic output to custom file destinations. Patch by Erlend E.
+Aasland.
diff --git a/Tools/clinic/clinic.py b/Tools/clinic/clinic.py
index f0f2d205c419d..91aa48c5aa08c 100755
--- a/Tools/clinic/clinic.py
+++ b/Tools/clinic/clinic.py
@@ -4120,7 +4120,7 @@ def directive_output(self, command_or_name, destination=''):
             self.block.output.append('\n')
             return
 
-        d = self.clinic.get_destination(destination)
+        d = self.clinic.get_destination_buffer(destination)
 
         if command_or_name == "everything":
             for name in list(fd):


From webhook-mailer at python.org  Tue Jul  5 05:16:38 2022
From: webhook-mailer at python.org (ambv)
Date: Tue, 05 Jul 2022 09:16:38 -0000
Subject: [Python-checkins] gh-93626: Set the release for
 `__future__.annotations` to `None` (GH-93628) (GH-94553)
Message-ID: <mailman.2078.1657012599.20746.python-checkins@python.org>

https://github.com/python/cpython/commit/99a06685d4034a9b3d4dd898292926932168d94d
commit: 99a06685d4034a9b3d4dd898292926932168d94d
branch: 3.11
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: ambv <lukasz at langa.pl>
date: 2022-07-05T11:16:32+02:00
summary:

gh-93626: Set the release for `__future__.annotations` to `None` (GH-93628) (GH-94553)

Co-authored-by: Guido van Rossum <gvanrossum at gmail.com>
(cherry picked from commit 4791a8a8357e67431cb686d9559aa419074b8e33)

Co-authored-by: KotlinIsland <65446343+KotlinIsland at users.noreply.github.com>

files:
A Misc/NEWS.d/next/Library/2022-06-09-14-44-21.gh-issue-93626.sfghs46.rst
M Doc/whatsnew/3.11.rst
M Lib/__future__.py

diff --git a/Doc/whatsnew/3.11.rst b/Doc/whatsnew/3.11.rst
index 0aa44295f73bb..eacd4c4726ea3 100644
--- a/Doc/whatsnew/3.11.rst
+++ b/Doc/whatsnew/3.11.rst
@@ -336,6 +336,13 @@ See :pep:`681` for more details.
 (Contributed by Jelle Zijlstra in :gh:`91860`. PEP written by
 Erik De Bonte and Eric Traut.)
 
+PEP 563 May Not Be the Future
+-----------------------------
+
+* :pep:`563` Postponed Evaluation of Annotations, ``__future__.annotations``
+  that was planned for this release has been indefinitely postponed.
+  See `this message <https://mail.python.org/archives/list/python-dev at python.org/message/VIZEBX5EYMSYIJNDBF6DMUMZOCWHARSO/>`_ for more information.
+
 Other Language Changes
 ======================
 
diff --git a/Lib/__future__.py b/Lib/__future__.py
index 97dc90c6e4644..39720a5e4126c 100644
--- a/Lib/__future__.py
+++ b/Lib/__future__.py
@@ -33,7 +33,7 @@
 to use the feature in question, but may continue to use such imports.
 
 MandatoryRelease may also be None, meaning that a planned feature got
-dropped.
+dropped or that the release version is undetermined.
 
 Instances of class _Feature have two corresponding methods,
 .getOptionalRelease() and .getMandatoryRelease().
@@ -96,7 +96,7 @@ def getMandatoryRelease(self):
         """Return release in which this feature will become mandatory.
 
         This is a 5-tuple, of the same form as sys.version_info, or, if
-        the feature was dropped, is None.
+        the feature was dropped, or the release date is undetermined, is None.
         """
         return self.mandatory
 
@@ -143,5 +143,5 @@ def __repr__(self):
                           CO_FUTURE_GENERATOR_STOP)
 
 annotations = _Feature((3, 7, 0, "beta", 1),
-                       (3, 11, 0, "alpha", 0),
+                       None,
                        CO_FUTURE_ANNOTATIONS)
diff --git a/Misc/NEWS.d/next/Library/2022-06-09-14-44-21.gh-issue-93626.sfghs46.rst b/Misc/NEWS.d/next/Library/2022-06-09-14-44-21.gh-issue-93626.sfghs46.rst
new file mode 100644
index 0000000000000..c6fa103706e9c
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2022-06-09-14-44-21.gh-issue-93626.sfghs46.rst
@@ -0,0 +1 @@
+Set ``__future__.annotations`` to have a ``None`` mandatoryRelease to indicate that it is currently 'TBD'.


From webhook-mailer at python.org  Tue Jul  5 05:16:38 2022
From: webhook-mailer at python.org (ambv)
Date: Tue, 05 Jul 2022 09:16:38 -0000
Subject: [Python-checkins] Docs: remove redundant "adverb-adjective" hyphens
 from compound modifiers (GH-94551)
Message-ID: <mailman.2079.1657012601.20746.python-checkins@python.org>

https://github.com/python/cpython/commit/3440d197a55800ecceea3e115e44b4262411359c
commit: 3440d197a55800ecceea3e115e44b4262411359c
branch: main
author: Ned Batchelder <ned at nedbatchelder.com>
committer: ambv <lukasz at langa.pl>
date: 2022-07-05T11:16:10+02:00
summary:

Docs: remove redundant "adverb-adjective" hyphens from compound modifiers (GH-94551)

Discussion: https://discuss.python.org/t/slight-grammar-fix-throughout-adverbs-dont-need-hyphen/17021

files:
M Doc/c-api/allocation.rst
M Doc/c-api/intro.rst
M Doc/c-api/memory.rst
M Doc/c-api/typeobj.rst
M Doc/c-api/weakref.rst
M Doc/distutils/apiref.rst
M Doc/extending/building.rst
M Doc/extending/newtypes.rst
M Doc/faq/design.rst
M Doc/faq/programming.rst
M Doc/glossary.rst
M Doc/howto/clinic.rst
M Doc/howto/functional.rst
M Doc/howto/instrumentation.rst
M Doc/howto/logging.rst
M Doc/howto/regex.rst
M Doc/howto/urllib2.rst
M Doc/install/index.rst
M Doc/library/asynchat.rst
M Doc/library/custominterp.rst
M Doc/library/decimal.rst
M Doc/library/doctest.rst
M Doc/library/glob.rst
M Doc/library/hmac.rst
M Doc/library/importlib.rst
M Doc/library/inspect.rst
M Doc/library/mailbox.rst
M Doc/library/optparse.rst
M Doc/library/os.rst
M Doc/library/secrets.rst
M Doc/library/select.rst
M Doc/library/shutil.rst
M Doc/library/smtpd.rst
M Doc/library/socket.rst
M Doc/library/sqlite3.rst
M Doc/library/struct.rst
M Doc/library/subprocess.rst
M Doc/library/tarfile.rst
M Doc/library/tkinter.ttk.rst
M Doc/library/typing.rst
M Doc/library/urllib.request.rst
M Doc/library/uuid.rst
M Doc/library/warnings.rst
M Doc/library/wsgiref.rst
M Doc/library/xml.rst
M Doc/library/xmlrpc.client.rst
M Doc/library/zlib.rst
M Doc/reference/datamodel.rst
M Doc/reference/import.rst
M Doc/reference/lexical_analysis.rst
M Doc/tutorial/classes.rst
M Doc/tutorial/inputoutput.rst
M Doc/using/cmdline.rst
M Doc/whatsnew/2.0.rst
M Doc/whatsnew/2.3.rst
M Doc/whatsnew/2.4.rst
M Doc/whatsnew/2.5.rst
M Doc/whatsnew/2.6.rst
M Doc/whatsnew/2.7.rst
M Doc/whatsnew/3.0.rst
M Doc/whatsnew/3.11.rst
M Doc/whatsnew/3.3.rst
M Doc/whatsnew/3.4.rst
M Doc/whatsnew/3.7.rst
M Misc/NEWS.d/3.10.0a3.rst
M Misc/NEWS.d/3.10.0a4.rst
M Misc/NEWS.d/3.11.0a4.rst
M Misc/NEWS.d/3.11.0b1.rst
M Misc/NEWS.d/3.7.0a1.rst
M Misc/NEWS.d/3.8.0a1.rst
M Misc/NEWS.d/3.8.0a2.rst

diff --git a/Doc/c-api/allocation.rst b/Doc/c-api/allocation.rst
index 33b0c06a9ebc2..0a8fcc5ae5fcd 100644
--- a/Doc/c-api/allocation.rst
+++ b/Doc/c-api/allocation.rst
@@ -14,7 +14,7 @@ Allocating Objects on the Heap
 
 .. c:function:: PyObject* PyObject_Init(PyObject *op, PyTypeObject *type)
 
-   Initialize a newly-allocated object *op* with its type and initial
+   Initialize a newly allocated object *op* with its type and initial
    reference.  Returns the initialized object.  If *type* indicates that the
    object participates in the cyclic garbage detector, it is added to the
    detector's set of observed objects. Other fields of the object are not
diff --git a/Doc/c-api/intro.rst b/Doc/c-api/intro.rst
index e53c826c58d13..d9fcd0de1fec6 100644
--- a/Doc/c-api/intro.rst
+++ b/Doc/c-api/intro.rst
@@ -779,7 +779,7 @@ A full list of the various types of debugging builds is in the file
 :file:`Misc/SpecialBuilds.txt` in the Python source distribution. Builds are
 available that support tracing of reference counts, debugging the memory
 allocator, or low-level profiling of the main interpreter loop.  Only the most
-frequently-used builds will be described in the remainder of this section.
+frequently used builds will be described in the remainder of this section.
 
 Compiling the interpreter with the :c:macro:`Py_DEBUG` macro defined produces
 what is generally meant by :ref:`a debug build of Python <debug-build>`.
diff --git a/Doc/c-api/memory.rst b/Doc/c-api/memory.rst
index 987dea40dd674..335ea00cff7cb 100644
--- a/Doc/c-api/memory.rst
+++ b/Doc/c-api/memory.rst
@@ -75,7 +75,7 @@ memory manager. For example, this is required when the interpreter is extended
 with new object types written in C. Another reason for using the Python heap is
 the desire to *inform* the Python memory manager about the memory needs of the
 extension module. Even when the requested memory is used exclusively for
-internal, highly-specific purposes, delegating all memory requests to the Python
+internal, highly specific purposes, delegating all memory requests to the Python
 memory manager causes the interpreter to have a more accurate image of its
 memory footprint as a whole. Consequently, under certain circumstances, the
 Python memory manager may or may not trigger appropriate actions, like garbage
diff --git a/Doc/c-api/typeobj.rst b/Doc/c-api/typeobj.rst
index d8d95bf0b6436..a331e9c188509 100644
--- a/Doc/c-api/typeobj.rst
+++ b/Doc/c-api/typeobj.rst
@@ -529,7 +529,7 @@ type objects) *must* have the :attr:`ob_size` field.
    ``PyObject_HEAD_INIT`` macro.  For :ref:`statically allocated objects
    <static-types>`, these fields always remain ``NULL``.  For :ref:`dynamically
    allocated objects <heap-types>`, these two fields are used to link the
-   object into a doubly-linked list of *all* live objects on the heap.
+   object into a doubly linked list of *all* live objects on the heap.
 
    This could be used for various debugging purposes; currently the only uses
    are the :func:`sys.getobjects` function and to print the objects that are
diff --git a/Doc/c-api/weakref.rst b/Doc/c-api/weakref.rst
index 7b32e17a23972..ace743ba01c5f 100644
--- a/Doc/c-api/weakref.rst
+++ b/Doc/c-api/weakref.rst
@@ -35,7 +35,7 @@ as much as it can.
    callable object that receives notification when *ob* is garbage collected; it
    should accept a single parameter, which will be the weak reference object
    itself. *callback* may also be ``None`` or ``NULL``.  If *ob* is not a
-   weakly-referencable object, or if *callback* is not callable, ``None``, or
+   weakly referencable object, or if *callback* is not callable, ``None``, or
    ``NULL``, this will return ``NULL`` and raise :exc:`TypeError`.
 
 
@@ -47,7 +47,7 @@ as much as it can.
    be a callable object that receives notification when *ob* is garbage
    collected; it should accept a single parameter, which will be the weak
    reference object itself. *callback* may also be ``None`` or ``NULL``.  If *ob*
-   is not a weakly-referencable object, or if *callback* is not callable,
+   is not a weakly referencable object, or if *callback* is not callable,
    ``None``, or ``NULL``, this will return ``NULL`` and raise :exc:`TypeError`.
 
 
diff --git a/Doc/distutils/apiref.rst b/Doc/distutils/apiref.rst
index 74c48142d6d7f..87c928555554a 100644
--- a/Doc/distutils/apiref.rst
+++ b/Doc/distutils/apiref.rst
@@ -1198,7 +1198,7 @@ other utility module.
    it contains certain values: see :func:`check_environ`.  Raise :exc:`ValueError`
    for any variables not found in either *local_vars* or ``os.environ``.
 
-   Note that this is not a fully-fledged string interpolation function. A valid
+   Note that this is not a full-fledged string interpolation function. A valid
    ``$variable`` can consist only of upper and lower case letters, numbers and an
    underscore. No { } or ( ) style quoting is available.
 
diff --git a/Doc/extending/building.rst b/Doc/extending/building.rst
index 69dffbd56abf1..53817074ab1ee 100644
--- a/Doc/extending/building.rst
+++ b/Doc/extending/building.rst
@@ -17,7 +17,7 @@ The initialization function has the signature:
 
 .. c:function:: PyObject* PyInit_modulename(void)
 
-It returns either a fully-initialized module, or a :c:type:`PyModuleDef`
+It returns either a fully initialized module, or a :c:type:`PyModuleDef`
 instance. See :ref:`initializing-modules` for details.
 
 .. highlight:: python
diff --git a/Doc/extending/newtypes.rst b/Doc/extending/newtypes.rst
index f75bee9e6f2a2..c7c434e58bf04 100644
--- a/Doc/extending/newtypes.rst
+++ b/Doc/extending/newtypes.rst
@@ -175,7 +175,7 @@ example::
    }
 
 If no :c:member:`~PyTypeObject.tp_repr` handler is specified, the interpreter will supply a
-representation that uses the type's :c:member:`~PyTypeObject.tp_name` and a uniquely-identifying
+representation that uses the type's :c:member:`~PyTypeObject.tp_name` and a uniquely identifying
 value for the object.
 
 The :c:member:`~PyTypeObject.tp_str` handler is to :func:`str` what the :c:member:`~PyTypeObject.tp_repr` handler
@@ -589,7 +589,7 @@ with the required field::
        PyObject *weakreflist;  /* List of weak references */
    } TrivialObject;
 
-And the corresponding member in the statically-declared type object::
+And the corresponding member in the statically declared type object::
 
    static PyTypeObject TrivialType = {
        PyVarObject_HEAD_INIT(NULL, 0)
diff --git a/Doc/faq/design.rst b/Doc/faq/design.rst
index a624fdb07a17d..794b69795bac2 100644
--- a/Doc/faq/design.rst
+++ b/Doc/faq/design.rst
@@ -313,7 +313,7 @@ you're too lazy to define a function.
 
 Functions are already first class objects in Python, and can be declared in a
 local scope.  Therefore the only advantage of using a lambda instead of a
-locally-defined function is that you don't need to invent a name for the
+locally defined function is that you don't need to invent a name for the
 function -- but that's just a local variable to which the function object (which
 is exactly the same type of object that a lambda expression yields) is assigned!
 
diff --git a/Doc/faq/programming.rst b/Doc/faq/programming.rst
index 5207add7783d3..4aea1277f9e79 100644
--- a/Doc/faq/programming.rst
+++ b/Doc/faq/programming.rst
@@ -294,7 +294,7 @@ It's good practice if you import modules in the following order:
 1. standard library modules -- e.g. ``sys``, ``os``, ``getopt``, ``re``
 2. third-party library modules (anything installed in Python's site-packages
    directory) -- e.g. mx.DateTime, ZODB, PIL.Image, etc.
-3. locally-developed modules
+3. locally developed modules
 
 It is sometimes necessary to move imports to a function or class to avoid
 problems with circular imports.  Gordon McMillan says:
@@ -771,7 +771,7 @@ What does the slash(/) in the parameter list of a function mean?
 
 A slash in the argument list of a function denotes that the parameters prior to
 it are positional-only.  Positional-only parameters are the ones without an
-externally-usable name.  Upon calling a function that accepts positional-only
+externally usable name.  Upon calling a function that accepts positional-only
 parameters, arguments are mapped to parameters based solely on their position.
 For example, :func:`divmod` is a function that accepts positional-only
 parameters. Its documentation looks like this::
diff --git a/Doc/glossary.rst b/Doc/glossary.rst
index 27e06c9ffcf4e..7950ec4e206e4 100644
--- a/Doc/glossary.rst
+++ b/Doc/glossary.rst
@@ -532,7 +532,7 @@ Glossary
       machines.
 
       However, some extension modules, either standard or third-party,
-      are designed so as to release the GIL when doing computationally-intensive
+      are designed so as to release the GIL when doing computationally intensive
       tasks such as compression or hashing.  Also, the GIL is always released
       when doing I/O.
 
diff --git a/Doc/howto/clinic.rst b/Doc/howto/clinic.rst
index 7959bc3a5c5b3..2d368966bf5d3 100644
--- a/Doc/howto/clinic.rst
+++ b/Doc/howto/clinic.rst
@@ -541,7 +541,7 @@ Let's dive in!
 
 16. Compile, then run the relevant portions of the regression-test suite.
     This change should not introduce any new compile-time warnings or errors,
-    and there should be no externally-visible change to Python's behavior.
+    and there should be no externally visible change to Python's behavior.
 
     Well, except for one difference: ``inspect.signature()`` run on your function
     should now provide a valid signature!
@@ -1117,7 +1117,7 @@ Here's the syntax for cloning a function::
 ``module.class`` in the sample just to illustrate that you must
 use the full path to *both* functions.)
 
-Sorry, there's no syntax for partially-cloning a function, or cloning a function
+Sorry, there's no syntax for partially cloning a function, or cloning a function
 then modifying it.  Cloning is an all-or nothing proposition.
 
 Also, the function you are cloning from must have been previously defined
@@ -1315,7 +1315,7 @@ to specify in your subclass.  Here's the current list:
     there is no default, but not specifying a default may
     result in an "uninitialized variable" warning.  This can
     easily happen when using option groups?although
-    properly-written code will never actually use this value,
+    properly written code will never actually use this value,
     the variable does get passed in to the impl, and the
     C compiler will complain about the "use" of the
     uninitialized value.  This value should always be a
diff --git a/Doc/howto/functional.rst b/Doc/howto/functional.rst
index fb561a6a10b66..eb800152050d1 100644
--- a/Doc/howto/functional.rst
+++ b/Doc/howto/functional.rst
@@ -741,7 +741,7 @@ further because you risk skipping a discarded element.
 The itertools module
 ====================
 
-The :mod:`itertools` module contains a number of commonly-used iterators as well
+The :mod:`itertools` module contains a number of commonly used iterators as well
 as functions for combining several iterators.  This section will introduce the
 module's contents by showing small examples.
 
diff --git a/Doc/howto/instrumentation.rst b/Doc/howto/instrumentation.rst
index 4a59ae82f96e2..4ce15c69dac90 100644
--- a/Doc/howto/instrumentation.rst
+++ b/Doc/howto/instrumentation.rst
@@ -123,7 +123,7 @@ Sufficiently modern readelf can print the metadata::
             Arguments: 8@%rbp 8@%r12 -4@%eax
 
 The above metadata contains information for SystemTap describing how it
-can patch strategically-placed machine code instructions to enable the
+can patch strategically placed machine code instructions to enable the
 tracing hooks used by a SystemTap script.
 
 
@@ -410,7 +410,7 @@ needing to directly name the static markers:
 
 
 The following script uses the tapset above to provide a top-like view of all
-running CPython code, showing the top 20 most frequently-entered bytecode
+running CPython code, showing the top 20 most frequently entered bytecode
 frames, each second, across the whole system:
 
 .. code-block:: none
diff --git a/Doc/howto/logging.rst b/Doc/howto/logging.rst
index f024430cedb0a..0caff13bd15d8 100644
--- a/Doc/howto/logging.rst
+++ b/Doc/howto/logging.rst
@@ -127,7 +127,7 @@ Logging to a file
 ^^^^^^^^^^^^^^^^^
 
 A very common situation is that of recording logging events in a file, so let's
-look at that next. Be sure to try the following in a newly-started Python
+look at that next. Be sure to try the following in a newly started Python
 interpreter, and don't just continue from the session described above::
 
    import logging
diff --git a/Doc/howto/regex.rst b/Doc/howto/regex.rst
index c4eed8fb1fbe7..5cd6140f19ca2 100644
--- a/Doc/howto/regex.rst
+++ b/Doc/howto/regex.rst
@@ -949,7 +949,7 @@ Additionally, you can retrieve named groups as a dictionary with
    >>> m.groupdict()
    {'first': 'Jane', 'last': 'Doe'}
 
-Named groups are handy because they let you use easily-remembered names, instead
+Named groups are handy because they let you use easily remembered names, instead
 of having to remember numbers.  Here's an example RE from the :mod:`imaplib`
 module::
 
diff --git a/Doc/howto/urllib2.rst b/Doc/howto/urllib2.rst
index e77fefffbd257..e1a2f48f0b084 100644
--- a/Doc/howto/urllib2.rst
+++ b/Doc/howto/urllib2.rst
@@ -420,7 +420,7 @@ Openers and Handlers
 ====================
 
 When you fetch a URL you use an opener (an instance of the perhaps
-confusingly-named :class:`urllib.request.OpenerDirector`). Normally we have been using
+confusingly named :class:`urllib.request.OpenerDirector`). Normally we have been using
 the default opener - via ``urlopen`` - but you can create custom
 openers. Openers use handlers. All the "heavy lifting" is done by the
 handlers. Each handler knows how to open URLs for a particular URL scheme (http,
diff --git a/Doc/install/index.rst b/Doc/install/index.rst
index 7f7be11700988..63b64b95fc721 100644
--- a/Doc/install/index.rst
+++ b/Doc/install/index.rst
@@ -65,7 +65,7 @@ If you download a module source distribution, you can tell pretty quickly if it
 was packaged and distributed in the standard way, i.e. using the Distutils.
 First, the distribution's name and version number will be featured prominently
 in the name of the downloaded archive, e.g. :file:`foo-1.0.tar.gz` or
-:file:`widget-0.9.7.zip`.  Next, the archive will unpack into a similarly-named
+:file:`widget-0.9.7.zip`.  Next, the archive will unpack into a similarly named
 directory: :file:`foo-1.0` or :file:`widget-0.9.7`.  Additionally, the
 distribution will contain a setup script :file:`setup.py`, and a file named
 :file:`README.txt` or possibly just :file:`README`, which should explain that
diff --git a/Doc/library/asynchat.rst b/Doc/library/asynchat.rst
index 4eb6a79d4dfbf..777b7075b30de 100644
--- a/Doc/library/asynchat.rst
+++ b/Doc/library/asynchat.rst
@@ -125,7 +125,7 @@ connection requests.
 .. method:: async_chat.push_with_producer(producer)
 
    Takes a producer object and adds it to the producer queue associated with
-   the channel.  When all currently-pushed producers have been exhausted the
+   the channel.  When all currently pushed producers have been exhausted the
    channel will consume this producer's data by calling its :meth:`more`
    method and send the data to the remote endpoint.
 
diff --git a/Doc/library/custominterp.rst b/Doc/library/custominterp.rst
index 5eeced20a9a59..9ea9e901372ee 100644
--- a/Doc/library/custominterp.rst
+++ b/Doc/library/custominterp.rst
@@ -8,7 +8,7 @@ The modules described in this chapter allow writing interfaces similar to
 Python's interactive interpreter.  If you want a Python interpreter that
 supports some special feature in addition to the Python language, you should
 look at the :mod:`code` module.  (The :mod:`codeop` module is lower-level, used
-to support compiling a possibly-incomplete chunk of Python code.)
+to support compiling a possibly incomplete chunk of Python code.)
 
 The full list of modules described in this chapter is:
 
diff --git a/Doc/library/decimal.rst b/Doc/library/decimal.rst
index d052581c97012..e7d3950fd1438 100644
--- a/Doc/library/decimal.rst
+++ b/Doc/library/decimal.rst
@@ -30,7 +30,7 @@
 
 --------------
 
-The :mod:`decimal` module provides support for fast correctly-rounded
+The :mod:`decimal` module provides support for fast correctly rounded
 decimal floating point arithmetic. It offers several advantages over the
 :class:`float` datatype:
 
@@ -1371,16 +1371,16 @@ In addition to the three supplied contexts, new contexts can be created with the
       With two arguments, compute ``x**y``.  If ``x`` is negative then ``y``
       must be integral.  The result will be inexact unless ``y`` is integral and
       the result is finite and can be expressed exactly in 'precision' digits.
-      The rounding mode of the context is used. Results are always correctly-rounded
+      The rounding mode of the context is used. Results are always correctly rounded
       in the Python version.
 
       ``Decimal(0) ** Decimal(0)`` results in ``InvalidOperation``, and if ``InvalidOperation``
       is not trapped, then results in ``Decimal('NaN')``.
 
       .. versionchanged:: 3.3
-         The C module computes :meth:`power` in terms of the correctly-rounded
+         The C module computes :meth:`power` in terms of the correctly rounded
          :meth:`exp` and :meth:`ln` functions. The result is well-defined but
-         only "almost always correctly-rounded".
+         only "almost always correctly rounded".
 
       With three arguments, compute ``(x**y) % modulo``.  For the three argument
       form, the following restrictions on the arguments hold:
@@ -2151,7 +2151,7 @@ Q. Is the CPython implementation fast for large numbers?
 A. Yes.  In the CPython and PyPy3 implementations, the C/CFFI versions of
 the decimal module integrate the high speed `libmpdec
 <https://www.bytereef.org/mpdecimal/doc/libmpdec/index.html>`_ library for
-arbitrary precision correctly-rounded decimal floating point arithmetic [#]_.
+arbitrary precision correctly rounded decimal floating point arithmetic [#]_.
 ``libmpdec`` uses `Karatsuba multiplication
 <https://en.wikipedia.org/wiki/Karatsuba_algorithm>`_
 for medium-sized numbers and the `Number Theoretic Transform
diff --git a/Doc/library/doctest.rst b/Doc/library/doctest.rst
index 2d50a49c6415e..75c6ee289a91e 100644
--- a/Doc/library/doctest.rst
+++ b/Doc/library/doctest.rst
@@ -565,12 +565,12 @@ doctest decides whether actual output matches an example's expected output:
 
    When specified, doctests expecting exceptions pass so long as an exception
    of the expected type is raised, even if the details
-   (message and fully-qualified exception name) don't match.
+   (message and fully qualified exception name) don't match.
 
    For example, an example expecting ``ValueError: 42`` will pass if the actual
    exception raised is ``ValueError: 3*14``, but will fail if, say, a
    :exc:`TypeError` is raised instead.
-   It will also ignore any fully-qualified name included before the
+   It will also ignore any fully qualified name included before the
    exception class, which can vary between implementations and versions
    of Python and the code/libraries in use.
    Hence, all three of these variations will work with the flag specified:
diff --git a/Doc/library/glob.rst b/Doc/library/glob.rst
index d51fd0ebf9e40..0e4cfe7ebed79 100644
--- a/Doc/library/glob.rst
+++ b/Doc/library/glob.rst
@@ -42,7 +42,7 @@ For example, ``'[?]'`` matches the character ``'?'``.
 .. function:: glob(pathname, *, root_dir=None, dir_fd=None, recursive=False, \
                    include_hidden=False)
 
-   Return a possibly-empty list of path names that match *pathname*, which must be
+   Return a possibly empty list of path names that match *pathname*, which must be
    a string containing a path specification. *pathname* can be either absolute
    (like :file:`/usr/src/Python-1.5/Makefile`) or relative (like
    :file:`../../Tools/\*/\*.gif`), and can contain shell-style wildcards. Broken
diff --git a/Doc/library/hmac.rst b/Doc/library/hmac.rst
index 6f1b59b57ce58..b2ca0455d3745 100644
--- a/Doc/library/hmac.rst
+++ b/Doc/library/hmac.rst
@@ -69,7 +69,7 @@ An HMAC object has the following methods:
 
    .. warning::
 
-      When comparing the output of :meth:`digest` to an externally-supplied
+      When comparing the output of :meth:`digest` to an externally supplied
       digest during a verification routine, it is recommended to use the
       :func:`compare_digest` function instead of the ``==`` operator
       to reduce the vulnerability to timing attacks.
@@ -83,7 +83,7 @@ An HMAC object has the following methods:
 
    .. warning::
 
-      When comparing the output of :meth:`hexdigest` to an externally-supplied
+      When comparing the output of :meth:`hexdigest` to an externally supplied
       digest during a verification routine, it is recommended to use the
       :func:`compare_digest` function instead of the ``==`` operator
       to reduce the vulnerability to timing attacks.
diff --git a/Doc/library/importlib.rst b/Doc/library/importlib.rst
index aac556e2c68d9..44bf703e93a84 100644
--- a/Doc/library/importlib.rst
+++ b/Doc/library/importlib.rst
@@ -450,7 +450,7 @@ ABC hierarchy::
         reloaded):
 
         - :attr:`__name__`
-            The module's fully-qualified name.
+            The module's fully qualified name.
             It is ``'__main__'`` for an executed module.
 
         - :attr:`__file__`
@@ -471,7 +471,7 @@ ABC hierarchy::
             as an indicator that the module is a package.
 
         - :attr:`__package__`
-            The fully-qualified name of the package the module is in (or the
+            The fully qualified name of the package the module is in (or the
             empty string for a top-level module).
             If the module is a package then this is the same as :attr:`__name__`.
 
@@ -899,7 +899,7 @@ find and load modules.
 
    (:attr:`__name__`)
 
-   The module's fully-qualified name.
+   The module's fully qualified name.
    The :term:`finder` should always set this attribute to a non-empty string.
 
    .. attribute:: loader
@@ -948,7 +948,7 @@ find and load modules.
 
    (:attr:`__package__`)
 
-   (Read-only) The fully-qualified name of the package the module is in (or the
+   (Read-only) The fully qualified name of the package the module is in (or the
    empty string for a top-level module).
    If the module is a package then this is the same as :attr:`name`.
 
diff --git a/Doc/library/inspect.rst b/Doc/library/inspect.rst
index 154d0f5dab0cd..700cd9122cd34 100644
--- a/Doc/library/inspect.rst
+++ b/Doc/library/inspect.rst
@@ -187,7 +187,7 @@ attributes:
 |           | co_name           | name with which this code |
 |           |                   | object was defined        |
 +-----------+-------------------+---------------------------+
-|           | co_qualname       | fully-qualified name with |
+|           | co_qualname       | fully qualified name with |
 |           |                   | which this code object    |
 |           |                   | was defined               |
 +-----------+-------------------+---------------------------+
@@ -1130,7 +1130,7 @@ Classes and functions
      doesn't have its own annotations dict, returns an empty dict.
    * All accesses to object members and dict values are done
      using ``getattr()`` and ``dict.get()`` for safety.
-   * Always, always, always returns a freshly-created dict.
+   * Always, always, always returns a freshly created dict.
 
    ``eval_str`` controls whether or not values of type ``str`` are replaced
    with the result of calling :func:`eval()` on those values:
diff --git a/Doc/library/mailbox.rst b/Doc/library/mailbox.rst
index 94d95d10290b0..d74fc8059fd53 100644
--- a/Doc/library/mailbox.rst
+++ b/Doc/library/mailbox.rst
@@ -1510,7 +1510,7 @@ The following exception classes are defined in the :mod:`mailbox` module:
 
    Raised when some mailbox-related condition beyond the control of the program
    causes it to be unable to proceed, such as when failing to acquire a lock that
-   another program already holds a lock, or when a uniquely-generated file name
+   another program already holds a lock, or when a uniquely generated file name
    already exists.
 
 
diff --git a/Doc/library/optparse.rst b/Doc/library/optparse.rst
index 0d686b10365a6..47e62553fb035 100644
--- a/Doc/library/optparse.rst
+++ b/Doc/library/optparse.rst
@@ -529,7 +529,7 @@ help message:
   line-wrapping---\ :mod:`optparse` takes care of wrapping lines and making
   the help output look good.
 
-* options that take a value indicate this fact in their automatically-generated
+* options that take a value indicate this fact in their automatically generated
   help message, e.g. for the "mode" option::
 
      -m MODE, --mode=MODE
@@ -539,7 +539,7 @@ help message:
   :mod:`optparse` converts the destination variable name to uppercase and uses
   that for the meta-variable.  Sometimes, that's not what you want---for
   example, the ``--filename`` option explicitly sets ``metavar="FILE"``,
-  resulting in this automatically-generated option description::
+  resulting in this automatically generated option description::
 
      -f FILE, --filename=FILE
 
@@ -1449,7 +1449,7 @@ intelligently and add conflicting options to it::
    parser.add_option("-n", "--dry-run", ..., help="do no harm")
    parser.add_option("-n", "--noisy", ..., help="be noisy")
 
-At this point, :mod:`optparse` detects that a previously-added option is already
+At this point, :mod:`optparse` detects that a previously added option is already
 using the ``-n`` option string.  Since ``conflict_handler`` is ``"resolve"``,
 it resolves the situation by removing ``-n`` from the earlier option's list of
 option strings.  Now ``--dry-run`` is the only way for the user to activate
@@ -1460,7 +1460,7 @@ that option.  If the user asks for help, the help message will reflect that::
      ...
      -n, --noisy   be noisy
 
-It's possible to whittle away the option strings for a previously-added option
+It's possible to whittle away the option strings for a previously added option
 until there are none left, and the user has no way of invoking that option from
 the command-line.  In that case, :mod:`optparse` removes that option completely,
 so it doesn't show up in help text or anywhere else. Carrying on with our
diff --git a/Doc/library/os.rst b/Doc/library/os.rst
index baf89bf8b56aa..4639a8b4afe59 100644
--- a/Doc/library/os.rst
+++ b/Doc/library/os.rst
@@ -2121,7 +2121,7 @@ features:
 
    The *mode* parameter is passed to :func:`mkdir` for creating the leaf
    directory; see :ref:`the mkdir() description <mkdir_modebits>` for how it
-   is interpreted.  To set the file permission bits of any newly-created parent
+   is interpreted.  To set the file permission bits of any newly created parent
    directories you can set the umask before invoking :func:`makedirs`.  The
    file permission bits of existing parent directories are not changed.
 
@@ -2152,7 +2152,7 @@ features:
 
    .. versionchanged:: 3.7
       The *mode* argument no longer affects the file permission bits of
-      newly-created intermediate-level directories.
+      newly created intermediate-level directories.
 
 
 .. function:: mkfifo(path, mode=0o666, *, dir_fd=None)
diff --git a/Doc/library/secrets.rst b/Doc/library/secrets.rst
index eda4616da5ec9..86fa35fec59f6 100644
--- a/Doc/library/secrets.rst
+++ b/Doc/library/secrets.rst
@@ -44,7 +44,7 @@ randomness that your operating system provides.
 
 .. function:: choice(sequence)
 
-   Return a randomly-chosen element from a non-empty sequence.
+   Return a randomly chosen element from a non-empty sequence.
 
 .. function:: randbelow(n)
 
@@ -155,7 +155,7 @@ Generate an eight-character alphanumeric password:
    Applications should not
    `store passwords in a recoverable format <http://cwe.mitre.org/data/definitions/257.html>`_,
    whether plain text or encrypted.  They should be salted and hashed
-   using a cryptographically-strong one-way (irreversible) hash function.
+   using a cryptographically strong one-way (irreversible) hash function.
 
 
 Generate a ten-character alphanumeric password with at least one
diff --git a/Doc/library/select.rst b/Doc/library/select.rst
index 46b5ff8b6d586..1c3d10ef20935 100644
--- a/Doc/library/select.rst
+++ b/Doc/library/select.rst
@@ -252,7 +252,7 @@ object.
 
 .. method:: devpoll.poll([timeout])
 
-   Polls the set of registered file descriptors, and returns a possibly-empty list
+   Polls the set of registered file descriptors, and returns a possibly empty list
    containing ``(fd, event)`` 2-tuples for the descriptors that have events or
    errors to report. *fd* is the file descriptor, and *event* is a bitmask with
    bits set for the reported events for that descriptor --- :const:`POLLIN` for
@@ -440,7 +440,7 @@ linearly scanned again. :c:func:`select` is O(highest file descriptor), while
 
 .. method:: poll.poll([timeout])
 
-   Polls the set of registered file descriptors, and returns a possibly-empty list
+   Polls the set of registered file descriptors, and returns a possibly empty list
    containing ``(fd, event)`` 2-tuples for the descriptors that have events or
    errors to report. *fd* is the file descriptor, and *event* is a bitmask with
    bits set for the reported events for that descriptor --- :const:`POLLIN` for
diff --git a/Doc/library/shutil.rst b/Doc/library/shutil.rst
index e79caecf310f2..7d69c5ff266f3 100644
--- a/Doc/library/shutil.rst
+++ b/Doc/library/shutil.rst
@@ -194,7 +194,7 @@ Directory and files operations
 
    When *follow_symlinks* is false, and *src* is a symbolic
    link, :func:`copy2` attempts to copy all metadata from the
-   *src* symbolic link to the newly-created *dst* symbolic link.
+   *src* symbolic link to the newly created *dst* symbolic link.
    However, this functionality is not available on all platforms.
    On platforms where some or all of this functionality is
    unavailable, :func:`copy2` will preserve all the metadata
diff --git a/Doc/library/smtpd.rst b/Doc/library/smtpd.rst
index a0d1fb0aa5152..5a7e41c6d0983 100644
--- a/Doc/library/smtpd.rst
+++ b/Doc/library/smtpd.rst
@@ -228,7 +228,7 @@ SMTPChannel Objects
 
    .. attribute:: fqdn
 
-      Holds the fully-qualified domain name of the server as returned by
+      Holds the fully qualified domain name of the server as returned by
       :func:`socket.getfqdn`.
 
    .. attribute:: peer
diff --git a/Doc/library/socket.rst b/Doc/library/socket.rst
index fc8a56e7b41ba..84b6d797ddc01 100644
--- a/Doc/library/socket.rst
+++ b/Doc/library/socket.rst
@@ -125,7 +125,7 @@ created.  Socket addresses are represented as follows:
 
 - A string or a tuple ``(id, unit)`` is used for the :const:`SYSPROTO_CONTROL`
   protocol of the :const:`PF_SYSTEM` family. The string is the name of a
-  kernel control using a dynamically-assigned ID. The tuple can be used if ID
+  kernel control using a dynamically assigned ID. The tuple can be used if ID
   and unit number of the kernel control are known or if a registered ID is
   used.
 
@@ -956,7 +956,7 @@ The :mod:`socket` module also offers various network-related services:
 .. function:: getnameinfo(sockaddr, flags)
 
    Translate a socket address *sockaddr* into a 2-tuple ``(host, port)``. Depending
-   on the settings of *flags*, the result can contain a fully-qualified domain name
+   on the settings of *flags*, the result can contain a fully qualified domain name
    or numeric address representation in *host*.  Similarly, *port* can contain a
    string port name or a numeric port number.
 
diff --git a/Doc/library/sqlite3.rst b/Doc/library/sqlite3.rst
index 33dfafd493099..b13d3f4b48650 100644
--- a/Doc/library/sqlite3.rst
+++ b/Doc/library/sqlite3.rst
@@ -683,7 +683,7 @@ Connection Objects
 
       If returning a tuple doesn't suffice and you want name-based access to
       columns, you should consider setting :attr:`row_factory` to the
-      highly-optimized :class:`sqlite3.Row` type. :class:`Row` provides both
+      highly optimized :class:`sqlite3.Row` type. :class:`Row` provides both
       index-based and case-insensitive name-based access to columns with almost no
       memory overhead. It will probably be better than your own custom
       dictionary-based approach or even a db_row based solution.
diff --git a/Doc/library/struct.rst b/Doc/library/struct.rst
index 25e26201d7d43..c1888d4a94fe0 100644
--- a/Doc/library/struct.rst
+++ b/Doc/library/struct.rst
@@ -82,7 +82,7 @@ The module defines the following exception and functions:
 
    Iteratively unpack from the buffer *buffer* according to the format
    string *format*.  This function returns an iterator which will read
-   equally-sized chunks from the buffer until all its contents have been
+   equally sized chunks from the buffer until all its contents have been
    consumed.  The buffer's size in bytes must be a multiple of the size
    required by the format, as reflected by :func:`calcsize`.
 
diff --git a/Doc/library/subprocess.rst b/Doc/library/subprocess.rst
index 4031a5f62167f..0a996feb22cef 100644
--- a/Doc/library/subprocess.rst
+++ b/Doc/library/subprocess.rst
@@ -359,7 +359,7 @@ functions.
 
    .. warning::
 
-      For maximum reliability, use a fully-qualified path for the executable.
+      For maximum reliability, use a fully qualified path for the executable.
       To search for an unqualified name on :envvar:`PATH`, use
       :meth:`shutil.which`. On all platforms, passing :data:`sys.executable`
       is the recommended way to launch the current Python interpreter again,
@@ -1553,7 +1553,7 @@ On Linux, :mod:`subprocess` defaults to using the ``vfork()`` system call
 internally when it is safe to do so rather than ``fork()``. This greatly
 improves performance.
 
-If you ever encounter a presumed highly-unusual situation where you need to
+If you ever encounter a presumed highly unusual situation where you need to
 prevent ``vfork()`` from being used by Python, you can set the
 :attr:`subprocess._USE_VFORK` attribute to a false value.
 
diff --git a/Doc/library/tarfile.rst b/Doc/library/tarfile.rst
index f9d34def79a12..6e8baba04fb92 100644
--- a/Doc/library/tarfile.rst
+++ b/Doc/library/tarfile.rst
@@ -839,7 +839,7 @@ There are three tar formats that can be created with the :mod:`tarfile` module:
   files and stores pathnames in a portable way. Modern tar implementations,
   including GNU tar, bsdtar/libarchive and star, fully support extended *pax*
   features; some old or unmaintained libraries may not, but should treat
-  *pax* archives as if they were in the universally-supported *ustar* format.
+  *pax* archives as if they were in the universally supported *ustar* format.
   It is the current default format for new archives.
 
   It extends the existing *ustar* format with extra headers for information
diff --git a/Doc/library/tkinter.ttk.rst b/Doc/library/tkinter.ttk.rst
index d50ea99aa46ee..b05799ef601eb 100644
--- a/Doc/library/tkinter.ttk.rst
+++ b/Doc/library/tkinter.ttk.rst
@@ -286,7 +286,7 @@ methods :meth:`tkinter.Widget.cget` and :meth:`tkinter.Widget.configure`.
       Modify or inquire widget state. If *statespec* is specified, sets the
       widget state according to it and return a new *statespec* indicating
       which flags were changed. If *statespec* is not specified, returns
-      the currently-enabled state flags.
+      the currently enabled state flags.
 
    *statespec* will usually be a list or a tuple.
 
@@ -465,7 +465,7 @@ Notebook
 
 Ttk Notebook widget manages a collection of windows and displays a single
 one at a time. Each child window is associated with a tab, which the user
-may select to change the currently-displayed window.
+may select to change the currently displayed window.
 
 
 Options
@@ -543,7 +543,7 @@ of the following forms:
 * An integer between zero and the number of tabs
 * The name of a child window
 * A positional specification of the form "@x,y", which identifies the tab
-* The literal string "current", which identifies the currently-selected tab
+* The literal string "current", which identifies the currently selected tab
 * The literal string "end", which returns the number of tabs (only valid for
   :meth:`Notebook.index`)
 
@@ -613,7 +613,7 @@ ttk.Notebook
       Selects the specified *tab_id*.
 
       The associated child window will be displayed, and the
-      previously-selected window (if different) is unmapped. If *tab_id* is
+      previously selected window (if different) is unmapped. If *tab_id* is
       omitted, returns the widget name of the currently selected pane.
 
 
diff --git a/Doc/library/typing.rst b/Doc/library/typing.rst
index ddcdc70939f19..fceb43aec9be3 100644
--- a/Doc/library/typing.rst
+++ b/Doc/library/typing.rst
@@ -78,7 +78,7 @@ annotations. These include:
      *Introducing* :data:`TypeVarTuple`
 * :pep:`647`: User-Defined Type Guards
      *Introducing* :data:`TypeGuard`
-* :pep:`655`: Marking individual TypedDict items as required or potentially-missing
+* :pep:`655`: Marking individual TypedDict items as required or potentially missing
      *Introducing* :data:`Required` and :data:`NotRequired`
 * :pep:`673`: Self type
     *Introducing* :data:`Self`
@@ -1034,7 +1034,7 @@ These can be used as types in annotations using ``[]``, each having a unique syn
    as either required or non-required respectively.
 
    For more information, see :class:`TypedDict` and
-   :pep:`655` ("Marking individual TypedDict items as required or potentially-missing").
+   :pep:`655` ("Marking individual TypedDict items as required or potentially missing").
 
    .. versionadded:: 3.11
 
diff --git a/Doc/library/urllib.request.rst b/Doc/library/urllib.request.rst
index 491ef022a1fad..542db1b5e2a39 100644
--- a/Doc/library/urllib.request.rst
+++ b/Doc/library/urllib.request.rst
@@ -1279,7 +1279,7 @@ involved.  For example, the :envvar:`http_proxy` environment variable is read to
 obtain the HTTP proxy's URL.
 
 This example replaces the default :class:`ProxyHandler` with one that uses
-programmatically-supplied proxy URLs, and adds proxy authorization support with
+programmatically supplied proxy URLs, and adds proxy authorization support with
 :class:`ProxyBasicAuthHandler`. ::
 
    proxy_handler = urllib.request.ProxyHandler({'http': 'http://www.example.com:3128/'})
diff --git a/Doc/library/uuid.rst b/Doc/library/uuid.rst
index ddfbbda279e35..a71fe7abf5b54 100644
--- a/Doc/library/uuid.rst
+++ b/Doc/library/uuid.rst
@@ -211,7 +211,7 @@ The :mod:`uuid` module defines the following namespace identifiers for use with
 
 .. data:: NAMESPACE_DNS
 
-   When this namespace is specified, the *name* string is a fully-qualified domain
+   When this namespace is specified, the *name* string is a fully qualified domain
    name.
 
 
diff --git a/Doc/library/warnings.rst b/Doc/library/warnings.rst
index 43708f8021ad2..28579ce8df4a6 100644
--- a/Doc/library/warnings.rst
+++ b/Doc/library/warnings.rst
@@ -163,9 +163,9 @@ the disposition of the match.  Each entry is a tuple of the form (*action*,
   category must be a subclass in order to match.
 
 * *module* is a string containing a regular expression that the start of the
-  fully-qualified module name must match, case-sensitively.  In :option:`-W` and
+  fully qualified module name must match, case-sensitively.  In :option:`-W` and
   :envvar:`PYTHONWARNINGS`, *module* is a literal string that the
-  fully-qualified module name must be equal to (case-sensitively), ignoring any
+  fully qualified module name must be equal to (case-sensitively), ignoring any
   whitespace at the start or end of *module*.
 
 * *lineno* is an integer that the line number where the warning occurred must
diff --git a/Doc/library/wsgiref.rst b/Doc/library/wsgiref.rst
index 6a2d47891b473..06223e667a450 100644
--- a/Doc/library/wsgiref.rst
+++ b/Doc/library/wsgiref.rst
@@ -333,7 +333,7 @@ request.  (E.g., using the :func:`shift_path_info` function from
 
    .. method:: WSGIServer.get_app()
 
-      Returns the currently-set application callable.
+      Returns the currently set application callable.
 
    Normally, however, you do not need to use these additional methods, as
    :meth:`set_app` is normally called by :func:`make_server`, and the
@@ -642,7 +642,7 @@ input, output, and error streams.
 
    .. method:: BaseHandler.setup_environ()
 
-      Set the :attr:`environ` attribute to a fully-populated WSGI environment.  The
+      Set the :attr:`environ` attribute to a fully populated WSGI environment.  The
       default implementation uses all of the above methods and attributes, plus the
       :meth:`get_stdin`, :meth:`get_stderr`, and :meth:`add_cgi_vars` methods and the
       :attr:`wsgi_file_wrapper` attribute.  It also inserts a ``SERVER_SOFTWARE`` key
diff --git a/Doc/library/xml.rst b/Doc/library/xml.rst
index e3b3516296114..20b0905bb1093 100644
--- a/Doc/library/xml.rst
+++ b/Doc/library/xml.rst
@@ -95,7 +95,7 @@ quadratic blowup entity expansion
   entity expansion, too. Instead of nested entities it repeats one large entity
   with a couple of thousand chars over and over again. The attack isn't as
   efficient as the exponential case but it avoids triggering parser countermeasures
-  that forbid deeply-nested entities.
+  that forbid deeply nested entities.
 
 external entity expansion
   Entity declarations can contain more than just text for replacement. They can
diff --git a/Doc/library/xmlrpc.client.rst b/Doc/library/xmlrpc.client.rst
index 8d9db53ef1f0d..0d9bfd51f1e49 100644
--- a/Doc/library/xmlrpc.client.rst
+++ b/Doc/library/xmlrpc.client.rst
@@ -47,7 +47,7 @@ between conformable Python objects and XML on the wire.
    The following parameters govern the use of the returned proxy instance.
    If *allow_none* is true,  the Python constant ``None`` will be translated into
    XML; the default behaviour is for ``None`` to raise a :exc:`TypeError`. This is
-   a commonly-used extension to the XML-RPC specification, but isn't supported by
+   a commonly used extension to the XML-RPC specification, but isn't supported by
    all clients and servers; see `http://ontosys.com/xml-rpc/extensions.php
    <https://web.archive.org/web/20130120074804/http://ontosys.com/xml-rpc/extensions.php>`_
    for a description.
diff --git a/Doc/library/zlib.rst b/Doc/library/zlib.rst
index 30eb99817a859..ac179722dee2b 100644
--- a/Doc/library/zlib.rst
+++ b/Doc/library/zlib.rst
@@ -265,7 +265,7 @@ Decompression objects support the following methods and attributes:
    A boolean indicating whether the end of the compressed data stream has been
    reached.
 
-   This makes it possible to distinguish between a properly-formed compressed
+   This makes it possible to distinguish between a properly formed compressed
    stream, and an incomplete or truncated one.
 
    .. versionadded:: 3.3
diff --git a/Doc/reference/datamodel.rst b/Doc/reference/datamodel.rst
index 8ac9a8c0566bf..758f3aef3ee34 100644
--- a/Doc/reference/datamodel.rst
+++ b/Doc/reference/datamodel.rst
@@ -1270,7 +1270,7 @@ Basic customization
 
    Typical implementations create a new instance of the class by invoking the
    superclass's :meth:`__new__` method using ``super().__new__(cls[, ...])``
-   with appropriate arguments and then modifying the newly-created instance
+   with appropriate arguments and then modifying the newly created instance
    as necessary before returning it.
 
    If :meth:`__new__` is invoked during object construction and it returns an
@@ -1560,7 +1560,7 @@ Basic customization
       predictable between repeated invocations of Python.
 
       This is intended to provide protection against a denial-of-service caused
-      by carefully-chosen inputs that exploit the worst case performance of a
+      by carefully chosen inputs that exploit the worst case performance of a
       dict insertion, O(n\ :sup:`2`) complexity.  See
       http://www.ocert.org/advisories/ocert-2011-003.html for details.
 
diff --git a/Doc/reference/import.rst b/Doc/reference/import.rst
index 3a41403c6476b..29d402ebcf492 100644
--- a/Doc/reference/import.rst
+++ b/Doc/reference/import.rst
@@ -541,7 +541,7 @@ the module.
 
 .. attribute:: __name__
 
-   The ``__name__`` attribute must be set to the fully-qualified name of
+   The ``__name__`` attribute must be set to the fully qualified name of
    the module.  This name is used to uniquely identify the module in
    the import system.
 
diff --git a/Doc/reference/lexical_analysis.rst b/Doc/reference/lexical_analysis.rst
index 1cf0a5b15cbbb..b76b4688413ee 100644
--- a/Doc/reference/lexical_analysis.rst
+++ b/Doc/reference/lexical_analysis.rst
@@ -757,7 +757,7 @@ the final value of the whole string.
 
 Top-level format specifiers may include nested replacement fields. These nested
 fields may include their own conversion fields and :ref:`format specifiers
-<formatspec>`, but may not include more deeply-nested replacement fields. The
+<formatspec>`, but may not include more deeply nested replacement fields. The
 :ref:`format specifier mini-language <formatspec>` is the same as that used by
 the :meth:`str.format` method.
 
diff --git a/Doc/tutorial/classes.rst b/Doc/tutorial/classes.rst
index 58b06eb5f2535..f27abe48b2d4e 100644
--- a/Doc/tutorial/classes.rst
+++ b/Doc/tutorial/classes.rst
@@ -297,7 +297,7 @@ initial state. Therefore a class may define a special method named
        self.data = []
 
 When a class defines an :meth:`__init__` method, class instantiation
-automatically invokes :meth:`__init__` for the newly-created class instance.  So
+automatically invokes :meth:`__init__` for the newly created class instance.  So
 in this example, a new, initialized instance can be obtained by::
 
    x = MyClass()
diff --git a/Doc/tutorial/inputoutput.rst b/Doc/tutorial/inputoutput.rst
index 1f1ef28e5cad4..324238228d626 100644
--- a/Doc/tutorial/inputoutput.rst
+++ b/Doc/tutorial/inputoutput.rst
@@ -189,7 +189,7 @@ notation. ::
 This is particularly useful in combination with the built-in function
 :func:`vars`, which returns a dictionary containing all local variables.
 
-As an example, the following lines produce a tidily-aligned
+As an example, the following lines produce a tidily aligned
 set of columns giving integers and their squares and cubes::
 
    >>> for x in range(1, 11):
diff --git a/Doc/using/cmdline.rst b/Doc/using/cmdline.rst
index d9f6afb3760bd..bc92e0e44b9b2 100644
--- a/Doc/using/cmdline.rst
+++ b/Doc/using/cmdline.rst
@@ -368,7 +368,7 @@ Miscellaneous options
    between repeated invocations of Python.
 
    Hash randomization is intended to provide protection against a
-   denial-of-service caused by carefully-chosen inputs that exploit the worst
+   denial-of-service caused by carefully chosen inputs that exploit the worst
    case performance of a dict construction, O(n\ :sup:`2`) complexity.  See
    http://www.ocert.org/advisories/ocert-2011-003.html for details.
 
@@ -464,7 +464,7 @@ Miscellaneous options
    whether the actual warning category of the message is a subclass of the
    specified warning category.
 
-   The *module* field matches the (fully-qualified) module name; this match is
+   The *module* field matches the (fully qualified) module name; this match is
    case-sensitive.
 
    The *lineno* field matches the line number, where zero matches all line
diff --git a/Doc/whatsnew/2.0.rst b/Doc/whatsnew/2.0.rst
index 325def51c274e..24fc39be6161c 100644
--- a/Doc/whatsnew/2.0.rst
+++ b/Doc/whatsnew/2.0.rst
@@ -21,7 +21,7 @@ Python's development never completely stops between releases, and a steady flow
 of bug fixes and improvements are always being submitted. A host of minor fixes,
 a few optimizations, additional docstrings, and better error messages went into
 2.0; to list them all would be impossible, but they're certainly significant.
-Consult the publicly-available CVS logs if you want to see the full list.  This
+Consult the publicly available CVS logs if you want to see the full list.  This
 progress is due to the five developers working for  PythonLabs are now getting
 paid to spend their days fixing bugs, and also due to the improved communication
 resulting  from moving to SourceForge.
diff --git a/Doc/whatsnew/2.3.rst b/Doc/whatsnew/2.3.rst
index cf5552064cf4a..745b0aa220502 100644
--- a/Doc/whatsnew/2.3.rst
+++ b/Doc/whatsnew/2.3.rst
@@ -527,7 +527,7 @@ creates a :class:`LogRecord` instance that is sent to any number of different
 of filters, and each filter can cause the :class:`LogRecord` to be ignored or
 can modify the record before passing it along.  When they're finally output,
 :class:`LogRecord` instances are converted to text by a :class:`Formatter`
-class.  All of these classes can be replaced by your own specially-written
+class.  All of these classes can be replaced by your own specially written
 classes.
 
 With all of these features the :mod:`logging` package should provide enough
diff --git a/Doc/whatsnew/2.4.rst b/Doc/whatsnew/2.4.rst
index 7e11c98399cc1..ddfac1a3f4e63 100644
--- a/Doc/whatsnew/2.4.rst
+++ b/Doc/whatsnew/2.4.rst
@@ -120,7 +120,7 @@ having the entire data set in memory at one time.  List comprehensions don't fit
 into this picture very well because they produce a Python list object containing
 all of the items.  This unavoidably pulls all of the objects into memory, which
 can be a problem if your data set is very large.  When trying to write a
-functionally-styled program, it would be natural to write something like::
+functionally styled program, it would be natural to write something like::
 
    links = [link for link in get_all_links() if not link.followed]
    for link in links:
@@ -918,7 +918,7 @@ Here are all of the changes that Python 2.4 makes to the core Python language.
 
   (Contributed by Raymond Hettinger.)
 
-* Encountering a failure while importing a module no longer leaves a partially-initialized
+* Encountering a failure while importing a module no longer leaves a partially initialized
   module object in ``sys.modules``.  The incomplete module object left
   behind would fool further imports of the same module into succeeding, leading to
   confusing errors.   (Fixed by Tim Peters.)
@@ -1541,7 +1541,7 @@ code:
 * The :mod:`tarfile` module now generates GNU-format tar files by default.
 
 * Encountering a failure while importing a module no longer leaves a
-  partially-initialized module object in ``sys.modules``.
+  partially initialized module object in ``sys.modules``.
 
 * :const:`None` is now a constant; code that binds a new value to  the name
   ``None`` is now a syntax error.
diff --git a/Doc/whatsnew/2.5.rst b/Doc/whatsnew/2.5.rst
index 597eaf51fb68d..1b1fb3be9cabd 100644
--- a/Doc/whatsnew/2.5.rst
+++ b/Doc/whatsnew/2.5.rst
@@ -15,7 +15,7 @@ release schedule.  Python 2.5 was released on September 19, 2006.
 
 The changes in Python 2.5 are an interesting mix of language and library
 improvements. The library enhancements will be more important to Python's user
-community, I think, because several widely-useful packages were added.  New
+community, I think, because several widely useful packages were added.  New
 modules include ElementTree for XML processing (:mod:`xml.etree`),
 the SQLite database module (:mod:`sqlite`), and the :mod:`ctypes`
 module for calling C functions.
@@ -1293,7 +1293,7 @@ complete list of changes, or look through the SVN logs for all the details.
   received several enhancements and a number of bugfixes.  You can now set the
   maximum size in bytes of a field by calling the
   ``csv.field_size_limit(new_limit)`` function; omitting the *new_limit*
-  argument will return the currently-set limit.  The :class:`reader` class now has
+  argument will return the currently set limit.  The :class:`reader` class now has
   a :attr:`line_num` attribute that counts the number of physical lines read from
   the source; records can span multiple physical lines, so :attr:`line_num` is not
   the same as the number of records read.
diff --git a/Doc/whatsnew/2.6.rst b/Doc/whatsnew/2.6.rst
index 0dbb5e50d27d7..7524da8963934 100644
--- a/Doc/whatsnew/2.6.rst
+++ b/Doc/whatsnew/2.6.rst
@@ -523,7 +523,7 @@ PEP 370: Per-user ``site-packages`` Directory
 
 When you run Python, the module search path ``sys.path`` usually
 includes a directory whose path ends in ``"site-packages"``.  This
-directory is intended to hold locally-installed packages available to
+directory is intended to hold locally installed packages available to
 all users using a machine or a particular site installation.
 
 Python 2.6 introduces a convention for user-specific site directories.
@@ -2460,7 +2460,7 @@ changes, or look through the Subversion logs for all the details.
   The function must take a filename and return true if the file
   should be excluded or false if it should be archived.
   The function is applied to both the name initially passed to :meth:`add`
-  and to the names of files in recursively-added directories.
+  and to the names of files in recursively added directories.
 
   (All changes contributed by Lars Gust?bel).
 
@@ -2513,7 +2513,7 @@ changes, or look through the Subversion logs for all the details.
   (Contributed by Brett Cannon.)
 
 * The :mod:`textwrap` module can now preserve existing whitespace
-  at the beginnings and ends of the newly-created lines
+  at the beginnings and ends of the newly created lines
   by specifying ``drop_whitespace=False``
   as an argument::
 
diff --git a/Doc/whatsnew/2.7.rst b/Doc/whatsnew/2.7.rst
index 8eb8daa2feeeb..f753055c16ee2 100644
--- a/Doc/whatsnew/2.7.rst
+++ b/Doc/whatsnew/2.7.rst
@@ -279,7 +279,7 @@ Comparing an :class:`~collections.OrderedDict` with a regular dictionary
 ignores the insertion order and just compares the keys and values.
 
 How does the :class:`~collections.OrderedDict` work?  It maintains a
-doubly-linked list of keys, appending new keys to the list as they're inserted.
+doubly linked list of keys, appending new keys to the list as they're inserted.
 A secondary dictionary maps keys to their corresponding list node, so
 deletion doesn't have to traverse the entire linked list and therefore
 remains O(1).
@@ -1968,7 +1968,7 @@ GvR worked on merging them into Python's version of :mod:`unittest`.
 
 * :meth:`~unittest.TestCase.assertAlmostEqual` and :meth:`~unittest.TestCase.assertNotAlmostEqual` test
   whether *first* and *second* are approximately equal.  This method
-  can either round their difference to an optionally-specified number
+  can either round their difference to an optionally specified number
   of *places* (the default is 7) and compare it to zero, or require
   the difference to be smaller than a supplied *delta* value.
 
@@ -2333,7 +2333,7 @@ Port-Specific Changes: Windows
 
 * The :mod:`_winreg` module for accessing the registry now implements
   the :func:`~_winreg.CreateKeyEx` and :func:`~_winreg.DeleteKeyEx`
-  functions, extended versions of previously-supported functions that
+  functions, extended versions of previously supported functions that
   take several extra arguments.  The :func:`~_winreg.DisableReflectionKey`,
   :func:`~_winreg.EnableReflectionKey`, and :func:`~_winreg.QueryReflectionKey`
   were also tested and documented.
diff --git a/Doc/whatsnew/3.0.rst b/Doc/whatsnew/3.0.rst
index 4da3507ad2e89..63b24748d8aab 100644
--- a/Doc/whatsnew/3.0.rst
+++ b/Doc/whatsnew/3.0.rst
@@ -663,7 +663,7 @@ Some other changes to standard library modules, not covered by
   :data:`string.ascii_letters` etc. instead.  (The reason for the
   removal is that :data:`string.letters` and friends had
   locale-specific behavior, which is a bad idea for such
-  attractively-named global "constants".)
+  attractively named global "constants".)
 
 * Renamed module :mod:`__builtin__` to :mod:`builtins` (removing the
   underscores, adding an 's').  The :data:`__builtins__` variable
diff --git a/Doc/whatsnew/3.11.rst b/Doc/whatsnew/3.11.rst
index d9a5efa34b414..95991528444c7 100644
--- a/Doc/whatsnew/3.11.rst
+++ b/Doc/whatsnew/3.11.rst
@@ -75,7 +75,7 @@ New syntax features:
 New typing features:
 
 * :pep:`646`: Variadic generics.
-* :pep:`655`: Marking individual TypedDict items as required or potentially-missing.
+* :pep:`655`: Marking individual TypedDict items as required or potentially missing.
 * :pep:`673`: ``Self`` type.
 * :pep:`675`: Arbitrary literal string type.
 
diff --git a/Doc/whatsnew/3.3.rst b/Doc/whatsnew/3.3.rst
index 361e6db07c3cd..0f989464c9c81 100644
--- a/Doc/whatsnew/3.3.rst
+++ b/Doc/whatsnew/3.3.rst
@@ -101,7 +101,7 @@ PEP 405: Virtual Environments
 
 Virtual environments help create separate Python setups while sharing a
 system-wide base install, for ease of maintenance.  Virtual environments
-have their own set of private site packages (i.e. locally-installed
+have their own set of private site packages (i.e. locally installed
 libraries), and are optionally segregated from the system-wide site
 packages.  Their concept and implementation are inspired by the popular
 ``virtualenv`` third-party package, but benefit from tighter integration
@@ -898,7 +898,7 @@ an IP address associated with a specific IP subnet).
 lzma
 ----
 
-The newly-added :mod:`lzma` module provides data compression and decompression
+The newly added :mod:`lzma` module provides data compression and decompression
 using the LZMA algorithm, including support for the ``.xz`` and ``.lzma``
 file formats.
 
@@ -1096,7 +1096,7 @@ decimal
    C-module and libmpdec written by Stefan Krah.
 
 The new C version of the decimal module integrates the high speed libmpdec
-library for arbitrary precision correctly-rounded decimal floating point
+library for arbitrary precision correctly rounded decimal floating point
 arithmetic. libmpdec conforms to IBM's General Decimal Arithmetic Specification.
 
 Performance gains range from 10x for database applications to 100x for
@@ -1158,8 +1158,8 @@ API changes
   in order to obtain a rounded or inexact value.
 
 
-* The power function in decimal.py is always correctly-rounded. In the
-  C version, it is defined in terms of the correctly-rounded
+* The power function in decimal.py is always correctly rounded. In the
+  C version, it is defined in terms of the correctly rounded
   :meth:`~decimal.Decimal.exp` and :meth:`~decimal.Decimal.ln` functions,
   but the final result is only "almost always correctly rounded".
 
@@ -2137,7 +2137,7 @@ zlib
 ----
 
 New attribute :attr:`zlib.Decompress.eof` makes it possible to distinguish
-between a properly-formed compressed stream and an incomplete or truncated one.
+between a properly formed compressed stream and an incomplete or truncated one.
 (Contributed by Nadeem Vawda in :issue:`12646`.)
 
 New attribute :attr:`zlib.ZLIB_RUNTIME_VERSION` reports the version string of
diff --git a/Doc/whatsnew/3.4.rst b/Doc/whatsnew/3.4.rst
index 023736134b2ca..a09b60ffb331e 100644
--- a/Doc/whatsnew/3.4.rst
+++ b/Doc/whatsnew/3.4.rst
@@ -1659,7 +1659,7 @@ The :class:`~unittest.TestCase` class has a new method,
 :keyword:`with` block becomes a "sub-test".  This context manager allows a test
 method to dynamically generate subtests  by, say, calling the ``subTest``
 context manager inside a loop.  A single test method can thereby produce an
-indefinite number of separately-identified and separately-counted tests, all of
+indefinite number of separately identified and separately counted tests, all of
 which will run even if one or more of them fail.  For example::
 
     class NumbersTest(unittest.TestCase):
@@ -2056,7 +2056,7 @@ Significant Optimizations
   ``malloc`` in ``obmalloc``.  Artificial benchmarks show about a 3% memory
   savings.
 
-* :func:`os.urandom` now uses a lazily-opened persistent file descriptor
+* :func:`os.urandom` now uses a lazily opened persistent file descriptor
   so as to avoid using many file descriptors when run in parallel from
   multiple threads.  (Contributed by Antoine Pitrou in :issue:`18756`.)
 
diff --git a/Doc/whatsnew/3.7.rst b/Doc/whatsnew/3.7.rst
index b2078f5a82e28..68901fa27eccf 100644
--- a/Doc/whatsnew/3.7.rst
+++ b/Doc/whatsnew/3.7.rst
@@ -291,7 +291,7 @@ PEP 539: New C API for Thread-Local Storage
 While Python provides a C API for thread-local storage support; the existing
 :ref:`Thread Local Storage (TLS) API <thread-local-storage-api>` has used
 :c:type:`int` to represent TLS keys across all platforms.  This has not
-generally been a problem for officially-support platforms, but that is neither
+generally been a problem for officially support platforms, but that is neither
 POSIX-compliant, nor portable in any practical sense.
 
 :pep:`539` changes this by providing a new :ref:`Thread Specific Storage (TSS)
@@ -1175,7 +1175,7 @@ of :func:`os.writev` and :func:`os.pwrite`). (Contributed by Pablo Galindo in
 :issue:`31368`.)
 
 The mode argument of :func:`os.makedirs` no longer affects the file
-permission bits of newly-created intermediate-level directories.
+permission bits of newly created intermediate-level directories.
 (Contributed by Serhiy Storchaka in :issue:`19930`.)
 
 :func:`os.dup2` now returns the new file descriptor.  Previously, ``None``
@@ -2296,7 +2296,7 @@ Changes in the Python API
   (Contributed by Serhiy Storchaka in :issue:`29192`.)
 
 * The *mode* argument of :func:`os.makedirs` no longer affects the file
-  permission bits of newly-created intermediate-level directories.
+  permission bits of newly created intermediate-level directories.
   To set their file permission bits you can set the umask before invoking
   ``makedirs()``.
   (Contributed by Serhiy Storchaka in :issue:`19930`.)
diff --git a/Misc/NEWS.d/3.10.0a3.rst b/Misc/NEWS.d/3.10.0a3.rst
index 4f182e8e3f1f0..699a0dd9e8d7c 100644
--- a/Misc/NEWS.d/3.10.0a3.rst
+++ b/Misc/NEWS.d/3.10.0a3.rst
@@ -763,7 +763,7 @@ as a positional-only argument.
 .. nonce: qLkNh8
 .. section: Library
 
-Enum: fix regression involving inheriting a multiply-inherited enum
+Enum: fix regression involving inheriting a multiply inherited enum
 
 ..
 
diff --git a/Misc/NEWS.d/3.10.0a4.rst b/Misc/NEWS.d/3.10.0a4.rst
index beac530fcb28f..95f9319668db4 100644
--- a/Misc/NEWS.d/3.10.0a4.rst
+++ b/Misc/NEWS.d/3.10.0a4.rst
@@ -446,7 +446,7 @@ In ``importlib.metadata``: -  ``EntryPoint`` objects now expose a ``.dist``
 object referencing the ``Distribution`` when constructed from a
 ``Distribution``. - Add support for package discovery under package
 normalization rules. - The object returned by ``metadata()`` now has a
-formally-defined protocol called ``PackageMetadata`` with declared support
+formally defined protocol called ``PackageMetadata`` with declared support
 for the ``.get_all()`` method. - Synced with importlib_metadata 3.3.
 
 ..
diff --git a/Misc/NEWS.d/3.11.0a4.rst b/Misc/NEWS.d/3.11.0a4.rst
index 2391f43e2b7fa..bcb6e8b7bdde3 100644
--- a/Misc/NEWS.d/3.11.0a4.rst
+++ b/Misc/NEWS.d/3.11.0a4.rst
@@ -694,7 +694,7 @@ removed in the future.
 .. section: Library
 
 :mod:`argparse` raises :exc:`ValueError` with clear message when trying to
-render usage for an empty mutually-exclusive group. Previously it raised a
+render usage for an empty mutually exclusive group. Previously it raised a
 cryptic :exc:`IndexError`.
 
 ..
diff --git a/Misc/NEWS.d/3.11.0b1.rst b/Misc/NEWS.d/3.11.0b1.rst
index c135eff4598e4..d8c2ec0a79971 100644
--- a/Misc/NEWS.d/3.11.0b1.rst
+++ b/Misc/NEWS.d/3.11.0b1.rst
@@ -109,7 +109,7 @@ methods are called only on objects of the correct type.
 .. nonce: 2PpaIN
 .. section: Core and Builtins
 
-Deoptimize statically-allocated code objects during ``Py_FINALIZE()`` so
+Deoptimize statically allocated code objects during ``Py_FINALIZE()`` so
 that future ``_PyCode_Quicken`` calls always start with unquickened code.
 
 ..
diff --git a/Misc/NEWS.d/3.7.0a1.rst b/Misc/NEWS.d/3.7.0a1.rst
index 244bb37e7c61d..e99c45ec7fdaa 100644
--- a/Misc/NEWS.d/3.7.0a1.rst
+++ b/Misc/NEWS.d/3.7.0a1.rst
@@ -3149,7 +3149,7 @@ they are finished in multiprocessing.Pool.
 .. section: Library
 
 The mode argument of os.makedirs() no longer affects the file permission
-bits of newly-created intermediate-level directories.
+bits of newly created intermediate-level directories.
 
 ..
 
diff --git a/Misc/NEWS.d/3.8.0a1.rst b/Misc/NEWS.d/3.8.0a1.rst
index 09b858d250c33..d95055a59da32 100644
--- a/Misc/NEWS.d/3.8.0a1.rst
+++ b/Misc/NEWS.d/3.8.0a1.rst
@@ -361,7 +361,7 @@ the "n" formatter.
 .. nonce: gjm1LO
 .. section: Core and Builtins
 
-Fix a possible segfault involving a newly-created coroutine.  Patch by
+Fix a possible segfault involving a newly created coroutine.  Patch by
 Zackery Spytz.
 
 ..
diff --git a/Misc/NEWS.d/3.8.0a2.rst b/Misc/NEWS.d/3.8.0a2.rst
index 1c0abab4c474a..223126145c77f 100644
--- a/Misc/NEWS.d/3.8.0a2.rst
+++ b/Misc/NEWS.d/3.8.0a2.rst
@@ -356,7 +356,7 @@ Add *headers* optional keyword-only parameter to
 .. section: Library
 
 Fix C implementation of pickle.loads to use importlib's locking mechanisms,
-and thereby avoid using partially-loaded modules. Patch by Tim Burgess.
+and thereby avoid using partially loaded modules. Patch by Tim Burgess.
 
 ..
 


From webhook-mailer at python.org  Tue Jul  5 06:12:15 2022
From: webhook-mailer at python.org (vstinner)
Date: Tue, 05 Jul 2022 10:12:15 -0000
Subject: [Python-checkins] gh-94379: Remove zipimport find_loader() and
 find_module() methods (#94380)
Message-ID: <mailman.2080.1657015935.20746.python-checkins@python.org>

https://github.com/python/cpython/commit/92bcb26d000c5890127a87ade2bd813cf1218704
commit: 92bcb26d000c5890127a87ade2bd813cf1218704
branch: main
author: Victor Stinner <vstinner at python.org>
committer: vstinner <vstinner at python.org>
date: 2022-07-05T12:11:42+02:00
summary:

gh-94379: Remove zipimport find_loader() and find_module() methods (#94380)

zipimport: Remove find_loader() and find_module() methods, deprecated
in Python 3.10: use the find_spec() method instead. See PEP 451 for
the rationale.

files:
A Misc/NEWS.d/next/Library/2022-06-28-14-29-21.gh-issue-94379.RrgKfh.rst
M Doc/whatsnew/3.12.rst
M Lib/test/test_zipimport.py
M Lib/zipimport.py

diff --git a/Doc/whatsnew/3.12.rst b/Doc/whatsnew/3.12.rst
index 43239a75f701a..a095baa5eace2 100644
--- a/Doc/whatsnew/3.12.rst
+++ b/Doc/whatsnew/3.12.rst
@@ -299,6 +299,11 @@ Removed
   has no ``copy()`` method, only a ``__copy__()`` method.
   (Contributed by Victor Stinner in :gh:`94383`.)
 
+* :mod:`zipimport`: Remove ``find_loader()`` and ``find_module()`` methods,
+  deprecated in Python 3.10: use the ``find_spec()`` method instead.  See
+  :pep:`451` for the rationale.
+  (Contributed by Victor Stinner in :gh:`94379`.)
+
 
 Porting to Python 3.12
 ======================
diff --git a/Lib/test/test_zipimport.py b/Lib/test/test_zipimport.py
index 84995be329568..fd2739dd89ac0 100644
--- a/Lib/test/test_zipimport.py
+++ b/Lib/test/test_zipimport.py
@@ -460,12 +460,6 @@ def testZipImporterMethods(self):
         # PEP 302
         with warnings.catch_warnings():
             warnings.simplefilter("ignore", DeprecationWarning)
-            find_mod = zi.find_module('spam')
-            self.assertIsNotNone(find_mod)
-            self.assertIsInstance(find_mod, zipimport.zipimporter)
-            self.assertFalse(find_mod.is_package('spam'))
-            load_mod = find_mod.load_module('spam')
-            self.assertEqual(find_mod.get_filename('spam'), load_mod.__file__)
 
             mod = zi.load_module(TESTPACK)
             self.assertEqual(zi.get_filename(TESTPACK), mod.__file__)
@@ -586,16 +580,6 @@ def testZipImporterMethodsInSubDirectory(self):
 
         pkg_path = TEMP_ZIP + os.sep + packdir + TESTPACK2
         zi2 = zipimport.zipimporter(pkg_path)
-        # PEP 302
-        with warnings.catch_warnings():
-            warnings.simplefilter("ignore", DeprecationWarning)
-            find_mod_dotted = zi2.find_module(TESTMOD)
-            self.assertIsNotNone(find_mod_dotted)
-            self.assertIsInstance(find_mod_dotted, zipimport.zipimporter)
-            self.assertFalse(zi2.is_package(TESTMOD))
-            load_mod = find_mod_dotted.load_module(TESTMOD)
-            self.assertEqual(
-                find_mod_dotted.get_filename(TESTMOD), load_mod.__file__)
 
         # PEP 451
         spec = zi2.find_spec(TESTMOD)
diff --git a/Lib/zipimport.py b/Lib/zipimport.py
index 25eaee9c0f291..d0394107c2c5f 100644
--- a/Lib/zipimport.py
+++ b/Lib/zipimport.py
@@ -102,64 +102,6 @@ def __init__(self, path):
             self.prefix += path_sep
 
 
-    # Check whether we can satisfy the import of the module named by
-    # 'fullname', or whether it could be a portion of a namespace
-    # package. Return self if we can load it, a string containing the
-    # full path if it's a possible namespace portion, None if we
-    # can't load it.
-    def find_loader(self, fullname, path=None):
-        """find_loader(fullname, path=None) -> self, str or None.
-
-        Search for a module specified by 'fullname'. 'fullname' must be the
-        fully qualified (dotted) module name. It returns the zipimporter
-        instance itself if the module was found, a string containing the
-        full path name if it's possibly a portion of a namespace package,
-        or None otherwise. The optional 'path' argument is ignored -- it's
-        there for compatibility with the importer protocol.
-
-        Deprecated since Python 3.10. Use find_spec() instead.
-        """
-        _warnings.warn("zipimporter.find_loader() is deprecated and slated for "
-                       "removal in Python 3.12; use find_spec() instead",
-                       DeprecationWarning)
-        mi = _get_module_info(self, fullname)
-        if mi is not None:
-            # This is a module or package.
-            return self, []
-
-        # Not a module or regular package. See if this is a directory, and
-        # therefore possibly a portion of a namespace package.
-
-        # We're only interested in the last path component of fullname
-        # earlier components are recorded in self.prefix.
-        modpath = _get_module_path(self, fullname)
-        if _is_dir(self, modpath):
-            # This is possibly a portion of a namespace
-            # package. Return the string representing its path,
-            # without a trailing separator.
-            return None, [f'{self.archive}{path_sep}{modpath}']
-
-        return None, []
-
-
-    # Check whether we can satisfy the import of the module named by
-    # 'fullname'. Return self if we can, None if we can't.
-    def find_module(self, fullname, path=None):
-        """find_module(fullname, path=None) -> self or None.
-
-        Search for a module specified by 'fullname'. 'fullname' must be the
-        fully qualified (dotted) module name. It returns the zipimporter
-        instance itself if the module was found, or None if it wasn't.
-        The optional 'path' argument is ignored -- it's there for compatibility
-        with the importer protocol.
-
-        Deprecated since Python 3.10. Use find_spec() instead.
-        """
-        _warnings.warn("zipimporter.find_module() is deprecated and slated for "
-                       "removal in Python 3.12; use find_spec() instead",
-                       DeprecationWarning)
-        return self.find_loader(fullname, path)[0]
-
     def find_spec(self, fullname, target=None):
         """Create a ModuleSpec for the specified module.
 
diff --git a/Misc/NEWS.d/next/Library/2022-06-28-14-29-21.gh-issue-94379.RrgKfh.rst b/Misc/NEWS.d/next/Library/2022-06-28-14-29-21.gh-issue-94379.RrgKfh.rst
new file mode 100644
index 0000000000000..24eafa1048ab4
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2022-06-28-14-29-21.gh-issue-94379.RrgKfh.rst
@@ -0,0 +1,3 @@
+:mod:`zipimport`: Remove ``find_loader()`` and ``find_module()`` methods,
+deprecated in Python 3.10: use the ``find_spec()`` method instead. See
+:pep:`451` for the rationale. Patch by Victor Stinner.


From webhook-mailer at python.org  Tue Jul  5 08:14:55 2022
From: webhook-mailer at python.org (pablogsal)
Date: Tue, 05 Jul 2022 12:14:55 -0000
Subject: [Python-checkins] gh-84753: Clarify change made to `inspect`
 functions (#94554)
Message-ID: <mailman.2081.1657023296.20746.python-checkins@python.org>

https://github.com/python/cpython/commit/a2a3f2c541290fc8f0720d1abdc12d564b856c28
commit: a2a3f2c541290fc8f0720d1abdc12d564b856c28
branch: main
author: ?ukasz Langa <lukasz at langa.pl>
committer: pablogsal <Pablogsal at gmail.com>
date: 2022-07-05T13:14:19+01:00
summary:

gh-84753: Clarify change made to `inspect` functions (#94554)

files:
M Misc/NEWS.d/next/Library/2022-06-21-11-40-31.gh-issue-84753.FW1pxO.rst

diff --git a/Misc/NEWS.d/next/Library/2022-06-21-11-40-31.gh-issue-84753.FW1pxO.rst b/Misc/NEWS.d/next/Library/2022-06-21-11-40-31.gh-issue-84753.FW1pxO.rst
index f701d2a1afeb8..eeae2edf7161a 100644
--- a/Misc/NEWS.d/next/Library/2022-06-21-11-40-31.gh-issue-84753.FW1pxO.rst
+++ b/Misc/NEWS.d/next/Library/2022-06-21-11-40-31.gh-issue-84753.FW1pxO.rst
@@ -1,3 +1,7 @@
-:func:`inspect.iscoroutinefunction` now properly returns ``True`` when an instance
-of :class:`unittest.mock.AsyncMock` is passed to it.  This makes it consistent with
+:func:`inspect.iscoroutinefunction`, :func:`inspect.isgeneratorfunction`,
+and :func:`inspect.isasyncgenfunction` now properly return ``True`` for
+duck-typed function-like objects like instances of
+:class:`unittest.mock.AsyncMock`.
+
+This makes :func:`inspect.iscoroutinefunction` consistent with the
 behavior of :func:`asyncio.iscoroutinefunction`.  Patch by Mehdi ABAAKOUK.


From webhook-mailer at python.org  Tue Jul  5 08:24:31 2022
From: webhook-mailer at python.org (ambv)
Date: Tue, 05 Jul 2022 12:24:31 -0000
Subject: [Python-checkins] gh-84753: Clarify change made to `inspect`
 functions (GH-94554) (GH-94559)
Message-ID: <mailman.2082.1657023873.20746.python-checkins@python.org>

https://github.com/python/cpython/commit/3472f3b6e50683a76a6a5ae745b14f4588e632aa
commit: 3472f3b6e50683a76a6a5ae745b14f4588e632aa
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: ambv <lukasz at langa.pl>
date: 2022-07-05T14:24:25+02:00
summary:

gh-84753: Clarify change made to `inspect` functions (GH-94554) (GH-94559)

(cherry picked from commit a2a3f2c541290fc8f0720d1abdc12d564b856c28)

Co-authored-by: ?ukasz Langa <lukasz at langa.pl>

files:
M Misc/NEWS.d/next/Library/2022-06-21-11-40-31.gh-issue-84753.FW1pxO.rst

diff --git a/Misc/NEWS.d/next/Library/2022-06-21-11-40-31.gh-issue-84753.FW1pxO.rst b/Misc/NEWS.d/next/Library/2022-06-21-11-40-31.gh-issue-84753.FW1pxO.rst
index f701d2a1afeb8..eeae2edf7161a 100644
--- a/Misc/NEWS.d/next/Library/2022-06-21-11-40-31.gh-issue-84753.FW1pxO.rst
+++ b/Misc/NEWS.d/next/Library/2022-06-21-11-40-31.gh-issue-84753.FW1pxO.rst
@@ -1,3 +1,7 @@
-:func:`inspect.iscoroutinefunction` now properly returns ``True`` when an instance
-of :class:`unittest.mock.AsyncMock` is passed to it.  This makes it consistent with
+:func:`inspect.iscoroutinefunction`, :func:`inspect.isgeneratorfunction`,
+and :func:`inspect.isasyncgenfunction` now properly return ``True`` for
+duck-typed function-like objects like instances of
+:class:`unittest.mock.AsyncMock`.
+
+This makes :func:`inspect.iscoroutinefunction` consistent with the
 behavior of :func:`asyncio.iscoroutinefunction`.  Patch by Mehdi ABAAKOUK.


From webhook-mailer at python.org  Tue Jul  5 08:30:41 2022
From: webhook-mailer at python.org (ambv)
Date: Tue, 05 Jul 2022 12:30:41 -0000
Subject: [Python-checkins] Docs: remove redundant "adverb-adjective" hyphens
 from compound modifiers (GH-94551) (GH-94557)
Message-ID: <mailman.2083.1657024241.20746.python-checkins@python.org>

https://github.com/python/cpython/commit/77bf9739305a0c9178ec94338c1289df0bdce738
commit: 77bf9739305a0c9178ec94338c1289df0bdce738
branch: 3.11
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: ambv <lukasz at langa.pl>
date: 2022-07-05T14:30:19+02:00
summary:

Docs: remove redundant "adverb-adjective" hyphens from compound modifiers (GH-94551) (GH-94557)

Discussion: https://discuss.python.org/t/slight-grammar-fix-throughout-adverbs-dont-need-hyphen/17021
(cherry picked from commit 3440d197a55800ecceea3e115e44b4262411359c)

Co-authored-by: Ned Batchelder <ned at nedbatchelder.com>

files:
M Doc/c-api/allocation.rst
M Doc/c-api/intro.rst
M Doc/c-api/memory.rst
M Doc/c-api/typeobj.rst
M Doc/c-api/weakref.rst
M Doc/distutils/apiref.rst
M Doc/extending/building.rst
M Doc/extending/newtypes.rst
M Doc/faq/design.rst
M Doc/faq/programming.rst
M Doc/glossary.rst
M Doc/howto/clinic.rst
M Doc/howto/functional.rst
M Doc/howto/instrumentation.rst
M Doc/howto/logging.rst
M Doc/howto/regex.rst
M Doc/howto/urllib2.rst
M Doc/install/index.rst
M Doc/library/asynchat.rst
M Doc/library/custominterp.rst
M Doc/library/decimal.rst
M Doc/library/doctest.rst
M Doc/library/glob.rst
M Doc/library/hmac.rst
M Doc/library/importlib.rst
M Doc/library/inspect.rst
M Doc/library/mailbox.rst
M Doc/library/optparse.rst
M Doc/library/os.rst
M Doc/library/secrets.rst
M Doc/library/select.rst
M Doc/library/shutil.rst
M Doc/library/smtpd.rst
M Doc/library/socket.rst
M Doc/library/sqlite3.rst
M Doc/library/struct.rst
M Doc/library/subprocess.rst
M Doc/library/tarfile.rst
M Doc/library/tkinter.ttk.rst
M Doc/library/typing.rst
M Doc/library/urllib.request.rst
M Doc/library/uuid.rst
M Doc/library/warnings.rst
M Doc/library/wsgiref.rst
M Doc/library/xml.rst
M Doc/library/xmlrpc.client.rst
M Doc/library/zlib.rst
M Doc/reference/datamodel.rst
M Doc/reference/import.rst
M Doc/reference/lexical_analysis.rst
M Doc/tutorial/classes.rst
M Doc/tutorial/inputoutput.rst
M Doc/using/cmdline.rst
M Doc/whatsnew/2.0.rst
M Doc/whatsnew/2.3.rst
M Doc/whatsnew/2.4.rst
M Doc/whatsnew/2.5.rst
M Doc/whatsnew/2.6.rst
M Doc/whatsnew/2.7.rst
M Doc/whatsnew/3.0.rst
M Doc/whatsnew/3.11.rst
M Doc/whatsnew/3.3.rst
M Doc/whatsnew/3.4.rst
M Doc/whatsnew/3.7.rst
M Misc/NEWS.d/3.10.0a3.rst
M Misc/NEWS.d/3.10.0a4.rst
M Misc/NEWS.d/3.11.0a4.rst
M Misc/NEWS.d/3.11.0b1.rst
M Misc/NEWS.d/3.7.0a1.rst
M Misc/NEWS.d/3.8.0a1.rst
M Misc/NEWS.d/3.8.0a2.rst

diff --git a/Doc/c-api/allocation.rst b/Doc/c-api/allocation.rst
index 33b0c06a9ebc2..0a8fcc5ae5fcd 100644
--- a/Doc/c-api/allocation.rst
+++ b/Doc/c-api/allocation.rst
@@ -14,7 +14,7 @@ Allocating Objects on the Heap
 
 .. c:function:: PyObject* PyObject_Init(PyObject *op, PyTypeObject *type)
 
-   Initialize a newly-allocated object *op* with its type and initial
+   Initialize a newly allocated object *op* with its type and initial
    reference.  Returns the initialized object.  If *type* indicates that the
    object participates in the cyclic garbage detector, it is added to the
    detector's set of observed objects. Other fields of the object are not
diff --git a/Doc/c-api/intro.rst b/Doc/c-api/intro.rst
index e53c826c58d13..d9fcd0de1fec6 100644
--- a/Doc/c-api/intro.rst
+++ b/Doc/c-api/intro.rst
@@ -779,7 +779,7 @@ A full list of the various types of debugging builds is in the file
 :file:`Misc/SpecialBuilds.txt` in the Python source distribution. Builds are
 available that support tracing of reference counts, debugging the memory
 allocator, or low-level profiling of the main interpreter loop.  Only the most
-frequently-used builds will be described in the remainder of this section.
+frequently used builds will be described in the remainder of this section.
 
 Compiling the interpreter with the :c:macro:`Py_DEBUG` macro defined produces
 what is generally meant by :ref:`a debug build of Python <debug-build>`.
diff --git a/Doc/c-api/memory.rst b/Doc/c-api/memory.rst
index 987dea40dd674..335ea00cff7cb 100644
--- a/Doc/c-api/memory.rst
+++ b/Doc/c-api/memory.rst
@@ -75,7 +75,7 @@ memory manager. For example, this is required when the interpreter is extended
 with new object types written in C. Another reason for using the Python heap is
 the desire to *inform* the Python memory manager about the memory needs of the
 extension module. Even when the requested memory is used exclusively for
-internal, highly-specific purposes, delegating all memory requests to the Python
+internal, highly specific purposes, delegating all memory requests to the Python
 memory manager causes the interpreter to have a more accurate image of its
 memory footprint as a whole. Consequently, under certain circumstances, the
 Python memory manager may or may not trigger appropriate actions, like garbage
diff --git a/Doc/c-api/typeobj.rst b/Doc/c-api/typeobj.rst
index 11221f92d25f5..e6df34e7db955 100644
--- a/Doc/c-api/typeobj.rst
+++ b/Doc/c-api/typeobj.rst
@@ -529,7 +529,7 @@ type objects) *must* have the :attr:`ob_size` field.
    ``PyObject_HEAD_INIT`` macro.  For :ref:`statically allocated objects
    <static-types>`, these fields always remain ``NULL``.  For :ref:`dynamically
    allocated objects <heap-types>`, these two fields are used to link the
-   object into a doubly-linked list of *all* live objects on the heap.
+   object into a doubly linked list of *all* live objects on the heap.
 
    This could be used for various debugging purposes; currently the only uses
    are the :func:`sys.getobjects` function and to print the objects that are
diff --git a/Doc/c-api/weakref.rst b/Doc/c-api/weakref.rst
index 7b32e17a23972..ace743ba01c5f 100644
--- a/Doc/c-api/weakref.rst
+++ b/Doc/c-api/weakref.rst
@@ -35,7 +35,7 @@ as much as it can.
    callable object that receives notification when *ob* is garbage collected; it
    should accept a single parameter, which will be the weak reference object
    itself. *callback* may also be ``None`` or ``NULL``.  If *ob* is not a
-   weakly-referencable object, or if *callback* is not callable, ``None``, or
+   weakly referencable object, or if *callback* is not callable, ``None``, or
    ``NULL``, this will return ``NULL`` and raise :exc:`TypeError`.
 
 
@@ -47,7 +47,7 @@ as much as it can.
    be a callable object that receives notification when *ob* is garbage
    collected; it should accept a single parameter, which will be the weak
    reference object itself. *callback* may also be ``None`` or ``NULL``.  If *ob*
-   is not a weakly-referencable object, or if *callback* is not callable,
+   is not a weakly referencable object, or if *callback* is not callable,
    ``None``, or ``NULL``, this will return ``NULL`` and raise :exc:`TypeError`.
 
 
diff --git a/Doc/distutils/apiref.rst b/Doc/distutils/apiref.rst
index 74c48142d6d7f..87c928555554a 100644
--- a/Doc/distutils/apiref.rst
+++ b/Doc/distutils/apiref.rst
@@ -1198,7 +1198,7 @@ other utility module.
    it contains certain values: see :func:`check_environ`.  Raise :exc:`ValueError`
    for any variables not found in either *local_vars* or ``os.environ``.
 
-   Note that this is not a fully-fledged string interpolation function. A valid
+   Note that this is not a full-fledged string interpolation function. A valid
    ``$variable`` can consist only of upper and lower case letters, numbers and an
    underscore. No { } or ( ) style quoting is available.
 
diff --git a/Doc/extending/building.rst b/Doc/extending/building.rst
index 69dffbd56abf1..53817074ab1ee 100644
--- a/Doc/extending/building.rst
+++ b/Doc/extending/building.rst
@@ -17,7 +17,7 @@ The initialization function has the signature:
 
 .. c:function:: PyObject* PyInit_modulename(void)
 
-It returns either a fully-initialized module, or a :c:type:`PyModuleDef`
+It returns either a fully initialized module, or a :c:type:`PyModuleDef`
 instance. See :ref:`initializing-modules` for details.
 
 .. highlight:: python
diff --git a/Doc/extending/newtypes.rst b/Doc/extending/newtypes.rst
index f75bee9e6f2a2..c7c434e58bf04 100644
--- a/Doc/extending/newtypes.rst
+++ b/Doc/extending/newtypes.rst
@@ -175,7 +175,7 @@ example::
    }
 
 If no :c:member:`~PyTypeObject.tp_repr` handler is specified, the interpreter will supply a
-representation that uses the type's :c:member:`~PyTypeObject.tp_name` and a uniquely-identifying
+representation that uses the type's :c:member:`~PyTypeObject.tp_name` and a uniquely identifying
 value for the object.
 
 The :c:member:`~PyTypeObject.tp_str` handler is to :func:`str` what the :c:member:`~PyTypeObject.tp_repr` handler
@@ -589,7 +589,7 @@ with the required field::
        PyObject *weakreflist;  /* List of weak references */
    } TrivialObject;
 
-And the corresponding member in the statically-declared type object::
+And the corresponding member in the statically declared type object::
 
    static PyTypeObject TrivialType = {
        PyVarObject_HEAD_INIT(NULL, 0)
diff --git a/Doc/faq/design.rst b/Doc/faq/design.rst
index a624fdb07a17d..794b69795bac2 100644
--- a/Doc/faq/design.rst
+++ b/Doc/faq/design.rst
@@ -313,7 +313,7 @@ you're too lazy to define a function.
 
 Functions are already first class objects in Python, and can be declared in a
 local scope.  Therefore the only advantage of using a lambda instead of a
-locally-defined function is that you don't need to invent a name for the
+locally defined function is that you don't need to invent a name for the
 function -- but that's just a local variable to which the function object (which
 is exactly the same type of object that a lambda expression yields) is assigned!
 
diff --git a/Doc/faq/programming.rst b/Doc/faq/programming.rst
index 5207add7783d3..4aea1277f9e79 100644
--- a/Doc/faq/programming.rst
+++ b/Doc/faq/programming.rst
@@ -294,7 +294,7 @@ It's good practice if you import modules in the following order:
 1. standard library modules -- e.g. ``sys``, ``os``, ``getopt``, ``re``
 2. third-party library modules (anything installed in Python's site-packages
    directory) -- e.g. mx.DateTime, ZODB, PIL.Image, etc.
-3. locally-developed modules
+3. locally developed modules
 
 It is sometimes necessary to move imports to a function or class to avoid
 problems with circular imports.  Gordon McMillan says:
@@ -771,7 +771,7 @@ What does the slash(/) in the parameter list of a function mean?
 
 A slash in the argument list of a function denotes that the parameters prior to
 it are positional-only.  Positional-only parameters are the ones without an
-externally-usable name.  Upon calling a function that accepts positional-only
+externally usable name.  Upon calling a function that accepts positional-only
 parameters, arguments are mapped to parameters based solely on their position.
 For example, :func:`divmod` is a function that accepts positional-only
 parameters. Its documentation looks like this::
diff --git a/Doc/glossary.rst b/Doc/glossary.rst
index 27e06c9ffcf4e..7950ec4e206e4 100644
--- a/Doc/glossary.rst
+++ b/Doc/glossary.rst
@@ -532,7 +532,7 @@ Glossary
       machines.
 
       However, some extension modules, either standard or third-party,
-      are designed so as to release the GIL when doing computationally-intensive
+      are designed so as to release the GIL when doing computationally intensive
       tasks such as compression or hashing.  Also, the GIL is always released
       when doing I/O.
 
diff --git a/Doc/howto/clinic.rst b/Doc/howto/clinic.rst
index 72fb3208c3752..e5ed32f69a8ef 100644
--- a/Doc/howto/clinic.rst
+++ b/Doc/howto/clinic.rst
@@ -541,7 +541,7 @@ Let's dive in!
 
 16. Compile, then run the relevant portions of the regression-test suite.
     This change should not introduce any new compile-time warnings or errors,
-    and there should be no externally-visible change to Python's behavior.
+    and there should be no externally visible change to Python's behavior.
 
     Well, except for one difference: ``inspect.signature()`` run on your function
     should now provide a valid signature!
@@ -1117,7 +1117,7 @@ Here's the syntax for cloning a function::
 ``module.class`` in the sample just to illustrate that you must
 use the full path to *both* functions.)
 
-Sorry, there's no syntax for partially-cloning a function, or cloning a function
+Sorry, there's no syntax for partially cloning a function, or cloning a function
 then modifying it.  Cloning is an all-or nothing proposition.
 
 Also, the function you are cloning from must have been previously defined
@@ -1315,7 +1315,7 @@ to specify in your subclass.  Here's the current list:
     there is no default, but not specifying a default may
     result in an "uninitialized variable" warning.  This can
     easily happen when using option groups?although
-    properly-written code will never actually use this value,
+    properly written code will never actually use this value,
     the variable does get passed in to the impl, and the
     C compiler will complain about the "use" of the
     uninitialized value.  This value should always be a
diff --git a/Doc/howto/functional.rst b/Doc/howto/functional.rst
index fb561a6a10b66..eb800152050d1 100644
--- a/Doc/howto/functional.rst
+++ b/Doc/howto/functional.rst
@@ -741,7 +741,7 @@ further because you risk skipping a discarded element.
 The itertools module
 ====================
 
-The :mod:`itertools` module contains a number of commonly-used iterators as well
+The :mod:`itertools` module contains a number of commonly used iterators as well
 as functions for combining several iterators.  This section will introduce the
 module's contents by showing small examples.
 
diff --git a/Doc/howto/instrumentation.rst b/Doc/howto/instrumentation.rst
index 4a59ae82f96e2..4ce15c69dac90 100644
--- a/Doc/howto/instrumentation.rst
+++ b/Doc/howto/instrumentation.rst
@@ -123,7 +123,7 @@ Sufficiently modern readelf can print the metadata::
             Arguments: 8@%rbp 8@%r12 -4@%eax
 
 The above metadata contains information for SystemTap describing how it
-can patch strategically-placed machine code instructions to enable the
+can patch strategically placed machine code instructions to enable the
 tracing hooks used by a SystemTap script.
 
 
@@ -410,7 +410,7 @@ needing to directly name the static markers:
 
 
 The following script uses the tapset above to provide a top-like view of all
-running CPython code, showing the top 20 most frequently-entered bytecode
+running CPython code, showing the top 20 most frequently entered bytecode
 frames, each second, across the whole system:
 
 .. code-block:: none
diff --git a/Doc/howto/logging.rst b/Doc/howto/logging.rst
index 93400627136e3..f98876a3352e4 100644
--- a/Doc/howto/logging.rst
+++ b/Doc/howto/logging.rst
@@ -124,7 +124,7 @@ Logging to a file
 ^^^^^^^^^^^^^^^^^
 
 A very common situation is that of recording logging events in a file, so let's
-look at that next. Be sure to try the following in a newly-started Python
+look at that next. Be sure to try the following in a newly started Python
 interpreter, and don't just continue from the session described above::
 
    import logging
diff --git a/Doc/howto/regex.rst b/Doc/howto/regex.rst
index c4eed8fb1fbe7..5cd6140f19ca2 100644
--- a/Doc/howto/regex.rst
+++ b/Doc/howto/regex.rst
@@ -949,7 +949,7 @@ Additionally, you can retrieve named groups as a dictionary with
    >>> m.groupdict()
    {'first': 'Jane', 'last': 'Doe'}
 
-Named groups are handy because they let you use easily-remembered names, instead
+Named groups are handy because they let you use easily remembered names, instead
 of having to remember numbers.  Here's an example RE from the :mod:`imaplib`
 module::
 
diff --git a/Doc/howto/urllib2.rst b/Doc/howto/urllib2.rst
index e77fefffbd257..e1a2f48f0b084 100644
--- a/Doc/howto/urllib2.rst
+++ b/Doc/howto/urllib2.rst
@@ -420,7 +420,7 @@ Openers and Handlers
 ====================
 
 When you fetch a URL you use an opener (an instance of the perhaps
-confusingly-named :class:`urllib.request.OpenerDirector`). Normally we have been using
+confusingly named :class:`urllib.request.OpenerDirector`). Normally we have been using
 the default opener - via ``urlopen`` - but you can create custom
 openers. Openers use handlers. All the "heavy lifting" is done by the
 handlers. Each handler knows how to open URLs for a particular URL scheme (http,
diff --git a/Doc/install/index.rst b/Doc/install/index.rst
index 7f7be11700988..63b64b95fc721 100644
--- a/Doc/install/index.rst
+++ b/Doc/install/index.rst
@@ -65,7 +65,7 @@ If you download a module source distribution, you can tell pretty quickly if it
 was packaged and distributed in the standard way, i.e. using the Distutils.
 First, the distribution's name and version number will be featured prominently
 in the name of the downloaded archive, e.g. :file:`foo-1.0.tar.gz` or
-:file:`widget-0.9.7.zip`.  Next, the archive will unpack into a similarly-named
+:file:`widget-0.9.7.zip`.  Next, the archive will unpack into a similarly named
 directory: :file:`foo-1.0` or :file:`widget-0.9.7`.  Additionally, the
 distribution will contain a setup script :file:`setup.py`, and a file named
 :file:`README.txt` or possibly just :file:`README`, which should explain that
diff --git a/Doc/library/asynchat.rst b/Doc/library/asynchat.rst
index 4eb6a79d4dfbf..777b7075b30de 100644
--- a/Doc/library/asynchat.rst
+++ b/Doc/library/asynchat.rst
@@ -125,7 +125,7 @@ connection requests.
 .. method:: async_chat.push_with_producer(producer)
 
    Takes a producer object and adds it to the producer queue associated with
-   the channel.  When all currently-pushed producers have been exhausted the
+   the channel.  When all currently pushed producers have been exhausted the
    channel will consume this producer's data by calling its :meth:`more`
    method and send the data to the remote endpoint.
 
diff --git a/Doc/library/custominterp.rst b/Doc/library/custominterp.rst
index 5eeced20a9a59..9ea9e901372ee 100644
--- a/Doc/library/custominterp.rst
+++ b/Doc/library/custominterp.rst
@@ -8,7 +8,7 @@ The modules described in this chapter allow writing interfaces similar to
 Python's interactive interpreter.  If you want a Python interpreter that
 supports some special feature in addition to the Python language, you should
 look at the :mod:`code` module.  (The :mod:`codeop` module is lower-level, used
-to support compiling a possibly-incomplete chunk of Python code.)
+to support compiling a possibly incomplete chunk of Python code.)
 
 The full list of modules described in this chapter is:
 
diff --git a/Doc/library/decimal.rst b/Doc/library/decimal.rst
index d052581c97012..e7d3950fd1438 100644
--- a/Doc/library/decimal.rst
+++ b/Doc/library/decimal.rst
@@ -30,7 +30,7 @@
 
 --------------
 
-The :mod:`decimal` module provides support for fast correctly-rounded
+The :mod:`decimal` module provides support for fast correctly rounded
 decimal floating point arithmetic. It offers several advantages over the
 :class:`float` datatype:
 
@@ -1371,16 +1371,16 @@ In addition to the three supplied contexts, new contexts can be created with the
       With two arguments, compute ``x**y``.  If ``x`` is negative then ``y``
       must be integral.  The result will be inexact unless ``y`` is integral and
       the result is finite and can be expressed exactly in 'precision' digits.
-      The rounding mode of the context is used. Results are always correctly-rounded
+      The rounding mode of the context is used. Results are always correctly rounded
       in the Python version.
 
       ``Decimal(0) ** Decimal(0)`` results in ``InvalidOperation``, and if ``InvalidOperation``
       is not trapped, then results in ``Decimal('NaN')``.
 
       .. versionchanged:: 3.3
-         The C module computes :meth:`power` in terms of the correctly-rounded
+         The C module computes :meth:`power` in terms of the correctly rounded
          :meth:`exp` and :meth:`ln` functions. The result is well-defined but
-         only "almost always correctly-rounded".
+         only "almost always correctly rounded".
 
       With three arguments, compute ``(x**y) % modulo``.  For the three argument
       form, the following restrictions on the arguments hold:
@@ -2151,7 +2151,7 @@ Q. Is the CPython implementation fast for large numbers?
 A. Yes.  In the CPython and PyPy3 implementations, the C/CFFI versions of
 the decimal module integrate the high speed `libmpdec
 <https://www.bytereef.org/mpdecimal/doc/libmpdec/index.html>`_ library for
-arbitrary precision correctly-rounded decimal floating point arithmetic [#]_.
+arbitrary precision correctly rounded decimal floating point arithmetic [#]_.
 ``libmpdec`` uses `Karatsuba multiplication
 <https://en.wikipedia.org/wiki/Karatsuba_algorithm>`_
 for medium-sized numbers and the `Number Theoretic Transform
diff --git a/Doc/library/doctest.rst b/Doc/library/doctest.rst
index 2d50a49c6415e..75c6ee289a91e 100644
--- a/Doc/library/doctest.rst
+++ b/Doc/library/doctest.rst
@@ -565,12 +565,12 @@ doctest decides whether actual output matches an example's expected output:
 
    When specified, doctests expecting exceptions pass so long as an exception
    of the expected type is raised, even if the details
-   (message and fully-qualified exception name) don't match.
+   (message and fully qualified exception name) don't match.
 
    For example, an example expecting ``ValueError: 42`` will pass if the actual
    exception raised is ``ValueError: 3*14``, but will fail if, say, a
    :exc:`TypeError` is raised instead.
-   It will also ignore any fully-qualified name included before the
+   It will also ignore any fully qualified name included before the
    exception class, which can vary between implementations and versions
    of Python and the code/libraries in use.
    Hence, all three of these variations will work with the flag specified:
diff --git a/Doc/library/glob.rst b/Doc/library/glob.rst
index 01ad67732cf2e..5af15c41a25c9 100644
--- a/Doc/library/glob.rst
+++ b/Doc/library/glob.rst
@@ -42,7 +42,7 @@ For example, ``'[?]'`` matches the character ``'?'``.
 .. function:: glob(pathname, *, root_dir=None, dir_fd=None, recursive=False, \
                    include_hidden=False)
 
-   Return a possibly-empty list of path names that match *pathname*, which must be
+   Return a possibly empty list of path names that match *pathname*, which must be
    a string containing a path specification. *pathname* can be either absolute
    (like :file:`/usr/src/Python-1.5/Makefile`) or relative (like
    :file:`../../Tools/\*/\*.gif`), and can contain shell-style wildcards. Broken
diff --git a/Doc/library/hmac.rst b/Doc/library/hmac.rst
index 6f1b59b57ce58..b2ca0455d3745 100644
--- a/Doc/library/hmac.rst
+++ b/Doc/library/hmac.rst
@@ -69,7 +69,7 @@ An HMAC object has the following methods:
 
    .. warning::
 
-      When comparing the output of :meth:`digest` to an externally-supplied
+      When comparing the output of :meth:`digest` to an externally supplied
       digest during a verification routine, it is recommended to use the
       :func:`compare_digest` function instead of the ``==`` operator
       to reduce the vulnerability to timing attacks.
@@ -83,7 +83,7 @@ An HMAC object has the following methods:
 
    .. warning::
 
-      When comparing the output of :meth:`hexdigest` to an externally-supplied
+      When comparing the output of :meth:`hexdigest` to an externally supplied
       digest during a verification routine, it is recommended to use the
       :func:`compare_digest` function instead of the ``==`` operator
       to reduce the vulnerability to timing attacks.
diff --git a/Doc/library/importlib.rst b/Doc/library/importlib.rst
index aac556e2c68d9..44bf703e93a84 100644
--- a/Doc/library/importlib.rst
+++ b/Doc/library/importlib.rst
@@ -450,7 +450,7 @@ ABC hierarchy::
         reloaded):
 
         - :attr:`__name__`
-            The module's fully-qualified name.
+            The module's fully qualified name.
             It is ``'__main__'`` for an executed module.
 
         - :attr:`__file__`
@@ -471,7 +471,7 @@ ABC hierarchy::
             as an indicator that the module is a package.
 
         - :attr:`__package__`
-            The fully-qualified name of the package the module is in (or the
+            The fully qualified name of the package the module is in (or the
             empty string for a top-level module).
             If the module is a package then this is the same as :attr:`__name__`.
 
@@ -899,7 +899,7 @@ find and load modules.
 
    (:attr:`__name__`)
 
-   The module's fully-qualified name.
+   The module's fully qualified name.
    The :term:`finder` should always set this attribute to a non-empty string.
 
    .. attribute:: loader
@@ -948,7 +948,7 @@ find and load modules.
 
    (:attr:`__package__`)
 
-   (Read-only) The fully-qualified name of the package the module is in (or the
+   (Read-only) The fully qualified name of the package the module is in (or the
    empty string for a top-level module).
    If the module is a package then this is the same as :attr:`name`.
 
diff --git a/Doc/library/inspect.rst b/Doc/library/inspect.rst
index 154d0f5dab0cd..700cd9122cd34 100644
--- a/Doc/library/inspect.rst
+++ b/Doc/library/inspect.rst
@@ -187,7 +187,7 @@ attributes:
 |           | co_name           | name with which this code |
 |           |                   | object was defined        |
 +-----------+-------------------+---------------------------+
-|           | co_qualname       | fully-qualified name with |
+|           | co_qualname       | fully qualified name with |
 |           |                   | which this code object    |
 |           |                   | was defined               |
 +-----------+-------------------+---------------------------+
@@ -1130,7 +1130,7 @@ Classes and functions
      doesn't have its own annotations dict, returns an empty dict.
    * All accesses to object members and dict values are done
      using ``getattr()`` and ``dict.get()`` for safety.
-   * Always, always, always returns a freshly-created dict.
+   * Always, always, always returns a freshly created dict.
 
    ``eval_str`` controls whether or not values of type ``str`` are replaced
    with the result of calling :func:`eval()` on those values:
diff --git a/Doc/library/mailbox.rst b/Doc/library/mailbox.rst
index 94d95d10290b0..d74fc8059fd53 100644
--- a/Doc/library/mailbox.rst
+++ b/Doc/library/mailbox.rst
@@ -1510,7 +1510,7 @@ The following exception classes are defined in the :mod:`mailbox` module:
 
    Raised when some mailbox-related condition beyond the control of the program
    causes it to be unable to proceed, such as when failing to acquire a lock that
-   another program already holds a lock, or when a uniquely-generated file name
+   another program already holds a lock, or when a uniquely generated file name
    already exists.
 
 
diff --git a/Doc/library/optparse.rst b/Doc/library/optparse.rst
index 0d686b10365a6..47e62553fb035 100644
--- a/Doc/library/optparse.rst
+++ b/Doc/library/optparse.rst
@@ -529,7 +529,7 @@ help message:
   line-wrapping---\ :mod:`optparse` takes care of wrapping lines and making
   the help output look good.
 
-* options that take a value indicate this fact in their automatically-generated
+* options that take a value indicate this fact in their automatically generated
   help message, e.g. for the "mode" option::
 
      -m MODE, --mode=MODE
@@ -539,7 +539,7 @@ help message:
   :mod:`optparse` converts the destination variable name to uppercase and uses
   that for the meta-variable.  Sometimes, that's not what you want---for
   example, the ``--filename`` option explicitly sets ``metavar="FILE"``,
-  resulting in this automatically-generated option description::
+  resulting in this automatically generated option description::
 
      -f FILE, --filename=FILE
 
@@ -1449,7 +1449,7 @@ intelligently and add conflicting options to it::
    parser.add_option("-n", "--dry-run", ..., help="do no harm")
    parser.add_option("-n", "--noisy", ..., help="be noisy")
 
-At this point, :mod:`optparse` detects that a previously-added option is already
+At this point, :mod:`optparse` detects that a previously added option is already
 using the ``-n`` option string.  Since ``conflict_handler`` is ``"resolve"``,
 it resolves the situation by removing ``-n`` from the earlier option's list of
 option strings.  Now ``--dry-run`` is the only way for the user to activate
@@ -1460,7 +1460,7 @@ that option.  If the user asks for help, the help message will reflect that::
      ...
      -n, --noisy   be noisy
 
-It's possible to whittle away the option strings for a previously-added option
+It's possible to whittle away the option strings for a previously added option
 until there are none left, and the user has no way of invoking that option from
 the command-line.  In that case, :mod:`optparse` removes that option completely,
 so it doesn't show up in help text or anywhere else. Carrying on with our
diff --git a/Doc/library/os.rst b/Doc/library/os.rst
index 9cd5dc8a15b10..43991a3252fe0 100644
--- a/Doc/library/os.rst
+++ b/Doc/library/os.rst
@@ -2107,7 +2107,7 @@ features:
 
    The *mode* parameter is passed to :func:`mkdir` for creating the leaf
    directory; see :ref:`the mkdir() description <mkdir_modebits>` for how it
-   is interpreted.  To set the file permission bits of any newly-created parent
+   is interpreted.  To set the file permission bits of any newly created parent
    directories you can set the umask before invoking :func:`makedirs`.  The
    file permission bits of existing parent directories are not changed.
 
@@ -2138,7 +2138,7 @@ features:
 
    .. versionchanged:: 3.7
       The *mode* argument no longer affects the file permission bits of
-      newly-created intermediate-level directories.
+      newly created intermediate-level directories.
 
 
 .. function:: mkfifo(path, mode=0o666, *, dir_fd=None)
diff --git a/Doc/library/secrets.rst b/Doc/library/secrets.rst
index eda4616da5ec9..86fa35fec59f6 100644
--- a/Doc/library/secrets.rst
+++ b/Doc/library/secrets.rst
@@ -44,7 +44,7 @@ randomness that your operating system provides.
 
 .. function:: choice(sequence)
 
-   Return a randomly-chosen element from a non-empty sequence.
+   Return a randomly chosen element from a non-empty sequence.
 
 .. function:: randbelow(n)
 
@@ -155,7 +155,7 @@ Generate an eight-character alphanumeric password:
    Applications should not
    `store passwords in a recoverable format <http://cwe.mitre.org/data/definitions/257.html>`_,
    whether plain text or encrypted.  They should be salted and hashed
-   using a cryptographically-strong one-way (irreversible) hash function.
+   using a cryptographically strong one-way (irreversible) hash function.
 
 
 Generate a ten-character alphanumeric password with at least one
diff --git a/Doc/library/select.rst b/Doc/library/select.rst
index 46b5ff8b6d586..1c3d10ef20935 100644
--- a/Doc/library/select.rst
+++ b/Doc/library/select.rst
@@ -252,7 +252,7 @@ object.
 
 .. method:: devpoll.poll([timeout])
 
-   Polls the set of registered file descriptors, and returns a possibly-empty list
+   Polls the set of registered file descriptors, and returns a possibly empty list
    containing ``(fd, event)`` 2-tuples for the descriptors that have events or
    errors to report. *fd* is the file descriptor, and *event* is a bitmask with
    bits set for the reported events for that descriptor --- :const:`POLLIN` for
@@ -440,7 +440,7 @@ linearly scanned again. :c:func:`select` is O(highest file descriptor), while
 
 .. method:: poll.poll([timeout])
 
-   Polls the set of registered file descriptors, and returns a possibly-empty list
+   Polls the set of registered file descriptors, and returns a possibly empty list
    containing ``(fd, event)`` 2-tuples for the descriptors that have events or
    errors to report. *fd* is the file descriptor, and *event* is a bitmask with
    bits set for the reported events for that descriptor --- :const:`POLLIN` for
diff --git a/Doc/library/shutil.rst b/Doc/library/shutil.rst
index e79caecf310f2..7d69c5ff266f3 100644
--- a/Doc/library/shutil.rst
+++ b/Doc/library/shutil.rst
@@ -194,7 +194,7 @@ Directory and files operations
 
    When *follow_symlinks* is false, and *src* is a symbolic
    link, :func:`copy2` attempts to copy all metadata from the
-   *src* symbolic link to the newly-created *dst* symbolic link.
+   *src* symbolic link to the newly created *dst* symbolic link.
    However, this functionality is not available on all platforms.
    On platforms where some or all of this functionality is
    unavailable, :func:`copy2` will preserve all the metadata
diff --git a/Doc/library/smtpd.rst b/Doc/library/smtpd.rst
index a0d1fb0aa5152..5a7e41c6d0983 100644
--- a/Doc/library/smtpd.rst
+++ b/Doc/library/smtpd.rst
@@ -228,7 +228,7 @@ SMTPChannel Objects
 
    .. attribute:: fqdn
 
-      Holds the fully-qualified domain name of the server as returned by
+      Holds the fully qualified domain name of the server as returned by
       :func:`socket.getfqdn`.
 
    .. attribute:: peer
diff --git a/Doc/library/socket.rst b/Doc/library/socket.rst
index e3a855cf4d4e4..f77279cd8812b 100644
--- a/Doc/library/socket.rst
+++ b/Doc/library/socket.rst
@@ -125,7 +125,7 @@ created.  Socket addresses are represented as follows:
 
 - A string or a tuple ``(id, unit)`` is used for the :const:`SYSPROTO_CONTROL`
   protocol of the :const:`PF_SYSTEM` family. The string is the name of a
-  kernel control using a dynamically-assigned ID. The tuple can be used if ID
+  kernel control using a dynamically assigned ID. The tuple can be used if ID
   and unit number of the kernel control are known or if a registered ID is
   used.
 
@@ -909,7 +909,7 @@ The :mod:`socket` module also offers various network-related services:
 .. function:: getnameinfo(sockaddr, flags)
 
    Translate a socket address *sockaddr* into a 2-tuple ``(host, port)``. Depending
-   on the settings of *flags*, the result can contain a fully-qualified domain name
+   on the settings of *flags*, the result can contain a fully qualified domain name
    or numeric address representation in *host*.  Similarly, *port* can contain a
    string port name or a numeric port number.
 
diff --git a/Doc/library/sqlite3.rst b/Doc/library/sqlite3.rst
index 2bdac761549bf..48549e06b3885 100644
--- a/Doc/library/sqlite3.rst
+++ b/Doc/library/sqlite3.rst
@@ -673,7 +673,7 @@ Connection Objects
 
       If returning a tuple doesn't suffice and you want name-based access to
       columns, you should consider setting :attr:`row_factory` to the
-      highly-optimized :class:`sqlite3.Row` type. :class:`Row` provides both
+      highly optimized :class:`sqlite3.Row` type. :class:`Row` provides both
       index-based and case-insensitive name-based access to columns with almost no
       memory overhead. It will probably be better than your own custom
       dictionary-based approach or even a db_row based solution.
diff --git a/Doc/library/struct.rst b/Doc/library/struct.rst
index 25e26201d7d43..c1888d4a94fe0 100644
--- a/Doc/library/struct.rst
+++ b/Doc/library/struct.rst
@@ -82,7 +82,7 @@ The module defines the following exception and functions:
 
    Iteratively unpack from the buffer *buffer* according to the format
    string *format*.  This function returns an iterator which will read
-   equally-sized chunks from the buffer until all its contents have been
+   equally sized chunks from the buffer until all its contents have been
    consumed.  The buffer's size in bytes must be a multiple of the size
    required by the format, as reflected by :func:`calcsize`.
 
diff --git a/Doc/library/subprocess.rst b/Doc/library/subprocess.rst
index 4031a5f62167f..0a996feb22cef 100644
--- a/Doc/library/subprocess.rst
+++ b/Doc/library/subprocess.rst
@@ -359,7 +359,7 @@ functions.
 
    .. warning::
 
-      For maximum reliability, use a fully-qualified path for the executable.
+      For maximum reliability, use a fully qualified path for the executable.
       To search for an unqualified name on :envvar:`PATH`, use
       :meth:`shutil.which`. On all platforms, passing :data:`sys.executable`
       is the recommended way to launch the current Python interpreter again,
@@ -1553,7 +1553,7 @@ On Linux, :mod:`subprocess` defaults to using the ``vfork()`` system call
 internally when it is safe to do so rather than ``fork()``. This greatly
 improves performance.
 
-If you ever encounter a presumed highly-unusual situation where you need to
+If you ever encounter a presumed highly unusual situation where you need to
 prevent ``vfork()`` from being used by Python, you can set the
 :attr:`subprocess._USE_VFORK` attribute to a false value.
 
diff --git a/Doc/library/tarfile.rst b/Doc/library/tarfile.rst
index f5c49b0ac4f73..6bfc9b5a9027c 100644
--- a/Doc/library/tarfile.rst
+++ b/Doc/library/tarfile.rst
@@ -836,7 +836,7 @@ There are three tar formats that can be created with the :mod:`tarfile` module:
   files and stores pathnames in a portable way. Modern tar implementations,
   including GNU tar, bsdtar/libarchive and star, fully support extended *pax*
   features; some old or unmaintained libraries may not, but should treat
-  *pax* archives as if they were in the universally-supported *ustar* format.
+  *pax* archives as if they were in the universally supported *ustar* format.
   It is the current default format for new archives.
 
   It extends the existing *ustar* format with extra headers for information
diff --git a/Doc/library/tkinter.ttk.rst b/Doc/library/tkinter.ttk.rst
index d50ea99aa46ee..b05799ef601eb 100644
--- a/Doc/library/tkinter.ttk.rst
+++ b/Doc/library/tkinter.ttk.rst
@@ -286,7 +286,7 @@ methods :meth:`tkinter.Widget.cget` and :meth:`tkinter.Widget.configure`.
       Modify or inquire widget state. If *statespec* is specified, sets the
       widget state according to it and return a new *statespec* indicating
       which flags were changed. If *statespec* is not specified, returns
-      the currently-enabled state flags.
+      the currently enabled state flags.
 
    *statespec* will usually be a list or a tuple.
 
@@ -465,7 +465,7 @@ Notebook
 
 Ttk Notebook widget manages a collection of windows and displays a single
 one at a time. Each child window is associated with a tab, which the user
-may select to change the currently-displayed window.
+may select to change the currently displayed window.
 
 
 Options
@@ -543,7 +543,7 @@ of the following forms:
 * An integer between zero and the number of tabs
 * The name of a child window
 * A positional specification of the form "@x,y", which identifies the tab
-* The literal string "current", which identifies the currently-selected tab
+* The literal string "current", which identifies the currently selected tab
 * The literal string "end", which returns the number of tabs (only valid for
   :meth:`Notebook.index`)
 
@@ -613,7 +613,7 @@ ttk.Notebook
       Selects the specified *tab_id*.
 
       The associated child window will be displayed, and the
-      previously-selected window (if different) is unmapped. If *tab_id* is
+      previously selected window (if different) is unmapped. If *tab_id* is
       omitted, returns the widget name of the currently selected pane.
 
 
diff --git a/Doc/library/typing.rst b/Doc/library/typing.rst
index ddcdc70939f19..fceb43aec9be3 100644
--- a/Doc/library/typing.rst
+++ b/Doc/library/typing.rst
@@ -78,7 +78,7 @@ annotations. These include:
      *Introducing* :data:`TypeVarTuple`
 * :pep:`647`: User-Defined Type Guards
      *Introducing* :data:`TypeGuard`
-* :pep:`655`: Marking individual TypedDict items as required or potentially-missing
+* :pep:`655`: Marking individual TypedDict items as required or potentially missing
      *Introducing* :data:`Required` and :data:`NotRequired`
 * :pep:`673`: Self type
     *Introducing* :data:`Self`
@@ -1034,7 +1034,7 @@ These can be used as types in annotations using ``[]``, each having a unique syn
    as either required or non-required respectively.
 
    For more information, see :class:`TypedDict` and
-   :pep:`655` ("Marking individual TypedDict items as required or potentially-missing").
+   :pep:`655` ("Marking individual TypedDict items as required or potentially missing").
 
    .. versionadded:: 3.11
 
diff --git a/Doc/library/urllib.request.rst b/Doc/library/urllib.request.rst
index 491ef022a1fad..542db1b5e2a39 100644
--- a/Doc/library/urllib.request.rst
+++ b/Doc/library/urllib.request.rst
@@ -1279,7 +1279,7 @@ involved.  For example, the :envvar:`http_proxy` environment variable is read to
 obtain the HTTP proxy's URL.
 
 This example replaces the default :class:`ProxyHandler` with one that uses
-programmatically-supplied proxy URLs, and adds proxy authorization support with
+programmatically supplied proxy URLs, and adds proxy authorization support with
 :class:`ProxyBasicAuthHandler`. ::
 
    proxy_handler = urllib.request.ProxyHandler({'http': 'http://www.example.com:3128/'})
diff --git a/Doc/library/uuid.rst b/Doc/library/uuid.rst
index ddfbbda279e35..a71fe7abf5b54 100644
--- a/Doc/library/uuid.rst
+++ b/Doc/library/uuid.rst
@@ -211,7 +211,7 @@ The :mod:`uuid` module defines the following namespace identifiers for use with
 
 .. data:: NAMESPACE_DNS
 
-   When this namespace is specified, the *name* string is a fully-qualified domain
+   When this namespace is specified, the *name* string is a fully qualified domain
    name.
 
 
diff --git a/Doc/library/warnings.rst b/Doc/library/warnings.rst
index 43708f8021ad2..28579ce8df4a6 100644
--- a/Doc/library/warnings.rst
+++ b/Doc/library/warnings.rst
@@ -163,9 +163,9 @@ the disposition of the match.  Each entry is a tuple of the form (*action*,
   category must be a subclass in order to match.
 
 * *module* is a string containing a regular expression that the start of the
-  fully-qualified module name must match, case-sensitively.  In :option:`-W` and
+  fully qualified module name must match, case-sensitively.  In :option:`-W` and
   :envvar:`PYTHONWARNINGS`, *module* is a literal string that the
-  fully-qualified module name must be equal to (case-sensitively), ignoring any
+  fully qualified module name must be equal to (case-sensitively), ignoring any
   whitespace at the start or end of *module*.
 
 * *lineno* is an integer that the line number where the warning occurred must
diff --git a/Doc/library/wsgiref.rst b/Doc/library/wsgiref.rst
index 6a2d47891b473..06223e667a450 100644
--- a/Doc/library/wsgiref.rst
+++ b/Doc/library/wsgiref.rst
@@ -333,7 +333,7 @@ request.  (E.g., using the :func:`shift_path_info` function from
 
    .. method:: WSGIServer.get_app()
 
-      Returns the currently-set application callable.
+      Returns the currently set application callable.
 
    Normally, however, you do not need to use these additional methods, as
    :meth:`set_app` is normally called by :func:`make_server`, and the
@@ -642,7 +642,7 @@ input, output, and error streams.
 
    .. method:: BaseHandler.setup_environ()
 
-      Set the :attr:`environ` attribute to a fully-populated WSGI environment.  The
+      Set the :attr:`environ` attribute to a fully populated WSGI environment.  The
       default implementation uses all of the above methods and attributes, plus the
       :meth:`get_stdin`, :meth:`get_stderr`, and :meth:`add_cgi_vars` methods and the
       :attr:`wsgi_file_wrapper` attribute.  It also inserts a ``SERVER_SOFTWARE`` key
diff --git a/Doc/library/xml.rst b/Doc/library/xml.rst
index e3b3516296114..20b0905bb1093 100644
--- a/Doc/library/xml.rst
+++ b/Doc/library/xml.rst
@@ -95,7 +95,7 @@ quadratic blowup entity expansion
   entity expansion, too. Instead of nested entities it repeats one large entity
   with a couple of thousand chars over and over again. The attack isn't as
   efficient as the exponential case but it avoids triggering parser countermeasures
-  that forbid deeply-nested entities.
+  that forbid deeply nested entities.
 
 external entity expansion
   Entity declarations can contain more than just text for replacement. They can
diff --git a/Doc/library/xmlrpc.client.rst b/Doc/library/xmlrpc.client.rst
index 8d9db53ef1f0d..0d9bfd51f1e49 100644
--- a/Doc/library/xmlrpc.client.rst
+++ b/Doc/library/xmlrpc.client.rst
@@ -47,7 +47,7 @@ between conformable Python objects and XML on the wire.
    The following parameters govern the use of the returned proxy instance.
    If *allow_none* is true,  the Python constant ``None`` will be translated into
    XML; the default behaviour is for ``None`` to raise a :exc:`TypeError`. This is
-   a commonly-used extension to the XML-RPC specification, but isn't supported by
+   a commonly used extension to the XML-RPC specification, but isn't supported by
    all clients and servers; see `http://ontosys.com/xml-rpc/extensions.php
    <https://web.archive.org/web/20130120074804/http://ontosys.com/xml-rpc/extensions.php>`_
    for a description.
diff --git a/Doc/library/zlib.rst b/Doc/library/zlib.rst
index 30eb99817a859..ac179722dee2b 100644
--- a/Doc/library/zlib.rst
+++ b/Doc/library/zlib.rst
@@ -265,7 +265,7 @@ Decompression objects support the following methods and attributes:
    A boolean indicating whether the end of the compressed data stream has been
    reached.
 
-   This makes it possible to distinguish between a properly-formed compressed
+   This makes it possible to distinguish between a properly formed compressed
    stream, and an incomplete or truncated one.
 
    .. versionadded:: 3.3
diff --git a/Doc/reference/datamodel.rst b/Doc/reference/datamodel.rst
index 8ac9a8c0566bf..758f3aef3ee34 100644
--- a/Doc/reference/datamodel.rst
+++ b/Doc/reference/datamodel.rst
@@ -1270,7 +1270,7 @@ Basic customization
 
    Typical implementations create a new instance of the class by invoking the
    superclass's :meth:`__new__` method using ``super().__new__(cls[, ...])``
-   with appropriate arguments and then modifying the newly-created instance
+   with appropriate arguments and then modifying the newly created instance
    as necessary before returning it.
 
    If :meth:`__new__` is invoked during object construction and it returns an
@@ -1560,7 +1560,7 @@ Basic customization
       predictable between repeated invocations of Python.
 
       This is intended to provide protection against a denial-of-service caused
-      by carefully-chosen inputs that exploit the worst case performance of a
+      by carefully chosen inputs that exploit the worst case performance of a
       dict insertion, O(n\ :sup:`2`) complexity.  See
       http://www.ocert.org/advisories/ocert-2011-003.html for details.
 
diff --git a/Doc/reference/import.rst b/Doc/reference/import.rst
index 3a41403c6476b..29d402ebcf492 100644
--- a/Doc/reference/import.rst
+++ b/Doc/reference/import.rst
@@ -541,7 +541,7 @@ the module.
 
 .. attribute:: __name__
 
-   The ``__name__`` attribute must be set to the fully-qualified name of
+   The ``__name__`` attribute must be set to the fully qualified name of
    the module.  This name is used to uniquely identify the module in
    the import system.
 
diff --git a/Doc/reference/lexical_analysis.rst b/Doc/reference/lexical_analysis.rst
index 0e64a056a6eb2..e75f460f8497a 100644
--- a/Doc/reference/lexical_analysis.rst
+++ b/Doc/reference/lexical_analysis.rst
@@ -753,7 +753,7 @@ the final value of the whole string.
 
 Top-level format specifiers may include nested replacement fields. These nested
 fields may include their own conversion fields and :ref:`format specifiers
-<formatspec>`, but may not include more deeply-nested replacement fields. The
+<formatspec>`, but may not include more deeply nested replacement fields. The
 :ref:`format specifier mini-language <formatspec>` is the same as that used by
 the :meth:`str.format` method.
 
diff --git a/Doc/tutorial/classes.rst b/Doc/tutorial/classes.rst
index 58b06eb5f2535..f27abe48b2d4e 100644
--- a/Doc/tutorial/classes.rst
+++ b/Doc/tutorial/classes.rst
@@ -297,7 +297,7 @@ initial state. Therefore a class may define a special method named
        self.data = []
 
 When a class defines an :meth:`__init__` method, class instantiation
-automatically invokes :meth:`__init__` for the newly-created class instance.  So
+automatically invokes :meth:`__init__` for the newly created class instance.  So
 in this example, a new, initialized instance can be obtained by::
 
    x = MyClass()
diff --git a/Doc/tutorial/inputoutput.rst b/Doc/tutorial/inputoutput.rst
index 1f1ef28e5cad4..324238228d626 100644
--- a/Doc/tutorial/inputoutput.rst
+++ b/Doc/tutorial/inputoutput.rst
@@ -189,7 +189,7 @@ notation. ::
 This is particularly useful in combination with the built-in function
 :func:`vars`, which returns a dictionary containing all local variables.
 
-As an example, the following lines produce a tidily-aligned
+As an example, the following lines produce a tidily aligned
 set of columns giving integers and their squares and cubes::
 
    >>> for x in range(1, 11):
diff --git a/Doc/using/cmdline.rst b/Doc/using/cmdline.rst
index af757d1e4ceb8..0025869ba46d4 100644
--- a/Doc/using/cmdline.rst
+++ b/Doc/using/cmdline.rst
@@ -365,7 +365,7 @@ Miscellaneous options
    between repeated invocations of Python.
 
    Hash randomization is intended to provide protection against a
-   denial-of-service caused by carefully-chosen inputs that exploit the worst
+   denial-of-service caused by carefully chosen inputs that exploit the worst
    case performance of a dict construction, O(n\ :sup:`2`) complexity.  See
    http://www.ocert.org/advisories/ocert-2011-003.html for details.
 
@@ -461,7 +461,7 @@ Miscellaneous options
    whether the actual warning category of the message is a subclass of the
    specified warning category.
 
-   The *module* field matches the (fully-qualified) module name; this match is
+   The *module* field matches the (fully qualified) module name; this match is
    case-sensitive.
 
    The *lineno* field matches the line number, where zero matches all line
diff --git a/Doc/whatsnew/2.0.rst b/Doc/whatsnew/2.0.rst
index 325def51c274e..24fc39be6161c 100644
--- a/Doc/whatsnew/2.0.rst
+++ b/Doc/whatsnew/2.0.rst
@@ -21,7 +21,7 @@ Python's development never completely stops between releases, and a steady flow
 of bug fixes and improvements are always being submitted. A host of minor fixes,
 a few optimizations, additional docstrings, and better error messages went into
 2.0; to list them all would be impossible, but they're certainly significant.
-Consult the publicly-available CVS logs if you want to see the full list.  This
+Consult the publicly available CVS logs if you want to see the full list.  This
 progress is due to the five developers working for  PythonLabs are now getting
 paid to spend their days fixing bugs, and also due to the improved communication
 resulting  from moving to SourceForge.
diff --git a/Doc/whatsnew/2.3.rst b/Doc/whatsnew/2.3.rst
index cf5552064cf4a..745b0aa220502 100644
--- a/Doc/whatsnew/2.3.rst
+++ b/Doc/whatsnew/2.3.rst
@@ -527,7 +527,7 @@ creates a :class:`LogRecord` instance that is sent to any number of different
 of filters, and each filter can cause the :class:`LogRecord` to be ignored or
 can modify the record before passing it along.  When they're finally output,
 :class:`LogRecord` instances are converted to text by a :class:`Formatter`
-class.  All of these classes can be replaced by your own specially-written
+class.  All of these classes can be replaced by your own specially written
 classes.
 
 With all of these features the :mod:`logging` package should provide enough
diff --git a/Doc/whatsnew/2.4.rst b/Doc/whatsnew/2.4.rst
index 7e11c98399cc1..ddfac1a3f4e63 100644
--- a/Doc/whatsnew/2.4.rst
+++ b/Doc/whatsnew/2.4.rst
@@ -120,7 +120,7 @@ having the entire data set in memory at one time.  List comprehensions don't fit
 into this picture very well because they produce a Python list object containing
 all of the items.  This unavoidably pulls all of the objects into memory, which
 can be a problem if your data set is very large.  When trying to write a
-functionally-styled program, it would be natural to write something like::
+functionally styled program, it would be natural to write something like::
 
    links = [link for link in get_all_links() if not link.followed]
    for link in links:
@@ -918,7 +918,7 @@ Here are all of the changes that Python 2.4 makes to the core Python language.
 
   (Contributed by Raymond Hettinger.)
 
-* Encountering a failure while importing a module no longer leaves a partially-initialized
+* Encountering a failure while importing a module no longer leaves a partially initialized
   module object in ``sys.modules``.  The incomplete module object left
   behind would fool further imports of the same module into succeeding, leading to
   confusing errors.   (Fixed by Tim Peters.)
@@ -1541,7 +1541,7 @@ code:
 * The :mod:`tarfile` module now generates GNU-format tar files by default.
 
 * Encountering a failure while importing a module no longer leaves a
-  partially-initialized module object in ``sys.modules``.
+  partially initialized module object in ``sys.modules``.
 
 * :const:`None` is now a constant; code that binds a new value to  the name
   ``None`` is now a syntax error.
diff --git a/Doc/whatsnew/2.5.rst b/Doc/whatsnew/2.5.rst
index 597eaf51fb68d..1b1fb3be9cabd 100644
--- a/Doc/whatsnew/2.5.rst
+++ b/Doc/whatsnew/2.5.rst
@@ -15,7 +15,7 @@ release schedule.  Python 2.5 was released on September 19, 2006.
 
 The changes in Python 2.5 are an interesting mix of language and library
 improvements. The library enhancements will be more important to Python's user
-community, I think, because several widely-useful packages were added.  New
+community, I think, because several widely useful packages were added.  New
 modules include ElementTree for XML processing (:mod:`xml.etree`),
 the SQLite database module (:mod:`sqlite`), and the :mod:`ctypes`
 module for calling C functions.
@@ -1293,7 +1293,7 @@ complete list of changes, or look through the SVN logs for all the details.
   received several enhancements and a number of bugfixes.  You can now set the
   maximum size in bytes of a field by calling the
   ``csv.field_size_limit(new_limit)`` function; omitting the *new_limit*
-  argument will return the currently-set limit.  The :class:`reader` class now has
+  argument will return the currently set limit.  The :class:`reader` class now has
   a :attr:`line_num` attribute that counts the number of physical lines read from
   the source; records can span multiple physical lines, so :attr:`line_num` is not
   the same as the number of records read.
diff --git a/Doc/whatsnew/2.6.rst b/Doc/whatsnew/2.6.rst
index 0dbb5e50d27d7..7524da8963934 100644
--- a/Doc/whatsnew/2.6.rst
+++ b/Doc/whatsnew/2.6.rst
@@ -523,7 +523,7 @@ PEP 370: Per-user ``site-packages`` Directory
 
 When you run Python, the module search path ``sys.path`` usually
 includes a directory whose path ends in ``"site-packages"``.  This
-directory is intended to hold locally-installed packages available to
+directory is intended to hold locally installed packages available to
 all users using a machine or a particular site installation.
 
 Python 2.6 introduces a convention for user-specific site directories.
@@ -2460,7 +2460,7 @@ changes, or look through the Subversion logs for all the details.
   The function must take a filename and return true if the file
   should be excluded or false if it should be archived.
   The function is applied to both the name initially passed to :meth:`add`
-  and to the names of files in recursively-added directories.
+  and to the names of files in recursively added directories.
 
   (All changes contributed by Lars Gust?bel).
 
@@ -2513,7 +2513,7 @@ changes, or look through the Subversion logs for all the details.
   (Contributed by Brett Cannon.)
 
 * The :mod:`textwrap` module can now preserve existing whitespace
-  at the beginnings and ends of the newly-created lines
+  at the beginnings and ends of the newly created lines
   by specifying ``drop_whitespace=False``
   as an argument::
 
diff --git a/Doc/whatsnew/2.7.rst b/Doc/whatsnew/2.7.rst
index 8eb8daa2feeeb..f753055c16ee2 100644
--- a/Doc/whatsnew/2.7.rst
+++ b/Doc/whatsnew/2.7.rst
@@ -279,7 +279,7 @@ Comparing an :class:`~collections.OrderedDict` with a regular dictionary
 ignores the insertion order and just compares the keys and values.
 
 How does the :class:`~collections.OrderedDict` work?  It maintains a
-doubly-linked list of keys, appending new keys to the list as they're inserted.
+doubly linked list of keys, appending new keys to the list as they're inserted.
 A secondary dictionary maps keys to their corresponding list node, so
 deletion doesn't have to traverse the entire linked list and therefore
 remains O(1).
@@ -1968,7 +1968,7 @@ GvR worked on merging them into Python's version of :mod:`unittest`.
 
 * :meth:`~unittest.TestCase.assertAlmostEqual` and :meth:`~unittest.TestCase.assertNotAlmostEqual` test
   whether *first* and *second* are approximately equal.  This method
-  can either round their difference to an optionally-specified number
+  can either round their difference to an optionally specified number
   of *places* (the default is 7) and compare it to zero, or require
   the difference to be smaller than a supplied *delta* value.
 
@@ -2333,7 +2333,7 @@ Port-Specific Changes: Windows
 
 * The :mod:`_winreg` module for accessing the registry now implements
   the :func:`~_winreg.CreateKeyEx` and :func:`~_winreg.DeleteKeyEx`
-  functions, extended versions of previously-supported functions that
+  functions, extended versions of previously supported functions that
   take several extra arguments.  The :func:`~_winreg.DisableReflectionKey`,
   :func:`~_winreg.EnableReflectionKey`, and :func:`~_winreg.QueryReflectionKey`
   were also tested and documented.
diff --git a/Doc/whatsnew/3.0.rst b/Doc/whatsnew/3.0.rst
index 4da3507ad2e89..63b24748d8aab 100644
--- a/Doc/whatsnew/3.0.rst
+++ b/Doc/whatsnew/3.0.rst
@@ -663,7 +663,7 @@ Some other changes to standard library modules, not covered by
   :data:`string.ascii_letters` etc. instead.  (The reason for the
   removal is that :data:`string.letters` and friends had
   locale-specific behavior, which is a bad idea for such
-  attractively-named global "constants".)
+  attractively named global "constants".)
 
 * Renamed module :mod:`__builtin__` to :mod:`builtins` (removing the
   underscores, adding an 's').  The :data:`__builtins__` variable
diff --git a/Doc/whatsnew/3.11.rst b/Doc/whatsnew/3.11.rst
index eacd4c4726ea3..97ad5b3fd5ca6 100644
--- a/Doc/whatsnew/3.11.rst
+++ b/Doc/whatsnew/3.11.rst
@@ -75,7 +75,7 @@ New syntax features:
 New typing features:
 
 * :pep:`646`: Variadic generics.
-* :pep:`655`: Marking individual TypedDict items as required or potentially-missing.
+* :pep:`655`: Marking individual TypedDict items as required or potentially missing.
 * :pep:`673`: ``Self`` type.
 * :pep:`675`: Arbitrary literal string type.
 
diff --git a/Doc/whatsnew/3.3.rst b/Doc/whatsnew/3.3.rst
index 361e6db07c3cd..0f989464c9c81 100644
--- a/Doc/whatsnew/3.3.rst
+++ b/Doc/whatsnew/3.3.rst
@@ -101,7 +101,7 @@ PEP 405: Virtual Environments
 
 Virtual environments help create separate Python setups while sharing a
 system-wide base install, for ease of maintenance.  Virtual environments
-have their own set of private site packages (i.e. locally-installed
+have their own set of private site packages (i.e. locally installed
 libraries), and are optionally segregated from the system-wide site
 packages.  Their concept and implementation are inspired by the popular
 ``virtualenv`` third-party package, but benefit from tighter integration
@@ -898,7 +898,7 @@ an IP address associated with a specific IP subnet).
 lzma
 ----
 
-The newly-added :mod:`lzma` module provides data compression and decompression
+The newly added :mod:`lzma` module provides data compression and decompression
 using the LZMA algorithm, including support for the ``.xz`` and ``.lzma``
 file formats.
 
@@ -1096,7 +1096,7 @@ decimal
    C-module and libmpdec written by Stefan Krah.
 
 The new C version of the decimal module integrates the high speed libmpdec
-library for arbitrary precision correctly-rounded decimal floating point
+library for arbitrary precision correctly rounded decimal floating point
 arithmetic. libmpdec conforms to IBM's General Decimal Arithmetic Specification.
 
 Performance gains range from 10x for database applications to 100x for
@@ -1158,8 +1158,8 @@ API changes
   in order to obtain a rounded or inexact value.
 
 
-* The power function in decimal.py is always correctly-rounded. In the
-  C version, it is defined in terms of the correctly-rounded
+* The power function in decimal.py is always correctly rounded. In the
+  C version, it is defined in terms of the correctly rounded
   :meth:`~decimal.Decimal.exp` and :meth:`~decimal.Decimal.ln` functions,
   but the final result is only "almost always correctly rounded".
 
@@ -2137,7 +2137,7 @@ zlib
 ----
 
 New attribute :attr:`zlib.Decompress.eof` makes it possible to distinguish
-between a properly-formed compressed stream and an incomplete or truncated one.
+between a properly formed compressed stream and an incomplete or truncated one.
 (Contributed by Nadeem Vawda in :issue:`12646`.)
 
 New attribute :attr:`zlib.ZLIB_RUNTIME_VERSION` reports the version string of
diff --git a/Doc/whatsnew/3.4.rst b/Doc/whatsnew/3.4.rst
index 023736134b2ca..a09b60ffb331e 100644
--- a/Doc/whatsnew/3.4.rst
+++ b/Doc/whatsnew/3.4.rst
@@ -1659,7 +1659,7 @@ The :class:`~unittest.TestCase` class has a new method,
 :keyword:`with` block becomes a "sub-test".  This context manager allows a test
 method to dynamically generate subtests  by, say, calling the ``subTest``
 context manager inside a loop.  A single test method can thereby produce an
-indefinite number of separately-identified and separately-counted tests, all of
+indefinite number of separately identified and separately counted tests, all of
 which will run even if one or more of them fail.  For example::
 
     class NumbersTest(unittest.TestCase):
@@ -2056,7 +2056,7 @@ Significant Optimizations
   ``malloc`` in ``obmalloc``.  Artificial benchmarks show about a 3% memory
   savings.
 
-* :func:`os.urandom` now uses a lazily-opened persistent file descriptor
+* :func:`os.urandom` now uses a lazily opened persistent file descriptor
   so as to avoid using many file descriptors when run in parallel from
   multiple threads.  (Contributed by Antoine Pitrou in :issue:`18756`.)
 
diff --git a/Doc/whatsnew/3.7.rst b/Doc/whatsnew/3.7.rst
index b2078f5a82e28..68901fa27eccf 100644
--- a/Doc/whatsnew/3.7.rst
+++ b/Doc/whatsnew/3.7.rst
@@ -291,7 +291,7 @@ PEP 539: New C API for Thread-Local Storage
 While Python provides a C API for thread-local storage support; the existing
 :ref:`Thread Local Storage (TLS) API <thread-local-storage-api>` has used
 :c:type:`int` to represent TLS keys across all platforms.  This has not
-generally been a problem for officially-support platforms, but that is neither
+generally been a problem for officially support platforms, but that is neither
 POSIX-compliant, nor portable in any practical sense.
 
 :pep:`539` changes this by providing a new :ref:`Thread Specific Storage (TSS)
@@ -1175,7 +1175,7 @@ of :func:`os.writev` and :func:`os.pwrite`). (Contributed by Pablo Galindo in
 :issue:`31368`.)
 
 The mode argument of :func:`os.makedirs` no longer affects the file
-permission bits of newly-created intermediate-level directories.
+permission bits of newly created intermediate-level directories.
 (Contributed by Serhiy Storchaka in :issue:`19930`.)
 
 :func:`os.dup2` now returns the new file descriptor.  Previously, ``None``
@@ -2296,7 +2296,7 @@ Changes in the Python API
   (Contributed by Serhiy Storchaka in :issue:`29192`.)
 
 * The *mode* argument of :func:`os.makedirs` no longer affects the file
-  permission bits of newly-created intermediate-level directories.
+  permission bits of newly created intermediate-level directories.
   To set their file permission bits you can set the umask before invoking
   ``makedirs()``.
   (Contributed by Serhiy Storchaka in :issue:`19930`.)
diff --git a/Misc/NEWS.d/3.10.0a3.rst b/Misc/NEWS.d/3.10.0a3.rst
index 4f182e8e3f1f0..699a0dd9e8d7c 100644
--- a/Misc/NEWS.d/3.10.0a3.rst
+++ b/Misc/NEWS.d/3.10.0a3.rst
@@ -763,7 +763,7 @@ as a positional-only argument.
 .. nonce: qLkNh8
 .. section: Library
 
-Enum: fix regression involving inheriting a multiply-inherited enum
+Enum: fix regression involving inheriting a multiply inherited enum
 
 ..
 
diff --git a/Misc/NEWS.d/3.10.0a4.rst b/Misc/NEWS.d/3.10.0a4.rst
index beac530fcb28f..95f9319668db4 100644
--- a/Misc/NEWS.d/3.10.0a4.rst
+++ b/Misc/NEWS.d/3.10.0a4.rst
@@ -446,7 +446,7 @@ In ``importlib.metadata``: -  ``EntryPoint`` objects now expose a ``.dist``
 object referencing the ``Distribution`` when constructed from a
 ``Distribution``. - Add support for package discovery under package
 normalization rules. - The object returned by ``metadata()`` now has a
-formally-defined protocol called ``PackageMetadata`` with declared support
+formally defined protocol called ``PackageMetadata`` with declared support
 for the ``.get_all()`` method. - Synced with importlib_metadata 3.3.
 
 ..
diff --git a/Misc/NEWS.d/3.11.0a4.rst b/Misc/NEWS.d/3.11.0a4.rst
index 2391f43e2b7fa..bcb6e8b7bdde3 100644
--- a/Misc/NEWS.d/3.11.0a4.rst
+++ b/Misc/NEWS.d/3.11.0a4.rst
@@ -694,7 +694,7 @@ removed in the future.
 .. section: Library
 
 :mod:`argparse` raises :exc:`ValueError` with clear message when trying to
-render usage for an empty mutually-exclusive group. Previously it raised a
+render usage for an empty mutually exclusive group. Previously it raised a
 cryptic :exc:`IndexError`.
 
 ..
diff --git a/Misc/NEWS.d/3.11.0b1.rst b/Misc/NEWS.d/3.11.0b1.rst
index c135eff4598e4..d8c2ec0a79971 100644
--- a/Misc/NEWS.d/3.11.0b1.rst
+++ b/Misc/NEWS.d/3.11.0b1.rst
@@ -109,7 +109,7 @@ methods are called only on objects of the correct type.
 .. nonce: 2PpaIN
 .. section: Core and Builtins
 
-Deoptimize statically-allocated code objects during ``Py_FINALIZE()`` so
+Deoptimize statically allocated code objects during ``Py_FINALIZE()`` so
 that future ``_PyCode_Quicken`` calls always start with unquickened code.
 
 ..
diff --git a/Misc/NEWS.d/3.7.0a1.rst b/Misc/NEWS.d/3.7.0a1.rst
index 244bb37e7c61d..e99c45ec7fdaa 100644
--- a/Misc/NEWS.d/3.7.0a1.rst
+++ b/Misc/NEWS.d/3.7.0a1.rst
@@ -3149,7 +3149,7 @@ they are finished in multiprocessing.Pool.
 .. section: Library
 
 The mode argument of os.makedirs() no longer affects the file permission
-bits of newly-created intermediate-level directories.
+bits of newly created intermediate-level directories.
 
 ..
 
diff --git a/Misc/NEWS.d/3.8.0a1.rst b/Misc/NEWS.d/3.8.0a1.rst
index 09b858d250c33..d95055a59da32 100644
--- a/Misc/NEWS.d/3.8.0a1.rst
+++ b/Misc/NEWS.d/3.8.0a1.rst
@@ -361,7 +361,7 @@ the "n" formatter.
 .. nonce: gjm1LO
 .. section: Core and Builtins
 
-Fix a possible segfault involving a newly-created coroutine.  Patch by
+Fix a possible segfault involving a newly created coroutine.  Patch by
 Zackery Spytz.
 
 ..
diff --git a/Misc/NEWS.d/3.8.0a2.rst b/Misc/NEWS.d/3.8.0a2.rst
index 1c0abab4c474a..223126145c77f 100644
--- a/Misc/NEWS.d/3.8.0a2.rst
+++ b/Misc/NEWS.d/3.8.0a2.rst
@@ -356,7 +356,7 @@ Add *headers* optional keyword-only parameter to
 .. section: Library
 
 Fix C implementation of pickle.loads to use importlib's locking mechanisms,
-and thereby avoid using partially-loaded modules. Patch by Tim Burgess.
+and thereby avoid using partially loaded modules. Patch by Tim Burgess.
 
 ..
 


From webhook-mailer at python.org  Tue Jul  5 08:30:45 2022
From: webhook-mailer at python.org (ambv)
Date: Tue, 05 Jul 2022 12:30:45 -0000
Subject: [Python-checkins] [3.10] Docs: remove redundant "adverb-adjective"
 hyphens from compound modifiers (GH-94551) (GH-94558)
Message-ID: <mailman.2084.1657024246.20746.python-checkins@python.org>

https://github.com/python/cpython/commit/6e47020d31c837f494ee500efa9b557bb83b87d7
commit: 6e47020d31c837f494ee500efa9b557bb83b87d7
branch: 3.10
author: ?ukasz Langa <lukasz at langa.pl>
committer: ambv <lukasz at langa.pl>
date: 2022-07-05T14:30:37+02:00
summary:

[3.10] Docs: remove redundant "adverb-adjective" hyphens from compound modifiers (GH-94551) (GH-94558)

Discussion: https://discuss.python.org/t/slight-grammar-fix-throughout-adverbs-dont-need-hyphen/17021
(cherry picked from commit 3440d197a55800ecceea3e115e44b4262411359c)

Co-authored-by: Ned Batchelder <ned at nedbatchelder.com>

files:
M Doc/c-api/allocation.rst
M Doc/c-api/intro.rst
M Doc/c-api/memory.rst
M Doc/c-api/typeobj.rst
M Doc/c-api/weakref.rst
M Doc/distutils/apiref.rst
M Doc/extending/building.rst
M Doc/extending/newtypes.rst
M Doc/faq/design.rst
M Doc/faq/programming.rst
M Doc/glossary.rst
M Doc/howto/clinic.rst
M Doc/howto/functional.rst
M Doc/howto/instrumentation.rst
M Doc/howto/logging.rst
M Doc/howto/regex.rst
M Doc/howto/urllib2.rst
M Doc/install/index.rst
M Doc/library/asynchat.rst
M Doc/library/custominterp.rst
M Doc/library/decimal.rst
M Doc/library/doctest.rst
M Doc/library/glob.rst
M Doc/library/hmac.rst
M Doc/library/importlib.rst
M Doc/library/inspect.rst
M Doc/library/mailbox.rst
M Doc/library/optparse.rst
M Doc/library/os.rst
M Doc/library/secrets.rst
M Doc/library/select.rst
M Doc/library/shutil.rst
M Doc/library/smtpd.rst
M Doc/library/socket.rst
M Doc/library/sqlite3.rst
M Doc/library/struct.rst
M Doc/library/subprocess.rst
M Doc/library/tarfile.rst
M Doc/library/tkinter.ttk.rst
M Doc/library/urllib.request.rst
M Doc/library/uuid.rst
M Doc/library/warnings.rst
M Doc/library/wsgiref.rst
M Doc/library/xml.rst
M Doc/library/xmlrpc.client.rst
M Doc/library/zlib.rst
M Doc/reference/datamodel.rst
M Doc/reference/import.rst
M Doc/reference/lexical_analysis.rst
M Doc/tutorial/classes.rst
M Doc/tutorial/inputoutput.rst
M Doc/using/cmdline.rst
M Doc/whatsnew/2.0.rst
M Doc/whatsnew/2.3.rst
M Doc/whatsnew/2.4.rst
M Doc/whatsnew/2.5.rst
M Doc/whatsnew/2.6.rst
M Doc/whatsnew/2.7.rst
M Doc/whatsnew/3.0.rst
M Doc/whatsnew/3.3.rst
M Doc/whatsnew/3.4.rst
M Doc/whatsnew/3.7.rst
M Misc/NEWS.d/3.10.0a3.rst
M Misc/NEWS.d/3.10.0a4.rst
M Misc/NEWS.d/3.7.0a1.rst
M Misc/NEWS.d/3.8.0a1.rst
M Misc/NEWS.d/3.8.0a2.rst

diff --git a/Doc/c-api/allocation.rst b/Doc/c-api/allocation.rst
index 33b0c06a9ebc2..0a8fcc5ae5fcd 100644
--- a/Doc/c-api/allocation.rst
+++ b/Doc/c-api/allocation.rst
@@ -14,7 +14,7 @@ Allocating Objects on the Heap
 
 .. c:function:: PyObject* PyObject_Init(PyObject *op, PyTypeObject *type)
 
-   Initialize a newly-allocated object *op* with its type and initial
+   Initialize a newly allocated object *op* with its type and initial
    reference.  Returns the initialized object.  If *type* indicates that the
    object participates in the cyclic garbage detector, it is added to the
    detector's set of observed objects. Other fields of the object are not
diff --git a/Doc/c-api/intro.rst b/Doc/c-api/intro.rst
index 083f6d32c79f8..2c09ac5c78fa1 100644
--- a/Doc/c-api/intro.rst
+++ b/Doc/c-api/intro.rst
@@ -746,7 +746,7 @@ A full list of the various types of debugging builds is in the file
 :file:`Misc/SpecialBuilds.txt` in the Python source distribution. Builds are
 available that support tracing of reference counts, debugging the memory
 allocator, or low-level profiling of the main interpreter loop.  Only the most
-frequently-used builds will be described in the remainder of this section.
+frequently used builds will be described in the remainder of this section.
 
 Compiling the interpreter with the :c:macro:`Py_DEBUG` macro defined produces
 what is generally meant by :ref:`a debug build of Python <debug-build>`.
diff --git a/Doc/c-api/memory.rst b/Doc/c-api/memory.rst
index f17d24bda589c..1bdb6a801e4c4 100644
--- a/Doc/c-api/memory.rst
+++ b/Doc/c-api/memory.rst
@@ -75,7 +75,7 @@ memory manager. For example, this is required when the interpreter is extended
 with new object types written in C. Another reason for using the Python heap is
 the desire to *inform* the Python memory manager about the memory needs of the
 extension module. Even when the requested memory is used exclusively for
-internal, highly-specific purposes, delegating all memory requests to the Python
+internal, highly specific purposes, delegating all memory requests to the Python
 memory manager causes the interpreter to have a more accurate image of its
 memory footprint as a whole. Consequently, under certain circumstances, the
 Python memory manager may or may not trigger appropriate actions, like garbage
diff --git a/Doc/c-api/typeobj.rst b/Doc/c-api/typeobj.rst
index 3da1403be29fa..8d7a2ed75fc9e 100644
--- a/Doc/c-api/typeobj.rst
+++ b/Doc/c-api/typeobj.rst
@@ -529,7 +529,7 @@ type objects) *must* have the :attr:`ob_size` field.
    ``PyObject_HEAD_INIT`` macro.  For :ref:`statically allocated objects
    <static-types>`, these fields always remain ``NULL``.  For :ref:`dynamically
    allocated objects <heap-types>`, these two fields are used to link the
-   object into a doubly-linked list of *all* live objects on the heap.
+   object into a doubly linked list of *all* live objects on the heap.
 
    This could be used for various debugging purposes; currently the only uses
    are the :func:`sys.getobjects` function and to print the objects that are
diff --git a/Doc/c-api/weakref.rst b/Doc/c-api/weakref.rst
index 98ebe711adaeb..cb6aba33b5681 100644
--- a/Doc/c-api/weakref.rst
+++ b/Doc/c-api/weakref.rst
@@ -35,7 +35,7 @@ as much as it can.
    callable object that receives notification when *ob* is garbage collected; it
    should accept a single parameter, which will be the weak reference object
    itself. *callback* may also be ``None`` or ``NULL``.  If *ob* is not a
-   weakly-referencable object, or if *callback* is not callable, ``None``, or
+   weakly referencable object, or if *callback* is not callable, ``None``, or
    ``NULL``, this will return ``NULL`` and raise :exc:`TypeError`.
 
 
@@ -47,7 +47,7 @@ as much as it can.
    be a callable object that receives notification when *ob* is garbage
    collected; it should accept a single parameter, which will be the weak
    reference object itself. *callback* may also be ``None`` or ``NULL``.  If *ob*
-   is not a weakly-referencable object, or if *callback* is not callable,
+   is not a weakly referencable object, or if *callback* is not callable,
    ``None``, or ``NULL``, this will return ``NULL`` and raise :exc:`TypeError`.
 
 
diff --git a/Doc/distutils/apiref.rst b/Doc/distutils/apiref.rst
index 5a13acf1485e1..a6dfa05ea3f06 100644
--- a/Doc/distutils/apiref.rst
+++ b/Doc/distutils/apiref.rst
@@ -1198,7 +1198,7 @@ other utility module.
    it contains certain values: see :func:`check_environ`.  Raise :exc:`ValueError`
    for any variables not found in either *local_vars* or ``os.environ``.
 
-   Note that this is not a fully-fledged string interpolation function. A valid
+   Note that this is not a full-fledged string interpolation function. A valid
    ``$variable`` can consist only of upper and lower case letters, numbers and an
    underscore. No { } or ( ) style quoting is available.
 
diff --git a/Doc/extending/building.rst b/Doc/extending/building.rst
index 69dffbd56abf1..53817074ab1ee 100644
--- a/Doc/extending/building.rst
+++ b/Doc/extending/building.rst
@@ -17,7 +17,7 @@ The initialization function has the signature:
 
 .. c:function:: PyObject* PyInit_modulename(void)
 
-It returns either a fully-initialized module, or a :c:type:`PyModuleDef`
+It returns either a fully initialized module, or a :c:type:`PyModuleDef`
 instance. See :ref:`initializing-modules` for details.
 
 .. highlight:: python
diff --git a/Doc/extending/newtypes.rst b/Doc/extending/newtypes.rst
index f75bee9e6f2a2..c7c434e58bf04 100644
--- a/Doc/extending/newtypes.rst
+++ b/Doc/extending/newtypes.rst
@@ -175,7 +175,7 @@ example::
    }
 
 If no :c:member:`~PyTypeObject.tp_repr` handler is specified, the interpreter will supply a
-representation that uses the type's :c:member:`~PyTypeObject.tp_name` and a uniquely-identifying
+representation that uses the type's :c:member:`~PyTypeObject.tp_name` and a uniquely identifying
 value for the object.
 
 The :c:member:`~PyTypeObject.tp_str` handler is to :func:`str` what the :c:member:`~PyTypeObject.tp_repr` handler
@@ -589,7 +589,7 @@ with the required field::
        PyObject *weakreflist;  /* List of weak references */
    } TrivialObject;
 
-And the corresponding member in the statically-declared type object::
+And the corresponding member in the statically declared type object::
 
    static PyTypeObject TrivialType = {
        PyVarObject_HEAD_INIT(NULL, 0)
diff --git a/Doc/faq/design.rst b/Doc/faq/design.rst
index a624fdb07a17d..794b69795bac2 100644
--- a/Doc/faq/design.rst
+++ b/Doc/faq/design.rst
@@ -313,7 +313,7 @@ you're too lazy to define a function.
 
 Functions are already first class objects in Python, and can be declared in a
 local scope.  Therefore the only advantage of using a lambda instead of a
-locally-defined function is that you don't need to invent a name for the
+locally defined function is that you don't need to invent a name for the
 function -- but that's just a local variable to which the function object (which
 is exactly the same type of object that a lambda expression yields) is assigned!
 
diff --git a/Doc/faq/programming.rst b/Doc/faq/programming.rst
index efd7a5ae00269..db4d0572cdbbe 100644
--- a/Doc/faq/programming.rst
+++ b/Doc/faq/programming.rst
@@ -294,7 +294,7 @@ It's good practice if you import modules in the following order:
 1. standard library modules -- e.g. ``sys``, ``os``, ``getopt``, ``re``
 2. third-party library modules (anything installed in Python's site-packages
    directory) -- e.g. mx.DateTime, ZODB, PIL.Image, etc.
-3. locally-developed modules
+3. locally developed modules
 
 It is sometimes necessary to move imports to a function or class to avoid
 problems with circular imports.  Gordon McMillan says:
@@ -771,7 +771,7 @@ What does the slash(/) in the parameter list of a function mean?
 
 A slash in the argument list of a function denotes that the parameters prior to
 it are positional-only.  Positional-only parameters are the ones without an
-externally-usable name.  Upon calling a function that accepts positional-only
+externally usable name.  Upon calling a function that accepts positional-only
 parameters, arguments are mapped to parameters based solely on their position.
 For example, :func:`divmod` is a function that accepts positional-only
 parameters. Its documentation looks like this::
diff --git a/Doc/glossary.rst b/Doc/glossary.rst
index 62c9b867ca12e..af6ed714b8ced 100644
--- a/Doc/glossary.rst
+++ b/Doc/glossary.rst
@@ -542,7 +542,7 @@ Glossary
       machines.
 
       However, some extension modules, either standard or third-party,
-      are designed so as to release the GIL when doing computationally-intensive
+      are designed so as to release the GIL when doing computationally intensive
       tasks such as compression or hashing.  Also, the GIL is always released
       when doing I/O.
 
diff --git a/Doc/howto/clinic.rst b/Doc/howto/clinic.rst
index f2195405fe96f..5a5cbab61b65c 100644
--- a/Doc/howto/clinic.rst
+++ b/Doc/howto/clinic.rst
@@ -541,7 +541,7 @@ Let's dive in!
 
 16. Compile, then run the relevant portions of the regression-test suite.
     This change should not introduce any new compile-time warnings or errors,
-    and there should be no externally-visible change to Python's behavior.
+    and there should be no externally visible change to Python's behavior.
 
     Well, except for one difference: ``inspect.signature()`` run on your function
     should now provide a valid signature!
@@ -1120,7 +1120,7 @@ Here's the syntax for cloning a function::
 ``module.class`` in the sample just to illustrate that you must
 use the full path to *both* functions.)
 
-Sorry, there's no syntax for partially-cloning a function, or cloning a function
+Sorry, there's no syntax for partially cloning a function, or cloning a function
 then modifying it.  Cloning is an all-or nothing proposition.
 
 Also, the function you are cloning from must have been previously defined
@@ -1318,7 +1318,7 @@ to specify in your subclass.  Here's the current list:
     there is no default, but not specifying a default may
     result in an "uninitialized variable" warning.  This can
     easily happen when using option groups?although
-    properly-written code will never actually use this value,
+    properly written code will never actually use this value,
     the variable does get passed in to the impl, and the
     C compiler will complain about the "use" of the
     uninitialized value.  This value should always be a
diff --git a/Doc/howto/functional.rst b/Doc/howto/functional.rst
index fb561a6a10b66..eb800152050d1 100644
--- a/Doc/howto/functional.rst
+++ b/Doc/howto/functional.rst
@@ -741,7 +741,7 @@ further because you risk skipping a discarded element.
 The itertools module
 ====================
 
-The :mod:`itertools` module contains a number of commonly-used iterators as well
+The :mod:`itertools` module contains a number of commonly used iterators as well
 as functions for combining several iterators.  This section will introduce the
 module's contents by showing small examples.
 
diff --git a/Doc/howto/instrumentation.rst b/Doc/howto/instrumentation.rst
index 4a59ae82f96e2..4ce15c69dac90 100644
--- a/Doc/howto/instrumentation.rst
+++ b/Doc/howto/instrumentation.rst
@@ -123,7 +123,7 @@ Sufficiently modern readelf can print the metadata::
             Arguments: 8@%rbp 8@%r12 -4@%eax
 
 The above metadata contains information for SystemTap describing how it
-can patch strategically-placed machine code instructions to enable the
+can patch strategically placed machine code instructions to enable the
 tracing hooks used by a SystemTap script.
 
 
@@ -410,7 +410,7 @@ needing to directly name the static markers:
 
 
 The following script uses the tapset above to provide a top-like view of all
-running CPython code, showing the top 20 most frequently-entered bytecode
+running CPython code, showing the top 20 most frequently entered bytecode
 frames, each second, across the whole system:
 
 .. code-block:: none
diff --git a/Doc/howto/logging.rst b/Doc/howto/logging.rst
index ff4e1d73a9653..0115a941afd6e 100644
--- a/Doc/howto/logging.rst
+++ b/Doc/howto/logging.rst
@@ -124,7 +124,7 @@ Logging to a file
 ^^^^^^^^^^^^^^^^^
 
 A very common situation is that of recording logging events in a file, so let's
-look at that next. Be sure to try the following in a newly-started Python
+look at that next. Be sure to try the following in a newly started Python
 interpreter, and don't just continue from the session described above::
 
    import logging
diff --git a/Doc/howto/regex.rst b/Doc/howto/regex.rst
index c4ebbd311e0fe..e07ea1bcf250e 100644
--- a/Doc/howto/regex.rst
+++ b/Doc/howto/regex.rst
@@ -949,7 +949,7 @@ Additionally, you can retrieve named groups as a dictionary with
    >>> m.groupdict()
    {'first': 'Jane', 'last': 'Doe'}
 
-Named groups are handy because they let you use easily-remembered names, instead
+Named groups are handy because they let you use easily remembered names, instead
 of having to remember numbers.  Here's an example RE from the :mod:`imaplib`
 module::
 
diff --git a/Doc/howto/urllib2.rst b/Doc/howto/urllib2.rst
index e77fefffbd257..e1a2f48f0b084 100644
--- a/Doc/howto/urllib2.rst
+++ b/Doc/howto/urllib2.rst
@@ -420,7 +420,7 @@ Openers and Handlers
 ====================
 
 When you fetch a URL you use an opener (an instance of the perhaps
-confusingly-named :class:`urllib.request.OpenerDirector`). Normally we have been using
+confusingly named :class:`urllib.request.OpenerDirector`). Normally we have been using
 the default opener - via ``urlopen`` - but you can create custom
 openers. Openers use handlers. All the "heavy lifting" is done by the
 handlers. Each handler knows how to open URLs for a particular URL scheme (http,
diff --git a/Doc/install/index.rst b/Doc/install/index.rst
index 7f7be11700988..63b64b95fc721 100644
--- a/Doc/install/index.rst
+++ b/Doc/install/index.rst
@@ -65,7 +65,7 @@ If you download a module source distribution, you can tell pretty quickly if it
 was packaged and distributed in the standard way, i.e. using the Distutils.
 First, the distribution's name and version number will be featured prominently
 in the name of the downloaded archive, e.g. :file:`foo-1.0.tar.gz` or
-:file:`widget-0.9.7.zip`.  Next, the archive will unpack into a similarly-named
+:file:`widget-0.9.7.zip`.  Next, the archive will unpack into a similarly named
 directory: :file:`foo-1.0` or :file:`widget-0.9.7`.  Additionally, the
 distribution will contain a setup script :file:`setup.py`, and a file named
 :file:`README.txt` or possibly just :file:`README`, which should explain that
diff --git a/Doc/library/asynchat.rst b/Doc/library/asynchat.rst
index 7cc9d99779bbb..70753bf15cebe 100644
--- a/Doc/library/asynchat.rst
+++ b/Doc/library/asynchat.rst
@@ -125,7 +125,7 @@ connection requests.
 .. method:: async_chat.push_with_producer(producer)
 
    Takes a producer object and adds it to the producer queue associated with
-   the channel.  When all currently-pushed producers have been exhausted the
+   the channel.  When all currently pushed producers have been exhausted the
    channel will consume this producer's data by calling its :meth:`more`
    method and send the data to the remote endpoint.
 
diff --git a/Doc/library/custominterp.rst b/Doc/library/custominterp.rst
index 5eeced20a9a59..9ea9e901372ee 100644
--- a/Doc/library/custominterp.rst
+++ b/Doc/library/custominterp.rst
@@ -8,7 +8,7 @@ The modules described in this chapter allow writing interfaces similar to
 Python's interactive interpreter.  If you want a Python interpreter that
 supports some special feature in addition to the Python language, you should
 look at the :mod:`code` module.  (The :mod:`codeop` module is lower-level, used
-to support compiling a possibly-incomplete chunk of Python code.)
+to support compiling a possibly incomplete chunk of Python code.)
 
 The full list of modules described in this chapter is:
 
diff --git a/Doc/library/decimal.rst b/Doc/library/decimal.rst
index 47627c02561b9..c1bc62432e4ca 100644
--- a/Doc/library/decimal.rst
+++ b/Doc/library/decimal.rst
@@ -30,7 +30,7 @@
 
 --------------
 
-The :mod:`decimal` module provides support for fast correctly-rounded
+The :mod:`decimal` module provides support for fast correctly rounded
 decimal floating point arithmetic. It offers several advantages over the
 :class:`float` datatype:
 
@@ -1355,16 +1355,16 @@ In addition to the three supplied contexts, new contexts can be created with the
       With two arguments, compute ``x**y``.  If ``x`` is negative then ``y``
       must be integral.  The result will be inexact unless ``y`` is integral and
       the result is finite and can be expressed exactly in 'precision' digits.
-      The rounding mode of the context is used. Results are always correctly-rounded
+      The rounding mode of the context is used. Results are always correctly rounded
       in the Python version.
 
       ``Decimal(0) ** Decimal(0)`` results in ``InvalidOperation``, and if ``InvalidOperation``
       is not trapped, then results in ``Decimal('NaN')``.
 
       .. versionchanged:: 3.3
-         The C module computes :meth:`power` in terms of the correctly-rounded
+         The C module computes :meth:`power` in terms of the correctly rounded
          :meth:`exp` and :meth:`ln` functions. The result is well-defined but
-         only "almost always correctly-rounded".
+         only "almost always correctly rounded".
 
       With three arguments, compute ``(x**y) % modulo``.  For the three argument
       form, the following restrictions on the arguments hold:
@@ -2135,7 +2135,7 @@ Q. Is the CPython implementation fast for large numbers?
 A. Yes.  In the CPython and PyPy3 implementations, the C/CFFI versions of
 the decimal module integrate the high speed `libmpdec
 <https://www.bytereef.org/mpdecimal/doc/libmpdec/index.html>`_ library for
-arbitrary precision correctly-rounded decimal floating point arithmetic [#]_.
+arbitrary precision correctly rounded decimal floating point arithmetic [#]_.
 ``libmpdec`` uses `Karatsuba multiplication
 <https://en.wikipedia.org/wiki/Karatsuba_algorithm>`_
 for medium-sized numbers and the `Number Theoretic Transform
diff --git a/Doc/library/doctest.rst b/Doc/library/doctest.rst
index dbb54c99133f3..e683ad07e3b95 100644
--- a/Doc/library/doctest.rst
+++ b/Doc/library/doctest.rst
@@ -566,12 +566,12 @@ doctest decides whether actual output matches an example's expected output:
 
    When specified, doctests expecting exceptions pass so long as an exception
    of the expected type is raised, even if the details
-   (message and fully-qualified exception name) don't match.
+   (message and fully qualified exception name) don't match.
 
    For example, an example expecting ``ValueError: 42`` will pass if the actual
    exception raised is ``ValueError: 3*14``, but will fail if, say, a
    :exc:`TypeError` is raised instead.
-   It will also ignore any fully-qualified name included before the
+   It will also ignore any fully qualified name included before the
    exception class, which can vary between implementations and versions
    of Python and the code/libraries in use.
    Hence, all three of these variations will work with the flag specified:
diff --git a/Doc/library/glob.rst b/Doc/library/glob.rst
index 4a290473d8924..3c038b6f69826 100644
--- a/Doc/library/glob.rst
+++ b/Doc/library/glob.rst
@@ -41,7 +41,7 @@ For example, ``'[?]'`` matches the character ``'?'``.
 
 .. function:: glob(pathname, *, root_dir=None, dir_fd=None, recursive=False)
 
-   Return a possibly-empty list of path names that match *pathname*, which must be
+   Return a possibly empty list of path names that match *pathname*, which must be
    a string containing a path specification. *pathname* can be either absolute
    (like :file:`/usr/src/Python-1.5/Makefile`) or relative (like
    :file:`../../Tools/\*/\*.gif`), and can contain shell-style wildcards. Broken
diff --git a/Doc/library/hmac.rst b/Doc/library/hmac.rst
index 6f1b59b57ce58..b2ca0455d3745 100644
--- a/Doc/library/hmac.rst
+++ b/Doc/library/hmac.rst
@@ -69,7 +69,7 @@ An HMAC object has the following methods:
 
    .. warning::
 
-      When comparing the output of :meth:`digest` to an externally-supplied
+      When comparing the output of :meth:`digest` to an externally supplied
       digest during a verification routine, it is recommended to use the
       :func:`compare_digest` function instead of the ``==`` operator
       to reduce the vulnerability to timing attacks.
@@ -83,7 +83,7 @@ An HMAC object has the following methods:
 
    .. warning::
 
-      When comparing the output of :meth:`hexdigest` to an externally-supplied
+      When comparing the output of :meth:`hexdigest` to an externally supplied
       digest during a verification routine, it is recommended to use the
       :func:`compare_digest` function instead of the ``==`` operator
       to reduce the vulnerability to timing attacks.
diff --git a/Doc/library/importlib.rst b/Doc/library/importlib.rst
index 85c23472e2756..3981cc6f2d965 100644
--- a/Doc/library/importlib.rst
+++ b/Doc/library/importlib.rst
@@ -447,7 +447,7 @@ ABC hierarchy::
             package. This attribute is not set on modules.
 
         - :attr:`__package__`
-            The fully-qualified name of the package under which the module was
+            The fully qualified name of the package under which the module was
             loaded as a submodule (or the empty string for top-level modules).
             For packages, it is the same as :attr:`__name__`.  The
             :func:`importlib.util.module_for_loader` decorator can handle the
@@ -1410,7 +1410,7 @@ find and load modules.
 
    (``__name__``)
 
-   A string for the fully-qualified name of the module.
+   A string for the fully qualified name of the module.
 
    .. attribute:: loader
 
@@ -1450,7 +1450,7 @@ find and load modules.
 
    (``__package__``)
 
-   (Read-only) The fully-qualified name of the package under which the module
+   (Read-only) The fully qualified name of the package under which the module
    should be loaded as a submodule (or the empty string for top-level modules).
    For packages, it is the same as :attr:`__name__`.
 
diff --git a/Doc/library/inspect.rst b/Doc/library/inspect.rst
index 44553afc33b75..56e6fff921ffd 100644
--- a/Doc/library/inspect.rst
+++ b/Doc/library/inspect.rst
@@ -1147,7 +1147,7 @@ Classes and functions
      doesn't have its own annotations dict, returns an empty dict.
    * All accesses to object members and dict values are done
      using ``getattr()`` and ``dict.get()`` for safety.
-   * Always, always, always returns a freshly-created dict.
+   * Always, always, always returns a freshly created dict.
 
    ``eval_str`` controls whether or not values of type ``str`` are replaced
    with the result of calling :func:`eval()` on those values:
diff --git a/Doc/library/mailbox.rst b/Doc/library/mailbox.rst
index 94d95d10290b0..d74fc8059fd53 100644
--- a/Doc/library/mailbox.rst
+++ b/Doc/library/mailbox.rst
@@ -1510,7 +1510,7 @@ The following exception classes are defined in the :mod:`mailbox` module:
 
    Raised when some mailbox-related condition beyond the control of the program
    causes it to be unable to proceed, such as when failing to acquire a lock that
-   another program already holds a lock, or when a uniquely-generated file name
+   another program already holds a lock, or when a uniquely generated file name
    already exists.
 
 
diff --git a/Doc/library/optparse.rst b/Doc/library/optparse.rst
index 0d686b10365a6..47e62553fb035 100644
--- a/Doc/library/optparse.rst
+++ b/Doc/library/optparse.rst
@@ -529,7 +529,7 @@ help message:
   line-wrapping---\ :mod:`optparse` takes care of wrapping lines and making
   the help output look good.
 
-* options that take a value indicate this fact in their automatically-generated
+* options that take a value indicate this fact in their automatically generated
   help message, e.g. for the "mode" option::
 
      -m MODE, --mode=MODE
@@ -539,7 +539,7 @@ help message:
   :mod:`optparse` converts the destination variable name to uppercase and uses
   that for the meta-variable.  Sometimes, that's not what you want---for
   example, the ``--filename`` option explicitly sets ``metavar="FILE"``,
-  resulting in this automatically-generated option description::
+  resulting in this automatically generated option description::
 
      -f FILE, --filename=FILE
 
@@ -1449,7 +1449,7 @@ intelligently and add conflicting options to it::
    parser.add_option("-n", "--dry-run", ..., help="do no harm")
    parser.add_option("-n", "--noisy", ..., help="be noisy")
 
-At this point, :mod:`optparse` detects that a previously-added option is already
+At this point, :mod:`optparse` detects that a previously added option is already
 using the ``-n`` option string.  Since ``conflict_handler`` is ``"resolve"``,
 it resolves the situation by removing ``-n`` from the earlier option's list of
 option strings.  Now ``--dry-run`` is the only way for the user to activate
@@ -1460,7 +1460,7 @@ that option.  If the user asks for help, the help message will reflect that::
      ...
      -n, --noisy   be noisy
 
-It's possible to whittle away the option strings for a previously-added option
+It's possible to whittle away the option strings for a previously added option
 until there are none left, and the user has no way of invoking that option from
 the command-line.  In that case, :mod:`optparse` removes that option completely,
 so it doesn't show up in help text or anywhere else. Carrying on with our
diff --git a/Doc/library/os.rst b/Doc/library/os.rst
index bd767980a96af..6694768419cbe 100644
--- a/Doc/library/os.rst
+++ b/Doc/library/os.rst
@@ -2086,7 +2086,7 @@ features:
 
    The *mode* parameter is passed to :func:`mkdir` for creating the leaf
    directory; see :ref:`the mkdir() description <mkdir_modebits>` for how it
-   is interpreted.  To set the file permission bits of any newly-created parent
+   is interpreted.  To set the file permission bits of any newly created parent
    directories you can set the umask before invoking :func:`makedirs`.  The
    file permission bits of existing parent directories are not changed.
 
@@ -2117,7 +2117,7 @@ features:
 
    .. versionchanged:: 3.7
       The *mode* argument no longer affects the file permission bits of
-      newly-created intermediate-level directories.
+      newly created intermediate-level directories.
 
 
 .. function:: mkfifo(path, mode=0o666, *, dir_fd=None)
diff --git a/Doc/library/secrets.rst b/Doc/library/secrets.rst
index eda4616da5ec9..86fa35fec59f6 100644
--- a/Doc/library/secrets.rst
+++ b/Doc/library/secrets.rst
@@ -44,7 +44,7 @@ randomness that your operating system provides.
 
 .. function:: choice(sequence)
 
-   Return a randomly-chosen element from a non-empty sequence.
+   Return a randomly chosen element from a non-empty sequence.
 
 .. function:: randbelow(n)
 
@@ -155,7 +155,7 @@ Generate an eight-character alphanumeric password:
    Applications should not
    `store passwords in a recoverable format <http://cwe.mitre.org/data/definitions/257.html>`_,
    whether plain text or encrypted.  They should be salted and hashed
-   using a cryptographically-strong one-way (irreversible) hash function.
+   using a cryptographically strong one-way (irreversible) hash function.
 
 
 Generate a ten-character alphanumeric password with at least one
diff --git a/Doc/library/select.rst b/Doc/library/select.rst
index 46b5ff8b6d586..1c3d10ef20935 100644
--- a/Doc/library/select.rst
+++ b/Doc/library/select.rst
@@ -252,7 +252,7 @@ object.
 
 .. method:: devpoll.poll([timeout])
 
-   Polls the set of registered file descriptors, and returns a possibly-empty list
+   Polls the set of registered file descriptors, and returns a possibly empty list
    containing ``(fd, event)`` 2-tuples for the descriptors that have events or
    errors to report. *fd* is the file descriptor, and *event* is a bitmask with
    bits set for the reported events for that descriptor --- :const:`POLLIN` for
@@ -440,7 +440,7 @@ linearly scanned again. :c:func:`select` is O(highest file descriptor), while
 
 .. method:: poll.poll([timeout])
 
-   Polls the set of registered file descriptors, and returns a possibly-empty list
+   Polls the set of registered file descriptors, and returns a possibly empty list
    containing ``(fd, event)`` 2-tuples for the descriptors that have events or
    errors to report. *fd* is the file descriptor, and *event* is a bitmask with
    bits set for the reported events for that descriptor --- :const:`POLLIN` for
diff --git a/Doc/library/shutil.rst b/Doc/library/shutil.rst
index 3a31543642bb9..cb672d9479cce 100644
--- a/Doc/library/shutil.rst
+++ b/Doc/library/shutil.rst
@@ -194,7 +194,7 @@ Directory and files operations
 
    When *follow_symlinks* is false, and *src* is a symbolic
    link, :func:`copy2` attempts to copy all metadata from the
-   *src* symbolic link to the newly-created *dst* symbolic link.
+   *src* symbolic link to the newly created *dst* symbolic link.
    However, this functionality is not available on all platforms.
    On platforms where some or all of this functionality is
    unavailable, :func:`copy2` will preserve all the metadata
diff --git a/Doc/library/smtpd.rst b/Doc/library/smtpd.rst
index 8fd009e5b2365..ac48e1ae871a6 100644
--- a/Doc/library/smtpd.rst
+++ b/Doc/library/smtpd.rst
@@ -246,7 +246,7 @@ SMTPChannel Objects
 
    .. attribute:: fqdn
 
-      Holds the fully-qualified domain name of the server as returned by
+      Holds the fully qualified domain name of the server as returned by
       :func:`socket.getfqdn`.
 
    .. attribute:: peer
diff --git a/Doc/library/socket.rst b/Doc/library/socket.rst
index 1100baf0ee5ca..bbf2ea180f5d1 100644
--- a/Doc/library/socket.rst
+++ b/Doc/library/socket.rst
@@ -125,7 +125,7 @@ created.  Socket addresses are represented as follows:
 
 - A string or a tuple ``(id, unit)`` is used for the :const:`SYSPROTO_CONTROL`
   protocol of the :const:`PF_SYSTEM` family. The string is the name of a
-  kernel control using a dynamically-assigned ID. The tuple can be used if ID
+  kernel control using a dynamically assigned ID. The tuple can be used if ID
   and unit number of the kernel control are known or if a registered ID is
   used.
 
@@ -869,7 +869,7 @@ The :mod:`socket` module also offers various network-related services:
 .. function:: getnameinfo(sockaddr, flags)
 
    Translate a socket address *sockaddr* into a 2-tuple ``(host, port)``. Depending
-   on the settings of *flags*, the result can contain a fully-qualified domain name
+   on the settings of *flags*, the result can contain a fully qualified domain name
    or numeric address representation in *host*.  Similarly, *port* can contain a
    string port name or a numeric port number.
 
diff --git a/Doc/library/sqlite3.rst b/Doc/library/sqlite3.rst
index 816b8825216c2..b0be6761d7185 100644
--- a/Doc/library/sqlite3.rst
+++ b/Doc/library/sqlite3.rst
@@ -582,7 +582,7 @@ Connection Objects
 
       If returning a tuple doesn't suffice and you want name-based access to
       columns, you should consider setting :attr:`row_factory` to the
-      highly-optimized :class:`sqlite3.Row` type. :class:`Row` provides both
+      highly optimized :class:`sqlite3.Row` type. :class:`Row` provides both
       index-based and case-insensitive name-based access to columns with almost no
       memory overhead. It will probably be better than your own custom
       dictionary-based approach or even a db_row based solution.
diff --git a/Doc/library/struct.rst b/Doc/library/struct.rst
index 25e26201d7d43..c1888d4a94fe0 100644
--- a/Doc/library/struct.rst
+++ b/Doc/library/struct.rst
@@ -82,7 +82,7 @@ The module defines the following exception and functions:
 
    Iteratively unpack from the buffer *buffer* according to the format
    string *format*.  This function returns an iterator which will read
-   equally-sized chunks from the buffer until all its contents have been
+   equally sized chunks from the buffer until all its contents have been
    consumed.  The buffer's size in bytes must be a multiple of the size
    required by the format, as reflected by :func:`calcsize`.
 
diff --git a/Doc/library/subprocess.rst b/Doc/library/subprocess.rst
index d0f8864493ed0..45fcfc79522c8 100644
--- a/Doc/library/subprocess.rst
+++ b/Doc/library/subprocess.rst
@@ -358,7 +358,7 @@ functions.
 
    .. warning::
 
-      For maximum reliability, use a fully-qualified path for the executable.
+      For maximum reliability, use a fully qualified path for the executable.
       To search for an unqualified name on :envvar:`PATH`, use
       :meth:`shutil.which`. On all platforms, passing :data:`sys.executable`
       is the recommended way to launch the current Python interpreter again,
diff --git a/Doc/library/tarfile.rst b/Doc/library/tarfile.rst
index 6afb8397b7866..44f34abfcf283 100644
--- a/Doc/library/tarfile.rst
+++ b/Doc/library/tarfile.rst
@@ -836,7 +836,7 @@ There are three tar formats that can be created with the :mod:`tarfile` module:
   files and stores pathnames in a portable way. Modern tar implementations,
   including GNU tar, bsdtar/libarchive and star, fully support extended *pax*
   features; some old or unmaintained libraries may not, but should treat
-  *pax* archives as if they were in the universally-supported *ustar* format.
+  *pax* archives as if they were in the universally supported *ustar* format.
   It is the current default format for new archives.
 
   It extends the existing *ustar* format with extra headers for information
diff --git a/Doc/library/tkinter.ttk.rst b/Doc/library/tkinter.ttk.rst
index 2db4c0f9143f6..3e31fbfbb2494 100644
--- a/Doc/library/tkinter.ttk.rst
+++ b/Doc/library/tkinter.ttk.rst
@@ -288,7 +288,7 @@ methods :meth:`tkinter.Widget.cget` and :meth:`tkinter.Widget.configure`.
       Modify or inquire widget state. If *statespec* is specified, sets the
       widget state according to it and return a new *statespec* indicating
       which flags were changed. If *statespec* is not specified, returns
-      the currently-enabled state flags.
+      the currently enabled state flags.
 
    *statespec* will usually be a list or a tuple.
 
@@ -467,7 +467,7 @@ Notebook
 
 Ttk Notebook widget manages a collection of windows and displays a single
 one at a time. Each child window is associated with a tab, which the user
-may select to change the currently-displayed window.
+may select to change the currently displayed window.
 
 
 Options
@@ -545,7 +545,7 @@ of the following forms:
 * An integer between zero and the number of tabs
 * The name of a child window
 * A positional specification of the form "@x,y", which identifies the tab
-* The literal string "current", which identifies the currently-selected tab
+* The literal string "current", which identifies the currently selected tab
 * The literal string "end", which returns the number of tabs (only valid for
   :meth:`Notebook.index`)
 
@@ -615,7 +615,7 @@ ttk.Notebook
       Selects the specified *tab_id*.
 
       The associated child window will be displayed, and the
-      previously-selected window (if different) is unmapped. If *tab_id* is
+      previously selected window (if different) is unmapped. If *tab_id* is
       omitted, returns the widget name of the currently selected pane.
 
 
diff --git a/Doc/library/urllib.request.rst b/Doc/library/urllib.request.rst
index 63248b3d94f21..9c2c37a5c9a7f 100644
--- a/Doc/library/urllib.request.rst
+++ b/Doc/library/urllib.request.rst
@@ -1269,7 +1269,7 @@ involved.  For example, the :envvar:`http_proxy` environment variable is read to
 obtain the HTTP proxy's URL.
 
 This example replaces the default :class:`ProxyHandler` with one that uses
-programmatically-supplied proxy URLs, and adds proxy authorization support with
+programmatically supplied proxy URLs, and adds proxy authorization support with
 :class:`ProxyBasicAuthHandler`. ::
 
    proxy_handler = urllib.request.ProxyHandler({'http': 'http://www.example.com:3128/'})
diff --git a/Doc/library/uuid.rst b/Doc/library/uuid.rst
index ddfbbda279e35..a71fe7abf5b54 100644
--- a/Doc/library/uuid.rst
+++ b/Doc/library/uuid.rst
@@ -211,7 +211,7 @@ The :mod:`uuid` module defines the following namespace identifiers for use with
 
 .. data:: NAMESPACE_DNS
 
-   When this namespace is specified, the *name* string is a fully-qualified domain
+   When this namespace is specified, the *name* string is a fully qualified domain
    name.
 
 
diff --git a/Doc/library/warnings.rst b/Doc/library/warnings.rst
index 8f2a5accd472b..30fc017a3a8ec 100644
--- a/Doc/library/warnings.rst
+++ b/Doc/library/warnings.rst
@@ -163,9 +163,9 @@ the disposition of the match.  Each entry is a tuple of the form (*action*,
   category must be a subclass in order to match.
 
 * *module* is a string containing a regular expression that the start of the
-  fully-qualified module name must match, case-sensitively.  In :option:`-W` and
+  fully qualified module name must match, case-sensitively.  In :option:`-W` and
   :envvar:`PYTHONWARNINGS`, *module* is a literal string that the
-  fully-qualified module name must be equal to (case-sensitively), ignoring any
+  fully qualified module name must be equal to (case-sensitively), ignoring any
   whitespace at the start or end of *module*.
 
 * *lineno* is an integer that the line number where the warning occurred must
diff --git a/Doc/library/wsgiref.rst b/Doc/library/wsgiref.rst
index e92a689de0b9b..2e0a16e52e275 100644
--- a/Doc/library/wsgiref.rst
+++ b/Doc/library/wsgiref.rst
@@ -329,7 +329,7 @@ request.  (E.g., using the :func:`shift_path_info` function from
 
    .. method:: WSGIServer.get_app()
 
-      Returns the currently-set application callable.
+      Returns the currently set application callable.
 
    Normally, however, you do not need to use these additional methods, as
    :meth:`set_app` is normally called by :func:`make_server`, and the
@@ -635,7 +635,7 @@ input, output, and error streams.
 
    .. method:: BaseHandler.setup_environ()
 
-      Set the :attr:`environ` attribute to a fully-populated WSGI environment.  The
+      Set the :attr:`environ` attribute to a fully populated WSGI environment.  The
       default implementation uses all of the above methods and attributes, plus the
       :meth:`get_stdin`, :meth:`get_stderr`, and :meth:`add_cgi_vars` methods and the
       :attr:`wsgi_file_wrapper` attribute.  It also inserts a ``SERVER_SOFTWARE`` key
diff --git a/Doc/library/xml.rst b/Doc/library/xml.rst
index e3b3516296114..20b0905bb1093 100644
--- a/Doc/library/xml.rst
+++ b/Doc/library/xml.rst
@@ -95,7 +95,7 @@ quadratic blowup entity expansion
   entity expansion, too. Instead of nested entities it repeats one large entity
   with a couple of thousand chars over and over again. The attack isn't as
   efficient as the exponential case but it avoids triggering parser countermeasures
-  that forbid deeply-nested entities.
+  that forbid deeply nested entities.
 
 external entity expansion
   Entity declarations can contain more than just text for replacement. They can
diff --git a/Doc/library/xmlrpc.client.rst b/Doc/library/xmlrpc.client.rst
index 8d9db53ef1f0d..0d9bfd51f1e49 100644
--- a/Doc/library/xmlrpc.client.rst
+++ b/Doc/library/xmlrpc.client.rst
@@ -47,7 +47,7 @@ between conformable Python objects and XML on the wire.
    The following parameters govern the use of the returned proxy instance.
    If *allow_none* is true,  the Python constant ``None`` will be translated into
    XML; the default behaviour is for ``None`` to raise a :exc:`TypeError`. This is
-   a commonly-used extension to the XML-RPC specification, but isn't supported by
+   a commonly used extension to the XML-RPC specification, but isn't supported by
    all clients and servers; see `http://ontosys.com/xml-rpc/extensions.php
    <https://web.archive.org/web/20130120074804/http://ontosys.com/xml-rpc/extensions.php>`_
    for a description.
diff --git a/Doc/library/zlib.rst b/Doc/library/zlib.rst
index 6758c615d74db..84076b2efe222 100644
--- a/Doc/library/zlib.rst
+++ b/Doc/library/zlib.rst
@@ -259,7 +259,7 @@ Decompression objects support the following methods and attributes:
    A boolean indicating whether the end of the compressed data stream has been
    reached.
 
-   This makes it possible to distinguish between a properly-formed compressed
+   This makes it possible to distinguish between a properly formed compressed
    stream, and an incomplete or truncated one.
 
    .. versionadded:: 3.3
diff --git a/Doc/reference/datamodel.rst b/Doc/reference/datamodel.rst
index a5739e6e5e472..ea9192bd82325 100644
--- a/Doc/reference/datamodel.rst
+++ b/Doc/reference/datamodel.rst
@@ -1235,7 +1235,7 @@ Basic customization
 
    Typical implementations create a new instance of the class by invoking the
    superclass's :meth:`__new__` method using ``super().__new__(cls[, ...])``
-   with appropriate arguments and then modifying the newly-created instance
+   with appropriate arguments and then modifying the newly created instance
    as necessary before returning it.
 
    If :meth:`__new__` is invoked during object construction and it returns an
@@ -1525,7 +1525,7 @@ Basic customization
       predictable between repeated invocations of Python.
 
       This is intended to provide protection against a denial-of-service caused
-      by carefully-chosen inputs that exploit the worst case performance of a
+      by carefully chosen inputs that exploit the worst case performance of a
       dict insertion, O(n\ :sup:`2`) complexity.  See
       http://www.ocert.org/advisories/ocert-2011-003.html for details.
 
diff --git a/Doc/reference/import.rst b/Doc/reference/import.rst
index 9c3c86649f555..92ae9fd3cf398 100644
--- a/Doc/reference/import.rst
+++ b/Doc/reference/import.rst
@@ -541,7 +541,7 @@ the module.
 
 .. attribute:: __name__
 
-   The ``__name__`` attribute must be set to the fully-qualified name of
+   The ``__name__`` attribute must be set to the fully qualified name of
    the module.  This name is used to uniquely identify the module in
    the import system.
 
diff --git a/Doc/reference/lexical_analysis.rst b/Doc/reference/lexical_analysis.rst
index 0dad31fd370e2..1a2cb411427a8 100644
--- a/Doc/reference/lexical_analysis.rst
+++ b/Doc/reference/lexical_analysis.rst
@@ -752,7 +752,7 @@ the final value of the whole string.
 
 Top-level format specifiers may include nested replacement fields. These nested
 fields may include their own conversion fields and :ref:`format specifiers
-<formatspec>`, but may not include more deeply-nested replacement fields. The
+<formatspec>`, but may not include more deeply nested replacement fields. The
 :ref:`format specifier mini-language <formatspec>` is the same as that used by
 the :meth:`str.format` method.
 
diff --git a/Doc/tutorial/classes.rst b/Doc/tutorial/classes.rst
index 58b06eb5f2535..f27abe48b2d4e 100644
--- a/Doc/tutorial/classes.rst
+++ b/Doc/tutorial/classes.rst
@@ -297,7 +297,7 @@ initial state. Therefore a class may define a special method named
        self.data = []
 
 When a class defines an :meth:`__init__` method, class instantiation
-automatically invokes :meth:`__init__` for the newly-created class instance.  So
+automatically invokes :meth:`__init__` for the newly created class instance.  So
 in this example, a new, initialized instance can be obtained by::
 
    x = MyClass()
diff --git a/Doc/tutorial/inputoutput.rst b/Doc/tutorial/inputoutput.rst
index 1f1ef28e5cad4..324238228d626 100644
--- a/Doc/tutorial/inputoutput.rst
+++ b/Doc/tutorial/inputoutput.rst
@@ -189,7 +189,7 @@ notation. ::
 This is particularly useful in combination with the built-in function
 :func:`vars`, which returns a dictionary containing all local variables.
 
-As an example, the following lines produce a tidily-aligned
+As an example, the following lines produce a tidily aligned
 set of columns giving integers and their squares and cubes::
 
    >>> for x in range(1, 11):
diff --git a/Doc/using/cmdline.rst b/Doc/using/cmdline.rst
index c4f65eb6194fb..b1e297d525849 100644
--- a/Doc/using/cmdline.rst
+++ b/Doc/using/cmdline.rst
@@ -321,7 +321,7 @@ Miscellaneous options
    between repeated invocations of Python.
 
    Hash randomization is intended to provide protection against a
-   denial-of-service caused by carefully-chosen inputs that exploit the worst
+   denial-of-service caused by carefully chosen inputs that exploit the worst
    case performance of a dict construction, O(n\ :sup:`2`) complexity.  See
    http://www.ocert.org/advisories/ocert-2011-003.html for details.
 
@@ -417,7 +417,7 @@ Miscellaneous options
    whether the actual warning category of the message is a subclass of the
    specified warning category.
 
-   The *module* field matches the (fully-qualified) module name; this match is
+   The *module* field matches the (fully qualified) module name; this match is
    case-sensitive.
 
    The *lineno* field matches the line number, where zero matches all line
diff --git a/Doc/whatsnew/2.0.rst b/Doc/whatsnew/2.0.rst
index 0e1cf1fd0ce46..e40218e73f008 100644
--- a/Doc/whatsnew/2.0.rst
+++ b/Doc/whatsnew/2.0.rst
@@ -21,7 +21,7 @@ Python's development never completely stops between releases, and a steady flow
 of bug fixes and improvements are always being submitted. A host of minor fixes,
 a few optimizations, additional docstrings, and better error messages went into
 2.0; to list them all would be impossible, but they're certainly significant.
-Consult the publicly-available CVS logs if you want to see the full list.  This
+Consult the publicly available CVS logs if you want to see the full list.  This
 progress is due to the five developers working for  PythonLabs are now getting
 paid to spend their days fixing bugs, and also due to the improved communication
 resulting  from moving to SourceForge.
diff --git a/Doc/whatsnew/2.3.rst b/Doc/whatsnew/2.3.rst
index cf5552064cf4a..745b0aa220502 100644
--- a/Doc/whatsnew/2.3.rst
+++ b/Doc/whatsnew/2.3.rst
@@ -527,7 +527,7 @@ creates a :class:`LogRecord` instance that is sent to any number of different
 of filters, and each filter can cause the :class:`LogRecord` to be ignored or
 can modify the record before passing it along.  When they're finally output,
 :class:`LogRecord` instances are converted to text by a :class:`Formatter`
-class.  All of these classes can be replaced by your own specially-written
+class.  All of these classes can be replaced by your own specially written
 classes.
 
 With all of these features the :mod:`logging` package should provide enough
diff --git a/Doc/whatsnew/2.4.rst b/Doc/whatsnew/2.4.rst
index 7e11c98399cc1..ddfac1a3f4e63 100644
--- a/Doc/whatsnew/2.4.rst
+++ b/Doc/whatsnew/2.4.rst
@@ -120,7 +120,7 @@ having the entire data set in memory at one time.  List comprehensions don't fit
 into this picture very well because they produce a Python list object containing
 all of the items.  This unavoidably pulls all of the objects into memory, which
 can be a problem if your data set is very large.  When trying to write a
-functionally-styled program, it would be natural to write something like::
+functionally styled program, it would be natural to write something like::
 
    links = [link for link in get_all_links() if not link.followed]
    for link in links:
@@ -918,7 +918,7 @@ Here are all of the changes that Python 2.4 makes to the core Python language.
 
   (Contributed by Raymond Hettinger.)
 
-* Encountering a failure while importing a module no longer leaves a partially-initialized
+* Encountering a failure while importing a module no longer leaves a partially initialized
   module object in ``sys.modules``.  The incomplete module object left
   behind would fool further imports of the same module into succeeding, leading to
   confusing errors.   (Fixed by Tim Peters.)
@@ -1541,7 +1541,7 @@ code:
 * The :mod:`tarfile` module now generates GNU-format tar files by default.
 
 * Encountering a failure while importing a module no longer leaves a
-  partially-initialized module object in ``sys.modules``.
+  partially initialized module object in ``sys.modules``.
 
 * :const:`None` is now a constant; code that binds a new value to  the name
   ``None`` is now a syntax error.
diff --git a/Doc/whatsnew/2.5.rst b/Doc/whatsnew/2.5.rst
index 597eaf51fb68d..1b1fb3be9cabd 100644
--- a/Doc/whatsnew/2.5.rst
+++ b/Doc/whatsnew/2.5.rst
@@ -15,7 +15,7 @@ release schedule.  Python 2.5 was released on September 19, 2006.
 
 The changes in Python 2.5 are an interesting mix of language and library
 improvements. The library enhancements will be more important to Python's user
-community, I think, because several widely-useful packages were added.  New
+community, I think, because several widely useful packages were added.  New
 modules include ElementTree for XML processing (:mod:`xml.etree`),
 the SQLite database module (:mod:`sqlite`), and the :mod:`ctypes`
 module for calling C functions.
@@ -1293,7 +1293,7 @@ complete list of changes, or look through the SVN logs for all the details.
   received several enhancements and a number of bugfixes.  You can now set the
   maximum size in bytes of a field by calling the
   ``csv.field_size_limit(new_limit)`` function; omitting the *new_limit*
-  argument will return the currently-set limit.  The :class:`reader` class now has
+  argument will return the currently set limit.  The :class:`reader` class now has
   a :attr:`line_num` attribute that counts the number of physical lines read from
   the source; records can span multiple physical lines, so :attr:`line_num` is not
   the same as the number of records read.
diff --git a/Doc/whatsnew/2.6.rst b/Doc/whatsnew/2.6.rst
index 0dbb5e50d27d7..7524da8963934 100644
--- a/Doc/whatsnew/2.6.rst
+++ b/Doc/whatsnew/2.6.rst
@@ -523,7 +523,7 @@ PEP 370: Per-user ``site-packages`` Directory
 
 When you run Python, the module search path ``sys.path`` usually
 includes a directory whose path ends in ``"site-packages"``.  This
-directory is intended to hold locally-installed packages available to
+directory is intended to hold locally installed packages available to
 all users using a machine or a particular site installation.
 
 Python 2.6 introduces a convention for user-specific site directories.
@@ -2460,7 +2460,7 @@ changes, or look through the Subversion logs for all the details.
   The function must take a filename and return true if the file
   should be excluded or false if it should be archived.
   The function is applied to both the name initially passed to :meth:`add`
-  and to the names of files in recursively-added directories.
+  and to the names of files in recursively added directories.
 
   (All changes contributed by Lars Gust?bel).
 
@@ -2513,7 +2513,7 @@ changes, or look through the Subversion logs for all the details.
   (Contributed by Brett Cannon.)
 
 * The :mod:`textwrap` module can now preserve existing whitespace
-  at the beginnings and ends of the newly-created lines
+  at the beginnings and ends of the newly created lines
   by specifying ``drop_whitespace=False``
   as an argument::
 
diff --git a/Doc/whatsnew/2.7.rst b/Doc/whatsnew/2.7.rst
index 2e9fdd05c0846..b74a456929159 100644
--- a/Doc/whatsnew/2.7.rst
+++ b/Doc/whatsnew/2.7.rst
@@ -279,7 +279,7 @@ Comparing an :class:`~collections.OrderedDict` with a regular dictionary
 ignores the insertion order and just compares the keys and values.
 
 How does the :class:`~collections.OrderedDict` work?  It maintains a
-doubly-linked list of keys, appending new keys to the list as they're inserted.
+doubly linked list of keys, appending new keys to the list as they're inserted.
 A secondary dictionary maps keys to their corresponding list node, so
 deletion doesn't have to traverse the entire linked list and therefore
 remains O(1).
@@ -1968,7 +1968,7 @@ GvR worked on merging them into Python's version of :mod:`unittest`.
 
 * :meth:`~unittest.TestCase.assertAlmostEqual` and :meth:`~unittest.TestCase.assertNotAlmostEqual` test
   whether *first* and *second* are approximately equal.  This method
-  can either round their difference to an optionally-specified number
+  can either round their difference to an optionally specified number
   of *places* (the default is 7) and compare it to zero, or require
   the difference to be smaller than a supplied *delta* value.
 
@@ -2333,7 +2333,7 @@ Port-Specific Changes: Windows
 
 * The :mod:`_winreg` module for accessing the registry now implements
   the :func:`~_winreg.CreateKeyEx` and :func:`~_winreg.DeleteKeyEx`
-  functions, extended versions of previously-supported functions that
+  functions, extended versions of previously supported functions that
   take several extra arguments.  The :func:`~_winreg.DisableReflectionKey`,
   :func:`~_winreg.EnableReflectionKey`, and :func:`~_winreg.QueryReflectionKey`
   were also tested and documented.
diff --git a/Doc/whatsnew/3.0.rst b/Doc/whatsnew/3.0.rst
index 4da3507ad2e89..63b24748d8aab 100644
--- a/Doc/whatsnew/3.0.rst
+++ b/Doc/whatsnew/3.0.rst
@@ -663,7 +663,7 @@ Some other changes to standard library modules, not covered by
   :data:`string.ascii_letters` etc. instead.  (The reason for the
   removal is that :data:`string.letters` and friends had
   locale-specific behavior, which is a bad idea for such
-  attractively-named global "constants".)
+  attractively named global "constants".)
 
 * Renamed module :mod:`__builtin__` to :mod:`builtins` (removing the
   underscores, adding an 's').  The :data:`__builtins__` variable
diff --git a/Doc/whatsnew/3.3.rst b/Doc/whatsnew/3.3.rst
index 361e6db07c3cd..0f989464c9c81 100644
--- a/Doc/whatsnew/3.3.rst
+++ b/Doc/whatsnew/3.3.rst
@@ -101,7 +101,7 @@ PEP 405: Virtual Environments
 
 Virtual environments help create separate Python setups while sharing a
 system-wide base install, for ease of maintenance.  Virtual environments
-have their own set of private site packages (i.e. locally-installed
+have their own set of private site packages (i.e. locally installed
 libraries), and are optionally segregated from the system-wide site
 packages.  Their concept and implementation are inspired by the popular
 ``virtualenv`` third-party package, but benefit from tighter integration
@@ -898,7 +898,7 @@ an IP address associated with a specific IP subnet).
 lzma
 ----
 
-The newly-added :mod:`lzma` module provides data compression and decompression
+The newly added :mod:`lzma` module provides data compression and decompression
 using the LZMA algorithm, including support for the ``.xz`` and ``.lzma``
 file formats.
 
@@ -1096,7 +1096,7 @@ decimal
    C-module and libmpdec written by Stefan Krah.
 
 The new C version of the decimal module integrates the high speed libmpdec
-library for arbitrary precision correctly-rounded decimal floating point
+library for arbitrary precision correctly rounded decimal floating point
 arithmetic. libmpdec conforms to IBM's General Decimal Arithmetic Specification.
 
 Performance gains range from 10x for database applications to 100x for
@@ -1158,8 +1158,8 @@ API changes
   in order to obtain a rounded or inexact value.
 
 
-* The power function in decimal.py is always correctly-rounded. In the
-  C version, it is defined in terms of the correctly-rounded
+* The power function in decimal.py is always correctly rounded. In the
+  C version, it is defined in terms of the correctly rounded
   :meth:`~decimal.Decimal.exp` and :meth:`~decimal.Decimal.ln` functions,
   but the final result is only "almost always correctly rounded".
 
@@ -2137,7 +2137,7 @@ zlib
 ----
 
 New attribute :attr:`zlib.Decompress.eof` makes it possible to distinguish
-between a properly-formed compressed stream and an incomplete or truncated one.
+between a properly formed compressed stream and an incomplete or truncated one.
 (Contributed by Nadeem Vawda in :issue:`12646`.)
 
 New attribute :attr:`zlib.ZLIB_RUNTIME_VERSION` reports the version string of
diff --git a/Doc/whatsnew/3.4.rst b/Doc/whatsnew/3.4.rst
index 0405f2ba19346..e179bb9ced0e4 100644
--- a/Doc/whatsnew/3.4.rst
+++ b/Doc/whatsnew/3.4.rst
@@ -1659,7 +1659,7 @@ The :class:`~unittest.TestCase` class has a new method,
 :keyword:`with` block becomes a "sub-test".  This context manager allows a test
 method to dynamically generate subtests  by, say, calling the ``subTest``
 context manager inside a loop.  A single test method can thereby produce an
-indefinite number of separately-identified and separately-counted tests, all of
+indefinite number of separately identified and separately counted tests, all of
 which will run even if one or more of them fail.  For example::
 
     class NumbersTest(unittest.TestCase):
@@ -2056,7 +2056,7 @@ Significant Optimizations
   ``malloc`` in ``obmalloc``.  Artificial benchmarks show about a 3% memory
   savings.
 
-* :func:`os.urandom` now uses a lazily-opened persistent file descriptor
+* :func:`os.urandom` now uses a lazily opened persistent file descriptor
   so as to avoid using many file descriptors when run in parallel from
   multiple threads.  (Contributed by Antoine Pitrou in :issue:`18756`.)
 
diff --git a/Doc/whatsnew/3.7.rst b/Doc/whatsnew/3.7.rst
index 1ee8cfa8f2268..7d6e7f24f542f 100644
--- a/Doc/whatsnew/3.7.rst
+++ b/Doc/whatsnew/3.7.rst
@@ -291,7 +291,7 @@ PEP 539: New C API for Thread-Local Storage
 While Python provides a C API for thread-local storage support; the existing
 :ref:`Thread Local Storage (TLS) API <thread-local-storage-api>` has used
 :c:type:`int` to represent TLS keys across all platforms.  This has not
-generally been a problem for officially-support platforms, but that is neither
+generally been a problem for officially support platforms, but that is neither
 POSIX-compliant, nor portable in any practical sense.
 
 :pep:`539` changes this by providing a new :ref:`Thread Specific Storage (TSS)
@@ -1175,7 +1175,7 @@ of :func:`os.writev` and :func:`os.pwrite`). (Contributed by Pablo Galindo in
 :issue:`31368`.)
 
 The mode argument of :func:`os.makedirs` no longer affects the file
-permission bits of newly-created intermediate-level directories.
+permission bits of newly created intermediate-level directories.
 (Contributed by Serhiy Storchaka in :issue:`19930`.)
 
 :func:`os.dup2` now returns the new file descriptor.  Previously, ``None``
@@ -2296,7 +2296,7 @@ Changes in the Python API
   (Contributed by Serhiy Storchaka in :issue:`29192`.)
 
 * The *mode* argument of :func:`os.makedirs` no longer affects the file
-  permission bits of newly-created intermediate-level directories.
+  permission bits of newly created intermediate-level directories.
   To set their file permission bits you can set the umask before invoking
   ``makedirs()``.
   (Contributed by Serhiy Storchaka in :issue:`19930`.)
diff --git a/Misc/NEWS.d/3.10.0a3.rst b/Misc/NEWS.d/3.10.0a3.rst
index 4f182e8e3f1f0..699a0dd9e8d7c 100644
--- a/Misc/NEWS.d/3.10.0a3.rst
+++ b/Misc/NEWS.d/3.10.0a3.rst
@@ -763,7 +763,7 @@ as a positional-only argument.
 .. nonce: qLkNh8
 .. section: Library
 
-Enum: fix regression involving inheriting a multiply-inherited enum
+Enum: fix regression involving inheriting a multiply inherited enum
 
 ..
 
diff --git a/Misc/NEWS.d/3.10.0a4.rst b/Misc/NEWS.d/3.10.0a4.rst
index 214f9e521a55d..74c0af3094237 100644
--- a/Misc/NEWS.d/3.10.0a4.rst
+++ b/Misc/NEWS.d/3.10.0a4.rst
@@ -446,7 +446,7 @@ In ``importlib.metadata``: -  ``EntryPoint`` objects now expose a ``.dist``
 object referencing the ``Distribution`` when constructed from a
 ``Distribution``. - Add support for package discovery under package
 normalization rules. - The object returned by ``metadata()`` now has a
-formally-defined protocol called ``PackageMetadata`` with declared support
+formally defined protocol called ``PackageMetadata`` with declared support
 for the ``.get_all()`` method. - Synced with importlib_metadata 3.3.
 
 ..
diff --git a/Misc/NEWS.d/3.7.0a1.rst b/Misc/NEWS.d/3.7.0a1.rst
index 244bb37e7c61d..e99c45ec7fdaa 100644
--- a/Misc/NEWS.d/3.7.0a1.rst
+++ b/Misc/NEWS.d/3.7.0a1.rst
@@ -3149,7 +3149,7 @@ they are finished in multiprocessing.Pool.
 .. section: Library
 
 The mode argument of os.makedirs() no longer affects the file permission
-bits of newly-created intermediate-level directories.
+bits of newly created intermediate-level directories.
 
 ..
 
diff --git a/Misc/NEWS.d/3.8.0a1.rst b/Misc/NEWS.d/3.8.0a1.rst
index 09b858d250c33..d95055a59da32 100644
--- a/Misc/NEWS.d/3.8.0a1.rst
+++ b/Misc/NEWS.d/3.8.0a1.rst
@@ -361,7 +361,7 @@ the "n" formatter.
 .. nonce: gjm1LO
 .. section: Core and Builtins
 
-Fix a possible segfault involving a newly-created coroutine.  Patch by
+Fix a possible segfault involving a newly created coroutine.  Patch by
 Zackery Spytz.
 
 ..
diff --git a/Misc/NEWS.d/3.8.0a2.rst b/Misc/NEWS.d/3.8.0a2.rst
index 1c0abab4c474a..223126145c77f 100644
--- a/Misc/NEWS.d/3.8.0a2.rst
+++ b/Misc/NEWS.d/3.8.0a2.rst
@@ -356,7 +356,7 @@ Add *headers* optional keyword-only parameter to
 .. section: Library
 
 Fix C implementation of pickle.loads to use importlib's locking mechanisms,
-and thereby avoid using partially-loaded modules. Patch by Tim Burgess.
+and thereby avoid using partially loaded modules. Patch by Tim Burgess.
 
 ..
 


From webhook-mailer at python.org  Tue Jul  5 08:33:30 2022
From: webhook-mailer at python.org (ambv)
Date: Tue, 05 Jul 2022 12:33:30 -0000
Subject: [Python-checkins] gh-94538: Fix Argument Clinic output to custom
 file (GH-94539) (GH-94556)
Message-ID: <mailman.2085.1657024411.20746.python-checkins@python.org>

https://github.com/python/cpython/commit/5bd56a030ddf19052f23194e7ff95b4b9144f94f
commit: 5bd56a030ddf19052f23194e7ff95b4b9144f94f
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: ambv <lukasz at langa.pl>
date: 2022-07-05T14:33:23+02:00
summary:

gh-94538: Fix Argument Clinic output to custom file (GH-94539) (GH-94556)

(cherry picked from commit 2b8ed4d3d4741811da31fc774a202d535755c0a9)

Co-authored-by: Erlend Egeberg Aasland <erlend.aasland at protonmail.com>

files:
A Misc/NEWS.d/next/Tools-Demos/2022-07-04-01-37-42.gh-issue-94538.1rgy1Y.rst
M Tools/clinic/clinic.py

diff --git a/Misc/NEWS.d/next/Tools-Demos/2022-07-04-01-37-42.gh-issue-94538.1rgy1Y.rst b/Misc/NEWS.d/next/Tools-Demos/2022-07-04-01-37-42.gh-issue-94538.1rgy1Y.rst
new file mode 100644
index 0000000000000..e39ae3950c0fe
--- /dev/null
+++ b/Misc/NEWS.d/next/Tools-Demos/2022-07-04-01-37-42.gh-issue-94538.1rgy1Y.rst
@@ -0,0 +1,2 @@
+Fix Argument Clinic output to custom file destinations. Patch by Erlend E.
+Aasland.
diff --git a/Tools/clinic/clinic.py b/Tools/clinic/clinic.py
index 9ea2784085aac..8deea13b63750 100755
--- a/Tools/clinic/clinic.py
+++ b/Tools/clinic/clinic.py
@@ -4053,7 +4053,7 @@ def directive_output(self, command_or_name, destination=''):
             self.block.output.append('\n')
             return
 
-        d = self.clinic.get_destination(destination)
+        d = self.clinic.get_destination_buffer(destination)
 
         if command_or_name == "everything":
             for name in list(fd):


From webhook-mailer at python.org  Tue Jul  5 08:34:04 2022
From: webhook-mailer at python.org (ambv)
Date: Tue, 05 Jul 2022 12:34:04 -0000
Subject: [Python-checkins] gh-94538: Fix Argument Clinic output to custom
 file (GH-94539) (GH-94555)
Message-ID: <mailman.2086.1657024445.20746.python-checkins@python.org>

https://github.com/python/cpython/commit/e28446858f57501b488c76ba5dc93368566da25b
commit: e28446858f57501b488c76ba5dc93368566da25b
branch: 3.11
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: ambv <lukasz at langa.pl>
date: 2022-07-05T14:33:59+02:00
summary:

gh-94538: Fix Argument Clinic output to custom file (GH-94539) (GH-94555)

(cherry picked from commit 2b8ed4d3d4741811da31fc774a202d535755c0a9)

Co-authored-by: Erlend Egeberg Aasland <erlend.aasland at protonmail.com>

files:
A Misc/NEWS.d/next/Tools-Demos/2022-07-04-01-37-42.gh-issue-94538.1rgy1Y.rst
M Tools/clinic/clinic.py

diff --git a/Misc/NEWS.d/next/Tools-Demos/2022-07-04-01-37-42.gh-issue-94538.1rgy1Y.rst b/Misc/NEWS.d/next/Tools-Demos/2022-07-04-01-37-42.gh-issue-94538.1rgy1Y.rst
new file mode 100644
index 0000000000000..e39ae3950c0fe
--- /dev/null
+++ b/Misc/NEWS.d/next/Tools-Demos/2022-07-04-01-37-42.gh-issue-94538.1rgy1Y.rst
@@ -0,0 +1,2 @@
+Fix Argument Clinic output to custom file destinations. Patch by Erlend E.
+Aasland.
diff --git a/Tools/clinic/clinic.py b/Tools/clinic/clinic.py
index 5ad4f879a33f7..791d43408233c 100755
--- a/Tools/clinic/clinic.py
+++ b/Tools/clinic/clinic.py
@@ -4131,7 +4131,7 @@ def directive_output(self, command_or_name, destination=''):
             self.block.output.append('\n')
             return
 
-        d = self.clinic.get_destination(destination)
+        d = self.clinic.get_destination_buffer(destination)
 
         if command_or_name == "everything":
             for name in list(fd):


From webhook-mailer at python.org  Tue Jul  5 08:35:14 2022
From: webhook-mailer at python.org (ambv)
Date: Tue, 05 Jul 2022 12:35:14 -0000
Subject: [Python-checkins] gh-84753: Clarify change made to `inspect`
 functions (GH-94554) (GH-94560)
Message-ID: <mailman.2087.1657024515.20746.python-checkins@python.org>

https://github.com/python/cpython/commit/0615e7f9bbc0ba07f48582df7857122d3f4c82b0
commit: 0615e7f9bbc0ba07f48582df7857122d3f4c82b0
branch: 3.11
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: ambv <lukasz at langa.pl>
date: 2022-07-05T14:35:09+02:00
summary:

gh-84753: Clarify change made to `inspect` functions (GH-94554) (GH-94560)

(cherry picked from commit a2a3f2c541290fc8f0720d1abdc12d564b856c28)

Co-authored-by: ?ukasz Langa <lukasz at langa.pl>

files:
M Misc/NEWS.d/next/Library/2022-06-21-11-40-31.gh-issue-84753.FW1pxO.rst

diff --git a/Misc/NEWS.d/next/Library/2022-06-21-11-40-31.gh-issue-84753.FW1pxO.rst b/Misc/NEWS.d/next/Library/2022-06-21-11-40-31.gh-issue-84753.FW1pxO.rst
index f701d2a1afeb8..eeae2edf7161a 100644
--- a/Misc/NEWS.d/next/Library/2022-06-21-11-40-31.gh-issue-84753.FW1pxO.rst
+++ b/Misc/NEWS.d/next/Library/2022-06-21-11-40-31.gh-issue-84753.FW1pxO.rst
@@ -1,3 +1,7 @@
-:func:`inspect.iscoroutinefunction` now properly returns ``True`` when an instance
-of :class:`unittest.mock.AsyncMock` is passed to it.  This makes it consistent with
+:func:`inspect.iscoroutinefunction`, :func:`inspect.isgeneratorfunction`,
+and :func:`inspect.isasyncgenfunction` now properly return ``True`` for
+duck-typed function-like objects like instances of
+:class:`unittest.mock.AsyncMock`.
+
+This makes :func:`inspect.iscoroutinefunction` consistent with the
 behavior of :func:`asyncio.iscoroutinefunction`.  Patch by Mehdi ABAAKOUK.


From webhook-mailer at python.org  Tue Jul  5 08:38:53 2022
From: webhook-mailer at python.org (ambv)
Date: Tue, 05 Jul 2022 12:38:53 -0000
Subject: [Python-checkins] gh-94485: Set line number of module's RESUME
 instruction to 0, as specified by PEP 626 (GH-94552)
Message-ID: <mailman.2088.1657024735.20746.python-checkins@python.org>

https://github.com/python/cpython/commit/324d01944d16868b07df9e8eef6987766a31a36d
commit: 324d01944d16868b07df9e8eef6987766a31a36d
branch: main
author: Irit Katriel <1055913+iritkatriel at users.noreply.github.com>
committer: ambv <lukasz at langa.pl>
date: 2022-07-05T14:38:44+02:00
summary:

gh-94485: Set line number of module's RESUME instruction to 0, as specified by PEP 626 (GH-94552)

Co-authored-by: Mark Shannon <mark at hotpy.org>

files:
A Misc/NEWS.d/next/Core and Builtins/2022-07-01-20-00-19.gh-issue-94485.mo5st7.rst
M Lib/importlib/_bootstrap_external.py
M Lib/test/test_code.py
M Lib/test/test_compile.py
M Lib/test/test_dis.py
M Programs/test_frozenmain.h
M Python/compile.c

diff --git a/Lib/importlib/_bootstrap_external.py b/Lib/importlib/_bootstrap_external.py
index 6cd3538624cb4..007127b9fd426 100644
--- a/Lib/importlib/_bootstrap_external.py
+++ b/Lib/importlib/_bootstrap_external.py
@@ -410,6 +410,7 @@ def _write_atomic(path, data, mode=0o666):
 #     Python 3.12a1 3504 (Merge LOAD_METHOD back into LOAD_ATTR)
 #     Python 3.12a1 3505 (Specialization/Cache for FOR_ITER)
 #     Python 3.12a1 3506 (Add BINARY_SLICE and STORE_SLICE instructions)
+#     Python 3.12a1 3507 (Set lineno of module's RESUME to 0)
 
 #     Python 3.13 will start with 3550
 
@@ -423,7 +424,7 @@ def _write_atomic(path, data, mode=0o666):
 # Whenever MAGIC_NUMBER is changed, the ranges in the magic_values array
 # in PC/launcher.c must also be updated.
 
-MAGIC_NUMBER = (3506).to_bytes(2, 'little') + b'\r\n'
+MAGIC_NUMBER = (3507).to_bytes(2, 'little') + b'\r\n'
 
 _RAW_MAGIC_NUMBER = int.from_bytes(MAGIC_NUMBER, 'little')  # For import.c
 
diff --git a/Lib/test/test_code.py b/Lib/test/test_code.py
index 308141aaf10e5..fd68f6dee7915 100644
--- a/Lib/test/test_code.py
+++ b/Lib/test/test_code.py
@@ -376,7 +376,6 @@ def test_co_positions_artificial_instructions(self):
                 for instruction in artificial_instructions
             ],
             [
-                ('RESUME', 0),
                 ("PUSH_EXC_INFO", None),
                 ("LOAD_CONST", None), # artificial 'None'
                 ("STORE_NAME", "e"),  # XX: we know the location for this
diff --git a/Lib/test/test_compile.py b/Lib/test/test_compile.py
index 46b16e753ceee..ab1685d3e5b8a 100644
--- a/Lib/test/test_compile.py
+++ b/Lib/test/test_compile.py
@@ -161,7 +161,7 @@ def test_leading_newlines(self):
         co = compile(s256, 'fn', 'exec')
         self.assertEqual(co.co_firstlineno, 1)
         lines = list(co.co_lines())
-        self.assertEqual(lines[0][2], None)
+        self.assertEqual(lines[0][2], 0)
         self.assertEqual(lines[1][2], 257)
 
     def test_literals_with_leading_zeroes(self):
@@ -1032,8 +1032,8 @@ def test_uses_slice_instructions(self):
         def check_op_count(func, op, expected):
             actual = 0
             for instr in dis.Bytecode(func):
-                 if instr.opname == op:
-                     actual += 1
+                if instr.opname == op:
+                    actual += 1
             self.assertEqual(actual, expected)
 
         def load():
@@ -1090,6 +1090,8 @@ def generic_visit(self, node):
 
         # Check against the positions in the code object.
         for (line, end_line, col, end_col) in code.co_positions():
+            if line == 0:
+                continue # This is an artificial module-start line
             # If the offset is not None (indicating missing data), ensure that
             # it was part of one of the AST nodes.
             if line is not None:
diff --git a/Lib/test/test_dis.py b/Lib/test/test_dis.py
index 07f1203ff0688..256004855d4a6 100644
--- a/Lib/test/test_dis.py
+++ b/Lib/test/test_dis.py
@@ -267,7 +267,7 @@ def bug42562():
 expr_str = "x + 1"
 
 dis_expr_str = """\
-           RESUME                   0
+  0        RESUME                   0
 
   1        LOAD_NAME                0 (x)
            LOAD_CONST               0 (1)
@@ -278,7 +278,7 @@ def bug42562():
 simple_stmt_str = "x = x + 1"
 
 dis_simple_stmt_str = """\
-           RESUME                   0
+  0        RESUME                   0
 
   1        LOAD_NAME                0 (x)
            LOAD_CONST               0 (1)
@@ -297,7 +297,7 @@ def bug42562():
 # leading newline is for a reason (tests lineno)
 
 dis_annot_stmt_str = """\
-           RESUME                   0
+  0        RESUME                   0
 
   2        SETUP_ANNOTATIONS
            LOAD_CONST               0 (1)
@@ -335,7 +335,7 @@ def bug42562():
 # Trailing newline has been deliberately omitted
 
 dis_compound_stmt_str = """\
-           RESUME                   0
+  0        RESUME                   0
 
   1        LOAD_CONST               0 (0)
            STORE_NAME               0 (x)
@@ -1092,7 +1092,7 @@ def test_super_instructions(self):
     @cpython_only
     def test_binary_specialize(self):
         binary_op_quicken = """\
-              0 RESUME_QUICK             0
+  0           0 RESUME_QUICK             0
 
   1           2 LOAD_NAME                0 (a)
               4 LOAD_NAME                1 (b)
@@ -1110,7 +1110,7 @@ def test_binary_specialize(self):
         self.do_disassembly_compare(got, binary_op_quicken % "BINARY_OP_ADD_UNICODE     0 (+)", True)
 
         binary_subscr_quicken = """\
-              0 RESUME_QUICK             0
+  0           0 RESUME_QUICK             0
 
   1           2 LOAD_NAME                0 (a)
               4 LOAD_CONST               0 (0)
@@ -1130,7 +1130,7 @@ def test_binary_specialize(self):
     @cpython_only
     def test_load_attr_specialize(self):
         load_attr_quicken = """\
-              0 RESUME_QUICK             0
+  0           0 RESUME_QUICK             0
 
   1           2 LOAD_CONST               0 ('a')
               4 LOAD_ATTR_SLOT           0 (__class__)
@@ -1144,7 +1144,7 @@ def test_load_attr_specialize(self):
     @cpython_only
     def test_call_specialize(self):
         call_quicken = """\
-           RESUME_QUICK             0
+  0        RESUME_QUICK             0
 
   1        PUSH_NULL
            LOAD_NAME                0 (str)
@@ -1718,7 +1718,7 @@ def test_co_positions(self):
             for instr in dis.get_instructions(code)
         ]
         expected = [
-            (None, None, None, None),
+            (0, 1, 0, 0),
             (1, 1, 0, 1),
             (1, 1, 0, 1),
             (2, 2, 2, 3),
diff --git a/Misc/NEWS.d/next/Core and Builtins/2022-07-01-20-00-19.gh-issue-94485.mo5st7.rst b/Misc/NEWS.d/next/Core and Builtins/2022-07-01-20-00-19.gh-issue-94485.mo5st7.rst
new file mode 100644
index 0000000000000..14d90b7e764a7
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2022-07-01-20-00-19.gh-issue-94485.mo5st7.rst	
@@ -0,0 +1,2 @@
+Line number of a module's ``RESUME`` instruction is set to 0 as specified in
+:pep:`626`.
diff --git a/Programs/test_frozenmain.h b/Programs/test_frozenmain.h
index 55d461c8beb80..677ce180f95fd 100644
--- a/Programs/test_frozenmain.h
+++ b/Programs/test_frozenmain.h
@@ -28,15 +28,15 @@ unsigned char M_test_frozenmain[] = {
     3,0,0,0,218,3,107,101,121,169,0,243,0,0,0,0,
     250,18,116,101,115,116,95,102,114,111,122,101,110,109,97,105,
     110,46,112,121,250,8,60,109,111,100,117,108,101,62,114,18,
-    0,0,0,1,0,0,0,115,145,0,0,0,248,240,6,0,
-    1,11,128,10,128,10,128,10,216,0,24,208,0,24,208,0,
-    24,208,0,24,224,0,5,128,5,208,6,26,212,0,27,208,
-    0,27,216,0,5,128,5,128,106,144,35,151,40,145,40,212,
-    0,27,208,0,27,216,9,38,208,9,26,215,9,38,209,9,
-    38,212,9,40,168,24,212,9,50,128,6,240,2,6,12,2,
-    240,0,7,1,42,241,0,7,1,42,128,67,240,14,0,5,
-    10,128,69,208,10,40,144,67,208,10,40,208,10,40,152,54,
-    160,35,156,59,208,10,40,208,10,40,212,4,41,208,4,41,
-    208,4,41,240,15,7,1,42,240,0,7,1,42,114,16,0,
-    0,0,
+    0,0,0,1,0,0,0,115,149,0,0,0,240,3,1,1,
+    1,240,8,0,1,11,128,10,128,10,128,10,216,0,24,208,
+    0,24,208,0,24,208,0,24,224,0,5,128,5,208,6,26,
+    212,0,27,208,0,27,216,0,5,128,5,128,106,144,35,151,
+    40,145,40,212,0,27,208,0,27,216,9,38,208,9,26,215,
+    9,38,209,9,38,212,9,40,168,24,212,9,50,128,6,240,
+    2,6,12,2,240,0,7,1,42,241,0,7,1,42,128,67,
+    240,14,0,5,10,128,69,208,10,40,144,67,208,10,40,208,
+    10,40,152,54,160,35,156,59,208,10,40,208,10,40,212,4,
+    41,208,4,41,208,4,41,240,15,7,1,42,240,0,7,1,
+    42,114,16,0,0,0,
 };
diff --git a/Python/compile.c b/Python/compile.c
index 5ae1e345201ce..77176893f60c5 100644
--- a/Python/compile.c
+++ b/Python/compile.c
@@ -1759,7 +1759,7 @@ compiler_enter_scope(struct compiler *c, identifier name,
     c->u->u_curblock = block;
 
     if (u->u_scope_type == COMPILER_SCOPE_MODULE) {
-        c->u->u_loc.lineno = -1;
+        c->u->u_loc.lineno = 0;
     }
     else {
         if (!compiler_set_qualname(c))
@@ -1767,6 +1767,9 @@ compiler_enter_scope(struct compiler *c, identifier name,
     }
     ADDOP_I(c, RESUME, 0);
 
+    if (u->u_scope_type == COMPILER_SCOPE_MODULE) {
+        c->u->u_loc.lineno = -1;
+    }
     return 1;
 }
 


From webhook-mailer at python.org  Tue Jul  5 10:01:50 2022
From: webhook-mailer at python.org (ambv)
Date: Tue, 05 Jul 2022 14:01:50 -0000
Subject: [Python-checkins] [3.11] gh-94485: Set line number of module's
 RESUME instruction to 0 as specified by PEP 626 (GH-94552) (GH-94562)
Message-ID: <mailman.2089.1657029711.20746.python-checkins@python.org>

https://github.com/python/cpython/commit/1bfe83a114da3939c00746fc44dc5da7f56f525f
commit: 1bfe83a114da3939c00746fc44dc5da7f56f525f
branch: 3.11
author: ?ukasz Langa <lukasz at langa.pl>
committer: ambv <lukasz at langa.pl>
date: 2022-07-05T16:01:24+02:00
summary:

[3.11] gh-94485: Set line number of module's RESUME instruction to 0 as specified by PEP 626 (GH-94552) (GH-94562)

Co-authored-by: Irit Katriel <1055913+iritkatriel at users.noreply.github.com>
Co-authored-by: Mark Shannon <mark at hotpy.org>

(cherry picked from commit 324d01944d16868b07df9e8eef6987766a31a36d)

files:
A Misc/NEWS.d/next/Core and Builtins/2022-07-01-20-00-19.gh-issue-94485.mo5st7.rst
M Lib/importlib/_bootstrap_external.py
M Lib/test/test_code.py
M Lib/test/test_compile.py
M Lib/test/test_dis.py
M Programs/test_frozenmain.h
M Python/compile.c

diff --git a/Lib/importlib/_bootstrap_external.py b/Lib/importlib/_bootstrap_external.py
index 0061ad091c23b..446d7981acbab 100644
--- a/Lib/importlib/_bootstrap_external.py
+++ b/Lib/importlib/_bootstrap_external.py
@@ -402,7 +402,8 @@ def _write_atomic(path, data, mode=0o666):
 #                         add JUMP_BACKWARD_NO_INTERRUPT, make JUMP_NO_INTERRUPT virtual)
 #     Python 3.11a7 3492 (make POP_JUMP_IF_NONE/NOT_NONE/TRUE/FALSE relative)
 #     Python 3.11a7 3493 (Make JUMP_IF_TRUE_OR_POP/JUMP_IF_FALSE_OR_POP relative)
-#    Python 3.11a7 3494 (New location info table)
+#     Python 3.11a7 3494 (New location info table)
+#     Python 3.11b4 3495 (Set line number of module's RESUME instr to 0 per PEP 626)
 #     Python 3.12 will start with magic number 3500
 
 
@@ -416,7 +417,7 @@ def _write_atomic(path, data, mode=0o666):
 # Whenever MAGIC_NUMBER is changed, the ranges in the magic_values array
 # in PC/launcher.c must also be updated.
 
-MAGIC_NUMBER = (3494).to_bytes(2, 'little') + b'\r\n'
+MAGIC_NUMBER = (3495).to_bytes(2, 'little') + b'\r\n'
 
 _RAW_MAGIC_NUMBER = int.from_bytes(MAGIC_NUMBER, 'little')  # For import.c
 
diff --git a/Lib/test/test_code.py b/Lib/test/test_code.py
index 308141aaf10e5..fd68f6dee7915 100644
--- a/Lib/test/test_code.py
+++ b/Lib/test/test_code.py
@@ -376,7 +376,6 @@ def test_co_positions_artificial_instructions(self):
                 for instruction in artificial_instructions
             ],
             [
-                ('RESUME', 0),
                 ("PUSH_EXC_INFO", None),
                 ("LOAD_CONST", None), # artificial 'None'
                 ("STORE_NAME", "e"),  # XX: we know the location for this
diff --git a/Lib/test/test_compile.py b/Lib/test/test_compile.py
index d7c536e4ab20d..d113a00088f2c 100644
--- a/Lib/test/test_compile.py
+++ b/Lib/test/test_compile.py
@@ -161,7 +161,7 @@ def test_leading_newlines(self):
         co = compile(s256, 'fn', 'exec')
         self.assertEqual(co.co_firstlineno, 1)
         lines = list(co.co_lines())
-        self.assertEqual(lines[0][2], None)
+        self.assertEqual(lines[0][2], 0)
         self.assertEqual(lines[1][2], 257)
 
     def test_literals_with_leading_zeroes(self):
@@ -1054,6 +1054,8 @@ def generic_visit(self, node):
 
         # Check against the positions in the code object.
         for (line, end_line, col, end_col) in code.co_positions():
+            if line == 0:
+                continue # This is an artificial module-start line
             # If the offset is not None (indicating missing data), ensure that
             # it was part of one of the AST nodes.
             if line is not None:
diff --git a/Lib/test/test_dis.py b/Lib/test/test_dis.py
index e3e4a3768e7bd..4283c30e0a1c1 100644
--- a/Lib/test/test_dis.py
+++ b/Lib/test/test_dis.py
@@ -272,7 +272,7 @@ def bug42562():
 expr_str = "x + 1"
 
 dis_expr_str = """\
-           RESUME                   0
+  0        RESUME                   0
 
   1        LOAD_NAME                0 (x)
            LOAD_CONST               0 (1)
@@ -283,7 +283,7 @@ def bug42562():
 simple_stmt_str = "x = x + 1"
 
 dis_simple_stmt_str = """\
-           RESUME                   0
+  0        RESUME                   0
 
   1        LOAD_NAME                0 (x)
            LOAD_CONST               0 (1)
@@ -302,7 +302,7 @@ def bug42562():
 # leading newline is for a reason (tests lineno)
 
 dis_annot_stmt_str = """\
-           RESUME                   0
+  0        RESUME                   0
 
   2        SETUP_ANNOTATIONS
            LOAD_CONST               0 (1)
@@ -342,7 +342,7 @@ def bug42562():
 # Trailing newline has been deliberately omitted
 
 dis_compound_stmt_str = """\
-           RESUME                   0
+  0        RESUME                   0
 
   1        LOAD_CONST               0 (0)
            STORE_NAME               0 (x)
@@ -954,7 +954,7 @@ def test_super_instructions(self):
     @cpython_only
     def test_binary_specialize(self):
         binary_op_quicken = """\
-              0 RESUME_QUICK             0
+  0           0 RESUME_QUICK             0
 
   1           2 LOAD_NAME                0 (a)
               4 LOAD_NAME                1 (b)
@@ -972,7 +972,7 @@ def test_binary_specialize(self):
         self.do_disassembly_compare(got, binary_op_quicken % "BINARY_OP_ADD_UNICODE     0 (+)", True)
 
         binary_subscr_quicken = """\
-              0 RESUME_QUICK             0
+  0           0 RESUME_QUICK             0
 
   1           2 LOAD_NAME                0 (a)
               4 LOAD_CONST               0 (0)
@@ -992,7 +992,7 @@ def test_binary_specialize(self):
     @cpython_only
     def test_load_attr_specialize(self):
         load_attr_quicken = """\
-              0 RESUME_QUICK             0
+  0           0 RESUME_QUICK             0
 
   1           2 LOAD_CONST               0 ('a')
               4 LOAD_ATTR_SLOT           0 (__class__)
@@ -1006,7 +1006,7 @@ def test_load_attr_specialize(self):
     @cpython_only
     def test_call_specialize(self):
         call_quicken = """\
-              0 RESUME_QUICK             0
+  0           0 RESUME_QUICK             0
 
   1           2 PUSH_NULL
               4 LOAD_NAME                0 (str)
@@ -1595,7 +1595,7 @@ def test_co_positions(self):
             for instr in dis.get_instructions(code)
         ]
         expected = [
-            (None, None, None, None),
+            (0, 1, 0, 0),
             (1, 1, 0, 1),
             (1, 1, 0, 1),
             (2, 2, 2, 3),
diff --git a/Misc/NEWS.d/next/Core and Builtins/2022-07-01-20-00-19.gh-issue-94485.mo5st7.rst b/Misc/NEWS.d/next/Core and Builtins/2022-07-01-20-00-19.gh-issue-94485.mo5st7.rst
new file mode 100644
index 0000000000000..14d90b7e764a7
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2022-07-01-20-00-19.gh-issue-94485.mo5st7.rst	
@@ -0,0 +1,2 @@
+Line number of a module's ``RESUME`` instruction is set to 0 as specified in
+:pep:`626`.
diff --git a/Programs/test_frozenmain.h b/Programs/test_frozenmain.h
index eec2e0cc6048f..0b658000d4465 100644
--- a/Programs/test_frozenmain.h
+++ b/Programs/test_frozenmain.h
@@ -28,15 +28,15 @@ unsigned char M_test_frozenmain[] = {
     107,101,121,169,0,243,0,0,0,0,250,18,116,101,115,116,
     95,102,114,111,122,101,110,109,97,105,110,46,112,121,250,8,
     60,109,111,100,117,108,101,62,114,18,0,0,0,1,0,0,
-    0,115,152,0,0,0,248,240,6,0,1,11,128,10,128,10,
-    128,10,216,0,24,208,0,24,208,0,24,208,0,24,224,0,
-    5,128,5,208,6,26,209,0,27,212,0,27,208,0,27,216,
-    0,5,128,5,128,106,144,35,148,40,209,0,27,212,0,27,
-    208,0,27,216,9,38,208,9,26,212,9,38,209,9,40,212,
-    9,40,168,24,212,9,50,128,6,240,2,6,12,2,240,0,
-    7,1,42,240,0,7,1,42,128,67,240,14,0,5,10,128,
-    69,208,10,40,144,67,208,10,40,208,10,40,152,54,160,35,
-    156,59,208,10,40,208,10,40,209,4,41,212,4,41,208,4,
-    41,208,4,41,240,15,7,1,42,240,0,7,1,42,114,16,
-    0,0,0,
+    0,115,156,0,0,0,240,3,1,1,1,240,8,0,1,11,
+    128,10,128,10,128,10,216,0,24,208,0,24,208,0,24,208,
+    0,24,224,0,5,128,5,208,6,26,209,0,27,212,0,27,
+    208,0,27,216,0,5,128,5,128,106,144,35,148,40,209,0,
+    27,212,0,27,208,0,27,216,9,38,208,9,26,212,9,38,
+    209,9,40,212,9,40,168,24,212,9,50,128,6,240,2,6,
+    12,2,240,0,7,1,42,240,0,7,1,42,128,67,240,14,
+    0,5,10,128,69,208,10,40,144,67,208,10,40,208,10,40,
+    152,54,160,35,156,59,208,10,40,208,10,40,209,4,41,212,
+    4,41,208,4,41,208,4,41,240,15,7,1,42,240,0,7,
+    1,42,114,16,0,0,0,
 };
diff --git a/Python/compile.c b/Python/compile.c
index 1bb0d96207d1d..cfe4b6ec04f9e 100644
--- a/Python/compile.c
+++ b/Python/compile.c
@@ -1803,7 +1803,7 @@ compiler_enter_scope(struct compiler *c, identifier name,
     c->u->u_curblock = block;
 
     if (u->u_scope_type == COMPILER_SCOPE_MODULE) {
-        c->u->u_lineno = -1;
+        c->u->u_lineno = 0;
     }
     else {
         if (!compiler_set_qualname(c))
@@ -1811,6 +1811,9 @@ compiler_enter_scope(struct compiler *c, identifier name,
     }
     ADDOP_I(c, RESUME, 0);
 
+    if (u->u_scope_type == COMPILER_SCOPE_MODULE) {
+        c->u->u_lineno = -1;
+    }
     return 1;
 }
 


From webhook-mailer at python.org  Tue Jul  5 10:23:44 2022
From: webhook-mailer at python.org (vsajip)
Date: Tue, 05 Jul 2022 14:23:44 -0000
Subject: [Python-checkins] bpo-46755: Don't log stack info twice in
 QueueHandler (GH-31355)
Message-ID: <mailman.2090.1657031025.20746.python-checkins@python.org>

https://github.com/python/cpython/commit/c60f125533b8808317c1370450f0535430d59d8c
commit: c60f125533b8808317c1370450f0535430d59d8c
branch: main
author: Erik Montnemery <erik at montnemery.com>
committer: vsajip <vinay_sajip at yahoo.co.uk>
date: 2022-07-05T15:23:12+01:00
summary:

bpo-46755: Don't log stack info twice in QueueHandler (GH-31355)

files:
A Misc/NEWS.d/next/Library/2022-02-15-12-40-48.bpo-46755.zePJfx.rst
M Doc/library/logging.handlers.rst
M Lib/logging/handlers.py
M Lib/test/test_logging.py

diff --git a/Doc/library/logging.handlers.rst b/Doc/library/logging.handlers.rst
index 4bdd5508c67c4..1447cabb9a1df 100644
--- a/Doc/library/logging.handlers.rst
+++ b/Doc/library/logging.handlers.rst
@@ -1034,7 +1034,7 @@ possible, while any potentially slow operations (such as sending an email via
       method is enqueued.
 
       The base implementation formats the record to merge the message,
-      arguments, and exception information, if present.  It also removes
+      arguments, exception and stack information, if present.  It also removes
       unpickleable items from the record in-place. Specifically, it overwrites
       the record's :attr:`msg` and :attr:`message` attributes with the merged
       message (obtained by calling the handler's :meth:`format` method), and
diff --git a/Lib/logging/handlers.py b/Lib/logging/handlers.py
index b4c8a3ba9a189..1c8226c181632 100644
--- a/Lib/logging/handlers.py
+++ b/Lib/logging/handlers.py
@@ -1456,7 +1456,7 @@ def prepare(self, record):
         # (if there's exception data), and also returns the formatted
         # message. We can then use this to replace the original
         # msg + args, as these might be unpickleable. We also zap the
-        # exc_info and exc_text attributes, as they are no longer
+        # exc_info, exc_text and stack_info attributes, as they are no longer
         # needed and, if not None, will typically not be pickleable.
         msg = self.format(record)
         # bpo-35726: make copy of record to avoid affecting other handlers in the chain.
@@ -1466,6 +1466,7 @@ def prepare(self, record):
         record.args = None
         record.exc_info = None
         record.exc_text = None
+        record.stack_info = None
         return record
 
     def emit(self, record):
diff --git a/Lib/test/test_logging.py b/Lib/test/test_logging.py
index 0aec0728c0a8a..a900dabec6774 100644
--- a/Lib/test/test_logging.py
+++ b/Lib/test/test_logging.py
@@ -3808,7 +3808,7 @@ def test_queue_listener(self):
     @unittest.skipUnless(hasattr(logging.handlers, 'QueueListener'),
                          'logging.handlers.QueueListener required for this test')
     def test_queue_listener_with_StreamHandler(self):
-        # Test that traceback only appends once (bpo-34334).
+        # Test that traceback and stack-info only appends once (bpo-34334, bpo-46755).
         listener = logging.handlers.QueueListener(self.queue, self.root_hdlr)
         listener.start()
         try:
@@ -3816,8 +3816,10 @@ def test_queue_listener_with_StreamHandler(self):
         except ZeroDivisionError as e:
             exc = e
             self.que_logger.exception(self.next_message(), exc_info=exc)
+        self.que_logger.error(self.next_message(), stack_info=True)
         listener.stop()
         self.assertEqual(self.stream.getvalue().strip().count('Traceback'), 1)
+        self.assertEqual(self.stream.getvalue().strip().count('Stack'), 1)
 
     @unittest.skipUnless(hasattr(logging.handlers, 'QueueListener'),
                          'logging.handlers.QueueListener required for this test')
diff --git a/Misc/NEWS.d/next/Library/2022-02-15-12-40-48.bpo-46755.zePJfx.rst b/Misc/NEWS.d/next/Library/2022-02-15-12-40-48.bpo-46755.zePJfx.rst
new file mode 100644
index 0000000000000..399caf7253593
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2022-02-15-12-40-48.bpo-46755.zePJfx.rst
@@ -0,0 +1,2 @@
+In :class:`QueueHandler`, clear ``stack_info`` from :class:`LogRecord` to
+prevent stack trace from being written twice.


From webhook-mailer at python.org  Tue Jul  5 10:37:42 2022
From: webhook-mailer at python.org (ambv)
Date: Tue, 05 Jul 2022 14:37:42 -0000
Subject: [Python-checkins] Docs: Convert PEP 630 (Isolating Extension
 Modules) to a HOWTO (GH-94489)
Message-ID: <mailman.2091.1657031863.20746.python-checkins@python.org>

https://github.com/python/cpython/commit/e6ec6f5b50e8793172e83a9afbb05fe01f236b37
commit: e6ec6f5b50e8793172e83a9afbb05fe01f236b37
branch: main
author: Petr Viktorin <encukou at gmail.com>
committer: ambv <lukasz at langa.pl>
date: 2022-07-05T16:37:28+02:00
summary:

Docs: Convert PEP 630 (Isolating Extension Modules) to a HOWTO (GH-94489)

Co-authored-by: Stanley <46876382+slateny at users.noreply.github.com>
Co-authored-by: Alex Waygood <Alex.Waygood at Gmail.com>

files:
A Doc/howto/isolating-extensions.rst
M Doc/howto/index.rst

diff --git a/Doc/howto/index.rst b/Doc/howto/index.rst
index eae8f143ee206..8a378e6659efc 100644
--- a/Doc/howto/index.rst
+++ b/Doc/howto/index.rst
@@ -31,4 +31,5 @@ Currently, the HOWTOs are:
    clinic.rst
    instrumentation.rst
    annotations.rst
+   isolating-extensions.rst
 
diff --git a/Doc/howto/isolating-extensions.rst b/Doc/howto/isolating-extensions.rst
new file mode 100644
index 0000000000000..8ee7e5e28479a
--- /dev/null
+++ b/Doc/howto/isolating-extensions.rst
@@ -0,0 +1,536 @@
+.. highlight:: c
+
+***************************
+Isolating Extension Modules
+***************************
+
+.. topic:: Abstract
+
+    Traditionally, state belonging to Python extension modules was kept in C
+    ``static`` variables, which have process-wide scope. This document
+    describes problems of such per-process state and shows a safer way:
+    per-module state.
+
+    The document also describes how to switch to per-module state where
+    possible. This transition involves allocating space for that state, potentially
+    switching from static types to heap types, and?perhaps most
+    importantly?accessing per-module state from code.
+
+
+Who should read this
+====================
+
+This guide is written for maintainers of :ref:`C-API <c-api-index>` extensions
+who would like to make that extension safer to use in applications where
+Python itself is used as a library.
+
+
+Background
+==========
+
+An *interpreter* is the context in which Python code runs. It contains
+configuration (e.g. the import path) and runtime state (e.g. the set of
+imported modules).
+
+Python supports running multiple interpreters in one process. There are
+two cases to think about?users may run interpreters:
+
+-  in sequence, with several :c:func:`Py_InitializeEx`/:c:func:`Py_FinalizeEx`
+   cycles, and
+-  in parallel, managing "sub-interpreters" using
+   :c:func:`Py_NewInterpreter`/:c:func:`Py_EndInterpreter`.
+
+Both cases (and combinations of them) would be most useful when
+embedding Python within a library. Libraries generally shouldn't make
+assumptions about the application that uses them, which include
+assuming a process-wide "main Python interpreter".
+
+Historically, Python extension modules don't handle this use case well.
+Many extension modules (and even some stdlib modules) use *per-process*
+global state, because C ``static`` variables are extremely easy to use.
+Thus, data that should be specific to an interpreter ends up being shared
+between interpreters. Unless the extension developer is careful, it is very
+easy to introduce edge cases that lead to crashes when a module is loaded in
+more than one interpreter in the same process.
+
+Unfortunately, *per-interpreter* state is not easy to achieve. Extension
+authors tend to not keep multiple interpreters in mind when developing,
+and it is currently cumbersome to test the behavior.
+
+Enter Per-Module State
+----------------------
+
+Instead of focusing on per-interpreter state, Python's C API is evolving
+to better support the more granular *per-module* state.
+This means that C-level data is be attached to a *module object*.
+Each interpreter creates its own module object, keeping the data separate.
+For testing the isolation, multiple module objects corresponding to a single
+extension can even be loaded in a single interpreter.
+
+Per-module state provides an easy way to think about lifetime and
+resource ownership: the extension module will initialize when a
+module object is created, and clean up when it's freed. In this regard,
+a module is just like any other :c:expr:`PyObject *`; there are no "on
+interpreter shutdown" hooks to think?or forget?about.
+
+Note that there are use cases for different kinds of "globals":
+per-process, per-interpreter, per-thread or per-task state.
+With per-module state as the default, these are still possible,
+but you should treat them as exceptional cases:
+if you need them, you should give them additional care and testing.
+(Note that this guide does not cover them.)
+
+
+Isolated Module Objects
+-----------------------
+
+The key point to keep in mind when developing an extension module is
+that several module objects can be created from a single shared library.
+For example:
+
+.. code-block:: pycon
+
+   >>> import sys
+   >>> import binascii
+   >>> old_binascii = binascii
+   >>> del sys.modules['binascii']
+   >>> import binascii  # create a new module object
+   >>> old_binascii == binascii
+   False
+
+As a rule of thumb, the two modules should be completely independent.
+All objects and state specific to the module should be encapsulated
+within the module object, not shared with other module objects, and
+cleaned up when the module object is deallocated.
+Since this just is a rule of thumb, exceptions are possible
+(see `Managing Global State`_), but they will need more
+thought and attention to edge cases.
+
+While some modules could do with less stringent restrictions, isolated
+modules make it easier to set clear expectations and guidelines that
+work across a variety of use cases.
+
+
+Surprising Edge Cases
+---------------------
+
+Note that isolated modules do create some surprising edge cases. Most
+notably, each module object will typically not share its classes and
+exceptions with other similar modules. Continuing from the
+`example above <Isolated Module Objects_>`__,
+note that ``old_binascii.Error`` and ``binascii.Error`` are
+separate objects. In the following code, the exception is *not* caught:
+
+.. code-block:: pycon
+
+   >>> old_binascii.Error == binascii.Error
+   False
+   >>> try:
+   ...     old_binascii.unhexlify(b'qwertyuiop')
+   ... except binascii.Error:
+   ...     print('boo')
+   ...
+   Traceback (most recent call last):
+     File "<stdin>", line 2, in <module>
+   binascii.Error: Non-hexadecimal digit found
+
+This is expected. Notice that pure-Python modules behave the same way:
+it is a part of how Python works.
+
+The goal is to make extension modules safe at the C level, not to make
+hacks behave intuitively. Mutating ``sys.modules`` "manually" counts
+as a hack.
+
+
+Making Modules Safe with Multiple Interpreters
+==============================================
+
+
+Managing Global State
+---------------------
+
+Sometimes, the state associated with a Python module is not specific to that module, but
+to the entire process (or something else "more global" than a module).
+For example:
+
+-  The ``readline`` module manages *the* terminal.
+-  A module running on a circuit board wants to control *the* on-board
+   LED.
+
+In these cases, the Python module should provide *access* to the global
+state, rather than *own* it. If possible, write the module so that
+multiple copies of it can access the state independently (along with
+other libraries, whether for Python or other languages). If that is not
+possible, consider explicit locking.
+
+If it is necessary to use process-global state, the simplest way to
+avoid issues with multiple interpreters is to explicitly prevent a
+module from being loaded more than once per process?see
+`Opt-Out: Limiting to One Module Object per Process`_.
+
+
+Managing Per-Module State
+-------------------------
+
+To use per-module state, use
+:ref:`multi-phase extension module initialization <multi-phase-initialization>`.
+This signals that your module supports multiple interpreters correctly.
+
+Set ``PyModuleDef.m_size`` to a positive number to request that many
+bytes of storage local to the module. Usually, this will be set to the
+size of some module-specific ``struct``, which can store all of the
+module's C-level state. In particular, it is where you should put
+pointers to classes (including exceptions, but excluding static types)
+and settings (e.g. ``csv``'s :py:data:`~csv.field_size_limit`)
+which the C code needs to function.
+
+.. note::
+   Another option is to store state in the module's ``__dict__``,
+   but you must avoid crashing when users modify ``__dict__`` from
+   Python code. This usually means error- and type-checking at the C level,
+   which is easy to get wrong and hard to test sufficiently.
+
+   However, if module state is not needed in C code, storing it in
+   ``__dict__`` only is a good idea.
+
+If the module state includes ``PyObject`` pointers, the module object
+must hold references to those objects and implement the module-level hooks
+``m_traverse``, ``m_clear`` and ``m_free``. These work like
+``tp_traverse``, ``tp_clear`` and ``tp_free`` of a class. Adding them will
+require some work and make the code longer; this is the price for
+modules which can be unloaded cleanly.
+
+An example of a module with per-module state is currently available as
+`xxlimited <https://github.com/python/cpython/blob/master/Modules/xxlimited.c>`__;
+example module initialization shown at the bottom of the file.
+
+
+Opt-Out: Limiting to One Module Object per Process
+--------------------------------------------------
+
+A non-negative ``PyModuleDef.m_size`` signals that a module supports
+multiple interpreters correctly. If this is not yet the case for your
+module, you can explicitly make your module loadable only once per
+process. For example::
+
+   static int loaded = 0;
+
+   static int
+   exec_module(PyObject* module)
+   {
+       if (loaded) {
+           PyErr_SetString(PyExc_ImportError,
+                           "cannot load module more than once per process");
+           return -1;
+       }
+       loaded = 1;
+       // ... rest of initialization
+   }
+
+
+Module State Access from Functions
+----------------------------------
+
+Accessing the state from module-level functions is straightforward.
+Functions get the module object as their first argument; for extracting
+the state, you can use ``PyModule_GetState``::
+
+   static PyObject *
+   func(PyObject *module, PyObject *args)
+   {
+       my_struct *state = (my_struct*)PyModule_GetState(module);
+       if (state == NULL) {
+           return NULL;
+       }
+       // ... rest of logic
+   }
+
+.. note::
+   ``PyModule_GetState`` may return ``NULL`` without setting an
+   exception if there is no module state, i.e. ``PyModuleDef.m_size`` was
+   zero. In your own module, you're in control of ``m_size``, so this is
+   easy to prevent.
+
+
+Heap Types
+==========
+
+Traditionally, types defined in C code are *static*; that is,
+``static PyTypeObject`` structures defined directly in code and
+initialized using ``PyType_Ready()``.
+
+Such types are necessarily shared across the process. Sharing them
+between module objects requires paying attention to any state they own
+or access. To limit the possible issues, static types are immutable at
+the Python level: for example, you can't set ``str.myattribute = 123``.
+
+.. impl-detail::
+   Sharing truly immutable objects between interpreters is fine,
+   as long as they don't provide access to mutable objects.
+   However, in CPython, every Python object has a mutable implementation
+   detail: the reference count. Changes to the refcount are guarded by the GIL.
+   Thus, code that shares any Python objects across interpreters implicitly
+   depends on CPython's current, process-wide GIL.
+
+Because they are immutable and process-global, static types cannot access
+"their" module state.
+If any method of such a type requires access to module state,
+the type must be converted to a *heap-allocated type*, or *heap type*
+for short. These correspond more closely to classes created by Python's
+``class`` statement.
+
+For new modules, using heap types by default is a good rule of thumb.
+
+
+Changing Static Types to Heap Types
+-----------------------------------
+
+Static types can be converted to heap types, but note that
+the heap type API was not designed for "lossless" conversion
+from static types?that is, creating a type that works exactly like a given
+static type.
+So, when rewriting the class definition in a new API,
+you are likely to unintentionally change a few details (e.g. pickleability
+or inherited slots).
+Always test the details that are important to you.
+
+Watch out for the following two points in particular (but note that this is not
+a comprehensive list):
+
+* Unlike static types, heap type objects are mutable by default.
+  Use the :c:data:`Py_TPFLAGS_IMMUTABLETYPE` flag to prevent mutability.
+* Heap types inherit :c:member:`~PyTypeObject.tp_new` by default,
+  so it may become possible to instantiate them from Python code.
+  You can prevent this with the :c:data:`Py_TPFLAGS_DISALLOW_INSTANTIATION` flag.
+
+
+Defining Heap Types
+-------------------
+
+Heap types can be created by filling a :c:struct:`PyType_Spec` structure, a
+description or "blueprint" of a class, and calling
+:c:func:`PyType_FromModuleAndSpec` to construct a new class object.
+
+.. note::
+   Other functions, like :c:func:`PyType_FromSpec`, can also create
+   heap types, but :c:func:`PyType_FromModuleAndSpec` associates the module
+   with the class, allowing access to the module state from methods.
+
+The class should generally be stored in *both* the module state (for
+safe access from C) and the module's ``__dict__`` (for access from
+Python code).
+
+
+Garbage-Collection Protocol
+---------------------------
+
+Instances of heap types hold a reference to their type.
+This ensures that the type isn't destroyed before all its instances are,
+but may result in reference cycles that need to be broken by the
+garbage collector.
+
+To avoid memory leaks, instances of heap types must implement the
+garbage collection protocol.
+That is, heap types should:
+
+- Have the :c:data:`Py_TPFLAGS_HAVE_GC` flag.
+- Define a traverse function using ``Py_tp_traverse``, which
+  visits the type (e.g. using :c:expr:`Py_VISIT(Py_TYPE(self))`).
+
+Please refer to the :ref:`the documentation <type-structs>` of
+:c:data:`Py_TPFLAGS_HAVE_GC` and :c:member:`~PyTypeObject.tp_traverse`
+for additional considerations.
+
+If your traverse function delegates to the ``tp_traverse`` of its base class
+(or another type), ensure that ``Py_TYPE(self)`` is visited only once.
+Note that only heap type are expected to visit the type in ``tp_traverse``.
+
+For example, if your traverse function includes::
+
+   base->tp_traverse(self, visit, arg)
+
+...and ``base`` may be a static type, then it should also include::
+
+    if (base->tp_flags & Py_TPFLAGS_HEAPTYPE) {
+        // a heap type's tp_traverse already visited Py_TYPE(self)
+    } else {
+        Py_VISIT(Py_TYPE(self));
+    }
+
+It is not necessary to handle the type's reference count in ``tp_new``
+and ``tp_clear``.
+
+
+Module State Access from Classes
+--------------------------------
+
+If you have a type object defined with :c:func:`PyType_FromModuleAndSpec`,
+you can call :c:func:`PyType_GetModule` to get the associated module, and then
+:c:func:`PyModule_GetState` to get the module's state.
+
+To save a some tedious error-handling boilerplate code, you can combine
+these two steps with :c:func:`PyType_GetModuleState`, resulting in::
+
+   my_struct *state = (my_struct*)PyType_GetModuleState(type);
+   if (state === NULL) {
+       return NULL;
+   }
+
+
+Module State Access from Regular Methods
+----------------------------------------
+
+Accessing the module-level state from methods of a class is somewhat more
+complicated, but is possible thanks to API introduced in Python 3.9.
+To get the state, you need to first get the *defining class*, and then
+get the module state from it.
+
+The largest roadblock is getting *the class a method was defined in*, or
+that method's "defining class" for short. The defining class can have a
+reference to the module it is part of.
+
+Do not confuse the defining class with :c:expr:`Py_TYPE(self)`. If the method
+is called on a *subclass* of your type, ``Py_TYPE(self)`` will refer to
+that subclass, which may be defined in different module than yours.
+
+.. note::
+   The following Python code can illustrate the concept.
+   ``Base.get_defining_class`` returns ``Base`` even
+   if ``type(self) == Sub``:
+
+   .. code-block:: python
+
+      class Base:
+          def get_type_of_self(self):
+              return type(self)
+
+          def get_defining_class(self):
+              return __class__
+
+      class Sub(Base):
+          pass
+
+For a method to get its "defining class", it must use the
+:c:data:`METH_METHOD | METH_FASTCALL | METH_KEYWORDS`
+:c:type:`calling convention <PyMethodDef>`
+and the corresponding :c:type:`PyCMethod` signature::
+
+   PyObject *PyCMethod(
+       PyObject *self,               // object the method was called on
+       PyTypeObject *defining_class, // defining class
+       PyObject *const *args,        // C array of arguments
+       Py_ssize_t nargs,             // length of "args"
+       PyObject *kwnames)            // NULL, or dict of keyword arguments
+
+Once you have the defining class, call :c:func:`PyType_GetModuleState` to get
+the state of its associated module.
+
+For example::
+
+   static PyObject *
+   example_method(PyObject *self,
+           PyTypeObject *defining_class,
+           PyObject *const *args,
+           Py_ssize_t nargs,
+           PyObject *kwnames)
+   {
+       my_struct *state = (my_struct*)PyType_GetModuleState(defining_class);
+       if (state === NULL) {
+           return NULL;
+       }
+       ... // rest of logic
+   }
+
+   PyDoc_STRVAR(example_method_doc, "...");
+
+   static PyMethodDef my_methods[] = {
+       {"example_method",
+         (PyCFunction)(void(*)(void))example_method,
+         METH_METHOD|METH_FASTCALL|METH_KEYWORDS,
+         example_method_doc}
+       {NULL},
+   }
+
+
+Module State Access from Slot Methods, Getters and Setters
+----------------------------------------------------------
+
+.. note::
+
+   This is new in Python 3.11.
+
+   .. After adding to limited API:
+
+      If you use the `limited API <https://docs.python.org/3/c-api/stable.html>__,
+      you must update ``Py_LIMITED_API`` to ``0x030b0000``, losing ABI
+      compatibility with earlier versions.
+
+Slot methods?the fast C equivalents for special methods, such as
+:c:member:`~PyNumberMethods.nb_add` for :py:attr:`~object.__add__` or
+:c:member:`~PyType.tp_new` for initialization?have a very simple API that
+doesn't allow passing in the defining class, unlike with :c:type:`PyCMethod`.
+The same goes for getters and setters defined with
+:c:type:`PyGetSetDef`.
+
+To access the module state in these cases, use the
+:c:func:`PyType_GetModuleByDef` function, and pass in the module definition.
+Once you have the module, call :c:func:`PyModule_GetState`
+to get the state::
+
+    PyObject *module = PyType_GetModuleByDef(Py_TYPE(self), &module_def);
+    my_struct *state = (my_struct*)PyModule_GetState(module);
+    if (state === NULL) {
+        return NULL;
+    }
+
+``PyType_GetModuleByDef`` works by searching the
+:term:`method resolution order` (i.e. all superclasses) for the first
+superclass that has a corresponding module.
+
+.. note::
+
+   In very exotic cases (inheritance chains spanning multiple modules
+   created from the same definition), ``PyType_GetModuleByDef`` might not
+   return the module of the true defining class. However, it will always
+   return a module with the same definition, ensuring a compatible
+   C memory layout.
+
+
+Lifetime of the Module State
+----------------------------
+
+When a module object is garbage-collected, its module state is freed.
+For each pointer to (a part of) the module state, you must hold a reference
+to the module object.
+
+Usually this is not an issue, because types created with
+:c:func:`PyType_FromModuleAndSpec`, and their instances, hold a reference
+to the module.
+However, you must be careful in reference counting when you reference
+module state from other places, such as callbacks for external
+libraries.
+
+
+Open Issues
+===========
+
+Several issues around per-module state and heap types are still open.
+
+Discussions about improving the situation are best held on the `capi-sig
+mailing list <https://mail.python.org/mailman3/lists/capi-sig.python.org/>`__.
+
+
+Per-Class Scope
+---------------
+
+It is currently (as of Python 3.11) not possible to attach state to individual
+*types* without relying on CPython implementation details (which may change
+in the future?perhaps, ironically, to allow a proper solution for
+per-class scope).
+
+
+Lossless Conversion to Heap Types
+---------------------------------
+
+The heap type API was not designed for "lossless" conversion from static types;
+that is, creating a type that works exactly like a given static type.


From webhook-mailer at python.org  Tue Jul  5 10:49:44 2022
From: webhook-mailer at python.org (vsajip)
Date: Tue, 05 Jul 2022 14:49:44 -0000
Subject: [Python-checkins] [3.11] bpo-46755: Don't log stack info twice in
 QueueHandler (GH-31355) (GH-94564)
Message-ID: <mailman.2092.1657032585.20746.python-checkins@python.org>

https://github.com/python/cpython/commit/d49159bd9f1fd7596ca4d77e26c1c2564c624b36
commit: d49159bd9f1fd7596ca4d77e26c1c2564c624b36
branch: 3.11
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: vsajip <vinay_sajip at yahoo.co.uk>
date: 2022-07-05T15:49:05+01:00
summary:

[3.11] bpo-46755: Don't log stack info twice in QueueHandler (GH-31355) (GH-94564)

Co-authored-by: Erik Montnemery <erik at montnemery.com>

files:
A Misc/NEWS.d/next/Library/2022-02-15-12-40-48.bpo-46755.zePJfx.rst
M Doc/library/logging.handlers.rst
M Lib/logging/handlers.py
M Lib/test/test_logging.py

diff --git a/Doc/library/logging.handlers.rst b/Doc/library/logging.handlers.rst
index f5ef80ea044c6..0cbe707339a7a 100644
--- a/Doc/library/logging.handlers.rst
+++ b/Doc/library/logging.handlers.rst
@@ -1034,7 +1034,7 @@ possible, while any potentially slow operations (such as sending an email via
       method is enqueued.
 
       The base implementation formats the record to merge the message,
-      arguments, and exception information, if present.  It also removes
+      arguments, exception and stack information, if present.  It also removes
       unpickleable items from the record in-place. Specifically, it overwrites
       the record's :attr:`msg` and :attr:`message` attributes with the merged
       message (obtained by calling the handler's :meth:`format` method), and
diff --git a/Lib/logging/handlers.py b/Lib/logging/handlers.py
index 78e919d195d97..78b756019dc83 100644
--- a/Lib/logging/handlers.py
+++ b/Lib/logging/handlers.py
@@ -1455,7 +1455,7 @@ def prepare(self, record):
         # (if there's exception data), and also returns the formatted
         # message. We can then use this to replace the original
         # msg + args, as these might be unpickleable. We also zap the
-        # exc_info and exc_text attributes, as they are no longer
+        # exc_info, exc_text and stack_info attributes, as they are no longer
         # needed and, if not None, will typically not be pickleable.
         msg = self.format(record)
         # bpo-35726: make copy of record to avoid affecting other handlers in the chain.
@@ -1465,6 +1465,7 @@ def prepare(self, record):
         record.args = None
         record.exc_info = None
         record.exc_text = None
+        record.stack_info = None
         return record
 
     def emit(self, record):
diff --git a/Lib/test/test_logging.py b/Lib/test/test_logging.py
index 9eda0706ac6fd..71926a5432e26 100644
--- a/Lib/test/test_logging.py
+++ b/Lib/test/test_logging.py
@@ -3665,7 +3665,7 @@ def test_queue_listener(self):
     @unittest.skipUnless(hasattr(logging.handlers, 'QueueListener'),
                          'logging.handlers.QueueListener required for this test')
     def test_queue_listener_with_StreamHandler(self):
-        # Test that traceback only appends once (bpo-34334).
+        # Test that traceback and stack-info only appends once (bpo-34334, bpo-46755).
         listener = logging.handlers.QueueListener(self.queue, self.root_hdlr)
         listener.start()
         try:
@@ -3673,8 +3673,10 @@ def test_queue_listener_with_StreamHandler(self):
         except ZeroDivisionError as e:
             exc = e
             self.que_logger.exception(self.next_message(), exc_info=exc)
+        self.que_logger.error(self.next_message(), stack_info=True)
         listener.stop()
         self.assertEqual(self.stream.getvalue().strip().count('Traceback'), 1)
+        self.assertEqual(self.stream.getvalue().strip().count('Stack'), 1)
 
     @unittest.skipUnless(hasattr(logging.handlers, 'QueueListener'),
                          'logging.handlers.QueueListener required for this test')
diff --git a/Misc/NEWS.d/next/Library/2022-02-15-12-40-48.bpo-46755.zePJfx.rst b/Misc/NEWS.d/next/Library/2022-02-15-12-40-48.bpo-46755.zePJfx.rst
new file mode 100644
index 0000000000000..399caf7253593
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2022-02-15-12-40-48.bpo-46755.zePJfx.rst
@@ -0,0 +1,2 @@
+In :class:`QueueHandler`, clear ``stack_info`` from :class:`LogRecord` to
+prevent stack trace from being written twice.


From webhook-mailer at python.org  Tue Jul  5 11:04:53 2022
From: webhook-mailer at python.org (vsajip)
Date: Tue, 05 Jul 2022 15:04:53 -0000
Subject: [Python-checkins] [3.10] bpo-46755: Don't log stack info twice in
 QueueHandler (GH-31355) (GH-94565)
Message-ID: <mailman.2093.1657033493.20746.python-checkins@python.org>

https://github.com/python/cpython/commit/3287e45847a4d471e20425f0da5194ac5735e16c
commit: 3287e45847a4d471e20425f0da5194ac5735e16c
branch: 3.10
author: Vinay Sajip <vinay_sajip at yahoo.co.uk>
committer: vsajip <vinay_sajip at yahoo.co.uk>
date: 2022-07-05T16:04:29+01:00
summary:

[3.10] bpo-46755: Don't log stack info twice in QueueHandler (GH-31355) (GH-94565)

Co-authored-by: Erik Montnemery <erik at montnemery.com>

files:
A Misc/NEWS.d/next/Library/2022-02-15-12-40-48.bpo-46755.zePJfx.rst
M Doc/library/logging.handlers.rst
M Lib/logging/handlers.py
M Lib/test/test_logging.py

diff --git a/Doc/library/logging.handlers.rst b/Doc/library/logging.handlers.rst
index a5b181ee612d5..1447cabb9a1df 100644
--- a/Doc/library/logging.handlers.rst
+++ b/Doc/library/logging.handlers.rst
@@ -1034,8 +1034,12 @@ possible, while any potentially slow operations (such as sending an email via
       method is enqueued.
 
       The base implementation formats the record to merge the message,
-      arguments, and exception information, if present.  It also
-      removes unpickleable items from the record in-place.
+      arguments, exception and stack information, if present.  It also removes
+      unpickleable items from the record in-place. Specifically, it overwrites
+      the record's :attr:`msg` and :attr:`message` attributes with the merged
+      message (obtained by calling the handler's :meth:`format` method), and
+      sets the :attr:`args`, :attr:`exc_info` and :attr:`exc_text` attributes
+      to ``None``.
 
       You might want to override this method if you want to convert
       the record to a dict or JSON string, or send a modified copy
@@ -1047,7 +1051,13 @@ possible, while any potentially slow operations (such as sending an email via
       want to override this if you want to use blocking behaviour, or a
       timeout, or a customized queue implementation.
 
+   .. attribute:: listener
 
+      When created via configuration using :func:`~logging.config.dictConfig`, this
+      attribute will contain a :class:`QueueListener` instance for use with this
+      handler. Otherwise, it will be ``None``.
+
+      .. versionadded:: 3.12
 
 .. _queue-listener:
 
diff --git a/Lib/logging/handlers.py b/Lib/logging/handlers.py
index 61a39958c0ac0..b2d1f279225df 100644
--- a/Lib/logging/handlers.py
+++ b/Lib/logging/handlers.py
@@ -1439,7 +1439,7 @@ def prepare(self, record):
         # (if there's exception data), and also returns the formatted
         # message. We can then use this to replace the original
         # msg + args, as these might be unpickleable. We also zap the
-        # exc_info and exc_text attributes, as they are no longer
+        # exc_info, exc_text and stack_info attributes, as they are no longer
         # needed and, if not None, will typically not be pickleable.
         msg = self.format(record)
         # bpo-35726: make copy of record to avoid affecting other handlers in the chain.
@@ -1449,6 +1449,7 @@ def prepare(self, record):
         record.args = None
         record.exc_info = None
         record.exc_text = None
+        record.stack_info = None
         return record
 
     def emit(self, record):
diff --git a/Lib/test/test_logging.py b/Lib/test/test_logging.py
index bdb1e7588b20b..af68f2582040e 100644
--- a/Lib/test/test_logging.py
+++ b/Lib/test/test_logging.py
@@ -3598,7 +3598,7 @@ def test_queue_listener(self):
     @unittest.skipUnless(hasattr(logging.handlers, 'QueueListener'),
                          'logging.handlers.QueueListener required for this test')
     def test_queue_listener_with_StreamHandler(self):
-        # Test that traceback only appends once (bpo-34334).
+        # Test that traceback and stack-info only appends once (bpo-34334, bpo-46755).
         listener = logging.handlers.QueueListener(self.queue, self.root_hdlr)
         listener.start()
         try:
@@ -3606,8 +3606,10 @@ def test_queue_listener_with_StreamHandler(self):
         except ZeroDivisionError as e:
             exc = e
             self.que_logger.exception(self.next_message(), exc_info=exc)
+        self.que_logger.error(self.next_message(), stack_info=True)
         listener.stop()
         self.assertEqual(self.stream.getvalue().strip().count('Traceback'), 1)
+        self.assertEqual(self.stream.getvalue().strip().count('Stack'), 1)
 
     @unittest.skipUnless(hasattr(logging.handlers, 'QueueListener'),
                          'logging.handlers.QueueListener required for this test')
diff --git a/Misc/NEWS.d/next/Library/2022-02-15-12-40-48.bpo-46755.zePJfx.rst b/Misc/NEWS.d/next/Library/2022-02-15-12-40-48.bpo-46755.zePJfx.rst
new file mode 100644
index 0000000000000..399caf7253593
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2022-02-15-12-40-48.bpo-46755.zePJfx.rst
@@ -0,0 +1,2 @@
+In :class:`QueueHandler`, clear ``stack_info`` from :class:`LogRecord` to
+prevent stack trace from being written twice.


From webhook-mailer at python.org  Tue Jul  5 11:08:30 2022
From: webhook-mailer at python.org (vsajip)
Date: Tue, 05 Jul 2022 15:08:30 -0000
Subject: [Python-checkins] gh-92897: Ensure `venv --copies` respects source
 build property of the creating interpreter (GH-92899)
Message-ID: <mailman.2094.1657033711.20746.python-checkins@python.org>

https://github.com/python/cpython/commit/067597522a9002f3b8aff7f46033f10acb2381e4
commit: 067597522a9002f3b8aff7f46033f10acb2381e4
branch: main
author: Jeremy Kloth <jeremy.kloth at gmail.com>
committer: vsajip <vinay_sajip at yahoo.co.uk>
date: 2022-07-05T16:08:20+01:00
summary:

gh-92897: Ensure `venv --copies` respects source build property of the creating interpreter (GH-92899)

files:
M Lib/distutils/sysconfig.py
M Lib/distutils/tests/test_sysconfig.py
M Lib/sysconfig.py
M Lib/test/test_sysconfig.py
M Lib/test/test_venv.py

diff --git a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py
index 041877512051b..8eada987c1381 100644
--- a/Lib/distutils/sysconfig.py
+++ b/Lib/distutils/sysconfig.py
@@ -29,8 +29,6 @@
     parse_config_h as sysconfig_parse_config_h,
 
     _init_non_posix,
-    _is_python_source_dir,
-    _sys_home,
 
     _variable_rx,
     _findvar1_rx,
@@ -51,9 +49,6 @@
 # which might not be true in the time of import.
 _config_vars = get_config_vars()
 
-if os.name == "nt":
-    from sysconfig import _fix_pcbuild
-
 warnings.warn(
     'The distutils.sysconfig module is deprecated, use sysconfig instead',
     DeprecationWarning,
@@ -286,7 +281,7 @@ def get_python_inc(plat_specific=0, prefix=None):
             # must use "srcdir" from the makefile to find the "Include"
             # directory.
             if plat_specific:
-                return _sys_home or project_base
+                return project_base
             else:
                 incdir = os.path.join(get_config_var('srcdir'), 'Include')
                 return os.path.normpath(incdir)
diff --git a/Lib/distutils/tests/test_sysconfig.py b/Lib/distutils/tests/test_sysconfig.py
index 270e91a98d0c4..8f9f72f2b0656 100644
--- a/Lib/distutils/tests/test_sysconfig.py
+++ b/Lib/distutils/tests/test_sysconfig.py
@@ -60,7 +60,11 @@ def test_srcdir(self):
             # should be a full source checkout.
             Python_h = os.path.join(srcdir, 'Include', 'Python.h')
             self.assertTrue(os.path.exists(Python_h), Python_h)
-            self.assertTrue(sysconfig._is_python_source_dir(srcdir))
+            # <srcdir>/PC/pyconfig.h always exists even if unused on POSIX.
+            pyconfig_h = os.path.join(srcdir, 'PC', 'pyconfig.h')
+            self.assertTrue(os.path.exists(pyconfig_h), pyconfig_h)
+            pyconfig_h_in = os.path.join(srcdir, 'pyconfig.h.in')
+            self.assertTrue(os.path.exists(pyconfig_h_in), pyconfig_h_in)
         elif os.name == 'posix':
             self.assertEqual(
                 os.path.dirname(sysconfig.get_makefile_filename()),
diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py
index bf926cf76807b..ebe3711827422 100644
--- a/Lib/sysconfig.py
+++ b/Lib/sysconfig.py
@@ -195,37 +195,38 @@ def _safe_realpath(path):
     # unable to retrieve the real program name
     _PROJECT_BASE = _safe_realpath(os.getcwd())
 
-if (os.name == 'nt' and
-    _PROJECT_BASE.lower().endswith(('\\pcbuild\\win32', '\\pcbuild\\amd64'))):
-    _PROJECT_BASE = _safe_realpath(os.path.join(_PROJECT_BASE, pardir, pardir))
+# In a virtual environment, `sys._home` gives us the target directory
+# `_PROJECT_BASE` for the executable that created it when the virtual
+# python is an actual executable ('venv --copies' or Windows).
+_sys_home = getattr(sys, '_home', None)
+if _sys_home:
+    _PROJECT_BASE = _sys_home
+
+if os.name == 'nt':
+    # In a source build, the executable is in a subdirectory of the root
+    # that we want (<root>\PCbuild\<platname>).
+    # `_BASE_PREFIX` is used as the base installation is where the source
+    # will be.  The realpath is needed to prevent mount point confusion
+    # that can occur with just string comparisons.
+    if _safe_realpath(_PROJECT_BASE).startswith(
+            _safe_realpath(f'{_BASE_PREFIX}\\PCbuild')):
+        _PROJECT_BASE = _BASE_PREFIX
 
 # set for cross builds
 if "_PYTHON_PROJECT_BASE" in os.environ:
     _PROJECT_BASE = _safe_realpath(os.environ["_PYTHON_PROJECT_BASE"])
 
-def _is_python_source_dir(d):
+def is_python_build(check_home=None):
+    if check_home is not None:
+        import warnings
+        warnings.warn("check_home argument is deprecated and ignored.",
+                      DeprecationWarning, stacklevel=2)
     for fn in ("Setup", "Setup.local"):
-        if os.path.isfile(os.path.join(d, "Modules", fn)):
+        if os.path.isfile(os.path.join(_PROJECT_BASE, "Modules", fn)):
             return True
     return False
 
-_sys_home = getattr(sys, '_home', None)
-
-if os.name == 'nt':
-    def _fix_pcbuild(d):
-        if d and os.path.normcase(d).startswith(
-                os.path.normcase(os.path.join(_PREFIX, "PCbuild"))):
-            return _PREFIX
-        return d
-    _PROJECT_BASE = _fix_pcbuild(_PROJECT_BASE)
-    _sys_home = _fix_pcbuild(_sys_home)
-
-def is_python_build(check_home=False):
-    if check_home and _sys_home:
-        return _is_python_source_dir(_sys_home)
-    return _is_python_source_dir(_PROJECT_BASE)
-
-_PYTHON_BUILD = is_python_build(True)
+_PYTHON_BUILD = is_python_build()
 
 if _PYTHON_BUILD:
     for scheme in ('posix_prefix', 'posix_home'):
@@ -442,7 +443,7 @@ def _parse_makefile(filename, vars=None, keep_unresolved=True):
 def get_makefile_filename():
     """Return the path of the Makefile."""
     if _PYTHON_BUILD:
-        return os.path.join(_sys_home or _PROJECT_BASE, "Makefile")
+        return os.path.join(_PROJECT_BASE, "Makefile")
     if hasattr(sys, 'abiflags'):
         config_dir_name = f'config-{_PY_VERSION_SHORT}{sys.abiflags}'
     else:
@@ -587,9 +588,9 @@ def get_config_h_filename():
     """Return the path of pyconfig.h."""
     if _PYTHON_BUILD:
         if os.name == "nt":
-            inc_dir = os.path.join(_sys_home or _PROJECT_BASE, "PC")
+            inc_dir = os.path.join(_PROJECT_BASE, "PC")
         else:
-            inc_dir = _sys_home or _PROJECT_BASE
+            inc_dir = _PROJECT_BASE
     else:
         inc_dir = get_path('platinclude')
     return os.path.join(inc_dir, 'pyconfig.h')
diff --git a/Lib/test/test_sysconfig.py b/Lib/test/test_sysconfig.py
index 27722fbe11ee1..114e144d52e98 100644
--- a/Lib/test/test_sysconfig.py
+++ b/Lib/test/test_sysconfig.py
@@ -450,7 +450,11 @@ def test_srcdir(self):
             # should be a full source checkout.
             Python_h = os.path.join(srcdir, 'Include', 'Python.h')
             self.assertTrue(os.path.exists(Python_h), Python_h)
-            self.assertTrue(sysconfig._is_python_source_dir(srcdir))
+            # <srcdir>/PC/pyconfig.h always exists even if unused on POSIX.
+            pyconfig_h = os.path.join(srcdir, 'PC', 'pyconfig.h')
+            self.assertTrue(os.path.exists(pyconfig_h), pyconfig_h)
+            pyconfig_h_in = os.path.join(srcdir, 'pyconfig.h.in')
+            self.assertTrue(os.path.exists(pyconfig_h_in), pyconfig_h_in)
         elif os.name == 'posix':
             makefile_dir = os.path.dirname(sysconfig.get_makefile_filename())
             # Issue #19340: srcdir has been realpath'ed already
diff --git a/Lib/test/test_venv.py b/Lib/test/test_venv.py
index 1545a94affc5e..4359a4e3ebe86 100644
--- a/Lib/test/test_venv.py
+++ b/Lib/test/test_venv.py
@@ -15,6 +15,7 @@
 import struct
 import subprocess
 import sys
+import sysconfig
 import tempfile
 from test.support import (captured_stdout, captured_stderr,
                           skip_if_broken_multiprocessing_synchronize, verbose,
@@ -254,18 +255,49 @@ def test_prefixes(self):
             self.assertEqual(out.strip(), expected.encode(), prefix)
 
     @requireVenvCreate
-    def test_sysconfig_preferred_and_default_scheme(self):
+    def test_sysconfig(self):
         """
-        Test that the sysconfig preferred(prefix) and default scheme is venv.
+        Test that the sysconfig functions work in a virtual environment.
         """
         rmtree(self.env_dir)
-        self.run_with_capture(venv.create, self.env_dir)
+        self.run_with_capture(venv.create, self.env_dir, symlinks=False)
         envpy = os.path.join(self.env_dir, self.bindir, self.exe)
         cmd = [envpy, '-c', None]
-        for call in ('get_preferred_scheme("prefix")', 'get_default_scheme()'):
-            cmd[2] = 'import sysconfig; print(sysconfig.%s)' % call
-            out, err = check_output(cmd)
-            self.assertEqual(out.strip(), b'venv', err)
+        for call, expected in (
+            # installation scheme
+            ('get_preferred_scheme("prefix")', 'venv'),
+            ('get_default_scheme()', 'venv'),
+            # build environment
+            ('is_python_build()', str(sysconfig.is_python_build())),
+            ('get_makefile_filename()', sysconfig.get_makefile_filename()),
+            ('get_config_h_filename()', sysconfig.get_config_h_filename())):
+            with self.subTest(call):
+                cmd[2] = 'import sysconfig; print(sysconfig.%s)' % call
+                out, err = check_output(cmd)
+                self.assertEqual(out.strip(), expected.encode(), err)
+
+    @requireVenvCreate
+    @unittest.skipUnless(can_symlink(), 'Needs symlinks')
+    def test_sysconfig_symlinks(self):
+        """
+        Test that the sysconfig functions work in a virtual environment.
+        """
+        rmtree(self.env_dir)
+        self.run_with_capture(venv.create, self.env_dir, symlinks=True)
+        envpy = os.path.join(self.env_dir, self.bindir, self.exe)
+        cmd = [envpy, '-c', None]
+        for call, expected in (
+            # installation scheme
+            ('get_preferred_scheme("prefix")', 'venv'),
+            ('get_default_scheme()', 'venv'),
+            # build environment
+            ('is_python_build()', str(sysconfig.is_python_build())),
+            ('get_makefile_filename()', sysconfig.get_makefile_filename()),
+            ('get_config_h_filename()', sysconfig.get_config_h_filename())):
+            with self.subTest(call):
+                cmd[2] = 'import sysconfig; print(sysconfig.%s)' % call
+                out, err = check_output(cmd)
+                self.assertEqual(out.strip(), expected.encode(), err)
 
     if sys.platform == 'win32':
         ENV_SUBDIRS = (


From webhook-mailer at python.org  Tue Jul  5 11:20:14 2022
From: webhook-mailer at python.org (ambv)
Date: Tue, 05 Jul 2022 15:20:14 -0000
Subject: [Python-checkins] Docs: Convert PEP 630 (Isolating Extension
 Modules) to a HOWTO (GH-94489) (GH-94566)
Message-ID: <mailman.2095.1657034415.20746.python-checkins@python.org>

https://github.com/python/cpython/commit/7a3dae06eb6ff822b47ee8ed01dd840139cb994c
commit: 7a3dae06eb6ff822b47ee8ed01dd840139cb994c
branch: 3.11
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: ambv <lukasz at langa.pl>
date: 2022-07-05T17:20:03+02:00
summary:

Docs: Convert PEP 630 (Isolating Extension Modules) to a HOWTO (GH-94489) (GH-94566)

Co-authored-by: Stanley <46876382+slateny at users.noreply.github.com>
Co-authored-by: Alex Waygood <Alex.Waygood at Gmail.com>
Co-authored-by: Petr Viktorin <encukou at gmail.com>

(cherry picked from commit e6ec6f5b50e8793172e83a9afbb05fe01f236b37)

files:
A Doc/howto/isolating-extensions.rst
M Doc/howto/index.rst

diff --git a/Doc/howto/index.rst b/Doc/howto/index.rst
index eae8f143ee206..8a378e6659efc 100644
--- a/Doc/howto/index.rst
+++ b/Doc/howto/index.rst
@@ -31,4 +31,5 @@ Currently, the HOWTOs are:
    clinic.rst
    instrumentation.rst
    annotations.rst
+   isolating-extensions.rst
 
diff --git a/Doc/howto/isolating-extensions.rst b/Doc/howto/isolating-extensions.rst
new file mode 100644
index 0000000000000..8ee7e5e28479a
--- /dev/null
+++ b/Doc/howto/isolating-extensions.rst
@@ -0,0 +1,536 @@
+.. highlight:: c
+
+***************************
+Isolating Extension Modules
+***************************
+
+.. topic:: Abstract
+
+    Traditionally, state belonging to Python extension modules was kept in C
+    ``static`` variables, which have process-wide scope. This document
+    describes problems of such per-process state and shows a safer way:
+    per-module state.
+
+    The document also describes how to switch to per-module state where
+    possible. This transition involves allocating space for that state, potentially
+    switching from static types to heap types, and?perhaps most
+    importantly?accessing per-module state from code.
+
+
+Who should read this
+====================
+
+This guide is written for maintainers of :ref:`C-API <c-api-index>` extensions
+who would like to make that extension safer to use in applications where
+Python itself is used as a library.
+
+
+Background
+==========
+
+An *interpreter* is the context in which Python code runs. It contains
+configuration (e.g. the import path) and runtime state (e.g. the set of
+imported modules).
+
+Python supports running multiple interpreters in one process. There are
+two cases to think about?users may run interpreters:
+
+-  in sequence, with several :c:func:`Py_InitializeEx`/:c:func:`Py_FinalizeEx`
+   cycles, and
+-  in parallel, managing "sub-interpreters" using
+   :c:func:`Py_NewInterpreter`/:c:func:`Py_EndInterpreter`.
+
+Both cases (and combinations of them) would be most useful when
+embedding Python within a library. Libraries generally shouldn't make
+assumptions about the application that uses them, which include
+assuming a process-wide "main Python interpreter".
+
+Historically, Python extension modules don't handle this use case well.
+Many extension modules (and even some stdlib modules) use *per-process*
+global state, because C ``static`` variables are extremely easy to use.
+Thus, data that should be specific to an interpreter ends up being shared
+between interpreters. Unless the extension developer is careful, it is very
+easy to introduce edge cases that lead to crashes when a module is loaded in
+more than one interpreter in the same process.
+
+Unfortunately, *per-interpreter* state is not easy to achieve. Extension
+authors tend to not keep multiple interpreters in mind when developing,
+and it is currently cumbersome to test the behavior.
+
+Enter Per-Module State
+----------------------
+
+Instead of focusing on per-interpreter state, Python's C API is evolving
+to better support the more granular *per-module* state.
+This means that C-level data is be attached to a *module object*.
+Each interpreter creates its own module object, keeping the data separate.
+For testing the isolation, multiple module objects corresponding to a single
+extension can even be loaded in a single interpreter.
+
+Per-module state provides an easy way to think about lifetime and
+resource ownership: the extension module will initialize when a
+module object is created, and clean up when it's freed. In this regard,
+a module is just like any other :c:expr:`PyObject *`; there are no "on
+interpreter shutdown" hooks to think?or forget?about.
+
+Note that there are use cases for different kinds of "globals":
+per-process, per-interpreter, per-thread or per-task state.
+With per-module state as the default, these are still possible,
+but you should treat them as exceptional cases:
+if you need them, you should give them additional care and testing.
+(Note that this guide does not cover them.)
+
+
+Isolated Module Objects
+-----------------------
+
+The key point to keep in mind when developing an extension module is
+that several module objects can be created from a single shared library.
+For example:
+
+.. code-block:: pycon
+
+   >>> import sys
+   >>> import binascii
+   >>> old_binascii = binascii
+   >>> del sys.modules['binascii']
+   >>> import binascii  # create a new module object
+   >>> old_binascii == binascii
+   False
+
+As a rule of thumb, the two modules should be completely independent.
+All objects and state specific to the module should be encapsulated
+within the module object, not shared with other module objects, and
+cleaned up when the module object is deallocated.
+Since this just is a rule of thumb, exceptions are possible
+(see `Managing Global State`_), but they will need more
+thought and attention to edge cases.
+
+While some modules could do with less stringent restrictions, isolated
+modules make it easier to set clear expectations and guidelines that
+work across a variety of use cases.
+
+
+Surprising Edge Cases
+---------------------
+
+Note that isolated modules do create some surprising edge cases. Most
+notably, each module object will typically not share its classes and
+exceptions with other similar modules. Continuing from the
+`example above <Isolated Module Objects_>`__,
+note that ``old_binascii.Error`` and ``binascii.Error`` are
+separate objects. In the following code, the exception is *not* caught:
+
+.. code-block:: pycon
+
+   >>> old_binascii.Error == binascii.Error
+   False
+   >>> try:
+   ...     old_binascii.unhexlify(b'qwertyuiop')
+   ... except binascii.Error:
+   ...     print('boo')
+   ...
+   Traceback (most recent call last):
+     File "<stdin>", line 2, in <module>
+   binascii.Error: Non-hexadecimal digit found
+
+This is expected. Notice that pure-Python modules behave the same way:
+it is a part of how Python works.
+
+The goal is to make extension modules safe at the C level, not to make
+hacks behave intuitively. Mutating ``sys.modules`` "manually" counts
+as a hack.
+
+
+Making Modules Safe with Multiple Interpreters
+==============================================
+
+
+Managing Global State
+---------------------
+
+Sometimes, the state associated with a Python module is not specific to that module, but
+to the entire process (or something else "more global" than a module).
+For example:
+
+-  The ``readline`` module manages *the* terminal.
+-  A module running on a circuit board wants to control *the* on-board
+   LED.
+
+In these cases, the Python module should provide *access* to the global
+state, rather than *own* it. If possible, write the module so that
+multiple copies of it can access the state independently (along with
+other libraries, whether for Python or other languages). If that is not
+possible, consider explicit locking.
+
+If it is necessary to use process-global state, the simplest way to
+avoid issues with multiple interpreters is to explicitly prevent a
+module from being loaded more than once per process?see
+`Opt-Out: Limiting to One Module Object per Process`_.
+
+
+Managing Per-Module State
+-------------------------
+
+To use per-module state, use
+:ref:`multi-phase extension module initialization <multi-phase-initialization>`.
+This signals that your module supports multiple interpreters correctly.
+
+Set ``PyModuleDef.m_size`` to a positive number to request that many
+bytes of storage local to the module. Usually, this will be set to the
+size of some module-specific ``struct``, which can store all of the
+module's C-level state. In particular, it is where you should put
+pointers to classes (including exceptions, but excluding static types)
+and settings (e.g. ``csv``'s :py:data:`~csv.field_size_limit`)
+which the C code needs to function.
+
+.. note::
+   Another option is to store state in the module's ``__dict__``,
+   but you must avoid crashing when users modify ``__dict__`` from
+   Python code. This usually means error- and type-checking at the C level,
+   which is easy to get wrong and hard to test sufficiently.
+
+   However, if module state is not needed in C code, storing it in
+   ``__dict__`` only is a good idea.
+
+If the module state includes ``PyObject`` pointers, the module object
+must hold references to those objects and implement the module-level hooks
+``m_traverse``, ``m_clear`` and ``m_free``. These work like
+``tp_traverse``, ``tp_clear`` and ``tp_free`` of a class. Adding them will
+require some work and make the code longer; this is the price for
+modules which can be unloaded cleanly.
+
+An example of a module with per-module state is currently available as
+`xxlimited <https://github.com/python/cpython/blob/master/Modules/xxlimited.c>`__;
+example module initialization shown at the bottom of the file.
+
+
+Opt-Out: Limiting to One Module Object per Process
+--------------------------------------------------
+
+A non-negative ``PyModuleDef.m_size`` signals that a module supports
+multiple interpreters correctly. If this is not yet the case for your
+module, you can explicitly make your module loadable only once per
+process. For example::
+
+   static int loaded = 0;
+
+   static int
+   exec_module(PyObject* module)
+   {
+       if (loaded) {
+           PyErr_SetString(PyExc_ImportError,
+                           "cannot load module more than once per process");
+           return -1;
+       }
+       loaded = 1;
+       // ... rest of initialization
+   }
+
+
+Module State Access from Functions
+----------------------------------
+
+Accessing the state from module-level functions is straightforward.
+Functions get the module object as their first argument; for extracting
+the state, you can use ``PyModule_GetState``::
+
+   static PyObject *
+   func(PyObject *module, PyObject *args)
+   {
+       my_struct *state = (my_struct*)PyModule_GetState(module);
+       if (state == NULL) {
+           return NULL;
+       }
+       // ... rest of logic
+   }
+
+.. note::
+   ``PyModule_GetState`` may return ``NULL`` without setting an
+   exception if there is no module state, i.e. ``PyModuleDef.m_size`` was
+   zero. In your own module, you're in control of ``m_size``, so this is
+   easy to prevent.
+
+
+Heap Types
+==========
+
+Traditionally, types defined in C code are *static*; that is,
+``static PyTypeObject`` structures defined directly in code and
+initialized using ``PyType_Ready()``.
+
+Such types are necessarily shared across the process. Sharing them
+between module objects requires paying attention to any state they own
+or access. To limit the possible issues, static types are immutable at
+the Python level: for example, you can't set ``str.myattribute = 123``.
+
+.. impl-detail::
+   Sharing truly immutable objects between interpreters is fine,
+   as long as they don't provide access to mutable objects.
+   However, in CPython, every Python object has a mutable implementation
+   detail: the reference count. Changes to the refcount are guarded by the GIL.
+   Thus, code that shares any Python objects across interpreters implicitly
+   depends on CPython's current, process-wide GIL.
+
+Because they are immutable and process-global, static types cannot access
+"their" module state.
+If any method of such a type requires access to module state,
+the type must be converted to a *heap-allocated type*, or *heap type*
+for short. These correspond more closely to classes created by Python's
+``class`` statement.
+
+For new modules, using heap types by default is a good rule of thumb.
+
+
+Changing Static Types to Heap Types
+-----------------------------------
+
+Static types can be converted to heap types, but note that
+the heap type API was not designed for "lossless" conversion
+from static types?that is, creating a type that works exactly like a given
+static type.
+So, when rewriting the class definition in a new API,
+you are likely to unintentionally change a few details (e.g. pickleability
+or inherited slots).
+Always test the details that are important to you.
+
+Watch out for the following two points in particular (but note that this is not
+a comprehensive list):
+
+* Unlike static types, heap type objects are mutable by default.
+  Use the :c:data:`Py_TPFLAGS_IMMUTABLETYPE` flag to prevent mutability.
+* Heap types inherit :c:member:`~PyTypeObject.tp_new` by default,
+  so it may become possible to instantiate them from Python code.
+  You can prevent this with the :c:data:`Py_TPFLAGS_DISALLOW_INSTANTIATION` flag.
+
+
+Defining Heap Types
+-------------------
+
+Heap types can be created by filling a :c:struct:`PyType_Spec` structure, a
+description or "blueprint" of a class, and calling
+:c:func:`PyType_FromModuleAndSpec` to construct a new class object.
+
+.. note::
+   Other functions, like :c:func:`PyType_FromSpec`, can also create
+   heap types, but :c:func:`PyType_FromModuleAndSpec` associates the module
+   with the class, allowing access to the module state from methods.
+
+The class should generally be stored in *both* the module state (for
+safe access from C) and the module's ``__dict__`` (for access from
+Python code).
+
+
+Garbage-Collection Protocol
+---------------------------
+
+Instances of heap types hold a reference to their type.
+This ensures that the type isn't destroyed before all its instances are,
+but may result in reference cycles that need to be broken by the
+garbage collector.
+
+To avoid memory leaks, instances of heap types must implement the
+garbage collection protocol.
+That is, heap types should:
+
+- Have the :c:data:`Py_TPFLAGS_HAVE_GC` flag.
+- Define a traverse function using ``Py_tp_traverse``, which
+  visits the type (e.g. using :c:expr:`Py_VISIT(Py_TYPE(self))`).
+
+Please refer to the :ref:`the documentation <type-structs>` of
+:c:data:`Py_TPFLAGS_HAVE_GC` and :c:member:`~PyTypeObject.tp_traverse`
+for additional considerations.
+
+If your traverse function delegates to the ``tp_traverse`` of its base class
+(or another type), ensure that ``Py_TYPE(self)`` is visited only once.
+Note that only heap type are expected to visit the type in ``tp_traverse``.
+
+For example, if your traverse function includes::
+
+   base->tp_traverse(self, visit, arg)
+
+...and ``base`` may be a static type, then it should also include::
+
+    if (base->tp_flags & Py_TPFLAGS_HEAPTYPE) {
+        // a heap type's tp_traverse already visited Py_TYPE(self)
+    } else {
+        Py_VISIT(Py_TYPE(self));
+    }
+
+It is not necessary to handle the type's reference count in ``tp_new``
+and ``tp_clear``.
+
+
+Module State Access from Classes
+--------------------------------
+
+If you have a type object defined with :c:func:`PyType_FromModuleAndSpec`,
+you can call :c:func:`PyType_GetModule` to get the associated module, and then
+:c:func:`PyModule_GetState` to get the module's state.
+
+To save a some tedious error-handling boilerplate code, you can combine
+these two steps with :c:func:`PyType_GetModuleState`, resulting in::
+
+   my_struct *state = (my_struct*)PyType_GetModuleState(type);
+   if (state === NULL) {
+       return NULL;
+   }
+
+
+Module State Access from Regular Methods
+----------------------------------------
+
+Accessing the module-level state from methods of a class is somewhat more
+complicated, but is possible thanks to API introduced in Python 3.9.
+To get the state, you need to first get the *defining class*, and then
+get the module state from it.
+
+The largest roadblock is getting *the class a method was defined in*, or
+that method's "defining class" for short. The defining class can have a
+reference to the module it is part of.
+
+Do not confuse the defining class with :c:expr:`Py_TYPE(self)`. If the method
+is called on a *subclass* of your type, ``Py_TYPE(self)`` will refer to
+that subclass, which may be defined in different module than yours.
+
+.. note::
+   The following Python code can illustrate the concept.
+   ``Base.get_defining_class`` returns ``Base`` even
+   if ``type(self) == Sub``:
+
+   .. code-block:: python
+
+      class Base:
+          def get_type_of_self(self):
+              return type(self)
+
+          def get_defining_class(self):
+              return __class__
+
+      class Sub(Base):
+          pass
+
+For a method to get its "defining class", it must use the
+:c:data:`METH_METHOD | METH_FASTCALL | METH_KEYWORDS`
+:c:type:`calling convention <PyMethodDef>`
+and the corresponding :c:type:`PyCMethod` signature::
+
+   PyObject *PyCMethod(
+       PyObject *self,               // object the method was called on
+       PyTypeObject *defining_class, // defining class
+       PyObject *const *args,        // C array of arguments
+       Py_ssize_t nargs,             // length of "args"
+       PyObject *kwnames)            // NULL, or dict of keyword arguments
+
+Once you have the defining class, call :c:func:`PyType_GetModuleState` to get
+the state of its associated module.
+
+For example::
+
+   static PyObject *
+   example_method(PyObject *self,
+           PyTypeObject *defining_class,
+           PyObject *const *args,
+           Py_ssize_t nargs,
+           PyObject *kwnames)
+   {
+       my_struct *state = (my_struct*)PyType_GetModuleState(defining_class);
+       if (state === NULL) {
+           return NULL;
+       }
+       ... // rest of logic
+   }
+
+   PyDoc_STRVAR(example_method_doc, "...");
+
+   static PyMethodDef my_methods[] = {
+       {"example_method",
+         (PyCFunction)(void(*)(void))example_method,
+         METH_METHOD|METH_FASTCALL|METH_KEYWORDS,
+         example_method_doc}
+       {NULL},
+   }
+
+
+Module State Access from Slot Methods, Getters and Setters
+----------------------------------------------------------
+
+.. note::
+
+   This is new in Python 3.11.
+
+   .. After adding to limited API:
+
+      If you use the `limited API <https://docs.python.org/3/c-api/stable.html>__,
+      you must update ``Py_LIMITED_API`` to ``0x030b0000``, losing ABI
+      compatibility with earlier versions.
+
+Slot methods?the fast C equivalents for special methods, such as
+:c:member:`~PyNumberMethods.nb_add` for :py:attr:`~object.__add__` or
+:c:member:`~PyType.tp_new` for initialization?have a very simple API that
+doesn't allow passing in the defining class, unlike with :c:type:`PyCMethod`.
+The same goes for getters and setters defined with
+:c:type:`PyGetSetDef`.
+
+To access the module state in these cases, use the
+:c:func:`PyType_GetModuleByDef` function, and pass in the module definition.
+Once you have the module, call :c:func:`PyModule_GetState`
+to get the state::
+
+    PyObject *module = PyType_GetModuleByDef(Py_TYPE(self), &module_def);
+    my_struct *state = (my_struct*)PyModule_GetState(module);
+    if (state === NULL) {
+        return NULL;
+    }
+
+``PyType_GetModuleByDef`` works by searching the
+:term:`method resolution order` (i.e. all superclasses) for the first
+superclass that has a corresponding module.
+
+.. note::
+
+   In very exotic cases (inheritance chains spanning multiple modules
+   created from the same definition), ``PyType_GetModuleByDef`` might not
+   return the module of the true defining class. However, it will always
+   return a module with the same definition, ensuring a compatible
+   C memory layout.
+
+
+Lifetime of the Module State
+----------------------------
+
+When a module object is garbage-collected, its module state is freed.
+For each pointer to (a part of) the module state, you must hold a reference
+to the module object.
+
+Usually this is not an issue, because types created with
+:c:func:`PyType_FromModuleAndSpec`, and their instances, hold a reference
+to the module.
+However, you must be careful in reference counting when you reference
+module state from other places, such as callbacks for external
+libraries.
+
+
+Open Issues
+===========
+
+Several issues around per-module state and heap types are still open.
+
+Discussions about improving the situation are best held on the `capi-sig
+mailing list <https://mail.python.org/mailman3/lists/capi-sig.python.org/>`__.
+
+
+Per-Class Scope
+---------------
+
+It is currently (as of Python 3.11) not possible to attach state to individual
+*types* without relying on CPython implementation details (which may change
+in the future?perhaps, ironically, to allow a proper solution for
+per-class scope).
+
+
+Lossless Conversion to Heap Types
+---------------------------------
+
+The heap type API was not designed for "lossless" conversion from static types;
+that is, creating a type that works exactly like a given static type.


From webhook-mailer at python.org  Tue Jul  5 11:24:04 2022
From: webhook-mailer at python.org (ambv)
Date: Tue, 05 Jul 2022 15:24:04 -0000
Subject: [Python-checkins] gh-90355: Add isolated flag if currently isolated
 (GH-92857)
Message-ID: <mailman.2096.1657034645.20746.python-checkins@python.org>

https://github.com/python/cpython/commit/c8556bcf6c0b05ac46bd74880626a2853e7c99a1
commit: c8556bcf6c0b05ac46bd74880626a2853e7c99a1
branch: main
author: Carter Dodd <carter.dodd at gmail.com>
committer: ambv <lukasz at langa.pl>
date: 2022-07-05T17:23:44+02:00
summary:

gh-90355: Add isolated flag if currently isolated (GH-92857)

Co-authored-by: ?ric <merwok at netwok.org>
Co-authored-by: ?ukasz Langa <lukasz at langa.pl>

files:
A Misc/NEWS.d/next/Library/2022-01-03-15-07-06.bpo-46197.Z0djv6.rst
M Lib/ensurepip/__init__.py

diff --git a/Lib/ensurepip/__init__.py b/Lib/ensurepip/__init__.py
index a198a86e1f9af..1f25825f3febf 100644
--- a/Lib/ensurepip/__init__.py
+++ b/Lib/ensurepip/__init__.py
@@ -89,8 +89,18 @@ def _run_pip(args, additional_paths=None):
 sys.argv[1:] = {args}
 runpy.run_module("pip", run_name="__main__", alter_sys=True)
 """
-    return subprocess.run([sys.executable, '-W', 'ignore::DeprecationWarning',
-                           "-c", code], check=True).returncode
+
+    cmd = [
+        sys.executable,
+        '-W',
+        'ignore::DeprecationWarning',
+        '-c',
+        code,
+    ]
+    if sys.flags.isolated:
+        # run code in isolated mode if currently running isolated
+        cmd.insert(1, '-I')
+    return subprocess.run(cmd, check=True).returncode
 
 
 def version():
diff --git a/Misc/NEWS.d/next/Library/2022-01-03-15-07-06.bpo-46197.Z0djv6.rst b/Misc/NEWS.d/next/Library/2022-01-03-15-07-06.bpo-46197.Z0djv6.rst
new file mode 100644
index 0000000000000..7a3b2d59dfaf4
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2022-01-03-15-07-06.bpo-46197.Z0djv6.rst
@@ -0,0 +1 @@
+Fix :mod:`ensurepip` environment isolation for subprocess running ``pip``.


From webhook-mailer at python.org  Tue Jul  5 11:40:26 2022
From: webhook-mailer at python.org (vsajip)
Date: Tue, 05 Jul 2022 15:40:26 -0000
Subject: [Python-checkins] [3.11] gh-92897: Ensure `venv --copies` respects
 source build property of the creating interpreter (GH-92899) (GH-94567)
Message-ID: <mailman.2097.1657035627.20746.python-checkins@python.org>

https://github.com/python/cpython/commit/49aeda989d9385eb4f0c41f7a7e4854037a7abfb
commit: 49aeda989d9385eb4f0c41f7a7e4854037a7abfb
branch: 3.11
author: Vinay Sajip <vinay_sajip at yahoo.co.uk>
committer: vsajip <vinay_sajip at yahoo.co.uk>
date: 2022-07-05T16:40:17+01:00
summary:

[3.11] gh-92897: Ensure `venv --copies` respects source build property of the creating interpreter (GH-92899) (GH-94567)

(cherry picked from commit 067597522a9002f3b8aff7f46033f10acb2381e4)

Co-authored-by: Jeremy Kloth <jeremy.kloth at gmail.com>

files:
M Lib/distutils/sysconfig.py
M Lib/distutils/tests/test_sysconfig.py
M Lib/sysconfig.py
M Lib/test/test_sysconfig.py
M Lib/test/test_venv.py

diff --git a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py
index 3414a761e76b99..03b85584190db9 100644
--- a/Lib/distutils/sysconfig.py
+++ b/Lib/distutils/sysconfig.py
@@ -30,8 +30,6 @@
     parse_config_h as sysconfig_parse_config_h,
 
     _init_non_posix,
-    _is_python_source_dir,
-    _sys_home,
 
     _variable_rx,
     _findvar1_rx,
@@ -52,9 +50,6 @@
 # which might not be true in the time of import.
 _config_vars = get_config_vars()
 
-if os.name == "nt":
-    from sysconfig import _fix_pcbuild
-
 warnings.warn(
     'The distutils.sysconfig module is deprecated, use sysconfig instead',
     DeprecationWarning,
@@ -287,7 +282,7 @@ def get_python_inc(plat_specific=0, prefix=None):
             # must use "srcdir" from the makefile to find the "Include"
             # directory.
             if plat_specific:
-                return _sys_home or project_base
+                return project_base
             else:
                 incdir = os.path.join(get_config_var('srcdir'), 'Include')
                 return os.path.normpath(incdir)
diff --git a/Lib/distutils/tests/test_sysconfig.py b/Lib/distutils/tests/test_sysconfig.py
index 0664acade82cd1..d1c472794c5ae5 100644
--- a/Lib/distutils/tests/test_sysconfig.py
+++ b/Lib/distutils/tests/test_sysconfig.py
@@ -61,7 +61,11 @@ def test_srcdir(self):
             # should be a full source checkout.
             Python_h = os.path.join(srcdir, 'Include', 'Python.h')
             self.assertTrue(os.path.exists(Python_h), Python_h)
-            self.assertTrue(sysconfig._is_python_source_dir(srcdir))
+            # <srcdir>/PC/pyconfig.h always exists even if unused on POSIX.
+            pyconfig_h = os.path.join(srcdir, 'PC', 'pyconfig.h')
+            self.assertTrue(os.path.exists(pyconfig_h), pyconfig_h)
+            pyconfig_h_in = os.path.join(srcdir, 'pyconfig.h.in')
+            self.assertTrue(os.path.exists(pyconfig_h_in), pyconfig_h_in)
         elif os.name == 'posix':
             self.assertEqual(
                 os.path.dirname(sysconfig.get_makefile_filename()),
diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py
index bf926cf76807b7..ebe37118274222 100644
--- a/Lib/sysconfig.py
+++ b/Lib/sysconfig.py
@@ -195,37 +195,38 @@ def _safe_realpath(path):
     # unable to retrieve the real program name
     _PROJECT_BASE = _safe_realpath(os.getcwd())
 
-if (os.name == 'nt' and
-    _PROJECT_BASE.lower().endswith(('\\pcbuild\\win32', '\\pcbuild\\amd64'))):
-    _PROJECT_BASE = _safe_realpath(os.path.join(_PROJECT_BASE, pardir, pardir))
+# In a virtual environment, `sys._home` gives us the target directory
+# `_PROJECT_BASE` for the executable that created it when the virtual
+# python is an actual executable ('venv --copies' or Windows).
+_sys_home = getattr(sys, '_home', None)
+if _sys_home:
+    _PROJECT_BASE = _sys_home
+
+if os.name == 'nt':
+    # In a source build, the executable is in a subdirectory of the root
+    # that we want (<root>\PCbuild\<platname>).
+    # `_BASE_PREFIX` is used as the base installation is where the source
+    # will be.  The realpath is needed to prevent mount point confusion
+    # that can occur with just string comparisons.
+    if _safe_realpath(_PROJECT_BASE).startswith(
+            _safe_realpath(f'{_BASE_PREFIX}\\PCbuild')):
+        _PROJECT_BASE = _BASE_PREFIX
 
 # set for cross builds
 if "_PYTHON_PROJECT_BASE" in os.environ:
     _PROJECT_BASE = _safe_realpath(os.environ["_PYTHON_PROJECT_BASE"])
 
-def _is_python_source_dir(d):
+def is_python_build(check_home=None):
+    if check_home is not None:
+        import warnings
+        warnings.warn("check_home argument is deprecated and ignored.",
+                      DeprecationWarning, stacklevel=2)
     for fn in ("Setup", "Setup.local"):
-        if os.path.isfile(os.path.join(d, "Modules", fn)):
+        if os.path.isfile(os.path.join(_PROJECT_BASE, "Modules", fn)):
             return True
     return False
 
-_sys_home = getattr(sys, '_home', None)
-
-if os.name == 'nt':
-    def _fix_pcbuild(d):
-        if d and os.path.normcase(d).startswith(
-                os.path.normcase(os.path.join(_PREFIX, "PCbuild"))):
-            return _PREFIX
-        return d
-    _PROJECT_BASE = _fix_pcbuild(_PROJECT_BASE)
-    _sys_home = _fix_pcbuild(_sys_home)
-
-def is_python_build(check_home=False):
-    if check_home and _sys_home:
-        return _is_python_source_dir(_sys_home)
-    return _is_python_source_dir(_PROJECT_BASE)
-
-_PYTHON_BUILD = is_python_build(True)
+_PYTHON_BUILD = is_python_build()
 
 if _PYTHON_BUILD:
     for scheme in ('posix_prefix', 'posix_home'):
@@ -442,7 +443,7 @@ def _parse_makefile(filename, vars=None, keep_unresolved=True):
 def get_makefile_filename():
     """Return the path of the Makefile."""
     if _PYTHON_BUILD:
-        return os.path.join(_sys_home or _PROJECT_BASE, "Makefile")
+        return os.path.join(_PROJECT_BASE, "Makefile")
     if hasattr(sys, 'abiflags'):
         config_dir_name = f'config-{_PY_VERSION_SHORT}{sys.abiflags}'
     else:
@@ -587,9 +588,9 @@ def get_config_h_filename():
     """Return the path of pyconfig.h."""
     if _PYTHON_BUILD:
         if os.name == "nt":
-            inc_dir = os.path.join(_sys_home or _PROJECT_BASE, "PC")
+            inc_dir = os.path.join(_PROJECT_BASE, "PC")
         else:
-            inc_dir = _sys_home or _PROJECT_BASE
+            inc_dir = _PROJECT_BASE
     else:
         inc_dir = get_path('platinclude')
     return os.path.join(inc_dir, 'pyconfig.h')
diff --git a/Lib/test/test_sysconfig.py b/Lib/test/test_sysconfig.py
index 83b492e9219ac1..578ac1db504455 100644
--- a/Lib/test/test_sysconfig.py
+++ b/Lib/test/test_sysconfig.py
@@ -451,7 +451,11 @@ def test_srcdir(self):
             # should be a full source checkout.
             Python_h = os.path.join(srcdir, 'Include', 'Python.h')
             self.assertTrue(os.path.exists(Python_h), Python_h)
-            self.assertTrue(sysconfig._is_python_source_dir(srcdir))
+            # <srcdir>/PC/pyconfig.h always exists even if unused on POSIX.
+            pyconfig_h = os.path.join(srcdir, 'PC', 'pyconfig.h')
+            self.assertTrue(os.path.exists(pyconfig_h), pyconfig_h)
+            pyconfig_h_in = os.path.join(srcdir, 'pyconfig.h.in')
+            self.assertTrue(os.path.exists(pyconfig_h_in), pyconfig_h_in)
         elif os.name == 'posix':
             makefile_dir = os.path.dirname(sysconfig.get_makefile_filename())
             # Issue #19340: srcdir has been realpath'ed already
diff --git a/Lib/test/test_venv.py b/Lib/test/test_venv.py
index 4440fceace2060..74039f59f797e5 100644
--- a/Lib/test/test_venv.py
+++ b/Lib/test/test_venv.py
@@ -15,6 +15,7 @@
 import struct
 import subprocess
 import sys
+import sysconfig
 import tempfile
 from test.support import (captured_stdout, captured_stderr, requires_zlib,
                           skip_if_broken_multiprocessing_synchronize, verbose,
@@ -254,18 +255,49 @@ def test_prefixes(self):
             self.assertEqual(out.strip(), expected.encode(), prefix)
 
     @requireVenvCreate
-    def test_sysconfig_preferred_and_default_scheme(self):
+    def test_sysconfig(self):
         """
-        Test that the sysconfig preferred(prefix) and default scheme is venv.
+        Test that the sysconfig functions work in a virtual environment.
         """
         rmtree(self.env_dir)
-        self.run_with_capture(venv.create, self.env_dir)
+        self.run_with_capture(venv.create, self.env_dir, symlinks=False)
         envpy = os.path.join(self.env_dir, self.bindir, self.exe)
         cmd = [envpy, '-c', None]
-        for call in ('get_preferred_scheme("prefix")', 'get_default_scheme()'):
-            cmd[2] = 'import sysconfig; print(sysconfig.%s)' % call
-            out, err = check_output(cmd)
-            self.assertEqual(out.strip(), b'venv', err)
+        for call, expected in (
+            # installation scheme
+            ('get_preferred_scheme("prefix")', 'venv'),
+            ('get_default_scheme()', 'venv'),
+            # build environment
+            ('is_python_build()', str(sysconfig.is_python_build())),
+            ('get_makefile_filename()', sysconfig.get_makefile_filename()),
+            ('get_config_h_filename()', sysconfig.get_config_h_filename())):
+            with self.subTest(call):
+                cmd[2] = 'import sysconfig; print(sysconfig.%s)' % call
+                out, err = check_output(cmd)
+                self.assertEqual(out.strip(), expected.encode(), err)
+
+    @requireVenvCreate
+    @unittest.skipUnless(can_symlink(), 'Needs symlinks')
+    def test_sysconfig_symlinks(self):
+        """
+        Test that the sysconfig functions work in a virtual environment.
+        """
+        rmtree(self.env_dir)
+        self.run_with_capture(venv.create, self.env_dir, symlinks=True)
+        envpy = os.path.join(self.env_dir, self.bindir, self.exe)
+        cmd = [envpy, '-c', None]
+        for call, expected in (
+            # installation scheme
+            ('get_preferred_scheme("prefix")', 'venv'),
+            ('get_default_scheme()', 'venv'),
+            # build environment
+            ('is_python_build()', str(sysconfig.is_python_build())),
+            ('get_makefile_filename()', sysconfig.get_makefile_filename()),
+            ('get_config_h_filename()', sysconfig.get_config_h_filename())):
+            with self.subTest(call):
+                cmd[2] = 'import sysconfig; print(sysconfig.%s)' % call
+                out, err = check_output(cmd)
+                self.assertEqual(out.strip(), expected.encode(), err)
 
     if sys.platform == 'win32':
         ENV_SUBDIRS = (


From webhook-mailer at python.org  Tue Jul  5 11:54:12 2022
From: webhook-mailer at python.org (ambv)
Date: Tue, 05 Jul 2022 15:54:12 -0000
Subject: [Python-checkins] gh-90355: Add isolated flag if currently isolated
 (GH-92857) (GH-94568)
Message-ID: <mailman.2098.1657036453.20746.python-checkins@python.org>

https://github.com/python/cpython/commit/9bd97a2a7e542aca2635cc53d74b286944653316
commit: 9bd97a2a7e542aca2635cc53d74b286944653316
branch: 3.11
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: ambv <lukasz at langa.pl>
date: 2022-07-05T17:54:03+02:00
summary:

gh-90355: Add isolated flag if currently isolated (GH-92857) (GH-94568)

Co-authored-by: Carter Dodd <carter.dodd at gmail.com>
Co-authored-by: ?ric <merwok at netwok.org>
Co-authored-by: ?ukasz Langa <lukasz at langa.pl>
(cherry picked from commit c8556bcf6c0b05ac46bd74880626a2853e7c99a1)

files:
A Misc/NEWS.d/next/Library/2022-01-03-15-07-06.bpo-46197.Z0djv6.rst
M Lib/ensurepip/__init__.py

diff --git a/Lib/ensurepip/__init__.py b/Lib/ensurepip/__init__.py
index a198a86e1f9af..1f25825f3febf 100644
--- a/Lib/ensurepip/__init__.py
+++ b/Lib/ensurepip/__init__.py
@@ -89,8 +89,18 @@ def _run_pip(args, additional_paths=None):
 sys.argv[1:] = {args}
 runpy.run_module("pip", run_name="__main__", alter_sys=True)
 """
-    return subprocess.run([sys.executable, '-W', 'ignore::DeprecationWarning',
-                           "-c", code], check=True).returncode
+
+    cmd = [
+        sys.executable,
+        '-W',
+        'ignore::DeprecationWarning',
+        '-c',
+        code,
+    ]
+    if sys.flags.isolated:
+        # run code in isolated mode if currently running isolated
+        cmd.insert(1, '-I')
+    return subprocess.run(cmd, check=True).returncode
 
 
 def version():
diff --git a/Misc/NEWS.d/next/Library/2022-01-03-15-07-06.bpo-46197.Z0djv6.rst b/Misc/NEWS.d/next/Library/2022-01-03-15-07-06.bpo-46197.Z0djv6.rst
new file mode 100644
index 0000000000000..7a3b2d59dfaf4
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2022-01-03-15-07-06.bpo-46197.Z0djv6.rst
@@ -0,0 +1 @@
+Fix :mod:`ensurepip` environment isolation for subprocess running ``pip``.


From webhook-mailer at python.org  Tue Jul  5 11:58:40 2022
From: webhook-mailer at python.org (ambv)
Date: Tue, 05 Jul 2022 15:58:40 -0000
Subject: [Python-checkins] gh-90355: Add isolated flag if currently isolated
 (GH-92857) (GH-94569)
Message-ID: <mailman.2099.1657036722.20746.python-checkins@python.org>

https://github.com/python/cpython/commit/922075c964e5d630402176169980b8831c42409c
commit: 922075c964e5d630402176169980b8831c42409c
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: ambv <lukasz at langa.pl>
date: 2022-07-05T17:58:28+02:00
summary:

gh-90355: Add isolated flag if currently isolated (GH-92857) (GH-94569)

Co-authored-by: Carter Dodd <carter.dodd at gmail.com>
Co-authored-by: ?ric <merwok at netwok.org>
Co-authored-by: ?ukasz Langa <lukasz at langa.pl>
(cherry picked from commit c8556bcf6c0b05ac46bd74880626a2853e7c99a1)

files:
A Misc/NEWS.d/next/Library/2022-01-03-15-07-06.bpo-46197.Z0djv6.rst
M Lib/ensurepip/__init__.py

diff --git a/Lib/ensurepip/__init__.py b/Lib/ensurepip/__init__.py
index 3fbe8b2a5b136..a82dbadce1635 100644
--- a/Lib/ensurepip/__init__.py
+++ b/Lib/ensurepip/__init__.py
@@ -90,8 +90,18 @@ def _run_pip(args, additional_paths=None):
 sys.argv[1:] = {args}
 runpy.run_module("pip", run_name="__main__", alter_sys=True)
 """
-    return subprocess.run([sys.executable, '-W', 'ignore::DeprecationWarning',
-                           "-c", code], check=True).returncode
+
+    cmd = [
+        sys.executable,
+        '-W',
+        'ignore::DeprecationWarning',
+        '-c',
+        code,
+    ]
+    if sys.flags.isolated:
+        # run code in isolated mode if currently running isolated
+        cmd.insert(1, '-I')
+    return subprocess.run(cmd, check=True).returncode
 
 
 def version():
diff --git a/Misc/NEWS.d/next/Library/2022-01-03-15-07-06.bpo-46197.Z0djv6.rst b/Misc/NEWS.d/next/Library/2022-01-03-15-07-06.bpo-46197.Z0djv6.rst
new file mode 100644
index 0000000000000..7a3b2d59dfaf4
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2022-01-03-15-07-06.bpo-46197.Z0djv6.rst
@@ -0,0 +1 @@
+Fix :mod:`ensurepip` environment isolation for subprocess running ``pip``.


From webhook-mailer at python.org  Tue Jul  5 12:07:16 2022
From: webhook-mailer at python.org (ambv)
Date: Tue, 05 Jul 2022 16:07:16 -0000
Subject: [Python-checkins] [3.9] gh-90355: Add isolated flag if currently
 isolated (GH-92857) (GH-94570)
Message-ID: <mailman.2100.1657037237.20746.python-checkins@python.org>

https://github.com/python/cpython/commit/eff4aa5409a0dfe6ccd5ef4662578c77ee2954f1
commit: eff4aa5409a0dfe6ccd5ef4662578c77ee2954f1
branch: 3.9
author: ?ukasz Langa <lukasz at langa.pl>
committer: ambv <lukasz at langa.pl>
date: 2022-07-05T18:06:57+02:00
summary:

[3.9] gh-90355: Add isolated flag if currently isolated (GH-92857) (GH-94570)

Co-authored-by: Carter Dodd <carter.dodd at gmail.com>
Co-authored-by: ?ric <merwok at netwok.org>
Co-authored-by: ?ukasz Langa <lukasz at langa.pl>
(cherry picked from commit c8556bcf6c0b05ac46bd74880626a2853e7c99a1)

files:
A Misc/NEWS.d/next/Library/2022-01-03-15-07-06.bpo-46197.Z0djv6.rst
M Lib/ensurepip/__init__.py

diff --git a/Lib/ensurepip/__init__.py b/Lib/ensurepip/__init__.py
index e510cc7fb2baf..981534c4a0941 100644
--- a/Lib/ensurepip/__init__.py
+++ b/Lib/ensurepip/__init__.py
@@ -31,7 +31,12 @@ def _run_pip(args, additional_paths=None):
 sys.argv[1:] = {args}
 runpy.run_module("pip", run_name="__main__", alter_sys=True)
 """
-    return subprocess.run([sys.executable, "-c", code], check=True).returncode
+
+    cmd = [sys.executable, '-c', code]
+    if sys.flags.isolated:
+        # run code in isolated mode if currently running isolated
+        cmd.insert(1, '-I')
+    return subprocess.run(cmd, check=True).returncode
 
 
 def version():
diff --git a/Misc/NEWS.d/next/Library/2022-01-03-15-07-06.bpo-46197.Z0djv6.rst b/Misc/NEWS.d/next/Library/2022-01-03-15-07-06.bpo-46197.Z0djv6.rst
new file mode 100644
index 0000000000000..7a3b2d59dfaf4
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2022-01-03-15-07-06.bpo-46197.Z0djv6.rst
@@ -0,0 +1 @@
+Fix :mod:`ensurepip` environment isolation for subprocess running ``pip``.


From webhook-mailer at python.org  Tue Jul  5 12:07:46 2022
From: webhook-mailer at python.org (ambv)
Date: Tue, 05 Jul 2022 16:07:46 -0000
Subject: [Python-checkins] [3.8] gh-90355: Add isolated flag if currently
 isolated (GH-92857) (GH-94571)
Message-ID: <mailman.2101.1657037268.20746.python-checkins@python.org>

https://github.com/python/cpython/commit/f78733b332966cef7d0c61165389549f4ffe0727
commit: f78733b332966cef7d0c61165389549f4ffe0727
branch: 3.8
author: ?ukasz Langa <lukasz at langa.pl>
committer: ambv <lukasz at langa.pl>
date: 2022-07-05T18:07:36+02:00
summary:

[3.8] gh-90355: Add isolated flag if currently isolated (GH-92857) (GH-94571)

Co-authored-by: Carter Dodd <carter.dodd at gmail.com>
Co-authored-by: ?ric <merwok at netwok.org>
Co-authored-by: ?ukasz Langa <lukasz at langa.pl>
(cherry picked from commit c8556bcf6c0b05ac46bd74880626a2853e7c99a1)

files:
A Misc/NEWS.d/next/Library/2022-01-03-15-07-06.bpo-46197.Z0djv6.rst
M Lib/ensurepip/__init__.py

diff --git a/Lib/ensurepip/__init__.py b/Lib/ensurepip/__init__.py
index b291e9afb1897..88ddc63128f5b 100644
--- a/Lib/ensurepip/__init__.py
+++ b/Lib/ensurepip/__init__.py
@@ -29,7 +29,12 @@ def _run_pip(args, additional_paths=None):
 sys.argv[1:] = {args}
 runpy.run_module("pip", run_name="__main__", alter_sys=True)
 """
-    return subprocess.run([sys.executable, "-c", code], check=True).returncode
+
+    cmd = [sys.executable, '-c', code]
+    if sys.flags.isolated:
+        # run code in isolated mode if currently running isolated
+        cmd.insert(1, '-I')
+    return subprocess.run(cmd, check=True).returncode
 
 
 def version():
diff --git a/Misc/NEWS.d/next/Library/2022-01-03-15-07-06.bpo-46197.Z0djv6.rst b/Misc/NEWS.d/next/Library/2022-01-03-15-07-06.bpo-46197.Z0djv6.rst
new file mode 100644
index 0000000000000..7a3b2d59dfaf4
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2022-01-03-15-07-06.bpo-46197.Z0djv6.rst
@@ -0,0 +1 @@
+Fix :mod:`ensurepip` environment isolation for subprocess running ``pip``.


From webhook-mailer at python.org  Tue Jul  5 12:40:01 2022
From: webhook-mailer at python.org (pablogsal)
Date: Tue, 05 Jul 2022 16:40:01 -0000
Subject: [Python-checkins] gh-94360: Fix a tokenizer crash when reading
 encoded files with syntax errors from stdin (#94386)
Message-ID: <mailman.2102.1657039203.20746.python-checkins@python.org>

https://github.com/python/cpython/commit/36fcde61ba48c4e918830691ecf4092e4e3b9b99
commit: 36fcde61ba48c4e918830691ecf4092e4e3b9b99
branch: main
author: Pablo Galindo Salgado <Pablogsal at gmail.com>
committer: pablogsal <Pablogsal at gmail.com>
date: 2022-07-05T17:39:21+01:00
summary:

gh-94360: Fix a tokenizer crash when reading encoded files with syntax errors from stdin (#94386)

* gh-94360: Fix a tokenizer crash when reading encoded files with syntax errors from stdin

Signed-off-by: Pablo Galindo <pablogsal at gmail.com>

* nitty nit

Co-authored-by: ?ukasz Langa <lukasz at langa.pl>

files:
A Misc/NEWS.d/next/Core and Builtins/2022-06-28-14-20-36.gh-issue-94360.DiEnen.rst
M Parser/pegen_errors.c
M Parser/tokenizer.c

diff --git a/Misc/NEWS.d/next/Core and Builtins/2022-06-28-14-20-36.gh-issue-94360.DiEnen.rst b/Misc/NEWS.d/next/Core and Builtins/2022-06-28-14-20-36.gh-issue-94360.DiEnen.rst
new file mode 100644
index 0000000000000..0a74ba38b0ac4
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2022-06-28-14-20-36.gh-issue-94360.DiEnen.rst	
@@ -0,0 +1,2 @@
+Fixed a tokenizer crash when reading encoded files with syntax errors from
+``stdin`` with non utf-8 encoded text. Patch by Pablo Galindo
diff --git a/Parser/pegen_errors.c b/Parser/pegen_errors.c
index 489699679633e..5703088443ede 100644
--- a/Parser/pegen_errors.c
+++ b/Parser/pegen_errors.c
@@ -259,15 +259,15 @@ get_error_line_from_tokenizer_buffers(Parser *p, Py_ssize_t lineno)
     const char* buf_end = p->tok->fp_interactive ? p->tok->interactive_src_end : p->tok->inp;
 
     for (int i = 0; i < relative_lineno - 1; i++) {
-        char *new_line = strchr(cur_line, '\n') + 1;
+        char *new_line = strchr(cur_line, '\n');
         // The assert is here for debug builds but the conditional that
         // follows is there so in release builds we do not crash at the cost
         // to report a potentially wrong line.
-        assert(new_line != NULL && new_line <= buf_end);
-        if (new_line == NULL || new_line > buf_end) {
+        assert(new_line != NULL && new_line + 1 < buf_end);
+        if (new_line == NULL || new_line + 1 > buf_end) {
             break;
         }
-        cur_line = new_line;
+        cur_line = new_line + 1;
     }
 
     char *next_newline;
diff --git a/Parser/tokenizer.c b/Parser/tokenizer.c
index 952265eb923f9..f2606f17d1463 100644
--- a/Parser/tokenizer.c
+++ b/Parser/tokenizer.c
@@ -308,6 +308,10 @@ tok_concatenate_interactive_new_line(struct tok_state *tok, const char *line) {
 
     Py_ssize_t current_size = tok->interactive_src_end - tok->interactive_src_start;
     Py_ssize_t line_size = strlen(line);
+    char last_char = line[line_size > 0 ? line_size - 1 : line_size];
+    if (last_char != '\n') {
+        line_size += 1;
+    }
     char* new_str = tok->interactive_src_start;
 
     new_str = PyMem_Realloc(new_str, current_size + line_size + 1);
@@ -321,7 +325,11 @@ tok_concatenate_interactive_new_line(struct tok_state *tok, const char *line) {
         return -1;
     }
     strcpy(new_str + current_size, line);
-
+    if (last_char != '\n') {
+        /* Last line does not end in \n, fake one */
+        new_str[current_size + line_size - 1] = '\n';
+        new_str[current_size + line_size] = '\0';
+    }
     tok->interactive_src_start = new_str;
     tok->interactive_src_end = new_str + current_size + line_size;
     return 0;


From webhook-mailer at python.org  Tue Jul  5 13:10:01 2022
From: webhook-mailer at python.org (miss-islington)
Date: Tue, 05 Jul 2022 17:10:01 -0000
Subject: [Python-checkins] gh-94360: Fix a tokenizer crash when reading
 encoded files with syntax errors from stdin (GH-94386)
Message-ID: <mailman.2103.1657041001.20746.python-checkins@python.org>

https://github.com/python/cpython/commit/d49c99f10d66e6c485bde7e35d79dea07f3c90eb
commit: d49c99f10d66e6c485bde7e35d79dea07f3c90eb
branch: 3.11
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-05T10:09:51-07:00
summary:

gh-94360: Fix a tokenizer crash when reading encoded files with syntax errors from stdin (GH-94386)


* gh-94360: Fix a tokenizer crash when reading encoded files with syntax errors from stdin

Signed-off-by: Pablo Galindo <pablogsal at gmail.com>

* nitty nit

Co-authored-by: ?ukasz Langa <lukasz at langa.pl>
(cherry picked from commit 36fcde61ba48c4e918830691ecf4092e4e3b9b99)

Co-authored-by: Pablo Galindo Salgado <Pablogsal at gmail.com>

files:
A Misc/NEWS.d/next/Core and Builtins/2022-06-28-14-20-36.gh-issue-94360.DiEnen.rst
M Parser/pegen_errors.c
M Parser/tokenizer.c

diff --git a/Misc/NEWS.d/next/Core and Builtins/2022-06-28-14-20-36.gh-issue-94360.DiEnen.rst b/Misc/NEWS.d/next/Core and Builtins/2022-06-28-14-20-36.gh-issue-94360.DiEnen.rst
new file mode 100644
index 0000000000000..0a74ba38b0ac4
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2022-06-28-14-20-36.gh-issue-94360.DiEnen.rst	
@@ -0,0 +1,2 @@
+Fixed a tokenizer crash when reading encoded files with syntax errors from
+``stdin`` with non utf-8 encoded text. Patch by Pablo Galindo
diff --git a/Parser/pegen_errors.c b/Parser/pegen_errors.c
index 489699679633e..5703088443ede 100644
--- a/Parser/pegen_errors.c
+++ b/Parser/pegen_errors.c
@@ -259,15 +259,15 @@ get_error_line_from_tokenizer_buffers(Parser *p, Py_ssize_t lineno)
     const char* buf_end = p->tok->fp_interactive ? p->tok->interactive_src_end : p->tok->inp;
 
     for (int i = 0; i < relative_lineno - 1; i++) {
-        char *new_line = strchr(cur_line, '\n') + 1;
+        char *new_line = strchr(cur_line, '\n');
         // The assert is here for debug builds but the conditional that
         // follows is there so in release builds we do not crash at the cost
         // to report a potentially wrong line.
-        assert(new_line != NULL && new_line <= buf_end);
-        if (new_line == NULL || new_line > buf_end) {
+        assert(new_line != NULL && new_line + 1 < buf_end);
+        if (new_line == NULL || new_line + 1 > buf_end) {
             break;
         }
-        cur_line = new_line;
+        cur_line = new_line + 1;
     }
 
     char *next_newline;
diff --git a/Parser/tokenizer.c b/Parser/tokenizer.c
index c450aa8e4636c..b61ac120c8694 100644
--- a/Parser/tokenizer.c
+++ b/Parser/tokenizer.c
@@ -305,6 +305,10 @@ tok_concatenate_interactive_new_line(struct tok_state *tok, const char *line) {
 
     Py_ssize_t current_size = tok->interactive_src_end - tok->interactive_src_start;
     Py_ssize_t line_size = strlen(line);
+    char last_char = line[line_size > 0 ? line_size - 1 : line_size];
+    if (last_char != '\n') {
+        line_size += 1;
+    }
     char* new_str = tok->interactive_src_start;
 
     new_str = PyMem_Realloc(new_str, current_size + line_size + 1);
@@ -318,7 +322,11 @@ tok_concatenate_interactive_new_line(struct tok_state *tok, const char *line) {
         return -1;
     }
     strcpy(new_str + current_size, line);
-
+    if (last_char != '\n') {
+        /* Last line does not end in \n, fake one */
+        new_str[current_size + line_size - 1] = '\n';
+        new_str[current_size + line_size] = '\0';
+    }
     tok->interactive_src_start = new_str;
     tok->interactive_src_end = new_str + current_size + line_size;
     return 0;


From webhook-mailer at python.org  Tue Jul  5 14:09:57 2022
From: webhook-mailer at python.org (ambv)
Date: Tue, 05 Jul 2022 18:09:57 -0000
Subject: [Python-checkins] gh-91330: Tests and docs for dataclass
 descriptor-typed fields (GH-94424)
Message-ID: <mailman.2104.1657044598.20746.python-checkins@python.org>

https://github.com/python/cpython/commit/5f319308a820f49fec66fc3ade50bbaa9fe2105d
commit: 5f319308a820f49fec66fc3ade50bbaa9fe2105d
branch: main
author: Erik De Bonte <erikd at microsoft.com>
committer: ambv <lukasz at langa.pl>
date: 2022-07-05T20:09:41+02:00
summary:

gh-91330: Tests and docs for dataclass descriptor-typed fields (GH-94424)

Co-authored-by: ?ukasz Langa <lukasz at langa.pl>

files:
A Misc/NEWS.d/next/Tests/2022-07-05-17-53-13.gh-issue-91330.Qys5IL.rst
M Doc/library/dataclasses.rst
M Lib/test/test_dataclasses.py

diff --git a/Doc/library/dataclasses.rst b/Doc/library/dataclasses.rst
index ec50696ea89d4..4364ac342471e 100644
--- a/Doc/library/dataclasses.rst
+++ b/Doc/library/dataclasses.rst
@@ -749,3 +749,54 @@ mutable types as default values for fields::
    ``dict``, or ``set``, unhashable objects are now not allowed as
    default values.  Unhashability is used to approximate
    mutability.
+
+Descriptor-typed fields
+-----------------------
+
+Fields that are assigned :ref:`descriptor objects <descriptors>` as their
+default value have the following special behaviors:
+
+* The value for the field passed to the dataclass's ``__init__`` method is
+  passed to the descriptor's ``__set__`` method rather than overwriting the
+  descriptor object.
+* Similarly, when getting or setting the field, the descriptor's
+  ``__get__`` or ``__set__`` method is called rather than returning or
+  overwriting the descriptor object.
+* To determine whether a field contains a default value, ``dataclasses``
+  will call the descriptor's ``__get__`` method using its class access
+  form (i.e. ``descriptor.__get__(obj=None, type=cls)``.  If the
+  descriptor returns a value in this case, it will be used as the
+  field's default. On the other hand, if the descriptor raises
+  :exc:`AttributeError` in this situation, no default value will be
+  provided for the field.
+
+::
+
+  class IntConversionDescriptor:
+    def __init__(self, *, default):
+      self._default = default
+
+    def __set_name__(self, owner, name):
+      self._name = "_" + name
+
+    def __get__(self, obj, type):
+      if obj is None:
+        return self._default
+
+      return getattr(obj, self._name, self._default)
+
+    def __set__(self, obj, value):
+      setattr(obj, self._name, int(value))
+
+  @dataclass
+  class InventoryItem:
+    quantity_on_hand: IntConversionDescriptor = IntConversionDescriptor(default=100)
+
+  i = InventoryItem()
+  print(i.quantity_on_hand)   # 100
+  i.quantity_on_hand = 2.5    # calls __set__ with 2.5
+  print(i.quantity_on_hand)   # 2
+
+Note that if a field is annotated with a descriptor type, but is not assigned
+a descriptor object as its default value, the field will act like a normal
+field.
diff --git a/Lib/test/test_dataclasses.py b/Lib/test/test_dataclasses.py
index 98dfab481bfd1..cfa82093dfbe0 100644
--- a/Lib/test/test_dataclasses.py
+++ b/Lib/test/test_dataclasses.py
@@ -3229,6 +3229,115 @@ class C:
 
         self.assertEqual(D.__set_name__.call_count, 1)
 
+    def test_init_calls_set(self):
+        class D:
+            pass
+
+        D.__set__ = Mock()
+
+        @dataclass
+        class C:
+            i: D = D()
+
+        # Make sure D.__set__ is called.
+        D.__set__.reset_mock()
+        c = C(5)
+        self.assertEqual(D.__set__.call_count, 1)
+
+    def test_getting_field_calls_get(self):
+        class D:
+            pass
+
+        D.__set__ = Mock()
+        D.__get__ = Mock()
+
+        @dataclass
+        class C:
+            i: D = D()
+
+        c = C(5)
+
+        # Make sure D.__get__ is called.
+        D.__get__.reset_mock()
+        value = c.i
+        self.assertEqual(D.__get__.call_count, 1)
+
+    def test_setting_field_calls_set(self):
+        class D:
+            pass
+
+        D.__set__ = Mock()
+
+        @dataclass
+        class C:
+            i: D = D()
+
+        c = C(5)
+
+        # Make sure D.__set__ is called.
+        D.__set__.reset_mock()
+        c.i = 10
+        self.assertEqual(D.__set__.call_count, 1)
+
+    def test_setting_uninitialized_descriptor_field(self):
+        class D:
+            pass
+
+        D.__set__ = Mock()
+
+        @dataclass
+        class C:
+            i: D
+
+        # D.__set__ is not called because there's no D instance to call it on
+        D.__set__.reset_mock()
+        c = C(5)
+        self.assertEqual(D.__set__.call_count, 0)
+
+        # D.__set__ still isn't called after setting i to an instance of D
+        # because descriptors don't behave like that when stored as instance vars
+        c.i = D()
+        c.i = 5
+        self.assertEqual(D.__set__.call_count, 0)
+
+    def test_default_value(self):
+        class D:
+            def __get__(self, instance: Any, owner: object) -> int:
+                if instance is None:
+                    return 100
+
+                return instance._x
+
+            def __set__(self, instance: Any, value: int) -> None:
+                instance._x = value
+
+        @dataclass
+        class C:
+            i: D = D()
+
+        c = C()
+        self.assertEqual(c.i, 100)
+
+        c = C(5)
+        self.assertEqual(c.i, 5)
+
+    def test_no_default_value(self):
+        class D:
+            def __get__(self, instance: Any, owner: object) -> int:
+                if instance is None:
+                    raise AttributeError()
+
+                return instance._x
+
+            def __set__(self, instance: Any, value: int) -> None:
+                instance._x = value
+
+        @dataclass
+        class C:
+            i: D = D()
+
+        with self.assertRaisesRegex(TypeError, 'missing 1 required positional argument'):
+            c = C()
 
 class TestStringAnnotations(unittest.TestCase):
     def test_classvar(self):
diff --git a/Misc/NEWS.d/next/Tests/2022-07-05-17-53-13.gh-issue-91330.Qys5IL.rst b/Misc/NEWS.d/next/Tests/2022-07-05-17-53-13.gh-issue-91330.Qys5IL.rst
new file mode 100644
index 0000000000000..315521102f4ec
--- /dev/null
+++ b/Misc/NEWS.d/next/Tests/2022-07-05-17-53-13.gh-issue-91330.Qys5IL.rst
@@ -0,0 +1,7 @@
+Added more tests for :mod:`dataclasses` to cover behavior with data
+descriptor-based fields.
+
+# Write your Misc/NEWS entry below.  It should be a simple ReST paragraph. #
+Don't start with "- Issue #<n>: " or "- gh-issue-<n>: " or that sort of
+stuff.
+###########################################################################


From webhook-mailer at python.org  Tue Jul  5 14:14:36 2022
From: webhook-mailer at python.org (ambv)
Date: Tue, 05 Jul 2022 18:14:36 -0000
Subject: [Python-checkins] [3.10] gh-94360: Fix a tokenizer crash when
 reading encoded files with syntax errors from stdin (GH-94386) (GH-94574)
Message-ID: <mailman.2105.1657044876.20746.python-checkins@python.org>

https://github.com/python/cpython/commit/697e78ca05ee989c383996a7fde2277fb2d2886f
commit: 697e78ca05ee989c383996a7fde2277fb2d2886f
branch: 3.10
author: Pablo Galindo Salgado <Pablogsal at gmail.com>
committer: ambv <lukasz at langa.pl>
date: 2022-07-05T20:14:28+02:00
summary:

[3.10] gh-94360: Fix a tokenizer crash when reading encoded files with syntax errors from stdin (GH-94386) (GH-94574)

Signed-off-by: Pablo Galindo <pablogsal at gmail.com>
Co-authored-by: Pablo Galindo Salgado <Pablogsal at gmail.com>
Co-authored-by: ?ukasz Langa <lukasz at langa.pl>

(cherry picked from commit 36fcde61ba48c4e918830691ecf4092e4e3b9b99)

files:
A Misc/NEWS.d/next/Core and Builtins/2022-06-28-14-20-36.gh-issue-94360.DiEnen.rst
M Parser/pegen.c
M Parser/tokenizer.c

diff --git a/Misc/NEWS.d/next/Core and Builtins/2022-06-28-14-20-36.gh-issue-94360.DiEnen.rst b/Misc/NEWS.d/next/Core and Builtins/2022-06-28-14-20-36.gh-issue-94360.DiEnen.rst
new file mode 100644
index 0000000000000..0a74ba38b0ac4
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2022-06-28-14-20-36.gh-issue-94360.DiEnen.rst	
@@ -0,0 +1,2 @@
+Fixed a tokenizer crash when reading encoded files with syntax errors from
+``stdin`` with non utf-8 encoded text. Patch by Pablo Galindo
diff --git a/Parser/pegen.c b/Parser/pegen.c
index c04824315c7a3..414059d12363c 100644
--- a/Parser/pegen.c
+++ b/Parser/pegen.c
@@ -446,12 +446,12 @@ get_error_line(Parser *p, Py_ssize_t lineno)
     Py_ssize_t relative_lineno = p->starting_lineno ? lineno - p->starting_lineno + 1 : lineno;
 
     for (int i = 0; i < relative_lineno - 1; i++) {
-        char *new_line = strchr(cur_line, '\n') + 1;
-        assert(new_line != NULL && new_line <= buf_end);
-        if (new_line == NULL || new_line > buf_end) {
+        char *new_line = strchr(cur_line, '\n');
+        assert(new_line != NULL && new_line + 1 < buf_end);
+        if (new_line == NULL || new_line + 1 > buf_end) {
             break;
         }
-        cur_line = new_line;
+        cur_line = new_line + 1;
     }
 
     char *next_newline;
diff --git a/Parser/tokenizer.c b/Parser/tokenizer.c
index 267ccec33fd77..579474c43354f 100644
--- a/Parser/tokenizer.c
+++ b/Parser/tokenizer.c
@@ -328,6 +328,10 @@ tok_concatenate_interactive_new_line(struct tok_state *tok, const char *line) {
 
     Py_ssize_t current_size = tok->interactive_src_end - tok->interactive_src_start;
     Py_ssize_t line_size = strlen(line);
+    char last_char = line[line_size > 0 ? line_size - 1 : line_size];
+    if (last_char != '\n') {
+        line_size += 1;
+    }
     char* new_str = tok->interactive_src_start;
 
     new_str = PyMem_Realloc(new_str, current_size + line_size + 1);
@@ -341,7 +345,11 @@ tok_concatenate_interactive_new_line(struct tok_state *tok, const char *line) {
         return -1;
     }
     strcpy(new_str + current_size, line);
-
+    if (last_char != '\n') {
+        /* Last line does not end in \n, fake one */
+        new_str[current_size + line_size - 1] = '\n';
+        new_str[current_size + line_size] = '\0';
+    }
     tok->interactive_src_start = new_str;
     tok->interactive_src_end = new_str + current_size + line_size;
     return 0;


From webhook-mailer at python.org  Tue Jul  5 14:19:07 2022
From: webhook-mailer at python.org (ambv)
Date: Tue, 05 Jul 2022 18:19:07 -0000
Subject: [Python-checkins] gh-94510: Raise on re-entrant calls to
 sys.setprofile and sys.settrace (GH-94511)
Message-ID: <mailman.2106.1657045148.20746.python-checkins@python.org>

https://github.com/python/cpython/commit/40d81fd63b46cf998880ce3bf3e5cb42bc3199c1
commit: 40d81fd63b46cf998880ce3bf3e5cb42bc3199c1
branch: main
author: Pablo Galindo Salgado <Pablogsal at gmail.com>
committer: ambv <lukasz at langa.pl>
date: 2022-07-05T20:18:47+02:00
summary:

gh-94510: Raise on re-entrant calls to sys.setprofile and sys.settrace (GH-94511)

Co-authored-by: ?ukasz Langa <lukasz at langa.pl>

files:
A Misc/NEWS.d/next/Library/2022-07-02-19-46-30.gh-issue-94510.xOatDC.rst
M Lib/test/test_sys_setprofile.py
M Lib/test/test_sys_settrace.py
M Modules/_lsprof.c
M Python/ceval.c

diff --git a/Lib/test/test_sys_setprofile.py b/Lib/test/test_sys_setprofile.py
index 21a09b51926e6..4c3053a1e3e9e 100644
--- a/Lib/test/test_sys_setprofile.py
+++ b/Lib/test/test_sys_setprofile.py
@@ -2,6 +2,7 @@
 import pprint
 import sys
 import unittest
+from test import support
 
 
 class TestGetProfile(unittest.TestCase):
@@ -415,5 +416,43 @@ def show_events(callable):
     pprint.pprint(capture_events(callable))
 
 
+class TestEdgeCases(unittest.TestCase):
+
+    def setUp(self):
+        self.addCleanup(sys.setprofile, sys.getprofile())
+        sys.setprofile(None)
+
+    def test_reentrancy(self):
+        def foo(*args):
+            ...
+
+        def bar(*args):
+            ...
+
+        class A:
+            def __call__(self, *args):
+                pass
+
+            def __del__(self):
+                sys.setprofile(bar)
+
+        sys.setprofile(A())
+        with support.catch_unraisable_exception() as cm:
+            sys.setprofile(foo)
+            self.assertEqual(cm.unraisable.object, A.__del__)
+            self.assertIsInstance(cm.unraisable.exc_value, RuntimeError)
+
+        self.assertEqual(sys.getprofile(), foo)
+
+
+    def test_same_object(self):
+        def foo(*args):
+            ...
+
+        sys.setprofile(foo)
+        del foo
+        sys.setprofile(sys.getprofile())
+
+
 if __name__ == "__main__":
     unittest.main()
diff --git a/Lib/test/test_sys_settrace.py b/Lib/test/test_sys_settrace.py
index fd2740ea19f0c..7ec290dbf04ad 100644
--- a/Lib/test/test_sys_settrace.py
+++ b/Lib/test/test_sys_settrace.py
@@ -2,6 +2,7 @@
 
 from test import support
 import unittest
+from unittest.mock import MagicMock
 import sys
 import difflib
 import gc
@@ -2684,5 +2685,43 @@ def f():
         self.assertEqual(counts, {'call': 1, 'line': 2000, 'return': 1})
 
 
+class TestEdgeCases(unittest.TestCase):
+
+    def setUp(self):
+        self.addCleanup(sys.settrace, sys.gettrace())
+        sys.settrace(None)
+
+    def test_reentrancy(self):
+        def foo(*args):
+            ...
+
+        def bar(*args):
+            ...
+
+        class A:
+            def __call__(self, *args):
+                pass
+
+            def __del__(self):
+                sys.settrace(bar)
+
+        sys.settrace(A())
+        with support.catch_unraisable_exception() as cm:
+            sys.settrace(foo)
+            self.assertEqual(cm.unraisable.object, A.__del__)
+            self.assertIsInstance(cm.unraisable.exc_value, RuntimeError)
+
+        self.assertEqual(sys.gettrace(), foo)
+
+
+    def test_same_object(self):
+        def foo(*args):
+            ...
+
+        sys.settrace(foo)
+        del foo
+        sys.settrace(sys.gettrace())
+
+
 if __name__ == "__main__":
     unittest.main()
diff --git a/Misc/NEWS.d/next/Library/2022-07-02-19-46-30.gh-issue-94510.xOatDC.rst b/Misc/NEWS.d/next/Library/2022-07-02-19-46-30.gh-issue-94510.xOatDC.rst
new file mode 100644
index 0000000000000..55856d5756559
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2022-07-02-19-46-30.gh-issue-94510.xOatDC.rst
@@ -0,0 +1,2 @@
+Re-entrant calls to :func:`sys.setprofile` and :func:`sys.settrace` now
+raise :exc:`RuntimeError`. Patch by Pablo Galindo.
diff --git a/Modules/_lsprof.c b/Modules/_lsprof.c
index 9ba45e69ef4e2..0e8432fda01ec 100644
--- a/Modules/_lsprof.c
+++ b/Modules/_lsprof.c
@@ -750,7 +750,7 @@ profiler_dealloc(ProfilerObject *op)
     if (op->flags & POF_ENABLED) {
         PyThreadState *tstate = _PyThreadState_GET();
         if (_PyEval_SetProfile(tstate, NULL, NULL) < 0) {
-            PyErr_WriteUnraisable((PyObject *)op);
+            _PyErr_WriteUnraisableMsg("When destroying _lsprof profiler", NULL);
         }
     }
 
diff --git a/Python/ceval.c b/Python/ceval.c
index 4fcdf9b41dea9..cdb14d84c0670 100644
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -6973,10 +6973,20 @@ _PyEval_SetProfile(PyThreadState *tstate, Py_tracefunc func, PyObject *arg)
     /* The caller must hold the GIL */
     assert(PyGILState_Check());
 
+    static int reentrant = 0;
+    if (reentrant) {
+        _PyErr_SetString(tstate, PyExc_RuntimeError, "Cannot install a profile function "
+                         "while another profile function is being installed");
+        reentrant = 0;
+        return -1;
+    }
+    reentrant = 1;
+
     /* Call _PySys_Audit() in the context of the current thread state,
        even if tstate is not the current thread state. */
     PyThreadState *current_tstate = _PyThreadState_GET();
     if (_PySys_Audit(current_tstate, "sys.setprofile", NULL) < 0) {
+        reentrant = 0;
         return -1;
     }
 
@@ -6994,6 +7004,7 @@ _PyEval_SetProfile(PyThreadState *tstate, Py_tracefunc func, PyObject *arg)
 
     /* Flag that tracing or profiling is turned on */
     _PyThreadState_UpdateTracingState(tstate);
+    reentrant = 0;
     return 0;
 }
 
@@ -7014,10 +7025,21 @@ _PyEval_SetTrace(PyThreadState *tstate, Py_tracefunc func, PyObject *arg)
     /* The caller must hold the GIL */
     assert(PyGILState_Check());
 
+    static int reentrant = 0;
+
+    if (reentrant) {
+        _PyErr_SetString(tstate, PyExc_RuntimeError, "Cannot install a trace function "
+                         "while another trace function is being installed");
+        reentrant = 0;
+        return -1;
+    }
+    reentrant = 1;
+
     /* Call _PySys_Audit() in the context of the current thread state,
        even if tstate is not the current thread state. */
     PyThreadState *current_tstate = _PyThreadState_GET();
     if (_PySys_Audit(current_tstate, "sys.settrace", NULL) < 0) {
+        reentrant = 0;
         return -1;
     }
 
@@ -7027,15 +7049,15 @@ _PyEval_SetTrace(PyThreadState *tstate, Py_tracefunc func, PyObject *arg)
     tstate->c_traceobj = NULL;
     /* Must make sure that profiling is not ignored if 'traceobj' is freed */
     _PyThreadState_UpdateTracingState(tstate);
-    Py_XDECREF(traceobj);
-
     Py_XINCREF(arg);
+    Py_XDECREF(traceobj);
     tstate->c_traceobj = arg;
     tstate->c_tracefunc = func;
 
     /* Flag that tracing or profiling is turned on */
     _PyThreadState_UpdateTracingState(tstate);
 
+    reentrant = 0;
     return 0;
 }
 


From webhook-mailer at python.org  Tue Jul  5 14:44:40 2022
From: webhook-mailer at python.org (ambv)
Date: Tue, 05 Jul 2022 18:44:40 -0000
Subject: [Python-checkins] gh-91330: Tests and docs for dataclass
 descriptor-typed fields (GH-94424) (GH-94576)
Message-ID: <mailman.2107.1657046681.20746.python-checkins@python.org>

https://github.com/python/cpython/commit/552fc9a9acd81694bee2001f68ba155315360cfa
commit: 552fc9a9acd81694bee2001f68ba155315360cfa
branch: 3.11
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: ambv <lukasz at langa.pl>
date: 2022-07-05T20:44:31+02:00
summary:

gh-91330: Tests and docs for dataclass descriptor-typed fields (GH-94424) (GH-94576)

Co-authored-by: Erik De Bonte <erikd at microsoft.com>
Co-authored-by: ?ukasz Langa <lukasz at langa.pl>
(cherry picked from commit 5f319308a820f49fec66fc3ade50bbaa9fe2105d)

files:
A Misc/NEWS.d/next/Tests/2022-07-05-17-53-13.gh-issue-91330.Qys5IL.rst
M Doc/library/dataclasses.rst
M Lib/test/test_dataclasses.py

diff --git a/Doc/library/dataclasses.rst b/Doc/library/dataclasses.rst
index ec50696ea89d4..4364ac342471e 100644
--- a/Doc/library/dataclasses.rst
+++ b/Doc/library/dataclasses.rst
@@ -749,3 +749,54 @@ mutable types as default values for fields::
    ``dict``, or ``set``, unhashable objects are now not allowed as
    default values.  Unhashability is used to approximate
    mutability.
+
+Descriptor-typed fields
+-----------------------
+
+Fields that are assigned :ref:`descriptor objects <descriptors>` as their
+default value have the following special behaviors:
+
+* The value for the field passed to the dataclass's ``__init__`` method is
+  passed to the descriptor's ``__set__`` method rather than overwriting the
+  descriptor object.
+* Similarly, when getting or setting the field, the descriptor's
+  ``__get__`` or ``__set__`` method is called rather than returning or
+  overwriting the descriptor object.
+* To determine whether a field contains a default value, ``dataclasses``
+  will call the descriptor's ``__get__`` method using its class access
+  form (i.e. ``descriptor.__get__(obj=None, type=cls)``.  If the
+  descriptor returns a value in this case, it will be used as the
+  field's default. On the other hand, if the descriptor raises
+  :exc:`AttributeError` in this situation, no default value will be
+  provided for the field.
+
+::
+
+  class IntConversionDescriptor:
+    def __init__(self, *, default):
+      self._default = default
+
+    def __set_name__(self, owner, name):
+      self._name = "_" + name
+
+    def __get__(self, obj, type):
+      if obj is None:
+        return self._default
+
+      return getattr(obj, self._name, self._default)
+
+    def __set__(self, obj, value):
+      setattr(obj, self._name, int(value))
+
+  @dataclass
+  class InventoryItem:
+    quantity_on_hand: IntConversionDescriptor = IntConversionDescriptor(default=100)
+
+  i = InventoryItem()
+  print(i.quantity_on_hand)   # 100
+  i.quantity_on_hand = 2.5    # calls __set__ with 2.5
+  print(i.quantity_on_hand)   # 2
+
+Note that if a field is annotated with a descriptor type, but is not assigned
+a descriptor object as its default value, the field will act like a normal
+field.
diff --git a/Lib/test/test_dataclasses.py b/Lib/test/test_dataclasses.py
index 822e7305bd8a1..569f97902a390 100644
--- a/Lib/test/test_dataclasses.py
+++ b/Lib/test/test_dataclasses.py
@@ -3229,6 +3229,115 @@ class C:
 
         self.assertEqual(D.__set_name__.call_count, 1)
 
+    def test_init_calls_set(self):
+        class D:
+            pass
+
+        D.__set__ = Mock()
+
+        @dataclass
+        class C:
+            i: D = D()
+
+        # Make sure D.__set__ is called.
+        D.__set__.reset_mock()
+        c = C(5)
+        self.assertEqual(D.__set__.call_count, 1)
+
+    def test_getting_field_calls_get(self):
+        class D:
+            pass
+
+        D.__set__ = Mock()
+        D.__get__ = Mock()
+
+        @dataclass
+        class C:
+            i: D = D()
+
+        c = C(5)
+
+        # Make sure D.__get__ is called.
+        D.__get__.reset_mock()
+        value = c.i
+        self.assertEqual(D.__get__.call_count, 1)
+
+    def test_setting_field_calls_set(self):
+        class D:
+            pass
+
+        D.__set__ = Mock()
+
+        @dataclass
+        class C:
+            i: D = D()
+
+        c = C(5)
+
+        # Make sure D.__set__ is called.
+        D.__set__.reset_mock()
+        c.i = 10
+        self.assertEqual(D.__set__.call_count, 1)
+
+    def test_setting_uninitialized_descriptor_field(self):
+        class D:
+            pass
+
+        D.__set__ = Mock()
+
+        @dataclass
+        class C:
+            i: D
+
+        # D.__set__ is not called because there's no D instance to call it on
+        D.__set__.reset_mock()
+        c = C(5)
+        self.assertEqual(D.__set__.call_count, 0)
+
+        # D.__set__ still isn't called after setting i to an instance of D
+        # because descriptors don't behave like that when stored as instance vars
+        c.i = D()
+        c.i = 5
+        self.assertEqual(D.__set__.call_count, 0)
+
+    def test_default_value(self):
+        class D:
+            def __get__(self, instance: Any, owner: object) -> int:
+                if instance is None:
+                    return 100
+
+                return instance._x
+
+            def __set__(self, instance: Any, value: int) -> None:
+                instance._x = value
+
+        @dataclass
+        class C:
+            i: D = D()
+
+        c = C()
+        self.assertEqual(c.i, 100)
+
+        c = C(5)
+        self.assertEqual(c.i, 5)
+
+    def test_no_default_value(self):
+        class D:
+            def __get__(self, instance: Any, owner: object) -> int:
+                if instance is None:
+                    raise AttributeError()
+
+                return instance._x
+
+            def __set__(self, instance: Any, value: int) -> None:
+                instance._x = value
+
+        @dataclass
+        class C:
+            i: D = D()
+
+        with self.assertRaisesRegex(TypeError, 'missing 1 required positional argument'):
+            c = C()
 
 class TestStringAnnotations(unittest.TestCase):
     def test_classvar(self):
diff --git a/Misc/NEWS.d/next/Tests/2022-07-05-17-53-13.gh-issue-91330.Qys5IL.rst b/Misc/NEWS.d/next/Tests/2022-07-05-17-53-13.gh-issue-91330.Qys5IL.rst
new file mode 100644
index 0000000000000..315521102f4ec
--- /dev/null
+++ b/Misc/NEWS.d/next/Tests/2022-07-05-17-53-13.gh-issue-91330.Qys5IL.rst
@@ -0,0 +1,7 @@
+Added more tests for :mod:`dataclasses` to cover behavior with data
+descriptor-based fields.
+
+# Write your Misc/NEWS entry below.  It should be a simple ReST paragraph. #
+Don't start with "- Issue #<n>: " or "- gh-issue-<n>: " or that sort of
+stuff.
+###########################################################################


From webhook-mailer at python.org  Tue Jul  5 14:45:08 2022
From: webhook-mailer at python.org (ambv)
Date: Tue, 05 Jul 2022 18:45:08 -0000
Subject: [Python-checkins] [3.10] gh-91330: Tests and docs for dataclass
 descriptor-typed fields (GH-94424) (GH-94577)
Message-ID: <mailman.2108.1657046709.20746.python-checkins@python.org>

https://github.com/python/cpython/commit/fd34bfe48444fdb22ff1ae78941cf621854b351f
commit: fd34bfe48444fdb22ff1ae78941cf621854b351f
branch: 3.10
author: ?ukasz Langa <lukasz at langa.pl>
committer: ambv <lukasz at langa.pl>
date: 2022-07-05T20:45:02+02:00
summary:

[3.10] gh-91330: Tests and docs for dataclass descriptor-typed fields (GH-94424) (GH-94577)

Co-authored-by: Erik De Bonte <erikd at microsoft.com>
Co-authored-by: ?ukasz Langa <lukasz at langa.pl>
(cherry picked from commit 5f319308a820f49fec66fc3ade50bbaa9fe2105d)

files:
A Misc/NEWS.d/next/Tests/2022-07-05-17-53-13.gh-issue-91330.Qys5IL.rst
M Doc/library/dataclasses.rst
M Lib/test/test_dataclasses.py

diff --git a/Doc/library/dataclasses.rst b/Doc/library/dataclasses.rst
index 1fe5bda3b9415..02de64288d0d0 100644
--- a/Doc/library/dataclasses.rst
+++ b/Doc/library/dataclasses.rst
@@ -726,3 +726,54 @@ Mutable default values
          x: list = field(default_factory=list)
 
      assert D().x is not D().x
+
+Descriptor-typed fields
+-----------------------
+
+Fields that are assigned :ref:`descriptor objects <descriptors>` as their
+default value have the following special behaviors:
+
+* The value for the field passed to the dataclass's ``__init__`` method is
+  passed to the descriptor's ``__set__`` method rather than overwriting the
+  descriptor object.
+* Similarly, when getting or setting the field, the descriptor's
+  ``__get__`` or ``__set__`` method is called rather than returning or
+  overwriting the descriptor object.
+* To determine whether a field contains a default value, ``dataclasses``
+  will call the descriptor's ``__get__`` method using its class access
+  form (i.e. ``descriptor.__get__(obj=None, type=cls)``.  If the
+  descriptor returns a value in this case, it will be used as the
+  field's default. On the other hand, if the descriptor raises
+  :exc:`AttributeError` in this situation, no default value will be
+  provided for the field.
+
+::
+
+  class IntConversionDescriptor:
+    def __init__(self, *, default):
+      self._default = default
+
+    def __set_name__(self, owner, name):
+      self._name = "_" + name
+
+    def __get__(self, obj, type):
+      if obj is None:
+        return self._default
+
+      return getattr(obj, self._name, self._default)
+
+    def __set__(self, obj, value):
+      setattr(obj, self._name, int(value))
+
+  @dataclass
+  class InventoryItem:
+    quantity_on_hand: IntConversionDescriptor = IntConversionDescriptor(default=100)
+
+  i = InventoryItem()
+  print(i.quantity_on_hand)   # 100
+  i.quantity_on_hand = 2.5    # calls __set__ with 2.5
+  print(i.quantity_on_hand)   # 2
+
+Note that if a field is annotated with a descriptor type, but is not assigned
+a descriptor object as its default value, the field will act like a normal
+field.
diff --git a/Lib/test/test_dataclasses.py b/Lib/test/test_dataclasses.py
index ef5009ab11677..f4f7ed5acab48 100644
--- a/Lib/test/test_dataclasses.py
+++ b/Lib/test/test_dataclasses.py
@@ -2989,6 +2989,115 @@ class C:
 
         self.assertEqual(D.__set_name__.call_count, 1)
 
+    def test_init_calls_set(self):
+        class D:
+            pass
+
+        D.__set__ = Mock()
+
+        @dataclass
+        class C:
+            i: D = D()
+
+        # Make sure D.__set__ is called.
+        D.__set__.reset_mock()
+        c = C(5)
+        self.assertEqual(D.__set__.call_count, 1)
+
+    def test_getting_field_calls_get(self):
+        class D:
+            pass
+
+        D.__set__ = Mock()
+        D.__get__ = Mock()
+
+        @dataclass
+        class C:
+            i: D = D()
+
+        c = C(5)
+
+        # Make sure D.__get__ is called.
+        D.__get__.reset_mock()
+        value = c.i
+        self.assertEqual(D.__get__.call_count, 1)
+
+    def test_setting_field_calls_set(self):
+        class D:
+            pass
+
+        D.__set__ = Mock()
+
+        @dataclass
+        class C:
+            i: D = D()
+
+        c = C(5)
+
+        # Make sure D.__set__ is called.
+        D.__set__.reset_mock()
+        c.i = 10
+        self.assertEqual(D.__set__.call_count, 1)
+
+    def test_setting_uninitialized_descriptor_field(self):
+        class D:
+            pass
+
+        D.__set__ = Mock()
+
+        @dataclass
+        class C:
+            i: D
+
+        # D.__set__ is not called because there's no D instance to call it on
+        D.__set__.reset_mock()
+        c = C(5)
+        self.assertEqual(D.__set__.call_count, 0)
+
+        # D.__set__ still isn't called after setting i to an instance of D
+        # because descriptors don't behave like that when stored as instance vars
+        c.i = D()
+        c.i = 5
+        self.assertEqual(D.__set__.call_count, 0)
+
+    def test_default_value(self):
+        class D:
+            def __get__(self, instance: Any, owner: object) -> int:
+                if instance is None:
+                    return 100
+
+                return instance._x
+
+            def __set__(self, instance: Any, value: int) -> None:
+                instance._x = value
+
+        @dataclass
+        class C:
+            i: D = D()
+
+        c = C()
+        self.assertEqual(c.i, 100)
+
+        c = C(5)
+        self.assertEqual(c.i, 5)
+
+    def test_no_default_value(self):
+        class D:
+            def __get__(self, instance: Any, owner: object) -> int:
+                if instance is None:
+                    raise AttributeError()
+
+                return instance._x
+
+            def __set__(self, instance: Any, value: int) -> None:
+                instance._x = value
+
+        @dataclass
+        class C:
+            i: D = D()
+
+        with self.assertRaisesRegex(TypeError, 'missing 1 required positional argument'):
+            c = C()
 
 class TestStringAnnotations(unittest.TestCase):
     def test_classvar(self):
diff --git a/Misc/NEWS.d/next/Tests/2022-07-05-17-53-13.gh-issue-91330.Qys5IL.rst b/Misc/NEWS.d/next/Tests/2022-07-05-17-53-13.gh-issue-91330.Qys5IL.rst
new file mode 100644
index 0000000000000..315521102f4ec
--- /dev/null
+++ b/Misc/NEWS.d/next/Tests/2022-07-05-17-53-13.gh-issue-91330.Qys5IL.rst
@@ -0,0 +1,7 @@
+Added more tests for :mod:`dataclasses` to cover behavior with data
+descriptor-based fields.
+
+# Write your Misc/NEWS entry below.  It should be a simple ReST paragraph. #
+Don't start with "- Issue #<n>: " or "- gh-issue-<n>: " or that sort of
+stuff.
+###########################################################################


From webhook-mailer at python.org  Tue Jul  5 14:52:42 2022
From: webhook-mailer at python.org (pablogsal)
Date: Tue, 05 Jul 2022 18:52:42 -0000
Subject: [Python-checkins] [3.10] gh-94510: Raise on re-entrant calls to
 sys.setprofile and syssettrace (GH-94511) (#94579)
Message-ID: <mailman.2109.1657047163.20746.python-checkins@python.org>

https://github.com/python/cpython/commit/5e24c80b948da6995990296cf262d9eae265e8ec
commit: 5e24c80b948da6995990296cf262d9eae265e8ec
branch: 3.10
author: Pablo Galindo Salgado <Pablogsal at gmail.com>
committer: pablogsal <Pablogsal at gmail.com>
date: 2022-07-05T19:52:33+01:00
summary:

[3.10] gh-94510: Raise on re-entrant calls to sys.setprofile and syssettrace (GH-94511) (#94579)

Co-authored-by: ?ukasz Langa <lukasz at langa.pl>.
Co-authored-by: Pablo Galindo Salgado <Pablogsal at gmail.com>

files:
A Misc/NEWS.d/next/Library/2022-07-02-19-46-30.gh-issue-94510.xOatDC.rst
M Lib/test/test_sys_setprofile.py
M Lib/test/test_sys_settrace.py
M Modules/_lsprof.c
M Python/ceval.c

diff --git a/Lib/test/test_sys_setprofile.py b/Lib/test/test_sys_setprofile.py
index 21a09b51926e6..4c3053a1e3e9e 100644
--- a/Lib/test/test_sys_setprofile.py
+++ b/Lib/test/test_sys_setprofile.py
@@ -2,6 +2,7 @@
 import pprint
 import sys
 import unittest
+from test import support
 
 
 class TestGetProfile(unittest.TestCase):
@@ -415,5 +416,43 @@ def show_events(callable):
     pprint.pprint(capture_events(callable))
 
 
+class TestEdgeCases(unittest.TestCase):
+
+    def setUp(self):
+        self.addCleanup(sys.setprofile, sys.getprofile())
+        sys.setprofile(None)
+
+    def test_reentrancy(self):
+        def foo(*args):
+            ...
+
+        def bar(*args):
+            ...
+
+        class A:
+            def __call__(self, *args):
+                pass
+
+            def __del__(self):
+                sys.setprofile(bar)
+
+        sys.setprofile(A())
+        with support.catch_unraisable_exception() as cm:
+            sys.setprofile(foo)
+            self.assertEqual(cm.unraisable.object, A.__del__)
+            self.assertIsInstance(cm.unraisable.exc_value, RuntimeError)
+
+        self.assertEqual(sys.getprofile(), foo)
+
+
+    def test_same_object(self):
+        def foo(*args):
+            ...
+
+        sys.setprofile(foo)
+        del foo
+        sys.setprofile(sys.getprofile())
+
+
 if __name__ == "__main__":
     unittest.main()
diff --git a/Lib/test/test_sys_settrace.py b/Lib/test/test_sys_settrace.py
index 4b3d096f16315..1f509eee556b0 100644
--- a/Lib/test/test_sys_settrace.py
+++ b/Lib/test/test_sys_settrace.py
@@ -2,6 +2,7 @@
 
 from test import support
 import unittest
+from unittest.mock import MagicMock
 import sys
 import difflib
 import gc
@@ -2196,5 +2197,43 @@ async def test_jump_backward_over_async_listcomp_v2(output):
         output.append(8)
 
 
+class TestEdgeCases(unittest.TestCase):
+
+    def setUp(self):
+        self.addCleanup(sys.settrace, sys.gettrace())
+        sys.settrace(None)
+
+    def test_reentrancy(self):
+        def foo(*args):
+            ...
+
+        def bar(*args):
+            ...
+
+        class A:
+            def __call__(self, *args):
+                pass
+
+            def __del__(self):
+                sys.settrace(bar)
+
+        sys.settrace(A())
+        with support.catch_unraisable_exception() as cm:
+            sys.settrace(foo)
+            self.assertEqual(cm.unraisable.object, A.__del__)
+            self.assertIsInstance(cm.unraisable.exc_value, RuntimeError)
+
+        self.assertEqual(sys.gettrace(), foo)
+
+
+    def test_same_object(self):
+        def foo(*args):
+            ...
+
+        sys.settrace(foo)
+        del foo
+        sys.settrace(sys.gettrace())
+
+
 if __name__ == "__main__":
     unittest.main()
diff --git a/Misc/NEWS.d/next/Library/2022-07-02-19-46-30.gh-issue-94510.xOatDC.rst b/Misc/NEWS.d/next/Library/2022-07-02-19-46-30.gh-issue-94510.xOatDC.rst
new file mode 100644
index 0000000000000..55856d5756559
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2022-07-02-19-46-30.gh-issue-94510.xOatDC.rst
@@ -0,0 +1,2 @@
+Re-entrant calls to :func:`sys.setprofile` and :func:`sys.settrace` now
+raise :exc:`RuntimeError`. Patch by Pablo Galindo.
diff --git a/Modules/_lsprof.c b/Modules/_lsprof.c
index 703067cc743a5..8d754aa7e3ca2 100644
--- a/Modules/_lsprof.c
+++ b/Modules/_lsprof.c
@@ -744,7 +744,7 @@ profiler_dealloc(ProfilerObject *op)
     if (op->flags & POF_ENABLED) {
         PyThreadState *tstate = PyThreadState_GET();
         if (_PyEval_SetProfile(tstate, NULL, NULL) < 0) {
-            PyErr_WriteUnraisable((PyObject *)op);
+            _PyErr_WriteUnraisableMsg("When destroying _lsprof profiler", NULL);
         }
     }
 
diff --git a/Python/ceval.c b/Python/ceval.c
index 9a193c994d12e..df4b9a84a2def 100644
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -5525,10 +5525,20 @@ _PyEval_SetProfile(PyThreadState *tstate, Py_tracefunc func, PyObject *arg)
     /* The caller must hold the GIL */
     assert(PyGILState_Check());
 
+    static int reentrant = 0;
+    if (reentrant) {
+        _PyErr_SetString(tstate, PyExc_RuntimeError, "Cannot install a profile function "
+                         "while another profile function is being installed");
+        reentrant = 0;
+        return -1;
+    }
+    reentrant = 1;
+
     /* Call _PySys_Audit() in the context of the current thread state,
        even if tstate is not the current thread state. */
     PyThreadState *current_tstate = _PyThreadState_GET();
     if (_PySys_Audit(current_tstate, "sys.setprofile", NULL) < 0) {
+        reentrant = 0;
         return -1;
     }
 
@@ -5546,6 +5556,7 @@ _PyEval_SetProfile(PyThreadState *tstate, Py_tracefunc func, PyObject *arg)
 
     /* Flag that tracing or profiling is turned on */
     tstate->cframe->use_tracing = (func != NULL) || (tstate->c_tracefunc != NULL);
+    reentrant = 0;
     return 0;
 }
 
@@ -5566,10 +5577,21 @@ _PyEval_SetTrace(PyThreadState *tstate, Py_tracefunc func, PyObject *arg)
     /* The caller must hold the GIL */
     assert(PyGILState_Check());
 
+    static int reentrant = 0;
+
+    if (reentrant) {
+        _PyErr_SetString(tstate, PyExc_RuntimeError, "Cannot install a trace function "
+                         "while another trace function is being installed");
+        reentrant = 0;
+        return -1;
+    }
+    reentrant = 1;
+
     /* Call _PySys_Audit() in the context of the current thread state,
        even if tstate is not the current thread state. */
     PyThreadState *current_tstate = _PyThreadState_GET();
     if (_PySys_Audit(current_tstate, "sys.settrace", NULL) < 0) {
+        reentrant = 0;
         return -1;
     }
 
@@ -5579,9 +5601,8 @@ _PyEval_SetTrace(PyThreadState *tstate, Py_tracefunc func, PyObject *arg)
     tstate->c_traceobj = NULL;
     /* Must make sure that profiling is not ignored if 'traceobj' is freed */
     tstate->cframe->use_tracing = (tstate->c_profilefunc != NULL);
-    Py_XDECREF(traceobj);
-
     Py_XINCREF(arg);
+    Py_XDECREF(traceobj);
     tstate->c_traceobj = arg;
     tstate->c_tracefunc = func;
 
@@ -5589,6 +5610,7 @@ _PyEval_SetTrace(PyThreadState *tstate, Py_tracefunc func, PyObject *arg)
     tstate->cframe->use_tracing = ((func != NULL)
                            || (tstate->c_profilefunc != NULL));
 
+    reentrant = 0;
     return 0;
 }
 


From webhook-mailer at python.org  Tue Jul  5 15:02:51 2022
From: webhook-mailer at python.org (ambv)
Date: Tue, 05 Jul 2022 19:02:51 -0000
Subject: [Python-checkins] [3.11] gh-94510: Raise on re-entrant calls to
 sys.setprofile and sys.settrace (GH-94511) (GH-94578)
Message-ID: <mailman.2110.1657047772.20746.python-checkins@python.org>

https://github.com/python/cpython/commit/5f4a16b2913ac84ccaab95b50dd4b0e7fbc58ec2
commit: 5f4a16b2913ac84ccaab95b50dd4b0e7fbc58ec2
branch: 3.11
author: ?ukasz Langa <lukasz at langa.pl>
committer: ambv <lukasz at langa.pl>
date: 2022-07-05T21:02:43+02:00
summary:

[3.11] gh-94510: Raise on re-entrant calls to sys.setprofile and sys.settrace (GH-94511) (GH-94578)

Co-authored-by: Pablo Galindo Salgado <Pablogsal at gmail.com>
Co-authored-by: ?ukasz Langa <lukasz at langa.pl>
(cherry picked from commit 40d81fd63b46cf998880ce3bf3e5cb42bc3199c1)

files:
A Misc/NEWS.d/next/Library/2022-07-02-19-46-30.gh-issue-94510.xOatDC.rst
M Lib/test/test_sys_setprofile.py
M Lib/test/test_sys_settrace.py
M Modules/_lsprof.c
M Python/ceval.c

diff --git a/Lib/test/test_sys_setprofile.py b/Lib/test/test_sys_setprofile.py
index 21a09b51926e6..4c3053a1e3e9e 100644
--- a/Lib/test/test_sys_setprofile.py
+++ b/Lib/test/test_sys_setprofile.py
@@ -2,6 +2,7 @@
 import pprint
 import sys
 import unittest
+from test import support
 
 
 class TestGetProfile(unittest.TestCase):
@@ -415,5 +416,43 @@ def show_events(callable):
     pprint.pprint(capture_events(callable))
 
 
+class TestEdgeCases(unittest.TestCase):
+
+    def setUp(self):
+        self.addCleanup(sys.setprofile, sys.getprofile())
+        sys.setprofile(None)
+
+    def test_reentrancy(self):
+        def foo(*args):
+            ...
+
+        def bar(*args):
+            ...
+
+        class A:
+            def __call__(self, *args):
+                pass
+
+            def __del__(self):
+                sys.setprofile(bar)
+
+        sys.setprofile(A())
+        with support.catch_unraisable_exception() as cm:
+            sys.setprofile(foo)
+            self.assertEqual(cm.unraisable.object, A.__del__)
+            self.assertIsInstance(cm.unraisable.exc_value, RuntimeError)
+
+        self.assertEqual(sys.getprofile(), foo)
+
+
+    def test_same_object(self):
+        def foo(*args):
+            ...
+
+        sys.setprofile(foo)
+        del foo
+        sys.setprofile(sys.getprofile())
+
+
 if __name__ == "__main__":
     unittest.main()
diff --git a/Lib/test/test_sys_settrace.py b/Lib/test/test_sys_settrace.py
index fd2740ea19f0c..7ec290dbf04ad 100644
--- a/Lib/test/test_sys_settrace.py
+++ b/Lib/test/test_sys_settrace.py
@@ -2,6 +2,7 @@
 
 from test import support
 import unittest
+from unittest.mock import MagicMock
 import sys
 import difflib
 import gc
@@ -2684,5 +2685,43 @@ def f():
         self.assertEqual(counts, {'call': 1, 'line': 2000, 'return': 1})
 
 
+class TestEdgeCases(unittest.TestCase):
+
+    def setUp(self):
+        self.addCleanup(sys.settrace, sys.gettrace())
+        sys.settrace(None)
+
+    def test_reentrancy(self):
+        def foo(*args):
+            ...
+
+        def bar(*args):
+            ...
+
+        class A:
+            def __call__(self, *args):
+                pass
+
+            def __del__(self):
+                sys.settrace(bar)
+
+        sys.settrace(A())
+        with support.catch_unraisable_exception() as cm:
+            sys.settrace(foo)
+            self.assertEqual(cm.unraisable.object, A.__del__)
+            self.assertIsInstance(cm.unraisable.exc_value, RuntimeError)
+
+        self.assertEqual(sys.gettrace(), foo)
+
+
+    def test_same_object(self):
+        def foo(*args):
+            ...
+
+        sys.settrace(foo)
+        del foo
+        sys.settrace(sys.gettrace())
+
+
 if __name__ == "__main__":
     unittest.main()
diff --git a/Misc/NEWS.d/next/Library/2022-07-02-19-46-30.gh-issue-94510.xOatDC.rst b/Misc/NEWS.d/next/Library/2022-07-02-19-46-30.gh-issue-94510.xOatDC.rst
new file mode 100644
index 0000000000000..55856d5756559
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2022-07-02-19-46-30.gh-issue-94510.xOatDC.rst
@@ -0,0 +1,2 @@
+Re-entrant calls to :func:`sys.setprofile` and :func:`sys.settrace` now
+raise :exc:`RuntimeError`. Patch by Pablo Galindo.
diff --git a/Modules/_lsprof.c b/Modules/_lsprof.c
index 9ba45e69ef4e2..0e8432fda01ec 100644
--- a/Modules/_lsprof.c
+++ b/Modules/_lsprof.c
@@ -750,7 +750,7 @@ profiler_dealloc(ProfilerObject *op)
     if (op->flags & POF_ENABLED) {
         PyThreadState *tstate = _PyThreadState_GET();
         if (_PyEval_SetProfile(tstate, NULL, NULL) < 0) {
-            PyErr_WriteUnraisable((PyObject *)op);
+            _PyErr_WriteUnraisableMsg("When destroying _lsprof profiler", NULL);
         }
     }
 
diff --git a/Python/ceval.c b/Python/ceval.c
index a2c1d0bc43985..32f471f574b73 100644
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -6930,10 +6930,20 @@ _PyEval_SetProfile(PyThreadState *tstate, Py_tracefunc func, PyObject *arg)
     /* The caller must hold the GIL */
     assert(PyGILState_Check());
 
+    static int reentrant = 0;
+    if (reentrant) {
+        _PyErr_SetString(tstate, PyExc_RuntimeError, "Cannot install a profile function "
+                         "while another profile function is being installed");
+        reentrant = 0;
+        return -1;
+    }
+    reentrant = 1;
+
     /* Call _PySys_Audit() in the context of the current thread state,
        even if tstate is not the current thread state. */
     PyThreadState *current_tstate = _PyThreadState_GET();
     if (_PySys_Audit(current_tstate, "sys.setprofile", NULL) < 0) {
+        reentrant = 0;
         return -1;
     }
 
@@ -6951,6 +6961,7 @@ _PyEval_SetProfile(PyThreadState *tstate, Py_tracefunc func, PyObject *arg)
 
     /* Flag that tracing or profiling is turned on */
     _PyThreadState_UpdateTracingState(tstate);
+    reentrant = 0;
     return 0;
 }
 
@@ -6971,10 +6982,21 @@ _PyEval_SetTrace(PyThreadState *tstate, Py_tracefunc func, PyObject *arg)
     /* The caller must hold the GIL */
     assert(PyGILState_Check());
 
+    static int reentrant = 0;
+
+    if (reentrant) {
+        _PyErr_SetString(tstate, PyExc_RuntimeError, "Cannot install a trace function "
+                         "while another trace function is being installed");
+        reentrant = 0;
+        return -1;
+    }
+    reentrant = 1;
+
     /* Call _PySys_Audit() in the context of the current thread state,
        even if tstate is not the current thread state. */
     PyThreadState *current_tstate = _PyThreadState_GET();
     if (_PySys_Audit(current_tstate, "sys.settrace", NULL) < 0) {
+        reentrant = 0;
         return -1;
     }
 
@@ -6984,15 +7006,15 @@ _PyEval_SetTrace(PyThreadState *tstate, Py_tracefunc func, PyObject *arg)
     tstate->c_traceobj = NULL;
     /* Must make sure that profiling is not ignored if 'traceobj' is freed */
     _PyThreadState_UpdateTracingState(tstate);
-    Py_XDECREF(traceobj);
-
     Py_XINCREF(arg);
+    Py_XDECREF(traceobj);
     tstate->c_traceobj = arg;
     tstate->c_tracefunc = func;
 
     /* Flag that tracing or profiling is turned on */
     _PyThreadState_UpdateTracingState(tstate);
 
+    reentrant = 0;
     return 0;
 }
 


From webhook-mailer at python.org  Wed Jul  6 02:16:08 2022
From: webhook-mailer at python.org (iritkatriel)
Date: Wed, 06 Jul 2022 06:16:08 -0000
Subject: [Python-checkins] gh-94438: in frameobject's mark_stacks switch,
 the PUSH_EXC_INFO and POP_EXCEPT cases are no longer reachable
 (GH-94582)
Message-ID: <mailman.2111.1657088169.20746.python-checkins@python.org>

https://github.com/python/cpython/commit/50b9a7762f06335277d9962edc8d39498601a4e4
commit: 50b9a7762f06335277d9962edc8d39498601a4e4
branch: main
author: Irit Katriel <1055913+iritkatriel at users.noreply.github.com>
committer: iritkatriel <1055913+iritkatriel at users.noreply.github.com>
date: 2022-07-06T07:15:59+01:00
summary:

gh-94438: in frameobject's mark_stacks switch, the PUSH_EXC_INFO and POP_EXCEPT cases are no longer reachable (GH-94582)

files:
M Objects/frameobject.c

diff --git a/Objects/frameobject.c b/Objects/frameobject.c
index 34a6c46c6b57f..6f4de65cc7c0d 100644
--- a/Objects/frameobject.c
+++ b/Objects/frameobject.c
@@ -256,10 +256,6 @@ mark_stacks(PyCodeObject *code_obj, int len)
                     stacks[i+1] = next_stack;
                     break;
                 }
-                case POP_EXCEPT:
-                    next_stack = pop_value(pop_value(pop_value(next_stack)));
-                    stacks[i+1] = next_stack;
-                    break;
                 case SEND:
                     j = get_arg(code, i) + i + 1;
                     assert(j < len);
@@ -304,10 +300,16 @@ mark_stacks(PyCodeObject *code_obj, int len)
                     stacks[i+1] = next_stack;
                     break;
                 case PUSH_EXC_INFO:
-                    next_stack = push_value(next_stack, Except);
-                    next_stack = push_value(next_stack, Except);
-                    next_stack = push_value(next_stack, Except);
-                    stacks[i+1] = next_stack;
+                case POP_EXCEPT:
+                    /* These instructions only appear in exception handlers, which
+                     * skip this switch ever since the move to zero-cost exceptions
+                     * (their stack remains UNINITIALIZED because nothing sets it).
+                     *
+                     * Note that explain_incompatible_stack interprets an
+                     * UNINITIALIZED stack as belonging to an exception handler.
+                     */
+                    Py_UNREACHABLE();
+                    break;
                 case RETURN_VALUE:
                 case RAISE_VARARGS:
                 case RERAISE:


From webhook-mailer at python.org  Wed Jul  6 03:22:12 2022
From: webhook-mailer at python.org (iritkatriel)
Date: Wed, 06 Jul 2022 07:22:12 -0000
Subject: [Python-checkins] [3.11] gh-94438: in frameobject's mark_stacks
 switch,
 the PUSH_EXC_INFO and POP_EXCEPT cases are no longer reachable (GH-94582)
 (GH-94595)
Message-ID: <mailman.2112.1657092132.20746.python-checkins@python.org>

https://github.com/python/cpython/commit/b22f9d6e8cd9ef15e4898a1d3f2e52ade26a0594
commit: b22f9d6e8cd9ef15e4898a1d3f2e52ade26a0594
branch: 3.11
author: Irit Katriel <1055913+iritkatriel at users.noreply.github.com>
committer: iritkatriel <1055913+iritkatriel at users.noreply.github.com>
date: 2022-07-06T08:21:59+01:00
summary:

[3.11] gh-94438: in frameobject's mark_stacks switch, the PUSH_EXC_INFO and POP_EXCEPT cases are no longer reachable (GH-94582) (GH-94595)

(cherry picked from commit 50b9a7762f06335277d9962edc8d39498601a4e4)

Co-authored-by: Irit Katriel <1055913+iritkatriel at users.noreply.github.com>

files:
M Objects/frameobject.c

diff --git a/Objects/frameobject.c b/Objects/frameobject.c
index cb822a1119709..78113366c0d7e 100644
--- a/Objects/frameobject.c
+++ b/Objects/frameobject.c
@@ -256,10 +256,6 @@ mark_stacks(PyCodeObject *code_obj, int len)
                     stacks[i+1] = next_stack;
                     break;
                 }
-                case POP_EXCEPT:
-                    next_stack = pop_value(pop_value(pop_value(next_stack)));
-                    stacks[i+1] = next_stack;
-                    break;
                 case SEND:
                     j = get_arg(code, i) + i + 1;
                     assert(j < len);
@@ -304,10 +300,16 @@ mark_stacks(PyCodeObject *code_obj, int len)
                     stacks[i+1] = next_stack;
                     break;
                 case PUSH_EXC_INFO:
-                    next_stack = push_value(next_stack, Except);
-                    next_stack = push_value(next_stack, Except);
-                    next_stack = push_value(next_stack, Except);
-                    stacks[i+1] = next_stack;
+                case POP_EXCEPT:
+                    /* These instructions only appear in exception handlers, which
+                     * skip this switch ever since the move to zero-cost exceptions
+                     * (their stack remains UNINITIALIZED because nothing sets it).
+                     *
+                     * Note that explain_incompatible_stack interprets an
+                     * UNINITIALIZED stack as belonging to an exception handler.
+                     */
+                    Py_UNREACHABLE();
+                    break;
                 case RETURN_VALUE:
                 case RAISE_VARARGS:
                 case RERAISE:


From webhook-mailer at python.org  Wed Jul  6 05:56:34 2022
From: webhook-mailer at python.org (tiran)
Date: Wed, 06 Jul 2022 09:56:34 -0000
Subject: [Python-checkins] gh-90005: Port readline and curses to
 PY_STDLIB_MOD (GH-94452)
Message-ID: <mailman.2113.1657101396.20746.python-checkins@python.org>

https://github.com/python/cpython/commit/e925241d95d8095adf67f492042f97254ff82ec1
commit: e925241d95d8095adf67f492042f97254ff82ec1
branch: main
author: Christian Heimes <christian at python.org>
committer: tiran <christian at python.org>
date: 2022-07-06T11:56:25+02:00
summary:

gh-90005: Port readline and curses to PY_STDLIB_MOD (GH-94452)

Co-authored-by: Erlend Egeberg Aasland <erlend.aasland at protonmail.com>

files:
A Misc/NEWS.d/next/Build/2022-06-30-17-18-23.gh-issue-90005.EIOOla.rst
M Modules/Setup.stdlib.in
M configure
M configure.ac
M pyconfig.h.in
M setup.py

diff --git a/Misc/NEWS.d/next/Build/2022-06-30-17-18-23.gh-issue-90005.EIOOla.rst b/Misc/NEWS.d/next/Build/2022-06-30-17-18-23.gh-issue-90005.EIOOla.rst
new file mode 100644
index 0000000000000..90a2dd486c195
--- /dev/null
+++ b/Misc/NEWS.d/next/Build/2022-06-30-17-18-23.gh-issue-90005.EIOOla.rst
@@ -0,0 +1,5 @@
+Dependencies of :mod:`readline` and :mod:`curses` module are now detected in
+``configure`` script with ``pkg-config``. Only ``ncurses`` / ``ncursesw``
+are detected automatically. The old ``curses`` library is not configured
+automatically. Workaround for missing ``termcap`` or ``tinfo`` library
+has been removed.
diff --git a/Modules/Setup.stdlib.in b/Modules/Setup.stdlib.in
index ad34f85e25451..7357aacd7267a 100644
--- a/Modules/Setup.stdlib.in
+++ b/Modules/Setup.stdlib.in
@@ -72,8 +72,8 @@
 # gdbm module needs -lgdbm
 @MODULE__GDBM_TRUE at _gdbm _gdbmmodule.c
 
-# needs -lreadline or -leditline, sometimes termcap, termlib, or tinfo
-#@MODULE_READLINE_TRUE at readline readline.c
+# needs -lreadline or -ledit, sometimes termcap, termlib, or tinfo
+ at MODULE_READLINE_TRUE@readline readline.c
 
 # hashing builtins, can be disabled with --without-builtin-hashlib-hashes
 @MODULE__MD5_TRUE at _md5 md5module.c
@@ -138,10 +138,10 @@
 # needs -lffi and -ldl
 @MODULE__CTYPES_TRUE at _ctypes _ctypes/_ctypes.c _ctypes/callbacks.c _ctypes/callproc.c _ctypes/stgdict.c _ctypes/cfield.c @MODULE__CTYPES_MALLOC_CLOSURE@
 
-# needs -lncurses, -lncursesw or -lcurses, sometimes -ltermcap
-#@MODULE__CURSES_TRUE at _curses _cursesmodule.c
-# needs -lncurses and -lpanel
-#@MODULE__CURSES_PANEL_TRUE at _curses_panel _curses_panel.c
+# needs -lncurses[w], sometimes -ltermcap/tinfo
+ at MODULE__CURSES_TRUE@_curses _cursesmodule.c
+# needs -lncurses[w] and -lpanel[w]
+ at MODULE__CURSES_PANEL_TRUE@_curses_panel _curses_panel.c
 
 @MODULE__SQLITE3_TRUE at _sqlite3 _sqlite/blob.c _sqlite/connection.c _sqlite/cursor.c _sqlite/microprotocols.c _sqlite/module.c _sqlite/prepare_protocol.c _sqlite/row.c _sqlite/statement.c _sqlite/util.c
 
diff --git a/configure b/configure
index 8d0ba9740b8ea..38481eea8475e 100755
--- a/configure
+++ b/configure
@@ -660,6 +660,8 @@ MODULE__TKINTER_FALSE
 MODULE__TKINTER_TRUE
 MODULE__SQLITE3_FALSE
 MODULE__SQLITE3_TRUE
+MODULE_READLINE_FALSE
+MODULE_READLINE_TRUE
 MODULE_NIS_FALSE
 MODULE_NIS_TRUE
 MODULE__GDBM_FALSE
@@ -668,6 +670,10 @@ MODULE__DBM_FALSE
 MODULE__DBM_TRUE
 MODULE__DECIMAL_FALSE
 MODULE__DECIMAL_TRUE
+MODULE__CURSES_PANEL_FALSE
+MODULE__CURSES_PANEL_TRUE
+MODULE__CURSES_FALSE
+MODULE__CURSES_TRUE
 MODULE__CTYPES_FALSE
 MODULE__CTYPES_TRUE
 MODULE__CRYPT_FALSE
@@ -792,6 +798,14 @@ OPENSSL_INCLUDES
 ENSUREPIP
 SRCDIRS
 THREADHEADERS
+PANEL_LIBS
+PANEL_CFLAGS
+CURSES_LIBS
+CURSES_CFLAGS
+LIBEDIT_LIBS
+LIBEDIT_CFLAGS
+LIBREADLINE_LIBS
+LIBREADLINE_CFLAGS
 WHEEL_PKG_DIR
 LIBPL
 PY_ENABLE_SHARED
@@ -1108,6 +1122,14 @@ LIBLZMA_CFLAGS
 LIBLZMA_LIBS
 LIBCRYPT_CFLAGS
 LIBCRYPT_LIBS
+LIBREADLINE_CFLAGS
+LIBREADLINE_LIBS
+LIBEDIT_CFLAGS
+LIBEDIT_LIBS
+CURSES_CFLAGS
+CURSES_LIBS
+PANEL_CFLAGS
+PANEL_LIBS
 LIBB2_CFLAGS
 LIBB2_LIBS'
 
@@ -1848,8 +1870,8 @@ Optional Packages:
   --with-wheel-pkg-dir=PATH
                           Directory of wheel packages used by ensurepip
                           (default: none)
-  --with(out)-readline[=editline]
-                          use Editline for backend or disable readline module
+  --with(out)-readline[=editline|readline|no]
+                          use libedit for backend or disable readline module
   --with-computed-gotos   enable computed gotos in evaluation loop (enabled by
                           default on supported compilers)
   --with-ensurepip[=install|upgrade|no]
@@ -1923,6 +1945,20 @@ Some influential environment variables:
               C compiler flags for LIBCRYPT, overriding pkg-config
   LIBCRYPT_LIBS
               linker flags for LIBCRYPT, overriding pkg-config
+  LIBREADLINE_CFLAGS
+              C compiler flags for LIBREADLINE, overriding pkg-config
+  LIBREADLINE_LIBS
+              linker flags for LIBREADLINE, overriding pkg-config
+  LIBEDIT_CFLAGS
+              C compiler flags for LIBEDIT, overriding pkg-config
+  LIBEDIT_LIBS
+              linker flags for LIBEDIT, overriding pkg-config
+  CURSES_CFLAGS
+              C compiler flags for CURSES, overriding pkg-config
+  CURSES_LIBS linker flags for CURSES, overriding pkg-config
+  PANEL_CFLAGS
+              C compiler flags for PANEL, overriding pkg-config
+  PANEL_LIBS  linker flags for PANEL, overriding pkg-config
   LIBB2_CFLAGS
               C compiler flags for LIBB2, overriding pkg-config
   LIBB2_LIBS  linker flags for LIBB2, overriding pkg-config
@@ -20497,48 +20533,114 @@ $as_echo "#define HAVE_GETC_UNLOCKED 1" >>confdefs.h
 fi
 
 
+
+
+
 # Check whether --with-readline was given.
 if test "${with_readline+set}" = set; then :
   withval=$with_readline;
+    case $with_readline in #(
+  editline|edit) :
+    with_readline=edit ;; #(
+  yes|readline) :
+    with_readline=readline ;; #(
+  no) :
+     ;; #(
+  *) :
+    as_fn_error $? "proper usage is --with(out)-readline[=editline|readline|no]" "$LINENO" 5
+     ;;
+esac
+
 else
-  with_readline=yes
+  with_readline=readline
+
 fi
 
 
-# check where readline lives
-py_cv_lib_readline=no
-# save the value of LIBS so we don't actually link Python with readline
-LIBS_no_readline=$LIBS
+if test "x$with_readline" = xreadline; then :
 
-if test "$with_readline" != no; then
-  case "$with_readline" in
-  editline|edit)
-    LIBREADLINE=edit
 
-$as_echo "#define WITH_EDITLINE 1" >>confdefs.h
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBREADLINE" >&5
+$as_echo_n "checking for LIBREADLINE... " >&6; }
 
-    ;;
-  yes|readline)
-    LIBREADLINE=readline
-    ;;
-  *)
-    as_fn_error $? "proper usage is --with(out)-readline[=editline]" "$LINENO" 5
-    ;;
-  esac
+if test -n "$LIBREADLINE_CFLAGS"; then
+    pkg_cv_LIBREADLINE_CFLAGS="$LIBREADLINE_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"readline\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "readline") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_LIBREADLINE_CFLAGS=`$PKG_CONFIG --cflags "readline" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$LIBREADLINE_LIBS"; then
+    pkg_cv_LIBREADLINE_LIBS="$LIBREADLINE_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"readline\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "readline") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_LIBREADLINE_LIBS=`$PKG_CONFIG --libs "readline" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
 
-  # On some systems we need to link readline to a termcap compatible
-  # library.  NOTE: Keep the precedence of listed libraries synchronised
-  # with setup.py.
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to link readline libs" >&5
-$as_echo_n "checking how to link readline libs... " >&6; }
-  for py_libtermcap in "" tinfo ncursesw ncurses curses termcap; do
-    if test -z "$py_libtermcap"; then
-      READLINE_LIBS="-l$LIBREADLINE"
-    else
-      READLINE_LIBS="-l$LIBREADLINE -l$py_libtermcap"
-    fi
-    LIBS="$READLINE_LIBS $LIBS_no_readline"
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+
+
+if test $pkg_failed = yes; then
+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+	        LIBREADLINE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "readline" 2>&1`
+        else
+	        LIBREADLINE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "readline" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$LIBREADLINE_PKG_ERRORS" >&5
+
+
+    for ac_header in readline/readline.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "readline/readline.h" "ac_cv_header_readline_readline_h" "$ac_includes_default"
+if test "x$ac_cv_header_readline_readline_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_READLINE_READLINE_H 1
+_ACEOF
+
+      save_CFLAGS=$CFLAGS
+save_CPPFLAGS=$CPPFLAGS
+save_LDFLAGS=$LDFLAGS
+save_LIBS=$LIBS
+
+
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for readline in -lreadline" >&5
+$as_echo_n "checking for readline in -lreadline... " >&6; }
+if ${ac_cv_lib_readline_readline+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lreadline  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -20557,71 +20659,68 @@ return readline ();
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  py_cv_lib_readline=yes
+  ac_cv_lib_readline_readline=yes
+else
+  ac_cv_lib_readline_readline=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-    if test $py_cv_lib_readline = yes; then
-      break
-    fi
-  done
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_readline_readline" >&5
+$as_echo "$ac_cv_lib_readline_readline" >&6; }
+if test "x$ac_cv_lib_readline_readline" = xyes; then :
 
-  # Uncomment this line if you want to use READLINE_LIBS in Makefile or scripts
-  #AC_SUBST([READLINE_LIBS])
-  if test $py_cv_lib_readline = no; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5
-$as_echo "none" >&6; }
-  else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $READLINE_LIBS" >&5
-$as_echo "$READLINE_LIBS" >&6; }
+          LIBREADLINE=readline
+          READLINE_CFLAGS=${LIBREADLINE_CFLAGS-""}
+          READLINE_LIBS=${LIBREADLINE_LIBS-"-lreadline"}
+
+else
 
-$as_echo "#define HAVE_LIBREADLINE 1" >>confdefs.h
+          with_readline=no
 
-  fi
 fi
 
-if test "$py_cv_lib_readline" = yes; then
-  # check for readline 2.2
-  ac_fn_c_check_decl "$LINENO" "rl_completion_append_character" "ac_cv_have_decl_rl_completion_append_character" "
-#include <stdio.h> /* Must be first for Gnu Readline */
-#ifdef WITH_EDITLINE
-# include <editline/readline.h>
-#else
-# include <readline/readline.h>
-#endif
 
-"
-if test "x$ac_cv_have_decl_rl_completion_append_character" = xyes; then :
+CFLAGS=$save_CFLAGS
+CPPFLAGS=$save_CPPFLAGS
+LDFLAGS=$save_LDFLAGS
+LIBS=$save_LIBS
+
 
-$as_echo "#define HAVE_RL_COMPLETION_APPEND_CHARACTER 1" >>confdefs.h
 
+else
+  with_readline=no
 fi
 
-  ac_fn_c_check_decl "$LINENO" "rl_completion_suppress_append" "ac_cv_have_decl_rl_completion_suppress_append" "
-#include <stdio.h> /* Must be first for Gnu Readline */
-#ifdef WITH_EDITLINE
-# include <editline/readline.h>
-#else
-# include <readline/readline.h>
-#endif
+done
 
-"
-if test "x$ac_cv_have_decl_rl_completion_suppress_append" = xyes; then :
 
-$as_echo "#define HAVE_RL_COMPLETION_SUPPRESS_APPEND 1" >>confdefs.h
+elif test $pkg_failed = untried; then
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
-fi
+    for ac_header in readline/readline.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "readline/readline.h" "ac_cv_header_readline_readline_h" "$ac_includes_default"
+if test "x$ac_cv_header_readline_readline_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_READLINE_READLINE_H 1
+_ACEOF
+
+      save_CFLAGS=$CFLAGS
+save_CPPFLAGS=$CPPFLAGS
+save_LDFLAGS=$LDFLAGS
+save_LIBS=$LIBS
 
 
-  # check for readline 4.0
-  as_ac_Lib=`$as_echo "ac_cv_lib_$LIBREADLINE''_rl_pre_input_hook" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for rl_pre_input_hook in -l$LIBREADLINE" >&5
-$as_echo_n "checking for rl_pre_input_hook in -l$LIBREADLINE... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for readline in -lreadline" >&5
+$as_echo_n "checking for readline in -lreadline... " >&6; }
+if ${ac_cv_lib_readline_readline+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-l$LIBREADLINE $READLINE_LIBS $LIBS"
+LIBS="-lreadline  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -20631,43 +20730,150 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 #ifdef __cplusplus
 extern "C"
 #endif
-char rl_pre_input_hook ();
+char readline ();
 int
 main ()
 {
-return rl_pre_input_hook ();
+return readline ();
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  eval "$as_ac_Lib=yes"
+  ac_cv_lib_readline_readline=yes
 else
-  eval "$as_ac_Lib=no"
+  ac_cv_lib_readline_readline=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-eval ac_res=\$$as_ac_Lib
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_readline_readline" >&5
+$as_echo "$ac_cv_lib_readline_readline" >&6; }
+if test "x$ac_cv_lib_readline_readline" = xyes; then :
 
-$as_echo "#define HAVE_RL_PRE_INPUT_HOOK 1" >>confdefs.h
+          LIBREADLINE=readline
+          READLINE_CFLAGS=${LIBREADLINE_CFLAGS-""}
+          READLINE_LIBS=${LIBREADLINE_LIBS-"-lreadline"}
+
+else
+
+          with_readline=no
 
 fi
 
 
-  # also in 4.0
-  as_ac_Lib=`$as_echo "ac_cv_lib_$LIBREADLINE''_rl_completion_display_matches_hook" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for rl_completion_display_matches_hook in -l$LIBREADLINE" >&5
-$as_echo_n "checking for rl_completion_display_matches_hook in -l$LIBREADLINE... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
+CFLAGS=$save_CFLAGS
+CPPFLAGS=$save_CPPFLAGS
+LDFLAGS=$save_LDFLAGS
+LIBS=$save_LIBS
+
+
+
+else
+  with_readline=no
+fi
+
+done
+
+
+else
+	LIBREADLINE_CFLAGS=$pkg_cv_LIBREADLINE_CFLAGS
+	LIBREADLINE_LIBS=$pkg_cv_LIBREADLINE_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+    LIBREADLINE=readline
+    READLINE_CFLAGS=$LIBREADLINE_CFLAGS
+    READLINE_LIBS=$LIBREADLINE_LIBS
+
+fi
+
+fi
+
+if test "x$with_readline" = xedit; then :
+
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBEDIT" >&5
+$as_echo_n "checking for LIBEDIT... " >&6; }
+
+if test -n "$LIBEDIT_CFLAGS"; then
+    pkg_cv_LIBEDIT_CFLAGS="$LIBEDIT_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libedit\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libedit") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_LIBEDIT_CFLAGS=`$PKG_CONFIG --cflags "libedit" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$LIBEDIT_LIBS"; then
+    pkg_cv_LIBEDIT_LIBS="$LIBEDIT_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libedit\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libedit") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_LIBEDIT_LIBS=`$PKG_CONFIG --libs "libedit" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+	        LIBEDIT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libedit" 2>&1`
+        else
+	        LIBEDIT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libedit" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$LIBEDIT_PKG_ERRORS" >&5
+
+
+    for ac_header in editline/readline.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "editline/readline.h" "ac_cv_header_editline_readline_h" "$ac_includes_default"
+if test "x$ac_cv_header_editline_readline_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_EDITLINE_READLINE_H 1
+_ACEOF
+
+      save_CFLAGS=$CFLAGS
+save_CPPFLAGS=$CPPFLAGS
+save_LDFLAGS=$LDFLAGS
+save_LIBS=$LIBS
+
+
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for readline in -ledit" >&5
+$as_echo_n "checking for readline in -ledit... " >&6; }
+if ${ac_cv_lib_edit_readline+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-l$LIBREADLINE $READLINE_LIBS $LIBS"
+LIBS="-ledit  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -20677,43 +20883,80 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 #ifdef __cplusplus
 extern "C"
 #endif
-char rl_completion_display_matches_hook ();
+char readline ();
 int
 main ()
 {
-return rl_completion_display_matches_hook ();
+return readline ();
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  eval "$as_ac_Lib=yes"
+  ac_cv_lib_edit_readline=yes
 else
-  eval "$as_ac_Lib=no"
+  ac_cv_lib_edit_readline=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-eval ac_res=\$$as_ac_Lib
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_edit_readline" >&5
+$as_echo "$ac_cv_lib_edit_readline" >&6; }
+if test "x$ac_cv_lib_edit_readline" = xyes; then :
 
-$as_echo "#define HAVE_RL_COMPLETION_DISPLAY_MATCHES_HOOK 1" >>confdefs.h
+          LIBREADLINE=edit
+          $as_echo "#define WITH_EDITLINE 1" >>confdefs.h
+
+          READLINE_CFLAGS=${LIBEDIT_CFLAGS-""}
+          READLINE_LIBS=${LIBEDIT_LIBS-"-ledit"}
+
+else
+
+          with_readline=no
 
 fi
 
 
-  # also in 4.0, but not in editline
-  as_ac_Lib=`$as_echo "ac_cv_lib_$LIBREADLINE''_rl_resize_terminal" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for rl_resize_terminal in -l$LIBREADLINE" >&5
-$as_echo_n "checking for rl_resize_terminal in -l$LIBREADLINE... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
+CFLAGS=$save_CFLAGS
+CPPFLAGS=$save_CPPFLAGS
+LDFLAGS=$save_LDFLAGS
+LIBS=$save_LIBS
+
+
+
+else
+  with_readline=no
+fi
+
+done
+
+
+elif test $pkg_failed = untried; then
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+    for ac_header in editline/readline.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "editline/readline.h" "ac_cv_header_editline_readline_h" "$ac_includes_default"
+if test "x$ac_cv_header_editline_readline_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_EDITLINE_READLINE_H 1
+_ACEOF
+
+      save_CFLAGS=$CFLAGS
+save_CPPFLAGS=$CPPFLAGS
+save_LDFLAGS=$LDFLAGS
+save_LIBS=$LIBS
+
+
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for readline in -ledit" >&5
+$as_echo_n "checking for readline in -ledit... " >&6; }
+if ${ac_cv_lib_edit_readline+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-l$LIBREADLINE $READLINE_LIBS $LIBS"
+LIBS="-ledit  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -20723,145 +20966,393 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 #ifdef __cplusplus
 extern "C"
 #endif
-char rl_resize_terminal ();
+char readline ();
 int
 main ()
 {
-return rl_resize_terminal ();
+return readline ();
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  eval "$as_ac_Lib=yes"
+  ac_cv_lib_edit_readline=yes
 else
-  eval "$as_ac_Lib=no"
+  ac_cv_lib_edit_readline=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-eval ac_res=\$$as_ac_Lib
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
-
-$as_echo "#define HAVE_RL_RESIZE_TERMINAL 1" >>confdefs.h
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_edit_readline" >&5
+$as_echo "$ac_cv_lib_edit_readline" >&6; }
+if test "x$ac_cv_lib_edit_readline" = xyes; then :
 
-fi
+          LIBREADLINE=edit
+          $as_echo "#define WITH_EDITLINE 1" >>confdefs.h
 
+          READLINE_CFLAGS=${LIBEDIT_CFLAGS-""}
+          READLINE_LIBS=${LIBEDIT_LIBS-"-ledit"}
 
-  # check for readline 4.2
-  as_ac_Lib=`$as_echo "ac_cv_lib_$LIBREADLINE''_rl_completion_matches" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for rl_completion_matches in -l$LIBREADLINE" >&5
-$as_echo_n "checking for rl_completion_matches in -l$LIBREADLINE... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
-  $as_echo_n "(cached) " >&6
 else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-l$LIBREADLINE $READLINE_LIBS $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
 
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char rl_completion_matches ();
+          with_readline=no
+
+fi
+
+
+CFLAGS=$save_CFLAGS
+CPPFLAGS=$save_CPPFLAGS
+LDFLAGS=$save_LDFLAGS
+LIBS=$save_LIBS
+
+
+
+else
+  with_readline=no
+fi
+
+done
+
+
+else
+	LIBEDIT_CFLAGS=$pkg_cv_LIBEDIT_CFLAGS
+	LIBEDIT_LIBS=$pkg_cv_LIBEDIT_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+    $as_echo "#define WITH_EDITLINE 1" >>confdefs.h
+
+    LIBREADLINE=edit
+    READLINE_CFLAGS=$LIBEDIT_CFLAGS
+    READLINE_LIBS=$LIBEDIT_LIBS
+
+fi
+
+fi
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to link readline" >&5
+$as_echo_n "checking how to link readline... " >&6; }
+if test "x$with_readline" = xno; then :
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+else
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_readline (CFLAGS: $READLINE_CFLAGS, LIBS: $READLINE_LIBS)" >&5
+$as_echo "$with_readline (CFLAGS: $READLINE_CFLAGS, LIBS: $READLINE_LIBS)" >&6; }
+
+  save_CFLAGS=$CFLAGS
+save_CPPFLAGS=$CPPFLAGS
+save_LDFLAGS=$LDFLAGS
+save_LIBS=$LIBS
+
+
+    CPPFLAGS="$READLINE_CFLAGS $CFLAGS"
+    LIBS="$READLINE_LIBS $LIBS"
+    LIBS_SAVE=$LIBS
+
+
+
+    # check for readline 2.2
+    ac_fn_c_check_decl "$LINENO" "rl_completion_append_character" "ac_cv_have_decl_rl_completion_append_character" "
+      #include <stdio.h> /* Must be first for Gnu Readline */
+      #ifdef WITH_EDITLINE
+      # include <editline/readline.h>
+      #else
+      # include <readline/readline.h>
+      # include <readline/history.h>
+      #endif
+
+"
+if test "x$ac_cv_have_decl_rl_completion_append_character" = xyes; then :
+
+
+$as_echo "#define HAVE_RL_COMPLETION_APPEND_CHARACTER 1" >>confdefs.h
+
+
+fi
+
+
+    ac_fn_c_check_decl "$LINENO" "rl_completion_suppress_append" "ac_cv_have_decl_rl_completion_suppress_append" "
+      #include <stdio.h> /* Must be first for Gnu Readline */
+      #ifdef WITH_EDITLINE
+      # include <editline/readline.h>
+      #else
+      # include <readline/readline.h>
+      # include <readline/history.h>
+      #endif
+
+"
+if test "x$ac_cv_have_decl_rl_completion_suppress_append" = xyes; then :
+
+
+$as_echo "#define HAVE_RL_COMPLETION_SUPPRESS_APPEND 1" >>confdefs.h
+
+
+fi
+
+
+    # check for readline 4.0
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for rl_pre_input_hook in -l$LIBREADLINE" >&5
+$as_echo_n "checking for rl_pre_input_hook in -l$LIBREADLINE... " >&6; }
+if ${ac_cv_readline_rl_pre_input_hook+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+      #include <stdio.h> /* Must be first for Gnu Readline */
+      #ifdef WITH_EDITLINE
+      # include <editline/readline.h>
+      #else
+      # include <readline/readline.h>
+      # include <readline/history.h>
+      #endif
+
 int
 main ()
 {
-return rl_completion_matches ();
+void *x = rl_pre_input_hook
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  eval "$as_ac_Lib=yes"
+  ac_cv_readline_rl_pre_input_hook=yes
 else
-  eval "$as_ac_Lib=no"
+  ac_cv_readline_rl_pre_input_hook=no
+
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
+
 fi
-eval ac_res=\$$as_ac_Lib
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_readline_rl_pre_input_hook" >&5
+$as_echo "$ac_cv_readline_rl_pre_input_hook" >&6; }
+    if test "x$ac_cv_readline_rl_pre_input_hook" = xyes; then :
+
+
+$as_echo "#define HAVE_RL_PRE_INPUT_HOOK 1" >>confdefs.h
 
-$as_echo "#define HAVE_RL_COMPLETION_MATCHES 1" >>confdefs.h
 
 fi
 
+    # also in 4.0
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for rl_completion_display_matches_hook in -l$LIBREADLINE" >&5
+$as_echo_n "checking for rl_completion_display_matches_hook in -l$LIBREADLINE... " >&6; }
+if ${ac_cv_readline_rl_completion_display_matches_hook+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
 
-  # also in readline 4.2
-  ac_fn_c_check_decl "$LINENO" "rl_catch_signals" "ac_cv_have_decl_rl_catch_signals" "
-#include <stdio.h> /* Must be first for Gnu Readline */
-#ifdef WITH_EDITLINE
-# include <editline/readline.h>
-#else
-# include <readline/readline.h>
-#endif
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+      #include <stdio.h> /* Must be first for Gnu Readline */
+      #ifdef WITH_EDITLINE
+      # include <editline/readline.h>
+      #else
+      # include <readline/readline.h>
+      # include <readline/history.h>
+      #endif
+
+int
+main ()
+{
+void *x = rl_completion_display_matches_hook
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_readline_rl_completion_display_matches_hook=yes
+else
+  ac_cv_readline_rl_completion_display_matches_hook=no
+
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_readline_rl_completion_display_matches_hook" >&5
+$as_echo "$ac_cv_readline_rl_completion_display_matches_hook" >&6; }
+    if test "x$ac_cv_readline_rl_completion_display_matches_hook" = xyes; then :
+
+
+$as_echo "#define HAVE_RL_COMPLETION_DISPLAY_MATCHES_HOOK 1" >>confdefs.h
+
+
+fi
+
+    # also in 4.0, but not in editline
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for rl_resize_terminal in -l$LIBREADLINE" >&5
+$as_echo_n "checking for rl_resize_terminal in -l$LIBREADLINE... " >&6; }
+if ${ac_cv_readline_rl_resize_terminal+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+      #include <stdio.h> /* Must be first for Gnu Readline */
+      #ifdef WITH_EDITLINE
+      # include <editline/readline.h>
+      #else
+      # include <readline/readline.h>
+      # include <readline/history.h>
+      #endif
+
+int
+main ()
+{
+void *x = rl_resize_terminal
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_readline_rl_resize_terminal=yes
+else
+  ac_cv_readline_rl_resize_terminal=no
+
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_readline_rl_resize_terminal" >&5
+$as_echo "$ac_cv_readline_rl_resize_terminal" >&6; }
+    if test "x$ac_cv_readline_rl_resize_terminal" = xyes; then :
+
+
+$as_echo "#define HAVE_RL_RESIZE_TERMINAL 1" >>confdefs.h
+
+
+fi
+
+    # check for readline 4.2
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for rl_completion_matches in -l$LIBREADLINE" >&5
+$as_echo_n "checking for rl_completion_matches in -l$LIBREADLINE... " >&6; }
+if ${ac_cv_readline_rl_completion_matches+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+      #include <stdio.h> /* Must be first for Gnu Readline */
+      #ifdef WITH_EDITLINE
+      # include <editline/readline.h>
+      #else
+      # include <readline/readline.h>
+      # include <readline/history.h>
+      #endif
+
+int
+main ()
+{
+void *x = rl_completion_matches
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_readline_rl_completion_matches=yes
+else
+  ac_cv_readline_rl_completion_matches=no
+
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_readline_rl_completion_matches" >&5
+$as_echo "$ac_cv_readline_rl_completion_matches" >&6; }
+    if test "x$ac_cv_readline_rl_completion_matches" = xyes; then :
+
+
+$as_echo "#define HAVE_RL_COMPLETION_MATCHES 1" >>confdefs.h
+
+
+fi
+
+    # also in readline 4.2
+    ac_fn_c_check_decl "$LINENO" "rl_catch_signals" "ac_cv_have_decl_rl_catch_signals" "
+      #include <stdio.h> /* Must be first for Gnu Readline */
+      #ifdef WITH_EDITLINE
+      # include <editline/readline.h>
+      #else
+      # include <readline/readline.h>
+      # include <readline/history.h>
+      #endif
 
 "
 if test "x$ac_cv_have_decl_rl_catch_signals" = xyes; then :
 
+
 $as_echo "#define HAVE_RL_CATCH_SIGNAL 1" >>confdefs.h
 
+
 fi
 
 
-  as_ac_Lib=`$as_echo "ac_cv_lib_$LIBREADLINE''_append_history" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for append_history in -l$LIBREADLINE" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for append_history in -l$LIBREADLINE" >&5
 $as_echo_n "checking for append_history in -l$LIBREADLINE... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
+if ${ac_cv_readline_append_history+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-l$LIBREADLINE $READLINE_LIBS $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char append_history ();
+      #include <stdio.h> /* Must be first for Gnu Readline */
+      #ifdef WITH_EDITLINE
+      # include <editline/readline.h>
+      #else
+      # include <readline/readline.h>
+      # include <readline/history.h>
+      #endif
+
 int
 main ()
 {
-return append_history ();
+void *x = append_history
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  eval "$as_ac_Lib=yes"
+  ac_cv_readline_append_history=yes
 else
-  eval "$as_ac_Lib=no"
+  ac_cv_readline_append_history=no
+
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
+
 fi
-eval ac_res=\$$as_ac_Lib
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_readline_append_history" >&5
+$as_echo "$ac_cv_readline_append_history" >&6; }
+    if test "x$ac_cv_readline_append_history" = xyes; then :
+
 
 $as_echo "#define HAVE_RL_APPEND_HISTORY 1" >>confdefs.h
 
-fi
 
 fi
 
-# End of readline checks: restore LIBS
-LIBS=$LIBS_no_readline
+
+
+CFLAGS=$save_CFLAGS
+CPPFLAGS=$save_CPPFLAGS
+LDFLAGS=$save_LDFLAGS
+LIBS=$save_LIBS
+
+
+fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for broken nice()" >&5
 $as_echo_n "checking for broken nice()... " >&6; }
@@ -21003,145 +21494,989 @@ int main()
 	    exit(1);
 #endif
 
-	putenv("TZ=EST+5EDT,M4.1.0,M10.5.0");
-	tzset();
-	if (localtime(&groundhogday)->tm_hour != 19)
-	    exit(1);
-#if HAVE_TZNAME
-	if (strcmp(tzname[0], "EST") || strcmp(tzname[1], "EDT"))
-	    exit(1);
-#endif
+	putenv("TZ=EST+5EDT,M4.1.0,M10.5.0");
+	tzset();
+	if (localtime(&groundhogday)->tm_hour != 19)
+	    exit(1);
+#if HAVE_TZNAME
+	if (strcmp(tzname[0], "EST") || strcmp(tzname[1], "EDT"))
+	    exit(1);
+#endif
+
+	putenv("TZ=AEST-10AEDT-11,M10.5.0,M3.5.0");
+	tzset();
+	if (localtime(&groundhogday)->tm_hour != 11)
+	    exit(1);
+#if HAVE_TZNAME
+	if (strcmp(tzname[0], "AEST") || strcmp(tzname[1], "AEDT"))
+	    exit(1);
+#endif
+
+#if HAVE_STRUCT_TM_TM_ZONE
+	if (strcmp(localtime(&groundhogday)->tm_zone, "AEDT"))
+	    exit(1);
+	if (strcmp(localtime(&midyear)->tm_zone, "AEST"))
+	    exit(1);
+#endif
+
+	exit(0);
+}
+
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  ac_cv_working_tzset=yes
+else
+  ac_cv_working_tzset=no
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_working_tzset" >&5
+$as_echo "$ac_cv_working_tzset" >&6; }
+if test "$ac_cv_working_tzset" = yes
+then
+
+$as_echo "#define HAVE_WORKING_TZSET 1" >>confdefs.h
+
+fi
+
+# Look for subsecond timestamps in struct stat
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for tv_nsec in struct stat" >&5
+$as_echo_n "checking for tv_nsec in struct stat... " >&6; }
+if ${ac_cv_stat_tv_nsec+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <sys/stat.h>
+int
+main ()
+{
+
+struct stat st;
+st.st_mtim.tv_nsec = 1;
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_stat_tv_nsec=yes
+else
+  ac_cv_stat_tv_nsec=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_stat_tv_nsec" >&5
+$as_echo "$ac_cv_stat_tv_nsec" >&6; }
+if test "$ac_cv_stat_tv_nsec" = yes
+then
+
+$as_echo "#define HAVE_STAT_TV_NSEC 1" >>confdefs.h
+
+fi
+
+# Look for BSD style subsecond timestamps in struct stat
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for tv_nsec2 in struct stat" >&5
+$as_echo_n "checking for tv_nsec2 in struct stat... " >&6; }
+if ${ac_cv_stat_tv_nsec2+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <sys/stat.h>
+int
+main ()
+{
+
+struct stat st;
+st.st_mtimespec.tv_nsec = 1;
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_stat_tv_nsec2=yes
+else
+  ac_cv_stat_tv_nsec2=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_stat_tv_nsec2" >&5
+$as_echo "$ac_cv_stat_tv_nsec2" >&6; }
+if test "$ac_cv_stat_tv_nsec2" = yes
+then
+
+$as_echo "#define HAVE_STAT_TV_NSEC2 1" >>confdefs.h
+
+fi
+
+have_curses=no
+have_panel=no
+
+
+for ac_header in curses.h ncurses.h
+do :
+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+
+if test "x$ac_cv_header_ncurses_h" = xyes; then :
+
+  if test "$ac_sys_system" != "Darwin"; then
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CURSES" >&5
+$as_echo_n "checking for CURSES... " >&6; }
+
+if test -n "$CURSES_CFLAGS"; then
+    pkg_cv_CURSES_CFLAGS="$CURSES_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ncursesw\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "ncursesw") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_CURSES_CFLAGS=`$PKG_CONFIG --cflags "ncursesw" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$CURSES_LIBS"; then
+    pkg_cv_CURSES_LIBS="$CURSES_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ncursesw\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "ncursesw") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_CURSES_LIBS=`$PKG_CONFIG --libs "ncursesw" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+	        CURSES_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "ncursesw" 2>&1`
+        else
+	        CURSES_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "ncursesw" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$CURSES_PKG_ERRORS" >&5
+
+
+      save_CFLAGS=$CFLAGS
+save_CPPFLAGS=$CPPFLAGS
+save_LDFLAGS=$LDFLAGS
+save_LIBS=$LIBS
+
+
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for initscr in -lncursesw" >&5
+$as_echo_n "checking for initscr in -lncursesw... " >&6; }
+if ${ac_cv_lib_ncursesw_initscr+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lncursesw  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char initscr ();
+int
+main ()
+{
+return initscr ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_ncursesw_initscr=yes
+else
+  ac_cv_lib_ncursesw_initscr=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ncursesw_initscr" >&5
+$as_echo "$ac_cv_lib_ncursesw_initscr" >&6; }
+if test "x$ac_cv_lib_ncursesw_initscr" = xyes; then :
+
+          $as_echo "#define HAVE_NCURSESW 1" >>confdefs.h
+
+          have_curses=ncursesw
+          CURSES_CFLAGS=${CURSES_CFLAGS-""}
+          CURSES_LIBS=${CURSES_LIBS-"-lncursesw"}
+
+fi
+
+
+CFLAGS=$save_CFLAGS
+CPPFLAGS=$save_CPPFLAGS
+LDFLAGS=$save_LDFLAGS
+LIBS=$save_LIBS
+
+
+
+elif test $pkg_failed = untried; then
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+      save_CFLAGS=$CFLAGS
+save_CPPFLAGS=$CPPFLAGS
+save_LDFLAGS=$LDFLAGS
+save_LIBS=$LIBS
+
+
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for initscr in -lncursesw" >&5
+$as_echo_n "checking for initscr in -lncursesw... " >&6; }
+if ${ac_cv_lib_ncursesw_initscr+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lncursesw  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char initscr ();
+int
+main ()
+{
+return initscr ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_ncursesw_initscr=yes
+else
+  ac_cv_lib_ncursesw_initscr=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ncursesw_initscr" >&5
+$as_echo "$ac_cv_lib_ncursesw_initscr" >&6; }
+if test "x$ac_cv_lib_ncursesw_initscr" = xyes; then :
+
+          $as_echo "#define HAVE_NCURSESW 1" >>confdefs.h
+
+          have_curses=ncursesw
+          CURSES_CFLAGS=${CURSES_CFLAGS-""}
+          CURSES_LIBS=${CURSES_LIBS-"-lncursesw"}
+
+fi
+
+
+CFLAGS=$save_CFLAGS
+CPPFLAGS=$save_CPPFLAGS
+LDFLAGS=$save_LDFLAGS
+LIBS=$save_LIBS
+
+
+
+else
+	CURSES_CFLAGS=$pkg_cv_CURSES_CFLAGS
+	CURSES_LIBS=$pkg_cv_CURSES_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+      have_curses=ncursesw
+
+fi
+  fi
+
+  if test "x$have_curses" = xno; then :
+
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CURSES" >&5
+$as_echo_n "checking for CURSES... " >&6; }
+
+if test -n "$CURSES_CFLAGS"; then
+    pkg_cv_CURSES_CFLAGS="$CURSES_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ncurses\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "ncurses") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_CURSES_CFLAGS=`$PKG_CONFIG --cflags "ncurses" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$CURSES_LIBS"; then
+    pkg_cv_CURSES_LIBS="$CURSES_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ncurses\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "ncurses") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_CURSES_LIBS=`$PKG_CONFIG --libs "ncurses" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+	        CURSES_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "ncurses" 2>&1`
+        else
+	        CURSES_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "ncurses" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$CURSES_PKG_ERRORS" >&5
+
+
+      save_CFLAGS=$CFLAGS
+save_CPPFLAGS=$CPPFLAGS
+save_LDFLAGS=$LDFLAGS
+save_LIBS=$LIBS
+
+
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for initscr in -lncurses" >&5
+$as_echo_n "checking for initscr in -lncurses... " >&6; }
+if ${ac_cv_lib_ncurses_initscr+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lncurses  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char initscr ();
+int
+main ()
+{
+return initscr ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_ncurses_initscr=yes
+else
+  ac_cv_lib_ncurses_initscr=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ncurses_initscr" >&5
+$as_echo "$ac_cv_lib_ncurses_initscr" >&6; }
+if test "x$ac_cv_lib_ncurses_initscr" = xyes; then :
+
+          have_curses=ncurses
+          CURSES_CFLAGS=${CURSES_CFLAGS-""}
+          CURSES_LIBS=${CURSES_LIBS-"-lncurses"}
+
+fi
+
+
+CFLAGS=$save_CFLAGS
+CPPFLAGS=$save_CPPFLAGS
+LDFLAGS=$save_LDFLAGS
+LIBS=$save_LIBS
+
+
+
+elif test $pkg_failed = untried; then
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+      save_CFLAGS=$CFLAGS
+save_CPPFLAGS=$CPPFLAGS
+save_LDFLAGS=$LDFLAGS
+save_LIBS=$LIBS
+
+
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for initscr in -lncurses" >&5
+$as_echo_n "checking for initscr in -lncurses... " >&6; }
+if ${ac_cv_lib_ncurses_initscr+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lncurses  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char initscr ();
+int
+main ()
+{
+return initscr ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_ncurses_initscr=yes
+else
+  ac_cv_lib_ncurses_initscr=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ncurses_initscr" >&5
+$as_echo "$ac_cv_lib_ncurses_initscr" >&6; }
+if test "x$ac_cv_lib_ncurses_initscr" = xyes; then :
+
+          have_curses=ncurses
+          CURSES_CFLAGS=${CURSES_CFLAGS-""}
+          CURSES_LIBS=${CURSES_LIBS-"-lncurses"}
+
+fi
+
+
+CFLAGS=$save_CFLAGS
+CPPFLAGS=$save_CPPFLAGS
+LDFLAGS=$save_LDFLAGS
+LIBS=$save_LIBS
+
+
+
+else
+	CURSES_CFLAGS=$pkg_cv_CURSES_CFLAGS
+	CURSES_LIBS=$pkg_cv_CURSES_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+      have_curses=ncurses
+
+fi
+
+fi
+
+
+fi
+CURSES_CFLAGS=$(echo $CURSES_CFLAGS | sed 's/-D_XOPEN_SOURCE=600//')
+
+if test "$have_curses" = no -a "$ac_sys_system" = "Darwin"; then
+
+  as_fn_append CURSES_CFLAGS " -D_XOPEN_SOURCE_EXTENDED=1"
+  $as_echo "#define HAVE_NCURSESW 1" >>confdefs.h
+
+fi
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking curses module flags" >&5
+$as_echo_n "checking curses module flags... " >&6; }
+if test "x$have_curses" = xno; then :
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+else
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_curses (CFLAGS: $CURSES_CFLAGS, LIBS: $CURSES_LIBS)" >&5
+$as_echo "$have_curses (CFLAGS: $CURSES_CFLAGS, LIBS: $CURSES_LIBS)" >&6; }
+
+fi
+
+for ac_header in panel.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "panel.h" "ac_cv_header_panel_h" "$ac_includes_default"
+if test "x$ac_cv_header_panel_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_PANEL_H 1
+_ACEOF
+
+fi
+
+done
+
+
+if test "x$ac_cv_header_panel_h" = xyes; then :
+
+
+  if test "$ac_sys_system" != "Darwin"; then
+        if test "x$have_curses" = xncursesw; then :
+
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PANEL" >&5
+$as_echo_n "checking for PANEL... " >&6; }
+
+if test -n "$PANEL_CFLAGS"; then
+    pkg_cv_PANEL_CFLAGS="$PANEL_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"panelw\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "panelw") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_PANEL_CFLAGS=`$PKG_CONFIG --cflags "panelw" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$PANEL_LIBS"; then
+    pkg_cv_PANEL_LIBS="$PANEL_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"panelw\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "panelw") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_PANEL_LIBS=`$PKG_CONFIG --libs "panelw" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+	        PANEL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "panelw" 2>&1`
+        else
+	        PANEL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "panelw" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$PANEL_PKG_ERRORS" >&5
+
+
+        save_CFLAGS=$CFLAGS
+save_CPPFLAGS=$CPPFLAGS
+save_LDFLAGS=$LDFLAGS
+save_LIBS=$LIBS
+
+
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for update_panels in -lpanelw" >&5
+$as_echo_n "checking for update_panels in -lpanelw... " >&6; }
+if ${ac_cv_lib_panelw_update_panels+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lpanelw  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char update_panels ();
+int
+main ()
+{
+return update_panels ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_panelw_update_panels=yes
+else
+  ac_cv_lib_panelw_update_panels=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_panelw_update_panels" >&5
+$as_echo "$ac_cv_lib_panelw_update_panels" >&6; }
+if test "x$ac_cv_lib_panelw_update_panels" = xyes; then :
+
+            have_panel=panelw
+            PANEL_CFLAGS=${PANEL_CFLAGS-""}
+            PANEL_LIBS=${PANEL_LIBS-"-lpanelw"}
+
+fi
+
+
+CFLAGS=$save_CFLAGS
+CPPFLAGS=$save_CPPFLAGS
+LDFLAGS=$save_LDFLAGS
+LIBS=$save_LIBS
+
+
+
+elif test $pkg_failed = untried; then
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+        save_CFLAGS=$CFLAGS
+save_CPPFLAGS=$CPPFLAGS
+save_LDFLAGS=$LDFLAGS
+save_LIBS=$LIBS
+
+
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for update_panels in -lpanelw" >&5
+$as_echo_n "checking for update_panels in -lpanelw... " >&6; }
+if ${ac_cv_lib_panelw_update_panels+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lpanelw  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char update_panels ();
+int
+main ()
+{
+return update_panels ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_panelw_update_panels=yes
+else
+  ac_cv_lib_panelw_update_panels=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_panelw_update_panels" >&5
+$as_echo "$ac_cv_lib_panelw_update_panels" >&6; }
+if test "x$ac_cv_lib_panelw_update_panels" = xyes; then :
+
+            have_panel=panelw
+            PANEL_CFLAGS=${PANEL_CFLAGS-""}
+            PANEL_LIBS=${PANEL_LIBS-"-lpanelw"}
+
+fi
+
+
+CFLAGS=$save_CFLAGS
+CPPFLAGS=$save_CPPFLAGS
+LDFLAGS=$save_LDFLAGS
+LIBS=$save_LIBS
+
+
+
+else
+	PANEL_CFLAGS=$pkg_cv_PANEL_CFLAGS
+	PANEL_LIBS=$pkg_cv_PANEL_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+        have_panel=panelw
+
+fi
+
+fi
+  fi
 
-	putenv("TZ=AEST-10AEDT-11,M10.5.0,M3.5.0");
-	tzset();
-	if (localtime(&groundhogday)->tm_hour != 11)
-	    exit(1);
-#if HAVE_TZNAME
-	if (strcmp(tzname[0], "AEST") || strcmp(tzname[1], "AEDT"))
-	    exit(1);
-#endif
+  if test "x$have_curses" = xncurses; then :
 
-#if HAVE_STRUCT_TM_TM_ZONE
-	if (strcmp(localtime(&groundhogday)->tm_zone, "AEDT"))
-	    exit(1);
-	if (strcmp(localtime(&midyear)->tm_zone, "AEST"))
-	    exit(1);
-#endif
 
-	exit(0);
-}
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PANEL" >&5
+$as_echo_n "checking for PANEL... " >&6; }
 
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  ac_cv_working_tzset=yes
+if test -n "$PANEL_CFLAGS"; then
+    pkg_cv_PANEL_CFLAGS="$PANEL_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"panel\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "panel") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_PANEL_CFLAGS=`$PKG_CONFIG --cflags "panel" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
 else
-  ac_cv_working_tzset=no
+  pkg_failed=yes
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+ else
+    pkg_failed=untried
 fi
-
+if test -n "$PANEL_LIBS"; then
+    pkg_cv_PANEL_LIBS="$PANEL_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"panel\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "panel") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_PANEL_LIBS=`$PKG_CONFIG --libs "panel" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_working_tzset" >&5
-$as_echo "$ac_cv_working_tzset" >&6; }
-if test "$ac_cv_working_tzset" = yes
-then
 
-$as_echo "#define HAVE_WORKING_TZSET 1" >>confdefs.h
 
+
+if test $pkg_failed = yes; then
+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
 fi
+        if test $_pkg_short_errors_supported = yes; then
+	        PANEL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "panel" 2>&1`
+        else
+	        PANEL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "panel" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$PANEL_PKG_ERRORS" >&5
 
-# Look for subsecond timestamps in struct stat
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for tv_nsec in struct stat" >&5
-$as_echo_n "checking for tv_nsec in struct stat... " >&6; }
-if ${ac_cv_stat_tv_nsec+:} false; then :
+
+      save_CFLAGS=$CFLAGS
+save_CPPFLAGS=$CPPFLAGS
+save_LDFLAGS=$LDFLAGS
+save_LIBS=$LIBS
+
+
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for update_panels in -lpanel" >&5
+$as_echo_n "checking for update_panels in -lpanel... " >&6; }
+if ${ac_cv_lib_panel_update_panels+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lpanel  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <sys/stat.h>
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char update_panels ();
 int
 main ()
 {
-
-struct stat st;
-st.st_mtim.tv_nsec = 1;
-
+return update_panels ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_stat_tv_nsec=yes
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_panel_update_panels=yes
 else
-  ac_cv_stat_tv_nsec=no
+  ac_cv_lib_panel_update_panels=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_stat_tv_nsec" >&5
-$as_echo "$ac_cv_stat_tv_nsec" >&6; }
-if test "$ac_cv_stat_tv_nsec" = yes
-then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_panel_update_panels" >&5
+$as_echo "$ac_cv_lib_panel_update_panels" >&6; }
+if test "x$ac_cv_lib_panel_update_panels" = xyes; then :
 
-$as_echo "#define HAVE_STAT_TV_NSEC 1" >>confdefs.h
+          have_panel=panel
+          PANEL_CFLAGS=${PANEL_CFLAGS-""}
+          PANEL_LIBS=${PANEL_LIBS-"-lpanel"}
 
 fi
 
-# Look for BSD style subsecond timestamps in struct stat
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for tv_nsec2 in struct stat" >&5
-$as_echo_n "checking for tv_nsec2 in struct stat... " >&6; }
-if ${ac_cv_stat_tv_nsec2+:} false; then :
+
+CFLAGS=$save_CFLAGS
+CPPFLAGS=$save_CPPFLAGS
+LDFLAGS=$save_LDFLAGS
+LIBS=$save_LIBS
+
+
+
+elif test $pkg_failed = untried; then
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+      save_CFLAGS=$CFLAGS
+save_CPPFLAGS=$CPPFLAGS
+save_LDFLAGS=$LDFLAGS
+save_LIBS=$LIBS
+
+
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for update_panels in -lpanel" >&5
+$as_echo_n "checking for update_panels in -lpanel... " >&6; }
+if ${ac_cv_lib_panel_update_panels+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lpanel  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <sys/stat.h>
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char update_panels ();
 int
 main ()
 {
-
-struct stat st;
-st.st_mtimespec.tv_nsec = 1;
-
+return update_panels ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_stat_tv_nsec2=yes
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_panel_update_panels=yes
 else
-  ac_cv_stat_tv_nsec2=no
+  ac_cv_lib_panel_update_panels=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_stat_tv_nsec2" >&5
-$as_echo "$ac_cv_stat_tv_nsec2" >&6; }
-if test "$ac_cv_stat_tv_nsec2" = yes
-then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_panel_update_panels" >&5
+$as_echo "$ac_cv_lib_panel_update_panels" >&6; }
+if test "x$ac_cv_lib_panel_update_panels" = xyes; then :
 
-$as_echo "#define HAVE_STAT_TV_NSEC2 1" >>confdefs.h
+          have_panel=panel
+          PANEL_CFLAGS=${PANEL_CFLAGS-""}
+          PANEL_LIBS=${PANEL_LIBS-"-lpanel"}
+
+fi
+
+
+CFLAGS=$save_CFLAGS
+CPPFLAGS=$save_CPPFLAGS
+LDFLAGS=$save_LDFLAGS
+LIBS=$save_LIBS
+
+
+
+else
+	PANEL_CFLAGS=$pkg_cv_PANEL_CFLAGS
+	PANEL_LIBS=$pkg_cv_PANEL_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+      have_panel=panel
 
 fi
 
-# first curses header check
-ac_save_cppflags="$CPPFLAGS"
-if test "$cross_compiling" = no; then
-  CPPFLAGS="$CPPFLAGS -I/usr/include/ncursesw"
 fi
 
-for ac_header in curses.h ncurses.h
-do :
-  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
 
 fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking panel flags" >&5
+$as_echo_n "checking panel flags... " >&6; }
+if test "x$have_panel" = xno; then :
 
-done
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
+else
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_panel (CFLAGS: $PANEL_CFLAGS, LIBS: $PANEL_LIBS)" >&5
+$as_echo "$have_panel (CFLAGS: $PANEL_CFLAGS, LIBS: $PANEL_LIBS)" >&6; }
+
+fi
+
+# first curses header check
+ac_save_cppflags="$CPPFLAGS"
+if test "$cross_compiling" = no; then
+  CPPFLAGS="$CPPFLAGS -I/usr/include/ncursesw"
+fi
 
 # On Solaris, term.h requires curses.h
 for ac_header in term.h
@@ -24637,6 +25972,76 @@ fi
 $as_echo "$py_cv_module__ctypes" >&6; }
 
 
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for stdlib extension module _curses" >&5
+$as_echo_n "checking for stdlib extension module _curses... " >&6; }
+        if test "$py_cv_module__curses" != "n/a"; then :
+
+    if true; then :
+  if test "$have_curses" != "no"; then :
+  py_cv_module__curses=yes
+else
+  py_cv_module__curses=missing
+fi
+else
+  py_cv_module__curses=disabled
+fi
+
+fi
+  as_fn_append MODULE_BLOCK "MODULE__CURSES_STATE=$py_cv_module__curses$as_nl"
+  if test "x$py_cv_module__curses" = xyes; then :
+
+    as_fn_append MODULE_BLOCK "MODULE__CURSES_CFLAGS=$CURSES_CFLAGS$as_nl"
+    as_fn_append MODULE_BLOCK "MODULE__CURSES_LDFLAGS=$CURSES_LIBS
+$as_nl"
+
+fi
+   if test "$py_cv_module__curses" = yes; then
+  MODULE__CURSES_TRUE=
+  MODULE__CURSES_FALSE='#'
+else
+  MODULE__CURSES_TRUE='#'
+  MODULE__CURSES_FALSE=
+fi
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $py_cv_module__curses" >&5
+$as_echo "$py_cv_module__curses" >&6; }
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for stdlib extension module _curses_panel" >&5
+$as_echo_n "checking for stdlib extension module _curses_panel... " >&6; }
+        if test "$py_cv_module__curses_panel" != "n/a"; then :
+
+    if true; then :
+  if test "$have_panel" != "no"; then :
+  py_cv_module__curses_panel=yes
+else
+  py_cv_module__curses_panel=missing
+fi
+else
+  py_cv_module__curses_panel=disabled
+fi
+
+fi
+  as_fn_append MODULE_BLOCK "MODULE__CURSES_PANEL_STATE=$py_cv_module__curses_panel$as_nl"
+  if test "x$py_cv_module__curses_panel" = xyes; then :
+
+    as_fn_append MODULE_BLOCK "MODULE__CURSES_PANEL_CFLAGS=$PANEL_CFLAGS $CURSES_CFLAGS$as_nl"
+    as_fn_append MODULE_BLOCK "MODULE__CURSES_PANEL_LDFLAGS=$PANEL_LIBS $CURSES_LIBS
+$as_nl"
+
+fi
+   if test "$py_cv_module__curses_panel" = yes; then
+  MODULE__CURSES_PANEL_TRUE=
+  MODULE__CURSES_PANEL_FALSE='#'
+else
+  MODULE__CURSES_PANEL_TRUE='#'
+  MODULE__CURSES_PANEL_FALSE=
+fi
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $py_cv_module__curses_panel" >&5
+$as_echo "$py_cv_module__curses_panel" >&6; }
+
+
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for stdlib extension module _decimal" >&5
 $as_echo_n "checking for stdlib extension module _decimal... " >&6; }
         if test "$py_cv_module__decimal" != "n/a"; then :
@@ -24773,6 +26178,40 @@ fi
 $as_echo "$py_cv_module_nis" >&6; }
 
 
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for stdlib extension module readline" >&5
+$as_echo_n "checking for stdlib extension module readline... " >&6; }
+        if test "$py_cv_module_readline" != "n/a"; then :
+
+    if true; then :
+  if test "$with_readline" != "no"; then :
+  py_cv_module_readline=yes
+else
+  py_cv_module_readline=missing
+fi
+else
+  py_cv_module_readline=disabled
+fi
+
+fi
+  as_fn_append MODULE_BLOCK "MODULE_READLINE_STATE=$py_cv_module_readline$as_nl"
+  if test "x$py_cv_module_readline" = xyes; then :
+
+    as_fn_append MODULE_BLOCK "MODULE_READLINE_CFLAGS=$READLINE_CFLAGS$as_nl"
+    as_fn_append MODULE_BLOCK "MODULE_READLINE_LDFLAGS=$READLINE_LIBS$as_nl"
+
+fi
+   if test "$py_cv_module_readline" = yes; then
+  MODULE_READLINE_TRUE=
+  MODULE_READLINE_FALSE='#'
+else
+  MODULE_READLINE_TRUE='#'
+  MODULE_READLINE_FALSE=
+fi
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $py_cv_module_readline" >&5
+$as_echo "$py_cv_module_readline" >&6; }
+
+
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for stdlib extension module _sqlite3" >&5
 $as_echo_n "checking for stdlib extension module _sqlite3... " >&6; }
         if test "$py_cv_module__sqlite3" != "n/a"; then :
@@ -25719,6 +27158,14 @@ if test -z "${MODULE__CTYPES_TRUE}" && test -z "${MODULE__CTYPES_FALSE}"; then
   as_fn_error $? "conditional \"MODULE__CTYPES\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${MODULE__CURSES_TRUE}" && test -z "${MODULE__CURSES_FALSE}"; then
+  as_fn_error $? "conditional \"MODULE__CURSES\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${MODULE__CURSES_PANEL_TRUE}" && test -z "${MODULE__CURSES_PANEL_FALSE}"; then
+  as_fn_error $? "conditional \"MODULE__CURSES_PANEL\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${MODULE__DECIMAL_TRUE}" && test -z "${MODULE__DECIMAL_FALSE}"; then
   as_fn_error $? "conditional \"MODULE__DECIMAL\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -25735,6 +27182,10 @@ if test -z "${MODULE_NIS_TRUE}" && test -z "${MODULE_NIS_FALSE}"; then
   as_fn_error $? "conditional \"MODULE_NIS\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${MODULE_READLINE_TRUE}" && test -z "${MODULE_READLINE_FALSE}"; then
+  as_fn_error $? "conditional \"MODULE_READLINE\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${MODULE__SQLITE3_TRUE}" && test -z "${MODULE__SQLITE3_FALSE}"; then
   as_fn_error $? "conditional \"MODULE__SQLITE3\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
diff --git a/configure.ac b/configure.ac
index b03ead3bdefa0..42e181bca9dac 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5780,127 +5780,169 @@ then
   [Define this if you have flockfile(), getc_unlocked(), and funlockfile()])
 fi
 
-AC_ARG_WITH([readline],
-  [AS_HELP_STRING([--with(out)-readline@<:@=editline@:>@],
-    [use Editline for backend or disable readline module])],
-    [],
-    [with_readline=yes])
+dnl Check for libreadline and libedit
+dnl - libreadline provides "readline/readline.h" header and "libreadline"
+dnl   shared library. pkg-config file is readline.pc
+dnl - libedit provides "editline/readline.h" header and "libedit" shared
+dnl   library. pkg-config file ins libedit.pc
+dnl - editline is not supported ("readline.h" and "libeditline" shared library)
+dnl
+dnl NOTE: In the past we checked if readline needs an additional termcap
+dnl library (tinfo ncursesw ncurses termcap). We now assume that libreadline
+dnl or readline.pc provide correct linker information.
 
-# check where readline lives
-py_cv_lib_readline=no
-# save the value of LIBS so we don't actually link Python with readline
-LIBS_no_readline=$LIBS
+AH_TEMPLATE([WITH_EDITLINE], [Define to build the readline module against libedit.])
 
-if test "$with_readline" != no; then
-  case "$with_readline" in
-  editline|edit)
-    LIBREADLINE=edit
-    AC_DEFINE(WITH_EDITLINE, 1,
-      [Define to build the readline module against Editline.])
-    ;;
-  yes|readline)
+AC_ARG_WITH(
+  [readline],
+  [AS_HELP_STRING([--with(out)-readline@<:@=editline|readline|no@:>@],
+                  [use libedit for backend or disable readline module])],
+  [
+    AS_CASE([$with_readline],
+      [editline|edit], [with_readline=edit],
+      [yes|readline], [with_readline=readline],
+      [no], [],
+      [AC_MSG_ERROR([proper usage is --with(out)-readline@<:@=editline|readline|no@:>@])]
+    )
+  ],
+  [with_readline=readline]
+)
+
+AS_VAR_IF([with_readline], [readline], [
+  PKG_CHECK_MODULES([LIBREADLINE], [readline], [
     LIBREADLINE=readline
-    ;;
-  *)
-    AC_MSG_ERROR([proper usage is --with(out)-readline@<:@=editline@:>@])
-    ;;
-  esac
+    READLINE_CFLAGS=$LIBREADLINE_CFLAGS
+    READLINE_LIBS=$LIBREADLINE_LIBS
+  ], [
+    AC_CHECK_HEADERS([readline/readline.h], [
+      WITH_SAVE_ENV([
+        AC_CHECK_LIB([readline], [readline], [
+          LIBREADLINE=readline
+          READLINE_CFLAGS=${LIBREADLINE_CFLAGS-""}
+          READLINE_LIBS=${LIBREADLINE_LIBS-"-lreadline"}
+        ], [
+          with_readline=no
+        ])
+      ])
+    ], [with_readline=no])
+  ])
+])
 
-  # On some systems we need to link readline to a termcap compatible
-  # library.  NOTE: Keep the precedence of listed libraries synchronised
-  # with setup.py.
-  AC_MSG_CHECKING([how to link readline libs])
-  for py_libtermcap in "" tinfo ncursesw ncurses curses termcap; do
-    if test -z "$py_libtermcap"; then
-      READLINE_LIBS="-l$LIBREADLINE"
-    else
-      READLINE_LIBS="-l$LIBREADLINE -l$py_libtermcap"
-    fi
-    LIBS="$READLINE_LIBS $LIBS_no_readline"
-    AC_LINK_IFELSE(
-      [AC_LANG_CALL([],[readline])],
-      [py_cv_lib_readline=yes])
-    if test $py_cv_lib_readline = yes; then
-      break
-    fi
-  done
+AS_VAR_IF([with_readline], [edit], [
+  PKG_CHECK_MODULES([LIBEDIT], [libedit], [
+    AC_DEFINE([WITH_EDITLINE], [1])
+    LIBREADLINE=edit
+    READLINE_CFLAGS=$LIBEDIT_CFLAGS
+    READLINE_LIBS=$LIBEDIT_LIBS
+  ], [
+    AC_CHECK_HEADERS([editline/readline.h], [
+      WITH_SAVE_ENV([
+        AC_CHECK_LIB([edit], [readline], [
+          LIBREADLINE=edit
+          AC_DEFINE([WITH_EDITLINE], [1])
+          READLINE_CFLAGS=${LIBEDIT_CFLAGS-""}
+          READLINE_LIBS=${LIBEDIT_LIBS-"-ledit"}
+        ], [
+          with_readline=no
+        ])
+      ])
+    ], [with_readline=no])
+  ])
+])
 
-  # Uncomment this line if you want to use READLINE_LIBS in Makefile or scripts
-  #AC_SUBST([READLINE_LIBS])
-  if test $py_cv_lib_readline = no; then
-    AC_MSG_RESULT([none])
-  else
-    AC_MSG_RESULT([$READLINE_LIBS])
-    AC_DEFINE(HAVE_LIBREADLINE, 1,
-      [Define to build the readline module.])
-  fi
-fi
 
-if test "$py_cv_lib_readline" = yes; then
-  # check for readline 2.2
-  AC_CHECK_DECL(rl_completion_append_character,
-    AC_DEFINE(HAVE_RL_COMPLETION_APPEND_CHARACTER, 1,
-      [Define if you have readline 2.2]),,
-    [
-#include <stdio.h> /* Must be first for Gnu Readline */
-#ifdef WITH_EDITLINE
-# include <editline/readline.h>
-#else
-# include <readline/readline.h>
-#endif
+AC_MSG_CHECKING([how to link readline])
+AS_VAR_IF([with_readline], [no], [
+  AC_MSG_RESULT([no])
+], [
+  AC_MSG_RESULT([$with_readline (CFLAGS: $READLINE_CFLAGS, LIBS: $READLINE_LIBS)])
+
+  WITH_SAVE_ENV([
+    CPPFLAGS="$READLINE_CFLAGS $CFLAGS"
+    LIBS="$READLINE_LIBS $LIBS"
+    LIBS_SAVE=$LIBS
+
+    m4_define([readline_includes], [
+      #include <stdio.h> /* Must be first for Gnu Readline */
+      #ifdef WITH_EDITLINE
+      # include <editline/readline.h>
+      #else
+      # include <readline/readline.h>
+      # include <readline/history.h>
+      #endif
     ])
-  AC_CHECK_DECL(rl_completion_suppress_append,
-    AC_DEFINE(HAVE_RL_COMPLETION_SUPPRESS_APPEND, 1,
-      [Define if you have rl_completion_suppress_append]),,
-    [
-#include <stdio.h> /* Must be first for Gnu Readline */
-#ifdef WITH_EDITLINE
-# include <editline/readline.h>
-#else
-# include <readline/readline.h>
-#endif
+
+    # check for readline 2.2
+    AC_CHECK_DECL([rl_completion_append_character], [
+      AC_DEFINE([HAVE_RL_COMPLETION_APPEND_CHARACTER], [1], [Define if you have readline 2.2])
+    ], [], [readline_includes])
+
+    AC_CHECK_DECL([rl_completion_suppress_append], [
+      AC_DEFINE([HAVE_RL_COMPLETION_SUPPRESS_APPEND], [1], [Define if you have rl_completion_suppress_append])
+    ], [], [readline_includes])
+
+    # check for readline 4.0
+    AC_CACHE_CHECK([for rl_pre_input_hook in -l$LIBREADLINE], [ac_cv_readline_rl_pre_input_hook], [
+      AC_LINK_IFELSE(
+        [AC_LANG_PROGRAM([readline_includes], [void *x = rl_pre_input_hook])],
+        [ac_cv_readline_rl_pre_input_hook=yes], [ac_cv_readline_rl_pre_input_hook=no]
+      )
+    ])
+    AS_VAR_IF([ac_cv_readline_rl_pre_input_hook], [yes], [
+      AC_DEFINE([HAVE_RL_PRE_INPUT_HOOK], [1], [Define if you have readline 4.0])
     ])
 
-  # check for readline 4.0
-  AC_CHECK_LIB($LIBREADLINE, rl_pre_input_hook,
-    AC_DEFINE(HAVE_RL_PRE_INPUT_HOOK, 1,
-      [Define if you have readline 4.0]),,$READLINE_LIBS)
-
-  # also in 4.0
-  AC_CHECK_LIB($LIBREADLINE, rl_completion_display_matches_hook,
-    AC_DEFINE(HAVE_RL_COMPLETION_DISPLAY_MATCHES_HOOK, 1,
-      [Define if you have readline 4.0]),,$READLINE_LIBS)
-
-  # also in 4.0, but not in editline
-  AC_CHECK_LIB($LIBREADLINE, rl_resize_terminal,
-    AC_DEFINE(HAVE_RL_RESIZE_TERMINAL, 1,
-      [Define if you have readline 4.0]),,$READLINE_LIBS)
-
-  # check for readline 4.2
-  AC_CHECK_LIB($LIBREADLINE, rl_completion_matches,
-    AC_DEFINE(HAVE_RL_COMPLETION_MATCHES, 1,
-      [Define if you have readline 4.2]),,$READLINE_LIBS)
-
-  # also in readline 4.2
-  AC_CHECK_DECL(rl_catch_signals,
-    AC_DEFINE(HAVE_RL_CATCH_SIGNAL, 1,
-      [Define if you can turn off readline's signal handling.]),,
-    [
-#include <stdio.h> /* Must be first for Gnu Readline */
-#ifdef WITH_EDITLINE
-# include <editline/readline.h>
-#else
-# include <readline/readline.h>
-#endif
+    # also in 4.0
+    AC_CACHE_CHECK([for rl_completion_display_matches_hook in -l$LIBREADLINE], [ac_cv_readline_rl_completion_display_matches_hook], [
+      AC_LINK_IFELSE(
+        [AC_LANG_PROGRAM([readline_includes], [void *x = rl_completion_display_matches_hook])],
+        [ac_cv_readline_rl_completion_display_matches_hook=yes], [ac_cv_readline_rl_completion_display_matches_hook=no]
+      )
+    ])
+    AS_VAR_IF([ac_cv_readline_rl_completion_display_matches_hook], [yes], [
+      AC_DEFINE([HAVE_RL_COMPLETION_DISPLAY_MATCHES_HOOK], [1], [Define if you have readline 4.0])
     ])
 
-  AC_CHECK_LIB($LIBREADLINE, append_history,
-    AC_DEFINE(HAVE_RL_APPEND_HISTORY, 1,
-      [Define if readline supports append_history]),,$READLINE_LIBS)
-fi
+    # also in 4.0, but not in editline
+      AC_CACHE_CHECK([for rl_resize_terminal in -l$LIBREADLINE], [ac_cv_readline_rl_resize_terminal], [
+      AC_LINK_IFELSE(
+        [AC_LANG_PROGRAM([readline_includes], [void *x = rl_resize_terminal])],
+        [ac_cv_readline_rl_resize_terminal=yes], [ac_cv_readline_rl_resize_terminal=no]
+      )
+    ])
+    AS_VAR_IF([ac_cv_readline_rl_resize_terminal], [yes], [
+      AC_DEFINE([HAVE_RL_RESIZE_TERMINAL], [1], [Define if you have readline 4.0])
+    ])
 
-# End of readline checks: restore LIBS
-LIBS=$LIBS_no_readline
+    # check for readline 4.2
+    AC_CACHE_CHECK([for rl_completion_matches in -l$LIBREADLINE], [ac_cv_readline_rl_completion_matches], [
+      AC_LINK_IFELSE(
+        [AC_LANG_PROGRAM([readline_includes], [void *x = rl_completion_matches])],
+        [ac_cv_readline_rl_completion_matches=yes], [ac_cv_readline_rl_completion_matches=no]
+      )
+    ])
+    AS_VAR_IF([ac_cv_readline_rl_completion_matches], [yes], [
+      AC_DEFINE([HAVE_RL_COMPLETION_MATCHES], [1], [Define if you have readline 4.2])
+    ])
+
+    # also in readline 4.2
+    AC_CHECK_DECL([rl_catch_signals], [
+      AC_DEFINE([HAVE_RL_CATCH_SIGNAL], [1], [Define if you can turn off readline's signal handling.])
+    ], [], [readline_includes])
+
+    AC_CACHE_CHECK([for append_history in -l$LIBREADLINE], [ac_cv_readline_append_history], [
+      AC_LINK_IFELSE(
+        [AC_LANG_PROGRAM([readline_includes], [void *x = append_history])],
+        [ac_cv_readline_append_history=yes], [ac_cv_readline_append_history=no]
+      )
+    ])
+    AS_VAR_IF([ac_cv_readline_append_history], [yes], [
+      AC_DEFINE([HAVE_RL_APPEND_HISTORY], [1], [Define if readline supports append_history])
+    ])
+
+    m4_undefine([readline_includes])
+  ])dnl WITH_SAVE_ENV()
+])
 
 AC_CACHE_CHECK([for broken nice()], [ac_cv_broken_nice], [
 AC_RUN_IFELSE([AC_LANG_SOURCE([[
@@ -6056,14 +6098,124 @@ then
   [Define if you have struct stat.st_mtimensec])
 fi
 
+dnl check for ncurses/ncursesw and panel/panelw
+dnl NOTE: old curses is not detected.
+dnl have_curses=[no, ncursesw, ncurses]
+dnl have_panel=[no, panelw, panel]
+have_curses=no
+have_panel=no
+
+AH_TEMPLATE([HAVE_NCURSESW], [Define to 1 if you have the `ncursesw' library.])
+AC_CHECK_HEADERS([curses.h ncurses.h])
+
+AS_VAR_IF([ac_cv_header_ncurses_h], [yes], [
+  if test "$ac_sys_system" != "Darwin"; then
+    dnl On macOS, there is no separate /usr/lib/libncursesw nor libpanelw.
+    PKG_CHECK_MODULES([CURSES], [ncursesw], [
+      have_curses=ncursesw
+    ], [
+      WITH_SAVE_ENV([
+        AC_CHECK_LIB([ncursesw], [initscr], [
+          AC_DEFINE([HAVE_NCURSESW], [1])
+          have_curses=ncursesw
+          CURSES_CFLAGS=${CURSES_CFLAGS-""}
+          CURSES_LIBS=${CURSES_LIBS-"-lncursesw"}
+        ])
+      ])
+    ])
+  fi
+
+  AS_VAR_IF([have_curses], [no], [
+    PKG_CHECK_MODULES([CURSES], [ncurses], [
+      have_curses=ncurses
+    ], [
+      WITH_SAVE_ENV([
+        AC_CHECK_LIB([ncurses], [initscr], [
+          have_curses=ncurses
+          CURSES_CFLAGS=${CURSES_CFLAGS-""}
+          CURSES_LIBS=${CURSES_LIBS-"-lncurses"}
+        ])
+      ])
+    ])
+  ])
+
+])dnl ac_cv_header_ncurses_h = yes
+
+dnl remove _XOPEN_SOURCE macro from curses cflags. pyconfig.h sets
+dnl the macro to 700.
+CURSES_CFLAGS=$(echo $CURSES_CFLAGS | sed 's/-D_XOPEN_SOURCE=600//')
+
+if test "$have_curses" = no -a "$ac_sys_system" = "Darwin"; then
+  dnl On macOS, there is no separate /usr/lib/libncursesw nor libpanelw.
+  dnl If we are here, we found a locally-supplied version of libncursesw.
+  dnl There should also be a libpanelw.
+  dnl _XOPEN_SOURCE defines are usually excluded for macOS, but we need
+  dnl _XOPEN_SOURCE_EXTENDED here for ncurses wide char support.
+
+  AS_VAR_APPEND([CURSES_CFLAGS], [" -D_XOPEN_SOURCE_EXTENDED=1"])
+  AC_DEFINE([HAVE_NCURSESW], [1])
+fi
+
+dnl TODO: detect "curses" and special cases tinfo, terminfo, or termcap
+
+AC_MSG_CHECKING([curses module flags])
+AS_VAR_IF([have_curses], [no], [
+  AC_MSG_RESULT([no])  
+], [
+  AC_MSG_RESULT([$have_curses (CFLAGS: $CURSES_CFLAGS, LIBS: $CURSES_LIBS)])
+])
+
+dnl check for ncurses' panel/panelw library
+AC_CHECK_HEADERS([panel.h])
+
+AS_VAR_IF([ac_cv_header_panel_h], [yes], [
+
+  if test "$ac_sys_system" != "Darwin"; then
+    dnl On macOS, there is no separate /usr/lib/libncursesw nor libpanelw.
+    AS_VAR_IF([have_curses], [ncursesw], [
+      PKG_CHECK_MODULES([PANEL], [panelw], [
+        have_panel=panelw
+      ], [
+        WITH_SAVE_ENV([
+          AC_CHECK_LIB([panelw], [update_panels], [
+            have_panel=panelw
+            PANEL_CFLAGS=${PANEL_CFLAGS-""}
+            PANEL_LIBS=${PANEL_LIBS-"-lpanelw"}
+          ])
+        ])
+      ])
+    ])
+  fi
+
+  AS_VAR_IF([have_curses], [ncurses], [
+    PKG_CHECK_MODULES([PANEL], [panel], [
+      have_panel=panel
+    ], [
+      WITH_SAVE_ENV([
+        AC_CHECK_LIB([panel], [update_panels], [
+          have_panel=panel
+          PANEL_CFLAGS=${PANEL_CFLAGS-""}
+          PANEL_LIBS=${PANEL_LIBS-"-lpanel"}
+        ])
+      ])
+    ])
+  ])
+
+])dnl ac_cv_header_panel_h = yes
+
+AC_MSG_CHECKING([panel flags])
+AS_VAR_IF([have_panel], [no], [
+  AC_MSG_RESULT([no])  
+], [
+  AC_MSG_RESULT([$have_panel (CFLAGS: $PANEL_CFLAGS, LIBS: $PANEL_LIBS)])
+])
+
 # first curses header check
 ac_save_cppflags="$CPPFLAGS"
 if test "$cross_compiling" = no; then
   CPPFLAGS="$CPPFLAGS -I/usr/include/ncursesw"
 fi
 
-AC_CHECK_HEADERS(curses.h ncurses.h)
-
 # On Solaris, term.h requires curses.h
 AC_CHECK_HEADERS(term.h,,,[
 #ifdef HAVE_CURSES_H
@@ -6985,8 +7137,14 @@ PY_STDLIB_MOD([_crypt],
 PY_STDLIB_MOD([_ctypes],
   [], [test "$have_libffi" = yes],
   [$LIBFFI_CFLAGS], [$LIBFFI_LIBS])
-dnl PY_STDLIB_MOD([_curses], [], [], [], [])
-dnl PY_STDLIB_MOD([_curses_panel], [], [], [], [])
+PY_STDLIB_MOD([_curses],
+  [], [test "$have_curses" != "no"],
+  [$CURSES_CFLAGS], [$CURSES_LIBS]
+)
+PY_STDLIB_MOD([_curses_panel],
+  [], [test "$have_panel" != "no"],
+  [$PANEL_CFLAGS $CURSES_CFLAGS], [$PANEL_LIBS $CURSES_LIBS]
+)
 PY_STDLIB_MOD([_decimal], [], [], [$LIBMPDEC_CFLAGS], [$LIBMPDEC_LDFLAGS])
 PY_STDLIB_MOD([_dbm],
   [test -n "$with_dbmliborder"], [test "$have_dbm" != "no"],
@@ -6997,7 +7155,9 @@ PY_STDLIB_MOD([_gdbm],
 PY_STDLIB_MOD([nis],
   [], [test "$have_nis" = yes -a "$ac_cv_header_rpc_rpc_h" = yes],
   [$LIBNSL_CFLAGS], [$LIBNSL_LIBS])
-dnl PY_STDLIB_MOD([readline], [], [], [], [])
+ PY_STDLIB_MOD([readline],
+  [], [test "$with_readline" != "no"],
+  [$READLINE_CFLAGS], [$READLINE_LIBS])
 PY_STDLIB_MOD([_sqlite3],
   [test "$have_sqlite3" = "yes"],
   [test "$have_supported_sqlite3" = "yes"],
diff --git a/pyconfig.h.in b/pyconfig.h.in
index b05ddd41c2bba..aa9fc559fa251 100644
--- a/pyconfig.h.in
+++ b/pyconfig.h.in
@@ -290,6 +290,9 @@
 /* Defined when any dynamic module loading is enabled. */
 #undef HAVE_DYNAMIC_LOADING
 
+/* Define to 1 if you have the <editline/readline.h> header file. */
+#undef HAVE_EDITLINE_READLINE_H
+
 /* Define to 1 if you have the <endian.h> header file. */
 #undef HAVE_ENDIAN_H
 
@@ -646,9 +649,6 @@
 /* Define to 1 if you have the <libintl.h> header file. */
 #undef HAVE_LIBINTL_H
 
-/* Define to build the readline module. */
-#undef HAVE_LIBREADLINE
-
 /* Define to 1 if you have the `resolv' library (-lresolv). */
 #undef HAVE_LIBRESOLV
 
@@ -784,6 +784,9 @@
 /* Define to 1 if you have the `nanosleep' function. */
 #undef HAVE_NANOSLEEP
 
+/* Define to 1 if you have the `ncursesw' library. */
+#undef HAVE_NCURSESW
+
 /* Define to 1 if you have the <ncurses.h> header file. */
 #undef HAVE_NCURSES_H
 
@@ -821,6 +824,9 @@
 /* Define to 1 if you have the `openpty' function. */
 #undef HAVE_OPENPTY
 
+/* Define to 1 if you have the <panel.h> header file. */
+#undef HAVE_PANEL_H
+
 /* Define to 1 if you have the `pathconf' function. */
 #undef HAVE_PATHCONF
 
@@ -905,6 +911,9 @@
 /* Define to 1 if you have the `pwritev2' function. */
 #undef HAVE_PWRITEV2
 
+/* Define to 1 if you have the <readline/readline.h> header file. */
+#undef HAVE_READLINE_READLINE_H
+
 /* Define to 1 if you have the `readlink' function. */
 #undef HAVE_READLINK
 
@@ -1662,7 +1671,7 @@
    Dyld is necessary to support frameworks. */
 #undef WITH_DYLD
 
-/* Define to build the readline module against Editline. */
+/* Define to build the readline module against libedit. */
 #undef WITH_EDITLINE
 
 /* Define if you want to compile in object freelists optimization */
diff --git a/setup.py b/setup.py
index cc11dedee1b2e..2edcb08b4fd7f 100644
--- a/setup.py
+++ b/setup.py
@@ -1015,149 +1015,9 @@ def detect_test_extensions(self):
         ))
 
     def detect_readline_curses(self):
-        # readline
-        readline_termcap_library = ""
-        curses_library = ""
-        # Cannot use os.popen here in py3k.
-        tmpfile = os.path.join(self.build_temp, 'readline_termcap_lib')
-        if not os.path.exists(self.build_temp):
-            os.makedirs(self.build_temp)
-        # Determine if readline is already linked against curses or tinfo.
-        if sysconfig.get_config_var('HAVE_LIBREADLINE'):
-            if sysconfig.get_config_var('WITH_EDITLINE'):
-                readline_lib = 'edit'
-            else:
-                readline_lib = 'readline'
-            do_readline = self.compiler.find_library_file(self.lib_dirs,
-                readline_lib)
-            if CROSS_COMPILING:
-                ret = run_command("%s -d %s | grep '(NEEDED)' > %s"
-                                % (sysconfig.get_config_var('READELF'),
-                                   do_readline, tmpfile))
-            elif find_executable('ldd'):
-                ret = run_command("ldd %s > %s" % (do_readline, tmpfile))
-            else:
-                ret = 1
-            if ret == 0:
-                with open(tmpfile) as fp:
-                    for ln in fp:
-                        if 'curses' in ln:
-                            readline_termcap_library = re.sub(
-                                r'.*lib(n?cursesw?)\.so.*', r'\1', ln
-                            ).rstrip()
-                            break
-                        # termcap interface split out from ncurses
-                        if 'tinfo' in ln:
-                            readline_termcap_library = 'tinfo'
-                            break
-            if os.path.exists(tmpfile):
-                os.unlink(tmpfile)
-        else:
-            do_readline = False
-        # Issue 7384: If readline is already linked against curses,
-        # use the same library for the readline and curses modules.
-        if 'curses' in readline_termcap_library:
-            curses_library = readline_termcap_library
-        elif self.compiler.find_library_file(self.lib_dirs, 'ncursesw'):
-            curses_library = 'ncursesw'
-        # Issue 36210: OSS provided ncurses does not link on AIX
-        # Use IBM supplied 'curses' for successful build of _curses
-        elif AIX and self.compiler.find_library_file(self.lib_dirs, 'curses'):
-            curses_library = 'curses'
-        elif self.compiler.find_library_file(self.lib_dirs, 'ncurses'):
-            curses_library = 'ncurses'
-        elif self.compiler.find_library_file(self.lib_dirs, 'curses'):
-            curses_library = 'curses'
-
-        if MACOS:
-            os_release = int(os.uname()[2].split('.')[0])
-            dep_target = sysconfig.get_config_var('MACOSX_DEPLOYMENT_TARGET')
-            if (dep_target and
-                    (tuple(int(n) for n in dep_target.split('.')[0:2])
-                        < (10, 5) ) ):
-                os_release = 8
-            if os_release < 9:
-                # MacOSX 10.4 has a broken readline. Don't try to build
-                # the readline module unless the user has installed a fixed
-                # readline package
-                if find_file('readline/rlconf.h', self.inc_dirs, []) is None:
-                    do_readline = False
-        if do_readline:
-            readline_libs = [readline_lib]
-            if readline_termcap_library:
-                pass # Issue 7384: Already linked against curses or tinfo.
-            elif curses_library:
-                readline_libs.append(curses_library)
-            elif self.compiler.find_library_file(self.lib_dirs +
-                                                     ['/usr/lib/termcap'],
-                                                     'termcap'):
-                readline_libs.append('termcap')
-            self.add(Extension('readline', ['readline.c'],
-                               library_dirs=['/usr/lib/termcap'],
-                               libraries=readline_libs))
-        else:
-            self.missing.append('readline')
-
-        # Curses support, requiring the System V version of curses, often
-        # provided by the ncurses library.
-        curses_defines = []
-        curses_includes = []
-        panel_library = 'panel'
-        if curses_library == 'ncursesw':
-            curses_defines.append(('HAVE_NCURSESW', '1'))
-            if not CROSS_COMPILING:
-                curses_includes.append('/usr/include/ncursesw')
-            # Bug 1464056: If _curses.so links with ncursesw,
-            # _curses_panel.so must link with panelw.
-            panel_library = 'panelw'
-            if MACOS:
-                # On OS X, there is no separate /usr/lib/libncursesw nor
-                # libpanelw.  If we are here, we found a locally-supplied
-                # version of libncursesw.  There should also be a
-                # libpanelw.  _XOPEN_SOURCE defines are usually excluded
-                # for OS X but we need _XOPEN_SOURCE_EXTENDED here for
-                # ncurses wide char support
-                curses_defines.append(('_XOPEN_SOURCE_EXTENDED', '1'))
-        elif MACOS and curses_library == 'ncurses':
-            # Building with the system-suppied combined libncurses/libpanel
-            curses_defines.append(('HAVE_NCURSESW', '1'))
-            curses_defines.append(('_XOPEN_SOURCE_EXTENDED', '1'))
-
-        curses_enabled = True
-        if curses_library.startswith('ncurses'):
-            curses_libs = [curses_library]
-            self.add(Extension('_curses', ['_cursesmodule.c'],
-                               include_dirs=curses_includes,
-                               define_macros=curses_defines,
-                               libraries=curses_libs))
-        elif curses_library == 'curses' and not MACOS:
-                # OSX has an old Berkeley curses, not good enough for
-                # the _curses module.
-            if (self.compiler.find_library_file(self.lib_dirs, 'terminfo')):
-                curses_libs = ['curses', 'terminfo']
-            elif (self.compiler.find_library_file(self.lib_dirs, 'termcap')):
-                curses_libs = ['curses', 'termcap']
-            else:
-                curses_libs = ['curses']
-
-            self.add(Extension('_curses', ['_cursesmodule.c'],
-                               define_macros=curses_defines,
-                               libraries=curses_libs))
-        else:
-            curses_enabled = False
-            self.missing.append('_curses')
-
-        # If the curses module is enabled, check for the panel module
-        # _curses_panel needs some form of ncurses
-        skip_curses_panel = True if AIX else False
-        if (curses_enabled and not skip_curses_panel and
-                self.compiler.find_library_file(self.lib_dirs, panel_library)):
-            self.add(Extension('_curses_panel', ['_curses_panel.c'],
-                           include_dirs=curses_includes,
-                           define_macros=curses_defines,
-                           libraries=[panel_library, *curses_libs]))
-        elif not skip_curses_panel:
-            self.missing.append('_curses_panel')
+        self.addext(Extension('readline', ['readline.c']))
+        self.addext(Extension('_curses', ['_cursesmodule.c']))
+        self.addext(Extension('_curses_panel', ['_curses_panel.c']))
 
     def detect_crypt(self):
         self.addext(Extension('_crypt', ['_cryptmodule.c']))


From webhook-mailer at python.org  Wed Jul  6 11:19:01 2022
From: webhook-mailer at python.org (pablogsal)
Date: Wed, 06 Jul 2022 15:19:01 -0000
Subject: [Python-checkins] GH-93896: AAlways set event loop in asyncio.run
 and IsolatedAsyncioTestCase (#94593)
Message-ID: <mailman.2114.1657120741.20746.python-checkins@python.org>

https://github.com/python/cpython/commit/14fea6b4d25658bc00adbb97dd40ea3d3e6843ad
commit: 14fea6b4d25658bc00adbb97dd40ea3d3e6843ad
branch: main
author: Kumar Aditya <59607654+kumaraditya303 at users.noreply.github.com>
committer: pablogsal <Pablogsal at gmail.com>
date: 2022-07-06T16:18:21+01:00
summary:

GH-93896: AAlways set event loop in asyncio.run and IsolatedAsyncioTestCase (#94593)

files:
A Misc/NEWS.d/next/Library/2022-07-06-06-02-02.gh-issue-93896.vIgWGr.rst
M Lib/asyncio/runners.py
M Lib/test/test_asyncio/test_runners.py

diff --git a/Lib/asyncio/runners.py b/Lib/asyncio/runners.py
index f524c3b8e424f..7489a50f8e48d 100644
--- a/Lib/asyncio/runners.py
+++ b/Lib/asyncio/runners.py
@@ -52,6 +52,7 @@ def __init__(self, *, debug=None, loop_factory=None):
         self._loop = None
         self._context = None
         self._interrupt_count = 0
+        self._set_event_loop = False
 
     def __enter__(self):
         self._lazy_init()
@@ -70,6 +71,8 @@ def close(self):
             loop.run_until_complete(loop.shutdown_asyncgens())
             loop.run_until_complete(loop.shutdown_default_executor())
         finally:
+            if self._set_event_loop:
+                events.set_event_loop(None)
             loop.close()
             self._loop = None
             self._state = _State.CLOSED
@@ -111,6 +114,8 @@ def run(self, coro, *, context=None):
 
         self._interrupt_count = 0
         try:
+            if self._set_event_loop:
+                events.set_event_loop(self._loop)
             return self._loop.run_until_complete(task)
         except exceptions.CancelledError:
             if self._interrupt_count > 0 and task.uncancel() == 0:
@@ -130,6 +135,7 @@ def _lazy_init(self):
             return
         if self._loop_factory is None:
             self._loop = events.new_event_loop()
+            self._set_event_loop = True
         else:
             self._loop = self._loop_factory()
         if self._debug is not None:
diff --git a/Lib/test/test_asyncio/test_runners.py b/Lib/test/test_asyncio/test_runners.py
index 7780a5f15e1b4..1f6a4983690cd 100644
--- a/Lib/test/test_asyncio/test_runners.py
+++ b/Lib/test/test_asyncio/test_runners.py
@@ -198,6 +198,18 @@ async def main():
         self.assertIsNone(spinner.ag_frame)
         self.assertFalse(spinner.ag_running)
 
+    def test_asyncio_run_set_event_loop(self):
+        #See https://github.com/python/cpython/issues/93896
+
+        async def main():
+            await asyncio.sleep(0)
+            return 42
+
+        policy = asyncio.get_event_loop_policy()
+        policy.set_event_loop = mock.Mock()
+        asyncio.run(main())
+        self.assertTrue(policy.set_event_loop.called)
+
 
 class RunnerTests(BaseTest):
 
diff --git a/Misc/NEWS.d/next/Library/2022-07-06-06-02-02.gh-issue-93896.vIgWGr.rst b/Misc/NEWS.d/next/Library/2022-07-06-06-02-02.gh-issue-93896.vIgWGr.rst
new file mode 100644
index 0000000000000..2283e14de9a9a
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2022-07-06-06-02-02.gh-issue-93896.vIgWGr.rst
@@ -0,0 +1 @@
+Fix :func:`asyncio.run` and :class:`unittest.IsolatedAsyncioTestCase` to always the set event loop as it was done in Python 3.10 and earlier. Patch by Kumar Aditya.


From webhook-mailer at python.org  Wed Jul  6 11:48:52 2022
From: webhook-mailer at python.org (miss-islington)
Date: Wed, 06 Jul 2022 15:48:52 -0000
Subject: [Python-checkins] GH-93896: AAlways set event loop in asyncio.run
 and IsolatedAsyncioTestCase (GH-94593)
Message-ID: <mailman.2115.1657122533.20746.python-checkins@python.org>

https://github.com/python/cpython/commit/0187b601063c09670c2f65a68e4c42231b1446e1
commit: 0187b601063c09670c2f65a68e4c42231b1446e1
branch: 3.11
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-06T08:48:37-07:00
summary:

GH-93896: AAlways set event loop in asyncio.run and IsolatedAsyncioTestCase (GH-94593)

(cherry picked from commit 14fea6b4d25658bc00adbb97dd40ea3d3e6843ad)

Co-authored-by: Kumar Aditya <59607654+kumaraditya303 at users.noreply.github.com>

files:
A Misc/NEWS.d/next/Library/2022-07-06-06-02-02.gh-issue-93896.vIgWGr.rst
M Lib/asyncio/runners.py
M Lib/test/test_asyncio/test_runners.py

diff --git a/Lib/asyncio/runners.py b/Lib/asyncio/runners.py
index 065691bed9928..c58b52ed862e8 100644
--- a/Lib/asyncio/runners.py
+++ b/Lib/asyncio/runners.py
@@ -53,6 +53,7 @@ def __init__(self, *, debug=None, loop_factory=None):
         self._loop = None
         self._context = None
         self._interrupt_count = 0
+        self._set_event_loop = False
 
     def __enter__(self):
         self._lazy_init()
@@ -71,6 +72,8 @@ def close(self):
             loop.run_until_complete(loop.shutdown_asyncgens())
             loop.run_until_complete(loop.shutdown_default_executor())
         finally:
+            if self._set_event_loop:
+                events.set_event_loop(None)
             loop.close()
             self._loop = None
             self._state = _State.CLOSED
@@ -112,6 +115,8 @@ def run(self, coro, *, context=None):
 
         self._interrupt_count = 0
         try:
+            if self._set_event_loop:
+                events.set_event_loop(self._loop)
             return self._loop.run_until_complete(task)
         except exceptions.CancelledError:
             if self._interrupt_count > 0 and task.uncancel() == 0:
@@ -131,6 +136,7 @@ def _lazy_init(self):
             return
         if self._loop_factory is None:
             self._loop = events.new_event_loop()
+            self._set_event_loop = True
         else:
             self._loop = self._loop_factory()
         if self._debug is not None:
diff --git a/Lib/test/test_asyncio/test_runners.py b/Lib/test/test_asyncio/test_runners.py
index 3e288d1b62ade..a27942c4f53eb 100644
--- a/Lib/test/test_asyncio/test_runners.py
+++ b/Lib/test/test_asyncio/test_runners.py
@@ -199,6 +199,18 @@ async def main():
         self.assertIsNone(spinner.ag_frame)
         self.assertFalse(spinner.ag_running)
 
+    def test_asyncio_run_set_event_loop(self):
+        #See https://github.com/python/cpython/issues/93896
+
+        async def main():
+            await asyncio.sleep(0)
+            return 42
+
+        policy = asyncio.get_event_loop_policy()
+        policy.set_event_loop = mock.Mock()
+        asyncio.run(main())
+        self.assertTrue(policy.set_event_loop.called)
+
 
 class RunnerTests(BaseTest):
 
diff --git a/Misc/NEWS.d/next/Library/2022-07-06-06-02-02.gh-issue-93896.vIgWGr.rst b/Misc/NEWS.d/next/Library/2022-07-06-06-02-02.gh-issue-93896.vIgWGr.rst
new file mode 100644
index 0000000000000..2283e14de9a9a
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2022-07-06-06-02-02.gh-issue-93896.vIgWGr.rst
@@ -0,0 +1 @@
+Fix :func:`asyncio.run` and :class:`unittest.IsolatedAsyncioTestCase` to always the set event loop as it was done in Python 3.10 and earlier. Patch by Kumar Aditya.


From webhook-mailer at python.org  Wed Jul  6 16:59:21 2022
From: webhook-mailer at python.org (erlend-aasland)
Date: Wed, 06 Jul 2022 20:59:21 -0000
Subject: [Python-checkins] gh-94017: Improve clarity of sqlite3 transaction
 handling docs (#94320)
Message-ID: <mailman.2116.1657141162.20746.python-checkins@python.org>

https://github.com/python/cpython/commit/760b8cf0c887fbc5191611a7e7d4b8c0c4f15edc
commit: 760b8cf0c887fbc5191611a7e7d4b8c0c4f15edc
branch: main
author: Erlend Egeberg Aasland <erlend.aasland at innova.no>
committer: erlend-aasland <erlend.aasland at protonmail.com>
date: 2022-07-06T22:59:07+02:00
summary:

gh-94017: Improve clarity of sqlite3 transaction handling docs (#94320)

Co-authored-by: Alex Waygood <Alex.Waygood at Gmail.com>
Co-authored-by: CAM Gerlach <CAM.Gerlach at Gerlach.CAM>

files:
M Doc/library/sqlite3.rst

diff --git a/Doc/library/sqlite3.rst b/Doc/library/sqlite3.rst
index b13d3f4b48650..b5cd6894e8060 100644
--- a/Doc/library/sqlite3.rst
+++ b/Doc/library/sqlite3.rst
@@ -406,14 +406,24 @@ Connection Objects
 
    .. attribute:: isolation_level
 
-      Get or set the current default isolation level. :const:`None` for autocommit mode or
-      one of "DEFERRED", "IMMEDIATE" or "EXCLUSIVE". See section
-      :ref:`sqlite3-controlling-transactions` for a more detailed explanation.
+      This attribute controls the :ref:`transaction handling
+      <sqlite3-controlling-transactions>` performed by ``sqlite3``.
+      If set to :const:`None`, transactions are never implicitly opened.
+      If set to one of ``"DEFERRED"``, ``"IMMEDIATE"``, or ``"EXCLUSIVE"``,
+      corresponding to the underlying `SQLite transaction behaviour`_,
+      implicit :ref:`transaction management
+      <sqlite3-controlling-transactions>` is performed.
+
+      If not overridden by the *isolation_level* parameter of :func:`connect`,
+      the default is ``""``, which is an alias for ``"DEFERRED"``.
 
    .. attribute:: in_transaction
 
+      This read-only attribute corresponds to the low-level SQLite
+      `autocommit mode`_.
+
       :const:`True` if a transaction is active (there are uncommitted changes),
-      :const:`False` otherwise.  Read-only attribute.
+      :const:`False` otherwise.
 
       .. versionadded:: 3.2
 
@@ -868,7 +878,7 @@ Cursor Objects
 
    .. method:: execute(sql[, parameters])
 
-      Executes an SQL statement. Values may be bound to the statement using
+      Execute an SQL statement. Values may be bound to the statement using
       :ref:`placeholders <sqlite3-placeholders>`.
 
       :meth:`execute` will only execute a single SQL statement. If you try to execute
@@ -876,13 +886,19 @@ Cursor Objects
       :meth:`executescript` if you want to execute multiple SQL statements with one
       call.
 
+      If :attr:`~Connection.isolation_level` is not :const:`None`,
+      *sql* is an ``INSERT``, ``UPDATE``, ``DELETE``, or ``REPLACE`` statement,
+      and there is no open transaction,
+      a transaction is implicitly opened before executing *sql*.
+
 
    .. method:: executemany(sql, seq_of_parameters)
 
-      Executes a :ref:`parameterized <sqlite3-placeholders>` SQL command
+      Execute a :ref:`parameterized <sqlite3-placeholders>` SQL command
       against all parameter sequences or mappings found in the sequence
-      *seq_of_parameters*. The :mod:`sqlite3` module also allows using an
+      *seq_of_parameters*.  It is also possible to use an
       :term:`iterator` yielding parameters instead of a sequence.
+      Uses the same implicit transaction handling as :meth:`~Cursor.execute`.
 
       .. literalinclude:: ../includes/sqlite3/executemany_1.py
 
@@ -893,12 +909,13 @@ Cursor Objects
 
    .. method:: executescript(sql_script)
 
-      This is a nonstandard convenience method for executing multiple SQL statements
-      at once. It issues a ``COMMIT`` statement first, then executes the SQL script it
-      gets as a parameter.  This method disregards :attr:`isolation_level`; any
-      transaction control must be added to *sql_script*.
+      Execute multiple SQL statements at once.
+      If there is a pending transaciton,
+      an implicit ``COMMIT`` statement is executed first.
+      No other implicit transaction control is performed;
+      any transaction control must be added to *sql_script*.
 
-      *sql_script* can be an instance of :class:`str`.
+      *sql_script* must be a :class:`string <str>`.
 
       Example:
 
@@ -1425,38 +1442,43 @@ This section shows recipes for common adapters and converters.
 Controlling Transactions
 ------------------------
 
-The underlying ``sqlite3`` library operates in ``autocommit`` mode by default,
-but the Python :mod:`sqlite3` module by default does not.
-
-``autocommit`` mode means that statements that modify the database take effect
-immediately.  A ``BEGIN`` or ``SAVEPOINT`` statement disables ``autocommit``
-mode, and a ``COMMIT``, a ``ROLLBACK``, or a ``RELEASE`` that ends the
-outermost transaction, turns ``autocommit`` mode back on.
-
-The Python :mod:`sqlite3` module by default issues a ``BEGIN`` statement
-implicitly before a Data Modification Language (DML) statement (i.e.
-``INSERT``/``UPDATE``/``DELETE``/``REPLACE``).
-
-You can control which kind of ``BEGIN`` statements :mod:`sqlite3` implicitly
-executes via the *isolation_level* parameter to the :func:`connect`
-call, or via the :attr:`isolation_level` property of connections.
-If you specify no *isolation_level*, a plain ``BEGIN`` is used, which is
-equivalent to specifying ``DEFERRED``.  Other possible values are ``IMMEDIATE``
-and ``EXCLUSIVE``.
-
-You can disable the :mod:`sqlite3` module's implicit transaction management by
-setting :attr:`isolation_level` to ``None``.  This will leave the underlying
-``sqlite3`` library operating in ``autocommit`` mode.  You can then completely
-control the transaction state by explicitly issuing ``BEGIN``, ``ROLLBACK``,
-``SAVEPOINT``, and ``RELEASE`` statements in your code.
-
-Note that :meth:`~Cursor.executescript` disregards
-:attr:`isolation_level`; any transaction control must be added explicitly.
+The ``sqlite3`` module does not adhere to the transaction handling recommended
+by :pep:`249`.
+
+If the connection attribute :attr:`~Connection.isolation_level`
+is not :const:`None`,
+new transactions are implicitly opened before
+:meth:`~Cursor.execute` and :meth:`~Cursor.executemany` executes
+``INSERT``, ``UPDATE``, ``DELETE``, or ``REPLACE`` statements.
+Use the :meth:`~Connection.commit` and :meth:`~Connection.rollback` methods
+to respectively commit and roll back pending transactions.
+You can choose the underlying `SQLite transaction behaviour`_ ?
+that is, whether and what type of ``BEGIN`` statements ``sqlite3``
+implicitly executes ?
+via the :attr:`~Connection.isolation_level` attribute.
+
+If :attr:`~Connection.isolation_level` is set to :const:`None`,
+no transactions are implicitly opened at all.
+This leaves the underlying SQLite library in `autocommit mode`_,
+but also allows the user to perform their own transaction handling
+using explicit SQL statements.
+The underlying SQLite library autocommit mode can be queried using the
+:attr:`~Connection.in_transaction` attribute.
+
+The :meth:`~Cursor.executescript` method implicitly commits
+any pending transaction before execution of the given SQL script,
+regardless of the value of :attr:`~Connection.isolation_level`.
 
 .. versionchanged:: 3.6
    :mod:`sqlite3` used to implicitly commit an open transaction before DDL
    statements.  This is no longer the case.
 
+.. _autocommit mode:
+   https://www.sqlite.org/lang_transaction.html#implicit_versus_explicit_transactions
+
+.. _SQLite transaction behaviour:
+   https://www.sqlite.org/lang_transaction.html#deferred_immediate_and_exclusive_transactions
+
 
 Using :mod:`sqlite3` efficiently
 --------------------------------


From webhook-mailer at python.org  Wed Jul  6 17:07:45 2022
From: webhook-mailer at python.org (miss-islington)
Date: Wed, 06 Jul 2022 21:07:45 -0000
Subject: [Python-checkins] gh-94017: Improve clarity of sqlite3 transaction
 handling docs (GH-94320)
Message-ID: <mailman.2117.1657141667.20746.python-checkins@python.org>

https://github.com/python/cpython/commit/7e3b6affa0b52eb13d1244d80d907c305d38ed70
commit: 7e3b6affa0b52eb13d1244d80d907c305d38ed70
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-06T14:07:36-07:00
summary:

gh-94017: Improve clarity of sqlite3 transaction handling docs (GH-94320)


Co-authored-by: Alex Waygood <Alex.Waygood at Gmail.com>
Co-authored-by: CAM Gerlach <CAM.Gerlach at Gerlach.CAM>
(cherry picked from commit 760b8cf0c887fbc5191611a7e7d4b8c0c4f15edc)

Co-authored-by: Erlend Egeberg Aasland <erlend.aasland at innova.no>

files:
M Doc/library/sqlite3.rst

diff --git a/Doc/library/sqlite3.rst b/Doc/library/sqlite3.rst
index b0be6761d7185..ac0d03062079c 100644
--- a/Doc/library/sqlite3.rst
+++ b/Doc/library/sqlite3.rst
@@ -360,14 +360,24 @@ Connection Objects
 
    .. attribute:: isolation_level
 
-      Get or set the current default isolation level. :const:`None` for autocommit mode or
-      one of "DEFERRED", "IMMEDIATE" or "EXCLUSIVE". See section
-      :ref:`sqlite3-controlling-transactions` for a more detailed explanation.
+      This attribute controls the :ref:`transaction handling
+      <sqlite3-controlling-transactions>` performed by ``sqlite3``.
+      If set to :const:`None`, transactions are never implicitly opened.
+      If set to one of ``"DEFERRED"``, ``"IMMEDIATE"``, or ``"EXCLUSIVE"``,
+      corresponding to the underlying `SQLite transaction behaviour`_,
+      implicit :ref:`transaction management
+      <sqlite3-controlling-transactions>` is performed.
+
+      If not overridden by the *isolation_level* parameter of :func:`connect`,
+      the default is ``""``, which is an alias for ``"DEFERRED"``.
 
    .. attribute:: in_transaction
 
+      This read-only attribute corresponds to the low-level SQLite
+      `autocommit mode`_.
+
       :const:`True` if a transaction is active (there are uncommitted changes),
-      :const:`False` otherwise.  Read-only attribute.
+      :const:`False` otherwise.
 
       .. versionadded:: 3.2
 
@@ -695,7 +705,7 @@ Cursor Objects
 
    .. method:: execute(sql[, parameters])
 
-      Executes an SQL statement. Values may be bound to the statement using
+      Execute an SQL statement. Values may be bound to the statement using
       :ref:`placeholders <sqlite3-placeholders>`.
 
       :meth:`execute` will only execute a single SQL statement. If you try to execute
@@ -703,13 +713,19 @@ Cursor Objects
       :meth:`executescript` if you want to execute multiple SQL statements with one
       call.
 
+      If :attr:`~Connection.isolation_level` is not :const:`None`,
+      *sql* is an ``INSERT``, ``UPDATE``, ``DELETE``, or ``REPLACE`` statement,
+      and there is no open transaction,
+      a transaction is implicitly opened before executing *sql*.
+
 
    .. method:: executemany(sql, seq_of_parameters)
 
-      Executes a :ref:`parameterized <sqlite3-placeholders>` SQL command
+      Execute a :ref:`parameterized <sqlite3-placeholders>` SQL command
       against all parameter sequences or mappings found in the sequence
-      *seq_of_parameters*. The :mod:`sqlite3` module also allows using an
+      *seq_of_parameters*.  It is also possible to use an
       :term:`iterator` yielding parameters instead of a sequence.
+      Uses the same implicit transaction handling as :meth:`~Cursor.execute`.
 
       .. literalinclude:: ../includes/sqlite3/executemany_1.py
 
@@ -720,12 +736,13 @@ Cursor Objects
 
    .. method:: executescript(sql_script)
 
-      This is a nonstandard convenience method for executing multiple SQL statements
-      at once. It issues a ``COMMIT`` statement first, then executes the SQL script it
-      gets as a parameter.  This method disregards :attr:`isolation_level`; any
-      transaction control must be added to *sql_script*.
+      Execute multiple SQL statements at once.
+      If there is a pending transaciton,
+      an implicit ``COMMIT`` statement is executed first.
+      No other implicit transaction control is performed;
+      any transaction control must be added to *sql_script*.
 
-      *sql_script* can be an instance of :class:`str`.
+      *sql_script* must be a :class:`string <str>`.
 
       Example:
 
@@ -1183,38 +1200,43 @@ This section shows recipes for common adapters and converters.
 Controlling Transactions
 ------------------------
 
-The underlying ``sqlite3`` library operates in ``autocommit`` mode by default,
-but the Python :mod:`sqlite3` module by default does not.
-
-``autocommit`` mode means that statements that modify the database take effect
-immediately.  A ``BEGIN`` or ``SAVEPOINT`` statement disables ``autocommit``
-mode, and a ``COMMIT``, a ``ROLLBACK``, or a ``RELEASE`` that ends the
-outermost transaction, turns ``autocommit`` mode back on.
-
-The Python :mod:`sqlite3` module by default issues a ``BEGIN`` statement
-implicitly before a Data Modification Language (DML) statement (i.e.
-``INSERT``/``UPDATE``/``DELETE``/``REPLACE``).
-
-You can control which kind of ``BEGIN`` statements :mod:`sqlite3` implicitly
-executes via the *isolation_level* parameter to the :func:`connect`
-call, or via the :attr:`isolation_level` property of connections.
-If you specify no *isolation_level*, a plain ``BEGIN`` is used, which is
-equivalent to specifying ``DEFERRED``.  Other possible values are ``IMMEDIATE``
-and ``EXCLUSIVE``.
-
-You can disable the :mod:`sqlite3` module's implicit transaction management by
-setting :attr:`isolation_level` to ``None``.  This will leave the underlying
-``sqlite3`` library operating in ``autocommit`` mode.  You can then completely
-control the transaction state by explicitly issuing ``BEGIN``, ``ROLLBACK``,
-``SAVEPOINT``, and ``RELEASE`` statements in your code.
-
-Note that :meth:`~Cursor.executescript` disregards
-:attr:`isolation_level`; any transaction control must be added explicitly.
+The ``sqlite3`` module does not adhere to the transaction handling recommended
+by :pep:`249`.
+
+If the connection attribute :attr:`~Connection.isolation_level`
+is not :const:`None`,
+new transactions are implicitly opened before
+:meth:`~Cursor.execute` and :meth:`~Cursor.executemany` executes
+``INSERT``, ``UPDATE``, ``DELETE``, or ``REPLACE`` statements.
+Use the :meth:`~Connection.commit` and :meth:`~Connection.rollback` methods
+to respectively commit and roll back pending transactions.
+You can choose the underlying `SQLite transaction behaviour`_ ?
+that is, whether and what type of ``BEGIN`` statements ``sqlite3``
+implicitly executes ?
+via the :attr:`~Connection.isolation_level` attribute.
+
+If :attr:`~Connection.isolation_level` is set to :const:`None`,
+no transactions are implicitly opened at all.
+This leaves the underlying SQLite library in `autocommit mode`_,
+but also allows the user to perform their own transaction handling
+using explicit SQL statements.
+The underlying SQLite library autocommit mode can be queried using the
+:attr:`~Connection.in_transaction` attribute.
+
+The :meth:`~Cursor.executescript` method implicitly commits
+any pending transaction before execution of the given SQL script,
+regardless of the value of :attr:`~Connection.isolation_level`.
 
 .. versionchanged:: 3.6
    :mod:`sqlite3` used to implicitly commit an open transaction before DDL
    statements.  This is no longer the case.
 
+.. _autocommit mode:
+   https://www.sqlite.org/lang_transaction.html#implicit_versus_explicit_transactions
+
+.. _SQLite transaction behaviour:
+   https://www.sqlite.org/lang_transaction.html#deferred_immediate_and_exclusive_transactions
+
 
 Using :mod:`sqlite3` efficiently
 --------------------------------


From webhook-mailer at python.org  Wed Jul  6 17:08:17 2022
From: webhook-mailer at python.org (miss-islington)
Date: Wed, 06 Jul 2022 21:08:17 -0000
Subject: [Python-checkins] gh-94017: Improve clarity of sqlite3 transaction
 handling docs (GH-94320)
Message-ID: <mailman.2118.1657141698.20746.python-checkins@python.org>

https://github.com/python/cpython/commit/37a47b139c7618d141d8b85631d2bc75f851b4c7
commit: 37a47b139c7618d141d8b85631d2bc75f851b4c7
branch: 3.11
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-06T14:08:13-07:00
summary:

gh-94017: Improve clarity of sqlite3 transaction handling docs (GH-94320)


Co-authored-by: Alex Waygood <Alex.Waygood at Gmail.com>
Co-authored-by: CAM Gerlach <CAM.Gerlach at Gerlach.CAM>
(cherry picked from commit 760b8cf0c887fbc5191611a7e7d4b8c0c4f15edc)

Co-authored-by: Erlend Egeberg Aasland <erlend.aasland at innova.no>

files:
M Doc/library/sqlite3.rst

diff --git a/Doc/library/sqlite3.rst b/Doc/library/sqlite3.rst
index 48549e06b3885..9ebd42b7925ba 100644
--- a/Doc/library/sqlite3.rst
+++ b/Doc/library/sqlite3.rst
@@ -396,14 +396,24 @@ Connection Objects
 
    .. attribute:: isolation_level
 
-      Get or set the current default isolation level. :const:`None` for autocommit mode or
-      one of "DEFERRED", "IMMEDIATE" or "EXCLUSIVE". See section
-      :ref:`sqlite3-controlling-transactions` for a more detailed explanation.
+      This attribute controls the :ref:`transaction handling
+      <sqlite3-controlling-transactions>` performed by ``sqlite3``.
+      If set to :const:`None`, transactions are never implicitly opened.
+      If set to one of ``"DEFERRED"``, ``"IMMEDIATE"``, or ``"EXCLUSIVE"``,
+      corresponding to the underlying `SQLite transaction behaviour`_,
+      implicit :ref:`transaction management
+      <sqlite3-controlling-transactions>` is performed.
+
+      If not overridden by the *isolation_level* parameter of :func:`connect`,
+      the default is ``""``, which is an alias for ``"DEFERRED"``.
 
    .. attribute:: in_transaction
 
+      This read-only attribute corresponds to the low-level SQLite
+      `autocommit mode`_.
+
       :const:`True` if a transaction is active (there are uncommitted changes),
-      :const:`False` otherwise.  Read-only attribute.
+      :const:`False` otherwise.
 
       .. versionadded:: 3.2
 
@@ -858,7 +868,7 @@ Cursor Objects
 
    .. method:: execute(sql[, parameters])
 
-      Executes an SQL statement. Values may be bound to the statement using
+      Execute an SQL statement. Values may be bound to the statement using
       :ref:`placeholders <sqlite3-placeholders>`.
 
       :meth:`execute` will only execute a single SQL statement. If you try to execute
@@ -866,13 +876,19 @@ Cursor Objects
       :meth:`executescript` if you want to execute multiple SQL statements with one
       call.
 
+      If :attr:`~Connection.isolation_level` is not :const:`None`,
+      *sql* is an ``INSERT``, ``UPDATE``, ``DELETE``, or ``REPLACE`` statement,
+      and there is no open transaction,
+      a transaction is implicitly opened before executing *sql*.
+
 
    .. method:: executemany(sql, seq_of_parameters)
 
-      Executes a :ref:`parameterized <sqlite3-placeholders>` SQL command
+      Execute a :ref:`parameterized <sqlite3-placeholders>` SQL command
       against all parameter sequences or mappings found in the sequence
-      *seq_of_parameters*. The :mod:`sqlite3` module also allows using an
+      *seq_of_parameters*.  It is also possible to use an
       :term:`iterator` yielding parameters instead of a sequence.
+      Uses the same implicit transaction handling as :meth:`~Cursor.execute`.
 
       .. literalinclude:: ../includes/sqlite3/executemany_1.py
 
@@ -883,12 +899,13 @@ Cursor Objects
 
    .. method:: executescript(sql_script)
 
-      This is a nonstandard convenience method for executing multiple SQL statements
-      at once. It issues a ``COMMIT`` statement first, then executes the SQL script it
-      gets as a parameter.  This method disregards :attr:`isolation_level`; any
-      transaction control must be added to *sql_script*.
+      Execute multiple SQL statements at once.
+      If there is a pending transaciton,
+      an implicit ``COMMIT`` statement is executed first.
+      No other implicit transaction control is performed;
+      any transaction control must be added to *sql_script*.
 
-      *sql_script* can be an instance of :class:`str`.
+      *sql_script* must be a :class:`string <str>`.
 
       Example:
 
@@ -1415,38 +1432,43 @@ This section shows recipes for common adapters and converters.
 Controlling Transactions
 ------------------------
 
-The underlying ``sqlite3`` library operates in ``autocommit`` mode by default,
-but the Python :mod:`sqlite3` module by default does not.
-
-``autocommit`` mode means that statements that modify the database take effect
-immediately.  A ``BEGIN`` or ``SAVEPOINT`` statement disables ``autocommit``
-mode, and a ``COMMIT``, a ``ROLLBACK``, or a ``RELEASE`` that ends the
-outermost transaction, turns ``autocommit`` mode back on.
-
-The Python :mod:`sqlite3` module by default issues a ``BEGIN`` statement
-implicitly before a Data Modification Language (DML) statement (i.e.
-``INSERT``/``UPDATE``/``DELETE``/``REPLACE``).
-
-You can control which kind of ``BEGIN`` statements :mod:`sqlite3` implicitly
-executes via the *isolation_level* parameter to the :func:`connect`
-call, or via the :attr:`isolation_level` property of connections.
-If you specify no *isolation_level*, a plain ``BEGIN`` is used, which is
-equivalent to specifying ``DEFERRED``.  Other possible values are ``IMMEDIATE``
-and ``EXCLUSIVE``.
-
-You can disable the :mod:`sqlite3` module's implicit transaction management by
-setting :attr:`isolation_level` to ``None``.  This will leave the underlying
-``sqlite3`` library operating in ``autocommit`` mode.  You can then completely
-control the transaction state by explicitly issuing ``BEGIN``, ``ROLLBACK``,
-``SAVEPOINT``, and ``RELEASE`` statements in your code.
-
-Note that :meth:`~Cursor.executescript` disregards
-:attr:`isolation_level`; any transaction control must be added explicitly.
+The ``sqlite3`` module does not adhere to the transaction handling recommended
+by :pep:`249`.
+
+If the connection attribute :attr:`~Connection.isolation_level`
+is not :const:`None`,
+new transactions are implicitly opened before
+:meth:`~Cursor.execute` and :meth:`~Cursor.executemany` executes
+``INSERT``, ``UPDATE``, ``DELETE``, or ``REPLACE`` statements.
+Use the :meth:`~Connection.commit` and :meth:`~Connection.rollback` methods
+to respectively commit and roll back pending transactions.
+You can choose the underlying `SQLite transaction behaviour`_ ?
+that is, whether and what type of ``BEGIN`` statements ``sqlite3``
+implicitly executes ?
+via the :attr:`~Connection.isolation_level` attribute.
+
+If :attr:`~Connection.isolation_level` is set to :const:`None`,
+no transactions are implicitly opened at all.
+This leaves the underlying SQLite library in `autocommit mode`_,
+but also allows the user to perform their own transaction handling
+using explicit SQL statements.
+The underlying SQLite library autocommit mode can be queried using the
+:attr:`~Connection.in_transaction` attribute.
+
+The :meth:`~Cursor.executescript` method implicitly commits
+any pending transaction before execution of the given SQL script,
+regardless of the value of :attr:`~Connection.isolation_level`.
 
 .. versionchanged:: 3.6
    :mod:`sqlite3` used to implicitly commit an open transaction before DDL
    statements.  This is no longer the case.
 
+.. _autocommit mode:
+   https://www.sqlite.org/lang_transaction.html#implicit_versus_explicit_transactions
+
+.. _SQLite transaction behaviour:
+   https://www.sqlite.org/lang_transaction.html#deferred_immediate_and_exclusive_transactions
+
 
 Using :mod:`sqlite3` efficiently
 --------------------------------


From webhook-mailer at python.org  Wed Jul  6 19:13:41 2022
From: webhook-mailer at python.org (erlend-aasland)
Date: Wed, 06 Jul 2022 23:13:41 -0000
Subject: [Python-checkins] gh-94630: Update sqlite3 docs with
 positional-only and keyword-only symbols (#94631)
Message-ID: <mailman.2119.1657149222.20746.python-checkins@python.org>

https://github.com/python/cpython/commit/94988603f3c934f95220f09aefffd50c0a5d3367
commit: 94988603f3c934f95220f09aefffd50c0a5d3367
branch: main
author: Erlend Egeberg Aasland <erlend.aasland at protonmail.com>
committer: erlend-aasland <erlend.aasland at protonmail.com>
date: 2022-07-07T01:13:30+02:00
summary:

gh-94630: Update sqlite3 docs with positional-only and keyword-only symbols (#94631)

files:
M Doc/library/sqlite3.rst

diff --git a/Doc/library/sqlite3.rst b/Doc/library/sqlite3.rst
index b5cd6894e8060..d3b7d0723991b 100644
--- a/Doc/library/sqlite3.rst
+++ b/Doc/library/sqlite3.rst
@@ -332,7 +332,7 @@ Module functions and constants
       Added the ``sqlite3.connect/handle`` auditing event.
 
 
-.. function:: register_converter(typename, converter)
+.. function:: register_converter(typename, converter, /)
 
    Register the *converter* callable to convert SQLite objects of type
    *typename* into a Python object of a specific type.
@@ -346,7 +346,7 @@ Module functions and constants
    case-insensitively.
 
 
-.. function:: register_adapter(type, adapter)
+.. function:: register_adapter(type, adapter, /)
 
    Register an *adapter* callable to adapt the Python type *type* into an
    SQLite type.
@@ -368,7 +368,7 @@ Module functions and constants
    .. literalinclude:: ../includes/sqlite3/complete_statement.py
 
 
-.. function:: enable_callback_tracebacks(flag)
+.. function:: enable_callback_tracebacks(flag, /)
 
    By default you will not get any tracebacks in user-defined functions,
    aggregates, converters, authorizer callbacks etc. If you want to debug them,
@@ -508,7 +508,7 @@ Connection Objects
       .. literalinclude:: ../includes/sqlite3/md5func.py
 
 
-   .. method:: create_aggregate(name, n_arg, aggregate_class)
+   .. method:: create_aggregate(name, /, n_arg, aggregate_class)
 
       Creates a user-defined aggregate function.
 
@@ -647,7 +647,7 @@ Connection Objects
       .. versionadded:: 3.3
 
 
-   .. method:: enable_load_extension(enabled)
+   .. method:: enable_load_extension(enabled, /)
 
       This routine allows/disallows the SQLite engine to load SQLite extensions
       from shared libraries.  SQLite extensions can define new functions,
@@ -665,7 +665,7 @@ Connection Objects
 
       .. literalinclude:: ../includes/sqlite3/load_extension.py
 
-   .. method:: load_extension(path)
+   .. method:: load_extension(path, /)
 
       This routine loads an SQLite extension from a shared library.  You have to
       enable extension loading with :meth:`enable_load_extension` before you can
@@ -876,7 +876,7 @@ Cursor Objects
    .. index:: single: ? (question mark); in SQL statements
    .. index:: single: : (colon); in SQL statements
 
-   .. method:: execute(sql[, parameters])
+   .. method:: execute(sql, parameters=(), /)
 
       Execute an SQL statement. Values may be bound to the statement using
       :ref:`placeholders <sqlite3-placeholders>`.
@@ -892,7 +892,7 @@ Cursor Objects
       a transaction is implicitly opened before executing *sql*.
 
 
-   .. method:: executemany(sql, seq_of_parameters)
+   .. method:: executemany(sql, seq_of_parameters, /)
 
       Execute a :ref:`parameterized <sqlite3-placeholders>` SQL command
       against all parameter sequences or mappings found in the sequence
@@ -907,7 +907,7 @@ Cursor Objects
       .. literalinclude:: ../includes/sqlite3/executemany_2.py
 
 
-   .. method:: executescript(sql_script)
+   .. method:: executescript(sql_script, /)
 
       Execute multiple SQL statements at once.
       If there is a pending transaciton,
@@ -957,11 +957,11 @@ Cursor Objects
       The cursor will be unusable from this point forward; a :exc:`ProgrammingError`
       exception will be raised if any operation is attempted with the cursor.
 
-   .. method:: setinputsizes(sizes)
+   .. method:: setinputsizes(sizes, /)
 
       Required by the DB-API. Does nothing in :mod:`sqlite3`.
 
-   .. method:: setoutputsize(size [, column])
+   .. method:: setoutputsize(size, column=None, /)
 
       Required by the DB-API. Does nothing in :mod:`sqlite3`.
 


From webhook-mailer at python.org  Wed Jul  6 19:21:11 2022
From: webhook-mailer at python.org (miss-islington)
Date: Wed, 06 Jul 2022 23:21:11 -0000
Subject: [Python-checkins] gh-94630: Update sqlite3 docs with
 positional-only and keyword-only symbols (GH-94631)
Message-ID: <mailman.2120.1657149671.20746.python-checkins@python.org>

https://github.com/python/cpython/commit/7f45ae859a252bc3ef9e47bd3aed80b56e910f07
commit: 7f45ae859a252bc3ef9e47bd3aed80b56e910f07
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-06T16:21:05-07:00
summary:

gh-94630: Update sqlite3 docs with positional-only and keyword-only symbols (GH-94631)

(cherry picked from commit 94988603f3c934f95220f09aefffd50c0a5d3367)

Co-authored-by: Erlend Egeberg Aasland <erlend.aasland at protonmail.com>

files:
M Doc/library/sqlite3.rst

diff --git a/Doc/library/sqlite3.rst b/Doc/library/sqlite3.rst
index ac0d03062079c..c262c69a9afd9 100644
--- a/Doc/library/sqlite3.rst
+++ b/Doc/library/sqlite3.rst
@@ -304,7 +304,7 @@ Module functions and constants
       Added the ``sqlite3.connect/handle`` auditing event.
 
 
-.. function:: register_converter(typename, converter)
+.. function:: register_converter(typename, converter, /)
 
    Register the *converter* callable to convert SQLite objects of type
    *typename* into a Python object of a specific type.
@@ -318,7 +318,7 @@ Module functions and constants
    case-insensitively.
 
 
-.. function:: register_adapter(type, adapter)
+.. function:: register_adapter(type, adapter, /)
 
    Register an *adapter* callable to adapt the Python type *type* into an
    SQLite type.
@@ -340,7 +340,7 @@ Module functions and constants
    .. literalinclude:: ../includes/sqlite3/complete_statement.py
 
 
-.. function:: enable_callback_tracebacks(flag)
+.. function:: enable_callback_tracebacks(flag, /)
 
    By default you will not get any tracebacks in user-defined functions,
    aggregates, converters, authorizer callbacks etc. If you want to debug them,
@@ -445,7 +445,7 @@ Connection Objects
       .. literalinclude:: ../includes/sqlite3/md5func.py
 
 
-   .. method:: create_aggregate(name, n_arg, aggregate_class)
+   .. method:: create_aggregate(name, /, n_arg, aggregate_class)
 
       Creates a user-defined aggregate function.
 
@@ -546,7 +546,7 @@ Connection Objects
       .. versionadded:: 3.3
 
 
-   .. method:: enable_load_extension(enabled)
+   .. method:: enable_load_extension(enabled, /)
 
       This routine allows/disallows the SQLite engine to load SQLite extensions
       from shared libraries.  SQLite extensions can define new functions,
@@ -564,7 +564,7 @@ Connection Objects
 
       .. literalinclude:: ../includes/sqlite3/load_extension.py
 
-   .. method:: load_extension(path)
+   .. method:: load_extension(path, /)
 
       This routine loads an SQLite extension from a shared library.  You have to
       enable extension loading with :meth:`enable_load_extension` before you can
@@ -703,7 +703,7 @@ Cursor Objects
    .. index:: single: ? (question mark); in SQL statements
    .. index:: single: : (colon); in SQL statements
 
-   .. method:: execute(sql[, parameters])
+   .. method:: execute(sql, parameters=(), /)
 
       Execute an SQL statement. Values may be bound to the statement using
       :ref:`placeholders <sqlite3-placeholders>`.
@@ -719,7 +719,7 @@ Cursor Objects
       a transaction is implicitly opened before executing *sql*.
 
 
-   .. method:: executemany(sql, seq_of_parameters)
+   .. method:: executemany(sql, seq_of_parameters, /)
 
       Execute a :ref:`parameterized <sqlite3-placeholders>` SQL command
       against all parameter sequences or mappings found in the sequence
@@ -734,7 +734,7 @@ Cursor Objects
       .. literalinclude:: ../includes/sqlite3/executemany_2.py
 
 
-   .. method:: executescript(sql_script)
+   .. method:: executescript(sql_script, /)
 
       Execute multiple SQL statements at once.
       If there is a pending transaciton,
@@ -784,11 +784,11 @@ Cursor Objects
       The cursor will be unusable from this point forward; a :exc:`ProgrammingError`
       exception will be raised if any operation is attempted with the cursor.
 
-   .. method:: setinputsizes(sizes)
+   .. method:: setinputsizes(sizes, /)
 
       Required by the DB-API. Does nothing in :mod:`sqlite3`.
 
-   .. method:: setoutputsize(size [, column])
+   .. method:: setoutputsize(size, column=None, /)
 
       Required by the DB-API. Does nothing in :mod:`sqlite3`.
 


From webhook-mailer at python.org  Wed Jul  6 19:22:15 2022
From: webhook-mailer at python.org (miss-islington)
Date: Wed, 06 Jul 2022 23:22:15 -0000
Subject: [Python-checkins] gh-94630: Update sqlite3 docs with
 positional-only and keyword-only symbols (GH-94631)
Message-ID: <mailman.2121.1657149735.20746.python-checkins@python.org>

https://github.com/python/cpython/commit/fa44a760d583ad2d8e049aca1626c35ef5a8149e
commit: fa44a760d583ad2d8e049aca1626c35ef5a8149e
branch: 3.11
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-06T16:22:10-07:00
summary:

gh-94630: Update sqlite3 docs with positional-only and keyword-only symbols (GH-94631)

(cherry picked from commit 94988603f3c934f95220f09aefffd50c0a5d3367)

Co-authored-by: Erlend Egeberg Aasland <erlend.aasland at protonmail.com>

files:
M Doc/library/sqlite3.rst

diff --git a/Doc/library/sqlite3.rst b/Doc/library/sqlite3.rst
index 9ebd42b7925ba..49f3536e6c316 100644
--- a/Doc/library/sqlite3.rst
+++ b/Doc/library/sqlite3.rst
@@ -322,7 +322,7 @@ Module functions and constants
       Added the ``sqlite3.connect/handle`` auditing event.
 
 
-.. function:: register_converter(typename, converter)
+.. function:: register_converter(typename, converter, /)
 
    Register the *converter* callable to convert SQLite objects of type
    *typename* into a Python object of a specific type.
@@ -336,7 +336,7 @@ Module functions and constants
    case-insensitively.
 
 
-.. function:: register_adapter(type, adapter)
+.. function:: register_adapter(type, adapter, /)
 
    Register an *adapter* callable to adapt the Python type *type* into an
    SQLite type.
@@ -358,7 +358,7 @@ Module functions and constants
    .. literalinclude:: ../includes/sqlite3/complete_statement.py
 
 
-.. function:: enable_callback_tracebacks(flag)
+.. function:: enable_callback_tracebacks(flag, /)
 
    By default you will not get any tracebacks in user-defined functions,
    aggregates, converters, authorizer callbacks etc. If you want to debug them,
@@ -498,7 +498,7 @@ Connection Objects
       .. literalinclude:: ../includes/sqlite3/md5func.py
 
 
-   .. method:: create_aggregate(name, n_arg, aggregate_class)
+   .. method:: create_aggregate(name, /, n_arg, aggregate_class)
 
       Creates a user-defined aggregate function.
 
@@ -637,7 +637,7 @@ Connection Objects
       .. versionadded:: 3.3
 
 
-   .. method:: enable_load_extension(enabled)
+   .. method:: enable_load_extension(enabled, /)
 
       This routine allows/disallows the SQLite engine to load SQLite extensions
       from shared libraries.  SQLite extensions can define new functions,
@@ -655,7 +655,7 @@ Connection Objects
 
       .. literalinclude:: ../includes/sqlite3/load_extension.py
 
-   .. method:: load_extension(path)
+   .. method:: load_extension(path, /)
 
       This routine loads an SQLite extension from a shared library.  You have to
       enable extension loading with :meth:`enable_load_extension` before you can
@@ -866,7 +866,7 @@ Cursor Objects
    .. index:: single: ? (question mark); in SQL statements
    .. index:: single: : (colon); in SQL statements
 
-   .. method:: execute(sql[, parameters])
+   .. method:: execute(sql, parameters=(), /)
 
       Execute an SQL statement. Values may be bound to the statement using
       :ref:`placeholders <sqlite3-placeholders>`.
@@ -882,7 +882,7 @@ Cursor Objects
       a transaction is implicitly opened before executing *sql*.
 
 
-   .. method:: executemany(sql, seq_of_parameters)
+   .. method:: executemany(sql, seq_of_parameters, /)
 
       Execute a :ref:`parameterized <sqlite3-placeholders>` SQL command
       against all parameter sequences or mappings found in the sequence
@@ -897,7 +897,7 @@ Cursor Objects
       .. literalinclude:: ../includes/sqlite3/executemany_2.py
 
 
-   .. method:: executescript(sql_script)
+   .. method:: executescript(sql_script, /)
 
       Execute multiple SQL statements at once.
       If there is a pending transaciton,
@@ -947,11 +947,11 @@ Cursor Objects
       The cursor will be unusable from this point forward; a :exc:`ProgrammingError`
       exception will be raised if any operation is attempted with the cursor.
 
-   .. method:: setinputsizes(sizes)
+   .. method:: setinputsizes(sizes, /)
 
       Required by the DB-API. Does nothing in :mod:`sqlite3`.
 
-   .. method:: setoutputsize(size [, column])
+   .. method:: setoutputsize(size, column=None, /)
 
       Required by the DB-API. Does nothing in :mod:`sqlite3`.
 


From webhook-mailer at python.org  Thu Jul  7 02:38:40 2022
From: webhook-mailer at python.org (miss-islington)
Date: Thu, 07 Jul 2022 06:38:40 -0000
Subject: [Python-checkins] gh-92228: disable the compiler's 'small exit
 block inlining' optimization for blocks that have a line number (GH-94592)
Message-ID: <mailman.2122.1657175921.20746.python-checkins@python.org>

https://github.com/python/cpython/commit/bde06e1b8381f140b296a397ddd1deb1c784ff8e
commit: bde06e1b8381f140b296a397ddd1deb1c784ff8e
branch: main
author: Irit Katriel <1055913+iritkatriel at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-06T23:38:36-07:00
summary:

gh-92228: disable the compiler's 'small exit block inlining' optimization for blocks that have a line number (GH-94592)



Inlining of code that corresponds to source code lines, can make it hard to distinguish later between code which is only reachable from except handlers, and that which is reachable in normal control flow. This caused problems with the debugger's jump feature.

This PR turns off the inlining optimisation for code which has line numbers. We still inline things like the implicit "return None".

files:
A Misc/NEWS.d/next/Core and Builtins/2022-07-06-14-02-26.gh-issue-92228.44Cbly.rst
M Lib/test/test_dis.py
M Lib/test/test_peepholer.py
M Lib/test/test_sys_settrace.py
M Python/compile.c

diff --git a/Lib/test/test_dis.py b/Lib/test/test_dis.py
index 256004855d4a6..440e4ed5eacfb 100644
--- a/Lib/test/test_dis.py
+++ b/Lib/test/test_dis.py
@@ -360,13 +360,13 @@ def bug42562():
     -->    BINARY_OP               11 (/)
            POP_TOP
 
-%3d        LOAD_FAST_CHECK          1 (tb)
+%3d     >> LOAD_FAST_CHECK          1 (tb)
            RETURN_VALUE
         >> PUSH_EXC_INFO
 
 %3d        LOAD_GLOBAL              0 (Exception)
            CHECK_EXC_MATCH
-           POP_JUMP_FORWARD_IF_FALSE    23 (to 82)
+           POP_JUMP_FORWARD_IF_FALSE    22 (to 80)
            STORE_FAST               0 (e)
 
 %3d        LOAD_FAST                0 (e)
@@ -376,9 +376,7 @@ def bug42562():
            LOAD_CONST               0 (None)
            STORE_FAST               0 (e)
            DELETE_FAST              0 (e)
-
-%3d        LOAD_FAST                1 (tb)
-           RETURN_VALUE
+           JUMP_BACKWARD           29 (to 14)
         >> LOAD_CONST               0 (None)
            STORE_FAST               0 (e)
            DELETE_FAST              0 (e)
@@ -396,7 +394,6 @@ def bug42562():
        TRACEBACK_CODE.co_firstlineno + 5,
        TRACEBACK_CODE.co_firstlineno + 3,
        TRACEBACK_CODE.co_firstlineno + 4,
-       TRACEBACK_CODE.co_firstlineno + 5,
        TRACEBACK_CODE.co_firstlineno + 3)
 
 def _fstring(a, b, c, d):
@@ -443,7 +440,7 @@ def _with(c):
            CALL                     2
            POP_TOP
 
-%3d        LOAD_CONST               2 (2)
+%3d     >> LOAD_CONST               2 (2)
            STORE_FAST               2 (y)
            LOAD_CONST               0 (None)
            RETURN_VALUE
@@ -456,11 +453,7 @@ def _with(c):
            POP_EXCEPT
            POP_TOP
            POP_TOP
-
-%3d        LOAD_CONST               2 (2)
-           STORE_FAST               2 (y)
-           LOAD_CONST               0 (None)
-           RETURN_VALUE
+           JUMP_BACKWARD           13 (to 30)
         >> COPY                     3
            POP_EXCEPT
            RERAISE                  1
@@ -472,7 +465,6 @@ def _with(c):
        _with.__code__.co_firstlineno + 1,
        _with.__code__.co_firstlineno + 3,
        _with.__code__.co_firstlineno + 1,
-       _with.__code__.co_firstlineno + 3,
        )
 
 async def _asyncwith(c):
@@ -510,7 +502,7 @@ async def _asyncwith(c):
            JUMP_BACKWARD_NO_INTERRUPT     4 (to 48)
         >> POP_TOP
 
-%3d        LOAD_CONST               2 (2)
+%3d     >> LOAD_CONST               2 (2)
            STORE_FAST               2 (y)
            LOAD_CONST               0 (None)
            RETURN_VALUE
@@ -529,11 +521,7 @@ async def _asyncwith(c):
            POP_EXCEPT
            POP_TOP
            POP_TOP
-
-%3d        LOAD_CONST               2 (2)
-           STORE_FAST               2 (y)
-           LOAD_CONST               0 (None)
-           RETURN_VALUE
+           JUMP_BACKWARD           19 (to 58)
         >> COPY                     3
            POP_EXCEPT
            RERAISE                  1
@@ -545,7 +533,6 @@ async def _asyncwith(c):
        _asyncwith.__code__.co_firstlineno + 1,
        _asyncwith.__code__.co_firstlineno + 3,
        _asyncwith.__code__.co_firstlineno + 1,
-       _asyncwith.__code__.co_firstlineno + 3,
        )
 
 
diff --git a/Lib/test/test_peepholer.py b/Lib/test/test_peepholer.py
index 2c3b1ab65a8f9..e03c42c2f823d 100644
--- a/Lib/test/test_peepholer.py
+++ b/Lib/test/test_peepholer.py
@@ -345,6 +345,8 @@ def f(x):
         self.assertEqual(len(returns), 1)
         self.check_lnotab(f)
 
+    @unittest.skip("Following gh-92228 the return has two predecessors "
+                   "and that prevents jump elimination.")
     def test_elim_jump_to_return(self):
         # JUMP_FORWARD to RETURN -->  RETURN
         def f(cond, true_value, false_value):
diff --git a/Lib/test/test_sys_settrace.py b/Lib/test/test_sys_settrace.py
index 7ec290dbf04ad..f03b03e19a252 100644
--- a/Lib/test/test_sys_settrace.py
+++ b/Lib/test/test_sys_settrace.py
@@ -2042,6 +2042,15 @@ def test_no_jump_within_except_block(output):
             output.append(6)
         output.append(7)
 
+    @jump_test(6, 1, [1, 5, 1, 5])
+    def test_jump_over_try_except(output):
+        output.append(1)
+        try:
+            1 / 0
+        except ZeroDivisionError as e:
+            output.append(5)
+        x = 42  # has to be a two-instruction block
+
     @jump_test(2, 4, [1, 4, 5, -4])
     def test_jump_across_with(output):
         output.append(1)
diff --git a/Misc/NEWS.d/next/Core and Builtins/2022-07-06-14-02-26.gh-issue-92228.44Cbly.rst b/Misc/NEWS.d/next/Core and Builtins/2022-07-06-14-02-26.gh-issue-92228.44Cbly.rst
new file mode 100644
index 0000000000000..458ad897cefcb
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2022-07-06-14-02-26.gh-issue-92228.44Cbly.rst	
@@ -0,0 +1 @@
+Disable the compiler's inline-small-exit-blocks optimization for exit blocks that are associated with source code lines. This fixes a bug where the debugger cannot tell where an exception handler ends and the following code block begins.
diff --git a/Python/compile.c b/Python/compile.c
index 77176893f60c5..f36a6e85a54c2 100644
--- a/Python/compile.c
+++ b/Python/compile.c
@@ -9224,6 +9224,16 @@ optimize_basic_block(PyObject *const_cache, basicblock *bb, PyObject *consts)
     return -1;
 }
 
+static bool
+basicblock_has_lineno(const basicblock *bb) {
+    for (int i = 0; i < bb->b_iused; i++) {
+        if (bb->b_instr[i].i_loc.lineno > 0) {
+            return true;
+        }
+    }
+    return false;
+}
+
 /* If this block ends with an unconditional jump to an exit block,
  * then remove the jump and extend this block with the target.
  */
@@ -9240,6 +9250,10 @@ extend_block(basicblock *bb) {
     }
     if (basicblock_exits_scope(last->i_target) && last->i_target->b_iused <= MAX_COPY_SIZE) {
         basicblock *to_copy = last->i_target;
+        if (basicblock_has_lineno(to_copy)) {
+            /* copy only blocks without line number (like implicit 'return None's) */
+            return 0;
+        }
         last->i_opcode = NOP;
         for (int i = 0; i < to_copy->b_iused; i++) {
             int index = basicblock_next_instr(bb);


From webhook-mailer at python.org  Thu Jul  7 03:00:30 2022
From: webhook-mailer at python.org (erlend-aasland)
Date: Thu, 07 Jul 2022 07:00:30 -0000
Subject: [Python-checkins] gh-94628: Add explicit parameter list to
 sqlite3.connect docs (#94629)
Message-ID: <mailman.2123.1657177231.20746.python-checkins@python.org>

https://github.com/python/cpython/commit/3eb2b9634fdc6826a558fa5aa820dc6e69b7800e
commit: 3eb2b9634fdc6826a558fa5aa820dc6e69b7800e
branch: main
author: Erlend Egeberg Aasland <erlend.aasland at protonmail.com>
committer: erlend-aasland <erlend.aasland at protonmail.com>
date: 2022-07-07T09:00:20+02:00
summary:

gh-94628: Add explicit parameter list to sqlite3.connect docs (#94629)

Co-authored-by: CAM Gerlach <CAM.Gerlach at Gerlach.CAM>

files:
M Doc/library/sqlite3.rst

diff --git a/Doc/library/sqlite3.rst b/Doc/library/sqlite3.rst
index d3b7d0723991b..ad49a217d3b4a 100644
--- a/Doc/library/sqlite3.rst
+++ b/Doc/library/sqlite3.rst
@@ -246,90 +246,89 @@ Module functions and constants
    (bitwise or) operator.
 
 
-.. function:: connect(database[, timeout, detect_types, isolation_level, check_same_thread, factory, cached_statements, uri])
-
-   Opens a connection to the SQLite database file *database*. By default returns a
-   :class:`Connection` object, unless a custom *factory* is given.
-
-   *database* is a :term:`path-like object` giving the pathname (absolute or
-   relative to the current  working directory) of the database file to be opened.
-   You can use ``":memory:"`` to open a database connection to a database that
-   resides in RAM instead of on disk.
-
-   When a database is accessed by multiple connections, and one of the processes
-   modifies the database, the SQLite database is locked until that transaction is
-   committed. The *timeout* parameter specifies how long the connection should wait
-   for the lock to go away until raising an exception. The default for the timeout
-   parameter is 5.0 (five seconds).
-
-   For the *isolation_level* parameter, please see the
-   :attr:`~Connection.isolation_level` property of :class:`Connection` objects.
-
-   SQLite natively supports only the types TEXT, INTEGER, REAL, BLOB and NULL. If
-   you want to use other types you must add support for them yourself. The
-   *detect_types* parameter and using custom **converters** registered with the
-   module-level :func:`register_converter` function allow you to easily do that.
-
-   *detect_types* defaults to 0 (type detection disabled).
-   Set it to any combination (using ``|``, bitwise or) of
-   :const:`PARSE_DECLTYPES` and :const:`PARSE_COLNAMES`
-   to enable type detection.
-   Column names takes precedence over declared types if both flags are set.
-   Types cannot be detected for generated fields (for example ``max(data)``),
-   even when the *detect_types* parameter is set.
-   In such cases, the returned type is :class:`str`.
-
-   By default, *check_same_thread* is :const:`True` and only the creating thread may
-   use the connection. If set :const:`False`, the returned connection may be shared
-   across multiple threads. When using multiple threads with the same connection
-   writing operations should be serialized by the user to avoid data corruption.
-
-   By default, the :mod:`sqlite3` module uses its :class:`Connection` class for the
-   connect call.  You can, however, subclass the :class:`Connection` class and make
-   :func:`connect` use your class instead by providing your class for the *factory*
-   parameter.
-
-   Consult the section :ref:`sqlite3-types` of this manual for details.
-
-   The :mod:`sqlite3` module internally uses a statement cache to avoid SQL parsing
-   overhead. If you want to explicitly set the number of statements that are cached
-   for the connection, you can set the *cached_statements* parameter. The currently
-   implemented default is to cache 128 statements.
-
-   If *uri* is :const:`True`, *database* is interpreted as a
-   :abbr:`URI (Uniform Resource Identifier)` with a file path and an optional
-   query string.  The scheme part *must* be ``"file:"``.  The path can be a
-   relative or absolute file path.  The query string allows us to pass
-   parameters to SQLite. Some useful URI tricks include::
-
-       # Open a database in read-only mode.
-       con = sqlite3.connect("file:template.db?mode=ro", uri=True)
-
-       # Don't implicitly create a new database file if it does not already exist.
-       # Will raise sqlite3.OperationalError if unable to open a database file.
-       con = sqlite3.connect("file:nosuchdb.db?mode=rw", uri=True)
-
-       # Create a shared named in-memory database.
-       con1 = sqlite3.connect("file:mem1?mode=memory&cache=shared", uri=True)
-       con2 = sqlite3.connect("file:mem1?mode=memory&cache=shared", uri=True)
-       con1.executescript("create table t(t); insert into t values(28);")
-       rows = con2.execute("select * from t").fetchall()
-
-   More information about this feature, including a list of recognized
-   parameters, can be found in the
-   `SQLite URI documentation <https://www.sqlite.org/uri.html>`_.
+
+.. function:: connect(database, timeout=5.0, detect_types=0, isolation_level="DEFERRED", check_same_thread=True, factory=sqlite3.Connection, cached_statements=128, uri=False)
+
+   Open a connection to an SQLite database.
+
+   :param database:
+       The path to the database file to be opened.
+       Pass ``":memory:"`` to open a connection to a database that is
+       in RAM instead of on disk.
+   :type database: :term:`path-like object`
+
+   :param timeout:
+       How many seconds the connection should wait before raising
+       an exception, if the database is locked by another connection.
+       If another connection opens a transaction to modify the database,
+       it will be locked until that transaction is committed.
+       Default five seconds.
+   :type timeout: float
+
+   :param detect_types:
+       Control whether and how data types not
+       :ref:`natively supported by SQLite <sqlite3-types>`
+       are looked up to be converted to Python types,
+       using the converters registered with :func:`register_converter`.
+       Set it to any combination (using ``|``, bitwise or) of
+       :const:`PARSE_DECLTYPES` and :const:`PARSE_COLNAMES`
+       to enable this.
+       Column names takes precedence over declared types if both flags are set.
+       Types cannot be detected for generated fields (for example ``max(data)``),
+       even when the *detect_types* parameter is set; :class:`str` will be
+       returned instead.
+       By default (``0``), type detection is disabled.
+   :type detect_types: int
+
+   :param isolation_level:
+       The :attr:`~Connection.isolation_level` of the connection,
+       controlling whether and how transactions are implicitly opened.
+       Can be ``"DEFERRED"`` (default), ``"EXCLUSIVE"`` or ``"IMMEDIATE"``;
+       or :const:`None` to disable opening transactions implicitly.
+       See :ref:`sqlite3-controlling-transactions` for more.
+   :type isolation_level: str | None
+
+   :param check_same_thread:
+       If :const:`True` (default), only the creating thread may use the connection.
+       If :const:`False`, the connection may be shared across multiple threads;
+       if so, write operations should be serialized by the user to avoid data
+       corruption.
+   :type check_same_thread: bool
+
+   :param factory:
+       A custom subclass of :class:`Connection` to create the connection with,
+       if not the default :class:`Connection` class.
+   :type factory: :class:`Connection`
+
+   :param cached_statements:
+       The number of statements that ``sqlite3``
+       should internally cache for this connection, to avoid parsing overhead.
+       By default, 128 statements.
+   :type cached_statements: int
+
+   :param uri:
+       If set to :const:`True`, *database* is interpreted as a
+       :abbr:`URI (Uniform Resource Identifier)` with a file path
+       and an optional query string.
+       The scheme part *must* be ``"file:"``,
+       and the path can be relative or absolute.
+       The query string allows passing parameters to SQLite,
+       enabling various :ref:`sqlite3-uri-tricks`.
+   :type uri: bool
+
+   :rtype: sqlite3.Connection
 
    .. audit-event:: sqlite3.connect database sqlite3.connect
    .. audit-event:: sqlite3.connect/handle connection_handle sqlite3.connect
 
-   .. versionchanged:: 3.4
-      Added the *uri* parameter.
+   .. versionadded:: 3.4
+      The *uri* parameter.
 
    .. versionchanged:: 3.7
       *database* can now also be a :term:`path-like object`, not only a string.
 
-   .. versionchanged:: 3.10
-      Added the ``sqlite3.connect/handle`` auditing event.
+   .. versionadded:: 3.10
+      The ``sqlite3.connect/handle`` auditing event.
 
 
 .. function:: register_converter(typename, converter, /)
@@ -1480,6 +1479,36 @@ regardless of the value of :attr:`~Connection.isolation_level`.
    https://www.sqlite.org/lang_transaction.html#deferred_immediate_and_exclusive_transactions
 
 
+.. _sqlite3-uri-tricks:
+
+SQLite URI tricks
+-----------------
+
+Some useful URI tricks include:
+
+* Open a database in read-only mode::
+
+    con = sqlite3.connect("file:template.db?mode=ro", uri=True)
+
+* Do not implicitly create a new database file if it does not already exist;
+  will raise :exc:`~sqlite3.OperationalError` if unable to create a new file::
+
+    con = sqlite3.connect("file:nosuchdb.db?mode=rw", uri=True)
+
+* Create a shared named in-memory database::
+
+    con1 = sqlite3.connect("file:mem1?mode=memory&cache=shared", uri=True)
+    con2 = sqlite3.connect("file:mem1?mode=memory&cache=shared", uri=True)
+    con1.execute("create table t(t)")
+    con1.execute("insert into t values(28)")
+    con1.commit()
+    rows = con2.execute("select * from t").fetchall()
+
+More information about this feature, including a list of parameters,
+can be found in the `SQLite URI documentation`_.
+
+.. _SQLite URI documentation: https://www.sqlite.org/uri.html
+
 Using :mod:`sqlite3` efficiently
 --------------------------------
 


From webhook-mailer at python.org  Thu Jul  7 04:46:31 2022
From: webhook-mailer at python.org (erlend-aasland)
Date: Thu, 07 Jul 2022 08:46:31 -0000
Subject: [Python-checkins] [3.11] gh-94628: Add explicit parameter list to
 sqlite3.connect docs (GH-94629) (#94645)
Message-ID: <mailman.2124.1657183592.20746.python-checkins@python.org>

https://github.com/python/cpython/commit/3517c138a814a571fab512c489bacafc7a0e3f22
commit: 3517c138a814a571fab512c489bacafc7a0e3f22
branch: 3.11
author: Erlend Egeberg Aasland <erlend.aasland at protonmail.com>
committer: erlend-aasland <erlend.aasland at protonmail.com>
date: 2022-07-07T10:46:14+02:00
summary:

[3.11] gh-94628: Add explicit parameter list to sqlite3.connect docs (GH-94629) (#94645)

Co-authored-by: CAM Gerlach <CAM.Gerlach at Gerlach.CAM>
(cherry picked from commit 3eb2b9634fdc6826a558fa5aa820dc6e69b7800e)

Co-authored-by: Erlend Egeberg Aasland <erlend.aasland at protonmail.com>

files:
M Doc/library/sqlite3.rst

diff --git a/Doc/library/sqlite3.rst b/Doc/library/sqlite3.rst
index 49f3536e6c316..3ffd67d067406 100644
--- a/Doc/library/sqlite3.rst
+++ b/Doc/library/sqlite3.rst
@@ -236,90 +236,89 @@ Module functions and constants
    (bitwise or) operator.
 
 
-.. function:: connect(database[, timeout, detect_types, isolation_level, check_same_thread, factory, cached_statements, uri])
-
-   Opens a connection to the SQLite database file *database*. By default returns a
-   :class:`Connection` object, unless a custom *factory* is given.
-
-   *database* is a :term:`path-like object` giving the pathname (absolute or
-   relative to the current  working directory) of the database file to be opened.
-   You can use ``":memory:"`` to open a database connection to a database that
-   resides in RAM instead of on disk.
-
-   When a database is accessed by multiple connections, and one of the processes
-   modifies the database, the SQLite database is locked until that transaction is
-   committed. The *timeout* parameter specifies how long the connection should wait
-   for the lock to go away until raising an exception. The default for the timeout
-   parameter is 5.0 (five seconds).
-
-   For the *isolation_level* parameter, please see the
-   :attr:`~Connection.isolation_level` property of :class:`Connection` objects.
-
-   SQLite natively supports only the types TEXT, INTEGER, REAL, BLOB and NULL. If
-   you want to use other types you must add support for them yourself. The
-   *detect_types* parameter and using custom **converters** registered with the
-   module-level :func:`register_converter` function allow you to easily do that.
-
-   *detect_types* defaults to 0 (type detection disabled).
-   Set it to any combination (using ``|``, bitwise or) of
-   :const:`PARSE_DECLTYPES` and :const:`PARSE_COLNAMES`
-   to enable type detection.
-   Column names takes precedence over declared types if both flags are set.
-   Types cannot be detected for generated fields (for example ``max(data)``),
-   even when the *detect_types* parameter is set.
-   In such cases, the returned type is :class:`str`.
-
-   By default, *check_same_thread* is :const:`True` and only the creating thread may
-   use the connection. If set :const:`False`, the returned connection may be shared
-   across multiple threads. When using multiple threads with the same connection
-   writing operations should be serialized by the user to avoid data corruption.
-
-   By default, the :mod:`sqlite3` module uses its :class:`Connection` class for the
-   connect call.  You can, however, subclass the :class:`Connection` class and make
-   :func:`connect` use your class instead by providing your class for the *factory*
-   parameter.
-
-   Consult the section :ref:`sqlite3-types` of this manual for details.
-
-   The :mod:`sqlite3` module internally uses a statement cache to avoid SQL parsing
-   overhead. If you want to explicitly set the number of statements that are cached
-   for the connection, you can set the *cached_statements* parameter. The currently
-   implemented default is to cache 128 statements.
-
-   If *uri* is :const:`True`, *database* is interpreted as a
-   :abbr:`URI (Uniform Resource Identifier)` with a file path and an optional
-   query string.  The scheme part *must* be ``"file:"``.  The path can be a
-   relative or absolute file path.  The query string allows us to pass
-   parameters to SQLite. Some useful URI tricks include::
-
-       # Open a database in read-only mode.
-       con = sqlite3.connect("file:template.db?mode=ro", uri=True)
-
-       # Don't implicitly create a new database file if it does not already exist.
-       # Will raise sqlite3.OperationalError if unable to open a database file.
-       con = sqlite3.connect("file:nosuchdb.db?mode=rw", uri=True)
-
-       # Create a shared named in-memory database.
-       con1 = sqlite3.connect("file:mem1?mode=memory&cache=shared", uri=True)
-       con2 = sqlite3.connect("file:mem1?mode=memory&cache=shared", uri=True)
-       con1.executescript("create table t(t); insert into t values(28);")
-       rows = con2.execute("select * from t").fetchall()
-
-   More information about this feature, including a list of recognized
-   parameters, can be found in the
-   `SQLite URI documentation <https://www.sqlite.org/uri.html>`_.
+
+.. function:: connect(database, timeout=5.0, detect_types=0, isolation_level="DEFERRED", check_same_thread=True, factory=sqlite3.Connection, cached_statements=128, uri=False)
+
+   Open a connection to an SQLite database.
+
+   :param database:
+       The path to the database file to be opened.
+       Pass ``":memory:"`` to open a connection to a database that is
+       in RAM instead of on disk.
+   :type database: :term:`path-like object`
+
+   :param timeout:
+       How many seconds the connection should wait before raising
+       an exception, if the database is locked by another connection.
+       If another connection opens a transaction to modify the database,
+       it will be locked until that transaction is committed.
+       Default five seconds.
+   :type timeout: float
+
+   :param detect_types:
+       Control whether and how data types not
+       :ref:`natively supported by SQLite <sqlite3-types>`
+       are looked up to be converted to Python types,
+       using the converters registered with :func:`register_converter`.
+       Set it to any combination (using ``|``, bitwise or) of
+       :const:`PARSE_DECLTYPES` and :const:`PARSE_COLNAMES`
+       to enable this.
+       Column names takes precedence over declared types if both flags are set.
+       Types cannot be detected for generated fields (for example ``max(data)``),
+       even when the *detect_types* parameter is set; :class:`str` will be
+       returned instead.
+       By default (``0``), type detection is disabled.
+   :type detect_types: int
+
+   :param isolation_level:
+       The :attr:`~Connection.isolation_level` of the connection,
+       controlling whether and how transactions are implicitly opened.
+       Can be ``"DEFERRED"`` (default), ``"EXCLUSIVE"`` or ``"IMMEDIATE"``;
+       or :const:`None` to disable opening transactions implicitly.
+       See :ref:`sqlite3-controlling-transactions` for more.
+   :type isolation_level: str | None
+
+   :param check_same_thread:
+       If :const:`True` (default), only the creating thread may use the connection.
+       If :const:`False`, the connection may be shared across multiple threads;
+       if so, write operations should be serialized by the user to avoid data
+       corruption.
+   :type check_same_thread: bool
+
+   :param factory:
+       A custom subclass of :class:`Connection` to create the connection with,
+       if not the default :class:`Connection` class.
+   :type factory: :class:`Connection`
+
+   :param cached_statements:
+       The number of statements that ``sqlite3``
+       should internally cache for this connection, to avoid parsing overhead.
+       By default, 128 statements.
+   :type cached_statements: int
+
+   :param uri:
+       If set to :const:`True`, *database* is interpreted as a
+       :abbr:`URI (Uniform Resource Identifier)` with a file path
+       and an optional query string.
+       The scheme part *must* be ``"file:"``,
+       and the path can be relative or absolute.
+       The query string allows passing parameters to SQLite,
+       enabling various :ref:`sqlite3-uri-tricks`.
+   :type uri: bool
+
+   :rtype: sqlite3.Connection
 
    .. audit-event:: sqlite3.connect database sqlite3.connect
    .. audit-event:: sqlite3.connect/handle connection_handle sqlite3.connect
 
-   .. versionchanged:: 3.4
-      Added the *uri* parameter.
+   .. versionadded:: 3.4
+      The *uri* parameter.
 
    .. versionchanged:: 3.7
       *database* can now also be a :term:`path-like object`, not only a string.
 
-   .. versionchanged:: 3.10
-      Added the ``sqlite3.connect/handle`` auditing event.
+   .. versionadded:: 3.10
+      The ``sqlite3.connect/handle`` auditing event.
 
 
 .. function:: register_converter(typename, converter, /)
@@ -1470,6 +1469,36 @@ regardless of the value of :attr:`~Connection.isolation_level`.
    https://www.sqlite.org/lang_transaction.html#deferred_immediate_and_exclusive_transactions
 
 
+.. _sqlite3-uri-tricks:
+
+SQLite URI tricks
+-----------------
+
+Some useful URI tricks include:
+
+* Open a database in read-only mode::
+
+    con = sqlite3.connect("file:template.db?mode=ro", uri=True)
+
+* Do not implicitly create a new database file if it does not already exist;
+  will raise :exc:`~sqlite3.OperationalError` if unable to create a new file::
+
+    con = sqlite3.connect("file:nosuchdb.db?mode=rw", uri=True)
+
+* Create a shared named in-memory database::
+
+    con1 = sqlite3.connect("file:mem1?mode=memory&cache=shared", uri=True)
+    con2 = sqlite3.connect("file:mem1?mode=memory&cache=shared", uri=True)
+    con1.execute("create table t(t)")
+    con1.execute("insert into t values(28)")
+    con1.commit()
+    rows = con2.execute("select * from t").fetchall()
+
+More information about this feature, including a list of parameters,
+can be found in the `SQLite URI documentation`_.
+
+.. _SQLite URI documentation: https://www.sqlite.org/uri.html
+
 Using :mod:`sqlite3` efficiently
 --------------------------------
 


From webhook-mailer at python.org  Thu Jul  7 04:46:33 2022
From: webhook-mailer at python.org (erlend-aasland)
Date: Thu, 07 Jul 2022 08:46:33 -0000
Subject: [Python-checkins] [3.10] gh-94628: Add explicit parameter list to
 sqlite3.connect docs (GH-94629) (#94646)
Message-ID: <mailman.2125.1657183594.20746.python-checkins@python.org>

https://github.com/python/cpython/commit/663aa6e7d958fbc0a6d003429af2482ecd46ea1c
commit: 663aa6e7d958fbc0a6d003429af2482ecd46ea1c
branch: 3.10
author: Erlend Egeberg Aasland <erlend.aasland at protonmail.com>
committer: erlend-aasland <erlend.aasland at protonmail.com>
date: 2022-07-07T10:46:29+02:00
summary:

[3.10] gh-94628: Add explicit parameter list to sqlite3.connect docs (GH-94629) (#94646)

Co-authored-by: CAM Gerlach <CAM.Gerlach at Gerlach.CAM>.
(cherry picked from commit 3eb2b9634fdc6826a558fa5aa820dc6e69b7800e)

Co-authored-by: Erlend Egeberg Aasland <erlend.aasland at protonmail.com>

files:
M Doc/library/sqlite3.rst

diff --git a/Doc/library/sqlite3.rst b/Doc/library/sqlite3.rst
index c262c69a9afd9..280a85e822f69 100644
--- a/Doc/library/sqlite3.rst
+++ b/Doc/library/sqlite3.rst
@@ -218,90 +218,89 @@ Module functions and constants
    (bitwise or) operator.
 
 
-.. function:: connect(database[, timeout, detect_types, isolation_level, check_same_thread, factory, cached_statements, uri])
-
-   Opens a connection to the SQLite database file *database*. By default returns a
-   :class:`Connection` object, unless a custom *factory* is given.
-
-   *database* is a :term:`path-like object` giving the pathname (absolute or
-   relative to the current  working directory) of the database file to be opened.
-   You can use ``":memory:"`` to open a database connection to a database that
-   resides in RAM instead of on disk.
-
-   When a database is accessed by multiple connections, and one of the processes
-   modifies the database, the SQLite database is locked until that transaction is
-   committed. The *timeout* parameter specifies how long the connection should wait
-   for the lock to go away until raising an exception. The default for the timeout
-   parameter is 5.0 (five seconds).
-
-   For the *isolation_level* parameter, please see the
-   :attr:`~Connection.isolation_level` property of :class:`Connection` objects.
-
-   SQLite natively supports only the types TEXT, INTEGER, REAL, BLOB and NULL. If
-   you want to use other types you must add support for them yourself. The
-   *detect_types* parameter and using custom **converters** registered with the
-   module-level :func:`register_converter` function allow you to easily do that.
-
-   *detect_types* defaults to 0 (type detection disabled).
-   Set it to any combination (using ``|``, bitwise or) of
-   :const:`PARSE_DECLTYPES` and :const:`PARSE_COLNAMES`
-   to enable type detection.
-   Column names takes precedence over declared types if both flags are set.
-   Types cannot be detected for generated fields (for example ``max(data)``),
-   even when the *detect_types* parameter is set.
-   In such cases, the returned type is :class:`str`.
-
-   By default, *check_same_thread* is :const:`True` and only the creating thread may
-   use the connection. If set :const:`False`, the returned connection may be shared
-   across multiple threads. When using multiple threads with the same connection
-   writing operations should be serialized by the user to avoid data corruption.
-
-   By default, the :mod:`sqlite3` module uses its :class:`Connection` class for the
-   connect call.  You can, however, subclass the :class:`Connection` class and make
-   :func:`connect` use your class instead by providing your class for the *factory*
-   parameter.
-
-   Consult the section :ref:`sqlite3-types` of this manual for details.
-
-   The :mod:`sqlite3` module internally uses a statement cache to avoid SQL parsing
-   overhead. If you want to explicitly set the number of statements that are cached
-   for the connection, you can set the *cached_statements* parameter. The currently
-   implemented default is to cache 100 statements.
-
-   If *uri* is :const:`True`, *database* is interpreted as a
-   :abbr:`URI (Uniform Resource Identifier)` with a file path and an optional
-   query string.  The scheme part *must* be ``"file:"``.  The path can be a
-   relative or absolute file path.  The query string allows us to pass
-   parameters to SQLite. Some useful URI tricks include::
-
-       # Open a database in read-only mode.
-       con = sqlite3.connect("file:template.db?mode=ro", uri=True)
-
-       # Don't implicitly create a new database file if it does not already exist.
-       # Will raise sqlite3.OperationalError if unable to open a database file.
-       con = sqlite3.connect("file:nosuchdb.db?mode=rw", uri=True)
-
-       # Create a shared named in-memory database.
-       con1 = sqlite3.connect("file:mem1?mode=memory&cache=shared", uri=True)
-       con2 = sqlite3.connect("file:mem1?mode=memory&cache=shared", uri=True)
-       con1.executescript("create table t(t); insert into t values(28);")
-       rows = con2.execute("select * from t").fetchall()
-
-   More information about this feature, including a list of recognized
-   parameters, can be found in the
-   `SQLite URI documentation <https://www.sqlite.org/uri.html>`_.
+
+.. function:: connect(database, timeout=5.0, detect_types=0, isolation_level="DEFERRED", check_same_thread=True, factory=sqlite3.Connection, cached_statements=128, uri=False)
+
+   Open a connection to an SQLite database.
+
+   :param database:
+       The path to the database file to be opened.
+       Pass ``":memory:"`` to open a connection to a database that is
+       in RAM instead of on disk.
+   :type database: :term:`path-like object`
+
+   :param timeout:
+       How many seconds the connection should wait before raising
+       an exception, if the database is locked by another connection.
+       If another connection opens a transaction to modify the database,
+       it will be locked until that transaction is committed.
+       Default five seconds.
+   :type timeout: float
+
+   :param detect_types:
+       Control whether and how data types not
+       :ref:`natively supported by SQLite <sqlite3-types>`
+       are looked up to be converted to Python types,
+       using the converters registered with :func:`register_converter`.
+       Set it to any combination (using ``|``, bitwise or) of
+       :const:`PARSE_DECLTYPES` and :const:`PARSE_COLNAMES`
+       to enable this.
+       Column names takes precedence over declared types if both flags are set.
+       Types cannot be detected for generated fields (for example ``max(data)``),
+       even when the *detect_types* parameter is set; :class:`str` will be
+       returned instead.
+       By default (``0``), type detection is disabled.
+   :type detect_types: int
+
+   :param isolation_level:
+       The :attr:`~Connection.isolation_level` of the connection,
+       controlling whether and how transactions are implicitly opened.
+       Can be ``"DEFERRED"`` (default), ``"EXCLUSIVE"`` or ``"IMMEDIATE"``;
+       or :const:`None` to disable opening transactions implicitly.
+       See :ref:`sqlite3-controlling-transactions` for more.
+   :type isolation_level: str | None
+
+   :param check_same_thread:
+       If :const:`True` (default), only the creating thread may use the connection.
+       If :const:`False`, the connection may be shared across multiple threads;
+       if so, write operations should be serialized by the user to avoid data
+       corruption.
+   :type check_same_thread: bool
+
+   :param factory:
+       A custom subclass of :class:`Connection` to create the connection with,
+       if not the default :class:`Connection` class.
+   :type factory: :class:`Connection`
+
+   :param cached_statements:
+       The number of statements that ``sqlite3``
+       should internally cache for this connection, to avoid parsing overhead.
+       By default, 100 statements.
+   :type cached_statements: int
+
+   :param uri:
+       If set to :const:`True`, *database* is interpreted as a
+       :abbr:`URI (Uniform Resource Identifier)` with a file path
+       and an optional query string.
+       The scheme part *must* be ``"file:"``,
+       and the path can be relative or absolute.
+       The query string allows passing parameters to SQLite,
+       enabling various :ref:`sqlite3-uri-tricks`.
+   :type uri: bool
+
+   :rtype: sqlite3.Connection
 
    .. audit-event:: sqlite3.connect database sqlite3.connect
    .. audit-event:: sqlite3.connect/handle connection_handle sqlite3.connect
 
-   .. versionchanged:: 3.4
-      Added the *uri* parameter.
+   .. versionadded:: 3.4
+      The *uri* parameter.
 
    .. versionchanged:: 3.7
       *database* can now also be a :term:`path-like object`, not only a string.
 
-   .. versionchanged:: 3.10
-      Added the ``sqlite3.connect/handle`` auditing event.
+   .. versionadded:: 3.10
+      The ``sqlite3.connect/handle`` auditing event.
 
 
 .. function:: register_converter(typename, converter, /)
@@ -1238,6 +1237,36 @@ regardless of the value of :attr:`~Connection.isolation_level`.
    https://www.sqlite.org/lang_transaction.html#deferred_immediate_and_exclusive_transactions
 
 
+.. _sqlite3-uri-tricks:
+
+SQLite URI tricks
+-----------------
+
+Some useful URI tricks include:
+
+* Open a database in read-only mode::
+
+    con = sqlite3.connect("file:template.db?mode=ro", uri=True)
+
+* Do not implicitly create a new database file if it does not already exist;
+  will raise :exc:`~sqlite3.OperationalError` if unable to create a new file::
+
+    con = sqlite3.connect("file:nosuchdb.db?mode=rw", uri=True)
+
+* Create a shared named in-memory database::
+
+    con1 = sqlite3.connect("file:mem1?mode=memory&cache=shared", uri=True)
+    con2 = sqlite3.connect("file:mem1?mode=memory&cache=shared", uri=True)
+    con1.execute("create table t(t)")
+    con1.execute("insert into t values(28)")
+    con1.commit()
+    rows = con2.execute("select * from t").fetchall()
+
+More information about this feature, including a list of parameters,
+can be found in the `SQLite URI documentation`_.
+
+.. _SQLite URI documentation: https://www.sqlite.org/uri.html
+
 Using :mod:`sqlite3` efficiently
 --------------------------------
 


From webhook-mailer at python.org  Thu Jul  7 05:29:40 2022
From: webhook-mailer at python.org (erlend-aasland)
Date: Thu, 07 Jul 2022 09:29:40 -0000
Subject: [Python-checkins] gh-94430: Allow params named `module` or `self`
 with custom C names in Argument Clinic (#94431)
Message-ID: <mailman.2126.1657186182.20746.python-checkins@python.org>

https://github.com/python/cpython/commit/8bbd70b4d130f060f87e3f53810dc747a49fa369
commit: 8bbd70b4d130f060f87e3f53810dc747a49fa369
branch: main
author: Erlend Egeberg Aasland <erlend.aasland at protonmail.com>
committer: erlend-aasland <erlend.aasland at protonmail.com>
date: 2022-07-07T11:29:34+02:00
summary:

gh-94430: Allow params named `module` or `self` with custom C names in Argument Clinic (#94431)

files:
A Misc/NEWS.d/next/Tools-Demos/2022-06-29-22-47-11.gh-issue-94430.hdov8L.rst
M Lib/test/clinic.test
M Tools/clinic/clinic.py

diff --git a/Lib/test/clinic.test b/Lib/test/clinic.test
index 94322f6d61771..e981b5a28504e 100644
--- a/Lib/test/clinic.test
+++ b/Lib/test/clinic.test
@@ -3518,3 +3518,44 @@ static PyObject *
 test_vararg_with_only_defaults_impl(PyObject *module, PyObject *args, int b,
                                     PyObject *c)
 /*[clinic end generated code: output=7e393689e6ce61a3 input=fa56a709a035666e]*/
+
+/*[clinic input]
+test_paramname_module
+
+    module as mod: object
+[clinic start generated code]*/
+
+PyDoc_STRVAR(test_paramname_module__doc__,
+"test_paramname_module($module, /, module)\n"
+"--\n"
+"\n");
+
+#define TEST_PARAMNAME_MODULE_METHODDEF    \
+    {"test_paramname_module", _PyCFunction_CAST(test_paramname_module), METH_FASTCALL|METH_KEYWORDS, test_paramname_module__doc__},
+
+static PyObject *
+test_paramname_module_impl(PyObject *module, PyObject *mod);
+
+static PyObject *
+test_paramname_module(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+{
+    PyObject *return_value = NULL;
+    static const char * const _keywords[] = {"module", NULL};
+    static _PyArg_Parser _parser = {NULL, _keywords, "test_paramname_module", 0};
+    PyObject *argsbuf[1];
+    PyObject *mod;
+
+    args = _PyArg_UnpackKeywords(args, nargs, NULL, kwnames, &_parser, 1, 1, 0, argsbuf);
+    if (!args) {
+        goto exit;
+    }
+    mod = args[0];
+    return_value = test_paramname_module_impl(module, mod);
+
+exit:
+    return return_value;
+}
+
+static PyObject *
+test_paramname_module_impl(PyObject *module, PyObject *mod)
+/*[clinic end generated code: output=23379a7ffa65c514 input=afefe259667f13ba]*/
diff --git a/Misc/NEWS.d/next/Tools-Demos/2022-06-29-22-47-11.gh-issue-94430.hdov8L.rst b/Misc/NEWS.d/next/Tools-Demos/2022-06-29-22-47-11.gh-issue-94430.hdov8L.rst
new file mode 100644
index 0000000000000..88aa8d0866531
--- /dev/null
+++ b/Misc/NEWS.d/next/Tools-Demos/2022-06-29-22-47-11.gh-issue-94430.hdov8L.rst
@@ -0,0 +1,2 @@
+Allow parameters named ``module`` and ``self`` with custom C names in Argument
+Clinic. Patch by Erlend E. Aasland
diff --git a/Tools/clinic/clinic.py b/Tools/clinic/clinic.py
index 91aa48c5aa08c..0041363c46be2 100755
--- a/Tools/clinic/clinic.py
+++ b/Tools/clinic/clinic.py
@@ -4710,9 +4710,14 @@ def bad_node(self, node):
 
         p = Parameter(parameter_name, kind, function=self.function, converter=converter, default=value, group=self.group)
 
-        if parameter_name in self.function.parameters:
+        names = [k.name for k in self.function.parameters.values()]
+        if parameter_name in names[1:]:
             fail("You can't have two parameters named " + repr(parameter_name) + "!")
-        self.function.parameters[parameter_name] = p
+        elif names and parameter_name == names[0] and c_name is None:
+            fail(f"Parameter '{parameter_name}' requires a custom C name")
+
+        key = f"{parameter_name}_as_{c_name}" if c_name else parameter_name
+        self.function.parameters[key] = p
 
     def parse_converter(self, annotation):
         if (hasattr(ast, 'Constant') and


From webhook-mailer at python.org  Thu Jul  7 06:11:04 2022
From: webhook-mailer at python.org (miss-islington)
Date: Thu, 07 Jul 2022 10:11:04 -0000
Subject: [Python-checkins] [3.11] gh-92228: disable the compiler's 'small
 exit block inlining' optimization for blocks that have a line number
 (GH-94592) (GH-94643)
Message-ID: <mailman.2127.1657188666.20746.python-checkins@python.org>

https://github.com/python/cpython/commit/74c953d396816c0ef3de80276c00d29f79cbf8bf
commit: 74c953d396816c0ef3de80276c00d29f79cbf8bf
branch: 3.11
author: Christian Heimes <christian at python.org>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-07T03:10:32-07:00
summary:

[3.11] gh-92228: disable the compiler's 'small exit block inlining' optimization for blocks that have a line number (GH-94592) (GH-94643)



Inlining of code that corresponds to source code lines, can make it hard to distinguish later between code which is only reachable from except handlers, and that which is reachable in normal control flow. This caused problems with the debugger's jump feature.

This PR turns off the inlining optimisation for code which has line numbers. We still inline things like the implicit "return None"..
(cherry picked from commit bde06e1b8381f140b296a397ddd1deb1c784ff8e)

Co-authored-by: Irit Katriel <1055913+iritkatriel at users.noreply.github.com>

files:
A Misc/NEWS.d/next/Core and Builtins/2022-07-06-14-02-26.gh-issue-92228.44Cbly.rst
M Lib/test/test_dis.py
M Lib/test/test_peepholer.py
M Lib/test/test_sys_settrace.py
M Python/compile.c

diff --git a/Lib/test/test_dis.py b/Lib/test/test_dis.py
index 4283c30e0a1c1..b00f329e0068b 100644
--- a/Lib/test/test_dis.py
+++ b/Lib/test/test_dis.py
@@ -366,14 +366,12 @@ def bug42562():
            LOAD_CONST               2 (0)
     -->    BINARY_OP               11 (/)
            POP_TOP
-
-%3d        LOAD_FAST                1 (tb)
-           RETURN_VALUE
+           JUMP_FORWARD            30 (to 76)
         >> PUSH_EXC_INFO
 
 %3d        LOAD_GLOBAL              0 (Exception)
            CHECK_EXC_MATCH
-           POP_JUMP_FORWARD_IF_FALSE    18 (to 72)
+           POP_JUMP_FORWARD_IF_FALSE    17 (to 68)
            STORE_FAST               0 (e)
 
 %3d        LOAD_FAST                0 (e)
@@ -383,9 +381,7 @@ def bug42562():
            LOAD_CONST               0 (None)
            STORE_FAST               0 (e)
            DELETE_FAST              0 (e)
-
-%3d        LOAD_FAST                1 (tb)
-           RETURN_VALUE
+           JUMP_FORWARD             8 (to 76)
         >> LOAD_CONST               0 (None)
            STORE_FAST               0 (e)
            DELETE_FAST              0 (e)
@@ -395,15 +391,17 @@ def bug42562():
         >> COPY                     3
            POP_EXCEPT
            RERAISE                  1
+
+%3d     >> LOAD_FAST                1 (tb)
+           RETURN_VALUE
 ExceptionTable:
 """ % (TRACEBACK_CODE.co_firstlineno,
        TRACEBACK_CODE.co_firstlineno + 1,
        TRACEBACK_CODE.co_firstlineno + 2,
-       TRACEBACK_CODE.co_firstlineno + 5,
        TRACEBACK_CODE.co_firstlineno + 3,
        TRACEBACK_CODE.co_firstlineno + 4,
-       TRACEBACK_CODE.co_firstlineno + 5,
-       TRACEBACK_CODE.co_firstlineno + 3)
+       TRACEBACK_CODE.co_firstlineno + 3,
+       TRACEBACK_CODE.co_firstlineno + 5)
 
 def _fstring(a, b, c, d):
     return f'{a} {b:4} {c!r} {d!r:4}'
diff --git a/Lib/test/test_peepholer.py b/Lib/test/test_peepholer.py
index 6a2f550d67052..241644ad7d2ff 100644
--- a/Lib/test/test_peepholer.py
+++ b/Lib/test/test_peepholer.py
@@ -344,6 +344,8 @@ def f(x):
         self.assertEqual(len(returns), 1)
         self.check_lnotab(f)
 
+    @unittest.skip("Following gh-92228 the return has two predecessors "
+                   "and that prevents jump elimination.")
     def test_elim_jump_to_return(self):
         # JUMP_FORWARD to RETURN -->  RETURN
         def f(cond, true_value, false_value):
diff --git a/Lib/test/test_sys_settrace.py b/Lib/test/test_sys_settrace.py
index 7ec290dbf04ad..f03b03e19a252 100644
--- a/Lib/test/test_sys_settrace.py
+++ b/Lib/test/test_sys_settrace.py
@@ -2042,6 +2042,15 @@ def test_no_jump_within_except_block(output):
             output.append(6)
         output.append(7)
 
+    @jump_test(6, 1, [1, 5, 1, 5])
+    def test_jump_over_try_except(output):
+        output.append(1)
+        try:
+            1 / 0
+        except ZeroDivisionError as e:
+            output.append(5)
+        x = 42  # has to be a two-instruction block
+
     @jump_test(2, 4, [1, 4, 5, -4])
     def test_jump_across_with(output):
         output.append(1)
diff --git a/Misc/NEWS.d/next/Core and Builtins/2022-07-06-14-02-26.gh-issue-92228.44Cbly.rst b/Misc/NEWS.d/next/Core and Builtins/2022-07-06-14-02-26.gh-issue-92228.44Cbly.rst
new file mode 100644
index 0000000000000..458ad897cefcb
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2022-07-06-14-02-26.gh-issue-92228.44Cbly.rst	
@@ -0,0 +1 @@
+Disable the compiler's inline-small-exit-blocks optimization for exit blocks that are associated with source code lines. This fixes a bug where the debugger cannot tell where an exception handler ends and the following code block begins.
diff --git a/Python/compile.c b/Python/compile.c
index cfe4b6ec04f9e..a71e7d31eecd2 100644
--- a/Python/compile.c
+++ b/Python/compile.c
@@ -8976,6 +8976,16 @@ optimize_basic_block(struct compiler *c, basicblock *bb, PyObject *consts)
     return -1;
 }
 
+static bool
+basicblock_has_lineno(const basicblock *bb) {
+    for (int i = 0; i < bb->b_iused; i++) {
+        if (bb->b_instr[i].i_lineno > 0) {
+            return true;
+        }
+    }
+    return false;
+}
+
 /* If this block ends with an unconditional jump to an exit block,
  * then remove the jump and extend this block with the target.
  */
@@ -8992,6 +9002,10 @@ extend_block(basicblock *bb) {
     }
     if (last->i_target->b_exit && last->i_target->b_iused <= MAX_COPY_SIZE) {
         basicblock *to_copy = last->i_target;
+        if (basicblock_has_lineno(to_copy)) {
+            /* copy only blocks without line number (like implicit 'return None's) */
+            return 0;
+        }
         last->i_opcode = NOP;
         for (int i = 0; i < to_copy->b_iused; i++) {
             int index = compiler_next_instr(bb);


From webhook-mailer at python.org  Thu Jul  7 06:12:59 2022
From: webhook-mailer at python.org (erlend-aasland)
Date: Thu, 07 Jul 2022 10:12:59 -0000
Subject: [Python-checkins] [3.11] gh-94430: Allow params named `module` or
 `self` with custom C names in AC (GH-94431) (#94649)
Message-ID: <mailman.2128.1657188780.20746.python-checkins@python.org>

https://github.com/python/cpython/commit/c0b7868db28cb8840b67844984133cdfb29b6bcb
commit: c0b7868db28cb8840b67844984133cdfb29b6bcb
branch: 3.11
author: Erlend Egeberg Aasland <erlend.aasland at protonmail.com>
committer: erlend-aasland <erlend.aasland at protonmail.com>
date: 2022-07-07T12:12:47+02:00
summary:

[3.11] gh-94430: Allow params named `module` or `self` with custom C names in AC (GH-94431) (#94649)

(cherry picked from commit 8bbd70b4d130f060f87e3f53810dc747a49fa369)

Co-authored-by: Erlend Egeberg Aasland <erlend.aasland at protonmail.com>

files:
A Misc/NEWS.d/next/Tools-Demos/2022-06-29-22-47-11.gh-issue-94430.hdov8L.rst
M Lib/test/clinic.test
M Tools/clinic/clinic.py

diff --git a/Lib/test/clinic.test b/Lib/test/clinic.test
index 9ef3610ba10c0..9016cffba95ca 100644
--- a/Lib/test/clinic.test
+++ b/Lib/test/clinic.test
@@ -3524,3 +3524,44 @@ static PyObject *
 test_vararg_with_only_defaults_impl(PyObject *module, PyObject *args, int b,
                                     PyObject *c)
 /*[clinic end generated code: output=7e393689e6ce61a3 input=fa56a709a035666e]*/
+
+/*[clinic input]
+test_paramname_module
+
+    module as mod: object
+[clinic start generated code]*/
+
+PyDoc_STRVAR(test_paramname_module__doc__,
+"test_paramname_module($module, /, module)\n"
+"--\n"
+"\n");
+
+#define TEST_PARAMNAME_MODULE_METHODDEF    \
+    {"test_paramname_module", _PyCFunction_CAST(test_paramname_module), METH_FASTCALL|METH_KEYWORDS, test_paramname_module__doc__},
+
+static PyObject *
+test_paramname_module_impl(PyObject *module, PyObject *mod);
+
+static PyObject *
+test_paramname_module(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+{
+    PyObject *return_value = NULL;
+    static const char * const _keywords[] = {"module", NULL};
+    static _PyArg_Parser _parser = {NULL, _keywords, "test_paramname_module", 0};
+    PyObject *argsbuf[1];
+    PyObject *mod;
+
+    args = _PyArg_UnpackKeywords(args, nargs, NULL, kwnames, &_parser, 1, 1, 0, argsbuf);
+    if (!args) {
+        goto exit;
+    }
+    mod = args[0];
+    return_value = test_paramname_module_impl(module, mod);
+
+exit:
+    return return_value;
+}
+
+static PyObject *
+test_paramname_module_impl(PyObject *module, PyObject *mod)
+/*[clinic end generated code: output=23379a7ffa65c514 input=afefe259667f13ba]*/
diff --git a/Misc/NEWS.d/next/Tools-Demos/2022-06-29-22-47-11.gh-issue-94430.hdov8L.rst b/Misc/NEWS.d/next/Tools-Demos/2022-06-29-22-47-11.gh-issue-94430.hdov8L.rst
new file mode 100644
index 0000000000000..88aa8d0866531
--- /dev/null
+++ b/Misc/NEWS.d/next/Tools-Demos/2022-06-29-22-47-11.gh-issue-94430.hdov8L.rst
@@ -0,0 +1,2 @@
+Allow parameters named ``module`` and ``self`` with custom C names in Argument
+Clinic. Patch by Erlend E. Aasland
diff --git a/Tools/clinic/clinic.py b/Tools/clinic/clinic.py
index 791d43408233c..cd0446dc4f05d 100755
--- a/Tools/clinic/clinic.py
+++ b/Tools/clinic/clinic.py
@@ -4721,9 +4721,14 @@ def bad_node(self, node):
 
         p = Parameter(parameter_name, kind, function=self.function, converter=converter, default=value, group=self.group)
 
-        if parameter_name in self.function.parameters:
+        names = [k.name for k in self.function.parameters.values()]
+        if parameter_name in names[1:]:
             fail("You can't have two parameters named " + repr(parameter_name) + "!")
-        self.function.parameters[parameter_name] = p
+        elif names and parameter_name == names[0] and c_name is None:
+            fail(f"Parameter '{parameter_name}' requires a custom C name")
+
+        key = f"{parameter_name}_as_{c_name}" if c_name else parameter_name
+        self.function.parameters[key] = p
 
     def parse_converter(self, annotation):
         if (hasattr(ast, 'Constant') and


From webhook-mailer at python.org  Thu Jul  7 06:54:01 2022
From: webhook-mailer at python.org (tiran)
Date: Thu, 07 Jul 2022 10:54:01 -0000
Subject: [Python-checkins] gh-94215: Add reproducer for segfault in
 frame_setlineno() (GH-94563)
Message-ID: <mailman.2129.1657191242.20746.python-checkins@python.org>

https://github.com/python/cpython/commit/de5884295ece094931413267973036ae8a0bca05
commit: de5884295ece094931413267973036ae8a0bca05
branch: main
author: Christian Heimes <christian at python.org>
committer: tiran <christian at python.org>
date: 2022-07-07T12:53:57+02:00
summary:

gh-94215: Add reproducer for segfault in frame_setlineno() (GH-94563)

files:
M Lib/test/test_pdb.py

diff --git a/Lib/test/test_pdb.py b/Lib/test/test_pdb.py
index f0c15e7b9c536..968a32fce47b6 100644
--- a/Lib/test/test_pdb.py
+++ b/Lib/test/test_pdb.py
@@ -1407,6 +1407,74 @@ def test_pdb_issue_gh_91742():
     (Pdb) continue
     Author: 'pi' Version: '3.14'
     """
+
+def test_pdb_issue_gh_94215():
+    """See GH-94215
+
+    Check that frame_setlineno() does not leak references.
+
+    >>> def test_function():
+    ...    def func():
+    ...        def inner(v): pass
+    ...        inner(
+    ...             42
+    ...        )
+    ...
+    ...    import pdb; pdb.Pdb(nosigint=True, readrc=False).set_trace()
+    ...    func()
+
+    >>> reset_Breakpoint()
+    >>> with PdbTestInput([  # doctest: +NORMALIZE_WHITESPACE
+    ...     'step',
+    ...     'next',
+    ...     'next',
+    ...     'jump 3',
+    ...     'next',
+    ...     'next',
+    ...     'jump 3',
+    ...     'next',
+    ...     'next',
+    ...     'jump 3',
+    ...     'continue'
+    ... ]):
+    ...     test_function()
+    > <doctest test.test_pdb.test_pdb_issue_gh_94215[0]>(9)test_function()
+    -> func()
+    (Pdb) step
+    --Call--
+    > <doctest test.test_pdb.test_pdb_issue_gh_94215[0]>(2)func()
+    -> def func():
+    (Pdb) next
+    > <doctest test.test_pdb.test_pdb_issue_gh_94215[0]>(3)func()
+    -> def inner(v): pass
+    (Pdb) next
+    > <doctest test.test_pdb.test_pdb_issue_gh_94215[0]>(4)func()
+    -> inner(
+    (Pdb) jump 3
+    > <doctest test.test_pdb.test_pdb_issue_gh_94215[0]>(3)func()
+    -> def inner(v): pass
+    (Pdb) next
+    > <doctest test.test_pdb.test_pdb_issue_gh_94215[0]>(4)func()
+    -> inner(
+    (Pdb) next
+    > <doctest test.test_pdb.test_pdb_issue_gh_94215[0]>(5)func()
+    -> 42
+    (Pdb) jump 3
+    > <doctest test.test_pdb.test_pdb_issue_gh_94215[0]>(3)func()
+    -> def inner(v): pass
+    (Pdb) next
+    > <doctest test.test_pdb.test_pdb_issue_gh_94215[0]>(4)func()
+    -> inner(
+    (Pdb) next
+    > <doctest test.test_pdb.test_pdb_issue_gh_94215[0]>(5)func()
+    -> 42
+    (Pdb) jump 3
+    > <doctest test.test_pdb.test_pdb_issue_gh_94215[0]>(3)func()
+    -> def inner(v): pass
+    (Pdb) continue
+    """
+
+
 @support.requires_subprocess()
 class PdbTestCase(unittest.TestCase):
     def tearDown(self):
@@ -1414,7 +1482,7 @@ def tearDown(self):
 
     @unittest.skipIf(sys.flags.safe_path,
                      'PYTHONSAFEPATH changes default sys.path')
-    def _run_pdb(self, pdb_args, commands):
+    def _run_pdb(self, pdb_args, commands, expected_returncode=0):
         self.addCleanup(os_helper.rmtree, '__pycache__')
         cmd = [sys.executable, '-m', 'pdb'] + pdb_args
         with subprocess.Popen(
@@ -1427,15 +1495,20 @@ def _run_pdb(self, pdb_args, commands):
             stdout, stderr = proc.communicate(str.encode(commands))
         stdout = stdout and bytes.decode(stdout)
         stderr = stderr and bytes.decode(stderr)
+        self.assertEqual(
+            proc.returncode,
+            expected_returncode,
+            f"Unexpected return code\nstdout: {stdout}\nstderr: {stderr}"
+        )
         return stdout, stderr
 
-    def run_pdb_script(self, script, commands):
+    def run_pdb_script(self, script, commands, expected_returncode=0):
         """Run 'script' lines with pdb and the pdb 'commands'."""
         filename = 'main.py'
         with open(filename, 'w') as f:
             f.write(textwrap.dedent(script))
         self.addCleanup(os_helper.unlink, filename)
-        return self._run_pdb([filename], commands)
+        return self._run_pdb([filename], commands, expected_returncode)
 
     def run_pdb_module(self, script, commands):
         """Runs the script code as part of a module"""
@@ -1641,7 +1714,9 @@ def test_issue16180(self):
         script = "def f: pass\n"
         commands = ''
         expected = "SyntaxError:"
-        stdout, stderr = self.run_pdb_script(script, commands)
+        stdout, stderr = self.run_pdb_script(
+            script, commands, expected_returncode=1
+        )
         self.assertIn(expected, stdout,
             '\n\nExpected:\n{}\nGot:\n{}\n'
             'Fail to handle a syntax error in the debuggee.'
@@ -1804,7 +1879,9 @@ def test_module_without_a_main(self):
         with open(init_file, 'w'):
             pass
         self.addCleanup(os_helper.rmtree, module_name)
-        stdout, stderr = self._run_pdb(['-m', module_name], "")
+        stdout, stderr = self._run_pdb(
+            ['-m', module_name], "", expected_returncode=1
+        )
         self.assertIn("ImportError: No module named t_main.__main__",
                       stdout.splitlines())
 
@@ -1817,7 +1894,9 @@ def test_package_without_a_main(self):
         with open(modpath + '/__init__.py', 'w'):
             pass
         self.addCleanup(os_helper.rmtree, pkg_name)
-        stdout, stderr = self._run_pdb(['-m', modpath.replace('/', '.')], "")
+        stdout, stderr = self._run_pdb(
+            ['-m', modpath.replace('/', '.')], "", expected_returncode=1
+        )
         self.assertIn(
             "'t_pkg.t_main' is a package and cannot be directly executed",
             stdout)
@@ -2006,6 +2085,25 @@ def test_issue42383(self):
             expected = '(Pdb) The correct file was executed'
             self.assertEqual(stdout.split('\n')[6].rstrip('\r'), expected)
 
+    @unittest.skip("test crashes, see gh-94215")
+    def test_gh_94215_crash(self):
+        script = """\
+            def func():
+                def inner(v): pass
+                inner(
+                    42
+                )
+            func()
+        """
+        commands = textwrap.dedent("""
+            break func
+            continue
+            next
+            next
+            jump 2
+        """)
+        stdout, stderr = self.run_pdb_script(script, commands)
+        self.assertFalse(stderr)
 
 class ChecklineTests(unittest.TestCase):
     def setUp(self):


From webhook-mailer at python.org  Thu Jul  7 06:57:17 2022
From: webhook-mailer at python.org (tiran)
Date: Thu, 07 Jul 2022 10:57:17 -0000
Subject: [Python-checkins] gh-94644: Define HAVE_NCURSESW in pkg-config
 branch (#94651)
Message-ID: <mailman.2130.1657191437.20746.python-checkins@python.org>

https://github.com/python/cpython/commit/9c60b25a0d5c0107862a04e3ba8f789921b88961
commit: 9c60b25a0d5c0107862a04e3ba8f789921b88961
branch: main
author: Christian Heimes <christian at python.org>
committer: tiran <christian at python.org>
date: 2022-07-07T12:57:12+02:00
summary:

gh-94644: Define HAVE_NCURSESW in pkg-config branch (#94651)

files:
M configure
M configure.ac

diff --git a/configure b/configure
index 38481eea8475e..bb0625432d211 100755
--- a/configure
+++ b/configure
@@ -21825,6 +21825,8 @@ else
         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 
+      $as_echo "#define HAVE_NCURSESW 1" >>confdefs.h
+
       have_curses=ncursesw
 
 fi
diff --git a/configure.ac b/configure.ac
index 42e181bca9dac..fde61728e7ef8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6112,6 +6112,7 @@ AS_VAR_IF([ac_cv_header_ncurses_h], [yes], [
   if test "$ac_sys_system" != "Darwin"; then
     dnl On macOS, there is no separate /usr/lib/libncursesw nor libpanelw.
     PKG_CHECK_MODULES([CURSES], [ncursesw], [
+      AC_DEFINE([HAVE_NCURSESW], [1])
       have_curses=ncursesw
     ], [
       WITH_SAVE_ENV([


From webhook-mailer at python.org  Thu Jul  7 06:57:50 2022
From: webhook-mailer at python.org (miss-islington)
Date: Thu, 07 Jul 2022 10:57:50 -0000
Subject: [Python-checkins] GH-94644: fix test_curses ref leak (GH-94647)
Message-ID: <mailman.2131.1657191470.20746.python-checkins@python.org>

https://github.com/python/cpython/commit/277f55cb04409ccdf651d43df5eb9dcb3ee3128c
commit: 277f55cb04409ccdf651d43df5eb9dcb3ee3128c
branch: main
author: Kumar Aditya <59607654+kumaraditya303 at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-07T03:57:45-07:00
summary:

GH-94644: fix test_curses ref leak (GH-94647)

files:
M Modules/_cursesmodule.c

diff --git a/Modules/_cursesmodule.c b/Modules/_cursesmodule.c
index 7e2699e1b5c5b..c10b2b302c602 100644
--- a/Modules/_cursesmodule.c
+++ b/Modules/_cursesmodule.c
@@ -383,6 +383,7 @@ PyCurses_ConvertToString(PyCursesWindowObject *win, PyObject *obj,
             return 0;
         /* check for embedded null bytes */
         if (PyBytes_AsStringAndSize(*bytes, &str, NULL) < 0) {
+            Py_CLEAR(*bytes);
             return 0;
         }
         return 1;


From webhook-mailer at python.org  Thu Jul  7 07:17:52 2022
From: webhook-mailer at python.org (miss-islington)
Date: Thu, 07 Jul 2022 11:17:52 -0000
Subject: [Python-checkins] gh-94215: Add reproducer for segfault in
 frame_setlineno() (GH-94563)
Message-ID: <mailman.2132.1657192673.20746.python-checkins@python.org>

https://github.com/python/cpython/commit/421c4b025583df9396dbd6b1e0e90d4a8b6d083f
commit: 421c4b025583df9396dbd6b1e0e90d4a8b6d083f
branch: 3.11
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-07T04:17:47-07:00
summary:

gh-94215: Add reproducer for segfault in frame_setlineno() (GH-94563)

(cherry picked from commit de5884295ece094931413267973036ae8a0bca05)

Co-authored-by: Christian Heimes <christian at python.org>

files:
M Lib/test/test_pdb.py

diff --git a/Lib/test/test_pdb.py b/Lib/test/test_pdb.py
index f0c15e7b9c536..968a32fce47b6 100644
--- a/Lib/test/test_pdb.py
+++ b/Lib/test/test_pdb.py
@@ -1407,6 +1407,74 @@ def test_pdb_issue_gh_91742():
     (Pdb) continue
     Author: 'pi' Version: '3.14'
     """
+
+def test_pdb_issue_gh_94215():
+    """See GH-94215
+
+    Check that frame_setlineno() does not leak references.
+
+    >>> def test_function():
+    ...    def func():
+    ...        def inner(v): pass
+    ...        inner(
+    ...             42
+    ...        )
+    ...
+    ...    import pdb; pdb.Pdb(nosigint=True, readrc=False).set_trace()
+    ...    func()
+
+    >>> reset_Breakpoint()
+    >>> with PdbTestInput([  # doctest: +NORMALIZE_WHITESPACE
+    ...     'step',
+    ...     'next',
+    ...     'next',
+    ...     'jump 3',
+    ...     'next',
+    ...     'next',
+    ...     'jump 3',
+    ...     'next',
+    ...     'next',
+    ...     'jump 3',
+    ...     'continue'
+    ... ]):
+    ...     test_function()
+    > <doctest test.test_pdb.test_pdb_issue_gh_94215[0]>(9)test_function()
+    -> func()
+    (Pdb) step
+    --Call--
+    > <doctest test.test_pdb.test_pdb_issue_gh_94215[0]>(2)func()
+    -> def func():
+    (Pdb) next
+    > <doctest test.test_pdb.test_pdb_issue_gh_94215[0]>(3)func()
+    -> def inner(v): pass
+    (Pdb) next
+    > <doctest test.test_pdb.test_pdb_issue_gh_94215[0]>(4)func()
+    -> inner(
+    (Pdb) jump 3
+    > <doctest test.test_pdb.test_pdb_issue_gh_94215[0]>(3)func()
+    -> def inner(v): pass
+    (Pdb) next
+    > <doctest test.test_pdb.test_pdb_issue_gh_94215[0]>(4)func()
+    -> inner(
+    (Pdb) next
+    > <doctest test.test_pdb.test_pdb_issue_gh_94215[0]>(5)func()
+    -> 42
+    (Pdb) jump 3
+    > <doctest test.test_pdb.test_pdb_issue_gh_94215[0]>(3)func()
+    -> def inner(v): pass
+    (Pdb) next
+    > <doctest test.test_pdb.test_pdb_issue_gh_94215[0]>(4)func()
+    -> inner(
+    (Pdb) next
+    > <doctest test.test_pdb.test_pdb_issue_gh_94215[0]>(5)func()
+    -> 42
+    (Pdb) jump 3
+    > <doctest test.test_pdb.test_pdb_issue_gh_94215[0]>(3)func()
+    -> def inner(v): pass
+    (Pdb) continue
+    """
+
+
 @support.requires_subprocess()
 class PdbTestCase(unittest.TestCase):
     def tearDown(self):
@@ -1414,7 +1482,7 @@ def tearDown(self):
 
     @unittest.skipIf(sys.flags.safe_path,
                      'PYTHONSAFEPATH changes default sys.path')
-    def _run_pdb(self, pdb_args, commands):
+    def _run_pdb(self, pdb_args, commands, expected_returncode=0):
         self.addCleanup(os_helper.rmtree, '__pycache__')
         cmd = [sys.executable, '-m', 'pdb'] + pdb_args
         with subprocess.Popen(
@@ -1427,15 +1495,20 @@ def _run_pdb(self, pdb_args, commands):
             stdout, stderr = proc.communicate(str.encode(commands))
         stdout = stdout and bytes.decode(stdout)
         stderr = stderr and bytes.decode(stderr)
+        self.assertEqual(
+            proc.returncode,
+            expected_returncode,
+            f"Unexpected return code\nstdout: {stdout}\nstderr: {stderr}"
+        )
         return stdout, stderr
 
-    def run_pdb_script(self, script, commands):
+    def run_pdb_script(self, script, commands, expected_returncode=0):
         """Run 'script' lines with pdb and the pdb 'commands'."""
         filename = 'main.py'
         with open(filename, 'w') as f:
             f.write(textwrap.dedent(script))
         self.addCleanup(os_helper.unlink, filename)
-        return self._run_pdb([filename], commands)
+        return self._run_pdb([filename], commands, expected_returncode)
 
     def run_pdb_module(self, script, commands):
         """Runs the script code as part of a module"""
@@ -1641,7 +1714,9 @@ def test_issue16180(self):
         script = "def f: pass\n"
         commands = ''
         expected = "SyntaxError:"
-        stdout, stderr = self.run_pdb_script(script, commands)
+        stdout, stderr = self.run_pdb_script(
+            script, commands, expected_returncode=1
+        )
         self.assertIn(expected, stdout,
             '\n\nExpected:\n{}\nGot:\n{}\n'
             'Fail to handle a syntax error in the debuggee.'
@@ -1804,7 +1879,9 @@ def test_module_without_a_main(self):
         with open(init_file, 'w'):
             pass
         self.addCleanup(os_helper.rmtree, module_name)
-        stdout, stderr = self._run_pdb(['-m', module_name], "")
+        stdout, stderr = self._run_pdb(
+            ['-m', module_name], "", expected_returncode=1
+        )
         self.assertIn("ImportError: No module named t_main.__main__",
                       stdout.splitlines())
 
@@ -1817,7 +1894,9 @@ def test_package_without_a_main(self):
         with open(modpath + '/__init__.py', 'w'):
             pass
         self.addCleanup(os_helper.rmtree, pkg_name)
-        stdout, stderr = self._run_pdb(['-m', modpath.replace('/', '.')], "")
+        stdout, stderr = self._run_pdb(
+            ['-m', modpath.replace('/', '.')], "", expected_returncode=1
+        )
         self.assertIn(
             "'t_pkg.t_main' is a package and cannot be directly executed",
             stdout)
@@ -2006,6 +2085,25 @@ def test_issue42383(self):
             expected = '(Pdb) The correct file was executed'
             self.assertEqual(stdout.split('\n')[6].rstrip('\r'), expected)
 
+    @unittest.skip("test crashes, see gh-94215")
+    def test_gh_94215_crash(self):
+        script = """\
+            def func():
+                def inner(v): pass
+                inner(
+                    42
+                )
+            func()
+        """
+        commands = textwrap.dedent("""
+            break func
+            continue
+            next
+            next
+            jump 2
+        """)
+        stdout, stderr = self.run_pdb_script(script, commands)
+        self.assertFalse(stderr)
 
 class ChecklineTests(unittest.TestCase):
     def setUp(self):


From webhook-mailer at python.org  Thu Jul  7 07:26:38 2022
From: webhook-mailer at python.org (erlend-aasland)
Date: Thu, 07 Jul 2022 11:26:38 -0000
Subject: [Python-checkins] [3.10] gh-94430: Allow params named `module` or
 `self` with custom C names in AC (GH-94431) (#94650)
Message-ID: <mailman.2133.1657193199.20746.python-checkins@python.org>

https://github.com/python/cpython/commit/dc36801f7c621d02350ef5c652d6dfa8d6f9aef7
commit: dc36801f7c621d02350ef5c652d6dfa8d6f9aef7
branch: 3.10
author: Erlend Egeberg Aasland <erlend.aasland at protonmail.com>
committer: erlend-aasland <erlend.aasland at protonmail.com>
date: 2022-07-07T13:26:21+02:00
summary:

[3.10] gh-94430: Allow params named `module` or `self` with custom C names in AC (GH-94431) (#94650)

(cherry picked from commit 8bbd70b4d130f060f87e3f53810dc747a49fa369)

Co-authored-by: Erlend Egeberg Aasland <erlend.aasland at protonmail.com>

files:
A Misc/NEWS.d/next/Tools-Demos/2022-06-29-22-47-11.gh-issue-94430.hdov8L.rst
M Lib/test/clinic.test
M Tools/clinic/clinic.py

diff --git a/Lib/test/clinic.test b/Lib/test/clinic.test
index 07e13829d5db9..0f5c651f214f2 100644
--- a/Lib/test/clinic.test
+++ b/Lib/test/clinic.test
@@ -3308,3 +3308,44 @@ test_preprocessor_guarded_else(PyObject *module, PyObject *Py_UNUSED(ignored))
     #define TEST_PREPROCESSOR_GUARDED_ELSE_METHODDEF
 #endif /* !defined(TEST_PREPROCESSOR_GUARDED_ELSE_METHODDEF) */
 /*[clinic end generated code: output=3804bb18d454038c input=3fc80c9989d2f2e1]*/
+
+/*[clinic input]
+test_paramname_module
+
+    module as mod: object
+[clinic start generated code]*/
+
+PyDoc_STRVAR(test_paramname_module__doc__,
+"test_paramname_module($module, /, module)\n"
+"--\n"
+"\n");
+
+#define TEST_PARAMNAME_MODULE_METHODDEF    \
+    {"test_paramname_module", (PyCFunction)(void(*)(void))test_paramname_module, METH_FASTCALL|METH_KEYWORDS, test_paramname_module__doc__},
+
+static PyObject *
+test_paramname_module_impl(PyObject *module, PyObject *mod);
+
+static PyObject *
+test_paramname_module(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+{
+    PyObject *return_value = NULL;
+    static const char * const _keywords[] = {"module", NULL};
+    static _PyArg_Parser _parser = {NULL, _keywords, "test_paramname_module", 0};
+    PyObject *argsbuf[1];
+    PyObject *mod;
+
+    args = _PyArg_UnpackKeywords(args, nargs, NULL, kwnames, &_parser, 1, 1, 0, argsbuf);
+    if (!args) {
+        goto exit;
+    }
+    mod = args[0];
+    return_value = test_paramname_module_impl(module, mod);
+
+exit:
+    return return_value;
+}
+
+static PyObject *
+test_paramname_module_impl(PyObject *module, PyObject *mod)
+/*[clinic end generated code: output=2a6769d34d1b2be0 input=afefe259667f13ba]*/
diff --git a/Misc/NEWS.d/next/Tools-Demos/2022-06-29-22-47-11.gh-issue-94430.hdov8L.rst b/Misc/NEWS.d/next/Tools-Demos/2022-06-29-22-47-11.gh-issue-94430.hdov8L.rst
new file mode 100644
index 0000000000000..88aa8d0866531
--- /dev/null
+++ b/Misc/NEWS.d/next/Tools-Demos/2022-06-29-22-47-11.gh-issue-94430.hdov8L.rst
@@ -0,0 +1,2 @@
+Allow parameters named ``module`` and ``self`` with custom C names in Argument
+Clinic. Patch by Erlend E. Aasland
diff --git a/Tools/clinic/clinic.py b/Tools/clinic/clinic.py
index 8deea13b63750..1ad9807862cd4 100755
--- a/Tools/clinic/clinic.py
+++ b/Tools/clinic/clinic.py
@@ -4626,9 +4626,14 @@ def bad_node(self, node):
 
         p = Parameter(parameter_name, kind, function=self.function, converter=converter, default=value, group=self.group)
 
-        if parameter_name in self.function.parameters:
+        names = [k.name for k in self.function.parameters.values()]
+        if parameter_name in names[1:]:
             fail("You can't have two parameters named " + repr(parameter_name) + "!")
-        self.function.parameters[parameter_name] = p
+        elif names and parameter_name == names[0] and c_name is None:
+            fail(f"Parameter '{parameter_name}' requires a custom C name")
+
+        key = f"{parameter_name}_as_{c_name}" if c_name else parameter_name
+        self.function.parameters[key] = p
 
     def parse_converter(self, annotation):
         if (hasattr(ast, 'Constant') and


From webhook-mailer at python.org  Thu Jul  7 07:27:01 2022
From: webhook-mailer at python.org (miss-islington)
Date: Thu, 07 Jul 2022 11:27:01 -0000
Subject: [Python-checkins] gh-93910: Fix enum performance regression
 (GH-94614)
Message-ID: <mailman.2134.1657193222.20746.python-checkins@python.org>

https://github.com/python/cpython/commit/ed136b96737fdbeff864079d12904cb962c6cce5
commit: ed136b96737fdbeff864079d12904cb962c6cce5
branch: main
author: Michael Droettboom <mdboom at gmail.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-07T04:26:56-07:00
summary:

gh-93910: Fix enum performance regression (GH-94614)



This removes the performance regression in 3.11, **at the expense of not fixing
the "bug" that allows accessing values from values** (e.g. `Color.RED.BLUE`).

Using the benchmark @markshannon [presented](https://github.com/python/cpython/issues/93910#issuecomment-1165503032), the results are:

| Version | Enum | Fast enum | Normal class |
| --- | --- | --- | --- |
| 3.10 | 2.04 | 0.59 | 0.56 |
| 3.11 | 2.78 | 0.31 | 0.15 |
| This PR | 1.30 | 0.32 | 0.16 |

I share this mostly as information about the source of the regression, as this may be useful. It may be that the lower-risk approach for the beta is just to revert to a previously-known working state.

files:
A Misc/NEWS.d/next/Library/2022-07-06-14-45-12.gh-issue-93910.iZcp67.rst
M Lib/enum.py
M Lib/test/test_enum.py

diff --git a/Lib/enum.py b/Lib/enum.py
index 69216c97fa86b..652878ce1e1df 100644
--- a/Lib/enum.py
+++ b/Lib/enum.py
@@ -309,16 +309,17 @@ def __set_name__(self, enum_class, member_name):
         if descriptor and not need_override:
             # previous enum.property found, no further action needed
             pass
-        else:
+        elif descriptor and need_override:
             redirect = property()
             redirect.__set_name__(enum_class, member_name)
-            if descriptor and need_override:
-                # previous enum.property found, but some other inherited attribute
-                # is in the way; copy fget, fset, fdel to this one
-                redirect.fget = descriptor.fget
-                redirect.fset = descriptor.fset
-                redirect.fdel = descriptor.fdel
+            # Previous enum.property found, but some other inherited attribute
+            # is in the way; copy fget, fset, fdel to this one.
+            redirect.fget = descriptor.fget
+            redirect.fset = descriptor.fset
+            redirect.fdel = descriptor.fdel
             setattr(enum_class, member_name, redirect)
+        else:
+            setattr(enum_class, member_name, enum_member)
         # now add to _member_map_ (even aliases)
         enum_class._member_map_[member_name] = enum_member
         try:
@@ -647,7 +648,7 @@ def __new__(metacls, cls, bases, classdict, *, boundary=None, _simple=False, **k
                         'member order does not match _order_:\n  %r\n  %r'
                         % (enum_class._member_names_, _order_)
                         )
-        #
+
         return enum_class
 
     def __bool__(cls):
diff --git a/Lib/test/test_enum.py b/Lib/test/test_enum.py
index a26350992cf9d..aec18c79f7249 100644
--- a/Lib/test/test_enum.py
+++ b/Lib/test/test_enum.py
@@ -2646,6 +2646,7 @@ class Private(Enum):
         self.assertEqual(Private._Private__corporal, 'Radar')
         self.assertEqual(Private._Private__major_, 'Hoolihan')
 
+    @unittest.skip("Accessing all values retained for performance reasons, see GH-93910")
     def test_exception_for_member_from_member_access(self):
         with self.assertRaisesRegex(AttributeError, "<enum .Di.> member has no attribute .NO."):
             class Di(Enum):
diff --git a/Misc/NEWS.d/next/Library/2022-07-06-14-45-12.gh-issue-93910.iZcp67.rst b/Misc/NEWS.d/next/Library/2022-07-06-14-45-12.gh-issue-93910.iZcp67.rst
new file mode 100644
index 0000000000000..2e589118e3efd
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2022-07-06-14-45-12.gh-issue-93910.iZcp67.rst
@@ -0,0 +1,3 @@
+The ability to access the other values of an enum on an enum (e.g.
+``Color.RED.BLUE``) has been restored in order to fix a performance
+regression.


From webhook-mailer at python.org  Thu Jul  7 07:41:30 2022
From: webhook-mailer at python.org (miss-islington)
Date: Thu, 07 Jul 2022 11:41:30 -0000
Subject: [Python-checkins] GH-94644: fix test_curses ref leak (GH-94647)
Message-ID: <mailman.2135.1657194091.20746.python-checkins@python.org>

https://github.com/python/cpython/commit/c5819c1f6c67f04e08f058ac7f24dec86e0e4554
commit: c5819c1f6c67f04e08f058ac7f24dec86e0e4554
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-07T04:41:06-07:00
summary:

GH-94644: fix test_curses ref leak (GH-94647)

(cherry picked from commit 277f55cb04409ccdf651d43df5eb9dcb3ee3128c)

Co-authored-by: Kumar Aditya <59607654+kumaraditya303 at users.noreply.github.com>

files:
M Modules/_cursesmodule.c

diff --git a/Modules/_cursesmodule.c b/Modules/_cursesmodule.c
index a1de43599c99d..e043f747310b6 100644
--- a/Modules/_cursesmodule.c
+++ b/Modules/_cursesmodule.c
@@ -378,6 +378,7 @@ PyCurses_ConvertToString(PyCursesWindowObject *win, PyObject *obj,
             return 0;
         /* check for embedded null bytes */
         if (PyBytes_AsStringAndSize(*bytes, &str, NULL) < 0) {
+            Py_CLEAR(*bytes);
             return 0;
         }
         return 1;


From webhook-mailer at python.org  Thu Jul  7 08:01:48 2022
From: webhook-mailer at python.org (miss-islington)
Date: Thu, 07 Jul 2022 12:01:48 -0000
Subject: [Python-checkins] gh-93910: Fix enum performance regression
 (GH-94614)
Message-ID: <mailman.2136.1657195310.20746.python-checkins@python.org>

https://github.com/python/cpython/commit/65c431685b40583b877da573e41514d63217815d
commit: 65c431685b40583b877da573e41514d63217815d
branch: 3.11
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-07T05:01:09-07:00
summary:

gh-93910: Fix enum performance regression (GH-94614)


This removes the performance regression in 3.11, **at the expense of not fixing
the "bug" that allows accessing values from values** (e.g. `Color.RED.BLUE`).

Using the benchmark @markshannon [presented](https://github.com/python/cpython/issues/93910GH-issuecomment-1165503032), the results are:

| Version | Enum | Fast enum | Normal class |
| --- | --- | --- | --- |
| 3.10 | 2.04 | 0.59 | 0.56 |
| 3.11 | 2.78 | 0.31 | 0.15 |
| This PR | 1.30 | 0.32 | 0.16 |

I share this mostly as information about the source of the regression, as this may be useful. It may be that the lower-risk approach for the beta is just to revert to a previously-known working state.
(cherry picked from commit ed136b96737fdbeff864079d12904cb962c6cce5)

Co-authored-by: Michael Droettboom <mdboom at gmail.com>

files:
A Misc/NEWS.d/next/Library/2022-07-06-14-45-12.gh-issue-93910.iZcp67.rst
M Lib/enum.py
M Lib/test/test_enum.py

diff --git a/Lib/enum.py b/Lib/enum.py
index e11093c6cf468..e5971917cef46 100644
--- a/Lib/enum.py
+++ b/Lib/enum.py
@@ -309,16 +309,17 @@ def __set_name__(self, enum_class, member_name):
         if descriptor and not need_override:
             # previous enum.property found, no further action needed
             pass
-        else:
+        elif descriptor and need_override:
             redirect = property()
             redirect.__set_name__(enum_class, member_name)
-            if descriptor and need_override:
-                # previous enum.property found, but some other inherited attribute
-                # is in the way; copy fget, fset, fdel to this one
-                redirect.fget = descriptor.fget
-                redirect.fset = descriptor.fset
-                redirect.fdel = descriptor.fdel
+            # Previous enum.property found, but some other inherited attribute
+            # is in the way; copy fget, fset, fdel to this one.
+            redirect.fget = descriptor.fget
+            redirect.fset = descriptor.fset
+            redirect.fdel = descriptor.fdel
             setattr(enum_class, member_name, redirect)
+        else:
+            setattr(enum_class, member_name, enum_member)
         # now add to _member_map_ (even aliases)
         enum_class._member_map_[member_name] = enum_member
         try:
@@ -647,7 +648,7 @@ def __new__(metacls, cls, bases, classdict, *, boundary=None, _simple=False, **k
                         'member order does not match _order_:\n  %r\n  %r'
                         % (enum_class._member_names_, _order_)
                         )
-        #
+
         return enum_class
 
     def __bool__(cls):
diff --git a/Lib/test/test_enum.py b/Lib/test/test_enum.py
index ac5c52b2b303b..f9a662746fb1a 100644
--- a/Lib/test/test_enum.py
+++ b/Lib/test/test_enum.py
@@ -2611,6 +2611,7 @@ class Private(Enum):
         self.assertEqual(Private._Private__corporal, 'Radar')
         self.assertEqual(Private._Private__major_, 'Hoolihan')
 
+    @unittest.skip("Accessing all values retained for performance reasons, see GH-93910")
     def test_exception_for_member_from_member_access(self):
         with self.assertRaisesRegex(AttributeError, "<enum .Di.> member has no attribute .NO."):
             class Di(Enum):
diff --git a/Misc/NEWS.d/next/Library/2022-07-06-14-45-12.gh-issue-93910.iZcp67.rst b/Misc/NEWS.d/next/Library/2022-07-06-14-45-12.gh-issue-93910.iZcp67.rst
new file mode 100644
index 0000000000000..2e589118e3efd
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2022-07-06-14-45-12.gh-issue-93910.iZcp67.rst
@@ -0,0 +1,3 @@
+The ability to access the other values of an enum on an enum (e.g.
+``Color.RED.BLUE``) has been restored in order to fix a performance
+regression.


From webhook-mailer at python.org  Thu Jul  7 08:03:08 2022
From: webhook-mailer at python.org (miss-islington)
Date: Thu, 07 Jul 2022 12:03:08 -0000
Subject: [Python-checkins] GH-94644: fix test_curses ref leak (GH-94647)
Message-ID: <mailman.2137.1657195390.20746.python-checkins@python.org>

https://github.com/python/cpython/commit/77a015387bb5dce0ecce10b9589e58048d9963a1
commit: 77a015387bb5dce0ecce10b9589e58048d9963a1
branch: 3.11
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-07T05:03:00-07:00
summary:

GH-94644: fix test_curses ref leak (GH-94647)

(cherry picked from commit 277f55cb04409ccdf651d43df5eb9dcb3ee3128c)

Co-authored-by: Kumar Aditya <59607654+kumaraditya303 at users.noreply.github.com>

files:
M Modules/_cursesmodule.c

diff --git a/Modules/_cursesmodule.c b/Modules/_cursesmodule.c
index 7e2699e1b5c5b..c10b2b302c602 100644
--- a/Modules/_cursesmodule.c
+++ b/Modules/_cursesmodule.c
@@ -383,6 +383,7 @@ PyCurses_ConvertToString(PyCursesWindowObject *win, PyObject *obj,
             return 0;
         /* check for embedded null bytes */
         if (PyBytes_AsStringAndSize(*bytes, &str, NULL) < 0) {
+            Py_CLEAR(*bytes);
             return 0;
         }
         return 1;


From webhook-mailer at python.org  Thu Jul  7 08:48:08 2022
From: webhook-mailer at python.org (tiran)
Date: Thu, 07 Jul 2022 12:48:08 -0000
Subject: [Python-checkins] gh-94642: Remove -D_XOPEN_SOURCE from more
 pkg-config CFLAGS (#94657)
Message-ID: <mailman.2138.1657198089.20746.python-checkins@python.org>

https://github.com/python/cpython/commit/29f86d6c28fa9ed39e42678776d6005eaf5090c8
commit: 29f86d6c28fa9ed39e42678776d6005eaf5090c8
branch: main
author: Christian Heimes <christian at python.org>
committer: tiran <christian at python.org>
date: 2022-07-07T14:47:32+02:00
summary:

gh-94642: Remove -D_XOPEN_SOURCE from more pkg-config CFLAGS (#94657)

Some pkg-config pc files define CFLAGS with -D_XOPEN_SOURCE=600. We always want _XOPEN_SOURCE=700.

files:
M configure
M configure.ac

diff --git a/configure b/configure
index bb0625432d211..5f2830338ee8f 100755
--- a/configure
+++ b/configure
@@ -21031,6 +21031,7 @@ fi
 
 fi
 
+READLINE_CFLAGS=$(echo $READLINE_CFLAGS | sed 's/-D_XOPEN_SOURCE=600//g')
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to link readline" >&5
 $as_echo_n "checking how to link readline... " >&6; }
@@ -22028,7 +22029,7 @@ fi
 
 
 fi
-CURSES_CFLAGS=$(echo $CURSES_CFLAGS | sed 's/-D_XOPEN_SOURCE=600//')
+CURSES_CFLAGS=$(echo $CURSES_CFLAGS | sed 's/-D_XOPEN_SOURCE=600//g')
 
 if test "$have_curses" = no -a "$ac_sys_system" = "Darwin"; then
 
@@ -22460,6 +22461,8 @@ fi
 
 
 fi
+PANEL_CFLAGS=$(echo $PANEL_CFLAGS | sed 's/-D_XOPEN_SOURCE=600//g')
+
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking panel flags" >&5
 $as_echo_n "checking panel flags... " >&6; }
 if test "x$have_panel" = xno; then :
diff --git a/configure.ac b/configure.ac
index fde61728e7ef8..88219dc9b5464 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5850,6 +5850,8 @@ AS_VAR_IF([with_readline], [edit], [
   ])
 ])
 
+dnl pyconfig.h defines _XOPEN_SOURCE=700
+READLINE_CFLAGS=$(echo $READLINE_CFLAGS | sed 's/-D_XOPEN_SOURCE=600//g')
 
 AC_MSG_CHECKING([how to link readline])
 AS_VAR_IF([with_readline], [no], [
@@ -6144,7 +6146,7 @@ AS_VAR_IF([ac_cv_header_ncurses_h], [yes], [
 
 dnl remove _XOPEN_SOURCE macro from curses cflags. pyconfig.h sets
 dnl the macro to 700.
-CURSES_CFLAGS=$(echo $CURSES_CFLAGS | sed 's/-D_XOPEN_SOURCE=600//')
+CURSES_CFLAGS=$(echo $CURSES_CFLAGS | sed 's/-D_XOPEN_SOURCE=600//g')
 
 if test "$have_curses" = no -a "$ac_sys_system" = "Darwin"; then
   dnl On macOS, there is no separate /usr/lib/libncursesw nor libpanelw.
@@ -6204,6 +6206,9 @@ AS_VAR_IF([ac_cv_header_panel_h], [yes], [
 
 ])dnl ac_cv_header_panel_h = yes
 
+dnl pyconfig.h defines _XOPEN_SOURCE=700
+PANEL_CFLAGS=$(echo $PANEL_CFLAGS | sed 's/-D_XOPEN_SOURCE=600//g')
+
 AC_MSG_CHECKING([panel flags])
 AS_VAR_IF([have_panel], [no], [
   AC_MSG_RESULT([no])  


From webhook-mailer at python.org  Thu Jul  7 10:55:50 2022
From: webhook-mailer at python.org (rhettinger)
Date: Thu, 07 Jul 2022 14:55:50 -0000
Subject: [Python-checkins] gh-94343: Ease initialization of reprlib.Repr
 attributes (GH-94581)
Message-ID: <mailman.2139.1657205751.20746.python-checkins@python.org>

https://github.com/python/cpython/commit/b6558d768f19584ad724be23030603280f9e6361
commit: b6558d768f19584ad724be23030603280f9e6361
branch: main
author: finefoot <33361833+finefoot at users.noreply.github.com>
committer: rhettinger <rhettinger at users.noreply.github.com>
date: 2022-07-07T09:55:33-05:00
summary:

gh-94343: Ease initialization of reprlib.Repr attributes (GH-94581)

files:
A Misc/NEWS.d/next/Library/2022-07-05-17-22-00.gh-issue-94343.kf4H5r.rst
M Doc/library/reprlib.rst
M Lib/reprlib.py
M Lib/test/test_reprlib.py

diff --git a/Doc/library/reprlib.rst b/Doc/library/reprlib.rst
index 4b37c5ba60f4e..bb94b6089ad3d 100644
--- a/Doc/library/reprlib.rst
+++ b/Doc/library/reprlib.rst
@@ -17,12 +17,31 @@ debugger and may be useful in other contexts as well.
 This module provides a class, an instance, and a function:
 
 
-.. class:: Repr()
+.. class:: Repr(*, maxlevel=6, maxtuple=6, maxlist=6, maxarray=5, maxdict=4, \
+                maxset=6, maxfrozenset=6, maxdeque=6, maxstring=30, maxlong=40, \
+                maxother=30, fillvalue="...")
 
    Class which provides formatting services useful in implementing functions
    similar to the built-in :func:`repr`; size limits for  different object types
    are added to avoid the generation of representations which are excessively long.
 
+   The keyword arguments of the constructor can be used as a shortcut to set the
+   attributes of the :class:`Repr` instance. Which means that the following
+   initialization::
+
+      aRepr = reprlib.Repr(maxlevel=3)
+
+   Is equivalent to::
+
+      aRepr = reprlib.Repr()
+      aRepr.maxlevel = 3
+
+   See section `Repr Objects`_ for more information about :class:`Repr`
+   attributes.
+
+   .. versionchanged:: 3.12
+      Allow attributes to be set via keyword arguments.
+
 
 .. data:: aRepr
 
diff --git a/Lib/reprlib.py b/Lib/reprlib.py
index f3518df105e41..c33b4da166fac 100644
--- a/Lib/reprlib.py
+++ b/Lib/reprlib.py
@@ -35,19 +35,23 @@ def wrapper(self):
 
 class Repr:
 
-    def __init__(self):
-        self.fillvalue = '...'
-        self.maxlevel = 6
-        self.maxtuple = 6
-        self.maxlist = 6
-        self.maxarray = 5
-        self.maxdict = 4
-        self.maxset = 6
-        self.maxfrozenset = 6
-        self.maxdeque = 6
-        self.maxstring = 30
-        self.maxlong = 40
-        self.maxother = 30
+    def __init__(
+        self, *, maxlevel=6, maxtuple=6, maxlist=6, maxarray=5, maxdict=4,
+        maxset=6, maxfrozenset=6, maxdeque=6, maxstring=30, maxlong=40,
+        maxother=30, fillvalue='...',
+    ):
+        self.maxlevel = maxlevel
+        self.maxtuple = maxtuple
+        self.maxlist = maxlist
+        self.maxarray = maxarray
+        self.maxdict = maxdict
+        self.maxset = maxset
+        self.maxfrozenset = maxfrozenset
+        self.maxdeque = maxdeque
+        self.maxstring = maxstring
+        self.maxlong = maxlong
+        self.maxother = maxother
+        self.fillvalue = fillvalue
 
     def repr(self, x):
         return self.repr1(x, self.maxlevel)
diff --git a/Lib/test/test_reprlib.py b/Lib/test/test_reprlib.py
index aa326399ab224..5119511f5d689 100644
--- a/Lib/test/test_reprlib.py
+++ b/Lib/test/test_reprlib.py
@@ -25,6 +25,28 @@ def nestedTuple(nesting):
 
 class ReprTests(unittest.TestCase):
 
+    def test_init_kwargs(self):
+        example_kwargs = {
+            "maxlevel": 101,
+            "maxtuple": 102,
+            "maxlist": 103,
+            "maxarray": 104,
+            "maxdict": 105,
+            "maxset": 106,
+            "maxfrozenset": 107,
+            "maxdeque": 108,
+            "maxstring": 109,
+            "maxlong": 110,
+            "maxother": 111,
+            "fillvalue": "x" * 112,
+        }
+        r1 = Repr()
+        for attr, val in example_kwargs.items():
+            setattr(r1, attr, val)
+        r2 = Repr(**example_kwargs)
+        for attr in example_kwargs:
+            self.assertEqual(getattr(r1, attr), getattr(r2, attr), msg=attr)
+
     def test_string(self):
         eq = self.assertEqual
         eq(r("abc"), "'abc'")
diff --git a/Misc/NEWS.d/next/Library/2022-07-05-17-22-00.gh-issue-94343.kf4H5r.rst b/Misc/NEWS.d/next/Library/2022-07-05-17-22-00.gh-issue-94343.kf4H5r.rst
new file mode 100644
index 0000000000000..f666c2b0ec125
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2022-07-05-17-22-00.gh-issue-94343.kf4H5r.rst
@@ -0,0 +1 @@
+Allow setting the attributes of ``reprlib.Repr`` during object initialization


From webhook-mailer at python.org  Thu Jul  7 15:59:47 2022
From: webhook-mailer at python.org (miss-islington)
Date: Thu, 07 Jul 2022 19:59:47 -0000
Subject: [Python-checkins] gh-93654: Add module docstring to pathlib
 (GH-94611)
Message-ID: <mailman.2140.1657223988.20746.python-checkins@python.org>

https://github.com/python/cpython/commit/afd6a37ad159cf7cc632ee4680cd50cef0ceb006
commit: afd6a37ad159cf7cc632ee4680cd50cef0ceb006
branch: main
author: Samuel Sloniker <sam at kj7rrv.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-07T12:59:29-07:00
summary:

gh-93654: Add module docstring to pathlib (GH-94611)



Issue: gh-93654

files:
M Lib/pathlib.py

diff --git a/Lib/pathlib.py b/Lib/pathlib.py
index bb440c9d57216..69e7d558a056f 100644
--- a/Lib/pathlib.py
+++ b/Lib/pathlib.py
@@ -1,3 +1,10 @@
+"""Object-oriented filesystem paths.
+
+This module provides classes to represent abstract paths and concrete
+paths with operations that have semantics appropriate for different
+operating systems.
+"""
+
 import fnmatch
 import functools
 import io


From webhook-mailer at python.org  Thu Jul  7 16:04:15 2022
From: webhook-mailer at python.org (miss-islington)
Date: Thu, 07 Jul 2022 20:04:15 -0000
Subject: [Python-checkins] GH-90699: Move generated static initializer to
 pycore_runtime_generated.h (GH-94051)
Message-ID: <mailman.2141.1657224256.20746.python-checkins@python.org>

https://github.com/python/cpython/commit/71697664d71e09dcf34aac41f6c100350efc3726
commit: 71697664d71e09dcf34aac41f6c100350efc3726
branch: main
author: Kumar Aditya <59607654+kumaraditya303 at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-07T13:04:05-07:00
summary:

GH-90699: Move generated static initializer to pycore_runtime_generated.h (GH-94051)

files:
A Include/internal/pycore_runtime_init_generated.h
M .gitattributes
M Include/internal/pycore_runtime_init.h
M Makefile.pre.in
M PCbuild/pythoncore.vcxproj
M PCbuild/pythoncore.vcxproj.filters
M Tools/scripts/generate_global_objects.py

diff --git a/.gitattributes b/.gitattributes
index 6da587a4c6ea5..fb11ddb6dfae1 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -62,26 +62,27 @@ PCbuild/readme.txt  dos
 #
 [attr]generated linguist-generated=true diff=generated
 
-**/clinic/*.c.h                              generated
-*_db.h                                       generated
-Doc/data/stable_abi.dat                      generated
-Doc/library/token-list.inc                   generated
-Include/internal/pycore_ast.h                generated
-Include/internal/pycore_ast_state.h          generated
-Include/internal/pycore_opcode.h             generated
-Include/opcode.h                             generated
-Include/token.h                              generated
-Lib/keyword.py                               generated
-Lib/test/test_stable_abi_ctypes.py           generated
-Lib/token.py                                 generated
-Objects/typeslots.inc                        generated
-PC/python3dll.c                              generated
-Parser/parser.c                              generated
-Parser/token.c                               generated
-Programs/test_frozenmain.h                   generated
-Python/Python-ast.c                          generated
-Python/opcode_targets.h                      generated
-Python/stdlib_module_names.h                 generated
-Tools/peg_generator/pegen/grammar_parser.py  generated
-aclocal.m4                                   generated
-configure                                    generated
+**/clinic/*.c.h                                     generated
+*_db.h                                              generated
+Doc/data/stable_abi.dat                             generated
+Doc/library/token-list.inc                          generated
+Include/internal/pycore_ast.h                       generated
+Include/internal/pycore_ast_state.h                 generated
+Include/internal/pycore_opcode.h                    generated
+Include/internal/pycore_runtime_init_generated.h    generated
+Include/opcode.h                                    generated
+Include/token.h                                     generated
+Lib/keyword.py                                      generated
+Lib/test/test_stable_abi_ctypes.py                  generated
+Lib/token.py                                        generated
+Objects/typeslots.inc                               generated
+PC/python3dll.c                                     generated
+Parser/parser.c                                     generated
+Parser/token.c                                      generated
+Programs/test_frozenmain.h                          generated
+Python/Python-ast.c                                 generated
+Python/opcode_targets.h                             generated
+Python/stdlib_module_names.h                        generated
+Tools/peg_generator/pegen/grammar_parser.py         generated
+aclocal.m4                                          generated
+configure                                           generated
diff --git a/Include/internal/pycore_runtime_init.h b/Include/internal/pycore_runtime_init.h
index a7a436011d9b4..c14d25941348b 100644
--- a/Include/internal/pycore_runtime_init.h
+++ b/Include/internal/pycore_runtime_init.h
@@ -121,1131 +121,7 @@ extern "C" {
         ._data = (LITERAL), \
     }
 
-/* The following is auto-generated by Tools/scripts/generate_global_objects.py. */
-#define _Py_global_objects_INIT { \
-    .singletons = { \
-        .small_ints = { \
-            _PyLong_DIGIT_INIT(-5), \
-            _PyLong_DIGIT_INIT(-4), \
-            _PyLong_DIGIT_INIT(-3), \
-            _PyLong_DIGIT_INIT(-2), \
-            _PyLong_DIGIT_INIT(-1), \
-            _PyLong_DIGIT_INIT(0), \
-            _PyLong_DIGIT_INIT(1), \
-            _PyLong_DIGIT_INIT(2), \
-            _PyLong_DIGIT_INIT(3), \
-            _PyLong_DIGIT_INIT(4), \
-            _PyLong_DIGIT_INIT(5), \
-            _PyLong_DIGIT_INIT(6), \
-            _PyLong_DIGIT_INIT(7), \
-            _PyLong_DIGIT_INIT(8), \
-            _PyLong_DIGIT_INIT(9), \
-            _PyLong_DIGIT_INIT(10), \
-            _PyLong_DIGIT_INIT(11), \
-            _PyLong_DIGIT_INIT(12), \
-            _PyLong_DIGIT_INIT(13), \
-            _PyLong_DIGIT_INIT(14), \
-            _PyLong_DIGIT_INIT(15), \
-            _PyLong_DIGIT_INIT(16), \
-            _PyLong_DIGIT_INIT(17), \
-            _PyLong_DIGIT_INIT(18), \
-            _PyLong_DIGIT_INIT(19), \
-            _PyLong_DIGIT_INIT(20), \
-            _PyLong_DIGIT_INIT(21), \
-            _PyLong_DIGIT_INIT(22), \
-            _PyLong_DIGIT_INIT(23), \
-            _PyLong_DIGIT_INIT(24), \
-            _PyLong_DIGIT_INIT(25), \
-            _PyLong_DIGIT_INIT(26), \
-            _PyLong_DIGIT_INIT(27), \
-            _PyLong_DIGIT_INIT(28), \
-            _PyLong_DIGIT_INIT(29), \
-            _PyLong_DIGIT_INIT(30), \
-            _PyLong_DIGIT_INIT(31), \
-            _PyLong_DIGIT_INIT(32), \
-            _PyLong_DIGIT_INIT(33), \
-            _PyLong_DIGIT_INIT(34), \
-            _PyLong_DIGIT_INIT(35), \
-            _PyLong_DIGIT_INIT(36), \
-            _PyLong_DIGIT_INIT(37), \
-            _PyLong_DIGIT_INIT(38), \
-            _PyLong_DIGIT_INIT(39), \
-            _PyLong_DIGIT_INIT(40), \
-            _PyLong_DIGIT_INIT(41), \
-            _PyLong_DIGIT_INIT(42), \
-            _PyLong_DIGIT_INIT(43), \
-            _PyLong_DIGIT_INIT(44), \
-            _PyLong_DIGIT_INIT(45), \
-            _PyLong_DIGIT_INIT(46), \
-            _PyLong_DIGIT_INIT(47), \
-            _PyLong_DIGIT_INIT(48), \
-            _PyLong_DIGIT_INIT(49), \
-            _PyLong_DIGIT_INIT(50), \
-            _PyLong_DIGIT_INIT(51), \
-            _PyLong_DIGIT_INIT(52), \
-            _PyLong_DIGIT_INIT(53), \
-            _PyLong_DIGIT_INIT(54), \
-            _PyLong_DIGIT_INIT(55), \
-            _PyLong_DIGIT_INIT(56), \
-            _PyLong_DIGIT_INIT(57), \
-            _PyLong_DIGIT_INIT(58), \
-            _PyLong_DIGIT_INIT(59), \
-            _PyLong_DIGIT_INIT(60), \
-            _PyLong_DIGIT_INIT(61), \
-            _PyLong_DIGIT_INIT(62), \
-            _PyLong_DIGIT_INIT(63), \
-            _PyLong_DIGIT_INIT(64), \
-            _PyLong_DIGIT_INIT(65), \
-            _PyLong_DIGIT_INIT(66), \
-            _PyLong_DIGIT_INIT(67), \
-            _PyLong_DIGIT_INIT(68), \
-            _PyLong_DIGIT_INIT(69), \
-            _PyLong_DIGIT_INIT(70), \
-            _PyLong_DIGIT_INIT(71), \
-            _PyLong_DIGIT_INIT(72), \
-            _PyLong_DIGIT_INIT(73), \
-            _PyLong_DIGIT_INIT(74), \
-            _PyLong_DIGIT_INIT(75), \
-            _PyLong_DIGIT_INIT(76), \
-            _PyLong_DIGIT_INIT(77), \
-            _PyLong_DIGIT_INIT(78), \
-            _PyLong_DIGIT_INIT(79), \
-            _PyLong_DIGIT_INIT(80), \
-            _PyLong_DIGIT_INIT(81), \
-            _PyLong_DIGIT_INIT(82), \
-            _PyLong_DIGIT_INIT(83), \
-            _PyLong_DIGIT_INIT(84), \
-            _PyLong_DIGIT_INIT(85), \
-            _PyLong_DIGIT_INIT(86), \
-            _PyLong_DIGIT_INIT(87), \
-            _PyLong_DIGIT_INIT(88), \
-            _PyLong_DIGIT_INIT(89), \
-            _PyLong_DIGIT_INIT(90), \
-            _PyLong_DIGIT_INIT(91), \
-            _PyLong_DIGIT_INIT(92), \
-            _PyLong_DIGIT_INIT(93), \
-            _PyLong_DIGIT_INIT(94), \
-            _PyLong_DIGIT_INIT(95), \
-            _PyLong_DIGIT_INIT(96), \
-            _PyLong_DIGIT_INIT(97), \
-            _PyLong_DIGIT_INIT(98), \
-            _PyLong_DIGIT_INIT(99), \
-            _PyLong_DIGIT_INIT(100), \
-            _PyLong_DIGIT_INIT(101), \
-            _PyLong_DIGIT_INIT(102), \
-            _PyLong_DIGIT_INIT(103), \
-            _PyLong_DIGIT_INIT(104), \
-            _PyLong_DIGIT_INIT(105), \
-            _PyLong_DIGIT_INIT(106), \
-            _PyLong_DIGIT_INIT(107), \
-            _PyLong_DIGIT_INIT(108), \
-            _PyLong_DIGIT_INIT(109), \
-            _PyLong_DIGIT_INIT(110), \
-            _PyLong_DIGIT_INIT(111), \
-            _PyLong_DIGIT_INIT(112), \
-            _PyLong_DIGIT_INIT(113), \
-            _PyLong_DIGIT_INIT(114), \
-            _PyLong_DIGIT_INIT(115), \
-            _PyLong_DIGIT_INIT(116), \
-            _PyLong_DIGIT_INIT(117), \
-            _PyLong_DIGIT_INIT(118), \
-            _PyLong_DIGIT_INIT(119), \
-            _PyLong_DIGIT_INIT(120), \
-            _PyLong_DIGIT_INIT(121), \
-            _PyLong_DIGIT_INIT(122), \
-            _PyLong_DIGIT_INIT(123), \
-            _PyLong_DIGIT_INIT(124), \
-            _PyLong_DIGIT_INIT(125), \
-            _PyLong_DIGIT_INIT(126), \
-            _PyLong_DIGIT_INIT(127), \
-            _PyLong_DIGIT_INIT(128), \
-            _PyLong_DIGIT_INIT(129), \
-            _PyLong_DIGIT_INIT(130), \
-            _PyLong_DIGIT_INIT(131), \
-            _PyLong_DIGIT_INIT(132), \
-            _PyLong_DIGIT_INIT(133), \
-            _PyLong_DIGIT_INIT(134), \
-            _PyLong_DIGIT_INIT(135), \
-            _PyLong_DIGIT_INIT(136), \
-            _PyLong_DIGIT_INIT(137), \
-            _PyLong_DIGIT_INIT(138), \
-            _PyLong_DIGIT_INIT(139), \
-            _PyLong_DIGIT_INIT(140), \
-            _PyLong_DIGIT_INIT(141), \
-            _PyLong_DIGIT_INIT(142), \
-            _PyLong_DIGIT_INIT(143), \
-            _PyLong_DIGIT_INIT(144), \
-            _PyLong_DIGIT_INIT(145), \
-            _PyLong_DIGIT_INIT(146), \
-            _PyLong_DIGIT_INIT(147), \
-            _PyLong_DIGIT_INIT(148), \
-            _PyLong_DIGIT_INIT(149), \
-            _PyLong_DIGIT_INIT(150), \
-            _PyLong_DIGIT_INIT(151), \
-            _PyLong_DIGIT_INIT(152), \
-            _PyLong_DIGIT_INIT(153), \
-            _PyLong_DIGIT_INIT(154), \
-            _PyLong_DIGIT_INIT(155), \
-            _PyLong_DIGIT_INIT(156), \
-            _PyLong_DIGIT_INIT(157), \
-            _PyLong_DIGIT_INIT(158), \
-            _PyLong_DIGIT_INIT(159), \
-            _PyLong_DIGIT_INIT(160), \
-            _PyLong_DIGIT_INIT(161), \
-            _PyLong_DIGIT_INIT(162), \
-            _PyLong_DIGIT_INIT(163), \
-            _PyLong_DIGIT_INIT(164), \
-            _PyLong_DIGIT_INIT(165), \
-            _PyLong_DIGIT_INIT(166), \
-            _PyLong_DIGIT_INIT(167), \
-            _PyLong_DIGIT_INIT(168), \
-            _PyLong_DIGIT_INIT(169), \
-            _PyLong_DIGIT_INIT(170), \
-            _PyLong_DIGIT_INIT(171), \
-            _PyLong_DIGIT_INIT(172), \
-            _PyLong_DIGIT_INIT(173), \
-            _PyLong_DIGIT_INIT(174), \
-            _PyLong_DIGIT_INIT(175), \
-            _PyLong_DIGIT_INIT(176), \
-            _PyLong_DIGIT_INIT(177), \
-            _PyLong_DIGIT_INIT(178), \
-            _PyLong_DIGIT_INIT(179), \
-            _PyLong_DIGIT_INIT(180), \
-            _PyLong_DIGIT_INIT(181), \
-            _PyLong_DIGIT_INIT(182), \
-            _PyLong_DIGIT_INIT(183), \
-            _PyLong_DIGIT_INIT(184), \
-            _PyLong_DIGIT_INIT(185), \
-            _PyLong_DIGIT_INIT(186), \
-            _PyLong_DIGIT_INIT(187), \
-            _PyLong_DIGIT_INIT(188), \
-            _PyLong_DIGIT_INIT(189), \
-            _PyLong_DIGIT_INIT(190), \
-            _PyLong_DIGIT_INIT(191), \
-            _PyLong_DIGIT_INIT(192), \
-            _PyLong_DIGIT_INIT(193), \
-            _PyLong_DIGIT_INIT(194), \
-            _PyLong_DIGIT_INIT(195), \
-            _PyLong_DIGIT_INIT(196), \
-            _PyLong_DIGIT_INIT(197), \
-            _PyLong_DIGIT_INIT(198), \
-            _PyLong_DIGIT_INIT(199), \
-            _PyLong_DIGIT_INIT(200), \
-            _PyLong_DIGIT_INIT(201), \
-            _PyLong_DIGIT_INIT(202), \
-            _PyLong_DIGIT_INIT(203), \
-            _PyLong_DIGIT_INIT(204), \
-            _PyLong_DIGIT_INIT(205), \
-            _PyLong_DIGIT_INIT(206), \
-            _PyLong_DIGIT_INIT(207), \
-            _PyLong_DIGIT_INIT(208), \
-            _PyLong_DIGIT_INIT(209), \
-            _PyLong_DIGIT_INIT(210), \
-            _PyLong_DIGIT_INIT(211), \
-            _PyLong_DIGIT_INIT(212), \
-            _PyLong_DIGIT_INIT(213), \
-            _PyLong_DIGIT_INIT(214), \
-            _PyLong_DIGIT_INIT(215), \
-            _PyLong_DIGIT_INIT(216), \
-            _PyLong_DIGIT_INIT(217), \
-            _PyLong_DIGIT_INIT(218), \
-            _PyLong_DIGIT_INIT(219), \
-            _PyLong_DIGIT_INIT(220), \
-            _PyLong_DIGIT_INIT(221), \
-            _PyLong_DIGIT_INIT(222), \
-            _PyLong_DIGIT_INIT(223), \
-            _PyLong_DIGIT_INIT(224), \
-            _PyLong_DIGIT_INIT(225), \
-            _PyLong_DIGIT_INIT(226), \
-            _PyLong_DIGIT_INIT(227), \
-            _PyLong_DIGIT_INIT(228), \
-            _PyLong_DIGIT_INIT(229), \
-            _PyLong_DIGIT_INIT(230), \
-            _PyLong_DIGIT_INIT(231), \
-            _PyLong_DIGIT_INIT(232), \
-            _PyLong_DIGIT_INIT(233), \
-            _PyLong_DIGIT_INIT(234), \
-            _PyLong_DIGIT_INIT(235), \
-            _PyLong_DIGIT_INIT(236), \
-            _PyLong_DIGIT_INIT(237), \
-            _PyLong_DIGIT_INIT(238), \
-            _PyLong_DIGIT_INIT(239), \
-            _PyLong_DIGIT_INIT(240), \
-            _PyLong_DIGIT_INIT(241), \
-            _PyLong_DIGIT_INIT(242), \
-            _PyLong_DIGIT_INIT(243), \
-            _PyLong_DIGIT_INIT(244), \
-            _PyLong_DIGIT_INIT(245), \
-            _PyLong_DIGIT_INIT(246), \
-            _PyLong_DIGIT_INIT(247), \
-            _PyLong_DIGIT_INIT(248), \
-            _PyLong_DIGIT_INIT(249), \
-            _PyLong_DIGIT_INIT(250), \
-            _PyLong_DIGIT_INIT(251), \
-            _PyLong_DIGIT_INIT(252), \
-            _PyLong_DIGIT_INIT(253), \
-            _PyLong_DIGIT_INIT(254), \
-            _PyLong_DIGIT_INIT(255), \
-            _PyLong_DIGIT_INIT(256), \
-        }, \
-        \
-        .bytes_empty = _PyBytes_SIMPLE_INIT(0, 0), \
-        .bytes_characters = { \
-            _PyBytes_CHAR_INIT(0), \
-            _PyBytes_CHAR_INIT(1), \
-            _PyBytes_CHAR_INIT(2), \
-            _PyBytes_CHAR_INIT(3), \
-            _PyBytes_CHAR_INIT(4), \
-            _PyBytes_CHAR_INIT(5), \
-            _PyBytes_CHAR_INIT(6), \
-            _PyBytes_CHAR_INIT(7), \
-            _PyBytes_CHAR_INIT(8), \
-            _PyBytes_CHAR_INIT(9), \
-            _PyBytes_CHAR_INIT(10), \
-            _PyBytes_CHAR_INIT(11), \
-            _PyBytes_CHAR_INIT(12), \
-            _PyBytes_CHAR_INIT(13), \
-            _PyBytes_CHAR_INIT(14), \
-            _PyBytes_CHAR_INIT(15), \
-            _PyBytes_CHAR_INIT(16), \
-            _PyBytes_CHAR_INIT(17), \
-            _PyBytes_CHAR_INIT(18), \
-            _PyBytes_CHAR_INIT(19), \
-            _PyBytes_CHAR_INIT(20), \
-            _PyBytes_CHAR_INIT(21), \
-            _PyBytes_CHAR_INIT(22), \
-            _PyBytes_CHAR_INIT(23), \
-            _PyBytes_CHAR_INIT(24), \
-            _PyBytes_CHAR_INIT(25), \
-            _PyBytes_CHAR_INIT(26), \
-            _PyBytes_CHAR_INIT(27), \
-            _PyBytes_CHAR_INIT(28), \
-            _PyBytes_CHAR_INIT(29), \
-            _PyBytes_CHAR_INIT(30), \
-            _PyBytes_CHAR_INIT(31), \
-            _PyBytes_CHAR_INIT(32), \
-            _PyBytes_CHAR_INIT(33), \
-            _PyBytes_CHAR_INIT(34), \
-            _PyBytes_CHAR_INIT(35), \
-            _PyBytes_CHAR_INIT(36), \
-            _PyBytes_CHAR_INIT(37), \
-            _PyBytes_CHAR_INIT(38), \
-            _PyBytes_CHAR_INIT(39), \
-            _PyBytes_CHAR_INIT(40), \
-            _PyBytes_CHAR_INIT(41), \
-            _PyBytes_CHAR_INIT(42), \
-            _PyBytes_CHAR_INIT(43), \
-            _PyBytes_CHAR_INIT(44), \
-            _PyBytes_CHAR_INIT(45), \
-            _PyBytes_CHAR_INIT(46), \
-            _PyBytes_CHAR_INIT(47), \
-            _PyBytes_CHAR_INIT(48), \
-            _PyBytes_CHAR_INIT(49), \
-            _PyBytes_CHAR_INIT(50), \
-            _PyBytes_CHAR_INIT(51), \
-            _PyBytes_CHAR_INIT(52), \
-            _PyBytes_CHAR_INIT(53), \
-            _PyBytes_CHAR_INIT(54), \
-            _PyBytes_CHAR_INIT(55), \
-            _PyBytes_CHAR_INIT(56), \
-            _PyBytes_CHAR_INIT(57), \
-            _PyBytes_CHAR_INIT(58), \
-            _PyBytes_CHAR_INIT(59), \
-            _PyBytes_CHAR_INIT(60), \
-            _PyBytes_CHAR_INIT(61), \
-            _PyBytes_CHAR_INIT(62), \
-            _PyBytes_CHAR_INIT(63), \
-            _PyBytes_CHAR_INIT(64), \
-            _PyBytes_CHAR_INIT(65), \
-            _PyBytes_CHAR_INIT(66), \
-            _PyBytes_CHAR_INIT(67), \
-            _PyBytes_CHAR_INIT(68), \
-            _PyBytes_CHAR_INIT(69), \
-            _PyBytes_CHAR_INIT(70), \
-            _PyBytes_CHAR_INIT(71), \
-            _PyBytes_CHAR_INIT(72), \
-            _PyBytes_CHAR_INIT(73), \
-            _PyBytes_CHAR_INIT(74), \
-            _PyBytes_CHAR_INIT(75), \
-            _PyBytes_CHAR_INIT(76), \
-            _PyBytes_CHAR_INIT(77), \
-            _PyBytes_CHAR_INIT(78), \
-            _PyBytes_CHAR_INIT(79), \
-            _PyBytes_CHAR_INIT(80), \
-            _PyBytes_CHAR_INIT(81), \
-            _PyBytes_CHAR_INIT(82), \
-            _PyBytes_CHAR_INIT(83), \
-            _PyBytes_CHAR_INIT(84), \
-            _PyBytes_CHAR_INIT(85), \
-            _PyBytes_CHAR_INIT(86), \
-            _PyBytes_CHAR_INIT(87), \
-            _PyBytes_CHAR_INIT(88), \
-            _PyBytes_CHAR_INIT(89), \
-            _PyBytes_CHAR_INIT(90), \
-            _PyBytes_CHAR_INIT(91), \
-            _PyBytes_CHAR_INIT(92), \
-            _PyBytes_CHAR_INIT(93), \
-            _PyBytes_CHAR_INIT(94), \
-            _PyBytes_CHAR_INIT(95), \
-            _PyBytes_CHAR_INIT(96), \
-            _PyBytes_CHAR_INIT(97), \
-            _PyBytes_CHAR_INIT(98), \
-            _PyBytes_CHAR_INIT(99), \
-            _PyBytes_CHAR_INIT(100), \
-            _PyBytes_CHAR_INIT(101), \
-            _PyBytes_CHAR_INIT(102), \
-            _PyBytes_CHAR_INIT(103), \
-            _PyBytes_CHAR_INIT(104), \
-            _PyBytes_CHAR_INIT(105), \
-            _PyBytes_CHAR_INIT(106), \
-            _PyBytes_CHAR_INIT(107), \
-            _PyBytes_CHAR_INIT(108), \
-            _PyBytes_CHAR_INIT(109), \
-            _PyBytes_CHAR_INIT(110), \
-            _PyBytes_CHAR_INIT(111), \
-            _PyBytes_CHAR_INIT(112), \
-            _PyBytes_CHAR_INIT(113), \
-            _PyBytes_CHAR_INIT(114), \
-            _PyBytes_CHAR_INIT(115), \
-            _PyBytes_CHAR_INIT(116), \
-            _PyBytes_CHAR_INIT(117), \
-            _PyBytes_CHAR_INIT(118), \
-            _PyBytes_CHAR_INIT(119), \
-            _PyBytes_CHAR_INIT(120), \
-            _PyBytes_CHAR_INIT(121), \
-            _PyBytes_CHAR_INIT(122), \
-            _PyBytes_CHAR_INIT(123), \
-            _PyBytes_CHAR_INIT(124), \
-            _PyBytes_CHAR_INIT(125), \
-            _PyBytes_CHAR_INIT(126), \
-            _PyBytes_CHAR_INIT(127), \
-            _PyBytes_CHAR_INIT(128), \
-            _PyBytes_CHAR_INIT(129), \
-            _PyBytes_CHAR_INIT(130), \
-            _PyBytes_CHAR_INIT(131), \
-            _PyBytes_CHAR_INIT(132), \
-            _PyBytes_CHAR_INIT(133), \
-            _PyBytes_CHAR_INIT(134), \
-            _PyBytes_CHAR_INIT(135), \
-            _PyBytes_CHAR_INIT(136), \
-            _PyBytes_CHAR_INIT(137), \
-            _PyBytes_CHAR_INIT(138), \
-            _PyBytes_CHAR_INIT(139), \
-            _PyBytes_CHAR_INIT(140), \
-            _PyBytes_CHAR_INIT(141), \
-            _PyBytes_CHAR_INIT(142), \
-            _PyBytes_CHAR_INIT(143), \
-            _PyBytes_CHAR_INIT(144), \
-            _PyBytes_CHAR_INIT(145), \
-            _PyBytes_CHAR_INIT(146), \
-            _PyBytes_CHAR_INIT(147), \
-            _PyBytes_CHAR_INIT(148), \
-            _PyBytes_CHAR_INIT(149), \
-            _PyBytes_CHAR_INIT(150), \
-            _PyBytes_CHAR_INIT(151), \
-            _PyBytes_CHAR_INIT(152), \
-            _PyBytes_CHAR_INIT(153), \
-            _PyBytes_CHAR_INIT(154), \
-            _PyBytes_CHAR_INIT(155), \
-            _PyBytes_CHAR_INIT(156), \
-            _PyBytes_CHAR_INIT(157), \
-            _PyBytes_CHAR_INIT(158), \
-            _PyBytes_CHAR_INIT(159), \
-            _PyBytes_CHAR_INIT(160), \
-            _PyBytes_CHAR_INIT(161), \
-            _PyBytes_CHAR_INIT(162), \
-            _PyBytes_CHAR_INIT(163), \
-            _PyBytes_CHAR_INIT(164), \
-            _PyBytes_CHAR_INIT(165), \
-            _PyBytes_CHAR_INIT(166), \
-            _PyBytes_CHAR_INIT(167), \
-            _PyBytes_CHAR_INIT(168), \
-            _PyBytes_CHAR_INIT(169), \
-            _PyBytes_CHAR_INIT(170), \
-            _PyBytes_CHAR_INIT(171), \
-            _PyBytes_CHAR_INIT(172), \
-            _PyBytes_CHAR_INIT(173), \
-            _PyBytes_CHAR_INIT(174), \
-            _PyBytes_CHAR_INIT(175), \
-            _PyBytes_CHAR_INIT(176), \
-            _PyBytes_CHAR_INIT(177), \
-            _PyBytes_CHAR_INIT(178), \
-            _PyBytes_CHAR_INIT(179), \
-            _PyBytes_CHAR_INIT(180), \
-            _PyBytes_CHAR_INIT(181), \
-            _PyBytes_CHAR_INIT(182), \
-            _PyBytes_CHAR_INIT(183), \
-            _PyBytes_CHAR_INIT(184), \
-            _PyBytes_CHAR_INIT(185), \
-            _PyBytes_CHAR_INIT(186), \
-            _PyBytes_CHAR_INIT(187), \
-            _PyBytes_CHAR_INIT(188), \
-            _PyBytes_CHAR_INIT(189), \
-            _PyBytes_CHAR_INIT(190), \
-            _PyBytes_CHAR_INIT(191), \
-            _PyBytes_CHAR_INIT(192), \
-            _PyBytes_CHAR_INIT(193), \
-            _PyBytes_CHAR_INIT(194), \
-            _PyBytes_CHAR_INIT(195), \
-            _PyBytes_CHAR_INIT(196), \
-            _PyBytes_CHAR_INIT(197), \
-            _PyBytes_CHAR_INIT(198), \
-            _PyBytes_CHAR_INIT(199), \
-            _PyBytes_CHAR_INIT(200), \
-            _PyBytes_CHAR_INIT(201), \
-            _PyBytes_CHAR_INIT(202), \
-            _PyBytes_CHAR_INIT(203), \
-            _PyBytes_CHAR_INIT(204), \
-            _PyBytes_CHAR_INIT(205), \
-            _PyBytes_CHAR_INIT(206), \
-            _PyBytes_CHAR_INIT(207), \
-            _PyBytes_CHAR_INIT(208), \
-            _PyBytes_CHAR_INIT(209), \
-            _PyBytes_CHAR_INIT(210), \
-            _PyBytes_CHAR_INIT(211), \
-            _PyBytes_CHAR_INIT(212), \
-            _PyBytes_CHAR_INIT(213), \
-            _PyBytes_CHAR_INIT(214), \
-            _PyBytes_CHAR_INIT(215), \
-            _PyBytes_CHAR_INIT(216), \
-            _PyBytes_CHAR_INIT(217), \
-            _PyBytes_CHAR_INIT(218), \
-            _PyBytes_CHAR_INIT(219), \
-            _PyBytes_CHAR_INIT(220), \
-            _PyBytes_CHAR_INIT(221), \
-            _PyBytes_CHAR_INIT(222), \
-            _PyBytes_CHAR_INIT(223), \
-            _PyBytes_CHAR_INIT(224), \
-            _PyBytes_CHAR_INIT(225), \
-            _PyBytes_CHAR_INIT(226), \
-            _PyBytes_CHAR_INIT(227), \
-            _PyBytes_CHAR_INIT(228), \
-            _PyBytes_CHAR_INIT(229), \
-            _PyBytes_CHAR_INIT(230), \
-            _PyBytes_CHAR_INIT(231), \
-            _PyBytes_CHAR_INIT(232), \
-            _PyBytes_CHAR_INIT(233), \
-            _PyBytes_CHAR_INIT(234), \
-            _PyBytes_CHAR_INIT(235), \
-            _PyBytes_CHAR_INIT(236), \
-            _PyBytes_CHAR_INIT(237), \
-            _PyBytes_CHAR_INIT(238), \
-            _PyBytes_CHAR_INIT(239), \
-            _PyBytes_CHAR_INIT(240), \
-            _PyBytes_CHAR_INIT(241), \
-            _PyBytes_CHAR_INIT(242), \
-            _PyBytes_CHAR_INIT(243), \
-            _PyBytes_CHAR_INIT(244), \
-            _PyBytes_CHAR_INIT(245), \
-            _PyBytes_CHAR_INIT(246), \
-            _PyBytes_CHAR_INIT(247), \
-            _PyBytes_CHAR_INIT(248), \
-            _PyBytes_CHAR_INIT(249), \
-            _PyBytes_CHAR_INIT(250), \
-            _PyBytes_CHAR_INIT(251), \
-            _PyBytes_CHAR_INIT(252), \
-            _PyBytes_CHAR_INIT(253), \
-            _PyBytes_CHAR_INIT(254), \
-            _PyBytes_CHAR_INIT(255), \
-        }, \
-        \
-        .strings = { \
-            .literals = { \
-                INIT_STR(anon_dictcomp, "<dictcomp>"), \
-                INIT_STR(anon_genexpr, "<genexpr>"), \
-                INIT_STR(anon_lambda, "<lambda>"), \
-                INIT_STR(anon_listcomp, "<listcomp>"), \
-                INIT_STR(anon_module, "<module>"), \
-                INIT_STR(anon_setcomp, "<setcomp>"), \
-                INIT_STR(anon_string, "<string>"), \
-                INIT_STR(anon_unknown, "<unknown>"), \
-                INIT_STR(close_br, "}"), \
-                INIT_STR(comma_sep, ", "), \
-                INIT_STR(dbl_close_br, "}}"), \
-                INIT_STR(dbl_open_br, "{{"), \
-                INIT_STR(dbl_percent, "%%"), \
-                INIT_STR(dot, "."), \
-                INIT_STR(dot_locals, ".<locals>"), \
-                INIT_STR(empty, ""), \
-                INIT_STR(list_err, "list index out of range"), \
-                INIT_STR(newline, "\n"), \
-                INIT_STR(open_br, "{"), \
-                INIT_STR(percent, "%"), \
-                INIT_STR(utf_8, "utf-8"), \
-            }, \
-            .identifiers = { \
-                INIT_ID(False), \
-                INIT_ID(Py_Repr), \
-                INIT_ID(TextIOWrapper), \
-                INIT_ID(True), \
-                INIT_ID(WarningMessage), \
-                INIT_ID(_), \
-                INIT_ID(__IOBase_closed), \
-                INIT_ID(__abc_tpflags__), \
-                INIT_ID(__abs__), \
-                INIT_ID(__abstractmethods__), \
-                INIT_ID(__add__), \
-                INIT_ID(__aenter__), \
-                INIT_ID(__aexit__), \
-                INIT_ID(__aiter__), \
-                INIT_ID(__all__), \
-                INIT_ID(__and__), \
-                INIT_ID(__anext__), \
-                INIT_ID(__annotations__), \
-                INIT_ID(__args__), \
-                INIT_ID(__await__), \
-                INIT_ID(__bases__), \
-                INIT_ID(__bool__), \
-                INIT_ID(__build_class__), \
-                INIT_ID(__builtins__), \
-                INIT_ID(__bytes__), \
-                INIT_ID(__call__), \
-                INIT_ID(__cantrace__), \
-                INIT_ID(__class__), \
-                INIT_ID(__class_getitem__), \
-                INIT_ID(__classcell__), \
-                INIT_ID(__complex__), \
-                INIT_ID(__contains__), \
-                INIT_ID(__copy__), \
-                INIT_ID(__del__), \
-                INIT_ID(__delattr__), \
-                INIT_ID(__delete__), \
-                INIT_ID(__delitem__), \
-                INIT_ID(__dict__), \
-                INIT_ID(__dictoffset__), \
-                INIT_ID(__dir__), \
-                INIT_ID(__divmod__), \
-                INIT_ID(__doc__), \
-                INIT_ID(__enter__), \
-                INIT_ID(__eq__), \
-                INIT_ID(__exit__), \
-                INIT_ID(__file__), \
-                INIT_ID(__float__), \
-                INIT_ID(__floordiv__), \
-                INIT_ID(__format__), \
-                INIT_ID(__fspath__), \
-                INIT_ID(__ge__), \
-                INIT_ID(__get__), \
-                INIT_ID(__getattr__), \
-                INIT_ID(__getattribute__), \
-                INIT_ID(__getinitargs__), \
-                INIT_ID(__getitem__), \
-                INIT_ID(__getnewargs__), \
-                INIT_ID(__getnewargs_ex__), \
-                INIT_ID(__getstate__), \
-                INIT_ID(__gt__), \
-                INIT_ID(__hash__), \
-                INIT_ID(__iadd__), \
-                INIT_ID(__iand__), \
-                INIT_ID(__ifloordiv__), \
-                INIT_ID(__ilshift__), \
-                INIT_ID(__imatmul__), \
-                INIT_ID(__imod__), \
-                INIT_ID(__import__), \
-                INIT_ID(__imul__), \
-                INIT_ID(__index__), \
-                INIT_ID(__init__), \
-                INIT_ID(__init_subclass__), \
-                INIT_ID(__instancecheck__), \
-                INIT_ID(__int__), \
-                INIT_ID(__invert__), \
-                INIT_ID(__ior__), \
-                INIT_ID(__ipow__), \
-                INIT_ID(__irshift__), \
-                INIT_ID(__isabstractmethod__), \
-                INIT_ID(__isub__), \
-                INIT_ID(__iter__), \
-                INIT_ID(__itruediv__), \
-                INIT_ID(__ixor__), \
-                INIT_ID(__le__), \
-                INIT_ID(__len__), \
-                INIT_ID(__length_hint__), \
-                INIT_ID(__lltrace__), \
-                INIT_ID(__loader__), \
-                INIT_ID(__lshift__), \
-                INIT_ID(__lt__), \
-                INIT_ID(__main__), \
-                INIT_ID(__matmul__), \
-                INIT_ID(__missing__), \
-                INIT_ID(__mod__), \
-                INIT_ID(__module__), \
-                INIT_ID(__mro_entries__), \
-                INIT_ID(__mul__), \
-                INIT_ID(__name__), \
-                INIT_ID(__ne__), \
-                INIT_ID(__neg__), \
-                INIT_ID(__new__), \
-                INIT_ID(__newobj__), \
-                INIT_ID(__newobj_ex__), \
-                INIT_ID(__next__), \
-                INIT_ID(__notes__), \
-                INIT_ID(__or__), \
-                INIT_ID(__orig_class__), \
-                INIT_ID(__origin__), \
-                INIT_ID(__package__), \
-                INIT_ID(__parameters__), \
-                INIT_ID(__path__), \
-                INIT_ID(__pos__), \
-                INIT_ID(__pow__), \
-                INIT_ID(__prepare__), \
-                INIT_ID(__qualname__), \
-                INIT_ID(__radd__), \
-                INIT_ID(__rand__), \
-                INIT_ID(__rdivmod__), \
-                INIT_ID(__reduce__), \
-                INIT_ID(__reduce_ex__), \
-                INIT_ID(__repr__), \
-                INIT_ID(__reversed__), \
-                INIT_ID(__rfloordiv__), \
-                INIT_ID(__rlshift__), \
-                INIT_ID(__rmatmul__), \
-                INIT_ID(__rmod__), \
-                INIT_ID(__rmul__), \
-                INIT_ID(__ror__), \
-                INIT_ID(__round__), \
-                INIT_ID(__rpow__), \
-                INIT_ID(__rrshift__), \
-                INIT_ID(__rshift__), \
-                INIT_ID(__rsub__), \
-                INIT_ID(__rtruediv__), \
-                INIT_ID(__rxor__), \
-                INIT_ID(__set__), \
-                INIT_ID(__set_name__), \
-                INIT_ID(__setattr__), \
-                INIT_ID(__setitem__), \
-                INIT_ID(__setstate__), \
-                INIT_ID(__sizeof__), \
-                INIT_ID(__slotnames__), \
-                INIT_ID(__slots__), \
-                INIT_ID(__spec__), \
-                INIT_ID(__str__), \
-                INIT_ID(__sub__), \
-                INIT_ID(__subclasscheck__), \
-                INIT_ID(__subclasshook__), \
-                INIT_ID(__truediv__), \
-                INIT_ID(__trunc__), \
-                INIT_ID(__typing_is_unpacked_typevartuple__), \
-                INIT_ID(__typing_prepare_subst__), \
-                INIT_ID(__typing_subst__), \
-                INIT_ID(__typing_unpacked_tuple_args__), \
-                INIT_ID(__warningregistry__), \
-                INIT_ID(__weaklistoffset__), \
-                INIT_ID(__weakref__), \
-                INIT_ID(__xor__), \
-                INIT_ID(_abc_impl), \
-                INIT_ID(_annotation), \
-                INIT_ID(_blksize), \
-                INIT_ID(_bootstrap), \
-                INIT_ID(_dealloc_warn), \
-                INIT_ID(_finalizing), \
-                INIT_ID(_find_and_load), \
-                INIT_ID(_fix_up_module), \
-                INIT_ID(_get_sourcefile), \
-                INIT_ID(_handle_fromlist), \
-                INIT_ID(_initializing), \
-                INIT_ID(_is_text_encoding), \
-                INIT_ID(_lock_unlock_module), \
-                INIT_ID(_showwarnmsg), \
-                INIT_ID(_shutdown), \
-                INIT_ID(_slotnames), \
-                INIT_ID(_uninitialized_submodules), \
-                INIT_ID(_warn_unawaited_coroutine), \
-                INIT_ID(_xoptions), \
-                INIT_ID(add), \
-                INIT_ID(append), \
-                INIT_ID(big), \
-                INIT_ID(buffer), \
-                INIT_ID(builtins), \
-                INIT_ID(c_call), \
-                INIT_ID(c_exception), \
-                INIT_ID(c_return), \
-                INIT_ID(call), \
-                INIT_ID(clear), \
-                INIT_ID(close), \
-                INIT_ID(closed), \
-                INIT_ID(code), \
-                INIT_ID(copy), \
-                INIT_ID(copyreg), \
-                INIT_ID(decode), \
-                INIT_ID(default), \
-                INIT_ID(defaultaction), \
-                INIT_ID(dictcomp), \
-                INIT_ID(difference_update), \
-                INIT_ID(dispatch_table), \
-                INIT_ID(displayhook), \
-                INIT_ID(encode), \
-                INIT_ID(encoding), \
-                INIT_ID(end_lineno), \
-                INIT_ID(end_offset), \
-                INIT_ID(errors), \
-                INIT_ID(excepthook), \
-                INIT_ID(exception), \
-                INIT_ID(extend), \
-                INIT_ID(filename), \
-                INIT_ID(fileno), \
-                INIT_ID(fillvalue), \
-                INIT_ID(filters), \
-                INIT_ID(find_class), \
-                INIT_ID(flush), \
-                INIT_ID(genexpr), \
-                INIT_ID(get), \
-                INIT_ID(get_source), \
-                INIT_ID(getattr), \
-                INIT_ID(getstate), \
-                INIT_ID(ignore), \
-                INIT_ID(importlib), \
-                INIT_ID(inf), \
-                INIT_ID(intersection), \
-                INIT_ID(isatty), \
-                INIT_ID(isinstance), \
-                INIT_ID(items), \
-                INIT_ID(iter), \
-                INIT_ID(join), \
-                INIT_ID(keys), \
-                INIT_ID(lambda), \
-                INIT_ID(last_traceback), \
-                INIT_ID(last_type), \
-                INIT_ID(last_value), \
-                INIT_ID(latin1), \
-                INIT_ID(len), \
-                INIT_ID(line), \
-                INIT_ID(lineno), \
-                INIT_ID(listcomp), \
-                INIT_ID(little), \
-                INIT_ID(locale), \
-                INIT_ID(match), \
-                INIT_ID(metaclass), \
-                INIT_ID(mode), \
-                INIT_ID(modules), \
-                INIT_ID(mro), \
-                INIT_ID(msg), \
-                INIT_ID(n_fields), \
-                INIT_ID(n_sequence_fields), \
-                INIT_ID(n_unnamed_fields), \
-                INIT_ID(name), \
-                INIT_ID(newlines), \
-                INIT_ID(next), \
-                INIT_ID(obj), \
-                INIT_ID(offset), \
-                INIT_ID(onceregistry), \
-                INIT_ID(opcode), \
-                INIT_ID(open), \
-                INIT_ID(parent), \
-                INIT_ID(path), \
-                INIT_ID(peek), \
-                INIT_ID(persistent_id), \
-                INIT_ID(persistent_load), \
-                INIT_ID(print_file_and_line), \
-                INIT_ID(ps1), \
-                INIT_ID(ps2), \
-                INIT_ID(raw), \
-                INIT_ID(read), \
-                INIT_ID(read1), \
-                INIT_ID(readable), \
-                INIT_ID(readall), \
-                INIT_ID(readinto), \
-                INIT_ID(readinto1), \
-                INIT_ID(readline), \
-                INIT_ID(reducer_override), \
-                INIT_ID(reload), \
-                INIT_ID(replace), \
-                INIT_ID(reset), \
-                INIT_ID(return), \
-                INIT_ID(reversed), \
-                INIT_ID(seek), \
-                INIT_ID(seekable), \
-                INIT_ID(send), \
-                INIT_ID(setcomp), \
-                INIT_ID(setstate), \
-                INIT_ID(sort), \
-                INIT_ID(stderr), \
-                INIT_ID(stdin), \
-                INIT_ID(stdout), \
-                INIT_ID(strict), \
-                INIT_ID(symmetric_difference_update), \
-                INIT_ID(tell), \
-                INIT_ID(text), \
-                INIT_ID(threading), \
-                INIT_ID(throw), \
-                INIT_ID(top), \
-                INIT_ID(truncate), \
-                INIT_ID(unraisablehook), \
-                INIT_ID(values), \
-                INIT_ID(version), \
-                INIT_ID(warnings), \
-                INIT_ID(warnoptions), \
-                INIT_ID(writable), \
-                INIT_ID(write), \
-            }, \
-            .ascii = { \
-                _PyASCIIObject_INIT("\x00"), \
-                _PyASCIIObject_INIT("\x01"), \
-                _PyASCIIObject_INIT("\x02"), \
-                _PyASCIIObject_INIT("\x03"), \
-                _PyASCIIObject_INIT("\x04"), \
-                _PyASCIIObject_INIT("\x05"), \
-                _PyASCIIObject_INIT("\x06"), \
-                _PyASCIIObject_INIT("\x07"), \
-                _PyASCIIObject_INIT("\x08"), \
-                _PyASCIIObject_INIT("\x09"), \
-                _PyASCIIObject_INIT("\x0a"), \
-                _PyASCIIObject_INIT("\x0b"), \
-                _PyASCIIObject_INIT("\x0c"), \
-                _PyASCIIObject_INIT("\x0d"), \
-                _PyASCIIObject_INIT("\x0e"), \
-                _PyASCIIObject_INIT("\x0f"), \
-                _PyASCIIObject_INIT("\x10"), \
-                _PyASCIIObject_INIT("\x11"), \
-                _PyASCIIObject_INIT("\x12"), \
-                _PyASCIIObject_INIT("\x13"), \
-                _PyASCIIObject_INIT("\x14"), \
-                _PyASCIIObject_INIT("\x15"), \
-                _PyASCIIObject_INIT("\x16"), \
-                _PyASCIIObject_INIT("\x17"), \
-                _PyASCIIObject_INIT("\x18"), \
-                _PyASCIIObject_INIT("\x19"), \
-                _PyASCIIObject_INIT("\x1a"), \
-                _PyASCIIObject_INIT("\x1b"), \
-                _PyASCIIObject_INIT("\x1c"), \
-                _PyASCIIObject_INIT("\x1d"), \
-                _PyASCIIObject_INIT("\x1e"), \
-                _PyASCIIObject_INIT("\x1f"), \
-                _PyASCIIObject_INIT("\x20"), \
-                _PyASCIIObject_INIT("\x21"), \
-                _PyASCIIObject_INIT("\x22"), \
-                _PyASCIIObject_INIT("\x23"), \
-                _PyASCIIObject_INIT("\x24"), \
-                _PyASCIIObject_INIT("\x25"), \
-                _PyASCIIObject_INIT("\x26"), \
-                _PyASCIIObject_INIT("\x27"), \
-                _PyASCIIObject_INIT("\x28"), \
-                _PyASCIIObject_INIT("\x29"), \
-                _PyASCIIObject_INIT("\x2a"), \
-                _PyASCIIObject_INIT("\x2b"), \
-                _PyASCIIObject_INIT("\x2c"), \
-                _PyASCIIObject_INIT("\x2d"), \
-                _PyASCIIObject_INIT("\x2e"), \
-                _PyASCIIObject_INIT("\x2f"), \
-                _PyASCIIObject_INIT("\x30"), \
-                _PyASCIIObject_INIT("\x31"), \
-                _PyASCIIObject_INIT("\x32"), \
-                _PyASCIIObject_INIT("\x33"), \
-                _PyASCIIObject_INIT("\x34"), \
-                _PyASCIIObject_INIT("\x35"), \
-                _PyASCIIObject_INIT("\x36"), \
-                _PyASCIIObject_INIT("\x37"), \
-                _PyASCIIObject_INIT("\x38"), \
-                _PyASCIIObject_INIT("\x39"), \
-                _PyASCIIObject_INIT("\x3a"), \
-                _PyASCIIObject_INIT("\x3b"), \
-                _PyASCIIObject_INIT("\x3c"), \
-                _PyASCIIObject_INIT("\x3d"), \
-                _PyASCIIObject_INIT("\x3e"), \
-                _PyASCIIObject_INIT("\x3f"), \
-                _PyASCIIObject_INIT("\x40"), \
-                _PyASCIIObject_INIT("\x41"), \
-                _PyASCIIObject_INIT("\x42"), \
-                _PyASCIIObject_INIT("\x43"), \
-                _PyASCIIObject_INIT("\x44"), \
-                _PyASCIIObject_INIT("\x45"), \
-                _PyASCIIObject_INIT("\x46"), \
-                _PyASCIIObject_INIT("\x47"), \
-                _PyASCIIObject_INIT("\x48"), \
-                _PyASCIIObject_INIT("\x49"), \
-                _PyASCIIObject_INIT("\x4a"), \
-                _PyASCIIObject_INIT("\x4b"), \
-                _PyASCIIObject_INIT("\x4c"), \
-                _PyASCIIObject_INIT("\x4d"), \
-                _PyASCIIObject_INIT("\x4e"), \
-                _PyASCIIObject_INIT("\x4f"), \
-                _PyASCIIObject_INIT("\x50"), \
-                _PyASCIIObject_INIT("\x51"), \
-                _PyASCIIObject_INIT("\x52"), \
-                _PyASCIIObject_INIT("\x53"), \
-                _PyASCIIObject_INIT("\x54"), \
-                _PyASCIIObject_INIT("\x55"), \
-                _PyASCIIObject_INIT("\x56"), \
-                _PyASCIIObject_INIT("\x57"), \
-                _PyASCIIObject_INIT("\x58"), \
-                _PyASCIIObject_INIT("\x59"), \
-                _PyASCIIObject_INIT("\x5a"), \
-                _PyASCIIObject_INIT("\x5b"), \
-                _PyASCIIObject_INIT("\x5c"), \
-                _PyASCIIObject_INIT("\x5d"), \
-                _PyASCIIObject_INIT("\x5e"), \
-                _PyASCIIObject_INIT("\x5f"), \
-                _PyASCIIObject_INIT("\x60"), \
-                _PyASCIIObject_INIT("\x61"), \
-                _PyASCIIObject_INIT("\x62"), \
-                _PyASCIIObject_INIT("\x63"), \
-                _PyASCIIObject_INIT("\x64"), \
-                _PyASCIIObject_INIT("\x65"), \
-                _PyASCIIObject_INIT("\x66"), \
-                _PyASCIIObject_INIT("\x67"), \
-                _PyASCIIObject_INIT("\x68"), \
-                _PyASCIIObject_INIT("\x69"), \
-                _PyASCIIObject_INIT("\x6a"), \
-                _PyASCIIObject_INIT("\x6b"), \
-                _PyASCIIObject_INIT("\x6c"), \
-                _PyASCIIObject_INIT("\x6d"), \
-                _PyASCIIObject_INIT("\x6e"), \
-                _PyASCIIObject_INIT("\x6f"), \
-                _PyASCIIObject_INIT("\x70"), \
-                _PyASCIIObject_INIT("\x71"), \
-                _PyASCIIObject_INIT("\x72"), \
-                _PyASCIIObject_INIT("\x73"), \
-                _PyASCIIObject_INIT("\x74"), \
-                _PyASCIIObject_INIT("\x75"), \
-                _PyASCIIObject_INIT("\x76"), \
-                _PyASCIIObject_INIT("\x77"), \
-                _PyASCIIObject_INIT("\x78"), \
-                _PyASCIIObject_INIT("\x79"), \
-                _PyASCIIObject_INIT("\x7a"), \
-                _PyASCIIObject_INIT("\x7b"), \
-                _PyASCIIObject_INIT("\x7c"), \
-                _PyASCIIObject_INIT("\x7d"), \
-                _PyASCIIObject_INIT("\x7e"), \
-                _PyASCIIObject_INIT("\x7f"), \
-            }, \
-            .latin1 = { \
-                _PyUnicode_LATIN1_INIT("\x80"), \
-                _PyUnicode_LATIN1_INIT("\x81"), \
-                _PyUnicode_LATIN1_INIT("\x82"), \
-                _PyUnicode_LATIN1_INIT("\x83"), \
-                _PyUnicode_LATIN1_INIT("\x84"), \
-                _PyUnicode_LATIN1_INIT("\x85"), \
-                _PyUnicode_LATIN1_INIT("\x86"), \
-                _PyUnicode_LATIN1_INIT("\x87"), \
-                _PyUnicode_LATIN1_INIT("\x88"), \
-                _PyUnicode_LATIN1_INIT("\x89"), \
-                _PyUnicode_LATIN1_INIT("\x8a"), \
-                _PyUnicode_LATIN1_INIT("\x8b"), \
-                _PyUnicode_LATIN1_INIT("\x8c"), \
-                _PyUnicode_LATIN1_INIT("\x8d"), \
-                _PyUnicode_LATIN1_INIT("\x8e"), \
-                _PyUnicode_LATIN1_INIT("\x8f"), \
-                _PyUnicode_LATIN1_INIT("\x90"), \
-                _PyUnicode_LATIN1_INIT("\x91"), \
-                _PyUnicode_LATIN1_INIT("\x92"), \
-                _PyUnicode_LATIN1_INIT("\x93"), \
-                _PyUnicode_LATIN1_INIT("\x94"), \
-                _PyUnicode_LATIN1_INIT("\x95"), \
-                _PyUnicode_LATIN1_INIT("\x96"), \
-                _PyUnicode_LATIN1_INIT("\x97"), \
-                _PyUnicode_LATIN1_INIT("\x98"), \
-                _PyUnicode_LATIN1_INIT("\x99"), \
-                _PyUnicode_LATIN1_INIT("\x9a"), \
-                _PyUnicode_LATIN1_INIT("\x9b"), \
-                _PyUnicode_LATIN1_INIT("\x9c"), \
-                _PyUnicode_LATIN1_INIT("\x9d"), \
-                _PyUnicode_LATIN1_INIT("\x9e"), \
-                _PyUnicode_LATIN1_INIT("\x9f"), \
-                _PyUnicode_LATIN1_INIT("\xa0"), \
-                _PyUnicode_LATIN1_INIT("\xa1"), \
-                _PyUnicode_LATIN1_INIT("\xa2"), \
-                _PyUnicode_LATIN1_INIT("\xa3"), \
-                _PyUnicode_LATIN1_INIT("\xa4"), \
-                _PyUnicode_LATIN1_INIT("\xa5"), \
-                _PyUnicode_LATIN1_INIT("\xa6"), \
-                _PyUnicode_LATIN1_INIT("\xa7"), \
-                _PyUnicode_LATIN1_INIT("\xa8"), \
-                _PyUnicode_LATIN1_INIT("\xa9"), \
-                _PyUnicode_LATIN1_INIT("\xaa"), \
-                _PyUnicode_LATIN1_INIT("\xab"), \
-                _PyUnicode_LATIN1_INIT("\xac"), \
-                _PyUnicode_LATIN1_INIT("\xad"), \
-                _PyUnicode_LATIN1_INIT("\xae"), \
-                _PyUnicode_LATIN1_INIT("\xaf"), \
-                _PyUnicode_LATIN1_INIT("\xb0"), \
-                _PyUnicode_LATIN1_INIT("\xb1"), \
-                _PyUnicode_LATIN1_INIT("\xb2"), \
-                _PyUnicode_LATIN1_INIT("\xb3"), \
-                _PyUnicode_LATIN1_INIT("\xb4"), \
-                _PyUnicode_LATIN1_INIT("\xb5"), \
-                _PyUnicode_LATIN1_INIT("\xb6"), \
-                _PyUnicode_LATIN1_INIT("\xb7"), \
-                _PyUnicode_LATIN1_INIT("\xb8"), \
-                _PyUnicode_LATIN1_INIT("\xb9"), \
-                _PyUnicode_LATIN1_INIT("\xba"), \
-                _PyUnicode_LATIN1_INIT("\xbb"), \
-                _PyUnicode_LATIN1_INIT("\xbc"), \
-                _PyUnicode_LATIN1_INIT("\xbd"), \
-                _PyUnicode_LATIN1_INIT("\xbe"), \
-                _PyUnicode_LATIN1_INIT("\xbf"), \
-                _PyUnicode_LATIN1_INIT("\xc0"), \
-                _PyUnicode_LATIN1_INIT("\xc1"), \
-                _PyUnicode_LATIN1_INIT("\xc2"), \
-                _PyUnicode_LATIN1_INIT("\xc3"), \
-                _PyUnicode_LATIN1_INIT("\xc4"), \
-                _PyUnicode_LATIN1_INIT("\xc5"), \
-                _PyUnicode_LATIN1_INIT("\xc6"), \
-                _PyUnicode_LATIN1_INIT("\xc7"), \
-                _PyUnicode_LATIN1_INIT("\xc8"), \
-                _PyUnicode_LATIN1_INIT("\xc9"), \
-                _PyUnicode_LATIN1_INIT("\xca"), \
-                _PyUnicode_LATIN1_INIT("\xcb"), \
-                _PyUnicode_LATIN1_INIT("\xcc"), \
-                _PyUnicode_LATIN1_INIT("\xcd"), \
-                _PyUnicode_LATIN1_INIT("\xce"), \
-                _PyUnicode_LATIN1_INIT("\xcf"), \
-                _PyUnicode_LATIN1_INIT("\xd0"), \
-                _PyUnicode_LATIN1_INIT("\xd1"), \
-                _PyUnicode_LATIN1_INIT("\xd2"), \
-                _PyUnicode_LATIN1_INIT("\xd3"), \
-                _PyUnicode_LATIN1_INIT("\xd4"), \
-                _PyUnicode_LATIN1_INIT("\xd5"), \
-                _PyUnicode_LATIN1_INIT("\xd6"), \
-                _PyUnicode_LATIN1_INIT("\xd7"), \
-                _PyUnicode_LATIN1_INIT("\xd8"), \
-                _PyUnicode_LATIN1_INIT("\xd9"), \
-                _PyUnicode_LATIN1_INIT("\xda"), \
-                _PyUnicode_LATIN1_INIT("\xdb"), \
-                _PyUnicode_LATIN1_INIT("\xdc"), \
-                _PyUnicode_LATIN1_INIT("\xdd"), \
-                _PyUnicode_LATIN1_INIT("\xde"), \
-                _PyUnicode_LATIN1_INIT("\xdf"), \
-                _PyUnicode_LATIN1_INIT("\xe0"), \
-                _PyUnicode_LATIN1_INIT("\xe1"), \
-                _PyUnicode_LATIN1_INIT("\xe2"), \
-                _PyUnicode_LATIN1_INIT("\xe3"), \
-                _PyUnicode_LATIN1_INIT("\xe4"), \
-                _PyUnicode_LATIN1_INIT("\xe5"), \
-                _PyUnicode_LATIN1_INIT("\xe6"), \
-                _PyUnicode_LATIN1_INIT("\xe7"), \
-                _PyUnicode_LATIN1_INIT("\xe8"), \
-                _PyUnicode_LATIN1_INIT("\xe9"), \
-                _PyUnicode_LATIN1_INIT("\xea"), \
-                _PyUnicode_LATIN1_INIT("\xeb"), \
-                _PyUnicode_LATIN1_INIT("\xec"), \
-                _PyUnicode_LATIN1_INIT("\xed"), \
-                _PyUnicode_LATIN1_INIT("\xee"), \
-                _PyUnicode_LATIN1_INIT("\xef"), \
-                _PyUnicode_LATIN1_INIT("\xf0"), \
-                _PyUnicode_LATIN1_INIT("\xf1"), \
-                _PyUnicode_LATIN1_INIT("\xf2"), \
-                _PyUnicode_LATIN1_INIT("\xf3"), \
-                _PyUnicode_LATIN1_INIT("\xf4"), \
-                _PyUnicode_LATIN1_INIT("\xf5"), \
-                _PyUnicode_LATIN1_INIT("\xf6"), \
-                _PyUnicode_LATIN1_INIT("\xf7"), \
-                _PyUnicode_LATIN1_INIT("\xf8"), \
-                _PyUnicode_LATIN1_INIT("\xf9"), \
-                _PyUnicode_LATIN1_INIT("\xfa"), \
-                _PyUnicode_LATIN1_INIT("\xfb"), \
-                _PyUnicode_LATIN1_INIT("\xfc"), \
-                _PyUnicode_LATIN1_INIT("\xfd"), \
-                _PyUnicode_LATIN1_INIT("\xfe"), \
-                _PyUnicode_LATIN1_INIT("\xff"), \
-            }, \
-        }, \
-        \
-        .tuple_empty = { \
-            .ob_base = _PyVarObject_IMMORTAL_INIT(&PyTuple_Type, 0) \
-        }, \
-    }, \
-}
-/* End auto-generated code */
-
+#include "pycore_runtime_init_generated.h"
 
 #ifdef __cplusplus
 }
diff --git a/Include/internal/pycore_runtime_init_generated.h b/Include/internal/pycore_runtime_init_generated.h
new file mode 100644
index 0000000000000..7b217c3e29d23
--- /dev/null
+++ b/Include/internal/pycore_runtime_init_generated.h
@@ -0,0 +1,1138 @@
+#ifndef Py_INTERNAL_RUNTIME_INIT_GENERATED_H
+#define Py_INTERNAL_RUNTIME_INIT_GENERATED_H
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifndef Py_BUILD_CORE
+#  error "this header requires Py_BUILD_CORE define"
+#endif
+
+/* The following is auto-generated by Tools/scripts/generate_global_objects.py. */
+#define _Py_global_objects_INIT { \
+    .singletons = { \
+        .small_ints = { \
+            _PyLong_DIGIT_INIT(-5), \
+            _PyLong_DIGIT_INIT(-4), \
+            _PyLong_DIGIT_INIT(-3), \
+            _PyLong_DIGIT_INIT(-2), \
+            _PyLong_DIGIT_INIT(-1), \
+            _PyLong_DIGIT_INIT(0), \
+            _PyLong_DIGIT_INIT(1), \
+            _PyLong_DIGIT_INIT(2), \
+            _PyLong_DIGIT_INIT(3), \
+            _PyLong_DIGIT_INIT(4), \
+            _PyLong_DIGIT_INIT(5), \
+            _PyLong_DIGIT_INIT(6), \
+            _PyLong_DIGIT_INIT(7), \
+            _PyLong_DIGIT_INIT(8), \
+            _PyLong_DIGIT_INIT(9), \
+            _PyLong_DIGIT_INIT(10), \
+            _PyLong_DIGIT_INIT(11), \
+            _PyLong_DIGIT_INIT(12), \
+            _PyLong_DIGIT_INIT(13), \
+            _PyLong_DIGIT_INIT(14), \
+            _PyLong_DIGIT_INIT(15), \
+            _PyLong_DIGIT_INIT(16), \
+            _PyLong_DIGIT_INIT(17), \
+            _PyLong_DIGIT_INIT(18), \
+            _PyLong_DIGIT_INIT(19), \
+            _PyLong_DIGIT_INIT(20), \
+            _PyLong_DIGIT_INIT(21), \
+            _PyLong_DIGIT_INIT(22), \
+            _PyLong_DIGIT_INIT(23), \
+            _PyLong_DIGIT_INIT(24), \
+            _PyLong_DIGIT_INIT(25), \
+            _PyLong_DIGIT_INIT(26), \
+            _PyLong_DIGIT_INIT(27), \
+            _PyLong_DIGIT_INIT(28), \
+            _PyLong_DIGIT_INIT(29), \
+            _PyLong_DIGIT_INIT(30), \
+            _PyLong_DIGIT_INIT(31), \
+            _PyLong_DIGIT_INIT(32), \
+            _PyLong_DIGIT_INIT(33), \
+            _PyLong_DIGIT_INIT(34), \
+            _PyLong_DIGIT_INIT(35), \
+            _PyLong_DIGIT_INIT(36), \
+            _PyLong_DIGIT_INIT(37), \
+            _PyLong_DIGIT_INIT(38), \
+            _PyLong_DIGIT_INIT(39), \
+            _PyLong_DIGIT_INIT(40), \
+            _PyLong_DIGIT_INIT(41), \
+            _PyLong_DIGIT_INIT(42), \
+            _PyLong_DIGIT_INIT(43), \
+            _PyLong_DIGIT_INIT(44), \
+            _PyLong_DIGIT_INIT(45), \
+            _PyLong_DIGIT_INIT(46), \
+            _PyLong_DIGIT_INIT(47), \
+            _PyLong_DIGIT_INIT(48), \
+            _PyLong_DIGIT_INIT(49), \
+            _PyLong_DIGIT_INIT(50), \
+            _PyLong_DIGIT_INIT(51), \
+            _PyLong_DIGIT_INIT(52), \
+            _PyLong_DIGIT_INIT(53), \
+            _PyLong_DIGIT_INIT(54), \
+            _PyLong_DIGIT_INIT(55), \
+            _PyLong_DIGIT_INIT(56), \
+            _PyLong_DIGIT_INIT(57), \
+            _PyLong_DIGIT_INIT(58), \
+            _PyLong_DIGIT_INIT(59), \
+            _PyLong_DIGIT_INIT(60), \
+            _PyLong_DIGIT_INIT(61), \
+            _PyLong_DIGIT_INIT(62), \
+            _PyLong_DIGIT_INIT(63), \
+            _PyLong_DIGIT_INIT(64), \
+            _PyLong_DIGIT_INIT(65), \
+            _PyLong_DIGIT_INIT(66), \
+            _PyLong_DIGIT_INIT(67), \
+            _PyLong_DIGIT_INIT(68), \
+            _PyLong_DIGIT_INIT(69), \
+            _PyLong_DIGIT_INIT(70), \
+            _PyLong_DIGIT_INIT(71), \
+            _PyLong_DIGIT_INIT(72), \
+            _PyLong_DIGIT_INIT(73), \
+            _PyLong_DIGIT_INIT(74), \
+            _PyLong_DIGIT_INIT(75), \
+            _PyLong_DIGIT_INIT(76), \
+            _PyLong_DIGIT_INIT(77), \
+            _PyLong_DIGIT_INIT(78), \
+            _PyLong_DIGIT_INIT(79), \
+            _PyLong_DIGIT_INIT(80), \
+            _PyLong_DIGIT_INIT(81), \
+            _PyLong_DIGIT_INIT(82), \
+            _PyLong_DIGIT_INIT(83), \
+            _PyLong_DIGIT_INIT(84), \
+            _PyLong_DIGIT_INIT(85), \
+            _PyLong_DIGIT_INIT(86), \
+            _PyLong_DIGIT_INIT(87), \
+            _PyLong_DIGIT_INIT(88), \
+            _PyLong_DIGIT_INIT(89), \
+            _PyLong_DIGIT_INIT(90), \
+            _PyLong_DIGIT_INIT(91), \
+            _PyLong_DIGIT_INIT(92), \
+            _PyLong_DIGIT_INIT(93), \
+            _PyLong_DIGIT_INIT(94), \
+            _PyLong_DIGIT_INIT(95), \
+            _PyLong_DIGIT_INIT(96), \
+            _PyLong_DIGIT_INIT(97), \
+            _PyLong_DIGIT_INIT(98), \
+            _PyLong_DIGIT_INIT(99), \
+            _PyLong_DIGIT_INIT(100), \
+            _PyLong_DIGIT_INIT(101), \
+            _PyLong_DIGIT_INIT(102), \
+            _PyLong_DIGIT_INIT(103), \
+            _PyLong_DIGIT_INIT(104), \
+            _PyLong_DIGIT_INIT(105), \
+            _PyLong_DIGIT_INIT(106), \
+            _PyLong_DIGIT_INIT(107), \
+            _PyLong_DIGIT_INIT(108), \
+            _PyLong_DIGIT_INIT(109), \
+            _PyLong_DIGIT_INIT(110), \
+            _PyLong_DIGIT_INIT(111), \
+            _PyLong_DIGIT_INIT(112), \
+            _PyLong_DIGIT_INIT(113), \
+            _PyLong_DIGIT_INIT(114), \
+            _PyLong_DIGIT_INIT(115), \
+            _PyLong_DIGIT_INIT(116), \
+            _PyLong_DIGIT_INIT(117), \
+            _PyLong_DIGIT_INIT(118), \
+            _PyLong_DIGIT_INIT(119), \
+            _PyLong_DIGIT_INIT(120), \
+            _PyLong_DIGIT_INIT(121), \
+            _PyLong_DIGIT_INIT(122), \
+            _PyLong_DIGIT_INIT(123), \
+            _PyLong_DIGIT_INIT(124), \
+            _PyLong_DIGIT_INIT(125), \
+            _PyLong_DIGIT_INIT(126), \
+            _PyLong_DIGIT_INIT(127), \
+            _PyLong_DIGIT_INIT(128), \
+            _PyLong_DIGIT_INIT(129), \
+            _PyLong_DIGIT_INIT(130), \
+            _PyLong_DIGIT_INIT(131), \
+            _PyLong_DIGIT_INIT(132), \
+            _PyLong_DIGIT_INIT(133), \
+            _PyLong_DIGIT_INIT(134), \
+            _PyLong_DIGIT_INIT(135), \
+            _PyLong_DIGIT_INIT(136), \
+            _PyLong_DIGIT_INIT(137), \
+            _PyLong_DIGIT_INIT(138), \
+            _PyLong_DIGIT_INIT(139), \
+            _PyLong_DIGIT_INIT(140), \
+            _PyLong_DIGIT_INIT(141), \
+            _PyLong_DIGIT_INIT(142), \
+            _PyLong_DIGIT_INIT(143), \
+            _PyLong_DIGIT_INIT(144), \
+            _PyLong_DIGIT_INIT(145), \
+            _PyLong_DIGIT_INIT(146), \
+            _PyLong_DIGIT_INIT(147), \
+            _PyLong_DIGIT_INIT(148), \
+            _PyLong_DIGIT_INIT(149), \
+            _PyLong_DIGIT_INIT(150), \
+            _PyLong_DIGIT_INIT(151), \
+            _PyLong_DIGIT_INIT(152), \
+            _PyLong_DIGIT_INIT(153), \
+            _PyLong_DIGIT_INIT(154), \
+            _PyLong_DIGIT_INIT(155), \
+            _PyLong_DIGIT_INIT(156), \
+            _PyLong_DIGIT_INIT(157), \
+            _PyLong_DIGIT_INIT(158), \
+            _PyLong_DIGIT_INIT(159), \
+            _PyLong_DIGIT_INIT(160), \
+            _PyLong_DIGIT_INIT(161), \
+            _PyLong_DIGIT_INIT(162), \
+            _PyLong_DIGIT_INIT(163), \
+            _PyLong_DIGIT_INIT(164), \
+            _PyLong_DIGIT_INIT(165), \
+            _PyLong_DIGIT_INIT(166), \
+            _PyLong_DIGIT_INIT(167), \
+            _PyLong_DIGIT_INIT(168), \
+            _PyLong_DIGIT_INIT(169), \
+            _PyLong_DIGIT_INIT(170), \
+            _PyLong_DIGIT_INIT(171), \
+            _PyLong_DIGIT_INIT(172), \
+            _PyLong_DIGIT_INIT(173), \
+            _PyLong_DIGIT_INIT(174), \
+            _PyLong_DIGIT_INIT(175), \
+            _PyLong_DIGIT_INIT(176), \
+            _PyLong_DIGIT_INIT(177), \
+            _PyLong_DIGIT_INIT(178), \
+            _PyLong_DIGIT_INIT(179), \
+            _PyLong_DIGIT_INIT(180), \
+            _PyLong_DIGIT_INIT(181), \
+            _PyLong_DIGIT_INIT(182), \
+            _PyLong_DIGIT_INIT(183), \
+            _PyLong_DIGIT_INIT(184), \
+            _PyLong_DIGIT_INIT(185), \
+            _PyLong_DIGIT_INIT(186), \
+            _PyLong_DIGIT_INIT(187), \
+            _PyLong_DIGIT_INIT(188), \
+            _PyLong_DIGIT_INIT(189), \
+            _PyLong_DIGIT_INIT(190), \
+            _PyLong_DIGIT_INIT(191), \
+            _PyLong_DIGIT_INIT(192), \
+            _PyLong_DIGIT_INIT(193), \
+            _PyLong_DIGIT_INIT(194), \
+            _PyLong_DIGIT_INIT(195), \
+            _PyLong_DIGIT_INIT(196), \
+            _PyLong_DIGIT_INIT(197), \
+            _PyLong_DIGIT_INIT(198), \
+            _PyLong_DIGIT_INIT(199), \
+            _PyLong_DIGIT_INIT(200), \
+            _PyLong_DIGIT_INIT(201), \
+            _PyLong_DIGIT_INIT(202), \
+            _PyLong_DIGIT_INIT(203), \
+            _PyLong_DIGIT_INIT(204), \
+            _PyLong_DIGIT_INIT(205), \
+            _PyLong_DIGIT_INIT(206), \
+            _PyLong_DIGIT_INIT(207), \
+            _PyLong_DIGIT_INIT(208), \
+            _PyLong_DIGIT_INIT(209), \
+            _PyLong_DIGIT_INIT(210), \
+            _PyLong_DIGIT_INIT(211), \
+            _PyLong_DIGIT_INIT(212), \
+            _PyLong_DIGIT_INIT(213), \
+            _PyLong_DIGIT_INIT(214), \
+            _PyLong_DIGIT_INIT(215), \
+            _PyLong_DIGIT_INIT(216), \
+            _PyLong_DIGIT_INIT(217), \
+            _PyLong_DIGIT_INIT(218), \
+            _PyLong_DIGIT_INIT(219), \
+            _PyLong_DIGIT_INIT(220), \
+            _PyLong_DIGIT_INIT(221), \
+            _PyLong_DIGIT_INIT(222), \
+            _PyLong_DIGIT_INIT(223), \
+            _PyLong_DIGIT_INIT(224), \
+            _PyLong_DIGIT_INIT(225), \
+            _PyLong_DIGIT_INIT(226), \
+            _PyLong_DIGIT_INIT(227), \
+            _PyLong_DIGIT_INIT(228), \
+            _PyLong_DIGIT_INIT(229), \
+            _PyLong_DIGIT_INIT(230), \
+            _PyLong_DIGIT_INIT(231), \
+            _PyLong_DIGIT_INIT(232), \
+            _PyLong_DIGIT_INIT(233), \
+            _PyLong_DIGIT_INIT(234), \
+            _PyLong_DIGIT_INIT(235), \
+            _PyLong_DIGIT_INIT(236), \
+            _PyLong_DIGIT_INIT(237), \
+            _PyLong_DIGIT_INIT(238), \
+            _PyLong_DIGIT_INIT(239), \
+            _PyLong_DIGIT_INIT(240), \
+            _PyLong_DIGIT_INIT(241), \
+            _PyLong_DIGIT_INIT(242), \
+            _PyLong_DIGIT_INIT(243), \
+            _PyLong_DIGIT_INIT(244), \
+            _PyLong_DIGIT_INIT(245), \
+            _PyLong_DIGIT_INIT(246), \
+            _PyLong_DIGIT_INIT(247), \
+            _PyLong_DIGIT_INIT(248), \
+            _PyLong_DIGIT_INIT(249), \
+            _PyLong_DIGIT_INIT(250), \
+            _PyLong_DIGIT_INIT(251), \
+            _PyLong_DIGIT_INIT(252), \
+            _PyLong_DIGIT_INIT(253), \
+            _PyLong_DIGIT_INIT(254), \
+            _PyLong_DIGIT_INIT(255), \
+            _PyLong_DIGIT_INIT(256), \
+        }, \
+        \
+        .bytes_empty = _PyBytes_SIMPLE_INIT(0, 0), \
+        .bytes_characters = { \
+            _PyBytes_CHAR_INIT(0), \
+            _PyBytes_CHAR_INIT(1), \
+            _PyBytes_CHAR_INIT(2), \
+            _PyBytes_CHAR_INIT(3), \
+            _PyBytes_CHAR_INIT(4), \
+            _PyBytes_CHAR_INIT(5), \
+            _PyBytes_CHAR_INIT(6), \
+            _PyBytes_CHAR_INIT(7), \
+            _PyBytes_CHAR_INIT(8), \
+            _PyBytes_CHAR_INIT(9), \
+            _PyBytes_CHAR_INIT(10), \
+            _PyBytes_CHAR_INIT(11), \
+            _PyBytes_CHAR_INIT(12), \
+            _PyBytes_CHAR_INIT(13), \
+            _PyBytes_CHAR_INIT(14), \
+            _PyBytes_CHAR_INIT(15), \
+            _PyBytes_CHAR_INIT(16), \
+            _PyBytes_CHAR_INIT(17), \
+            _PyBytes_CHAR_INIT(18), \
+            _PyBytes_CHAR_INIT(19), \
+            _PyBytes_CHAR_INIT(20), \
+            _PyBytes_CHAR_INIT(21), \
+            _PyBytes_CHAR_INIT(22), \
+            _PyBytes_CHAR_INIT(23), \
+            _PyBytes_CHAR_INIT(24), \
+            _PyBytes_CHAR_INIT(25), \
+            _PyBytes_CHAR_INIT(26), \
+            _PyBytes_CHAR_INIT(27), \
+            _PyBytes_CHAR_INIT(28), \
+            _PyBytes_CHAR_INIT(29), \
+            _PyBytes_CHAR_INIT(30), \
+            _PyBytes_CHAR_INIT(31), \
+            _PyBytes_CHAR_INIT(32), \
+            _PyBytes_CHAR_INIT(33), \
+            _PyBytes_CHAR_INIT(34), \
+            _PyBytes_CHAR_INIT(35), \
+            _PyBytes_CHAR_INIT(36), \
+            _PyBytes_CHAR_INIT(37), \
+            _PyBytes_CHAR_INIT(38), \
+            _PyBytes_CHAR_INIT(39), \
+            _PyBytes_CHAR_INIT(40), \
+            _PyBytes_CHAR_INIT(41), \
+            _PyBytes_CHAR_INIT(42), \
+            _PyBytes_CHAR_INIT(43), \
+            _PyBytes_CHAR_INIT(44), \
+            _PyBytes_CHAR_INIT(45), \
+            _PyBytes_CHAR_INIT(46), \
+            _PyBytes_CHAR_INIT(47), \
+            _PyBytes_CHAR_INIT(48), \
+            _PyBytes_CHAR_INIT(49), \
+            _PyBytes_CHAR_INIT(50), \
+            _PyBytes_CHAR_INIT(51), \
+            _PyBytes_CHAR_INIT(52), \
+            _PyBytes_CHAR_INIT(53), \
+            _PyBytes_CHAR_INIT(54), \
+            _PyBytes_CHAR_INIT(55), \
+            _PyBytes_CHAR_INIT(56), \
+            _PyBytes_CHAR_INIT(57), \
+            _PyBytes_CHAR_INIT(58), \
+            _PyBytes_CHAR_INIT(59), \
+            _PyBytes_CHAR_INIT(60), \
+            _PyBytes_CHAR_INIT(61), \
+            _PyBytes_CHAR_INIT(62), \
+            _PyBytes_CHAR_INIT(63), \
+            _PyBytes_CHAR_INIT(64), \
+            _PyBytes_CHAR_INIT(65), \
+            _PyBytes_CHAR_INIT(66), \
+            _PyBytes_CHAR_INIT(67), \
+            _PyBytes_CHAR_INIT(68), \
+            _PyBytes_CHAR_INIT(69), \
+            _PyBytes_CHAR_INIT(70), \
+            _PyBytes_CHAR_INIT(71), \
+            _PyBytes_CHAR_INIT(72), \
+            _PyBytes_CHAR_INIT(73), \
+            _PyBytes_CHAR_INIT(74), \
+            _PyBytes_CHAR_INIT(75), \
+            _PyBytes_CHAR_INIT(76), \
+            _PyBytes_CHAR_INIT(77), \
+            _PyBytes_CHAR_INIT(78), \
+            _PyBytes_CHAR_INIT(79), \
+            _PyBytes_CHAR_INIT(80), \
+            _PyBytes_CHAR_INIT(81), \
+            _PyBytes_CHAR_INIT(82), \
+            _PyBytes_CHAR_INIT(83), \
+            _PyBytes_CHAR_INIT(84), \
+            _PyBytes_CHAR_INIT(85), \
+            _PyBytes_CHAR_INIT(86), \
+            _PyBytes_CHAR_INIT(87), \
+            _PyBytes_CHAR_INIT(88), \
+            _PyBytes_CHAR_INIT(89), \
+            _PyBytes_CHAR_INIT(90), \
+            _PyBytes_CHAR_INIT(91), \
+            _PyBytes_CHAR_INIT(92), \
+            _PyBytes_CHAR_INIT(93), \
+            _PyBytes_CHAR_INIT(94), \
+            _PyBytes_CHAR_INIT(95), \
+            _PyBytes_CHAR_INIT(96), \
+            _PyBytes_CHAR_INIT(97), \
+            _PyBytes_CHAR_INIT(98), \
+            _PyBytes_CHAR_INIT(99), \
+            _PyBytes_CHAR_INIT(100), \
+            _PyBytes_CHAR_INIT(101), \
+            _PyBytes_CHAR_INIT(102), \
+            _PyBytes_CHAR_INIT(103), \
+            _PyBytes_CHAR_INIT(104), \
+            _PyBytes_CHAR_INIT(105), \
+            _PyBytes_CHAR_INIT(106), \
+            _PyBytes_CHAR_INIT(107), \
+            _PyBytes_CHAR_INIT(108), \
+            _PyBytes_CHAR_INIT(109), \
+            _PyBytes_CHAR_INIT(110), \
+            _PyBytes_CHAR_INIT(111), \
+            _PyBytes_CHAR_INIT(112), \
+            _PyBytes_CHAR_INIT(113), \
+            _PyBytes_CHAR_INIT(114), \
+            _PyBytes_CHAR_INIT(115), \
+            _PyBytes_CHAR_INIT(116), \
+            _PyBytes_CHAR_INIT(117), \
+            _PyBytes_CHAR_INIT(118), \
+            _PyBytes_CHAR_INIT(119), \
+            _PyBytes_CHAR_INIT(120), \
+            _PyBytes_CHAR_INIT(121), \
+            _PyBytes_CHAR_INIT(122), \
+            _PyBytes_CHAR_INIT(123), \
+            _PyBytes_CHAR_INIT(124), \
+            _PyBytes_CHAR_INIT(125), \
+            _PyBytes_CHAR_INIT(126), \
+            _PyBytes_CHAR_INIT(127), \
+            _PyBytes_CHAR_INIT(128), \
+            _PyBytes_CHAR_INIT(129), \
+            _PyBytes_CHAR_INIT(130), \
+            _PyBytes_CHAR_INIT(131), \
+            _PyBytes_CHAR_INIT(132), \
+            _PyBytes_CHAR_INIT(133), \
+            _PyBytes_CHAR_INIT(134), \
+            _PyBytes_CHAR_INIT(135), \
+            _PyBytes_CHAR_INIT(136), \
+            _PyBytes_CHAR_INIT(137), \
+            _PyBytes_CHAR_INIT(138), \
+            _PyBytes_CHAR_INIT(139), \
+            _PyBytes_CHAR_INIT(140), \
+            _PyBytes_CHAR_INIT(141), \
+            _PyBytes_CHAR_INIT(142), \
+            _PyBytes_CHAR_INIT(143), \
+            _PyBytes_CHAR_INIT(144), \
+            _PyBytes_CHAR_INIT(145), \
+            _PyBytes_CHAR_INIT(146), \
+            _PyBytes_CHAR_INIT(147), \
+            _PyBytes_CHAR_INIT(148), \
+            _PyBytes_CHAR_INIT(149), \
+            _PyBytes_CHAR_INIT(150), \
+            _PyBytes_CHAR_INIT(151), \
+            _PyBytes_CHAR_INIT(152), \
+            _PyBytes_CHAR_INIT(153), \
+            _PyBytes_CHAR_INIT(154), \
+            _PyBytes_CHAR_INIT(155), \
+            _PyBytes_CHAR_INIT(156), \
+            _PyBytes_CHAR_INIT(157), \
+            _PyBytes_CHAR_INIT(158), \
+            _PyBytes_CHAR_INIT(159), \
+            _PyBytes_CHAR_INIT(160), \
+            _PyBytes_CHAR_INIT(161), \
+            _PyBytes_CHAR_INIT(162), \
+            _PyBytes_CHAR_INIT(163), \
+            _PyBytes_CHAR_INIT(164), \
+            _PyBytes_CHAR_INIT(165), \
+            _PyBytes_CHAR_INIT(166), \
+            _PyBytes_CHAR_INIT(167), \
+            _PyBytes_CHAR_INIT(168), \
+            _PyBytes_CHAR_INIT(169), \
+            _PyBytes_CHAR_INIT(170), \
+            _PyBytes_CHAR_INIT(171), \
+            _PyBytes_CHAR_INIT(172), \
+            _PyBytes_CHAR_INIT(173), \
+            _PyBytes_CHAR_INIT(174), \
+            _PyBytes_CHAR_INIT(175), \
+            _PyBytes_CHAR_INIT(176), \
+            _PyBytes_CHAR_INIT(177), \
+            _PyBytes_CHAR_INIT(178), \
+            _PyBytes_CHAR_INIT(179), \
+            _PyBytes_CHAR_INIT(180), \
+            _PyBytes_CHAR_INIT(181), \
+            _PyBytes_CHAR_INIT(182), \
+            _PyBytes_CHAR_INIT(183), \
+            _PyBytes_CHAR_INIT(184), \
+            _PyBytes_CHAR_INIT(185), \
+            _PyBytes_CHAR_INIT(186), \
+            _PyBytes_CHAR_INIT(187), \
+            _PyBytes_CHAR_INIT(188), \
+            _PyBytes_CHAR_INIT(189), \
+            _PyBytes_CHAR_INIT(190), \
+            _PyBytes_CHAR_INIT(191), \
+            _PyBytes_CHAR_INIT(192), \
+            _PyBytes_CHAR_INIT(193), \
+            _PyBytes_CHAR_INIT(194), \
+            _PyBytes_CHAR_INIT(195), \
+            _PyBytes_CHAR_INIT(196), \
+            _PyBytes_CHAR_INIT(197), \
+            _PyBytes_CHAR_INIT(198), \
+            _PyBytes_CHAR_INIT(199), \
+            _PyBytes_CHAR_INIT(200), \
+            _PyBytes_CHAR_INIT(201), \
+            _PyBytes_CHAR_INIT(202), \
+            _PyBytes_CHAR_INIT(203), \
+            _PyBytes_CHAR_INIT(204), \
+            _PyBytes_CHAR_INIT(205), \
+            _PyBytes_CHAR_INIT(206), \
+            _PyBytes_CHAR_INIT(207), \
+            _PyBytes_CHAR_INIT(208), \
+            _PyBytes_CHAR_INIT(209), \
+            _PyBytes_CHAR_INIT(210), \
+            _PyBytes_CHAR_INIT(211), \
+            _PyBytes_CHAR_INIT(212), \
+            _PyBytes_CHAR_INIT(213), \
+            _PyBytes_CHAR_INIT(214), \
+            _PyBytes_CHAR_INIT(215), \
+            _PyBytes_CHAR_INIT(216), \
+            _PyBytes_CHAR_INIT(217), \
+            _PyBytes_CHAR_INIT(218), \
+            _PyBytes_CHAR_INIT(219), \
+            _PyBytes_CHAR_INIT(220), \
+            _PyBytes_CHAR_INIT(221), \
+            _PyBytes_CHAR_INIT(222), \
+            _PyBytes_CHAR_INIT(223), \
+            _PyBytes_CHAR_INIT(224), \
+            _PyBytes_CHAR_INIT(225), \
+            _PyBytes_CHAR_INIT(226), \
+            _PyBytes_CHAR_INIT(227), \
+            _PyBytes_CHAR_INIT(228), \
+            _PyBytes_CHAR_INIT(229), \
+            _PyBytes_CHAR_INIT(230), \
+            _PyBytes_CHAR_INIT(231), \
+            _PyBytes_CHAR_INIT(232), \
+            _PyBytes_CHAR_INIT(233), \
+            _PyBytes_CHAR_INIT(234), \
+            _PyBytes_CHAR_INIT(235), \
+            _PyBytes_CHAR_INIT(236), \
+            _PyBytes_CHAR_INIT(237), \
+            _PyBytes_CHAR_INIT(238), \
+            _PyBytes_CHAR_INIT(239), \
+            _PyBytes_CHAR_INIT(240), \
+            _PyBytes_CHAR_INIT(241), \
+            _PyBytes_CHAR_INIT(242), \
+            _PyBytes_CHAR_INIT(243), \
+            _PyBytes_CHAR_INIT(244), \
+            _PyBytes_CHAR_INIT(245), \
+            _PyBytes_CHAR_INIT(246), \
+            _PyBytes_CHAR_INIT(247), \
+            _PyBytes_CHAR_INIT(248), \
+            _PyBytes_CHAR_INIT(249), \
+            _PyBytes_CHAR_INIT(250), \
+            _PyBytes_CHAR_INIT(251), \
+            _PyBytes_CHAR_INIT(252), \
+            _PyBytes_CHAR_INIT(253), \
+            _PyBytes_CHAR_INIT(254), \
+            _PyBytes_CHAR_INIT(255), \
+        }, \
+        \
+        .strings = { \
+            .literals = { \
+                INIT_STR(anon_dictcomp, "<dictcomp>"), \
+                INIT_STR(anon_genexpr, "<genexpr>"), \
+                INIT_STR(anon_lambda, "<lambda>"), \
+                INIT_STR(anon_listcomp, "<listcomp>"), \
+                INIT_STR(anon_module, "<module>"), \
+                INIT_STR(anon_setcomp, "<setcomp>"), \
+                INIT_STR(anon_string, "<string>"), \
+                INIT_STR(anon_unknown, "<unknown>"), \
+                INIT_STR(close_br, "}"), \
+                INIT_STR(comma_sep, ", "), \
+                INIT_STR(dbl_close_br, "}}"), \
+                INIT_STR(dbl_open_br, "{{"), \
+                INIT_STR(dbl_percent, "%%"), \
+                INIT_STR(dot, "."), \
+                INIT_STR(dot_locals, ".<locals>"), \
+                INIT_STR(empty, ""), \
+                INIT_STR(list_err, "list index out of range"), \
+                INIT_STR(newline, "\n"), \
+                INIT_STR(open_br, "{"), \
+                INIT_STR(percent, "%"), \
+                INIT_STR(utf_8, "utf-8"), \
+            }, \
+            .identifiers = { \
+                INIT_ID(False), \
+                INIT_ID(Py_Repr), \
+                INIT_ID(TextIOWrapper), \
+                INIT_ID(True), \
+                INIT_ID(WarningMessage), \
+                INIT_ID(_), \
+                INIT_ID(__IOBase_closed), \
+                INIT_ID(__abc_tpflags__), \
+                INIT_ID(__abs__), \
+                INIT_ID(__abstractmethods__), \
+                INIT_ID(__add__), \
+                INIT_ID(__aenter__), \
+                INIT_ID(__aexit__), \
+                INIT_ID(__aiter__), \
+                INIT_ID(__all__), \
+                INIT_ID(__and__), \
+                INIT_ID(__anext__), \
+                INIT_ID(__annotations__), \
+                INIT_ID(__args__), \
+                INIT_ID(__await__), \
+                INIT_ID(__bases__), \
+                INIT_ID(__bool__), \
+                INIT_ID(__build_class__), \
+                INIT_ID(__builtins__), \
+                INIT_ID(__bytes__), \
+                INIT_ID(__call__), \
+                INIT_ID(__cantrace__), \
+                INIT_ID(__class__), \
+                INIT_ID(__class_getitem__), \
+                INIT_ID(__classcell__), \
+                INIT_ID(__complex__), \
+                INIT_ID(__contains__), \
+                INIT_ID(__copy__), \
+                INIT_ID(__del__), \
+                INIT_ID(__delattr__), \
+                INIT_ID(__delete__), \
+                INIT_ID(__delitem__), \
+                INIT_ID(__dict__), \
+                INIT_ID(__dictoffset__), \
+                INIT_ID(__dir__), \
+                INIT_ID(__divmod__), \
+                INIT_ID(__doc__), \
+                INIT_ID(__enter__), \
+                INIT_ID(__eq__), \
+                INIT_ID(__exit__), \
+                INIT_ID(__file__), \
+                INIT_ID(__float__), \
+                INIT_ID(__floordiv__), \
+                INIT_ID(__format__), \
+                INIT_ID(__fspath__), \
+                INIT_ID(__ge__), \
+                INIT_ID(__get__), \
+                INIT_ID(__getattr__), \
+                INIT_ID(__getattribute__), \
+                INIT_ID(__getinitargs__), \
+                INIT_ID(__getitem__), \
+                INIT_ID(__getnewargs__), \
+                INIT_ID(__getnewargs_ex__), \
+                INIT_ID(__getstate__), \
+                INIT_ID(__gt__), \
+                INIT_ID(__hash__), \
+                INIT_ID(__iadd__), \
+                INIT_ID(__iand__), \
+                INIT_ID(__ifloordiv__), \
+                INIT_ID(__ilshift__), \
+                INIT_ID(__imatmul__), \
+                INIT_ID(__imod__), \
+                INIT_ID(__import__), \
+                INIT_ID(__imul__), \
+                INIT_ID(__index__), \
+                INIT_ID(__init__), \
+                INIT_ID(__init_subclass__), \
+                INIT_ID(__instancecheck__), \
+                INIT_ID(__int__), \
+                INIT_ID(__invert__), \
+                INIT_ID(__ior__), \
+                INIT_ID(__ipow__), \
+                INIT_ID(__irshift__), \
+                INIT_ID(__isabstractmethod__), \
+                INIT_ID(__isub__), \
+                INIT_ID(__iter__), \
+                INIT_ID(__itruediv__), \
+                INIT_ID(__ixor__), \
+                INIT_ID(__le__), \
+                INIT_ID(__len__), \
+                INIT_ID(__length_hint__), \
+                INIT_ID(__lltrace__), \
+                INIT_ID(__loader__), \
+                INIT_ID(__lshift__), \
+                INIT_ID(__lt__), \
+                INIT_ID(__main__), \
+                INIT_ID(__matmul__), \
+                INIT_ID(__missing__), \
+                INIT_ID(__mod__), \
+                INIT_ID(__module__), \
+                INIT_ID(__mro_entries__), \
+                INIT_ID(__mul__), \
+                INIT_ID(__name__), \
+                INIT_ID(__ne__), \
+                INIT_ID(__neg__), \
+                INIT_ID(__new__), \
+                INIT_ID(__newobj__), \
+                INIT_ID(__newobj_ex__), \
+                INIT_ID(__next__), \
+                INIT_ID(__notes__), \
+                INIT_ID(__or__), \
+                INIT_ID(__orig_class__), \
+                INIT_ID(__origin__), \
+                INIT_ID(__package__), \
+                INIT_ID(__parameters__), \
+                INIT_ID(__path__), \
+                INIT_ID(__pos__), \
+                INIT_ID(__pow__), \
+                INIT_ID(__prepare__), \
+                INIT_ID(__qualname__), \
+                INIT_ID(__radd__), \
+                INIT_ID(__rand__), \
+                INIT_ID(__rdivmod__), \
+                INIT_ID(__reduce__), \
+                INIT_ID(__reduce_ex__), \
+                INIT_ID(__repr__), \
+                INIT_ID(__reversed__), \
+                INIT_ID(__rfloordiv__), \
+                INIT_ID(__rlshift__), \
+                INIT_ID(__rmatmul__), \
+                INIT_ID(__rmod__), \
+                INIT_ID(__rmul__), \
+                INIT_ID(__ror__), \
+                INIT_ID(__round__), \
+                INIT_ID(__rpow__), \
+                INIT_ID(__rrshift__), \
+                INIT_ID(__rshift__), \
+                INIT_ID(__rsub__), \
+                INIT_ID(__rtruediv__), \
+                INIT_ID(__rxor__), \
+                INIT_ID(__set__), \
+                INIT_ID(__set_name__), \
+                INIT_ID(__setattr__), \
+                INIT_ID(__setitem__), \
+                INIT_ID(__setstate__), \
+                INIT_ID(__sizeof__), \
+                INIT_ID(__slotnames__), \
+                INIT_ID(__slots__), \
+                INIT_ID(__spec__), \
+                INIT_ID(__str__), \
+                INIT_ID(__sub__), \
+                INIT_ID(__subclasscheck__), \
+                INIT_ID(__subclasshook__), \
+                INIT_ID(__truediv__), \
+                INIT_ID(__trunc__), \
+                INIT_ID(__typing_is_unpacked_typevartuple__), \
+                INIT_ID(__typing_prepare_subst__), \
+                INIT_ID(__typing_subst__), \
+                INIT_ID(__typing_unpacked_tuple_args__), \
+                INIT_ID(__warningregistry__), \
+                INIT_ID(__weaklistoffset__), \
+                INIT_ID(__weakref__), \
+                INIT_ID(__xor__), \
+                INIT_ID(_abc_impl), \
+                INIT_ID(_annotation), \
+                INIT_ID(_blksize), \
+                INIT_ID(_bootstrap), \
+                INIT_ID(_dealloc_warn), \
+                INIT_ID(_finalizing), \
+                INIT_ID(_find_and_load), \
+                INIT_ID(_fix_up_module), \
+                INIT_ID(_get_sourcefile), \
+                INIT_ID(_handle_fromlist), \
+                INIT_ID(_initializing), \
+                INIT_ID(_is_text_encoding), \
+                INIT_ID(_lock_unlock_module), \
+                INIT_ID(_showwarnmsg), \
+                INIT_ID(_shutdown), \
+                INIT_ID(_slotnames), \
+                INIT_ID(_uninitialized_submodules), \
+                INIT_ID(_warn_unawaited_coroutine), \
+                INIT_ID(_xoptions), \
+                INIT_ID(add), \
+                INIT_ID(append), \
+                INIT_ID(big), \
+                INIT_ID(buffer), \
+                INIT_ID(builtins), \
+                INIT_ID(c_call), \
+                INIT_ID(c_exception), \
+                INIT_ID(c_return), \
+                INIT_ID(call), \
+                INIT_ID(clear), \
+                INIT_ID(close), \
+                INIT_ID(closed), \
+                INIT_ID(code), \
+                INIT_ID(copy), \
+                INIT_ID(copyreg), \
+                INIT_ID(decode), \
+                INIT_ID(default), \
+                INIT_ID(defaultaction), \
+                INIT_ID(dictcomp), \
+                INIT_ID(difference_update), \
+                INIT_ID(dispatch_table), \
+                INIT_ID(displayhook), \
+                INIT_ID(encode), \
+                INIT_ID(encoding), \
+                INIT_ID(end_lineno), \
+                INIT_ID(end_offset), \
+                INIT_ID(errors), \
+                INIT_ID(excepthook), \
+                INIT_ID(exception), \
+                INIT_ID(extend), \
+                INIT_ID(filename), \
+                INIT_ID(fileno), \
+                INIT_ID(fillvalue), \
+                INIT_ID(filters), \
+                INIT_ID(find_class), \
+                INIT_ID(flush), \
+                INIT_ID(genexpr), \
+                INIT_ID(get), \
+                INIT_ID(get_source), \
+                INIT_ID(getattr), \
+                INIT_ID(getstate), \
+                INIT_ID(ignore), \
+                INIT_ID(importlib), \
+                INIT_ID(inf), \
+                INIT_ID(intersection), \
+                INIT_ID(isatty), \
+                INIT_ID(isinstance), \
+                INIT_ID(items), \
+                INIT_ID(iter), \
+                INIT_ID(join), \
+                INIT_ID(keys), \
+                INIT_ID(lambda), \
+                INIT_ID(last_traceback), \
+                INIT_ID(last_type), \
+                INIT_ID(last_value), \
+                INIT_ID(latin1), \
+                INIT_ID(len), \
+                INIT_ID(line), \
+                INIT_ID(lineno), \
+                INIT_ID(listcomp), \
+                INIT_ID(little), \
+                INIT_ID(locale), \
+                INIT_ID(match), \
+                INIT_ID(metaclass), \
+                INIT_ID(mode), \
+                INIT_ID(modules), \
+                INIT_ID(mro), \
+                INIT_ID(msg), \
+                INIT_ID(n_fields), \
+                INIT_ID(n_sequence_fields), \
+                INIT_ID(n_unnamed_fields), \
+                INIT_ID(name), \
+                INIT_ID(newlines), \
+                INIT_ID(next), \
+                INIT_ID(obj), \
+                INIT_ID(offset), \
+                INIT_ID(onceregistry), \
+                INIT_ID(opcode), \
+                INIT_ID(open), \
+                INIT_ID(parent), \
+                INIT_ID(path), \
+                INIT_ID(peek), \
+                INIT_ID(persistent_id), \
+                INIT_ID(persistent_load), \
+                INIT_ID(print_file_and_line), \
+                INIT_ID(ps1), \
+                INIT_ID(ps2), \
+                INIT_ID(raw), \
+                INIT_ID(read), \
+                INIT_ID(read1), \
+                INIT_ID(readable), \
+                INIT_ID(readall), \
+                INIT_ID(readinto), \
+                INIT_ID(readinto1), \
+                INIT_ID(readline), \
+                INIT_ID(reducer_override), \
+                INIT_ID(reload), \
+                INIT_ID(replace), \
+                INIT_ID(reset), \
+                INIT_ID(return), \
+                INIT_ID(reversed), \
+                INIT_ID(seek), \
+                INIT_ID(seekable), \
+                INIT_ID(send), \
+                INIT_ID(setcomp), \
+                INIT_ID(setstate), \
+                INIT_ID(sort), \
+                INIT_ID(stderr), \
+                INIT_ID(stdin), \
+                INIT_ID(stdout), \
+                INIT_ID(strict), \
+                INIT_ID(symmetric_difference_update), \
+                INIT_ID(tell), \
+                INIT_ID(text), \
+                INIT_ID(threading), \
+                INIT_ID(throw), \
+                INIT_ID(top), \
+                INIT_ID(truncate), \
+                INIT_ID(unraisablehook), \
+                INIT_ID(values), \
+                INIT_ID(version), \
+                INIT_ID(warnings), \
+                INIT_ID(warnoptions), \
+                INIT_ID(writable), \
+                INIT_ID(write), \
+            }, \
+            .ascii = { \
+                _PyASCIIObject_INIT("\x00"), \
+                _PyASCIIObject_INIT("\x01"), \
+                _PyASCIIObject_INIT("\x02"), \
+                _PyASCIIObject_INIT("\x03"), \
+                _PyASCIIObject_INIT("\x04"), \
+                _PyASCIIObject_INIT("\x05"), \
+                _PyASCIIObject_INIT("\x06"), \
+                _PyASCIIObject_INIT("\x07"), \
+                _PyASCIIObject_INIT("\x08"), \
+                _PyASCIIObject_INIT("\x09"), \
+                _PyASCIIObject_INIT("\x0a"), \
+                _PyASCIIObject_INIT("\x0b"), \
+                _PyASCIIObject_INIT("\x0c"), \
+                _PyASCIIObject_INIT("\x0d"), \
+                _PyASCIIObject_INIT("\x0e"), \
+                _PyASCIIObject_INIT("\x0f"), \
+                _PyASCIIObject_INIT("\x10"), \
+                _PyASCIIObject_INIT("\x11"), \
+                _PyASCIIObject_INIT("\x12"), \
+                _PyASCIIObject_INIT("\x13"), \
+                _PyASCIIObject_INIT("\x14"), \
+                _PyASCIIObject_INIT("\x15"), \
+                _PyASCIIObject_INIT("\x16"), \
+                _PyASCIIObject_INIT("\x17"), \
+                _PyASCIIObject_INIT("\x18"), \
+                _PyASCIIObject_INIT("\x19"), \
+                _PyASCIIObject_INIT("\x1a"), \
+                _PyASCIIObject_INIT("\x1b"), \
+                _PyASCIIObject_INIT("\x1c"), \
+                _PyASCIIObject_INIT("\x1d"), \
+                _PyASCIIObject_INIT("\x1e"), \
+                _PyASCIIObject_INIT("\x1f"), \
+                _PyASCIIObject_INIT("\x20"), \
+                _PyASCIIObject_INIT("\x21"), \
+                _PyASCIIObject_INIT("\x22"), \
+                _PyASCIIObject_INIT("\x23"), \
+                _PyASCIIObject_INIT("\x24"), \
+                _PyASCIIObject_INIT("\x25"), \
+                _PyASCIIObject_INIT("\x26"), \
+                _PyASCIIObject_INIT("\x27"), \
+                _PyASCIIObject_INIT("\x28"), \
+                _PyASCIIObject_INIT("\x29"), \
+                _PyASCIIObject_INIT("\x2a"), \
+                _PyASCIIObject_INIT("\x2b"), \
+                _PyASCIIObject_INIT("\x2c"), \
+                _PyASCIIObject_INIT("\x2d"), \
+                _PyASCIIObject_INIT("\x2e"), \
+                _PyASCIIObject_INIT("\x2f"), \
+                _PyASCIIObject_INIT("\x30"), \
+                _PyASCIIObject_INIT("\x31"), \
+                _PyASCIIObject_INIT("\x32"), \
+                _PyASCIIObject_INIT("\x33"), \
+                _PyASCIIObject_INIT("\x34"), \
+                _PyASCIIObject_INIT("\x35"), \
+                _PyASCIIObject_INIT("\x36"), \
+                _PyASCIIObject_INIT("\x37"), \
+                _PyASCIIObject_INIT("\x38"), \
+                _PyASCIIObject_INIT("\x39"), \
+                _PyASCIIObject_INIT("\x3a"), \
+                _PyASCIIObject_INIT("\x3b"), \
+                _PyASCIIObject_INIT("\x3c"), \
+                _PyASCIIObject_INIT("\x3d"), \
+                _PyASCIIObject_INIT("\x3e"), \
+                _PyASCIIObject_INIT("\x3f"), \
+                _PyASCIIObject_INIT("\x40"), \
+                _PyASCIIObject_INIT("\x41"), \
+                _PyASCIIObject_INIT("\x42"), \
+                _PyASCIIObject_INIT("\x43"), \
+                _PyASCIIObject_INIT("\x44"), \
+                _PyASCIIObject_INIT("\x45"), \
+                _PyASCIIObject_INIT("\x46"), \
+                _PyASCIIObject_INIT("\x47"), \
+                _PyASCIIObject_INIT("\x48"), \
+                _PyASCIIObject_INIT("\x49"), \
+                _PyASCIIObject_INIT("\x4a"), \
+                _PyASCIIObject_INIT("\x4b"), \
+                _PyASCIIObject_INIT("\x4c"), \
+                _PyASCIIObject_INIT("\x4d"), \
+                _PyASCIIObject_INIT("\x4e"), \
+                _PyASCIIObject_INIT("\x4f"), \
+                _PyASCIIObject_INIT("\x50"), \
+                _PyASCIIObject_INIT("\x51"), \
+                _PyASCIIObject_INIT("\x52"), \
+                _PyASCIIObject_INIT("\x53"), \
+                _PyASCIIObject_INIT("\x54"), \
+                _PyASCIIObject_INIT("\x55"), \
+                _PyASCIIObject_INIT("\x56"), \
+                _PyASCIIObject_INIT("\x57"), \
+                _PyASCIIObject_INIT("\x58"), \
+                _PyASCIIObject_INIT("\x59"), \
+                _PyASCIIObject_INIT("\x5a"), \
+                _PyASCIIObject_INIT("\x5b"), \
+                _PyASCIIObject_INIT("\x5c"), \
+                _PyASCIIObject_INIT("\x5d"), \
+                _PyASCIIObject_INIT("\x5e"), \
+                _PyASCIIObject_INIT("\x5f"), \
+                _PyASCIIObject_INIT("\x60"), \
+                _PyASCIIObject_INIT("\x61"), \
+                _PyASCIIObject_INIT("\x62"), \
+                _PyASCIIObject_INIT("\x63"), \
+                _PyASCIIObject_INIT("\x64"), \
+                _PyASCIIObject_INIT("\x65"), \
+                _PyASCIIObject_INIT("\x66"), \
+                _PyASCIIObject_INIT("\x67"), \
+                _PyASCIIObject_INIT("\x68"), \
+                _PyASCIIObject_INIT("\x69"), \
+                _PyASCIIObject_INIT("\x6a"), \
+                _PyASCIIObject_INIT("\x6b"), \
+                _PyASCIIObject_INIT("\x6c"), \
+                _PyASCIIObject_INIT("\x6d"), \
+                _PyASCIIObject_INIT("\x6e"), \
+                _PyASCIIObject_INIT("\x6f"), \
+                _PyASCIIObject_INIT("\x70"), \
+                _PyASCIIObject_INIT("\x71"), \
+                _PyASCIIObject_INIT("\x72"), \
+                _PyASCIIObject_INIT("\x73"), \
+                _PyASCIIObject_INIT("\x74"), \
+                _PyASCIIObject_INIT("\x75"), \
+                _PyASCIIObject_INIT("\x76"), \
+                _PyASCIIObject_INIT("\x77"), \
+                _PyASCIIObject_INIT("\x78"), \
+                _PyASCIIObject_INIT("\x79"), \
+                _PyASCIIObject_INIT("\x7a"), \
+                _PyASCIIObject_INIT("\x7b"), \
+                _PyASCIIObject_INIT("\x7c"), \
+                _PyASCIIObject_INIT("\x7d"), \
+                _PyASCIIObject_INIT("\x7e"), \
+                _PyASCIIObject_INIT("\x7f"), \
+            }, \
+            .latin1 = { \
+                _PyUnicode_LATIN1_INIT("\x80"), \
+                _PyUnicode_LATIN1_INIT("\x81"), \
+                _PyUnicode_LATIN1_INIT("\x82"), \
+                _PyUnicode_LATIN1_INIT("\x83"), \
+                _PyUnicode_LATIN1_INIT("\x84"), \
+                _PyUnicode_LATIN1_INIT("\x85"), \
+                _PyUnicode_LATIN1_INIT("\x86"), \
+                _PyUnicode_LATIN1_INIT("\x87"), \
+                _PyUnicode_LATIN1_INIT("\x88"), \
+                _PyUnicode_LATIN1_INIT("\x89"), \
+                _PyUnicode_LATIN1_INIT("\x8a"), \
+                _PyUnicode_LATIN1_INIT("\x8b"), \
+                _PyUnicode_LATIN1_INIT("\x8c"), \
+                _PyUnicode_LATIN1_INIT("\x8d"), \
+                _PyUnicode_LATIN1_INIT("\x8e"), \
+                _PyUnicode_LATIN1_INIT("\x8f"), \
+                _PyUnicode_LATIN1_INIT("\x90"), \
+                _PyUnicode_LATIN1_INIT("\x91"), \
+                _PyUnicode_LATIN1_INIT("\x92"), \
+                _PyUnicode_LATIN1_INIT("\x93"), \
+                _PyUnicode_LATIN1_INIT("\x94"), \
+                _PyUnicode_LATIN1_INIT("\x95"), \
+                _PyUnicode_LATIN1_INIT("\x96"), \
+                _PyUnicode_LATIN1_INIT("\x97"), \
+                _PyUnicode_LATIN1_INIT("\x98"), \
+                _PyUnicode_LATIN1_INIT("\x99"), \
+                _PyUnicode_LATIN1_INIT("\x9a"), \
+                _PyUnicode_LATIN1_INIT("\x9b"), \
+                _PyUnicode_LATIN1_INIT("\x9c"), \
+                _PyUnicode_LATIN1_INIT("\x9d"), \
+                _PyUnicode_LATIN1_INIT("\x9e"), \
+                _PyUnicode_LATIN1_INIT("\x9f"), \
+                _PyUnicode_LATIN1_INIT("\xa0"), \
+                _PyUnicode_LATIN1_INIT("\xa1"), \
+                _PyUnicode_LATIN1_INIT("\xa2"), \
+                _PyUnicode_LATIN1_INIT("\xa3"), \
+                _PyUnicode_LATIN1_INIT("\xa4"), \
+                _PyUnicode_LATIN1_INIT("\xa5"), \
+                _PyUnicode_LATIN1_INIT("\xa6"), \
+                _PyUnicode_LATIN1_INIT("\xa7"), \
+                _PyUnicode_LATIN1_INIT("\xa8"), \
+                _PyUnicode_LATIN1_INIT("\xa9"), \
+                _PyUnicode_LATIN1_INIT("\xaa"), \
+                _PyUnicode_LATIN1_INIT("\xab"), \
+                _PyUnicode_LATIN1_INIT("\xac"), \
+                _PyUnicode_LATIN1_INIT("\xad"), \
+                _PyUnicode_LATIN1_INIT("\xae"), \
+                _PyUnicode_LATIN1_INIT("\xaf"), \
+                _PyUnicode_LATIN1_INIT("\xb0"), \
+                _PyUnicode_LATIN1_INIT("\xb1"), \
+                _PyUnicode_LATIN1_INIT("\xb2"), \
+                _PyUnicode_LATIN1_INIT("\xb3"), \
+                _PyUnicode_LATIN1_INIT("\xb4"), \
+                _PyUnicode_LATIN1_INIT("\xb5"), \
+                _PyUnicode_LATIN1_INIT("\xb6"), \
+                _PyUnicode_LATIN1_INIT("\xb7"), \
+                _PyUnicode_LATIN1_INIT("\xb8"), \
+                _PyUnicode_LATIN1_INIT("\xb9"), \
+                _PyUnicode_LATIN1_INIT("\xba"), \
+                _PyUnicode_LATIN1_INIT("\xbb"), \
+                _PyUnicode_LATIN1_INIT("\xbc"), \
+                _PyUnicode_LATIN1_INIT("\xbd"), \
+                _PyUnicode_LATIN1_INIT("\xbe"), \
+                _PyUnicode_LATIN1_INIT("\xbf"), \
+                _PyUnicode_LATIN1_INIT("\xc0"), \
+                _PyUnicode_LATIN1_INIT("\xc1"), \
+                _PyUnicode_LATIN1_INIT("\xc2"), \
+                _PyUnicode_LATIN1_INIT("\xc3"), \
+                _PyUnicode_LATIN1_INIT("\xc4"), \
+                _PyUnicode_LATIN1_INIT("\xc5"), \
+                _PyUnicode_LATIN1_INIT("\xc6"), \
+                _PyUnicode_LATIN1_INIT("\xc7"), \
+                _PyUnicode_LATIN1_INIT("\xc8"), \
+                _PyUnicode_LATIN1_INIT("\xc9"), \
+                _PyUnicode_LATIN1_INIT("\xca"), \
+                _PyUnicode_LATIN1_INIT("\xcb"), \
+                _PyUnicode_LATIN1_INIT("\xcc"), \
+                _PyUnicode_LATIN1_INIT("\xcd"), \
+                _PyUnicode_LATIN1_INIT("\xce"), \
+                _PyUnicode_LATIN1_INIT("\xcf"), \
+                _PyUnicode_LATIN1_INIT("\xd0"), \
+                _PyUnicode_LATIN1_INIT("\xd1"), \
+                _PyUnicode_LATIN1_INIT("\xd2"), \
+                _PyUnicode_LATIN1_INIT("\xd3"), \
+                _PyUnicode_LATIN1_INIT("\xd4"), \
+                _PyUnicode_LATIN1_INIT("\xd5"), \
+                _PyUnicode_LATIN1_INIT("\xd6"), \
+                _PyUnicode_LATIN1_INIT("\xd7"), \
+                _PyUnicode_LATIN1_INIT("\xd8"), \
+                _PyUnicode_LATIN1_INIT("\xd9"), \
+                _PyUnicode_LATIN1_INIT("\xda"), \
+                _PyUnicode_LATIN1_INIT("\xdb"), \
+                _PyUnicode_LATIN1_INIT("\xdc"), \
+                _PyUnicode_LATIN1_INIT("\xdd"), \
+                _PyUnicode_LATIN1_INIT("\xde"), \
+                _PyUnicode_LATIN1_INIT("\xdf"), \
+                _PyUnicode_LATIN1_INIT("\xe0"), \
+                _PyUnicode_LATIN1_INIT("\xe1"), \
+                _PyUnicode_LATIN1_INIT("\xe2"), \
+                _PyUnicode_LATIN1_INIT("\xe3"), \
+                _PyUnicode_LATIN1_INIT("\xe4"), \
+                _PyUnicode_LATIN1_INIT("\xe5"), \
+                _PyUnicode_LATIN1_INIT("\xe6"), \
+                _PyUnicode_LATIN1_INIT("\xe7"), \
+                _PyUnicode_LATIN1_INIT("\xe8"), \
+                _PyUnicode_LATIN1_INIT("\xe9"), \
+                _PyUnicode_LATIN1_INIT("\xea"), \
+                _PyUnicode_LATIN1_INIT("\xeb"), \
+                _PyUnicode_LATIN1_INIT("\xec"), \
+                _PyUnicode_LATIN1_INIT("\xed"), \
+                _PyUnicode_LATIN1_INIT("\xee"), \
+                _PyUnicode_LATIN1_INIT("\xef"), \
+                _PyUnicode_LATIN1_INIT("\xf0"), \
+                _PyUnicode_LATIN1_INIT("\xf1"), \
+                _PyUnicode_LATIN1_INIT("\xf2"), \
+                _PyUnicode_LATIN1_INIT("\xf3"), \
+                _PyUnicode_LATIN1_INIT("\xf4"), \
+                _PyUnicode_LATIN1_INIT("\xf5"), \
+                _PyUnicode_LATIN1_INIT("\xf6"), \
+                _PyUnicode_LATIN1_INIT("\xf7"), \
+                _PyUnicode_LATIN1_INIT("\xf8"), \
+                _PyUnicode_LATIN1_INIT("\xf9"), \
+                _PyUnicode_LATIN1_INIT("\xfa"), \
+                _PyUnicode_LATIN1_INIT("\xfb"), \
+                _PyUnicode_LATIN1_INIT("\xfc"), \
+                _PyUnicode_LATIN1_INIT("\xfd"), \
+                _PyUnicode_LATIN1_INIT("\xfe"), \
+                _PyUnicode_LATIN1_INIT("\xff"), \
+            }, \
+        }, \
+        \
+        .tuple_empty = { \
+            .ob_base = _PyVarObject_IMMORTAL_INIT(&PyTuple_Type, 0) \
+        }, \
+    }, \
+}
+/* End auto-generated code */
+#ifdef __cplusplus
+}
+#endif
+#endif /* !Py_INTERNAL_RUNTIME_INIT_GENERATED_H */
diff --git a/Makefile.pre.in b/Makefile.pre.in
index ee67a015f74bb..84c783327edd8 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -1639,6 +1639,7 @@ PYTHON_HEADERS= \
 		$(srcdir)/Include/internal/pycore_pystate.h \
 		$(srcdir)/Include/internal/pycore_range.h \
 		$(srcdir)/Include/internal/pycore_runtime.h \
+		$(srcdir)/Include/internal/pycore_runtime_init_generated.h \
 		$(srcdir)/Include/internal/pycore_runtime_init.h \
 		$(srcdir)/Include/internal/pycore_signal.h \
 		$(srcdir)/Include/internal/pycore_sliceobject.h \
diff --git a/PCbuild/pythoncore.vcxproj b/PCbuild/pythoncore.vcxproj
index 09acce9d0c894..b5b4fce142b1e 100644
--- a/PCbuild/pythoncore.vcxproj
+++ b/PCbuild/pythoncore.vcxproj
@@ -241,6 +241,7 @@
     <ClInclude Include="..\Include\internal\pycore_range.h" />
     <ClInclude Include="..\Include\internal\pycore_runtime.h" />
     <ClInclude Include="..\Include\internal\pycore_runtime_init.h" />
+    <ClInclude Include="..\Include\internal\pycore_runtime_init_generated.h" />
     <ClInclude Include="..\Include\internal\pycore_signal.h" />
     <ClInclude Include="..\Include\internal\pycore_sliceobject.h" />
     <ClInclude Include="..\Include\internal\pycore_strhex.h" />
diff --git a/PCbuild/pythoncore.vcxproj.filters b/PCbuild/pythoncore.vcxproj.filters
index 4d91a7ad0b3e7..774b4b5b2e2e4 100644
--- a/PCbuild/pythoncore.vcxproj.filters
+++ b/PCbuild/pythoncore.vcxproj.filters
@@ -533,7 +533,7 @@
     </ClInclude>
     <ClInclude Include="..\Include\internal\pycore_descrobject.h">
       <Filter>Include\internal</Filter>
-    </ClInclude>    
+    </ClInclude>
     <ClInclude Include="..\Include\internal\pycore_dtoa.h">
       <Filter>Include\internal</Filter>
     </ClInclude>
@@ -627,6 +627,9 @@
     <ClInclude Include="..\Include\internal\pycore_runtime_init.h">
       <Filter>Include\internal</Filter>
     </ClInclude>
+    <ClInclude Include="..\Include\internal\pycore_runtime_init_generated.h">
+      <Filter>Include\internal</Filter>
+    </ClInclude>
     <ClInclude Include="..\Include\internal\pycore_signal.h">
       <Filter>Include\internal</Filter>
     </ClInclude>
diff --git a/Tools/scripts/generate_global_objects.py b/Tools/scripts/generate_global_objects.py
index 2180acd7ea94b..c26491b1d083a 100644
--- a/Tools/scripts/generate_global_objects.py
+++ b/Tools/scripts/generate_global_objects.py
@@ -237,7 +237,7 @@ def generate_runtime_init(identifiers, strings):
     assert nsmallposints and nsmallnegints
 
     # Then target the runtime initializer.
-    filename = os.path.join(INTERNAL, 'pycore_runtime_init.h')
+    filename = os.path.join(INTERNAL, 'pycore_runtime_init_generated.h')
 
     # Read the non-generated part of the file.
     with open(filename) as infile:


From webhook-mailer at python.org  Thu Jul  7 17:31:48 2022
From: webhook-mailer at python.org (JelleZijlstra)
Date: Thu, 07 Jul 2022 21:31:48 -0000
Subject: [Python-checkins] gh-92743: Remove copyright sign next to "Raymond
 Hettinger" (#94665)
Message-ID: <mailman.2142.1657229508.20746.python-checkins@python.org>

https://github.com/python/cpython/commit/860aefaecafc750c8cc33a0723b463dde28c1864
commit: 860aefaecafc750c8cc33a0723b463dde28c1864
branch: 3.10
author: Guy Yagev <yourlefthandman8 at gmail.com>
committer: JelleZijlstra <jelle.zijlstra at gmail.com>
date: 2022-07-07T14:31:39-07:00
summary:

gh-92743: Remove copyright sign next to "Raymond Hettinger" (#94665)

Closes GH-92743

files:
M Doc/library/typing.rst

diff --git a/Doc/library/typing.rst b/Doc/library/typing.rst
index 9936f1a3e57c3..1b7cf31d7cded 100644
--- a/Doc/library/typing.rst
+++ b/Doc/library/typing.rst
@@ -1142,7 +1142,7 @@ These are not used in annotations. They are building blocks for creating generic
 
     Bound type variables are particularly useful for annotating
     :func:`classmethods <classmethod>` that serve as alternative constructors.
-    In the following example (?
+    In the following example (by
     `Raymond Hettinger <https://www.youtube.com/watch?v=HTLu2DFOdTg>`_), the
     type variable ``C`` is bound to the ``Circle`` class through the use of a
     forward reference. Using this type variable to annotate the


From webhook-mailer at python.org  Thu Jul  7 18:33:22 2022
From: webhook-mailer at python.org (erlend-aasland)
Date: Thu, 07 Jul 2022 22:33:22 -0000
Subject: [Python-checkins] gh-94321: Document sqlite3.PrepareProtocol
 (#94620)
Message-ID: <mailman.2143.1657233203.20746.python-checkins@python.org>

https://github.com/python/cpython/commit/fb6dccae348b954d9f625031b54711a9a33da525
commit: fb6dccae348b954d9f625031b54711a9a33da525
branch: main
author: Erlend Egeberg Aasland <erlend.aasland at protonmail.com>
committer: erlend-aasland <erlend.aasland at protonmail.com>
date: 2022-07-08T00:33:17+02:00
summary:

gh-94321: Document sqlite3.PrepareProtocol (#94620)

files:
A Misc/NEWS.d/next/Documentation/2022-07-07-08-42-05.gh-issue-94321.pmCIPb.rst
M Doc/library/sqlite3.rst
M Modules/_sqlite/prepare_protocol.c

diff --git a/Doc/library/sqlite3.rst b/Doc/library/sqlite3.rst
index ad49a217d3b4a..2f4e2aeef9399 100644
--- a/Doc/library/sqlite3.rst
+++ b/Doc/library/sqlite3.rst
@@ -1139,6 +1139,16 @@ Blob Objects
       end).
 
 
+PrepareProtocol Objects
+-----------------------
+
+.. class:: PrepareProtocol
+
+   The PrepareProtocol type's single purpose is to act as a :pep:`246` style
+   adaption protocol for objects that can :ref:`adapt themselves
+   <sqlite3-conform>` to :ref:`native SQLite types <sqlite3-types>`.
+
+
 .. _sqlite3-exceptions:
 
 Exceptions
@@ -1297,6 +1307,8 @@ As an application developer, it may make more sense to take direct control by
 registering custom adapter functions.
 
 
+.. _sqlite3-conform:
+
 Letting your object adapt itself
 """"""""""""""""""""""""""""""""
 
diff --git a/Misc/NEWS.d/next/Documentation/2022-07-07-08-42-05.gh-issue-94321.pmCIPb.rst b/Misc/NEWS.d/next/Documentation/2022-07-07-08-42-05.gh-issue-94321.pmCIPb.rst
new file mode 100644
index 0000000000000..c1a8dcd853538
--- /dev/null
+++ b/Misc/NEWS.d/next/Documentation/2022-07-07-08-42-05.gh-issue-94321.pmCIPb.rst
@@ -0,0 +1,2 @@
+Document the :pep:`246` style protocol type
+:class:`sqlite3.PrepareProtocol`.
diff --git a/Modules/_sqlite/prepare_protocol.c b/Modules/_sqlite/prepare_protocol.c
index cefb46e390ad6..44533225665da 100644
--- a/Modules/_sqlite/prepare_protocol.c
+++ b/Modules/_sqlite/prepare_protocol.c
@@ -46,10 +46,13 @@ pysqlite_prepare_protocol_dealloc(pysqlite_PrepareProtocol *self)
     Py_DECREF(tp);
 }
 
+PyDoc_STRVAR(doc, "PEP 246 style object adaption protocol type.");
+
 static PyType_Slot type_slots[] = {
     {Py_tp_dealloc, pysqlite_prepare_protocol_dealloc},
     {Py_tp_init, pysqlite_prepare_protocol_init},
     {Py_tp_traverse, pysqlite_prepare_protocol_traverse},
+    {Py_tp_doc, (void *)doc},
     {0, NULL},
 };
 


From webhook-mailer at python.org  Thu Jul  7 19:09:09 2022
From: webhook-mailer at python.org (miss-islington)
Date: Thu, 07 Jul 2022 23:09:09 -0000
Subject: [Python-checkins] gh-94321: Document sqlite3.PrepareProtocol
 (GH-94620)
Message-ID: <mailman.2144.1657235350.20746.python-checkins@python.org>

https://github.com/python/cpython/commit/c72001e5bd2ddd5abec6cd508afb3912faf55d6b
commit: c72001e5bd2ddd5abec6cd508afb3912faf55d6b
branch: 3.11
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-07T16:09:05-07:00
summary:

gh-94321: Document sqlite3.PrepareProtocol (GH-94620)

(cherry picked from commit fb6dccae348b954d9f625031b54711a9a33da525)

Co-authored-by: Erlend Egeberg Aasland <erlend.aasland at protonmail.com>

files:
A Misc/NEWS.d/next/Documentation/2022-07-07-08-42-05.gh-issue-94321.pmCIPb.rst
M Doc/library/sqlite3.rst
M Modules/_sqlite/prepare_protocol.c

diff --git a/Doc/library/sqlite3.rst b/Doc/library/sqlite3.rst
index 3ffd67d067406..1d8f80aa9b035 100644
--- a/Doc/library/sqlite3.rst
+++ b/Doc/library/sqlite3.rst
@@ -1127,6 +1127,16 @@ Blob Objects
       end).
 
 
+PrepareProtocol Objects
+-----------------------
+
+.. class:: PrepareProtocol
+
+   The PrepareProtocol type's single purpose is to act as a :pep:`246` style
+   adaption protocol for objects that can :ref:`adapt themselves
+   <sqlite3-conform>` to :ref:`native SQLite types <sqlite3-types>`.
+
+
 .. _sqlite3-exceptions:
 
 Exceptions
@@ -1287,6 +1297,8 @@ As an application developer, it may make more sense to take direct control by
 registering custom adapter functions.
 
 
+.. _sqlite3-conform:
+
 Letting your object adapt itself
 """"""""""""""""""""""""""""""""
 
diff --git a/Misc/NEWS.d/next/Documentation/2022-07-07-08-42-05.gh-issue-94321.pmCIPb.rst b/Misc/NEWS.d/next/Documentation/2022-07-07-08-42-05.gh-issue-94321.pmCIPb.rst
new file mode 100644
index 0000000000000..c1a8dcd853538
--- /dev/null
+++ b/Misc/NEWS.d/next/Documentation/2022-07-07-08-42-05.gh-issue-94321.pmCIPb.rst
@@ -0,0 +1,2 @@
+Document the :pep:`246` style protocol type
+:class:`sqlite3.PrepareProtocol`.
diff --git a/Modules/_sqlite/prepare_protocol.c b/Modules/_sqlite/prepare_protocol.c
index cefb46e390ad6..44533225665da 100644
--- a/Modules/_sqlite/prepare_protocol.c
+++ b/Modules/_sqlite/prepare_protocol.c
@@ -46,10 +46,13 @@ pysqlite_prepare_protocol_dealloc(pysqlite_PrepareProtocol *self)
     Py_DECREF(tp);
 }
 
+PyDoc_STRVAR(doc, "PEP 246 style object adaption protocol type.");
+
 static PyType_Slot type_slots[] = {
     {Py_tp_dealloc, pysqlite_prepare_protocol_dealloc},
     {Py_tp_init, pysqlite_prepare_protocol_init},
     {Py_tp_traverse, pysqlite_prepare_protocol_traverse},
+    {Py_tp_doc, (void *)doc},
     {0, NULL},
 };
 


From webhook-mailer at python.org  Thu Jul  7 19:44:24 2022
From: webhook-mailer at python.org (erlend-aasland)
Date: Thu, 07 Jul 2022 23:44:24 -0000
Subject: [Python-checkins] [3.10] gh-94321: Document sqlite3.PrepareProtocol
 (GH-94620) (#94671)
Message-ID: <mailman.2145.1657237465.20746.python-checkins@python.org>

https://github.com/python/cpython/commit/797745e749d06d7854605b184892dc07572d84bd
commit: 797745e749d06d7854605b184892dc07572d84bd
branch: 3.10
author: Erlend Egeberg Aasland <erlend.aasland at protonmail.com>
committer: erlend-aasland <erlend.aasland at protonmail.com>
date: 2022-07-08T01:44:09+02:00
summary:

[3.10] gh-94321: Document sqlite3.PrepareProtocol (GH-94620) (#94671)

(cherry picked from commit fb6dccae348b954d9f625031b54711a9a33da525)

Co-authored-by: Erlend Egeberg Aasland <erlend.aasland at protonmail.com>

files:
A Misc/NEWS.d/next/Documentation/2022-07-07-08-42-05.gh-issue-94321.pmCIPb.rst
M Doc/library/sqlite3.rst
M Modules/_sqlite/prepare_protocol.c

diff --git a/Doc/library/sqlite3.rst b/Doc/library/sqlite3.rst
index 280a85e822f69..e666b69e4490b 100644
--- a/Doc/library/sqlite3.rst
+++ b/Doc/library/sqlite3.rst
@@ -912,6 +912,16 @@ Now we plug :class:`Row` in::
    35.14
 
 
+PrepareProtocol Objects
+-----------------------
+
+.. class:: PrepareProtocol
+
+   The PrepareProtocol type's single purpose is to act as a :pep:`246` style
+   adaption protocol for objects that can :ref:`adapt themselves
+   <sqlite3-conform>` to :ref:`native SQLite types <sqlite3-types>`.
+
+
 .. _sqlite3-exceptions:
 
 Exceptions
@@ -1055,6 +1065,8 @@ As an application developer, it may make more sense to take direct control by
 registering custom adapter functions.
 
 
+.. _sqlite3-conform:
+
 Letting your object adapt itself
 """"""""""""""""""""""""""""""""
 
diff --git a/Misc/NEWS.d/next/Documentation/2022-07-07-08-42-05.gh-issue-94321.pmCIPb.rst b/Misc/NEWS.d/next/Documentation/2022-07-07-08-42-05.gh-issue-94321.pmCIPb.rst
new file mode 100644
index 0000000000000..c1a8dcd853538
--- /dev/null
+++ b/Misc/NEWS.d/next/Documentation/2022-07-07-08-42-05.gh-issue-94321.pmCIPb.rst
@@ -0,0 +1,2 @@
+Document the :pep:`246` style protocol type
+:class:`sqlite3.PrepareProtocol`.
diff --git a/Modules/_sqlite/prepare_protocol.c b/Modules/_sqlite/prepare_protocol.c
index 800eef8794b45..aa499842df1c6 100644
--- a/Modules/_sqlite/prepare_protocol.c
+++ b/Modules/_sqlite/prepare_protocol.c
@@ -46,10 +46,13 @@ pysqlite_prepare_protocol_dealloc(pysqlite_PrepareProtocol *self)
     Py_DECREF(tp);
 }
 
+PyDoc_STRVAR(doc, "PEP 246 style object adaption protocol type.");
+
 static PyType_Slot type_slots[] = {
     {Py_tp_dealloc, pysqlite_prepare_protocol_dealloc},
     {Py_tp_init, pysqlite_prepare_protocol_init},
     {Py_tp_traverse, pysqlite_prepare_protocol_traverse},
+    {Py_tp_doc, (void *)doc},
     {0, NULL},
 };
 


From webhook-mailer at python.org  Thu Jul  7 20:39:06 2022
From: webhook-mailer at python.org (erlend-aasland)
Date: Fri, 08 Jul 2022 00:39:06 -0000
Subject: [Python-checkins] gh-94622: Add more references to the sqlite3
 types anchor (#94623)
Message-ID: <mailman.2146.1657240746.20746.python-checkins@python.org>

https://github.com/python/cpython/commit/e5b841a4037d1c2ce3d12a584facf800ae36332a
commit: e5b841a4037d1c2ce3d12a584facf800ae36332a
branch: main
author: Erlend Egeberg Aasland <erlend.aasland at protonmail.com>
committer: erlend-aasland <erlend.aasland at protonmail.com>
date: 2022-07-08T02:38:38+02:00
summary:

gh-94622: Add more references to the sqlite3 types anchor (#94623)

files:
M Doc/library/sqlite3.rst

diff --git a/Doc/library/sqlite3.rst b/Doc/library/sqlite3.rst
index 2f4e2aeef9399..bdff071b34ca0 100644
--- a/Doc/library/sqlite3.rst
+++ b/Doc/library/sqlite3.rst
@@ -496,8 +496,8 @@ Connection Objects
       SQLite 3.8.3 or higher, :exc:`NotSupportedError` will be raised if used
       with older versions.
 
-      The function can return any of the types supported by SQLite: bytes, str, int,
-      float and ``None``.
+      The function can return any of
+      :ref:`the types natively supported by SQLite <sqlite3-types>`.
 
       .. versionchanged:: 3.8
          The *deterministic* parameter was added.
@@ -516,8 +516,8 @@ Connection Objects
       any number of arguments), and a ``finalize`` method which will return the
       final result of the aggregate.
 
-      The ``finalize`` method can return any of the types supported by SQLite:
-      bytes, str, int, float and ``None``.
+      The ``finalize`` method can return any of
+      :ref:`the types natively supported by SQLite <sqlite3-types>`.
 
       Example:
 
@@ -537,10 +537,10 @@ Connection Objects
 
       ``step`` and ``value`` accept *num_params* number of parameters,
       unless *num_params* is ``-1``, in which case they may take any number of
-      arguments.  ``finalize`` and ``value`` can return any of the types
-      supported by SQLite:
-      :class:`bytes`, :class:`str`, :class:`int`, :class:`float`, and
-      :const:`None`.  Call :meth:`create_window_function` with
+      arguments.
+      ``finalize`` and ``value`` can return any of
+      :ref:`the types natively supported by SQLite <sqlite3-types>`.
+      Call :meth:`create_window_function` with
       *aggregate_class* set to :const:`None` to clear window function *name*.
 
       Aggregate window functions are supported by SQLite 3.25.0 and higher.


From webhook-mailer at python.org  Thu Jul  7 20:50:23 2022
From: webhook-mailer at python.org (erlend-aasland)
Date: Fri, 08 Jul 2022 00:50:23 -0000
Subject: [Python-checkins] [3.10] gh-94622: Add more references to the
 sqlite3 types anchor (GH-94623). (#94679)
Message-ID: <mailman.2147.1657241424.20746.python-checkins@python.org>

https://github.com/python/cpython/commit/691d26a17fc376f17f22b499fd6e887ac859b162
commit: 691d26a17fc376f17f22b499fd6e887ac859b162
branch: 3.10
author: Erlend Egeberg Aasland <erlend.aasland at protonmail.com>
committer: erlend-aasland <erlend.aasland at protonmail.com>
date: 2022-07-08T02:50:12+02:00
summary:

[3.10] gh-94622: Add more references to the sqlite3 types anchor (GH-94623). (#94679)

(cherry picked from commit e5b841a4037d1c2ce3d12a584facf800ae36332a)

Co-authored-by: Erlend Egeberg Aasland <erlend.aasland at protonmail.com>

files:
M Doc/library/sqlite3.rst

diff --git a/Doc/library/sqlite3.rst b/Doc/library/sqlite3.rst
index e666b69e4490b..7030059609ff9 100644
--- a/Doc/library/sqlite3.rst
+++ b/Doc/library/sqlite3.rst
@@ -433,8 +433,8 @@ Connection Objects
       SQLite 3.8.3 or higher, :exc:`NotSupportedError` will be raised if used
       with older versions.
 
-      The function can return any of the types supported by SQLite: bytes, str, int,
-      float and ``None``.
+      The function can return any of
+      :ref:`the types natively supported by SQLite <sqlite3-types>`.
 
       .. versionchanged:: 3.8
          The *deterministic* parameter was added.
@@ -453,8 +453,8 @@ Connection Objects
       any number of arguments), and a ``finalize`` method which will return the
       final result of the aggregate.
 
-      The ``finalize`` method can return any of the types supported by SQLite:
-      bytes, str, int, float and ``None``.
+      The ``finalize`` method can return any of
+      :ref:`the types natively supported by SQLite <sqlite3-types>`.
 
       Example:
 


From webhook-mailer at python.org  Thu Jul  7 20:50:23 2022
From: webhook-mailer at python.org (erlend-aasland)
Date: Fri, 08 Jul 2022 00:50:23 -0000
Subject: [Python-checkins] [3.11] gh-94622: Add more references to the
 sqlite3 types anchor (GH-94623) (#94678)
Message-ID: <mailman.2148.1657241424.20746.python-checkins@python.org>

https://github.com/python/cpython/commit/73a1800b55bc018cb2ac2a38c49e368bfe4a98d4
commit: 73a1800b55bc018cb2ac2a38c49e368bfe4a98d4
branch: 3.11
author: Erlend Egeberg Aasland <erlend.aasland at protonmail.com>
committer: erlend-aasland <erlend.aasland at protonmail.com>
date: 2022-07-08T02:50:01+02:00
summary:

[3.11] gh-94622: Add more references to the sqlite3 types anchor (GH-94623) (#94678)

(cherry picked from commit e5b841a4037d1c2ce3d12a584facf800ae36332a)

Co-authored-by: Erlend Egeberg Aasland <erlend.aasland at protonmail.com>

files:
M Doc/library/sqlite3.rst

diff --git a/Doc/library/sqlite3.rst b/Doc/library/sqlite3.rst
index 1d8f80aa9b035..575a5a1ebc07a 100644
--- a/Doc/library/sqlite3.rst
+++ b/Doc/library/sqlite3.rst
@@ -486,8 +486,8 @@ Connection Objects
       SQLite 3.8.3 or higher, :exc:`NotSupportedError` will be raised if used
       with older versions.
 
-      The function can return any of the types supported by SQLite: bytes, str, int,
-      float and ``None``.
+      The function can return any of
+      :ref:`the types natively supported by SQLite <sqlite3-types>`.
 
       .. versionchanged:: 3.8
          The *deterministic* parameter was added.
@@ -506,8 +506,8 @@ Connection Objects
       any number of arguments), and a ``finalize`` method which will return the
       final result of the aggregate.
 
-      The ``finalize`` method can return any of the types supported by SQLite:
-      bytes, str, int, float and ``None``.
+      The ``finalize`` method can return any of
+      :ref:`the types natively supported by SQLite <sqlite3-types>`.
 
       Example:
 
@@ -527,10 +527,10 @@ Connection Objects
 
       ``step`` and ``value`` accept *num_params* number of parameters,
       unless *num_params* is ``-1``, in which case they may take any number of
-      arguments.  ``finalize`` and ``value`` can return any of the types
-      supported by SQLite:
-      :class:`bytes`, :class:`str`, :class:`int`, :class:`float`, and
-      :const:`None`.  Call :meth:`create_window_function` with
+      arguments.
+      ``finalize`` and ``value`` can return any of
+      :ref:`the types natively supported by SQLite <sqlite3-types>`.
+      Call :meth:`create_window_function` with
       *aggregate_class* set to :const:`None` to clear window function *name*.
 
       Aggregate window functions are supported by SQLite 3.25.0 and higher.


From webhook-mailer at python.org  Fri Jul  8 08:41:15 2022
From: webhook-mailer at python.org (tiran)
Date: Fri, 08 Jul 2022 12:41:15 -0000
Subject: [Python-checkins] gh-94215: Fix error handling for line-tracing
 events (GH-94681)
Message-ID: <mailman.2149.1657284075.20746.python-checkins@python.org>

https://github.com/python/cpython/commit/23ee4a8067506e6c9c47748185653617413f7a60
commit: 23ee4a8067506e6c9c47748185653617413f7a60
branch: main
author: Brandt Bucher <brandtbucher at microsoft.com>
committer: tiran <christian at python.org>
date: 2022-07-08T14:40:35+02:00
summary:

gh-94215: Fix error handling for line-tracing events (GH-94681)

* Re-enable crasher
* Fix error handling for line-tracing events
* blurb add

files:
A Misc/NEWS.d/next/Core and Builtins/2022-07-07-21-13-25.gh-issue-94215._Sv9Ms.rst
M Lib/test/test_pdb.py
M Python/ceval.c

diff --git a/Lib/test/test_pdb.py b/Lib/test/test_pdb.py
index 968a32fce47b6..55c3283e26b1e 100644
--- a/Lib/test/test_pdb.py
+++ b/Lib/test/test_pdb.py
@@ -2085,7 +2085,6 @@ def test_issue42383(self):
             expected = '(Pdb) The correct file was executed'
             self.assertEqual(stdout.split('\n')[6].rstrip('\r'), expected)
 
-    @unittest.skip("test crashes, see gh-94215")
     def test_gh_94215_crash(self):
         script = """\
             def func():
diff --git a/Misc/NEWS.d/next/Core and Builtins/2022-07-07-21-13-25.gh-issue-94215._Sv9Ms.rst b/Misc/NEWS.d/next/Core and Builtins/2022-07-07-21-13-25.gh-issue-94215._Sv9Ms.rst
new file mode 100644
index 0000000000000..07af472fbdcab
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2022-07-07-21-13-25.gh-issue-94215._Sv9Ms.rst	
@@ -0,0 +1,3 @@
+Fix an issue where exceptions raised by line-tracing events would cause
+frames to be left in an invalid state, possibly resulting in a hard crash of
+the interpreter.
diff --git a/Python/ceval.c b/Python/ceval.c
index cdb14d84c0670..0176002432e8d 100644
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -5683,16 +5683,25 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, _PyInterpreterFrame *frame, int
                     err = maybe_call_line_trace(tstate->c_tracefunc,
                                                 tstate->c_traceobj,
                                                 tstate, frame, instr_prev);
+                    // Reload possibly changed frame fields:
+                    stack_pointer = _PyFrame_GetStackPointer(frame);
+                    frame->stacktop = -1;
+                    // next_instr is only reloaded if tracing *does not* raise.
+                    // This is consistent with the behavior of older Python
+                    // versions. If a trace function sets a new f_lineno and
+                    // *then* raises, we use the *old* location when searching
+                    // for an exception handler, displaying the traceback, and
+                    // so on:
                     if (err) {
-                        /* trace function raised an exception */
+                        // next_instr wasn't incremented at the start of this
+                        // instruction. Increment it before handling the error,
+                        // so that it looks the same as a "normal" instruction:
                         next_instr++;
                         goto error;
                     }
-                    /* Reload possibly changed frame fields */
+                    // Reload next_instr. Don't increment it, though, since
+                    // we're going to re-dispatch to the "true" instruction now:
                     next_instr = frame->prev_instr;
-
-                    stack_pointer = _PyFrame_GetStackPointer(frame);
-                    frame->stacktop = -1;
                 }
             }
         }


From webhook-mailer at python.org  Fri Jul  8 09:20:39 2022
From: webhook-mailer at python.org (vstinner)
Date: Fri, 08 Jul 2022 13:20:39 -0000
Subject: [Python-checkins] gh-94199: Remove the ssl.wrap_socket() function
 (#94203)
Message-ID: <mailman.2150.1657286439.20746.python-checkins@python.org>

https://github.com/python/cpython/commit/00464bbed66e5f64bdad7f930b315a88d5afccae
commit: 00464bbed66e5f64bdad7f930b315a88d5afccae
branch: main
author: Victor Stinner <vstinner at python.org>
committer: vstinner <vstinner at python.org>
date: 2022-07-08T15:20:15+02:00
summary:

gh-94199: Remove the ssl.wrap_socket() function (#94203)

Remove the ssl.wrap_socket() function, deprecated in Python 3.7:
instead, create a ssl.SSLContext object and call its
sl.SSLContext.wrap_socket() method. Any package that still uses
ssl.wrap_socket() is broken and insecure. The function neither sends
a SNI TLS extension nor validates server hostname. Code is subject to
CWE-295 : Improper Certificate Validation.

files:
A Misc/NEWS.d/next/Library/2022-06-24-10-39-56.gh-issue-94199.MIuckY.rst
M Doc/whatsnew/3.12.rst
M Lib/ssl.py
M Lib/test/test_ssl.py

diff --git a/Doc/whatsnew/3.12.rst b/Doc/whatsnew/3.12.rst
index a095baa5eace2..85b576c47c021 100644
--- a/Doc/whatsnew/3.12.rst
+++ b/Doc/whatsnew/3.12.rst
@@ -304,6 +304,15 @@ Removed
   :pep:`451` for the rationale.
   (Contributed by Victor Stinner in :gh:`94379`.)
 
+* Remove the :func:`ssl.wrap_socket` function, deprecated in Python 3.7:
+  instead, create a :class:`ssl.SSLContext` object and call its
+  :class:`ssl.SSLContext.wrap_socket` method. Any package that still uses
+  :func:`ssl.wrap_socket` is broken and insecure. The function neither sends a
+  SNI TLS extension nor validates server hostname. Code is subject to `CWE-295
+  <https://cwe.mitre.org/data/definitions/295.html>`_: Improper Certificate
+  Validation.
+  (Contributed by Victor Stinner in :gh:`94199`.)
+
 
 Porting to Python 3.12
 ======================
diff --git a/Lib/ssl.py b/Lib/ssl.py
index 02359a18c01e3..1d5873726441e 100644
--- a/Lib/ssl.py
+++ b/Lib/ssl.py
@@ -1357,36 +1357,6 @@ def version(self):
 SSLContext.sslobject_class = SSLObject
 
 
-def wrap_socket(sock, keyfile=None, certfile=None,
-                server_side=False, cert_reqs=CERT_NONE,
-                ssl_version=PROTOCOL_TLS, ca_certs=None,
-                do_handshake_on_connect=True,
-                suppress_ragged_eofs=True,
-                ciphers=None):
-    warnings.warn(
-        "ssl.wrap_socket() is deprecated, use SSLContext.wrap_socket()",
-        category=DeprecationWarning,
-        stacklevel=2
-    )
-    if server_side and not certfile:
-        raise ValueError("certfile must be specified for server-side "
-                         "operations")
-    if keyfile and not certfile:
-        raise ValueError("certfile must be specified")
-    context = SSLContext(ssl_version)
-    context.verify_mode = cert_reqs
-    if ca_certs:
-        context.load_verify_locations(ca_certs)
-    if certfile:
-        context.load_cert_chain(certfile, keyfile)
-    if ciphers:
-        context.set_ciphers(ciphers)
-    return context.wrap_socket(
-        sock=sock, server_side=server_side,
-        do_handshake_on_connect=do_handshake_on_connect,
-        suppress_ragged_eofs=suppress_ragged_eofs
-    )
-
 # some utility functions
 
 def cert_time_to_seconds(cert_time):
diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py
index 544adad89f586..65f5d4a6d7094 100644
--- a/Lib/test/test_ssl.py
+++ b/Lib/test/test_ssl.py
@@ -629,36 +629,6 @@ def test_openssl111_deprecations(self):
                     str(cm.warning)
                 )
 
-    @ignore_deprecation
-    def test_errors_sslwrap(self):
-        sock = socket.socket()
-        self.assertRaisesRegex(ValueError,
-                        "certfile must be specified",
-                        ssl.wrap_socket, sock, keyfile=CERTFILE)
-        self.assertRaisesRegex(ValueError,
-                        "certfile must be specified for server-side operations",
-                        ssl.wrap_socket, sock, server_side=True)
-        self.assertRaisesRegex(ValueError,
-                        "certfile must be specified for server-side operations",
-                         ssl.wrap_socket, sock, server_side=True, certfile="")
-        with ssl.wrap_socket(sock, server_side=True, certfile=CERTFILE) as s:
-            self.assertRaisesRegex(ValueError, "can't connect in server-side mode",
-                                     s.connect, (HOST, 8080))
-        with self.assertRaises(OSError) as cm:
-            with socket.socket() as sock:
-                ssl.wrap_socket(sock, certfile=NONEXISTINGCERT)
-        self.assertEqual(cm.exception.errno, errno.ENOENT)
-        with self.assertRaises(OSError) as cm:
-            with socket.socket() as sock:
-                ssl.wrap_socket(sock,
-                    certfile=CERTFILE, keyfile=NONEXISTINGCERT)
-        self.assertEqual(cm.exception.errno, errno.ENOENT)
-        with self.assertRaises(OSError) as cm:
-            with socket.socket() as sock:
-                ssl.wrap_socket(sock,
-                    certfile=NONEXISTINGCERT, keyfile=NONEXISTINGCERT)
-        self.assertEqual(cm.exception.errno, errno.ENOENT)
-
     def bad_cert_test(self, certfile):
         """Check that trying to use the given client certificate fails"""
         certfile = os.path.join(os.path.dirname(__file__) or os.curdir,
diff --git a/Misc/NEWS.d/next/Library/2022-06-24-10-39-56.gh-issue-94199.MIuckY.rst b/Misc/NEWS.d/next/Library/2022-06-24-10-39-56.gh-issue-94199.MIuckY.rst
new file mode 100644
index 0000000000000..e1fb163d55d59
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2022-06-24-10-39-56.gh-issue-94199.MIuckY.rst
@@ -0,0 +1,7 @@
+Remove the :func:`ssl.wrap_socket` function, deprecated in Python 3.7: instead,
+create a :class:`ssl.SSLContext` object and call its
+:class:`ssl.SSLContext.wrap_socket` method. Any package that still uses
+:func:`ssl.wrap_socket` is broken and insecure. The function neither sends a
+SNI TLS extension nor validates server hostname. Code is subject to `CWE-295
+<https://cwe.mitre.org/data/definitions/295.html>`_: Improper Certificate
+Validation. Patch by Victor Stinner.


From webhook-mailer at python.org  Fri Jul  8 09:25:58 2022
From: webhook-mailer at python.org (tiran)
Date: Fri, 08 Jul 2022 13:25:58 -0000
Subject: [Python-checkins] [3.11] gh-94215: Fix error handling for
 line-tracing events (GH-94681) (GH-94688)
Message-ID: <mailman.2151.1657286759.20746.python-checkins@python.org>

https://github.com/python/cpython/commit/36a3372d5105ffbd083a56cc8442a81a5bfeb19b
commit: 36a3372d5105ffbd083a56cc8442a81a5bfeb19b
branch: 3.11
author: Christian Heimes <christian at python.org>
committer: tiran <christian at python.org>
date: 2022-07-08T15:25:53+02:00
summary:

[3.11] gh-94215: Fix error handling for line-tracing events (GH-94681) (GH-94688)

* Re-enable crasher
* Fix error handling for line-tracing events
* blurb add
(cherry picked from commit 23ee4a8067506e6c9c47748185653617413f7a60)

Co-authored-by: Brandt Bucher <brandtbucher at microsoft.com>

files:
A Misc/NEWS.d/next/Core and Builtins/2022-07-07-21-13-25.gh-issue-94215._Sv9Ms.rst
M Lib/test/test_pdb.py
M Python/ceval.c

diff --git a/Lib/test/test_pdb.py b/Lib/test/test_pdb.py
index 968a32fce47b6..55c3283e26b1e 100644
--- a/Lib/test/test_pdb.py
+++ b/Lib/test/test_pdb.py
@@ -2085,7 +2085,6 @@ def test_issue42383(self):
             expected = '(Pdb) The correct file was executed'
             self.assertEqual(stdout.split('\n')[6].rstrip('\r'), expected)
 
-    @unittest.skip("test crashes, see gh-94215")
     def test_gh_94215_crash(self):
         script = """\
             def func():
diff --git a/Misc/NEWS.d/next/Core and Builtins/2022-07-07-21-13-25.gh-issue-94215._Sv9Ms.rst b/Misc/NEWS.d/next/Core and Builtins/2022-07-07-21-13-25.gh-issue-94215._Sv9Ms.rst
new file mode 100644
index 0000000000000..07af472fbdcab
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2022-07-07-21-13-25.gh-issue-94215._Sv9Ms.rst	
@@ -0,0 +1,3 @@
+Fix an issue where exceptions raised by line-tracing events would cause
+frames to be left in an invalid state, possibly resulting in a hard crash of
+the interpreter.
diff --git a/Python/ceval.c b/Python/ceval.c
index 32f471f574b73..1a5454570518f 100644
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -5642,16 +5642,25 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, _PyInterpreterFrame *frame, int
                     err = maybe_call_line_trace(tstate->c_tracefunc,
                                                 tstate->c_traceobj,
                                                 tstate, frame, instr_prev);
+                    // Reload possibly changed frame fields:
+                    stack_pointer = _PyFrame_GetStackPointer(frame);
+                    frame->stacktop = -1;
+                    // next_instr is only reloaded if tracing *does not* raise.
+                    // This is consistent with the behavior of older Python
+                    // versions. If a trace function sets a new f_lineno and
+                    // *then* raises, we use the *old* location when searching
+                    // for an exception handler, displaying the traceback, and
+                    // so on:
                     if (err) {
-                        /* trace function raised an exception */
+                        // next_instr wasn't incremented at the start of this
+                        // instruction. Increment it before handling the error,
+                        // so that it looks the same as a "normal" instruction:
                         next_instr++;
                         goto error;
                     }
-                    /* Reload possibly changed frame fields */
+                    // Reload next_instr. Don't increment it, though, since
+                    // we're going to re-dispatch to the "true" instruction now:
                     next_instr = frame->prev_instr;
-
-                    stack_pointer = _PyFrame_GetStackPointer(frame);
-                    frame->stacktop = -1;
                 }
             }
         }


From webhook-mailer at python.org  Fri Jul  8 10:44:21 2022
From: webhook-mailer at python.org (ezio-melotti)
Date: Fri, 08 Jul 2022 14:44:21 -0000
Subject: [Python-checkins] Use mdash-es consistently in the library docs
 index (#92762)
Message-ID: <mailman.2152.1657291462.20746.python-checkins@python.org>

https://github.com/python/cpython/commit/efb20a97c491821acb03564f526afaf9eed47eef
commit: efb20a97c491821acb03564f526afaf9eed47eef
branch: main
author: Oleg Iarygin <oleg at arhadthedev.net>
committer: ezio-melotti <ezio.melotti at gmail.com>
date: 2022-07-08T16:44:15+02:00
summary:

Use mdash-es consistently in the library docs index (#92762)

files:
M Doc/library/2to3.rst

diff --git a/Doc/library/2to3.rst b/Doc/library/2to3.rst
index fce02e2800933..d85ad94e9b7fe 100644
--- a/Doc/library/2to3.rst
+++ b/Doc/library/2to3.rst
@@ -1,7 +1,7 @@
 .. _2to3-reference:
 
-2to3 - Automated Python 2 to 3 code translation
-===============================================
+2to3 --- Automated Python 2 to 3 code translation
+=================================================
 
 .. sectionauthor:: Benjamin Peterson <benjamin at python.org>
 
@@ -456,8 +456,8 @@ and off individually.  They are described here in more detail.
    ``from future_builtins import zip`` appears.
 
 
-:mod:`lib2to3` - 2to3's library
--------------------------------
+:mod:`lib2to3` --- 2to3's library
+---------------------------------
 
 .. module:: lib2to3
    :synopsis: The 2to3 library


From webhook-mailer at python.org  Fri Jul  8 10:51:05 2022
From: webhook-mailer at python.org (miss-islington)
Date: Fri, 08 Jul 2022 14:51:05 -0000
Subject: [Python-checkins] Use mdash-es consistently in the library docs
 index (GH-92762)
Message-ID: <mailman.2153.1657291866.20746.python-checkins@python.org>

https://github.com/python/cpython/commit/da4912885f11f525a82a83f795ebffba06560e13
commit: da4912885f11f525a82a83f795ebffba06560e13
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-08T07:50:56-07:00
summary:

Use mdash-es consistently in the library docs index (GH-92762)

(cherry picked from commit efb20a97c491821acb03564f526afaf9eed47eef)

Co-authored-by: Oleg Iarygin <oleg at arhadthedev.net>

files:
M Doc/library/2to3.rst

diff --git a/Doc/library/2to3.rst b/Doc/library/2to3.rst
index 5e1b010e9bb5f..e9becb0738237 100644
--- a/Doc/library/2to3.rst
+++ b/Doc/library/2to3.rst
@@ -1,7 +1,7 @@
 .. _2to3-reference:
 
-2to3 - Automated Python 2 to 3 code translation
-===============================================
+2to3 --- Automated Python 2 to 3 code translation
+=================================================
 
 .. sectionauthor:: Benjamin Peterson <benjamin at python.org>
 
@@ -451,8 +451,8 @@ and off individually.  They are described here in more detail.
    ``from future_builtins import zip`` appears.
 
 
-:mod:`lib2to3` - 2to3's library
--------------------------------
+:mod:`lib2to3` --- 2to3's library
+---------------------------------
 
 .. module:: lib2to3
    :synopsis: The 2to3 library


From webhook-mailer at python.org  Fri Jul  8 10:52:10 2022
From: webhook-mailer at python.org (miss-islington)
Date: Fri, 08 Jul 2022 14:52:10 -0000
Subject: [Python-checkins] Use mdash-es consistently in the library docs
 index (GH-92762)
Message-ID: <mailman.2154.1657291931.20746.python-checkins@python.org>

https://github.com/python/cpython/commit/cb4359ccfc8f07cce6fbbd81f56fd252e1d7a6f5
commit: cb4359ccfc8f07cce6fbbd81f56fd252e1d7a6f5
branch: 3.11
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-08T07:52:02-07:00
summary:

Use mdash-es consistently in the library docs index (GH-92762)

(cherry picked from commit efb20a97c491821acb03564f526afaf9eed47eef)

Co-authored-by: Oleg Iarygin <oleg at arhadthedev.net>

files:
M Doc/library/2to3.rst

diff --git a/Doc/library/2to3.rst b/Doc/library/2to3.rst
index fce02e2800933..d85ad94e9b7fe 100644
--- a/Doc/library/2to3.rst
+++ b/Doc/library/2to3.rst
@@ -1,7 +1,7 @@
 .. _2to3-reference:
 
-2to3 - Automated Python 2 to 3 code translation
-===============================================
+2to3 --- Automated Python 2 to 3 code translation
+=================================================
 
 .. sectionauthor:: Benjamin Peterson <benjamin at python.org>
 
@@ -456,8 +456,8 @@ and off individually.  They are described here in more detail.
    ``from future_builtins import zip`` appears.
 
 
-:mod:`lib2to3` - 2to3's library
--------------------------------
+:mod:`lib2to3` --- 2to3's library
+---------------------------------
 
 .. module:: lib2to3
    :synopsis: The 2to3 library


From webhook-mailer at python.org  Fri Jul  8 11:56:46 2022
From: webhook-mailer at python.org (miss-islington)
Date: Fri, 08 Jul 2022 15:56:46 -0000
Subject: [Python-checkins] gh-93649: Split vectorcall testing from
 _testcapimodule.c (GH-94549)
Message-ID: <mailman.2155.1657295807.20746.python-checkins@python.org>

https://github.com/python/cpython/commit/be862b4e55cfe3413752aba2437f9086b5315d08
commit: be862b4e55cfe3413752aba2437f9086b5315d08
branch: main
author: Petr Viktorin <encukou at gmail.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-08T08:56:26-07:00
summary:

gh-93649: Split vectorcall testing from _testcapimodule.c (GH-94549)



The `_testcapimodule.c` file is getting too large to work with effectively.
This PR lays out a general structure of how tests can be split up, with more splitting to come later if the structure is OK.

Vectorcall tests aren't the biggest issue -- it's just an area I want to work on next, so I'm starting here.
An issue specific to vectorcall tests is that it wasn't clear that e.g. `MethodDescriptor2` is related to testing vectorcall: the `/* Test PEP 590 */` section had an ambiguous end. Separate file should make things like this much clearer.
OTOH, for some pieces it might not be clear where they should be -- I left `meth_fastcall` with tests of the other calling conventions. IMO, even with the ambiguity it's still worth it to split the huge file up.

I'm not sure about the buildsystem changes, hopefully CI will tell me what's wrong.

@vstinner, @markshannon: Do you think this is a good idea?

Automerge-Triggered-By: GH:encukou

files:
A Modules/_testcapi/README.txt
A Modules/_testcapi/parts.h
A Modules/_testcapi/vectorcall.c
M Makefile.pre.in
M Modules/Setup.stdlib.in
M Modules/_testcapimodule.c
M PCbuild/_testcapi.vcxproj
M PCbuild/_testcapi.vcxproj.filters
M setup.py

diff --git a/Makefile.pre.in b/Makefile.pre.in
index 84c783327edd8..c17c3d6067d97 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -2568,7 +2568,7 @@ MODULE__SHA3_DEPS=$(srcdir)/Modules/_sha3/sha3.c $(srcdir)/Modules/_sha3/sha3.h
 MODULE__SHA512_DEPS=$(srcdir)/Modules/hashlib.h
 MODULE__SOCKET_DEPS=$(srcdir)/Modules/socketmodule.h
 MODULE__SSL_DEPS=$(srcdir)/Modules/_ssl.h $(srcdir)/Modules/_ssl/cert.c $(srcdir)/Modules/_ssl/debughelpers.c $(srcdir)/Modules/_ssl/misc.c $(srcdir)/Modules/_ssl_data.h $(srcdir)/Modules/_ssl_data_111.h $(srcdir)/Modules/_ssl_data_300.h $(srcdir)/Modules/socketmodule.h
-MODULE__TESTCAPI_DEPS=$(srcdir)/Modules/testcapi_long.h
+MODULE__TESTCAPI_DEPS=$(srcdir)/Modules/testcapi_long.h Modules/_testcapi/parts.h $(srcdir)/Modules/_testcapi/vectorcall.c
 MODULE__SQLITE3_DEPS=$(srcdir)/Modules/_sqlite/connection.h $(srcdir)/Modules/_sqlite/cursor.h $(srcdir)/Modules/_sqlite/microprotocols.h $(srcdir)/Modules/_sqlite/module.h $(srcdir)/Modules/_sqlite/prepare_protocol.h $(srcdir)/Modules/_sqlite/row.h $(srcdir)/Modules/_sqlite/util.h
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/Modules/Setup.stdlib.in b/Modules/Setup.stdlib.in
index 7357aacd7267a..581a5c7f979d1 100644
--- a/Modules/Setup.stdlib.in
+++ b/Modules/Setup.stdlib.in
@@ -168,7 +168,7 @@
 @MODULE__XXTESTFUZZ_TRUE at _xxtestfuzz _xxtestfuzz/_xxtestfuzz.c _xxtestfuzz/fuzzer.c
 @MODULE__TESTBUFFER_TRUE at _testbuffer _testbuffer.c
 @MODULE__TESTINTERNALCAPI_TRUE at _testinternalcapi _testinternalcapi.c
- at MODULE__TESTCAPI_TRUE@_testcapi _testcapimodule.c
+ at MODULE__TESTCAPI_TRUE@_testcapi _testcapimodule.c _testcapi/vectorcall.c
 
 # Some testing modules MUST be built as shared libraries.
 *shared*
diff --git a/Modules/_testcapi/README.txt b/Modules/_testcapi/README.txt
new file mode 100644
index 0000000000000..134b6efc63809
--- /dev/null
+++ b/Modules/_testcapi/README.txt
@@ -0,0 +1,3 @@
+Tests in this directory are compiled into the _testcapi extension.
+The main file for the extension is Modules/_testcapimodule.c, which
+calls `_PyTestCapi_Init_*` from these functions.
diff --git a/Modules/_testcapi/parts.h b/Modules/_testcapi/parts.h
new file mode 100644
index 0000000000000..1111021e1852b
--- /dev/null
+++ b/Modules/_testcapi/parts.h
@@ -0,0 +1,3 @@
+#include "Python.h"
+
+PyAPI_FUNC(int) _PyTestCapi_Init_Vectorcall(PyObject *module);
diff --git a/Modules/_testcapi/vectorcall.c b/Modules/_testcapi/vectorcall.c
new file mode 100644
index 0000000000000..9bc702905caf7
--- /dev/null
+++ b/Modules/_testcapi/vectorcall.c
@@ -0,0 +1,270 @@
+#include "parts.h"
+#include <stddef.h>  // offsetof
+
+
+/* Test PEP 590 - Vectorcall */
+
+static int
+fastcall_args(PyObject *args, PyObject ***stack, Py_ssize_t *nargs)
+{
+    if (args == Py_None) {
+        *stack = NULL;
+        *nargs = 0;
+    }
+    else if (PyTuple_Check(args)) {
+        *stack = ((PyTupleObject *)args)->ob_item;
+        *nargs = PyTuple_GET_SIZE(args);
+    }
+    else {
+        PyErr_SetString(PyExc_TypeError, "args must be None or a tuple");
+        return -1;
+    }
+    return 0;
+}
+
+
+static PyObject *
+test_pyobject_fastcall(PyObject *self, PyObject *args)
+{
+    PyObject *func, *func_args;
+    PyObject **stack;
+    Py_ssize_t nargs;
+
+    if (!PyArg_ParseTuple(args, "OO", &func, &func_args)) {
+        return NULL;
+    }
+
+    if (fastcall_args(func_args, &stack, &nargs) < 0) {
+        return NULL;
+    }
+    return _PyObject_FastCall(func, stack, nargs);
+}
+
+static PyObject *
+test_pyobject_fastcalldict(PyObject *self, PyObject *args)
+{
+    PyObject *func, *func_args, *kwargs;
+    PyObject **stack;
+    Py_ssize_t nargs;
+
+    if (!PyArg_ParseTuple(args, "OOO", &func, &func_args, &kwargs)) {
+        return NULL;
+    }
+
+    if (fastcall_args(func_args, &stack, &nargs) < 0) {
+        return NULL;
+    }
+
+    if (kwargs == Py_None) {
+        kwargs = NULL;
+    }
+    else if (!PyDict_Check(kwargs)) {
+        PyErr_SetString(PyExc_TypeError, "kwnames must be None or a dict");
+        return NULL;
+    }
+
+    return PyObject_VectorcallDict(func, stack, nargs, kwargs);
+}
+
+static PyObject *
+test_pyobject_vectorcall(PyObject *self, PyObject *args)
+{
+    PyObject *func, *func_args, *kwnames = NULL;
+    PyObject **stack;
+    Py_ssize_t nargs, nkw;
+
+    if (!PyArg_ParseTuple(args, "OOO", &func, &func_args, &kwnames)) {
+        return NULL;
+    }
+
+    if (fastcall_args(func_args, &stack, &nargs) < 0) {
+        return NULL;
+    }
+
+    if (kwnames == Py_None) {
+        kwnames = NULL;
+    }
+    else if (PyTuple_Check(kwnames)) {
+        nkw = PyTuple_GET_SIZE(kwnames);
+        if (nargs < nkw) {
+            PyErr_SetString(PyExc_ValueError, "kwnames longer than args");
+            return NULL;
+        }
+        nargs -= nkw;
+    }
+    else {
+        PyErr_SetString(PyExc_TypeError, "kwnames must be None or a tuple");
+        return NULL;
+    }
+    return PyObject_Vectorcall(func, stack, nargs, kwnames);
+}
+
+static PyObject *
+test_pyvectorcall_call(PyObject *self, PyObject *args)
+{
+    PyObject *func;
+    PyObject *argstuple;
+    PyObject *kwargs = NULL;
+
+    if (!PyArg_ParseTuple(args, "OO|O", &func, &argstuple, &kwargs)) {
+        return NULL;
+    }
+
+    if (!PyTuple_Check(argstuple)) {
+        PyErr_SetString(PyExc_TypeError, "args must be a tuple");
+        return NULL;
+    }
+    if (kwargs != NULL && !PyDict_Check(kwargs)) {
+        PyErr_SetString(PyExc_TypeError, "kwargs must be a dict");
+        return NULL;
+    }
+
+    return PyVectorcall_Call(func, argstuple, kwargs);
+}
+
+static PyMethodDef TestMethods[] = {
+    {"pyobject_fastcall", test_pyobject_fastcall, METH_VARARGS},
+    {"pyobject_fastcalldict", test_pyobject_fastcalldict, METH_VARARGS},
+    {"pyobject_vectorcall", test_pyobject_vectorcall, METH_VARARGS},
+    {"pyvectorcall_call", test_pyvectorcall_call, METH_VARARGS},
+    {NULL},
+};
+
+
+typedef struct {
+    PyObject_HEAD
+    vectorcallfunc vectorcall;
+} MethodDescriptorObject;
+
+static PyObject *
+MethodDescriptor_vectorcall(PyObject *callable, PyObject *const *args,
+                            size_t nargsf, PyObject *kwnames)
+{
+    /* True if using the vectorcall function in MethodDescriptorObject
+     * but False for MethodDescriptor2Object */
+    MethodDescriptorObject *md = (MethodDescriptorObject *)callable;
+    return PyBool_FromLong(md->vectorcall != NULL);
+}
+
+static PyObject *
+MethodDescriptor_new(PyTypeObject* type, PyObject* args, PyObject *kw)
+{
+    MethodDescriptorObject *op = (MethodDescriptorObject *)type->tp_alloc(type, 0);
+    op->vectorcall = MethodDescriptor_vectorcall;
+    return (PyObject *)op;
+}
+
+static PyObject *
+func_descr_get(PyObject *func, PyObject *obj, PyObject *type)
+{
+    if (obj == Py_None || obj == NULL) {
+        Py_INCREF(func);
+        return func;
+    }
+    return PyMethod_New(func, obj);
+}
+
+static PyObject *
+nop_descr_get(PyObject *func, PyObject *obj, PyObject *type)
+{
+    Py_INCREF(func);
+    return func;
+}
+
+static PyObject *
+call_return_args(PyObject *self, PyObject *args, PyObject *kwargs)
+{
+    Py_INCREF(args);
+    return args;
+}
+
+static PyTypeObject MethodDescriptorBase_Type = {
+    PyVarObject_HEAD_INIT(NULL, 0)
+    "MethodDescriptorBase",
+    sizeof(MethodDescriptorObject),
+    .tp_new = MethodDescriptor_new,
+    .tp_call = PyVectorcall_Call,
+    .tp_vectorcall_offset = offsetof(MethodDescriptorObject, vectorcall),
+    .tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE |
+                Py_TPFLAGS_METHOD_DESCRIPTOR | Py_TPFLAGS_HAVE_VECTORCALL,
+    .tp_descr_get = func_descr_get,
+};
+
+static PyTypeObject MethodDescriptorDerived_Type = {
+    PyVarObject_HEAD_INIT(NULL, 0)
+    "MethodDescriptorDerived",
+    .tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE,
+};
+
+static PyTypeObject MethodDescriptorNopGet_Type = {
+    PyVarObject_HEAD_INIT(NULL, 0)
+    "MethodDescriptorNopGet",
+    .tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE,
+    .tp_call = call_return_args,
+    .tp_descr_get = nop_descr_get,
+};
+
+typedef struct {
+    MethodDescriptorObject base;
+    vectorcallfunc vectorcall;
+} MethodDescriptor2Object;
+
+static PyObject *
+MethodDescriptor2_new(PyTypeObject* type, PyObject* args, PyObject *kw)
+{
+    MethodDescriptor2Object *op = PyObject_New(MethodDescriptor2Object, type);
+    op->base.vectorcall = NULL;
+    op->vectorcall = MethodDescriptor_vectorcall;
+    return (PyObject *)op;
+}
+
+static PyTypeObject MethodDescriptor2_Type = {
+    PyVarObject_HEAD_INIT(NULL, 0)
+    "MethodDescriptor2",
+    sizeof(MethodDescriptor2Object),
+    .tp_new = MethodDescriptor2_new,
+    .tp_call = PyVectorcall_Call,
+    .tp_vectorcall_offset = offsetof(MethodDescriptor2Object, vectorcall),
+    .tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE | Py_TPFLAGS_HAVE_VECTORCALL,
+};
+
+
+int
+_PyTestCapi_Init_Vectorcall(PyObject *m) {
+    if (PyModule_AddFunctions(m, TestMethods) < 0) {
+        return -1;
+    }
+
+    if (PyType_Ready(&MethodDescriptorBase_Type) < 0) {
+        return -1;
+    }
+    if (PyModule_AddType(m, &MethodDescriptorBase_Type) < 0) {
+        return -1;
+    }
+
+    MethodDescriptorDerived_Type.tp_base = &MethodDescriptorBase_Type;
+    if (PyType_Ready(&MethodDescriptorDerived_Type) < 0) {
+        return -1;
+    }
+    if (PyModule_AddType(m, &MethodDescriptorDerived_Type) < 0) {
+        return -1;
+    }
+
+    MethodDescriptorNopGet_Type.tp_base = &MethodDescriptorBase_Type;
+    if (PyType_Ready(&MethodDescriptorNopGet_Type) < 0) {
+        return -1;
+    }
+    if (PyModule_AddType(m, &MethodDescriptorNopGet_Type) < 0) {
+        return -1;
+    }
+
+    MethodDescriptor2_Type.tp_base = &MethodDescriptorBase_Type;
+    if (PyType_Ready(&MethodDescriptor2_Type) < 0) {
+        return -1;
+    }
+    if (PyModule_AddType(m, &MethodDescriptor2_Type) < 0) {
+        return -1;
+    }
+
+    return 0;
+}
diff --git a/Modules/_testcapimodule.c b/Modules/_testcapimodule.c
index 7d88f4f51f831..436c701a7a3fa 100644
--- a/Modules/_testcapimodule.c
+++ b/Modules/_testcapimodule.c
@@ -43,6 +43,10 @@
 #  error "The public headers should not include <stdbool.h>, see bpo-46748"
 #endif
 
+// Several parts of this module are broken out into files in _testcapi/.
+// Include definitions from there.
+#include "_testcapi/parts.h"
+
 // Forward declarations
 static struct PyModuleDef _testcapimodule;
 static PyType_Spec HeapTypeNameType_Spec;
@@ -5299,128 +5303,6 @@ raise_SIGINT_then_send_None(PyObject *self, PyObject *args)
 }
 
 
-static int
-fastcall_args(PyObject *args, PyObject ***stack, Py_ssize_t *nargs)
-{
-    if (args == Py_None) {
-        *stack = NULL;
-        *nargs = 0;
-    }
-    else if (PyTuple_Check(args)) {
-        *stack = ((PyTupleObject *)args)->ob_item;
-        *nargs = PyTuple_GET_SIZE(args);
-    }
-    else {
-        PyErr_SetString(PyExc_TypeError, "args must be None or a tuple");
-        return -1;
-    }
-    return 0;
-}
-
-
-static PyObject *
-test_pyobject_fastcall(PyObject *self, PyObject *args)
-{
-    PyObject *func, *func_args;
-    PyObject **stack;
-    Py_ssize_t nargs;
-
-    if (!PyArg_ParseTuple(args, "OO", &func, &func_args)) {
-        return NULL;
-    }
-
-    if (fastcall_args(func_args, &stack, &nargs) < 0) {
-        return NULL;
-    }
-    return _PyObject_FastCall(func, stack, nargs);
-}
-
-
-static PyObject *
-test_pyobject_fastcalldict(PyObject *self, PyObject *args)
-{
-    PyObject *func, *func_args, *kwargs;
-    PyObject **stack;
-    Py_ssize_t nargs;
-
-    if (!PyArg_ParseTuple(args, "OOO", &func, &func_args, &kwargs)) {
-        return NULL;
-    }
-
-    if (fastcall_args(func_args, &stack, &nargs) < 0) {
-        return NULL;
-    }
-
-    if (kwargs == Py_None) {
-        kwargs = NULL;
-    }
-    else if (!PyDict_Check(kwargs)) {
-        PyErr_SetString(PyExc_TypeError, "kwnames must be None or a dict");
-        return NULL;
-    }
-
-    return PyObject_VectorcallDict(func, stack, nargs, kwargs);
-}
-
-
-static PyObject *
-test_pyobject_vectorcall(PyObject *self, PyObject *args)
-{
-    PyObject *func, *func_args, *kwnames = NULL;
-    PyObject **stack;
-    Py_ssize_t nargs, nkw;
-
-    if (!PyArg_ParseTuple(args, "OOO", &func, &func_args, &kwnames)) {
-        return NULL;
-    }
-
-    if (fastcall_args(func_args, &stack, &nargs) < 0) {
-        return NULL;
-    }
-
-    if (kwnames == Py_None) {
-        kwnames = NULL;
-    }
-    else if (PyTuple_Check(kwnames)) {
-        nkw = PyTuple_GET_SIZE(kwnames);
-        if (nargs < nkw) {
-            PyErr_SetString(PyExc_ValueError, "kwnames longer than args");
-            return NULL;
-        }
-        nargs -= nkw;
-    }
-    else {
-        PyErr_SetString(PyExc_TypeError, "kwnames must be None or a tuple");
-        return NULL;
-    }
-    return PyObject_Vectorcall(func, stack, nargs, kwnames);
-}
-
-
-static PyObject *
-test_pyvectorcall_call(PyObject *self, PyObject *args)
-{
-    PyObject *func;
-    PyObject *argstuple;
-    PyObject *kwargs = NULL;
-
-    if (!PyArg_ParseTuple(args, "OO|O", &func, &argstuple, &kwargs)) {
-        return NULL;
-    }
-
-    if (!PyTuple_Check(argstuple)) {
-        PyErr_SetString(PyExc_TypeError, "args must be a tuple");
-        return NULL;
-    }
-    if (kwargs != NULL && !PyDict_Check(kwargs)) {
-        PyErr_SetString(PyExc_TypeError, "kwargs must be a dict");
-        return NULL;
-    }
-
-    return PyVectorcall_Call(func, argstuple, kwargs);
-}
-
-
 static PyObject*
 stack_pointer(PyObject *self, PyObject *args)
 {
@@ -6403,10 +6285,6 @@ static PyMethodDef TestMethods[] = {
     {"tracemalloc_get_traceback", tracemalloc_get_traceback, METH_VARARGS},
     {"dict_get_version", dict_get_version, METH_VARARGS},
     {"raise_SIGINT_then_send_None", raise_SIGINT_then_send_None, METH_VARARGS},
-    {"pyobject_fastcall", test_pyobject_fastcall, METH_VARARGS},
-    {"pyobject_fastcalldict", test_pyobject_fastcalldict, METH_VARARGS},
-    {"pyobject_vectorcall", test_pyobject_vectorcall, METH_VARARGS},
-    {"pyvectorcall_call", test_pyvectorcall_call, METH_VARARGS},
     {"stack_pointer", stack_pointer, METH_NOARGS},
 #ifdef W_STOPCODE
     {"W_STOPCODE", py_w_stopcode, METH_VARARGS},
@@ -7009,106 +6887,6 @@ static PyTypeObject Generic_Type = {
     .tp_methods = generic_methods,
 };
 
-
-/* Test PEP 590 */
-
-typedef struct {
-    PyObject_HEAD
-    vectorcallfunc vectorcall;
-} MethodDescriptorObject;
-
-static PyObject *
-MethodDescriptor_vectorcall(PyObject *callable, PyObject *const *args,
-                            size_t nargsf, PyObject *kwnames)
-{
-    /* True if using the vectorcall function in MethodDescriptorObject
-     * but False for MethodDescriptor2Object */
-    MethodDescriptorObject *md = (MethodDescriptorObject *)callable;
-    return PyBool_FromLong(md->vectorcall != NULL);
-}
-
-static PyObject *
-MethodDescriptor_new(PyTypeObject* type, PyObject* args, PyObject *kw)
-{
-    MethodDescriptorObject *op = (MethodDescriptorObject *)type->tp_alloc(type, 0);
-    op->vectorcall = MethodDescriptor_vectorcall;
-    return (PyObject *)op;
-}
-
-static PyObject *
-func_descr_get(PyObject *func, PyObject *obj, PyObject *type)
-{
-    if (obj == Py_None || obj == NULL) {
-        Py_INCREF(func);
-        return func;
-    }
-    return PyMethod_New(func, obj);
-}
-
-static PyObject *
-nop_descr_get(PyObject *func, PyObject *obj, PyObject *type)
-{
-    Py_INCREF(func);
-    return func;
-}
-
-static PyObject *
-call_return_args(PyObject *self, PyObject *args, PyObject *kwargs)
-{
-    Py_INCREF(args);
-    return args;
-}
-
-static PyTypeObject MethodDescriptorBase_Type = {
-    PyVarObject_HEAD_INIT(NULL, 0)
-    "MethodDescriptorBase",
-    sizeof(MethodDescriptorObject),
-    .tp_new = MethodDescriptor_new,
-    .tp_call = PyVectorcall_Call,
-    .tp_vectorcall_offset = offsetof(MethodDescriptorObject, vectorcall),
-    .tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE |
-                Py_TPFLAGS_METHOD_DESCRIPTOR | Py_TPFLAGS_HAVE_VECTORCALL,
-    .tp_descr_get = func_descr_get,
-};
-
-static PyTypeObject MethodDescriptorDerived_Type = {
-    PyVarObject_HEAD_INIT(NULL, 0)
-    "MethodDescriptorDerived",
-    .tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE,
-};
-
-static PyTypeObject MethodDescriptorNopGet_Type = {
-    PyVarObject_HEAD_INIT(NULL, 0)
-    "MethodDescriptorNopGet",
-    .tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE,
-    .tp_call = call_return_args,
-    .tp_descr_get = nop_descr_get,
-};
-
-typedef struct {
-    MethodDescriptorObject base;
-    vectorcallfunc vectorcall;
-} MethodDescriptor2Object;
-
-static PyObject *
-MethodDescriptor2_new(PyTypeObject* type, PyObject* args, PyObject *kw)
-{
-    MethodDescriptor2Object *op = PyObject_New(MethodDescriptor2Object, type);
-    op->base.vectorcall = NULL;
-    op->vectorcall = MethodDescriptor_vectorcall;
-    return (PyObject *)op;
-}
-
-static PyTypeObject MethodDescriptor2_Type = {
-    PyVarObject_HEAD_INIT(NULL, 0)
-    "MethodDescriptor2",
-    sizeof(MethodDescriptor2Object),
-    .tp_new = MethodDescriptor2_new,
-    .tp_call = PyVectorcall_Call,
-    .tp_vectorcall_offset = offsetof(MethodDescriptor2Object, vectorcall),
-    .tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE | Py_TPFLAGS_HAVE_VECTORCALL,
-};
-
 PyDoc_STRVAR(heapdocctype__doc__,
 "HeapDocCType(arg1, arg2)\n"
 "--\n"
@@ -7778,29 +7556,6 @@ PyInit__testcapi(void)
     Py_INCREF(&MyList_Type);
     PyModule_AddObject(m, "MyList", (PyObject *)&MyList_Type);
 
-    if (PyType_Ready(&MethodDescriptorBase_Type) < 0)
-        return NULL;
-    Py_INCREF(&MethodDescriptorBase_Type);
-    PyModule_AddObject(m, "MethodDescriptorBase", (PyObject *)&MethodDescriptorBase_Type);
-
-    MethodDescriptorDerived_Type.tp_base = &MethodDescriptorBase_Type;
-    if (PyType_Ready(&MethodDescriptorDerived_Type) < 0)
-        return NULL;
-    Py_INCREF(&MethodDescriptorDerived_Type);
-    PyModule_AddObject(m, "MethodDescriptorDerived", (PyObject *)&MethodDescriptorDerived_Type);
-
-    MethodDescriptorNopGet_Type.tp_base = &MethodDescriptorBase_Type;
-    if (PyType_Ready(&MethodDescriptorNopGet_Type) < 0)
-        return NULL;
-    Py_INCREF(&MethodDescriptorNopGet_Type);
-    PyModule_AddObject(m, "MethodDescriptorNopGet", (PyObject *)&MethodDescriptorNopGet_Type);
-
-    MethodDescriptor2_Type.tp_base = &MethodDescriptorBase_Type;
-    if (PyType_Ready(&MethodDescriptor2_Type) < 0)
-        return NULL;
-    Py_INCREF(&MethodDescriptor2_Type);
-    PyModule_AddObject(m, "MethodDescriptor2", (PyObject *)&MethodDescriptor2_Type);
-
     if (PyType_Ready(&GenericAlias_Type) < 0)
         return NULL;
     Py_INCREF(&GenericAlias_Type);
@@ -7973,6 +7728,11 @@ PyInit__testcapi(void)
                            (PyObject *) &ContainerNoGC_type) < 0)
         return NULL;
 
+    /* Include tests from the _testcapi/ directory */
+    if (_PyTestCapi_Init_Vectorcall(m) < 0) {
+        return NULL;
+    }
+
     PyState_AddModule(m, &_testcapimodule);
     return m;
 }
@@ -8024,7 +7784,6 @@ test_buildvalue_issue38913(PyObject *self, PyObject *Py_UNUSED(ignored))
     }
     PyErr_Clear();
 
-
     Py_RETURN_NONE;
 }
 
diff --git a/PCbuild/_testcapi.vcxproj b/PCbuild/_testcapi.vcxproj
index c1a19437253b7..07e23557e1dba 100644
--- a/PCbuild/_testcapi.vcxproj
+++ b/PCbuild/_testcapi.vcxproj
@@ -94,6 +94,7 @@
   </PropertyGroup>
   <ItemGroup>
     <ClCompile Include="..\Modules\_testcapimodule.c" />
+    <ClCompile Include="..\Modules\_testcapi\vectorcall.c" />
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\PC\python_nt.rc" />
diff --git a/PCbuild/_testcapi.vcxproj.filters b/PCbuild/_testcapi.vcxproj.filters
index 53f64b7aa1e1a..82fce057e2e27 100644
--- a/PCbuild/_testcapi.vcxproj.filters
+++ b/PCbuild/_testcapi.vcxproj.filters
@@ -12,6 +12,9 @@
     <ClCompile Include="..\Modules\_testcapimodule.c">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\Modules\_testcapi\vectorcall.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\PC\python_nt.rc">
diff --git a/setup.py b/setup.py
index 2edcb08b4fd7f..7c71ac6ec6414 100644
--- a/setup.py
+++ b/setup.py
@@ -994,7 +994,7 @@ def detect_simple_extensions(self):
 
     def detect_test_extensions(self):
         # Python C API test module
-        self.addext(Extension('_testcapi', ['_testcapimodule.c']))
+        self.addext(Extension('_testcapi', ['_testcapimodule.c', '_testcapi/vectorcall.c']))
 
         # Python Internal C API test module
         self.addext(Extension('_testinternalcapi', ['_testinternalcapi.c']))


From webhook-mailer at python.org  Fri Jul  8 13:47:51 2022
From: webhook-mailer at python.org (miss-islington)
Date: Fri, 08 Jul 2022 17:47:51 -0000
Subject: [Python-checkins] GH-90699: Intern statically allocated strings
 (GH-93597)
Message-ID: <mailman.2156.1657302472.20746.python-checkins@python.org>

https://github.com/python/cpython/commit/9dff9f48144cf5d8bc1e6605f258973200c6b8c8
commit: 9dff9f48144cf5d8bc1e6605f258973200c6b8c8
branch: main
author: Kumar Aditya <59607654+kumaraditya303 at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-08T10:47:37-07:00
summary:

GH-90699: Intern statically allocated strings (GH-93597)



This is similar to how strings are interned for deepfreeze.

files:
M Include/internal/pycore_runtime_init_generated.h
M Objects/unicodeobject.c
M Tools/scripts/generate_global_objects.py

diff --git a/Include/internal/pycore_runtime_init_generated.h b/Include/internal/pycore_runtime_init_generated.h
index 7b217c3e29d23..ddaab07727b81 100644
--- a/Include/internal/pycore_runtime_init_generated.h
+++ b/Include/internal/pycore_runtime_init_generated.h
@@ -1131,6 +1131,615 @@ extern "C" {
         }, \
     }, \
 }
+
+static inline void
+_PyUnicode_InitStaticStrings(void) {
+    PyObject *string;
+    string = &_Py_ID(False);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(Py_Repr);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(TextIOWrapper);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(True);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(WarningMessage);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(_);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(__IOBase_closed);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(__abc_tpflags__);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(__abs__);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(__abstractmethods__);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(__add__);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(__aenter__);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(__aexit__);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(__aiter__);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(__all__);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(__and__);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(__anext__);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(__annotations__);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(__args__);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(__await__);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(__bases__);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(__bool__);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(__build_class__);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(__builtins__);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(__bytes__);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(__call__);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(__cantrace__);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(__class__);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(__class_getitem__);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(__classcell__);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(__complex__);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(__contains__);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(__copy__);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(__del__);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(__delattr__);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(__delete__);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(__delitem__);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(__dict__);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(__dictoffset__);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(__dir__);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(__divmod__);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(__doc__);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(__enter__);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(__eq__);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(__exit__);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(__file__);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(__float__);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(__floordiv__);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(__format__);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(__fspath__);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(__ge__);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(__get__);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(__getattr__);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(__getattribute__);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(__getinitargs__);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(__getitem__);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(__getnewargs__);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(__getnewargs_ex__);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(__getstate__);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(__gt__);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(__hash__);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(__iadd__);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(__iand__);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(__ifloordiv__);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(__ilshift__);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(__imatmul__);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(__imod__);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(__import__);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(__imul__);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(__index__);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(__init__);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(__init_subclass__);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(__instancecheck__);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(__int__);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(__invert__);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(__ior__);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(__ipow__);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(__irshift__);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(__isabstractmethod__);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(__isub__);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(__iter__);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(__itruediv__);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(__ixor__);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(__le__);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(__len__);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(__length_hint__);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(__lltrace__);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(__loader__);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(__lshift__);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(__lt__);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(__main__);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(__matmul__);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(__missing__);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(__mod__);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(__module__);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(__mro_entries__);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(__mul__);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(__name__);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(__ne__);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(__neg__);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(__new__);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(__newobj__);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(__newobj_ex__);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(__next__);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(__notes__);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(__or__);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(__orig_class__);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(__origin__);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(__package__);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(__parameters__);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(__path__);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(__pos__);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(__pow__);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(__prepare__);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(__qualname__);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(__radd__);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(__rand__);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(__rdivmod__);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(__reduce__);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(__reduce_ex__);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(__repr__);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(__reversed__);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(__rfloordiv__);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(__rlshift__);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(__rmatmul__);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(__rmod__);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(__rmul__);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(__ror__);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(__round__);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(__rpow__);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(__rrshift__);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(__rshift__);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(__rsub__);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(__rtruediv__);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(__rxor__);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(__set__);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(__set_name__);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(__setattr__);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(__setitem__);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(__setstate__);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(__sizeof__);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(__slotnames__);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(__slots__);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(__spec__);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(__str__);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(__sub__);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(__subclasscheck__);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(__subclasshook__);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(__truediv__);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(__trunc__);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(__typing_is_unpacked_typevartuple__);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(__typing_prepare_subst__);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(__typing_subst__);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(__typing_unpacked_tuple_args__);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(__warningregistry__);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(__weaklistoffset__);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(__weakref__);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(__xor__);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(_abc_impl);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(_annotation);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(_blksize);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(_bootstrap);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(_dealloc_warn);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(_finalizing);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(_find_and_load);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(_fix_up_module);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(_get_sourcefile);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(_handle_fromlist);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(_initializing);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(_is_text_encoding);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(_lock_unlock_module);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(_showwarnmsg);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(_shutdown);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(_slotnames);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(_uninitialized_submodules);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(_warn_unawaited_coroutine);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(_xoptions);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(add);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(append);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(big);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(buffer);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(builtins);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(c_call);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(c_exception);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(c_return);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(call);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(clear);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(close);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(closed);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(code);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(copy);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(copyreg);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(decode);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(default);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(defaultaction);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(dictcomp);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(difference_update);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(dispatch_table);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(displayhook);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(encode);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(encoding);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(end_lineno);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(end_offset);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(errors);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(excepthook);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(exception);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(extend);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(filename);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(fileno);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(fillvalue);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(filters);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(find_class);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(flush);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(genexpr);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(get);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(get_source);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(getattr);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(getstate);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(ignore);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(importlib);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(inf);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(intersection);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(isatty);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(isinstance);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(items);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(iter);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(join);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(keys);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(lambda);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(last_traceback);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(last_type);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(last_value);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(latin1);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(len);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(line);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(lineno);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(listcomp);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(little);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(locale);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(match);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(metaclass);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(mode);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(modules);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(mro);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(msg);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(n_fields);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(n_sequence_fields);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(n_unnamed_fields);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(name);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(newlines);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(next);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(obj);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(offset);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(onceregistry);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(opcode);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(open);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(parent);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(path);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(peek);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(persistent_id);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(persistent_load);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(print_file_and_line);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(ps1);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(ps2);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(raw);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(read);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(read1);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(readable);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(readall);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(readinto);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(readinto1);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(readline);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(reducer_override);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(reload);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(replace);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(reset);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(return);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(reversed);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(seek);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(seekable);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(send);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(setcomp);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(setstate);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(sort);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(stderr);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(stdin);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(stdout);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(strict);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(symmetric_difference_update);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(tell);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(text);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(threading);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(throw);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(top);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(truncate);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(unraisablehook);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(values);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(version);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(warnings);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(warnoptions);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(writable);
+    PyUnicode_InternInPlace(&string);
+    string = &_Py_ID(write);
+    PyUnicode_InternInPlace(&string);
+}
 /* End auto-generated code */
 #ifdef __cplusplus
 }
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
index d0e4bcd920e40..669ffe7072746 100644
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -52,6 +52,7 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "pycore_pathconfig.h"    // _Py_DumpPathConfig()
 #include "pycore_pylifecycle.h"   // _Py_SetFileSystemEncoding()
 #include "pycore_pystate.h"       // _PyInterpreterState_GET()
+#include "pycore_runtime_init.h"  // _PyUnicode_InitStaticStrings()
 #include "pycore_ucnhash.h"       // _PyUnicode_Name_CAPI
 #include "pycore_unicodeobject.h" // struct _Py_unicode_state
 #include "stringlib/eq.h"         // unicode_eq()
@@ -14576,6 +14577,14 @@ _PyUnicode_InitGlobalObjects(PyInterpreterState *interp)
         return _PyStatus_OK();
     }
 
+    /* Intern statically allocated string identifiers and deepfreeze strings.
+     * This must be done before any module initialization so that statically
+     * allocated string identifiers are used instead of heap allocated strings.
+     * Deepfreeze uses the interned identifiers if present to save space
+     * else generates them and they are interned to speed up dict lookups.
+    */
+    _PyUnicode_InitStaticStrings();
+
 #ifdef Py_DEBUG
     assert(_PyUnicode_CheckConsistency(&_Py_STR(empty), 1));
 
diff --git a/Tools/scripts/generate_global_objects.py b/Tools/scripts/generate_global_objects.py
index c26491b1d083a..27e3530f38574 100644
--- a/Tools/scripts/generate_global_objects.py
+++ b/Tools/scripts/generate_global_objects.py
@@ -284,6 +284,15 @@ def generate_runtime_init(identifiers, strings):
                 printer.write('')
                 with printer.block('.tuple_empty =', ','):
                     printer.write('.ob_base = _PyVarObject_IMMORTAL_INIT(&PyTuple_Type, 0)')
+        printer.write('')
+        printer.write("static inline void")
+        with printer.block("_PyUnicode_InitStaticStrings(void)"):
+            printer.write(f'PyObject *string;')
+            for i in sorted(identifiers):
+                # This use of _Py_ID() is ignored by iter_global_strings()
+                # since iter_files() ignores .h files.
+                printer.write(f'string = &_Py_ID({i});')
+                printer.write(f'PyUnicode_InternInPlace(&string);')
         printer.write(END)
         printer.write(after)
 
@@ -314,7 +323,4 @@ def main() -> None:
 
 
 if __name__ == '__main__':
-    import argparse
-    parser = argparse.ArgumentParser()
-    args = parser.parse_args()
-    main(**vars(args))
+    main()


From webhook-mailer at python.org  Fri Jul  8 14:01:57 2022
From: webhook-mailer at python.org (iritkatriel)
Date: Fri, 08 Jul 2022 18:01:57 -0000
Subject: [Python-checkins] Increase test coverage of Objects/exceptions.c
 (GH-94674)
Message-ID: <mailman.2157.1657303319.20746.python-checkins@python.org>

https://github.com/python/cpython/commit/4bed0db7c222f8df1b4e31107c0305214caf3f56
commit: 4bed0db7c222f8df1b4e31107c0305214caf3f56
branch: main
author: Irit Katriel <1055913+iritkatriel at users.noreply.github.com>
committer: iritkatriel <1055913+iritkatriel at users.noreply.github.com>
date: 2022-07-08T19:01:47+01:00
summary:

Increase test coverage of Objects/exceptions.c (GH-94674)

files:
M Lib/test/test_exception_group.py
M Lib/test/test_exceptions.py

diff --git a/Lib/test/test_exception_group.py b/Lib/test/test_exception_group.py
index 3ea5dff5c379a..aa28e16bedfa6 100644
--- a/Lib/test/test_exception_group.py
+++ b/Lib/test/test_exception_group.py
@@ -758,6 +758,18 @@ def test_split_does_not_copy_non_sequence_notes(self):
         self.assertFalse(hasattr(match, '__notes__'))
         self.assertFalse(hasattr(rest, '__notes__'))
 
+    def test_drive_invalid_return_value(self):
+        class MyEg(ExceptionGroup):
+            def derive(self, excs):
+                return 42
+
+        eg = MyEg('eg', [TypeError(1), ValueError(2)])
+        msg = "derive must return an instance of BaseExceptionGroup"
+        with self.assertRaisesRegex(TypeError, msg):
+            eg.split(TypeError)
+        with self.assertRaisesRegex(TypeError, msg):
+            eg.subgroup(TypeError)
+
 
 class NestedExceptionGroupSubclassSplitTest(ExceptionGroupSplitTestBase):
 
diff --git a/Lib/test/test_exceptions.py b/Lib/test/test_exceptions.py
index d91308572b27c..f8b05128e3f8b 100644
--- a/Lib/test/test_exceptions.py
+++ b/Lib/test/test_exceptions.py
@@ -546,6 +546,29 @@ def testAttributes(self):
                                              'pickled "%r", attribute "%s' %
                                              (e, checkArgName))
 
+    def test_setstate(self):
+        e = Exception(42)
+        e.blah = 53
+        self.assertEqual(e.args, (42,))
+        self.assertEqual(e.blah, 53)
+        self.assertRaises(AttributeError, getattr, e, 'a')
+        self.assertRaises(AttributeError, getattr, e, 'b')
+        e.__setstate__({'a': 1 , 'b': 2})
+        self.assertEqual(e.args, (42,))
+        self.assertEqual(e.blah, 53)
+        self.assertEqual(e.a, 1)
+        self.assertEqual(e.b, 2)
+        e.__setstate__({'a': 11, 'args': (1,2,3), 'blah': 35})
+        self.assertEqual(e.args, (1,2,3))
+        self.assertEqual(e.blah, 35)
+        self.assertEqual(e.a, 11)
+        self.assertEqual(e.b, 2)
+
+    def test_invalid_setstate(self):
+        e = Exception(42)
+        with self.assertRaisesRegex(TypeError, "state is not a dictionary"):
+            e.__setstate__(42)
+
     def test_notes(self):
         for e in [BaseException(1), Exception(2), ValueError(3)]:
             with self.subTest(e=e):
@@ -602,11 +625,30 @@ def testInvalidTraceback(self):
         else:
             self.fail("No exception raised")
 
-    def testInvalidAttrs(self):
-        self.assertRaises(TypeError, setattr, Exception(), '__cause__', 1)
-        self.assertRaises(TypeError, delattr, Exception(), '__cause__')
-        self.assertRaises(TypeError, setattr, Exception(), '__context__', 1)
-        self.assertRaises(TypeError, delattr, Exception(), '__context__')
+    def test_invalid_setattr(self):
+        TE = TypeError
+        exc = Exception()
+        msg = "'int' object is not iterable"
+        self.assertRaisesRegex(TE, msg, setattr, exc, 'args', 1)
+        msg = "__traceback__ must be a traceback or None"
+        self.assertRaisesRegex(TE, msg, setattr, exc, '__traceback__', 1)
+        msg = "exception cause must be None or derive from BaseException"
+        self.assertRaisesRegex(TE, msg, setattr, exc, '__cause__', 1)
+        msg = "exception context must be None or derive from BaseException"
+        self.assertRaisesRegex(TE, msg, setattr, exc, '__context__', 1)
+
+    def test_invalid_delattr(self):
+        TE = TypeError
+        try:
+            raise IndexError(4)
+        except Exception as e:
+            exc = e
+
+        msg = "may not be deleted"
+        self.assertRaisesRegex(TE, msg, delattr, exc, 'args')
+        self.assertRaisesRegex(TE, msg, delattr, exc, '__traceback__')
+        self.assertRaisesRegex(TE, msg, delattr, exc, '__cause__')
+        self.assertRaisesRegex(TE, msg, delattr, exc, '__context__')
 
     def testNoneClearsTracebackAttr(self):
         try:


From webhook-mailer at python.org  Fri Jul  8 21:52:30 2022
From: webhook-mailer at python.org (brandtbucher)
Date: Sat, 09 Jul 2022 01:52:30 -0000
Subject: [Python-checkins] GH-93252: Fix error handling for failed Python
 calls (GH-94693)
Message-ID: <mailman.2158.1657331551.20746.python-checkins@python.org>

https://github.com/python/cpython/commit/8a285df806816805484fed36dce5fd5b77a215a6
commit: 8a285df806816805484fed36dce5fd5b77a215a6
branch: main
author: Brandt Bucher <brandtbucher at microsoft.com>
committer: brandtbucher <brandtbucher at gmail.com>
date: 2022-07-08T18:52:26-07:00
summary:

GH-93252: Fix error handling for failed Python calls (GH-94693)

files:
A Misc/NEWS.d/next/Core and Builtins/2022-07-08-11-44-45.gh-issue-93252.i2358c.rst
M Lib/test/test_call.py
M Python/ceval.c

diff --git a/Lib/test/test_call.py b/Lib/test/test_call.py
index 6936f093e3db1..07355e8fa0616 100644
--- a/Lib/test/test_call.py
+++ b/Lib/test/test_call.py
@@ -26,6 +26,18 @@ def fn(**kw):
         self.assertIsInstance(res, dict)
         self.assertEqual(list(res.items()), expected)
 
+    def test_frames_are_popped_after_failed_calls(self):
+        # GH-93252: stuff blows up if we don't pop the new frame after
+        # recovering from failed calls:
+        def f():
+            pass
+        for _ in range(1000):
+            try:
+                f(None)
+            except TypeError:
+                pass
+        # BOOM!
+
 
 @cpython_only
 class CFunctionCallsErrorMessages(unittest.TestCase):
diff --git a/Misc/NEWS.d/next/Core and Builtins/2022-07-08-11-44-45.gh-issue-93252.i2358c.rst b/Misc/NEWS.d/next/Core and Builtins/2022-07-08-11-44-45.gh-issue-93252.i2358c.rst
new file mode 100644
index 0000000000000..1cc2d8560e53e
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2022-07-08-11-44-45.gh-issue-93252.i2358c.rst	
@@ -0,0 +1,2 @@
+Fix an issue that caused internal frames to outlive failed Python function
+calls, possibly resulting in memory leaks or hard interpreter crashes.
diff --git a/Python/ceval.c b/Python/ceval.c
index 0176002432e8d..2a0ce63d435d7 100644
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -6410,7 +6410,7 @@ _PyEvalFramePushAndInit(PyThreadState *tstate, PyFunctionObject *func,
     }
     if (initialize_locals(tstate, func, localsarray, args, argcount, kwnames)) {
         assert(frame->owner != FRAME_OWNED_BY_GENERATOR);
-        _PyFrame_Clear(frame);
+        _PyEvalFrameClearAndPop(tstate, frame);
         return NULL;
     }
     return frame;
@@ -6432,6 +6432,10 @@ _PyEvalFramePushAndInit(PyThreadState *tstate, PyFunctionObject *func,
 static void
 _PyEvalFrameClearAndPop(PyThreadState *tstate, _PyInterpreterFrame * frame)
 {
+    // Make sure that this is, indeed, the top frame. We can't check this in
+    // _PyThreadState_PopFrame, since f_code is already cleared at that point:
+    assert((PyObject **)frame + frame->f_code->co_framesize ==
+           tstate->datastack_top);
     tstate->recursion_remaining--;
     assert(frame->frame_obj == NULL || frame->frame_obj->f_frame == frame);
     assert(frame->owner == FRAME_OWNED_BY_THREAD);


From webhook-mailer at python.org  Sat Jul  9 00:18:07 2022
From: webhook-mailer at python.org (Fidget-Spinner)
Date: Sat, 09 Jul 2022 04:18:07 -0000
Subject: [Python-checkins] gh-94607: Fix subclassing generics (GH-94610)
Message-ID: <mailman.2159.1657340287.20746.python-checkins@python.org>

https://github.com/python/cpython/commit/6442a9dd212fa18343db21849cf05c0181662c1f
commit: 6442a9dd212fa18343db21849cf05c0181662c1f
branch: main
author: Ken Jin <28750310+Fidget-Spinner at users.noreply.github.com>
committer: Fidget-Spinner <28750310+Fidget-Spinner at users.noreply.github.com>
date: 2022-07-09T12:18:01+08:00
summary:

gh-94607: Fix subclassing generics (GH-94610)

Co-authored-by: Serhiy Storchaka <3659035+serhiy-storchaka at users.noreply.github.com>

files:
A Misc/NEWS.d/next/Library/2022-07-06-16-01-08.gh-issue-94607.Q6RYfz.rst
M Lib/test/test_typing.py
M Lib/typing.py
M Objects/genericaliasobject.c

diff --git a/Lib/test/test_typing.py b/Lib/test/test_typing.py
index 6850b881a188d..3f4101485c6e0 100644
--- a/Lib/test/test_typing.py
+++ b/Lib/test/test_typing.py
@@ -3650,6 +3650,35 @@ def test_subclass_special_form(self):
                     class Foo(obj):
                         pass
 
+    def test_complex_subclasses(self):
+        T_co = TypeVar("T_co", covariant=True)
+
+        class Base(Generic[T_co]):
+            ...
+
+        T = TypeVar("T")
+
+        # see gh-94607: this fails in that bug
+        class Sub(Base, Generic[T]):
+            ...
+
+    def test_parameter_detection(self):
+        self.assertEqual(List[T].__parameters__, (T,))
+        self.assertEqual(List[List[T]].__parameters__, (T,))
+        class A:
+            __parameters__ = (T,)
+        # Bare classes should be skipped
+        for a in (List, list):
+            for b in (A, int, TypeVar, TypeVarTuple, ParamSpec, types.GenericAlias, types.UnionType):
+                with self.subTest(generic=a, sub=b):
+                    with self.assertRaisesRegex(TypeError, '.* is not a generic class'):
+                        a[b][str]
+        # Duck-typing anything that looks like it has __parameters__.
+        # These tests are optional and failure is okay.
+        self.assertEqual(List[A()].__parameters__, (T,))
+        # C version of GenericAlias
+        self.assertEqual(list[A()].__parameters__, (T,))
+
 class ClassVarTests(BaseTestCase):
 
     def test_basics(self):
diff --git a/Lib/typing.py b/Lib/typing.py
index 25ae19f71fe94..66c26e416bd0b 100644
--- a/Lib/typing.py
+++ b/Lib/typing.py
@@ -250,6 +250,9 @@ def _collect_parameters(args):
     """
     parameters = []
     for t in args:
+        # We don't want __parameters__ descriptor of a bare Python class.
+        if isinstance(t, type):
+            continue
         if hasattr(t, '__typing_subst__'):
             if t not in parameters:
                 parameters.append(t)
diff --git a/Misc/NEWS.d/next/Library/2022-07-06-16-01-08.gh-issue-94607.Q6RYfz.rst b/Misc/NEWS.d/next/Library/2022-07-06-16-01-08.gh-issue-94607.Q6RYfz.rst
new file mode 100644
index 0000000000000..3bbb9172f2619
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2022-07-06-16-01-08.gh-issue-94607.Q6RYfz.rst
@@ -0,0 +1,2 @@
+Fix subclassing complex generics with type variables in :mod:`typing`. Previously an error message saying ``Some type variables ... are not listed in Generic[...]`` was shown.
+:mod:`typing` no longer populates ``__parameters__`` with the ``__parameters__`` of a Python class.
diff --git a/Objects/genericaliasobject.c b/Objects/genericaliasobject.c
index b2636d5475dbb..19f011fd3a743 100644
--- a/Objects/genericaliasobject.c
+++ b/Objects/genericaliasobject.c
@@ -219,6 +219,10 @@ _Py_make_parameters(PyObject *args)
     for (Py_ssize_t iarg = 0; iarg < nargs; iarg++) {
         PyObject *t = PyTuple_GET_ITEM(args, iarg);
         PyObject *subst;
+        // We don't want __parameters__ descriptor of a bare Python class.
+        if (PyType_Check(t)) {
+            continue;
+        }
         if (_PyObject_LookupAttr(t, &_Py_ID(__typing_subst__), &subst) < 0) {
             Py_DECREF(parameters);
             return NULL;


From webhook-mailer at python.org  Sat Jul  9 01:04:13 2022
From: webhook-mailer at python.org (vsajip)
Date: Sat, 09 Jul 2022 05:04:13 -0000
Subject: [Python-checkins] gh-94700: Rewrite the logging.Formatter API ref
 in structured form (GH-94701)
Message-ID: <mailman.2160.1657343054.20746.python-checkins@python.org>

https://github.com/python/cpython/commit/761eeb62a9af309a0e32662882c552209ddcea1e
commit: 761eeb62a9af309a0e32662882c552209ddcea1e
branch: main
author: CAM Gerlach <CAM.Gerlach at Gerlach.CAM>
committer: vsajip <vinay_sajip at yahoo.co.uk>
date: 2022-07-09T06:03:47+01:00
summary:

gh-94700: Rewrite the logging.Formatter API ref in structured form (GH-94701)

files:
M Doc/library/logging.rst

diff --git a/Doc/library/logging.rst b/Doc/library/logging.rst
index 8716724af5625..9bfed4352a195 100644
--- a/Doc/library/logging.rst
+++ b/Doc/library/logging.rst
@@ -531,55 +531,53 @@ Formatter Objects
 
 .. currentmodule:: logging
 
-:class:`Formatter` objects have the following attributes and methods. They are
-responsible for converting a :class:`LogRecord` to (usually) a string which can
-be interpreted by either a human or an external system. The base
-:class:`Formatter` allows a formatting string to be specified. If none is
-supplied, the default value of ``'%(message)s'`` is used, which just includes
-the message in the logging call. To have additional items of information in the
-formatted output (such as a timestamp), keep reading.
-
-A Formatter can be initialized with a format string which makes use of knowledge
-of the :class:`LogRecord` attributes - such as the default value mentioned above
-making use of the fact that the user's message and arguments are pre-formatted
-into a :class:`LogRecord`'s *message* attribute.  This format string contains
-standard Python %-style mapping keys. See section :ref:`old-string-formatting`
-for more information on string formatting.
-
-The useful mapping keys in a :class:`LogRecord` are given in the section on
-:ref:`logrecord-attributes`.
-
-
 .. class:: Formatter(fmt=None, datefmt=None, style='%', validate=True, *, defaults=None)
 
-   Returns a new instance of the :class:`Formatter` class.  The instance is
-   initialized with a format string for the message as a whole, as well as a
-   format string for the date/time portion of a message.  If no *fmt* is
-   specified, ``'%(message)s'`` is used.  If no *datefmt* is specified, a format
-   is used which is described in the :meth:`formatTime` documentation.
+   Responsible for converting a :class:`LogRecord` to an output string
+   to be interpreted by a human or external system.
+
+   :param fmt: A format string in the given *style* for
+       the logged output as a whole.
+       The possible mapping keys are drawn from the :class:`LogRecord` object's
+       :ref:`logrecord-attributes`.
+       If not specified, ``'%(message)s'`` is used,
+       which is just the logged message.
+   :type fmt: str
+
+   :param datefmt: A format string in the given *style* for
+       the date/time portion of the logged output.
+       If not specified, the default described in :meth:`formatTime` is used.
+   :type datefmt: str
+
+   :param style: Can be one of ``'%'``, ``'{'`` or ``'$'`` and determines
+       how the format string will be merged with its data: using one of
+       :ref:`old-string-formatting` (``%``), :meth:`str.format` (``{``)
+       or :class:`string.Template` (``$``). This only applies to
+       *fmt* and *datefmt* (e.g. ``'%(message)s'`` versus ``'{message}'``),
+       not to the actual log messages passed to the logging methods.
+       However, there are :ref:`other ways <formatting-styles>`
+       to use ``{``- and ``$``-formatting for log messages.
+   :type style: str
+
+   :param validate: If ``True`` (the default), incorrect or mismatched
+       *fmt* and *style* will raise a :exc:`ValueError`; for example,
+       ``logging.Formatter('%(asctime)s - %(message)s', style='{')``.
+   :type validate: bool
+
+   :param defaults: A dictionary with default values to use in custom fields.
+       For example,
+       ``logging.Formatter('%(ip)s %(message)s', defaults={"ip": None})``
+   :type defaults: dict[str, Any]
 
-   The *style* parameter can be one of '%', '{' or '$' and determines how
-   the format string will be merged with its data: using one of %-formatting,
-   :meth:`str.format` or :class:`string.Template`. This only applies to the
-   format string *fmt* (e.g. ``'%(message)s'`` or ``{message}``), not to the
-   actual log messages passed to ``Logger.debug`` etc; see
-   :ref:`formatting-styles` for more information on using {- and $-formatting
-   for log messages.
-
-   The *defaults* parameter can be a dictionary with default values to use in
-   custom fields. For example:
-   ``logging.Formatter('%(ip)s %(message)s', defaults={"ip": None})``
+   .. versionadded:: 3.2
+      The *style* parameter.
 
-   .. versionchanged:: 3.2
-      The *style* parameter was added.
+   .. versionadded:: 3.8
+      The *validate* parameter.
 
-   .. versionchanged:: 3.8
-      The *validate* parameter was added. Incorrect or mismatched style and fmt
-      will raise a ``ValueError``.
-      For example: ``logging.Formatter('%(asctime)s - %(message)s', style='{')``.
+   .. versionadded:: 3.10
+      The *defaults* parameter.
 
-   .. versionchanged:: 3.10
-      The *defaults* parameter was added.
 
    .. method:: format(record)
 


From webhook-mailer at python.org  Sat Jul  9 01:20:55 2022
From: webhook-mailer at python.org (miss-islington)
Date: Sat, 09 Jul 2022 05:20:55 -0000
Subject: [Python-checkins] gh-94607: Fix subclassing generics (GH-94610)
Message-ID: <mailman.2161.1657344056.20746.python-checkins@python.org>

https://github.com/python/cpython/commit/b4e232c4b5d977578b3c6aa86d8b76085167c313
commit: b4e232c4b5d977578b3c6aa86d8b76085167c313
branch: 3.11
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-08T22:20:43-07:00
summary:

gh-94607: Fix subclassing generics (GH-94610)


Co-authored-by: Serhiy Storchaka <3659035+serhiy-storchaka at users.noreply.github.com>
(cherry picked from commit 6442a9dd212fa18343db21849cf05c0181662c1f)

Co-authored-by: Ken Jin <28750310+Fidget-Spinner at users.noreply.github.com>

files:
A Misc/NEWS.d/next/Library/2022-07-06-16-01-08.gh-issue-94607.Q6RYfz.rst
M Lib/test/test_typing.py
M Lib/typing.py
M Objects/genericaliasobject.c

diff --git a/Lib/test/test_typing.py b/Lib/test/test_typing.py
index 634be9062d633..2fd57822726e5 100644
--- a/Lib/test/test_typing.py
+++ b/Lib/test/test_typing.py
@@ -3644,6 +3644,35 @@ def test_subclass_special_form(self):
                     class Foo(obj):
                         pass
 
+    def test_complex_subclasses(self):
+        T_co = TypeVar("T_co", covariant=True)
+
+        class Base(Generic[T_co]):
+            ...
+
+        T = TypeVar("T")
+
+        # see gh-94607: this fails in that bug
+        class Sub(Base, Generic[T]):
+            ...
+
+    def test_parameter_detection(self):
+        self.assertEqual(List[T].__parameters__, (T,))
+        self.assertEqual(List[List[T]].__parameters__, (T,))
+        class A:
+            __parameters__ = (T,)
+        # Bare classes should be skipped
+        for a in (List, list):
+            for b in (A, int, TypeVar, TypeVarTuple, ParamSpec, types.GenericAlias, types.UnionType):
+                with self.subTest(generic=a, sub=b):
+                    with self.assertRaisesRegex(TypeError, '.* is not a generic class'):
+                        a[b][str]
+        # Duck-typing anything that looks like it has __parameters__.
+        # These tests are optional and failure is okay.
+        self.assertEqual(List[A()].__parameters__, (T,))
+        # C version of GenericAlias
+        self.assertEqual(list[A()].__parameters__, (T,))
+
 class ClassVarTests(BaseTestCase):
 
     def test_basics(self):
diff --git a/Lib/typing.py b/Lib/typing.py
index 1ebc3ce1f64bd..31269273a5c0d 100644
--- a/Lib/typing.py
+++ b/Lib/typing.py
@@ -250,6 +250,9 @@ def _collect_parameters(args):
     """
     parameters = []
     for t in args:
+        # We don't want __parameters__ descriptor of a bare Python class.
+        if isinstance(t, type):
+            continue
         if hasattr(t, '__typing_subst__'):
             if t not in parameters:
                 parameters.append(t)
diff --git a/Misc/NEWS.d/next/Library/2022-07-06-16-01-08.gh-issue-94607.Q6RYfz.rst b/Misc/NEWS.d/next/Library/2022-07-06-16-01-08.gh-issue-94607.Q6RYfz.rst
new file mode 100644
index 0000000000000..3bbb9172f2619
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2022-07-06-16-01-08.gh-issue-94607.Q6RYfz.rst
@@ -0,0 +1,2 @@
+Fix subclassing complex generics with type variables in :mod:`typing`. Previously an error message saying ``Some type variables ... are not listed in Generic[...]`` was shown.
+:mod:`typing` no longer populates ``__parameters__`` with the ``__parameters__`` of a Python class.
diff --git a/Objects/genericaliasobject.c b/Objects/genericaliasobject.c
index b2636d5475dbb..19f011fd3a743 100644
--- a/Objects/genericaliasobject.c
+++ b/Objects/genericaliasobject.c
@@ -219,6 +219,10 @@ _Py_make_parameters(PyObject *args)
     for (Py_ssize_t iarg = 0; iarg < nargs; iarg++) {
         PyObject *t = PyTuple_GET_ITEM(args, iarg);
         PyObject *subst;
+        // We don't want __parameters__ descriptor of a bare Python class.
+        if (PyType_Check(t)) {
+            continue;
+        }
         if (_PyObject_LookupAttr(t, &_Py_ID(__typing_subst__), &subst) < 0) {
             Py_DECREF(parameters);
             return NULL;


From webhook-mailer at python.org  Sat Jul  9 07:01:29 2022
From: webhook-mailer at python.org (tiran)
Date: Sat, 09 Jul 2022 11:01:29 -0000
Subject: [Python-checkins] gh-93649: Fix dependencies of _testcapi (#94695)
Message-ID: <mailman.2162.1657364490.20746.python-checkins@python.org>

https://github.com/python/cpython/commit/18ef240a2c362eea64b67bab8f9d45c743eb3619
commit: 18ef240a2c362eea64b67bab8f9d45c743eb3619
branch: main
author: Christian Heimes <christian at python.org>
committer: tiran <christian at python.org>
date: 2022-07-09T13:01:23+02:00
summary:

gh-93649: Fix dependencies of _testcapi (#94695)

- header files are located in $(srcdir)
- dependencies must not list C files that are also in a makesetup Setup file
- generate SRCDIRS for OOT builds

files:
M Makefile.pre.in
M configure
M configure.ac

diff --git a/Makefile.pre.in b/Makefile.pre.in
index c17c3d6067d97..e1dc503059ec2 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -2568,7 +2568,7 @@ MODULE__SHA3_DEPS=$(srcdir)/Modules/_sha3/sha3.c $(srcdir)/Modules/_sha3/sha3.h
 MODULE__SHA512_DEPS=$(srcdir)/Modules/hashlib.h
 MODULE__SOCKET_DEPS=$(srcdir)/Modules/socketmodule.h
 MODULE__SSL_DEPS=$(srcdir)/Modules/_ssl.h $(srcdir)/Modules/_ssl/cert.c $(srcdir)/Modules/_ssl/debughelpers.c $(srcdir)/Modules/_ssl/misc.c $(srcdir)/Modules/_ssl_data.h $(srcdir)/Modules/_ssl_data_111.h $(srcdir)/Modules/_ssl_data_300.h $(srcdir)/Modules/socketmodule.h
-MODULE__TESTCAPI_DEPS=$(srcdir)/Modules/testcapi_long.h Modules/_testcapi/parts.h $(srcdir)/Modules/_testcapi/vectorcall.c
+MODULE__TESTCAPI_DEPS=$(srcdir)/Modules/testcapi_long.h $(srcdir)/Modules/_testcapi/parts.h
 MODULE__SQLITE3_DEPS=$(srcdir)/Modules/_sqlite/connection.h $(srcdir)/Modules/_sqlite/cursor.h $(srcdir)/Modules/_sqlite/microprotocols.h $(srcdir)/Modules/_sqlite/module.h $(srcdir)/Modules/_sqlite/prepare_protocol.h $(srcdir)/Modules/_sqlite/row.h $(srcdir)/Modules/_sqlite/util.h
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/configure b/configure
index 5f2830338ee8f..bffc30a590fbe 100755
--- a/configure
+++ b/configure
@@ -23261,6 +23261,7 @@ SRCDIRS="\
   Modules/_sha3 \
   Modules/_sqlite \
   Modules/_sre \
+  Modules/_testcapi \
   Modules/_xxtestfuzz \
   Modules/cjkcodecs \
   Modules/expat \
diff --git a/configure.ac b/configure.ac
index 88219dc9b5464..f940c9b2ddf00 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6439,6 +6439,7 @@ SRCDIRS="\
   Modules/_sha3 \
   Modules/_sqlite \
   Modules/_sre \
+  Modules/_testcapi \
   Modules/_xxtestfuzz \
   Modules/cjkcodecs \
   Modules/expat \


From webhook-mailer at python.org  Sat Jul  9 08:09:23 2022
From: webhook-mailer at python.org (miss-islington)
Date: Sat, 09 Jul 2022 12:09:23 -0000
Subject: [Python-checkins] [3.11] GH-93252: Fix error handling for failed
 Python calls (GH-94693) (GH-94708)
Message-ID: <mailman.2163.1657368564.20746.python-checkins@python.org>

https://github.com/python/cpython/commit/7a341724e4dc8188f01ac338deaa414c4e6542c4
commit: 7a341724e4dc8188f01ac338deaa414c4e6542c4
branch: 3.11
author: Kumar Aditya <59607654+kumaraditya303 at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-09T05:09:15-07:00
summary:

[3.11] GH-93252: Fix error handling for failed Python calls (GH-94693) (GH-94708)



Automerge-Triggered-By: GH:tiran

files:
A Misc/NEWS.d/next/Core and Builtins/2022-07-08-11-44-45.gh-issue-93252.i2358c.rst
M Lib/test/test_call.py
M Python/ceval.c

diff --git a/Lib/test/test_call.py b/Lib/test/test_call.py
index 6936f093e3db1..07355e8fa0616 100644
--- a/Lib/test/test_call.py
+++ b/Lib/test/test_call.py
@@ -26,6 +26,18 @@ def fn(**kw):
         self.assertIsInstance(res, dict)
         self.assertEqual(list(res.items()), expected)
 
+    def test_frames_are_popped_after_failed_calls(self):
+        # GH-93252: stuff blows up if we don't pop the new frame after
+        # recovering from failed calls:
+        def f():
+            pass
+        for _ in range(1000):
+            try:
+                f(None)
+            except TypeError:
+                pass
+        # BOOM!
+
 
 @cpython_only
 class CFunctionCallsErrorMessages(unittest.TestCase):
diff --git a/Misc/NEWS.d/next/Core and Builtins/2022-07-08-11-44-45.gh-issue-93252.i2358c.rst b/Misc/NEWS.d/next/Core and Builtins/2022-07-08-11-44-45.gh-issue-93252.i2358c.rst
new file mode 100644
index 0000000000000..1cc2d8560e53e
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2022-07-08-11-44-45.gh-issue-93252.i2358c.rst	
@@ -0,0 +1,2 @@
+Fix an issue that caused internal frames to outlive failed Python function
+calls, possibly resulting in memory leaks or hard interpreter crashes.
diff --git a/Python/ceval.c b/Python/ceval.c
index 1a5454570518f..c69ea21c14993 100644
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -6370,7 +6370,7 @@ _PyEvalFramePushAndInit(PyThreadState *tstate, PyFunctionObject *func,
     }
     if (initialize_locals(tstate, func, localsarray, args, argcount, kwnames)) {
         assert(frame->owner != FRAME_OWNED_BY_GENERATOR);
-        _PyFrame_Clear(frame);
+        _PyEvalFrameClearAndPop(tstate, frame);
         return NULL;
     }
     return frame;
@@ -6392,6 +6392,10 @@ _PyEvalFramePushAndInit(PyThreadState *tstate, PyFunctionObject *func,
 static void
 _PyEvalFrameClearAndPop(PyThreadState *tstate, _PyInterpreterFrame * frame)
 {
+    // Make sure that this is, indeed, the top frame. We can't check this in
+    // _PyThreadState_PopFrame, since f_code is already cleared at that point:
+    assert((PyObject **)frame + frame->f_code->co_nlocalsplus +
+        frame->f_code->co_stacksize + FRAME_SPECIALS_SIZE == tstate->datastack_top);
     tstate->recursion_remaining--;
     assert(frame->frame_obj == NULL || frame->frame_obj->f_frame == frame);
     assert(frame->owner == FRAME_OWNED_BY_THREAD);


From webhook-mailer at python.org  Sat Jul  9 09:58:38 2022
From: webhook-mailer at python.org (vstinner)
Date: Sat, 09 Jul 2022 13:58:38 -0000
Subject: [Python-checkins] pycore_interp.h: Fix comment about pytypedefs.h
 (#93188)
Message-ID: <mailman.2164.1657375119.20746.python-checkins@python.org>

https://github.com/python/cpython/commit/0fc8ac0b0db6c03182c5181475c7b0b2ff7ec11f
commit: 0fc8ac0b0db6c03182c5181475c7b0b2ff7ec11f
branch: main
author: Itamar Ostricher <itamarost at gmail.com>
committer: vstinner <vstinner at python.org>
date: 2022-07-09T15:58:30+02:00
summary:

pycore_interp.h: Fix comment about pytypedefs.h (#93188)

GH-31527 moved this typedef to `Include/pytypedefs.h`, so this comment
should point at the correct location

files:
M Include/internal/pycore_interp.h

diff --git a/Include/internal/pycore_interp.h b/Include/internal/pycore_interp.h
index bcfcd88d84492..6ce2945cd9fb7 100644
--- a/Include/internal/pycore_interp.h
+++ b/Include/internal/pycore_interp.h
@@ -73,7 +73,7 @@ struct atexit_state {
 /* PyInterpreterState holds the global state for one of the runtime's
    interpreters.  Typically the initial (main) interpreter is the only one.
 
-   The PyInterpreterState typedef is in Include/pystate.h.
+   The PyInterpreterState typedef is in Include/pytypedefs.h.
    */
 struct _is {
 


From webhook-mailer at python.org  Sat Jul  9 12:11:26 2022
From: webhook-mailer at python.org (tiran)
Date: Sat, 09 Jul 2022 16:11:26 -0000
Subject: [Python-checkins] gh-94637: Release GIL in
 SSLContext.set_default_verify_paths (GH-94658)
Message-ID: <mailman.2165.1657383088.20746.python-checkins@python.org>

https://github.com/python/cpython/commit/78307c7dc2352b6633138466debd4c10fae32970
commit: 78307c7dc2352b6633138466debd4c10fae32970
branch: main
author: Christian Heimes <christian at python.org>
committer: tiran <christian at python.org>
date: 2022-07-09T18:11:15+02:00
summary:

gh-94637: Release GIL in SSLContext.set_default_verify_paths (GH-94658)

files:
A Misc/NEWS.d/next/Library/2022-07-07-15-46-55.gh-issue-94637.IYEiUM.rst
M Modules/_ssl.c

diff --git a/Misc/NEWS.d/next/Library/2022-07-07-15-46-55.gh-issue-94637.IYEiUM.rst b/Misc/NEWS.d/next/Library/2022-07-07-15-46-55.gh-issue-94637.IYEiUM.rst
new file mode 100644
index 0000000000000..20cbbcd5088b7
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2022-07-07-15-46-55.gh-issue-94637.IYEiUM.rst
@@ -0,0 +1,3 @@
+:meth:`SSLContext.set_default_verify_paths` now releases the GIL around
+``SSL_CTX_set_default_verify_paths`` call. The function call performs I/O
+and CPU intensive work.
diff --git a/Modules/_ssl.c b/Modules/_ssl.c
index 8ff15d18fb637..78c02c1cd82fb 100644
--- a/Modules/_ssl.c
+++ b/Modules/_ssl.c
@@ -4302,7 +4302,11 @@ static PyObject *
 _ssl__SSLContext_set_default_verify_paths_impl(PySSLContext *self)
 /*[clinic end generated code: output=0bee74e6e09deaaa input=35f3408021463d74]*/
 {
-    if (!SSL_CTX_set_default_verify_paths(self->ctx)) {
+    int rc;
+    Py_BEGIN_ALLOW_THREADS
+    rc = SSL_CTX_set_default_verify_paths(self->ctx);
+    Py_END_ALLOW_THREADS
+    if (!rc) {
         _setSSLError(get_state_ctx(self), NULL, 0, __FILE__, __LINE__);
         return NULL;
     }


From webhook-mailer at python.org  Sat Jul  9 12:33:19 2022
From: webhook-mailer at python.org (miss-islington)
Date: Sat, 09 Jul 2022 16:33:19 -0000
Subject: [Python-checkins] gh-94637: Release GIL in
 SSLContext.set_default_verify_paths (GH-94658)
Message-ID: <mailman.2166.1657384400.20746.python-checkins@python.org>

https://github.com/python/cpython/commit/a61870e19602f54a0579dd83edf334ba00ad92f6
commit: a61870e19602f54a0579dd83edf334ba00ad92f6
branch: 3.11
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-09T09:33:15-07:00
summary:

gh-94637: Release GIL in SSLContext.set_default_verify_paths (GH-94658)

(cherry picked from commit 78307c7dc2352b6633138466debd4c10fae32970)

Co-authored-by: Christian Heimes <christian at python.org>

files:
A Misc/NEWS.d/next/Library/2022-07-07-15-46-55.gh-issue-94637.IYEiUM.rst
M Modules/_ssl.c

diff --git a/Misc/NEWS.d/next/Library/2022-07-07-15-46-55.gh-issue-94637.IYEiUM.rst b/Misc/NEWS.d/next/Library/2022-07-07-15-46-55.gh-issue-94637.IYEiUM.rst
new file mode 100644
index 0000000000000..20cbbcd5088b7
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2022-07-07-15-46-55.gh-issue-94637.IYEiUM.rst
@@ -0,0 +1,3 @@
+:meth:`SSLContext.set_default_verify_paths` now releases the GIL around
+``SSL_CTX_set_default_verify_paths`` call. The function call performs I/O
+and CPU intensive work.
diff --git a/Modules/_ssl.c b/Modules/_ssl.c
index 08596577086ac..6d5c0199b7883 100644
--- a/Modules/_ssl.c
+++ b/Modules/_ssl.c
@@ -4305,7 +4305,11 @@ static PyObject *
 _ssl__SSLContext_set_default_verify_paths_impl(PySSLContext *self)
 /*[clinic end generated code: output=0bee74e6e09deaaa input=35f3408021463d74]*/
 {
-    if (!SSL_CTX_set_default_verify_paths(self->ctx)) {
+    int rc;
+    Py_BEGIN_ALLOW_THREADS
+    rc = SSL_CTX_set_default_verify_paths(self->ctx);
+    Py_END_ALLOW_THREADS
+    if (!rc) {
         _setSSLError(get_state_ctx(self), NULL, 0, __FILE__, __LINE__);
         return NULL;
     }


From webhook-mailer at python.org  Sat Jul  9 12:35:58 2022
From: webhook-mailer at python.org (miss-islington)
Date: Sat, 09 Jul 2022 16:35:58 -0000
Subject: [Python-checkins] gh-94637: Release GIL in
 SSLContext.set_default_verify_paths (GH-94658)
Message-ID: <mailman.2167.1657384560.20746.python-checkins@python.org>

https://github.com/python/cpython/commit/d4796c2231eef9355814572650f00c3c4662f197
commit: d4796c2231eef9355814572650f00c3c4662f197
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-09T09:35:54-07:00
summary:

gh-94637: Release GIL in SSLContext.set_default_verify_paths (GH-94658)

(cherry picked from commit 78307c7dc2352b6633138466debd4c10fae32970)

Co-authored-by: Christian Heimes <christian at python.org>

files:
A Misc/NEWS.d/next/Library/2022-07-07-15-46-55.gh-issue-94637.IYEiUM.rst
M Modules/_ssl.c

diff --git a/Misc/NEWS.d/next/Library/2022-07-07-15-46-55.gh-issue-94637.IYEiUM.rst b/Misc/NEWS.d/next/Library/2022-07-07-15-46-55.gh-issue-94637.IYEiUM.rst
new file mode 100644
index 0000000000000..20cbbcd5088b7
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2022-07-07-15-46-55.gh-issue-94637.IYEiUM.rst
@@ -0,0 +1,3 @@
+:meth:`SSLContext.set_default_verify_paths` now releases the GIL around
+``SSL_CTX_set_default_verify_paths`` call. The function call performs I/O
+and CPU intensive work.
diff --git a/Modules/_ssl.c b/Modules/_ssl.c
index c8500c57aee75..51bb2d00e3e8a 100644
--- a/Modules/_ssl.c
+++ b/Modules/_ssl.c
@@ -4305,7 +4305,11 @@ static PyObject *
 _ssl__SSLContext_set_default_verify_paths_impl(PySSLContext *self)
 /*[clinic end generated code: output=0bee74e6e09deaaa input=35f3408021463d74]*/
 {
-    if (!SSL_CTX_set_default_verify_paths(self->ctx)) {
+    int rc;
+    Py_BEGIN_ALLOW_THREADS
+    rc = SSL_CTX_set_default_verify_paths(self->ctx);
+    Py_END_ALLOW_THREADS
+    if (!rc) {
         _setSSLError(get_state_ctx(self), NULL, 0, __FILE__, __LINE__);
         return NULL;
     }


From webhook-mailer at python.org  Sat Jul  9 14:26:44 2022
From: webhook-mailer at python.org (ericvsmith)
Date: Sat, 09 Jul 2022 18:26:44 -0000
Subject: [Python-checkins] Improve dataclass docstring (gh-94686)
Message-ID: <mailman.2168.1657391204.20746.python-checkins@python.org>

https://github.com/python/cpython/commit/a10cf2f6b3766f9dbbe54bdaacfb3f2ca406ea3d
commit: a10cf2f6b3766f9dbbe54bdaacfb3f2ca406ea3d
branch: main
author: Tom Fryers <61272761+TomFryers at users.noreply.github.com>
committer: ericvsmith <ericvsmith at users.noreply.github.com>
date: 2022-07-09T14:26:24-04:00
summary:

Improve dataclass docstring (gh-94686)

files:
M Lib/dataclasses.py

diff --git a/Lib/dataclasses.py b/Lib/dataclasses.py
index 69cab8c563ea9..103ecbafb2e27 100644
--- a/Lib/dataclasses.py
+++ b/Lib/dataclasses.py
@@ -1193,19 +1193,18 @@ def _add_slots(cls, is_frozen, weakref_slot):
 def dataclass(cls=None, /, *, init=True, repr=True, eq=True, order=False,
               unsafe_hash=False, frozen=False, match_args=True,
               kw_only=False, slots=False, weakref_slot=False):
-    """Returns the same class as was passed in, with dunder methods
-    added based on the fields defined in the class.
+    """Add dunder methods based on the fields defined in the class.
 
     Examines PEP 526 __annotations__ to determine fields.
 
-    If init is true, an __init__() method is added to the class. If
-    repr is true, a __repr__() method is added. If order is true, rich
+    If init is true, an __init__() method is added to the class. If repr
+    is true, a __repr__() method is added. If order is true, rich
     comparison dunder methods are added. If unsafe_hash is true, a
-    __hash__() method function is added. If frozen is true, fields may
-    not be assigned to after instance creation. If match_args is true,
-    the __match_args__ tuple is added. If kw_only is true, then by
-    default all fields are keyword-only. If slots is true, an
-    __slots__ attribute is added.
+    __hash__() method is added. If frozen is true, fields may not be
+    assigned to after instance creation. If match_args is true, the
+    __match_args__ tuple is added. If kw_only is true, then by default
+    all fields are keyword-only. If slots is true, a new class with a
+    __slots__ attribute is returned.
     """
 
     def wrap(cls):


From webhook-mailer at python.org  Sat Jul  9 14:51:39 2022
From: webhook-mailer at python.org (miss-islington)
Date: Sat, 09 Jul 2022 18:51:39 -0000
Subject: [Python-checkins] Improve dataclass docstring (gh-94686)
Message-ID: <mailman.2169.1657392700.20746.python-checkins@python.org>

https://github.com/python/cpython/commit/7b5737a51ac2f67ab1c1c1fdee75fbb59fd123ea
commit: 7b5737a51ac2f67ab1c1c1fdee75fbb59fd123ea
branch: 3.11
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-09T11:51:35-07:00
summary:

Improve dataclass docstring (gh-94686)

(cherry picked from commit a10cf2f6b3766f9dbbe54bdaacfb3f2ca406ea3d)

Co-authored-by: Tom Fryers <61272761+TomFryers at users.noreply.github.com>

files:
M Lib/dataclasses.py

diff --git a/Lib/dataclasses.py b/Lib/dataclasses.py
index 69cab8c563ea9..103ecbafb2e27 100644
--- a/Lib/dataclasses.py
+++ b/Lib/dataclasses.py
@@ -1193,19 +1193,18 @@ def _add_slots(cls, is_frozen, weakref_slot):
 def dataclass(cls=None, /, *, init=True, repr=True, eq=True, order=False,
               unsafe_hash=False, frozen=False, match_args=True,
               kw_only=False, slots=False, weakref_slot=False):
-    """Returns the same class as was passed in, with dunder methods
-    added based on the fields defined in the class.
+    """Add dunder methods based on the fields defined in the class.
 
     Examines PEP 526 __annotations__ to determine fields.
 
-    If init is true, an __init__() method is added to the class. If
-    repr is true, a __repr__() method is added. If order is true, rich
+    If init is true, an __init__() method is added to the class. If repr
+    is true, a __repr__() method is added. If order is true, rich
     comparison dunder methods are added. If unsafe_hash is true, a
-    __hash__() method function is added. If frozen is true, fields may
-    not be assigned to after instance creation. If match_args is true,
-    the __match_args__ tuple is added. If kw_only is true, then by
-    default all fields are keyword-only. If slots is true, an
-    __slots__ attribute is added.
+    __hash__() method is added. If frozen is true, fields may not be
+    assigned to after instance creation. If match_args is true, the
+    __match_args__ tuple is added. If kw_only is true, then by default
+    all fields are keyword-only. If slots is true, a new class with a
+    __slots__ attribute is returned.
     """
 
     def wrap(cls):


From webhook-mailer at python.org  Sat Jul  9 20:22:40 2022
From: webhook-mailer at python.org (brandtbucher)
Date: Sun, 10 Jul 2022 00:22:40 -0000
Subject: [Python-checkins] GH-94694: Fix column offsets for multi-line
 method lookups (GH-94697)
Message-ID: <mailman.2170.1657412561.20746.python-checkins@python.org>

https://github.com/python/cpython/commit/264b3ddfd561d97204ffb30be6a7d1fb0555e560
commit: 264b3ddfd561d97204ffb30be6a7d1fb0555e560
branch: main
author: Brandt Bucher <brandtbucher at microsoft.com>
committer: brandtbucher <brandtbucher at gmail.com>
date: 2022-07-09T17:22:23-07:00
summary:

GH-94694: Fix column offsets for multi-line method lookups (GH-94697)

files:
A Misc/NEWS.d/next/Core and Builtins/2022-07-08-16-44-11.gh-issue-94694.VkL2CM.rst
M Lib/test/test_compile.py
M Lib/test/test_traceback.py
M Python/compile.c

diff --git a/Lib/test/test_compile.py b/Lib/test/test_compile.py
index ab1685d3e5b8a..bc022a9f5cbe7 100644
--- a/Lib/test/test_compile.py
+++ b/Lib/test/test_compile.py
@@ -1181,6 +1181,27 @@ def test_complex_single_line_expression(self):
         self.assertOpcodeSourcePositionIs(compiled_code, 'BINARY_OP',
             line=1, end_line=1, column=0, end_column=27, occurrence=4)
 
+    def test_multiline_assert_rewritten_as_method_call(self):
+        # GH-94694: Don't crash if pytest rewrites a multiline assert as a
+        # method call with the same location information:
+        tree = ast.parse("assert (\n42\n)")
+        old_node = tree.body[0]
+        new_node = ast.Expr(
+            ast.Call(
+                ast.Attribute(
+                    ast.Name("spam", ast.Load()),
+                    "eggs",
+                    ast.Load(),
+                ),
+                [],
+                [],
+            )
+        )
+        ast.copy_location(new_node, old_node)
+        ast.fix_missing_locations(new_node)
+        tree.body[0] = new_node
+        compile(tree, "<test>", "exec")
+
 
 class TestExpressionStackSize(unittest.TestCase):
     # These tests check that the computed stack size for a code object
diff --git a/Lib/test/test_traceback.py b/Lib/test/test_traceback.py
index 722c265a6a8a5..72d67bf6ef140 100644
--- a/Lib/test/test_traceback.py
+++ b/Lib/test/test_traceback.py
@@ -702,6 +702,57 @@ class A: pass
         )
         self.assertEqual(result_lines, expected_error.splitlines())
 
+    def test_multiline_method_call_a(self):
+        def f():
+            (None
+                .method
+            )()
+        actual = self.get_exception(f)
+        expected = [
+            f"Traceback (most recent call last):",
+            f"  File \"{__file__}\", line {self.callable_line}, in get_exception",
+            f"    callable()",
+            f"    ^^^^^^^^^^",
+            f"  File \"{__file__}\", line {f.__code__.co_firstlineno + 2}, in f",
+            f"    .method",
+            f"     ^^^^^^",
+        ]
+        self.assertEqual(actual, expected)
+
+    def test_multiline_method_call_b(self):
+        def f():
+            (None.
+                method
+            )()
+        actual = self.get_exception(f)
+        expected = [
+            f"Traceback (most recent call last):",
+            f"  File \"{__file__}\", line {self.callable_line}, in get_exception",
+            f"    callable()",
+            f"    ^^^^^^^^^^",
+            f"  File \"{__file__}\", line {f.__code__.co_firstlineno + 2}, in f",
+            f"    method",
+            f"    ^^^^^^",
+        ]
+        self.assertEqual(actual, expected)
+
+    def test_multiline_method_call_c(self):
+        def f():
+            (None
+                . method
+            )()
+        actual = self.get_exception(f)
+        expected = [
+            f"Traceback (most recent call last):",
+            f"  File \"{__file__}\", line {self.callable_line}, in get_exception",
+            f"    callable()",
+            f"    ^^^^^^^^^^",
+            f"  File \"{__file__}\", line {f.__code__.co_firstlineno + 2}, in f",
+            f"    . method",
+            f"      ^^^^^^",
+        ]
+        self.assertEqual(actual, expected)
+
 @cpython_only
 @requires_debug_ranges()
 class CPythonTracebackErrorCaretTests(TracebackErrorLocationCaretTests):
diff --git a/Misc/NEWS.d/next/Core and Builtins/2022-07-08-16-44-11.gh-issue-94694.VkL2CM.rst b/Misc/NEWS.d/next/Core and Builtins/2022-07-08-16-44-11.gh-issue-94694.VkL2CM.rst
new file mode 100644
index 0000000000000..6434788140f42
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2022-07-08-16-44-11.gh-issue-94694.VkL2CM.rst	
@@ -0,0 +1,4 @@
+Fix an issue that could cause code with multi-line method lookups to have
+misleading or incorrect column offset information. In some cases (when
+compiling a hand-built AST) this could have resulted in a hard crash of the
+interpreter.
diff --git a/Python/compile.c b/Python/compile.c
index f36a6e85a54c2..427fb2a369481 100644
--- a/Python/compile.c
+++ b/Python/compile.c
@@ -4736,8 +4736,15 @@ update_location_to_match_attr(struct compiler *c, expr_ty meth)
 {
     if (meth->lineno != meth->end_lineno) {
         // Make start location match attribute
-        c->u->u_loc.lineno = meth->end_lineno;
-        c->u->u_loc.col_offset = meth->end_col_offset - (int)PyUnicode_GetLength(meth->v.Attribute.attr)-1;
+        c->u->u_loc.lineno = c->u->u_loc.end_lineno = meth->end_lineno;
+        int len = (int)PyUnicode_GET_LENGTH(meth->v.Attribute.attr);
+        if (len <= meth->end_col_offset) {
+            c->u->u_loc.col_offset = meth->end_col_offset - len;
+        }
+        else {
+            // GH-94694: Somebody's compiling weird ASTs. Just drop the columns:
+            c->u->u_loc.col_offset = c->u->u_loc.end_col_offset = -1;
+        }
     }
 }
 


From webhook-mailer at python.org  Sun Jul 10 01:12:50 2022
From: webhook-mailer at python.org (brandtbucher)
Date: Sun, 10 Jul 2022 05:12:50 -0000
Subject: [Python-checkins] [3.11] GH-94694: Fix column offsets for
 multi-line method lookups (GH-94721)
Message-ID: <mailman.0.1657429971.20440.python-checkins@python.org>

https://github.com/python/cpython/commit/e5c8ad3e1518f81f7651d82bbadf5af5e3f402a7
commit: e5c8ad3e1518f81f7651d82bbadf5af5e3f402a7
branch: 3.11
author: Brandt Bucher <brandtbucher at microsoft.com>
committer: brandtbucher <brandtbucher at gmail.com>
date: 2022-07-09T22:12:45-07:00
summary:

[3.11] GH-94694: Fix column offsets for multi-line method lookups (GH-94721)

(cherry picked from commit 264b3ddfd561d97204ffb30be6a7d1fb0555e560)

files:
A Misc/NEWS.d/next/Core and Builtins/2022-07-08-16-44-11.gh-issue-94694.VkL2CM.rst
M Lib/test/test_compile.py
M Lib/test/test_traceback.py
M Python/compile.c

diff --git a/Lib/test/test_compile.py b/Lib/test/test_compile.py
index d113a00088f2c..80b32dee0665f 100644
--- a/Lib/test/test_compile.py
+++ b/Lib/test/test_compile.py
@@ -1145,6 +1145,27 @@ def test_complex_single_line_expression(self):
         self.assertOpcodeSourcePositionIs(compiled_code, 'BINARY_OP',
             line=1, end_line=1, column=0, end_column=27, occurrence=4)
 
+    def test_multiline_assert_rewritten_as_method_call(self):
+        # GH-94694: Don't crash if pytest rewrites a multiline assert as a
+        # method call with the same location information:
+        tree = ast.parse("assert (\n42\n)")
+        old_node = tree.body[0]
+        new_node = ast.Expr(
+            ast.Call(
+                ast.Attribute(
+                    ast.Name("spam", ast.Load()),
+                    "eggs",
+                    ast.Load(),
+                ),
+                [],
+                [],
+            )
+        )
+        ast.copy_location(new_node, old_node)
+        ast.fix_missing_locations(new_node)
+        tree.body[0] = new_node
+        compile(tree, "<test>", "exec")
+
 
 class TestExpressionStackSize(unittest.TestCase):
     # These tests check that the computed stack size for a code object
diff --git a/Lib/test/test_traceback.py b/Lib/test/test_traceback.py
index e8ff4b5a28f55..40d5a84f92d99 100644
--- a/Lib/test/test_traceback.py
+++ b/Lib/test/test_traceback.py
@@ -703,6 +703,57 @@ class A: pass
         )
         self.assertEqual(result_lines, expected_error.splitlines())
 
+    def test_multiline_method_call_a(self):
+        def f():
+            (None
+                .method
+            )()
+        actual = self.get_exception(f)
+        expected = [
+            f"Traceback (most recent call last):",
+            f"  File \"{__file__}\", line {self.callable_line}, in get_exception",
+            f"    callable()",
+            f"    ^^^^^^^^^^",
+            f"  File \"{__file__}\", line {f.__code__.co_firstlineno + 2}, in f",
+            f"    .method",
+            f"     ^^^^^^",
+        ]
+        self.assertEqual(actual, expected)
+
+    def test_multiline_method_call_b(self):
+        def f():
+            (None.
+                method
+            )()
+        actual = self.get_exception(f)
+        expected = [
+            f"Traceback (most recent call last):",
+            f"  File \"{__file__}\", line {self.callable_line}, in get_exception",
+            f"    callable()",
+            f"    ^^^^^^^^^^",
+            f"  File \"{__file__}\", line {f.__code__.co_firstlineno + 2}, in f",
+            f"    method",
+            f"    ^^^^^^",
+        ]
+        self.assertEqual(actual, expected)
+
+    def test_multiline_method_call_c(self):
+        def f():
+            (None
+                . method
+            )()
+        actual = self.get_exception(f)
+        expected = [
+            f"Traceback (most recent call last):",
+            f"  File \"{__file__}\", line {self.callable_line}, in get_exception",
+            f"    callable()",
+            f"    ^^^^^^^^^^",
+            f"  File \"{__file__}\", line {f.__code__.co_firstlineno + 2}, in f",
+            f"    . method",
+            f"      ^^^^^^",
+        ]
+        self.assertEqual(actual, expected)
+
 @cpython_only
 @requires_debug_ranges()
 class CPythonTracebackErrorCaretTests(TracebackErrorLocationCaretTests):
diff --git a/Misc/NEWS.d/next/Core and Builtins/2022-07-08-16-44-11.gh-issue-94694.VkL2CM.rst b/Misc/NEWS.d/next/Core and Builtins/2022-07-08-16-44-11.gh-issue-94694.VkL2CM.rst
new file mode 100644
index 0000000000000..6434788140f42
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2022-07-08-16-44-11.gh-issue-94694.VkL2CM.rst	
@@ -0,0 +1,4 @@
+Fix an issue that could cause code with multi-line method lookups to have
+misleading or incorrect column offset information. In some cases (when
+compiling a hand-built AST) this could have resulted in a hard crash of the
+interpreter.
diff --git a/Python/compile.c b/Python/compile.c
index a71e7d31eecd2..42f3730e220f5 100644
--- a/Python/compile.c
+++ b/Python/compile.c
@@ -4788,8 +4788,15 @@ update_location_to_match_attr(struct compiler *c, expr_ty meth)
 {
     if (meth->lineno != meth->end_lineno) {
         // Make start location match attribute
-        c->u->u_lineno = meth->end_lineno;
-        c->u->u_col_offset = meth->end_col_offset - (int)PyUnicode_GetLength(meth->v.Attribute.attr)-1;
+        c->u->u_lineno = c->u->u_end_lineno = meth->end_lineno;
+        int len = (int)PyUnicode_GET_LENGTH(meth->v.Attribute.attr);
+        if (len <= meth->end_col_offset) {
+            c->u->u_col_offset = meth->end_col_offset - len;
+        }
+        else {
+            // GH-94694: Somebody's compiling weird ASTs. Just drop the columns:
+            c->u->u_col_offset = c->u->u_end_col_offset = -1;
+        }
     }
 }
 


From webhook-mailer at python.org  Sun Jul 10 03:40:44 2022
From: webhook-mailer at python.org (stevendaprano)
Date: Sun, 10 Jul 2022 07:40:44 -0000
Subject: [Python-checkins] GH-77265: Document NaN handling in statistics
 functions that sort or count (#94676)
Message-ID: <mailman.1.1657438845.20440.python-checkins@python.org>

https://github.com/python/cpython/commit/ef61b259e35a0249840184b59f43d8a7f9b095bc
commit: ef61b259e35a0249840184b59f43d8a7f9b095bc
branch: main
author: Raymond Hettinger <rhettinger at users.noreply.github.com>
committer: stevendaprano <steve+python at pearwood.info>
date: 2022-07-10T17:40:27+10:00
summary:

GH-77265: Document NaN handling in statistics functions that sort or count (#94676)

* Document NaN handling in functions that sort or count

* Update Doc/library/statistics.rst

Co-authored-by: Erlend Egeberg Aasland <erlend.aasland at protonmail.com>

* Update Doc/library/statistics.rst

Co-authored-by: Erlend Egeberg Aasland <erlend.aasland at protonmail.com>

* Fix trailing whitespace and rewrap text

Co-authored-by: Erlend Egeberg Aasland <erlend.aasland at protonmail.com>

files:
M Doc/library/statistics.rst

diff --git a/Doc/library/statistics.rst b/Doc/library/statistics.rst
index 347a1be8321e4..5aef6f6f05d63 100644
--- a/Doc/library/statistics.rst
+++ b/Doc/library/statistics.rst
@@ -35,6 +35,35 @@ and implementation-dependent.  If your input data consists of mixed types,
 you may be able to use :func:`map` to ensure a consistent result, for
 example: ``map(float, input_data)``.
 
+Some datasets use ``NaN`` (not a number) values to represent missing data.
+Since NaNs have unusual comparison semantics, they cause surprising or
+undefined behaviors in the statistics functions that sort data or that count
+occurrences.  The functions affected are ``median()``, ``median_low()``,
+``median_high()``, ``median_grouped()``, ``mode()``, ``multimode()``, and
+``quantiles()``.  The ``NaN`` values should be stripped before calling these
+functions::
+
+    >>> from statistics import median
+    >>> from math import isnan
+    >>> from itertools import filterfalse
+
+    >>> data = [20.7, float('NaN'),19.2, 18.3, float('NaN'), 14.4]
+    >>> sorted(data)  # This has surprising behavior
+    [20.7, nan, 14.4, 18.3, 19.2, nan]
+    >>> median(data)  # This result is unexpected
+    16.35
+
+    >>> sum(map(isnan, data))    # Number of missing values
+    2
+    >>> clean = list(filterfalse(isnan, data))  # Strip NaN values
+    >>> clean
+    [20.7, 19.2, 18.3, 14.4]
+    >>> sorted(clean)  # Sorting now works as expected
+    [14.4, 18.3, 19.2, 20.7]
+    >>> median(clean)       # This result is now well defined
+    18.75
+
+
 Averages and measures of central location
 -----------------------------------------
 


From webhook-mailer at python.org  Sun Jul 10 13:35:53 2022
From: webhook-mailer at python.org (rhettinger)
Date: Sun, 10 Jul 2022 17:35:53 -0000
Subject: [Python-checkins] GH-77265: Document NaN handling in statistics
 functions that sort or count (GH-94676) (#94726)
Message-ID: <mailman.2.1657474554.20440.python-checkins@python.org>

https://github.com/python/cpython/commit/f3212b1ec7a70b69f44acd763221463a69beee4f
commit: f3212b1ec7a70b69f44acd763221463a69beee4f
branch: 3.11
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: rhettinger <rhettinger at users.noreply.github.com>
date: 2022-07-10T12:35:33-05:00
summary:

GH-77265: Document NaN handling in statistics functions that sort or count (GH-94676) (#94726)

files:
M Doc/library/statistics.rst

diff --git a/Doc/library/statistics.rst b/Doc/library/statistics.rst
index 347a1be8321e4..5aef6f6f05d63 100644
--- a/Doc/library/statistics.rst
+++ b/Doc/library/statistics.rst
@@ -35,6 +35,35 @@ and implementation-dependent.  If your input data consists of mixed types,
 you may be able to use :func:`map` to ensure a consistent result, for
 example: ``map(float, input_data)``.
 
+Some datasets use ``NaN`` (not a number) values to represent missing data.
+Since NaNs have unusual comparison semantics, they cause surprising or
+undefined behaviors in the statistics functions that sort data or that count
+occurrences.  The functions affected are ``median()``, ``median_low()``,
+``median_high()``, ``median_grouped()``, ``mode()``, ``multimode()``, and
+``quantiles()``.  The ``NaN`` values should be stripped before calling these
+functions::
+
+    >>> from statistics import median
+    >>> from math import isnan
+    >>> from itertools import filterfalse
+
+    >>> data = [20.7, float('NaN'),19.2, 18.3, float('NaN'), 14.4]
+    >>> sorted(data)  # This has surprising behavior
+    [20.7, nan, 14.4, 18.3, 19.2, nan]
+    >>> median(data)  # This result is unexpected
+    16.35
+
+    >>> sum(map(isnan, data))    # Number of missing values
+    2
+    >>> clean = list(filterfalse(isnan, data))  # Strip NaN values
+    >>> clean
+    [20.7, 19.2, 18.3, 14.4]
+    >>> sorted(clean)  # Sorting now works as expected
+    [14.4, 18.3, 19.2, 20.7]
+    >>> median(clean)       # This result is now well defined
+    18.75
+
+
 Averages and measures of central location
 -----------------------------------------
 


From webhook-mailer at python.org  Sun Jul 10 13:36:05 2022
From: webhook-mailer at python.org (rhettinger)
Date: Sun, 10 Jul 2022 17:36:05 -0000
Subject: [Python-checkins] GH-77265: Document NaN handling in statistics
 functions that sort or count (GH-94676) (#94725)
Message-ID: <mailman.3.1657474566.20440.python-checkins@python.org>

https://github.com/python/cpython/commit/30015de7235e5b4033298b85a164fcd8d96046b3
commit: 30015de7235e5b4033298b85a164fcd8d96046b3
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: rhettinger <rhettinger at users.noreply.github.com>
date: 2022-07-10T12:36:01-05:00
summary:

GH-77265: Document NaN handling in statistics functions that sort or count (GH-94676) (#94725)

files:
M Doc/library/statistics.rst

diff --git a/Doc/library/statistics.rst b/Doc/library/statistics.rst
index 1f55ae8fb3b56..6484e74422dca 100644
--- a/Doc/library/statistics.rst
+++ b/Doc/library/statistics.rst
@@ -35,6 +35,35 @@ and implementation-dependent.  If your input data consists of mixed types,
 you may be able to use :func:`map` to ensure a consistent result, for
 example: ``map(float, input_data)``.
 
+Some datasets use ``NaN`` (not a number) values to represent missing data.
+Since NaNs have unusual comparison semantics, they cause surprising or
+undefined behaviors in the statistics functions that sort data or that count
+occurrences.  The functions affected are ``median()``, ``median_low()``,
+``median_high()``, ``median_grouped()``, ``mode()``, ``multimode()``, and
+``quantiles()``.  The ``NaN`` values should be stripped before calling these
+functions::
+
+    >>> from statistics import median
+    >>> from math import isnan
+    >>> from itertools import filterfalse
+
+    >>> data = [20.7, float('NaN'),19.2, 18.3, float('NaN'), 14.4]
+    >>> sorted(data)  # This has surprising behavior
+    [20.7, nan, 14.4, 18.3, 19.2, nan]
+    >>> median(data)  # This result is unexpected
+    16.35
+
+    >>> sum(map(isnan, data))    # Number of missing values
+    2
+    >>> clean = list(filterfalse(isnan, data))  # Strip NaN values
+    >>> clean
+    [20.7, 19.2, 18.3, 14.4]
+    >>> sorted(clean)  # Sorting now works as expected
+    [14.4, 18.3, 19.2, 20.7]
+    >>> median(clean)       # This result is now well defined
+    18.75
+
+
 Averages and measures of central location
 -----------------------------------------
 


From webhook-mailer at python.org  Sun Jul 10 14:04:10 2022
From: webhook-mailer at python.org (Fidget-Spinner)
Date: Sun, 10 Jul 2022 18:04:10 -0000
Subject: [Python-checkins] gh-94309: Deprecate typing.Hashable/Sized
 (GH-94626)
Message-ID: <mailman.4.1657476250.20440.python-checkins@python.org>

https://github.com/python/cpython/commit/e8e4b550f50e716c57cc5d0225042ab766c5582d
commit: e8e4b550f50e716c57cc5d0225042ab766c5582d
branch: main
author: MonadChains <monadchains at gmail.com>
committer: Fidget-Spinner <28750310+Fidget-Spinner at users.noreply.github.com>
date: 2022-07-10T19:04:01+01:00
summary:

gh-94309: Deprecate typing.Hashable/Sized (GH-94626)

Deprecate typing.Hashable/Sized. Use the collections.abc counterparts directly instead.

To be consistent with PEP 585, deprecated aliases will not raise any DeprecationWarning.

files:
A Misc/NEWS.d/next/Library/2022-07-06-22-41-51.gh-issue-94309._XswsX.rst
M Doc/library/typing.rst

diff --git a/Doc/library/typing.rst b/Doc/library/typing.rst
index fceb43aec9be3..3980e45ed6832 100644
--- a/Doc/library/typing.rst
+++ b/Doc/library/typing.rst
@@ -2215,6 +2215,9 @@ Corresponding to other types in :mod:`collections.abc`
 
    An alias to :class:`collections.abc.Hashable`.
 
+   .. deprecated:: 3.12
+      Use :class:`collections.abc.Hashable` directly instead.
+
 .. class:: Reversible(Iterable[T_co])
 
    A generic version of :class:`collections.abc.Reversible`.
@@ -2227,6 +2230,9 @@ Corresponding to other types in :mod:`collections.abc`
 
    An alias to :class:`collections.abc.Sized`.
 
+   .. deprecated:: 3.12
+      Use :class:`collections.abc.Sized` directly instead.
+
 Asynchronous programming
 """"""""""""""""""""""""
 
@@ -2849,3 +2855,6 @@ convenience. This is subject to change, and not all deprecations are listed.
 +----------------------------------+---------------+-------------------+----------------+
 |  ``typing.Text``                 | 3.11          | Undecided         | :gh:`92332`    |
 +----------------------------------+---------------+-------------------+----------------+
+|  ``typing.Hashable`` and         | 3.12          | Undecided         | :gh:`94309`    |
+|  ``typing.Sized``                |               |                   |                |
++----------------------------------+---------------+-------------------+----------------+
diff --git a/Misc/NEWS.d/next/Library/2022-07-06-22-41-51.gh-issue-94309._XswsX.rst b/Misc/NEWS.d/next/Library/2022-07-06-22-41-51.gh-issue-94309._XswsX.rst
new file mode 100644
index 0000000000000..b1d45586e9c49
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2022-07-06-22-41-51.gh-issue-94309._XswsX.rst
@@ -0,0 +1 @@
+Deprecate aliases :class:`typing.Hashable` and :class:`typing.Sized`


From webhook-mailer at python.org  Sun Jul 10 23:35:03 2022
From: webhook-mailer at python.org (rhettinger)
Date: Mon, 11 Jul 2022 03:35:03 -0000
Subject: [Python-checkins] Small speed-up for NormalDist.samples (GH-94730)
Message-ID: <mailman.5.1657510504.20440.python-checkins@python.org>

https://github.com/python/cpython/commit/c9118afd045a64ca22d4a8cc5d43532607083b2d
commit: c9118afd045a64ca22d4a8cc5d43532607083b2d
branch: main
author: Raymond Hettinger <rhettinger at users.noreply.github.com>
committer: rhettinger <rhettinger at users.noreply.github.com>
date: 2022-07-10T22:34:53-05:00
summary:

Small speed-up for NormalDist.samples (GH-94730)

files:
M Lib/statistics.py

diff --git a/Lib/statistics.py b/Lib/statistics.py
index 2d66b0522f19d..a2793d9718686 100644
--- a/Lib/statistics.py
+++ b/Lib/statistics.py
@@ -1193,7 +1193,7 @@ def samples(self, n, *, seed=None):
         "Generate *n* samples for a given mean and standard deviation."
         gauss = random.gauss if seed is None else random.Random(seed).gauss
         mu, sigma = self._mu, self._sigma
-        return [gauss(mu, sigma) for i in range(n)]
+        return [gauss(mu, sigma) for _ in repeat(None, n)]
 
     def pdf(self, x):
         "Probability density function.  P(x <= X < x+dx) / dx"


From webhook-mailer at python.org  Mon Jul 11 02:41:02 2022
From: webhook-mailer at python.org (pablogsal)
Date: Mon, 11 Jul 2022 06:41:02 -0000
Subject: [Python-checkins] gh-93883: elide traceback indicators when
 possible (#93994)
Message-ID: <mailman.6.1657521663.20440.python-checkins@python.org>

https://github.com/python/cpython/commit/da717519ecd17bf6c7ed334c12ff861f63b0f14f
commit: da717519ecd17bf6c7ed334c12ff861f63b0f14f
branch: main
author: John Belmonte <john at neggie.net>
committer: pablogsal <Pablogsal at gmail.com>
date: 2022-07-11T07:40:53+01:00
summary:

gh-93883: elide traceback indicators when possible (#93994)

* gh-93883: elide traceback indicators when possible

Elide traceback column indicators when the entire line of the
frame is implicated.  This reduces traceback length and draws
even more attention to the remaining (very relevant) indicators.

Example:
```
Traceback (most recent call last):
  File "query.py", line 99, in <module>
    bar()
  File "query.py", line 66, in bar
    foo()
  File "query.py", line 37, in foo
    magic_arithmetic('foo')
  File "query.py", line 18, in magic_arithmetic
    return add_counts(x) / 25
           ^^^^^^^^^^^^^
  File "query.py", line 24, in add_counts
    return 25 + query_user(user1) + query_user(user2)
                ^^^^^^^^^^^^^^^^^
  File "query.py", line 32, in query_user
    return 1 + query_count(db, response['a']['b']['c']['user'], retry=True)
                               ~~~~~~~~~~~~~~~~~~^^^^^
TypeError: 'NoneType' object is not subscriptable
```

Rather than going out of our way to provide indicator coverage
in every traceback test suite, the indicator test suite should
be responible for sufficient coverage (e.g. by adding a basic
exception group test to ensure that margin strings are covered).

files:
A Misc/NEWS.d/next/Core and Builtins/2022-06-24-14-06-20.gh-issue-93883.8jVQQ4.rst
M Doc/library/traceback.rst
M Doc/whatsnew/3.11.rst
M Lib/idlelib/idle_test/test_run.py
M Lib/test/test_cmd_line_script.py
M Lib/test/test_doctest.py
M Lib/test/test_traceback.py
M Lib/traceback.py
M Python/traceback.c

diff --git a/Doc/library/traceback.rst b/Doc/library/traceback.rst
index 796309c6cf0bb..a8412cc93d16f 100644
--- a/Doc/library/traceback.rst
+++ b/Doc/library/traceback.rst
@@ -464,32 +464,27 @@ The output for the example would look similar to this:
    *** print_tb:
      File "<doctest...>", line 10, in <module>
        lumberjack()
-       ^^^^^^^^^^^^
    *** print_exception:
    Traceback (most recent call last):
      File "<doctest...>", line 10, in <module>
        lumberjack()
-       ^^^^^^^^^^^^
      File "<doctest...>", line 4, in lumberjack
        bright_side_of_death()
-       ^^^^^^^^^^^^^^^^^^^^^^
    IndexError: tuple index out of range
    *** print_exc:
    Traceback (most recent call last):
      File "<doctest...>", line 10, in <module>
        lumberjack()
-       ^^^^^^^^^^^^
      File "<doctest...>", line 4, in lumberjack
        bright_side_of_death()
-       ^^^^^^^^^^^^^^^^^^^^^^
    IndexError: tuple index out of range
    *** format_exc, first and last line:
    Traceback (most recent call last):
    IndexError: tuple index out of range
    *** format_exception:
    ['Traceback (most recent call last):\n',
-    '  File "<doctest default[0]>", line 10, in <module>\n    lumberjack()\n    ^^^^^^^^^^^^\n',
-    '  File "<doctest default[0]>", line 4, in lumberjack\n    bright_side_of_death()\n    ^^^^^^^^^^^^^^^^^^^^^^\n',
+    '  File "<doctest default[0]>", line 10, in <module>\n    lumberjack()\n',
+    '  File "<doctest default[0]>", line 4, in lumberjack\n    bright_side_of_death()\n',
     '  File "<doctest default[0]>", line 7, in bright_side_of_death\n    return tuple()[0]\n           ~~~~~~~^^^\n',
     'IndexError: tuple index out of range\n']
    *** extract_tb:
@@ -497,8 +492,8 @@ The output for the example would look similar to this:
     <FrameSummary file <doctest...>, line 4 in lumberjack>,
     <FrameSummary file <doctest...>, line 7 in bright_side_of_death>]
    *** format_tb:
-   ['  File "<doctest default[0]>", line 10, in <module>\n    lumberjack()\n    ^^^^^^^^^^^^\n',
-    '  File "<doctest default[0]>", line 4, in lumberjack\n    bright_side_of_death()\n    ^^^^^^^^^^^^^^^^^^^^^^\n',
+   ['  File "<doctest default[0]>", line 10, in <module>\n    lumberjack()\n',
+    '  File "<doctest default[0]>", line 4, in lumberjack\n    bright_side_of_death()\n',
     '  File "<doctest default[0]>", line 7, in bright_side_of_death\n    return tuple()[0]\n           ~~~~~~~^^^\n']
    *** tb_lineno: 10
 
diff --git a/Doc/whatsnew/3.11.rst b/Doc/whatsnew/3.11.rst
index 95991528444c7..f7274a8cea158 100644
--- a/Doc/whatsnew/3.11.rst
+++ b/Doc/whatsnew/3.11.rst
@@ -117,7 +117,6 @@ when dealing with deeply nested dictionary objects and multiple function calls,
     Traceback (most recent call last):
       File "query.py", line 37, in <module>
         magic_arithmetic('foo')
-        ^^^^^^^^^^^^^^^^^^^^^^^
       File "query.py", line 18, in magic_arithmetic
         return add_counts(x) / 25
                ^^^^^^^^^^^^^
diff --git a/Lib/idlelib/idle_test/test_run.py b/Lib/idlelib/idle_test/test_run.py
index d859ffc153fcd..ec4637c5ca617 100644
--- a/Lib/idlelib/idle_test/test_run.py
+++ b/Lib/idlelib/idle_test/test_run.py
@@ -3,7 +3,7 @@
 from idlelib import run
 import io
 import sys
-from test.support import captured_output, captured_stderr, has_no_debug_ranges
+from test.support import captured_output, captured_stderr
 import unittest
 from unittest import mock
 import idlelib
@@ -33,14 +33,9 @@ def __eq__(self, other):
                         run.print_exception()
 
         tb = output.getvalue().strip().splitlines()
-        if has_no_debug_ranges():
-            self.assertEqual(11, len(tb))
-            self.assertIn('UnhashableException: ex2', tb[3])
-            self.assertIn('UnhashableException: ex1', tb[10])
-        else:
-            self.assertEqual(13, len(tb))
-            self.assertIn('UnhashableException: ex2', tb[4])
-            self.assertIn('UnhashableException: ex1', tb[12])
+        self.assertEqual(11, len(tb))
+        self.assertIn('UnhashableException: ex2', tb[3])
+        self.assertIn('UnhashableException: ex1', tb[10])
 
     data = (('1/0', ZeroDivisionError, "division by zero\n"),
             ('abc', NameError, "name 'abc' is not defined. "
diff --git a/Lib/test/test_cmd_line_script.py b/Lib/test/test_cmd_line_script.py
index d783af65839ad..9e98edf2146ca 100644
--- a/Lib/test/test_cmd_line_script.py
+++ b/Lib/test/test_cmd_line_script.py
@@ -549,10 +549,10 @@ def test_pep_409_verbiage(self):
             script_name = _make_test_script(script_dir, 'script', script)
             exitcode, stdout, stderr = assert_python_failure(script_name)
             text = stderr.decode('ascii').split('\n')
-            self.assertEqual(len(text), 6)
+            self.assertEqual(len(text), 5)
             self.assertTrue(text[0].startswith('Traceback'))
             self.assertTrue(text[1].startswith('  File '))
-            self.assertTrue(text[4].startswith('NameError'))
+            self.assertTrue(text[3].startswith('NameError'))
 
     def test_non_ascii(self):
         # Mac OS X denies the creation of a file with an invalid UTF-8 name.
diff --git a/Lib/test/test_doctest.py b/Lib/test/test_doctest.py
index 7c799697d9c22..65e215f1cdda4 100644
--- a/Lib/test/test_doctest.py
+++ b/Lib/test/test_doctest.py
@@ -2854,7 +2854,7 @@ def test_testmod(): r"""
     # Skip the test: the filesystem encoding is unable to encode the filename
     supports_unicode = False
 
-if supports_unicode and not support.has_no_debug_ranges():
+if supports_unicode:
     def test_unicode(): """
 Check doctest with a non-ascii filename:
 
@@ -2876,10 +2876,8 @@ def test_unicode(): """
         Traceback (most recent call last):
           File ...
             exec(compile(example.source, filename, "single",
-            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
           File "<doctest foo-b?r at baz[0]>", line 1, in <module>
             raise Exception('cl?')
-            ^^^^^^^^^^^^^^^^^^^^^^
         Exception: cl?
     TestResults(failed=1, attempted=1)
     """
diff --git a/Lib/test/test_traceback.py b/Lib/test/test_traceback.py
index 72d67bf6ef140..f4161fbf0178d 100644
--- a/Lib/test/test_traceback.py
+++ b/Lib/test/test_traceback.py
@@ -252,7 +252,7 @@ def do_test(firstlines, message, charset, lineno):
             self.assertTrue(stdout[2].endswith(err_line),
                 "Invalid traceback line: {0!r} instead of {1!r}".format(
                     stdout[2], err_line))
-            actual_err_msg = stdout[3 if has_no_debug_ranges() else 4]
+            actual_err_msg = stdout[3]
             self.assertTrue(actual_err_msg == err_msg,
                 "Invalid error message: {0!r} instead of {1!r}".format(
                     actual_err_msg, err_msg))
@@ -386,18 +386,19 @@ def get_exception(self, callable):
     callable_line = get_exception.__code__.co_firstlineno + 2
 
     def test_basic_caret(self):
+        # NOTE: In caret tests, "if True:" is used as a way to force indicator
+        #   display, since the raising expression spans only part of the line.
         def f():
-            raise ValueError("basic caret tests")
+            if True: raise ValueError("basic caret tests")
 
         lineno_f = f.__code__.co_firstlineno
         expected_f = (
             'Traceback (most recent call last):\n'
             f'  File "{__file__}", line {self.callable_line}, in get_exception\n'
             '    callable()\n'
-            '    ^^^^^^^^^^\n'
             f'  File "{__file__}", line {lineno_f+1}, in f\n'
-            '    raise ValueError("basic caret tests")\n'
-            '    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n'
+            '    if True: raise ValueError("basic caret tests")\n'
+            '             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n'
         )
         result_lines = self.get_exception(f)
         self.assertEqual(result_lines, expected_f.splitlines())
@@ -406,17 +407,16 @@ def test_line_with_unicode(self):
         # Make sure that even if a line contains multi-byte unicode characters
         # the correct carets are printed.
         def f_with_unicode():
-            raise ValueError("?ell? W?rld")
+            if True: raise ValueError("?ell? W?rld")
 
         lineno_f = f_with_unicode.__code__.co_firstlineno
         expected_f = (
             'Traceback (most recent call last):\n'
             f'  File "{__file__}", line {self.callable_line}, in get_exception\n'
             '    callable()\n'
-            '    ^^^^^^^^^^\n'
             f'  File "{__file__}", line {lineno_f+1}, in f_with_unicode\n'
-            '    raise ValueError("?ell? W?rld")\n'
-            '    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n'
+            '    if True: raise ValueError("?ell? W?rld")\n'
+            '             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n'
         )
         result_lines = self.get_exception(f_with_unicode)
         self.assertEqual(result_lines, expected_f.splitlines())
@@ -431,7 +431,6 @@ def foo(a: THIS_DOES_NOT_EXIST ) -> int:
             'Traceback (most recent call last):\n'
             f'  File "{__file__}", line {self.callable_line}, in get_exception\n'
             '    callable()\n'
-            '    ^^^^^^^^^^\n'
             f'  File "{__file__}", line {lineno_f+1}, in f_with_type\n'
             '    def foo(a: THIS_DOES_NOT_EXIST ) -> int:\n'
             '               ^^^^^^^^^^^^^^^^^^^\n'
@@ -443,7 +442,7 @@ def test_caret_multiline_expression(self):
         # Make sure no carets are printed for expressions spanning multiple
         # lines.
         def f_with_multiline():
-            raise ValueError(
+            if True: raise ValueError(
                 "error over multiple lines"
             )
 
@@ -452,10 +451,9 @@ def f_with_multiline():
             'Traceback (most recent call last):\n'
             f'  File "{__file__}", line {self.callable_line}, in get_exception\n'
             '    callable()\n'
-            '    ^^^^^^^^^^\n'
             f'  File "{__file__}", line {lineno_f+1}, in f_with_multiline\n'
-            '    raise ValueError(\n'
-            '    ^^^^^^^^^^^^^^^^^'
+            '    if True: raise ValueError(\n'
+            '             ^^^^^^^^^^^^^^^^^'
         )
         result_lines = self.get_exception(f_with_multiline)
         self.assertEqual(result_lines, expected_f.splitlines())
@@ -484,7 +482,6 @@ def f_with_multiline():
             'Traceback (most recent call last):\n'
             f'  File "{__file__}", line {self.callable_line}, in get_exception\n'
             '    callable()\n'
-            '    ^^^^^^^^^^\n'
             f'  File "{__file__}", line {lineno_f+2}, in f_with_multiline\n'
             '    return compile(code, "?", "exec")\n'
             '           ^^^^^^^^^^^^^^^^^^^^^^^^^^\n'
@@ -501,9 +498,8 @@ def test_caret_multiline_expression_bin_op(self):
         # lines.
         def f_with_multiline():
             return (
-                1 /
-                0 +
-                2
+                2 + 1 /
+                0
             )
 
         lineno_f = f_with_multiline.__code__.co_firstlineno
@@ -511,10 +507,9 @@ def f_with_multiline():
             'Traceback (most recent call last):\n'
             f'  File "{__file__}", line {self.callable_line}, in get_exception\n'
             '    callable()\n'
-            '    ^^^^^^^^^^\n'
             f'  File "{__file__}", line {lineno_f+2}, in f_with_multiline\n'
-            '    1 /\n'
-            '    ^^^'
+            '    2 + 1 /\n'
+            '        ^^^'
         )
         result_lines = self.get_exception(f_with_multiline)
         self.assertEqual(result_lines, expected_f.splitlines())
@@ -529,7 +524,6 @@ def f_with_binary_operator():
             'Traceback (most recent call last):\n'
             f'  File "{__file__}", line {self.callable_line}, in get_exception\n'
             '    callable()\n'
-            '    ^^^^^^^^^^\n'
             f'  File "{__file__}", line {lineno_f+2}, in f_with_binary_operator\n'
             '    return 10 + divisor / 0 + 30\n'
             '                ~~~~~~~~^~~\n'
@@ -547,7 +541,6 @@ def f_with_binary_operator():
             'Traceback (most recent call last):\n'
             f'  File "{__file__}", line {self.callable_line}, in get_exception\n'
             '    callable()\n'
-            '    ^^^^^^^^^^\n'
             f'  File "{__file__}", line {lineno_f+2}, in f_with_binary_operator\n'
             '    return 10 + divisor // 0 + 30\n'
             '                ~~~~~~~~^^~~\n'
@@ -565,7 +558,6 @@ def f_with_subscript():
             'Traceback (most recent call last):\n'
             f'  File "{__file__}", line {self.callable_line}, in get_exception\n'
             '    callable()\n'
-            '    ^^^^^^^^^^\n'
             f'  File "{__file__}", line {lineno_f+2}, in f_with_subscript\n'
             "    return some_dict['x']['y']['z']\n"
             '           ~~~~~~~~~~~~~~~~~~~^^^^^\n'
@@ -589,7 +581,6 @@ def test_traceback_specialization_with_syntax_error(self):
             'Traceback (most recent call last):\n'
             f'  File "{__file__}", line {self.callable_line}, in get_exception\n'
             '    callable()\n'
-            '    ^^^^^^^^^^\n'
             f'  File "{TESTFN}", line {lineno_f}, in <module>\n'
             "    1 $ 0 / 1 / 2\n"
             '    ^^^^^\n'
@@ -597,7 +588,7 @@ def test_traceback_specialization_with_syntax_error(self):
         self.assertEqual(result_lines, expected_error.splitlines())
 
     def test_traceback_very_long_line(self):
-        source = "a" * 256
+        source = "if True: " + "a" * 256
         bytecode = compile(source, TESTFN, "exec")
 
         with open(TESTFN, "w") as file:
@@ -612,13 +603,54 @@ def test_traceback_very_long_line(self):
             'Traceback (most recent call last):\n'
             f'  File "{__file__}", line {self.callable_line}, in get_exception\n'
             '    callable()\n'
-            '    ^^^^^^^^^^\n'
             f'  File "{TESTFN}", line {lineno_f}, in <module>\n'
             f'    {source}\n'
-            f'    {"^"*len(source)}\n'
+            f'    {" "*len("if True: ") + "^"*256}\n'
         )
         self.assertEqual(result_lines, expected_error.splitlines())
 
+    def test_secondary_caret_not_elided(self):
+        # Always show a line's indicators if they include the secondary character.
+        def f_with_subscript():
+            some_dict = {'x': {'y': None}}
+            some_dict['x']['y']['z']
+
+        lineno_f = f_with_subscript.__code__.co_firstlineno
+        expected_error = (
+            'Traceback (most recent call last):\n'
+            f'  File "{__file__}", line {self.callable_line}, in get_exception\n'
+            '    callable()\n'
+            f'  File "{__file__}", line {lineno_f+2}, in f_with_subscript\n'
+            "    some_dict['x']['y']['z']\n"
+            '    ~~~~~~~~~~~~~~~~~~~^^^^^\n'
+        )
+        result_lines = self.get_exception(f_with_subscript)
+        self.assertEqual(result_lines, expected_error.splitlines())
+
+    def test_caret_exception_group(self):
+        # Notably, this covers whether indicators handle margin strings correctly.
+        # (Exception groups use margin strings to display vertical indicators.)
+        # The implementation must account for both "indent" and "margin" offsets.
+
+        def exc():
+            if True: raise ExceptionGroup("eg", [ValueError(1), TypeError(2)])
+
+        expected_error = (
+             f'  + Exception Group Traceback (most recent call last):\n'
+             f'  |   File "{__file__}", line {self.callable_line}, in get_exception\n'
+             f'  |     callable()\n'
+             f'  |   File "{__file__}", line {exc.__code__.co_firstlineno + 1}, in exc\n'
+             f'  |     if True: raise ExceptionGroup("eg", [ValueError(1), TypeError(2)])\n'
+             f'  |              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n'
+             f'  | ExceptionGroup: eg (2 sub-exceptions)\n'
+             f'  +-+---------------- 1 ----------------\n'
+             f'    | ValueError: 1\n'
+             f'    +---------------- 2 ----------------\n'
+             f'    | TypeError: 2\n')
+
+        result_lines = self.get_exception(exc)
+        self.assertEqual(result_lines, expected_error.splitlines())
+
     def assertSpecialized(self, func, expected_specialization):
         result_lines = self.get_exception(func)
         specialization_line = result_lines[-1]
@@ -672,13 +704,11 @@ def g(): pass
             'Traceback (most recent call last):\n'
             f'  File "{__file__}", line {self.callable_line}, in get_exception\n'
             '    callable()\n'
-            '    ^^^^^^^^^^\n'
             f'  File "{__file__}", line {lineno_applydescs + 1}, in applydecs\n'
             '    @dec_error\n'
             '     ^^^^^^^^^\n'
             f'  File "{__file__}", line {lineno_dec_error + 1}, in dec_error\n'
             '    raise TypeError\n'
-            '    ^^^^^^^^^^^^^^^\n'
         )
         self.assertEqual(result_lines, expected_error.splitlines())
 
@@ -692,13 +722,11 @@ class A: pass
             'Traceback (most recent call last):\n'
             f'  File "{__file__}", line {self.callable_line}, in get_exception\n'
             '    callable()\n'
-            '    ^^^^^^^^^^\n'
             f'  File "{__file__}", line {lineno_applydescs_class + 1}, in applydecs_class\n'
             '    @dec_error\n'
             '     ^^^^^^^^^\n'
             f'  File "{__file__}", line {lineno_dec_error + 1}, in dec_error\n'
             '    raise TypeError\n'
-            '    ^^^^^^^^^^^^^^^\n'
         )
         self.assertEqual(result_lines, expected_error.splitlines())
 
@@ -816,12 +844,8 @@ def check_traceback_format(self, cleanup_func=None):
         # Make sure that the traceback is properly indented.
         tb_lines = python_fmt.splitlines()
         banner = tb_lines[0]
-        if has_no_debug_ranges():
-            self.assertEqual(len(tb_lines), 5)
-            location, source_line = tb_lines[-2], tb_lines[-1]
-        else:
-            self.assertEqual(len(tb_lines), 7)
-            location, source_line = tb_lines[-3], tb_lines[-2]
+        self.assertEqual(len(tb_lines), 5)
+        location, source_line = tb_lines[-2], tb_lines[-1]
         self.assertTrue(banner.startswith('Traceback'))
         self.assertTrue(location.startswith('  File'))
         self.assertTrue(source_line.startswith('    raise'))
@@ -885,16 +909,12 @@ def f():
             'Traceback (most recent call last):\n'
             f'  File "{__file__}", line {lineno_f+5}, in _check_recursive_traceback_display\n'
             '    f()\n'
-            '    ^^^\n'
             f'  File "{__file__}", line {lineno_f+1}, in f\n'
             '    f()\n'
-            '    ^^^\n'
             f'  File "{__file__}", line {lineno_f+1}, in f\n'
             '    f()\n'
-            '    ^^^\n'
             f'  File "{__file__}", line {lineno_f+1}, in f\n'
             '    f()\n'
-            '    ^^^\n'
             # XXX: The following line changes depending on whether the tests
             # are run through the interactive interpreter or with -m
             # It also varies depending on the platform (stack size)
@@ -945,14 +965,12 @@ def g(count=10):
             '  [Previous line repeated 7 more times]\n'
             f'  File "{__file__}", line {lineno_g+3}, in g\n'
             '    raise ValueError\n'
-            '    ^^^^^^^^^^^^^^^^\n'
             'ValueError\n'
         )
         tb_line = (
             'Traceback (most recent call last):\n'
             f'  File "{__file__}", line {lineno_g+7}, in _check_recursive_traceback_display\n'
             '    g()\n'
-            '    ^^^\n'
         )
         expected = (tb_line + result_g).splitlines()
         actual = stderr_g.getvalue().splitlines()
@@ -977,7 +995,6 @@ def h(count=10):
             'Traceback (most recent call last):\n'
             f'  File "{__file__}", line {lineno_h+7}, in _check_recursive_traceback_display\n'
             '    h()\n'
-            '    ^^^\n'
             f'  File "{__file__}", line {lineno_h+2}, in h\n'
             '    return h(count-1)\n'
             '           ^^^^^^^^^^\n'
@@ -990,7 +1007,6 @@ def h(count=10):
             '  [Previous line repeated 7 more times]\n'
             f'  File "{__file__}", line {lineno_h+3}, in h\n'
             '    g()\n'
-            '    ^^^\n'
         )
         expected = (result_h + result_g).splitlines()
         actual = stderr_h.getvalue().splitlines()
@@ -1016,14 +1032,12 @@ def h(count=10):
             '           ^^^^^^^^^^\n'
             f'  File "{__file__}", line {lineno_g+3}, in g\n'
             '    raise ValueError\n'
-            '    ^^^^^^^^^^^^^^^^\n'
             'ValueError\n'
         )
         tb_line = (
             'Traceback (most recent call last):\n'
-            f'  File "{__file__}", line {lineno_g+81}, in _check_recursive_traceback_display\n'
+            f'  File "{__file__}", line {lineno_g+77}, in _check_recursive_traceback_display\n'
             '    g(traceback._RECURSIVE_CUTOFF)\n'
-            '    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n'
         )
         expected = (tb_line + result_g).splitlines()
         actual = stderr_g.getvalue().splitlines()
@@ -1050,14 +1064,12 @@ def h(count=10):
             '  [Previous line repeated 1 more time]\n'
             f'  File "{__file__}", line {lineno_g+3}, in g\n'
             '    raise ValueError\n'
-            '    ^^^^^^^^^^^^^^^^\n'
             'ValueError\n'
         )
         tb_line = (
             'Traceback (most recent call last):\n'
-            f'  File "{__file__}", line {lineno_g+114}, in _check_recursive_traceback_display\n'
+            f'  File "{__file__}", line {lineno_g+108}, in _check_recursive_traceback_display\n'
             '    g(traceback._RECURSIVE_CUTOFF + 1)\n'
-            '    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n'
         )
         expected = (tb_line + result_g).splitlines()
         actual = stderr_g.getvalue().splitlines()
@@ -1110,16 +1122,10 @@ def __eq__(self, other):
             exception_print(exc_val)
 
         tb = stderr_f.getvalue().strip().splitlines()
-        if has_no_debug_ranges():
-            self.assertEqual(11, len(tb))
-            self.assertEqual(context_message.strip(), tb[5])
-            self.assertIn('UnhashableException: ex2', tb[3])
-            self.assertIn('UnhashableException: ex1', tb[10])
-        else:
-            self.assertEqual(13, len(tb))
-            self.assertEqual(context_message.strip(), tb[6])
-            self.assertIn('UnhashableException: ex2', tb[4])
-            self.assertIn('UnhashableException: ex1', tb[12])
+        self.assertEqual(11, len(tb))
+        self.assertEqual(context_message.strip(), tb[5])
+        self.assertIn('UnhashableException: ex2', tb[3])
+        self.assertIn('UnhashableException: ex1', tb[10])
 
     def deep_eg(self):
         e = TypeError(1)
@@ -1255,12 +1261,8 @@ def test_context_suppression(self):
         except ZeroDivisionError as _:
             e = _
         lines = self.get_report(e).splitlines()
-        if has_no_debug_ranges():
-            self.assertEqual(len(lines), 4)
-            self.assertTrue(lines[3].startswith('ZeroDivisionError'))
-        else:
-            self.assertEqual(len(lines), 5)
-            self.assertTrue(lines[4].startswith('ZeroDivisionError'))
+        self.assertEqual(len(lines), 4)
+        self.assertTrue(lines[3].startswith('ZeroDivisionError'))
         self.assertTrue(lines[0].startswith('Traceback'))
         self.assertTrue(lines[1].startswith('  File'))
         self.assertIn('ZeroDivisionError from None', lines[2])
@@ -1510,10 +1512,8 @@ def exc():
              f'  + Exception Group Traceback (most recent call last):\n'
              f'  |   File "{__file__}", line {self.callable_line}, in get_exception\n'
              f'  |     exception_or_callable()\n'
-             f'  |     ^^^^^^^^^^^^^^^^^^^^^^^\n'
              f'  |   File "{__file__}", line {exc.__code__.co_firstlineno + 1}, in exc\n'
              f'  |     raise ExceptionGroup("eg", [ValueError(1), TypeError(2)])\n'
-             f'  |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n'
              f'  | ExceptionGroup: eg (2 sub-exceptions)\n'
              f'  +-+---------------- 1 ----------------\n'
              f'    | ValueError: 1\n'
@@ -1535,7 +1535,6 @@ def exc():
         expected = (f'  + Exception Group Traceback (most recent call last):\n'
                     f'  |   File "{__file__}", line {exc.__code__.co_firstlineno + 3}, in exc\n'
                     f'  |     raise EG("eg1", [ValueError(1), TypeError(2)])\n'
-                    f'  |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n'
                     f'  | ExceptionGroup: eg1 (2 sub-exceptions)\n'
                     f'  +-+---------------- 1 ----------------\n'
                     f'    | ValueError: 1\n'
@@ -1548,10 +1547,8 @@ def exc():
                     f'  + Exception Group Traceback (most recent call last):\n'
                     f'  |   File "{__file__}", line {self.callable_line}, in get_exception\n'
                     f'  |     exception_or_callable()\n'
-                    f'  |     ^^^^^^^^^^^^^^^^^^^^^^^\n'
                     f'  |   File "{__file__}", line {exc.__code__.co_firstlineno + 5}, in exc\n'
                     f'  |     raise EG("eg2", [ValueError(3), TypeError(4)]) from e\n'
-                    f'  |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n'
                     f'  | ExceptionGroup: eg2 (2 sub-exceptions)\n'
                     f'  +-+---------------- 1 ----------------\n'
                     f'    | ValueError: 3\n'
@@ -1577,7 +1574,6 @@ def exc():
              f'  + Exception Group Traceback (most recent call last):\n'
              f'  |   File "{__file__}", line {exc.__code__.co_firstlineno + 4}, in exc\n'
              f'  |     raise EG("eg1", [ValueError(1), TypeError(2)])\n'
-             f'  |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n'
              f'  | ExceptionGroup: eg1 (2 sub-exceptions)\n'
              f'  +-+---------------- 1 ----------------\n'
              f'    | ValueError: 1\n'
@@ -1590,7 +1586,6 @@ def exc():
              f'  + Exception Group Traceback (most recent call last):\n'
              f'  |   File "{__file__}", line {exc.__code__.co_firstlineno + 6}, in exc\n'
              f'  |     raise EG("eg2", [ValueError(3), TypeError(4)])\n'
-             f'  |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n'
              f'  | ExceptionGroup: eg2 (2 sub-exceptions)\n'
              f'  +-+---------------- 1 ----------------\n'
              f'    | ValueError: 3\n'
@@ -1603,10 +1598,8 @@ def exc():
              f'Traceback (most recent call last):\n'
              f'  File "{__file__}", line {self.callable_line}, in get_exception\n'
              f'    exception_or_callable()\n'
-             f'    ^^^^^^^^^^^^^^^^^^^^^^^\n'
              f'  File "{__file__}", line {exc.__code__.co_firstlineno + 8}, in exc\n'
              f'    raise ImportError(5)\n'
-             f'    ^^^^^^^^^^^^^^^^^^^^\n'
              f'ImportError: 5\n')
 
         report = self.get_report(exc)
@@ -1629,7 +1622,6 @@ def exc():
         expected = (f'  + Exception Group Traceback (most recent call last):\n'
                     f'  |   File "{__file__}", line {exc.__code__.co_firstlineno + 9}, in exc\n'
                     f'  |     raise EG("eg", [VE(1), exc, VE(4)])\n'
-                    f'  |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n'
                     f'  | ExceptionGroup: eg (3 sub-exceptions)\n'
                     f'  +-+---------------- 1 ----------------\n'
                     f'    | ValueError: 1\n'
@@ -1637,7 +1629,6 @@ def exc():
                     f'    | Exception Group Traceback (most recent call last):\n'
                     f'    |   File "{__file__}", line {exc.__code__.co_firstlineno + 6}, in exc\n'
                     f'    |     raise EG("nested", [TE(2), TE(3)])\n'
-                    f'    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n'
                     f'    | ExceptionGroup: nested (2 sub-exceptions)\n'
                     f'    +-+---------------- 1 ----------------\n'
                     f'      | TypeError: 2\n'
@@ -1653,10 +1644,8 @@ def exc():
                     f'  + Exception Group Traceback (most recent call last):\n'
                     f'  |   File "{__file__}", line {self.callable_line}, in get_exception\n'
                     f'  |     exception_or_callable()\n'
-                    f'  |     ^^^^^^^^^^^^^^^^^^^^^^^\n'
                     f'  |   File "{__file__}", line {exc.__code__.co_firstlineno + 11}, in exc\n'
                     f'  |     raise EG("top", [VE(5)])\n'
-                    f'  |     ^^^^^^^^^^^^^^^^^^^^^^^^\n'
                     f'  | ExceptionGroup: top (1 sub-exception)\n'
                     f'  +-+---------------- 1 ----------------\n'
                     f'    | ValueError: 5\n'
@@ -1814,10 +1803,8 @@ def exc():
         expected = (f'  + Exception Group Traceback (most recent call last):\n'
                     f'  |   File "{__file__}", line {self.callable_line}, in get_exception\n'
                     f'  |     exception_or_callable()\n'
-                    f'  |     ^^^^^^^^^^^^^^^^^^^^^^^\n'
                     f'  |   File "{__file__}", line {exc.__code__.co_firstlineno + 9}, in exc\n'
                     f'  |     raise ExceptionGroup("nested", excs)\n'
-                    f'  |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n'
                     f'  | ExceptionGroup: nested (2 sub-exceptions)\n'
                     f'  | >> Multi line note\n'
                     f'  | >> Because I am such\n'
@@ -1829,14 +1816,12 @@ def exc():
                     f'    | Traceback (most recent call last):\n'
                     f'    |   File "{__file__}", line {exc.__code__.co_firstlineno + 5}, in exc\n'
                     f'    |     raise ValueError(msg)\n'
-                    f'    |     ^^^^^^^^^^^^^^^^^^^^^\n'
                     f'    | ValueError: bad value\n'
                     f'    | the bad value\n'
                     f'    +---------------- 2 ----------------\n'
                     f'    | Traceback (most recent call last):\n'
                     f'    |   File "{__file__}", line {exc.__code__.co_firstlineno + 5}, in exc\n'
                     f'    |     raise ValueError(msg)\n'
-                    f'    |     ^^^^^^^^^^^^^^^^^^^^^\n'
                     f'    | ValueError: terrible value\n'
                     f'    | the terrible value\n'
                     f'    +------------------------------------\n')
@@ -1869,10 +1854,8 @@ def exc():
         expected = (f'  + Exception Group Traceback (most recent call last):\n'
                     f'  |   File "{__file__}", line {self.callable_line}, in get_exception\n'
                     f'  |     exception_or_callable()\n'
-                    f'  |     ^^^^^^^^^^^^^^^^^^^^^^^\n'
                     f'  |   File "{__file__}", line {exc.__code__.co_firstlineno + 10}, in exc\n'
                     f'  |     raise ExceptionGroup("nested", excs)\n'
-                    f'  |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n'
                     f'  | ExceptionGroup: nested (2 sub-exceptions)\n'
                     f'  | >> Multi line note\n'
                     f'  | >> Because I am such\n'
@@ -1885,7 +1868,6 @@ def exc():
                     f'    | Traceback (most recent call last):\n'
                     f'    |   File "{__file__}", line {exc.__code__.co_firstlineno + 5}, in exc\n'
                     f'    |     raise ValueError(msg)\n'
-                    f'    |     ^^^^^^^^^^^^^^^^^^^^^\n'
                     f'    | ValueError: bad value\n'
                     f'    | the bad value\n'
                     f'    | Goodbye bad value\n'
@@ -1893,7 +1875,6 @@ def exc():
                     f'    | Traceback (most recent call last):\n'
                     f'    |   File "{__file__}", line {exc.__code__.co_firstlineno + 5}, in exc\n'
                     f'    |     raise ValueError(msg)\n'
-                    f'    |     ^^^^^^^^^^^^^^^^^^^^^\n'
                     f'    | ValueError: terrible value\n'
                     f'    | the terrible value\n'
                     f'    | Goodbye terrible value\n'
@@ -2669,19 +2650,16 @@ def test_exception_group_format(self):
                     f'  + Exception Group Traceback (most recent call last):',
                     f'  |   File "{__file__}", line {lno_g+23}, in _get_exception_group',
                     f'  |     raise ExceptionGroup("eg2", [exc3, exc4])',
-                    f'  |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^',
                     f'  | ExceptionGroup: eg2 (2 sub-exceptions)',
                     f'  +-+---------------- 1 ----------------',
                     f'    | Exception Group Traceback (most recent call last):',
                     f'    |   File "{__file__}", line {lno_g+16}, in _get_exception_group',
                     f'    |     raise ExceptionGroup("eg1", [exc1, exc2])',
-                    f'    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^',
                     f'    | ExceptionGroup: eg1 (2 sub-exceptions)',
                     f'    +-+---------------- 1 ----------------',
                     f'      | Traceback (most recent call last):',
                     f'      |   File "{__file__}", line {lno_g+9}, in _get_exception_group',
                     f'      |     f()',
-                    f'      |     ^^^',
                     f'      |   File "{__file__}", line {lno_f+1}, in f',
                     f'      |     1/0',
                     f'      |     ~^~',
@@ -2690,20 +2668,16 @@ def test_exception_group_format(self):
                     f'      | Traceback (most recent call last):',
                     f'      |   File "{__file__}", line {lno_g+13}, in _get_exception_group',
                     f'      |     g(42)',
-                    f'      |     ^^^^^',
                     f'      |   File "{__file__}", line {lno_g+1}, in g',
                     f'      |     raise ValueError(v)',
-                    f'      |     ^^^^^^^^^^^^^^^^^^^',
                     f'      | ValueError: 42',
                     f'      +------------------------------------',
                     f'    +---------------- 2 ----------------',
                     f'    | Traceback (most recent call last):',
                     f'    |   File "{__file__}", line {lno_g+20}, in _get_exception_group',
                     f'    |     g(24)',
-                    f'    |     ^^^^^',
                     f'    |   File "{__file__}", line {lno_g+1}, in g',
                     f'    |     raise ValueError(v)',
-                    f'    |     ^^^^^^^^^^^^^^^^^^^',
                     f'    | ValueError: 24',
                     f'    +------------------------------------',
                     f'']
diff --git a/Lib/traceback.py b/Lib/traceback.py
index 3afe49d1d8a0e..55f8080044053 100644
--- a/Lib/traceback.py
+++ b/Lib/traceback.py
@@ -465,7 +465,8 @@ def format_frame_summary(self, frame_summary):
         row.append('  File "{}", line {}, in {}\n'.format(
             frame_summary.filename, frame_summary.lineno, frame_summary.name))
         if frame_summary.line:
-            row.append('    {}\n'.format(frame_summary.line.strip()))
+            stripped_line = frame_summary.line.strip()
+            row.append('    {}\n'.format(stripped_line))
 
             orig_line_len = len(frame_summary._original_line)
             frame_line_len = len(frame_summary.line.lstrip())
@@ -486,19 +487,22 @@ def format_frame_summary(self, frame_summary):
                             frame_summary._original_line[colno - 1:end_colno - 1]
                         )
                 else:
-                    end_colno = stripped_characters + len(frame_summary.line.strip())
-
-                row.append('    ')
-                row.append(' ' * (colno - stripped_characters))
-
-                if anchors:
-                    row.append(anchors.primary_char * (anchors.left_end_offset))
-                    row.append(anchors.secondary_char * (anchors.right_start_offset - anchors.left_end_offset))
-                    row.append(anchors.primary_char * (end_colno - colno - anchors.right_start_offset))
-                else:
-                    row.append('^' * (end_colno - colno))
+                    end_colno = stripped_characters + len(stripped_line)
+
+                # show indicators if primary char doesn't span the frame line
+                if end_colno - colno < len(stripped_line) or (
+                        anchors and anchors.right_start_offset - anchors.left_end_offset > 0):
+                    row.append('    ')
+                    row.append(' ' * (colno - stripped_characters))
+
+                    if anchors:
+                        row.append(anchors.primary_char * (anchors.left_end_offset))
+                        row.append(anchors.secondary_char * (anchors.right_start_offset - anchors.left_end_offset))
+                        row.append(anchors.primary_char * (end_colno - colno - anchors.right_start_offset))
+                    else:
+                        row.append('^' * (end_colno - colno))
 
-                row.append('\n')
+                    row.append('\n')
 
         if frame_summary.locals:
             for name, value in sorted(frame_summary.locals.items()):
diff --git a/Misc/NEWS.d/next/Core and Builtins/2022-06-24-14-06-20.gh-issue-93883.8jVQQ4.rst b/Misc/NEWS.d/next/Core and Builtins/2022-06-24-14-06-20.gh-issue-93883.8jVQQ4.rst
new file mode 100644
index 0000000000000..53345577036a5
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2022-06-24-14-06-20.gh-issue-93883.8jVQQ4.rst	
@@ -0,0 +1 @@
+Revise the display strategy of traceback enhanced error locations.  The indicators are only shown when the location doesn't span the whole line.
diff --git a/Python/traceback.c b/Python/traceback.c
index 439689b32aea8..de658b9103180 100644
--- a/Python/traceback.c
+++ b/Python/traceback.c
@@ -592,7 +592,6 @@ _Py_DisplaySourceLine(PyObject *f, PyObject *filename, int lineno, int indent,
  *  Traceback (most recent call last):
  *    File "/home/isidentical/cpython/cpython/t.py", line 10, in <module>
  *      add_values(1, 2, 'x', 3, 4)
- *      ^^^^^^^^^^^^^^^^^^^^^^^^^^^
  *    File "/home/isidentical/cpython/cpython/t.py", line 2, in add_values
  *      return a + b + c + d + e
  *             ~~~~~~^~~
@@ -736,7 +735,7 @@ print_error_location_carets(PyObject *f, int offset, Py_ssize_t start_offset, Py
     int special_chars = (left_end_offset != -1 || right_start_offset != -1);
     const char *str;
     while (++offset <= end_offset) {
-        if (offset <= start_offset || offset > end_offset) {
+        if (offset <= start_offset) {
             str = " ";
         } else if (special_chars && left_end_offset < offset && offset <= right_start_offset) {
             str = secondary;
@@ -792,6 +791,7 @@ tb_displayline(PyTracebackObject* tb, PyObject *f, PyObject *filename, int linen
 
     int code_offset = tb->tb_lasti;
     PyCodeObject* code = frame->f_frame->f_code;
+    const Py_ssize_t source_line_len = PyUnicode_GET_LENGTH(source_line);
 
     int start_line;
     int end_line;
@@ -813,7 +813,7 @@ tb_displayline(PyTracebackObject* tb, PyObject *f, PyObject *filename, int linen
     //
     //  ERROR LINE ERROR LINE ERROR LINE ERROR LINE ERROR LINE ERROR LINE ERROR LINE
     //        ~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^~~~~~~~~~~~~~~~~~~~
-    //        |              |-> left_end_offset     |                  |-> left_offset
+    //        |              |-> left_end_offset     |                  |-> end_offset
     //        |-> start_offset                       |-> right_start_offset
     //
     // In general we will only have (start_offset, end_offset) but we can gather more information
@@ -822,6 +822,9 @@ tb_displayline(PyTracebackObject* tb, PyObject *f, PyObject *filename, int linen
     // the different ranges (primary_error_char and secondary_error_char). If we cannot obtain the
     // AST information or we cannot identify special ranges within it, then left_end_offset and
     // right_end_offset will be set to -1.
+    //
+    // To keep the column indicators pertinent, they are not shown when the primary character
+    // spans the whole line.
 
     // Convert the utf-8 byte offset to the actual character offset so we print the right number of carets.
     assert(source_line);
@@ -859,7 +862,7 @@ tb_displayline(PyTracebackObject* tb, PyObject *f, PyObject *filename, int linen
             goto done;
         }
 
-        Py_ssize_t i = PyUnicode_GET_LENGTH(source_line);
+        Py_ssize_t i = source_line_len;
         while (--i >= 0) {
             if (!IS_WHITESPACE(source_line_str[i])) {
                 break;
@@ -869,6 +872,13 @@ tb_displayline(PyTracebackObject* tb, PyObject *f, PyObject *filename, int linen
         end_offset = i + 1;
     }
 
+    // Elide indicators if primary char spans the frame line
+    Py_ssize_t stripped_line_len = source_line_len - truncation - _TRACEBACK_SOURCE_LINE_INDENT;
+    bool has_secondary_ranges = (left_end_offset != -1 || right_start_offset != -1);
+    if (end_offset - start_offset == stripped_line_len && !has_secondary_ranges) {
+        goto done;
+    }
+
     if (_Py_WriteIndentedMargin(margin_indent, margin, f) < 0) {
         err = -1;
         goto done;


From webhook-mailer at python.org  Mon Jul 11 05:14:58 2022
From: webhook-mailer at python.org (iritkatriel)
Date: Mon, 11 Jul 2022 09:14:58 -0000
Subject: [Python-checkins] gh-87822: Make traceback module robust to
 exceptions from repr() of local values (GH-94691)
Message-ID: <mailman.7.1657530899.20440.python-checkins@python.org>

https://github.com/python/cpython/commit/46fc584b00f2ccee5b77d8fc525881def8670a02
commit: 46fc584b00f2ccee5b77d8fc525881def8670a02
branch: main
author: Simon-Martin Schr?der <martin.schroeder at nerdluecht.de>
committer: iritkatriel <1055913+iritkatriel at users.noreply.github.com>
date: 2022-07-11T10:14:15+01:00
summary:

gh-87822: Make traceback module robust to exceptions from repr() of local values (GH-94691)

files:
A Misc/NEWS.d/next/Library/2022-07-08-17-49-12.gh-issue-87822.F9dzkf.rst
M Doc/library/traceback.rst
M Lib/test/test_traceback.py
M Lib/traceback.py
M Misc/ACKS

diff --git a/Doc/library/traceback.rst b/Doc/library/traceback.rst
index a8412cc93d16f..8cb6af9bc840b 100644
--- a/Doc/library/traceback.rst
+++ b/Doc/library/traceback.rst
@@ -341,6 +341,10 @@ capture data for later printing in a lightweight fashion.
       local variables in each :class:`FrameSummary` are captured as object
       representations.
 
+      .. versionchanged:: 3.12
+         Exceptions raised from :func:`repr` on a local variable (when
+         *capture_locals* is ``True``) are no longer propagated to the caller.
+
    .. classmethod:: from_list(a_list)
 
       Construct a :class:`StackSummary` object from a supplied list of
diff --git a/Lib/test/test_traceback.py b/Lib/test/test_traceback.py
index f4161fbf0178d..602bd2cae0a96 100644
--- a/Lib/test/test_traceback.py
+++ b/Lib/test/test_traceback.py
@@ -2279,6 +2279,9 @@ def format_frame_summary(self, frame_summary):
             f'  File "{__file__}", line {lno}, in f\n    1/0\n'
         )
 
+class Unrepresentable:
+    def __repr__(self) -> str:
+        raise Exception("Unrepresentable")
 
 class TestTracebackException(unittest.TestCase):
 
@@ -2546,12 +2549,13 @@ def test_locals(self):
         linecache.updatecache('/foo.py', globals())
         e = Exception("uh oh")
         c = test_code('/foo.py', 'method')
-        f = test_frame(c, globals(), {'something': 1, 'other': 'string'})
+        f = test_frame(c, globals(), {'something': 1, 'other': 'string', 'unrepresentable': Unrepresentable()})
         tb = test_tb(f, 6, None, 0)
         exc = traceback.TracebackException(
             Exception, e, tb, capture_locals=True)
         self.assertEqual(
-            exc.stack[0].locals, {'something': '1', 'other': "'string'"})
+            exc.stack[0].locals,
+            {'something': '1', 'other': "'string'", 'unrepresentable': '<local repr() failed>'})
 
     def test_no_locals(self):
         linecache.updatecache('/foo.py', globals())
diff --git a/Lib/traceback.py b/Lib/traceback.py
index 55f8080044053..b1a5fd0a26d40 100644
--- a/Lib/traceback.py
+++ b/Lib/traceback.py
@@ -279,7 +279,8 @@ def __init__(self, filename, lineno, name, *, lookup_line=True,
         self._line = line
         if lookup_line:
             self.line
-        self.locals = {k: repr(v) for k, v in locals.items()} if locals else None
+        self.locals = {k: _safe_string(v, 'local', func=repr)
+            for k, v in locals.items()} if locals else None
         self.end_lineno = end_lineno
         self.colno = colno
         self.end_colno = end_colno
diff --git a/Misc/ACKS b/Misc/ACKS
index b6340414cf701..32475f874c36d 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -1590,6 +1590,7 @@ Ed Schouten
 Scott Schram
 Robin Schreiber
 Chad J. Schroeder
+Simon-Martin Schroeder
 Christian Schubert
 Sam Schulenburg
 Andreas Schwab
diff --git a/Misc/NEWS.d/next/Library/2022-07-08-17-49-12.gh-issue-87822.F9dzkf.rst b/Misc/NEWS.d/next/Library/2022-07-08-17-49-12.gh-issue-87822.F9dzkf.rst
new file mode 100644
index 0000000000000..7b27f5df45ba2
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2022-07-08-17-49-12.gh-issue-87822.F9dzkf.rst
@@ -0,0 +1 @@
+When called with ``capture_locals=True``, the :mod:`traceback` module functions swallow exceptions raised from calls to ``repr()`` on local variables of frames. This is in order to prioritize the original exception over rendering errors.  An indication of the failure is printed in place of the missing value.  (Patch by Simon-Martin Schroeder).


From webhook-mailer at python.org  Mon Jul 11 05:23:15 2022
From: webhook-mailer at python.org (pablogsal)
Date: Mon, 11 Jul 2022 09:23:15 -0000
Subject: [Python-checkins] gh-93883: Fix some tests involving traceback
 formatting (#94737)
Message-ID: <mailman.8.1657531397.20440.python-checkins@python.org>

https://github.com/python/cpython/commit/1fdc35ef519855e1b69addf43af74f3ac7f37a6f
commit: 1fdc35ef519855e1b69addf43af74f3ac7f37a6f
branch: main
author: John Belmonte <john at neggie.net>
committer: pablogsal <Pablogsal at gmail.com>
date: 2022-07-11T10:22:41+01:00
summary:

gh-93883: Fix some tests involving traceback formatting (#94737)

PR #93994 was merged without being rebased in a few weeks, and
some new test code using the old scheme passed through automatic merge.

files:
M Lib/test/test_traceback.py

diff --git a/Lib/test/test_traceback.py b/Lib/test/test_traceback.py
index 602bd2cae0a96..ef08b29c6d360 100644
--- a/Lib/test/test_traceback.py
+++ b/Lib/test/test_traceback.py
@@ -740,7 +740,6 @@ def f():
             f"Traceback (most recent call last):",
             f"  File \"{__file__}\", line {self.callable_line}, in get_exception",
             f"    callable()",
-            f"    ^^^^^^^^^^",
             f"  File \"{__file__}\", line {f.__code__.co_firstlineno + 2}, in f",
             f"    .method",
             f"     ^^^^^^",
@@ -757,10 +756,8 @@ def f():
             f"Traceback (most recent call last):",
             f"  File \"{__file__}\", line {self.callable_line}, in get_exception",
             f"    callable()",
-            f"    ^^^^^^^^^^",
             f"  File \"{__file__}\", line {f.__code__.co_firstlineno + 2}, in f",
             f"    method",
-            f"    ^^^^^^",
         ]
         self.assertEqual(actual, expected)
 
@@ -774,7 +771,6 @@ def f():
             f"Traceback (most recent call last):",
             f"  File \"{__file__}\", line {self.callable_line}, in get_exception",
             f"    callable()",
-            f"    ^^^^^^^^^^",
             f"  File \"{__file__}\", line {f.__code__.co_firstlineno + 2}, in f",
             f"    . method",
             f"      ^^^^^^",


From webhook-mailer at python.org  Mon Jul 11 07:27:43 2022
From: webhook-mailer at python.org (miss-islington)
Date: Mon, 11 Jul 2022 11:27:43 -0000
Subject: [Python-checkins] [3.11] gh-93883: elide traceback indicators when
 possible (GH-93994) (GH-94740)
Message-ID: <mailman.9.1657538864.20440.python-checkins@python.org>

https://github.com/python/cpython/commit/45896f2a02f02f296d14cccd6959179ccd47e410
commit: 45896f2a02f02f296d14cccd6959179ccd47e410
branch: 3.11
author: John Belmonte <john at neggie.net>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-11T04:27:29-07:00
summary:

[3.11] gh-93883: elide traceback indicators when possible (GH-93994) (GH-94740)



Elide traceback column indicators when the entire line of the
frame is implicated.  This reduces traceback length and draws
more attention to the remaining (very relevant) indicators.

Example:
```
Traceback (most recent call last):
  File "query.py", line 99, in <module>
    bar()
  File "query.py", line 66, in bar
    foo()
  File "query.py", line 37, in foo
    magic_arithmetic('foo')
  File "query.py", line 18, in magic_arithmetic
    return add_counts(x) / 25
           ^^^^^^^^^^^^^
  File "query.py", line 24, in add_counts
    return 25 + query_user(user1) + query_user(user2)
                ^^^^^^^^^^^^^^^^^
  File "query.py", line 32, in query_user
    return 1 + query_count(db, response['a']['b']['c']['user'], retry=True)
                               ~~~~~~~~~~~~~~~~~~^^^^^
TypeError: 'NoneType' object is not subscriptable
```

Automerge-Triggered-By: GH:pablogsal

files:
A Misc/NEWS.d/next/Core and Builtins/2022-06-24-14-06-20.gh-issue-93883.8jVQQ4.rst
M Doc/library/traceback.rst
M Doc/whatsnew/3.11.rst
M Lib/idlelib/idle_test/test_run.py
M Lib/test/test_cmd_line_script.py
M Lib/test/test_doctest.py
M Lib/test/test_traceback.py
M Lib/traceback.py
M Python/traceback.c

diff --git a/Doc/library/traceback.rst b/Doc/library/traceback.rst
index 796309c6cf0bb..a8412cc93d16f 100644
--- a/Doc/library/traceback.rst
+++ b/Doc/library/traceback.rst
@@ -464,32 +464,27 @@ The output for the example would look similar to this:
    *** print_tb:
      File "<doctest...>", line 10, in <module>
        lumberjack()
-       ^^^^^^^^^^^^
    *** print_exception:
    Traceback (most recent call last):
      File "<doctest...>", line 10, in <module>
        lumberjack()
-       ^^^^^^^^^^^^
      File "<doctest...>", line 4, in lumberjack
        bright_side_of_death()
-       ^^^^^^^^^^^^^^^^^^^^^^
    IndexError: tuple index out of range
    *** print_exc:
    Traceback (most recent call last):
      File "<doctest...>", line 10, in <module>
        lumberjack()
-       ^^^^^^^^^^^^
      File "<doctest...>", line 4, in lumberjack
        bright_side_of_death()
-       ^^^^^^^^^^^^^^^^^^^^^^
    IndexError: tuple index out of range
    *** format_exc, first and last line:
    Traceback (most recent call last):
    IndexError: tuple index out of range
    *** format_exception:
    ['Traceback (most recent call last):\n',
-    '  File "<doctest default[0]>", line 10, in <module>\n    lumberjack()\n    ^^^^^^^^^^^^\n',
-    '  File "<doctest default[0]>", line 4, in lumberjack\n    bright_side_of_death()\n    ^^^^^^^^^^^^^^^^^^^^^^\n',
+    '  File "<doctest default[0]>", line 10, in <module>\n    lumberjack()\n',
+    '  File "<doctest default[0]>", line 4, in lumberjack\n    bright_side_of_death()\n',
     '  File "<doctest default[0]>", line 7, in bright_side_of_death\n    return tuple()[0]\n           ~~~~~~~^^^\n',
     'IndexError: tuple index out of range\n']
    *** extract_tb:
@@ -497,8 +492,8 @@ The output for the example would look similar to this:
     <FrameSummary file <doctest...>, line 4 in lumberjack>,
     <FrameSummary file <doctest...>, line 7 in bright_side_of_death>]
    *** format_tb:
-   ['  File "<doctest default[0]>", line 10, in <module>\n    lumberjack()\n    ^^^^^^^^^^^^\n',
-    '  File "<doctest default[0]>", line 4, in lumberjack\n    bright_side_of_death()\n    ^^^^^^^^^^^^^^^^^^^^^^\n',
+   ['  File "<doctest default[0]>", line 10, in <module>\n    lumberjack()\n',
+    '  File "<doctest default[0]>", line 4, in lumberjack\n    bright_side_of_death()\n',
     '  File "<doctest default[0]>", line 7, in bright_side_of_death\n    return tuple()[0]\n           ~~~~~~~^^^\n']
    *** tb_lineno: 10
 
diff --git a/Doc/whatsnew/3.11.rst b/Doc/whatsnew/3.11.rst
index 97ad5b3fd5ca6..a5b9c31afac25 100644
--- a/Doc/whatsnew/3.11.rst
+++ b/Doc/whatsnew/3.11.rst
@@ -117,7 +117,6 @@ when dealing with deeply nested dictionary objects and multiple function calls,
     Traceback (most recent call last):
       File "query.py", line 37, in <module>
         magic_arithmetic('foo')
-        ^^^^^^^^^^^^^^^^^^^^^^^
       File "query.py", line 18, in magic_arithmetic
         return add_counts(x) / 25
                ^^^^^^^^^^^^^
diff --git a/Lib/idlelib/idle_test/test_run.py b/Lib/idlelib/idle_test/test_run.py
index d859ffc153fcd..ec4637c5ca617 100644
--- a/Lib/idlelib/idle_test/test_run.py
+++ b/Lib/idlelib/idle_test/test_run.py
@@ -3,7 +3,7 @@
 from idlelib import run
 import io
 import sys
-from test.support import captured_output, captured_stderr, has_no_debug_ranges
+from test.support import captured_output, captured_stderr
 import unittest
 from unittest import mock
 import idlelib
@@ -33,14 +33,9 @@ def __eq__(self, other):
                         run.print_exception()
 
         tb = output.getvalue().strip().splitlines()
-        if has_no_debug_ranges():
-            self.assertEqual(11, len(tb))
-            self.assertIn('UnhashableException: ex2', tb[3])
-            self.assertIn('UnhashableException: ex1', tb[10])
-        else:
-            self.assertEqual(13, len(tb))
-            self.assertIn('UnhashableException: ex2', tb[4])
-            self.assertIn('UnhashableException: ex1', tb[12])
+        self.assertEqual(11, len(tb))
+        self.assertIn('UnhashableException: ex2', tb[3])
+        self.assertIn('UnhashableException: ex1', tb[10])
 
     data = (('1/0', ZeroDivisionError, "division by zero\n"),
             ('abc', NameError, "name 'abc' is not defined. "
diff --git a/Lib/test/test_cmd_line_script.py b/Lib/test/test_cmd_line_script.py
index d783af65839ad..9e98edf2146ca 100644
--- a/Lib/test/test_cmd_line_script.py
+++ b/Lib/test/test_cmd_line_script.py
@@ -549,10 +549,10 @@ def test_pep_409_verbiage(self):
             script_name = _make_test_script(script_dir, 'script', script)
             exitcode, stdout, stderr = assert_python_failure(script_name)
             text = stderr.decode('ascii').split('\n')
-            self.assertEqual(len(text), 6)
+            self.assertEqual(len(text), 5)
             self.assertTrue(text[0].startswith('Traceback'))
             self.assertTrue(text[1].startswith('  File '))
-            self.assertTrue(text[4].startswith('NameError'))
+            self.assertTrue(text[3].startswith('NameError'))
 
     def test_non_ascii(self):
         # Mac OS X denies the creation of a file with an invalid UTF-8 name.
diff --git a/Lib/test/test_doctest.py b/Lib/test/test_doctest.py
index a4aab6cf4db3b..00aeacddc12ca 100644
--- a/Lib/test/test_doctest.py
+++ b/Lib/test/test_doctest.py
@@ -2854,7 +2854,7 @@ def test_testmod(): r"""
     # Skip the test: the filesystem encoding is unable to encode the filename
     supports_unicode = False
 
-if supports_unicode and not support.has_no_debug_ranges():
+if supports_unicode:
     def test_unicode(): """
 Check doctest with a non-ascii filename:
 
@@ -2876,10 +2876,8 @@ def test_unicode(): """
         Traceback (most recent call last):
           File ...
             exec(compile(example.source, filename, "single",
-            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
           File "<doctest foo-b?r at baz[0]>", line 1, in <module>
             raise Exception('cl?')
-            ^^^^^^^^^^^^^^^^^^^^^^
         Exception: cl?
     TestResults(failed=1, attempted=1)
     """
diff --git a/Lib/test/test_traceback.py b/Lib/test/test_traceback.py
index 40d5a84f92d99..94ccc3f48d3ea 100644
--- a/Lib/test/test_traceback.py
+++ b/Lib/test/test_traceback.py
@@ -253,7 +253,7 @@ def do_test(firstlines, message, charset, lineno):
             self.assertTrue(stdout[2].endswith(err_line),
                 "Invalid traceback line: {0!r} instead of {1!r}".format(
                     stdout[2], err_line))
-            actual_err_msg = stdout[3 if has_no_debug_ranges() else 4]
+            actual_err_msg = stdout[3]
             self.assertTrue(actual_err_msg == err_msg,
                 "Invalid error message: {0!r} instead of {1!r}".format(
                     actual_err_msg, err_msg))
@@ -387,18 +387,19 @@ def get_exception(self, callable):
     callable_line = get_exception.__code__.co_firstlineno + 2
 
     def test_basic_caret(self):
+        # NOTE: In caret tests, "if True:" is used as a way to force indicator
+        #   display, since the raising expression spans only part of the line.
         def f():
-            raise ValueError("basic caret tests")
+            if True: raise ValueError("basic caret tests")
 
         lineno_f = f.__code__.co_firstlineno
         expected_f = (
             'Traceback (most recent call last):\n'
             f'  File "{__file__}", line {self.callable_line}, in get_exception\n'
             '    callable()\n'
-            '    ^^^^^^^^^^\n'
             f'  File "{__file__}", line {lineno_f+1}, in f\n'
-            '    raise ValueError("basic caret tests")\n'
-            '    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n'
+            '    if True: raise ValueError("basic caret tests")\n'
+            '             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n'
         )
         result_lines = self.get_exception(f)
         self.assertEqual(result_lines, expected_f.splitlines())
@@ -407,17 +408,16 @@ def test_line_with_unicode(self):
         # Make sure that even if a line contains multi-byte unicode characters
         # the correct carets are printed.
         def f_with_unicode():
-            raise ValueError("?ell? W?rld")
+            if True: raise ValueError("?ell? W?rld")
 
         lineno_f = f_with_unicode.__code__.co_firstlineno
         expected_f = (
             'Traceback (most recent call last):\n'
             f'  File "{__file__}", line {self.callable_line}, in get_exception\n'
             '    callable()\n'
-            '    ^^^^^^^^^^\n'
             f'  File "{__file__}", line {lineno_f+1}, in f_with_unicode\n'
-            '    raise ValueError("?ell? W?rld")\n'
-            '    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n'
+            '    if True: raise ValueError("?ell? W?rld")\n'
+            '             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n'
         )
         result_lines = self.get_exception(f_with_unicode)
         self.assertEqual(result_lines, expected_f.splitlines())
@@ -432,7 +432,6 @@ def foo(a: THIS_DOES_NOT_EXIST ) -> int:
             'Traceback (most recent call last):\n'
             f'  File "{__file__}", line {self.callable_line}, in get_exception\n'
             '    callable()\n'
-            '    ^^^^^^^^^^\n'
             f'  File "{__file__}", line {lineno_f+1}, in f_with_type\n'
             '    def foo(a: THIS_DOES_NOT_EXIST ) -> int:\n'
             '               ^^^^^^^^^^^^^^^^^^^\n'
@@ -444,7 +443,7 @@ def test_caret_multiline_expression(self):
         # Make sure no carets are printed for expressions spanning multiple
         # lines.
         def f_with_multiline():
-            raise ValueError(
+            if True: raise ValueError(
                 "error over multiple lines"
             )
 
@@ -453,10 +452,9 @@ def f_with_multiline():
             'Traceback (most recent call last):\n'
             f'  File "{__file__}", line {self.callable_line}, in get_exception\n'
             '    callable()\n'
-            '    ^^^^^^^^^^\n'
             f'  File "{__file__}", line {lineno_f+1}, in f_with_multiline\n'
-            '    raise ValueError(\n'
-            '    ^^^^^^^^^^^^^^^^^'
+            '    if True: raise ValueError(\n'
+            '             ^^^^^^^^^^^^^^^^^'
         )
         result_lines = self.get_exception(f_with_multiline)
         self.assertEqual(result_lines, expected_f.splitlines())
@@ -485,7 +483,6 @@ def f_with_multiline():
             'Traceback (most recent call last):\n'
             f'  File "{__file__}", line {self.callable_line}, in get_exception\n'
             '    callable()\n'
-            '    ^^^^^^^^^^\n'
             f'  File "{__file__}", line {lineno_f+2}, in f_with_multiline\n'
             '    return compile(code, "?", "exec")\n'
             '           ^^^^^^^^^^^^^^^^^^^^^^^^^^\n'
@@ -502,9 +499,8 @@ def test_caret_multiline_expression_bin_op(self):
         # lines.
         def f_with_multiline():
             return (
-                1 /
-                0 +
-                2
+                2 + 1 /
+                0
             )
 
         lineno_f = f_with_multiline.__code__.co_firstlineno
@@ -512,10 +508,9 @@ def f_with_multiline():
             'Traceback (most recent call last):\n'
             f'  File "{__file__}", line {self.callable_line}, in get_exception\n'
             '    callable()\n'
-            '    ^^^^^^^^^^\n'
             f'  File "{__file__}", line {lineno_f+2}, in f_with_multiline\n'
-            '    1 /\n'
-            '    ^^^'
+            '    2 + 1 /\n'
+            '        ^^^'
         )
         result_lines = self.get_exception(f_with_multiline)
         self.assertEqual(result_lines, expected_f.splitlines())
@@ -530,7 +525,6 @@ def f_with_binary_operator():
             'Traceback (most recent call last):\n'
             f'  File "{__file__}", line {self.callable_line}, in get_exception\n'
             '    callable()\n'
-            '    ^^^^^^^^^^\n'
             f'  File "{__file__}", line {lineno_f+2}, in f_with_binary_operator\n'
             '    return 10 + divisor / 0 + 30\n'
             '                ~~~~~~~~^~~\n'
@@ -548,7 +542,6 @@ def f_with_binary_operator():
             'Traceback (most recent call last):\n'
             f'  File "{__file__}", line {self.callable_line}, in get_exception\n'
             '    callable()\n'
-            '    ^^^^^^^^^^\n'
             f'  File "{__file__}", line {lineno_f+2}, in f_with_binary_operator\n'
             '    return 10 + divisor // 0 + 30\n'
             '                ~~~~~~~~^^~~\n'
@@ -566,7 +559,6 @@ def f_with_subscript():
             'Traceback (most recent call last):\n'
             f'  File "{__file__}", line {self.callable_line}, in get_exception\n'
             '    callable()\n'
-            '    ^^^^^^^^^^\n'
             f'  File "{__file__}", line {lineno_f+2}, in f_with_subscript\n'
             "    return some_dict['x']['y']['z']\n"
             '           ~~~~~~~~~~~~~~~~~~~^^^^^\n'
@@ -590,7 +582,6 @@ def test_traceback_specialization_with_syntax_error(self):
             'Traceback (most recent call last):\n'
             f'  File "{__file__}", line {self.callable_line}, in get_exception\n'
             '    callable()\n'
-            '    ^^^^^^^^^^\n'
             f'  File "{TESTFN}", line {lineno_f}, in <module>\n'
             "    1 $ 0 / 1 / 2\n"
             '    ^^^^^\n'
@@ -598,7 +589,7 @@ def test_traceback_specialization_with_syntax_error(self):
         self.assertEqual(result_lines, expected_error.splitlines())
 
     def test_traceback_very_long_line(self):
-        source = "a" * 256
+        source = "if True: " + "a" * 256
         bytecode = compile(source, TESTFN, "exec")
 
         with open(TESTFN, "w") as file:
@@ -613,13 +604,54 @@ def test_traceback_very_long_line(self):
             'Traceback (most recent call last):\n'
             f'  File "{__file__}", line {self.callable_line}, in get_exception\n'
             '    callable()\n'
-            '    ^^^^^^^^^^\n'
             f'  File "{TESTFN}", line {lineno_f}, in <module>\n'
             f'    {source}\n'
-            f'    {"^"*len(source)}\n'
+            f'    {" "*len("if True: ") + "^"*256}\n'
         )
         self.assertEqual(result_lines, expected_error.splitlines())
 
+    def test_secondary_caret_not_elided(self):
+        # Always show a line's indicators if they include the secondary character.
+        def f_with_subscript():
+            some_dict = {'x': {'y': None}}
+            some_dict['x']['y']['z']
+
+        lineno_f = f_with_subscript.__code__.co_firstlineno
+        expected_error = (
+            'Traceback (most recent call last):\n'
+            f'  File "{__file__}", line {self.callable_line}, in get_exception\n'
+            '    callable()\n'
+            f'  File "{__file__}", line {lineno_f+2}, in f_with_subscript\n'
+            "    some_dict['x']['y']['z']\n"
+            '    ~~~~~~~~~~~~~~~~~~~^^^^^\n'
+        )
+        result_lines = self.get_exception(f_with_subscript)
+        self.assertEqual(result_lines, expected_error.splitlines())
+
+    def test_caret_exception_group(self):
+        # Notably, this covers whether indicators handle margin strings correctly.
+        # (Exception groups use margin strings to display vertical indicators.)
+        # The implementation must account for both "indent" and "margin" offsets.
+
+        def exc():
+            if True: raise ExceptionGroup("eg", [ValueError(1), TypeError(2)])
+
+        expected_error = (
+             f'  + Exception Group Traceback (most recent call last):\n'
+             f'  |   File "{__file__}", line {self.callable_line}, in get_exception\n'
+             f'  |     callable()\n'
+             f'  |   File "{__file__}", line {exc.__code__.co_firstlineno + 1}, in exc\n'
+             f'  |     if True: raise ExceptionGroup("eg", [ValueError(1), TypeError(2)])\n'
+             f'  |              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n'
+             f'  | ExceptionGroup: eg (2 sub-exceptions)\n'
+             f'  +-+---------------- 1 ----------------\n'
+             f'    | ValueError: 1\n'
+             f'    +---------------- 2 ----------------\n'
+             f'    | TypeError: 2\n')
+
+        result_lines = self.get_exception(exc)
+        self.assertEqual(result_lines, expected_error.splitlines())
+
     def assertSpecialized(self, func, expected_specialization):
         result_lines = self.get_exception(func)
         specialization_line = result_lines[-1]
@@ -673,13 +705,11 @@ def g(): pass
             'Traceback (most recent call last):\n'
             f'  File "{__file__}", line {self.callable_line}, in get_exception\n'
             '    callable()\n'
-            '    ^^^^^^^^^^\n'
             f'  File "{__file__}", line {lineno_applydescs + 1}, in applydecs\n'
             '    @dec_error\n'
             '     ^^^^^^^^^\n'
             f'  File "{__file__}", line {lineno_dec_error + 1}, in dec_error\n'
             '    raise TypeError\n'
-            '    ^^^^^^^^^^^^^^^\n'
         )
         self.assertEqual(result_lines, expected_error.splitlines())
 
@@ -693,13 +723,11 @@ class A: pass
             'Traceback (most recent call last):\n'
             f'  File "{__file__}", line {self.callable_line}, in get_exception\n'
             '    callable()\n'
-            '    ^^^^^^^^^^\n'
             f'  File "{__file__}", line {lineno_applydescs_class + 1}, in applydecs_class\n'
             '    @dec_error\n'
             '     ^^^^^^^^^\n'
             f'  File "{__file__}", line {lineno_dec_error + 1}, in dec_error\n'
             '    raise TypeError\n'
-            '    ^^^^^^^^^^^^^^^\n'
         )
         self.assertEqual(result_lines, expected_error.splitlines())
 
@@ -713,7 +741,6 @@ def f():
             f"Traceback (most recent call last):",
             f"  File \"{__file__}\", line {self.callable_line}, in get_exception",
             f"    callable()",
-            f"    ^^^^^^^^^^",
             f"  File \"{__file__}\", line {f.__code__.co_firstlineno + 2}, in f",
             f"    .method",
             f"     ^^^^^^",
@@ -730,10 +757,8 @@ def f():
             f"Traceback (most recent call last):",
             f"  File \"{__file__}\", line {self.callable_line}, in get_exception",
             f"    callable()",
-            f"    ^^^^^^^^^^",
             f"  File \"{__file__}\", line {f.__code__.co_firstlineno + 2}, in f",
             f"    method",
-            f"    ^^^^^^",
         ]
         self.assertEqual(actual, expected)
 
@@ -747,7 +772,6 @@ def f():
             f"Traceback (most recent call last):",
             f"  File \"{__file__}\", line {self.callable_line}, in get_exception",
             f"    callable()",
-            f"    ^^^^^^^^^^",
             f"  File \"{__file__}\", line {f.__code__.co_firstlineno + 2}, in f",
             f"    . method",
             f"      ^^^^^^",
@@ -817,12 +841,8 @@ def check_traceback_format(self, cleanup_func=None):
         # Make sure that the traceback is properly indented.
         tb_lines = python_fmt.splitlines()
         banner = tb_lines[0]
-        if has_no_debug_ranges():
-            self.assertEqual(len(tb_lines), 5)
-            location, source_line = tb_lines[-2], tb_lines[-1]
-        else:
-            self.assertEqual(len(tb_lines), 7)
-            location, source_line = tb_lines[-3], tb_lines[-2]
+        self.assertEqual(len(tb_lines), 5)
+        location, source_line = tb_lines[-2], tb_lines[-1]
         self.assertTrue(banner.startswith('Traceback'))
         self.assertTrue(location.startswith('  File'))
         self.assertTrue(source_line.startswith('    raise'))
@@ -886,16 +906,12 @@ def f():
             'Traceback (most recent call last):\n'
             f'  File "{__file__}", line {lineno_f+5}, in _check_recursive_traceback_display\n'
             '    f()\n'
-            '    ^^^\n'
             f'  File "{__file__}", line {lineno_f+1}, in f\n'
             '    f()\n'
-            '    ^^^\n'
             f'  File "{__file__}", line {lineno_f+1}, in f\n'
             '    f()\n'
-            '    ^^^\n'
             f'  File "{__file__}", line {lineno_f+1}, in f\n'
             '    f()\n'
-            '    ^^^\n'
             # XXX: The following line changes depending on whether the tests
             # are run through the interactive interpreter or with -m
             # It also varies depending on the platform (stack size)
@@ -946,14 +962,12 @@ def g(count=10):
             '  [Previous line repeated 7 more times]\n'
             f'  File "{__file__}", line {lineno_g+3}, in g\n'
             '    raise ValueError\n'
-            '    ^^^^^^^^^^^^^^^^\n'
             'ValueError\n'
         )
         tb_line = (
             'Traceback (most recent call last):\n'
             f'  File "{__file__}", line {lineno_g+7}, in _check_recursive_traceback_display\n'
             '    g()\n'
-            '    ^^^\n'
         )
         expected = (tb_line + result_g).splitlines()
         actual = stderr_g.getvalue().splitlines()
@@ -978,7 +992,6 @@ def h(count=10):
             'Traceback (most recent call last):\n'
             f'  File "{__file__}", line {lineno_h+7}, in _check_recursive_traceback_display\n'
             '    h()\n'
-            '    ^^^\n'
             f'  File "{__file__}", line {lineno_h+2}, in h\n'
             '    return h(count-1)\n'
             '           ^^^^^^^^^^\n'
@@ -991,7 +1004,6 @@ def h(count=10):
             '  [Previous line repeated 7 more times]\n'
             f'  File "{__file__}", line {lineno_h+3}, in h\n'
             '    g()\n'
-            '    ^^^\n'
         )
         expected = (result_h + result_g).splitlines()
         actual = stderr_h.getvalue().splitlines()
@@ -1017,14 +1029,12 @@ def h(count=10):
             '           ^^^^^^^^^^\n'
             f'  File "{__file__}", line {lineno_g+3}, in g\n'
             '    raise ValueError\n'
-            '    ^^^^^^^^^^^^^^^^\n'
             'ValueError\n'
         )
         tb_line = (
             'Traceback (most recent call last):\n'
-            f'  File "{__file__}", line {lineno_g+81}, in _check_recursive_traceback_display\n'
+            f'  File "{__file__}", line {lineno_g+77}, in _check_recursive_traceback_display\n'
             '    g(traceback._RECURSIVE_CUTOFF)\n'
-            '    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n'
         )
         expected = (tb_line + result_g).splitlines()
         actual = stderr_g.getvalue().splitlines()
@@ -1051,14 +1061,12 @@ def h(count=10):
             '  [Previous line repeated 1 more time]\n'
             f'  File "{__file__}", line {lineno_g+3}, in g\n'
             '    raise ValueError\n'
-            '    ^^^^^^^^^^^^^^^^\n'
             'ValueError\n'
         )
         tb_line = (
             'Traceback (most recent call last):\n'
-            f'  File "{__file__}", line {lineno_g+114}, in _check_recursive_traceback_display\n'
+            f'  File "{__file__}", line {lineno_g+108}, in _check_recursive_traceback_display\n'
             '    g(traceback._RECURSIVE_CUTOFF + 1)\n'
-            '    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n'
         )
         expected = (tb_line + result_g).splitlines()
         actual = stderr_g.getvalue().splitlines()
@@ -1111,16 +1119,10 @@ def __eq__(self, other):
             exception_print(exc_val)
 
         tb = stderr_f.getvalue().strip().splitlines()
-        if has_no_debug_ranges():
-            self.assertEqual(11, len(tb))
-            self.assertEqual(context_message.strip(), tb[5])
-            self.assertIn('UnhashableException: ex2', tb[3])
-            self.assertIn('UnhashableException: ex1', tb[10])
-        else:
-            self.assertEqual(13, len(tb))
-            self.assertEqual(context_message.strip(), tb[6])
-            self.assertIn('UnhashableException: ex2', tb[4])
-            self.assertIn('UnhashableException: ex1', tb[12])
+        self.assertEqual(11, len(tb))
+        self.assertEqual(context_message.strip(), tb[5])
+        self.assertIn('UnhashableException: ex2', tb[3])
+        self.assertIn('UnhashableException: ex1', tb[10])
 
     def deep_eg(self):
         e = TypeError(1)
@@ -1256,12 +1258,8 @@ def test_context_suppression(self):
         except ZeroDivisionError as _:
             e = _
         lines = self.get_report(e).splitlines()
-        if has_no_debug_ranges():
-            self.assertEqual(len(lines), 4)
-            self.assertTrue(lines[3].startswith('ZeroDivisionError'))
-        else:
-            self.assertEqual(len(lines), 5)
-            self.assertTrue(lines[4].startswith('ZeroDivisionError'))
+        self.assertEqual(len(lines), 4)
+        self.assertTrue(lines[3].startswith('ZeroDivisionError'))
         self.assertTrue(lines[0].startswith('Traceback'))
         self.assertTrue(lines[1].startswith('  File'))
         self.assertIn('ZeroDivisionError from None', lines[2])
@@ -1511,10 +1509,8 @@ def exc():
              f'  + Exception Group Traceback (most recent call last):\n'
              f'  |   File "{__file__}", line {self.callable_line}, in get_exception\n'
              f'  |     exception_or_callable()\n'
-             f'  |     ^^^^^^^^^^^^^^^^^^^^^^^\n'
              f'  |   File "{__file__}", line {exc.__code__.co_firstlineno + 1}, in exc\n'
              f'  |     raise ExceptionGroup("eg", [ValueError(1), TypeError(2)])\n'
-             f'  |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n'
              f'  | ExceptionGroup: eg (2 sub-exceptions)\n'
              f'  +-+---------------- 1 ----------------\n'
              f'    | ValueError: 1\n'
@@ -1536,7 +1532,6 @@ def exc():
         expected = (f'  + Exception Group Traceback (most recent call last):\n'
                     f'  |   File "{__file__}", line {exc.__code__.co_firstlineno + 3}, in exc\n'
                     f'  |     raise EG("eg1", [ValueError(1), TypeError(2)])\n'
-                    f'  |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n'
                     f'  | ExceptionGroup: eg1 (2 sub-exceptions)\n'
                     f'  +-+---------------- 1 ----------------\n'
                     f'    | ValueError: 1\n'
@@ -1549,10 +1544,8 @@ def exc():
                     f'  + Exception Group Traceback (most recent call last):\n'
                     f'  |   File "{__file__}", line {self.callable_line}, in get_exception\n'
                     f'  |     exception_or_callable()\n'
-                    f'  |     ^^^^^^^^^^^^^^^^^^^^^^^\n'
                     f'  |   File "{__file__}", line {exc.__code__.co_firstlineno + 5}, in exc\n'
                     f'  |     raise EG("eg2", [ValueError(3), TypeError(4)]) from e\n'
-                    f'  |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n'
                     f'  | ExceptionGroup: eg2 (2 sub-exceptions)\n'
                     f'  +-+---------------- 1 ----------------\n'
                     f'    | ValueError: 3\n'
@@ -1578,7 +1571,6 @@ def exc():
              f'  + Exception Group Traceback (most recent call last):\n'
              f'  |   File "{__file__}", line {exc.__code__.co_firstlineno + 4}, in exc\n'
              f'  |     raise EG("eg1", [ValueError(1), TypeError(2)])\n'
-             f'  |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n'
              f'  | ExceptionGroup: eg1 (2 sub-exceptions)\n'
              f'  +-+---------------- 1 ----------------\n'
              f'    | ValueError: 1\n'
@@ -1591,7 +1583,6 @@ def exc():
              f'  + Exception Group Traceback (most recent call last):\n'
              f'  |   File "{__file__}", line {exc.__code__.co_firstlineno + 6}, in exc\n'
              f'  |     raise EG("eg2", [ValueError(3), TypeError(4)])\n'
-             f'  |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n'
              f'  | ExceptionGroup: eg2 (2 sub-exceptions)\n'
              f'  +-+---------------- 1 ----------------\n'
              f'    | ValueError: 3\n'
@@ -1604,10 +1595,8 @@ def exc():
              f'Traceback (most recent call last):\n'
              f'  File "{__file__}", line {self.callable_line}, in get_exception\n'
              f'    exception_or_callable()\n'
-             f'    ^^^^^^^^^^^^^^^^^^^^^^^\n'
              f'  File "{__file__}", line {exc.__code__.co_firstlineno + 8}, in exc\n'
              f'    raise ImportError(5)\n'
-             f'    ^^^^^^^^^^^^^^^^^^^^\n'
              f'ImportError: 5\n')
 
         report = self.get_report(exc)
@@ -1630,7 +1619,6 @@ def exc():
         expected = (f'  + Exception Group Traceback (most recent call last):\n'
                     f'  |   File "{__file__}", line {exc.__code__.co_firstlineno + 9}, in exc\n'
                     f'  |     raise EG("eg", [VE(1), exc, VE(4)])\n'
-                    f'  |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n'
                     f'  | ExceptionGroup: eg (3 sub-exceptions)\n'
                     f'  +-+---------------- 1 ----------------\n'
                     f'    | ValueError: 1\n'
@@ -1638,7 +1626,6 @@ def exc():
                     f'    | Exception Group Traceback (most recent call last):\n'
                     f'    |   File "{__file__}", line {exc.__code__.co_firstlineno + 6}, in exc\n'
                     f'    |     raise EG("nested", [TE(2), TE(3)])\n'
-                    f'    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n'
                     f'    | ExceptionGroup: nested (2 sub-exceptions)\n'
                     f'    +-+---------------- 1 ----------------\n'
                     f'      | TypeError: 2\n'
@@ -1654,10 +1641,8 @@ def exc():
                     f'  + Exception Group Traceback (most recent call last):\n'
                     f'  |   File "{__file__}", line {self.callable_line}, in get_exception\n'
                     f'  |     exception_or_callable()\n'
-                    f'  |     ^^^^^^^^^^^^^^^^^^^^^^^\n'
                     f'  |   File "{__file__}", line {exc.__code__.co_firstlineno + 11}, in exc\n'
                     f'  |     raise EG("top", [VE(5)])\n'
-                    f'  |     ^^^^^^^^^^^^^^^^^^^^^^^^\n'
                     f'  | ExceptionGroup: top (1 sub-exception)\n'
                     f'  +-+---------------- 1 ----------------\n'
                     f'    | ValueError: 5\n'
@@ -1815,10 +1800,8 @@ def exc():
         expected = (f'  + Exception Group Traceback (most recent call last):\n'
                     f'  |   File "{__file__}", line {self.callable_line}, in get_exception\n'
                     f'  |     exception_or_callable()\n'
-                    f'  |     ^^^^^^^^^^^^^^^^^^^^^^^\n'
                     f'  |   File "{__file__}", line {exc.__code__.co_firstlineno + 9}, in exc\n'
                     f'  |     raise ExceptionGroup("nested", excs)\n'
-                    f'  |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n'
                     f'  | ExceptionGroup: nested (2 sub-exceptions)\n'
                     f'  | >> Multi line note\n'
                     f'  | >> Because I am such\n'
@@ -1830,14 +1813,12 @@ def exc():
                     f'    | Traceback (most recent call last):\n'
                     f'    |   File "{__file__}", line {exc.__code__.co_firstlineno + 5}, in exc\n'
                     f'    |     raise ValueError(msg)\n'
-                    f'    |     ^^^^^^^^^^^^^^^^^^^^^\n'
                     f'    | ValueError: bad value\n'
                     f'    | the bad value\n'
                     f'    +---------------- 2 ----------------\n'
                     f'    | Traceback (most recent call last):\n'
                     f'    |   File "{__file__}", line {exc.__code__.co_firstlineno + 5}, in exc\n'
                     f'    |     raise ValueError(msg)\n'
-                    f'    |     ^^^^^^^^^^^^^^^^^^^^^\n'
                     f'    | ValueError: terrible value\n'
                     f'    | the terrible value\n'
                     f'    +------------------------------------\n')
@@ -1870,10 +1851,8 @@ def exc():
         expected = (f'  + Exception Group Traceback (most recent call last):\n'
                     f'  |   File "{__file__}", line {self.callable_line}, in get_exception\n'
                     f'  |     exception_or_callable()\n'
-                    f'  |     ^^^^^^^^^^^^^^^^^^^^^^^\n'
                     f'  |   File "{__file__}", line {exc.__code__.co_firstlineno + 10}, in exc\n'
                     f'  |     raise ExceptionGroup("nested", excs)\n'
-                    f'  |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n'
                     f'  | ExceptionGroup: nested (2 sub-exceptions)\n'
                     f'  | >> Multi line note\n'
                     f'  | >> Because I am such\n'
@@ -1886,7 +1865,6 @@ def exc():
                     f'    | Traceback (most recent call last):\n'
                     f'    |   File "{__file__}", line {exc.__code__.co_firstlineno + 5}, in exc\n'
                     f'    |     raise ValueError(msg)\n'
-                    f'    |     ^^^^^^^^^^^^^^^^^^^^^\n'
                     f'    | ValueError: bad value\n'
                     f'    | the bad value\n'
                     f'    | Goodbye bad value\n'
@@ -1894,7 +1872,6 @@ def exc():
                     f'    | Traceback (most recent call last):\n'
                     f'    |   File "{__file__}", line {exc.__code__.co_firstlineno + 5}, in exc\n'
                     f'    |     raise ValueError(msg)\n'
-                    f'    |     ^^^^^^^^^^^^^^^^^^^^^\n'
                     f'    | ValueError: terrible value\n'
                     f'    | the terrible value\n'
                     f'    | Goodbye terrible value\n'
@@ -2670,19 +2647,16 @@ def test_exception_group_format(self):
                     f'  + Exception Group Traceback (most recent call last):',
                     f'  |   File "{__file__}", line {lno_g+23}, in _get_exception_group',
                     f'  |     raise ExceptionGroup("eg2", [exc3, exc4])',
-                    f'  |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^',
                     f'  | ExceptionGroup: eg2 (2 sub-exceptions)',
                     f'  +-+---------------- 1 ----------------',
                     f'    | Exception Group Traceback (most recent call last):',
                     f'    |   File "{__file__}", line {lno_g+16}, in _get_exception_group',
                     f'    |     raise ExceptionGroup("eg1", [exc1, exc2])',
-                    f'    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^',
                     f'    | ExceptionGroup: eg1 (2 sub-exceptions)',
                     f'    +-+---------------- 1 ----------------',
                     f'      | Traceback (most recent call last):',
                     f'      |   File "{__file__}", line {lno_g+9}, in _get_exception_group',
                     f'      |     f()',
-                    f'      |     ^^^',
                     f'      |   File "{__file__}", line {lno_f+1}, in f',
                     f'      |     1/0',
                     f'      |     ~^~',
@@ -2691,20 +2665,16 @@ def test_exception_group_format(self):
                     f'      | Traceback (most recent call last):',
                     f'      |   File "{__file__}", line {lno_g+13}, in _get_exception_group',
                     f'      |     g(42)',
-                    f'      |     ^^^^^',
                     f'      |   File "{__file__}", line {lno_g+1}, in g',
                     f'      |     raise ValueError(v)',
-                    f'      |     ^^^^^^^^^^^^^^^^^^^',
                     f'      | ValueError: 42',
                     f'      +------------------------------------',
                     f'    +---------------- 2 ----------------',
                     f'    | Traceback (most recent call last):',
                     f'    |   File "{__file__}", line {lno_g+20}, in _get_exception_group',
                     f'    |     g(24)',
-                    f'    |     ^^^^^',
                     f'    |   File "{__file__}", line {lno_g+1}, in g',
                     f'    |     raise ValueError(v)',
-                    f'    |     ^^^^^^^^^^^^^^^^^^^',
                     f'    | ValueError: 24',
                     f'    +------------------------------------',
                     f'']
diff --git a/Lib/traceback.py b/Lib/traceback.py
index 3afe49d1d8a0e..55f8080044053 100644
--- a/Lib/traceback.py
+++ b/Lib/traceback.py
@@ -465,7 +465,8 @@ def format_frame_summary(self, frame_summary):
         row.append('  File "{}", line {}, in {}\n'.format(
             frame_summary.filename, frame_summary.lineno, frame_summary.name))
         if frame_summary.line:
-            row.append('    {}\n'.format(frame_summary.line.strip()))
+            stripped_line = frame_summary.line.strip()
+            row.append('    {}\n'.format(stripped_line))
 
             orig_line_len = len(frame_summary._original_line)
             frame_line_len = len(frame_summary.line.lstrip())
@@ -486,19 +487,22 @@ def format_frame_summary(self, frame_summary):
                             frame_summary._original_line[colno - 1:end_colno - 1]
                         )
                 else:
-                    end_colno = stripped_characters + len(frame_summary.line.strip())
-
-                row.append('    ')
-                row.append(' ' * (colno - stripped_characters))
-
-                if anchors:
-                    row.append(anchors.primary_char * (anchors.left_end_offset))
-                    row.append(anchors.secondary_char * (anchors.right_start_offset - anchors.left_end_offset))
-                    row.append(anchors.primary_char * (end_colno - colno - anchors.right_start_offset))
-                else:
-                    row.append('^' * (end_colno - colno))
+                    end_colno = stripped_characters + len(stripped_line)
+
+                # show indicators if primary char doesn't span the frame line
+                if end_colno - colno < len(stripped_line) or (
+                        anchors and anchors.right_start_offset - anchors.left_end_offset > 0):
+                    row.append('    ')
+                    row.append(' ' * (colno - stripped_characters))
+
+                    if anchors:
+                        row.append(anchors.primary_char * (anchors.left_end_offset))
+                        row.append(anchors.secondary_char * (anchors.right_start_offset - anchors.left_end_offset))
+                        row.append(anchors.primary_char * (end_colno - colno - anchors.right_start_offset))
+                    else:
+                        row.append('^' * (end_colno - colno))
 
-                row.append('\n')
+                    row.append('\n')
 
         if frame_summary.locals:
             for name, value in sorted(frame_summary.locals.items()):
diff --git a/Misc/NEWS.d/next/Core and Builtins/2022-06-24-14-06-20.gh-issue-93883.8jVQQ4.rst b/Misc/NEWS.d/next/Core and Builtins/2022-06-24-14-06-20.gh-issue-93883.8jVQQ4.rst
new file mode 100644
index 0000000000000..53345577036a5
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2022-06-24-14-06-20.gh-issue-93883.8jVQQ4.rst	
@@ -0,0 +1 @@
+Revise the display strategy of traceback enhanced error locations.  The indicators are only shown when the location doesn't span the whole line.
diff --git a/Python/traceback.c b/Python/traceback.c
index 0c49a8c20a7f5..20348c06fd802 100644
--- a/Python/traceback.c
+++ b/Python/traceback.c
@@ -592,7 +592,6 @@ _Py_DisplaySourceLine(PyObject *f, PyObject *filename, int lineno, int indent,
  *  Traceback (most recent call last):
  *    File "/home/isidentical/cpython/cpython/t.py", line 10, in <module>
  *      add_values(1, 2, 'x', 3, 4)
- *      ^^^^^^^^^^^^^^^^^^^^^^^^^^^
  *    File "/home/isidentical/cpython/cpython/t.py", line 2, in add_values
  *      return a + b + c + d + e
  *             ~~~~~~^~~
@@ -736,7 +735,7 @@ print_error_location_carets(PyObject *f, int offset, Py_ssize_t start_offset, Py
     int special_chars = (left_end_offset != -1 || right_start_offset != -1);
     const char *str;
     while (++offset <= end_offset) {
-        if (offset <= start_offset || offset > end_offset) {
+        if (offset <= start_offset) {
             str = " ";
         } else if (special_chars && left_end_offset < offset && offset <= right_start_offset) {
             str = secondary;
@@ -792,6 +791,7 @@ tb_displayline(PyTracebackObject* tb, PyObject *f, PyObject *filename, int linen
 
     int code_offset = tb->tb_lasti;
     PyCodeObject* code = frame->f_frame->f_code;
+    const Py_ssize_t source_line_len = PyUnicode_GET_LENGTH(source_line);
 
     int start_line;
     int end_line;
@@ -813,7 +813,7 @@ tb_displayline(PyTracebackObject* tb, PyObject *f, PyObject *filename, int linen
     //
     //  ERROR LINE ERROR LINE ERROR LINE ERROR LINE ERROR LINE ERROR LINE ERROR LINE
     //        ~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^~~~~~~~~~~~~~~~~~~~
-    //        |              |-> left_end_offset     |                  |-> left_offset
+    //        |              |-> left_end_offset     |                  |-> end_offset
     //        |-> start_offset                       |-> right_start_offset
     //
     // In general we will only have (start_offset, end_offset) but we can gather more information
@@ -822,6 +822,9 @@ tb_displayline(PyTracebackObject* tb, PyObject *f, PyObject *filename, int linen
     // the different ranges (primary_error_char and secondary_error_char). If we cannot obtain the
     // AST information or we cannot identify special ranges within it, then left_end_offset and
     // right_end_offset will be set to -1.
+    //
+    // To keep the column indicators pertinent, they are not shown when the primary character
+    // spans the whole line.
 
     // Convert the utf-8 byte offset to the actual character offset so we print the right number of carets.
     assert(source_line);
@@ -859,7 +862,7 @@ tb_displayline(PyTracebackObject* tb, PyObject *f, PyObject *filename, int linen
             goto done;
         }
 
-        Py_ssize_t i = PyUnicode_GET_LENGTH(source_line);
+        Py_ssize_t i = source_line_len;
         while (--i >= 0) {
             if (!IS_WHITESPACE(source_line_str[i])) {
                 break;
@@ -869,6 +872,13 @@ tb_displayline(PyTracebackObject* tb, PyObject *f, PyObject *filename, int linen
         end_offset = i + 1;
     }
 
+    // Elide indicators if primary char spans the frame line
+    Py_ssize_t stripped_line_len = source_line_len - truncation - _TRACEBACK_SOURCE_LINE_INDENT;
+    bool has_secondary_ranges = (left_end_offset != -1 || right_start_offset != -1);
+    if (end_offset - start_offset == stripped_line_len && !has_secondary_ranges) {
+        goto done;
+    }
+
     if (_Py_WriteIndentedMargin(margin_indent, margin, f) < 0) {
         err = -1;
         goto done;


From webhook-mailer at python.org  Mon Jul 11 08:12:54 2022
From: webhook-mailer at python.org (pablogsal)
Date: Mon, 11 Jul 2022 12:12:54 -0000
Subject: [Python-checkins] GH-94736: Fix _multiprocessing.SemLock
 subclassing (#94738)
Message-ID: <mailman.10.1657541575.20440.python-checkins@python.org>

https://github.com/python/cpython/commit/f5b76330cfb93e1ad1a77c71dafe719f6a808cec
commit: f5b76330cfb93e1ad1a77c71dafe719f6a808cec
branch: main
author: Kumar Aditya <59607654+kumaraditya303 at users.noreply.github.com>
committer: pablogsal <Pablogsal at gmail.com>
date: 2022-07-11T13:12:36+01:00
summary:

GH-94736: Fix _multiprocessing.SemLock subclassing (#94738)

* fix allocator and deallocator

* ?? Added by blurb_it.

* code review

Co-authored-by: blurb-it[bot] <43283697+blurb-it[bot]@users.noreply.github.com>

files:
A Misc/NEWS.d/next/Library/2022-07-11-10-41-48.gh-issue-94736.EbsgeK.rst
M Lib/test/_test_multiprocessing.py
M Modules/_multiprocessing/semaphore.c

diff --git a/Lib/test/_test_multiprocessing.py b/Lib/test/_test_multiprocessing.py
index 75969975af35b..4c4b9ac532396 100644
--- a/Lib/test/_test_multiprocessing.py
+++ b/Lib/test/_test_multiprocessing.py
@@ -6020,3 +6020,14 @@ def tearDownModule():
 
     remote_globs['setUpModule'] = setUpModule
     remote_globs['tearDownModule'] = tearDownModule
+
+
+ at unittest.skipIf(not hasattr(_multiprocessing, 'SemLock'), 'SemLock not available')
+class SemLockTests(unittest.TestCase):
+
+    def test_semlock_subclass(self):
+        class SemLock(_multiprocessing.SemLock):
+            pass
+        name = f'test_semlock_subclass-{os.getpid()}'
+        s = SemLock(1, 0, 10, name, 0)
+        _multiprocessing.sem_unlink(name)
diff --git a/Misc/NEWS.d/next/Library/2022-07-11-10-41-48.gh-issue-94736.EbsgeK.rst b/Misc/NEWS.d/next/Library/2022-07-11-10-41-48.gh-issue-94736.EbsgeK.rst
new file mode 100644
index 0000000000000..3080672ecdfbb
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2022-07-11-10-41-48.gh-issue-94736.EbsgeK.rst
@@ -0,0 +1 @@
+Fix crash when deallocating an instance of a subclass of ``_multiprocessing.SemLock``. Patch by Kumar Aditya.
diff --git a/Modules/_multiprocessing/semaphore.c b/Modules/_multiprocessing/semaphore.c
index 8607476aff10f..f5fd3257f066a 100644
--- a/Modules/_multiprocessing/semaphore.c
+++ b/Modules/_multiprocessing/semaphore.c
@@ -454,9 +454,7 @@ static PyObject *
 newsemlockobject(PyTypeObject *type, SEM_HANDLE handle, int kind, int maxvalue,
                  char *name)
 {
-    SemLockObject *self;
-
-    self = PyObject_New(SemLockObject, type);
+    SemLockObject *self = (SemLockObject *)type->tp_alloc(type, 0);
     if (!self)
         return NULL;
     self->handle = handle;
@@ -573,7 +571,7 @@ semlock_dealloc(SemLockObject* self)
     if (self->handle != SEM_FAILED)
         SEM_CLOSE(self->handle);
     PyMem_Free(self->name);
-    PyObject_Free(self);
+    Py_TYPE(self)->tp_free((PyObject*)self);
 }
 
 /*[clinic input]


From webhook-mailer at python.org  Mon Jul 11 08:21:26 2022
From: webhook-mailer at python.org (pablogsal)
Date: Mon, 11 Jul 2022 12:21:26 -0000
Subject: [Python-checkins] [3.10] GH-94329: Don't raise on excessive stack
 consumption (GH-94421) (#94448)
Message-ID: <mailman.11.1657542086.20440.python-checkins@python.org>

https://github.com/python/cpython/commit/b87d03d355a1b303a1e0550b0da0fdeb99674da5
commit: b87d03d355a1b303a1e0550b0da0fdeb99674da5
branch: 3.10
author: Mark Shannon <mark at hotpy.org>
committer: pablogsal <Pablogsal at gmail.com>
date: 2022-07-11T13:21:17+01:00
summary:

[3.10] GH-94329: Don't raise on excessive stack consumption (GH-94421) (#94448)

files:
A Misc/NEWS.d/next/Core and Builtins/2022-06-29-15-45-04.gh-issue-94329.olUQyk.rst
M Lib/test/test_compile.py
M Python/compile.c

diff --git a/Lib/test/test_compile.py b/Lib/test/test_compile.py
index 9859d9a46710d..8312613aeaa9f 100644
--- a/Lib/test/test_compile.py
+++ b/Lib/test/test_compile.py
@@ -1035,6 +1035,12 @@ def test_func_and(self):
         code += "   x and x\n" * self.N
         self.check_stack_size(code)
 
+    def test_stack_3050(self):
+        M = 3050
+        code = "x," * M + "=t"
+        # This raised on 3.10.0 to 3.10.5
+        compile(code, "<foo>", "single")
+
 
 class TestStackSizeStability(unittest.TestCase):
     # Check that repeating certain snippets doesn't increase the stack size
diff --git a/Misc/NEWS.d/next/Core and Builtins/2022-06-29-15-45-04.gh-issue-94329.olUQyk.rst b/Misc/NEWS.d/next/Core and Builtins/2022-06-29-15-45-04.gh-issue-94329.olUQyk.rst
new file mode 100644
index 0000000000000..afd31b6e4dc44
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2022-06-29-15-45-04.gh-issue-94329.olUQyk.rst	
@@ -0,0 +1,2 @@
+Compile and run code with unpacking of extremely large sequences (1000s of elements).
+Such code failed to compile. It now compiles and runs correctly.
diff --git a/Python/compile.c b/Python/compile.c
index ea2fdfdb60405..40d1761804b71 100644
--- a/Python/compile.c
+++ b/Python/compile.c
@@ -6968,13 +6968,6 @@ makecode(struct compiler *c, struct assembler *a, PyObject *consts)
         Py_DECREF(consts);
         goto error;
     }
-    if (maxdepth > MAX_ALLOWED_STACK_USE) {
-        PyErr_Format(PyExc_SystemError,
-                     "excessive stack use: stack is %d deep",
-                     maxdepth);
-        Py_DECREF(consts);
-        goto error;
-    }
     co = PyCode_NewWithPosOnlyArgs(posonlyargcount+posorkeywordargcount,
                                    posonlyargcount, kwonlyargcount, nlocals_int,
                                    maxdepth, flags, a->a_bytecode, consts, names,


From webhook-mailer at python.org  Mon Jul 11 08:32:43 2022
From: webhook-mailer at python.org (iritkatriel)
Date: Mon, 11 Jul 2022 12:32:43 -0000
Subject: [Python-checkins] bpo-45924: Fix asyncio incorrect traceback when
 future's exception is raised multiple times (GH-30274)
Message-ID: <mailman.12.1657542763.20440.python-checkins@python.org>

https://github.com/python/cpython/commit/86c1df18727568758cc329baddc1836e45664023
commit: 86c1df18727568758cc329baddc1836e45664023
branch: main
author: Kumar Aditya <59607654+kumaraditya303 at users.noreply.github.com>
committer: iritkatriel <1055913+iritkatriel at users.noreply.github.com>
date: 2022-07-11T13:32:11+01:00
summary:

bpo-45924: Fix asyncio incorrect traceback when future's exception is raised multiple times (GH-30274)

files:
A Misc/NEWS.d/next/Library/2021-12-27-15-32-15.bpo-45924.0ZpHX2.rst
M Lib/asyncio/futures.py
M Lib/test/test_asyncio/test_futures2.py
M Modules/_asynciomodule.c

diff --git a/Lib/asyncio/futures.py b/Lib/asyncio/futures.py
index 08c79e7b5109b..4bd9629e9eb62 100644
--- a/Lib/asyncio/futures.py
+++ b/Lib/asyncio/futures.py
@@ -206,7 +206,7 @@ def result(self):
             raise exceptions.InvalidStateError('Result is not ready.')
         self.__log_traceback = False
         if self._exception is not None:
-            raise self._exception
+            raise self._exception.with_traceback(self._exception_tb)
         return self._result
 
     def exception(self):
@@ -282,6 +282,7 @@ def set_exception(self, exception):
             raise TypeError("StopIteration interacts badly with generators "
                             "and cannot be raised into a Future")
         self._exception = exception
+        self._exception_tb = exception.__traceback__
         self._state = _FINISHED
         self.__schedule_callbacks()
         self.__log_traceback = True
diff --git a/Lib/test/test_asyncio/test_futures2.py b/Lib/test/test_asyncio/test_futures2.py
index 60b58850369f0..71279b69c7929 100644
--- a/Lib/test/test_asyncio/test_futures2.py
+++ b/Lib/test/test_asyncio/test_futures2.py
@@ -1,13 +1,42 @@
 # IsolatedAsyncioTestCase based tests
 import asyncio
+import traceback
 import unittest
+from asyncio import tasks
 
 
 def tearDownModule():
     asyncio.set_event_loop_policy(None)
 
 
-class FutureTests(unittest.IsolatedAsyncioTestCase):
+class FutureTests:
+
+    async def test_future_traceback(self):
+
+        async def raise_exc():
+            raise TypeError(42)
+
+        future = self.cls(raise_exc())
+
+        for _ in range(5):
+            try:
+                await future
+            except TypeError as e:
+                tb = ''.join(traceback.format_tb(e.__traceback__))
+                self.assertEqual(tb.count("await future"), 1)
+            else:
+                self.fail('TypeError was not raised')
+
+ at unittest.skipUnless(hasattr(tasks, '_CTask'),
+                       'requires the C _asyncio module')
+class CFutureTests(FutureTests, unittest.IsolatedAsyncioTestCase):
+    cls = tasks._CTask
+
+class PyFutureTests(FutureTests, unittest.IsolatedAsyncioTestCase):
+    cls = tasks._PyTask
+
+class FutureReprTests(unittest.IsolatedAsyncioTestCase):
+
     async def test_recursive_repr_for_pending_tasks(self):
         # The call crashes if the guard for recursive call
         # in base_futures:_future_repr_info is absent
diff --git a/Misc/NEWS.d/next/Library/2021-12-27-15-32-15.bpo-45924.0ZpHX2.rst b/Misc/NEWS.d/next/Library/2021-12-27-15-32-15.bpo-45924.0ZpHX2.rst
new file mode 100644
index 0000000000000..5cda22737adb7
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2021-12-27-15-32-15.bpo-45924.0ZpHX2.rst
@@ -0,0 +1 @@
+Fix :mod:`asyncio` incorrect traceback when future's exception is raised multiple times. Patch by Kumar Aditya.
diff --git a/Modules/_asynciomodule.c b/Modules/_asynciomodule.c
index bb7c5a7c3ec55..46175ccb8eb3c 100644
--- a/Modules/_asynciomodule.c
+++ b/Modules/_asynciomodule.c
@@ -70,6 +70,7 @@ typedef enum {
     PyObject *prefix##_context0;                                            \
     PyObject *prefix##_callbacks;                                           \
     PyObject *prefix##_exception;                                           \
+    PyObject *prefix##_exception_tb;                                        \
     PyObject *prefix##_result;                                              \
     PyObject *prefix##_source_tb;                                           \
     PyObject *prefix##_cancel_msg;                                          \
@@ -495,6 +496,7 @@ future_init(FutureObj *fut, PyObject *loop)
     Py_CLEAR(fut->fut_callbacks);
     Py_CLEAR(fut->fut_result);
     Py_CLEAR(fut->fut_exception);
+    Py_CLEAR(fut->fut_exception_tb);
     Py_CLEAR(fut->fut_source_tb);
     Py_CLEAR(fut->fut_cancel_msg);
     Py_CLEAR(fut->fut_cancelled_exc);
@@ -601,7 +603,9 @@ future_set_exception(FutureObj *fut, PyObject *exc)
     }
 
     assert(!fut->fut_exception);
+    assert(!fut->fut_exception_tb);
     fut->fut_exception = exc_val;
+    fut->fut_exception_tb = PyException_GetTraceback(exc_val);
     fut->fut_state = STATE_FINISHED;
 
     if (future_schedule_callbacks(fut) == -1) {
@@ -656,8 +660,16 @@ future_get_result(FutureObj *fut, PyObject **result)
 
     fut->fut_log_tb = 0;
     if (fut->fut_exception != NULL) {
+        PyObject *tb = fut->fut_exception_tb;
+        if (tb == NULL) {
+            tb = Py_None;
+        }
+        if (PyException_SetTraceback(fut->fut_exception, tb) < 0) {
+            return -1;
+        }
         Py_INCREF(fut->fut_exception);
         *result = fut->fut_exception;
+        Py_CLEAR(fut->fut_exception_tb);
         return 1;
     }
 
@@ -799,6 +811,7 @@ FutureObj_clear(FutureObj *fut)
     Py_CLEAR(fut->fut_callbacks);
     Py_CLEAR(fut->fut_result);
     Py_CLEAR(fut->fut_exception);
+    Py_CLEAR(fut->fut_exception_tb);
     Py_CLEAR(fut->fut_source_tb);
     Py_CLEAR(fut->fut_cancel_msg);
     Py_CLEAR(fut->fut_cancelled_exc);
@@ -815,6 +828,7 @@ FutureObj_traverse(FutureObj *fut, visitproc visit, void *arg)
     Py_VISIT(fut->fut_callbacks);
     Py_VISIT(fut->fut_result);
     Py_VISIT(fut->fut_exception);
+    Py_VISIT(fut->fut_exception_tb);
     Py_VISIT(fut->fut_source_tb);
     Py_VISIT(fut->fut_cancel_msg);
     Py_VISIT(fut->fut_cancelled_exc);


From webhook-mailer at python.org  Mon Jul 11 08:39:22 2022
From: webhook-mailer at python.org (miss-islington)
Date: Mon, 11 Jul 2022 12:39:22 -0000
Subject: [Python-checkins] GH-94736: Fix _multiprocessing.SemLock
 subclassing (GH-94738)
Message-ID: <mailman.13.1657543163.20440.python-checkins@python.org>

https://github.com/python/cpython/commit/916686fdb273d6adbd403e6d58029960ec7a89ab
commit: 916686fdb273d6adbd403e6d58029960ec7a89ab
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-11T05:39:09-07:00
summary:

GH-94736: Fix _multiprocessing.SemLock subclassing (GH-94738)


* fix allocator and deallocator

* ?? Added by blurb_it.

* code review

Co-authored-by: blurb-it[bot] <43283697+blurb-it[bot]@users.noreply.github.com>
(cherry picked from commit f5b76330cfb93e1ad1a77c71dafe719f6a808cec)

Co-authored-by: Kumar Aditya <59607654+kumaraditya303 at users.noreply.github.com>

files:
A Misc/NEWS.d/next/Library/2022-07-11-10-41-48.gh-issue-94736.EbsgeK.rst
M Lib/test/_test_multiprocessing.py
M Modules/_multiprocessing/semaphore.c

diff --git a/Lib/test/_test_multiprocessing.py b/Lib/test/_test_multiprocessing.py
index ba488b17920ef..08eea47441675 100644
--- a/Lib/test/_test_multiprocessing.py
+++ b/Lib/test/_test_multiprocessing.py
@@ -5964,3 +5964,14 @@ def tearDownModule():
 
     remote_globs['setUpModule'] = setUpModule
     remote_globs['tearDownModule'] = tearDownModule
+
+
+ at unittest.skipIf(not hasattr(_multiprocessing, 'SemLock'), 'SemLock not available')
+class SemLockTests(unittest.TestCase):
+
+    def test_semlock_subclass(self):
+        class SemLock(_multiprocessing.SemLock):
+            pass
+        name = f'test_semlock_subclass-{os.getpid()}'
+        s = SemLock(1, 0, 10, name, 0)
+        _multiprocessing.sem_unlink(name)
diff --git a/Misc/NEWS.d/next/Library/2022-07-11-10-41-48.gh-issue-94736.EbsgeK.rst b/Misc/NEWS.d/next/Library/2022-07-11-10-41-48.gh-issue-94736.EbsgeK.rst
new file mode 100644
index 0000000000000..3080672ecdfbb
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2022-07-11-10-41-48.gh-issue-94736.EbsgeK.rst
@@ -0,0 +1 @@
+Fix crash when deallocating an instance of a subclass of ``_multiprocessing.SemLock``. Patch by Kumar Aditya.
diff --git a/Modules/_multiprocessing/semaphore.c b/Modules/_multiprocessing/semaphore.c
index 9a2d1f85c92fa..3356658fef189 100644
--- a/Modules/_multiprocessing/semaphore.c
+++ b/Modules/_multiprocessing/semaphore.c
@@ -452,9 +452,7 @@ static PyObject *
 newsemlockobject(PyTypeObject *type, SEM_HANDLE handle, int kind, int maxvalue,
                  char *name)
 {
-    SemLockObject *self;
-
-    self = PyObject_New(SemLockObject, type);
+    SemLockObject *self = (SemLockObject *)type->tp_alloc(type, 0);
     if (!self)
         return NULL;
     self->handle = handle;
@@ -571,7 +569,7 @@ semlock_dealloc(SemLockObject* self)
     if (self->handle != SEM_FAILED)
         SEM_CLOSE(self->handle);
     PyMem_Free(self->name);
-    PyObject_Free(self);
+    Py_TYPE(self)->tp_free((PyObject*)self);
 }
 
 /*[clinic input]


From webhook-mailer at python.org  Mon Jul 11 08:40:08 2022
From: webhook-mailer at python.org (miss-islington)
Date: Mon, 11 Jul 2022 12:40:08 -0000
Subject: [Python-checkins] GH-94736: Fix _multiprocessing.SemLock
 subclassing (GH-94738)
Message-ID: <mailman.14.1657543209.20440.python-checkins@python.org>

https://github.com/python/cpython/commit/8464e4ae8300d6e600cd192884552ab634155625
commit: 8464e4ae8300d6e600cd192884552ab634155625
branch: 3.11
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-11T05:40:02-07:00
summary:

GH-94736: Fix _multiprocessing.SemLock subclassing (GH-94738)


* fix allocator and deallocator

* ?? Added by blurb_it.

* code review

Co-authored-by: blurb-it[bot] <43283697+blurb-it[bot]@users.noreply.github.com>
(cherry picked from commit f5b76330cfb93e1ad1a77c71dafe719f6a808cec)

Co-authored-by: Kumar Aditya <59607654+kumaraditya303 at users.noreply.github.com>

files:
A Misc/NEWS.d/next/Library/2022-07-11-10-41-48.gh-issue-94736.EbsgeK.rst
M Lib/test/_test_multiprocessing.py
M Modules/_multiprocessing/semaphore.c

diff --git a/Lib/test/_test_multiprocessing.py b/Lib/test/_test_multiprocessing.py
index 46f4386e8e108..43566545afa2b 100644
--- a/Lib/test/_test_multiprocessing.py
+++ b/Lib/test/_test_multiprocessing.py
@@ -6026,3 +6026,14 @@ def tearDownModule():
 
     remote_globs['setUpModule'] = setUpModule
     remote_globs['tearDownModule'] = tearDownModule
+
+
+ at unittest.skipIf(not hasattr(_multiprocessing, 'SemLock'), 'SemLock not available')
+class SemLockTests(unittest.TestCase):
+
+    def test_semlock_subclass(self):
+        class SemLock(_multiprocessing.SemLock):
+            pass
+        name = f'test_semlock_subclass-{os.getpid()}'
+        s = SemLock(1, 0, 10, name, 0)
+        _multiprocessing.sem_unlink(name)
diff --git a/Misc/NEWS.d/next/Library/2022-07-11-10-41-48.gh-issue-94736.EbsgeK.rst b/Misc/NEWS.d/next/Library/2022-07-11-10-41-48.gh-issue-94736.EbsgeK.rst
new file mode 100644
index 0000000000000..3080672ecdfbb
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2022-07-11-10-41-48.gh-issue-94736.EbsgeK.rst
@@ -0,0 +1 @@
+Fix crash when deallocating an instance of a subclass of ``_multiprocessing.SemLock``. Patch by Kumar Aditya.
diff --git a/Modules/_multiprocessing/semaphore.c b/Modules/_multiprocessing/semaphore.c
index 8607476aff10f..f5fd3257f066a 100644
--- a/Modules/_multiprocessing/semaphore.c
+++ b/Modules/_multiprocessing/semaphore.c
@@ -454,9 +454,7 @@ static PyObject *
 newsemlockobject(PyTypeObject *type, SEM_HANDLE handle, int kind, int maxvalue,
                  char *name)
 {
-    SemLockObject *self;
-
-    self = PyObject_New(SemLockObject, type);
+    SemLockObject *self = (SemLockObject *)type->tp_alloc(type, 0);
     if (!self)
         return NULL;
     self->handle = handle;
@@ -573,7 +571,7 @@ semlock_dealloc(SemLockObject* self)
     if (self->handle != SEM_FAILED)
         SEM_CLOSE(self->handle);
     PyMem_Free(self->name);
-    PyObject_Free(self);
+    Py_TYPE(self)->tp_free((PyObject*)self);
 }
 
 /*[clinic input]


From webhook-mailer at python.org  Mon Jul 11 09:17:56 2022
From: webhook-mailer at python.org (pablogsal)
Date: Mon, 11 Jul 2022 13:17:56 -0000
Subject: [Python-checkins] [3.11] bpo-45924: Fix asyncio incorrect traceback
 when future's exception is raised multiple times (GH-30274) (#94747)
Message-ID: <mailman.15.1657545477.20440.python-checkins@python.org>

https://github.com/python/cpython/commit/91176d38836cceb0d8e6d8cf5dfe7fe089b821ae
commit: 91176d38836cceb0d8e6d8cf5dfe7fe089b821ae
branch: 3.11
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: pablogsal <Pablogsal at gmail.com>
date: 2022-07-11T14:17:32+01:00
summary:

[3.11] bpo-45924: Fix asyncio incorrect traceback when future's exception is raised multiple times (GH-30274) (#94747)

Co-authored-by: Kumar Aditya <59607654+kumaraditya303 at users.noreply.github.com>

files:
A Misc/NEWS.d/next/Library/2021-12-27-15-32-15.bpo-45924.0ZpHX2.rst
M Lib/asyncio/futures.py
M Lib/test/test_asyncio/test_futures2.py
M Modules/_asynciomodule.c

diff --git a/Lib/asyncio/futures.py b/Lib/asyncio/futures.py
index 08c79e7b5109b..4bd9629e9eb62 100644
--- a/Lib/asyncio/futures.py
+++ b/Lib/asyncio/futures.py
@@ -206,7 +206,7 @@ def result(self):
             raise exceptions.InvalidStateError('Result is not ready.')
         self.__log_traceback = False
         if self._exception is not None:
-            raise self._exception
+            raise self._exception.with_traceback(self._exception_tb)
         return self._result
 
     def exception(self):
@@ -282,6 +282,7 @@ def set_exception(self, exception):
             raise TypeError("StopIteration interacts badly with generators "
                             "and cannot be raised into a Future")
         self._exception = exception
+        self._exception_tb = exception.__traceback__
         self._state = _FINISHED
         self.__schedule_callbacks()
         self.__log_traceback = True
diff --git a/Lib/test/test_asyncio/test_futures2.py b/Lib/test/test_asyncio/test_futures2.py
index 60b58850369f0..71279b69c7929 100644
--- a/Lib/test/test_asyncio/test_futures2.py
+++ b/Lib/test/test_asyncio/test_futures2.py
@@ -1,13 +1,42 @@
 # IsolatedAsyncioTestCase based tests
 import asyncio
+import traceback
 import unittest
+from asyncio import tasks
 
 
 def tearDownModule():
     asyncio.set_event_loop_policy(None)
 
 
-class FutureTests(unittest.IsolatedAsyncioTestCase):
+class FutureTests:
+
+    async def test_future_traceback(self):
+
+        async def raise_exc():
+            raise TypeError(42)
+
+        future = self.cls(raise_exc())
+
+        for _ in range(5):
+            try:
+                await future
+            except TypeError as e:
+                tb = ''.join(traceback.format_tb(e.__traceback__))
+                self.assertEqual(tb.count("await future"), 1)
+            else:
+                self.fail('TypeError was not raised')
+
+ at unittest.skipUnless(hasattr(tasks, '_CTask'),
+                       'requires the C _asyncio module')
+class CFutureTests(FutureTests, unittest.IsolatedAsyncioTestCase):
+    cls = tasks._CTask
+
+class PyFutureTests(FutureTests, unittest.IsolatedAsyncioTestCase):
+    cls = tasks._PyTask
+
+class FutureReprTests(unittest.IsolatedAsyncioTestCase):
+
     async def test_recursive_repr_for_pending_tasks(self):
         # The call crashes if the guard for recursive call
         # in base_futures:_future_repr_info is absent
diff --git a/Misc/NEWS.d/next/Library/2021-12-27-15-32-15.bpo-45924.0ZpHX2.rst b/Misc/NEWS.d/next/Library/2021-12-27-15-32-15.bpo-45924.0ZpHX2.rst
new file mode 100644
index 0000000000000..5cda22737adb7
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2021-12-27-15-32-15.bpo-45924.0ZpHX2.rst
@@ -0,0 +1 @@
+Fix :mod:`asyncio` incorrect traceback when future's exception is raised multiple times. Patch by Kumar Aditya.
diff --git a/Modules/_asynciomodule.c b/Modules/_asynciomodule.c
index 5fa722305757d..eae468d8d96a5 100644
--- a/Modules/_asynciomodule.c
+++ b/Modules/_asynciomodule.c
@@ -70,6 +70,7 @@ typedef enum {
     PyObject *prefix##_context0;                                            \
     PyObject *prefix##_callbacks;                                           \
     PyObject *prefix##_exception;                                           \
+    PyObject *prefix##_exception_tb;                                        \
     PyObject *prefix##_result;                                              \
     PyObject *prefix##_source_tb;                                           \
     PyObject *prefix##_cancel_msg;                                          \
@@ -495,6 +496,7 @@ future_init(FutureObj *fut, PyObject *loop)
     Py_CLEAR(fut->fut_callbacks);
     Py_CLEAR(fut->fut_result);
     Py_CLEAR(fut->fut_exception);
+    Py_CLEAR(fut->fut_exception_tb);
     Py_CLEAR(fut->fut_source_tb);
     Py_CLEAR(fut->fut_cancel_msg);
     Py_CLEAR(fut->fut_cancelled_exc);
@@ -601,7 +603,9 @@ future_set_exception(FutureObj *fut, PyObject *exc)
     }
 
     assert(!fut->fut_exception);
+    assert(!fut->fut_exception_tb);
     fut->fut_exception = exc_val;
+    fut->fut_exception_tb = PyException_GetTraceback(exc_val);
     fut->fut_state = STATE_FINISHED;
 
     if (future_schedule_callbacks(fut) == -1) {
@@ -656,8 +660,16 @@ future_get_result(FutureObj *fut, PyObject **result)
 
     fut->fut_log_tb = 0;
     if (fut->fut_exception != NULL) {
+        PyObject *tb = fut->fut_exception_tb;
+        if (tb == NULL) {
+            tb = Py_None;
+        }
+        if (PyException_SetTraceback(fut->fut_exception, tb) < 0) {
+            return -1;
+        }
         Py_INCREF(fut->fut_exception);
         *result = fut->fut_exception;
+        Py_CLEAR(fut->fut_exception_tb);
         return 1;
     }
 
@@ -799,6 +811,7 @@ FutureObj_clear(FutureObj *fut)
     Py_CLEAR(fut->fut_callbacks);
     Py_CLEAR(fut->fut_result);
     Py_CLEAR(fut->fut_exception);
+    Py_CLEAR(fut->fut_exception_tb);
     Py_CLEAR(fut->fut_source_tb);
     Py_CLEAR(fut->fut_cancel_msg);
     Py_CLEAR(fut->fut_cancelled_exc);
@@ -815,6 +828,7 @@ FutureObj_traverse(FutureObj *fut, visitproc visit, void *arg)
     Py_VISIT(fut->fut_callbacks);
     Py_VISIT(fut->fut_result);
     Py_VISIT(fut->fut_exception);
+    Py_VISIT(fut->fut_exception_tb);
     Py_VISIT(fut->fut_source_tb);
     Py_VISIT(fut->fut_cancel_msg);
     Py_VISIT(fut->fut_cancelled_exc);


From webhook-mailer at python.org  Mon Jul 11 10:35:54 2022
From: webhook-mailer at python.org (miss-islington)
Date: Mon, 11 Jul 2022 14:35:54 -0000
Subject: [Python-checkins] GH-94736: mark SemLock test as linux only
 (GH-94750)
Message-ID: <mailman.16.1657550155.20440.python-checkins@python.org>

https://github.com/python/cpython/commit/cfafd3adf8c3bb73881081f721e77ebfc94431ea
commit: cfafd3adf8c3bb73881081f721e77ebfc94431ea
branch: main
author: Kumar Aditya <59607654+kumaraditya303 at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-11T07:35:47-07:00
summary:

GH-94736: mark SemLock test as linux only (GH-94750)



See https://buildbot.python.org/all/#/builders/172/builds/2522
The PR skips the test on non-linux platforms.

Automerge-Triggered-By: GH:pablogsal

files:
M Lib/test/_test_multiprocessing.py

diff --git a/Lib/test/_test_multiprocessing.py b/Lib/test/_test_multiprocessing.py
index 4c4b9ac532396..e3e7ee39ebdb8 100644
--- a/Lib/test/_test_multiprocessing.py
+++ b/Lib/test/_test_multiprocessing.py
@@ -6023,6 +6023,7 @@ def tearDownModule():
 
 
 @unittest.skipIf(not hasattr(_multiprocessing, 'SemLock'), 'SemLock not available')
+ at unittest.skipIf(sys.platform != "linux", "Linux only")
 class SemLockTests(unittest.TestCase):
 
     def test_semlock_subclass(self):


From webhook-mailer at python.org  Mon Jul 11 10:38:33 2022
From: webhook-mailer at python.org (pablogsal)
Date: Mon, 11 Jul 2022 14:38:33 -0000
Subject: [Python-checkins] bpo-45924: Fix asyncio incorrect traceback when
 future's exception is raised multiple times (GH-30274) (#94748)
Message-ID: <mailman.17.1657550314.20440.python-checkins@python.org>

https://github.com/python/cpython/commit/aa2142def669e87016406acf7a84a5254487b0ee
commit: aa2142def669e87016406acf7a84a5254487b0ee
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: pablogsal <Pablogsal at gmail.com>
date: 2022-07-11T15:38:27+01:00
summary:

bpo-45924: Fix asyncio incorrect traceback when future's exception is raised multiple times (GH-30274) (#94748)

(cherry picked from commit 86c1df18727568758cc329baddc1836e45664023)

Co-authored-by: Kumar Aditya <59607654+kumaraditya303 at users.noreply.github.com>

Co-authored-by: Kumar Aditya <59607654+kumaraditya303 at users.noreply.github.com>

files:
A Misc/NEWS.d/next/Library/2021-12-27-15-32-15.bpo-45924.0ZpHX2.rst
M Lib/asyncio/futures.py
M Lib/test/test_asyncio/test_futures2.py
M Modules/_asynciomodule.c

diff --git a/Lib/asyncio/futures.py b/Lib/asyncio/futures.py
index 8e8cd87612588..48a32f868385c 100644
--- a/Lib/asyncio/futures.py
+++ b/Lib/asyncio/futures.py
@@ -198,7 +198,7 @@ def result(self):
             raise exceptions.InvalidStateError('Result is not ready.')
         self.__log_traceback = False
         if self._exception is not None:
-            raise self._exception
+            raise self._exception.with_traceback(self._exception_tb)
         return self._result
 
     def exception(self):
@@ -274,6 +274,7 @@ def set_exception(self, exception):
             raise TypeError("StopIteration interacts badly with generators "
                             "and cannot be raised into a Future")
         self._exception = exception
+        self._exception_tb = exception.__traceback__
         self._state = _FINISHED
         self.__schedule_callbacks()
         self.__log_traceback = True
diff --git a/Lib/test/test_asyncio/test_futures2.py b/Lib/test/test_asyncio/test_futures2.py
index 60b58850369f0..71279b69c7929 100644
--- a/Lib/test/test_asyncio/test_futures2.py
+++ b/Lib/test/test_asyncio/test_futures2.py
@@ -1,13 +1,42 @@
 # IsolatedAsyncioTestCase based tests
 import asyncio
+import traceback
 import unittest
+from asyncio import tasks
 
 
 def tearDownModule():
     asyncio.set_event_loop_policy(None)
 
 
-class FutureTests(unittest.IsolatedAsyncioTestCase):
+class FutureTests:
+
+    async def test_future_traceback(self):
+
+        async def raise_exc():
+            raise TypeError(42)
+
+        future = self.cls(raise_exc())
+
+        for _ in range(5):
+            try:
+                await future
+            except TypeError as e:
+                tb = ''.join(traceback.format_tb(e.__traceback__))
+                self.assertEqual(tb.count("await future"), 1)
+            else:
+                self.fail('TypeError was not raised')
+
+ at unittest.skipUnless(hasattr(tasks, '_CTask'),
+                       'requires the C _asyncio module')
+class CFutureTests(FutureTests, unittest.IsolatedAsyncioTestCase):
+    cls = tasks._CTask
+
+class PyFutureTests(FutureTests, unittest.IsolatedAsyncioTestCase):
+    cls = tasks._PyTask
+
+class FutureReprTests(unittest.IsolatedAsyncioTestCase):
+
     async def test_recursive_repr_for_pending_tasks(self):
         # The call crashes if the guard for recursive call
         # in base_futures:_future_repr_info is absent
diff --git a/Misc/NEWS.d/next/Library/2021-12-27-15-32-15.bpo-45924.0ZpHX2.rst b/Misc/NEWS.d/next/Library/2021-12-27-15-32-15.bpo-45924.0ZpHX2.rst
new file mode 100644
index 0000000000000..5cda22737adb7
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2021-12-27-15-32-15.bpo-45924.0ZpHX2.rst
@@ -0,0 +1 @@
+Fix :mod:`asyncio` incorrect traceback when future's exception is raised multiple times. Patch by Kumar Aditya.
diff --git a/Modules/_asynciomodule.c b/Modules/_asynciomodule.c
index 392e0e7c7357f..1f6de2177a37a 100644
--- a/Modules/_asynciomodule.c
+++ b/Modules/_asynciomodule.c
@@ -63,6 +63,7 @@ typedef enum {
     PyObject *prefix##_context0;                                            \
     PyObject *prefix##_callbacks;                                           \
     PyObject *prefix##_exception;                                           \
+    PyObject *prefix##_exception_tb;                                        \
     PyObject *prefix##_result;                                              \
     PyObject *prefix##_source_tb;                                           \
     PyObject *prefix##_cancel_msg;                                          \
@@ -487,6 +488,7 @@ future_init(FutureObj *fut, PyObject *loop)
     Py_CLEAR(fut->fut_callbacks);
     Py_CLEAR(fut->fut_result);
     Py_CLEAR(fut->fut_exception);
+    Py_CLEAR(fut->fut_exception_tb);
     Py_CLEAR(fut->fut_source_tb);
     Py_CLEAR(fut->fut_cancel_msg);
     _PyErr_ClearExcState(&fut->fut_cancelled_exc_state);
@@ -593,7 +595,9 @@ future_set_exception(FutureObj *fut, PyObject *exc)
     }
 
     assert(!fut->fut_exception);
+    assert(!fut->fut_exception_tb);
     fut->fut_exception = exc_val;
+    fut->fut_exception_tb = PyException_GetTraceback(exc_val);
     fut->fut_state = STATE_FINISHED;
 
     if (future_schedule_callbacks(fut) == -1) {
@@ -641,8 +645,16 @@ future_get_result(FutureObj *fut, PyObject **result)
 
     fut->fut_log_tb = 0;
     if (fut->fut_exception != NULL) {
+        PyObject *tb = fut->fut_exception_tb;
+        if (tb == NULL) {
+            tb = Py_None;
+        }
+        if (PyException_SetTraceback(fut->fut_exception, tb) < 0) {
+            return -1;
+        }
         Py_INCREF(fut->fut_exception);
         *result = fut->fut_exception;
+        Py_CLEAR(fut->fut_exception_tb);
         return 1;
     }
 
@@ -784,6 +796,7 @@ FutureObj_clear(FutureObj *fut)
     Py_CLEAR(fut->fut_callbacks);
     Py_CLEAR(fut->fut_result);
     Py_CLEAR(fut->fut_exception);
+    Py_CLEAR(fut->fut_exception_tb);
     Py_CLEAR(fut->fut_source_tb);
     Py_CLEAR(fut->fut_cancel_msg);
     _PyErr_ClearExcState(&fut->fut_cancelled_exc_state);
@@ -800,6 +813,7 @@ FutureObj_traverse(FutureObj *fut, visitproc visit, void *arg)
     Py_VISIT(fut->fut_callbacks);
     Py_VISIT(fut->fut_result);
     Py_VISIT(fut->fut_exception);
+    Py_VISIT(fut->fut_exception_tb);
     Py_VISIT(fut->fut_source_tb);
     Py_VISIT(fut->fut_cancel_msg);
     Py_VISIT(fut->dict);


From webhook-mailer at python.org  Mon Jul 11 11:24:25 2022
From: webhook-mailer at python.org (pablogsal)
Date: Mon, 11 Jul 2022 15:24:25 -0000
Subject: [Python-checkins] [3.11] GH-94736: mark SemLock test as linux only
 (GH-94750) (#94752)
Message-ID: <mailman.18.1657553065.20440.python-checkins@python.org>

https://github.com/python/cpython/commit/a276833a7d2dadce2d9ffcbc3f958e32749b0234
commit: a276833a7d2dadce2d9ffcbc3f958e32749b0234
branch: 3.11
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: pablogsal <Pablogsal at gmail.com>
date: 2022-07-11T16:24:12+01:00
summary:

[3.11] GH-94736: mark SemLock test as linux only (GH-94750) (#94752)

Co-authored-by: Kumar Aditya <59607654+kumaraditya303 at users.noreply.github.com>

files:
M Lib/test/_test_multiprocessing.py

diff --git a/Lib/test/_test_multiprocessing.py b/Lib/test/_test_multiprocessing.py
index 43566545afa2b..4f0df0f508f73 100644
--- a/Lib/test/_test_multiprocessing.py
+++ b/Lib/test/_test_multiprocessing.py
@@ -6029,6 +6029,7 @@ def tearDownModule():
 
 
 @unittest.skipIf(not hasattr(_multiprocessing, 'SemLock'), 'SemLock not available')
+ at unittest.skipIf(sys.platform != "linux", "Linux only")
 class SemLockTests(unittest.TestCase):
 
     def test_semlock_subclass(self):


From webhook-mailer at python.org  Mon Jul 11 12:15:30 2022
From: webhook-mailer at python.org (pablogsal)
Date: Mon, 11 Jul 2022 16:15:30 -0000
Subject: [Python-checkins] [3.10] GH-94736: mark SemLock test as linux only
 (GH-94750) (#94753)
Message-ID: <mailman.19.1657556132.20440.python-checkins@python.org>

https://github.com/python/cpython/commit/1bc13df6281e72c6a5bbc5b2b6b17b95b829d14b
commit: 1bc13df6281e72c6a5bbc5b2b6b17b95b829d14b
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: pablogsal <Pablogsal at gmail.com>
date: 2022-07-11T17:14:57+01:00
summary:

[3.10] GH-94736: mark SemLock test as linux only (GH-94750) (#94753)

Co-authored-by: Kumar Aditya <59607654+kumaraditya303 at users.noreply.github.com>

files:
M Lib/test/_test_multiprocessing.py

diff --git a/Lib/test/_test_multiprocessing.py b/Lib/test/_test_multiprocessing.py
index 08eea47441675..de1a99a2723d2 100644
--- a/Lib/test/_test_multiprocessing.py
+++ b/Lib/test/_test_multiprocessing.py
@@ -5967,6 +5967,7 @@ def tearDownModule():
 
 
 @unittest.skipIf(not hasattr(_multiprocessing, 'SemLock'), 'SemLock not available')
+ at unittest.skipIf(sys.platform != "linux", "Linux only")
 class SemLockTests(unittest.TestCase):
 
     def test_semlock_subclass(self):


From webhook-mailer at python.org  Mon Jul 11 13:32:05 2022
From: webhook-mailer at python.org (pablogsal)
Date: Mon, 11 Jul 2022 17:32:05 -0000
Subject: [Python-checkins] Python 3.11.0b4
Message-ID: <mailman.20.1657560726.20440.python-checkins@python.org>

https://github.com/python/cpython/commit/5a7e1e0a92622c605ab28c95b3dd61a21d285ad5
commit: 5a7e1e0a92622c605ab28c95b3dd61a21d285ad5
branch: 3.11
author: Pablo Galindo <pablogsal at gmail.com>
committer: pablogsal <Pablogsal at gmail.com>
date: 2022-07-11T16:25:22+01:00
summary:

Python 3.11.0b4

files:
A Misc/NEWS.d/3.11.0b4.rst
D Misc/NEWS.d/next/Build/2022-06-04-12-53-53.gh-issue-93491.ehM211.rst
D Misc/NEWS.d/next/Build/2022-06-08-14-28-03.gh-issue-93584.0xfHOK.rst
D Misc/NEWS.d/next/Build/2022-06-29-08-58-31.gh-issue-94404.3MadM6.rst
D Misc/NEWS.d/next/C API/2022-06-04-13-15-41.gh-issue-93442.4M4NDb.rst
D Misc/NEWS.d/next/C API/2022-06-10-23-41-48.gh-issue-91731.fhYUQG.rst
D Misc/NEWS.d/next/C API/2022-06-13-21-37-31.gh-issue-91321.DgJFvS.rst
D Misc/NEWS.d/next/C API/2022-06-17-13-41-38.gh-issue-93937.uKVTEh.rst
D Misc/NEWS.d/next/Core and Builtins/2022-01-02-14-53-59.bpo-46142.WayjgT.rst
D Misc/NEWS.d/next/Core and Builtins/2022-05-17-20-41-43.gh-issue-92858.eIXJTn.rst
D Misc/NEWS.d/next/Core and Builtins/2022-05-18-08-32-33.gh-issue-92914.tJUeTD.rst
D Misc/NEWS.d/next/Core and Builtins/2022-05-18-18-34-45.gh-issue-92930.kpYPOb.rst
D Misc/NEWS.d/next/Core and Builtins/2022-05-20-09-25-34.gh-issue-93021.k3Aji2.rst
D Misc/NEWS.d/next/Core and Builtins/2022-05-30-15-35-42.gh-issue-93354.RZk8gs.rst
D Misc/NEWS.d/next/Core and Builtins/2022-05-31-16-36-30.gh-issue-93382.Jf6gAj.rst
D Misc/NEWS.d/next/Core and Builtins/2022-06-01-17-47-40.gh-issue-93418.24dJuc.rst
D Misc/NEWS.d/next/Core and Builtins/2022-06-09-19-19-02.gh-issue-93461.5DqP1e.rst
D Misc/NEWS.d/next/Core and Builtins/2022-06-10-10-31-18.gh-issue-93662.-7RSC1.rst
D Misc/NEWS.d/next/Core and Builtins/2022-06-10-12-03-17.gh-issue-93671.idkQqG.rst
D Misc/NEWS.d/next/Core and Builtins/2022-06-12-19-31-56.gh-issue-89828.bq02M7.rst
D Misc/NEWS.d/next/Core and Builtins/2022-06-13-10-48-09.gh-issue-93516.yJSait.rst
D Misc/NEWS.d/next/Core and Builtins/2022-06-13-13-55-34.gh-issue-93516.HILrDl.rst
D Misc/NEWS.d/next/Core and Builtins/2022-06-20-13-48-57.gh-issue-94021.o78q3G.rst
D Misc/NEWS.d/next/Core and Builtins/2022-06-24-14-06-20.gh-issue-93883.8jVQQ4.rst
D Misc/NEWS.d/next/Core and Builtins/2022-06-26-14-37-03.gh-issue-94192.ab7tn7.rst
D Misc/NEWS.d/next/Core and Builtins/2022-06-28-10-08-06.gh-issue-94262.m-HWUZ.rst
D Misc/NEWS.d/next/Core and Builtins/2022-06-28-12-41-17.gh-issue-88116.A7fEl_.rst
D Misc/NEWS.d/next/Core and Builtins/2022-06-28-14-20-36.gh-issue-94360.DiEnen.rst
D Misc/NEWS.d/next/Core and Builtins/2022-06-29-15-45-04.gh-issue-94329.olUQyk.rst
D Misc/NEWS.d/next/Core and Builtins/2022-06-29-22-18-36.gh-issue-91719.3APYYI.rst
D Misc/NEWS.d/next/Core and Builtins/2022-06-30-15-07-26.gh-issue-94438.btzHSk.rst
D Misc/NEWS.d/next/Core and Builtins/2022-07-01-20-00-19.gh-issue-94485.mo5st7.rst
D Misc/NEWS.d/next/Core and Builtins/2022-07-06-14-02-26.gh-issue-92228.44Cbly.rst
D Misc/NEWS.d/next/Core and Builtins/2022-07-07-21-13-25.gh-issue-94215._Sv9Ms.rst
D Misc/NEWS.d/next/Core and Builtins/2022-07-08-11-44-45.gh-issue-93252.i2358c.rst
D Misc/NEWS.d/next/Core and Builtins/2022-07-08-16-44-11.gh-issue-94694.VkL2CM.rst
D Misc/NEWS.d/next/Documentation/2022-03-30-17-56-01.bpo-47161.gesHfS.rst
D Misc/NEWS.d/next/Documentation/2022-05-26-14-51-25.gh-issue-88831.5Cccr5.rst
D Misc/NEWS.d/next/Documentation/2022-05-29-21-22-54.gh-issue-86986.lFXw8j.rst
D Misc/NEWS.d/next/Documentation/2022-06-15-12-12-49.gh-issue-87260.epyI7D.rst
D Misc/NEWS.d/next/Documentation/2022-06-16-10-10-59.gh-issue-61162.1ypkG8.rst
D Misc/NEWS.d/next/Documentation/2022-07-07-08-42-05.gh-issue-94321.pmCIPb.rst
D Misc/NEWS.d/next/Library/2018-09-28-22-18-03.bpo-34828.5Zyi_S.rst
D Misc/NEWS.d/next/Library/2021-12-27-15-32-15.bpo-45924.0ZpHX2.rst
D Misc/NEWS.d/next/Library/2022-01-03-15-07-06.bpo-46197.Z0djv6.rst
D Misc/NEWS.d/next/Library/2022-02-15-12-40-48.bpo-46755.zePJfx.rst
D Misc/NEWS.d/next/Library/2022-04-08-22-12-11.bpo-47231.lvyglt.rst
D Misc/NEWS.d/next/Library/2022-04-11-16-55-41.gh-issue-91456.DK3KKl.rst
D Misc/NEWS.d/next/Library/2022-04-15-17-38-55.gh-issue-91577.Ah7cLL.rst
D Misc/NEWS.d/next/Library/2022-05-19-17-49-58.gh-issue-92932.o2peTh.rst
D Misc/NEWS.d/next/Library/2022-05-22-16-08-01.gh-issue-89973.jc-Q4g.rst
D Misc/NEWS.d/next/Library/2022-05-24-11-19-04.gh-issue-74696.-cnf-A.rst
D Misc/NEWS.d/next/Library/2022-05-26-23-10-55.gh-issue-93156.4XfDVN.rst
D Misc/NEWS.d/next/Library/2022-05-30-21-42-50.gh-issue-83658.01Ntx0.rst
D Misc/NEWS.d/next/Library/2022-05-31-14-58-40.gh-issue-93353.9Hvm6o.rst
D Misc/NEWS.d/next/Library/2022-06-01-11-24-13.gh-issue-91162.NxvU_u.rst
D Misc/NEWS.d/next/Library/2022-06-05-22-22-42.gh-issue-93421.43UO_8.rst
D Misc/NEWS.d/next/Library/2022-06-06-12-58-27.gh-issue-79579.e8rB-M.rst
D Misc/NEWS.d/next/Library/2022-06-06-13-19-43.gh-issue-93521._vE8m9.rst
D Misc/NEWS.d/next/Library/2022-06-07-14-53-46.gh-issue-90549.T4FMKY.rst
D Misc/NEWS.d/next/Library/2022-06-08-20-11-02.gh-issue-90494.LIZT85.rst
D Misc/NEWS.d/next/Library/2022-06-09-10-12-55.gh-issue-90473.683m_C.rst
D Misc/NEWS.d/next/Library/2022-06-09-14-44-21.gh-issue-93626.sfghs46.rst
D Misc/NEWS.d/next/Library/2022-06-09-17-15-26.gh-issue-91389.OE4vS5.rst
D Misc/NEWS.d/next/Library/2022-06-11-13-32-17.gh-issue-79512.A1KTDr.rst
D Misc/NEWS.d/next/Library/2022-06-15-21-20-02.gh-issue-93820.FAMLY8.rst
D Misc/NEWS.d/next/Library/2022-06-15-21-28-16.gh-issue-83499.u3DQJ-.rst
D Misc/NEWS.d/next/Library/2022-06-15-21-35-11.gh-issue-91404.39TZzW.rst
D Misc/NEWS.d/next/Library/2022-06-16-09-24-50.gh-issue-93847.kuv8bN.rst
D Misc/NEWS.d/next/Library/2022-06-16-11-16-53.gh-issue-93820.00X0Y5.rst
D Misc/NEWS.d/next/Library/2022-06-20-23-14-43.gh-issue-94028.UofEcX.rst
D Misc/NEWS.d/next/Library/2022-06-21-11-40-31.gh-issue-84753.FW1pxO.rst
D Misc/NEWS.d/next/Library/2022-06-22-11-16-11.gh-issue-94101.V9vDG8.rst
D Misc/NEWS.d/next/Library/2022-06-23-13-12-05.gh-issue-91742.sNytVX.rst
D Misc/NEWS.d/next/Library/2022-06-24-19-23-59.gh-issue-94207.VhS1eS.rst
D Misc/NEWS.d/next/Library/2022-06-25-16-27-02.gh-issue-94254.beP16v.rst
D Misc/NEWS.d/next/Library/2022-06-29-04-42-56.gh-issue-94398.YOq_bJ.rst
D Misc/NEWS.d/next/Library/2022-06-29-09-48-37.gh-issue-92336.otA6c6.rst
D Misc/NEWS.d/next/Library/2022-07-02-19-46-30.gh-issue-94510.xOatDC.rst
D Misc/NEWS.d/next/Library/2022-07-06-06-02-02.gh-issue-93896.vIgWGr.rst
D Misc/NEWS.d/next/Library/2022-07-06-14-45-12.gh-issue-93910.iZcp67.rst
D Misc/NEWS.d/next/Library/2022-07-06-16-01-08.gh-issue-94607.Q6RYfz.rst
D Misc/NEWS.d/next/Library/2022-07-07-15-46-55.gh-issue-94637.IYEiUM.rst
D Misc/NEWS.d/next/Library/2022-07-11-10-41-48.gh-issue-94736.EbsgeK.rst
D Misc/NEWS.d/next/Security/2022-04-27-18-25-30.gh-issue-68966.gjS8zs.rst
D Misc/NEWS.d/next/Security/2022-05-19-08-53-07.gh-issue-92888.TLtR9W.rst
D Misc/NEWS.d/next/Security/2022-06-03-12-52-53.gh-issue-79096.YVoxgC.rst
D Misc/NEWS.d/next/Security/2022-06-15-20-09-23.gh-issue-87389.QVaC3f.rst
D Misc/NEWS.d/next/Tests/2022-03-14-23-28-17.bpo-47016.K-t2QX.rst
D Misc/NEWS.d/next/Tests/2022-05-25-23-00-35.gh-issue-92886.Y-vrWj.rst
D Misc/NEWS.d/next/Tests/2022-05-25-23-07-15.gh-issue-92886.Aki63_.rst
D Misc/NEWS.d/next/Tests/2022-06-03-12-22-44.gh-issue-89858.ftBvjE.rst
D Misc/NEWS.d/next/Tests/2022-06-03-14-18-37.gh-issue-90473.7iXVRK.rst
D Misc/NEWS.d/next/Tests/2022-06-03-16-26-04.gh-issue-57539.HxWgYO.rst
D Misc/NEWS.d/next/Tests/2022-06-04-12-05-31.gh-issue-90473.RSpjF7.rst
D Misc/NEWS.d/next/Tests/2022-06-05-10-16-45.gh-issue-90473.QMu7A8.rst
D Misc/NEWS.d/next/Tests/2022-06-08-14-17-59.gh-issue-93575.Xb2LNB.rst
D Misc/NEWS.d/next/Tests/2022-06-08-22-32-56.gh-issue-93616.e5Kkx2.rst
D Misc/NEWS.d/next/Tests/2022-06-10-21-18-14.gh-issue-84461.9TAb26.rst
D Misc/NEWS.d/next/Tests/2022-06-17-13-55-11.gh-issue-93957.X4ovYV.rst
D Misc/NEWS.d/next/Tests/2022-06-17-15-20-09.gh-issue-93951.CW1Vv4.rst
D Misc/NEWS.d/next/Tests/2022-06-27-08-53-40.gh-issue-94315.MoZT9t.rst
D Misc/NEWS.d/next/Tests/2022-06-27-21-27-20.gh-issue-94208.VR6HX-.rst
D Misc/NEWS.d/next/Tests/2022-07-05-17-53-13.gh-issue-91330.Qys5IL.rst
D Misc/NEWS.d/next/Tools-Demos/2022-06-29-22-47-11.gh-issue-94430.hdov8L.rst
D Misc/NEWS.d/next/Tools-Demos/2022-07-04-01-37-42.gh-issue-94538.1rgy1Y.rst
D Misc/NEWS.d/next/Windows/2022-03-20-15-47-35.bpo-42658.16eXtb.rst
D Misc/NEWS.d/next/Windows/2022-06-15-01-03-52.gh-issue-93824.mR4mxu.rst
M Include/patchlevel.h
M Lib/pydoc_data/topics.py
M README.rst

diff --git a/Include/patchlevel.h b/Include/patchlevel.h
index 06d20ff72be04..4b2c9ed14c447 100644
--- a/Include/patchlevel.h
+++ b/Include/patchlevel.h
@@ -20,10 +20,10 @@
 #define PY_MINOR_VERSION        11
 #define PY_MICRO_VERSION        0
 #define PY_RELEASE_LEVEL        PY_RELEASE_LEVEL_BETA
-#define PY_RELEASE_SERIAL       3
+#define PY_RELEASE_SERIAL       4
 
 /* Version as a string */
-#define PY_VERSION              "3.11.0b3+"
+#define PY_VERSION              "3.11.0b4"
 /*--end constants--*/
 
 /* Version as a single 4-byte hex number, e.g. 0x010502B2 == 1.5.2b2.
diff --git a/Lib/pydoc_data/topics.py b/Lib/pydoc_data/topics.py
index eaae3630dfe28..99760e6cab21c 100644
--- a/Lib/pydoc_data/topics.py
+++ b/Lib/pydoc_data/topics.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Autogenerated by Sphinx on Wed Jun  1 14:07:03 2022
+# Autogenerated by Sphinx on Mon Jul 11 16:25:08 2022
 topics = {'assert': 'The "assert" statement\n'
            '**********************\n'
            '\n'
@@ -4144,7 +4144,7 @@
                   '   invoking the superclass?s "__new__()" method using\n'
                   '   "super().__new__(cls[, ...])" with appropriate arguments '
                   'and then\n'
-                  '   modifying the newly-created instance as necessary before '
+                  '   modifying the newly created instance as necessary before '
                   'returning\n'
                   '   it.\n'
                   '\n'
@@ -4547,7 +4547,7 @@
                   'Python.This is\n'
                   '     intended to provide protection against a '
                   'denial-of-service caused\n'
-                  '     by carefully-chosen inputs that exploit the worst '
+                  '     by carefully chosen inputs that exploit the worst '
                   'case\n'
                   '     performance of a dict insertion, O(n^2) complexity.  '
                   'See\n'
@@ -9076,7 +9076,7 @@
                  '   invoking the superclass?s "__new__()" method using\n'
                  '   "super().__new__(cls[, ...])" with appropriate arguments '
                  'and then\n'
-                 '   modifying the newly-created instance as necessary before '
+                 '   modifying the newly created instance as necessary before '
                  'returning\n'
                  '   it.\n'
                  '\n'
@@ -9477,7 +9477,7 @@
                  'is\n'
                  '     intended to provide protection against a '
                  'denial-of-service caused\n'
-                 '     by carefully-chosen inputs that exploit the worst case\n'
+                 '     by carefully chosen inputs that exploit the worst case\n'
                  '     performance of a dict insertion, O(n^2) complexity.  '
                  'See\n'
                  '     http://www.ocert.org/advisories/ocert-2011-003.html '
diff --git a/Misc/NEWS.d/3.11.0b4.rst b/Misc/NEWS.d/3.11.0b4.rst
new file mode 100644
index 0000000000000..144a73222001c
--- /dev/null
+++ b/Misc/NEWS.d/3.11.0b4.rst
@@ -0,0 +1,1120 @@
+.. date: 2022-06-15-20-09-23
+.. gh-issue: 87389
+.. nonce: QVaC3f
+.. release date: 2022-07-11
+.. section: Security
+
+:mod:`http.server`: Fix an open redirection vulnerability in the HTTP server
+when an URI path starts with ``//``.  Vulnerability discovered, and initial
+fix proposed, by Hamza Avvan.
+
+..
+
+.. date: 2022-06-03-12-52-53
+.. gh-issue: 79096
+.. nonce: YVoxgC
+.. section: Security
+
+LWPCookieJar and MozillaCookieJar create files with file mode 600 instead of
+644 (Microsoft Windows is not affected)
+
+..
+
+.. date: 2022-05-19-08-53-07
+.. gh-issue: 92888
+.. nonce: TLtR9W
+.. section: Security
+
+Fix ``memoryview`` use after free when accessing the backing buffer in
+certain cases.
+
+..
+
+.. date: 2022-04-27-18-25-30
+.. gh-issue: 68966
+.. nonce: gjS8zs
+.. section: Security
+
+The deprecated mailcap module now refuses to inject unsafe text (filenames,
+MIME types, parameters) into shell commands. Instead of using such text, it
+will warn and act as if a match was not found (or for test commands, as if
+the test failed).
+
+..
+
+.. date: 2022-07-08-16-44-11
+.. gh-issue: 94694
+.. nonce: VkL2CM
+.. section: Core and Builtins
+
+Fix an issue that could cause code with multi-line method lookups to have
+misleading or incorrect column offset information. In some cases (when
+compiling a hand-built AST) this could have resulted in a hard crash of the
+interpreter.
+
+..
+
+.. date: 2022-07-08-11-44-45
+.. gh-issue: 93252
+.. nonce: i2358c
+.. section: Core and Builtins
+
+Fix an issue that caused internal frames to outlive failed Python function
+calls, possibly resulting in memory leaks or hard interpreter crashes.
+
+..
+
+.. date: 2022-07-07-21-13-25
+.. gh-issue: 94215
+.. nonce: _Sv9Ms
+.. section: Core and Builtins
+
+Fix an issue where exceptions raised by line-tracing events would cause
+frames to be left in an invalid state, possibly resulting in a hard crash of
+the interpreter.
+
+..
+
+.. date: 2022-07-06-14-02-26
+.. gh-issue: 92228
+.. nonce: 44Cbly
+.. section: Core and Builtins
+
+Disable the compiler's inline-small-exit-blocks optimization for exit blocks
+that are associated with source code lines. This fixes a bug where the
+debugger cannot tell where an exception handler ends and the following code
+block begins.
+
+..
+
+.. date: 2022-07-01-20-00-19
+.. gh-issue: 94485
+.. nonce: mo5st7
+.. section: Core and Builtins
+
+Line number of a module's ``RESUME`` instruction is set to 0 as specified in
+:pep:`626`.
+
+..
+
+.. date: 2022-06-30-15-07-26
+.. gh-issue: 94438
+.. nonce: btzHSk
+.. section: Core and Builtins
+
+Account for instructions that can push NULL to the stack when setting line
+number in a frame. Prevents some (unlikely) crashes.
+
+..
+
+.. date: 2022-06-29-22-18-36
+.. gh-issue: 91719
+.. nonce: 3APYYI
+.. section: Core and Builtins
+
+Reload ``opcode`` when raising ``unknown opcode error`` in the interpreter
+main loop, for C compilers to generate dispatching code independently.
+
+..
+
+.. date: 2022-06-29-15-45-04
+.. gh-issue: 94329
+.. nonce: olUQyk
+.. section: Core and Builtins
+
+Compile and run code with unpacking of extremely large sequences (1000s of
+elements). Such code failed to compile. It now compiles and runs correctly.
+
+..
+
+.. date: 2022-06-28-14-20-36
+.. gh-issue: 94360
+.. nonce: DiEnen
+.. section: Core and Builtins
+
+Fixed a tokenizer crash when reading encoded files with syntax errors from
+``stdin`` with non utf-8 encoded text. Patch by Pablo Galindo
+
+..
+
+.. date: 2022-06-28-12-41-17
+.. gh-issue: 88116
+.. nonce: A7fEl_
+.. section: Core and Builtins
+
+Fix an issue when reading line numbers from code objects if the encoded line
+numbers are close to ``INT_MIN``. Patch by Pablo Galindo
+
+..
+
+.. date: 2022-06-28-10-08-06
+.. gh-issue: 94262
+.. nonce: m-HWUZ
+.. section: Core and Builtins
+
+Don't create frame objects for incomplete frames. Prevents the creation of
+generators and closures from being observable to Python and C extensions,
+restoring the behavior of 3.10 and earlier.
+
+..
+
+.. date: 2022-06-26-14-37-03
+.. gh-issue: 94192
+.. nonce: ab7tn7
+.. section: Core and Builtins
+
+Fix error for dictionary literals with invalid expression as value.
+
+..
+
+.. date: 2022-06-24-14-06-20
+.. gh-issue: 93883
+.. nonce: 8jVQQ4
+.. section: Core and Builtins
+
+Revise the display strategy of traceback enhanced error locations.  The
+indicators are only shown when the location doesn't span the whole line.
+
+..
+
+.. date: 2022-06-20-13-48-57
+.. gh-issue: 94021
+.. nonce: o78q3G
+.. section: Core and Builtins
+
+Fix unreachable code warning in ``Python/specialize.c``.
+
+..
+
+.. date: 2022-06-13-13-55-34
+.. gh-issue: 93516
+.. nonce: HILrDl
+.. section: Core and Builtins
+
+Store offset of first traceable instruction in code object to avoid having
+to recompute it for each instruction when tracing.
+
+..
+
+.. date: 2022-06-13-10-48-09
+.. gh-issue: 93516
+.. nonce: yJSait
+.. section: Core and Builtins
+
+Lazily create a table mapping bytecode offsets to line numbers to speed up
+calculation of line numbers when tracing.
+
+..
+
+.. date: 2022-06-12-19-31-56
+.. gh-issue: 89828
+.. nonce: bq02M7
+.. section: Core and Builtins
+
+:class:`types.GenericAlias` no longer relays the ``__class__`` attribute.
+For example, ``isinstance(list[int], type)`` no longer returns ``True``.
+
+..
+
+.. date: 2022-06-10-12-03-17
+.. gh-issue: 93671
+.. nonce: idkQqG
+.. section: Core and Builtins
+
+Fix some exponential backtrace case happening with deeply nested sequence
+patterns in match statements. Patch by Pablo Galindo
+
+..
+
+.. date: 2022-06-10-10-31-18
+.. gh-issue: 93662
+.. nonce: -7RSC1
+.. section: Core and Builtins
+
+Make sure that the end column offsets are correct in multi-line method
+calls. Previously, the end column could precede the column offset.
+
+..
+
+.. date: 2022-06-09-19-19-02
+.. gh-issue: 93461
+.. nonce: 5DqP1e
+.. section: Core and Builtins
+
+:func:`importlib.invalidate_caches` now drops entries from
+:data:`sys.path_importer_cache` with a relative path as name. This solves a
+caching issue when a process changes its current working directory.
+
+``FileFinder`` no longer inserts a dot in the path, e.g. ``/egg/./spam`` is
+now ``/egg/spam``.
+
+..
+
+.. date: 2022-06-01-17-47-40
+.. gh-issue: 93418
+.. nonce: 24dJuc
+.. section: Core and Builtins
+
+Fixed an assert where an f-string has an equal sign '=' following an
+expression, but there's no trailing brace. For example, f"{i=".
+
+..
+
+.. date: 2022-05-31-16-36-30
+.. gh-issue: 93382
+.. nonce: Jf6gAj
+.. section: Core and Builtins
+
+Cache the result of :c:func:`PyCode_GetCode` function to restore the O(1)
+lookup of the :attr:`~types.CodeType.co_code` attribute.
+
+..
+
+.. date: 2022-05-30-15-35-42
+.. gh-issue: 93354
+.. nonce: RZk8gs
+.. section: Core and Builtins
+
+Use exponential backoff for specialization counters in the interpreter. Can
+reduce the number of failed specializations significantly and avoid slowdown
+for those parts of a program that are not suitable for specialization.
+
+..
+
+.. date: 2022-05-20-09-25-34
+.. gh-issue: 93021
+.. nonce: k3Aji2
+.. section: Core and Builtins
+
+Fix the :attr:`__text_signature__` for :meth:`__get__` methods implemented
+in C. Patch by Jelle Zijlstra.
+
+..
+
+.. date: 2022-05-18-18-34-45
+.. gh-issue: 92930
+.. nonce: kpYPOb
+.. section: Core and Builtins
+
+Fixed a crash in ``_pickle.c`` from mutating collections during
+``__reduce__`` or ``persistent_id``.
+
+..
+
+.. date: 2022-05-18-08-32-33
+.. gh-issue: 92914
+.. nonce: tJUeTD
+.. section: Core and Builtins
+
+Always round the allocated size for lists up to the nearest even number.
+
+..
+
+.. date: 2022-05-17-20-41-43
+.. gh-issue: 92858
+.. nonce: eIXJTn
+.. section: Core and Builtins
+
+Improve error message for some suites with syntax error before ':'
+
+..
+
+.. bpo: 46142
+.. date: 2022-01-02-14-53-59
+.. nonce: WayjgT
+.. section: Core and Builtins
+
+Make ``--help`` output shorter by moving some info to the new ``--help-env``
+and ``--help-xoptions`` command-line options. Also add ``--help-all`` option
+to print complete usage.
+
+..
+
+.. date: 2022-07-11-10-41-48
+.. gh-issue: 94736
+.. nonce: EbsgeK
+.. section: Library
+
+Fix crash when deallocating an instance of a subclass of
+``_multiprocessing.SemLock``. Patch by Kumar Aditya.
+
+..
+
+.. date: 2022-07-07-15-46-55
+.. gh-issue: 94637
+.. nonce: IYEiUM
+.. section: Library
+
+:meth:`SSLContext.set_default_verify_paths` now releases the GIL around
+``SSL_CTX_set_default_verify_paths`` call. The function call performs I/O
+and CPU intensive work.
+
+..
+
+.. date: 2022-07-06-16-01-08
+.. gh-issue: 94607
+.. nonce: Q6RYfz
+.. section: Library
+
+Fix subclassing complex generics with type variables in :mod:`typing`.
+Previously an error message saying ``Some type variables ... are not listed
+in Generic[...]`` was shown. :mod:`typing` no longer populates
+``__parameters__`` with the ``__parameters__`` of a Python class.
+
+..
+
+.. date: 2022-07-06-14-45-12
+.. gh-issue: 93910
+.. nonce: iZcp67
+.. section: Library
+
+The ability to access the other values of an enum on an enum (e.g.
+``Color.RED.BLUE``) has been restored in order to fix a performance
+regression.
+
+..
+
+.. date: 2022-07-06-06-02-02
+.. gh-issue: 93896
+.. nonce: vIgWGr
+.. section: Library
+
+Fix :func:`asyncio.run` and :class:`unittest.IsolatedAsyncioTestCase` to
+always the set event loop as it was done in Python 3.10 and earlier. Patch
+by Kumar Aditya.
+
+..
+
+.. date: 2022-07-02-19-46-30
+.. gh-issue: 94510
+.. nonce: xOatDC
+.. section: Library
+
+Re-entrant calls to :func:`sys.setprofile` and :func:`sys.settrace` now
+raise :exc:`RuntimeError`. Patch by Pablo Galindo.
+
+..
+
+.. date: 2022-06-29-09-48-37
+.. gh-issue: 92336
+.. nonce: otA6c6
+.. section: Library
+
+Fix bug where :meth:`linecache.getline` fails on bad files with
+:exc:`UnicodeDecodeError` or :exc:`SyntaxError`. It now returns an empty
+string as per the documentation.
+
+..
+
+.. date: 2022-06-29-04-42-56
+.. gh-issue: 94398
+.. nonce: YOq_bJ
+.. section: Library
+
+Once a :class:`asyncio.TaskGroup` has started shutting down (i.e., at least
+one task has failed and the task group has started cancelling the remaining
+tasks), it should not be possible to add new tasks to the task group.
+
+..
+
+.. date: 2022-06-25-16-27-02
+.. gh-issue: 94254
+.. nonce: beP16v
+.. section: Library
+
+Fixed types of :mod:`struct` module to be immutable. Patch by Kumar Aditya.
+
+..
+
+.. date: 2022-06-24-19-23-59
+.. gh-issue: 94207
+.. nonce: VhS1eS
+.. section: Library
+
+Made :class:`_struct.Struct` GC-tracked in order to fix a reference leak in
+the :mod:`_struct` module.
+
+..
+
+.. date: 2022-06-23-13-12-05
+.. gh-issue: 91742
+.. nonce: sNytVX
+.. section: Library
+
+Fix :mod:`pdb` crash after jump caused by a null pointer dereference. Patch
+by Kumar Aditya.
+
+..
+
+.. date: 2022-06-22-11-16-11
+.. gh-issue: 94101
+.. nonce: V9vDG8
+.. section: Library
+
+Manual instantiation of :class:`ssl.SSLSession` objects is no longer allowed
+as it lead to misconfigured instances that crashed the interpreter when
+attributes where accessed on them.
+
+..
+
+.. date: 2022-06-21-11-40-31
+.. gh-issue: 84753
+.. nonce: FW1pxO
+.. section: Library
+
+:func:`inspect.iscoroutinefunction`, :func:`inspect.isgeneratorfunction`,
+and :func:`inspect.isasyncgenfunction` now properly return ``True`` for
+duck-typed function-like objects like instances of
+:class:`unittest.mock.AsyncMock`.
+
+This makes :func:`inspect.iscoroutinefunction` consistent with the behavior
+of :func:`asyncio.iscoroutinefunction`.  Patch by Mehdi ABAAKOUK.
+
+..
+
+.. date: 2022-06-20-23-14-43
+.. gh-issue: 94028
+.. nonce: UofEcX
+.. section: Library
+
+Fix a regression in the :mod:`sqlite3` where statement objects were not
+properly cleared and reset after use in cursor iters. The regression was
+introduced by PR 27884 in Python 3.11a1. Patch by Erlend E. Aasland.
+
+..
+
+.. date: 2022-06-16-11-16-53
+.. gh-issue: 93820
+.. nonce: 00X0Y5
+.. section: Library
+
+Pickle :class:`enum.Flag` by name.
+
+..
+
+.. date: 2022-06-16-09-24-50
+.. gh-issue: 93847
+.. nonce: kuv8bN
+.. section: Library
+
+Fix repr of enum of generic aliases.
+
+..
+
+.. date: 2022-06-15-21-35-11
+.. gh-issue: 91404
+.. nonce: 39TZzW
+.. section: Library
+
+Revert the :mod:`re` memory leak when a match is terminated by a signal or
+memory allocation failure as the implemented fix caused a major performance
+regression.
+
+..
+
+.. date: 2022-06-15-21-28-16
+.. gh-issue: 83499
+.. nonce: u3DQJ-
+.. section: Library
+
+Fix double closing of file description in :mod:`tempfile`.
+
+..
+
+.. date: 2022-06-15-21-20-02
+.. gh-issue: 93820
+.. nonce: FAMLY8
+.. section: Library
+
+Fixed a regression when :func:`copy.copy`-ing :class:`enum.Flag` with
+multiple flag members.
+
+..
+
+.. date: 2022-06-11-13-32-17
+.. gh-issue: 79512
+.. nonce: A1KTDr
+.. section: Library
+
+Fixed names and ``__module__`` value of :mod:`weakref` classes
+:class:`~weakref.ReferenceType`, :class:`~weakref.ProxyType`,
+:class:`~weakref.CallableProxyType`. It makes them pickleable.
+
+..
+
+.. date: 2022-06-09-17-15-26
+.. gh-issue: 91389
+.. nonce: OE4vS5
+.. section: Library
+
+Fix an issue where :mod:`dis` utilities could report missing or incorrect
+position information in the presence of ``CACHE`` entries.
+
+..
+
+.. date: 2022-06-09-14-44-21
+.. gh-issue: 93626
+.. nonce: sfghs46
+.. section: Library
+
+Set ``__future__.annotations`` to have a ``None`` mandatoryRelease to
+indicate that it is currently 'TBD'.
+
+..
+
+.. date: 2022-06-09-10-12-55
+.. gh-issue: 90473
+.. nonce: 683m_C
+.. section: Library
+
+Emscripten and WASI have no home directory and cannot provide :pep:`370`
+user site directory.
+
+..
+
+.. date: 2022-06-08-20-11-02
+.. gh-issue: 90494
+.. nonce: LIZT85
+.. section: Library
+
+:func:`copy.copy` and :func:`copy.deepcopy` now always raise a TypeError if
+``__reduce__()`` returns a tuple with length 6 instead of silently ignore
+the 6th item or produce incorrect result.
+
+..
+
+.. date: 2022-06-07-14-53-46
+.. gh-issue: 90549
+.. nonce: T4FMKY
+.. section: Library
+
+Fix a multiprocessing bug where a global named resource (such as a
+semaphore) could leak when a child process is spawned (as opposed to
+forked).
+
+..
+
+.. date: 2022-06-06-13-19-43
+.. gh-issue: 93521
+.. nonce: _vE8m9
+.. section: Library
+
+Fixed a case where dataclasses would try to add ``__weakref__`` into the
+``__slots__`` for a dataclass that specified ``weakref_slot=True`` when it
+was already defined in one of its bases. This resulted in a ``TypeError``
+upon the new class being created.
+
+..
+
+.. date: 2022-06-06-12-58-27
+.. gh-issue: 79579
+.. nonce: e8rB-M
+.. section: Library
+
+:mod:`sqlite3` now correctly detects DML queries with leading comments.
+Patch by Erlend E. Aasland.
+
+..
+
+.. date: 2022-06-05-22-22-42
+.. gh-issue: 93421
+.. nonce: 43UO_8
+.. section: Library
+
+Update :data:`sqlite3.Cursor.rowcount` when a DML statement has run to
+completion. This fixes the row count for SQL queries like ``UPDATE ...
+RETURNING``. Patch by Erlend E. Aasland.
+
+..
+
+.. date: 2022-06-01-11-24-13
+.. gh-issue: 91162
+.. nonce: NxvU_u
+.. section: Library
+
+Support splitting of unpacked arbitrary-length tuple over ``TypeVar`` and
+``TypeVarTuple`` parameters. For example:
+
+* ``A[T, *Ts][*tuple[int, ...]]`` -> ``A[int, *tuple[int, ...]]``
+* ``A[*Ts, T][*tuple[int, ...]]`` -> ``A[*tuple[int, ...], int]``
+
+..
+
+.. date: 2022-05-31-14-58-40
+.. gh-issue: 93353
+.. nonce: 9Hvm6o
+.. section: Library
+
+Fix the :func:`importlib.resources.as_file` context manager to remove the
+temporary file if destroyed late during Python finalization: keep a local
+reference to the :func:`os.remove` function. Patch by Victor Stinner.
+
+..
+
+.. date: 2022-05-30-21-42-50
+.. gh-issue: 83658
+.. nonce: 01Ntx0
+.. section: Library
+
+Make :class:`multiprocessing.Pool` raise an exception if
+``maxtasksperchild`` is not ``None`` or a positive int.
+
+..
+
+.. date: 2022-05-26-23-10-55
+.. gh-issue: 93156
+.. nonce: 4XfDVN
+.. section: Library
+
+Accessing the :attr:`pathlib.PurePath.parents` sequence of an absolute path
+using negative index values produced incorrect results.
+
+..
+
+.. date: 2022-05-24-11-19-04
+.. gh-issue: 74696
+.. nonce: -cnf-A
+.. section: Library
+
+:func:`shutil.make_archive` no longer temporarily changes the current
+working directory during creation of standard ``.zip`` or tar archives.
+
+..
+
+.. date: 2022-05-22-16-08-01
+.. gh-issue: 89973
+.. nonce: jc-Q4g
+.. section: Library
+
+Fix :exc:`re.error` raised in :mod:`fnmatch` if the pattern contains a
+character range with upper bound lower than lower bound (e.g. ``[c-a]``).
+Now such ranges are interpreted as empty ranges.
+
+..
+
+.. date: 2022-05-19-17-49-58
+.. gh-issue: 92932
+.. nonce: o2peTh
+.. section: Library
+
+Now :func:`~dis.dis` and :func:`~dis.get_instructions` handle operand values
+for instructions prefixed by ``EXTENDED_ARG_QUICK``. Patch by Sam Gross and
+Dong-hee Na.
+
+..
+
+.. date: 2022-04-15-17-38-55
+.. gh-issue: 91577
+.. nonce: Ah7cLL
+.. section: Library
+
+Move imports in :class:`~multiprocessing.SharedMemory` methods to module
+level so that they can be executed late in python finalization.
+
+..
+
+.. date: 2022-04-11-16-55-41
+.. gh-issue: 91456
+.. nonce: DK3KKl
+.. section: Library
+
+Deprecate current default auto() behavior:  In 3.13 the default will be for
+for auto() to always return the largest member value incremented by 1, and
+to raise if incompatible value types are used.
+
+..
+
+.. bpo: 47231
+.. date: 2022-04-08-22-12-11
+.. nonce: lvyglt
+.. section: Library
+
+Fixed an issue with inconsistent trailing slashes in tarfile longname
+directories.
+
+..
+
+.. bpo: 46755
+.. date: 2022-02-15-12-40-48
+.. nonce: zePJfx
+.. section: Library
+
+In :class:`QueueHandler`, clear ``stack_info`` from :class:`LogRecord` to
+prevent stack trace from being written twice.
+
+..
+
+.. bpo: 46197
+.. date: 2022-01-03-15-07-06
+.. nonce: Z0djv6
+.. section: Library
+
+Fix :mod:`ensurepip` environment isolation for subprocess running ``pip``.
+
+..
+
+.. bpo: 45924
+.. date: 2021-12-27-15-32-15
+.. nonce: 0ZpHX2
+.. section: Library
+
+Fix :mod:`asyncio` incorrect traceback when future's exception is raised
+multiple times. Patch by Kumar Aditya.
+
+..
+
+.. bpo: 34828
+.. date: 2018-09-28-22-18-03
+.. nonce: 5Zyi_S
+.. section: Library
+
+:meth:`sqlite3.Connection.iterdump` now handles databases that use
+``AUTOINCREMENT`` in one or more tables.
+
+..
+
+.. date: 2022-07-07-08-42-05
+.. gh-issue: 94321
+.. nonce: pmCIPb
+.. section: Documentation
+
+Document the :pep:`246` style protocol type
+:class:`sqlite3.PrepareProtocol`.
+
+..
+
+.. date: 2022-06-16-10-10-59
+.. gh-issue: 61162
+.. nonce: 1ypkG8
+.. section: Documentation
+
+Clarify :mod:`sqlite3` behavior when
+:ref:`sqlite3-connection-context-manager`.
+
+..
+
+.. date: 2022-06-15-12-12-49
+.. gh-issue: 87260
+.. nonce: epyI7D
+.. section: Documentation
+
+Align :mod:`sqlite3` argument specs with the actual implementation.
+
+..
+
+.. date: 2022-05-29-21-22-54
+.. gh-issue: 86986
+.. nonce: lFXw8j
+.. section: Documentation
+
+The minimum Sphinx version required to build the documentation is now 3.2.
+
+..
+
+.. date: 2022-05-26-14-51-25
+.. gh-issue: 88831
+.. nonce: 5Cccr5
+.. section: Documentation
+
+Augmented documentation of asyncio.create_task(). Clarified the need to keep
+strong references to tasks and added a code snippet detailing how to to
+this.
+
+..
+
+.. bpo: 47161
+.. date: 2022-03-30-17-56-01
+.. nonce: gesHfS
+.. section: Documentation
+
+Document that :class:`pathlib.PurePath` does not collapse initial double
+slashes because they denote UNC paths.
+
+..
+
+.. date: 2022-07-05-17-53-13
+.. gh-issue: 91330
+.. nonce: Qys5IL
+.. section: Tests
+
+Added more tests for :mod:`dataclasses` to cover behavior with data
+descriptor-based fields.
+
+# Write your Misc/NEWS entry below.  It should be a simple ReST paragraph. #
+Don't start with "- Issue #<n>: " or "- gh-issue-<n>: " or that sort of
+stuff.
+###########################################################################
+
+..
+
+.. date: 2022-06-27-21-27-20
+.. gh-issue: 94208
+.. nonce: VR6HX-
+.. section: Tests
+
+``test_ssl`` is now checking for supported TLS version and protocols in more
+tests.
+
+..
+
+.. date: 2022-06-27-08-53-40
+.. gh-issue: 94315
+.. nonce: MoZT9t
+.. section: Tests
+
+Tests now check for DAC override capability instead of relying on
+:func:`os.geteuid`.
+
+..
+
+.. date: 2022-06-17-15-20-09
+.. gh-issue: 93951
+.. nonce: CW1Vv4
+.. section: Tests
+
+In test_bdb.StateTestCase.test_skip, avoid including auxiliary importers.
+
+..
+
+.. date: 2022-06-17-13-55-11
+.. gh-issue: 93957
+.. nonce: X4ovYV
+.. section: Tests
+
+Provide nicer error reporting from subprocesses in
+test_venv.EnsurePipTest.test_with_pip.
+
+..
+
+.. date: 2022-06-10-21-18-14
+.. gh-issue: 84461
+.. nonce: 9TAb26
+.. section: Tests
+
+``run_tests.py`` now handles cross compiling env vars correctly and pass
+``HOSTRUNNER`` to regression tests.
+
+..
+
+.. date: 2022-06-08-22-32-56
+.. gh-issue: 93616
+.. nonce: e5Kkx2
+.. section: Tests
+
+``test_modulefinder`` now creates a temporary directory in
+``ModuleFinderTest.setUp()`` instead of module scope.
+
+..
+
+.. date: 2022-06-08-14-17-59
+.. gh-issue: 93575
+.. nonce: Xb2LNB
+.. section: Tests
+
+Fix issue with test_unicode test_raiseMemError. The test case now use
+``test.support.calcobjsize`` to calculate size of PyUnicode structs.
+:func:`sys.getsizeof` may return different size when string has UTF-8
+memory.
+
+..
+
+.. date: 2022-06-05-10-16-45
+.. gh-issue: 90473
+.. nonce: QMu7A8
+.. section: Tests
+
+WASI does not have a ``chmod(2)`` syscall. :func:`os.chmod` is now a dummy
+function on WASI. Skip all tests that depend on working :func:`os.chmod`.
+
+..
+
+.. date: 2022-06-04-12-05-31
+.. gh-issue: 90473
+.. nonce: RSpjF7
+.. section: Tests
+
+Skip tests on WASI that require symlinks with absolute paths.
+
+..
+
+.. date: 2022-06-03-16-26-04
+.. gh-issue: 57539
+.. nonce: HxWgYO
+.. section: Tests
+
+Increase calendar test coverage for
+:meth:`calendar.LocaleTextCalendar.formatweekday`.
+
+..
+
+.. date: 2022-06-03-14-18-37
+.. gh-issue: 90473
+.. nonce: 7iXVRK
+.. section: Tests
+
+Skip symlink tests on WASI. wasmtime uses ``openat2(2)`` with
+``RESOLVE_BENEATH`` flag, which prevents symlinks with absolute paths.
+
+..
+
+.. date: 2022-06-03-12-22-44
+.. gh-issue: 89858
+.. nonce: ftBvjE
+.. section: Tests
+
+Fix ``test_embed`` for out-of-tree builds. Patch by Kumar Aditya.
+
+..
+
+.. date: 2022-05-25-23-07-15
+.. gh-issue: 92886
+.. nonce: Aki63_
+.. section: Tests
+
+Fixing tests that fail when running with optimizations (``-O``) in
+``test_imaplib.py``.
+
+..
+
+.. date: 2022-05-25-23-00-35
+.. gh-issue: 92886
+.. nonce: Y-vrWj
+.. section: Tests
+
+Fixing tests that fail when running with optimizations (``-O``) in
+``test_zipimport.py``
+
+..
+
+.. bpo: 47016
+.. date: 2022-03-14-23-28-17
+.. nonce: K-t2QX
+.. section: Tests
+
+Create a GitHub Actions workflow for verifying bundled pip and setuptools.
+Patch by Illia Volochii and Adam Turner.
+
+..
+
+.. date: 2022-06-29-08-58-31
+.. gh-issue: 94404
+.. nonce: 3MadM6
+.. section: Build
+
+``makesetup`` now works around an issue with sed on macOS and uses correct
+CFLAGS for object files that end up in a shared extension. Module CFLAGS are
+used before PY_STDMODULE_CFLAGS to avoid clashes with system headers.
+
+..
+
+.. date: 2022-06-08-14-28-03
+.. gh-issue: 93584
+.. nonce: 0xfHOK
+.. section: Build
+
+Address race condition in ``Makefile`` when installing a PGO build. All
+``test`` and ``install`` targets now depend on ``all`` target.
+
+..
+
+.. date: 2022-06-04-12-53-53
+.. gh-issue: 93491
+.. nonce: ehM211
+.. section: Build
+
+``configure`` now detects and reports :pep:`11` support tiers.
+
+..
+
+.. date: 2022-06-15-01-03-52
+.. gh-issue: 93824
+.. nonce: mR4mxu
+.. section: Windows
+
+Drag and drop of files onto Python files in Windows Explorer has been
+enabled for Windows ARM64.
+
+..
+
+.. bpo: 42658
+.. date: 2022-03-20-15-47-35
+.. nonce: 16eXtb
+.. section: Windows
+
+Support native Windows case-insensitive path comparisons by using
+``LCMapStringEx`` instead of :func:`str.lower` in :func:`ntpath.normcase`.
+Add ``LCMapStringEx`` to the :mod:`_winapi` module.
+
+..
+
+.. date: 2022-07-04-01-37-42
+.. gh-issue: 94538
+.. nonce: 1rgy1Y
+.. section: Tools/Demos
+
+Fix Argument Clinic output to custom file destinations. Patch by Erlend E.
+Aasland.
+
+..
+
+.. date: 2022-06-29-22-47-11
+.. gh-issue: 94430
+.. nonce: hdov8L
+.. section: Tools/Demos
+
+Allow parameters named ``module`` and ``self`` with custom C names in
+Argument Clinic. Patch by Erlend E. Aasland
+
+..
+
+.. date: 2022-06-17-13-41-38
+.. gh-issue: 93937
+.. nonce: uKVTEh
+.. section: C API
+
+The following frame functions and type are now directly available with
+``#include <Python.h>``, it's no longer needed to add ``#include
+<frameobject.h>``:
+
+* :c:func:`PyFrame_Check`
+* :c:func:`PyFrame_GetBack`
+* :c:func:`PyFrame_GetBuiltins`
+* :c:func:`PyFrame_GetGenerator`
+* :c:func:`PyFrame_GetGlobals`
+* :c:func:`PyFrame_GetLasti`
+* :c:func:`PyFrame_GetLocals`
+* :c:type:`PyFrame_Type`
+
+Patch by Victor Stinner.
+
+..
+
+.. date: 2022-06-13-21-37-31
+.. gh-issue: 91321
+.. nonce: DgJFvS
+.. section: C API
+
+Fix the compatibility of the Python C API with C++ older than C++11. Patch
+by Victor Stinner.
+
+..
+
+.. date: 2022-06-10-23-41-48
+.. gh-issue: 91731
+.. nonce: fhYUQG
+.. section: C API
+
+Avoid defining the ``static_assert`` when compiling with C++ 11, where this
+is a keyword and redefining it can lead to undefined behavior. Patch by
+Pablo Galindo
+
+..
+
+.. date: 2022-06-04-13-15-41
+.. gh-issue: 93442
+.. nonce: 4M4NDb
+.. section: C API
+
+Add C++ overloads for _Py_CAST_impl() to handle 0/NULL.  This will allow C++
+extensions that pass 0 or NULL to macros using _Py_CAST() to continue to
+compile.
diff --git a/Misc/NEWS.d/next/Build/2022-06-04-12-53-53.gh-issue-93491.ehM211.rst b/Misc/NEWS.d/next/Build/2022-06-04-12-53-53.gh-issue-93491.ehM211.rst
deleted file mode 100644
index b3560fac81d2a..0000000000000
--- a/Misc/NEWS.d/next/Build/2022-06-04-12-53-53.gh-issue-93491.ehM211.rst
+++ /dev/null
@@ -1 +0,0 @@
-``configure`` now detects and reports :pep:`11` support tiers.
diff --git a/Misc/NEWS.d/next/Build/2022-06-08-14-28-03.gh-issue-93584.0xfHOK.rst b/Misc/NEWS.d/next/Build/2022-06-08-14-28-03.gh-issue-93584.0xfHOK.rst
deleted file mode 100644
index 07ca5fad592b2..0000000000000
--- a/Misc/NEWS.d/next/Build/2022-06-08-14-28-03.gh-issue-93584.0xfHOK.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Address race condition in ``Makefile`` when installing a PGO build. All
-``test`` and ``install`` targets now depend on ``all`` target.
diff --git a/Misc/NEWS.d/next/Build/2022-06-29-08-58-31.gh-issue-94404.3MadM6.rst b/Misc/NEWS.d/next/Build/2022-06-29-08-58-31.gh-issue-94404.3MadM6.rst
deleted file mode 100644
index c7c47533c54ae..0000000000000
--- a/Misc/NEWS.d/next/Build/2022-06-29-08-58-31.gh-issue-94404.3MadM6.rst
+++ /dev/null
@@ -1,3 +0,0 @@
-``makesetup`` now works around an issue with sed on macOS and uses correct
-CFLAGS for object files that end up in a shared extension. Module CFLAGS
-are used before PY_STDMODULE_CFLAGS to avoid clashes with system headers.
diff --git a/Misc/NEWS.d/next/C API/2022-06-04-13-15-41.gh-issue-93442.4M4NDb.rst b/Misc/NEWS.d/next/C API/2022-06-04-13-15-41.gh-issue-93442.4M4NDb.rst
deleted file mode 100644
index f48ed37c81445..0000000000000
--- a/Misc/NEWS.d/next/C API/2022-06-04-13-15-41.gh-issue-93442.4M4NDb.rst	
+++ /dev/null
@@ -1,3 +0,0 @@
-Add C++ overloads for _Py_CAST_impl() to handle 0/NULL.  This will allow C++
-extensions that pass 0 or NULL to macros using _Py_CAST() to continue to
-compile.
diff --git a/Misc/NEWS.d/next/C API/2022-06-10-23-41-48.gh-issue-91731.fhYUQG.rst b/Misc/NEWS.d/next/C API/2022-06-10-23-41-48.gh-issue-91731.fhYUQG.rst
deleted file mode 100644
index 185671ca4fcfb..0000000000000
--- a/Misc/NEWS.d/next/C API/2022-06-10-23-41-48.gh-issue-91731.fhYUQG.rst	
+++ /dev/null
@@ -1,3 +0,0 @@
-Avoid defining the ``static_assert`` when compiling with C++ 11, where this
-is a keyword and redefining it can lead to undefined behavior. Patch by
-Pablo Galindo
diff --git a/Misc/NEWS.d/next/C API/2022-06-13-21-37-31.gh-issue-91321.DgJFvS.rst b/Misc/NEWS.d/next/C API/2022-06-13-21-37-31.gh-issue-91321.DgJFvS.rst
deleted file mode 100644
index 57c39bc8d83c8..0000000000000
--- a/Misc/NEWS.d/next/C API/2022-06-13-21-37-31.gh-issue-91321.DgJFvS.rst	
+++ /dev/null
@@ -1,2 +0,0 @@
-Fix the compatibility of the Python C API with C++ older than C++11. Patch by
-Victor Stinner.
diff --git a/Misc/NEWS.d/next/C API/2022-06-17-13-41-38.gh-issue-93937.uKVTEh.rst b/Misc/NEWS.d/next/C API/2022-06-17-13-41-38.gh-issue-93937.uKVTEh.rst
deleted file mode 100644
index c0a0745aa0dd2..0000000000000
--- a/Misc/NEWS.d/next/C API/2022-06-17-13-41-38.gh-issue-93937.uKVTEh.rst	
+++ /dev/null
@@ -1,14 +0,0 @@
-The following frame functions and type are now directly available with
-``#include <Python.h>``, it's no longer needed to add ``#include
-<frameobject.h>``:
-
-* :c:func:`PyFrame_Check`
-* :c:func:`PyFrame_GetBack`
-* :c:func:`PyFrame_GetBuiltins`
-* :c:func:`PyFrame_GetGenerator`
-* :c:func:`PyFrame_GetGlobals`
-* :c:func:`PyFrame_GetLasti`
-* :c:func:`PyFrame_GetLocals`
-* :c:type:`PyFrame_Type`
-
-Patch by Victor Stinner.
diff --git a/Misc/NEWS.d/next/Core and Builtins/2022-01-02-14-53-59.bpo-46142.WayjgT.rst b/Misc/NEWS.d/next/Core and Builtins/2022-01-02-14-53-59.bpo-46142.WayjgT.rst
deleted file mode 100644
index 3c62c54289946..0000000000000
--- a/Misc/NEWS.d/next/Core and Builtins/2022-01-02-14-53-59.bpo-46142.WayjgT.rst	
+++ /dev/null
@@ -1,3 +0,0 @@
-Make ``--help`` output shorter by moving some info to the new
-``--help-env`` and ``--help-xoptions`` command-line options.
-Also add ``--help-all`` option to print complete usage.
diff --git a/Misc/NEWS.d/next/Core and Builtins/2022-05-17-20-41-43.gh-issue-92858.eIXJTn.rst b/Misc/NEWS.d/next/Core and Builtins/2022-05-17-20-41-43.gh-issue-92858.eIXJTn.rst
deleted file mode 100644
index fa91d941b1759..0000000000000
--- a/Misc/NEWS.d/next/Core and Builtins/2022-05-17-20-41-43.gh-issue-92858.eIXJTn.rst	
+++ /dev/null
@@ -1 +0,0 @@
-Improve error message for some suites with syntax error before ':'
diff --git a/Misc/NEWS.d/next/Core and Builtins/2022-05-18-08-32-33.gh-issue-92914.tJUeTD.rst b/Misc/NEWS.d/next/Core and Builtins/2022-05-18-08-32-33.gh-issue-92914.tJUeTD.rst
deleted file mode 100644
index 1242a15c029dc..0000000000000
--- a/Misc/NEWS.d/next/Core and Builtins/2022-05-18-08-32-33.gh-issue-92914.tJUeTD.rst	
+++ /dev/null
@@ -1 +0,0 @@
-Always round the allocated size for lists up to the nearest even number.
diff --git a/Misc/NEWS.d/next/Core and Builtins/2022-05-18-18-34-45.gh-issue-92930.kpYPOb.rst b/Misc/NEWS.d/next/Core and Builtins/2022-05-18-18-34-45.gh-issue-92930.kpYPOb.rst
deleted file mode 100644
index cd5d7b3214ea4..0000000000000
--- a/Misc/NEWS.d/next/Core and Builtins/2022-05-18-18-34-45.gh-issue-92930.kpYPOb.rst	
+++ /dev/null
@@ -1 +0,0 @@
-Fixed a crash in ``_pickle.c`` from mutating collections during ``__reduce__`` or ``persistent_id``.
diff --git a/Misc/NEWS.d/next/Core and Builtins/2022-05-20-09-25-34.gh-issue-93021.k3Aji2.rst b/Misc/NEWS.d/next/Core and Builtins/2022-05-20-09-25-34.gh-issue-93021.k3Aji2.rst
deleted file mode 100644
index 8fdd8dfb4229a..0000000000000
--- a/Misc/NEWS.d/next/Core and Builtins/2022-05-20-09-25-34.gh-issue-93021.k3Aji2.rst	
+++ /dev/null
@@ -1,2 +0,0 @@
-Fix the :attr:`__text_signature__` for :meth:`__get__` methods implemented
-in C. Patch by Jelle Zijlstra.
diff --git a/Misc/NEWS.d/next/Core and Builtins/2022-05-30-15-35-42.gh-issue-93354.RZk8gs.rst b/Misc/NEWS.d/next/Core and Builtins/2022-05-30-15-35-42.gh-issue-93354.RZk8gs.rst
deleted file mode 100644
index dcfe6a9b6ba3a..0000000000000
--- a/Misc/NEWS.d/next/Core and Builtins/2022-05-30-15-35-42.gh-issue-93354.RZk8gs.rst	
+++ /dev/null
@@ -1,3 +0,0 @@
-Use exponential backoff for specialization counters in the interpreter. Can
-reduce the number of failed specializations significantly and avoid slowdown
-for those parts of a program that are not suitable for specialization.
diff --git a/Misc/NEWS.d/next/Core and Builtins/2022-05-31-16-36-30.gh-issue-93382.Jf6gAj.rst b/Misc/NEWS.d/next/Core and Builtins/2022-05-31-16-36-30.gh-issue-93382.Jf6gAj.rst
deleted file mode 100644
index 1fe821edf5a14..0000000000000
--- a/Misc/NEWS.d/next/Core and Builtins/2022-05-31-16-36-30.gh-issue-93382.Jf6gAj.rst	
+++ /dev/null
@@ -1,2 +0,0 @@
-Cache the result of :c:func:`PyCode_GetCode` function to restore the O(1)
-lookup of the :attr:`~types.CodeType.co_code` attribute.
diff --git a/Misc/NEWS.d/next/Core and Builtins/2022-06-01-17-47-40.gh-issue-93418.24dJuc.rst b/Misc/NEWS.d/next/Core and Builtins/2022-06-01-17-47-40.gh-issue-93418.24dJuc.rst
deleted file mode 100644
index 74ad06bfeee7c..0000000000000
--- a/Misc/NEWS.d/next/Core and Builtins/2022-06-01-17-47-40.gh-issue-93418.24dJuc.rst	
+++ /dev/null
@@ -1,2 +0,0 @@
-Fixed an assert where an f-string has an equal sign '=' following an
-expression, but there's no trailing brace. For example, f"{i=".
diff --git a/Misc/NEWS.d/next/Core and Builtins/2022-06-09-19-19-02.gh-issue-93461.5DqP1e.rst b/Misc/NEWS.d/next/Core and Builtins/2022-06-09-19-19-02.gh-issue-93461.5DqP1e.rst
deleted file mode 100644
index f6ed14887eae1..0000000000000
--- a/Misc/NEWS.d/next/Core and Builtins/2022-06-09-19-19-02.gh-issue-93461.5DqP1e.rst	
+++ /dev/null
@@ -1,6 +0,0 @@
-:func:`importlib.invalidate_caches` now drops entries from
-:data:`sys.path_importer_cache` with a relative path as name. This solves a
-caching issue when a process changes its current working directory.
-
-``FileFinder`` no longer inserts a dot in the path, e.g.
-``/egg/./spam`` is now ``/egg/spam``.
diff --git a/Misc/NEWS.d/next/Core and Builtins/2022-06-10-10-31-18.gh-issue-93662.-7RSC1.rst b/Misc/NEWS.d/next/Core and Builtins/2022-06-10-10-31-18.gh-issue-93662.-7RSC1.rst
deleted file mode 100644
index e444a00cf7ecc..0000000000000
--- a/Misc/NEWS.d/next/Core and Builtins/2022-06-10-10-31-18.gh-issue-93662.-7RSC1.rst	
+++ /dev/null
@@ -1,2 +0,0 @@
-Make sure that the end column offsets are correct in multi-line method
-calls. Previously, the end column could precede the column offset.
diff --git a/Misc/NEWS.d/next/Core and Builtins/2022-06-10-12-03-17.gh-issue-93671.idkQqG.rst b/Misc/NEWS.d/next/Core and Builtins/2022-06-10-12-03-17.gh-issue-93671.idkQqG.rst
deleted file mode 100644
index a775715335951..0000000000000
--- a/Misc/NEWS.d/next/Core and Builtins/2022-06-10-12-03-17.gh-issue-93671.idkQqG.rst	
+++ /dev/null
@@ -1,2 +0,0 @@
-Fix some exponential backtrace case happening with deeply nested sequence
-patterns in match statements. Patch by Pablo Galindo
diff --git a/Misc/NEWS.d/next/Core and Builtins/2022-06-12-19-31-56.gh-issue-89828.bq02M7.rst b/Misc/NEWS.d/next/Core and Builtins/2022-06-12-19-31-56.gh-issue-89828.bq02M7.rst
deleted file mode 100644
index 14ca99e1458ce..0000000000000
--- a/Misc/NEWS.d/next/Core and Builtins/2022-06-12-19-31-56.gh-issue-89828.bq02M7.rst	
+++ /dev/null
@@ -1,2 +0,0 @@
-:class:`types.GenericAlias` no longer relays the ``__class__`` attribute.
-For example, ``isinstance(list[int], type)`` no longer returns ``True``.
diff --git a/Misc/NEWS.d/next/Core and Builtins/2022-06-13-10-48-09.gh-issue-93516.yJSait.rst b/Misc/NEWS.d/next/Core and Builtins/2022-06-13-10-48-09.gh-issue-93516.yJSait.rst
deleted file mode 100644
index 5c22c7a67b6e5..0000000000000
--- a/Misc/NEWS.d/next/Core and Builtins/2022-06-13-10-48-09.gh-issue-93516.yJSait.rst	
+++ /dev/null
@@ -1,2 +0,0 @@
-Lazily create a table mapping bytecode offsets to line numbers to speed up
-calculation of line numbers when tracing.
diff --git a/Misc/NEWS.d/next/Core and Builtins/2022-06-13-13-55-34.gh-issue-93516.HILrDl.rst b/Misc/NEWS.d/next/Core and Builtins/2022-06-13-13-55-34.gh-issue-93516.HILrDl.rst
deleted file mode 100644
index a324c2dbcbe8a..0000000000000
--- a/Misc/NEWS.d/next/Core and Builtins/2022-06-13-13-55-34.gh-issue-93516.HILrDl.rst	
+++ /dev/null
@@ -1,2 +0,0 @@
-Store offset of first traceable instruction in code object to avoid having
-to recompute it for each instruction when tracing.
diff --git a/Misc/NEWS.d/next/Core and Builtins/2022-06-20-13-48-57.gh-issue-94021.o78q3G.rst b/Misc/NEWS.d/next/Core and Builtins/2022-06-20-13-48-57.gh-issue-94021.o78q3G.rst
deleted file mode 100644
index 0724c517b2ba0..0000000000000
--- a/Misc/NEWS.d/next/Core and Builtins/2022-06-20-13-48-57.gh-issue-94021.o78q3G.rst	
+++ /dev/null
@@ -1 +0,0 @@
-Fix unreachable code warning in ``Python/specialize.c``.
diff --git a/Misc/NEWS.d/next/Core and Builtins/2022-06-24-14-06-20.gh-issue-93883.8jVQQ4.rst b/Misc/NEWS.d/next/Core and Builtins/2022-06-24-14-06-20.gh-issue-93883.8jVQQ4.rst
deleted file mode 100644
index 53345577036a5..0000000000000
--- a/Misc/NEWS.d/next/Core and Builtins/2022-06-24-14-06-20.gh-issue-93883.8jVQQ4.rst	
+++ /dev/null
@@ -1 +0,0 @@
-Revise the display strategy of traceback enhanced error locations.  The indicators are only shown when the location doesn't span the whole line.
diff --git a/Misc/NEWS.d/next/Core and Builtins/2022-06-26-14-37-03.gh-issue-94192.ab7tn7.rst b/Misc/NEWS.d/next/Core and Builtins/2022-06-26-14-37-03.gh-issue-94192.ab7tn7.rst
deleted file mode 100644
index ebd8b04e45091..0000000000000
--- a/Misc/NEWS.d/next/Core and Builtins/2022-06-26-14-37-03.gh-issue-94192.ab7tn7.rst	
+++ /dev/null
@@ -1 +0,0 @@
-Fix error for dictionary literals with invalid expression as value.
diff --git a/Misc/NEWS.d/next/Core and Builtins/2022-06-28-10-08-06.gh-issue-94262.m-HWUZ.rst b/Misc/NEWS.d/next/Core and Builtins/2022-06-28-10-08-06.gh-issue-94262.m-HWUZ.rst
deleted file mode 100644
index 7ba39bbcfe21d..0000000000000
--- a/Misc/NEWS.d/next/Core and Builtins/2022-06-28-10-08-06.gh-issue-94262.m-HWUZ.rst	
+++ /dev/null
@@ -1,3 +0,0 @@
-Don't create frame objects for incomplete frames. Prevents the creation of
-generators and closures from being observable to Python and C extensions,
-restoring the behavior of 3.10 and earlier.
diff --git a/Misc/NEWS.d/next/Core and Builtins/2022-06-28-12-41-17.gh-issue-88116.A7fEl_.rst b/Misc/NEWS.d/next/Core and Builtins/2022-06-28-12-41-17.gh-issue-88116.A7fEl_.rst
deleted file mode 100644
index a8347cff09f39..0000000000000
--- a/Misc/NEWS.d/next/Core and Builtins/2022-06-28-12-41-17.gh-issue-88116.A7fEl_.rst	
+++ /dev/null
@@ -1,2 +0,0 @@
-Fix an issue when reading line numbers from code objects if the encoded line
-numbers are close to ``INT_MIN``. Patch by Pablo Galindo
diff --git a/Misc/NEWS.d/next/Core and Builtins/2022-06-28-14-20-36.gh-issue-94360.DiEnen.rst b/Misc/NEWS.d/next/Core and Builtins/2022-06-28-14-20-36.gh-issue-94360.DiEnen.rst
deleted file mode 100644
index 0a74ba38b0ac4..0000000000000
--- a/Misc/NEWS.d/next/Core and Builtins/2022-06-28-14-20-36.gh-issue-94360.DiEnen.rst	
+++ /dev/null
@@ -1,2 +0,0 @@
-Fixed a tokenizer crash when reading encoded files with syntax errors from
-``stdin`` with non utf-8 encoded text. Patch by Pablo Galindo
diff --git a/Misc/NEWS.d/next/Core and Builtins/2022-06-29-15-45-04.gh-issue-94329.olUQyk.rst b/Misc/NEWS.d/next/Core and Builtins/2022-06-29-15-45-04.gh-issue-94329.olUQyk.rst
deleted file mode 100644
index afd31b6e4dc44..0000000000000
--- a/Misc/NEWS.d/next/Core and Builtins/2022-06-29-15-45-04.gh-issue-94329.olUQyk.rst	
+++ /dev/null
@@ -1,2 +0,0 @@
-Compile and run code with unpacking of extremely large sequences (1000s of elements).
-Such code failed to compile. It now compiles and runs correctly.
diff --git a/Misc/NEWS.d/next/Core and Builtins/2022-06-29-22-18-36.gh-issue-91719.3APYYI.rst b/Misc/NEWS.d/next/Core and Builtins/2022-06-29-22-18-36.gh-issue-91719.3APYYI.rst
deleted file mode 100644
index 0d085e8877837..0000000000000
--- a/Misc/NEWS.d/next/Core and Builtins/2022-06-29-22-18-36.gh-issue-91719.3APYYI.rst	
+++ /dev/null
@@ -1,2 +0,0 @@
-Reload ``opcode`` when raising ``unknown opcode error`` in the interpreter main loop,
-for C compilers to generate dispatching code independently.
diff --git a/Misc/NEWS.d/next/Core and Builtins/2022-06-30-15-07-26.gh-issue-94438.btzHSk.rst b/Misc/NEWS.d/next/Core and Builtins/2022-06-30-15-07-26.gh-issue-94438.btzHSk.rst
deleted file mode 100644
index b08dd8f2ad160..0000000000000
--- a/Misc/NEWS.d/next/Core and Builtins/2022-06-30-15-07-26.gh-issue-94438.btzHSk.rst	
+++ /dev/null
@@ -1,2 +0,0 @@
-Account for instructions that can push NULL to the stack when setting line
-number in a frame. Prevents some (unlikely) crashes.
diff --git a/Misc/NEWS.d/next/Core and Builtins/2022-07-01-20-00-19.gh-issue-94485.mo5st7.rst b/Misc/NEWS.d/next/Core and Builtins/2022-07-01-20-00-19.gh-issue-94485.mo5st7.rst
deleted file mode 100644
index 14d90b7e764a7..0000000000000
--- a/Misc/NEWS.d/next/Core and Builtins/2022-07-01-20-00-19.gh-issue-94485.mo5st7.rst	
+++ /dev/null
@@ -1,2 +0,0 @@
-Line number of a module's ``RESUME`` instruction is set to 0 as specified in
-:pep:`626`.
diff --git a/Misc/NEWS.d/next/Core and Builtins/2022-07-06-14-02-26.gh-issue-92228.44Cbly.rst b/Misc/NEWS.d/next/Core and Builtins/2022-07-06-14-02-26.gh-issue-92228.44Cbly.rst
deleted file mode 100644
index 458ad897cefcb..0000000000000
--- a/Misc/NEWS.d/next/Core and Builtins/2022-07-06-14-02-26.gh-issue-92228.44Cbly.rst	
+++ /dev/null
@@ -1 +0,0 @@
-Disable the compiler's inline-small-exit-blocks optimization for exit blocks that are associated with source code lines. This fixes a bug where the debugger cannot tell where an exception handler ends and the following code block begins.
diff --git a/Misc/NEWS.d/next/Core and Builtins/2022-07-07-21-13-25.gh-issue-94215._Sv9Ms.rst b/Misc/NEWS.d/next/Core and Builtins/2022-07-07-21-13-25.gh-issue-94215._Sv9Ms.rst
deleted file mode 100644
index 07af472fbdcab..0000000000000
--- a/Misc/NEWS.d/next/Core and Builtins/2022-07-07-21-13-25.gh-issue-94215._Sv9Ms.rst	
+++ /dev/null
@@ -1,3 +0,0 @@
-Fix an issue where exceptions raised by line-tracing events would cause
-frames to be left in an invalid state, possibly resulting in a hard crash of
-the interpreter.
diff --git a/Misc/NEWS.d/next/Core and Builtins/2022-07-08-11-44-45.gh-issue-93252.i2358c.rst b/Misc/NEWS.d/next/Core and Builtins/2022-07-08-11-44-45.gh-issue-93252.i2358c.rst
deleted file mode 100644
index 1cc2d8560e53e..0000000000000
--- a/Misc/NEWS.d/next/Core and Builtins/2022-07-08-11-44-45.gh-issue-93252.i2358c.rst	
+++ /dev/null
@@ -1,2 +0,0 @@
-Fix an issue that caused internal frames to outlive failed Python function
-calls, possibly resulting in memory leaks or hard interpreter crashes.
diff --git a/Misc/NEWS.d/next/Core and Builtins/2022-07-08-16-44-11.gh-issue-94694.VkL2CM.rst b/Misc/NEWS.d/next/Core and Builtins/2022-07-08-16-44-11.gh-issue-94694.VkL2CM.rst
deleted file mode 100644
index 6434788140f42..0000000000000
--- a/Misc/NEWS.d/next/Core and Builtins/2022-07-08-16-44-11.gh-issue-94694.VkL2CM.rst	
+++ /dev/null
@@ -1,4 +0,0 @@
-Fix an issue that could cause code with multi-line method lookups to have
-misleading or incorrect column offset information. In some cases (when
-compiling a hand-built AST) this could have resulted in a hard crash of the
-interpreter.
diff --git a/Misc/NEWS.d/next/Documentation/2022-03-30-17-56-01.bpo-47161.gesHfS.rst b/Misc/NEWS.d/next/Documentation/2022-03-30-17-56-01.bpo-47161.gesHfS.rst
deleted file mode 100644
index 6b552daa7c13a..0000000000000
--- a/Misc/NEWS.d/next/Documentation/2022-03-30-17-56-01.bpo-47161.gesHfS.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Document that :class:`pathlib.PurePath` does not collapse
-initial double slashes because they denote UNC paths.
diff --git a/Misc/NEWS.d/next/Documentation/2022-05-26-14-51-25.gh-issue-88831.5Cccr5.rst b/Misc/NEWS.d/next/Documentation/2022-05-26-14-51-25.gh-issue-88831.5Cccr5.rst
deleted file mode 100644
index 983bea981a9b2..0000000000000
--- a/Misc/NEWS.d/next/Documentation/2022-05-26-14-51-25.gh-issue-88831.5Cccr5.rst
+++ /dev/null
@@ -1 +0,0 @@
-Augmented documentation of asyncio.create_task(). Clarified the need to keep strong references to tasks and added a code snippet detailing how to to this.
diff --git a/Misc/NEWS.d/next/Documentation/2022-05-29-21-22-54.gh-issue-86986.lFXw8j.rst b/Misc/NEWS.d/next/Documentation/2022-05-29-21-22-54.gh-issue-86986.lFXw8j.rst
deleted file mode 100644
index 1db028c30f67a..0000000000000
--- a/Misc/NEWS.d/next/Documentation/2022-05-29-21-22-54.gh-issue-86986.lFXw8j.rst
+++ /dev/null
@@ -1 +0,0 @@
-The minimum Sphinx version required to build the documentation is now 3.2.
diff --git a/Misc/NEWS.d/next/Documentation/2022-06-15-12-12-49.gh-issue-87260.epyI7D.rst b/Misc/NEWS.d/next/Documentation/2022-06-15-12-12-49.gh-issue-87260.epyI7D.rst
deleted file mode 100644
index 4c6cee86ca115..0000000000000
--- a/Misc/NEWS.d/next/Documentation/2022-06-15-12-12-49.gh-issue-87260.epyI7D.rst
+++ /dev/null
@@ -1 +0,0 @@
-Align :mod:`sqlite3` argument specs with the actual implementation.
diff --git a/Misc/NEWS.d/next/Documentation/2022-06-16-10-10-59.gh-issue-61162.1ypkG8.rst b/Misc/NEWS.d/next/Documentation/2022-06-16-10-10-59.gh-issue-61162.1ypkG8.rst
deleted file mode 100644
index c8b3a22223218..0000000000000
--- a/Misc/NEWS.d/next/Documentation/2022-06-16-10-10-59.gh-issue-61162.1ypkG8.rst
+++ /dev/null
@@ -1 +0,0 @@
-Clarify :mod:`sqlite3` behavior when :ref:`sqlite3-connection-context-manager`.
diff --git a/Misc/NEWS.d/next/Documentation/2022-07-07-08-42-05.gh-issue-94321.pmCIPb.rst b/Misc/NEWS.d/next/Documentation/2022-07-07-08-42-05.gh-issue-94321.pmCIPb.rst
deleted file mode 100644
index c1a8dcd853538..0000000000000
--- a/Misc/NEWS.d/next/Documentation/2022-07-07-08-42-05.gh-issue-94321.pmCIPb.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Document the :pep:`246` style protocol type
-:class:`sqlite3.PrepareProtocol`.
diff --git a/Misc/NEWS.d/next/Library/2018-09-28-22-18-03.bpo-34828.5Zyi_S.rst b/Misc/NEWS.d/next/Library/2018-09-28-22-18-03.bpo-34828.5Zyi_S.rst
deleted file mode 100644
index b0e10a158b5b1..0000000000000
--- a/Misc/NEWS.d/next/Library/2018-09-28-22-18-03.bpo-34828.5Zyi_S.rst
+++ /dev/null
@@ -1 +0,0 @@
-:meth:`sqlite3.Connection.iterdump` now handles databases that use ``AUTOINCREMENT`` in one or more tables.
diff --git a/Misc/NEWS.d/next/Library/2021-12-27-15-32-15.bpo-45924.0ZpHX2.rst b/Misc/NEWS.d/next/Library/2021-12-27-15-32-15.bpo-45924.0ZpHX2.rst
deleted file mode 100644
index 5cda22737adb7..0000000000000
--- a/Misc/NEWS.d/next/Library/2021-12-27-15-32-15.bpo-45924.0ZpHX2.rst
+++ /dev/null
@@ -1 +0,0 @@
-Fix :mod:`asyncio` incorrect traceback when future's exception is raised multiple times. Patch by Kumar Aditya.
diff --git a/Misc/NEWS.d/next/Library/2022-01-03-15-07-06.bpo-46197.Z0djv6.rst b/Misc/NEWS.d/next/Library/2022-01-03-15-07-06.bpo-46197.Z0djv6.rst
deleted file mode 100644
index 7a3b2d59dfaf4..0000000000000
--- a/Misc/NEWS.d/next/Library/2022-01-03-15-07-06.bpo-46197.Z0djv6.rst
+++ /dev/null
@@ -1 +0,0 @@
-Fix :mod:`ensurepip` environment isolation for subprocess running ``pip``.
diff --git a/Misc/NEWS.d/next/Library/2022-02-15-12-40-48.bpo-46755.zePJfx.rst b/Misc/NEWS.d/next/Library/2022-02-15-12-40-48.bpo-46755.zePJfx.rst
deleted file mode 100644
index 399caf7253593..0000000000000
--- a/Misc/NEWS.d/next/Library/2022-02-15-12-40-48.bpo-46755.zePJfx.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-In :class:`QueueHandler`, clear ``stack_info`` from :class:`LogRecord` to
-prevent stack trace from being written twice.
diff --git a/Misc/NEWS.d/next/Library/2022-04-08-22-12-11.bpo-47231.lvyglt.rst b/Misc/NEWS.d/next/Library/2022-04-08-22-12-11.bpo-47231.lvyglt.rst
deleted file mode 100644
index ee05c5e285675..0000000000000
--- a/Misc/NEWS.d/next/Library/2022-04-08-22-12-11.bpo-47231.lvyglt.rst
+++ /dev/null
@@ -1 +0,0 @@
-Fixed an issue with inconsistent trailing slashes in tarfile longname directories.
diff --git a/Misc/NEWS.d/next/Library/2022-04-11-16-55-41.gh-issue-91456.DK3KKl.rst b/Misc/NEWS.d/next/Library/2022-04-11-16-55-41.gh-issue-91456.DK3KKl.rst
deleted file mode 100644
index a4c853149bdf0..0000000000000
--- a/Misc/NEWS.d/next/Library/2022-04-11-16-55-41.gh-issue-91456.DK3KKl.rst
+++ /dev/null
@@ -1,3 +0,0 @@
-Deprecate current default auto() behavior:  In 3.13 the default will be for
-for auto() to always return the largest member value incremented by
-1, and to raise if incompatible value types are used.
diff --git a/Misc/NEWS.d/next/Library/2022-04-15-17-38-55.gh-issue-91577.Ah7cLL.rst b/Misc/NEWS.d/next/Library/2022-04-15-17-38-55.gh-issue-91577.Ah7cLL.rst
deleted file mode 100644
index 0f44f34011f9c..0000000000000
--- a/Misc/NEWS.d/next/Library/2022-04-15-17-38-55.gh-issue-91577.Ah7cLL.rst
+++ /dev/null
@@ -1 +0,0 @@
-Move imports in :class:`~multiprocessing.SharedMemory` methods to module level so that they can be executed late in python finalization.
diff --git a/Misc/NEWS.d/next/Library/2022-05-19-17-49-58.gh-issue-92932.o2peTh.rst b/Misc/NEWS.d/next/Library/2022-05-19-17-49-58.gh-issue-92932.o2peTh.rst
deleted file mode 100644
index cb76ac5cbd60e..0000000000000
--- a/Misc/NEWS.d/next/Library/2022-05-19-17-49-58.gh-issue-92932.o2peTh.rst
+++ /dev/null
@@ -1,3 +0,0 @@
-Now :func:`~dis.dis` and :func:`~dis.get_instructions` handle operand values
-for instructions prefixed by ``EXTENDED_ARG_QUICK``.
-Patch by Sam Gross and Dong-hee Na.
diff --git a/Misc/NEWS.d/next/Library/2022-05-22-16-08-01.gh-issue-89973.jc-Q4g.rst b/Misc/NEWS.d/next/Library/2022-05-22-16-08-01.gh-issue-89973.jc-Q4g.rst
deleted file mode 100644
index 7e61fd7d46a0b..0000000000000
--- a/Misc/NEWS.d/next/Library/2022-05-22-16-08-01.gh-issue-89973.jc-Q4g.rst
+++ /dev/null
@@ -1,3 +0,0 @@
-Fix :exc:`re.error` raised in :mod:`fnmatch` if the pattern contains a
-character range with upper bound lower than lower bound (e.g. ``[c-a]``).
-Now such ranges are interpreted as empty ranges.
diff --git a/Misc/NEWS.d/next/Library/2022-05-24-11-19-04.gh-issue-74696.-cnf-A.rst b/Misc/NEWS.d/next/Library/2022-05-24-11-19-04.gh-issue-74696.-cnf-A.rst
deleted file mode 100644
index 5b2e460e9ea07..0000000000000
--- a/Misc/NEWS.d/next/Library/2022-05-24-11-19-04.gh-issue-74696.-cnf-A.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-:func:`shutil.make_archive` no longer temporarily changes the current
-working directory during creation of standard ``.zip`` or tar archives.
diff --git a/Misc/NEWS.d/next/Library/2022-05-26-23-10-55.gh-issue-93156.4XfDVN.rst b/Misc/NEWS.d/next/Library/2022-05-26-23-10-55.gh-issue-93156.4XfDVN.rst
deleted file mode 100644
index 165baa08aaab1..0000000000000
--- a/Misc/NEWS.d/next/Library/2022-05-26-23-10-55.gh-issue-93156.4XfDVN.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Accessing the :attr:`pathlib.PurePath.parents` sequence of an absolute path
-using negative index values produced incorrect results.
diff --git a/Misc/NEWS.d/next/Library/2022-05-30-21-42-50.gh-issue-83658.01Ntx0.rst b/Misc/NEWS.d/next/Library/2022-05-30-21-42-50.gh-issue-83658.01Ntx0.rst
deleted file mode 100644
index a187309540980..0000000000000
--- a/Misc/NEWS.d/next/Library/2022-05-30-21-42-50.gh-issue-83658.01Ntx0.rst
+++ /dev/null
@@ -1 +0,0 @@
-Make :class:`multiprocessing.Pool` raise an exception if ``maxtasksperchild`` is not ``None`` or a positive int.
diff --git a/Misc/NEWS.d/next/Library/2022-05-31-14-58-40.gh-issue-93353.9Hvm6o.rst b/Misc/NEWS.d/next/Library/2022-05-31-14-58-40.gh-issue-93353.9Hvm6o.rst
deleted file mode 100644
index 67be3c68f47cb..0000000000000
--- a/Misc/NEWS.d/next/Library/2022-05-31-14-58-40.gh-issue-93353.9Hvm6o.rst
+++ /dev/null
@@ -1,3 +0,0 @@
-Fix the :func:`importlib.resources.as_file` context manager to remove the
-temporary file if destroyed late during Python finalization: keep a local
-reference to the :func:`os.remove` function. Patch by Victor Stinner.
diff --git a/Misc/NEWS.d/next/Library/2022-06-01-11-24-13.gh-issue-91162.NxvU_u.rst b/Misc/NEWS.d/next/Library/2022-06-01-11-24-13.gh-issue-91162.NxvU_u.rst
deleted file mode 100644
index 09fa47c0d2384..0000000000000
--- a/Misc/NEWS.d/next/Library/2022-06-01-11-24-13.gh-issue-91162.NxvU_u.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-Support splitting of unpacked arbitrary-length tuple over ``TypeVar`` and
-``TypeVarTuple`` parameters. For example:
-
-* ``A[T, *Ts][*tuple[int, ...]]`` -> ``A[int, *tuple[int, ...]]``
-* ``A[*Ts, T][*tuple[int, ...]]`` -> ``A[*tuple[int, ...], int]``
diff --git a/Misc/NEWS.d/next/Library/2022-06-05-22-22-42.gh-issue-93421.43UO_8.rst b/Misc/NEWS.d/next/Library/2022-06-05-22-22-42.gh-issue-93421.43UO_8.rst
deleted file mode 100644
index 9e1d6554e0ab2..0000000000000
--- a/Misc/NEWS.d/next/Library/2022-06-05-22-22-42.gh-issue-93421.43UO_8.rst
+++ /dev/null
@@ -1,3 +0,0 @@
-Update :data:`sqlite3.Cursor.rowcount` when a DML statement has run to
-completion. This fixes the row count for SQL queries like
-``UPDATE ... RETURNING``. Patch by Erlend E. Aasland.
diff --git a/Misc/NEWS.d/next/Library/2022-06-06-12-58-27.gh-issue-79579.e8rB-M.rst b/Misc/NEWS.d/next/Library/2022-06-06-12-58-27.gh-issue-79579.e8rB-M.rst
deleted file mode 100644
index 82b1a1c28a600..0000000000000
--- a/Misc/NEWS.d/next/Library/2022-06-06-12-58-27.gh-issue-79579.e8rB-M.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-:mod:`sqlite3` now correctly detects DML queries with leading comments.
-Patch by Erlend E. Aasland.
diff --git a/Misc/NEWS.d/next/Library/2022-06-06-13-19-43.gh-issue-93521._vE8m9.rst b/Misc/NEWS.d/next/Library/2022-06-06-13-19-43.gh-issue-93521._vE8m9.rst
deleted file mode 100644
index 3a3ff4736d294..0000000000000
--- a/Misc/NEWS.d/next/Library/2022-06-06-13-19-43.gh-issue-93521._vE8m9.rst
+++ /dev/null
@@ -1,4 +0,0 @@
-Fixed a case where dataclasses would try to add ``__weakref__`` into the
-``__slots__`` for a dataclass that specified ``weakref_slot=True`` when it was
-already defined in one of its bases. This resulted in a ``TypeError`` upon the
-new class being created.
diff --git a/Misc/NEWS.d/next/Library/2022-06-07-14-53-46.gh-issue-90549.T4FMKY.rst b/Misc/NEWS.d/next/Library/2022-06-07-14-53-46.gh-issue-90549.T4FMKY.rst
deleted file mode 100644
index 6ebdc394900e6..0000000000000
--- a/Misc/NEWS.d/next/Library/2022-06-07-14-53-46.gh-issue-90549.T4FMKY.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Fix a multiprocessing bug where a global named resource (such as a semaphore)
-could leak when a child process is spawned (as opposed to forked).
diff --git a/Misc/NEWS.d/next/Library/2022-06-08-20-11-02.gh-issue-90494.LIZT85.rst b/Misc/NEWS.d/next/Library/2022-06-08-20-11-02.gh-issue-90494.LIZT85.rst
deleted file mode 100644
index 95416768793ea..0000000000000
--- a/Misc/NEWS.d/next/Library/2022-06-08-20-11-02.gh-issue-90494.LIZT85.rst
+++ /dev/null
@@ -1,3 +0,0 @@
-:func:`copy.copy` and :func:`copy.deepcopy` now always raise a TypeError if
-``__reduce__()`` returns a tuple with length 6 instead of silently ignore
-the 6th item or produce incorrect result.
diff --git a/Misc/NEWS.d/next/Library/2022-06-09-10-12-55.gh-issue-90473.683m_C.rst b/Misc/NEWS.d/next/Library/2022-06-09-10-12-55.gh-issue-90473.683m_C.rst
deleted file mode 100644
index b053a8e9a0813..0000000000000
--- a/Misc/NEWS.d/next/Library/2022-06-09-10-12-55.gh-issue-90473.683m_C.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Emscripten and WASI have no home directory and cannot provide :pep:`370`
-user site directory.
diff --git a/Misc/NEWS.d/next/Library/2022-06-09-14-44-21.gh-issue-93626.sfghs46.rst b/Misc/NEWS.d/next/Library/2022-06-09-14-44-21.gh-issue-93626.sfghs46.rst
deleted file mode 100644
index c6fa103706e9c..0000000000000
--- a/Misc/NEWS.d/next/Library/2022-06-09-14-44-21.gh-issue-93626.sfghs46.rst
+++ /dev/null
@@ -1 +0,0 @@
-Set ``__future__.annotations`` to have a ``None`` mandatoryRelease to indicate that it is currently 'TBD'.
diff --git a/Misc/NEWS.d/next/Library/2022-06-09-17-15-26.gh-issue-91389.OE4vS5.rst b/Misc/NEWS.d/next/Library/2022-06-09-17-15-26.gh-issue-91389.OE4vS5.rst
deleted file mode 100644
index 0a126551e4110..0000000000000
--- a/Misc/NEWS.d/next/Library/2022-06-09-17-15-26.gh-issue-91389.OE4vS5.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Fix an issue where :mod:`dis` utilities could report missing or incorrect
-position information in the presence of ``CACHE`` entries.
diff --git a/Misc/NEWS.d/next/Library/2022-06-11-13-32-17.gh-issue-79512.A1KTDr.rst b/Misc/NEWS.d/next/Library/2022-06-11-13-32-17.gh-issue-79512.A1KTDr.rst
deleted file mode 100644
index 5393fb52e93c3..0000000000000
--- a/Misc/NEWS.d/next/Library/2022-06-11-13-32-17.gh-issue-79512.A1KTDr.rst
+++ /dev/null
@@ -1,3 +0,0 @@
-Fixed names and ``__module__`` value of :mod:`weakref` classes
-:class:`~weakref.ReferenceType`, :class:`~weakref.ProxyType`,
-:class:`~weakref.CallableProxyType`. It makes them pickleable.
diff --git a/Misc/NEWS.d/next/Library/2022-06-15-21-20-02.gh-issue-93820.FAMLY8.rst b/Misc/NEWS.d/next/Library/2022-06-15-21-20-02.gh-issue-93820.FAMLY8.rst
deleted file mode 100644
index e06d897e7d8e6..0000000000000
--- a/Misc/NEWS.d/next/Library/2022-06-15-21-20-02.gh-issue-93820.FAMLY8.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Fixed a regression when :func:`copy.copy`-ing :class:`enum.Flag` with
-multiple flag members.
diff --git a/Misc/NEWS.d/next/Library/2022-06-15-21-28-16.gh-issue-83499.u3DQJ-.rst b/Misc/NEWS.d/next/Library/2022-06-15-21-28-16.gh-issue-83499.u3DQJ-.rst
deleted file mode 100644
index 6b32b238dfded..0000000000000
--- a/Misc/NEWS.d/next/Library/2022-06-15-21-28-16.gh-issue-83499.u3DQJ-.rst
+++ /dev/null
@@ -1 +0,0 @@
-Fix double closing of file description in :mod:`tempfile`.
diff --git a/Misc/NEWS.d/next/Library/2022-06-15-21-35-11.gh-issue-91404.39TZzW.rst b/Misc/NEWS.d/next/Library/2022-06-15-21-35-11.gh-issue-91404.39TZzW.rst
deleted file mode 100644
index e20b15c7b7586..0000000000000
--- a/Misc/NEWS.d/next/Library/2022-06-15-21-35-11.gh-issue-91404.39TZzW.rst
+++ /dev/null
@@ -1,3 +0,0 @@
-Revert the :mod:`re` memory leak when a match is terminated by a signal or
-memory allocation failure as the implemented fix caused a major performance
-regression.
diff --git a/Misc/NEWS.d/next/Library/2022-06-16-09-24-50.gh-issue-93847.kuv8bN.rst b/Misc/NEWS.d/next/Library/2022-06-16-09-24-50.gh-issue-93847.kuv8bN.rst
deleted file mode 100644
index c6947575e67e1..0000000000000
--- a/Misc/NEWS.d/next/Library/2022-06-16-09-24-50.gh-issue-93847.kuv8bN.rst
+++ /dev/null
@@ -1 +0,0 @@
-Fix repr of enum of generic aliases.
diff --git a/Misc/NEWS.d/next/Library/2022-06-16-11-16-53.gh-issue-93820.00X0Y5.rst b/Misc/NEWS.d/next/Library/2022-06-16-11-16-53.gh-issue-93820.00X0Y5.rst
deleted file mode 100644
index 70bb1e6c0cd76..0000000000000
--- a/Misc/NEWS.d/next/Library/2022-06-16-11-16-53.gh-issue-93820.00X0Y5.rst
+++ /dev/null
@@ -1 +0,0 @@
-Pickle :class:`enum.Flag` by name.
diff --git a/Misc/NEWS.d/next/Library/2022-06-20-23-14-43.gh-issue-94028.UofEcX.rst b/Misc/NEWS.d/next/Library/2022-06-20-23-14-43.gh-issue-94028.UofEcX.rst
deleted file mode 100644
index 5775b2276d70b..0000000000000
--- a/Misc/NEWS.d/next/Library/2022-06-20-23-14-43.gh-issue-94028.UofEcX.rst
+++ /dev/null
@@ -1,3 +0,0 @@
-Fix a regression in the :mod:`sqlite3` where statement objects were not
-properly cleared and reset after use in cursor iters. The regression was
-introduced by PR 27884 in Python 3.11a1. Patch by Erlend E. Aasland.
diff --git a/Misc/NEWS.d/next/Library/2022-06-21-11-40-31.gh-issue-84753.FW1pxO.rst b/Misc/NEWS.d/next/Library/2022-06-21-11-40-31.gh-issue-84753.FW1pxO.rst
deleted file mode 100644
index eeae2edf7161a..0000000000000
--- a/Misc/NEWS.d/next/Library/2022-06-21-11-40-31.gh-issue-84753.FW1pxO.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-:func:`inspect.iscoroutinefunction`, :func:`inspect.isgeneratorfunction`,
-and :func:`inspect.isasyncgenfunction` now properly return ``True`` for
-duck-typed function-like objects like instances of
-:class:`unittest.mock.AsyncMock`.
-
-This makes :func:`inspect.iscoroutinefunction` consistent with the
-behavior of :func:`asyncio.iscoroutinefunction`.  Patch by Mehdi ABAAKOUK.
diff --git a/Misc/NEWS.d/next/Library/2022-06-22-11-16-11.gh-issue-94101.V9vDG8.rst b/Misc/NEWS.d/next/Library/2022-06-22-11-16-11.gh-issue-94101.V9vDG8.rst
deleted file mode 100644
index bcef0ca07470a..0000000000000
--- a/Misc/NEWS.d/next/Library/2022-06-22-11-16-11.gh-issue-94101.V9vDG8.rst
+++ /dev/null
@@ -1,3 +0,0 @@
-Manual instantiation of :class:`ssl.SSLSession` objects is no longer allowed
-as it lead to misconfigured instances that crashed the interpreter when
-attributes where accessed on them.
diff --git a/Misc/NEWS.d/next/Library/2022-06-23-13-12-05.gh-issue-91742.sNytVX.rst b/Misc/NEWS.d/next/Library/2022-06-23-13-12-05.gh-issue-91742.sNytVX.rst
deleted file mode 100644
index 30c92363b10b3..0000000000000
--- a/Misc/NEWS.d/next/Library/2022-06-23-13-12-05.gh-issue-91742.sNytVX.rst
+++ /dev/null
@@ -1 +0,0 @@
-Fix :mod:`pdb` crash after jump caused by a null pointer dereference. Patch by Kumar Aditya.
diff --git a/Misc/NEWS.d/next/Library/2022-06-24-19-23-59.gh-issue-94207.VhS1eS.rst b/Misc/NEWS.d/next/Library/2022-06-24-19-23-59.gh-issue-94207.VhS1eS.rst
deleted file mode 100644
index 3d38524ac0e83..0000000000000
--- a/Misc/NEWS.d/next/Library/2022-06-24-19-23-59.gh-issue-94207.VhS1eS.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Made :class:`_struct.Struct` GC-tracked in order to fix a reference leak in
-the :mod:`_struct` module.
diff --git a/Misc/NEWS.d/next/Library/2022-06-25-16-27-02.gh-issue-94254.beP16v.rst b/Misc/NEWS.d/next/Library/2022-06-25-16-27-02.gh-issue-94254.beP16v.rst
deleted file mode 100644
index 81482bcd4f897..0000000000000
--- a/Misc/NEWS.d/next/Library/2022-06-25-16-27-02.gh-issue-94254.beP16v.rst
+++ /dev/null
@@ -1 +0,0 @@
-Fixed types of :mod:`struct` module to be immutable. Patch by Kumar Aditya.
diff --git a/Misc/NEWS.d/next/Library/2022-06-29-04-42-56.gh-issue-94398.YOq_bJ.rst b/Misc/NEWS.d/next/Library/2022-06-29-04-42-56.gh-issue-94398.YOq_bJ.rst
deleted file mode 100644
index c6e7e967d106e..0000000000000
--- a/Misc/NEWS.d/next/Library/2022-06-29-04-42-56.gh-issue-94398.YOq_bJ.rst
+++ /dev/null
@@ -1 +0,0 @@
-Once a :class:`asyncio.TaskGroup` has started shutting down (i.e., at least one task has failed and the task group has started cancelling the remaining tasks), it should not be possible to add new tasks to the task group.
diff --git a/Misc/NEWS.d/next/Library/2022-06-29-09-48-37.gh-issue-92336.otA6c6.rst b/Misc/NEWS.d/next/Library/2022-06-29-09-48-37.gh-issue-92336.otA6c6.rst
deleted file mode 100644
index eb74e0ceb7446..0000000000000
--- a/Misc/NEWS.d/next/Library/2022-06-29-09-48-37.gh-issue-92336.otA6c6.rst
+++ /dev/null
@@ -1 +0,0 @@
-Fix bug where :meth:`linecache.getline` fails on bad files with :exc:`UnicodeDecodeError` or :exc:`SyntaxError`. It now returns an empty string as per the documentation.
diff --git a/Misc/NEWS.d/next/Library/2022-07-02-19-46-30.gh-issue-94510.xOatDC.rst b/Misc/NEWS.d/next/Library/2022-07-02-19-46-30.gh-issue-94510.xOatDC.rst
deleted file mode 100644
index 55856d5756559..0000000000000
--- a/Misc/NEWS.d/next/Library/2022-07-02-19-46-30.gh-issue-94510.xOatDC.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Re-entrant calls to :func:`sys.setprofile` and :func:`sys.settrace` now
-raise :exc:`RuntimeError`. Patch by Pablo Galindo.
diff --git a/Misc/NEWS.d/next/Library/2022-07-06-06-02-02.gh-issue-93896.vIgWGr.rst b/Misc/NEWS.d/next/Library/2022-07-06-06-02-02.gh-issue-93896.vIgWGr.rst
deleted file mode 100644
index 2283e14de9a9a..0000000000000
--- a/Misc/NEWS.d/next/Library/2022-07-06-06-02-02.gh-issue-93896.vIgWGr.rst
+++ /dev/null
@@ -1 +0,0 @@
-Fix :func:`asyncio.run` and :class:`unittest.IsolatedAsyncioTestCase` to always the set event loop as it was done in Python 3.10 and earlier. Patch by Kumar Aditya.
diff --git a/Misc/NEWS.d/next/Library/2022-07-06-14-45-12.gh-issue-93910.iZcp67.rst b/Misc/NEWS.d/next/Library/2022-07-06-14-45-12.gh-issue-93910.iZcp67.rst
deleted file mode 100644
index 2e589118e3efd..0000000000000
--- a/Misc/NEWS.d/next/Library/2022-07-06-14-45-12.gh-issue-93910.iZcp67.rst
+++ /dev/null
@@ -1,3 +0,0 @@
-The ability to access the other values of an enum on an enum (e.g.
-``Color.RED.BLUE``) has been restored in order to fix a performance
-regression.
diff --git a/Misc/NEWS.d/next/Library/2022-07-06-16-01-08.gh-issue-94607.Q6RYfz.rst b/Misc/NEWS.d/next/Library/2022-07-06-16-01-08.gh-issue-94607.Q6RYfz.rst
deleted file mode 100644
index 3bbb9172f2619..0000000000000
--- a/Misc/NEWS.d/next/Library/2022-07-06-16-01-08.gh-issue-94607.Q6RYfz.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Fix subclassing complex generics with type variables in :mod:`typing`. Previously an error message saying ``Some type variables ... are not listed in Generic[...]`` was shown.
-:mod:`typing` no longer populates ``__parameters__`` with the ``__parameters__`` of a Python class.
diff --git a/Misc/NEWS.d/next/Library/2022-07-07-15-46-55.gh-issue-94637.IYEiUM.rst b/Misc/NEWS.d/next/Library/2022-07-07-15-46-55.gh-issue-94637.IYEiUM.rst
deleted file mode 100644
index 20cbbcd5088b7..0000000000000
--- a/Misc/NEWS.d/next/Library/2022-07-07-15-46-55.gh-issue-94637.IYEiUM.rst
+++ /dev/null
@@ -1,3 +0,0 @@
-:meth:`SSLContext.set_default_verify_paths` now releases the GIL around
-``SSL_CTX_set_default_verify_paths`` call. The function call performs I/O
-and CPU intensive work.
diff --git a/Misc/NEWS.d/next/Library/2022-07-11-10-41-48.gh-issue-94736.EbsgeK.rst b/Misc/NEWS.d/next/Library/2022-07-11-10-41-48.gh-issue-94736.EbsgeK.rst
deleted file mode 100644
index 3080672ecdfbb..0000000000000
--- a/Misc/NEWS.d/next/Library/2022-07-11-10-41-48.gh-issue-94736.EbsgeK.rst
+++ /dev/null
@@ -1 +0,0 @@
-Fix crash when deallocating an instance of a subclass of ``_multiprocessing.SemLock``. Patch by Kumar Aditya.
diff --git a/Misc/NEWS.d/next/Security/2022-04-27-18-25-30.gh-issue-68966.gjS8zs.rst b/Misc/NEWS.d/next/Security/2022-04-27-18-25-30.gh-issue-68966.gjS8zs.rst
deleted file mode 100644
index da81a1f6993db..0000000000000
--- a/Misc/NEWS.d/next/Security/2022-04-27-18-25-30.gh-issue-68966.gjS8zs.rst
+++ /dev/null
@@ -1,4 +0,0 @@
-The deprecated mailcap module now refuses to inject unsafe text (filenames,
-MIME types, parameters) into shell commands. Instead of using such text, it
-will warn and act as if a match was not found (or for test commands, as if
-the test failed).
diff --git a/Misc/NEWS.d/next/Security/2022-05-19-08-53-07.gh-issue-92888.TLtR9W.rst b/Misc/NEWS.d/next/Security/2022-05-19-08-53-07.gh-issue-92888.TLtR9W.rst
deleted file mode 100644
index 4841b8a90a087..0000000000000
--- a/Misc/NEWS.d/next/Security/2022-05-19-08-53-07.gh-issue-92888.TLtR9W.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Fix ``memoryview`` use after free when accessing the backing buffer in certain cases.
-
diff --git a/Misc/NEWS.d/next/Security/2022-06-03-12-52-53.gh-issue-79096.YVoxgC.rst b/Misc/NEWS.d/next/Security/2022-06-03-12-52-53.gh-issue-79096.YVoxgC.rst
deleted file mode 100644
index 9ec3335dc71b9..0000000000000
--- a/Misc/NEWS.d/next/Security/2022-06-03-12-52-53.gh-issue-79096.YVoxgC.rst
+++ /dev/null
@@ -1 +0,0 @@
-LWPCookieJar and MozillaCookieJar create files with file mode 600 instead of 644 (Microsoft Windows is not affected)
diff --git a/Misc/NEWS.d/next/Security/2022-06-15-20-09-23.gh-issue-87389.QVaC3f.rst b/Misc/NEWS.d/next/Security/2022-06-15-20-09-23.gh-issue-87389.QVaC3f.rst
deleted file mode 100644
index 029d437190deb..0000000000000
--- a/Misc/NEWS.d/next/Security/2022-06-15-20-09-23.gh-issue-87389.QVaC3f.rst
+++ /dev/null
@@ -1,3 +0,0 @@
-:mod:`http.server`: Fix an open redirection vulnerability in the HTTP server
-when an URI path starts with ``//``.  Vulnerability discovered, and initial
-fix proposed, by Hamza Avvan.
diff --git a/Misc/NEWS.d/next/Tests/2022-03-14-23-28-17.bpo-47016.K-t2QX.rst b/Misc/NEWS.d/next/Tests/2022-03-14-23-28-17.bpo-47016.K-t2QX.rst
deleted file mode 100644
index 774bfafc021ef..0000000000000
--- a/Misc/NEWS.d/next/Tests/2022-03-14-23-28-17.bpo-47016.K-t2QX.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Create a GitHub Actions workflow for verifying bundled pip and setuptools.
-Patch by Illia Volochii and Adam Turner.
diff --git a/Misc/NEWS.d/next/Tests/2022-05-25-23-00-35.gh-issue-92886.Y-vrWj.rst b/Misc/NEWS.d/next/Tests/2022-05-25-23-00-35.gh-issue-92886.Y-vrWj.rst
deleted file mode 100644
index 93c1ffe33f28a..0000000000000
--- a/Misc/NEWS.d/next/Tests/2022-05-25-23-00-35.gh-issue-92886.Y-vrWj.rst
+++ /dev/null
@@ -1 +0,0 @@
-Fixing tests that fail when running with optimizations (``-O``) in ``test_zipimport.py``
diff --git a/Misc/NEWS.d/next/Tests/2022-05-25-23-07-15.gh-issue-92886.Aki63_.rst b/Misc/NEWS.d/next/Tests/2022-05-25-23-07-15.gh-issue-92886.Aki63_.rst
deleted file mode 100644
index 581f6bfea24b6..0000000000000
--- a/Misc/NEWS.d/next/Tests/2022-05-25-23-07-15.gh-issue-92886.Aki63_.rst
+++ /dev/null
@@ -1 +0,0 @@
-Fixing tests that fail when running with optimizations (``-O``) in ``test_imaplib.py``.
diff --git a/Misc/NEWS.d/next/Tests/2022-06-03-12-22-44.gh-issue-89858.ftBvjE.rst b/Misc/NEWS.d/next/Tests/2022-06-03-12-22-44.gh-issue-89858.ftBvjE.rst
deleted file mode 100644
index ef806a93c018c..0000000000000
--- a/Misc/NEWS.d/next/Tests/2022-06-03-12-22-44.gh-issue-89858.ftBvjE.rst
+++ /dev/null
@@ -1 +0,0 @@
-Fix ``test_embed`` for out-of-tree builds. Patch by Kumar Aditya.
diff --git a/Misc/NEWS.d/next/Tests/2022-06-03-14-18-37.gh-issue-90473.7iXVRK.rst b/Misc/NEWS.d/next/Tests/2022-06-03-14-18-37.gh-issue-90473.7iXVRK.rst
deleted file mode 100644
index a3165a01111fb..0000000000000
--- a/Misc/NEWS.d/next/Tests/2022-06-03-14-18-37.gh-issue-90473.7iXVRK.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Skip symlink tests on WASI. wasmtime uses ``openat2(2)`` with
-``RESOLVE_BENEATH`` flag, which prevents symlinks with absolute paths.
diff --git a/Misc/NEWS.d/next/Tests/2022-06-03-16-26-04.gh-issue-57539.HxWgYO.rst b/Misc/NEWS.d/next/Tests/2022-06-03-16-26-04.gh-issue-57539.HxWgYO.rst
deleted file mode 100644
index 0734b599f4ad9..0000000000000
--- a/Misc/NEWS.d/next/Tests/2022-06-03-16-26-04.gh-issue-57539.HxWgYO.rst
+++ /dev/null
@@ -1 +0,0 @@
-Increase calendar test coverage for :meth:`calendar.LocaleTextCalendar.formatweekday`.
diff --git a/Misc/NEWS.d/next/Tests/2022-06-04-12-05-31.gh-issue-90473.RSpjF7.rst b/Misc/NEWS.d/next/Tests/2022-06-04-12-05-31.gh-issue-90473.RSpjF7.rst
deleted file mode 100644
index 07d579995c091..0000000000000
--- a/Misc/NEWS.d/next/Tests/2022-06-04-12-05-31.gh-issue-90473.RSpjF7.rst
+++ /dev/null
@@ -1 +0,0 @@
-Skip tests on WASI that require symlinks with absolute paths.
diff --git a/Misc/NEWS.d/next/Tests/2022-06-05-10-16-45.gh-issue-90473.QMu7A8.rst b/Misc/NEWS.d/next/Tests/2022-06-05-10-16-45.gh-issue-90473.QMu7A8.rst
deleted file mode 100644
index 6c76b7f4990e4..0000000000000
--- a/Misc/NEWS.d/next/Tests/2022-06-05-10-16-45.gh-issue-90473.QMu7A8.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-WASI does not have a ``chmod(2)`` syscall. :func:`os.chmod` is now a dummy
-function on WASI. Skip all tests that depend on working :func:`os.chmod`.
diff --git a/Misc/NEWS.d/next/Tests/2022-06-08-14-17-59.gh-issue-93575.Xb2LNB.rst b/Misc/NEWS.d/next/Tests/2022-06-08-14-17-59.gh-issue-93575.Xb2LNB.rst
deleted file mode 100644
index 98d15328a087a..0000000000000
--- a/Misc/NEWS.d/next/Tests/2022-06-08-14-17-59.gh-issue-93575.Xb2LNB.rst
+++ /dev/null
@@ -1,4 +0,0 @@
-Fix issue with test_unicode test_raiseMemError. The test case now use
-``test.support.calcobjsize`` to calculate size of PyUnicode structs.
-:func:`sys.getsizeof` may return different size when string has UTF-8
-memory.
diff --git a/Misc/NEWS.d/next/Tests/2022-06-08-22-32-56.gh-issue-93616.e5Kkx2.rst b/Misc/NEWS.d/next/Tests/2022-06-08-22-32-56.gh-issue-93616.e5Kkx2.rst
deleted file mode 100644
index de8ec52cc88b2..0000000000000
--- a/Misc/NEWS.d/next/Tests/2022-06-08-22-32-56.gh-issue-93616.e5Kkx2.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-``test_modulefinder`` now creates a temporary directory in
-``ModuleFinderTest.setUp()`` instead of module scope.
diff --git a/Misc/NEWS.d/next/Tests/2022-06-10-21-18-14.gh-issue-84461.9TAb26.rst b/Misc/NEWS.d/next/Tests/2022-06-10-21-18-14.gh-issue-84461.9TAb26.rst
deleted file mode 100644
index 7cdf5bee72187..0000000000000
--- a/Misc/NEWS.d/next/Tests/2022-06-10-21-18-14.gh-issue-84461.9TAb26.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-``run_tests.py`` now handles cross compiling env vars correctly and pass
-``HOSTRUNNER`` to regression tests.
diff --git a/Misc/NEWS.d/next/Tests/2022-06-17-13-55-11.gh-issue-93957.X4ovYV.rst b/Misc/NEWS.d/next/Tests/2022-06-17-13-55-11.gh-issue-93957.X4ovYV.rst
deleted file mode 100644
index 2719933f6b94c..0000000000000
--- a/Misc/NEWS.d/next/Tests/2022-06-17-13-55-11.gh-issue-93957.X4ovYV.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Provide nicer error reporting from subprocesses in
-test_venv.EnsurePipTest.test_with_pip.
diff --git a/Misc/NEWS.d/next/Tests/2022-06-17-15-20-09.gh-issue-93951.CW1Vv4.rst b/Misc/NEWS.d/next/Tests/2022-06-17-15-20-09.gh-issue-93951.CW1Vv4.rst
deleted file mode 100644
index b627466b4b221..0000000000000
--- a/Misc/NEWS.d/next/Tests/2022-06-17-15-20-09.gh-issue-93951.CW1Vv4.rst
+++ /dev/null
@@ -1 +0,0 @@
-In test_bdb.StateTestCase.test_skip, avoid including auxiliary importers.
diff --git a/Misc/NEWS.d/next/Tests/2022-06-27-08-53-40.gh-issue-94315.MoZT9t.rst b/Misc/NEWS.d/next/Tests/2022-06-27-08-53-40.gh-issue-94315.MoZT9t.rst
deleted file mode 100644
index 09d5d7e56ae83..0000000000000
--- a/Misc/NEWS.d/next/Tests/2022-06-27-08-53-40.gh-issue-94315.MoZT9t.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Tests now check for DAC override capability instead of relying on
-:func:`os.geteuid`.
diff --git a/Misc/NEWS.d/next/Tests/2022-06-27-21-27-20.gh-issue-94208.VR6HX-.rst b/Misc/NEWS.d/next/Tests/2022-06-27-21-27-20.gh-issue-94208.VR6HX-.rst
deleted file mode 100644
index d0f970ad286b1..0000000000000
--- a/Misc/NEWS.d/next/Tests/2022-06-27-21-27-20.gh-issue-94208.VR6HX-.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-``test_ssl`` is now checking for supported TLS version and protocols in more
-tests.
diff --git a/Misc/NEWS.d/next/Tests/2022-07-05-17-53-13.gh-issue-91330.Qys5IL.rst b/Misc/NEWS.d/next/Tests/2022-07-05-17-53-13.gh-issue-91330.Qys5IL.rst
deleted file mode 100644
index 315521102f4ec..0000000000000
--- a/Misc/NEWS.d/next/Tests/2022-07-05-17-53-13.gh-issue-91330.Qys5IL.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-Added more tests for :mod:`dataclasses` to cover behavior with data
-descriptor-based fields.
-
-# Write your Misc/NEWS entry below.  It should be a simple ReST paragraph. #
-Don't start with "- Issue #<n>: " or "- gh-issue-<n>: " or that sort of
-stuff.
-###########################################################################
diff --git a/Misc/NEWS.d/next/Tools-Demos/2022-06-29-22-47-11.gh-issue-94430.hdov8L.rst b/Misc/NEWS.d/next/Tools-Demos/2022-06-29-22-47-11.gh-issue-94430.hdov8L.rst
deleted file mode 100644
index 88aa8d0866531..0000000000000
--- a/Misc/NEWS.d/next/Tools-Demos/2022-06-29-22-47-11.gh-issue-94430.hdov8L.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Allow parameters named ``module`` and ``self`` with custom C names in Argument
-Clinic. Patch by Erlend E. Aasland
diff --git a/Misc/NEWS.d/next/Tools-Demos/2022-07-04-01-37-42.gh-issue-94538.1rgy1Y.rst b/Misc/NEWS.d/next/Tools-Demos/2022-07-04-01-37-42.gh-issue-94538.1rgy1Y.rst
deleted file mode 100644
index e39ae3950c0fe..0000000000000
--- a/Misc/NEWS.d/next/Tools-Demos/2022-07-04-01-37-42.gh-issue-94538.1rgy1Y.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Fix Argument Clinic output to custom file destinations. Patch by Erlend E.
-Aasland.
diff --git a/Misc/NEWS.d/next/Windows/2022-03-20-15-47-35.bpo-42658.16eXtb.rst b/Misc/NEWS.d/next/Windows/2022-03-20-15-47-35.bpo-42658.16eXtb.rst
deleted file mode 100644
index 852cc77676a31..0000000000000
--- a/Misc/NEWS.d/next/Windows/2022-03-20-15-47-35.bpo-42658.16eXtb.rst
+++ /dev/null
@@ -1,3 +0,0 @@
-Support native Windows case-insensitive path comparisons by using
-``LCMapStringEx`` instead of :func:`str.lower` in :func:`ntpath.normcase`.
-Add ``LCMapStringEx`` to the :mod:`_winapi` module.
diff --git a/Misc/NEWS.d/next/Windows/2022-06-15-01-03-52.gh-issue-93824.mR4mxu.rst b/Misc/NEWS.d/next/Windows/2022-06-15-01-03-52.gh-issue-93824.mR4mxu.rst
deleted file mode 100644
index cabe983847c89..0000000000000
--- a/Misc/NEWS.d/next/Windows/2022-06-15-01-03-52.gh-issue-93824.mR4mxu.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Drag and drop of files onto Python files in Windows Explorer has been
-enabled for Windows ARM64.
diff --git a/README.rst b/README.rst
index 24fdcfbd91959..32bb5cad66cc7 100644
--- a/README.rst
+++ b/README.rst
@@ -1,4 +1,4 @@
-This is Python version 3.11.0 beta 3
+This is Python version 3.11.0 beta 4
 ====================================
 
 .. image:: https://github.com/python/cpython/workflows/Tests/badge.svg


From webhook-mailer at python.org  Tue Jul 12 11:06:24 2022
From: webhook-mailer at python.org (encukou)
Date: Tue, 12 Jul 2022 15:06:24 -0000
Subject: [Python-checkins] gh-94751: Install,
 import and run the test C++ extension (MVP) (GH-94754)
Message-ID: <mailman.21.1657638385.20440.python-checkins@python.org>

https://github.com/python/cpython/commit/ec5db539b9df99c8b96149768dc2e8598dce2afa
commit: ec5db539b9df99c8b96149768dc2e8598dce2afa
branch: main
author: Petr Viktorin <encukou at gmail.com>
committer: encukou <encukou at gmail.com>
date: 2022-07-12T17:06:05+02:00
summary:

gh-94751: Install, import and run the test C++ extension (MVP) (GH-94754)

This is a quick-and-dirty way to run the C++ tests.
It can definitely be improved in the future, but it should fail when things go wrong.

- Run test functions on import (yes, this can definitely be improved)
- Fudge setuptools metadata (name & version) to make the extension installable
- Install and import the extension in test_cppext

files:
M Lib/test/_testcppext.cpp
M Lib/test/setup_testcppext.py
M Lib/test/test_cppext.py

diff --git a/Lib/test/_testcppext.cpp b/Lib/test/_testcppext.cpp
index b6d35407a61ed..be7538826b6c4 100644
--- a/Lib/test/_testcppext.cpp
+++ b/Lib/test/_testcppext.cpp
@@ -128,6 +128,9 @@ static PyMethodDef _testcppext_methods[] = {
     {"add", _testcppext_add, METH_VARARGS, _testcppext_add_doc},
     {"test_api_casts", test_api_casts, METH_NOARGS, _Py_NULL},
     {"test_unicode", test_unicode, METH_NOARGS, _Py_NULL},
+    // Note: _testcppext_exec currently runs all test functions directly.
+    // When adding a new one, add a call there.
+
     {_Py_NULL, _Py_NULL, 0, _Py_NULL}  /* sentinel */
 };
 
@@ -138,6 +141,17 @@ _testcppext_exec(PyObject *module)
     if (PyModule_AddIntMacro(module, __cplusplus) < 0) {
         return -1;
     }
+
+    PyObject *result;
+
+    result = PyObject_CallMethod(module, "test_api_casts", "");
+    if (!result) return -1;
+    Py_DECREF(result);
+
+    result = PyObject_CallMethod(module, "test_unicode", "");
+    if (!result) return -1;
+    Py_DECREF(result);
+
     return 0;
 }
 
diff --git a/Lib/test/setup_testcppext.py b/Lib/test/setup_testcppext.py
index 892e24a6376c5..ae81e33e23b6b 100644
--- a/Lib/test/setup_testcppext.py
+++ b/Lib/test/setup_testcppext.py
@@ -46,7 +46,7 @@ def main():
         sources=[SOURCE],
         language='c++',
         extra_compile_args=cppflags)
-    setup(name=name, ext_modules=[cpp_ext])
+    setup(name='internal' + name, version='0.0', ext_modules=[cpp_ext])
 
 
 if __name__ == "__main__":
diff --git a/Lib/test/test_cppext.py b/Lib/test/test_cppext.py
index 8673911ecfae5..2c54d33711691 100644
--- a/Lib/test/test_cppext.py
+++ b/Lib/test/test_cppext.py
@@ -17,22 +17,22 @@
 @support.requires_subprocess()
 class TestCPPExt(unittest.TestCase):
     def test_build_cpp11(self):
-        self.check_build(False)
+        self.check_build(False, '_testcpp11ext')
 
     def test_build_cpp03(self):
-        self.check_build(True)
+        self.check_build(True, '_testcpp03ext')
 
     # With MSVC, the linker fails with: cannot open file 'python311.lib'
     # https://github.com/python/cpython/pull/32175#issuecomment-1111175897
     @unittest.skipIf(MS_WINDOWS, 'test fails on Windows')
     # the test uses venv+pip: skip if it's not available
     @support.requires_venv_with_pip()
-    def check_build(self, std_cpp03):
+    def check_build(self, std_cpp03, extension_name):
         # Build in a temporary directory
         with os_helper.temp_cwd():
-            self._check_build(std_cpp03)
+            self._check_build(std_cpp03, extension_name)
 
-    def _check_build(self, std_cpp03):
+    def _check_build(self, std_cpp03, extension_name):
         venv_dir = 'env'
         verbose = support.verbose
 
@@ -52,22 +52,47 @@ def _check_build(self, std_cpp03):
         else:
             python = os.path.join(venv_dir, 'bin', python_exe)
 
+        def run_cmd(operation, cmd):
+            if verbose:
+                print('Run:', ' '.join(cmd))
+                subprocess.run(cmd, check=True)
+            else:
+                proc = subprocess.run(cmd,
+                                      stdout=subprocess.PIPE,
+                                      stderr=subprocess.STDOUT,
+                                      text=True)
+                if proc.returncode:
+                    print(proc.stdout, end='')
+                    self.fail(
+                        f"{operation} failed with exit code {proc.returncode}")
+
         # Build the C++ extension
         cmd = [python, '-X', 'dev',
                SETUP_TESTCPPEXT, 'build_ext', '--verbose']
         if std_cpp03:
             cmd.append('-std=c++03')
-        if verbose:
-            print('Run:', ' '.join(cmd))
-            subprocess.run(cmd, check=True)
-        else:
-            proc = subprocess.run(cmd,
-                                  stdout=subprocess.PIPE,
-                                  stderr=subprocess.STDOUT,
-                                  text=True)
-            if proc.returncode:
-                print(proc.stdout, end='')
-                self.fail(f"Build failed with exit code {proc.returncode}")
+        run_cmd('Build', cmd)
+
+        # Install the C++ extension
+        cmd = [python, '-X', 'dev',
+               SETUP_TESTCPPEXT, 'install']
+        run_cmd('Install', cmd)
+
+        # Do a reference run. Until we test that running python
+        # doesn't leak references (gh-94755), run it so one can manually check
+        # -X showrefcount results against this baseline.
+        cmd = [python,
+               '-X', 'dev',
+               '-X', 'showrefcount',
+               '-c', 'pass']
+        run_cmd('Reference run', cmd)
+
+        # Import the C++ extension
+        cmd = [python,
+               '-X', 'dev',
+               '-X', 'showrefcount',
+               '-c', f"import {extension_name}"]
+        run_cmd('Import', cmd)
 
 
 if __name__ == "__main__":


From webhook-mailer at python.org  Tue Jul 12 12:09:57 2022
From: webhook-mailer at python.org (tiran)
Date: Tue, 12 Jul 2022 16:09:57 -0000
Subject: [Python-checkins] gh-94773: deepfreeze: support frozensets with
 unsortable types (GH-94775)
Message-ID: <mailman.22.1657642199.20440.python-checkins@python.org>

https://github.com/python/cpython/commit/0c66074e9f8c9728e1d920910d35da0c62f30403
commit: 0c66074e9f8c9728e1d920910d35da0c62f30403
branch: main
author: Christian Heimes <christian at python.org>
committer: tiran <christian at python.org>
date: 2022-07-12T18:09:47+02:00
summary:

gh-94773: deepfreeze: support frozensets with unsortable types (GH-94775)

files:
A Misc/NEWS.d/next/Build/2022-07-12-13-39-18.gh-issue-94773.koHKm5.rst
M Tools/scripts/deepfreeze.py

diff --git a/Misc/NEWS.d/next/Build/2022-07-12-13-39-18.gh-issue-94773.koHKm5.rst b/Misc/NEWS.d/next/Build/2022-07-12-13-39-18.gh-issue-94773.koHKm5.rst
new file mode 100644
index 0000000000000..ed7e40c91103d
--- /dev/null
+++ b/Misc/NEWS.d/next/Build/2022-07-12-13-39-18.gh-issue-94773.koHKm5.rst
@@ -0,0 +1,2 @@
+``deepfreeze.py`` now supports code object with frozensets that contain
+incompatible, unsortable types.
diff --git a/Tools/scripts/deepfreeze.py b/Tools/scripts/deepfreeze.py
index f9fd4e36a81ba..62eeafab0848c 100644
--- a/Tools/scripts/deepfreeze.py
+++ b/Tools/scripts/deepfreeze.py
@@ -359,7 +359,12 @@ def generate_complex(self, name: str, z: complex) -> str:
         return f"&{name}.ob_base"
 
     def generate_frozenset(self, name: str, fs: FrozenSet[object]) -> str:
-        ret = self.generate_tuple(name, tuple(sorted(fs)))
+        try:
+            fs = sorted(fs)
+        except TypeError:
+            # frozen set with incompatible types, fallback to repr()
+            fs = sorted(fs, key=repr)
+        ret = self.generate_tuple(name, tuple(fs))
         self.write("// TODO: The above tuple should be a frozenset")
         return ret
 


From webhook-mailer at python.org  Tue Jul 12 12:36:05 2022
From: webhook-mailer at python.org (miss-islington)
Date: Tue, 12 Jul 2022 16:36:05 -0000
Subject: [Python-checkins] gh-94773: deepfreeze: support frozensets with
 unsortable types (GH-94775)
Message-ID: <mailman.23.1657643767.20440.python-checkins@python.org>

https://github.com/python/cpython/commit/cdd0cabf92e731518ab1ff842673a4578213c1b5
commit: cdd0cabf92e731518ab1ff842673a4578213c1b5
branch: 3.11
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-12T09:35:43-07:00
summary:

gh-94773: deepfreeze: support frozensets with unsortable types (GH-94775)

(cherry picked from commit 0c66074e9f8c9728e1d920910d35da0c62f30403)

Co-authored-by: Christian Heimes <christian at python.org>

files:
A Misc/NEWS.d/next/Build/2022-07-12-13-39-18.gh-issue-94773.koHKm5.rst
M Tools/scripts/deepfreeze.py

diff --git a/Misc/NEWS.d/next/Build/2022-07-12-13-39-18.gh-issue-94773.koHKm5.rst b/Misc/NEWS.d/next/Build/2022-07-12-13-39-18.gh-issue-94773.koHKm5.rst
new file mode 100644
index 0000000000000..ed7e40c91103d
--- /dev/null
+++ b/Misc/NEWS.d/next/Build/2022-07-12-13-39-18.gh-issue-94773.koHKm5.rst
@@ -0,0 +1,2 @@
+``deepfreeze.py`` now supports code object with frozensets that contain
+incompatible, unsortable types.
diff --git a/Tools/scripts/deepfreeze.py b/Tools/scripts/deepfreeze.py
index 5a64c1ec2e61f..c300c3019eefd 100644
--- a/Tools/scripts/deepfreeze.py
+++ b/Tools/scripts/deepfreeze.py
@@ -369,7 +369,12 @@ def generate_complex(self, name: str, z: complex) -> str:
         return f"&{name}.ob_base"
 
     def generate_frozenset(self, name: str, fs: FrozenSet[object]) -> str:
-        ret = self.generate_tuple(name, tuple(sorted(fs)))
+        try:
+            fs = sorted(fs)
+        except TypeError:
+            # frozen set with incompatible types, fallback to repr()
+            fs = sorted(fs, key=repr)
+        ret = self.generate_tuple(name, tuple(fs))
         self.write("// TODO: The above tuple should be a frozenset")
         return ret
 


From webhook-mailer at python.org  Tue Jul 12 13:45:56 2022
From: webhook-mailer at python.org (Fidget-Spinner)
Date: Tue, 12 Jul 2022 17:45:56 -0000
Subject: [Python-checkins] docs: typing.Self, fix typo (GH-94771)
Message-ID: <mailman.24.1657647958.20440.python-checkins@python.org>

https://github.com/python/cpython/commit/90a6e56e5663233fe986331ef3f10422fe57dcbc
commit: 90a6e56e5663233fe986331ef3f10422fe57dcbc
branch: main
author: Max Zhenzhera <59729293+maxzhenzhera at users.noreply.github.com>
committer: Fidget-Spinner <28750310+Fidget-Spinner at users.noreply.github.com>
date: 2022-07-12T18:45:52+01:00
summary:

docs: typing.Self, fix typo (GH-94771)

* fix typo - double spelled word 'use'

* change methods names to the infinitive form

files:
M Doc/library/typing.rst
M Lib/typing.py

diff --git a/Doc/library/typing.rst b/Doc/library/typing.rst
index 3980e45ed6832..4d422f539ad18 100644
--- a/Doc/library/typing.rst
+++ b/Doc/library/typing.rst
@@ -683,7 +683,7 @@ These can be used as types in annotations and do not support ``[]``.
       from typing import Self
 
       class Foo:
-         def returns_self(self) -> Self:
+         def return_self(self) -> Self:
             ...
             return self
 
@@ -696,7 +696,7 @@ These can be used as types in annotations and do not support ``[]``.
       Self = TypeVar("Self", bound="Foo")
 
       class Foo:
-         def returns_self(self: Self) -> Self:
+         def return_self(self: Self) -> Self:
             ...
             return self
 
@@ -707,7 +707,7 @@ These can be used as types in annotations and do not support ``[]``.
             ...
             return self
 
-   You should use use :data:`Self` as calls to ``SubclassOfFoo.returns_self`` would have
+   You should use :data:`Self` as calls to ``SubclassOfFoo.return_self`` would have
    ``Foo`` as the return type and not ``SubclassOfFoo``.
 
    Other common use cases include:
diff --git a/Lib/typing.py b/Lib/typing.py
index 66c26e416bd0b..43ef07e50cfef 100644
--- a/Lib/typing.py
+++ b/Lib/typing.py
@@ -569,7 +569,7 @@ def Self(self, parameters):
       from typing import Self
 
       class Foo:
-          def returns_self(self) -> Self:
+          def return_self(self) -> Self:
               ...
               return self
 


From webhook-mailer at python.org  Tue Jul 12 14:17:18 2022
From: webhook-mailer at python.org (miss-islington)
Date: Tue, 12 Jul 2022 18:17:18 -0000
Subject: [Python-checkins] docs: typing.Self, fix typo (GH-94771)
Message-ID: <mailman.25.1657649838.20440.python-checkins@python.org>

https://github.com/python/cpython/commit/7c185017a9b68c851ea079ef31f6bcef694378ac
commit: 7c185017a9b68c851ea079ef31f6bcef694378ac
branch: 3.11
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-12T11:17:06-07:00
summary:

docs: typing.Self, fix typo (GH-94771)


* fix typo - double spelled word 'use'

* change methods names to the infinitive form
(cherry picked from commit 90a6e56e5663233fe986331ef3f10422fe57dcbc)

Co-authored-by: Max Zhenzhera <59729293+maxzhenzhera at users.noreply.github.com>

files:
M Doc/library/typing.rst
M Lib/typing.py

diff --git a/Doc/library/typing.rst b/Doc/library/typing.rst
index fceb43aec9be3..ba73d69e87940 100644
--- a/Doc/library/typing.rst
+++ b/Doc/library/typing.rst
@@ -683,7 +683,7 @@ These can be used as types in annotations and do not support ``[]``.
       from typing import Self
 
       class Foo:
-         def returns_self(self) -> Self:
+         def return_self(self) -> Self:
             ...
             return self
 
@@ -696,7 +696,7 @@ These can be used as types in annotations and do not support ``[]``.
       Self = TypeVar("Self", bound="Foo")
 
       class Foo:
-         def returns_self(self: Self) -> Self:
+         def return_self(self: Self) -> Self:
             ...
             return self
 
@@ -707,7 +707,7 @@ These can be used as types in annotations and do not support ``[]``.
             ...
             return self
 
-   You should use use :data:`Self` as calls to ``SubclassOfFoo.returns_self`` would have
+   You should use :data:`Self` as calls to ``SubclassOfFoo.return_self`` would have
    ``Foo`` as the return type and not ``SubclassOfFoo``.
 
    Other common use cases include:
diff --git a/Lib/typing.py b/Lib/typing.py
index 31269273a5c0d..9d6babefe6c2d 100644
--- a/Lib/typing.py
+++ b/Lib/typing.py
@@ -569,7 +569,7 @@ def Self(self, parameters):
       from typing import Self
 
       class Foo:
-          def returns_self(self) -> Self:
+          def return_self(self) -> Self:
               ...
               return self
 


From webhook-mailer at python.org  Tue Jul 12 15:55:41 2022
From: webhook-mailer at python.org (Fidget-Spinner)
Date: Tue, 12 Jul 2022 19:55:41 -0000
Subject: [Python-checkins] Fix heading levels for "Deprecated" section in
 What's New for 3.12 (GH-94762)
Message-ID: <mailman.26.1657655741.20440.python-checkins@python.org>

https://github.com/python/cpython/commit/47f50cbab79d3639c59af7f651dfdebba57b08ce
commit: 47f50cbab79d3639c59af7f651dfdebba57b08ce
branch: main
author: Pradyun Gedam <pgedam at bloomberg.net>
committer: Fidget-Spinner <28750310+Fidget-Spinner at users.noreply.github.com>
date: 2022-07-12T20:55:32+01:00
summary:

Fix heading levels for "Deprecated" section in What's New for 3.12 (GH-94762)

These headings were at the same level as the "Deprecated" heading, but
likely intended to be a subheading within that section.

Co-authored-by: Pradyun Gedam <pradyunsg at users.noreply.github.com>

files:
M Doc/whatsnew/3.12.rst

diff --git a/Doc/whatsnew/3.12.rst b/Doc/whatsnew/3.12.rst
index 85b576c47c021..3de80cf6a68fc 100644
--- a/Doc/whatsnew/3.12.rst
+++ b/Doc/whatsnew/3.12.rst
@@ -134,7 +134,7 @@ Deprecated
 
 
 Pending Removal in Python 3.13
-==============================
+------------------------------
 
 The following modules and APIs have been deprecated in earlier Python releases,
 and will be removed in Python 3.13.
@@ -172,7 +172,7 @@ APIs:
 * :class:`webbrowser.MacOSX` (:gh:`86421`)
 
 Pending Removal in Future Versions
-==================================
+----------------------------------
 
 The following APIs were deprecated in earlier Python versions and will be removed,
 although there is currently no date scheduled for their removal.


From webhook-mailer at python.org  Tue Jul 12 17:34:47 2022
From: webhook-mailer at python.org (benjaminp)
Date: Tue, 12 Jul 2022 21:34:47 -0000
Subject: [Python-checkins] Fix typo in _exact_ratio comment. (GH-94789)
Message-ID: <mailman.27.1657661688.20440.python-checkins@python.org>

https://github.com/python/cpython/commit/e39ce7d4871429d3a48f51139eff9abacd719361
commit: e39ce7d4871429d3a48f51139eff9abacd719361
branch: main
author: Benjamin Peterson <benjamin at python.org>
committer: benjaminp <benjamin at locrian.net>
date: 2022-07-12T14:34:23-07:00
summary:

Fix typo in _exact_ratio comment. (GH-94789)

files:
M Lib/statistics.py

diff --git a/Lib/statistics.py b/Lib/statistics.py
index a2793d9718686..9d775e74f81c6 100644
--- a/Lib/statistics.py
+++ b/Lib/statistics.py
@@ -298,7 +298,7 @@ def _exact_ratio(x):
 
     # The integer ratios for binary floats can have numerators or
     # denominators with over 300 decimal digits.  The problem is more
-    # acute with decimal floats where the the default decimal context
+    # acute with decimal floats where the default decimal context
     # supports a huge range of exponents from Emin=-999999 to
     # Emax=999999.  When expanded with as_integer_ratio(), numbers like
     # Decimal('3.14E+5000') and Decimal('3.14E-5000') have large


From webhook-mailer at python.org  Tue Jul 12 17:57:48 2022
From: webhook-mailer at python.org (miss-islington)
Date: Tue, 12 Jul 2022 21:57:48 -0000
Subject: [Python-checkins] Fix typo in _exact_ratio comment. (GH-94789)
Message-ID: <mailman.28.1657663070.20440.python-checkins@python.org>

https://github.com/python/cpython/commit/3c91f429181ca9620ffcf049c1e8d5039e9691ee
commit: 3c91f429181ca9620ffcf049c1e8d5039e9691ee
branch: 3.11
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-12T14:57:39-07:00
summary:

Fix typo in _exact_ratio comment. (GH-94789)

(cherry picked from commit e39ce7d4871429d3a48f51139eff9abacd719361)

Co-authored-by: Benjamin Peterson <benjamin at python.org>

files:
M Lib/statistics.py

diff --git a/Lib/statistics.py b/Lib/statistics.py
index 2d66b0522f19d..9598ab6d090d0 100644
--- a/Lib/statistics.py
+++ b/Lib/statistics.py
@@ -298,7 +298,7 @@ def _exact_ratio(x):
 
     # The integer ratios for binary floats can have numerators or
     # denominators with over 300 decimal digits.  The problem is more
-    # acute with decimal floats where the the default decimal context
+    # acute with decimal floats where the default decimal context
     # supports a huge range of exponents from Emin=-999999 to
     # Emax=999999.  When expanded with as_integer_ratio(), numbers like
     # Decimal('3.14E+5000') and Decimal('3.14E-5000') have large


From webhook-mailer at python.org  Tue Jul 12 23:53:34 2022
From: webhook-mailer at python.org (rhettinger)
Date: Wed, 13 Jul 2022 03:53:34 -0000
Subject: [Python-checkins] gh-94713 - Replacing while 1 with while True
 (#94714)
Message-ID: <mailman.29.1657684415.20440.python-checkins@python.org>

https://github.com/python/cpython/commit/cceac5dd06fdbaba3f45b8be159dfa79b74ff237
commit: cceac5dd06fdbaba3f45b8be159dfa79b74ff237
branch: main
author: Itay <59503091+Nougat-Waffle at users.noreply.github.com>
committer: rhettinger <rhettinger at users.noreply.github.com>
date: 2022-07-12T22:53:14-05:00
summary:

gh-94713 - Replacing while 1 with while True (#94714)

files:
M Lib/platform.py

diff --git a/Lib/platform.py b/Lib/platform.py
index c272c407c7776..df8faac88ca88 100755
--- a/Lib/platform.py
+++ b/Lib/platform.py
@@ -561,7 +561,7 @@ def _platform(*args):
     platform = platform.replace('unknown', '')
 
     # Fold '--'s and remove trailing '-'
-    while 1:
+    while True:
         cleaned = platform.replace('--', '-')
         if cleaned == platform:
             break


From webhook-mailer at python.org  Wed Jul 13 05:09:17 2022
From: webhook-mailer at python.org (encukou)
Date: Wed, 13 Jul 2022 09:09:17 -0000
Subject: [Python-checkins] gh-94751: Install,
 import and run the test C++ extension (MVP) (GH-94754) (#94780)
Message-ID: <mailman.30.1657703358.20440.python-checkins@python.org>

https://github.com/python/cpython/commit/ffbd6ae37c427061adae09956cd9388c86264bb7
commit: ffbd6ae37c427061adae09956cd9388c86264bb7
branch: 3.11
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: encukou <encukou at gmail.com>
date: 2022-07-13T11:09:06+02:00
summary:

gh-94751: Install, import and run the test C++ extension (MVP) (GH-94754) (#94780)

This is a quick-and-dirty way to run the C++ tests.
It can definitely be improved in the future, but it should fail when things go wrong.

- Run test functions on import (yes, this can definitely be improved)
- Fudge setuptools metadata (name & version) to make the extension installable
- Install and import the extension in test_cppext
(cherry picked from commit ec5db539b9df99c8b96149768dc2e8598dce2afa)

Co-authored-by: Petr Viktorin <encukou at gmail.com>

files:
M Lib/test/_testcppext.cpp
M Lib/test/setup_testcppext.py
M Lib/test/test_cppext.py

diff --git a/Lib/test/_testcppext.cpp b/Lib/test/_testcppext.cpp
index b6d35407a61ed..be7538826b6c4 100644
--- a/Lib/test/_testcppext.cpp
+++ b/Lib/test/_testcppext.cpp
@@ -128,6 +128,9 @@ static PyMethodDef _testcppext_methods[] = {
     {"add", _testcppext_add, METH_VARARGS, _testcppext_add_doc},
     {"test_api_casts", test_api_casts, METH_NOARGS, _Py_NULL},
     {"test_unicode", test_unicode, METH_NOARGS, _Py_NULL},
+    // Note: _testcppext_exec currently runs all test functions directly.
+    // When adding a new one, add a call there.
+
     {_Py_NULL, _Py_NULL, 0, _Py_NULL}  /* sentinel */
 };
 
@@ -138,6 +141,17 @@ _testcppext_exec(PyObject *module)
     if (PyModule_AddIntMacro(module, __cplusplus) < 0) {
         return -1;
     }
+
+    PyObject *result;
+
+    result = PyObject_CallMethod(module, "test_api_casts", "");
+    if (!result) return -1;
+    Py_DECREF(result);
+
+    result = PyObject_CallMethod(module, "test_unicode", "");
+    if (!result) return -1;
+    Py_DECREF(result);
+
     return 0;
 }
 
diff --git a/Lib/test/setup_testcppext.py b/Lib/test/setup_testcppext.py
index 892e24a6376c5..ae81e33e23b6b 100644
--- a/Lib/test/setup_testcppext.py
+++ b/Lib/test/setup_testcppext.py
@@ -46,7 +46,7 @@ def main():
         sources=[SOURCE],
         language='c++',
         extra_compile_args=cppflags)
-    setup(name=name, ext_modules=[cpp_ext])
+    setup(name='internal' + name, version='0.0', ext_modules=[cpp_ext])
 
 
 if __name__ == "__main__":
diff --git a/Lib/test/test_cppext.py b/Lib/test/test_cppext.py
index 8673911ecfae5..2c54d33711691 100644
--- a/Lib/test/test_cppext.py
+++ b/Lib/test/test_cppext.py
@@ -17,22 +17,22 @@
 @support.requires_subprocess()
 class TestCPPExt(unittest.TestCase):
     def test_build_cpp11(self):
-        self.check_build(False)
+        self.check_build(False, '_testcpp11ext')
 
     def test_build_cpp03(self):
-        self.check_build(True)
+        self.check_build(True, '_testcpp03ext')
 
     # With MSVC, the linker fails with: cannot open file 'python311.lib'
     # https://github.com/python/cpython/pull/32175#issuecomment-1111175897
     @unittest.skipIf(MS_WINDOWS, 'test fails on Windows')
     # the test uses venv+pip: skip if it's not available
     @support.requires_venv_with_pip()
-    def check_build(self, std_cpp03):
+    def check_build(self, std_cpp03, extension_name):
         # Build in a temporary directory
         with os_helper.temp_cwd():
-            self._check_build(std_cpp03)
+            self._check_build(std_cpp03, extension_name)
 
-    def _check_build(self, std_cpp03):
+    def _check_build(self, std_cpp03, extension_name):
         venv_dir = 'env'
         verbose = support.verbose
 
@@ -52,22 +52,47 @@ def _check_build(self, std_cpp03):
         else:
             python = os.path.join(venv_dir, 'bin', python_exe)
 
+        def run_cmd(operation, cmd):
+            if verbose:
+                print('Run:', ' '.join(cmd))
+                subprocess.run(cmd, check=True)
+            else:
+                proc = subprocess.run(cmd,
+                                      stdout=subprocess.PIPE,
+                                      stderr=subprocess.STDOUT,
+                                      text=True)
+                if proc.returncode:
+                    print(proc.stdout, end='')
+                    self.fail(
+                        f"{operation} failed with exit code {proc.returncode}")
+
         # Build the C++ extension
         cmd = [python, '-X', 'dev',
                SETUP_TESTCPPEXT, 'build_ext', '--verbose']
         if std_cpp03:
             cmd.append('-std=c++03')
-        if verbose:
-            print('Run:', ' '.join(cmd))
-            subprocess.run(cmd, check=True)
-        else:
-            proc = subprocess.run(cmd,
-                                  stdout=subprocess.PIPE,
-                                  stderr=subprocess.STDOUT,
-                                  text=True)
-            if proc.returncode:
-                print(proc.stdout, end='')
-                self.fail(f"Build failed with exit code {proc.returncode}")
+        run_cmd('Build', cmd)
+
+        # Install the C++ extension
+        cmd = [python, '-X', 'dev',
+               SETUP_TESTCPPEXT, 'install']
+        run_cmd('Install', cmd)
+
+        # Do a reference run. Until we test that running python
+        # doesn't leak references (gh-94755), run it so one can manually check
+        # -X showrefcount results against this baseline.
+        cmd = [python,
+               '-X', 'dev',
+               '-X', 'showrefcount',
+               '-c', 'pass']
+        run_cmd('Reference run', cmd)
+
+        # Import the C++ extension
+        cmd = [python,
+               '-X', 'dev',
+               '-X', 'showrefcount',
+               '-c', f"import {extension_name}"]
+        run_cmd('Import', cmd)
 
 
 if __name__ == "__main__":


From webhook-mailer at python.org  Wed Jul 13 07:23:24 2022
From: webhook-mailer at python.org (encukou)
Date: Wed, 13 Jul 2022 11:23:24 -0000
Subject: [Python-checkins] gh-93649: Fix linkage of
 _PyTestCapi_Init_Vectorcall (#94702)
Message-ID: <mailman.31.1657711406.20440.python-checkins@python.org>

https://github.com/python/cpython/commit/fc21a43b1f0d4426690ccc52dc96e5aaef9f5ab5
commit: fc21a43b1f0d4426690ccc52dc96e5aaef9f5ab5
branch: main
author: Oleg Iarygin <oleg at arhadthedev.net>
committer: encukou <encukou at gmail.com>
date: 2022-07-13T13:22:45+02:00
summary:

gh-93649: Fix linkage of _PyTestCapi_Init_Vectorcall (#94702)

files:
M Modules/_testcapi/parts.h

diff --git a/Modules/_testcapi/parts.h b/Modules/_testcapi/parts.h
index 1111021e1852b..54cddf4b0929f 100644
--- a/Modules/_testcapi/parts.h
+++ b/Modules/_testcapi/parts.h
@@ -1,3 +1,3 @@
 #include "Python.h"
 
-PyAPI_FUNC(int) _PyTestCapi_Init_Vectorcall(PyObject *module);
+int _PyTestCapi_Init_Vectorcall(PyObject *module);


From webhook-mailer at python.org  Wed Jul 13 10:35:42 2022
From: webhook-mailer at python.org (tiran)
Date: Wed, 13 Jul 2022 14:35:42 -0000
Subject: [Python-checkins] gh-94759: Create LCOV report with branch coverage
 (GH-94793)
Message-ID: <mailman.0.1657722943.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/f5c02afaff43f4ed7f4ac74d7c90171e56c2b2d7
commit: f5c02afaff43f4ed7f4ac74d7c90171e56c2b2d7
branch: main
author: Christian Heimes <christian at python.org>
committer: tiran <christian at python.org>
date: 2022-07-13T16:35:28+02:00
summary:

gh-94759: Create LCOV report with branch coverage (GH-94793)

files:
M Makefile.pre.in

diff --git a/Makefile.pre.in b/Makefile.pre.in
index e1dc503059ec2..77696fca94078 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -318,7 +318,8 @@ PROFILE_TASK=	@PROFILE_TASK@
 # report files for gcov / lcov coverage report
 COVERAGE_INFO=	$(abs_builddir)/coverage.info
 COVERAGE_REPORT=$(abs_builddir)/lcov-report
-COVERAGE_REPORT_OPTIONS=--no-branch-coverage --title "CPython lcov report"
+COVERAGE_LCOV_OPTIONS=--rc lcov_branch_coverage=1
+COVERAGE_REPORT_OPTIONS=--rc lcov_branch_coverage=1 --branch-coverage --title "CPython $(VERSION) LCOV report [commit $(shell $(GITVERSION))]"
 
 
 # === Definitions added by makesetup ===
@@ -651,25 +652,24 @@ profile-opt: profile-run-stamp
 coverage:
 	@echo "Building with support for coverage checking:"
 	$(MAKE) clean
-	$(MAKE) @DEF_MAKE_RULE@ CFLAGS="$(CFLAGS) -O0 -pg --coverage" LIBS="$(LIBS) --coverage"
+	$(MAKE) @DEF_MAKE_RULE@ CFLAGS="$(CFLAGS) -O0 -pg --coverage" LDFLAGS="$(LDFLAGS) --coverage"
 
 coverage-lcov:
 	@echo "Creating Coverage HTML report with LCOV:"
 	@rm -f $(COVERAGE_INFO)
 	@rm -rf $(COVERAGE_REPORT)
-	@lcov --capture --directory $(abs_builddir) \
+	@lcov $(COVERAGE_LCOV_OPTIONS) --capture \
+	    --directory $(abs_builddir) \
 	    --base-directory $(realpath $(abs_builddir)) \
 	    --path $(realpath $(abs_srcdir)) \
 	    --output-file $(COVERAGE_INFO)
 	@ # remove 3rd party modules, system headers and internal files with
 	@ # debug, test or dummy functions.
-	@lcov --remove $(COVERAGE_INFO) \
+	@lcov $(COVERAGE_LCOV_OPTIONS) --remove $(COVERAGE_INFO) \
 	    '*/Modules/_blake2/impl/*' \
 	    '*/Modules/_ctypes/libffi*/*' \
 	    '*/Modules/_decimal/libmpdec/*' \
 	    '*/Modules/expat/*' \
-	    '*/Modules/zlib/*' \
-	    '*/Include/*' \
 	    '*/Modules/xx*.c' \
 	    '*/Python/pyfpe.c' \
 	    '*/Python/pystrcmp.c' \
@@ -677,7 +677,8 @@ coverage-lcov:
 	    '/usr/local/include/*' \
 	    '/usr/lib/gcc/*' \
 	    --output-file $(COVERAGE_INFO)
-	@genhtml $(COVERAGE_INFO) --output-directory $(COVERAGE_REPORT) \
+	@genhtml $(COVERAGE_INFO) \
+	    --output-directory $(COVERAGE_REPORT) \
 	    $(COVERAGE_REPORT_OPTIONS)
 	@echo
 	@echo "lcov report at $(COVERAGE_REPORT)/index.html"


From webhook-mailer at python.org  Wed Jul 13 10:46:15 2022
From: webhook-mailer at python.org (rhettinger)
Date: Wed, 13 Jul 2022 14:46:15 -0000
Subject: [Python-checkins] GH-81620: Add random.binomialvariate() (GH-94719)
Message-ID: <mailman.1.1657723576.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/ed06ec1ab851544234138952d357facb32eba6c5
commit: ed06ec1ab851544234138952d357facb32eba6c5
branch: main
author: Raymond Hettinger <rhettinger at users.noreply.github.com>
committer: rhettinger <rhettinger at users.noreply.github.com>
date: 2022-07-13T09:46:04-05:00
summary:

GH-81620: Add random.binomialvariate() (GH-94719)

files:
A Misc/NEWS.d/next/Library/2022-07-09-15-17-02.gh-issue-81620.L0O_bV.rst
M Doc/library/random.rst
M Lib/random.py
M Lib/test/test_random.py

diff --git a/Doc/library/random.rst b/Doc/library/random.rst
index 613fbce0fdf20..78c2b030d6095 100644
--- a/Doc/library/random.rst
+++ b/Doc/library/random.rst
@@ -258,6 +258,28 @@ Functions for sequences
       The *population* must be a sequence.  Automatic conversion of sets
       to lists is no longer supported.
 
+Discrete distributions
+----------------------
+
+The following function generates a discrete distribution.
+
+.. function:: binomialvariate(n=1, p=0.5)
+
+   `Binomial distribution
+   <http://mathworld.wolfram.com/BinomialDistribution.html>`_.
+   Return the number of successes for *n* independent trials with the
+   probability of success in each trial being *p*:
+
+   Mathematically equivalent to::
+
+       sum(random() < p for i in range(n))
+
+   The number of trials *n* should be a non-negative integer.
+   The probability of success *p* should be between ``0.0 <= p <= 1.0``.
+   The result is an integer in the range ``0 <= X <= n``.
+
+   .. versionadded:: 3.12
+
 
 .. _real-valued-distributions:
 
@@ -452,16 +474,13 @@ Simulations::
    >>> # Deal 20 cards without replacement from a deck
    >>> # of 52 playing cards, and determine the proportion of cards
    >>> # with a ten-value:  ten, jack, queen, or king.
-   >>> dealt = sample(['tens', 'low cards'], counts=[16, 36], k=20)
-   >>> dealt.count('tens') / 20
+   >>> deal = sample(['tens', 'low cards'], counts=[16, 36], k=20)
+   >>> deal.count('tens') / 20
    0.15
 
    >>> # Estimate the probability of getting 5 or more heads from 7 spins
    >>> # of a biased coin that settles on heads 60% of the time.
-   >>> def trial():
-   ...     return choices('HT', cum_weights=(0.60, 1.00), k=7).count('H') >= 5
-   ...
-   >>> sum(trial() for i in range(10_000)) / 10_000
+   >>> sum(binomialvariate(n=7, p=0.6) >= 5 for i in range(10_000)) / 10_000
    0.4169
 
    >>> # Probability of the median of 5 samples being in middle two quartiles
diff --git a/Lib/random.py b/Lib/random.py
index 2166474af0554..00849bd7e732f 100644
--- a/Lib/random.py
+++ b/Lib/random.py
@@ -24,6 +24,7 @@
            negative exponential
            gamma
            beta
+           binomial
            pareto
            Weibull
 
@@ -49,6 +50,7 @@
 from math import log as _log, exp as _exp, pi as _pi, e as _e, ceil as _ceil
 from math import sqrt as _sqrt, acos as _acos, cos as _cos, sin as _sin
 from math import tau as TWOPI, floor as _floor, isfinite as _isfinite
+from math import lgamma as _lgamma, fabs as _fabs
 from os import urandom as _urandom
 from _collections_abc import Sequence as _Sequence
 from operator import index as _index
@@ -68,6 +70,7 @@
     "Random",
     "SystemRandom",
     "betavariate",
+    "binomialvariate",
     "choice",
     "choices",
     "expovariate",
@@ -725,6 +728,91 @@ def betavariate(self, alpha, beta):
             return y / (y + self.gammavariate(beta, 1.0))
         return 0.0
 
+
+    def binomialvariate(self, n=1, p=0.5):
+        """Binomial random variable.
+
+        Gives the number of successes for *n* independent trials
+        with the probability of success in each trial being *p*:
+
+            sum(random() < p for i in range(n))
+
+        Returns an integer in the range:   0 <= X <= n
+
+        """
+        # Error check inputs and handle edge cases
+        if n < 0:
+            raise ValueError("n must be non-negative")
+        if p <= 0.0 or p >= 1.0:
+            if p == 0.0:
+                return 0
+            if p == 1.0:
+                return n
+            raise ValueError("p must be in the range 0.0 <= p <= 1.0")
+
+        random = self.random
+
+        # Fast path for a common case
+        if n == 1:
+            return _index(random() < p)
+
+        # Exploit symmetry to establish:  p <= 0.5
+        if p > 0.5:
+            return n - self.binomialvariate(n, 1.0 - p)
+
+        if n * p < 10.0:
+            # BG: Geometric method by Devroye with running time of O(np).
+            # https://dl.acm.org/doi/pdf/10.1145/42372.42381
+            x = y = 0
+            c = _log(1.0 - p)
+            if not c:
+                return x
+            while True:
+                y += _floor(_log(random()) / c) + 1
+                if y > n:
+                    return x
+                x += 1
+
+        # BTRS: Transformed rejection with squeeze method by Wolfgang H?rmann
+        # https://citeseerx.ist.psu.edu/viewdoc/download?doi=10.1.1.47.8407&rep=rep1&type=pdf
+        assert n*p >= 10.0 and p <= 0.5
+        setup_complete = False
+
+        spq = _sqrt(n * p * (1.0 - p))  # Standard deviation of the distribution
+        b = 1.15 + 2.53 * spq
+        a = -0.0873 + 0.0248 * b + 0.01 * p
+        c = n * p + 0.5
+        vr = 0.92 - 4.2 / b
+
+        while True:
+
+            u = random()
+            v = random()
+            u -= 0.5
+            us = 0.5 - _fabs(u)
+            k = _floor((2.0 * a / us + b) * u + c)
+            if k < 0 or k > n:
+                continue
+
+            # The early-out "squeeze" test substantially reduces
+            # the number of acceptance condition evaluations.
+            if us >= 0.07 and v <= vr:
+                return k
+
+            # Acceptance-rejection test.
+            # Note, the original paper errorneously omits the call to log(v)
+            # when comparing to the log of the rescaled binomial distribution.
+            if not setup_complete:
+                alpha = (2.83 + 5.1 / b) * spq
+                lpq = _log(p / (1.0 - p))
+                m = _floor((n + 1) * p)         # Mode of the distribution
+                h = _lgamma(m + 1) + _lgamma(n - m + 1)
+                setup_complete = True           # Only needs to be done once
+            v *= alpha / (a / (us * us) + b)
+            if _log(v) <= h - _lgamma(k + 1) - _lgamma(n - k + 1) + (k - m) * lpq:
+                return k
+
+
     def paretovariate(self, alpha):
         """Pareto distribution.  alpha is the shape parameter."""
         # Jain, pg. 495
@@ -810,6 +898,7 @@ def _notimplemented(self, *args, **kwds):
 gammavariate = _inst.gammavariate
 gauss = _inst.gauss
 betavariate = _inst.betavariate
+binomialvariate = _inst.binomialvariate
 paretovariate = _inst.paretovariate
 weibullvariate = _inst.weibullvariate
 getstate = _inst.getstate
@@ -834,15 +923,17 @@ def _test_generator(n, func, args):
     low = min(data)
     high = max(data)
 
-    print(f'{t1 - t0:.3f} sec, {n} times {func.__name__}')
+    print(f'{t1 - t0:.3f} sec, {n} times {func.__name__}{args!r}')
     print('avg %g, stddev %g, min %g, max %g\n' % (xbar, sigma, low, high))
 
 
-def _test(N=2000):
+def _test(N=10_000):
     _test_generator(N, random, ())
     _test_generator(N, normalvariate, (0.0, 1.0))
     _test_generator(N, lognormvariate, (0.0, 1.0))
     _test_generator(N, vonmisesvariate, (0.0, 1.0))
+    _test_generator(N, binomialvariate, (15, 0.60))
+    _test_generator(N, binomialvariate, (100, 0.75))
     _test_generator(N, gammavariate, (0.01, 1.0))
     _test_generator(N, gammavariate, (0.1, 1.0))
     _test_generator(N, gammavariate, (0.1, 2.0))
diff --git a/Lib/test/test_random.py b/Lib/test/test_random.py
index fcf17a949c2a6..1e825c3572d20 100644
--- a/Lib/test/test_random.py
+++ b/Lib/test/test_random.py
@@ -1045,6 +1045,9 @@ def test_constant(self):
                 (g.lognormvariate, (0.0, 0.0), 1.0),
                 (g.lognormvariate, (-float('inf'), 0.0), 0.0),
                 (g.normalvariate, (10.0, 0.0), 10.0),
+                (g.binomialvariate, (0, 0.5), 0),
+                (g.binomialvariate, (10, 0.0), 0),
+                (g.binomialvariate, (10, 1.0), 10),
                 (g.paretovariate, (float('inf'),), 1.0),
                 (g.weibullvariate, (10.0, float('inf')), 10.0),
                 (g.weibullvariate, (0.0, 10.0), 0.0),
@@ -1052,6 +1055,59 @@ def test_constant(self):
             for i in range(N):
                 self.assertEqual(variate(*args), expected)
 
+    def test_binomialvariate(self):
+        B = random.binomialvariate
+
+        # Cover all the code paths
+        with self.assertRaises(ValueError):
+            B(n=-1)                            # Negative n
+        with self.assertRaises(ValueError):
+            B(n=1, p=-0.5)                     # Negative p
+        with self.assertRaises(ValueError):
+            B(n=1, p=1.5)                      # p > 1.0
+        self.assertEqual(B(10, 0.0), 0)        # p == 0.0
+        self.assertEqual(B(10, 1.0), 10)       # p == 1.0
+        self.assertTrue(B(1, 0.3) in {0, 1})   # n == 1 fast path
+        self.assertTrue(B(1, 0.9) in {0, 1})   # n == 1 fast path
+        self.assertTrue(B(1, 0.0) in {0})      # n == 1 fast path
+        self.assertTrue(B(1, 1.0) in {1})      # n == 1 fast path
+
+        # BG method p <= 0.5 and n*p=1.25
+        self.assertTrue(B(5, 0.25) in set(range(6)))
+
+        # BG method p >= 0.5 and n*(1-p)=1.25
+        self.assertTrue(B(5, 0.75) in set(range(6)))
+
+        # BTRS method p <= 0.5 and n*p=25
+        self.assertTrue(B(100, 0.25) in set(range(101)))
+
+        # BTRS method p > 0.5 and n*(1-p)=25
+        self.assertTrue(B(100, 0.75) in set(range(101)))
+
+        # Statistical tests chosen such that they are
+        # exceedingly unlikely to ever fail for correct code.
+
+        # BG code path
+        # Expected dist: [31641, 42188, 21094, 4688, 391]
+        c = Counter(B(4, 0.25) for i in range(100_000))
+        self.assertTrue(29_641 <= c[0] <= 33_641, c)
+        self.assertTrue(40_188 <= c[1] <= 44_188)
+        self.assertTrue(19_094 <= c[2] <= 23_094)
+        self.assertTrue(2_688  <= c[3] <= 6_688)
+        self.assertEqual(set(c), {0, 1, 2, 3, 4})
+
+        # BTRS code path
+        # Sum of c[20], c[21], c[22], c[23], c[24] expected to be 36,214
+        c = Counter(B(100, 0.25) for i in range(100_000))
+        self.assertTrue(34_214 <= c[20]+c[21]+c[22]+c[23]+c[24] <= 38_214)
+        self.assertTrue(set(c) <= set(range(101)))
+        self.assertEqual(c.total(), 100_000)
+
+        # Demonstrate the BTRS works for huge values of n
+        self.assertTrue(19_000_000 <= B(100_000_000, 0.2) <= 21_000_000)
+        self.assertTrue(89_000_000 <= B(100_000_000, 0.9) <= 91_000_000)
+
+
     def test_von_mises_range(self):
         # Issue 17149: von mises variates were not consistently in the
         # range [0, 2*PI].
diff --git a/Misc/NEWS.d/next/Library/2022-07-09-15-17-02.gh-issue-81620.L0O_bV.rst b/Misc/NEWS.d/next/Library/2022-07-09-15-17-02.gh-issue-81620.L0O_bV.rst
new file mode 100644
index 0000000000000..b4ccea4924ff6
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2022-07-09-15-17-02.gh-issue-81620.L0O_bV.rst
@@ -0,0 +1 @@
+Add random.binomialvariate().


From webhook-mailer at python.org  Wed Jul 13 11:01:46 2022
From: webhook-mailer at python.org (miss-islington)
Date: Wed, 13 Jul 2022 15:01:46 -0000
Subject: [Python-checkins] gh-94759: Create LCOV report with branch coverage
 (GH-94793)
Message-ID: <mailman.2.1657724506.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/f44a9dc430d0e4f44d2d2914aa3241205ab5c185
commit: f44a9dc430d0e4f44d2d2914aa3241205ab5c185
branch: 3.11
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-13T08:01:15-07:00
summary:

gh-94759: Create LCOV report with branch coverage (GH-94793)

(cherry picked from commit f5c02afaff43f4ed7f4ac74d7c90171e56c2b2d7)

Co-authored-by: Christian Heimes <christian at python.org>

files:
M Makefile.pre.in

diff --git a/Makefile.pre.in b/Makefile.pre.in
index 3d0e279dba71d..f43956b6b7cf6 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -316,7 +316,8 @@ PROFILE_TASK=	@PROFILE_TASK@
 # report files for gcov / lcov coverage report
 COVERAGE_INFO=	$(abs_builddir)/coverage.info
 COVERAGE_REPORT=$(abs_builddir)/lcov-report
-COVERAGE_REPORT_OPTIONS=--no-branch-coverage --title "CPython lcov report"
+COVERAGE_LCOV_OPTIONS=--rc lcov_branch_coverage=1
+COVERAGE_REPORT_OPTIONS=--rc lcov_branch_coverage=1 --branch-coverage --title "CPython $(VERSION) LCOV report [commit $(shell $(GITVERSION))]"
 
 
 # === Definitions added by makesetup ===
@@ -653,25 +654,24 @@ profile-opt: profile-run-stamp
 coverage:
 	@echo "Building with support for coverage checking:"
 	$(MAKE) clean
-	$(MAKE) @DEF_MAKE_RULE@ CFLAGS="$(CFLAGS) -O0 -pg --coverage" LIBS="$(LIBS) --coverage"
+	$(MAKE) @DEF_MAKE_RULE@ CFLAGS="$(CFLAGS) -O0 -pg --coverage" LDFLAGS="$(LDFLAGS) --coverage"
 
 coverage-lcov:
 	@echo "Creating Coverage HTML report with LCOV:"
 	@rm -f $(COVERAGE_INFO)
 	@rm -rf $(COVERAGE_REPORT)
-	@lcov --capture --directory $(abs_builddir) \
+	@lcov $(COVERAGE_LCOV_OPTIONS) --capture \
+	    --directory $(abs_builddir) \
 	    --base-directory $(realpath $(abs_builddir)) \
 	    --path $(realpath $(abs_srcdir)) \
 	    --output-file $(COVERAGE_INFO)
 	@ # remove 3rd party modules, system headers and internal files with
 	@ # debug, test or dummy functions.
-	@lcov --remove $(COVERAGE_INFO) \
+	@lcov $(COVERAGE_LCOV_OPTIONS) --remove $(COVERAGE_INFO) \
 	    '*/Modules/_blake2/impl/*' \
 	    '*/Modules/_ctypes/libffi*/*' \
 	    '*/Modules/_decimal/libmpdec/*' \
 	    '*/Modules/expat/*' \
-	    '*/Modules/zlib/*' \
-	    '*/Include/*' \
 	    '*/Modules/xx*.c' \
 	    '*/Python/pyfpe.c' \
 	    '*/Python/pystrcmp.c' \
@@ -679,7 +679,8 @@ coverage-lcov:
 	    '/usr/local/include/*' \
 	    '/usr/lib/gcc/*' \
 	    --output-file $(COVERAGE_INFO)
-	@genhtml $(COVERAGE_INFO) --output-directory $(COVERAGE_REPORT) \
+	@genhtml $(COVERAGE_INFO) \
+	    --output-directory $(COVERAGE_REPORT) \
 	    $(COVERAGE_REPORT_OPTIONS)
 	@echo
 	@echo "lcov report at $(COVERAGE_REPORT)/index.html"


From webhook-mailer at python.org  Wed Jul 13 12:08:37 2022
From: webhook-mailer at python.org (miss-islington)
Date: Wed, 13 Jul 2022 16:08:37 -0000
Subject: [Python-checkins] gh-90815: Fix test_embed for Windows PGO build
 with mimalloc (GH-94790)
Message-ID: <mailman.3.1657728518.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/4a6bb30eb600e3b18f4a84c1be922c07758c613f
commit: 4a6bb30eb600e3b18f4a84c1be922c07758c613f
branch: main
author: neonene <53406459+neonene at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-13T09:08:12-07:00
summary:

gh-90815: Fix test_embed for Windows PGO build with mimalloc (GH-94790)



Fixes the failure of PGO building with `mimalloc` on Windows, ensuring that `test_bpo20891` does not break profiling data (`python31*.pgc`).

files:
M Programs/_testembed.c

diff --git a/Programs/_testembed.c b/Programs/_testembed.c
index 542e46968ce56..6b43d53403014 100644
--- a/Programs/_testembed.c
+++ b/Programs/_testembed.c
@@ -368,6 +368,8 @@ static int test_bpo20891(void)
 
     PyThread_free_lock(lock);
 
+    Py_Finalize();
+
     return 0;
 }
 


From webhook-mailer at python.org  Wed Jul 13 12:13:19 2022
From: webhook-mailer at python.org (gvanrossum)
Date: Wed, 13 Jul 2022 16:13:19 -0000
Subject: [Python-checkins] gh-94499 Add test for private name mangling in
 class pattern matching (#94500)
Message-ID: <mailman.4.1657728801.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/8d7089f0a016f905fa7ae04ae1bdb9b14c6aeef6
commit: 8d7089f0a016f905fa7ae04ae1bdb9b14c6aeef6
branch: main
author: da-woods <dw-git at d-woods.co.uk>
committer: gvanrossum <gvanrossum at gmail.com>
date: 2022-07-13T09:13:10-07:00
summary:

gh-94499 Add test for private name mangling in class pattern matching (#94500)

The current status quo is that private attribute names are not
mangled when a class is matched. I've added a test to
document/legimize this behaviour.

Co-authored-by: Brandt Bucher <brandtbucher at gmail.com>

files:
M Lib/test/test_patma.py

diff --git a/Lib/test/test_patma.py b/Lib/test/test_patma.py
index db198f7715783..0ed54079c99b3 100644
--- a/Lib/test/test_patma.py
+++ b/Lib/test/test_patma.py
@@ -2654,6 +2654,20 @@ def get(key, default=None):
 
         self.assertEqual(y, 'bar')
 
+    def test_patma_249(self):
+        class C:
+            __attr = "eggs"  # mangled to _C__attr
+            _Outer__attr = "bacon"
+        class Outer:
+            def f(self, x):
+                match x:
+                    # looks up __attr, not _C__attr or _Outer__attr
+                    case C(__attr=y):
+                        return y
+        c = C()
+        setattr(c, "__attr", "spam")  # setattr is needed because we're in a class scope
+        self.assertEqual(Outer().f(c), "spam")
+
 
 class TestSyntaxErrors(unittest.TestCase):
 


From webhook-mailer at python.org  Wed Jul 13 12:40:05 2022
From: webhook-mailer at python.org (miss-islington)
Date: Wed, 13 Jul 2022 16:40:05 -0000
Subject: [Python-checkins] gh-90815: Fix test_embed for Windows PGO build
 with mimalloc (GH-94790)
Message-ID: <mailman.5.1657730407.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/65dd637840aa3d5f0686cc9add640f8a9e3acd1e
commit: 65dd637840aa3d5f0686cc9add640f8a9e3acd1e
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-13T09:39:56-07:00
summary:

gh-90815: Fix test_embed for Windows PGO build with mimalloc (GH-94790)


Fixes the failure of PGO building with `mimalloc` on Windows, ensuring that `test_bpo20891` does not break profiling data (`python31*.pgc`).
(cherry picked from commit 4a6bb30eb600e3b18f4a84c1be922c07758c613f)

Co-authored-by: neonene <53406459+neonene at users.noreply.github.com>

files:
M Programs/_testembed.c

diff --git a/Programs/_testembed.c b/Programs/_testembed.c
index b7d4675a955a5..34c44120a2012 100644
--- a/Programs/_testembed.c
+++ b/Programs/_testembed.c
@@ -290,6 +290,8 @@ static int test_bpo20891(void)
 
     PyThread_free_lock(lock);
 
+    Py_Finalize();
+
     return 0;
 }
 


From webhook-mailer at python.org  Wed Jul 13 12:40:50 2022
From: webhook-mailer at python.org (miss-islington)
Date: Wed, 13 Jul 2022 16:40:50 -0000
Subject: [Python-checkins] gh-90815: Fix test_embed for Windows PGO build
 with mimalloc (GH-94790)
Message-ID: <mailman.6.1657730452.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/11cdde85c3153f4cef382500d74b4155a0e784a0
commit: 11cdde85c3153f4cef382500d74b4155a0e784a0
branch: 3.11
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-13T09:40:46-07:00
summary:

gh-90815: Fix test_embed for Windows PGO build with mimalloc (GH-94790)


Fixes the failure of PGO building with `mimalloc` on Windows, ensuring that `test_bpo20891` does not break profiling data (`python31*.pgc`).
(cherry picked from commit 4a6bb30eb600e3b18f4a84c1be922c07758c613f)

Co-authored-by: neonene <53406459+neonene at users.noreply.github.com>

files:
M Programs/_testembed.c

diff --git a/Programs/_testembed.c b/Programs/_testembed.c
index 542e46968ce56..6b43d53403014 100644
--- a/Programs/_testembed.c
+++ b/Programs/_testembed.c
@@ -368,6 +368,8 @@ static int test_bpo20891(void)
 
     PyThread_free_lock(lock);
 
+    Py_Finalize();
+
     return 0;
 }
 


From webhook-mailer at python.org  Wed Jul 13 20:05:02 2022
From: webhook-mailer at python.org (corona10)
Date: Thu, 14 Jul 2022 00:05:02 -0000
Subject: [Python-checkins] gh-90359: Update documentation to follow PEP 495.
 (gh-94800)
Message-ID: <mailman.7.1657757102.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/07374cce52abb7fd39729dc1b646ca3029b64c64
commit: 07374cce52abb7fd39729dc1b646ca3029b64c64
branch: main
author: Dong-hee Na <donghee.na at python.org>
committer: corona10 <donghee.na92 at gmail.com>
date: 2022-07-14T09:04:52+09:00
summary:

gh-90359: Update documentation to follow PEP 495. (gh-94800)

files:
M Doc/c-api/datetime.rst

diff --git a/Doc/c-api/datetime.rst b/Doc/c-api/datetime.rst
index 4c4e4bcfa6333..d650f5569d238 100644
--- a/Doc/c-api/datetime.rst
+++ b/Doc/c-api/datetime.rst
@@ -190,6 +190,12 @@ must not be ``NULL``, and the type is not checked:
 
    Return the microsecond, as an int from 0 through 999999.
 
+.. c:function:: int PyDateTime_DATE_GET_FOLD(PyDateTime_DateTime *o)
+
+   Return the fold, as an int from 0 through 1.
+
+   .. versionadded:: 3.6
+
 .. c:function:: PyObject* PyDateTime_DATE_GET_TZINFO(PyDateTime_DateTime *o)
 
    Return the tzinfo (which may be ``None``).
@@ -219,6 +225,12 @@ and the type is not checked:
 
    Return the microsecond, as an int from 0 through 999999.
 
+.. c:function:: int PyDateTime_TIME_GET_FOLD(PyDateTime_Time *o)
+
+   Return the fold, as an int from 0 through 1.
+
+   .. versionadded:: 3.6
+
 .. c:function:: PyObject* PyDateTime_TIME_GET_TZINFO(PyDateTime_Time *o)
 
    Return the tzinfo (which may be ``None``).


From webhook-mailer at python.org  Wed Jul 13 20:16:13 2022
From: webhook-mailer at python.org (miss-islington)
Date: Thu, 14 Jul 2022 00:16:13 -0000
Subject: [Python-checkins] gh-90359: Update documentation to follow PEP 495.
 (gh-94800)
Message-ID: <mailman.8.1657757774.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/c473627c73b70ef587ca2195fdb8ee721d9a7ba8
commit: c473627c73b70ef587ca2195fdb8ee721d9a7ba8
branch: 3.11
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-13T17:16:09-07:00
summary:

gh-90359: Update documentation to follow PEP 495. (gh-94800)

(cherry picked from commit 07374cce52abb7fd39729dc1b646ca3029b64c64)

Co-authored-by: Dong-hee Na <donghee.na at python.org>

files:
M Doc/c-api/datetime.rst

diff --git a/Doc/c-api/datetime.rst b/Doc/c-api/datetime.rst
index 4c4e4bcfa6333..d650f5569d238 100644
--- a/Doc/c-api/datetime.rst
+++ b/Doc/c-api/datetime.rst
@@ -190,6 +190,12 @@ must not be ``NULL``, and the type is not checked:
 
    Return the microsecond, as an int from 0 through 999999.
 
+.. c:function:: int PyDateTime_DATE_GET_FOLD(PyDateTime_DateTime *o)
+
+   Return the fold, as an int from 0 through 1.
+
+   .. versionadded:: 3.6
+
 .. c:function:: PyObject* PyDateTime_DATE_GET_TZINFO(PyDateTime_DateTime *o)
 
    Return the tzinfo (which may be ``None``).
@@ -219,6 +225,12 @@ and the type is not checked:
 
    Return the microsecond, as an int from 0 through 999999.
 
+.. c:function:: int PyDateTime_TIME_GET_FOLD(PyDateTime_Time *o)
+
+   Return the fold, as an int from 0 through 1.
+
+   .. versionadded:: 3.6
+
 .. c:function:: PyObject* PyDateTime_TIME_GET_TZINFO(PyDateTime_Time *o)
 
    Return the tzinfo (which may be ``None``).


From webhook-mailer at python.org  Wed Jul 13 20:16:49 2022
From: webhook-mailer at python.org (miss-islington)
Date: Thu, 14 Jul 2022 00:16:49 -0000
Subject: [Python-checkins] gh-90359: Update documentation to follow PEP 495.
 (gh-94800)
Message-ID: <mailman.9.1657757810.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/381b86bde818dbba62aa61fbb068ed89d6a4d23f
commit: 381b86bde818dbba62aa61fbb068ed89d6a4d23f
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-13T17:16:44-07:00
summary:

gh-90359: Update documentation to follow PEP 495. (gh-94800)

(cherry picked from commit 07374cce52abb7fd39729dc1b646ca3029b64c64)

Co-authored-by: Dong-hee Na <donghee.na at python.org>

files:
M Doc/c-api/datetime.rst

diff --git a/Doc/c-api/datetime.rst b/Doc/c-api/datetime.rst
index 4c4e4bcfa6333..d650f5569d238 100644
--- a/Doc/c-api/datetime.rst
+++ b/Doc/c-api/datetime.rst
@@ -190,6 +190,12 @@ must not be ``NULL``, and the type is not checked:
 
    Return the microsecond, as an int from 0 through 999999.
 
+.. c:function:: int PyDateTime_DATE_GET_FOLD(PyDateTime_DateTime *o)
+
+   Return the fold, as an int from 0 through 1.
+
+   .. versionadded:: 3.6
+
 .. c:function:: PyObject* PyDateTime_DATE_GET_TZINFO(PyDateTime_DateTime *o)
 
    Return the tzinfo (which may be ``None``).
@@ -219,6 +225,12 @@ and the type is not checked:
 
    Return the microsecond, as an int from 0 through 999999.
 
+.. c:function:: int PyDateTime_TIME_GET_FOLD(PyDateTime_Time *o)
+
+   Return the fold, as an int from 0 through 1.
+
+   .. versionadded:: 3.6
+
 .. c:function:: PyObject* PyDateTime_TIME_GET_TZINFO(PyDateTime_Time *o)
 
    Return the tzinfo (which may be ``None``).


From webhook-mailer at python.org  Wed Jul 13 20:40:17 2022
From: webhook-mailer at python.org (corona10)
Date: Thu, 14 Jul 2022 00:40:17 -0000
Subject: [Python-checkins] gh-90359: Unify documentation style for
 datetime.rst (gh-94836)
Message-ID: <mailman.10.1657759218.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/967da5febbc77b36a5b14863e61db3a2d441a940
commit: 967da5febbc77b36a5b14863e61db3a2d441a940
branch: main
author: Dong-hee Na <donghee.na at python.org>
committer: corona10 <donghee.na92 at gmail.com>
date: 2022-07-14T09:40:10+09:00
summary:

gh-90359: Unify documentation style for datetime.rst (gh-94836)

files:
M Doc/c-api/datetime.rst

diff --git a/Doc/c-api/datetime.rst b/Doc/c-api/datetime.rst
index d650f5569d238..72fc07afbf1f4 100644
--- a/Doc/c-api/datetime.rst
+++ b/Doc/c-api/datetime.rst
@@ -132,6 +132,7 @@ Macros to create objects:
    resulting number of microseconds and seconds lie in the ranges documented for
    :class:`datetime.timedelta` objects.
 
+
 .. c:function:: PyObject* PyTimeZone_FromOffset(PyDateTime_DeltaType* offset)
 
    Return a :class:`datetime.timezone` object with an unnamed fixed offset
@@ -139,6 +140,7 @@ Macros to create objects:
 
    .. versionadded:: 3.7
 
+
 .. c:function:: PyObject* PyTimeZone_FromOffsetAndName(PyDateTime_DeltaType* offset, PyUnicode* name)
 
    Return a :class:`datetime.timezone` object with a fixed offset represented
@@ -190,18 +192,21 @@ must not be ``NULL``, and the type is not checked:
 
    Return the microsecond, as an int from 0 through 999999.
 
+
 .. c:function:: int PyDateTime_DATE_GET_FOLD(PyDateTime_DateTime *o)
 
    Return the fold, as an int from 0 through 1.
 
    .. versionadded:: 3.6
 
+
 .. c:function:: PyObject* PyDateTime_DATE_GET_TZINFO(PyDateTime_DateTime *o)
 
    Return the tzinfo (which may be ``None``).
 
    .. versionadded:: 3.10
 
+
 Macros to extract fields from time objects.  The argument must be an instance of
 :c:data:`PyDateTime_Time`, including subclasses. The argument must not be ``NULL``,
 and the type is not checked:
@@ -225,12 +230,14 @@ and the type is not checked:
 
    Return the microsecond, as an int from 0 through 999999.
 
+
 .. c:function:: int PyDateTime_TIME_GET_FOLD(PyDateTime_Time *o)
 
    Return the fold, as an int from 0 through 1.
 
    .. versionadded:: 3.6
 
+
 .. c:function:: PyObject* PyDateTime_TIME_GET_TZINFO(PyDateTime_Time *o)
 
    Return the tzinfo (which may be ``None``).


From webhook-mailer at python.org  Wed Jul 13 20:51:11 2022
From: webhook-mailer at python.org (miss-islington)
Date: Thu, 14 Jul 2022 00:51:11 -0000
Subject: [Python-checkins] gh-90359: Unify documentation style for
 datetime.rst (gh-94836)
Message-ID: <mailman.11.1657759873.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/8a01502e2da19cce1db4ebb791a065298451931d
commit: 8a01502e2da19cce1db4ebb791a065298451931d
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-13T17:51:03-07:00
summary:

gh-90359: Unify documentation style for datetime.rst (gh-94836)

(cherry picked from commit 967da5febbc77b36a5b14863e61db3a2d441a940)

Co-authored-by: Dong-hee Na <donghee.na at python.org>

files:
M Doc/c-api/datetime.rst

diff --git a/Doc/c-api/datetime.rst b/Doc/c-api/datetime.rst
index d650f5569d238..72fc07afbf1f4 100644
--- a/Doc/c-api/datetime.rst
+++ b/Doc/c-api/datetime.rst
@@ -132,6 +132,7 @@ Macros to create objects:
    resulting number of microseconds and seconds lie in the ranges documented for
    :class:`datetime.timedelta` objects.
 
+
 .. c:function:: PyObject* PyTimeZone_FromOffset(PyDateTime_DeltaType* offset)
 
    Return a :class:`datetime.timezone` object with an unnamed fixed offset
@@ -139,6 +140,7 @@ Macros to create objects:
 
    .. versionadded:: 3.7
 
+
 .. c:function:: PyObject* PyTimeZone_FromOffsetAndName(PyDateTime_DeltaType* offset, PyUnicode* name)
 
    Return a :class:`datetime.timezone` object with a fixed offset represented
@@ -190,18 +192,21 @@ must not be ``NULL``, and the type is not checked:
 
    Return the microsecond, as an int from 0 through 999999.
 
+
 .. c:function:: int PyDateTime_DATE_GET_FOLD(PyDateTime_DateTime *o)
 
    Return the fold, as an int from 0 through 1.
 
    .. versionadded:: 3.6
 
+
 .. c:function:: PyObject* PyDateTime_DATE_GET_TZINFO(PyDateTime_DateTime *o)
 
    Return the tzinfo (which may be ``None``).
 
    .. versionadded:: 3.10
 
+
 Macros to extract fields from time objects.  The argument must be an instance of
 :c:data:`PyDateTime_Time`, including subclasses. The argument must not be ``NULL``,
 and the type is not checked:
@@ -225,12 +230,14 @@ and the type is not checked:
 
    Return the microsecond, as an int from 0 through 999999.
 
+
 .. c:function:: int PyDateTime_TIME_GET_FOLD(PyDateTime_Time *o)
 
    Return the fold, as an int from 0 through 1.
 
    .. versionadded:: 3.6
 
+
 .. c:function:: PyObject* PyDateTime_TIME_GET_TZINFO(PyDateTime_Time *o)
 
    Return the tzinfo (which may be ``None``).


From webhook-mailer at python.org  Wed Jul 13 20:52:57 2022
From: webhook-mailer at python.org (corona10)
Date: Thu, 14 Jul 2022 00:52:57 -0000
Subject: [Python-checkins] [3.11] gh-90359: Unify documentation style for
 datetime.rst (gh-94836) (gh-94838)
Message-ID: <mailman.12.1657759978.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/0a51204cd02b9fbee0616fdbdd9139526b32aeab
commit: 0a51204cd02b9fbee0616fdbdd9139526b32aeab
branch: 3.11
author: Dong-hee Na <donghee.na at python.org>
committer: corona10 <donghee.na92 at gmail.com>
date: 2022-07-14T09:52:53+09:00
summary:

[3.11] gh-90359: Unify documentation style for datetime.rst (gh-94836) (gh-94838)

(cherry picked from commit 967da5febbc77b36a5b14863e61db3a2d441a940)

Co-authored-by: Dong-hee Na <donghee.na at python.org>

files:
M Doc/c-api/datetime.rst

diff --git a/Doc/c-api/datetime.rst b/Doc/c-api/datetime.rst
index d650f5569d238..72fc07afbf1f4 100644
--- a/Doc/c-api/datetime.rst
+++ b/Doc/c-api/datetime.rst
@@ -132,6 +132,7 @@ Macros to create objects:
    resulting number of microseconds and seconds lie in the ranges documented for
    :class:`datetime.timedelta` objects.
 
+
 .. c:function:: PyObject* PyTimeZone_FromOffset(PyDateTime_DeltaType* offset)
 
    Return a :class:`datetime.timezone` object with an unnamed fixed offset
@@ -139,6 +140,7 @@ Macros to create objects:
 
    .. versionadded:: 3.7
 
+
 .. c:function:: PyObject* PyTimeZone_FromOffsetAndName(PyDateTime_DeltaType* offset, PyUnicode* name)
 
    Return a :class:`datetime.timezone` object with a fixed offset represented
@@ -190,18 +192,21 @@ must not be ``NULL``, and the type is not checked:
 
    Return the microsecond, as an int from 0 through 999999.
 
+
 .. c:function:: int PyDateTime_DATE_GET_FOLD(PyDateTime_DateTime *o)
 
    Return the fold, as an int from 0 through 1.
 
    .. versionadded:: 3.6
 
+
 .. c:function:: PyObject* PyDateTime_DATE_GET_TZINFO(PyDateTime_DateTime *o)
 
    Return the tzinfo (which may be ``None``).
 
    .. versionadded:: 3.10
 
+
 Macros to extract fields from time objects.  The argument must be an instance of
 :c:data:`PyDateTime_Time`, including subclasses. The argument must not be ``NULL``,
 and the type is not checked:
@@ -225,12 +230,14 @@ and the type is not checked:
 
    Return the microsecond, as an int from 0 through 999999.
 
+
 .. c:function:: int PyDateTime_TIME_GET_FOLD(PyDateTime_Time *o)
 
    Return the fold, as an int from 0 through 1.
 
    .. versionadded:: 3.6
 
+
 .. c:function:: PyObject* PyDateTime_TIME_GET_TZINFO(PyDateTime_Time *o)
 
    Return the tzinfo (which may be ``None``).


From webhook-mailer at python.org  Wed Jul 13 21:09:16 2022
From: webhook-mailer at python.org (terryjreedy)
Date: Thu, 14 Jul 2022 01:09:16 -0000
Subject: [Python-checkins] idlelib: replace 'while 1' with 'while True'
 (#94827)
Message-ID: <mailman.13.1657760957.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/6a15f918b5a6fb5113d5332ebf27df1d5360e66c
commit: 6a15f918b5a6fb5113d5332ebf27df1d5360e66c
branch: main
author: Terry Jan Reedy <tjreedy at udel.edu>
committer: terryjreedy <tjreedy at udel.edu>
date: 2022-07-13T21:09:07-04:00
summary:

idlelib: replace 'while 1' with 'while True' (#94827)

files:
M Lib/idlelib/editor.py
M Lib/idlelib/history.py
M Lib/idlelib/hyperparser.py
M Lib/idlelib/rpc.py
M Lib/idlelib/run.py
M Lib/idlelib/searchengine.py

diff --git a/Lib/idlelib/editor.py b/Lib/idlelib/editor.py
index 6c52efd655e12..859a288b4bc67 100644
--- a/Lib/idlelib/editor.py
+++ b/Lib/idlelib/editor.py
@@ -1301,7 +1301,7 @@ def smart_backspace_event(self, event):
         want = ((have - 1) // self.indentwidth) * self.indentwidth
         # Debug prompt is multilined....
         ncharsdeleted = 0
-        while 1:
+        while True:
             chars = chars[:-1]
             ncharsdeleted = ncharsdeleted + 1
             have = len(chars.expandtabs(tabwidth))
diff --git a/Lib/idlelib/history.py b/Lib/idlelib/history.py
index 100f505256a94..5a9b32aaf6bb8 100644
--- a/Lib/idlelib/history.py
+++ b/Lib/idlelib/history.py
@@ -65,7 +65,7 @@ def fetch(self, reverse):
                     self.text.bell()
                     return
         nprefix = len(prefix)
-        while 1:
+        while True:
             pointer += -1 if reverse else 1
             if pointer < 0 or pointer >= nhist:
                 self.text.bell()
diff --git a/Lib/idlelib/hyperparser.py b/Lib/idlelib/hyperparser.py
index 77baca782b3fd..76144ee8fb30f 100644
--- a/Lib/idlelib/hyperparser.py
+++ b/Lib/idlelib/hyperparser.py
@@ -237,9 +237,9 @@ def get_expression(self):
         last_identifier_pos = pos
         postdot_phase = True
 
-        while 1:
+        while True:
             # Eat whitespaces, comments, and if postdot_phase is False - a dot
-            while 1:
+            while True:
                 if pos>brck_limit and rawtext[pos-1] in self._whitespace_chars:
                     # Eat a whitespace
                     pos -= 1
diff --git a/Lib/idlelib/rpc.py b/Lib/idlelib/rpc.py
index 8efcf048fa3aa..62eec84c9c8d0 100644
--- a/Lib/idlelib/rpc.py
+++ b/Lib/idlelib/rpc.py
@@ -307,7 +307,7 @@ def _getresponse(self, myseq, wait):
         self.debug("_getresponse:myseq:", myseq)
         if threading.current_thread() is self.sockthread:
             # this thread does all reading of requests or responses
-            while 1:
+            while True:
                 response = self.pollresponse(myseq, wait)
                 if response is not None:
                     return response
@@ -417,7 +417,7 @@ def pollresponse(self, myseq, wait):
         self.responses and notify the owning thread.
 
         """
-        while 1:
+        while True:
             # send queued response if there is one available
             try:
                 qmsg = response_queue.get(0)
diff --git a/Lib/idlelib/run.py b/Lib/idlelib/run.py
index aaa9b5ce8d181..577c49eb67b20 100644
--- a/Lib/idlelib/run.py
+++ b/Lib/idlelib/run.py
@@ -145,7 +145,7 @@ def main(del_exitfunc=False):
                                   args=((LOCALHOST, port),))
     sockthread.daemon = True
     sockthread.start()
-    while 1:
+    while True:
         try:
             if exit_now:
                 try:
diff --git a/Lib/idlelib/searchengine.py b/Lib/idlelib/searchengine.py
index eddef581ab40a..0684142f43644 100644
--- a/Lib/idlelib/searchengine.py
+++ b/Lib/idlelib/searchengine.py
@@ -165,7 +165,7 @@ def search_backward(self, text, prog, line, col, wrap, ok=0):
         wrapped = 0
         startline = line
         chars = text.get("%d.0" % line, "%d.0" % (line+1))
-        while 1:
+        while True:
             m = search_reverse(prog, chars[:-1], col)
             if m:
                 if ok or m.start() < col:


From webhook-mailer at python.org  Wed Jul 13 21:27:43 2022
From: webhook-mailer at python.org (miss-islington)
Date: Thu, 14 Jul 2022 01:27:43 -0000
Subject: [Python-checkins] idlelib: replace 'while 1' with 'while True'
 (GH-94827)
Message-ID: <mailman.14.1657762064.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/915fb4f4418de5150121ed16ed88c2e11f60283b
commit: 915fb4f4418de5150121ed16ed88c2e11f60283b
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-13T18:27:20-07:00
summary:

idlelib: replace 'while 1' with 'while True' (GH-94827)

(cherry picked from commit 6a15f918b5a6fb5113d5332ebf27df1d5360e66c)

Co-authored-by: Terry Jan Reedy <tjreedy at udel.edu>

files:
M Lib/idlelib/editor.py
M Lib/idlelib/history.py
M Lib/idlelib/hyperparser.py
M Lib/idlelib/rpc.py
M Lib/idlelib/run.py
M Lib/idlelib/searchengine.py

diff --git a/Lib/idlelib/editor.py b/Lib/idlelib/editor.py
index 6c52efd655e12..859a288b4bc67 100644
--- a/Lib/idlelib/editor.py
+++ b/Lib/idlelib/editor.py
@@ -1301,7 +1301,7 @@ def smart_backspace_event(self, event):
         want = ((have - 1) // self.indentwidth) * self.indentwidth
         # Debug prompt is multilined....
         ncharsdeleted = 0
-        while 1:
+        while True:
             chars = chars[:-1]
             ncharsdeleted = ncharsdeleted + 1
             have = len(chars.expandtabs(tabwidth))
diff --git a/Lib/idlelib/history.py b/Lib/idlelib/history.py
index 7ce09253eff5c..621c5812fc25c 100644
--- a/Lib/idlelib/history.py
+++ b/Lib/idlelib/history.py
@@ -65,7 +65,7 @@ def fetch(self, reverse):
                     self.text.bell()
                     return
         nprefix = len(prefix)
-        while 1:
+        while True:
             pointer += -1 if reverse else 1
             if pointer < 0 or pointer >= nhist:
                 self.text.bell()
diff --git a/Lib/idlelib/hyperparser.py b/Lib/idlelib/hyperparser.py
index 77baca782b3fd..76144ee8fb30f 100644
--- a/Lib/idlelib/hyperparser.py
+++ b/Lib/idlelib/hyperparser.py
@@ -237,9 +237,9 @@ def get_expression(self):
         last_identifier_pos = pos
         postdot_phase = True
 
-        while 1:
+        while True:
             # Eat whitespaces, comments, and if postdot_phase is False - a dot
-            while 1:
+            while True:
                 if pos>brck_limit and rawtext[pos-1] in self._whitespace_chars:
                     # Eat a whitespace
                     pos -= 1
diff --git a/Lib/idlelib/rpc.py b/Lib/idlelib/rpc.py
index 8efcf048fa3aa..62eec84c9c8d0 100644
--- a/Lib/idlelib/rpc.py
+++ b/Lib/idlelib/rpc.py
@@ -307,7 +307,7 @@ def _getresponse(self, myseq, wait):
         self.debug("_getresponse:myseq:", myseq)
         if threading.current_thread() is self.sockthread:
             # this thread does all reading of requests or responses
-            while 1:
+            while True:
                 response = self.pollresponse(myseq, wait)
                 if response is not None:
                     return response
@@ -417,7 +417,7 @@ def pollresponse(self, myseq, wait):
         self.responses and notify the owning thread.
 
         """
-        while 1:
+        while True:
             # send queued response if there is one available
             try:
                 qmsg = response_queue.get(0)
diff --git a/Lib/idlelib/run.py b/Lib/idlelib/run.py
index aaa9b5ce8d181..577c49eb67b20 100644
--- a/Lib/idlelib/run.py
+++ b/Lib/idlelib/run.py
@@ -145,7 +145,7 @@ def main(del_exitfunc=False):
                                   args=((LOCALHOST, port),))
     sockthread.daemon = True
     sockthread.start()
-    while 1:
+    while True:
         try:
             if exit_now:
                 try:
diff --git a/Lib/idlelib/searchengine.py b/Lib/idlelib/searchengine.py
index eddef581ab40a..0684142f43644 100644
--- a/Lib/idlelib/searchengine.py
+++ b/Lib/idlelib/searchengine.py
@@ -165,7 +165,7 @@ def search_backward(self, text, prog, line, col, wrap, ok=0):
         wrapped = 0
         startline = line
         chars = text.get("%d.0" % line, "%d.0" % (line+1))
-        while 1:
+        while True:
             m = search_reverse(prog, chars[:-1], col)
             if m:
                 if ok or m.start() < col:


From webhook-mailer at python.org  Wed Jul 13 21:33:38 2022
From: webhook-mailer at python.org (miss-islington)
Date: Thu, 14 Jul 2022 01:33:38 -0000
Subject: [Python-checkins] idlelib: replace 'while 1' with 'while True'
 (GH-94827)
Message-ID: <mailman.15.1657762419.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/29fc20cdc068b1d744371d3e5a0e87b1dc7b73e5
commit: 29fc20cdc068b1d744371d3e5a0e87b1dc7b73e5
branch: 3.11
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-13T18:33:29-07:00
summary:

idlelib: replace 'while 1' with 'while True' (GH-94827)

(cherry picked from commit 6a15f918b5a6fb5113d5332ebf27df1d5360e66c)

Co-authored-by: Terry Jan Reedy <tjreedy at udel.edu>

files:
M Lib/idlelib/editor.py
M Lib/idlelib/history.py
M Lib/idlelib/hyperparser.py
M Lib/idlelib/rpc.py
M Lib/idlelib/run.py
M Lib/idlelib/searchengine.py

diff --git a/Lib/idlelib/editor.py b/Lib/idlelib/editor.py
index 6c52efd655e12..859a288b4bc67 100644
--- a/Lib/idlelib/editor.py
+++ b/Lib/idlelib/editor.py
@@ -1301,7 +1301,7 @@ def smart_backspace_event(self, event):
         want = ((have - 1) // self.indentwidth) * self.indentwidth
         # Debug prompt is multilined....
         ncharsdeleted = 0
-        while 1:
+        while True:
             chars = chars[:-1]
             ncharsdeleted = ncharsdeleted + 1
             have = len(chars.expandtabs(tabwidth))
diff --git a/Lib/idlelib/history.py b/Lib/idlelib/history.py
index 100f505256a94..5a9b32aaf6bb8 100644
--- a/Lib/idlelib/history.py
+++ b/Lib/idlelib/history.py
@@ -65,7 +65,7 @@ def fetch(self, reverse):
                     self.text.bell()
                     return
         nprefix = len(prefix)
-        while 1:
+        while True:
             pointer += -1 if reverse else 1
             if pointer < 0 or pointer >= nhist:
                 self.text.bell()
diff --git a/Lib/idlelib/hyperparser.py b/Lib/idlelib/hyperparser.py
index 77baca782b3fd..76144ee8fb30f 100644
--- a/Lib/idlelib/hyperparser.py
+++ b/Lib/idlelib/hyperparser.py
@@ -237,9 +237,9 @@ def get_expression(self):
         last_identifier_pos = pos
         postdot_phase = True
 
-        while 1:
+        while True:
             # Eat whitespaces, comments, and if postdot_phase is False - a dot
-            while 1:
+            while True:
                 if pos>brck_limit and rawtext[pos-1] in self._whitespace_chars:
                     # Eat a whitespace
                     pos -= 1
diff --git a/Lib/idlelib/rpc.py b/Lib/idlelib/rpc.py
index 8efcf048fa3aa..62eec84c9c8d0 100644
--- a/Lib/idlelib/rpc.py
+++ b/Lib/idlelib/rpc.py
@@ -307,7 +307,7 @@ def _getresponse(self, myseq, wait):
         self.debug("_getresponse:myseq:", myseq)
         if threading.current_thread() is self.sockthread:
             # this thread does all reading of requests or responses
-            while 1:
+            while True:
                 response = self.pollresponse(myseq, wait)
                 if response is not None:
                     return response
@@ -417,7 +417,7 @@ def pollresponse(self, myseq, wait):
         self.responses and notify the owning thread.
 
         """
-        while 1:
+        while True:
             # send queued response if there is one available
             try:
                 qmsg = response_queue.get(0)
diff --git a/Lib/idlelib/run.py b/Lib/idlelib/run.py
index aaa9b5ce8d181..577c49eb67b20 100644
--- a/Lib/idlelib/run.py
+++ b/Lib/idlelib/run.py
@@ -145,7 +145,7 @@ def main(del_exitfunc=False):
                                   args=((LOCALHOST, port),))
     sockthread.daemon = True
     sockthread.start()
-    while 1:
+    while True:
         try:
             if exit_now:
                 try:
diff --git a/Lib/idlelib/searchengine.py b/Lib/idlelib/searchengine.py
index eddef581ab40a..0684142f43644 100644
--- a/Lib/idlelib/searchengine.py
+++ b/Lib/idlelib/searchengine.py
@@ -165,7 +165,7 @@ def search_backward(self, text, prog, line, col, wrap, ok=0):
         wrapped = 0
         startline = line
         chars = text.get("%d.0" % line, "%d.0" % (line+1))
-        while 1:
+        while True:
             m = search_reverse(prog, chars[:-1], col)
             if m:
                 if ok or m.start() < col:


From webhook-mailer at python.org  Thu Jul 14 02:50:40 2022
From: webhook-mailer at python.org (Fidget-Spinner)
Date: Thu, 14 Jul 2022 06:50:40 -0000
Subject: [Python-checkins] gh-94309: Add typing.Hashable and typing.Sized
 for "What's New for Python 3.12" (GH-94729)
Message-ID: <mailman.16.1657781441.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/b03a9e8c8a4f3f5bb7196d4825fbfdaff022756f
commit: b03a9e8c8a4f3f5bb7196d4825fbfdaff022756f
branch: main
author: MonadChains <monadchains at gmail.com>
committer: Fidget-Spinner <28750310+Fidget-Spinner at users.noreply.github.com>
date: 2022-07-14T07:50:31+01:00
summary:

gh-94309: Add typing.Hashable and typing.Sized for "What's New for Python 3.12" (GH-94729)

Co-authored-by: Ken Jin <28750310+Fidget-Spinner at users.noreply.github.com>

files:
M Doc/whatsnew/3.12.rst

diff --git a/Doc/whatsnew/3.12.rst b/Doc/whatsnew/3.12.rst
index 3de80cf6a68fc..c23026b436c88 100644
--- a/Doc/whatsnew/3.12.rst
+++ b/Doc/whatsnew/3.12.rst
@@ -132,6 +132,9 @@ CPython bytecode changes
 Deprecated
 ==========
 
+* :class:`typing.Hashable` and :class:`typing.Sized` aliases for :class:`collections.abc.Hashable`
+  and :class:`collections.abc.Sized`. (:gh:`94309`)
+
 
 Pending Removal in Python 3.13
 ------------------------------


From webhook-mailer at python.org  Thu Jul 14 03:51:57 2022
From: webhook-mailer at python.org (miss-islington)
Date: Thu, 14 Jul 2022 07:51:57 -0000
Subject: [Python-checkins] gh-93939: Build C extensions without setup.py
 (GH-94474)
Message-ID: <mailman.17.1657785118.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/81dca70d704d0834d8c30580e648a973250b2973
commit: 81dca70d704d0834d8c30580e648a973250b2973
branch: main
author: Christian Heimes <christian at python.org>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-14T00:51:49-07:00
summary:

gh-93939: Build C extensions without setup.py (GH-94474)



Combines GH-93940, GH-94452, and GH-94433

files:
A Misc/NEWS.d/next/Build/2022-06-28-09-42-10.gh-issue-93939._VWxKW.rst
D Lib/_bootsubprocess.py
D setup.py
M Doc/whatsnew/3.12.rst
M Lib/test/test_descr.py
M Makefile.pre.in
M Modules/Setup
M Modules/Setup.stdlib.in
M Python/stdlib_module_names.h
M Tools/scripts/check_extension_modules.py
M Tools/scripts/generate_stdlib_module_names.py
M Tools/ssl/multissltests.py
M configure
M configure.ac

diff --git a/Doc/whatsnew/3.12.rst b/Doc/whatsnew/3.12.rst
index c23026b436c88..942196c03fd92 100644
--- a/Doc/whatsnew/3.12.rst
+++ b/Doc/whatsnew/3.12.rst
@@ -356,6 +356,12 @@ Changes in the Python API
 Build Changes
 =============
 
+* Python no longer uses ``setup.py`` to build shared C extension modules.
+  Build parameters like headers and libraries are detected in ``configure``
+  script. Extensions are built by ``Makefile``. Most extensions use
+  ``pkg-config`` and fall back to manual detection.
+  (Contributed by Christian Heimes in :gh:`93939`.)
+
 * ``va_start()`` with two parameters, like ``va_start(args, format),``
   is now required to build Python.
   ``va_start()`` is no longer called with a single parameter.
diff --git a/Lib/_bootsubprocess.py b/Lib/_bootsubprocess.py
deleted file mode 100644
index 014782f616c82..0000000000000
--- a/Lib/_bootsubprocess.py
+++ /dev/null
@@ -1,97 +0,0 @@
-"""
-Basic subprocess implementation for POSIX which only uses os functions. Only
-implement features required by setup.py to build C extension modules when
-subprocess is unavailable. setup.py is not used on Windows.
-"""
-import os
-
-
-# distutils.spawn used by distutils.command.build_ext
-# calls subprocess.Popen().wait()
-class Popen:
-    def __init__(self, cmd, env=None):
-        self._cmd = cmd
-        self._env = env
-        self.returncode = None
-
-    def wait(self):
-        pid = os.fork()
-        if pid == 0:
-            # Child process
-            try:
-                if self._env is not None:
-                    os.execve(self._cmd[0], self._cmd, self._env)
-                else:
-                    os.execv(self._cmd[0], self._cmd)
-            finally:
-                os._exit(1)
-        else:
-            # Parent process
-            _, status = os.waitpid(pid, 0)
-            self.returncode = os.waitstatus_to_exitcode(status)
-
-        return self.returncode
-
-
-def _check_cmd(cmd):
-    # Use regex [a-zA-Z0-9./-]+: reject empty string, space, etc.
-    safe_chars = []
-    for first, last in (("a", "z"), ("A", "Z"), ("0", "9")):
-        for ch in range(ord(first), ord(last) + 1):
-            safe_chars.append(chr(ch))
-    safe_chars.append("./-")
-    safe_chars = ''.join(safe_chars)
-
-    if isinstance(cmd, (tuple, list)):
-        check_strs = cmd
-    elif isinstance(cmd, str):
-        check_strs = [cmd]
-    else:
-        return False
-
-    for arg in check_strs:
-        if not isinstance(arg, str):
-            return False
-        if not arg:
-            # reject empty string
-            return False
-        for ch in arg:
-            if ch not in safe_chars:
-                return False
-
-    return True
-
-
-# _aix_support used by distutil.util calls subprocess.check_output()
-def check_output(cmd, **kwargs):
-    if kwargs:
-        raise NotImplementedError(repr(kwargs))
-
-    if not _check_cmd(cmd):
-        raise ValueError(f"unsupported command: {cmd!r}")
-
-    tmp_filename = "check_output.tmp"
-    if not isinstance(cmd, str):
-        cmd = " ".join(cmd)
-    cmd = f"{cmd} >{tmp_filename}"
-
-    try:
-        # system() spawns a shell
-        status = os.system(cmd)
-        exitcode = os.waitstatus_to_exitcode(status)
-        if exitcode:
-            raise ValueError(f"Command {cmd!r} returned non-zero "
-                             f"exit status {exitcode!r}")
-
-        try:
-            with open(tmp_filename, "rb") as fp:
-                stdout = fp.read()
-        except FileNotFoundError:
-            stdout = b''
-    finally:
-        try:
-            os.unlink(tmp_filename)
-        except OSError:
-            pass
-
-    return stdout
diff --git a/Lib/test/test_descr.py b/Lib/test/test_descr.py
index b5f1bd4af888d..4386e113745a4 100644
--- a/Lib/test/test_descr.py
+++ b/Lib/test/test_descr.py
@@ -21,6 +21,11 @@
 except ImportError:
     _testcapi = None
 
+try:
+    import xxsubtype
+except ImportError:
+    xxsubtype = None
+
 
 class OperatorsTest(unittest.TestCase):
 
@@ -299,6 +304,7 @@ def test_explicit_reverse_methods(self):
         self.assertEqual(float.__rsub__(3.0, 1), -2.0)
 
     @support.impl_detail("the module 'xxsubtype' is internal")
+    @unittest.skipIf(xxsubtype is None, "requires xxsubtype module")
     def test_spam_lists(self):
         # Testing spamlist operations...
         import copy, xxsubtype as spam
@@ -343,6 +349,7 @@ def foo(self): return 1
         self.assertEqual(a.getstate(), 42)
 
     @support.impl_detail("the module 'xxsubtype' is internal")
+    @unittest.skipIf(xxsubtype is None, "requires xxsubtype module")
     def test_spam_dicts(self):
         # Testing spamdict operations...
         import copy, xxsubtype as spam
@@ -1600,6 +1607,7 @@ def test_refleaks_in_classmethod___init__(self):
         self.assertAlmostEqual(gettotalrefcount() - refs_before, 0, delta=10)
 
     @support.impl_detail("the module 'xxsubtype' is internal")
+    @unittest.skipIf(xxsubtype is None, "requires xxsubtype module")
     def test_classmethods_in_c(self):
         # Testing C-based class methods...
         import xxsubtype as spam
@@ -1683,6 +1691,7 @@ def test_refleaks_in_staticmethod___init__(self):
         self.assertAlmostEqual(gettotalrefcount() - refs_before, 0, delta=10)
 
     @support.impl_detail("the module 'xxsubtype' is internal")
+    @unittest.skipIf(xxsubtype is None, "requires xxsubtype module")
     def test_staticmethods_in_c(self):
         # Testing C-based static methods...
         import xxsubtype as spam
diff --git a/Makefile.pre.in b/Makefile.pre.in
index 77696fca94078..98df01963ca5a 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -211,12 +211,6 @@ ENSUREPIP=      @ENSUREPIP@
 LIBMPDEC_A= Modules/_decimal/libmpdec/libmpdec.a
 LIBEXPAT_A= Modules/expat/libexpat.a
 
-# OpenSSL options for setup.py so sysconfig can pick up AC_SUBST() vars.
-OPENSSL_INCLUDES=@OPENSSL_INCLUDES@
-OPENSSL_LIBS=@OPENSSL_LIBS@
-OPENSSL_LDFLAGS=@OPENSSL_LDFLAGS@
-OPENSSL_RPATH=@OPENSSL_RPATH@
-
 # Module state, compiler flags and linker flags
 # Empty CFLAGS and LDFLAGS are omitted.
 # states:
@@ -582,9 +576,10 @@ LIBEXPAT_HEADERS= \
 
 # Default target
 all:		@DEF_MAKE_ALL_RULE@
-build_all:	check-clean-src $(BUILDPYTHON) platform oldsharedmods sharedmods \
-		gdbhooks Programs/_testembed scripts
-build_wasm: check-clean-src $(BUILDPYTHON) platform oldsharedmods python-config
+build_all:	check-clean-src $(BUILDPYTHON) platform sharedmods \
+		gdbhooks Programs/_testembed scripts checksharedmods
+build_wasm: check-clean-src $(BUILDPYTHON) platform sharedmods \
+		python-config checksharedmods
 
 # Check that the source is clean when building out of source.
 check-clean-src:
@@ -726,22 +721,6 @@ $(srcdir)/Modules/_blake2/blake2s_impl.c: $(srcdir)/Modules/_blake2/blake2b_impl
 	$(PYTHON_FOR_REGEN) $(srcdir)/Modules/_blake2/blake2b2s.py
 	$(PYTHON_FOR_REGEN) $(srcdir)/Tools/clinic/clinic.py -f $@
 
-# Build the shared modules
-# Under GNU make, MAKEFLAGS are sorted and normalized; the 's' for
-# -s, --silent or --quiet is always the first char.
-# Under BSD make, MAKEFLAGS might be " -s -v x=y".
-# Ignore macros passed by GNU make, passed after --
-sharedmods: $(PYTHON_FOR_BUILD_DEPS) pybuilddir.txt @LIBMPDEC_INTERNAL@ @LIBEXPAT_INTERNAL@
-	@case "`echo X $$MAKEFLAGS | sed 's/^X //;s/ -- .*//'`" in \
-	    *\ -s*|s*) quiet="-q";; \
-	    *) quiet="";; \
-	esac; \
-	echo "$(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' \
-		$(PYTHON_FOR_BUILD) $(srcdir)/setup.py $$quiet build"; \
-	$(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' \
-		$(PYTHON_FOR_BUILD) $(srcdir)/setup.py $$quiet build
-
-
 # Build static library
 $(LIBRARY): $(LIBRARY_OBJS)
 	-rm -f $@
@@ -832,10 +811,6 @@ python.worker.js: $(srcdir)/Tools/wasm/python.worker.js
 # Build static libmpdec.a
 LIBMPDEC_CFLAGS=@LIBMPDEC_CFLAGS@ $(PY_STDMODULE_CFLAGS) $(CCSHARED)
 
-# for setup.py
-DECIMAL_CFLAGS=@LIBMPDEC_CFLAGS@
-DECIMAL_LDFLAGS=@LIBMPDEC_LDFLAGS@
-
 # "%.o: %c" is not portable
 Modules/_decimal/libmpdec/basearith.o: $(srcdir)/Modules/_decimal/libmpdec/basearith.c $(LIBMPDEC_HEADERS) $(PYTHON_HEADERS)
 	$(CC) -c $(LIBMPDEC_CFLAGS) -o $@ $(srcdir)/Modules/_decimal/libmpdec/basearith.c
@@ -890,10 +865,6 @@ $(LIBMPDEC_A): $(LIBMPDEC_OBJS)
 # Build static libexpat.a
 LIBEXPAT_CFLAGS=@LIBEXPAT_CFLAGS@ $(PY_STDMODULE_CFLAGS) $(CCSHARED)
 
-# for setup.py
-EXPAT_CFLAGS=@LIBEXPAT_CFLAGS@
-EXPAT_LDFLAGS=@LIBEXPAT_LDFLAGS@
-
 Modules/expat/xmlparse.o: $(srcdir)/Modules/expat/xmlparse.c $(LIBEXPAT_HEADERS) $(PYTHON_HEADERS)
 	$(CC) -c $(LIBEXPAT_CFLAGS) -o $@ $(srcdir)/Modules/expat/xmlparse.c
 
@@ -910,7 +881,7 @@ $(LIBEXPAT_A): $(LIBEXPAT_OBJS)
 # create relative links from build/lib.platform/egg.so to Modules/egg.so
 # pybuilddir.txt is created too late. We cannot use it in Makefile
 # targets. ln --relative is not portable.
-oldsharedmods: $(SHAREDMODS) pybuilddir.txt
+sharedmods: $(SHAREDMODS) pybuilddir.txt
 	@target=`cat pybuilddir.txt`; \
 	$(MKDIR_P) $$target; \
 	for mod in X $(SHAREDMODS); do \
@@ -919,7 +890,8 @@ oldsharedmods: $(SHAREDMODS) pybuilddir.txt
 		fi; \
 	done
 
-checksharedmods: oldsharedmods sharedmods $(PYTHON_FOR_BUILD_DEPS)
+# dependency on BUILDPYTHON ensures that the target is run last
+checksharedmods: sharedmods $(PYTHON_FOR_BUILD_DEPS) $(BUILDPYTHON)
 	@$(RUNSHARED) $(PYTHON_FOR_BUILD) $(srcdir)/Tools/scripts/check_extension_modules.py
 
 Modules/Setup.local:
@@ -942,7 +914,7 @@ Makefile Modules/config.c: Makefile.pre \
 	$(SHELL) $(MAKESETUP) -c $(srcdir)/Modules/config.c.in \
 				-s Modules \
 				Modules/Setup.local \
-				@MODULES_SETUP_STDLIB@ \
+				Modules/Setup.stdlib \
 				Modules/Setup.bootstrap \
 				$(srcdir)/Modules/Setup
 	@mv config.c Modules
@@ -1762,13 +1734,13 @@ altinstall: commoninstall
 
 commoninstall:  check-clean-src @FRAMEWORKALTINSTALLFIRST@ \
 		altbininstall libinstall inclinstall libainstall \
-		sharedinstall oldsharedinstall altmaninstall \
+		sharedinstall altmaninstall \
 		@FRAMEWORKALTINSTALLLAST@
 
 # Install shared libraries enabled by Setup
 DESTDIRS=	$(exec_prefix) $(LIBDIR) $(BINLIBDEST) $(DESTSHARED)
 
-oldsharedinstall: $(DESTSHARED) all
+sharedinstall: $(DESTSHARED) all
 		@for i in X $(SHAREDMODS); do \
 		  if test $$i != X; then \
 		    echo $(INSTALL_SHARED) $$i $(DESTSHARED)/`basename $$i`; \
@@ -2252,17 +2224,6 @@ libainstall: all scripts
 	else true; \
 	fi
 
-# Install the dynamically loadable modules
-# This goes into $(exec_prefix)
-sharedinstall: all
-	$(RUNSHARED) $(PYTHON_FOR_BUILD) $(srcdir)/setup.py install \
-	   	--prefix=$(prefix) \
-		--install-scripts=$(BINDIR) \
-		--install-platlib=$(DESTSHARED) \
-		--root=$(DESTDIR)/
-	-rm $(DESTDIR)$(DESTSHARED)/_sysconfigdata_$(ABIFLAGS)_$(MACHDEP)_$(MULTIARCH).py
-	-rm -r $(DESTDIR)$(DESTSHARED)/__pycache__
-
 # Here are a couple of targets for MacOSX again, to install a full
 # framework-based Python. frameworkinstall installs everything, the
 # subtargets install specific parts. Much of the actual work is offloaded to
@@ -2536,10 +2497,10 @@ update-config:
 Python/thread.o: @THREADHEADERS@ $(srcdir)/Python/condvar.h
 
 # Declare targets that aren't real files
-.PHONY: all build_all build_wasm sharedmods check-clean-src
-.PHONY: oldsharedmods checksharedmods test quicktest
-.PHONY: install altinstall oldsharedinstall bininstall altbininstall
-.PHONY: maninstall libinstall inclinstall libainstall sharedinstall
+.PHONY: all build_all build_wasm check-clean-src
+.PHONY: sharedmods checksharedmods test quicktest
+.PHONY: install altinstall sharedinstall bininstall altbininstall
+.PHONY: maninstall libinstall inclinstall libainstall
 .PHONY: frameworkinstall frameworkinstallframework frameworkinstallstructure
 .PHONY: frameworkinstallmaclib frameworkinstallapps frameworkinstallunixtools
 .PHONY: frameworkaltinstallunixtools recheck clean clobber distclean
diff --git a/Misc/NEWS.d/next/Build/2022-06-28-09-42-10.gh-issue-93939._VWxKW.rst b/Misc/NEWS.d/next/Build/2022-06-28-09-42-10.gh-issue-93939._VWxKW.rst
new file mode 100644
index 0000000000000..fa1e9e6be5c64
--- /dev/null
+++ b/Misc/NEWS.d/next/Build/2022-06-28-09-42-10.gh-issue-93939._VWxKW.rst
@@ -0,0 +1,2 @@
+C extension modules are now built by ``configure`` and ``make``
+instead of :mod:`distutils` and ``setup.py``.
diff --git a/Modules/Setup b/Modules/Setup
index d3647ecb99592..8fe79512787cd 100644
--- a/Modules/Setup
+++ b/Modules/Setup
@@ -275,7 +275,7 @@ PYTHONPATH=$(COREPYTHONPATH)
 #xx xxmodule.c
 #xxlimited xxlimited.c
 #xxlimited_35 xxlimited_35.c
-xxsubtype xxsubtype.c  # Required for the test suite to pass!
+#xxsubtype xxsubtype.c
 
 # Testing
 
diff --git a/Modules/Setup.stdlib.in b/Modules/Setup.stdlib.in
index 581a5c7f979d1..09eca9f980db1 100644
--- a/Modules/Setup.stdlib.in
+++ b/Modules/Setup.stdlib.in
@@ -165,6 +165,7 @@
 ############################################################################
 # Test modules
 
+ at MODULE_XXSUBTYPE_TRUE@xxsubtype xxsubtype.c
 @MODULE__XXTESTFUZZ_TRUE at _xxtestfuzz _xxtestfuzz/_xxtestfuzz.c _xxtestfuzz/fuzzer.c
 @MODULE__TESTBUFFER_TRUE at _testbuffer _testbuffer.c
 @MODULE__TESTINTERNALCAPI_TRUE at _testinternalcapi _testinternalcapi.c
diff --git a/Python/stdlib_module_names.h b/Python/stdlib_module_names.h
index 553585a76a394..ff422e7230184 100644
--- a/Python/stdlib_module_names.h
+++ b/Python/stdlib_module_names.h
@@ -9,7 +9,6 @@ static const char* _Py_stdlib_module_names[] = {
 "_asyncio",
 "_bisect",
 "_blake2",
-"_bootsubprocess",
 "_bz2",
 "_codecs",
 "_codecs_cn",
diff --git a/Tools/scripts/check_extension_modules.py b/Tools/scripts/check_extension_modules.py
index b3f43abf637bd..59239c62e2ef3 100644
--- a/Tools/scripts/check_extension_modules.py
+++ b/Tools/scripts/check_extension_modules.py
@@ -130,10 +130,11 @@ class ModuleChecker:
     pybuilddir_txt = "pybuilddir.txt"
 
     setup_files = (
-        SRC_DIR / "Modules/Setup",
+        # see end of configure.ac
         "Modules/Setup.local",
-        "Modules/Setup.bootstrap",
         "Modules/Setup.stdlib",
+        "Modules/Setup.bootstrap",
+        SRC_DIR / "Modules/Setup",
     )
 
     def __init__(self, cross_compiling: bool = False, strict: bool = False):
@@ -308,12 +309,6 @@ def get_sysconfig_modules(self) -> Iterable[ModuleInfo]:
         MODBUILT_NAMES: modules in *static* block
         MODSHARED_NAMES: modules in *shared* block
         MODDISABLED_NAMES: modules in *disabled* block
-
-        Modules built by setup.py addext() have a MODULE_{modname}_STATE entry,
-        but are not listed in MODSHARED_NAMES.
-
-        Modules built by old-style setup.py add() have neither a  MODULE_{modname}
-        entry nor an entry in MODSHARED_NAMES.
         """
         moddisabled = set(sysconfig.get_config_var("MODDISABLED_NAMES").split())
         if self.cross_compiling:
diff --git a/Tools/scripts/generate_stdlib_module_names.py b/Tools/scripts/generate_stdlib_module_names.py
index 82f10948b1b95..92100bd06509a 100644
--- a/Tools/scripts/generate_stdlib_module_names.py
+++ b/Tools/scripts/generate_stdlib_module_names.py
@@ -12,7 +12,6 @@
 
 SRC_DIR = os.path.dirname(os.path.dirname(os.path.dirname(__file__)))
 STDLIB_PATH = os.path.join(SRC_DIR, 'Lib')
-SETUP_PY = os.path.join(SRC_DIR, 'setup.py')
 
 IGNORE = {
     '__init__',
@@ -64,15 +63,6 @@ def list_packages(names):
             names.add(name)
 
 
-# Extension modules built by setup.py
-def list_setup_extensions(names):
-    cmd = [sys.executable, SETUP_PY, "-q", "build", "--list-module-names"]
-    output = subprocess.check_output(cmd)
-    output = output.decode("utf8")
-    extensions = output.splitlines()
-    names |= set(extensions)
-
-
 # Built-in and extension modules built by Modules/Setup*
 # includes Windows and macOS extensions.
 def list_modules_setup_extensions(names):
@@ -103,7 +93,6 @@ def list_frozen(names):
 def list_modules():
     names = set(sys.builtin_module_names)
     list_modules_setup_extensions(names)
-    list_setup_extensions(names)
     list_packages(names)
     list_python_modules(names)
     list_frozen(names)
diff --git a/Tools/ssl/multissltests.py b/Tools/ssl/multissltests.py
index fc6b2d0f8becf..24ddd2a20913a 100755
--- a/Tools/ssl/multissltests.py
+++ b/Tools/ssl/multissltests.py
@@ -358,7 +358,7 @@ def recompile_pymods(self):
         env["LD_RUN_PATH"] = self.lib_dir
 
         log.info("Rebuilding Python modules")
-        cmd = [sys.executable, os.path.join(PYTHONROOT, "setup.py"), "build"]
+        cmd = ["make", "sharedmods", "checksharedmods"]
         self._subprocess_call(cmd, env=env)
         self.check_imports()
 
@@ -472,7 +472,7 @@ def main():
     start = datetime.now()
 
     if args.steps in {'modules', 'tests'}:
-        for name in ['setup.py', 'Modules/_ssl.c']:
+        for name in ['Makefile.pre.in', 'Modules/_ssl.c']:
             if not os.path.isfile(os.path.join(PYTHONROOT, name)):
                 parser.error(
                     "Must be executed from CPython build dir"
diff --git a/configure b/configure
index bffc30a590fbe..55d0518d3886f 100755
--- a/configure
+++ b/configure
@@ -632,6 +632,8 @@ MODULE__CTYPES_TEST_FALSE
 MODULE__CTYPES_TEST_TRUE
 MODULE__XXTESTFUZZ_FALSE
 MODULE__XXTESTFUZZ_TRUE
+MODULE_XXSUBTYPE_FALSE
+MODULE_XXSUBTYPE_TRUE
 MODULE__TESTMULTIPHASE_FALSE
 MODULE__TESTMULTIPHASE_TRUE
 MODULE__TESTIMPORTMULTIPLE_FALSE
@@ -786,12 +788,10 @@ MODULE_TIME_FALSE
 MODULE_TIME_TRUE
 MODULE__IO_FALSE
 MODULE__IO_TRUE
-MODULES_SETUP_STDLIB
 MODULE_BUILDTYPE
 TEST_MODULES
 LIBB2_LIBS
 LIBB2_CFLAGS
-OPENSSL_RPATH
 OPENSSL_LDFLAGS
 OPENSSL_LIBS
 OPENSSL_INCLUDES
@@ -852,13 +852,11 @@ LIBSQLITE3_CFLAGS
 LIBNSL_LIBS
 LIBNSL_CFLAGS
 LIBMPDEC_INTERNAL
-LIBMPDEC_LDFLAGS
 LIBMPDEC_CFLAGS
 MODULE__CTYPES_MALLOC_CLOSURE
 LIBFFI_LIBS
 LIBFFI_CFLAGS
 LIBEXPAT_INTERNAL
-LIBEXPAT_LDFLAGS
 LIBEXPAT_CFLAGS
 TZPATH
 LIBUUID_LIBS
@@ -12026,7 +12024,6 @@ fi
 
 
 
-
 # Check for use of the system libffi library
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --with-system-ffi" >&5
 $as_echo_n "checking for --with-system-ffi... " >&6; }
@@ -12530,7 +12527,6 @@ fi
 
 
 
-
 # Check whether _decimal should use a coroutine-local or thread-local context
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --with-decimal-contextvar" >&5
 $as_echo_n "checking for --with-decimal-contextvar... " >&6; }
@@ -24024,7 +24020,6 @@ esac
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OPENSSL_RPATH" >&5
 $as_echo "$OPENSSL_RPATH" >&6; }
 
-
 # This static linking is NOT OFFICIALLY SUPPORTED and not advertised.
 # Requires static OpenSSL build with position-independent code. Some features
 # like DSO engines or external OSSL providers don't work. Only tested with GCC
@@ -24503,22 +24498,6 @@ case $host_cpu in #(
 esac
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for additional Modules/Setup files" >&5
-$as_echo_n "checking for additional Modules/Setup files... " >&6; }
-case $ac_sys_system in #(
-  Emscripten) :
-    MODULES_SETUP_STDLIB=Modules/Setup.stdlib ;; #(
-  WASI) :
-    MODULES_SETUP_STDLIB=Modules/Setup.stdlib ;; #(
-  *) :
-    MODULES_SETUP_STDLIB=
- ;;
-esac
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MODULES_SETUP_STDLIB" >&5
-$as_echo "$MODULES_SETUP_STDLIB" >&6; }
-
-
-
 
 MODULE_BLOCK=
 
@@ -26683,6 +26662,40 @@ fi
 $as_echo "$py_cv_module__testmultiphase" >&6; }
 
 
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for stdlib extension module xxsubtype" >&5
+$as_echo_n "checking for stdlib extension module xxsubtype... " >&6; }
+        if test "$py_cv_module_xxsubtype" != "n/a"; then :
+
+    if test "$TEST_MODULES" = yes; then :
+  if true; then :
+  py_cv_module_xxsubtype=yes
+else
+  py_cv_module_xxsubtype=missing
+fi
+else
+  py_cv_module_xxsubtype=disabled
+fi
+
+fi
+  as_fn_append MODULE_BLOCK "MODULE_XXSUBTYPE_STATE=$py_cv_module_xxsubtype$as_nl"
+  if test "x$py_cv_module_xxsubtype" = xyes; then :
+
+
+
+
+fi
+   if test "$py_cv_module_xxsubtype" = yes; then
+  MODULE_XXSUBTYPE_TRUE=
+  MODULE_XXSUBTYPE_FALSE='#'
+else
+  MODULE_XXSUBTYPE_TRUE='#'
+  MODULE_XXSUBTYPE_FALSE=
+fi
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $py_cv_module_xxsubtype" >&5
+$as_echo "$py_cv_module_xxsubtype" >&6; }
+
+
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for stdlib extension module _xxtestfuzz" >&5
 $as_echo_n "checking for stdlib extension module _xxtestfuzz... " >&6; }
         if test "$py_cv_module__xxtestfuzz" != "n/a"; then :
@@ -27248,6 +27261,10 @@ if test -z "${MODULE__TESTMULTIPHASE_TRUE}" && test -z "${MODULE__TESTMULTIPHASE
   as_fn_error $? "conditional \"MODULE__TESTMULTIPHASE\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${MODULE_XXSUBTYPE_TRUE}" && test -z "${MODULE_XXSUBTYPE_FALSE}"; then
+  as_fn_error $? "conditional \"MODULE_XXSUBTYPE\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${MODULE__XXTESTFUZZ_TRUE}" && test -z "${MODULE__XXTESTFUZZ_FALSE}"; then
   as_fn_error $? "conditional \"MODULE__XXTESTFUZZ\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -28467,7 +28484,11 @@ fi
 $as_echo "$as_me: creating Makefile" >&6;}
 $SHELL $srcdir/Modules/makesetup -c $srcdir/Modules/config.c.in \
 			-s Modules \
-			Modules/Setup.local $MODULES_SETUP_STDLIB Modules/Setup.bootstrap $srcdir/Modules/Setup
+			Modules/Setup.local Modules/Setup.stdlib Modules/Setup.bootstrap $srcdir/Modules/Setup
+if test $? -ne 0; then
+  as_fn_error $? "makesetup failed" "$LINENO" 5
+fi
+
 mv config.c Modules
 
 if test -z "$PKG_CONFIG"; then
diff --git a/configure.ac b/configure.ac
index f940c9b2ddf00..c851659a9110c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3569,7 +3569,6 @@ AS_VAR_IF([with_system_expat], [yes], [
 ])
 
 AC_SUBST([LIBEXPAT_CFLAGS])
-AC_SUBST([LIBEXPAT_LDFLAGS])
 AC_SUBST([LIBEXPAT_INTERNAL])
 
 # Check for use of the system libffi library
@@ -3676,7 +3675,6 @@ AS_VAR_IF([with_system_libmpdec], [yes], [
 ])
 
 AC_SUBST([LIBMPDEC_CFLAGS])
-AC_SUBST([LIBMPDEC_LDFLAGS])
 AC_SUBST([LIBMPDEC_INTERNAL])
 
 # Check whether _decimal should use a coroutine-local or thread-local context
@@ -6736,7 +6734,6 @@ AS_CASE($with_openssl_rpath,
     ]
 )
 AC_MSG_RESULT($OPENSSL_RPATH)
-AC_SUBST([OPENSSL_RPATH])
 
 # This static linking is NOT OFFICIALLY SUPPORTED and not advertised.
 # Requires static OpenSSL build with position-independent code. Some features
@@ -6983,17 +6980,6 @@ AS_CASE([$host_cpu],
 )
 AC_SUBST([MODULE_BUILDTYPE])
 
-dnl Use Modules/Setup.stdlib as additional provider?
-AC_MSG_CHECKING([for additional Modules/Setup files])
-AS_CASE([$ac_sys_system],
-    [Emscripten], [MODULES_SETUP_STDLIB=Modules/Setup.stdlib],
-    [WASI], [MODULES_SETUP_STDLIB=Modules/Setup.stdlib],
-    [MODULES_SETUP_STDLIB=]
-)
-AC_MSG_RESULT([$MODULES_SETUP_STDLIB])
-AC_SUBST([MODULES_SETUP_STDLIB])
-
-
 dnl _MODULE_BLOCK_ADD([VAR], [VALUE])
 dnl internal: adds $1=quote($2) to MODULE_BLOCK
 AC_DEFUN([_MODULE_BLOCK_ADD], [AS_VAR_APPEND([MODULE_BLOCK], ["$1=_AS_QUOTE([$2])$as_nl"])])
@@ -7198,6 +7184,7 @@ PY_STDLIB_MOD([_testinternalcapi], [test "$TEST_MODULES" = yes])
 PY_STDLIB_MOD([_testbuffer], [test "$TEST_MODULES" = yes])
 PY_STDLIB_MOD([_testimportmultiple], [test "$TEST_MODULES" = yes], [test "$ac_cv_func_dlopen" = yes])
 PY_STDLIB_MOD([_testmultiphase], [test "$TEST_MODULES" = yes], [test "$ac_cv_func_dlopen" = yes])
+PY_STDLIB_MOD([xxsubtype], [test "$TEST_MODULES" = yes])
 PY_STDLIB_MOD([_xxtestfuzz], [test "$TEST_MODULES" = yes])
 PY_STDLIB_MOD([_ctypes_test],
   [test "$TEST_MODULES" = yes], [test "$have_libffi" = yes -a "$ac_cv_func_dlopen" = yes],
@@ -7227,7 +7214,11 @@ fi
 AC_MSG_NOTICE([creating Makefile])
 $SHELL $srcdir/Modules/makesetup -c $srcdir/Modules/config.c.in \
 			-s Modules \
-			Modules/Setup.local $MODULES_SETUP_STDLIB Modules/Setup.bootstrap $srcdir/Modules/Setup
+			Modules/Setup.local Modules/Setup.stdlib Modules/Setup.bootstrap $srcdir/Modules/Setup
+if test $? -ne 0; then
+  AC_MSG_ERROR([makesetup failed])
+fi
+
 mv config.c Modules
 
 if test -z "$PKG_CONFIG"; then
diff --git a/setup.py b/setup.py
deleted file mode 100644
index 7c71ac6ec6414..0000000000000
--- a/setup.py
+++ /dev/null
@@ -1,1294 +0,0 @@
-# Autodetecting setup.py script for building the Python extensions
-
-import argparse
-import importlib._bootstrap
-import importlib.machinery
-import importlib.util
-import logging
-import os
-import re
-import shlex
-import sys
-import sysconfig
-import warnings
-from glob import glob, escape
-import _osx_support
-
-
-try:
-    import subprocess
-    del subprocess
-    SUBPROCESS_BOOTSTRAP = False
-except ImportError:
-    # Bootstrap Python: distutils.spawn uses subprocess to build C extensions,
-    # subprocess requires C extensions built by setup.py like _posixsubprocess.
-    #
-    # Use _bootsubprocess which only uses the os module.
-    #
-    # It is dropped from sys.modules as soon as all C extension modules
-    # are built.
-    import _bootsubprocess
-    sys.modules['subprocess'] = _bootsubprocess
-    del _bootsubprocess
-    SUBPROCESS_BOOTSTRAP = True
-
-
-with warnings.catch_warnings():
-    # bpo-41282 (PEP 632) deprecated distutils but setup.py still uses it
-    warnings.filterwarnings(
-        "ignore",
-        "The distutils package is deprecated",
-        DeprecationWarning
-    )
-    warnings.filterwarnings(
-        "ignore",
-        "The distutils.sysconfig module is deprecated, use sysconfig instead",
-        DeprecationWarning
-    )
-
-    from distutils.command.build_ext import build_ext
-    from distutils.command.install import install
-    from distutils.command.install_lib import install_lib
-    from distutils.core import Extension, setup
-    from distutils.errors import CCompilerError, DistutilsError
-    from distutils.spawn import find_executable
-
-
-# This global variable is used to hold the list of modules to be disabled.
-DISABLED_MODULE_LIST = []
-
-# --list-module-names option used by Tools/scripts/generate_module_names.py
-LIST_MODULE_NAMES = False
-
-
-logging.basicConfig(format='%(message)s', level=logging.INFO)
-log = logging.getLogger('setup')
-
-
-def get_platform():
-    # Cross compiling
-    if "_PYTHON_HOST_PLATFORM" in os.environ:
-        return os.environ["_PYTHON_HOST_PLATFORM"]
-
-    # Get value of sys.platform
-    if sys.platform.startswith('osf1'):
-        return 'osf1'
-    return sys.platform
-
-
-CROSS_COMPILING = ("_PYTHON_HOST_PLATFORM" in os.environ)
-HOST_PLATFORM = get_platform()
-MS_WINDOWS = (HOST_PLATFORM == 'win32')
-CYGWIN = (HOST_PLATFORM == 'cygwin')
-MACOS = (HOST_PLATFORM == 'darwin')
-AIX = (HOST_PLATFORM.startswith('aix'))
-VXWORKS = ('vxworks' in HOST_PLATFORM)
-EMSCRIPTEN = HOST_PLATFORM == 'emscripten-wasm32'
-CC = os.environ.get("CC")
-if not CC:
-    CC = sysconfig.get_config_var("CC")
-
-if EMSCRIPTEN:
-    # emcc is a Python script from a different Python interpreter.
-    os.environ.pop("PYTHONPATH", None)
-
-
-SUMMARY = """
-Python is an interpreted, interactive, object-oriented programming
-language. It is often compared to Tcl, Perl, Scheme or Java.
-
-Python combines remarkable power with very clear syntax. It has
-modules, classes, exceptions, very high level dynamic data types, and
-dynamic typing. There are interfaces to many system calls and
-libraries, as well as to various windowing systems (X11, Motif, Tk,
-Mac, MFC). New built-in modules are easily written in C or C++. Python
-is also usable as an extension language for applications that need a
-programmable interface.
-
-The Python implementation is portable: it runs on many brands of UNIX,
-on Windows, DOS, Mac, Amiga... If your favorite system isn't
-listed here, it may still be supported, if there's a C compiler for
-it. Ask around on comp.lang.python -- or just try compiling Python
-yourself.
-"""
-
-CLASSIFIERS = """
-Development Status :: 6 - Mature
-License :: OSI Approved :: Python Software Foundation License
-Natural Language :: English
-Programming Language :: C
-Programming Language :: Python
-Topic :: Software Development
-"""
-
-
-def run_command(cmd):
-    status = os.system(cmd)
-    return os.waitstatus_to_exitcode(status)
-
-
-# Set common compiler and linker flags derived from the Makefile,
-# reserved for building the interpreter and the stdlib modules.
-# See bpo-21121 and bpo-35257
-def set_compiler_flags(compiler_flags, compiler_py_flags_nodist):
-    flags = sysconfig.get_config_var(compiler_flags)
-    py_flags_nodist = sysconfig.get_config_var(compiler_py_flags_nodist)
-    sysconfig.get_config_vars()[compiler_flags] = flags + ' ' + py_flags_nodist
-
-
-def add_dir_to_list(dirlist, dir):
-    """Add the directory 'dir' to the list 'dirlist' (after any relative
-    directories) if:
-
-    1) 'dir' is not already in 'dirlist'
-    2) 'dir' actually exists, and is a directory.
-    """
-    if dir is None or not os.path.isdir(dir) or dir in dirlist:
-        return
-    for i, path in enumerate(dirlist):
-        if not os.path.isabs(path):
-            dirlist.insert(i + 1, dir)
-            return
-    dirlist.insert(0, dir)
-
-
-def sysroot_paths(make_vars, subdirs):
-    """Get the paths of sysroot sub-directories.
-
-    * make_vars: a sequence of names of variables of the Makefile where
-      sysroot may be set.
-    * subdirs: a sequence of names of subdirectories used as the location for
-      headers or libraries.
-    """
-
-    dirs = []
-    for var_name in make_vars:
-        var = sysconfig.get_config_var(var_name)
-        if var is not None:
-            m = re.search(r'--sysroot=([^"]\S*|"[^"]+")', var)
-            if m is not None:
-                sysroot = m.group(1).strip('"')
-                for subdir in subdirs:
-                    if os.path.isabs(subdir):
-                        subdir = subdir[1:]
-                    path = os.path.join(sysroot, subdir)
-                    if os.path.isdir(path):
-                        dirs.append(path)
-                break
-    return dirs
-
-
-MACOS_SDK_ROOT = None
-MACOS_SDK_SPECIFIED = None
-
-def macosx_sdk_root():
-    """Return the directory of the current macOS SDK.
-
-    If no SDK was explicitly configured, call the compiler to find which
-    include files paths are being searched by default.  Use '/' if the
-    compiler is searching /usr/include (meaning system header files are
-    installed) or use the root of an SDK if that is being searched.
-    (The SDK may be supplied via Xcode or via the Command Line Tools).
-    The SDK paths used by Apple-supplied tool chains depend on the
-    setting of various variables; see the xcrun man page for more info.
-    Also sets MACOS_SDK_SPECIFIED for use by macosx_sdk_specified().
-    """
-    global MACOS_SDK_ROOT, MACOS_SDK_SPECIFIED
-
-    # If already called, return cached result.
-    if MACOS_SDK_ROOT:
-        return MACOS_SDK_ROOT
-
-    cflags = sysconfig.get_config_var('CFLAGS')
-    m = re.search(r'-isysroot\s*(\S+)', cflags)
-    if m is not None:
-        MACOS_SDK_ROOT = m.group(1)
-        MACOS_SDK_SPECIFIED = MACOS_SDK_ROOT != '/'
-    else:
-        MACOS_SDK_ROOT = _osx_support._default_sysroot(
-            sysconfig.get_config_var('CC'))
-        MACOS_SDK_SPECIFIED = False
-
-    return MACOS_SDK_ROOT
-
-
-def is_macosx_sdk_path(path):
-    """
-    Returns True if 'path' can be located in a macOS SDK
-    """
-    return ( (path.startswith('/usr/') and not path.startswith('/usr/local'))
-                or path.startswith('/System/Library')
-                or path.startswith('/System/iOSSupport') )
-
-
-def grep_headers_for(function, headers):
-    for header in headers:
-        with open(header, 'r', errors='surrogateescape') as f:
-            if function in f.read():
-                return True
-    return False
-
-
-def find_file(filename, std_dirs, paths):
-    """Searches for the directory where a given file is located,
-    and returns a possibly-empty list of additional directories, or None
-    if the file couldn't be found at all.
-
-    'filename' is the name of a file, such as readline.h or libcrypto.a.
-    'std_dirs' is the list of standard system directories; if the
-        file is found in one of them, no additional directives are needed.
-    'paths' is a list of additional locations to check; if the file is
-        found in one of them, the resulting list will contain the directory.
-    """
-    if MACOS:
-        # Honor the MacOSX SDK setting when one was specified.
-        # An SDK is a directory with the same structure as a real
-        # system, but with only header files and libraries.
-        sysroot = macosx_sdk_root()
-
-    # Check the standard locations
-    for dir_ in std_dirs:
-        f = os.path.join(dir_, filename)
-
-        if MACOS and is_macosx_sdk_path(dir_):
-            f = os.path.join(sysroot, dir_[1:], filename)
-
-        if os.path.exists(f): return []
-
-    # Check the additional directories
-    for dir_ in paths:
-        f = os.path.join(dir_, filename)
-
-        if MACOS and is_macosx_sdk_path(dir_):
-            f = os.path.join(sysroot, dir_[1:], filename)
-
-        if os.path.exists(f):
-            return [dir_]
-
-    # Not found anywhere
-    return None
-
-
-def validate_tzpath():
-    base_tzpath = sysconfig.get_config_var('TZPATH')
-    if not base_tzpath:
-        return
-
-    tzpaths = base_tzpath.split(os.pathsep)
-    bad_paths = [tzpath for tzpath in tzpaths if not os.path.isabs(tzpath)]
-    if bad_paths:
-        raise ValueError('TZPATH must contain only absolute paths, '
-                         + f'found:\n{tzpaths!r}\nwith invalid paths:\n'
-                         + f'{bad_paths!r}')
-
-
-def find_module_file(module, dirlist):
-    """Find a module in a set of possible folders. If it is not found
-    return the unadorned filename"""
-    dirs = find_file(module, [], dirlist)
-    if not dirs:
-        return module
-    if len(dirs) > 1:
-        log.info(f"WARNING: multiple copies of {module} found")
-    return os.path.abspath(os.path.join(dirs[0], module))
-
-
-class PyBuildExt(build_ext):
-
-    def __init__(self, dist):
-        build_ext.__init__(self, dist)
-        self.srcdir = None
-        self.lib_dirs = None
-        self.inc_dirs = None
-        self.config_h_vars = None
-        self.failed = []
-        self.failed_on_import = []
-        self.missing = []
-        self.disabled_configure = []
-        if '-j' in os.environ.get('MAKEFLAGS', ''):
-            self.parallel = True
-
-    def add(self, ext):
-        self.extensions.append(ext)
-
-    def addext(self, ext, *, update_flags=True):
-        """Add extension with Makefile MODULE_{name} support
-        """
-        if update_flags:
-            self.update_extension_flags(ext)
-
-        state = sysconfig.get_config_var(f"MODULE_{ext.name.upper()}_STATE")
-        if state == "yes":
-            self.extensions.append(ext)
-        elif state == "disabled":
-            self.disabled_configure.append(ext.name)
-        elif state == "missing":
-            self.missing.append(ext.name)
-        elif state == "n/a":
-            # not available on current platform
-            pass
-        else:
-            # not migrated to MODULE_{name}_STATE yet.
-            self.announce(
-                f'WARNING: Makefile is missing module variable for "{ext.name}"',
-                level=2
-            )
-            self.extensions.append(ext)
-
-    def update_extension_flags(self, ext):
-        """Update extension flags with module CFLAGS and LDFLAGS
-
-        Reads MODULE_{name}_CFLAGS and _LDFLAGS
-
-        Distutils appends extra args to the compiler arguments. Some flags like
-        -I must appear earlier, otherwise the pre-processor picks up files
-        from system include directories.
-        """
-        upper_name = ext.name.upper()
-        # Parse compiler flags (-I, -D, -U, extra args)
-        cflags = sysconfig.get_config_var(f"MODULE_{upper_name}_CFLAGS")
-        if cflags:
-            for token in shlex.split(cflags):
-                switch = token[0:2]
-                value = token[2:]
-                if switch == '-I':
-                    ext.include_dirs.append(value)
-                elif switch == '-D':
-                    key, _, val = value.partition("=")
-                    if not val:
-                        val = None
-                    ext.define_macros.append((key, val))
-                elif switch == '-U':
-                    ext.undef_macros.append(value)
-                else:
-                    ext.extra_compile_args.append(token)
-
-        # Parse linker flags (-L, -l, extra objects, extra args)
-        ldflags = sysconfig.get_config_var(f"MODULE_{upper_name}_LDFLAGS")
-        if ldflags:
-            for token in shlex.split(ldflags):
-                switch = token[0:2]
-                value = token[2:]
-                if switch == '-L':
-                    ext.library_dirs.append(value)
-                elif switch == '-l':
-                    ext.libraries.append(value)
-                elif (
-                    token[0] != '-' and
-                    token.endswith(('.a', '.o', '.so', '.sl', '.dylib'))
-                ):
-                    ext.extra_objects.append(token)
-                else:
-                    ext.extra_link_args.append(token)
-
-        return ext
-
-    def set_srcdir(self):
-        self.srcdir = sysconfig.get_config_var('srcdir')
-        if not self.srcdir:
-            # Maybe running on Windows but not using CYGWIN?
-            raise ValueError("No source directory; cannot proceed.")
-        self.srcdir = os.path.abspath(self.srcdir)
-
-    def remove_disabled(self):
-        # Remove modules that are present on the disabled list
-        extensions = [ext for ext in self.extensions
-                      if ext.name not in DISABLED_MODULE_LIST]
-        self.extensions = extensions
-
-    def update_sources_depends(self):
-        # Fix up the autodetected modules, prefixing all the source files
-        # with Modules/.
-        # Add dependencies from MODULE_{name}_DEPS variable
-        moddirlist = [
-            # files in Modules/ directory
-            os.path.join(self.srcdir, 'Modules'),
-            # files relative to build base, e.g. libmpdec.a, libexpat.a
-            os.getcwd()
-        ]
-
-        # Python header files
-        include_dir = escape(sysconfig.get_path('include'))
-        headers = [sysconfig.get_config_h_filename()]
-        headers.extend(glob(os.path.join(include_dir, "*.h")))
-        headers.extend(glob(os.path.join(include_dir, "cpython", "*.h")))
-        headers.extend(glob(os.path.join(include_dir, "internal", "*.h")))
-
-        for ext in self.extensions:
-            ext.sources = [ find_module_file(filename, moddirlist)
-                            for filename in ext.sources ]
-            # Update dependencies from Makefile
-            makedeps = sysconfig.get_config_var(f"MODULE_{ext.name.upper()}_DEPS")
-            if makedeps:
-                # remove backslashes from line break continuations
-                ext.depends.extend(
-                    dep for dep in makedeps.split() if dep != "\\"
-                )
-            ext.depends = [
-                find_module_file(filename, moddirlist) for filename in ext.depends
-            ]
-            # re-compile extensions if a header file has been changed
-            ext.depends.extend(headers)
-
-    def handle_configured_extensions(self):
-        # The sysconfig variables built by makesetup that list the already
-        # built modules and the disabled modules as configured by the Setup
-        # files.
-        sysconf_built = set(sysconfig.get_config_var('MODBUILT_NAMES').split())
-        sysconf_shared = set(sysconfig.get_config_var('MODSHARED_NAMES').split())
-        sysconf_dis = set(sysconfig.get_config_var('MODDISABLED_NAMES').split())
-
-        mods_built = []
-        mods_disabled = []
-        for ext in self.extensions:
-            # If a module has already been built or has been disabled in the
-            # Setup files, don't build it here.
-            if ext.name in sysconf_built:
-                mods_built.append(ext)
-            if ext.name in sysconf_dis:
-                mods_disabled.append(ext)
-
-        mods_configured = mods_built + mods_disabled
-        if mods_configured:
-            self.extensions = [x for x in self.extensions if x not in
-                               mods_configured]
-            # Remove the shared libraries built by a previous build.
-            for ext in mods_configured:
-                # Don't remove shared extensions which have been built
-                # by Modules/Setup
-                if ext.name in sysconf_shared:
-                    continue
-                fullpath = self.get_ext_fullpath(ext.name)
-                if os.path.lexists(fullpath):
-                    os.unlink(fullpath)
-
-        return mods_built, mods_disabled
-
-    def set_compiler_executables(self):
-        # When you run "make CC=altcc" or something similar, you really want
-        # those environment variables passed into the setup.py phase.  Here's
-        # a small set of useful ones.
-        compiler = os.environ.get('CC')
-        args = {}
-        # unfortunately, distutils doesn't let us provide separate C and C++
-        # compilers
-        if compiler is not None:
-            (ccshared,cflags) = sysconfig.get_config_vars('CCSHARED','CFLAGS')
-            args['compiler_so'] = compiler + ' ' + ccshared + ' ' + cflags
-        self.compiler.set_executables(**args)
-
-    def build_extensions(self):
-        self.set_srcdir()
-        self.set_compiler_executables()
-        self.configure_compiler()
-        self.init_inc_lib_dirs()
-
-        # Detect which modules should be compiled
-        self.detect_modules()
-
-        if not LIST_MODULE_NAMES:
-            self.remove_disabled()
-
-        self.update_sources_depends()
-        mods_built, mods_disabled = self.handle_configured_extensions()
-
-        if LIST_MODULE_NAMES:
-            for ext in self.extensions:
-                print(ext.name)
-            for name in self.missing:
-                print(name)
-            return
-
-        build_ext.build_extensions(self)
-
-        if SUBPROCESS_BOOTSTRAP:
-            # Drop our custom subprocess module:
-            # use the newly built subprocess module
-            del sys.modules['subprocess']
-
-        for ext in self.extensions:
-            self.check_extension_import(ext)
-
-        self.summary(mods_built, mods_disabled)
-
-    def summary(self, mods_built, mods_disabled):
-        longest = max([len(e.name) for e in self.extensions], default=0)
-        if self.failed or self.failed_on_import:
-            all_failed = self.failed + self.failed_on_import
-            longest = max(longest, max([len(name) for name in all_failed]))
-
-        def print_three_column(lst):
-            lst.sort(key=str.lower)
-            # guarantee zip() doesn't drop anything
-            while len(lst) % 3:
-                lst.append("")
-            for e, f, g in zip(lst[::3], lst[1::3], lst[2::3]):
-                print("%-*s   %-*s   %-*s" % (longest, e, longest, f,
-                                              longest, g))
-
-        if self.missing:
-            print()
-            print("The necessary bits to build these optional modules were not "
-                  "found:")
-            print_three_column(self.missing)
-            print("To find the necessary bits, look in setup.py in"
-                  " detect_modules() for the module's name.")
-            print()
-
-        if mods_built:
-            print()
-            print("The following modules found by detect_modules() in"
-            " setup.py, have been")
-            print("built by the Makefile instead, as configured by the"
-            " Setup files:")
-            print_three_column([ext.name for ext in mods_built])
-            print()
-
-        if mods_disabled:
-            print()
-            print("The following modules found by detect_modules() in"
-            " setup.py have not")
-            print("been built, they are *disabled* in the Setup files:")
-            print_three_column([ext.name for ext in mods_disabled])
-            print()
-
-        if self.disabled_configure:
-            print()
-            print("The following modules found by detect_modules() in"
-            " setup.py have not")
-            print("been built, they are *disabled* by configure:")
-            print_three_column(self.disabled_configure)
-            print()
-
-        if self.failed:
-            failed = self.failed[:]
-            print()
-            print("Failed to build these modules:")
-            print_three_column(failed)
-            print()
-
-        if self.failed_on_import:
-            failed = self.failed_on_import[:]
-            print()
-            print("Following modules built successfully"
-                  " but were removed because they could not be imported:")
-            print_three_column(failed)
-            print()
-
-        if any('_ssl' in l
-               for l in (self.missing, self.failed, self.failed_on_import)):
-            print()
-            print("Could not build the ssl module!")
-            print("Python requires a OpenSSL 1.1.1 or newer")
-            if sysconfig.get_config_var("OPENSSL_LDFLAGS"):
-                print("Custom linker flags may require --with-openssl-rpath=auto")
-            print()
-
-        if os.environ.get("PYTHONSTRICTEXTENSIONBUILD") and (
-            self.failed or self.failed_on_import or self.missing
-        ):
-            raise RuntimeError("Failed to build some stdlib modules")
-
-    def build_extension(self, ext):
-        try:
-            build_ext.build_extension(self, ext)
-        except (CCompilerError, DistutilsError) as why:
-            self.announce('WARNING: building of extension "%s" failed: %s' %
-                          (ext.name, why))
-            self.failed.append(ext.name)
-            return
-
-    def check_extension_import(self, ext):
-        # Don't try to import an extension that has failed to compile
-        if ext.name in self.failed:
-            self.announce(
-                'WARNING: skipping import check for failed build "%s"' %
-                ext.name, level=1)
-            return
-
-        # Workaround for Mac OS X: The Carbon-based modules cannot be
-        # reliably imported into a command-line Python
-        if 'Carbon' in ext.extra_link_args:
-            self.announce(
-                'WARNING: skipping import check for Carbon-based "%s"' %
-                ext.name)
-            return
-
-        if MACOS and (
-                sys.maxsize > 2**32 and '-arch' in ext.extra_link_args):
-            # Don't bother doing an import check when an extension was
-            # build with an explicit '-arch' flag on OSX. That's currently
-            # only used to build 32-bit only extensions in a 4-way
-            # universal build and loading 32-bit code into a 64-bit
-            # process will fail.
-            self.announce(
-                'WARNING: skipping import check for "%s"' %
-                ext.name)
-            return
-
-        # Workaround for Cygwin: Cygwin currently has fork issues when many
-        # modules have been imported
-        if CYGWIN:
-            self.announce('WARNING: skipping import check for Cygwin-based "%s"'
-                % ext.name)
-            return
-        ext_filename = os.path.join(
-            self.build_lib,
-            self.get_ext_filename(self.get_ext_fullname(ext.name)))
-
-        # If the build directory didn't exist when setup.py was
-        # started, sys.path_importer_cache has a negative result
-        # cached.  Clear that cache before trying to import.
-        sys.path_importer_cache.clear()
-
-        # Don't try to load extensions for cross builds
-        if CROSS_COMPILING:
-            return
-
-        loader = importlib.machinery.ExtensionFileLoader(ext.name, ext_filename)
-        spec = importlib.util.spec_from_file_location(ext.name, ext_filename,
-                                                      loader=loader)
-        try:
-            importlib._bootstrap._load(spec)
-        except ImportError as why:
-            self.failed_on_import.append(ext.name)
-            self.announce('*** WARNING: renaming "%s" since importing it'
-                          ' failed: %s' % (ext.name, why), level=3)
-            assert not self.inplace
-            basename, tail = os.path.splitext(ext_filename)
-            newname = basename + "_failed" + tail
-            if os.path.exists(newname):
-                os.remove(newname)
-            os.rename(ext_filename, newname)
-
-        except:
-            exc_type, why, tb = sys.exc_info()
-            self.announce('*** WARNING: importing extension "%s" '
-                          'failed with %s: %s' % (ext.name, exc_type, why),
-                          level=3)
-            self.failed.append(ext.name)
-
-    def add_multiarch_paths(self):
-        # Debian/Ubuntu multiarch support.
-        # https://wiki.ubuntu.com/MultiarchSpec
-        tmpfile = os.path.join(self.build_temp, 'multiarch')
-        if not os.path.exists(self.build_temp):
-            os.makedirs(self.build_temp)
-        ret = run_command(
-            '%s -print-multiarch > %s 2> /dev/null' % (CC, tmpfile))
-        multiarch_path_component = ''
-        try:
-            if ret == 0:
-                with open(tmpfile) as fp:
-                    multiarch_path_component = fp.readline().strip()
-        finally:
-            os.unlink(tmpfile)
-
-        if multiarch_path_component != '':
-            add_dir_to_list(self.compiler.library_dirs,
-                            '/usr/lib/' + multiarch_path_component)
-            add_dir_to_list(self.compiler.include_dirs,
-                            '/usr/include/' + multiarch_path_component)
-            return
-
-        if not find_executable('dpkg-architecture'):
-            return
-        opt = ''
-        if CROSS_COMPILING:
-            opt = '-t' + sysconfig.get_config_var('HOST_GNU_TYPE')
-        tmpfile = os.path.join(self.build_temp, 'multiarch')
-        if not os.path.exists(self.build_temp):
-            os.makedirs(self.build_temp)
-        ret = run_command(
-            'dpkg-architecture %s -qDEB_HOST_MULTIARCH > %s 2> /dev/null' %
-            (opt, tmpfile))
-        try:
-            if ret == 0:
-                with open(tmpfile) as fp:
-                    multiarch_path_component = fp.readline().strip()
-                add_dir_to_list(self.compiler.library_dirs,
-                                '/usr/lib/' + multiarch_path_component)
-                add_dir_to_list(self.compiler.include_dirs,
-                                '/usr/include/' + multiarch_path_component)
-        finally:
-            os.unlink(tmpfile)
-
-    def add_wrcc_search_dirs(self):
-        # add library search path by wr-cc, the compiler wrapper
-
-        def convert_mixed_path(path):
-            # convert path like C:\folder1\folder2/folder3/folder4
-            # to msys style /c/folder1/folder2/folder3/folder4
-            drive = path[0].lower()
-            left = path[2:].replace("\\", "/")
-            return "/" + drive + left
-
-        def add_search_path(line):
-            # On Windows building machine, VxWorks does
-            # cross builds under msys2 environment.
-            pathsep = (";" if sys.platform == "msys" else ":")
-            for d in line.strip().split("=")[1].split(pathsep):
-                d = d.strip()
-                if sys.platform == "msys":
-                    # On Windows building machine, compiler
-                    # returns mixed style path like:
-                    # C:\folder1\folder2/folder3/folder4
-                    d = convert_mixed_path(d)
-                d = os.path.normpath(d)
-                add_dir_to_list(self.compiler.library_dirs, d)
-
-        tmpfile = os.path.join(self.build_temp, 'wrccpaths')
-        os.makedirs(self.build_temp, exist_ok=True)
-        try:
-            ret = run_command('%s --print-search-dirs >%s' % (CC, tmpfile))
-            if ret:
-                return
-            with open(tmpfile) as fp:
-                # Parse paths in libraries line. The line is like:
-                # On Linux, "libraries: = path1:path2:path3"
-                # On Windows, "libraries: = path1;path2;path3"
-                for line in fp:
-                    if not line.startswith("libraries"):
-                        continue
-                    add_search_path(line)
-        finally:
-            try:
-                os.unlink(tmpfile)
-            except OSError:
-                pass
-
-    def add_cross_compiling_paths(self):
-        tmpfile = os.path.join(self.build_temp, 'ccpaths')
-        if not os.path.exists(self.build_temp):
-            os.makedirs(self.build_temp)
-        # bpo-38472: With a German locale, GCC returns "gcc-Version 9.1.0
-        # (GCC)", whereas it returns "gcc version 9.1.0" with the C locale.
-        ret = run_command('LC_ALL=C %s -E -v - </dev/null 2>%s 1>/dev/null' % (CC, tmpfile))
-        is_gcc = False
-        is_clang = False
-        in_incdirs = False
-        try:
-            if ret == 0:
-                with open(tmpfile) as fp:
-                    for line in fp.readlines():
-                        if line.startswith("gcc version"):
-                            is_gcc = True
-                        elif line.startswith("clang version"):
-                            is_clang = True
-                        elif line.startswith("#include <...>"):
-                            in_incdirs = True
-                        elif line.startswith("End of search list"):
-                            in_incdirs = False
-                        elif (is_gcc or is_clang) and line.startswith("LIBRARY_PATH"):
-                            for d in line.strip().split("=")[1].split(":"):
-                                d = os.path.normpath(d)
-                                if '/gcc/' not in d:
-                                    add_dir_to_list(self.compiler.library_dirs,
-                                                    d)
-                        elif (is_gcc or is_clang) and in_incdirs and '/gcc/' not in line and '/clang/' not in line:
-                            add_dir_to_list(self.compiler.include_dirs,
-                                            line.strip())
-        finally:
-            os.unlink(tmpfile)
-
-        if VXWORKS:
-            self.add_wrcc_search_dirs()
-
-    def add_ldflags_cppflags(self):
-        # Add paths specified in the environment variables LDFLAGS and
-        # CPPFLAGS for header and library files.
-        # We must get the values from the Makefile and not the environment
-        # directly since an inconsistently reproducible issue comes up where
-        # the environment variable is not set even though the value were passed
-        # into configure and stored in the Makefile (issue found on OS X 10.3).
-        for env_var, arg_name, dir_list in (
-                ('LDFLAGS', '-R', self.compiler.runtime_library_dirs),
-                ('LDFLAGS', '-L', self.compiler.library_dirs),
-                ('CPPFLAGS', '-I', self.compiler.include_dirs)):
-            env_val = sysconfig.get_config_var(env_var)
-            if env_val:
-                parser = argparse.ArgumentParser()
-                parser.add_argument(arg_name, dest="dirs", action="append")
-
-                # To prevent argparse from raising an exception about any
-                # options in env_val that it mistakes for known option, we
-                # strip out all double dashes and any dashes followed by a
-                # character that is not for the option we are dealing with.
-                #
-                # Please note that order of the regex is important!  We must
-                # strip out double-dashes first so that we don't end up with
-                # substituting "--Long" to "-Long" and thus lead to "ong" being
-                # used for a library directory.
-                env_val = re.sub(r'(^|\s+)-(-|(?!%s))' % arg_name[1],
-                                 ' ', env_val)
-                options, _ = parser.parse_known_args(env_val.split())
-                if options.dirs:
-                    for directory in reversed(options.dirs):
-                        add_dir_to_list(dir_list, directory)
-
-    def configure_compiler(self):
-        # Ensure that /usr/local is always used, but the local build
-        # directories (i.e. '.' and 'Include') must be first.  See issue
-        # 10520.
-        if not CROSS_COMPILING:
-            add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
-            add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
-        # only change this for cross builds for 3.3, issues on Mageia
-        if CROSS_COMPILING:
-            self.add_cross_compiling_paths()
-        self.add_multiarch_paths()
-        self.add_ldflags_cppflags()
-
-    def init_inc_lib_dirs(self):
-        if (not CROSS_COMPILING and
-                os.path.normpath(sys.base_prefix) != '/usr' and
-                not sysconfig.get_config_var('PYTHONFRAMEWORK')):
-            # OSX note: Don't add LIBDIR and INCLUDEDIR to building a framework
-            # (PYTHONFRAMEWORK is set) to avoid # linking problems when
-            # building a framework with different architectures than
-            # the one that is currently installed (issue #7473)
-            add_dir_to_list(self.compiler.library_dirs,
-                            sysconfig.get_config_var("LIBDIR"))
-            add_dir_to_list(self.compiler.include_dirs,
-                            sysconfig.get_config_var("INCLUDEDIR"))
-
-        system_lib_dirs = ['/lib64', '/usr/lib64', '/lib', '/usr/lib']
-        system_include_dirs = ['/usr/include']
-        # lib_dirs and inc_dirs are used to search for files;
-        # if a file is found in one of those directories, it can
-        # be assumed that no additional -I,-L directives are needed.
-        if not CROSS_COMPILING:
-            self.lib_dirs = self.compiler.library_dirs + system_lib_dirs
-            self.inc_dirs = self.compiler.include_dirs + system_include_dirs
-        else:
-            # Add the sysroot paths. 'sysroot' is a compiler option used to
-            # set the logical path of the standard system headers and
-            # libraries.
-            self.lib_dirs = (self.compiler.library_dirs +
-                             sysroot_paths(('LDFLAGS', 'CC'), system_lib_dirs))
-            self.inc_dirs = (self.compiler.include_dirs +
-                             sysroot_paths(('CPPFLAGS', 'CFLAGS', 'CC'),
-                                           system_include_dirs))
-
-        config_h = sysconfig.get_config_h_filename()
-        with open(config_h) as file:
-            self.config_h_vars = sysconfig.parse_config_h(file)
-
-        # OSF/1 and Unixware have some stuff in /usr/ccs/lib (like -ldb)
-        if HOST_PLATFORM in ['osf1', 'unixware7', 'openunix8']:
-            self.lib_dirs += ['/usr/ccs/lib']
-
-        # HP-UX11iv3 keeps files in lib/hpux folders.
-        if HOST_PLATFORM == 'hp-ux11':
-            self.lib_dirs += ['/usr/lib/hpux64', '/usr/lib/hpux32']
-
-        if MACOS:
-            # This should work on any unixy platform ;-)
-            # If the user has bothered specifying additional -I and -L flags
-            # in OPT and LDFLAGS we might as well use them here.
-            #
-            # NOTE: using shlex.split would technically be more correct, but
-            # also gives a bootstrap problem. Let's hope nobody uses
-            # directories with whitespace in the name to store libraries.
-            cflags, ldflags = sysconfig.get_config_vars(
-                    'CFLAGS', 'LDFLAGS')
-            for item in cflags.split():
-                if item.startswith('-I'):
-                    self.inc_dirs.append(item[2:])
-
-            for item in ldflags.split():
-                if item.startswith('-L'):
-                    self.lib_dirs.append(item[2:])
-
-    def detect_simple_extensions(self):
-        #
-        # The following modules are all pretty straightforward, and compile
-        # on pretty much any POSIXish platform.
-        #
-
-        # array objects
-        self.addext(Extension('array', ['arraymodule.c']))
-
-        # Context Variables
-        self.addext(Extension('_contextvars', ['_contextvarsmodule.c']))
-
-        # math library functions, e.g. sin()
-        self.addext(Extension('math',  ['mathmodule.c']))
-
-        # complex math library functions
-        self.addext(Extension('cmath', ['cmathmodule.c']))
-
-        # libm is needed by delta_new() that uses round() and by accum() that
-        # uses modf().
-        self.addext(Extension('_datetime', ['_datetimemodule.c']))
-        self.addext(Extension('_zoneinfo', ['_zoneinfo.c']))
-        # random number generator implemented in C
-        self.addext(Extension("_random", ["_randommodule.c"]))
-        self.addext(Extension("_bisect", ["_bisectmodule.c"]))
-        self.addext(Extension("_heapq", ["_heapqmodule.c"]))
-        # C-optimized pickle replacement
-        self.addext(Extension("_pickle", ["_pickle.c"]))
-        # _json speedups
-        self.addext(Extension("_json", ["_json.c"]))
-
-        # profiler (_lsprof is for cProfile.py)
-        self.addext(Extension('_lsprof', ['_lsprof.c', 'rotatingtree.c']))
-        # static Unicode character database
-        self.addext(Extension('unicodedata', ['unicodedata.c']))
-        self.addext(Extension('_opcode', ['_opcode.c']))
-
-        # asyncio speedups
-        self.addext(Extension("_asyncio", ["_asynciomodule.c"]))
-
-        self.addext(Extension("_queue", ["_queuemodule.c"]))
-        self.addext(Extension("_statistics", ["_statisticsmodule.c"]))
-        self.addext(Extension("_struct", ["_struct.c"]))
-        self.addext(Extension("_typing", ["_typingmodule.c"]))
-
-        # Modules with some UNIX dependencies -- on by default:
-        # (If you have a really backward UNIX, select and socket may not be
-        # supported...)
-
-        # fcntl(2) and ioctl(2)
-        self.addext(Extension('fcntl', ['fcntlmodule.c']))
-        # grp(3)
-        self.addext(Extension('grp', ['grpmodule.c']))
-
-        self.addext(Extension('_socket', ['socketmodule.c']))
-        self.addext(Extension('spwd', ['spwdmodule.c']))
-
-        # select(2); not on ancient System V
-        self.addext(Extension('select', ['selectmodule.c']))
-
-        # Memory-mapped files (also works on Win32).
-        self.addext(Extension('mmap', ['mmapmodule.c']))
-
-        # Lance Ellinghaus's syslog module
-        # syslog daemon interface
-        self.addext(Extension('syslog', ['syslogmodule.c']))
-
-        # Python interface to subinterpreter C-API.
-        self.addext(Extension('_xxsubinterpreters', ['_xxsubinterpretersmodule.c']))
-
-        #
-        # Here ends the simple stuff.  From here on, modules need certain
-        # libraries, are platform-specific, or present other surprises.
-        #
-
-        # Multimedia modules
-        # These don't work for 64-bit platforms!!!
-        # These represent audio samples or images as strings:
-        #
-        # Operations on audio samples
-        # According to #993173, this one should actually work fine on
-        # 64-bit platforms.
-        #
-        # audioop needs libm for floor() in multiple functions.
-        self.addext(Extension('audioop', ['audioop.c']))
-
-        # CSV files
-        self.addext(Extension('_csv', ['_csv.c']))
-
-        # POSIX subprocess module helper.
-        self.addext(Extension('_posixsubprocess', ['_posixsubprocess.c']))
-
-    def detect_test_extensions(self):
-        # Python C API test module
-        self.addext(Extension('_testcapi', ['_testcapimodule.c', '_testcapi/vectorcall.c']))
-
-        # Python Internal C API test module
-        self.addext(Extension('_testinternalcapi', ['_testinternalcapi.c']))
-
-        # Python PEP-3118 (buffer protocol) test module
-        self.addext(Extension('_testbuffer', ['_testbuffer.c']))
-
-        # Test loading multiple modules from one compiled file (https://bugs.python.org/issue16421)
-        self.addext(Extension('_testimportmultiple', ['_testimportmultiple.c']))
-
-        # Test multi-phase extension module init (PEP 489)
-        self.addext(Extension('_testmultiphase', ['_testmultiphase.c']))
-
-        # Fuzz tests.
-        self.addext(Extension(
-            '_xxtestfuzz',
-            ['_xxtestfuzz/_xxtestfuzz.c', '_xxtestfuzz/fuzzer.c']
-        ))
-
-    def detect_readline_curses(self):
-        self.addext(Extension('readline', ['readline.c']))
-        self.addext(Extension('_curses', ['_cursesmodule.c']))
-        self.addext(Extension('_curses_panel', ['_curses_panel.c']))
-
-    def detect_crypt(self):
-        self.addext(Extension('_crypt', ['_cryptmodule.c']))
-
-    def detect_dbm_gdbm(self):
-        self.addext(Extension('_dbm', ['_dbmmodule.c']))
-        # Anthony Baxter's gdbm module.  GNU dbm(3) will require -lgdbm:
-        self.addext(Extension('_gdbm', ['_gdbmmodule.c']))
-
-    def detect_sqlite(self):
-        sources = [
-            "_sqlite/blob.c",
-            "_sqlite/connection.c",
-            "_sqlite/cursor.c",
-            "_sqlite/microprotocols.c",
-            "_sqlite/module.c",
-            "_sqlite/prepare_protocol.c",
-            "_sqlite/row.c",
-            "_sqlite/statement.c",
-            "_sqlite/util.c",
-        ]
-        self.addext(Extension("_sqlite3", sources=sources))
-
-    def detect_platform_specific_exts(self):
-        # Unix-only modules
-        # Steen Lumholt's termios module
-        self.addext(Extension('termios', ['termios.c']))
-        # Jeremy Hylton's rlimit interface
-        self.addext(Extension('resource', ['resource.c']))
-        # linux/soundcard.h or sys/soundcard.h
-        self.addext(Extension('ossaudiodev', ['ossaudiodev.c']))
-
-        # macOS-only, needs SystemConfiguration and CoreFoundation framework
-        self.addext(Extension('_scproxy', ['_scproxy.c']))
-
-    def detect_compress_exts(self):
-        # Andrew Kuchling's zlib module.
-        self.addext(Extension('zlib', ['zlibmodule.c']))
-
-        # Helper module for various ascii-encoders.  Uses zlib for an optimized
-        # crc32 if we have it.  Otherwise binascii uses its own.
-        self.addext(Extension('binascii', ['binascii.c']))
-
-        # Gustavo Niemeyer's bz2 module.
-        self.addext(Extension('_bz2', ['_bz2module.c']))
-
-        # LZMA compression support.
-        self.addext(Extension('_lzma', ['_lzmamodule.c']))
-
-    def detect_expat_elementtree(self):
-        # Interface to the Expat XML parser
-        #
-        # Expat was written by James Clark and is now maintained by a group of
-        # developers on SourceForge; see www.libexpat.org for more information.
-        # The pyexpat module was written by Paul Prescod after a prototype by
-        # Jack Jansen.  The Expat source is included in Modules/expat/.  Usage
-        # of a system shared libexpat.so is possible with --with-system-expat
-        # configure option.
-        #
-        # More information on Expat can be found at www.libexpat.org.
-        #
-        self.addext(Extension('pyexpat', sources=['pyexpat.c']))
-
-        # Fredrik Lundh's cElementTree module.  Note that this also
-        # uses expat (via the CAPI hook in pyexpat).
-        self.addext(Extension('_elementtree', sources=['_elementtree.c']))
-
-    def detect_multibytecodecs(self):
-        # Hye-Shik Chang's CJKCodecs modules.
-        self.addext(Extension('_multibytecodec',
-                              ['cjkcodecs/multibytecodec.c']))
-        for loc in ('kr', 'jp', 'cn', 'tw', 'hk', 'iso2022'):
-            self.addext(Extension(
-                f'_codecs_{loc}', [f'cjkcodecs/_codecs_{loc}.c']
-            ))
-
-    def detect_multiprocessing(self):
-        # Richard Oudkerk's multiprocessing module
-        multiprocessing_srcs = ['_multiprocessing/multiprocessing.c']
-        if (
-            sysconfig.get_config_var('HAVE_SEM_OPEN') and not
-            sysconfig.get_config_var('POSIX_SEMAPHORES_NOT_ENABLED')
-        ):
-            multiprocessing_srcs.append('_multiprocessing/semaphore.c')
-        self.addext(Extension('_multiprocessing', multiprocessing_srcs))
-        self.addext(Extension('_posixshmem', ['_multiprocessing/posixshmem.c']))
-
-    def detect_uuid(self):
-        # Build the _uuid module if possible
-        self.addext(Extension('_uuid', ['_uuidmodule.c']))
-
-    def detect_modules(self):
-        # remove dummy extension
-        self.extensions = []
-
-        # Some C extensions are built by entries in Modules/Setup.bootstrap.
-        # These are extensions are required to bootstrap the interpreter or
-        # build process.
-        self.detect_simple_extensions()
-        self.detect_test_extensions()
-        self.detect_readline_curses()
-        self.detect_crypt()
-        self.detect_openssl_hashlib()
-        self.detect_hash_builtins()
-        self.detect_dbm_gdbm()
-        self.detect_sqlite()
-        self.detect_platform_specific_exts()
-        self.detect_nis()
-        self.detect_compress_exts()
-        self.detect_expat_elementtree()
-        self.detect_multibytecodecs()
-        self.detect_decimal()
-        self.detect_ctypes()
-        self.detect_multiprocessing()
-        self.detect_tkinter()
-        self.detect_uuid()
-
-        # Uncomment the next line if you want to play with xxmodule.c
-#        self.add(Extension('xx', ['xxmodule.c']))
-
-        self.addext(Extension('xxlimited', ['xxlimited.c']))
-        self.addext(Extension('xxlimited_35', ['xxlimited_35.c']))
-
-    def detect_tkinter(self):
-        self.addext(Extension('_tkinter', ['_tkinter.c', 'tkappinit.c']))
-
-    def detect_ctypes(self):
-        # Thomas Heller's _ctypes module
-        src = [
-            '_ctypes/_ctypes.c',
-            '_ctypes/callbacks.c',
-            '_ctypes/callproc.c',
-            '_ctypes/stgdict.c',
-            '_ctypes/cfield.c',
-        ]
-        malloc_closure = sysconfig.get_config_var(
-            "MODULE__CTYPES_MALLOC_CLOSURE"
-        )
-        if malloc_closure:
-            src.append(malloc_closure)
-
-        self.addext(Extension('_ctypes', src))
-        self.addext(Extension('_ctypes_test', ['_ctypes/_ctypes_test.c']))
-
-    def detect_decimal(self):
-        # Stefan Krah's _decimal module
-        self.addext(
-            Extension(
-                '_decimal',
-                ['_decimal/_decimal.c'],
-                # Uncomment for extra functionality:
-                # define_macros=[('EXTRA_FUNCTIONALITY', 1)]
-            )
-        )
-
-    def detect_openssl_hashlib(self):
-        self.addext(Extension('_ssl', ['_ssl.c']))
-        self.addext(Extension('_hashlib', ['_hashopenssl.c']))
-
-    def detect_hash_builtins(self):
-        # By default we always compile these even when OpenSSL is available
-        # (issue #14693). It's harmless and the object code is tiny
-        # (40-50 KiB per module, only loaded when actually used).  Modules can
-        # be disabled via the --with-builtin-hashlib-hashes configure flag.
-
-        self.addext(Extension('_md5', ['md5module.c']))
-        self.addext(Extension('_sha1', ['sha1module.c']))
-        self.addext(Extension('_sha256', ['sha256module.c']))
-        self.addext(Extension('_sha512', ['sha512module.c']))
-        self.addext(Extension('_sha3', ['_sha3/sha3module.c']))
-        self.addext(Extension('_blake2',
-            [
-                '_blake2/blake2module.c',
-                '_blake2/blake2b_impl.c',
-                '_blake2/blake2s_impl.c'
-            ]
-        ))
-
-    def detect_nis(self):
-        self.addext(Extension('nis', ['nismodule.c']))
-
-
-class PyBuildInstall(install):
-    # Suppress the warning about installation into the lib_dynload
-    # directory, which is not in sys.path when running Python during
-    # installation:
-    def initialize_options (self):
-        install.initialize_options(self)
-        self.warn_dir=0
-
-    # Customize subcommands to not install an egg-info file for Python
-    sub_commands = [('install_lib', install.has_lib),
-                    ('install_headers', install.has_headers),
-                    ('install_scripts', install.has_scripts),
-                    ('install_data', install.has_data)]
-
-
-class PyBuildInstallLib(install_lib):
-    # Do exactly what install_lib does but make sure correct access modes get
-    # set on installed directories and files. All installed files with get
-    # mode 644 unless they are a shared library in which case they will get
-    # mode 755. All installed directories will get mode 755.
-
-    # this is works for EXT_SUFFIX too, which ends with SHLIB_SUFFIX
-    shlib_suffix = sysconfig.get_config_var("SHLIB_SUFFIX")
-
-    def install(self):
-        outfiles = install_lib.install(self)
-        self.set_file_modes(outfiles, 0o644, 0o755)
-        self.set_dir_modes(self.install_dir, 0o755)
-        return outfiles
-
-    def set_file_modes(self, files, defaultMode, sharedLibMode):
-        if not files: return
-
-        for filename in files:
-            if os.path.islink(filename): continue
-            mode = defaultMode
-            if filename.endswith(self.shlib_suffix): mode = sharedLibMode
-            log.info("changing mode of %s to %o", filename, mode)
-            if not self.dry_run: os.chmod(filename, mode)
-
-    def set_dir_modes(self, dirname, mode):
-        for dirpath, dirnames, fnames in os.walk(dirname):
-            if os.path.islink(dirpath):
-                continue
-            log.info("changing mode of %s to %o", dirpath, mode)
-            if not self.dry_run: os.chmod(dirpath, mode)
-
-
-def main():
-    global LIST_MODULE_NAMES
-
-    if "--list-module-names" in sys.argv:
-        LIST_MODULE_NAMES = True
-        sys.argv.remove("--list-module-names")
-
-    set_compiler_flags('CFLAGS', 'PY_CFLAGS_NODIST')
-    set_compiler_flags('LDFLAGS', 'PY_LDFLAGS_NODIST')
-
-    class DummyProcess:
-        """Hack for parallel build"""
-        ProcessPoolExecutor = None
-
-    sys.modules['concurrent.futures.process'] = DummyProcess
-    validate_tzpath()
-
-    # turn off warnings when deprecated modules are imported
-    import warnings
-    warnings.filterwarnings("ignore",category=DeprecationWarning)
-    setup(# PyPI Metadata (PEP 301)
-          name = "Python",
-          version = sys.version.split()[0],
-          url = "https://www.python.org/%d.%d" % sys.version_info[:2],
-          maintainer = "Guido van Rossum and the Python community",
-          maintainer_email = "python-dev at python.org",
-          description = "A high-level object-oriented programming language",
-          long_description = SUMMARY.strip(),
-          license = "PSF license",
-          classifiers = [x for x in CLASSIFIERS.split("\n") if x],
-          platforms = ["Many"],
-
-          # Build info
-          cmdclass = {'build_ext': PyBuildExt,
-                      'install': PyBuildInstall,
-                      'install_lib': PyBuildInstallLib},
-          # A dummy module is defined here, because build_ext won't be
-          # called unless there's at least one extension module defined.
-          ext_modules=[Extension('_dummy', ['_dummy.c'])],
-        )
-
-# --install-platlib
-if __name__ == '__main__':
-    main()


From webhook-mailer at python.org  Thu Jul 14 05:57:31 2022
From: webhook-mailer at python.org (encukou)
Date: Thu, 14 Jul 2022 09:57:31 -0000
Subject: [Python-checkins] gh-94731: Revert to C-style casts for _Py_CAST
 (GH-94782)
Message-ID: <mailman.18.1657792652.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/6cbb57f62d345d7a5d6aeb1b3b5d37a845344d5e
commit: 6cbb57f62d345d7a5d6aeb1b3b5d37a845344d5e
branch: main
author: Petr Viktorin <encukou at gmail.com>
committer: encukou <encukou at gmail.com>
date: 2022-07-14T11:57:18+02:00
summary:

gh-94731: Revert to C-style casts for _Py_CAST (GH-94782)

Co-authored-by: da-woods <dw-git at d-woods.co.uk>

files:
A Misc/NEWS.d/next/C API/2022-07-12-17-39-32.gh-issue-94731.9CPJNU.rst
M Include/pyport.h
M Lib/test/_testcppext.cpp
M Lib/test/setup_testcppext.py
M Lib/test/test_cppext.py

diff --git a/Include/pyport.h b/Include/pyport.h
index 313bc8d21c83f..b3ff2f4882e90 100644
--- a/Include/pyport.h
+++ b/Include/pyport.h
@@ -14,62 +14,14 @@
 #endif
 
 
-// Macro to use C++ static_cast<>, reinterpret_cast<> and const_cast<>
-// in the Python C API.
-//
-// In C++, _Py_CAST(type, expr) converts a constant expression to a
-// non constant type using const_cast<type>. For example,
-// _Py_CAST(PyObject*, op) can convert a "const PyObject*" to
-// "PyObject*".
-//
-// The type argument must not be a constant type.
+// Macro to use C++ static_cast<> in the Python C API.
 #ifdef __cplusplus
-#include <cstddef>
 #  define _Py_STATIC_CAST(type, expr) static_cast<type>(expr)
-extern "C++" {
-    namespace {
-        template <typename type>
-        inline type _Py_CAST_impl(long int ptr) {
-            return reinterpret_cast<type>(ptr);
-        }
-        template <typename type>
-        inline type _Py_CAST_impl(int ptr) {
-            return reinterpret_cast<type>(ptr);
-        }
-#if __cplusplus >= 201103
-        template <typename type>
-        inline type _Py_CAST_impl(std::nullptr_t) {
-            return static_cast<type>(nullptr);
-        }
-#endif
-
-        template <typename type, typename expr_type>
-            inline type _Py_CAST_impl(expr_type *expr) {
-                return reinterpret_cast<type>(expr);
-            }
-
-        template <typename type, typename expr_type>
-            inline type _Py_CAST_impl(expr_type const *expr) {
-                return reinterpret_cast<type>(const_cast<expr_type *>(expr));
-            }
-
-        template <typename type, typename expr_type>
-            inline type _Py_CAST_impl(expr_type &expr) {
-                return static_cast<type>(expr);
-            }
-
-        template <typename type, typename expr_type>
-            inline type _Py_CAST_impl(expr_type const &expr) {
-                return static_cast<type>(const_cast<expr_type &>(expr));
-            }
-    }
-}
-#  define _Py_CAST(type, expr) _Py_CAST_impl<type>(expr)
-
 #else
 #  define _Py_STATIC_CAST(type, expr) ((type)(expr))
-#  define _Py_CAST(type, expr) ((type)(expr))
 #endif
+// Macro to use the more powerful/dangerous C-style cast even in C++.
+#define _Py_CAST(type, expr) ((type)(expr))
 
 // Static inline functions should use _Py_NULL rather than using directly NULL
 // to prevent C++ compiler warnings. On C++11 and newer, _Py_NULL is defined as
diff --git a/Lib/test/_testcppext.cpp b/Lib/test/_testcppext.cpp
index be7538826b6c4..0e381a78c5cee 100644
--- a/Lib/test/_testcppext.cpp
+++ b/Lib/test/_testcppext.cpp
@@ -12,6 +12,9 @@
 #  define NAME _testcpp03ext
 #endif
 
+#define _STR(NAME) #NAME
+#define STR(NAME) _STR(NAME)
+
 PyDoc_STRVAR(_testcppext_add_doc,
 "add(x, y)\n"
 "\n"
@@ -123,11 +126,77 @@ test_unicode(PyObject *Py_UNUSED(module), PyObject *Py_UNUSED(args))
     Py_RETURN_NONE;
 }
 
+/* Test a `new`-allocated object with a virtual method.
+ * (https://github.com/python/cpython/issues/94731) */
+
+class VirtualPyObject : public PyObject {
+public:
+    VirtualPyObject();
+    virtual ~VirtualPyObject() {
+        delete [] internal_data;
+        --instance_count;
+    }
+    virtual void set_internal_data() {
+        internal_data[0] = 1;
+    }
+    static void dealloc(PyObject* o) {
+        delete static_cast<VirtualPyObject*>(o);
+    }
+
+    // Number of "living" instances
+    static int instance_count;
+private:
+    // buffer that can get corrupted
+    int* internal_data;
+};
+
+int VirtualPyObject::instance_count = 0;
+
+PyType_Slot VirtualPyObject_Slots[] = {
+    {Py_tp_free, (void*)VirtualPyObject::dealloc},
+    {0, _Py_NULL},
+};
+
+PyType_Spec VirtualPyObject_Spec = {
+    /* .name */ STR(NAME) ".VirtualPyObject",
+    /* .basicsize */ sizeof(VirtualPyObject),
+    /* .itemsize */ 0,
+    /* .flags */ Py_TPFLAGS_DEFAULT,
+    /* .slots */ VirtualPyObject_Slots,
+};
+
+VirtualPyObject::VirtualPyObject() {
+    // Create a temporary type (just so we don't need to store it)
+    PyObject *type = PyType_FromSpec(&VirtualPyObject_Spec);
+    // no good way to signal failure from a C++ constructor, so use assert
+    // for error handling
+    assert(type);
+    assert(PyObject_Init(this, (PyTypeObject *)type));
+    Py_DECREF(type);
+    internal_data = new int[50];
+    ++instance_count;
+}
+
+static PyObject *
+test_virtual_object(PyObject *Py_UNUSED(module), PyObject *Py_UNUSED(args))
+{
+    VirtualPyObject* obj = new VirtualPyObject();
+    obj->set_internal_data();
+    Py_DECREF(obj);
+    if (VirtualPyObject::instance_count != 0) {
+        return PyErr_Format(
+            PyExc_AssertionError,
+            "instance_count should be 0, got %d",
+            VirtualPyObject::instance_count);
+    }
+    Py_RETURN_NONE;
+}
 
 static PyMethodDef _testcppext_methods[] = {
     {"add", _testcppext_add, METH_VARARGS, _testcppext_add_doc},
     {"test_api_casts", test_api_casts, METH_NOARGS, _Py_NULL},
     {"test_unicode", test_unicode, METH_NOARGS, _Py_NULL},
+    {"test_virtual_object", test_virtual_object, METH_NOARGS, _Py_NULL},
     // Note: _testcppext_exec currently runs all test functions directly.
     // When adding a new one, add a call there.
 
@@ -152,6 +221,10 @@ _testcppext_exec(PyObject *module)
     if (!result) return -1;
     Py_DECREF(result);
 
+    result = PyObject_CallMethod(module, "test_virtual_object", "");
+    if (!result) return -1;
+    Py_DECREF(result);
+
     return 0;
 }
 
@@ -163,9 +236,6 @@ static PyModuleDef_Slot _testcppext_slots[] = {
 
 PyDoc_STRVAR(_testcppext_doc, "C++ test extension.");
 
-#define _STR(NAME) #NAME
-#define STR(NAME) _STR(NAME)
-
 static struct PyModuleDef _testcppext_module = {
     PyModuleDef_HEAD_INIT,  // m_base
     STR(NAME),  // m_name
diff --git a/Lib/test/setup_testcppext.py b/Lib/test/setup_testcppext.py
index ae81e33e23b6b..c6b68104d1333 100644
--- a/Lib/test/setup_testcppext.py
+++ b/Lib/test/setup_testcppext.py
@@ -17,8 +17,6 @@
         # a C++ extension using the Python C API does not emit C++ compiler
         # warnings
         '-Werror',
-        # Warn on old-style cast (C cast) like: (PyObject*)op
-        '-Wold-style-cast',
     ]
 else:
     # Don't pass any compiler flag to MSVC
@@ -37,9 +35,6 @@ def main():
         name = '_testcpp11ext'
 
     cppflags = [*CPPFLAGS, f'-std={std}']
-    if std == 'c++11':
-        # Warn when using NULL rather than _Py_NULL in static inline functions
-        cppflags.append('-Wzero-as-null-pointer-constant')
 
     cpp_ext = Extension(
         name,
diff --git a/Lib/test/test_cppext.py b/Lib/test/test_cppext.py
index 2c54d33711691..465894d24e7df 100644
--- a/Lib/test/test_cppext.py
+++ b/Lib/test/test_cppext.py
@@ -4,6 +4,7 @@
 import sys
 import unittest
 import subprocess
+import sysconfig
 from test import support
 from test.support import os_helper
 
@@ -25,6 +26,11 @@ def test_build_cpp03(self):
     # With MSVC, the linker fails with: cannot open file 'python311.lib'
     # https://github.com/python/cpython/pull/32175#issuecomment-1111175897
     @unittest.skipIf(MS_WINDOWS, 'test fails on Windows')
+    # Building and running an extension in clang sanitizing mode is not
+    # straightforward
+    @unittest.skipIf(
+        '-fsanitize' in (sysconfig.get_config_var('PY_CFLAGS') or ''),
+        'test does not work with analyzing builds')
     # the test uses venv+pip: skip if it's not available
     @support.requires_venv_with_pip()
     def check_build(self, std_cpp03, extension_name):
diff --git a/Misc/NEWS.d/next/C API/2022-07-12-17-39-32.gh-issue-94731.9CPJNU.rst b/Misc/NEWS.d/next/C API/2022-07-12-17-39-32.gh-issue-94731.9CPJNU.rst
new file mode 100644
index 0000000000000..b7816d28215e7
--- /dev/null
+++ b/Misc/NEWS.d/next/C API/2022-07-12-17-39-32.gh-issue-94731.9CPJNU.rst	
@@ -0,0 +1,3 @@
+Python again uses C-style casts for most casting operations when compiled
+with C++. This may trigger compiler warnings, if they are enabled with e.g.
+``-Wold-style-cast `` or ``-Wzero-as-null-pointer-constant`` options for ``g++``.


From webhook-mailer at python.org  Thu Jul 14 12:47:27 2022
From: webhook-mailer at python.org (miss-islington)
Date: Thu, 14 Jul 2022 16:47:27 -0000
Subject: [Python-checkins] GH-89988: Fix memory leak in pickle.Pickler
 dispatch_table lookup (GH-94298)
Message-ID: <mailman.19.1657817249.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/91f791400338673f025897c70da99301c85694c5
commit: 91f791400338673f025897c70da99301c85694c5
branch: 3.11
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-14T09:47:17-07:00
summary:

GH-89988: Fix memory leak in pickle.Pickler dispatch_table lookup (GH-94298)

(cherry picked from commit 01ef1f95dab9c9930ce1a23634a3e5a8331bf3c7)

Co-authored-by: Kumar Aditya <59607654+kumaraditya303 at users.noreply.github.com>

files:
A Misc/NEWS.d/next/Library/2022-06-26-10-59-15.gh-issue-89988.K8rnmt.rst
M Lib/test/test_pickle.py
M Modules/_pickle.c

diff --git a/Lib/test/test_pickle.py b/Lib/test/test_pickle.py
index 057af21e71fe4..44fdca7a6b168 100644
--- a/Lib/test/test_pickle.py
+++ b/Lib/test/test_pickle.py
@@ -154,6 +154,29 @@ def persistent_id(obj):
                 return obj
         check(PersPickler)
 
+    @support.cpython_only
+    def test_custom_pickler_dispatch_table_memleak(self):
+        # See https://github.com/python/cpython/issues/89988
+
+        class Pickler(self.pickler):
+            def __init__(self, *args, **kwargs):
+                self.dispatch_table = table
+                super().__init__(*args, **kwargs)
+
+        class DispatchTable:
+            pass
+
+        table = DispatchTable()
+        pickler = Pickler(io.BytesIO())
+        self.assertIs(pickler.dispatch_table, table)
+        table_ref = weakref.ref(table)
+        self.assertIsNotNone(table_ref())
+        del pickler
+        del table
+        support.gc_collect()
+        self.assertIsNone(table_ref())
+
+
     @support.cpython_only
     def test_unpickler_reference_cycle(self):
         def check(Unpickler):
diff --git a/Misc/NEWS.d/next/Library/2022-06-26-10-59-15.gh-issue-89988.K8rnmt.rst b/Misc/NEWS.d/next/Library/2022-06-26-10-59-15.gh-issue-89988.K8rnmt.rst
new file mode 100644
index 0000000000000..811a8d6031e0b
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2022-06-26-10-59-15.gh-issue-89988.K8rnmt.rst
@@ -0,0 +1 @@
+Fix memory leak in :class:`pickle.Pickler` when looking up :attr:`dispatch_table`. Patch by Kumar Aditya.
diff --git a/Modules/_pickle.c b/Modules/_pickle.c
index 23d26f6d608ff..b4b1dda199c23 100644
--- a/Modules/_pickle.c
+++ b/Modules/_pickle.c
@@ -4773,7 +4773,9 @@ _pickle_Pickler___init___impl(PicklerObject *self, PyObject *file,
     {
         return -1;
     }
-
+    if (self->dispatch_table != NULL) {
+        return 0;
+    }
     if (_PyObject_LookupAttr((PyObject *)self, &_Py_ID(dispatch_table),
                              &self->dispatch_table) < 0) {
         return -1;


From webhook-mailer at python.org  Thu Jul 14 14:33:35 2022
From: webhook-mailer at python.org (gvanrossum)
Date: Thu, 14 Jul 2022 18:33:35 -0000
Subject: [Python-checkins] gh-94841: Ensure arena_map_get() is inlined in
 PyObject_Free() (#94842)
Message-ID: <mailman.20.1657823617.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/9b3f7792093c533608f70043aa2a7daf7f903a16
commit: 9b3f7792093c533608f70043aa2a7daf7f903a16
branch: main
author: neonene <53406459+neonene at users.noreply.github.com>
committer: gvanrossum <gvanrossum at gmail.com>
date: 2022-07-14T11:33:25-07:00
summary:

gh-94841: Ensure arena_map_get() is inlined in PyObject_Free() (#94842)

files:
A Misc/NEWS.d/next/Build/2022-07-14-02-45-44.gh-issue-94841.lLRTdf.rst
M Objects/obmalloc.c

diff --git a/Misc/NEWS.d/next/Build/2022-07-14-02-45-44.gh-issue-94841.lLRTdf.rst b/Misc/NEWS.d/next/Build/2022-07-14-02-45-44.gh-issue-94841.lLRTdf.rst
new file mode 100644
index 0000000000000..f7ad4f88a51db
--- /dev/null
+++ b/Misc/NEWS.d/next/Build/2022-07-14-02-45-44.gh-issue-94841.lLRTdf.rst
@@ -0,0 +1 @@
+Fix the possible performance regression of :c:func:`PyObject_Free` compiled with MSVC version 1932.
diff --git a/Objects/obmalloc.c b/Objects/obmalloc.c
index 78a6f01a0964e..1d487d8e807a2 100644
--- a/Objects/obmalloc.c
+++ b/Objects/obmalloc.c
@@ -1446,7 +1446,7 @@ static arena_map_bot_t arena_map_root;
 
 /* Return a pointer to a bottom tree node, return NULL if it doesn't exist or
  * it cannot be created */
-static arena_map_bot_t *
+static Py_ALWAYS_INLINE arena_map_bot_t *
 arena_map_get(block *p, int create)
 {
 #ifdef USE_INTERIOR_NODES


From webhook-mailer at python.org  Thu Jul 14 15:04:16 2022
From: webhook-mailer at python.org (miss-islington)
Date: Thu, 14 Jul 2022 19:04:16 -0000
Subject: [Python-checkins] gh-94841: Ensure arena_map_get() is inlined in
 PyObject_Free() (GH-94842)
Message-ID: <mailman.21.1657825456.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/498c6490807e67a48df7982d266acd2c7407ca60
commit: 498c6490807e67a48df7982d266acd2c7407ca60
branch: 3.11
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-14T12:04:06-07:00
summary:

gh-94841: Ensure arena_map_get() is inlined in PyObject_Free() (GH-94842)

(cherry picked from commit 9b3f7792093c533608f70043aa2a7daf7f903a16)

Co-authored-by: neonene <53406459+neonene at users.noreply.github.com>

files:
A Misc/NEWS.d/next/Build/2022-07-14-02-45-44.gh-issue-94841.lLRTdf.rst
M Objects/obmalloc.c

diff --git a/Misc/NEWS.d/next/Build/2022-07-14-02-45-44.gh-issue-94841.lLRTdf.rst b/Misc/NEWS.d/next/Build/2022-07-14-02-45-44.gh-issue-94841.lLRTdf.rst
new file mode 100644
index 0000000000000..f7ad4f88a51db
--- /dev/null
+++ b/Misc/NEWS.d/next/Build/2022-07-14-02-45-44.gh-issue-94841.lLRTdf.rst
@@ -0,0 +1 @@
+Fix the possible performance regression of :c:func:`PyObject_Free` compiled with MSVC version 1932.
diff --git a/Objects/obmalloc.c b/Objects/obmalloc.c
index 823855ca6d8e8..ce5da5f1b7b92 100644
--- a/Objects/obmalloc.c
+++ b/Objects/obmalloc.c
@@ -1445,7 +1445,7 @@ static arena_map_bot_t arena_map_root;
 
 /* Return a pointer to a bottom tree node, return NULL if it doesn't exist or
  * it cannot be created */
-static arena_map_bot_t *
+static Py_ALWAYS_INLINE arena_map_bot_t *
 arena_map_get(block *p, int create)
 {
 #ifdef USE_INTERIOR_NODES


From webhook-mailer at python.org  Thu Jul 14 15:33:23 2022
From: webhook-mailer at python.org (ned-deily)
Date: Thu, 14 Jul 2022 19:33:23 -0000
Subject: [Python-checkins] [3.7] gh-90359: Update documentation to follow
 PEP 495. (gh-94800). (gh-94833)
Message-ID: <mailman.22.1657827205.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/dfc5e451b59e578b4e5eaddc34d4766271cb09dd
commit: dfc5e451b59e578b4e5eaddc34d4766271cb09dd
branch: 3.7
author: Dong-hee Na <donghee.na at python.org>
committer: ned-deily <nad at python.org>
date: 2022-07-14T15:33:14-04:00
summary:

[3.7] gh-90359: Update documentation to follow PEP 495. (gh-94800). (gh-94833)

(cherry picked from commit 07374cce52abb7fd39729dc1b646ca3029b64c64)

Co-authored-by: Dong-hee Na <donghee.na at python.org>

files:
M Doc/c-api/datetime.rst

diff --git a/Doc/c-api/datetime.rst b/Doc/c-api/datetime.rst
index 55de81665e04b..cb3267e3f8242 100644
--- a/Doc/c-api/datetime.rst
+++ b/Doc/c-api/datetime.rst
@@ -186,6 +186,13 @@ must not be ``NULL``, and the type is not checked:
    Return the microsecond, as an int from 0 through 999999.
 
 
+.. c:function:: int PyDateTime_DATE_GET_FOLD(PyDateTime_DateTime *o)
+
+   Return the fold, as an int from 0 through 1.
+
+   .. versionadded:: 3.6
+
+
 Macros to extract fields from time objects.  The argument must be an instance of
 :c:data:`PyDateTime_Time`, including subclasses. The argument must not be ``NULL``,
 and the type is not checked:
@@ -210,6 +217,13 @@ and the type is not checked:
    Return the microsecond, as an int from 0 through 999999.
 
 
+.. c:function:: int PyDateTime_TIME_GET_FOLD(PyDateTime_Time *o)
+
+   Return the fold, as an int from 0 through 1.
+
+   .. versionadded:: 3.6
+
+
 Macros to extract fields from time delta objects.  The argument must be an
 instance of :c:data:`PyDateTime_Delta`, including subclasses. The argument must
 not be ``NULL``, and the type is not checked:


From webhook-mailer at python.org  Thu Jul 14 17:35:19 2022
From: webhook-mailer at python.org (miss-islington)
Date: Thu, 14 Jul 2022 21:35:19 -0000
Subject: [Python-checkins] gh-94816: Improve coverage of decode_linetable
 (GH-94853)
Message-ID: <mailman.23.1657834520.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/20b9d2a658059c8c1624400f60bb6ba19a31ee9b
commit: 20b9d2a658059c8c1624400f60bb6ba19a31ee9b
branch: main
author: Michael Droettboom <mdboom at gmail.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-14T14:34:50-07:00
summary:

gh-94816: Improve coverage of decode_linetable (GH-94853)



This makes calls to co_lnotab to exercise this code, as well
as generating synthetically large code to exercise the corner
cases where line numbers need multiple bytes.

Automerge-Triggered-By: GH:brandtbucher

files:
M Lib/test/test_code.py

diff --git a/Lib/test/test_code.py b/Lib/test/test_code.py
index fd68f6dee7915..9110ce062b398 100644
--- a/Lib/test/test_code.py
+++ b/Lib/test/test_code.py
@@ -17,6 +17,7 @@
 freevars: ()
 nlocals: 2
 flags: 3
+lnotab: [4, 1, 10, 2]
 consts: ('None', '<code object g>')
 
 >>> dump(f(4).__code__)
@@ -30,6 +31,7 @@
 freevars: ('x',)
 nlocals: 1
 flags: 19
+lnotab: [4, 1]
 consts: ('None',)
 
 >>> def h(x, y):
@@ -50,6 +52,7 @@
 freevars: ()
 nlocals: 5
 flags: 3
+lnotab: [2, 1, 10, 1, 10, 1, 10, 1]
 consts: ('None',)
 
 >>> def attrs(obj):
@@ -68,6 +71,7 @@
 freevars: ()
 nlocals: 1
 flags: 3
+lnotab: [2, 1, 46, 1, 46, 1]
 consts: ('None',)
 
 >>> def optimize_away():
@@ -87,6 +91,7 @@
 freevars: ()
 nlocals: 0
 flags: 3
+lnotab: [2, 2, 2, 1, 2, 1]
 consts: ("'doc string'", 'None')
 
 >>> def keywordonly_args(a,b,*,k1):
@@ -104,6 +109,7 @@
 freevars: ()
 nlocals: 3
 flags: 3
+lnotab: [2, 1]
 consts: ('None',)
 
 >>> def posonly_args(a,b,/,c):
@@ -121,6 +127,7 @@
 freevars: ()
 nlocals: 3
 flags: 3
+lnotab: [2, 1]
 consts: ('None',)
 
 """
@@ -161,6 +168,7 @@ def dump(co):
                  "kwonlyargcount", "names", "varnames",
                  "cellvars", "freevars", "nlocals", "flags"]:
         print("%s: %s" % (attr, getattr(co, "co_" + attr)))
+    print("lnotab:", list(co.co_lnotab))
     print("consts:", tuple(consts(co.co_consts)))
 
 # Needed for test_closure_injection below
@@ -428,6 +436,21 @@ def func():
             self.assertIsNone(line)
             self.assertEqual(end_line, new_code.co_firstlineno + 1)
 
+    def test_large_lnotab(self):
+        d = {}
+        lines = (
+            ["def f():"] +
+            [""] * (1 << 17) +
+            ["    pass"] * (1 << 17)
+        )
+        source = "\n".join(lines)
+        exec(source, d)
+        code = d["f"].__code__
+
+        expected = 1032 * [0, 127] + [0, 9] + ((1 << 17) - 1) * [2, 1]
+        expected[0] = 2
+        self.assertEqual(list(code.co_lnotab), expected)
+
 
 def isinterned(s):
     return s is sys.intern(('_' + s + '_')[1:-1])


From webhook-mailer at python.org  Thu Jul 14 17:46:58 2022
From: webhook-mailer at python.org (brandtbucher)
Date: Thu, 14 Jul 2022 21:46:58 -0000
Subject: [Python-checkins] GH-94808: Cover handling non-finite numbers from
 round when ndigits is provided (GH-94860)
Message-ID: <mailman.24.1657835219.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/625ba9bdff51baddf9d5e156e5facf05fa1003d6
commit: 625ba9bdff51baddf9d5e156e5facf05fa1003d6
branch: main
author: Michael Droettboom <mdboom at gmail.com>
committer: brandtbucher <brandtbucher at gmail.com>
date: 2022-07-14T14:46:40-07:00
summary:

GH-94808: Cover handling non-finite numbers from round when ndigits is provided (GH-94860)

files:
M Lib/test/test_float.py

diff --git a/Lib/test/test_float.py b/Lib/test/test_float.py
index 672ec14115553..b5e271abc86a5 100644
--- a/Lib/test/test_float.py
+++ b/Lib/test/test_float.py
@@ -831,6 +831,11 @@ def test_inf_nan(self):
         self.assertRaises(TypeError, round, NAN, "ceci n'est pas un integer")
         self.assertRaises(TypeError, round, -0.0, 1j)
 
+    def test_inf_nan_ndigits(self):
+        self.assertEqual(round(INF, 0), INF)
+        self.assertEqual(round(-INF, 0), -INF)
+        self.assertTrue(math.isnan(round(NAN, 0)))
+
     def test_large_n(self):
         for n in [324, 325, 400, 2**31-1, 2**31, 2**32, 2**100]:
             self.assertEqual(round(123.456, n), 123.456)


From webhook-mailer at python.org  Thu Jul 14 17:47:51 2022
From: webhook-mailer at python.org (erlend-aasland)
Date: Thu, 14 Jul 2022 21:47:51 -0000
Subject: [Python-checkins] Docs: fix typo in sqlite3.rst (#94798)
Message-ID: <mailman.25.1657835272.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/9ea72e9d8d9c7ff7c0cec4bacf6071ff4f1f6238
commit: 9ea72e9d8d9c7ff7c0cec4bacf6071ff4f1f6238
branch: main
author: Ikko Ashimine <eltociear at gmail.com>
committer: erlend-aasland <erlend.aasland at protonmail.com>
date: 2022-07-14T23:47:46+02:00
summary:

Docs: fix typo in sqlite3.rst (#94798)

Colum -> Column

files:
M Doc/library/sqlite3.rst

diff --git a/Doc/library/sqlite3.rst b/Doc/library/sqlite3.rst
index bdff071b34ca0..d2997dc925178 100644
--- a/Doc/library/sqlite3.rst
+++ b/Doc/library/sqlite3.rst
@@ -1366,7 +1366,7 @@ of :func:`connect`. There are three options:
 * Explicit: set *detect_types* to :const:`PARSE_COLNAMES`
 * Both: set *detect_types* to
   ``sqlite3.PARSE_DECLTYPES | sqlite3.PARSE_COLNAMES``.
-  Colum names take precedence over declared types.
+  Column names take precedence over declared types.
 
 The following example illustrates the implicit and explicit approaches:
 


From webhook-mailer at python.org  Thu Jul 14 17:56:34 2022
From: webhook-mailer at python.org (miss-islington)
Date: Thu, 14 Jul 2022 21:56:34 -0000
Subject: [Python-checkins] Docs: fix typo in sqlite3.rst (GH-94798)
Message-ID: <mailman.26.1657835795.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/016fd7b57fec3d9f67981b520078ca46bc4c426c
commit: 016fd7b57fec3d9f67981b520078ca46bc4c426c
branch: 3.11
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-14T14:56:30-07:00
summary:

Docs: fix typo in sqlite3.rst (GH-94798)


Colum -> Column
(cherry picked from commit 9ea72e9d8d9c7ff7c0cec4bacf6071ff4f1f6238)

Co-authored-by: Ikko Ashimine <eltociear at gmail.com>

files:
M Doc/library/sqlite3.rst

diff --git a/Doc/library/sqlite3.rst b/Doc/library/sqlite3.rst
index 575a5a1ebc07a..9da7b5403cca3 100644
--- a/Doc/library/sqlite3.rst
+++ b/Doc/library/sqlite3.rst
@@ -1356,7 +1356,7 @@ of :func:`connect`. There are three options:
 * Explicit: set *detect_types* to :const:`PARSE_COLNAMES`
 * Both: set *detect_types* to
   ``sqlite3.PARSE_DECLTYPES | sqlite3.PARSE_COLNAMES``.
-  Colum names take precedence over declared types.
+  Column names take precedence over declared types.
 
 The following example illustrates the implicit and explicit approaches:
 


From webhook-mailer at python.org  Thu Jul 14 17:58:18 2022
From: webhook-mailer at python.org (miss-islington)
Date: Thu, 14 Jul 2022 21:58:18 -0000
Subject: [Python-checkins] Docs: fix typo in sqlite3.rst (GH-94798)
Message-ID: <mailman.27.1657835899.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/1cf0305ba563228143ecc6622d066590bae35309
commit: 1cf0305ba563228143ecc6622d066590bae35309
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-14T14:58:14-07:00
summary:

Docs: fix typo in sqlite3.rst (GH-94798)


Colum -> Column
(cherry picked from commit 9ea72e9d8d9c7ff7c0cec4bacf6071ff4f1f6238)

Co-authored-by: Ikko Ashimine <eltociear at gmail.com>

files:
M Doc/library/sqlite3.rst

diff --git a/Doc/library/sqlite3.rst b/Doc/library/sqlite3.rst
index 7030059609ff9..808adb1323015 100644
--- a/Doc/library/sqlite3.rst
+++ b/Doc/library/sqlite3.rst
@@ -1124,7 +1124,7 @@ of :func:`connect`. There are three options:
 * Explicit: set *detect_types* to :const:`PARSE_COLNAMES`
 * Both: set *detect_types* to
   ``sqlite3.PARSE_DECLTYPES | sqlite3.PARSE_COLNAMES``.
-  Colum names take precedence over declared types.
+  Column names take precedence over declared types.
 
 The following example illustrates the implicit and explicit approaches:
 


From webhook-mailer at python.org  Thu Jul 14 19:53:14 2022
From: webhook-mailer at python.org (miss-islington)
Date: Thu, 14 Jul 2022 23:53:14 -0000
Subject: [Python-checkins] gh-94808: Add coverage for boolobject.c:bool_new
 (GH-94859)
Message-ID: <mailman.28.1657842795.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/df4d53a09ab9fd9116d1b52bdc42133e019ca82b
commit: df4d53a09ab9fd9116d1b52bdc42133e019ca82b
branch: main
author: Michael Droettboom <mdboom at gmail.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-14T16:53:06-07:00
summary:

gh-94808: Add coverage for boolobject.c:bool_new (GH-94859)



`bool_new` had no coverage.

Automerge-Triggered-By: GH:brandtbucher

files:
M Lib/test/test_bool.py

diff --git a/Lib/test/test_bool.py b/Lib/test/test_bool.py
index 4b32aad2419f4..f46f21da8da35 100644
--- a/Lib/test/test_bool.py
+++ b/Lib/test/test_bool.py
@@ -369,6 +369,13 @@ def f(x):
         f(x)
         self.assertGreaterEqual(x.count, 1)
 
+    def test_bool_new(self):
+        self.assertIs(bool.__new__(bool), False)
+        self.assertIs(bool.__new__(bool, 1), True)
+        self.assertIs(bool.__new__(bool, 0), False)
+        self.assertIs(bool.__new__(bool, False), False)
+        self.assertIs(bool.__new__(bool, True), True)
+
 
 if __name__ == "__main__":
     unittest.main()


From webhook-mailer at python.org  Thu Jul 14 20:26:48 2022
From: webhook-mailer at python.org (nascheme)
Date: Fri, 15 Jul 2022 00:26:48 -0000
Subject: [Python-checkins] [3.10] gh-94841: Ensure arena_map_get() is
 inlined in PyObject_Free() (GH-94842)
Message-ID: <mailman.29.1657844809.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/5d26f855213a4b6e57311ccac2af87c8d85f3499
commit: 5d26f855213a4b6e57311ccac2af87c8d85f3499
branch: 3.10
author: Neil Schemenauer <nas-github at arctrix.com>
committer: nascheme <nas-github at arctrix.com>
date: 2022-07-14T17:26:40-07:00
summary:

[3.10] gh-94841: Ensure arena_map_get() is inlined in PyObject_Free() (GH-94842)

Need to define ALWAYS_INLINE macro for 3.10.

Co-authored-by: neonene <53406459+neonene at users.noreply.github.com>

files:
A Misc/NEWS.d/next/Build/2022-07-14-02-45-44.gh-issue-94841.lLRTdf.rst
M Objects/obmalloc.c

diff --git a/Misc/NEWS.d/next/Build/2022-07-14-02-45-44.gh-issue-94841.lLRTdf.rst b/Misc/NEWS.d/next/Build/2022-07-14-02-45-44.gh-issue-94841.lLRTdf.rst
new file mode 100644
index 0000000000000..f7ad4f88a51db
--- /dev/null
+++ b/Misc/NEWS.d/next/Build/2022-07-14-02-45-44.gh-issue-94841.lLRTdf.rst
@@ -0,0 +1 @@
+Fix the possible performance regression of :c:func:`PyObject_Free` compiled with MSVC version 1932.
diff --git a/Objects/obmalloc.c b/Objects/obmalloc.c
index 615703a963ede..ed8dd5a5042d5 100644
--- a/Objects/obmalloc.c
+++ b/Objects/obmalloc.c
@@ -1397,9 +1397,19 @@ static int arena_map_bot_count;
 static arena_map_bot_t arena_map_root;
 #endif
 
+#if defined(Py_DEBUG)
+#  define ALWAYS_INLINE
+#elif defined(__GNUC__) || defined(__clang__) || defined(__INTEL_COMPILER)
+#  define ALWAYS_INLINE __attribute__((always_inline))
+#elif defined(_MSC_VER)
+#  define ALWAYS_INLINE __forceinline
+#else
+#  define ALWAYS_INLINE
+#endif
+
 /* Return a pointer to a bottom tree node, return NULL if it doesn't exist or
  * it cannot be created */
-static arena_map_bot_t *
+static ALWAYS_INLINE arena_map_bot_t *
 arena_map_get(block *p, int create)
 {
 #ifdef USE_INTERIOR_NODES


From webhook-mailer at python.org  Thu Jul 14 22:38:42 2022
From: webhook-mailer at python.org (gvanrossum)
Date: Fri, 15 Jul 2022 02:38:42 -0000
Subject: [Python-checkins] GH-46771: docs for asyncio.timeout and task
 cancellation (#94794)
Message-ID: <mailman.30.1657852723.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/08f68975abb5bc6b3205f9442b68d97f4ef044db
commit: 08f68975abb5bc6b3205f9442b68d97f4ef044db
branch: main
author: Tin Tvrtkovi? <tinchester at gmail.com>
committer: gvanrossum <gvanrossum at gmail.com>
date: 2022-07-14T19:38:38-07:00
summary:

GH-46771: docs for asyncio.timeout and task cancellation (#94794)

files:
M Doc/library/asyncio-task.rst

diff --git a/Doc/library/asyncio-task.rst b/Doc/library/asyncio-task.rst
index 76969762dd9f5..a307d22e456eb 100644
--- a/Doc/library/asyncio-task.rst
+++ b/Doc/library/asyncio-task.rst
@@ -282,6 +282,24 @@ Creating Tasks
       Added the *context* parameter.
 
 
+Task Cancellation
+=================
+
+Tasks can easily and safely be cancelled.
+When a task is cancelled, :exc:`asyncio.CancelledError` will be raised
+in the task at the next opportunity.
+
+It is recommended that coroutines use ``try/finally`` blocks to robustly
+perform clean-up logic. In case :exc:`asyncio.CancelledError`
+is explicitly caught, it should generally be propagated when
+clean-up is complete. Most code can safely ignore :exc:`asyncio.CancelledError`.
+
+Important asyncio components, like :class:`asyncio.TaskGroup` and the
+:func:`asyncio.timeout` context manager, are implemented using cancellation
+internally and might misbehave if a coroutine swallows
+:exc:`asyncio.CancelledError`.
+
+
 Task Groups
 ===========
 
@@ -537,6 +555,122 @@ Shielding From Cancellation
 Timeouts
 ========
 
+.. coroutinefunction:: timeout(delay)
+
+    An :ref:`asynchronous context manager <async-context-managers>`
+    that can be used to limit the amount of time spent waiting on
+    something.
+
+    *delay* can either be ``None``, or a float/int number of
+    seconds to wait. If *delay* is ``None``, no time limit will
+    be applied; this can be useful if the delay is unknown when
+    the context manager is created.
+
+    In either case, the context manager can be rescheduled after
+    creation using :meth:`Timeout.reschedule`.
+
+    Example::
+
+        async def main():
+            async with asyncio.timeout(10):
+                await long_running_task()
+
+    If ``long_running_task`` takes more than 10 seconds to complete,
+    the context manager will cancel the current task and handle
+    the resulting :exc:`asyncio.CancelledError` internally, transforming it
+    into an :exc:`asyncio.TimeoutError` which can be caught and handled.
+
+    .. note::
+
+      The :func:`asyncio.timeout` context manager is what transforms
+      the :exc:`asyncio.CancelledError` into an :exc:`asyncio.TimeoutError`,
+      which means the :exc:`asyncio.TimeoutError` can only be caught
+      *outside* of the context manager.
+
+    Example of catching :exc:`asyncio.TimeoutError`::
+
+        async def main():
+            try:
+                async with asyncio.timeout(10):
+                    await long_running_task()
+            except TimeoutError:
+                print("The long operation timed out, but we've handled it.")
+
+            print("This statement will run regardless.")
+
+    The context manager produced by :func:`asyncio.timeout` can be
+    rescheduled to a different deadline and inspected.
+
+    .. class:: Timeout()
+
+       An :ref:`asynchronous context manager <async-context-managers>`
+       that limits time spent inside of it.
+
+        .. versionadded:: 3.11
+
+        .. method:: when() -> float | None
+
+           Return the current deadline, or ``None`` if the current
+           deadline is not set.
+
+           The deadline is a float, consistent with the time returned by
+           :meth:`loop.time`.
+
+        .. method:: reschedule(when: float | None)
+
+            Change the time the timeout will trigger.
+
+            If *when* is `None`, any current deadline will be removed, and the
+            context manager will wait indefinitely.
+
+            If *when* is a float, it is set as the new deadline.
+
+        .. method:: expired() -> bool
+
+           Return whether the context manager has exceeded its deadline
+           (expired).
+
+    Example::
+
+        async def main():
+            try:
+                # We do not know the timeout when starting, so we pass ``None``.
+                async with asyncio.timeout(None) as cm:
+                    # We know the timeout now, so we reschedule it.
+                    new_deadline = get_running_loop().time() + 10
+                    cm.reschedule(new_deadline)
+
+                    await long_running_task()
+            except TimeoutError:
+                pass
+
+            if cm.expired:
+                print("Looks like we haven't finished on time.")
+
+    Timeout context managers can be safely nested.
+
+    .. versionadded:: 3.11
+
+.. coroutinefunction:: timeout_at(when)
+
+   Similar to :func:`asyncio.timeout`, except *when* is the absolute time
+   to stop waiting, or ``None``.
+
+   Example::
+
+      async def main():
+          loop = get_running_loop()
+          deadline = loop.time() + 20
+          try:
+              async with asyncio.timeout_at(deadline):
+                  await long_running_task()
+          except TimeoutError:
+              print("The long operation timed out, but we've handled it.")
+
+          print("This statement will run regardless.")
+
+   .. versionadded:: 3.11
+
 .. coroutinefunction:: wait_for(aw, timeout)
 
    Wait for the *aw* :ref:`awaitable <asyncio-awaitables>`


From webhook-mailer at python.org  Thu Jul 14 22:48:12 2022
From: webhook-mailer at python.org (miss-islington)
Date: Fri, 15 Jul 2022 02:48:12 -0000
Subject: [Python-checkins] GH-46771: docs for asyncio.timeout and task
 cancellation (GH-94794)
Message-ID: <mailman.31.1657853293.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/3b6cb56dc922649e6a31af962feb1941665338af
commit: 3b6cb56dc922649e6a31af962feb1941665338af
branch: 3.11
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-14T19:48:03-07:00
summary:

GH-46771: docs for asyncio.timeout and task cancellation (GH-94794)

(cherry picked from commit 08f68975abb5bc6b3205f9442b68d97f4ef044db)

Co-authored-by: Tin Tvrtkovi? <tinchester at gmail.com>

files:
M Doc/library/asyncio-task.rst

diff --git a/Doc/library/asyncio-task.rst b/Doc/library/asyncio-task.rst
index 76969762dd9f5..a307d22e456eb 100644
--- a/Doc/library/asyncio-task.rst
+++ b/Doc/library/asyncio-task.rst
@@ -282,6 +282,24 @@ Creating Tasks
       Added the *context* parameter.
 
 
+Task Cancellation
+=================
+
+Tasks can easily and safely be cancelled.
+When a task is cancelled, :exc:`asyncio.CancelledError` will be raised
+in the task at the next opportunity.
+
+It is recommended that coroutines use ``try/finally`` blocks to robustly
+perform clean-up logic. In case :exc:`asyncio.CancelledError`
+is explicitly caught, it should generally be propagated when
+clean-up is complete. Most code can safely ignore :exc:`asyncio.CancelledError`.
+
+Important asyncio components, like :class:`asyncio.TaskGroup` and the
+:func:`asyncio.timeout` context manager, are implemented using cancellation
+internally and might misbehave if a coroutine swallows
+:exc:`asyncio.CancelledError`.
+
+
 Task Groups
 ===========
 
@@ -537,6 +555,122 @@ Shielding From Cancellation
 Timeouts
 ========
 
+.. coroutinefunction:: timeout(delay)
+
+    An :ref:`asynchronous context manager <async-context-managers>`
+    that can be used to limit the amount of time spent waiting on
+    something.
+
+    *delay* can either be ``None``, or a float/int number of
+    seconds to wait. If *delay* is ``None``, no time limit will
+    be applied; this can be useful if the delay is unknown when
+    the context manager is created.
+
+    In either case, the context manager can be rescheduled after
+    creation using :meth:`Timeout.reschedule`.
+
+    Example::
+
+        async def main():
+            async with asyncio.timeout(10):
+                await long_running_task()
+
+    If ``long_running_task`` takes more than 10 seconds to complete,
+    the context manager will cancel the current task and handle
+    the resulting :exc:`asyncio.CancelledError` internally, transforming it
+    into an :exc:`asyncio.TimeoutError` which can be caught and handled.
+
+    .. note::
+
+      The :func:`asyncio.timeout` context manager is what transforms
+      the :exc:`asyncio.CancelledError` into an :exc:`asyncio.TimeoutError`,
+      which means the :exc:`asyncio.TimeoutError` can only be caught
+      *outside* of the context manager.
+
+    Example of catching :exc:`asyncio.TimeoutError`::
+
+        async def main():
+            try:
+                async with asyncio.timeout(10):
+                    await long_running_task()
+            except TimeoutError:
+                print("The long operation timed out, but we've handled it.")
+
+            print("This statement will run regardless.")
+
+    The context manager produced by :func:`asyncio.timeout` can be
+    rescheduled to a different deadline and inspected.
+
+    .. class:: Timeout()
+
+       An :ref:`asynchronous context manager <async-context-managers>`
+       that limits time spent inside of it.
+
+        .. versionadded:: 3.11
+
+        .. method:: when() -> float | None
+
+           Return the current deadline, or ``None`` if the current
+           deadline is not set.
+
+           The deadline is a float, consistent with the time returned by
+           :meth:`loop.time`.
+
+        .. method:: reschedule(when: float | None)
+
+            Change the time the timeout will trigger.
+
+            If *when* is `None`, any current deadline will be removed, and the
+            context manager will wait indefinitely.
+
+            If *when* is a float, it is set as the new deadline.
+
+        .. method:: expired() -> bool
+
+           Return whether the context manager has exceeded its deadline
+           (expired).
+
+    Example::
+
+        async def main():
+            try:
+                # We do not know the timeout when starting, so we pass ``None``.
+                async with asyncio.timeout(None) as cm:
+                    # We know the timeout now, so we reschedule it.
+                    new_deadline = get_running_loop().time() + 10
+                    cm.reschedule(new_deadline)
+
+                    await long_running_task()
+            except TimeoutError:
+                pass
+
+            if cm.expired:
+                print("Looks like we haven't finished on time.")
+
+    Timeout context managers can be safely nested.
+
+    .. versionadded:: 3.11
+
+.. coroutinefunction:: timeout_at(when)
+
+   Similar to :func:`asyncio.timeout`, except *when* is the absolute time
+   to stop waiting, or ``None``.
+
+   Example::
+
+      async def main():
+          loop = get_running_loop()
+          deadline = loop.time() + 20
+          try:
+              async with asyncio.timeout_at(deadline):
+                  await long_running_task()
+          except TimeoutError:
+              print("The long operation timed out, but we've handled it.")
+
+          print("This statement will run regardless.")
+
+   .. versionadded:: 3.11
+
 .. coroutinefunction:: wait_for(aw, timeout)
 
    Wait for the *aw* :ref:`awaitable <asyncio-awaitables>`


From webhook-mailer at python.org  Fri Jul 15 01:04:08 2022
From: webhook-mailer at python.org (vsajip)
Date: Fri, 15 Jul 2022 05:04:08 -0000
Subject: [Python-checkins] [doc] Update cookbook example and add information
 about queue types. (GH-94854)
Message-ID: <mailman.32.1657861448.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/dc54193095e8ac8d73489f7ab133e016a5556256
commit: dc54193095e8ac8d73489f7ab133e016a5556256
branch: main
author: Vinay Sajip <vinay_sajip at yahoo.co.uk>
committer: vsajip <vinay_sajip at yahoo.co.uk>
date: 2022-07-15T06:03:58+01:00
summary:

[doc] Update cookbook example and add information about queue types. (GH-94854)

files:
M Doc/howto/logging-cookbook.rst
M Doc/library/logging.handlers.rst

diff --git a/Doc/howto/logging-cookbook.rst b/Doc/howto/logging-cookbook.rst
index 7f4fe3a63a702..321c4bc510ad9 100644
--- a/Doc/howto/logging-cookbook.rst
+++ b/Doc/howto/logging-cookbook.rst
@@ -219,7 +219,7 @@ messages should not. Here's how you can achieve this::
    logging.basicConfig(level=logging.DEBUG,
                        format='%(asctime)s %(name)-12s %(levelname)-8s %(message)s',
                        datefmt='%m-%d %H:%M',
-                       filename='/temp/myapp.log',
+                       filename='/tmp/myapp.log',
                        filemode='w')
    # define a Handler which writes INFO messages or higher to the sys.stderr
    console = logging.StreamHandler()
@@ -270,6 +270,11 @@ are sent to both destinations.
 This example uses console and file handlers, but you can use any number and
 combination of handlers you choose.
 
+Note that the above choice of log filename ``/tmp/myapp.log`` implies use of a
+standard location for temporary files on POSIX systems. On Windows, you may need to
+choose a different directory name for the log - just ensure that the directory exists
+and that you have the permissions to create and update files in it.
+
 
 Configuration server example
 ----------------------------
diff --git a/Doc/library/logging.handlers.rst b/Doc/library/logging.handlers.rst
index 1447cabb9a1df..0dc05255db9cb 100644
--- a/Doc/library/logging.handlers.rst
+++ b/Doc/library/logging.handlers.rst
@@ -1018,6 +1018,8 @@ possible, while any potentially slow operations (such as sending an email via
    have the task tracking API, which means that you can use
    :class:`~queue.SimpleQueue` instances for *queue*.
 
+   .. note:: If you are using :mod:`multiprocessing`, you should avoid using
+      :class:`~queue.SimpleQueue` and instead use :class:`multiprocessing.Queue`.
 
    .. method:: emit(record)
 
@@ -1091,6 +1093,9 @@ possible, while any potentially slow operations (such as sending an email via
    task tracking API (though it's used if available), which means that you can
    use :class:`~queue.SimpleQueue` instances for *queue*.
 
+   .. note:: If you are using :mod:`multiprocessing`, you should avoid using
+      :class:`~queue.SimpleQueue` and instead use :class:`multiprocessing.Queue`.
+
    If ``respect_handler_level`` is ``True``, a handler's level is respected
    (compared with the level for the message) when deciding whether to pass
    messages to that handler; otherwise, the behaviour is as in previous Python


From webhook-mailer at python.org  Fri Jul 15 02:13:51 2022
From: webhook-mailer at python.org (serhiy-storchaka)
Date: Fri, 15 Jul 2022 06:13:51 -0000
Subject: [Python-checkins] gh-94821: Fix autobind of empty unix domain
 address (GH-94826)
Message-ID: <mailman.33.1657865631.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/c22f134211743cd5ad14cec1dd4f527bee542b4c
commit: c22f134211743cd5ad14cec1dd4f527bee542b4c
branch: main
author: Nir Soffer <nsoffer at redhat.com>
committer: serhiy-storchaka <storchaka at gmail.com>
date: 2022-07-15T09:13:33+03:00
summary:

gh-94821: Fix autobind of empty unix domain address (GH-94826)

When binding a unix socket to an empty address on Linux, the socket is
automatically bound to an available address in the abstract namespace.

    >>> s = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
    >>> s.bind("")
    >>> s.getsockname()
    b'\x0075499'

Since python 3.9, the socket is bound to the one address:

    >>> s.getsockname()
    b'\x00'

And trying to bind multiple sockets will fail with:

    Traceback (most recent call last):
      File "/home/nsoffer/src/cpython/Lib/test/test_socket.py", line 5553, in testAutobind
        s2.bind("")
    OSError: [Errno 98] Address already in use

Added 2 tests:
- Auto binding empty address on Linux
- Failing to bind an empty address on other platforms

Fixes f6b3a07b7df6 (bpo-44493: Add missing terminated NUL in sockaddr_un's length (GH-26866)

files:
A Misc/NEWS.d/next/Library/2022-07-14-00-43-52.gh-issue-94821.e17ghU.rst
M Lib/test/test_socket.py
M Modules/socketmodule.c

diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py
index 1700b429ab07c..8424693fc609a 100644
--- a/Lib/test/test_socket.py
+++ b/Lib/test/test_socket.py
@@ -5543,6 +5543,20 @@ def testBytearrayName(self):
             s.bind(bytearray(b"\x00python\x00test\x00"))
             self.assertEqual(s.getsockname(), b"\x00python\x00test\x00")
 
+    def testAutobind(self):
+        # Check that binding to an empty string binds to an available address
+        # in the abstract namespace as specified in unix(7) "Autobind feature".
+        abstract_address = b"^\0[0-9a-f]{5}"
+        with socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) as s1:
+            s1.bind("")
+            self.assertRegex(s1.getsockname(), abstract_address)
+            # Each socket is bound to a different abstract address.
+            with socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) as s2:
+                s2.bind("")
+                self.assertRegex(s2.getsockname(), abstract_address)
+                self.assertNotEqual(s1.getsockname(), s2.getsockname())
+
+
 @unittest.skipUnless(hasattr(socket, 'AF_UNIX'), 'test needs socket.AF_UNIX')
 class TestUnixDomain(unittest.TestCase):
 
@@ -5612,6 +5626,11 @@ def testUnencodableAddr(self):
         self.addCleanup(os_helper.unlink, path)
         self.assertEqual(self.sock.getsockname(), path)
 
+    @unittest.skipIf(sys.platform == 'linux', 'Linux specific test')
+    def testEmptyAddress(self):
+        # Test that binding empty address fails.
+        self.assertRaises(OSError, self.sock.bind, "")
+
 
 class BufferIOTest(SocketConnectedTest):
     """
diff --git a/Misc/NEWS.d/next/Library/2022-07-14-00-43-52.gh-issue-94821.e17ghU.rst b/Misc/NEWS.d/next/Library/2022-07-14-00-43-52.gh-issue-94821.e17ghU.rst
new file mode 100644
index 0000000000000..bf7885aef8cbf
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2022-07-14-00-43-52.gh-issue-94821.e17ghU.rst
@@ -0,0 +1,2 @@
+Fix binding of unix socket to empty address on Linux to use an available
+address from the abstract namespace, instead of "\0".
diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
index 55e19ffab5cba..9b4155e164f10 100644
--- a/Modules/socketmodule.c
+++ b/Modules/socketmodule.c
@@ -1724,8 +1724,10 @@ getsockaddrarg(PySocketSockObject *s, PyObject *args,
 
         struct sockaddr_un* addr = &addrbuf->un;
 #ifdef __linux__
-        if (path.len > 0 && *(const char *)path.buf == 0) {
-            /* Linux abstract namespace extension */
+        if (path.len == 0 || *(const char *)path.buf == 0) {
+            /* Linux abstract namespace extension:
+               - Empty address auto-binding to an abstract address
+               - Address that starts with null byte */
             if ((size_t)path.len > sizeof addr->sun_path) {
                 PyErr_SetString(PyExc_OSError,
                                 "AF_UNIX path too long");


From webhook-mailer at python.org  Fri Jul 15 03:18:51 2022
From: webhook-mailer at python.org (vsajip)
Date: Fri, 15 Jul 2022 07:18:51 -0000
Subject: [Python-checkins] [3.10] [doc] Update cookbook example and add
 information about queue types. (GH-94854) (GH-94872)
Message-ID: <mailman.34.1657869532.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/c5bf768a531c488a6e97288946b8002553481dc7
commit: c5bf768a531c488a6e97288946b8002553481dc7
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: vsajip <vinay_sajip at yahoo.co.uk>
date: 2022-07-15T08:18:30+01:00
summary:

[3.10] [doc] Update cookbook example and add information about queue types. (GH-94854) (GH-94872)

(cherry picked from commit dc54193095e8ac8d73489f7ab133e016a5556256)

files:
M Doc/howto/logging-cookbook.rst
M Doc/library/logging.handlers.rst

diff --git a/Doc/howto/logging-cookbook.rst b/Doc/howto/logging-cookbook.rst
index 7f4fe3a63a702..321c4bc510ad9 100644
--- a/Doc/howto/logging-cookbook.rst
+++ b/Doc/howto/logging-cookbook.rst
@@ -219,7 +219,7 @@ messages should not. Here's how you can achieve this::
    logging.basicConfig(level=logging.DEBUG,
                        format='%(asctime)s %(name)-12s %(levelname)-8s %(message)s',
                        datefmt='%m-%d %H:%M',
-                       filename='/temp/myapp.log',
+                       filename='/tmp/myapp.log',
                        filemode='w')
    # define a Handler which writes INFO messages or higher to the sys.stderr
    console = logging.StreamHandler()
@@ -270,6 +270,11 @@ are sent to both destinations.
 This example uses console and file handlers, but you can use any number and
 combination of handlers you choose.
 
+Note that the above choice of log filename ``/tmp/myapp.log`` implies use of a
+standard location for temporary files on POSIX systems. On Windows, you may need to
+choose a different directory name for the log - just ensure that the directory exists
+and that you have the permissions to create and update files in it.
+
 
 Configuration server example
 ----------------------------
diff --git a/Doc/library/logging.handlers.rst b/Doc/library/logging.handlers.rst
index 1447cabb9a1df..0dc05255db9cb 100644
--- a/Doc/library/logging.handlers.rst
+++ b/Doc/library/logging.handlers.rst
@@ -1018,6 +1018,8 @@ possible, while any potentially slow operations (such as sending an email via
    have the task tracking API, which means that you can use
    :class:`~queue.SimpleQueue` instances for *queue*.
 
+   .. note:: If you are using :mod:`multiprocessing`, you should avoid using
+      :class:`~queue.SimpleQueue` and instead use :class:`multiprocessing.Queue`.
 
    .. method:: emit(record)
 
@@ -1091,6 +1093,9 @@ possible, while any potentially slow operations (such as sending an email via
    task tracking API (though it's used if available), which means that you can
    use :class:`~queue.SimpleQueue` instances for *queue*.
 
+   .. note:: If you are using :mod:`multiprocessing`, you should avoid using
+      :class:`~queue.SimpleQueue` and instead use :class:`multiprocessing.Queue`.
+
    If ``respect_handler_level`` is ``True``, a handler's level is respected
    (compared with the level for the message) when deciding whether to pass
    messages to that handler; otherwise, the behaviour is as in previous Python


From webhook-mailer at python.org  Fri Jul 15 03:19:08 2022
From: webhook-mailer at python.org (vsajip)
Date: Fri, 15 Jul 2022 07:19:08 -0000
Subject: [Python-checkins] [3.11] [doc] Update cookbook example and add
 information about queue types. (GH-94854) (GH-94871)
Message-ID: <mailman.35.1657869549.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/a6c4ca9b7cc9d8e0715be099adf3aecc415539f8
commit: a6c4ca9b7cc9d8e0715be099adf3aecc415539f8
branch: 3.11
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: vsajip <vinay_sajip at yahoo.co.uk>
date: 2022-07-15T08:19:02+01:00
summary:

[3.11] [doc] Update cookbook example and add information about queue types. (GH-94854) (GH-94871)

(cherry picked from commit dc54193095e8ac8d73489f7ab133e016a5556256)

files:
M Doc/howto/logging-cookbook.rst
M Doc/library/logging.handlers.rst

diff --git a/Doc/howto/logging-cookbook.rst b/Doc/howto/logging-cookbook.rst
index 7f4fe3a63a702..321c4bc510ad9 100644
--- a/Doc/howto/logging-cookbook.rst
+++ b/Doc/howto/logging-cookbook.rst
@@ -219,7 +219,7 @@ messages should not. Here's how you can achieve this::
    logging.basicConfig(level=logging.DEBUG,
                        format='%(asctime)s %(name)-12s %(levelname)-8s %(message)s',
                        datefmt='%m-%d %H:%M',
-                       filename='/temp/myapp.log',
+                       filename='/tmp/myapp.log',
                        filemode='w')
    # define a Handler which writes INFO messages or higher to the sys.stderr
    console = logging.StreamHandler()
@@ -270,6 +270,11 @@ are sent to both destinations.
 This example uses console and file handlers, but you can use any number and
 combination of handlers you choose.
 
+Note that the above choice of log filename ``/tmp/myapp.log`` implies use of a
+standard location for temporary files on POSIX systems. On Windows, you may need to
+choose a different directory name for the log - just ensure that the directory exists
+and that you have the permissions to create and update files in it.
+
 
 Configuration server example
 ----------------------------
diff --git a/Doc/library/logging.handlers.rst b/Doc/library/logging.handlers.rst
index 0cbe707339a7a..026f14153cbe1 100644
--- a/Doc/library/logging.handlers.rst
+++ b/Doc/library/logging.handlers.rst
@@ -1018,6 +1018,8 @@ possible, while any potentially slow operations (such as sending an email via
    have the task tracking API, which means that you can use
    :class:`~queue.SimpleQueue` instances for *queue*.
 
+   .. note:: If you are using :mod:`multiprocessing`, you should avoid using
+      :class:`~queue.SimpleQueue` and instead use :class:`multiprocessing.Queue`.
 
    .. method:: emit(record)
 
@@ -1085,6 +1087,9 @@ possible, while any potentially slow operations (such as sending an email via
    task tracking API (though it's used if available), which means that you can
    use :class:`~queue.SimpleQueue` instances for *queue*.
 
+   .. note:: If you are using :mod:`multiprocessing`, you should avoid using
+      :class:`~queue.SimpleQueue` and instead use :class:`multiprocessing.Queue`.
+
    If ``respect_handler_level`` is ``True``, a handler's level is respected
    (compared with the level for the message) when deciding whether to pass
    messages to that handler; otherwise, the behaviour is as in previous Python


From webhook-mailer at python.org  Fri Jul 15 03:35:34 2022
From: webhook-mailer at python.org (encukou)
Date: Fri, 15 Jul 2022 07:35:34 -0000
Subject: [Python-checkins] gh-94731: Revert to C-style casts for _Py_CAST
 (GH-94782) (#94849)
Message-ID: <mailman.36.1657870535.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/d9107aa0157a2ff6741b9aa2f78759e90f522bd7
commit: d9107aa0157a2ff6741b9aa2f78759e90f522bd7
branch: 3.11
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: encukou <encukou at gmail.com>
date: 2022-07-15T09:35:23+02:00
summary:

gh-94731: Revert to C-style casts for _Py_CAST (GH-94782) (#94849)

Co-authored-by: da-woods <dw-git at d-woods.co.uk>
(cherry picked from commit 6cbb57f62d345d7a5d6aeb1b3b5d37a845344d5e)

files:
A Misc/NEWS.d/next/C API/2022-07-12-17-39-32.gh-issue-94731.9CPJNU.rst
M Include/pyport.h
M Lib/test/_testcppext.cpp
M Lib/test/setup_testcppext.py
M Lib/test/test_cppext.py

diff --git a/Include/pyport.h b/Include/pyport.h
index 59f225fc8fa5d..93250f4eb1d7a 100644
--- a/Include/pyport.h
+++ b/Include/pyport.h
@@ -14,62 +14,14 @@
 #endif
 
 
-// Macro to use C++ static_cast<>, reinterpret_cast<> and const_cast<>
-// in the Python C API.
-//
-// In C++, _Py_CAST(type, expr) converts a constant expression to a
-// non constant type using const_cast<type>. For example,
-// _Py_CAST(PyObject*, op) can convert a "const PyObject*" to
-// "PyObject*".
-//
-// The type argument must not be a constant type.
+// Macro to use C++ static_cast<> in the Python C API.
 #ifdef __cplusplus
-#include <cstddef>
 #  define _Py_STATIC_CAST(type, expr) static_cast<type>(expr)
-extern "C++" {
-    namespace {
-        template <typename type>
-        inline type _Py_CAST_impl(long int ptr) {
-            return reinterpret_cast<type>(ptr);
-        }
-        template <typename type>
-        inline type _Py_CAST_impl(int ptr) {
-            return reinterpret_cast<type>(ptr);
-        }
-#if __cplusplus >= 201103
-        template <typename type>
-        inline type _Py_CAST_impl(std::nullptr_t) {
-            return static_cast<type>(nullptr);
-        }
-#endif
-
-        template <typename type, typename expr_type>
-            inline type _Py_CAST_impl(expr_type *expr) {
-                return reinterpret_cast<type>(expr);
-            }
-
-        template <typename type, typename expr_type>
-            inline type _Py_CAST_impl(expr_type const *expr) {
-                return reinterpret_cast<type>(const_cast<expr_type *>(expr));
-            }
-
-        template <typename type, typename expr_type>
-            inline type _Py_CAST_impl(expr_type &expr) {
-                return static_cast<type>(expr);
-            }
-
-        template <typename type, typename expr_type>
-            inline type _Py_CAST_impl(expr_type const &expr) {
-                return static_cast<type>(const_cast<expr_type &>(expr));
-            }
-    }
-}
-#  define _Py_CAST(type, expr) _Py_CAST_impl<type>(expr)
-
 #else
 #  define _Py_STATIC_CAST(type, expr) ((type)(expr))
-#  define _Py_CAST(type, expr) ((type)(expr))
 #endif
+// Macro to use the more powerful/dangerous C-style cast even in C++.
+#define _Py_CAST(type, expr) ((type)(expr))
 
 // Static inline functions should use _Py_NULL rather than using directly NULL
 // to prevent C++ compiler warnings. On C++11 and newer, _Py_NULL is defined as
diff --git a/Lib/test/_testcppext.cpp b/Lib/test/_testcppext.cpp
index be7538826b6c4..0e381a78c5cee 100644
--- a/Lib/test/_testcppext.cpp
+++ b/Lib/test/_testcppext.cpp
@@ -12,6 +12,9 @@
 #  define NAME _testcpp03ext
 #endif
 
+#define _STR(NAME) #NAME
+#define STR(NAME) _STR(NAME)
+
 PyDoc_STRVAR(_testcppext_add_doc,
 "add(x, y)\n"
 "\n"
@@ -123,11 +126,77 @@ test_unicode(PyObject *Py_UNUSED(module), PyObject *Py_UNUSED(args))
     Py_RETURN_NONE;
 }
 
+/* Test a `new`-allocated object with a virtual method.
+ * (https://github.com/python/cpython/issues/94731) */
+
+class VirtualPyObject : public PyObject {
+public:
+    VirtualPyObject();
+    virtual ~VirtualPyObject() {
+        delete [] internal_data;
+        --instance_count;
+    }
+    virtual void set_internal_data() {
+        internal_data[0] = 1;
+    }
+    static void dealloc(PyObject* o) {
+        delete static_cast<VirtualPyObject*>(o);
+    }
+
+    // Number of "living" instances
+    static int instance_count;
+private:
+    // buffer that can get corrupted
+    int* internal_data;
+};
+
+int VirtualPyObject::instance_count = 0;
+
+PyType_Slot VirtualPyObject_Slots[] = {
+    {Py_tp_free, (void*)VirtualPyObject::dealloc},
+    {0, _Py_NULL},
+};
+
+PyType_Spec VirtualPyObject_Spec = {
+    /* .name */ STR(NAME) ".VirtualPyObject",
+    /* .basicsize */ sizeof(VirtualPyObject),
+    /* .itemsize */ 0,
+    /* .flags */ Py_TPFLAGS_DEFAULT,
+    /* .slots */ VirtualPyObject_Slots,
+};
+
+VirtualPyObject::VirtualPyObject() {
+    // Create a temporary type (just so we don't need to store it)
+    PyObject *type = PyType_FromSpec(&VirtualPyObject_Spec);
+    // no good way to signal failure from a C++ constructor, so use assert
+    // for error handling
+    assert(type);
+    assert(PyObject_Init(this, (PyTypeObject *)type));
+    Py_DECREF(type);
+    internal_data = new int[50];
+    ++instance_count;
+}
+
+static PyObject *
+test_virtual_object(PyObject *Py_UNUSED(module), PyObject *Py_UNUSED(args))
+{
+    VirtualPyObject* obj = new VirtualPyObject();
+    obj->set_internal_data();
+    Py_DECREF(obj);
+    if (VirtualPyObject::instance_count != 0) {
+        return PyErr_Format(
+            PyExc_AssertionError,
+            "instance_count should be 0, got %d",
+            VirtualPyObject::instance_count);
+    }
+    Py_RETURN_NONE;
+}
 
 static PyMethodDef _testcppext_methods[] = {
     {"add", _testcppext_add, METH_VARARGS, _testcppext_add_doc},
     {"test_api_casts", test_api_casts, METH_NOARGS, _Py_NULL},
     {"test_unicode", test_unicode, METH_NOARGS, _Py_NULL},
+    {"test_virtual_object", test_virtual_object, METH_NOARGS, _Py_NULL},
     // Note: _testcppext_exec currently runs all test functions directly.
     // When adding a new one, add a call there.
 
@@ -152,6 +221,10 @@ _testcppext_exec(PyObject *module)
     if (!result) return -1;
     Py_DECREF(result);
 
+    result = PyObject_CallMethod(module, "test_virtual_object", "");
+    if (!result) return -1;
+    Py_DECREF(result);
+
     return 0;
 }
 
@@ -163,9 +236,6 @@ static PyModuleDef_Slot _testcppext_slots[] = {
 
 PyDoc_STRVAR(_testcppext_doc, "C++ test extension.");
 
-#define _STR(NAME) #NAME
-#define STR(NAME) _STR(NAME)
-
 static struct PyModuleDef _testcppext_module = {
     PyModuleDef_HEAD_INIT,  // m_base
     STR(NAME),  // m_name
diff --git a/Lib/test/setup_testcppext.py b/Lib/test/setup_testcppext.py
index ae81e33e23b6b..c6b68104d1333 100644
--- a/Lib/test/setup_testcppext.py
+++ b/Lib/test/setup_testcppext.py
@@ -17,8 +17,6 @@
         # a C++ extension using the Python C API does not emit C++ compiler
         # warnings
         '-Werror',
-        # Warn on old-style cast (C cast) like: (PyObject*)op
-        '-Wold-style-cast',
     ]
 else:
     # Don't pass any compiler flag to MSVC
@@ -37,9 +35,6 @@ def main():
         name = '_testcpp11ext'
 
     cppflags = [*CPPFLAGS, f'-std={std}']
-    if std == 'c++11':
-        # Warn when using NULL rather than _Py_NULL in static inline functions
-        cppflags.append('-Wzero-as-null-pointer-constant')
 
     cpp_ext = Extension(
         name,
diff --git a/Lib/test/test_cppext.py b/Lib/test/test_cppext.py
index 2c54d33711691..465894d24e7df 100644
--- a/Lib/test/test_cppext.py
+++ b/Lib/test/test_cppext.py
@@ -4,6 +4,7 @@
 import sys
 import unittest
 import subprocess
+import sysconfig
 from test import support
 from test.support import os_helper
 
@@ -25,6 +26,11 @@ def test_build_cpp03(self):
     # With MSVC, the linker fails with: cannot open file 'python311.lib'
     # https://github.com/python/cpython/pull/32175#issuecomment-1111175897
     @unittest.skipIf(MS_WINDOWS, 'test fails on Windows')
+    # Building and running an extension in clang sanitizing mode is not
+    # straightforward
+    @unittest.skipIf(
+        '-fsanitize' in (sysconfig.get_config_var('PY_CFLAGS') or ''),
+        'test does not work with analyzing builds')
     # the test uses venv+pip: skip if it's not available
     @support.requires_venv_with_pip()
     def check_build(self, std_cpp03, extension_name):
diff --git a/Misc/NEWS.d/next/C API/2022-07-12-17-39-32.gh-issue-94731.9CPJNU.rst b/Misc/NEWS.d/next/C API/2022-07-12-17-39-32.gh-issue-94731.9CPJNU.rst
new file mode 100644
index 0000000000000..b7816d28215e7
--- /dev/null
+++ b/Misc/NEWS.d/next/C API/2022-07-12-17-39-32.gh-issue-94731.9CPJNU.rst	
@@ -0,0 +1,3 @@
+Python again uses C-style casts for most casting operations when compiled
+with C++. This may trigger compiler warnings, if they are enabled with e.g.
+``-Wold-style-cast `` or ``-Wzero-as-null-pointer-constant`` options for ``g++``.


From webhook-mailer at python.org  Fri Jul 15 08:48:36 2022
From: webhook-mailer at python.org (tiran)
Date: Fri, 15 Jul 2022 12:48:36 -0000
Subject: [Python-checkins] gh-94801: Use custom flags to check for headers
 and libs (#94802)
Message-ID: <mailman.37.1657889317.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/944ff8c57c9e8ff5a5bd18925070ddb1504490ab
commit: 944ff8c57c9e8ff5a5bd18925070ddb1504490ab
branch: main
author: Christian Heimes <christian at python.org>
committer: tiran <christian at python.org>
date: 2022-07-15T14:48:01+02:00
summary:

gh-94801: Use custom flags to check for headers and libs (#94802)

files:
A Misc/NEWS.d/next/Build/2022-07-13-10-13-10.gh-issue-94801.3xUB24.rst
M configure
M configure.ac

diff --git a/Misc/NEWS.d/next/Build/2022-07-13-10-13-10.gh-issue-94801.3xUB24.rst b/Misc/NEWS.d/next/Build/2022-07-13-10-13-10.gh-issue-94801.3xUB24.rst
new file mode 100644
index 0000000000000..5caf84f96da13
--- /dev/null
+++ b/Misc/NEWS.d/next/Build/2022-07-13-10-13-10.gh-issue-94801.3xUB24.rst
@@ -0,0 +1,2 @@
+``configure`` now uses custom flags like ``ZLIB_CFLAGS`` and ``ZLIB_LIBS``
+when searching for headers and libraries.
diff --git a/configure b/configure
index 55d0518d3886f..df6b193433e3e 100755
--- a/configure
+++ b/configure
@@ -3090,6 +3090,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
+
+
+
+
 if test "$srcdir" != . -a "$srcdir" != "$(pwd)"; then
     # If we're building out-of-tree, we need to make sure the following
     # resources get picked up before their $srcdir counterparts.
@@ -11263,7 +11267,15 @@ fi
 	echo "$LIBUUID_PKG_ERRORS" >&5
 
 
-      for ac_header in uuid/uuid.h
+      save_CFLAGS=$CFLAGS
+save_CPPFLAGS=$CPPFLAGS
+save_LDFLAGS=$LDFLAGS
+save_LIBS=$LIBS
+
+
+        CPPFLAGS="$CFLAGS $LIBUUID_CFLAGS"
+        LDFLAGS="$LDFLAGS $LIBUUID_LIBS"
+        for ac_header in uuid/uuid.h
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "uuid/uuid.h" "ac_cv_header_uuid_uuid_h" "$ac_includes_default"
 if test "x$ac_cv_header_uuid_uuid_h" = xyes; then :
@@ -11271,11 +11283,7 @@ if test "x$ac_cv_header_uuid_uuid_h" = xyes; then :
 #define HAVE_UUID_UUID_H 1
 _ACEOF
 
-        save_CFLAGS=$CFLAGS
-save_CPPFLAGS=$CPPFLAGS
-save_LDFLAGS=$LDFLAGS
-save_LIBS=$LIBS
-
+          py_check_lib_save_LIBS=$LIBS
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for uuid_generate_time in -luuid" >&5
 $as_echo_n "checking for uuid_generate_time in -luuid... " >&6; }
 if ${ac_cv_lib_uuid_uuid_generate_time+:} false; then :
@@ -11316,20 +11324,10 @@ if test "x$ac_cv_lib_uuid_uuid_generate_time" = xyes; then :
   have_uuid=yes
 fi
 
+LIBS=$py_check_lib_save_LIBS
 
-CFLAGS=$save_CFLAGS
-CPPFLAGS=$save_CPPFLAGS
-LDFLAGS=$save_LDFLAGS
-LIBS=$save_LIBS
-
-
-        save_CFLAGS=$CFLAGS
-save_CPPFLAGS=$CPPFLAGS
-save_LDFLAGS=$LDFLAGS
-save_LIBS=$LIBS
-
-
-          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for uuid_generate_time_safe in -luuid" >&5
+          py_check_lib_save_LIBS=$LIBS
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for uuid_generate_time_safe in -luuid" >&5
 $as_echo_n "checking for uuid_generate_time_safe in -luuid... " >&6; }
 if ${ac_cv_lib_uuid_uuid_generate_time_safe+:} false; then :
   $as_echo_n "(cached) " >&6
@@ -11366,19 +11364,18 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_uuid_uuid_generate_time_safe" >&5
 $as_echo "$ac_cv_lib_uuid_uuid_generate_time_safe" >&6; }
 if test "x$ac_cv_lib_uuid_uuid_generate_time_safe" = xyes; then :
-
-            have_uuid=yes
+  have_uuid=yes
             $as_echo "#define HAVE_UUID_GENERATE_TIME_SAFE 1" >>confdefs.h
 
 
 fi
 
+LIBS=$py_check_lib_save_LIBS
 
-CFLAGS=$save_CFLAGS
-CPPFLAGS=$save_CPPFLAGS
-LDFLAGS=$save_LDFLAGS
-LIBS=$save_LIBS
 
+fi
+
+done
 
         if test "x$have_uuid" = xyes; then :
 
@@ -11387,9 +11384,11 @@ LIBS=$save_LIBS
 
 fi
 
-fi
+CFLAGS=$save_CFLAGS
+CPPFLAGS=$save_CPPFLAGS
+LDFLAGS=$save_LDFLAGS
+LIBS=$save_LIBS
 
-done
 
 
 
@@ -11397,7 +11396,15 @@ elif test $pkg_failed = untried; then
      	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 
-      for ac_header in uuid/uuid.h
+      save_CFLAGS=$CFLAGS
+save_CPPFLAGS=$CPPFLAGS
+save_LDFLAGS=$LDFLAGS
+save_LIBS=$LIBS
+
+
+        CPPFLAGS="$CFLAGS $LIBUUID_CFLAGS"
+        LDFLAGS="$LDFLAGS $LIBUUID_LIBS"
+        for ac_header in uuid/uuid.h
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "uuid/uuid.h" "ac_cv_header_uuid_uuid_h" "$ac_includes_default"
 if test "x$ac_cv_header_uuid_uuid_h" = xyes; then :
@@ -11405,11 +11412,7 @@ if test "x$ac_cv_header_uuid_uuid_h" = xyes; then :
 #define HAVE_UUID_UUID_H 1
 _ACEOF
 
-        save_CFLAGS=$CFLAGS
-save_CPPFLAGS=$CPPFLAGS
-save_LDFLAGS=$LDFLAGS
-save_LIBS=$LIBS
-
+          py_check_lib_save_LIBS=$LIBS
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for uuid_generate_time in -luuid" >&5
 $as_echo_n "checking for uuid_generate_time in -luuid... " >&6; }
 if ${ac_cv_lib_uuid_uuid_generate_time+:} false; then :
@@ -11450,20 +11453,10 @@ if test "x$ac_cv_lib_uuid_uuid_generate_time" = xyes; then :
   have_uuid=yes
 fi
 
+LIBS=$py_check_lib_save_LIBS
 
-CFLAGS=$save_CFLAGS
-CPPFLAGS=$save_CPPFLAGS
-LDFLAGS=$save_LDFLAGS
-LIBS=$save_LIBS
-
-
-        save_CFLAGS=$CFLAGS
-save_CPPFLAGS=$CPPFLAGS
-save_LDFLAGS=$LDFLAGS
-save_LIBS=$LIBS
-
-
-          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for uuid_generate_time_safe in -luuid" >&5
+          py_check_lib_save_LIBS=$LIBS
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for uuid_generate_time_safe in -luuid" >&5
 $as_echo_n "checking for uuid_generate_time_safe in -luuid... " >&6; }
 if ${ac_cv_lib_uuid_uuid_generate_time_safe+:} false; then :
   $as_echo_n "(cached) " >&6
@@ -11500,19 +11493,18 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_uuid_uuid_generate_time_safe" >&5
 $as_echo "$ac_cv_lib_uuid_uuid_generate_time_safe" >&6; }
 if test "x$ac_cv_lib_uuid_uuid_generate_time_safe" = xyes; then :
-
-            have_uuid=yes
+  have_uuid=yes
             $as_echo "#define HAVE_UUID_GENERATE_TIME_SAFE 1" >>confdefs.h
 
 
 fi
 
+LIBS=$py_check_lib_save_LIBS
 
-CFLAGS=$save_CFLAGS
-CPPFLAGS=$save_CPPFLAGS
-LDFLAGS=$save_LDFLAGS
-LIBS=$save_LIBS
 
+fi
+
+done
 
         if test "x$have_uuid" = xyes; then :
 
@@ -11521,9 +11513,11 @@ LIBS=$save_LIBS
 
 fi
 
-fi
+CFLAGS=$save_CFLAGS
+CPPFLAGS=$save_CPPFLAGS
+LDFLAGS=$save_LDFLAGS
+LIBS=$save_LIBS
 
-done
 
 
 
@@ -12122,15 +12116,17 @@ fi
 	echo "$LIBFFI_PKG_ERRORS" >&5
 
 
-    ac_fn_c_check_header_mongrel "$LINENO" "ffi.h" "ac_cv_header_ffi_h" "$ac_includes_default"
-if test "x$ac_cv_header_ffi_h" = xyes; then :
-
-      save_CFLAGS=$CFLAGS
+    save_CFLAGS=$CFLAGS
 save_CPPFLAGS=$CPPFLAGS
 save_LDFLAGS=$LDFLAGS
 save_LIBS=$LIBS
 
 
+      CPPFLAGS="$CFLAGS $LIBFFI_CFLAGS"
+      LDFLAGS="$LDFLAGS $LIBFFI_LIBS"
+      ac_fn_c_check_header_mongrel "$LINENO" "ffi.h" "ac_cv_header_ffi_h" "$ac_includes_default"
+if test "x$ac_cv_header_ffi_h" = xyes; then :
+
         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ffi_call in -lffi" >&5
 $as_echo_n "checking for ffi_call in -lffi... " >&6; }
 if ${ac_cv_lib_ffi_ffi_call+:} false; then :
@@ -12170,13 +12166,18 @@ $as_echo "$ac_cv_lib_ffi_ffi_call" >&6; }
 if test "x$ac_cv_lib_ffi_ffi_call" = xyes; then :
 
           have_libffi=yes
-          LIBFFI_LIBS="-lffi"
+          LIBFFI_CFLAGS=${LIBFFI_CFLAGS-""}
+          LIBFFI_LIBS=${LIBFFI_LIBS-"-lffi"}
 
 else
   have_libffi=no
 fi
 
 
+fi
+
+
+
 CFLAGS=$save_CFLAGS
 CPPFLAGS=$save_CPPFLAGS
 LDFLAGS=$save_LDFLAGS
@@ -12184,23 +12185,21 @@ LIBS=$save_LIBS
 
 
 
-fi
-
-
-
 elif test $pkg_failed = untried; then
      	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 
-    ac_fn_c_check_header_mongrel "$LINENO" "ffi.h" "ac_cv_header_ffi_h" "$ac_includes_default"
-if test "x$ac_cv_header_ffi_h" = xyes; then :
-
-      save_CFLAGS=$CFLAGS
+    save_CFLAGS=$CFLAGS
 save_CPPFLAGS=$CPPFLAGS
 save_LDFLAGS=$LDFLAGS
 save_LIBS=$LIBS
 
 
+      CPPFLAGS="$CFLAGS $LIBFFI_CFLAGS"
+      LDFLAGS="$LDFLAGS $LIBFFI_LIBS"
+      ac_fn_c_check_header_mongrel "$LINENO" "ffi.h" "ac_cv_header_ffi_h" "$ac_includes_default"
+if test "x$ac_cv_header_ffi_h" = xyes; then :
+
         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ffi_call in -lffi" >&5
 $as_echo_n "checking for ffi_call in -lffi... " >&6; }
 if ${ac_cv_lib_ffi_ffi_call+:} false; then :
@@ -12240,13 +12239,18 @@ $as_echo "$ac_cv_lib_ffi_ffi_call" >&6; }
 if test "x$ac_cv_lib_ffi_ffi_call" = xyes; then :
 
           have_libffi=yes
-          LIBFFI_LIBS="-lffi"
+          LIBFFI_CFLAGS=${LIBFFI_CFLAGS-""}
+          LIBFFI_LIBS=${LIBFFI_LIBS-"-lffi"}
 
 else
   have_libffi=no
 fi
 
 
+fi
+
+
+
 CFLAGS=$save_CFLAGS
 CPPFLAGS=$save_CPPFLAGS
 LDFLAGS=$save_LDFLAGS
@@ -12254,10 +12258,6 @@ LIBS=$save_LIBS
 
 
 
-fi
-
-
-
 else
 	LIBFFI_CFLAGS=$pkg_cv_LIBFFI_CFLAGS
 	LIBFFI_LIBS=$pkg_cv_LIBFFI_LIBS
@@ -12905,6 +12905,19 @@ case $ac_sys_system in #(
 esac
 
 
+
+
+  if test "$ac_sys_system" = "Emscripten" -a -z "$LIBSQLITE3_CFLAGS" -a -z "$LIBSQLITE3_LIBS"; then :
+
+    LIBSQLITE3_CFLAGS="-sUSE_SQLITE3"
+    LIBSQLITE3_LIBS="-sUSE_SQLITE3"
+
+fi
+
+
+
+
+
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBSQLITE3" >&5
 $as_echo_n "checking for LIBSQLITE3... " >&6; }
@@ -16513,6 +16526,19 @@ fi
 
 
 
+
+
+  if test "$ac_sys_system" = "Emscripten" -a -z "$ZLIB_CFLAGS" -a -z "$ZLIB_LIBS"; then :
+
+    ZLIB_CFLAGS="-sUSE_ZLIB"
+    ZLIB_LIBS="-sUSE_ZLIB"
+
+fi
+
+
+
+
+
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ZLIB" >&5
 $as_echo_n "checking for ZLIB... " >&6; }
@@ -16572,7 +16598,15 @@ fi
 	echo "$ZLIB_PKG_ERRORS" >&5
 
 
-  for ac_header in zlib.h
+  save_CFLAGS=$CFLAGS
+save_CPPFLAGS=$CPPFLAGS
+save_LDFLAGS=$LDFLAGS
+save_LIBS=$LIBS
+
+
+    CPPFLAGS="$CFLAGS $ZLIB_CFLAGS"
+    LDFLAGS="$LDFLAGS $ZLIB_LIBS"
+    for ac_header in zlib.h
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "zlib.h" "ac_cv_header_zlib_h" "$ac_includes_default"
 if test "x$ac_cv_header_zlib_h" = xyes; then :
@@ -16580,13 +16614,8 @@ if test "x$ac_cv_header_zlib_h" = xyes; then :
 #define HAVE_ZLIB_H 1
 _ACEOF
 
-    save_CFLAGS=$CFLAGS
-save_CPPFLAGS=$CPPFLAGS
-save_LDFLAGS=$LDFLAGS
-save_LIBS=$LIBS
-
-
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gzread in -lz" >&5
+      py_check_lib_save_LIBS=$LIBS
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gzread in -lz" >&5
 $as_echo_n "checking for gzread in -lz... " >&6; }
 if ${ac_cv_lib_z_gzread+:} false; then :
   $as_echo_n "(cached) " >&6
@@ -16623,11 +16652,26 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_gzread" >&5
 $as_echo "$ac_cv_lib_z_gzread" >&6; }
 if test "x$ac_cv_lib_z_gzread" = xyes; then :
+  have_zlib=yes
+else
+  have_zlib=no
+fi
+
+LIBS=$py_check_lib_save_LIBS
+
+
+else
+  have_zlib=no
+fi
 
-        have_zlib=yes
-        ZLIB_CFLAGS=${ZLIB_CFLAGS-""}
-        ZLIB_LIBS=${ZLIB_LIBS-"-lz"}
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inflateCopy in -lz" >&5
+done
+
+    if test "x$have_zlib" = xyes; then :
+
+      ZLIB_CFLAGS=${ZLIB_CFLAGS-""}
+      ZLIB_LIBS=${ZLIB_LIBS-"-lz"}
+      py_check_lib_save_LIBS=$LIBS
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inflateCopy in -lz" >&5
 $as_echo_n "checking for inflateCopy in -lz... " >&6; }
 if ${ac_cv_lib_z_inflateCopy+:} false; then :
   $as_echo_n "(cached) " >&6
@@ -16668,14 +16712,11 @@ if test "x$ac_cv_lib_z_inflateCopy" = xyes; then :
 
 fi
 
+LIBS=$py_check_lib_save_LIBS
 
-else
-
-        have_zlib=no
 
 fi
 
-
 CFLAGS=$save_CFLAGS
 CPPFLAGS=$save_CPPFLAGS
 LDFLAGS=$save_LDFLAGS
@@ -16683,18 +16724,19 @@ LIBS=$save_LIBS
 
 
 
-else
-  have_zlib=no
-fi
-
-done
-
-
 elif test $pkg_failed = untried; then
      	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 
-  for ac_header in zlib.h
+  save_CFLAGS=$CFLAGS
+save_CPPFLAGS=$CPPFLAGS
+save_LDFLAGS=$LDFLAGS
+save_LIBS=$LIBS
+
+
+    CPPFLAGS="$CFLAGS $ZLIB_CFLAGS"
+    LDFLAGS="$LDFLAGS $ZLIB_LIBS"
+    for ac_header in zlib.h
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "zlib.h" "ac_cv_header_zlib_h" "$ac_includes_default"
 if test "x$ac_cv_header_zlib_h" = xyes; then :
@@ -16702,13 +16744,8 @@ if test "x$ac_cv_header_zlib_h" = xyes; then :
 #define HAVE_ZLIB_H 1
 _ACEOF
 
-    save_CFLAGS=$CFLAGS
-save_CPPFLAGS=$CPPFLAGS
-save_LDFLAGS=$LDFLAGS
-save_LIBS=$LIBS
-
-
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gzread in -lz" >&5
+      py_check_lib_save_LIBS=$LIBS
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gzread in -lz" >&5
 $as_echo_n "checking for gzread in -lz... " >&6; }
 if ${ac_cv_lib_z_gzread+:} false; then :
   $as_echo_n "(cached) " >&6
@@ -16745,11 +16782,26 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_gzread" >&5
 $as_echo "$ac_cv_lib_z_gzread" >&6; }
 if test "x$ac_cv_lib_z_gzread" = xyes; then :
+  have_zlib=yes
+else
+  have_zlib=no
+fi
+
+LIBS=$py_check_lib_save_LIBS
 
-        have_zlib=yes
-        ZLIB_CFLAGS=${ZLIB_CFLAGS-""}
-        ZLIB_LIBS=${ZLIB_LIBS-"-lz"}
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inflateCopy in -lz" >&5
+
+else
+  have_zlib=no
+fi
+
+done
+
+    if test "x$have_zlib" = xyes; then :
+
+      ZLIB_CFLAGS=${ZLIB_CFLAGS-""}
+      ZLIB_LIBS=${ZLIB_LIBS-"-lz"}
+      py_check_lib_save_LIBS=$LIBS
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inflateCopy in -lz" >&5
 $as_echo_n "checking for inflateCopy in -lz... " >&6; }
 if ${ac_cv_lib_z_inflateCopy+:} false; then :
   $as_echo_n "(cached) " >&6
@@ -16790,14 +16842,11 @@ if test "x$ac_cv_lib_z_inflateCopy" = xyes; then :
 
 fi
 
+LIBS=$py_check_lib_save_LIBS
 
-else
-
-        have_zlib=no
 
 fi
 
-
 CFLAGS=$save_CFLAGS
 CPPFLAGS=$save_CPPFLAGS
 LDFLAGS=$save_LDFLAGS
@@ -16805,13 +16854,6 @@ LIBS=$save_LIBS
 
 
 
-else
-  have_zlib=no
-fi
-
-done
-
-
 else
 	ZLIB_CFLAGS=$pkg_cv_ZLIB_CFLAGS
 	ZLIB_LIBS=$pkg_cv_ZLIB_LIBS
@@ -16824,11 +16866,6 @@ $as_echo "yes" >&6; }
 
 fi
 
-if test "$have_zlib" = "yes" -a "$ac_sys_system" = "Emscripten" -a "$ZLIB_LIBS" = "-lz"; then
-  ZLIB_CFLAGS="-sUSE_ZLIB"
-  ZLIB_LIBS="-sUSE_ZLIB"
-fi
-
 if test "x$have_zlib" = xyes; then :
 
   BINASCII_CFLAGS="-DUSE_ZLIB_CRC32 $ZLIB_CFLAGS"
@@ -16837,6 +16874,19 @@ if test "x$have_zlib" = xyes; then :
 fi
 
 
+
+
+  if test "$ac_sys_system" = "Emscripten" -a -z "$BZIP2_CFLAGS" -a -z "$BZIP2_LIBS"; then :
+
+    BZIP2_CFLAGS="-sUSE_BZIP2"
+    BZIP2_LIBS="-sUSE_BZIP2"
+
+fi
+
+
+
+
+
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for BZIP2" >&5
 $as_echo_n "checking for BZIP2... " >&6; }
@@ -16896,7 +16946,15 @@ fi
 	echo "$BZIP2_PKG_ERRORS" >&5
 
 
-  for ac_header in bzlib.h
+  save_CFLAGS=$CFLAGS
+save_CPPFLAGS=$CPPFLAGS
+save_LDFLAGS=$LDFLAGS
+save_LIBS=$LIBS
+
+
+    CPPFLAGS="$CFLAGS $BZIP2_CFLAGS"
+    LDFLAGS="$LDFLAGS $BZIP2_LIBS"
+    for ac_header in bzlib.h
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "bzlib.h" "ac_cv_header_bzlib_h" "$ac_includes_default"
 if test "x$ac_cv_header_bzlib_h" = xyes; then :
@@ -16904,12 +16962,6 @@ if test "x$ac_cv_header_bzlib_h" = xyes; then :
 #define HAVE_BZLIB_H 1
 _ACEOF
 
-    save_CFLAGS=$CFLAGS
-save_CPPFLAGS=$CPPFLAGS
-save_LDFLAGS=$LDFLAGS
-save_LIBS=$LIBS
-
-
       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for BZ2_bzCompress in -lbz2" >&5
 $as_echo_n "checking for BZ2_bzCompress in -lbz2... " >&6; }
 if ${ac_cv_lib_bz2_BZ2_bzCompress+:} false; then :
@@ -16947,15 +16999,24 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bz2_BZ2_bzCompress" >&5
 $as_echo "$ac_cv_lib_bz2_BZ2_bzCompress" >&6; }
 if test "x$ac_cv_lib_bz2_BZ2_bzCompress" = xyes; then :
+  have_bzip2=yes
+else
+  have_bzip2=no
+fi
 
-        have_bzip2=yes
-        BZIP2_CFLAGS=${BZIP2_CFLAGS-""}
-        BZIP2_LIBS=${BZIP2_LIBS-"-lbz2"}
 
 else
   have_bzip2=no
 fi
 
+done
+
+    if test "x$have_bzip2" = xyes; then :
+
+      BZIP2_CFLAGS=${BZIP2_CFLAGS-""}
+      BZIP2_LIBS=${BZIP2_LIBS-"-lbz2"}
+
+fi
 
 CFLAGS=$save_CFLAGS
 CPPFLAGS=$save_CPPFLAGS
@@ -16964,18 +17025,19 @@ LIBS=$save_LIBS
 
 
 
-else
-  have_bzip2=no
-fi
-
-done
-
-
 elif test $pkg_failed = untried; then
      	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 
-  for ac_header in bzlib.h
+  save_CFLAGS=$CFLAGS
+save_CPPFLAGS=$CPPFLAGS
+save_LDFLAGS=$LDFLAGS
+save_LIBS=$LIBS
+
+
+    CPPFLAGS="$CFLAGS $BZIP2_CFLAGS"
+    LDFLAGS="$LDFLAGS $BZIP2_LIBS"
+    for ac_header in bzlib.h
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "bzlib.h" "ac_cv_header_bzlib_h" "$ac_includes_default"
 if test "x$ac_cv_header_bzlib_h" = xyes; then :
@@ -16983,12 +17045,6 @@ if test "x$ac_cv_header_bzlib_h" = xyes; then :
 #define HAVE_BZLIB_H 1
 _ACEOF
 
-    save_CFLAGS=$CFLAGS
-save_CPPFLAGS=$CPPFLAGS
-save_LDFLAGS=$LDFLAGS
-save_LIBS=$LIBS
-
-
       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for BZ2_bzCompress in -lbz2" >&5
 $as_echo_n "checking for BZ2_bzCompress in -lbz2... " >&6; }
 if ${ac_cv_lib_bz2_BZ2_bzCompress+:} false; then :
@@ -17026,15 +17082,24 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bz2_BZ2_bzCompress" >&5
 $as_echo "$ac_cv_lib_bz2_BZ2_bzCompress" >&6; }
 if test "x$ac_cv_lib_bz2_BZ2_bzCompress" = xyes; then :
+  have_bzip2=yes
+else
+  have_bzip2=no
+fi
 
-        have_bzip2=yes
-        BZIP2_CFLAGS=${BZIP2_CFLAGS-""}
-        BZIP2_LIBS=${BZIP2_LIBS-"-lbz2"}
 
 else
   have_bzip2=no
 fi
 
+done
+
+    if test "x$have_bzip2" = xyes; then :
+
+      BZIP2_CFLAGS=${BZIP2_CFLAGS-""}
+      BZIP2_LIBS=${BZIP2_LIBS-"-lbz2"}
+
+fi
 
 CFLAGS=$save_CFLAGS
 CPPFLAGS=$save_CPPFLAGS
@@ -17043,13 +17108,6 @@ LIBS=$save_LIBS
 
 
 
-else
-  have_bzip2=no
-fi
-
-done
-
-
 else
 	BZIP2_CFLAGS=$pkg_cv_BZIP2_CFLAGS
 	BZIP2_LIBS=$pkg_cv_BZIP2_LIBS
@@ -17058,12 +17116,6 @@ $as_echo "yes" >&6; }
 	have_bzip2=yes
 fi
 
-if test "$have_bzip2" = "yes" -a "$ac_sys_system" = "Emscripten" -a "$BZIP2_LIBS" = "-lbz2"; then
-  BZIP2_CFLAGS="-sUSE_BZIP2"
-  BZIP2_LIBS="-sUSE_BZIP2"
-fi
-
-
 
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBLZMA" >&5
@@ -17124,7 +17176,15 @@ fi
 	echo "$LIBLZMA_PKG_ERRORS" >&5
 
 
-  for ac_header in lzma.h
+  save_CFLAGS=$CFLAGS
+save_CPPFLAGS=$CPPFLAGS
+save_LDFLAGS=$LDFLAGS
+save_LIBS=$LIBS
+
+
+    CPPFLAGS="$CFLAGS $LIBLZMA_CFLAGS"
+    LDFLAGS="$LDFLAGS $LIBLZMA_LIBS"
+    for ac_header in lzma.h
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "lzma.h" "ac_cv_header_lzma_h" "$ac_includes_default"
 if test "x$ac_cv_header_lzma_h" = xyes; then :
@@ -17132,12 +17192,6 @@ if test "x$ac_cv_header_lzma_h" = xyes; then :
 #define HAVE_LZMA_H 1
 _ACEOF
 
-    save_CFLAGS=$CFLAGS
-save_CPPFLAGS=$CPPFLAGS
-save_LDFLAGS=$LDFLAGS
-save_LIBS=$LIBS
-
-
       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for lzma_easy_encoder in -llzma" >&5
 $as_echo_n "checking for lzma_easy_encoder in -llzma... " >&6; }
 if ${ac_cv_lib_lzma_lzma_easy_encoder+:} false; then :
@@ -17175,15 +17229,24 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lzma_lzma_easy_encoder" >&5
 $as_echo "$ac_cv_lib_lzma_lzma_easy_encoder" >&6; }
 if test "x$ac_cv_lib_lzma_lzma_easy_encoder" = xyes; then :
+  have_liblzma=yes
+else
+  have_liblzma=no
+fi
 
-        have_liblzma=yes
-        LIBLZMA_CFLAGS=${LIBLZMA_CFLAGS-""}
-        LIBLZMA_LIBS=${LIBLZMA_LIBS-"-llzma"}
 
 else
   have_liblzma=no
 fi
 
+done
+
+    if test "x$have_liblzma" = xyes; then :
+
+      LIBLZMA_CFLAGS=${LIBLZMA_CFLAGS-""}
+      LIBLZMA_LIBS=${LIBLZMA_LIBS-"-llzma"}
+
+fi
 
 CFLAGS=$save_CFLAGS
 CPPFLAGS=$save_CPPFLAGS
@@ -17192,18 +17255,19 @@ LIBS=$save_LIBS
 
 
 
-else
-  have_liblzma=no
-fi
-
-done
-
-
 elif test $pkg_failed = untried; then
      	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 
-  for ac_header in lzma.h
+  save_CFLAGS=$CFLAGS
+save_CPPFLAGS=$CPPFLAGS
+save_LDFLAGS=$LDFLAGS
+save_LIBS=$LIBS
+
+
+    CPPFLAGS="$CFLAGS $LIBLZMA_CFLAGS"
+    LDFLAGS="$LDFLAGS $LIBLZMA_LIBS"
+    for ac_header in lzma.h
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "lzma.h" "ac_cv_header_lzma_h" "$ac_includes_default"
 if test "x$ac_cv_header_lzma_h" = xyes; then :
@@ -17211,12 +17275,6 @@ if test "x$ac_cv_header_lzma_h" = xyes; then :
 #define HAVE_LZMA_H 1
 _ACEOF
 
-    save_CFLAGS=$CFLAGS
-save_CPPFLAGS=$CPPFLAGS
-save_LDFLAGS=$LDFLAGS
-save_LIBS=$LIBS
-
-
       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for lzma_easy_encoder in -llzma" >&5
 $as_echo_n "checking for lzma_easy_encoder in -llzma... " >&6; }
 if ${ac_cv_lib_lzma_lzma_easy_encoder+:} false; then :
@@ -17254,15 +17312,24 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lzma_lzma_easy_encoder" >&5
 $as_echo "$ac_cv_lib_lzma_lzma_easy_encoder" >&6; }
 if test "x$ac_cv_lib_lzma_lzma_easy_encoder" = xyes; then :
+  have_liblzma=yes
+else
+  have_liblzma=no
+fi
 
-        have_liblzma=yes
-        LIBLZMA_CFLAGS=${LIBLZMA_CFLAGS-""}
-        LIBLZMA_LIBS=${LIBLZMA_LIBS-"-llzma"}
 
 else
   have_liblzma=no
 fi
 
+done
+
+    if test "x$have_liblzma" = xyes; then :
+
+      LIBLZMA_CFLAGS=${LIBLZMA_CFLAGS-""}
+      LIBLZMA_LIBS=${LIBLZMA_LIBS-"-llzma"}
+
+fi
 
 CFLAGS=$save_CFLAGS
 CPPFLAGS=$save_CPPFLAGS
@@ -17271,13 +17338,6 @@ LIBS=$save_LIBS
 
 
 
-else
-  have_liblzma=no
-fi
-
-done
-
-
 else
 	LIBLZMA_CFLAGS=$pkg_cv_LIBLZMA_CFLAGS
 	LIBLZMA_LIBS=$pkg_cv_LIBLZMA_LIBS
@@ -20615,7 +20675,15 @@ fi
 	echo "$LIBREADLINE_PKG_ERRORS" >&5
 
 
-    for ac_header in readline/readline.h
+    save_CFLAGS=$CFLAGS
+save_CPPFLAGS=$CPPFLAGS
+save_LDFLAGS=$LDFLAGS
+save_LIBS=$LIBS
+
+
+      CPPFLAGS="$CFLAGS $LIBREADLINE_CFLAGS"
+      LDFLAGS="$LDFLAGS $LIBREADLINE_LIBS"
+      for ac_header in readline/readline.h
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "readline/readline.h" "ac_cv_header_readline_readline_h" "$ac_includes_default"
 if test "x$ac_cv_header_readline_readline_h" = xyes; then :
@@ -20623,12 +20691,6 @@ if test "x$ac_cv_header_readline_readline_h" = xyes; then :
 #define HAVE_READLINE_READLINE_H 1
 _ACEOF
 
-      save_CFLAGS=$CFLAGS
-save_CPPFLAGS=$CPPFLAGS
-save_LDFLAGS=$LDFLAGS
-save_LIBS=$LIBS
-
-
         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for readline in -lreadline" >&5
 $as_echo_n "checking for readline in -lreadline... " >&6; }
 if ${ac_cv_lib_readline_readline+:} false; then :
@@ -20672,11 +20734,16 @@ if test "x$ac_cv_lib_readline_readline" = xyes; then :
           READLINE_LIBS=${LIBREADLINE_LIBS-"-lreadline"}
 
 else
+  with_readline=no
+fi
 
-          with_readline=no
 
+else
+  with_readline=no
 fi
 
+done
+
 
 CFLAGS=$save_CFLAGS
 CPPFLAGS=$save_CPPFLAGS
@@ -20685,18 +20752,19 @@ LIBS=$save_LIBS
 
 
 
-else
-  with_readline=no
-fi
-
-done
-
-
 elif test $pkg_failed = untried; then
      	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 
-    for ac_header in readline/readline.h
+    save_CFLAGS=$CFLAGS
+save_CPPFLAGS=$CPPFLAGS
+save_LDFLAGS=$LDFLAGS
+save_LIBS=$LIBS
+
+
+      CPPFLAGS="$CFLAGS $LIBREADLINE_CFLAGS"
+      LDFLAGS="$LDFLAGS $LIBREADLINE_LIBS"
+      for ac_header in readline/readline.h
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "readline/readline.h" "ac_cv_header_readline_readline_h" "$ac_includes_default"
 if test "x$ac_cv_header_readline_readline_h" = xyes; then :
@@ -20704,12 +20772,6 @@ if test "x$ac_cv_header_readline_readline_h" = xyes; then :
 #define HAVE_READLINE_READLINE_H 1
 _ACEOF
 
-      save_CFLAGS=$CFLAGS
-save_CPPFLAGS=$CPPFLAGS
-save_LDFLAGS=$LDFLAGS
-save_LIBS=$LIBS
-
-
         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for readline in -lreadline" >&5
 $as_echo_n "checking for readline in -lreadline... " >&6; }
 if ${ac_cv_lib_readline_readline+:} false; then :
@@ -20753,11 +20815,16 @@ if test "x$ac_cv_lib_readline_readline" = xyes; then :
           READLINE_LIBS=${LIBREADLINE_LIBS-"-lreadline"}
 
 else
+  with_readline=no
+fi
 
-          with_readline=no
 
+else
+  with_readline=no
 fi
 
+done
+
 
 CFLAGS=$save_CFLAGS
 CPPFLAGS=$save_CPPFLAGS
@@ -20766,13 +20833,6 @@ LIBS=$save_LIBS
 
 
 
-else
-  with_readline=no
-fi
-
-done
-
-
 else
 	LIBREADLINE_CFLAGS=$pkg_cv_LIBREADLINE_CFLAGS
 	LIBREADLINE_LIBS=$pkg_cv_LIBREADLINE_LIBS
@@ -20849,7 +20909,15 @@ fi
 	echo "$LIBEDIT_PKG_ERRORS" >&5
 
 
-    for ac_header in editline/readline.h
+    save_CFLAGS=$CFLAGS
+save_CPPFLAGS=$CPPFLAGS
+save_LDFLAGS=$LDFLAGS
+save_LIBS=$LIBS
+
+
+      CPPFLAGS="$CFLAGS $LIBEDIT_CFLAGS"
+      LDFLAGS="$LDFLAGS $LIBEDIT_LIBS"
+      for ac_header in editline/readline.h
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "editline/readline.h" "ac_cv_header_editline_readline_h" "$ac_includes_default"
 if test "x$ac_cv_header_editline_readline_h" = xyes; then :
@@ -20857,12 +20925,6 @@ if test "x$ac_cv_header_editline_readline_h" = xyes; then :
 #define HAVE_EDITLINE_READLINE_H 1
 _ACEOF
 
-      save_CFLAGS=$CFLAGS
-save_CPPFLAGS=$CPPFLAGS
-save_LDFLAGS=$LDFLAGS
-save_LIBS=$LIBS
-
-
         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for readline in -ledit" >&5
 $as_echo_n "checking for readline in -ledit... " >&6; }
 if ${ac_cv_lib_edit_readline+:} false; then :
@@ -20908,11 +20970,16 @@ if test "x$ac_cv_lib_edit_readline" = xyes; then :
           READLINE_LIBS=${LIBEDIT_LIBS-"-ledit"}
 
 else
+  with_readline=no
+fi
 
-          with_readline=no
 
+else
+  with_readline=no
 fi
 
+done
+
 
 CFLAGS=$save_CFLAGS
 CPPFLAGS=$save_CPPFLAGS
@@ -20921,18 +20988,19 @@ LIBS=$save_LIBS
 
 
 
-else
-  with_readline=no
-fi
-
-done
-
-
 elif test $pkg_failed = untried; then
      	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 
-    for ac_header in editline/readline.h
+    save_CFLAGS=$CFLAGS
+save_CPPFLAGS=$CPPFLAGS
+save_LDFLAGS=$LDFLAGS
+save_LIBS=$LIBS
+
+
+      CPPFLAGS="$CFLAGS $LIBEDIT_CFLAGS"
+      LDFLAGS="$LDFLAGS $LIBEDIT_LIBS"
+      for ac_header in editline/readline.h
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "editline/readline.h" "ac_cv_header_editline_readline_h" "$ac_includes_default"
 if test "x$ac_cv_header_editline_readline_h" = xyes; then :
@@ -20940,12 +21008,6 @@ if test "x$ac_cv_header_editline_readline_h" = xyes; then :
 #define HAVE_EDITLINE_READLINE_H 1
 _ACEOF
 
-      save_CFLAGS=$CFLAGS
-save_CPPFLAGS=$CPPFLAGS
-save_LDFLAGS=$LDFLAGS
-save_LIBS=$LIBS
-
-
         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for readline in -ledit" >&5
 $as_echo_n "checking for readline in -ledit... " >&6; }
 if ${ac_cv_lib_edit_readline+:} false; then :
@@ -20991,11 +21053,16 @@ if test "x$ac_cv_lib_edit_readline" = xyes; then :
           READLINE_LIBS=${LIBEDIT_LIBS-"-ledit"}
 
 else
+  with_readline=no
+fi
 
-          with_readline=no
 
+else
+  with_readline=no
 fi
 
+done
+
 
 CFLAGS=$save_CFLAGS
 CPPFLAGS=$save_CPPFLAGS
@@ -21004,13 +21071,6 @@ LIBS=$save_LIBS
 
 
 
-else
-  with_readline=no
-fi
-
-done
-
-
 else
 	LIBEDIT_CFLAGS=$pkg_cv_LIBEDIT_CFLAGS
 	LIBEDIT_LIBS=$pkg_cv_LIBEDIT_LIBS
diff --git a/configure.ac b/configure.ac
index c851659a9110c..1aa1c298ffe3a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -69,6 +69,28 @@ AC_DEFUN([PY_CHECK_FUNC],
   AS_VAR_POPDEF([py_define])
 ])
 
+dnl PY_CHECK_LIB(LIBRARY, FUNCTION, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND], [OTHER-LIBRARIES])
+dnl Like AC_CHECK_LIB() but does not modify LIBS
+AC_DEFUN([PY_CHECK_LIB],
+[AS_VAR_COPY([py_check_lib_save_LIBS], [LIBS])]
+[AC_CHECK_LIB($1, $2, $3, $4, $5)]
+[AS_VAR_COPY([LIBS], [py_check_lib_save_LIBS])]
+)
+
+dnl PY_CHECK_EMSCRIPTEN_PORT(PKG_VAR, [EMPORT_ARGS])
+dnl Use Emscripten port unless user passes ${PKG_VAR}_CFLAGS
+dnl or ${PKG_VAR}_LIBS to configure.
+AC_DEFUN([PY_CHECK_EMSCRIPTEN_PORT], [
+  AS_VAR_PUSHDEF([py_cflags], [$1_CFLAGS])
+  AS_VAR_PUSHDEF([py_libs], [$1_LIBS])
+  AS_IF([test "$ac_sys_system" = "Emscripten" -a -z "$py_cflags" -a -z "$py_libs"], [
+    py_cflags="$2"
+    py_libs="$2"
+  ])
+  AS_VAR_POPDEF([py_cflags])
+  AS_VAR_POPDEF([py_libs])
+])
+
 AC_SUBST(BASECPPFLAGS)
 if test "$srcdir" != . -a "$srcdir" != "$(pwd)"; then
     # If we're building out-of-tree, we need to make sure the following
@@ -3371,12 +3393,12 @@ AS_VAR_IF([have_uuid], [missing], [
       AC_DEFINE([HAVE_UUID_H], [1])
       AC_DEFINE([HAVE_UUID_GENERATE_TIME_SAFE], [1])
     ], [
-      AC_CHECK_HEADERS([uuid/uuid.h], [
-        WITH_SAVE_ENV(
-          [AC_CHECK_LIB([uuid], [uuid_generate_time], [have_uuid=yes])
-        ])
-        WITH_SAVE_ENV([
-          AC_CHECK_LIB([uuid], [uuid_generate_time_safe], [
+      WITH_SAVE_ENV([
+        CPPFLAGS="$CFLAGS $LIBUUID_CFLAGS"
+        LDFLAGS="$LDFLAGS $LIBUUID_LIBS"
+        AC_CHECK_HEADERS([uuid/uuid.h], [
+          PY_CHECK_LIB([uuid], [uuid_generate_time], [have_uuid=yes])
+          PY_CHECK_LIB([uuid], [uuid_generate_time_safe], [
             have_uuid=yes
             AC_DEFINE([HAVE_UUID_GENERATE_TIME_SAFE], [1])
           ])
@@ -3602,11 +3624,14 @@ dnl detect libffi
 have_libffi=missing
 AS_VAR_IF([with_system_ffi], [yes], [
   PKG_CHECK_MODULES([LIBFFI], [libffi], [have_libffi=yes], [
-    AC_CHECK_HEADER([ffi.h], [
-      WITH_SAVE_ENV([
+    WITH_SAVE_ENV([
+      CPPFLAGS="$CFLAGS $LIBFFI_CFLAGS"
+      LDFLAGS="$LDFLAGS $LIBFFI_LIBS"
+      AC_CHECK_HEADER([ffi.h], [
         AC_CHECK_LIB([ffi], [ffi_call], [
           have_libffi=yes
-          LIBFFI_LIBS="-lffi"
+          LIBFFI_CFLAGS=${LIBFFI_CFLAGS-""}
+          LIBFFI_LIBS=${LIBFFI_LIBS-"-lffi"}
         ], [have_libffi=no])
       ])
     ])
@@ -3779,6 +3804,9 @@ AS_CASE([$ac_sys_system],
   [OSSAUDIODEV_LIBS=""]
 )
 
+dnl detect sqlite3 from Emscripten emport
+PY_CHECK_EMSCRIPTEN_PORT([LIBSQLITE3], [-sUSE_SQLITE3])
+
 dnl Check for SQLite library. Use pkg-config if available.
 PKG_CHECK_MODULES(
   [LIBSQLITE3], [sqlite3 >= 3.7.15], [], [
@@ -4788,64 +4816,63 @@ fi
 dnl Check for compression libraries
 AH_TEMPLATE([HAVE_ZLIB_COPY], [Define if the zlib library has inflateCopy])
 
+dnl detect zlib from Emscripten emport
+PY_CHECK_EMSCRIPTEN_PORT([ZLIB], [-sUSE_ZLIB])
+
 PKG_CHECK_MODULES([ZLIB], [zlib >= 1.2.0], [
   have_zlib=yes
   dnl zlib 1.2.0 (2003) added inflateCopy
   AC_DEFINE([HAVE_ZLIB_COPY], [1])
 ], [
-  AC_CHECK_HEADERS([zlib.h], [
-    WITH_SAVE_ENV([
-      AC_CHECK_LIB([z], [gzread], [
-        have_zlib=yes
-        ZLIB_CFLAGS=${ZLIB_CFLAGS-""}
-        ZLIB_LIBS=${ZLIB_LIBS-"-lz"}
-        AC_CHECK_LIB([z], [inflateCopy], [AC_DEFINE([HAVE_ZLIB_COPY], [1])])
-      ], [
-        have_zlib=no
-      ])
+  WITH_SAVE_ENV([
+    CPPFLAGS="$CFLAGS $ZLIB_CFLAGS"
+    LDFLAGS="$LDFLAGS $ZLIB_LIBS"
+    AC_CHECK_HEADERS([zlib.h], [
+      PY_CHECK_LIB([z], [gzread], [have_zlib=yes], [have_zlib=no])
+    ], [have_zlib=no])
+    AS_VAR_IF([have_zlib], [yes], [
+      ZLIB_CFLAGS=${ZLIB_CFLAGS-""}
+      ZLIB_LIBS=${ZLIB_LIBS-"-lz"}
+      PY_CHECK_LIB([z], [inflateCopy], [AC_DEFINE([HAVE_ZLIB_COPY], [1])])
     ])
-  ], [have_zlib=no])
+  ])
 ])
 
-if test "$have_zlib" = "yes" -a "$ac_sys_system" = "Emscripten" -a "$ZLIB_LIBS" = "-lz"; then
-  ZLIB_CFLAGS="-sUSE_ZLIB"
-  ZLIB_LIBS="-sUSE_ZLIB"
-fi
-
 dnl binascii can use zlib for optimized crc32.
 AS_VAR_IF([have_zlib], [yes], [
   BINASCII_CFLAGS="-DUSE_ZLIB_CRC32 $ZLIB_CFLAGS"
   BINASCII_LIBS="$ZLIB_LIBS"
 ])
 
+dnl detect bzip2 from Emscripten emport
+PY_CHECK_EMSCRIPTEN_PORT([BZIP2], [-sUSE_BZIP2])
+
 PKG_CHECK_MODULES([BZIP2], [bzip2], [have_bzip2=yes], [
-  AC_CHECK_HEADERS([bzlib.h], [
-    WITH_SAVE_ENV([
-      AC_CHECK_LIB([bz2], [BZ2_bzCompress], [
-        have_bzip2=yes
-        BZIP2_CFLAGS=${BZIP2_CFLAGS-""}
-        BZIP2_LIBS=${BZIP2_LIBS-"-lbz2"}
-      ], [have_bzip2=no])
+  WITH_SAVE_ENV([
+    CPPFLAGS="$CFLAGS $BZIP2_CFLAGS"
+    LDFLAGS="$LDFLAGS $BZIP2_LIBS"
+    AC_CHECK_HEADERS([bzlib.h], [
+      AC_CHECK_LIB([bz2], [BZ2_bzCompress], [have_bzip2=yes], [have_bzip2=no])
+    ], [have_bzip2=no])
+    AS_VAR_IF([have_bzip2], [yes], [
+      BZIP2_CFLAGS=${BZIP2_CFLAGS-""}
+      BZIP2_LIBS=${BZIP2_LIBS-"-lbz2"}
     ])
-  ], [have_bzip2=no])
+  ])
 ])
 
-if test "$have_bzip2" = "yes" -a "$ac_sys_system" = "Emscripten" -a "$BZIP2_LIBS" = "-lbz2"; then
-  BZIP2_CFLAGS="-sUSE_BZIP2"
-  BZIP2_LIBS="-sUSE_BZIP2"
-fi
-
-
 PKG_CHECK_MODULES([LIBLZMA], [liblzma], [have_liblzma=yes], [
-  AC_CHECK_HEADERS([lzma.h], [
-    WITH_SAVE_ENV([
-      AC_CHECK_LIB([lzma], [lzma_easy_encoder], [
-        have_liblzma=yes
-        LIBLZMA_CFLAGS=${LIBLZMA_CFLAGS-""}
-        LIBLZMA_LIBS=${LIBLZMA_LIBS-"-llzma"}
-      ], [have_liblzma=no])
+  WITH_SAVE_ENV([
+    CPPFLAGS="$CFLAGS $LIBLZMA_CFLAGS"
+    LDFLAGS="$LDFLAGS $LIBLZMA_LIBS"
+    AC_CHECK_HEADERS([lzma.h], [
+      AC_CHECK_LIB([lzma], [lzma_easy_encoder], [have_liblzma=yes], [have_liblzma=no])
+    ], [have_liblzma=no])
+    AS_VAR_IF([have_liblzma], [yes], [
+      LIBLZMA_CFLAGS=${LIBLZMA_CFLAGS-""}
+      LIBLZMA_LIBS=${LIBLZMA_LIBS-"-llzma"}
     ])
-  ], [have_liblzma=no])
+  ])
 ])
 
 PY_CHECK_FUNC([hstrerror], [#include <netdb.h>])
@@ -5812,17 +5839,17 @@ AS_VAR_IF([with_readline], [readline], [
     READLINE_CFLAGS=$LIBREADLINE_CFLAGS
     READLINE_LIBS=$LIBREADLINE_LIBS
   ], [
-    AC_CHECK_HEADERS([readline/readline.h], [
-      WITH_SAVE_ENV([
+    WITH_SAVE_ENV([
+      CPPFLAGS="$CFLAGS $LIBREADLINE_CFLAGS"
+      LDFLAGS="$LDFLAGS $LIBREADLINE_LIBS"
+      AC_CHECK_HEADERS([readline/readline.h], [
         AC_CHECK_LIB([readline], [readline], [
           LIBREADLINE=readline
           READLINE_CFLAGS=${LIBREADLINE_CFLAGS-""}
           READLINE_LIBS=${LIBREADLINE_LIBS-"-lreadline"}
-        ], [
-          with_readline=no
-        ])
-      ])
-    ], [with_readline=no])
+        ], [with_readline=no])
+      ], [with_readline=no])
+    ])
   ])
 ])
 
@@ -5833,18 +5860,18 @@ AS_VAR_IF([with_readline], [edit], [
     READLINE_CFLAGS=$LIBEDIT_CFLAGS
     READLINE_LIBS=$LIBEDIT_LIBS
   ], [
-    AC_CHECK_HEADERS([editline/readline.h], [
-      WITH_SAVE_ENV([
+    WITH_SAVE_ENV([
+      CPPFLAGS="$CFLAGS $LIBEDIT_CFLAGS"
+      LDFLAGS="$LDFLAGS $LIBEDIT_LIBS"
+      AC_CHECK_HEADERS([editline/readline.h], [
         AC_CHECK_LIB([edit], [readline], [
           LIBREADLINE=edit
           AC_DEFINE([WITH_EDITLINE], [1])
           READLINE_CFLAGS=${LIBEDIT_CFLAGS-""}
           READLINE_LIBS=${LIBEDIT_LIBS-"-ledit"}
-        ], [
-          with_readline=no
-        ])
-      ])
-    ], [with_readline=no])
+        ], [with_readline=no])
+      ], [with_readline=no])
+    ])
   ])
 ])
 


From webhook-mailer at python.org  Fri Jul 15 13:00:45 2022
From: webhook-mailer at python.org (miss-islington)
Date: Fri, 15 Jul 2022 17:00:45 -0000
Subject: [Python-checkins] gh-94814: Improve coverage of
 _PyCode_CreateLineArray (GH-94852)
Message-ID: <mailman.38.1657904446.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/582ae86b3f07d806f145b3eb9009efd9fbf2e041
commit: 582ae86b3f07d806f145b3eb9009efd9fbf2e041
branch: main
author: Michael Droettboom <mdboom at gmail.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-15T10:00:27-07:00
summary:

gh-94814: Improve coverage of _PyCode_CreateLineArray (GH-94852)



The case where there are more than (1 << 15) lines was not covered.

I don't know if increasing test coverage requires a blurb -- let me know if it does.

Automerge-Triggered-By: GH:brandtbucher

files:
M Lib/test/test_sys_settrace.py

diff --git a/Lib/test/test_sys_settrace.py b/Lib/test/test_sys_settrace.py
index f03b03e19a252..4f2dd4f9eade3 100644
--- a/Lib/test/test_sys_settrace.py
+++ b/Lib/test/test_sys_settrace.py
@@ -1571,6 +1571,28 @@ def func():
 
         self.run_and_compare(func, EXPECTED_EVENTS)
 
+    def test_very_large_function(self):
+        # There is a separate code path when the number of lines > (1 << 15).
+        d = {}
+        exec("""def f():              # line 0
+            x = 0                     # line 1
+            y = 1                     # line 2
+            %s                        # lines 3 through (1 << 16)
+            x += 1                    #
+            return""" % ('\n' * (1 << 16),), d)
+        f = d['f']
+
+        EXPECTED_EVENTS = [
+            (0, 'call'),
+            (1, 'line'),
+            (2, 'line'),
+            (65540, 'line'),
+            (65541, 'line'),
+            (65541, 'return'),
+        ]
+
+        self.run_and_compare(f, EXPECTED_EVENTS)
+
 
 EVENT_NAMES = [
     'call',


From webhook-mailer at python.org  Fri Jul 15 13:28:52 2022
From: webhook-mailer at python.org (miss-islington)
Date: Fri, 15 Jul 2022 17:28:52 -0000
Subject: [Python-checkins] gh-94814: Improve coverage of
 _PyCode_CreateLineArray (GH-94852)
Message-ID: <mailman.39.1657906133.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/8f92ebbde7a841f6557b1d416cbcdba030e4b662
commit: 8f92ebbde7a841f6557b1d416cbcdba030e4b662
branch: 3.11
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-15T10:28:47-07:00
summary:

gh-94814: Improve coverage of _PyCode_CreateLineArray (GH-94852)


The case where there are more than (1 << 15) lines was not covered.

I don't know if increasing test coverage requires a blurb -- let me know if it does.

Automerge-Triggered-By: GH:brandtbucher
(cherry picked from commit 582ae86b3f07d806f145b3eb9009efd9fbf2e041)

Co-authored-by: Michael Droettboom <mdboom at gmail.com>

files:
M Lib/test/test_sys_settrace.py

diff --git a/Lib/test/test_sys_settrace.py b/Lib/test/test_sys_settrace.py
index f03b03e19a252..4f2dd4f9eade3 100644
--- a/Lib/test/test_sys_settrace.py
+++ b/Lib/test/test_sys_settrace.py
@@ -1571,6 +1571,28 @@ def func():
 
         self.run_and_compare(func, EXPECTED_EVENTS)
 
+    def test_very_large_function(self):
+        # There is a separate code path when the number of lines > (1 << 15).
+        d = {}
+        exec("""def f():              # line 0
+            x = 0                     # line 1
+            y = 1                     # line 2
+            %s                        # lines 3 through (1 << 16)
+            x += 1                    #
+            return""" % ('\n' * (1 << 16),), d)
+        f = d['f']
+
+        EXPECTED_EVENTS = [
+            (0, 'call'),
+            (1, 'line'),
+            (2, 'line'),
+            (65540, 'line'),
+            (65541, 'line'),
+            (65541, 'return'),
+        ]
+
+        self.run_and_compare(f, EXPECTED_EVENTS)
+
 
 EVENT_NAMES = [
     'call',


From webhook-mailer at python.org  Fri Jul 15 13:34:23 2022
From: webhook-mailer at python.org (miss-islington)
Date: Fri, 15 Jul 2022 17:34:23 -0000
Subject: [Python-checkins] [3.11] GH-94808: Cover handling non-finite
 numbers from round when ndigits is provided (GH-94860) (GH-94882)
Message-ID: <mailman.40.1657906463.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/e55f60db8f84131bc6c3cbf453b66fd4f13c3f0f
commit: e55f60db8f84131bc6c3cbf453b66fd4f13c3f0f
branch: 3.11
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-15T10:34:18-07:00
summary:

[3.11] GH-94808: Cover handling non-finite numbers from round when ndigits is provided (GH-94860) (GH-94882)



(cherry picked from commit 625ba9bdff51baddf9d5e156e5facf05fa1003d6)


Co-authored-by: Michael Droettboom <mdboom at gmail.com>

Automerge-Triggered-By: GH:brandtbucher

files:
M Lib/test/test_float.py

diff --git a/Lib/test/test_float.py b/Lib/test/test_float.py
index d8c0fe1854eba..e99250199975b 100644
--- a/Lib/test/test_float.py
+++ b/Lib/test/test_float.py
@@ -832,6 +832,11 @@ def test_inf_nan(self):
         self.assertRaises(TypeError, round, NAN, "ceci n'est pas un integer")
         self.assertRaises(TypeError, round, -0.0, 1j)
 
+    def test_inf_nan_ndigits(self):
+        self.assertEqual(round(INF, 0), INF)
+        self.assertEqual(round(-INF, 0), -INF)
+        self.assertTrue(math.isnan(round(NAN, 0)))
+
     def test_large_n(self):
         for n in [324, 325, 400, 2**31-1, 2**31, 2**32, 2**100]:
             self.assertEqual(round(123.456, n), 123.456)


From webhook-mailer at python.org  Fri Jul 15 13:37:20 2022
From: webhook-mailer at python.org (brandtbucher)
Date: Fri, 15 Jul 2022 17:37:20 -0000
Subject: [Python-checkins] gh-94808: Add coverage for boolobject.c:bool_new
 (GH-94859) (GH-94883)
Message-ID: <mailman.41.1657906640.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/8dc4de3aafed9aceaa904206f757f11bb682999b
commit: 8dc4de3aafed9aceaa904206f757f11bb682999b
branch: 3.11
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: brandtbucher <brandtbucher at gmail.com>
date: 2022-07-15T10:37:13-07:00
summary:

gh-94808: Add coverage for boolobject.c:bool_new (GH-94859) (GH-94883)

`bool_new` had no coverage.

Automerge-Triggered-By: GH:brandtbucher
(cherry picked from commit df4d53a09ab9fd9116d1b52bdc42133e019ca82b)

Co-authored-by: Michael Droettboom <mdboom at gmail.com>

Co-authored-by: Michael Droettboom <mdboom at gmail.com>

files:
M Lib/test/test_bool.py

diff --git a/Lib/test/test_bool.py b/Lib/test/test_bool.py
index 4b32aad2419f4..f46f21da8da35 100644
--- a/Lib/test/test_bool.py
+++ b/Lib/test/test_bool.py
@@ -369,6 +369,13 @@ def f(x):
         f(x)
         self.assertGreaterEqual(x.count, 1)
 
+    def test_bool_new(self):
+        self.assertIs(bool.__new__(bool), False)
+        self.assertIs(bool.__new__(bool, 1), True)
+        self.assertIs(bool.__new__(bool, 0), False)
+        self.assertIs(bool.__new__(bool, False), False)
+        self.assertIs(bool.__new__(bool, True), True)
+
 
 if __name__ == "__main__":
     unittest.main()


From webhook-mailer at python.org  Fri Jul 15 18:09:50 2022
From: webhook-mailer at python.org (ezio-melotti)
Date: Fri, 15 Jul 2022 22:09:50 -0000
Subject: [Python-checkins] Add additional pointers to pathlib's mapping to
 os.path functions (#94828)
Message-ID: <mailman.42.1657922991.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/3789c635772fbdeb5d0fc32aa811fd6b1d935a60
commit: 3789c635772fbdeb5d0fc32aa811fd6b1d935a60
branch: main
author: Chris Adams <chris at improbable.org>
committer: ezio-melotti <ezio.melotti at gmail.com>
date: 2022-07-16T00:09:27+02:00
summary:

Add additional pointers to pathlib's mapping to os.path functions (#94828)

* Add additional pointers to pathlib's mapping to os.path functions

os.path.splitext has a somewhat quirky signature since it mixes the path and filename components but I wanted the documentation to mention `PurePath.stem` as the natural counterpart to `PurePath.suffix` for the common use of `os.path.splitext` to turn "file.py" into "file" and "py".

Technically this could have some discussion of how to handle the parent directory hierarchy but that seems a bit out of keeping with the spirit of this table so I omitted mentioning `PurePath.parents` here.

* Update Doc/library/pathlib.rst

Co-authored-by: Ezio Melotti <ezio.melotti at gmail.com>

Co-authored-by: Ezio Melotti <ezio.melotti at gmail.com>

files:
M Doc/library/pathlib.rst

diff --git a/Doc/library/pathlib.rst b/Doc/library/pathlib.rst
index 2b798698385fd..d5cda3adc8d51 100644
--- a/Doc/library/pathlib.rst
+++ b/Doc/library/pathlib.rst
@@ -1300,7 +1300,8 @@ Below is a table mapping various :mod:`os` functions to their corresponding
 :func:`os.path.basename`               :data:`PurePath.name`
 :func:`os.path.dirname`                :data:`PurePath.parent`
 :func:`os.path.samefile`               :meth:`Path.samefile`
-:func:`os.path.splitext`               :data:`PurePath.suffix`
+:func:`os.path.splitext`               :data:`PurePath.stem` and
+                                       :data:`PurePath.suffix`
 ====================================   ==============================
 
 .. rubric:: Footnotes


From webhook-mailer at python.org  Fri Jul 15 18:16:51 2022
From: webhook-mailer at python.org (miss-islington)
Date: Fri, 15 Jul 2022 22:16:51 -0000
Subject: [Python-checkins] Add additional pointers to pathlib's mapping to
 os.path functions (GH-94828)
Message-ID: <mailman.43.1657923412.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/6654392587ede1c8e595a8fcdd273a02bc04ea51
commit: 6654392587ede1c8e595a8fcdd273a02bc04ea51
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-15T15:16:45-07:00
summary:

Add additional pointers to pathlib's mapping to os.path functions (GH-94828)


* Add additional pointers to pathlib's mapping to os.path functions

os.path.splitext has a somewhat quirky signature since it mixes the path and filename components but I wanted the documentation to mention `PurePath.stem` as the natural counterpart to `PurePath.suffix` for the common use of `os.path.splitext` to turn "file.py" into "file" and "py".

Technically this could have some discussion of how to handle the parent directory hierarchy but that seems a bit out of keeping with the spirit of this table so I omitted mentioning `PurePath.parents` here.

* Update Doc/library/pathlib.rst

Co-authored-by: Ezio Melotti <ezio.melotti at gmail.com>

Co-authored-by: Ezio Melotti <ezio.melotti at gmail.com>
(cherry picked from commit 3789c635772fbdeb5d0fc32aa811fd6b1d935a60)

Co-authored-by: Chris Adams <chris at improbable.org>

files:
M Doc/library/pathlib.rst

diff --git a/Doc/library/pathlib.rst b/Doc/library/pathlib.rst
index cb25cc92c2c4a..f969b1104f089 100644
--- a/Doc/library/pathlib.rst
+++ b/Doc/library/pathlib.rst
@@ -1300,7 +1300,8 @@ Below is a table mapping various :mod:`os` functions to their corresponding
 :func:`os.path.basename`               :data:`PurePath.name`
 :func:`os.path.dirname`                :data:`PurePath.parent`
 :func:`os.path.samefile`               :meth:`Path.samefile`
-:func:`os.path.splitext`               :data:`PurePath.suffix`
+:func:`os.path.splitext`               :data:`PurePath.stem` and
+                                       :data:`PurePath.suffix`
 ====================================   ==============================
 
 .. rubric:: Footnotes


From webhook-mailer at python.org  Fri Jul 15 18:21:39 2022
From: webhook-mailer at python.org (miss-islington)
Date: Fri, 15 Jul 2022 22:21:39 -0000
Subject: [Python-checkins] Add additional pointers to pathlib's mapping to
 os.path functions (GH-94828)
Message-ID: <mailman.44.1657923700.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/734c8b7e55e37883af738198dc52fbf5011962c6
commit: 734c8b7e55e37883af738198dc52fbf5011962c6
branch: 3.11
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-15T15:21:34-07:00
summary:

Add additional pointers to pathlib's mapping to os.path functions (GH-94828)


* Add additional pointers to pathlib's mapping to os.path functions

os.path.splitext has a somewhat quirky signature since it mixes the path and filename components but I wanted the documentation to mention `PurePath.stem` as the natural counterpart to `PurePath.suffix` for the common use of `os.path.splitext` to turn "file.py" into "file" and "py".

Technically this could have some discussion of how to handle the parent directory hierarchy but that seems a bit out of keeping with the spirit of this table so I omitted mentioning `PurePath.parents` here.

* Update Doc/library/pathlib.rst

Co-authored-by: Ezio Melotti <ezio.melotti at gmail.com>

Co-authored-by: Ezio Melotti <ezio.melotti at gmail.com>
(cherry picked from commit 3789c635772fbdeb5d0fc32aa811fd6b1d935a60)

Co-authored-by: Chris Adams <chris at improbable.org>

files:
M Doc/library/pathlib.rst

diff --git a/Doc/library/pathlib.rst b/Doc/library/pathlib.rst
index c4fe645e3c903..5012150b86cef 100644
--- a/Doc/library/pathlib.rst
+++ b/Doc/library/pathlib.rst
@@ -1319,7 +1319,8 @@ Below is a table mapping various :mod:`os` functions to their corresponding
 :func:`os.path.basename`               :data:`PurePath.name`
 :func:`os.path.dirname`                :data:`PurePath.parent`
 :func:`os.path.samefile`               :meth:`Path.samefile`
-:func:`os.path.splitext`               :data:`PurePath.suffix`
+:func:`os.path.splitext`               :data:`PurePath.stem` and
+                                       :data:`PurePath.suffix`
 ====================================   ==============================
 
 .. rubric:: Footnotes


From webhook-mailer at python.org  Fri Jul 15 22:10:39 2022
From: webhook-mailer at python.org (rhettinger)
Date: Sat, 16 Jul 2022 02:10:39 -0000
Subject: [Python-checkins] Tutorial sys.argv example should not have
 interactive prompt (GH-94880)
Message-ID: <mailman.45.1657937441.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/7502af888f1571150be708da6a8de294e9453a34
commit: 7502af888f1571150be708da6a8de294e9453a34
branch: main
author: Marco Buttu <marco.buttu at gmail.com>
committer: rhettinger <rhettinger at users.noreply.github.com>
date: 2022-07-15T21:10:19-05:00
summary:

Tutorial sys.argv example should not have interactive prompt (GH-94880)

files:
M Doc/tutorial/stdlib.rst

diff --git a/Doc/tutorial/stdlib.rst b/Doc/tutorial/stdlib.rst
index b32a552d5570c..4f5ada90eb57b 100644
--- a/Doc/tutorial/stdlib.rst
+++ b/Doc/tutorial/stdlib.rst
@@ -65,11 +65,15 @@ Command Line Arguments
 
 Common utility scripts often need to process command line arguments. These
 arguments are stored in the :mod:`sys` module's *argv* attribute as a list.  For
-instance the following output results from running ``python demo.py one two
-three`` at the command line::
+instance, let's take the following :file:`demo.py` file::
+
+   # File demo.py
+   import sys
+   print(sys.argv)
+
+Here is the output from running ``python demo.py one two three`` at the command
+line::
 
-   >>> import sys
-   >>> print(sys.argv)
    ['demo.py', 'one', 'two', 'three']
 
 The :mod:`argparse` module provides a more sophisticated mechanism to process


From webhook-mailer at python.org  Sat Jul 16 04:35:35 2022
From: webhook-mailer at python.org (pablogsal)
Date: Sat, 16 Jul 2022 08:35:35 -0000
Subject: [Python-checkins] [3.11] bpo-14916: interactive fd is not tied to
 stdin [type-bug] (#91469)
Message-ID: <mailman.46.1657960536.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/bbb2ab70b6d42c097dc35caa4d816ff7476d6554
commit: bbb2ab70b6d42c097dc35caa4d816ff7476d6554
branch: main
author: Paul m. p. Peny <mail.peny at free.fr>
committer: pablogsal <Pablogsal at gmail.com>
date: 2022-07-16T09:35:19+01:00
summary:

[3.11] bpo-14916: interactive fd is not tied to stdin [type-bug] (#91469)

* bpo-14916: interactive fd is not always stdin

related to https://github.com/python/cpython/pull/31006 merged bugfix

following https://bugs.python.org/issue14916

* ?? Added by blurb_it.

Co-authored-by: blurb-it[bot] <43283697+blurb-it[bot]@users.noreply.github.com>

files:
A Misc/NEWS.d/next/C API/2022-04-13-16-10-55.gh-issue-59121.-B7mKp.rst
M Parser/pegen_errors.c

diff --git a/Misc/NEWS.d/next/C API/2022-04-13-16-10-55.gh-issue-59121.-B7mKp.rst b/Misc/NEWS.d/next/C API/2022-04-13-16-10-55.gh-issue-59121.-B7mKp.rst
new file mode 100644
index 0000000000000..d52866ea08f71
--- /dev/null
+++ b/Misc/NEWS.d/next/C API/2022-04-13-16-10-55.gh-issue-59121.-B7mKp.rst	
@@ -0,0 +1 @@
+Fixed an assert that prevented ``PyRun_InteractiveOne`` from providing tracebacks when parsing from the provided FD.
diff --git a/Parser/pegen_errors.c b/Parser/pegen_errors.c
index 5703088443ede..c87d50abd2c71 100644
--- a/Parser/pegen_errors.c
+++ b/Parser/pegen_errors.c
@@ -245,7 +245,7 @@ get_error_line_from_tokenizer_buffers(Parser *p, Py_ssize_t lineno)
      * (multi-line) statement are stored in p->tok->interactive_src_start.
      * If not, we're parsing from a string, which means that the whole source
      * is stored in p->tok->str. */
-    assert((p->tok->fp == NULL && p->tok->str != NULL) || p->tok->fp == stdin);
+    assert((p->tok->fp == NULL && p->tok->str != NULL) || p->tok->fp != NULL);
 
     char *cur_line = p->tok->fp_interactive ? p->tok->interactive_src_start : p->tok->str;
     if (cur_line == NULL) {


From webhook-mailer at python.org  Sat Jul 16 05:02:28 2022
From: webhook-mailer at python.org (zooba)
Date: Sat, 16 Jul 2022 09:02:28 -0000
Subject: [Python-checkins] gh-94772: Fix off-by-one error in Windows
 launcher (GH-94779)
Message-ID: <mailman.47.1657962149.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/407ff6556cc999d692b264466ad8d32304a09bce
commit: 407ff6556cc999d692b264466ad8d32304a09bce
branch: main
author: Paul Moore <p.f.moore at gmail.com>
committer: zooba <steve.dower at microsoft.com>
date: 2022-07-16T10:02:22+01:00
summary:

gh-94772: Fix off-by-one error in Windows launcher (GH-94779)

files:
A Misc/NEWS.d/next/Windows/2022-07-12-20-45-43.gh-issue-94772.uNMmdG.rst
M Lib/test/test_launcher.py
M PC/launcher2.c

diff --git a/Lib/test/test_launcher.py b/Lib/test/test_launcher.py
index cd7b944f98f58..50a2e8c03d647 100644
--- a/Lib/test/test_launcher.py
+++ b/Lib/test/test_launcher.py
@@ -515,6 +515,30 @@ def test_py3_shebang(self):
         self.assertEqual("3.100-arm64", data["SearchInfo.tag"])
         self.assertEqual(f"X.Y-arm64.exe -X fake_arg_for_test -prearg {script} -postarg", data["stdout"].strip())
 
+    def test_py_shebang_nl(self):
+        with self.py_ini(TEST_PY_COMMANDS):
+            with self.script("#! /usr/bin/env python -prearg\n") as script:
+                data = self.run_py([script, "-postarg"])
+        self.assertEqual("PythonTestSuite", data["SearchInfo.company"])
+        self.assertEqual("3.100", data["SearchInfo.tag"])
+        self.assertEqual(f"X.Y.exe -prearg {script} -postarg", data["stdout"].strip())
+
+    def test_py2_shebang_nl(self):
+        with self.py_ini(TEST_PY_COMMANDS):
+            with self.script("#! /usr/bin/env python2 -prearg\n") as script:
+                data = self.run_py([script, "-postarg"])
+        self.assertEqual("PythonTestSuite", data["SearchInfo.company"])
+        self.assertEqual("3.100-32", data["SearchInfo.tag"])
+        self.assertEqual(f"X.Y-32.exe -prearg {script} -postarg", data["stdout"].strip())
+
+    def test_py3_shebang_nl(self):
+        with self.py_ini(TEST_PY_COMMANDS):
+            with self.script("#! /usr/bin/env python3 -prearg\n") as script:
+                data = self.run_py([script, "-postarg"])
+        self.assertEqual("PythonTestSuite", data["SearchInfo.company"])
+        self.assertEqual("3.100-arm64", data["SearchInfo.tag"])
+        self.assertEqual(f"X.Y-arm64.exe -X fake_arg_for_test -prearg {script} -postarg", data["stdout"].strip())
+
     def test_install(self):
         data = self.run_py(["-V:3.10"], env={"PYLAUNCHER_ALWAYS_INSTALL": "1"}, expect_returncode=111)
         cmd = data["stdout"].strip()
diff --git a/Misc/NEWS.d/next/Windows/2022-07-12-20-45-43.gh-issue-94772.uNMmdG.rst b/Misc/NEWS.d/next/Windows/2022-07-12-20-45-43.gh-issue-94772.uNMmdG.rst
new file mode 100644
index 0000000000000..bb5ab754484eb
--- /dev/null
+++ b/Misc/NEWS.d/next/Windows/2022-07-12-20-45-43.gh-issue-94772.uNMmdG.rst
@@ -0,0 +1 @@
+Fix incorrect handling of shebang lines in py.exe launcher
diff --git a/PC/launcher2.c b/PC/launcher2.c
index ae11f4f024a90..c8ed1b0f7c8a6 100644
--- a/PC/launcher2.c
+++ b/PC/launcher2.c
@@ -874,7 +874,9 @@ checkShebang(SearchInfo *search)
     while (--bytesRead > 0 && *++b != '\r' && *b != '\n') { }
     wchar_t *shebang;
     int shebangLength;
-    int exitCode = _decodeShebang(search, start, (int)(b - start + 1), onlyUtf8, &shebang, &shebangLength);
+    // We add 1 when bytesRead==0, as in that case we hit EOF and b points
+    // to the last character in the file, not the newline
+    int exitCode = _decodeShebang(search, start, (int)(b - start + (bytesRead == 0)), onlyUtf8, &shebang, &shebangLength);
     if (exitCode) {
         return exitCode;
     }


From webhook-mailer at python.org  Sat Jul 16 05:42:24 2022
From: webhook-mailer at python.org (zooba)
Date: Sat, 16 Jul 2022 09:42:24 -0000
Subject: [Python-checkins] gh-94772: Fix off-by-one error in Windows
 launcher (GH-94779)
Message-ID: <mailman.48.1657964545.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/b040617195ff7bfd09acf9cac14177d360aa382f
commit: b040617195ff7bfd09acf9cac14177d360aa382f
branch: 3.11
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: zooba <steve.dower at microsoft.com>
date: 2022-07-16T10:42:08+01:00
summary:

gh-94772: Fix off-by-one error in Windows launcher (GH-94779)

(cherry picked from commit 407ff6556cc999d692b264466ad8d32304a09bce)

Co-authored-by: Paul Moore <p.f.moore at gmail.com>

Co-authored-by: Paul Moore <p.f.moore at gmail.com>

files:
A Misc/NEWS.d/next/Windows/2022-07-12-20-45-43.gh-issue-94772.uNMmdG.rst
M Lib/test/test_launcher.py
M PC/launcher2.c

diff --git a/Lib/test/test_launcher.py b/Lib/test/test_launcher.py
index e9f6fcb7d7f24..201aba660abee 100644
--- a/Lib/test/test_launcher.py
+++ b/Lib/test/test_launcher.py
@@ -516,6 +516,30 @@ def test_py3_shebang(self):
         self.assertEqual("3.100-arm64", data["SearchInfo.tag"])
         self.assertEqual(f"X.Y-arm64.exe -X fake_arg_for_test -prearg {script} -postarg", data["stdout"].strip())
 
+    def test_py_shebang_nl(self):
+        with self.py_ini(TEST_PY_COMMANDS):
+            with self.script("#! /usr/bin/env python -prearg\n") as script:
+                data = self.run_py([script, "-postarg"])
+        self.assertEqual("PythonTestSuite", data["SearchInfo.company"])
+        self.assertEqual("3.100", data["SearchInfo.tag"])
+        self.assertEqual(f"X.Y.exe -prearg {script} -postarg", data["stdout"].strip())
+
+    def test_py2_shebang_nl(self):
+        with self.py_ini(TEST_PY_COMMANDS):
+            with self.script("#! /usr/bin/env python2 -prearg\n") as script:
+                data = self.run_py([script, "-postarg"])
+        self.assertEqual("PythonTestSuite", data["SearchInfo.company"])
+        self.assertEqual("3.100-32", data["SearchInfo.tag"])
+        self.assertEqual(f"X.Y-32.exe -prearg {script} -postarg", data["stdout"].strip())
+
+    def test_py3_shebang_nl(self):
+        with self.py_ini(TEST_PY_COMMANDS):
+            with self.script("#! /usr/bin/env python3 -prearg\n") as script:
+                data = self.run_py([script, "-postarg"])
+        self.assertEqual("PythonTestSuite", data["SearchInfo.company"])
+        self.assertEqual("3.100-arm64", data["SearchInfo.tag"])
+        self.assertEqual(f"X.Y-arm64.exe -X fake_arg_for_test -prearg {script} -postarg", data["stdout"].strip())
+
     def test_install(self):
         data = self.run_py(["-V:3.10"], env={"PYLAUNCHER_ALWAYS_INSTALL": "1"}, expect_returncode=111)
         cmd = data["stdout"].strip()
diff --git a/Misc/NEWS.d/next/Windows/2022-07-12-20-45-43.gh-issue-94772.uNMmdG.rst b/Misc/NEWS.d/next/Windows/2022-07-12-20-45-43.gh-issue-94772.uNMmdG.rst
new file mode 100644
index 0000000000000..bb5ab754484eb
--- /dev/null
+++ b/Misc/NEWS.d/next/Windows/2022-07-12-20-45-43.gh-issue-94772.uNMmdG.rst
@@ -0,0 +1 @@
+Fix incorrect handling of shebang lines in py.exe launcher
diff --git a/PC/launcher2.c b/PC/launcher2.c
index ae11f4f024a90..c8ed1b0f7c8a6 100644
--- a/PC/launcher2.c
+++ b/PC/launcher2.c
@@ -874,7 +874,9 @@ checkShebang(SearchInfo *search)
     while (--bytesRead > 0 && *++b != '\r' && *b != '\n') { }
     wchar_t *shebang;
     int shebangLength;
-    int exitCode = _decodeShebang(search, start, (int)(b - start + 1), onlyUtf8, &shebang, &shebangLength);
+    // We add 1 when bytesRead==0, as in that case we hit EOF and b points
+    // to the last character in the file, not the newline
+    int exitCode = _decodeShebang(search, start, (int)(b - start + (bytesRead == 0)), onlyUtf8, &shebang, &shebangLength);
     if (exitCode) {
         return exitCode;
     }


From webhook-mailer at python.org  Sat Jul 16 07:26:51 2022
From: webhook-mailer at python.org (miss-islington)
Date: Sat, 16 Jul 2022 11:26:51 -0000
Subject: [Python-checkins] gh-94698: add Subscript and Attribute targets to
 ast.for documentation (GH-94901)
Message-ID: <mailman.49.1657970812.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/16b6e14cc291865ecaf50fa57d0685da94496567
commit: 16b6e14cc291865ecaf50fa57d0685da94496567
branch: main
author: anilbey <anil.tuncel at epfl.ch>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-16T04:26:43-07:00
summary:

gh-94698: add Subscript and Attribute targets to ast.for documentation (GH-94901)



### Summary

Add Attribute and Subscript as possible targets for the "ast for loop documentation".

Automerge-Triggered-By: GH:isidentical

files:
M Doc/library/ast.rst

diff --git a/Doc/library/ast.rst b/Doc/library/ast.rst
index b10aa7cd50d17..7ad21026f690f 100644
--- a/Doc/library/ast.rst
+++ b/Doc/library/ast.rst
@@ -1028,10 +1028,11 @@ Control flow
 .. class:: For(target, iter, body, orelse, type_comment)
 
    A ``for`` loop. ``target`` holds the variable(s) the loop assigns to, as a
-   single :class:`Name`, :class:`Tuple` or :class:`List` node. ``iter`` holds
-   the item to be looped over, again as a single node. ``body`` and ``orelse``
-   contain lists of nodes to execute. Those in ``orelse`` are executed if the
-   loop finishes normally, rather than via a ``break`` statement.
+   single :class:`Name`, :class:`Tuple`, :class:`List`, :class:`Attribute` or
+   :class:`Subscript` node. ``iter`` holds the item to be looped over, again
+   as a single node. ``body`` and ``orelse`` contain lists of nodes to execute.
+   Those in ``orelse`` are executed if the loop finishes normally, rather than
+   via a ``break`` statement.
 
    .. attribute:: type_comment
 


From webhook-mailer at python.org  Sat Jul 16 12:38:45 2022
From: webhook-mailer at python.org (zooba)
Date: Sat, 16 Jul 2022 16:38:45 -0000
Subject: [Python-checkins] gh-90844: Allow virtual environments to correctly
 launch when they have spaces in the path (GH-94903)
Message-ID: <mailman.50.1657989527.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/4b4439daed3992a5c5a83b86596d6e00ac3c1203
commit: 4b4439daed3992a5c5a83b86596d6e00ac3c1203
branch: main
author: Steve Dower <steve.dower at python.org>
committer: zooba <steve.dower at microsoft.com>
date: 2022-07-16T17:38:36+01:00
summary:

gh-90844: Allow virtual environments to correctly launch when they have spaces in the path (GH-94903)

files:
A Misc/NEWS.d/next/Windows/2022-07-16-16-18-32.gh-issue-90844.vwITT3.rst
M PC/launcher.c

diff --git a/Misc/NEWS.d/next/Windows/2022-07-16-16-18-32.gh-issue-90844.vwITT3.rst b/Misc/NEWS.d/next/Windows/2022-07-16-16-18-32.gh-issue-90844.vwITT3.rst
new file mode 100644
index 0000000000000..8d9e850a5b5b7
--- /dev/null
+++ b/Misc/NEWS.d/next/Windows/2022-07-16-16-18-32.gh-issue-90844.vwITT3.rst
@@ -0,0 +1,2 @@
+Allow virtual environments to correctly launch when they have spaces in the
+path.
diff --git a/PC/launcher.c b/PC/launcher.c
index de7abeb4e86ab..da566a180168c 100644
--- a/PC/launcher.c
+++ b/PC/launcher.c
@@ -1926,27 +1926,35 @@ process(int argc, wchar_t ** argv)
         if (!cch) {
             error(0, L"Cannot determine memory for home path");
         }
-        cch += (DWORD)wcslen(PYTHON_EXECUTABLE) + 1 + 1; /* include sep and null */
+        cch += (DWORD)wcslen(PYTHON_EXECUTABLE) + 4; /* include sep, null and quotes */
         executable = (wchar_t *)malloc(cch * sizeof(wchar_t));
         if (executable == NULL) {
             error(RC_NO_MEMORY, L"A memory allocation failed");
         }
-        cch_actual = MultiByteToWideChar(CP_UTF8, 0, start, len, executable, cch);
+        /* start with a quote - we'll skip this ahead, but want it for the final string */
+        executable[0] = L'"';
+        cch_actual = MultiByteToWideChar(CP_UTF8, 0, start, len, &executable[1], cch - 1);
         if (!cch_actual) {
             error(RC_BAD_VENV_CFG, L"Cannot decode home path in '%ls'",
                   venv_cfg_path);
         }
+        cch_actual += 1; /* account for the first quote */
+        executable[cch_actual] = L'\0';
         if (executable[cch_actual - 1] != L'\\') {
             executable[cch_actual++] = L'\\';
             executable[cch_actual] = L'\0';
         }
-        if (wcscat_s(executable, cch, PYTHON_EXECUTABLE)) {
+        if (wcscat_s(&executable[1], cch - 1, PYTHON_EXECUTABLE)) {
             error(RC_BAD_VENV_CFG, L"Cannot create executable path from '%ls'",
                   venv_cfg_path);
         }
-        if (GetFileAttributesW(executable) == INVALID_FILE_ATTRIBUTES) {
+        /* there's no trailing quote, so we only have to skip one character for the test */
+        if (GetFileAttributesW(&executable[1]) == INVALID_FILE_ATTRIBUTES) {
             error(RC_NO_PYTHON, L"No Python at '%ls'", executable);
         }
+        /* now append the final quote */
+        wcscat_s(executable, cch, L"\"");
+        /* smuggle our original path through */
         if (!SetEnvironmentVariableW(L"__PYVENV_LAUNCHER__", argv0)) {
             error(0, L"Failed to set launcher environment");
         }


From webhook-mailer at python.org  Sat Jul 16 13:07:46 2022
From: webhook-mailer at python.org (miss-islington)
Date: Sat, 16 Jul 2022 17:07:46 -0000
Subject: [Python-checkins] gh-90844: Allow virtual environments to correctly
 launch when they have spaces in the path (GH-94903)
Message-ID: <mailman.51.1657991267.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/3781d1a45815b5f4455491efd036babc084101b3
commit: 3781d1a45815b5f4455491efd036babc084101b3
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-16T10:07:39-07:00
summary:

gh-90844: Allow virtual environments to correctly launch when they have spaces in the path (GH-94903)

(cherry picked from commit 4b4439daed3992a5c5a83b86596d6e00ac3c1203)

Co-authored-by: Steve Dower <steve.dower at python.org>

files:
A Misc/NEWS.d/next/Windows/2022-07-16-16-18-32.gh-issue-90844.vwITT3.rst
M PC/launcher.c

diff --git a/Misc/NEWS.d/next/Windows/2022-07-16-16-18-32.gh-issue-90844.vwITT3.rst b/Misc/NEWS.d/next/Windows/2022-07-16-16-18-32.gh-issue-90844.vwITT3.rst
new file mode 100644
index 0000000000000..8d9e850a5b5b7
--- /dev/null
+++ b/Misc/NEWS.d/next/Windows/2022-07-16-16-18-32.gh-issue-90844.vwITT3.rst
@@ -0,0 +1,2 @@
+Allow virtual environments to correctly launch when they have spaces in the
+path.
diff --git a/PC/launcher.c b/PC/launcher.c
index 734e7533398b1..7c34e0ded7bfa 100644
--- a/PC/launcher.c
+++ b/PC/launcher.c
@@ -1923,27 +1923,35 @@ process(int argc, wchar_t ** argv)
         if (!cch) {
             error(0, L"Cannot determine memory for home path");
         }
-        cch += (DWORD)wcslen(PYTHON_EXECUTABLE) + 1 + 1; /* include sep and null */
+        cch += (DWORD)wcslen(PYTHON_EXECUTABLE) + 4; /* include sep, null and quotes */
         executable = (wchar_t *)malloc(cch * sizeof(wchar_t));
         if (executable == NULL) {
             error(RC_NO_MEMORY, L"A memory allocation failed");
         }
-        cch_actual = MultiByteToWideChar(CP_UTF8, 0, start, len, executable, cch);
+        /* start with a quote - we'll skip this ahead, but want it for the final string */
+        executable[0] = L'"';
+        cch_actual = MultiByteToWideChar(CP_UTF8, 0, start, len, &executable[1], cch - 1);
         if (!cch_actual) {
             error(RC_BAD_VENV_CFG, L"Cannot decode home path in '%ls'",
                   venv_cfg_path);
         }
+        cch_actual += 1; /* account for the first quote */
+        executable[cch_actual] = L'\0';
         if (executable[cch_actual - 1] != L'\\') {
             executable[cch_actual++] = L'\\';
             executable[cch_actual] = L'\0';
         }
-        if (wcscat_s(executable, cch, PYTHON_EXECUTABLE)) {
+        if (wcscat_s(&executable[1], cch - 1, PYTHON_EXECUTABLE)) {
             error(RC_BAD_VENV_CFG, L"Cannot create executable path from '%ls'",
                   venv_cfg_path);
         }
-        if (GetFileAttributesW(executable) == INVALID_FILE_ATTRIBUTES) {
+        /* there's no trailing quote, so we only have to skip one character for the test */
+        if (GetFileAttributesW(&executable[1]) == INVALID_FILE_ATTRIBUTES) {
             error(RC_NO_PYTHON, L"No Python at '%ls'", executable);
         }
+        /* now append the final quote */
+        wcscat_s(executable, cch, L"\"");
+        /* smuggle our original path through */
         if (!SetEnvironmentVariableW(L"__PYVENV_LAUNCHER__", argv0)) {
             error(0, L"Failed to set launcher environment");
         }


From webhook-mailer at python.org  Sat Jul 16 13:11:38 2022
From: webhook-mailer at python.org (miss-islington)
Date: Sat, 16 Jul 2022 17:11:38 -0000
Subject: [Python-checkins] gh-90844: Allow virtual environments to correctly
 launch when they have spaces in the path (GH-94903)
Message-ID: <mailman.52.1657991499.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/8c08e86d8d44272a18ae9254d4e52f490a5ea491
commit: 8c08e86d8d44272a18ae9254d4e52f490a5ea491
branch: 3.11
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-16T10:11:34-07:00
summary:

gh-90844: Allow virtual environments to correctly launch when they have spaces in the path (GH-94903)

(cherry picked from commit 4b4439daed3992a5c5a83b86596d6e00ac3c1203)

Co-authored-by: Steve Dower <steve.dower at python.org>

files:
A Misc/NEWS.d/next/Windows/2022-07-16-16-18-32.gh-issue-90844.vwITT3.rst
M PC/launcher.c

diff --git a/Misc/NEWS.d/next/Windows/2022-07-16-16-18-32.gh-issue-90844.vwITT3.rst b/Misc/NEWS.d/next/Windows/2022-07-16-16-18-32.gh-issue-90844.vwITT3.rst
new file mode 100644
index 0000000000000..8d9e850a5b5b7
--- /dev/null
+++ b/Misc/NEWS.d/next/Windows/2022-07-16-16-18-32.gh-issue-90844.vwITT3.rst
@@ -0,0 +1,2 @@
+Allow virtual environments to correctly launch when they have spaces in the
+path.
diff --git a/PC/launcher.c b/PC/launcher.c
index de7abeb4e86ab..da566a180168c 100644
--- a/PC/launcher.c
+++ b/PC/launcher.c
@@ -1926,27 +1926,35 @@ process(int argc, wchar_t ** argv)
         if (!cch) {
             error(0, L"Cannot determine memory for home path");
         }
-        cch += (DWORD)wcslen(PYTHON_EXECUTABLE) + 1 + 1; /* include sep and null */
+        cch += (DWORD)wcslen(PYTHON_EXECUTABLE) + 4; /* include sep, null and quotes */
         executable = (wchar_t *)malloc(cch * sizeof(wchar_t));
         if (executable == NULL) {
             error(RC_NO_MEMORY, L"A memory allocation failed");
         }
-        cch_actual = MultiByteToWideChar(CP_UTF8, 0, start, len, executable, cch);
+        /* start with a quote - we'll skip this ahead, but want it for the final string */
+        executable[0] = L'"';
+        cch_actual = MultiByteToWideChar(CP_UTF8, 0, start, len, &executable[1], cch - 1);
         if (!cch_actual) {
             error(RC_BAD_VENV_CFG, L"Cannot decode home path in '%ls'",
                   venv_cfg_path);
         }
+        cch_actual += 1; /* account for the first quote */
+        executable[cch_actual] = L'\0';
         if (executable[cch_actual - 1] != L'\\') {
             executable[cch_actual++] = L'\\';
             executable[cch_actual] = L'\0';
         }
-        if (wcscat_s(executable, cch, PYTHON_EXECUTABLE)) {
+        if (wcscat_s(&executable[1], cch - 1, PYTHON_EXECUTABLE)) {
             error(RC_BAD_VENV_CFG, L"Cannot create executable path from '%ls'",
                   venv_cfg_path);
         }
-        if (GetFileAttributesW(executable) == INVALID_FILE_ATTRIBUTES) {
+        /* there's no trailing quote, so we only have to skip one character for the test */
+        if (GetFileAttributesW(&executable[1]) == INVALID_FILE_ATTRIBUTES) {
             error(RC_NO_PYTHON, L"No Python at '%ls'", executable);
         }
+        /* now append the final quote */
+        wcscat_s(executable, cch, L"\"");
+        /* smuggle our original path through */
         if (!SetEnvironmentVariableW(L"__PYVENV_LAUNCHER__", argv0)) {
             error(0, L"Failed to set launcher environment");
         }


From webhook-mailer at python.org  Sat Jul 16 14:52:27 2022
From: webhook-mailer at python.org (pablogsal)
Date: Sat, 16 Jul 2022 18:52:27 -0000
Subject: [Python-checkins] gh-94869: Fix the location in some expressions
 for multi-line f-string ast nodes (#94895)
Message-ID: <mailman.53.1657997548.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/2e9da8e3522764d09f1d6054a2be567e91a30812
commit: 2e9da8e3522764d09f1d6054a2be567e91a30812
branch: main
author: Pablo Galindo Salgado <Pablogsal at gmail.com>
committer: pablogsal <Pablogsal at gmail.com>
date: 2022-07-16T19:51:53+01:00
summary:

gh-94869: Fix the location in some expressions for multi-line f-string ast nodes (#94895)

files:
A Misc/NEWS.d/next/Core and Builtins/2022-07-16-08-14-17.gh-issue-94869.eRwMsX.rst
M Lib/test/test_fstring.py
M Parser/string_parser.c

diff --git a/Lib/test/test_fstring.py b/Lib/test/test_fstring.py
index 9815b7c28f2f4..bf3a5b0bbccdf 100644
--- a/Lib/test/test_fstring.py
+++ b/Lib/test/test_fstring.py
@@ -346,10 +346,39 @@ def test_ast_line_numbers_multiline_fstring(self):
         self.assertEqual(binop.lineno, 4)
         self.assertEqual(binop.left.lineno, 4)
         self.assertEqual(binop.right.lineno, 6)
-        self.assertEqual(binop.col_offset, 4)
-        self.assertEqual(binop.left.col_offset, 4)
+        self.assertEqual(binop.col_offset, 3)
+        self.assertEqual(binop.left.col_offset, 3)
         self.assertEqual(binop.right.col_offset, 7)
 
+        expr = """
+a = f'''
+          {blech}
+    '''
+"""
+        t = ast.parse(expr)
+        self.assertEqual(type(t), ast.Module)
+        self.assertEqual(len(t.body), 1)
+        # Check f'...'
+        self.assertEqual(type(t.body[0]), ast.Assign)
+        self.assertEqual(type(t.body[0].value), ast.JoinedStr)
+        self.assertEqual(len(t.body[0].value.values), 3)
+        self.assertEqual(type(t.body[0].value.values[1]), ast.FormattedValue)
+        self.assertEqual(t.body[0].lineno, 2)
+        self.assertEqual(t.body[0].value.lineno, 2)
+        self.assertEqual(t.body[0].value.values[0].lineno, 2)
+        self.assertEqual(t.body[0].value.values[1].lineno, 2)
+        self.assertEqual(t.body[0].value.values[2].lineno, 2)
+        self.assertEqual(t.body[0].col_offset, 0)
+        self.assertEqual(t.body[0].value.col_offset, 4)
+        self.assertEqual(t.body[0].value.values[0].col_offset, 4)
+        self.assertEqual(t.body[0].value.values[1].col_offset, 4)
+        self.assertEqual(t.body[0].value.values[2].col_offset, 4)
+        # Check {blech}
+        self.assertEqual(t.body[0].value.values[1].value.lineno, 3)
+        self.assertEqual(t.body[0].value.values[1].value.end_lineno, 3)
+        self.assertEqual(t.body[0].value.values[1].value.col_offset, 11)
+        self.assertEqual(t.body[0].value.values[1].value.end_col_offset, 16)
+
     def test_ast_line_numbers_with_parentheses(self):
         expr = """
 x = (
diff --git a/Misc/NEWS.d/next/Core and Builtins/2022-07-16-08-14-17.gh-issue-94869.eRwMsX.rst b/Misc/NEWS.d/next/Core and Builtins/2022-07-16-08-14-17.gh-issue-94869.eRwMsX.rst
new file mode 100644
index 0000000000000..2ccf91b0cd99a
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2022-07-16-08-14-17.gh-issue-94869.eRwMsX.rst	
@@ -0,0 +1,2 @@
+Fix the column offsets for some expressions in multi-line f-strings
+:mod:`ast` nodes. Patch by Pablo Galindo.
diff --git a/Parser/string_parser.c b/Parser/string_parser.c
index 984c05d39c1a1..9bc3b082136be 100644
--- a/Parser/string_parser.c
+++ b/Parser/string_parser.c
@@ -326,6 +326,9 @@ fstring_find_expr_location(Token *parent, const char* expr_start, char *expr_str
                 start--;
             }
             *p_cols += (int)(expr_start - start);
+            if (*start == '\n') {
+                *p_cols -= 1;
+            }
         }
         /* adjust the start based on the number of newlines encountered
            before the f-string expression */
@@ -416,7 +419,7 @@ fstring_compile_expr(Parser *p, const char *expr_start, const char *expr_end,
                                      NULL, p->arena);
 
     p2->starting_lineno = t->lineno + lines;
-    p2->starting_col_offset = t->col_offset + cols;
+    p2->starting_col_offset = lines != 0 ? cols : t->col_offset + cols;
 
     expr = _PyPegen_run_parser(p2);
 


From webhook-mailer at python.org  Sat Jul 16 15:17:19 2022
From: webhook-mailer at python.org (miss-islington)
Date: Sat, 16 Jul 2022 19:17:19 -0000
Subject: [Python-checkins] gh-94869: Fix the location in some expressions
 for multi-line f-string ast nodes (GH-94895)
Message-ID: <mailman.54.1657999040.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/e121cb5814b4e24cabf44b65a395d69c5acdafd5
commit: e121cb5814b4e24cabf44b65a395d69c5acdafd5
branch: 3.11
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-16T12:16:51-07:00
summary:

gh-94869: Fix the location in some expressions for multi-line f-string ast nodes (GH-94895)

(cherry picked from commit 2e9da8e3522764d09f1d6054a2be567e91a30812)

Co-authored-by: Pablo Galindo Salgado <Pablogsal at gmail.com>

files:
A Misc/NEWS.d/next/Core and Builtins/2022-07-16-08-14-17.gh-issue-94869.eRwMsX.rst
M Lib/test/test_fstring.py
M Parser/string_parser.c

diff --git a/Lib/test/test_fstring.py b/Lib/test/test_fstring.py
index 93aa229709a0a..453de6212a8da 100644
--- a/Lib/test/test_fstring.py
+++ b/Lib/test/test_fstring.py
@@ -346,10 +346,39 @@ def test_ast_line_numbers_multiline_fstring(self):
         self.assertEqual(binop.lineno, 4)
         self.assertEqual(binop.left.lineno, 4)
         self.assertEqual(binop.right.lineno, 6)
-        self.assertEqual(binop.col_offset, 4)
-        self.assertEqual(binop.left.col_offset, 4)
+        self.assertEqual(binop.col_offset, 3)
+        self.assertEqual(binop.left.col_offset, 3)
         self.assertEqual(binop.right.col_offset, 7)
 
+        expr = """
+a = f'''
+          {blech}
+    '''
+"""
+        t = ast.parse(expr)
+        self.assertEqual(type(t), ast.Module)
+        self.assertEqual(len(t.body), 1)
+        # Check f'...'
+        self.assertEqual(type(t.body[0]), ast.Assign)
+        self.assertEqual(type(t.body[0].value), ast.JoinedStr)
+        self.assertEqual(len(t.body[0].value.values), 3)
+        self.assertEqual(type(t.body[0].value.values[1]), ast.FormattedValue)
+        self.assertEqual(t.body[0].lineno, 2)
+        self.assertEqual(t.body[0].value.lineno, 2)
+        self.assertEqual(t.body[0].value.values[0].lineno, 2)
+        self.assertEqual(t.body[0].value.values[1].lineno, 2)
+        self.assertEqual(t.body[0].value.values[2].lineno, 2)
+        self.assertEqual(t.body[0].col_offset, 0)
+        self.assertEqual(t.body[0].value.col_offset, 4)
+        self.assertEqual(t.body[0].value.values[0].col_offset, 4)
+        self.assertEqual(t.body[0].value.values[1].col_offset, 4)
+        self.assertEqual(t.body[0].value.values[2].col_offset, 4)
+        # Check {blech}
+        self.assertEqual(t.body[0].value.values[1].value.lineno, 3)
+        self.assertEqual(t.body[0].value.values[1].value.end_lineno, 3)
+        self.assertEqual(t.body[0].value.values[1].value.col_offset, 11)
+        self.assertEqual(t.body[0].value.values[1].value.end_col_offset, 16)
+
     def test_ast_line_numbers_with_parentheses(self):
         expr = """
 x = (
diff --git a/Misc/NEWS.d/next/Core and Builtins/2022-07-16-08-14-17.gh-issue-94869.eRwMsX.rst b/Misc/NEWS.d/next/Core and Builtins/2022-07-16-08-14-17.gh-issue-94869.eRwMsX.rst
new file mode 100644
index 0000000000000..2ccf91b0cd99a
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2022-07-16-08-14-17.gh-issue-94869.eRwMsX.rst	
@@ -0,0 +1,2 @@
+Fix the column offsets for some expressions in multi-line f-strings
+:mod:`ast` nodes. Patch by Pablo Galindo.
diff --git a/Parser/string_parser.c b/Parser/string_parser.c
index 5e94d477bc04a..4f3f046673cbe 100644
--- a/Parser/string_parser.c
+++ b/Parser/string_parser.c
@@ -326,6 +326,9 @@ fstring_find_expr_location(Token *parent, const char* expr_start, char *expr_str
                 start--;
             }
             *p_cols += (int)(expr_start - start);
+            if (*start == '\n') {
+                *p_cols -= 1;
+            }
         }
         /* adjust the start based on the number of newlines encountered
            before the f-string expression */
@@ -416,7 +419,7 @@ fstring_compile_expr(Parser *p, const char *expr_start, const char *expr_end,
                                      NULL, p->arena);
 
     p2->starting_lineno = t->lineno + lines;
-    p2->starting_col_offset = t->col_offset + cols;
+    p2->starting_col_offset = lines != 0 ? cols : t->col_offset + cols;
 
     expr = _PyPegen_run_parser(p2);
 


From webhook-mailer at python.org  Sat Jul 16 17:06:43 2022
From: webhook-mailer at python.org (pablogsal)
Date: Sat, 16 Jul 2022 21:06:43 -0000
Subject: [Python-checkins] gh-94869: Fix the location in some expressions
 for multi-line f-string ast nodes (GH-94895) (#94911)
Message-ID: <mailman.55.1658005603.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/964431eaeb1905a95cb1bd745d0b9c0052db4b94
commit: 964431eaeb1905a95cb1bd745d0b9c0052db4b94
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: pablogsal <Pablogsal at gmail.com>
date: 2022-07-16T22:06:33+01:00
summary:

gh-94869: Fix the location in some expressions for multi-line f-string ast nodes (GH-94895) (#94911)

(cherry picked from commit 2e9da8e3522764d09f1d6054a2be567e91a30812)

Co-authored-by: Pablo Galindo Salgado <Pablogsal at gmail.com>

Co-authored-by: Pablo Galindo Salgado <Pablogsal at gmail.com>

files:
A Misc/NEWS.d/next/Core and Builtins/2022-07-16-08-14-17.gh-issue-94869.eRwMsX.rst
M Lib/test/test_fstring.py
M Parser/string_parser.c

diff --git a/Lib/test/test_fstring.py b/Lib/test/test_fstring.py
index 8f3b609d33bc9..38345c8d58076 100644
--- a/Lib/test/test_fstring.py
+++ b/Lib/test/test_fstring.py
@@ -346,10 +346,39 @@ def test_ast_line_numbers_multiline_fstring(self):
         self.assertEqual(binop.lineno, 4)
         self.assertEqual(binop.left.lineno, 4)
         self.assertEqual(binop.right.lineno, 6)
-        self.assertEqual(binop.col_offset, 4)
-        self.assertEqual(binop.left.col_offset, 4)
+        self.assertEqual(binop.col_offset, 3)
+        self.assertEqual(binop.left.col_offset, 3)
         self.assertEqual(binop.right.col_offset, 7)
 
+        expr = """
+a = f'''
+          {blech}
+    '''
+"""
+        t = ast.parse(expr)
+        self.assertEqual(type(t), ast.Module)
+        self.assertEqual(len(t.body), 1)
+        # Check f'...'
+        self.assertEqual(type(t.body[0]), ast.Assign)
+        self.assertEqual(type(t.body[0].value), ast.JoinedStr)
+        self.assertEqual(len(t.body[0].value.values), 3)
+        self.assertEqual(type(t.body[0].value.values[1]), ast.FormattedValue)
+        self.assertEqual(t.body[0].lineno, 2)
+        self.assertEqual(t.body[0].value.lineno, 2)
+        self.assertEqual(t.body[0].value.values[0].lineno, 2)
+        self.assertEqual(t.body[0].value.values[1].lineno, 2)
+        self.assertEqual(t.body[0].value.values[2].lineno, 2)
+        self.assertEqual(t.body[0].col_offset, 0)
+        self.assertEqual(t.body[0].value.col_offset, 4)
+        self.assertEqual(t.body[0].value.values[0].col_offset, 4)
+        self.assertEqual(t.body[0].value.values[1].col_offset, 4)
+        self.assertEqual(t.body[0].value.values[2].col_offset, 4)
+        # Check {blech}
+        self.assertEqual(t.body[0].value.values[1].value.lineno, 3)
+        self.assertEqual(t.body[0].value.values[1].value.end_lineno, 3)
+        self.assertEqual(t.body[0].value.values[1].value.col_offset, 11)
+        self.assertEqual(t.body[0].value.values[1].value.end_col_offset, 16)
+
     def test_ast_line_numbers_with_parentheses(self):
         expr = """
 x = (
diff --git a/Misc/NEWS.d/next/Core and Builtins/2022-07-16-08-14-17.gh-issue-94869.eRwMsX.rst b/Misc/NEWS.d/next/Core and Builtins/2022-07-16-08-14-17.gh-issue-94869.eRwMsX.rst
new file mode 100644
index 0000000000000..2ccf91b0cd99a
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2022-07-16-08-14-17.gh-issue-94869.eRwMsX.rst	
@@ -0,0 +1,2 @@
+Fix the column offsets for some expressions in multi-line f-strings
+:mod:`ast` nodes. Patch by Pablo Galindo.
diff --git a/Parser/string_parser.c b/Parser/string_parser.c
index 80f158b5a65be..d33260d0aaf9e 100644
--- a/Parser/string_parser.c
+++ b/Parser/string_parser.c
@@ -315,6 +315,9 @@ fstring_find_expr_location(Token *parent, const char* expr_start, char *expr_str
                 start--;
             }
             *p_cols += (int)(expr_start - start);
+            if (*start == '\n') {
+                *p_cols -= 1;
+            }
         }
         /* adjust the start based on the number of newlines encountered
            before the f-string expression */
@@ -400,7 +403,7 @@ fstring_compile_expr(Parser *p, const char *expr_start, const char *expr_end,
                                      NULL, p->arena);
 
     p2->starting_lineno = t->lineno + lines;
-    p2->starting_col_offset = t->col_offset + cols;
+    p2->starting_col_offset = lines != 0 ? cols : t->col_offset + cols;
 
     expr = _PyPegen_run_parser(p2);
 


From webhook-mailer at python.org  Sat Jul 16 21:08:02 2022
From: webhook-mailer at python.org (brettcannon)
Date: Sun, 17 Jul 2022 01:08:02 -0000
Subject: [Python-checkins] gh-91181: drop support for bytes on sys.path
 (GH-31934)
Message-ID: <mailman.56.1658020083.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/6da988a46c8955755624ad9878288d5214fceb4e
commit: 6da988a46c8955755624ad9878288d5214fceb4e
branch: main
author: Thomas Grainger <tagrain at gmail.com>
committer: brettcannon <brett at python.org>
date: 2022-07-16T18:07:53-07:00
summary:

gh-91181: drop support for bytes on sys.path (GH-31934)

Support for bytes broke sometime between Python 3.2 and 3.6 and has been broken ever since. Trying to bring back supports is surprisingly difficult in the face of -b and checking for keys in sys.path_importer_cache. Since the support was broken for so long, trying to overcome the difficulty of bringing back the support has been deemed not worth it.

Co-authored-by: Eryk Sun <eryksun at gmail.com>
Co-authored-by: Brett Cannon <brett at python.org>

files:
A Misc/NEWS.d/next/Library/2022-03-16-14-24-14.bpo-47025.qtT3CE.rst
M Doc/library/sys.rst
M Doc/reference/import.rst
M Lib/importlib/_bootstrap_external.py
M Lib/test/test_zipimport.py
M Lib/zipimport.py

diff --git a/Doc/library/sys.rst b/Doc/library/sys.rst
index 7e2468446eb96..d9799f8358c26 100644
--- a/Doc/library/sys.rst
+++ b/Doc/library/sys.rst
@@ -1158,7 +1158,7 @@ always available.
    line option or the :envvar:`PYTHONSAFEPATH` environment variable?
 
    A program is free to modify this list for its own purposes.  Only strings
-   and bytes should be added to :data:`sys.path`; all other data types are
+   should be added to :data:`sys.path`; all other data types are
    ignored during import.
 
 
diff --git a/Doc/reference/import.rst b/Doc/reference/import.rst
index 29d402ebcf492..1e6b08f32a7ac 100644
--- a/Doc/reference/import.rst
+++ b/Doc/reference/import.rst
@@ -800,10 +800,8 @@ environment variable and various other installation- and
 implementation-specific defaults.  Entries in :data:`sys.path` can name
 directories on the file system, zip files, and potentially other "locations"
 (see the :mod:`site` module) that should be searched for modules, such as
-URLs, or database queries.  Only strings and bytes should be present on
-:data:`sys.path`; all other data types are ignored.  The encoding of bytes
-entries is determined by the individual :term:`path entry finders <path entry
-finder>`.
+URLs, or database queries.  Only strings should be present on
+:data:`sys.path`; all other data types are ignored.
 
 The :term:`path based finder` is a :term:`meta path finder`, so the import
 machinery begins the :term:`import path` search by calling the path
diff --git a/Lib/importlib/_bootstrap_external.py b/Lib/importlib/_bootstrap_external.py
index 007127b9fd426..b6c6716e90773 100644
--- a/Lib/importlib/_bootstrap_external.py
+++ b/Lib/importlib/_bootstrap_external.py
@@ -1475,7 +1475,7 @@ def _get_spec(cls, fullname, path, target=None):
         #  the list of paths that will become its __path__
         namespace_path = []
         for entry in path:
-            if not isinstance(entry, (str, bytes)):
+            if not isinstance(entry, str):
                 continue
             finder = cls._path_importer_cache(entry)
             if finder is not None:
diff --git a/Lib/test/test_zipimport.py b/Lib/test/test_zipimport.py
index fd2739dd89ac0..52d43bdead67f 100644
--- a/Lib/test/test_zipimport.py
+++ b/Lib/test/test_zipimport.py
@@ -742,7 +742,8 @@ def testBytesPath(self):
             z.writestr(zinfo, test_src)
 
         zipimport.zipimporter(filename)
-        zipimport.zipimporter(os.fsencode(filename))
+        with self.assertRaises(TypeError):
+            zipimport.zipimporter(os.fsencode(filename))
         with self.assertRaises(TypeError):
             zipimport.zipimporter(bytearray(os.fsencode(filename)))
         with self.assertRaises(TypeError):
diff --git a/Lib/zipimport.py b/Lib/zipimport.py
index d0394107c2c5f..016f1b8a79798 100644
--- a/Lib/zipimport.py
+++ b/Lib/zipimport.py
@@ -63,8 +63,7 @@ class zipimporter(_bootstrap_external._LoaderBasics):
     # if found, or else read it from the archive.
     def __init__(self, path):
         if not isinstance(path, str):
-            import os
-            path = os.fsdecode(path)
+            raise TypeError(f"expected str, not {type(path)!r}")
         if not path:
             raise ZipImportError('archive path is empty', path=path)
         if alt_path_sep:
diff --git a/Misc/NEWS.d/next/Library/2022-03-16-14-24-14.bpo-47025.qtT3CE.rst b/Misc/NEWS.d/next/Library/2022-03-16-14-24-14.bpo-47025.qtT3CE.rst
new file mode 100644
index 0000000000000..1c7c7ace9706d
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2022-03-16-14-24-14.bpo-47025.qtT3CE.rst
@@ -0,0 +1 @@
+Drop support for :class:`bytes` on :attr:`sys.path`.


From webhook-mailer at python.org  Sat Jul 16 21:14:04 2022
From: webhook-mailer at python.org (ethanfurman)
Date: Sun, 17 Jul 2022 01:14:04 -0000
Subject: [Python-checkins] gh-93910: [Enum] restore member.member
 restriction while keeping performance boost (GH-94913)
Message-ID: <mailman.57.1658020445.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/c20186c3972ff38577c4c5e32ca86748210983d2
commit: c20186c3972ff38577c4c5e32ca86748210983d2
branch: main
author: Ethan Furman <ethan at stoneleaf.us>
committer: ethanfurman <ethan at stoneleaf.us>
date: 2022-07-16T18:13:57-07:00
summary:

gh-93910: [Enum] restore member.member restriction while keeping performance boost (GH-94913)

files:
M Lib/enum.py
M Lib/test/test_enum.py

diff --git a/Lib/enum.py b/Lib/enum.py
index 652878ce1e1df..a4f1f09adae01 100644
--- a/Lib/enum.py
+++ b/Lib/enum.py
@@ -1101,6 +1101,14 @@ def __new__(cls, value):
     def __init__(self, *args, **kwds):
         pass
 
+    def __getattribute__(self, name):
+        self_dict = super().__getattribute__('__dict__')
+        cls = super().__getattribute__('__class__')
+        value = super().__getattribute__(name)
+        if isinstance(value, cls) and name not in self_dict and name in self._member_names_:
+            raise AttributeError("<enum '%s'> member has no attribute %r" % (cls.__name__, name))
+        return super().__getattribute__(name)
+
     def _generate_next_value_(name, start, count, last_values):
         """
         Generate the next value when not given.
diff --git a/Lib/test/test_enum.py b/Lib/test/test_enum.py
index aec18c79f7249..87d7c725014e3 100644
--- a/Lib/test/test_enum.py
+++ b/Lib/test/test_enum.py
@@ -2646,7 +2646,6 @@ class Private(Enum):
         self.assertEqual(Private._Private__corporal, 'Radar')
         self.assertEqual(Private._Private__major_, 'Hoolihan')
 
-    @unittest.skip("Accessing all values retained for performance reasons, see GH-93910")
     def test_exception_for_member_from_member_access(self):
         with self.assertRaisesRegex(AttributeError, "<enum .Di.> member has no attribute .NO."):
             class Di(Enum):
@@ -2654,6 +2653,12 @@ class Di(Enum):
                 NO = 0
             nope = Di.YES.NO
 
+    def test_no_exception_for_overridden_member_from_member_access(self):
+        class Di(Enum):
+            YES = 1
+            NO = 0
+        Di.YES.NO = Di.NO
+        nope = Di.YES.NO
 
     def test_dynamic_members_with_static_methods(self):
         #


From webhook-mailer at python.org  Sat Jul 16 21:31:34 2022
From: webhook-mailer at python.org (miss-islington)
Date: Sun, 17 Jul 2022 01:31:34 -0000
Subject: [Python-checkins] gh-91181: drop support for bytes on sys.path
 (GH-31934)
Message-ID: <mailman.58.1658021495.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/ccbf85382c48f02939b9f84def45265be1dd795f
commit: ccbf85382c48f02939b9f84def45265be1dd795f
branch: 3.11
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-16T18:31:25-07:00
summary:

gh-91181: drop support for bytes on sys.path (GH-31934)


Support for bytes broke sometime between Python 3.2 and 3.6 and has been broken ever since. Trying to bring back supports is surprisingly difficult in the face of -b and checking for keys in sys.path_importer_cache. Since the support was broken for so long, trying to overcome the difficulty of bringing back the support has been deemed not worth it.

Co-authored-by: Eryk Sun <eryksun at gmail.com>
Co-authored-by: Brett Cannon <brett at python.org>
(cherry picked from commit 6da988a46c8955755624ad9878288d5214fceb4e)

Co-authored-by: Thomas Grainger <tagrain at gmail.com>

files:
A Misc/NEWS.d/next/Library/2022-03-16-14-24-14.bpo-47025.qtT3CE.rst
M Doc/library/sys.rst
M Doc/reference/import.rst
M Lib/importlib/_bootstrap_external.py
M Lib/test/test_zipimport.py
M Lib/zipimport.py

diff --git a/Doc/library/sys.rst b/Doc/library/sys.rst
index 7e2468446eb96..d9799f8358c26 100644
--- a/Doc/library/sys.rst
+++ b/Doc/library/sys.rst
@@ -1158,7 +1158,7 @@ always available.
    line option or the :envvar:`PYTHONSAFEPATH` environment variable?
 
    A program is free to modify this list for its own purposes.  Only strings
-   and bytes should be added to :data:`sys.path`; all other data types are
+   should be added to :data:`sys.path`; all other data types are
    ignored during import.
 
 
diff --git a/Doc/reference/import.rst b/Doc/reference/import.rst
index 29d402ebcf492..1e6b08f32a7ac 100644
--- a/Doc/reference/import.rst
+++ b/Doc/reference/import.rst
@@ -800,10 +800,8 @@ environment variable and various other installation- and
 implementation-specific defaults.  Entries in :data:`sys.path` can name
 directories on the file system, zip files, and potentially other "locations"
 (see the :mod:`site` module) that should be searched for modules, such as
-URLs, or database queries.  Only strings and bytes should be present on
-:data:`sys.path`; all other data types are ignored.  The encoding of bytes
-entries is determined by the individual :term:`path entry finders <path entry
-finder>`.
+URLs, or database queries.  Only strings should be present on
+:data:`sys.path`; all other data types are ignored.
 
 The :term:`path based finder` is a :term:`meta path finder`, so the import
 machinery begins the :term:`import path` search by calling the path
diff --git a/Lib/importlib/_bootstrap_external.py b/Lib/importlib/_bootstrap_external.py
index 446d7981acbab..f603a89f7f5a9 100644
--- a/Lib/importlib/_bootstrap_external.py
+++ b/Lib/importlib/_bootstrap_external.py
@@ -1468,7 +1468,7 @@ def _get_spec(cls, fullname, path, target=None):
         #  the list of paths that will become its __path__
         namespace_path = []
         for entry in path:
-            if not isinstance(entry, (str, bytes)):
+            if not isinstance(entry, str):
                 continue
             finder = cls._path_importer_cache(entry)
             if finder is not None:
diff --git a/Lib/test/test_zipimport.py b/Lib/test/test_zipimport.py
index 84995be329568..59a520015ff3a 100644
--- a/Lib/test/test_zipimport.py
+++ b/Lib/test/test_zipimport.py
@@ -758,7 +758,8 @@ def testBytesPath(self):
             z.writestr(zinfo, test_src)
 
         zipimport.zipimporter(filename)
-        zipimport.zipimporter(os.fsencode(filename))
+        with self.assertRaises(TypeError):
+            zipimport.zipimporter(os.fsencode(filename))
         with self.assertRaises(TypeError):
             zipimport.zipimporter(bytearray(os.fsencode(filename)))
         with self.assertRaises(TypeError):
diff --git a/Lib/zipimport.py b/Lib/zipimport.py
index 25eaee9c0f291..225bd214d627c 100644
--- a/Lib/zipimport.py
+++ b/Lib/zipimport.py
@@ -63,8 +63,7 @@ class zipimporter(_bootstrap_external._LoaderBasics):
     # if found, or else read it from the archive.
     def __init__(self, path):
         if not isinstance(path, str):
-            import os
-            path = os.fsdecode(path)
+            raise TypeError(f"expected str, not {type(path)!r}")
         if not path:
             raise ZipImportError('archive path is empty', path=path)
         if alt_path_sep:
diff --git a/Misc/NEWS.d/next/Library/2022-03-16-14-24-14.bpo-47025.qtT3CE.rst b/Misc/NEWS.d/next/Library/2022-03-16-14-24-14.bpo-47025.qtT3CE.rst
new file mode 100644
index 0000000000000..1c7c7ace9706d
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2022-03-16-14-24-14.bpo-47025.qtT3CE.rst
@@ -0,0 +1 @@
+Drop support for :class:`bytes` on :attr:`sys.path`.


From webhook-mailer at python.org  Sat Jul 16 22:14:49 2022
From: webhook-mailer at python.org (brettcannon)
Date: Sun, 17 Jul 2022 02:14:49 -0000
Subject: [Python-checkins] gh-91181: Add a What's New entry for dropping
 bytes support for `sys.path` (GH-94918)
Message-ID: <mailman.59.1658024090.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/ec4745b5f2c2a460f12c97243c5b7d875f24b0c8
commit: ec4745b5f2c2a460f12c97243c5b7d875f24b0c8
branch: main
author: Brett Cannon <brett at python.org>
committer: brettcannon <brett at python.org>
date: 2022-07-16T19:14:40-07:00
summary:

gh-91181: Add a What's New entry for dropping bytes support for `sys.path` (GH-94918)

files:
M Doc/whatsnew/3.11.rst

diff --git a/Doc/whatsnew/3.11.rst b/Doc/whatsnew/3.11.rst
index f7274a8cea158..63afbbb7f18e0 100644
--- a/Doc/whatsnew/3.11.rst
+++ b/Doc/whatsnew/3.11.rst
@@ -383,6 +383,13 @@ Other Language Changes
   coerces negative zero to zero after rounding to the format precision.  See
   :pep:`682` for more details.  (Contributed by John Belmonte in :gh:`90153`.)
 
+* Bytes are no longer accepted on :attr:`sys.path`.  Support broke sometime
+  between Python 3.2 and 3.6 with no one noticing until after Python 3.10.0
+  was released. Bringing back support would also be problematic due to
+  interactions between :option:`-b` and :attr:`sys.path_importer_cache` when
+  there is a mixture of strings and bytes keys.
+  (Contributed by Thomas Grainger in :gh:`91181`.)
+
 Other CPython Implementation Changes
 ====================================
 


From webhook-mailer at python.org  Sat Jul 16 22:24:06 2022
From: webhook-mailer at python.org (miss-islington)
Date: Sun, 17 Jul 2022 02:24:06 -0000
Subject: [Python-checkins] gh-91181: Add a What's New entry for dropping
 bytes support for `sys.path` (GH-94918)
Message-ID: <mailman.60.1658024647.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/5a34287b5dc75293bea02489feda22b4b6b28e3e
commit: 5a34287b5dc75293bea02489feda22b4b6b28e3e
branch: 3.11
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-16T19:23:57-07:00
summary:

gh-91181: Add a What's New entry for dropping bytes support for `sys.path` (GH-94918)

(cherry picked from commit ec4745b5f2c2a460f12c97243c5b7d875f24b0c8)

Co-authored-by: Brett Cannon <brett at python.org>

files:
M Doc/whatsnew/3.11.rst

diff --git a/Doc/whatsnew/3.11.rst b/Doc/whatsnew/3.11.rst
index a5b9c31afac25..58ecf335f87b1 100644
--- a/Doc/whatsnew/3.11.rst
+++ b/Doc/whatsnew/3.11.rst
@@ -383,6 +383,13 @@ Other Language Changes
   coerces negative zero to zero after rounding to the format precision.  See
   :pep:`682` for more details.  (Contributed by John Belmonte in :gh:`90153`.)
 
+* Bytes are no longer accepted on :attr:`sys.path`.  Support broke sometime
+  between Python 3.2 and 3.6 with no one noticing until after Python 3.10.0
+  was released. Bringing back support would also be problematic due to
+  interactions between :option:`-b` and :attr:`sys.path_importer_cache` when
+  there is a mixture of strings and bytes keys.
+  (Contributed by Thomas Grainger in :gh:`91181`.)
+
 Other CPython Implementation Changes
 ====================================
 


From webhook-mailer at python.org  Sun Jul 17 00:54:07 2022
From: webhook-mailer at python.org (miss-islington)
Date: Sun, 17 Jul 2022 04:54:07 -0000
Subject: [Python-checkins] gh-93910: [Enum] restore member.member
 restriction while keeping performance boost (GH-94913)
Message-ID: <mailman.61.1658033648.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/30f28ac296e506b336e0ab56c41422a53c36d0c2
commit: 30f28ac296e506b336e0ab56c41422a53c36d0c2
branch: 3.11
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-16T21:53:41-07:00
summary:

gh-93910: [Enum] restore member.member restriction while keeping performance boost (GH-94913)

(cherry picked from commit c20186c3972ff38577c4c5e32ca86748210983d2)

Co-authored-by: Ethan Furman <ethan at stoneleaf.us>

files:
M Lib/enum.py
M Lib/test/test_enum.py

diff --git a/Lib/enum.py b/Lib/enum.py
index e5971917cef46..b19d40cbc5ed9 100644
--- a/Lib/enum.py
+++ b/Lib/enum.py
@@ -1114,6 +1114,14 @@ def __new__(cls, value):
     def __init__(self, *args, **kwds):
         pass
 
+    def __getattribute__(self, name):
+        self_dict = super().__getattribute__('__dict__')
+        cls = super().__getattribute__('__class__')
+        value = super().__getattribute__(name)
+        if isinstance(value, cls) and name not in self_dict and name in self._member_names_:
+            raise AttributeError("<enum '%s'> member has no attribute %r" % (cls.__name__, name))
+        return super().__getattribute__(name)
+
     def _generate_next_value_(name, start, count, last_values):
         """
         Generate the next value when not given.
diff --git a/Lib/test/test_enum.py b/Lib/test/test_enum.py
index f9a662746fb1a..74f31bec50c4f 100644
--- a/Lib/test/test_enum.py
+++ b/Lib/test/test_enum.py
@@ -2611,7 +2611,6 @@ class Private(Enum):
         self.assertEqual(Private._Private__corporal, 'Radar')
         self.assertEqual(Private._Private__major_, 'Hoolihan')
 
-    @unittest.skip("Accessing all values retained for performance reasons, see GH-93910")
     def test_exception_for_member_from_member_access(self):
         with self.assertRaisesRegex(AttributeError, "<enum .Di.> member has no attribute .NO."):
             class Di(Enum):
@@ -2619,6 +2618,12 @@ class Di(Enum):
                 NO = 0
             nope = Di.YES.NO
 
+    def test_no_exception_for_overridden_member_from_member_access(self):
+        class Di(Enum):
+            YES = 1
+            NO = 0
+        Di.YES.NO = Di.NO
+        nope = Di.YES.NO
 
     def test_dynamic_members_with_static_methods(self):
         #


From webhook-mailer at python.org  Sun Jul 17 01:24:09 2022
From: webhook-mailer at python.org (serhiy-storchaka)
Date: Sun, 17 Jul 2022 05:24:09 -0000
Subject: [Python-checkins] gh-94864: Fix PyArg_Parse* with deprecated format
 units "u" and "Z" (GH-94902)
Message-ID: <mailman.62.1658035449.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/107c21c5d56682320b38c01b5575c1604a429239
commit: 107c21c5d56682320b38c01b5575c1604a429239
branch: 3.11
author: Serhiy Storchaka <storchaka at gmail.com>
committer: serhiy-storchaka <storchaka at gmail.com>
date: 2022-07-17T08:23:37+03:00
summary:

gh-94864: Fix PyArg_Parse* with deprecated format units "u" and "Z" (GH-94902)

It returned 1 (success) when warnings are turned into exceptions.

files:
A Misc/NEWS.d/next/C API/2022-07-16-14-57-23.gh-issue-94864.Pb41ab.rst
M Lib/test/test_getargs2.py
M Python/getargs.c

diff --git a/Lib/test/test_getargs2.py b/Lib/test/test_getargs2.py
index e0db9e40e650b..571cabb5f13a0 100644
--- a/Lib/test/test_getargs2.py
+++ b/Lib/test/test_getargs2.py
@@ -2,6 +2,7 @@
 import math
 import string
 import sys
+import warnings
 from test import support
 from test.support import import_helper
 from test.support import warnings_helper
@@ -999,6 +1000,9 @@ def test_u(self):
             self.assertRaises(TypeError, getargs_u, memoryview(b'memoryview'))
         with self.assertWarns(DeprecationWarning):
             self.assertRaises(TypeError, getargs_u, None)
+        with warnings.catch_warnings():
+            warnings.simplefilter('error', DeprecationWarning)
+            self.assertRaises(DeprecationWarning, getargs_u, 'abc\xe9')
 
     @support.requires_legacy_unicode_capi
     def test_u_hash(self):
@@ -1015,6 +1019,9 @@ def test_u_hash(self):
             self.assertRaises(TypeError, getargs_u_hash, memoryview(b'memoryview'))
         with self.assertWarns(DeprecationWarning):
             self.assertRaises(TypeError, getargs_u_hash, None)
+        with warnings.catch_warnings():
+            warnings.simplefilter('error', DeprecationWarning)
+            self.assertRaises(DeprecationWarning, getargs_u_hash, 'abc\xe9')
 
     @support.requires_legacy_unicode_capi
     def test_Z(self):
@@ -1031,6 +1038,9 @@ def test_Z(self):
             self.assertRaises(TypeError, getargs_Z, memoryview(b'memoryview'))
         with self.assertWarns(DeprecationWarning):
             self.assertIsNone(getargs_Z(None))
+        with warnings.catch_warnings():
+            warnings.simplefilter('error', DeprecationWarning)
+            self.assertRaises(DeprecationWarning, getargs_Z, 'abc\xe9')
 
     @support.requires_legacy_unicode_capi
     def test_Z_hash(self):
@@ -1047,6 +1057,9 @@ def test_Z_hash(self):
             self.assertRaises(TypeError, getargs_Z_hash, memoryview(b'memoryview'))
         with self.assertWarns(DeprecationWarning):
             self.assertIsNone(getargs_Z_hash(None))
+        with warnings.catch_warnings():
+            warnings.simplefilter('error', DeprecationWarning)
+            self.assertRaises(DeprecationWarning, getargs_Z_hash, 'abc\xe9')
 
 
 class Object_TestCase(unittest.TestCase):
diff --git a/Misc/NEWS.d/next/C API/2022-07-16-14-57-23.gh-issue-94864.Pb41ab.rst b/Misc/NEWS.d/next/C API/2022-07-16-14-57-23.gh-issue-94864.Pb41ab.rst
new file mode 100644
index 0000000000000..ed2a954778020
--- /dev/null
+++ b/Misc/NEWS.d/next/C API/2022-07-16-14-57-23.gh-issue-94864.Pb41ab.rst	
@@ -0,0 +1,2 @@
+Fix ``PyArg_Parse*`` with deprecated format units "u" and "Z". It returned 1
+(success) when warnings are turned into exceptions.
diff --git a/Python/getargs.c b/Python/getargs.c
index a2ea4d7da45f8..d7ba9a1e28239 100644
--- a/Python/getargs.c
+++ b/Python/getargs.c
@@ -1017,7 +1017,7 @@ convertsimple(PyObject *arg, const char **p_format, va_list *p_va, int flags,
     {
         if (PyErr_WarnFormat(PyExc_DeprecationWarning, 1,
                 "getargs: The '%c' format is deprecated. Use 'U' instead.", c)) {
-            return NULL;
+            RETURN_ERR_OCCURRED;
         }
 _Py_COMP_DIAG_PUSH
 _Py_COMP_DIAG_IGNORE_DEPR_DECLS


From webhook-mailer at python.org  Sun Jul 17 01:46:52 2022
From: webhook-mailer at python.org (miss-islington)
Date: Sun, 17 Jul 2022 05:46:52 -0000
Subject: [Python-checkins] gh-94864: Fix PyArg_Parse* with deprecated format
 units "u" and "Z" (GH-94902)
Message-ID: <mailman.63.1658036813.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/31608abf55839f5fa9cce33d530e35ea6e0ad427
commit: 31608abf55839f5fa9cce33d530e35ea6e0ad427
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-16T22:46:43-07:00
summary:

gh-94864: Fix PyArg_Parse* with deprecated format units "u" and "Z" (GH-94902)


It returned 1 (success) when warnings are turned into exceptions.
(cherry picked from commit 107c21c5d56682320b38c01b5575c1604a429239)

Co-authored-by: Serhiy Storchaka <storchaka at gmail.com>

files:
A Misc/NEWS.d/next/C API/2022-07-16-14-57-23.gh-issue-94864.Pb41ab.rst
M Lib/test/test_getargs2.py
M Python/getargs.c

diff --git a/Lib/test/test_getargs2.py b/Lib/test/test_getargs2.py
index e0db9e40e650b..571cabb5f13a0 100644
--- a/Lib/test/test_getargs2.py
+++ b/Lib/test/test_getargs2.py
@@ -2,6 +2,7 @@
 import math
 import string
 import sys
+import warnings
 from test import support
 from test.support import import_helper
 from test.support import warnings_helper
@@ -999,6 +1000,9 @@ def test_u(self):
             self.assertRaises(TypeError, getargs_u, memoryview(b'memoryview'))
         with self.assertWarns(DeprecationWarning):
             self.assertRaises(TypeError, getargs_u, None)
+        with warnings.catch_warnings():
+            warnings.simplefilter('error', DeprecationWarning)
+            self.assertRaises(DeprecationWarning, getargs_u, 'abc\xe9')
 
     @support.requires_legacy_unicode_capi
     def test_u_hash(self):
@@ -1015,6 +1019,9 @@ def test_u_hash(self):
             self.assertRaises(TypeError, getargs_u_hash, memoryview(b'memoryview'))
         with self.assertWarns(DeprecationWarning):
             self.assertRaises(TypeError, getargs_u_hash, None)
+        with warnings.catch_warnings():
+            warnings.simplefilter('error', DeprecationWarning)
+            self.assertRaises(DeprecationWarning, getargs_u_hash, 'abc\xe9')
 
     @support.requires_legacy_unicode_capi
     def test_Z(self):
@@ -1031,6 +1038,9 @@ def test_Z(self):
             self.assertRaises(TypeError, getargs_Z, memoryview(b'memoryview'))
         with self.assertWarns(DeprecationWarning):
             self.assertIsNone(getargs_Z(None))
+        with warnings.catch_warnings():
+            warnings.simplefilter('error', DeprecationWarning)
+            self.assertRaises(DeprecationWarning, getargs_Z, 'abc\xe9')
 
     @support.requires_legacy_unicode_capi
     def test_Z_hash(self):
@@ -1047,6 +1057,9 @@ def test_Z_hash(self):
             self.assertRaises(TypeError, getargs_Z_hash, memoryview(b'memoryview'))
         with self.assertWarns(DeprecationWarning):
             self.assertIsNone(getargs_Z_hash(None))
+        with warnings.catch_warnings():
+            warnings.simplefilter('error', DeprecationWarning)
+            self.assertRaises(DeprecationWarning, getargs_Z_hash, 'abc\xe9')
 
 
 class Object_TestCase(unittest.TestCase):
diff --git a/Misc/NEWS.d/next/C API/2022-07-16-14-57-23.gh-issue-94864.Pb41ab.rst b/Misc/NEWS.d/next/C API/2022-07-16-14-57-23.gh-issue-94864.Pb41ab.rst
new file mode 100644
index 0000000000000..ed2a954778020
--- /dev/null
+++ b/Misc/NEWS.d/next/C API/2022-07-16-14-57-23.gh-issue-94864.Pb41ab.rst	
@@ -0,0 +1,2 @@
+Fix ``PyArg_Parse*`` with deprecated format units "u" and "Z". It returned 1
+(success) when warnings are turned into exceptions.
diff --git a/Python/getargs.c b/Python/getargs.c
index d5e083509efef..92fc0aff322d2 100644
--- a/Python/getargs.c
+++ b/Python/getargs.c
@@ -1016,7 +1016,7 @@ convertsimple(PyObject *arg, const char **p_format, va_list *p_va, int flags,
     {
         if (PyErr_WarnFormat(PyExc_DeprecationWarning, 1,
                 "getargs: The '%c' format is deprecated. Use 'U' instead.", c)) {
-            return NULL;
+            RETURN_ERR_OCCURRED;
         }
 _Py_COMP_DIAG_PUSH
 _Py_COMP_DIAG_IGNORE_DEPR_DECLS


From webhook-mailer at python.org  Sun Jul 17 10:20:28 2022
From: webhook-mailer at python.org (zooba)
Date: Sun, 17 Jul 2022 14:20:28 -0000
Subject: [Python-checkins] gh-92348: Add quotes to support building on
 Windows with spaces in directory name (GH-94925)
Message-ID: <mailman.64.1658067629.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/5c19ddab65f91d190ec94c494e95c5d551a45efc
commit: 5c19ddab65f91d190ec94c494e95c5d551a45efc
branch: main
author: Steve Dower <steve.dower at python.org>
committer: zooba <steve.dower at microsoft.com>
date: 2022-07-17T15:20:24+01:00
summary:

gh-92348: Add quotes to support building on Windows with spaces in directory name (GH-94925)

files:
M PCbuild/pyproject.props

diff --git a/PCbuild/pyproject.props b/PCbuild/pyproject.props
index df3efc631d154..e398b333572e9 100644
--- a/PCbuild/pyproject.props
+++ b/PCbuild/pyproject.props
@@ -229,7 +229,7 @@ public override bool Execute() {
   </Target>
 
   <Target Name="FindPythonForBuild" Condition="$(PythonForBuild) == ''">
-    <Exec Command="$(MSBuildThisFileDirectory)\find_python.bat -q"
+    <Exec Command="&quot;$(MSBuildThisFileDirectory)\find_python.bat&quot; -q"
           EchoOff="true"
           ConsoleToMsBuild="true">
         <Output TaskParameter="ConsoleOutput" ItemName="_CmdExeLines" />


From webhook-mailer at python.org  Sun Jul 17 10:46:47 2022
From: webhook-mailer at python.org (miss-islington)
Date: Sun, 17 Jul 2022 14:46:47 -0000
Subject: [Python-checkins] gh-92348: Add quotes to support building on
 Windows with spaces in directory name (GH-94925)
Message-ID: <mailman.65.1658069208.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/7bca87d384b9c8b5243d930536c13c66b559010d
commit: 7bca87d384b9c8b5243d930536c13c66b559010d
branch: 3.11
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-17T07:46:43-07:00
summary:

gh-92348: Add quotes to support building on Windows with spaces in directory name (GH-94925)

(cherry picked from commit 5c19ddab65f91d190ec94c494e95c5d551a45efc)

Co-authored-by: Steve Dower <steve.dower at python.org>

files:
M PCbuild/pyproject.props

diff --git a/PCbuild/pyproject.props b/PCbuild/pyproject.props
index df3efc631d154..e398b333572e9 100644
--- a/PCbuild/pyproject.props
+++ b/PCbuild/pyproject.props
@@ -229,7 +229,7 @@ public override bool Execute() {
   </Target>
 
   <Target Name="FindPythonForBuild" Condition="$(PythonForBuild) == ''">
-    <Exec Command="$(MSBuildThisFileDirectory)\find_python.bat -q"
+    <Exec Command="&quot;$(MSBuildThisFileDirectory)\find_python.bat&quot; -q"
           EchoOff="true"
           ConsoleToMsBuild="true">
         <Output TaskParameter="ConsoleOutput" ItemName="_CmdExeLines" />


From webhook-mailer at python.org  Sun Jul 17 11:11:35 2022
From: webhook-mailer at python.org (zooba)
Date: Sun, 17 Jul 2022 15:11:35 -0000
Subject: [Python-checkins] gh-91348: Restore frame argument to sys._getframe
 audit event (GH-94928)
Message-ID: <mailman.66.1658070696.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/044a593cbbe1639e906e06c47504dd1020ddfee4
commit: 044a593cbbe1639e906e06c47504dd1020ddfee4
branch: main
author: Steve Dower <steve.dower at python.org>
committer: zooba <steve.dower at microsoft.com>
date: 2022-07-17T16:11:24+01:00
summary:

gh-91348: Restore frame argument to sys._getframe audit event (GH-94928)

files:
M Doc/library/sys.rst
M Lib/test/audit-tests.py
M Lib/test/test_audit.py
M Python/sysmodule.c

diff --git a/Doc/library/sys.rst b/Doc/library/sys.rst
index d9799f8358c26..e10efb10ff5a8 100644
--- a/Doc/library/sys.rst
+++ b/Doc/library/sys.rst
@@ -774,7 +774,7 @@ always available.
    that is deeper than the call stack, :exc:`ValueError` is raised.  The default
    for *depth* is zero, returning the frame at the top of the call stack.
 
-   .. audit-event:: sys._getframe "" sys._getframe
+   .. audit-event:: sys._getframe frame sys._getframe
 
    .. impl-detail::
 
diff --git a/Lib/test/audit-tests.py b/Lib/test/audit-tests.py
index ccec9fedc4460..00333cc9036a3 100644
--- a/Lib/test/audit-tests.py
+++ b/Lib/test/audit-tests.py
@@ -408,6 +408,17 @@ def hook(event, *args):
             raise RuntimeError("Expected sqlite3.load_extension to fail")
 
 
+def test_sys_getframe():
+    import sys
+
+    def hook(event, args):
+        if event.startswith("sys."):
+            print(event, args[0].f_code.co_name)
+
+    sys.addaudithook(hook)
+    sys._getframe()
+
+
 if __name__ == "__main__":
     from test.support import suppress_msvcrt_asserts
 
diff --git a/Lib/test/test_audit.py b/Lib/test/test_audit.py
index 0fa2d74835cba..6a025f39912e6 100644
--- a/Lib/test/test_audit.py
+++ b/Lib/test/test_audit.py
@@ -176,5 +176,17 @@ def test_sqlite3(self):
         self.assertEqual(actual, expected)
 
 
+    def test_sys_getframe(self):
+        returncode, events, stderr = self.run_python("test_sys_getframe")
+        if returncode:
+            self.fail(stderr)
+
+        if support.verbose:
+            print(*events, sep='\n')
+        actual = [(ev[0], ev[2]) for ev in events]
+        expected = [("sys._getframe", "test_sys_getframe")]
+
+        self.assertEqual(actual, expected)
+
 if __name__ == "__main__":
     unittest.main()
diff --git a/Python/sysmodule.c b/Python/sysmodule.c
index 93120071b400f..a5fa551b95764 100644
--- a/Python/sysmodule.c
+++ b/Python/sysmodule.c
@@ -1772,10 +1772,6 @@ sys__getframe_impl(PyObject *module, int depth)
     PyThreadState *tstate = _PyThreadState_GET();
     _PyInterpreterFrame *frame = tstate->cframe->current_frame;
 
-    if (_PySys_Audit(tstate, "sys._getframe", NULL) < 0) {
-        return NULL;
-    }
-
     if (frame != NULL) {
         while (depth > 0) {
             frame = frame->previous;
@@ -1793,7 +1789,13 @@ sys__getframe_impl(PyObject *module, int depth)
                          "call stack is not deep enough");
         return NULL;
     }
-    return _Py_XNewRef((PyObject *)_PyFrame_GetFrameObject(frame));
+
+    PyObject *pyFrame = Py_XNewRef((PyObject *)_PyFrame_GetFrameObject(frame));
+    if (pyFrame && _PySys_Audit(tstate, "sys._getframe", "(O)", pyFrame) < 0) {
+        Py_DECREF(pyFrame);
+        return NULL;
+    }
+    return pyFrame;
 }
 
 /*[clinic input]


From webhook-mailer at python.org  Sun Jul 17 11:39:31 2022
From: webhook-mailer at python.org (miss-islington)
Date: Sun, 17 Jul 2022 15:39:31 -0000
Subject: [Python-checkins] gh-94821: Fix autobind of empty unix domain
 address (GH-94826)
Message-ID: <mailman.67.1658072371.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/65d87a2cb843d5f6af6489cb9784f55938196a28
commit: 65d87a2cb843d5f6af6489cb9784f55938196a28
branch: 3.11
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-17T08:39:22-07:00
summary:

gh-94821: Fix autobind of empty unix domain address (GH-94826)


When binding a unix socket to an empty address on Linux, the socket is
automatically bound to an available address in the abstract namespace.

    >>> s = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
    >>> s.bind("")
    >>> s.getsockname()
    b'\x0075499'

Since python 3.9, the socket is bound to the one address:

    >>> s.getsockname()
    b'\x00'

And trying to bind multiple sockets will fail with:

    Traceback (most recent call last):
      File "/home/nsoffer/src/cpython/Lib/test/test_socket.py", line 5553, in testAutobind
        s2.bind("")
    OSError: [Errno 98] Address already in use

Added 2 tests:
- Auto binding empty address on Linux
- Failing to bind an empty address on other platforms

Fixes f6b3a07b7df6 (bpo-44493: Add missing terminated NUL in sockaddr_un's length (GH-26866)
(cherry picked from commit c22f134211743cd5ad14cec1dd4f527bee542b4c)

Co-authored-by: Nir Soffer <nsoffer at redhat.com>

files:
A Misc/NEWS.d/next/Library/2022-07-14-00-43-52.gh-issue-94821.e17ghU.rst
M Lib/test/test_socket.py
M Modules/socketmodule.c

diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py
index 1aaa9e44f90c6..a2938cd834ac1 100644
--- a/Lib/test/test_socket.py
+++ b/Lib/test/test_socket.py
@@ -5480,6 +5480,20 @@ def testBytearrayName(self):
             s.bind(bytearray(b"\x00python\x00test\x00"))
             self.assertEqual(s.getsockname(), b"\x00python\x00test\x00")
 
+    def testAutobind(self):
+        # Check that binding to an empty string binds to an available address
+        # in the abstract namespace as specified in unix(7) "Autobind feature".
+        abstract_address = b"^\0[0-9a-f]{5}"
+        with socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) as s1:
+            s1.bind("")
+            self.assertRegex(s1.getsockname(), abstract_address)
+            # Each socket is bound to a different abstract address.
+            with socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) as s2:
+                s2.bind("")
+                self.assertRegex(s2.getsockname(), abstract_address)
+                self.assertNotEqual(s1.getsockname(), s2.getsockname())
+
+
 @unittest.skipUnless(hasattr(socket, 'AF_UNIX'), 'test needs socket.AF_UNIX')
 class TestUnixDomain(unittest.TestCase):
 
@@ -5549,6 +5563,11 @@ def testUnencodableAddr(self):
         self.addCleanup(os_helper.unlink, path)
         self.assertEqual(self.sock.getsockname(), path)
 
+    @unittest.skipIf(sys.platform == 'linux', 'Linux specific test')
+    def testEmptyAddress(self):
+        # Test that binding empty address fails.
+        self.assertRaises(OSError, self.sock.bind, "")
+
 
 class BufferIOTest(SocketConnectedTest):
     """
diff --git a/Misc/NEWS.d/next/Library/2022-07-14-00-43-52.gh-issue-94821.e17ghU.rst b/Misc/NEWS.d/next/Library/2022-07-14-00-43-52.gh-issue-94821.e17ghU.rst
new file mode 100644
index 0000000000000..bf7885aef8cbf
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2022-07-14-00-43-52.gh-issue-94821.e17ghU.rst
@@ -0,0 +1,2 @@
+Fix binding of unix socket to empty address on Linux to use an available
+address from the abstract namespace, instead of "\0".
diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
index 461096cf17004..4e936e29a7cd9 100644
--- a/Modules/socketmodule.c
+++ b/Modules/socketmodule.c
@@ -1692,8 +1692,10 @@ getsockaddrarg(PySocketSockObject *s, PyObject *args,
 
         struct sockaddr_un* addr = &addrbuf->un;
 #ifdef __linux__
-        if (path.len > 0 && *(const char *)path.buf == 0) {
-            /* Linux abstract namespace extension */
+        if (path.len == 0 || *(const char *)path.buf == 0) {
+            /* Linux abstract namespace extension:
+               - Empty address auto-binding to an abstract address
+               - Address that starts with null byte */
             if ((size_t)path.len > sizeof addr->sun_path) {
                 PyErr_SetString(PyExc_OSError,
                                 "AF_UNIX path too long");


From webhook-mailer at python.org  Sun Jul 17 11:39:35 2022
From: webhook-mailer at python.org (miss-islington)
Date: Sun, 17 Jul 2022 15:39:35 -0000
Subject: [Python-checkins] gh-94821: Fix autobind of empty unix domain
 address (GH-94826)
Message-ID: <mailman.68.1658072376.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/5d75edd925f4e0624bd341b7c3ec8c61f0deec23
commit: 5d75edd925f4e0624bd341b7c3ec8c61f0deec23
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-17T08:39:30-07:00
summary:

gh-94821: Fix autobind of empty unix domain address (GH-94826)


When binding a unix socket to an empty address on Linux, the socket is
automatically bound to an available address in the abstract namespace.

    >>> s = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
    >>> s.bind("")
    >>> s.getsockname()
    b'\x0075499'

Since python 3.9, the socket is bound to the one address:

    >>> s.getsockname()
    b'\x00'

And trying to bind multiple sockets will fail with:

    Traceback (most recent call last):
      File "/home/nsoffer/src/cpython/Lib/test/test_socket.py", line 5553, in testAutobind
        s2.bind("")
    OSError: [Errno 98] Address already in use

Added 2 tests:
- Auto binding empty address on Linux
- Failing to bind an empty address on other platforms

Fixes f6b3a07b7df6 (bpo-44493: Add missing terminated NUL in sockaddr_un's length (GH-26866)
(cherry picked from commit c22f134211743cd5ad14cec1dd4f527bee542b4c)

Co-authored-by: Nir Soffer <nsoffer at redhat.com>

files:
A Misc/NEWS.d/next/Library/2022-07-14-00-43-52.gh-issue-94821.e17ghU.rst
M Lib/test/test_socket.py
M Modules/socketmodule.c

diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py
index 5c15648b605c6..9c5f6d3dc9a6d 100644
--- a/Lib/test/test_socket.py
+++ b/Lib/test/test_socket.py
@@ -5421,6 +5421,20 @@ def testBytearrayName(self):
             s.bind(bytearray(b"\x00python\x00test\x00"))
             self.assertEqual(s.getsockname(), b"\x00python\x00test\x00")
 
+    def testAutobind(self):
+        # Check that binding to an empty string binds to an available address
+        # in the abstract namespace as specified in unix(7) "Autobind feature".
+        abstract_address = b"^\0[0-9a-f]{5}"
+        with socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) as s1:
+            s1.bind("")
+            self.assertRegex(s1.getsockname(), abstract_address)
+            # Each socket is bound to a different abstract address.
+            with socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) as s2:
+                s2.bind("")
+                self.assertRegex(s2.getsockname(), abstract_address)
+                self.assertNotEqual(s1.getsockname(), s2.getsockname())
+
+
 @unittest.skipUnless(hasattr(socket, 'AF_UNIX'), 'test needs socket.AF_UNIX')
 class TestUnixDomain(unittest.TestCase):
 
@@ -5490,6 +5504,11 @@ def testUnencodableAddr(self):
         self.addCleanup(os_helper.unlink, path)
         self.assertEqual(self.sock.getsockname(), path)
 
+    @unittest.skipIf(sys.platform == 'linux', 'Linux specific test')
+    def testEmptyAddress(self):
+        # Test that binding empty address fails.
+        self.assertRaises(OSError, self.sock.bind, "")
+
 
 class BufferIOTest(SocketConnectedTest):
     """
diff --git a/Misc/NEWS.d/next/Library/2022-07-14-00-43-52.gh-issue-94821.e17ghU.rst b/Misc/NEWS.d/next/Library/2022-07-14-00-43-52.gh-issue-94821.e17ghU.rst
new file mode 100644
index 0000000000000..bf7885aef8cbf
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2022-07-14-00-43-52.gh-issue-94821.e17ghU.rst
@@ -0,0 +1,2 @@
+Fix binding of unix socket to empty address on Linux to use an available
+address from the abstract namespace, instead of "\0".
diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
index 271e79f7eabc3..6a9ac2ceb734e 100644
--- a/Modules/socketmodule.c
+++ b/Modules/socketmodule.c
@@ -1675,8 +1675,10 @@ getsockaddrarg(PySocketSockObject *s, PyObject *args,
 
         struct sockaddr_un* addr = &addrbuf->un;
 #ifdef __linux__
-        if (path.len > 0 && *(const char *)path.buf == 0) {
-            /* Linux abstract namespace extension */
+        if (path.len == 0 || *(const char *)path.buf == 0) {
+            /* Linux abstract namespace extension:
+               - Empty address auto-binding to an abstract address
+               - Address that starts with null byte */
             if ((size_t)path.len > sizeof addr->sun_path) {
                 PyErr_SetString(PyExc_OSError,
                                 "AF_UNIX path too long");


From webhook-mailer at python.org  Sun Jul 17 11:50:06 2022
From: webhook-mailer at python.org (miss-islington)
Date: Sun, 17 Jul 2022 15:50:06 -0000
Subject: [Python-checkins] gh-91348: Restore frame argument to sys._getframe
 audit event (GH-94928)
Message-ID: <mailman.69.1658073007.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/1c63734217be75c9fd024ba8fad28ccb108b4d55
commit: 1c63734217be75c9fd024ba8fad28ccb108b4d55
branch: 3.11
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-17T08:49:57-07:00
summary:

gh-91348: Restore frame argument to sys._getframe audit event (GH-94928)

(cherry picked from commit 044a593cbbe1639e906e06c47504dd1020ddfee4)

Co-authored-by: Steve Dower <steve.dower at python.org>

files:
M Doc/library/sys.rst
M Lib/test/audit-tests.py
M Lib/test/test_audit.py
M Python/sysmodule.c

diff --git a/Doc/library/sys.rst b/Doc/library/sys.rst
index d9799f8358c26..e10efb10ff5a8 100644
--- a/Doc/library/sys.rst
+++ b/Doc/library/sys.rst
@@ -774,7 +774,7 @@ always available.
    that is deeper than the call stack, :exc:`ValueError` is raised.  The default
    for *depth* is zero, returning the frame at the top of the call stack.
 
-   .. audit-event:: sys._getframe "" sys._getframe
+   .. audit-event:: sys._getframe frame sys._getframe
 
    .. impl-detail::
 
diff --git a/Lib/test/audit-tests.py b/Lib/test/audit-tests.py
index ccec9fedc4460..00333cc9036a3 100644
--- a/Lib/test/audit-tests.py
+++ b/Lib/test/audit-tests.py
@@ -408,6 +408,17 @@ def hook(event, *args):
             raise RuntimeError("Expected sqlite3.load_extension to fail")
 
 
+def test_sys_getframe():
+    import sys
+
+    def hook(event, args):
+        if event.startswith("sys."):
+            print(event, args[0].f_code.co_name)
+
+    sys.addaudithook(hook)
+    sys._getframe()
+
+
 if __name__ == "__main__":
     from test.support import suppress_msvcrt_asserts
 
diff --git a/Lib/test/test_audit.py b/Lib/test/test_audit.py
index 0fa2d74835cba..6a025f39912e6 100644
--- a/Lib/test/test_audit.py
+++ b/Lib/test/test_audit.py
@@ -176,5 +176,17 @@ def test_sqlite3(self):
         self.assertEqual(actual, expected)
 
 
+    def test_sys_getframe(self):
+        returncode, events, stderr = self.run_python("test_sys_getframe")
+        if returncode:
+            self.fail(stderr)
+
+        if support.verbose:
+            print(*events, sep='\n')
+        actual = [(ev[0], ev[2]) for ev in events]
+        expected = [("sys._getframe", "test_sys_getframe")]
+
+        self.assertEqual(actual, expected)
+
 if __name__ == "__main__":
     unittest.main()
diff --git a/Python/sysmodule.c b/Python/sysmodule.c
index 261ebb96ba285..e45a26404581c 100644
--- a/Python/sysmodule.c
+++ b/Python/sysmodule.c
@@ -1780,10 +1780,6 @@ sys__getframe_impl(PyObject *module, int depth)
     PyThreadState *tstate = _PyThreadState_GET();
     _PyInterpreterFrame *frame = tstate->cframe->current_frame;
 
-    if (_PySys_Audit(tstate, "sys._getframe", NULL) < 0) {
-        return NULL;
-    }
-
     if (frame != NULL) {
         while (depth > 0) {
             frame = frame->previous;
@@ -1801,7 +1797,13 @@ sys__getframe_impl(PyObject *module, int depth)
                          "call stack is not deep enough");
         return NULL;
     }
-    return _Py_XNewRef((PyObject *)_PyFrame_GetFrameObject(frame));
+
+    PyObject *pyFrame = Py_XNewRef((PyObject *)_PyFrame_GetFrameObject(frame));
+    if (pyFrame && _PySys_Audit(tstate, "sys._getframe", "(O)", pyFrame) < 0) {
+        Py_DECREF(pyFrame);
+        return NULL;
+    }
+    return pyFrame;
 }
 
 /*[clinic input]


From webhook-mailer at python.org  Sun Jul 17 13:22:13 2022
From: webhook-mailer at python.org (gvanrossum)
Date: Sun, 17 Jul 2022 17:22:13 -0000
Subject: [Python-checkins] gh-72889: Remove redundant
 mock.Mock()._is_coroutine = False workarounds (#94926)
Message-ID: <mailman.70.1658078533.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/07aeb7405ea42729b95ecae225f1d96a4aea5121
commit: 07aeb7405ea42729b95ecae225f1d96a4aea5121
branch: main
author: Thomas Grainger <tagrain at gmail.com>
committer: gvanrossum <gvanrossum at gmail.com>
date: 2022-07-17T10:21:58-07:00
summary:

gh-72889: Remove redundant mock.Mock()._is_coroutine = False workarounds (#94926)

files:
M Lib/test/test_asyncio/test_base_events.py
M Lib/test/test_asyncio/test_selector_events.py
M Lib/test/test_asyncio/test_subprocess.py

diff --git a/Lib/test/test_asyncio/test_base_events.py b/Lib/test/test_asyncio/test_base_events.py
index c6671bd0ad3d8..063174adacfa3 100644
--- a/Lib/test/test_asyncio/test_base_events.py
+++ b/Lib/test/test_asyncio/test_base_events.py
@@ -40,7 +40,6 @@ def mock_socket_module():
 
     m_socket.socket = mock.MagicMock()
     m_socket.socket.return_value = test_utils.mock_nonblocking_socket()
-    m_socket.getaddrinfo._is_coroutine = False
 
     return m_socket
 
@@ -1286,9 +1285,7 @@ def _test_create_connection_ip_addr(self, m_socket, allow_inet_pton):
         sock = m_socket.socket.return_value
 
         self.loop._add_reader = mock.Mock()
-        self.loop._add_reader._is_coroutine = False
         self.loop._add_writer = mock.Mock()
-        self.loop._add_writer._is_coroutine = False
 
         coro = self.loop.create_connection(asyncio.Protocol, '1.2.3.4', 80)
         t, p = self.loop.run_until_complete(coro)
@@ -1330,9 +1327,7 @@ def test_create_connection_ipv6_scope(self, m_socket):
         sock.family = socket.AF_INET6
 
         self.loop._add_reader = mock.Mock()
-        self.loop._add_reader._is_coroutine = False
         self.loop._add_writer = mock.Mock()
-        self.loop._add_writer._is_coroutine = False
 
         coro = self.loop.create_connection(asyncio.Protocol, 'fe80::1%1', 80)
         t, p = self.loop.run_until_complete(coro)
@@ -1359,9 +1354,7 @@ def test_create_connection_service_name(self, m_socket):
         sock = m_socket.socket.return_value
 
         self.loop._add_reader = mock.Mock()
-        self.loop._add_reader._is_coroutine = False
         self.loop._add_writer = mock.Mock()
-        self.loop._add_writer._is_coroutine = False
 
         for service, port in ('http', 80), (b'http', 80):
             coro = self.loop.create_connection(asyncio.Protocol,
@@ -1590,7 +1583,6 @@ class Err(OSError):
 
         m_socket.getaddrinfo.return_value = [
             (2, 1, 6, '', ('127.0.0.1', 10100))]
-        m_socket.getaddrinfo._is_coroutine = False
         m_sock = m_socket.socket.return_value = mock.Mock()
         m_sock.bind.side_effect = Err
 
@@ -1601,7 +1593,6 @@ class Err(OSError):
     @patch_socket
     def test_create_datagram_endpoint_no_addrinfo(self, m_socket):
         m_socket.getaddrinfo.return_value = []
-        m_socket.getaddrinfo._is_coroutine = False
 
         coro = self.loop.create_datagram_endpoint(
             MyDatagramProto, local_addr=('localhost', 0))
@@ -1835,7 +1826,6 @@ def getaddrinfo(*args, **kw):
         m_socket.getaddrinfo = getaddrinfo
         m_socket.socket.return_value.bind = bind = mock.Mock()
         self.loop._add_reader = mock.Mock()
-        self.loop._add_reader._is_coroutine = False
 
         reuseport_supported = hasattr(socket, 'SO_REUSEPORT')
         coro = self.loop.create_datagram_endpoint(
diff --git a/Lib/test/test_asyncio/test_selector_events.py b/Lib/test/test_asyncio/test_selector_events.py
index d9d30fc25b513..22dcfb2308352 100644
--- a/Lib/test/test_asyncio/test_selector_events.py
+++ b/Lib/test/test_asyncio/test_selector_events.py
@@ -61,7 +61,6 @@ def setUp(self):
     def test_make_socket_transport(self):
         m = mock.Mock()
         self.loop.add_reader = mock.Mock()
-        self.loop.add_reader._is_coroutine = False
         transport = self.loop._make_socket_transport(m, asyncio.Protocol())
         self.assertIsInstance(transport, _SelectorSocketTransport)
 
diff --git a/Lib/test/test_asyncio/test_subprocess.py b/Lib/test/test_asyncio/test_subprocess.py
index 09a5c390b3629..305330a691834 100644
--- a/Lib/test/test_asyncio/test_subprocess.py
+++ b/Lib/test/test_asyncio/test_subprocess.py
@@ -50,8 +50,6 @@ def setUp(self):
 
     def create_transport(self, waiter=None):
         protocol = mock.Mock()
-        protocol.connection_made._is_coroutine = False
-        protocol.process_exited._is_coroutine = False
         transport = TestSubprocessTransport(
                         self.loop, protocol, ['test'], False,
                         None, None, None, 0, waiter=waiter)


From webhook-mailer at python.org  Sun Jul 17 13:49:10 2022
From: webhook-mailer at python.org (miss-islington)
Date: Sun, 17 Jul 2022 17:49:10 -0000
Subject: [Python-checkins] gh-72889: Remove redundant
 mock.Mock()._is_coroutine = False workarounds (GH-94926)
Message-ID: <mailman.71.1658080151.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/8d0249e3458109f3d3b5d0e2b87cbf9d58dce072
commit: 8d0249e3458109f3d3b5d0e2b87cbf9d58dce072
branch: 3.11
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-17T10:49:01-07:00
summary:

gh-72889: Remove redundant mock.Mock()._is_coroutine = False workarounds (GH-94926)

(cherry picked from commit 07aeb7405ea42729b95ecae225f1d96a4aea5121)

Co-authored-by: Thomas Grainger <tagrain at gmail.com>

files:
M Lib/test/test_asyncio/test_base_events.py
M Lib/test/test_asyncio/test_selector_events.py
M Lib/test/test_asyncio/test_subprocess.py

diff --git a/Lib/test/test_asyncio/test_base_events.py b/Lib/test/test_asyncio/test_base_events.py
index c6671bd0ad3d8..063174adacfa3 100644
--- a/Lib/test/test_asyncio/test_base_events.py
+++ b/Lib/test/test_asyncio/test_base_events.py
@@ -40,7 +40,6 @@ def mock_socket_module():
 
     m_socket.socket = mock.MagicMock()
     m_socket.socket.return_value = test_utils.mock_nonblocking_socket()
-    m_socket.getaddrinfo._is_coroutine = False
 
     return m_socket
 
@@ -1286,9 +1285,7 @@ def _test_create_connection_ip_addr(self, m_socket, allow_inet_pton):
         sock = m_socket.socket.return_value
 
         self.loop._add_reader = mock.Mock()
-        self.loop._add_reader._is_coroutine = False
         self.loop._add_writer = mock.Mock()
-        self.loop._add_writer._is_coroutine = False
 
         coro = self.loop.create_connection(asyncio.Protocol, '1.2.3.4', 80)
         t, p = self.loop.run_until_complete(coro)
@@ -1330,9 +1327,7 @@ def test_create_connection_ipv6_scope(self, m_socket):
         sock.family = socket.AF_INET6
 
         self.loop._add_reader = mock.Mock()
-        self.loop._add_reader._is_coroutine = False
         self.loop._add_writer = mock.Mock()
-        self.loop._add_writer._is_coroutine = False
 
         coro = self.loop.create_connection(asyncio.Protocol, 'fe80::1%1', 80)
         t, p = self.loop.run_until_complete(coro)
@@ -1359,9 +1354,7 @@ def test_create_connection_service_name(self, m_socket):
         sock = m_socket.socket.return_value
 
         self.loop._add_reader = mock.Mock()
-        self.loop._add_reader._is_coroutine = False
         self.loop._add_writer = mock.Mock()
-        self.loop._add_writer._is_coroutine = False
 
         for service, port in ('http', 80), (b'http', 80):
             coro = self.loop.create_connection(asyncio.Protocol,
@@ -1590,7 +1583,6 @@ class Err(OSError):
 
         m_socket.getaddrinfo.return_value = [
             (2, 1, 6, '', ('127.0.0.1', 10100))]
-        m_socket.getaddrinfo._is_coroutine = False
         m_sock = m_socket.socket.return_value = mock.Mock()
         m_sock.bind.side_effect = Err
 
@@ -1601,7 +1593,6 @@ class Err(OSError):
     @patch_socket
     def test_create_datagram_endpoint_no_addrinfo(self, m_socket):
         m_socket.getaddrinfo.return_value = []
-        m_socket.getaddrinfo._is_coroutine = False
 
         coro = self.loop.create_datagram_endpoint(
             MyDatagramProto, local_addr=('localhost', 0))
@@ -1835,7 +1826,6 @@ def getaddrinfo(*args, **kw):
         m_socket.getaddrinfo = getaddrinfo
         m_socket.socket.return_value.bind = bind = mock.Mock()
         self.loop._add_reader = mock.Mock()
-        self.loop._add_reader._is_coroutine = False
 
         reuseport_supported = hasattr(socket, 'SO_REUSEPORT')
         coro = self.loop.create_datagram_endpoint(
diff --git a/Lib/test/test_asyncio/test_selector_events.py b/Lib/test/test_asyncio/test_selector_events.py
index d9d30fc25b513..22dcfb2308352 100644
--- a/Lib/test/test_asyncio/test_selector_events.py
+++ b/Lib/test/test_asyncio/test_selector_events.py
@@ -61,7 +61,6 @@ def setUp(self):
     def test_make_socket_transport(self):
         m = mock.Mock()
         self.loop.add_reader = mock.Mock()
-        self.loop.add_reader._is_coroutine = False
         transport = self.loop._make_socket_transport(m, asyncio.Protocol())
         self.assertIsInstance(transport, _SelectorSocketTransport)
 
diff --git a/Lib/test/test_asyncio/test_subprocess.py b/Lib/test/test_asyncio/test_subprocess.py
index 09a5c390b3629..305330a691834 100644
--- a/Lib/test/test_asyncio/test_subprocess.py
+++ b/Lib/test/test_asyncio/test_subprocess.py
@@ -50,8 +50,6 @@ def setUp(self):
 
     def create_transport(self, waiter=None):
         protocol = mock.Mock()
-        protocol.connection_made._is_coroutine = False
-        protocol.process_exited._is_coroutine = False
         transport = TestSubprocessTransport(
                         self.loop, protocol, ['test'], False,
                         None, None, None, 0, waiter=waiter)


From webhook-mailer at python.org  Sun Jul 17 21:51:13 2022
From: webhook-mailer at python.org (ethanfurman)
Date: Mon, 18 Jul 2022 01:51:13 -0000
Subject: [Python-checkins] gh-94601: [Enum] fix inheritance for __str__ and
 friends (GH-94942)
Message-ID: <mailman.72.1658109074.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/c961d14f85a0e3e53d5ad1182206ef34030f10b8
commit: c961d14f85a0e3e53d5ad1182206ef34030f10b8
branch: main
author: Ethan Furman <ethan at stoneleaf.us>
committer: ethanfurman <ethan at stoneleaf.us>
date: 2022-07-17T18:51:04-07:00
summary:

gh-94601: [Enum] fix inheritance for __str__ and friends (GH-94942)

files:
M Lib/enum.py
M Lib/test/test_enum.py

diff --git a/Lib/enum.py b/Lib/enum.py
index a4f1f09adae01..80945c116bfe5 100644
--- a/Lib/enum.py
+++ b/Lib/enum.py
@@ -247,7 +247,10 @@ def __set_name__(self, enum_class, member_name):
         if not enum_class._use_args_:
             enum_member = enum_class._new_member_(enum_class)
             if not hasattr(enum_member, '_value_'):
-                enum_member._value_ = value
+                try:
+                    enum_member._value_ = enum_class._member_type_(*args)
+                except Exception as exc:
+                    enum_member._value_ = value
         else:
             enum_member = enum_class._new_member_(enum_class, *args)
             if not hasattr(enum_member, '_value_'):
@@ -562,7 +565,13 @@ def __new__(metacls, cls, bases, classdict, *, boundary=None, _simple=False, **k
                 classdict['__str__'] = enum_class.__str__
         for name in ('__repr__', '__str__', '__format__', '__reduce_ex__'):
             if name not in classdict:
-                setattr(enum_class, name, getattr(first_enum, name))
+                # check for mixin overrides before replacing
+                enum_method = getattr(first_enum, name)
+                found_method = getattr(enum_class, name)
+                object_method = getattr(object, name)
+                data_type_method = getattr(member_type, name)
+                if found_method in (data_type_method, object_method):
+                    setattr(enum_class, name, enum_method)
         #
         # for Flag, add __or__, __and__, __xor__, and __invert__
         if Flag is not None and issubclass(enum_class, Flag):
@@ -937,16 +946,18 @@ def _find_data_repr_(mcls, class_name, bases):
     @classmethod
     def _find_data_type_(mcls, class_name, bases):
         data_types = set()
+        base_chain = set()
         for chain in bases:
             candidate = None
             for base in chain.__mro__:
+                base_chain.add(base)
                 if base is object:
                     continue
                 elif issubclass(base, Enum):
                     if base._member_type_ is not object:
                         data_types.add(base._member_type_)
                         break
-                elif '__new__' in base.__dict__:
+                elif '__new__' in base.__dict__ or '__init__' in base.__dict__:
                     if issubclass(base, Enum):
                         continue
                     data_types.add(candidate or base)
@@ -1658,7 +1669,13 @@ def convert_class(cls):
         enum_class = type(cls_name, (etype, ), body, boundary=boundary, _simple=True)
         for name in ('__repr__', '__str__', '__format__', '__reduce_ex__'):
             if name not in body:
-                setattr(enum_class, name, getattr(etype, name))
+                # check for mixin overrides before replacing
+                enum_method = getattr(etype, name)
+                found_method = getattr(enum_class, name)
+                object_method = getattr(object, name)
+                data_type_method = getattr(member_type, name)
+                if found_method in (data_type_method, object_method):
+                    setattr(enum_class, name, enum_method)
         gnv_last_values = []
         if issubclass(enum_class, Flag):
             # Flag / IntFlag
@@ -1989,7 +2006,6 @@ def _old_convert_(etype, name, module, filter, source=None, *, boundary=None):
         members.sort(key=lambda t: t[0])
     cls = etype(name, members, module=module, boundary=boundary or KEEP)
     cls.__reduce_ex__ = _reduce_ex_by_global_name
-    cls.__repr__ = global_enum_repr
     return cls
 
 _stdlib_enums = IntEnum, StrEnum, IntFlag
diff --git a/Lib/test/test_enum.py b/Lib/test/test_enum.py
index 87d7c725014e3..69fba9a13c89a 100644
--- a/Lib/test/test_enum.py
+++ b/Lib/test/test_enum.py
@@ -2693,12 +2693,15 @@ def test_repr_with_dataclass(self):
         @dataclass
         class Foo:
             __qualname__ = 'Foo'
-            a: int = 0
+            a: int
         class Entries(Foo, Enum):
-            ENTRY1 = Foo(1)
+            ENTRY1 = 1
+        self.assertTrue(isinstance(Entries.ENTRY1, Foo))
+        self.assertTrue(Entries._member_type_ is Foo, Entries._member_type_)
+        self.assertTrue(Entries.ENTRY1.value == Foo(1), Entries.ENTRY1.value)
         self.assertEqual(repr(Entries.ENTRY1), '<Entries.ENTRY1: Foo(a=1)>')
 
-    def test_repr_with_non_data_type_mixin(self):
+    def test_repr_with_init_data_type_mixin(self):
         # non-data_type is a mixin that doesn't define __new__
         class Foo:
             def __init__(self, a):
@@ -2706,10 +2709,23 @@ def __init__(self, a):
             def __repr__(self):
                 return f'Foo(a={self.a!r})'
         class Entries(Foo, Enum):
-            ENTRY1 = Foo(1)
-
+            ENTRY1 = 1
+        #
         self.assertEqual(repr(Entries.ENTRY1), '<Entries.ENTRY1: Foo(a=1)>')
 
+    def test_repr_and_str_with_non_data_type_mixin(self):
+        # non-data_type is a mixin that doesn't define __new__
+        class Foo:
+            def __repr__(self):
+                return 'Foo'
+            def __str__(self):
+                return 'ooF'
+        class Entries(Foo, Enum):
+            ENTRY1 = 1
+        #
+        self.assertEqual(repr(Entries.ENTRY1), 'Foo')
+        self.assertEqual(str(Entries.ENTRY1), 'ooF')
+
     def test_value_backup_assign(self):
         # check that enum will add missing values when custom __new__ does not
         class Some(Enum):


From webhook-mailer at python.org  Sun Jul 17 22:18:46 2022
From: webhook-mailer at python.org (miss-islington)
Date: Mon, 18 Jul 2022 02:18:46 -0000
Subject: [Python-checkins] gh-94601: [Enum] fix inheritance for __str__ and
 friends (GH-94942)
Message-ID: <mailman.73.1658110727.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/e747562345238cefd68ef6581feb17707a3a06ff
commit: e747562345238cefd68ef6581feb17707a3a06ff
branch: 3.11
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-17T19:18:41-07:00
summary:

gh-94601: [Enum] fix inheritance for __str__ and friends (GH-94942)

(cherry picked from commit c961d14f85a0e3e53d5ad1182206ef34030f10b8)

Co-authored-by: Ethan Furman <ethan at stoneleaf.us>

files:
M Lib/enum.py
M Lib/test/test_enum.py

diff --git a/Lib/enum.py b/Lib/enum.py
index b19d40cbc5ed9..f5c29edffcf9f 100644
--- a/Lib/enum.py
+++ b/Lib/enum.py
@@ -247,7 +247,10 @@ def __set_name__(self, enum_class, member_name):
         if not enum_class._use_args_:
             enum_member = enum_class._new_member_(enum_class)
             if not hasattr(enum_member, '_value_'):
-                enum_member._value_ = value
+                try:
+                    enum_member._value_ = enum_class._member_type_(*args)
+                except Exception as exc:
+                    enum_member._value_ = value
         else:
             enum_member = enum_class._new_member_(enum_class, *args)
             if not hasattr(enum_member, '_value_'):
@@ -562,7 +565,13 @@ def __new__(metacls, cls, bases, classdict, *, boundary=None, _simple=False, **k
                 classdict['__str__'] = enum_class.__str__
         for name in ('__repr__', '__str__', '__format__', '__reduce_ex__'):
             if name not in classdict:
-                setattr(enum_class, name, getattr(first_enum, name))
+                # check for mixin overrides before replacing
+                enum_method = getattr(first_enum, name)
+                found_method = getattr(enum_class, name)
+                object_method = getattr(object, name)
+                data_type_method = getattr(member_type, name)
+                if found_method in (data_type_method, object_method):
+                    setattr(enum_class, name, enum_method)
         #
         # for Flag, add __or__, __and__, __xor__, and __invert__
         if Flag is not None and issubclass(enum_class, Flag):
@@ -950,16 +959,18 @@ def _find_data_repr_(mcls, class_name, bases):
     @classmethod
     def _find_data_type_(mcls, class_name, bases):
         data_types = set()
+        base_chain = set()
         for chain in bases:
             candidate = None
             for base in chain.__mro__:
+                base_chain.add(base)
                 if base is object:
                     continue
                 elif issubclass(base, Enum):
                     if base._member_type_ is not object:
                         data_types.add(base._member_type_)
                         break
-                elif '__new__' in base.__dict__:
+                elif '__new__' in base.__dict__ or '__init__' in base.__dict__:
                     if issubclass(base, Enum):
                         continue
                     data_types.add(candidate or base)
@@ -1671,7 +1682,13 @@ def convert_class(cls):
         enum_class = type(cls_name, (etype, ), body, boundary=boundary, _simple=True)
         for name in ('__repr__', '__str__', '__format__', '__reduce_ex__'):
             if name not in body:
-                setattr(enum_class, name, getattr(etype, name))
+                # check for mixin overrides before replacing
+                enum_method = getattr(etype, name)
+                found_method = getattr(enum_class, name)
+                object_method = getattr(object, name)
+                data_type_method = getattr(member_type, name)
+                if found_method in (data_type_method, object_method):
+                    setattr(enum_class, name, enum_method)
         gnv_last_values = []
         if issubclass(enum_class, Flag):
             # Flag / IntFlag
@@ -2002,7 +2019,6 @@ def _old_convert_(etype, name, module, filter, source=None, *, boundary=None):
         members.sort(key=lambda t: t[0])
     cls = etype(name, members, module=module, boundary=boundary or KEEP)
     cls.__reduce_ex__ = _reduce_ex_by_global_name
-    cls.__repr__ = global_enum_repr
     return cls
 
 _stdlib_enums = IntEnum, StrEnum, IntFlag
diff --git a/Lib/test/test_enum.py b/Lib/test/test_enum.py
index 74f31bec50c4f..80834f2529ae9 100644
--- a/Lib/test/test_enum.py
+++ b/Lib/test/test_enum.py
@@ -2658,12 +2658,15 @@ def test_repr_with_dataclass(self):
         @dataclass
         class Foo:
             __qualname__ = 'Foo'
-            a: int = 0
+            a: int
         class Entries(Foo, Enum):
-            ENTRY1 = Foo(1)
+            ENTRY1 = 1
+        self.assertTrue(isinstance(Entries.ENTRY1, Foo))
+        self.assertTrue(Entries._member_type_ is Foo, Entries._member_type_)
+        self.assertTrue(Entries.ENTRY1.value == Foo(1), Entries.ENTRY1.value)
         self.assertEqual(repr(Entries.ENTRY1), '<Entries.ENTRY1: Foo(a=1)>')
 
-    def test_repr_with_non_data_type_mixin(self):
+    def test_repr_with_init_data_type_mixin(self):
         # non-data_type is a mixin that doesn't define __new__
         class Foo:
             def __init__(self, a):
@@ -2671,10 +2674,23 @@ def __init__(self, a):
             def __repr__(self):
                 return f'Foo(a={self.a!r})'
         class Entries(Foo, Enum):
-            ENTRY1 = Foo(1)
-
+            ENTRY1 = 1
+        #
         self.assertEqual(repr(Entries.ENTRY1), '<Entries.ENTRY1: Foo(a=1)>')
 
+    def test_repr_and_str_with_non_data_type_mixin(self):
+        # non-data_type is a mixin that doesn't define __new__
+        class Foo:
+            def __repr__(self):
+                return 'Foo'
+            def __str__(self):
+                return 'ooF'
+        class Entries(Foo, Enum):
+            ENTRY1 = 1
+        #
+        self.assertEqual(repr(Entries.ENTRY1), 'Foo')
+        self.assertEqual(str(Entries.ENTRY1), 'ooF')
+
     def test_value_backup_assign(self):
         # check that enum will add missing values when custom __new__ does not
         class Some(Enum):


From webhook-mailer at python.org  Mon Jul 18 02:47:04 2022
From: webhook-mailer at python.org (tiran)
Date: Mon, 18 Jul 2022 06:47:04 -0000
Subject: [Python-checkins] [3.11] gh-94801: Use custom flags to check for
 headers and libs (GH-94802) (GH-94881)
Message-ID: <mailman.74.1658126826.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/30412d91b6bfb4c973dbfd5cbe2c2e2f7d9e0563
commit: 30412d91b6bfb4c973dbfd5cbe2c2e2f7d9e0563
branch: 3.11
author: Christian Heimes <christian at python.org>
committer: tiran <christian at python.org>
date: 2022-07-18T08:46:49+02:00
summary:

[3.11] gh-94801: Use custom flags to check for headers and libs (GH-94802) (GH-94881)

Co-authored-by: Christian Heimes <christian at python.org>

files:
A Misc/NEWS.d/next/Build/2022-07-13-10-13-10.gh-issue-94801.3xUB24.rst
M configure
M configure.ac

diff --git a/Misc/NEWS.d/next/Build/2022-07-13-10-13-10.gh-issue-94801.3xUB24.rst b/Misc/NEWS.d/next/Build/2022-07-13-10-13-10.gh-issue-94801.3xUB24.rst
new file mode 100644
index 0000000000000..5caf84f96da13
--- /dev/null
+++ b/Misc/NEWS.d/next/Build/2022-07-13-10-13-10.gh-issue-94801.3xUB24.rst
@@ -0,0 +1,2 @@
+``configure`` now uses custom flags like ``ZLIB_CFLAGS`` and ``ZLIB_LIBS``
+when searching for headers and libraries.
diff --git a/configure b/configure
index 2186190631c7b..be8935937c8f4 100755
--- a/configure
+++ b/configure
@@ -3042,6 +3042,12 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
+
+
+
+
+
+
 if test "$srcdir" != . -a "$srcdir" != "$(pwd)"; then
     # If we're building out-of-tree, we need to make sure the following
     # resources get picked up before their $srcdir counterparts.
@@ -11164,7 +11170,15 @@ fi
 	echo "$LIBUUID_PKG_ERRORS" >&5
 
 
-      for ac_header in uuid/uuid.h
+      save_CFLAGS=$CFLAGS
+save_CPPFLAGS=$CPPFLAGS
+save_LDFLAGS=$LDFLAGS
+save_LIBS=$LIBS
+
+
+        CPPFLAGS="$CFLAGS $LIBUUID_CFLAGS"
+        LDFLAGS="$LDFLAGS $LIBUUID_LIBS"
+        for ac_header in uuid/uuid.h
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "uuid/uuid.h" "ac_cv_header_uuid_uuid_h" "$ac_includes_default"
 if test "x$ac_cv_header_uuid_uuid_h" = xyes; then :
@@ -11172,11 +11186,7 @@ if test "x$ac_cv_header_uuid_uuid_h" = xyes; then :
 #define HAVE_UUID_UUID_H 1
 _ACEOF
 
-        save_CFLAGS=$CFLAGS
-save_CPPFLAGS=$CPPFLAGS
-save_LDFLAGS=$LDFLAGS
-save_LIBS=$LIBS
-
+          py_check_lib_save_LIBS=$LIBS
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for uuid_generate_time in -luuid" >&5
 $as_echo_n "checking for uuid_generate_time in -luuid... " >&6; }
 if ${ac_cv_lib_uuid_uuid_generate_time+:} false; then :
@@ -11217,20 +11227,10 @@ if test "x$ac_cv_lib_uuid_uuid_generate_time" = xyes; then :
   have_uuid=yes
 fi
 
+LIBS=$py_check_lib_save_LIBS
 
-CFLAGS=$save_CFLAGS
-CPPFLAGS=$save_CPPFLAGS
-LDFLAGS=$save_LDFLAGS
-LIBS=$save_LIBS
-
-
-        save_CFLAGS=$CFLAGS
-save_CPPFLAGS=$CPPFLAGS
-save_LDFLAGS=$LDFLAGS
-save_LIBS=$LIBS
-
-
-          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for uuid_generate_time_safe in -luuid" >&5
+          py_check_lib_save_LIBS=$LIBS
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for uuid_generate_time_safe in -luuid" >&5
 $as_echo_n "checking for uuid_generate_time_safe in -luuid... " >&6; }
 if ${ac_cv_lib_uuid_uuid_generate_time_safe+:} false; then :
   $as_echo_n "(cached) " >&6
@@ -11267,19 +11267,18 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_uuid_uuid_generate_time_safe" >&5
 $as_echo "$ac_cv_lib_uuid_uuid_generate_time_safe" >&6; }
 if test "x$ac_cv_lib_uuid_uuid_generate_time_safe" = xyes; then :
-
-            have_uuid=yes
+  have_uuid=yes
             $as_echo "#define HAVE_UUID_GENERATE_TIME_SAFE 1" >>confdefs.h
 
 
 fi
 
+LIBS=$py_check_lib_save_LIBS
 
-CFLAGS=$save_CFLAGS
-CPPFLAGS=$save_CPPFLAGS
-LDFLAGS=$save_LDFLAGS
-LIBS=$save_LIBS
 
+fi
+
+done
 
         if test "x$have_uuid" = xyes; then :
 
@@ -11288,9 +11287,11 @@ LIBS=$save_LIBS
 
 fi
 
-fi
+CFLAGS=$save_CFLAGS
+CPPFLAGS=$save_CPPFLAGS
+LDFLAGS=$save_LDFLAGS
+LIBS=$save_LIBS
 
-done
 
 
 
@@ -11298,7 +11299,15 @@ elif test $pkg_failed = untried; then
      	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 
-      for ac_header in uuid/uuid.h
+      save_CFLAGS=$CFLAGS
+save_CPPFLAGS=$CPPFLAGS
+save_LDFLAGS=$LDFLAGS
+save_LIBS=$LIBS
+
+
+        CPPFLAGS="$CFLAGS $LIBUUID_CFLAGS"
+        LDFLAGS="$LDFLAGS $LIBUUID_LIBS"
+        for ac_header in uuid/uuid.h
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "uuid/uuid.h" "ac_cv_header_uuid_uuid_h" "$ac_includes_default"
 if test "x$ac_cv_header_uuid_uuid_h" = xyes; then :
@@ -11306,11 +11315,7 @@ if test "x$ac_cv_header_uuid_uuid_h" = xyes; then :
 #define HAVE_UUID_UUID_H 1
 _ACEOF
 
-        save_CFLAGS=$CFLAGS
-save_CPPFLAGS=$CPPFLAGS
-save_LDFLAGS=$LDFLAGS
-save_LIBS=$LIBS
-
+          py_check_lib_save_LIBS=$LIBS
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for uuid_generate_time in -luuid" >&5
 $as_echo_n "checking for uuid_generate_time in -luuid... " >&6; }
 if ${ac_cv_lib_uuid_uuid_generate_time+:} false; then :
@@ -11351,20 +11356,10 @@ if test "x$ac_cv_lib_uuid_uuid_generate_time" = xyes; then :
   have_uuid=yes
 fi
 
+LIBS=$py_check_lib_save_LIBS
 
-CFLAGS=$save_CFLAGS
-CPPFLAGS=$save_CPPFLAGS
-LDFLAGS=$save_LDFLAGS
-LIBS=$save_LIBS
-
-
-        save_CFLAGS=$CFLAGS
-save_CPPFLAGS=$CPPFLAGS
-save_LDFLAGS=$LDFLAGS
-save_LIBS=$LIBS
-
-
-          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for uuid_generate_time_safe in -luuid" >&5
+          py_check_lib_save_LIBS=$LIBS
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for uuid_generate_time_safe in -luuid" >&5
 $as_echo_n "checking for uuid_generate_time_safe in -luuid... " >&6; }
 if ${ac_cv_lib_uuid_uuid_generate_time_safe+:} false; then :
   $as_echo_n "(cached) " >&6
@@ -11401,19 +11396,18 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_uuid_uuid_generate_time_safe" >&5
 $as_echo "$ac_cv_lib_uuid_uuid_generate_time_safe" >&6; }
 if test "x$ac_cv_lib_uuid_uuid_generate_time_safe" = xyes; then :
-
-            have_uuid=yes
+  have_uuid=yes
             $as_echo "#define HAVE_UUID_GENERATE_TIME_SAFE 1" >>confdefs.h
 
 
 fi
 
+LIBS=$py_check_lib_save_LIBS
 
-CFLAGS=$save_CFLAGS
-CPPFLAGS=$save_CPPFLAGS
-LDFLAGS=$save_LDFLAGS
-LIBS=$save_LIBS
 
+fi
+
+done
 
         if test "x$have_uuid" = xyes; then :
 
@@ -11422,9 +11416,11 @@ LIBS=$save_LIBS
 
 fi
 
-fi
+CFLAGS=$save_CFLAGS
+CPPFLAGS=$save_CPPFLAGS
+LDFLAGS=$save_LDFLAGS
+LIBS=$save_LIBS
 
-done
 
 
 
@@ -12378,6 +12374,19 @@ case $ac_sys_system in #(
 esac
 
 
+
+
+  if test "$ac_sys_system" = "Emscripten" -a -z "$LIBSQLITE3_CFLAGS" -a -z "$LIBSQLITE3_LIBS"; then :
+
+    LIBSQLITE3_CFLAGS="-sUSE_SQLITE3"
+    LIBSQLITE3_LIBS="-sUSE_SQLITE3"
+
+fi
+
+
+
+
+
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBSQLITE3" >&5
 $as_echo_n "checking for LIBSQLITE3... " >&6; }
@@ -15923,6 +15932,19 @@ fi
 
 
 
+
+
+  if test "$ac_sys_system" = "Emscripten" -a -z "$ZLIB_CFLAGS" -a -z "$ZLIB_LIBS"; then :
+
+    ZLIB_CFLAGS="-sUSE_ZLIB"
+    ZLIB_LIBS="-sUSE_ZLIB"
+
+fi
+
+
+
+
+
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ZLIB" >&5
 $as_echo_n "checking for ZLIB... " >&6; }
@@ -15982,7 +16004,15 @@ fi
 	echo "$ZLIB_PKG_ERRORS" >&5
 
 
-  for ac_header in zlib.h
+  save_CFLAGS=$CFLAGS
+save_CPPFLAGS=$CPPFLAGS
+save_LDFLAGS=$LDFLAGS
+save_LIBS=$LIBS
+
+
+    CPPFLAGS="$CFLAGS $ZLIB_CFLAGS"
+    LDFLAGS="$LDFLAGS $ZLIB_LIBS"
+    for ac_header in zlib.h
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "zlib.h" "ac_cv_header_zlib_h" "$ac_includes_default"
 if test "x$ac_cv_header_zlib_h" = xyes; then :
@@ -15990,13 +16020,8 @@ if test "x$ac_cv_header_zlib_h" = xyes; then :
 #define HAVE_ZLIB_H 1
 _ACEOF
 
-    save_CFLAGS=$CFLAGS
-save_CPPFLAGS=$CPPFLAGS
-save_LDFLAGS=$LDFLAGS
-save_LIBS=$LIBS
-
-
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gzread in -lz" >&5
+      py_check_lib_save_LIBS=$LIBS
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gzread in -lz" >&5
 $as_echo_n "checking for gzread in -lz... " >&6; }
 if ${ac_cv_lib_z_gzread+:} false; then :
   $as_echo_n "(cached) " >&6
@@ -16033,11 +16058,26 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_gzread" >&5
 $as_echo "$ac_cv_lib_z_gzread" >&6; }
 if test "x$ac_cv_lib_z_gzread" = xyes; then :
+  have_zlib=yes
+else
+  have_zlib=no
+fi
+
+LIBS=$py_check_lib_save_LIBS
+
+
+else
+  have_zlib=no
+fi
+
+done
 
-        have_zlib=yes
-        ZLIB_CFLAGS=${ZLIB_CFLAGS-""}
-        ZLIB_LIBS=${ZLIB_LIBS-"-lz"}
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inflateCopy in -lz" >&5
+    if test "x$have_zlib" = xyes; then :
+
+      ZLIB_CFLAGS=${ZLIB_CFLAGS-""}
+      ZLIB_LIBS=${ZLIB_LIBS-"-lz"}
+      py_check_lib_save_LIBS=$LIBS
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inflateCopy in -lz" >&5
 $as_echo_n "checking for inflateCopy in -lz... " >&6; }
 if ${ac_cv_lib_z_inflateCopy+:} false; then :
   $as_echo_n "(cached) " >&6
@@ -16078,14 +16118,11 @@ if test "x$ac_cv_lib_z_inflateCopy" = xyes; then :
 
 fi
 
+LIBS=$py_check_lib_save_LIBS
 
-else
-
-        have_zlib=no
 
 fi
 
-
 CFLAGS=$save_CFLAGS
 CPPFLAGS=$save_CPPFLAGS
 LDFLAGS=$save_LDFLAGS
@@ -16093,18 +16130,19 @@ LIBS=$save_LIBS
 
 
 
-else
-  have_zlib=no
-fi
-
-done
-
-
 elif test $pkg_failed = untried; then
      	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 
-  for ac_header in zlib.h
+  save_CFLAGS=$CFLAGS
+save_CPPFLAGS=$CPPFLAGS
+save_LDFLAGS=$LDFLAGS
+save_LIBS=$LIBS
+
+
+    CPPFLAGS="$CFLAGS $ZLIB_CFLAGS"
+    LDFLAGS="$LDFLAGS $ZLIB_LIBS"
+    for ac_header in zlib.h
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "zlib.h" "ac_cv_header_zlib_h" "$ac_includes_default"
 if test "x$ac_cv_header_zlib_h" = xyes; then :
@@ -16112,13 +16150,8 @@ if test "x$ac_cv_header_zlib_h" = xyes; then :
 #define HAVE_ZLIB_H 1
 _ACEOF
 
-    save_CFLAGS=$CFLAGS
-save_CPPFLAGS=$CPPFLAGS
-save_LDFLAGS=$LDFLAGS
-save_LIBS=$LIBS
-
-
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gzread in -lz" >&5
+      py_check_lib_save_LIBS=$LIBS
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gzread in -lz" >&5
 $as_echo_n "checking for gzread in -lz... " >&6; }
 if ${ac_cv_lib_z_gzread+:} false; then :
   $as_echo_n "(cached) " >&6
@@ -16155,11 +16188,26 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_gzread" >&5
 $as_echo "$ac_cv_lib_z_gzread" >&6; }
 if test "x$ac_cv_lib_z_gzread" = xyes; then :
+  have_zlib=yes
+else
+  have_zlib=no
+fi
+
+LIBS=$py_check_lib_save_LIBS
+
+
+else
+  have_zlib=no
+fi
 
-        have_zlib=yes
-        ZLIB_CFLAGS=${ZLIB_CFLAGS-""}
-        ZLIB_LIBS=${ZLIB_LIBS-"-lz"}
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inflateCopy in -lz" >&5
+done
+
+    if test "x$have_zlib" = xyes; then :
+
+      ZLIB_CFLAGS=${ZLIB_CFLAGS-""}
+      ZLIB_LIBS=${ZLIB_LIBS-"-lz"}
+      py_check_lib_save_LIBS=$LIBS
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inflateCopy in -lz" >&5
 $as_echo_n "checking for inflateCopy in -lz... " >&6; }
 if ${ac_cv_lib_z_inflateCopy+:} false; then :
   $as_echo_n "(cached) " >&6
@@ -16200,14 +16248,11 @@ if test "x$ac_cv_lib_z_inflateCopy" = xyes; then :
 
 fi
 
+LIBS=$py_check_lib_save_LIBS
 
-else
-
-        have_zlib=no
 
 fi
 
-
 CFLAGS=$save_CFLAGS
 CPPFLAGS=$save_CPPFLAGS
 LDFLAGS=$save_LDFLAGS
@@ -16215,13 +16260,6 @@ LIBS=$save_LIBS
 
 
 
-else
-  have_zlib=no
-fi
-
-done
-
-
 else
 	ZLIB_CFLAGS=$pkg_cv_ZLIB_CFLAGS
 	ZLIB_LIBS=$pkg_cv_ZLIB_LIBS
@@ -16234,11 +16272,6 @@ $as_echo "yes" >&6; }
 
 fi
 
-if test "$have_zlib" = "yes" -a "$ac_sys_system" = "Emscripten" -a "$ZLIB_LIBS" = "-lz"; then
-  ZLIB_CFLAGS="-sUSE_ZLIB"
-  ZLIB_LIBS="-sUSE_ZLIB"
-fi
-
 if test "x$have_zlib" = xyes; then :
 
   BINASCII_CFLAGS="-DUSE_ZLIB_CRC32 $ZLIB_CFLAGS"
@@ -16247,6 +16280,19 @@ if test "x$have_zlib" = xyes; then :
 fi
 
 
+
+
+  if test "$ac_sys_system" = "Emscripten" -a -z "$BZIP2_CFLAGS" -a -z "$BZIP2_LIBS"; then :
+
+    BZIP2_CFLAGS="-sUSE_BZIP2"
+    BZIP2_LIBS="-sUSE_BZIP2"
+
+fi
+
+
+
+
+
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for BZIP2" >&5
 $as_echo_n "checking for BZIP2... " >&6; }
@@ -16306,7 +16352,15 @@ fi
 	echo "$BZIP2_PKG_ERRORS" >&5
 
 
-  for ac_header in bzlib.h
+  save_CFLAGS=$CFLAGS
+save_CPPFLAGS=$CPPFLAGS
+save_LDFLAGS=$LDFLAGS
+save_LIBS=$LIBS
+
+
+    CPPFLAGS="$CFLAGS $BZIP2_CFLAGS"
+    LDFLAGS="$LDFLAGS $BZIP2_LIBS"
+    for ac_header in bzlib.h
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "bzlib.h" "ac_cv_header_bzlib_h" "$ac_includes_default"
 if test "x$ac_cv_header_bzlib_h" = xyes; then :
@@ -16314,12 +16368,6 @@ if test "x$ac_cv_header_bzlib_h" = xyes; then :
 #define HAVE_BZLIB_H 1
 _ACEOF
 
-    save_CFLAGS=$CFLAGS
-save_CPPFLAGS=$CPPFLAGS
-save_LDFLAGS=$LDFLAGS
-save_LIBS=$LIBS
-
-
       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for BZ2_bzCompress in -lbz2" >&5
 $as_echo_n "checking for BZ2_bzCompress in -lbz2... " >&6; }
 if ${ac_cv_lib_bz2_BZ2_bzCompress+:} false; then :
@@ -16357,15 +16405,24 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bz2_BZ2_bzCompress" >&5
 $as_echo "$ac_cv_lib_bz2_BZ2_bzCompress" >&6; }
 if test "x$ac_cv_lib_bz2_BZ2_bzCompress" = xyes; then :
+  have_bzip2=yes
+else
+  have_bzip2=no
+fi
 
-        have_bzip2=yes
-        BZIP2_CFLAGS=${BZIP2_CFLAGS-""}
-        BZIP2_LIBS=${BZIP2_LIBS-"-lbz2"}
 
 else
   have_bzip2=no
 fi
 
+done
+
+    if test "x$have_bzip2" = xyes; then :
+
+      BZIP2_CFLAGS=${BZIP2_CFLAGS-""}
+      BZIP2_LIBS=${BZIP2_LIBS-"-lbz2"}
+
+fi
 
 CFLAGS=$save_CFLAGS
 CPPFLAGS=$save_CPPFLAGS
@@ -16374,18 +16431,19 @@ LIBS=$save_LIBS
 
 
 
-else
-  have_bzip2=no
-fi
-
-done
-
-
 elif test $pkg_failed = untried; then
      	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 
-  for ac_header in bzlib.h
+  save_CFLAGS=$CFLAGS
+save_CPPFLAGS=$CPPFLAGS
+save_LDFLAGS=$LDFLAGS
+save_LIBS=$LIBS
+
+
+    CPPFLAGS="$CFLAGS $BZIP2_CFLAGS"
+    LDFLAGS="$LDFLAGS $BZIP2_LIBS"
+    for ac_header in bzlib.h
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "bzlib.h" "ac_cv_header_bzlib_h" "$ac_includes_default"
 if test "x$ac_cv_header_bzlib_h" = xyes; then :
@@ -16393,12 +16451,6 @@ if test "x$ac_cv_header_bzlib_h" = xyes; then :
 #define HAVE_BZLIB_H 1
 _ACEOF
 
-    save_CFLAGS=$CFLAGS
-save_CPPFLAGS=$CPPFLAGS
-save_LDFLAGS=$LDFLAGS
-save_LIBS=$LIBS
-
-
       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for BZ2_bzCompress in -lbz2" >&5
 $as_echo_n "checking for BZ2_bzCompress in -lbz2... " >&6; }
 if ${ac_cv_lib_bz2_BZ2_bzCompress+:} false; then :
@@ -16436,15 +16488,24 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bz2_BZ2_bzCompress" >&5
 $as_echo "$ac_cv_lib_bz2_BZ2_bzCompress" >&6; }
 if test "x$ac_cv_lib_bz2_BZ2_bzCompress" = xyes; then :
+  have_bzip2=yes
+else
+  have_bzip2=no
+fi
 
-        have_bzip2=yes
-        BZIP2_CFLAGS=${BZIP2_CFLAGS-""}
-        BZIP2_LIBS=${BZIP2_LIBS-"-lbz2"}
 
 else
   have_bzip2=no
 fi
 
+done
+
+    if test "x$have_bzip2" = xyes; then :
+
+      BZIP2_CFLAGS=${BZIP2_CFLAGS-""}
+      BZIP2_LIBS=${BZIP2_LIBS-"-lbz2"}
+
+fi
 
 CFLAGS=$save_CFLAGS
 CPPFLAGS=$save_CPPFLAGS
@@ -16453,13 +16514,6 @@ LIBS=$save_LIBS
 
 
 
-else
-  have_bzip2=no
-fi
-
-done
-
-
 else
 	BZIP2_CFLAGS=$pkg_cv_BZIP2_CFLAGS
 	BZIP2_LIBS=$pkg_cv_BZIP2_LIBS
@@ -16468,12 +16522,6 @@ $as_echo "yes" >&6; }
 	have_bzip2=yes
 fi
 
-if test "$have_bzip2" = "yes" -a "$ac_sys_system" = "Emscripten" -a "$BZIP2_LIBS" = "-lbz2"; then
-  BZIP2_CFLAGS="-sUSE_BZIP2"
-  BZIP2_LIBS="-sUSE_BZIP2"
-fi
-
-
 
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBLZMA" >&5
@@ -16534,7 +16582,15 @@ fi
 	echo "$LIBLZMA_PKG_ERRORS" >&5
 
 
-  for ac_header in lzma.h
+  save_CFLAGS=$CFLAGS
+save_CPPFLAGS=$CPPFLAGS
+save_LDFLAGS=$LDFLAGS
+save_LIBS=$LIBS
+
+
+    CPPFLAGS="$CFLAGS $LIBLZMA_CFLAGS"
+    LDFLAGS="$LDFLAGS $LIBLZMA_LIBS"
+    for ac_header in lzma.h
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "lzma.h" "ac_cv_header_lzma_h" "$ac_includes_default"
 if test "x$ac_cv_header_lzma_h" = xyes; then :
@@ -16542,12 +16598,6 @@ if test "x$ac_cv_header_lzma_h" = xyes; then :
 #define HAVE_LZMA_H 1
 _ACEOF
 
-    save_CFLAGS=$CFLAGS
-save_CPPFLAGS=$CPPFLAGS
-save_LDFLAGS=$LDFLAGS
-save_LIBS=$LIBS
-
-
       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for lzma_easy_encoder in -llzma" >&5
 $as_echo_n "checking for lzma_easy_encoder in -llzma... " >&6; }
 if ${ac_cv_lib_lzma_lzma_easy_encoder+:} false; then :
@@ -16585,15 +16635,24 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lzma_lzma_easy_encoder" >&5
 $as_echo "$ac_cv_lib_lzma_lzma_easy_encoder" >&6; }
 if test "x$ac_cv_lib_lzma_lzma_easy_encoder" = xyes; then :
+  have_liblzma=yes
+else
+  have_liblzma=no
+fi
 
-        have_liblzma=yes
-        LIBLZMA_CFLAGS=${LIBLZMA_CFLAGS-""}
-        LIBLZMA_LIBS=${LIBLZMA_LIBS-"-llzma"}
 
 else
   have_liblzma=no
 fi
 
+done
+
+    if test "x$have_liblzma" = xyes; then :
+
+      LIBLZMA_CFLAGS=${LIBLZMA_CFLAGS-""}
+      LIBLZMA_LIBS=${LIBLZMA_LIBS-"-llzma"}
+
+fi
 
 CFLAGS=$save_CFLAGS
 CPPFLAGS=$save_CPPFLAGS
@@ -16602,18 +16661,19 @@ LIBS=$save_LIBS
 
 
 
-else
-  have_liblzma=no
-fi
-
-done
-
-
 elif test $pkg_failed = untried; then
      	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 
-  for ac_header in lzma.h
+  save_CFLAGS=$CFLAGS
+save_CPPFLAGS=$CPPFLAGS
+save_LDFLAGS=$LDFLAGS
+save_LIBS=$LIBS
+
+
+    CPPFLAGS="$CFLAGS $LIBLZMA_CFLAGS"
+    LDFLAGS="$LDFLAGS $LIBLZMA_LIBS"
+    for ac_header in lzma.h
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "lzma.h" "ac_cv_header_lzma_h" "$ac_includes_default"
 if test "x$ac_cv_header_lzma_h" = xyes; then :
@@ -16621,12 +16681,6 @@ if test "x$ac_cv_header_lzma_h" = xyes; then :
 #define HAVE_LZMA_H 1
 _ACEOF
 
-    save_CFLAGS=$CFLAGS
-save_CPPFLAGS=$CPPFLAGS
-save_LDFLAGS=$LDFLAGS
-save_LIBS=$LIBS
-
-
       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for lzma_easy_encoder in -llzma" >&5
 $as_echo_n "checking for lzma_easy_encoder in -llzma... " >&6; }
 if ${ac_cv_lib_lzma_lzma_easy_encoder+:} false; then :
@@ -16664,15 +16718,24 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lzma_lzma_easy_encoder" >&5
 $as_echo "$ac_cv_lib_lzma_lzma_easy_encoder" >&6; }
 if test "x$ac_cv_lib_lzma_lzma_easy_encoder" = xyes; then :
+  have_liblzma=yes
+else
+  have_liblzma=no
+fi
 
-        have_liblzma=yes
-        LIBLZMA_CFLAGS=${LIBLZMA_CFLAGS-""}
-        LIBLZMA_LIBS=${LIBLZMA_LIBS-"-llzma"}
 
 else
   have_liblzma=no
 fi
 
+done
+
+    if test "x$have_liblzma" = xyes; then :
+
+      LIBLZMA_CFLAGS=${LIBLZMA_CFLAGS-""}
+      LIBLZMA_LIBS=${LIBLZMA_LIBS-"-llzma"}
+
+fi
 
 CFLAGS=$save_CFLAGS
 CPPFLAGS=$save_CPPFLAGS
@@ -16681,13 +16744,6 @@ LIBS=$save_LIBS
 
 
 
-else
-  have_liblzma=no
-fi
-
-done
-
-
 else
 	LIBLZMA_CFLAGS=$pkg_cv_LIBLZMA_CFLAGS
 	LIBLZMA_LIBS=$pkg_cv_LIBLZMA_LIBS
diff --git a/configure.ac b/configure.ac
index a12d143ed8833..695576a46e87e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -49,6 +49,48 @@ AC_DEFUN([WITH_SAVE_ENV],
 [RESTORE_ENV]
 )dnl
 
+dnl PY_CHECK_FUNC(FUNCTION, [INCLUDES], [AC_DEFINE-VAR])
+AC_DEFUN([PY_CHECK_FUNC],
+[ AS_VAR_PUSHDEF([py_var], [ac_cv_func_$1])
+  AS_VAR_PUSHDEF([py_define], m4_ifblank([$3], [[HAVE_]m4_toupper($1)], [$3]))
+  AC_CACHE_CHECK(
+    [for $1],
+    [py_var],
+    [AC_COMPILE_IFELSE(
+      [AC_LANG_PROGRAM([$2], [void *x=$1])],
+      [AS_VAR_SET([py_var], [yes])],
+      [AS_VAR_SET([py_var], [no])])]
+  )
+  AS_VAR_IF(
+    [py_var],
+    [yes],
+    [AC_DEFINE([py_define], [1], [Define if you have the '$1' function.])])
+  AS_VAR_POPDEF([py_var])
+  AS_VAR_POPDEF([py_define])
+])
+
+dnl PY_CHECK_LIB(LIBRARY, FUNCTION, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND], [OTHER-LIBRARIES])
+dnl Like AC_CHECK_LIB() but does not modify LIBS
+AC_DEFUN([PY_CHECK_LIB],
+[AS_VAR_COPY([py_check_lib_save_LIBS], [LIBS])]
+[AC_CHECK_LIB($1, $2, $3, $4, $5)]
+[AS_VAR_COPY([LIBS], [py_check_lib_save_LIBS])]
+)
+
+dnl PY_CHECK_EMSCRIPTEN_PORT(PKG_VAR, [EMPORT_ARGS])
+dnl Use Emscripten port unless user passes ${PKG_VAR}_CFLAGS
+dnl or ${PKG_VAR}_LIBS to configure.
+AC_DEFUN([PY_CHECK_EMSCRIPTEN_PORT], [
+  AS_VAR_PUSHDEF([py_cflags], [$1_CFLAGS])
+  AS_VAR_PUSHDEF([py_libs], [$1_LIBS])
+  AS_IF([test "$ac_sys_system" = "Emscripten" -a -z "$py_cflags" -a -z "$py_libs"], [
+    py_cflags="$2"
+    py_libs="$2"
+  ])
+  AS_VAR_POPDEF([py_cflags])
+  AS_VAR_POPDEF([py_libs])
+])
+
 AC_SUBST(BASECPPFLAGS)
 if test "$srcdir" != . -a "$srcdir" != "$(pwd)"; then
     # If we're building out-of-tree, we need to make sure the following
@@ -3335,12 +3377,12 @@ AS_VAR_IF([have_uuid], [missing], [
       AC_DEFINE([HAVE_UUID_H], [1])
       AC_DEFINE([HAVE_UUID_GENERATE_TIME_SAFE], [1])
     ], [
-      AC_CHECK_HEADERS([uuid/uuid.h], [
-        WITH_SAVE_ENV(
-          [AC_CHECK_LIB([uuid], [uuid_generate_time], [have_uuid=yes])
-        ])
-        WITH_SAVE_ENV([
-          AC_CHECK_LIB([uuid], [uuid_generate_time_safe], [
+      WITH_SAVE_ENV([
+        CPPFLAGS="$CFLAGS $LIBUUID_CFLAGS"
+        LDFLAGS="$LDFLAGS $LIBUUID_LIBS"
+        AC_CHECK_HEADERS([uuid/uuid.h], [
+          PY_CHECK_LIB([uuid], [uuid_generate_time], [have_uuid=yes])
+          PY_CHECK_LIB([uuid], [uuid_generate_time_safe], [
             have_uuid=yes
             AC_DEFINE([HAVE_UUID_GENERATE_TIME_SAFE], [1])
           ])
@@ -3694,6 +3736,9 @@ AS_CASE([$ac_sys_system],
   [OSSAUDIODEV_LIBS=""]
 )
 
+dnl detect sqlite3 from Emscripten emport
+PY_CHECK_EMSCRIPTEN_PORT([LIBSQLITE3], [-sUSE_SQLITE3])
+
 dnl Check for SQLite library. Use pkg-config if available.
 PKG_CHECK_MODULES(
   [LIBSQLITE3], [sqlite3 >= 3.7.15], [], [
@@ -4675,64 +4720,63 @@ fi
 dnl Check for compression libraries
 AH_TEMPLATE([HAVE_ZLIB_COPY], [Define if the zlib library has inflateCopy])
 
+dnl detect zlib from Emscripten emport
+PY_CHECK_EMSCRIPTEN_PORT([ZLIB], [-sUSE_ZLIB])
+
 PKG_CHECK_MODULES([ZLIB], [zlib >= 1.2.0], [
   have_zlib=yes
   dnl zlib 1.2.0 (2003) added inflateCopy
   AC_DEFINE([HAVE_ZLIB_COPY], [1])
 ], [
-  AC_CHECK_HEADERS([zlib.h], [
-    WITH_SAVE_ENV([
-      AC_CHECK_LIB([z], [gzread], [
-        have_zlib=yes
-        ZLIB_CFLAGS=${ZLIB_CFLAGS-""}
-        ZLIB_LIBS=${ZLIB_LIBS-"-lz"}
-        AC_CHECK_LIB([z], [inflateCopy], [AC_DEFINE([HAVE_ZLIB_COPY], [1])])
-      ], [
-        have_zlib=no
-      ])
+  WITH_SAVE_ENV([
+    CPPFLAGS="$CFLAGS $ZLIB_CFLAGS"
+    LDFLAGS="$LDFLAGS $ZLIB_LIBS"
+    AC_CHECK_HEADERS([zlib.h], [
+      PY_CHECK_LIB([z], [gzread], [have_zlib=yes], [have_zlib=no])
+    ], [have_zlib=no])
+    AS_VAR_IF([have_zlib], [yes], [
+      ZLIB_CFLAGS=${ZLIB_CFLAGS-""}
+      ZLIB_LIBS=${ZLIB_LIBS-"-lz"}
+      PY_CHECK_LIB([z], [inflateCopy], [AC_DEFINE([HAVE_ZLIB_COPY], [1])])
     ])
-  ], [have_zlib=no])
+  ])
 ])
 
-if test "$have_zlib" = "yes" -a "$ac_sys_system" = "Emscripten" -a "$ZLIB_LIBS" = "-lz"; then
-  ZLIB_CFLAGS="-sUSE_ZLIB"
-  ZLIB_LIBS="-sUSE_ZLIB"
-fi
-
 dnl binascii can use zlib for optimized crc32.
 AS_VAR_IF([have_zlib], [yes], [
   BINASCII_CFLAGS="-DUSE_ZLIB_CRC32 $ZLIB_CFLAGS"
   BINASCII_LIBS="$ZLIB_LIBS"
 ])
 
+dnl detect bzip2 from Emscripten emport
+PY_CHECK_EMSCRIPTEN_PORT([BZIP2], [-sUSE_BZIP2])
+
 PKG_CHECK_MODULES([BZIP2], [bzip2], [have_bzip2=yes], [
-  AC_CHECK_HEADERS([bzlib.h], [
-    WITH_SAVE_ENV([
-      AC_CHECK_LIB([bz2], [BZ2_bzCompress], [
-        have_bzip2=yes
-        BZIP2_CFLAGS=${BZIP2_CFLAGS-""}
-        BZIP2_LIBS=${BZIP2_LIBS-"-lbz2"}
-      ], [have_bzip2=no])
+  WITH_SAVE_ENV([
+    CPPFLAGS="$CFLAGS $BZIP2_CFLAGS"
+    LDFLAGS="$LDFLAGS $BZIP2_LIBS"
+    AC_CHECK_HEADERS([bzlib.h], [
+      AC_CHECK_LIB([bz2], [BZ2_bzCompress], [have_bzip2=yes], [have_bzip2=no])
+    ], [have_bzip2=no])
+    AS_VAR_IF([have_bzip2], [yes], [
+      BZIP2_CFLAGS=${BZIP2_CFLAGS-""}
+      BZIP2_LIBS=${BZIP2_LIBS-"-lbz2"}
     ])
-  ], [have_bzip2=no])
+  ])
 ])
 
-if test "$have_bzip2" = "yes" -a "$ac_sys_system" = "Emscripten" -a "$BZIP2_LIBS" = "-lbz2"; then
-  BZIP2_CFLAGS="-sUSE_BZIP2"
-  BZIP2_LIBS="-sUSE_BZIP2"
-fi
-
-
 PKG_CHECK_MODULES([LIBLZMA], [liblzma], [have_liblzma=yes], [
-  AC_CHECK_HEADERS([lzma.h], [
-    WITH_SAVE_ENV([
-      AC_CHECK_LIB([lzma], [lzma_easy_encoder], [
-        have_liblzma=yes
-        LIBLZMA_CFLAGS=${LIBLZMA_CFLAGS-""}
-        LIBLZMA_LIBS=${LIBLZMA_LIBS-"-llzma"}
-      ], [have_liblzma=no])
+  WITH_SAVE_ENV([
+    CPPFLAGS="$CFLAGS $LIBLZMA_CFLAGS"
+    LDFLAGS="$LDFLAGS $LIBLZMA_LIBS"
+    AC_CHECK_HEADERS([lzma.h], [
+      AC_CHECK_LIB([lzma], [lzma_easy_encoder], [have_liblzma=yes], [have_liblzma=no])
+    ], [have_liblzma=no])
+    AS_VAR_IF([have_liblzma], [yes], [
+      LIBLZMA_CFLAGS=${LIBLZMA_CFLAGS-""}
+      LIBLZMA_LIBS=${LIBLZMA_LIBS-"-llzma"}
     ])
-  ], [have_liblzma=no])
+  ])
 ])
 
 PY_CHECK_FUNC([hstrerror], [#include <netdb.h>])


From webhook-mailer at python.org  Mon Jul 18 02:47:08 2022
From: webhook-mailer at python.org (tiran)
Date: Mon, 18 Jul 2022 06:47:08 -0000
Subject: [Python-checkins] gh-94847: Don't force inlining in debug builds of
 libmpdec (GH-94848)
Message-ID: <mailman.75.1658126829.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/97b4121f9373a1b5312b90ac00eae9960deacfdb
commit: 97b4121f9373a1b5312b90ac00eae9960deacfdb
branch: main
author: Christian Heimes <christian at python.org>
committer: tiran <christian at python.org>
date: 2022-07-18T08:47:03+02:00
summary:

gh-94847: Don't force inlining in debug builds of libmpdec (GH-94848)

files:
A Misc/NEWS.d/next/Build/2022-07-14-11-13-26.gh-issue-94847.s3Kr5p.rst
M configure
M configure.ac

diff --git a/Misc/NEWS.d/next/Build/2022-07-14-11-13-26.gh-issue-94847.s3Kr5p.rst b/Misc/NEWS.d/next/Build/2022-07-14-11-13-26.gh-issue-94847.s3Kr5p.rst
new file mode 100644
index 0000000000000..a6d1e7277da4c
--- /dev/null
+++ b/Misc/NEWS.d/next/Build/2022-07-14-11-13-26.gh-issue-94847.s3Kr5p.rst
@@ -0,0 +1,2 @@
+Fixed ``_decimal`` module build issue on GCC when compiling with LTO and
+pydebug. Debug builds no longer force inlining of functions.
diff --git a/configure b/configure
index df6b193433e3e..d607c5e5d37a0 100755
--- a/configure
+++ b/configure
@@ -12522,6 +12522,12 @@ else
   LIBMPDEC_LDFLAGS="-lm \$(LIBMPDEC_A)"
   LIBMPDEC_INTERNAL="\$(LIBMPDEC_A)"
 
+    if test "x$with_pydebug" = xyes; then :
+
+    as_fn_append LIBMPDEC_CFLAGS " -DTEST_COVERAGE"
+
+fi
+
 fi
 
 
diff --git a/configure.ac b/configure.ac
index 1aa1c298ffe3a..c5924169e03a0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3697,6 +3697,11 @@ AS_VAR_IF([with_system_libmpdec], [yes], [
   LIBMPDEC_CFLAGS="-I\$(srcdir)/Modules/_decimal/libmpdec"
   LIBMPDEC_LDFLAGS="-lm \$(LIBMPDEC_A)"
   LIBMPDEC_INTERNAL="\$(LIBMPDEC_A)"
+
+  dnl Disable forced inlining in debug builds, see GH-94847
+  AS_VAR_IF([with_pydebug], [yes], [
+    AS_VAR_APPEND([LIBMPDEC_CFLAGS], [" -DTEST_COVERAGE"])
+  ])
 ])
 
 AC_SUBST([LIBMPDEC_CFLAGS])


From webhook-mailer at python.org  Mon Jul 18 05:20:20 2022
From: webhook-mailer at python.org (pablogsal)
Date: Mon, 18 Jul 2022 09:20:20 -0000
Subject: [Python-checkins] gh-94947: Disallow parsing walrus with
 feature_version < (3, 8) (#94948)
Message-ID: <mailman.76.1658136020.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/ae0be5a53bb4caee3de4888341addd9c94133f2d
commit: ae0be5a53bb4caee3de4888341addd9c94133f2d
branch: main
author: Shantanu <12621235+hauntsaninja at users.noreply.github.com>
committer: pablogsal <Pablogsal at gmail.com>
date: 2022-07-18T10:20:12+01:00
summary:

gh-94947: Disallow parsing walrus with feature_version < (3, 8) (#94948)

* gh-94947: Disallow parsing walrus with feature_version < (3, 8)

* oops, commit the parser

* ?? Added by blurb_it.

Co-authored-by: blurb-it[bot] <43283697+blurb-it[bot]@users.noreply.github.com>

files:
A Misc/NEWS.d/next/Core and Builtins/2022-07-18-04-48-34.gh-issue-94947.df9gUw.rst
M Grammar/python.gram
M Lib/test/test_ast.py
M Parser/parser.c

diff --git a/Grammar/python.gram b/Grammar/python.gram
index 91d73a9fffd19..6a8bb942fffcc 100644
--- a/Grammar/python.gram
+++ b/Grammar/python.gram
@@ -660,7 +660,9 @@ star_named_expression[expr_ty]:
     | named_expression
 
 assignment_expression[expr_ty]:
-    | a=NAME ':=' ~ b=expression { _PyAST_NamedExpr(CHECK(expr_ty, _PyPegen_set_expr_context(p, a, Store)), b, EXTRA) }
+    | a=NAME ':=' ~ b=expression {
+        CHECK_VERSION(expr_ty, 8, "Assignment expressions are",
+        _PyAST_NamedExpr(CHECK(expr_ty, _PyPegen_set_expr_context(p, a, Store)), b, EXTRA)) }
 
 named_expression[expr_ty]:
     | assignment_expression
diff --git a/Lib/test/test_ast.py b/Lib/test/test_ast.py
index 225892414b8c1..5d7e4419560b8 100644
--- a/Lib/test/test_ast.py
+++ b/Lib/test/test_ast.py
@@ -743,6 +743,11 @@ def test_issue40614_feature_version(self):
         with self.assertRaises(SyntaxError):
             ast.parse('f"{x=}"', feature_version=(3, 7))
 
+    def test_assignment_expression_feature_version(self):
+        ast.parse('(x := 0)', feature_version=(3, 8))
+        with self.assertRaises(SyntaxError):
+            ast.parse('(x := 0)', feature_version=(3, 7))
+
     def test_constant_as_name(self):
         for constant in "True", "False", "None":
             expr = ast.Expression(ast.Name(constant, ast.Load()))
diff --git a/Misc/NEWS.d/next/Core and Builtins/2022-07-18-04-48-34.gh-issue-94947.df9gUw.rst b/Misc/NEWS.d/next/Core and Builtins/2022-07-18-04-48-34.gh-issue-94947.df9gUw.rst
new file mode 100644
index 0000000000000..360ea67048fe2
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2022-07-18-04-48-34.gh-issue-94947.df9gUw.rst	
@@ -0,0 +1 @@
+:func:`ast.parse` will no longer parse assignment expressions when passed ``feature_version`` less than ``(3, 8)``. Patch by Shantanu Jain.
diff --git a/Parser/parser.c b/Parser/parser.c
index 3d59d4a704c23..309c249141d71 100644
--- a/Parser/parser.c
+++ b/Parser/parser.c
@@ -11223,7 +11223,7 @@ assignment_expression_rule(Parser *p)
             UNUSED(_end_lineno); // Only used by EXTRA macro
             int _end_col_offset = _token->end_col_offset;
             UNUSED(_end_col_offset); // Only used by EXTRA macro
-            _res = _PyAST_NamedExpr ( CHECK ( expr_ty , _PyPegen_set_expr_context ( p , a , Store ) ) , b , EXTRA );
+            _res = CHECK_VERSION ( expr_ty , 8 , "Assignment expressions are" , _PyAST_NamedExpr ( CHECK ( expr_ty , _PyPegen_set_expr_context ( p , a , Store ) ) , b , EXTRA ) );
             if (_res == NULL && PyErr_Occurred()) {
                 p->error_indicator = 1;
                 p->level--;


From webhook-mailer at python.org  Mon Jul 18 05:46:26 2022
From: webhook-mailer at python.org (miss-islington)
Date: Mon, 18 Jul 2022 09:46:26 -0000
Subject: [Python-checkins] gh-94947: Disallow parsing walrus with
 feature_version < (3, 8) (GH-94948)
Message-ID: <mailman.77.1658137588.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/7dc236d11642a2b366a7f20bc057c1934b3687ef
commit: 7dc236d11642a2b366a7f20bc057c1934b3687ef
branch: 3.11
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-18T02:46:21-07:00
summary:

gh-94947: Disallow parsing walrus with feature_version < (3, 8) (GH-94948)


* gh-94947: Disallow parsing walrus with feature_version < (3, 8)

* oops, commit the parser

* ?? Added by blurb_it.

Co-authored-by: blurb-it[bot] <43283697+blurb-it[bot]@users.noreply.github.com>
(cherry picked from commit ae0be5a53bb4caee3de4888341addd9c94133f2d)

Co-authored-by: Shantanu <12621235+hauntsaninja at users.noreply.github.com>

files:
A Misc/NEWS.d/next/Core and Builtins/2022-07-18-04-48-34.gh-issue-94947.df9gUw.rst
M Grammar/python.gram
M Lib/test/test_ast.py
M Parser/parser.c

diff --git a/Grammar/python.gram b/Grammar/python.gram
index 91d73a9fffd19..6a8bb942fffcc 100644
--- a/Grammar/python.gram
+++ b/Grammar/python.gram
@@ -660,7 +660,9 @@ star_named_expression[expr_ty]:
     | named_expression
 
 assignment_expression[expr_ty]:
-    | a=NAME ':=' ~ b=expression { _PyAST_NamedExpr(CHECK(expr_ty, _PyPegen_set_expr_context(p, a, Store)), b, EXTRA) }
+    | a=NAME ':=' ~ b=expression {
+        CHECK_VERSION(expr_ty, 8, "Assignment expressions are",
+        _PyAST_NamedExpr(CHECK(expr_ty, _PyPegen_set_expr_context(p, a, Store)), b, EXTRA)) }
 
 named_expression[expr_ty]:
     | assignment_expression
diff --git a/Lib/test/test_ast.py b/Lib/test/test_ast.py
index 225892414b8c1..5d7e4419560b8 100644
--- a/Lib/test/test_ast.py
+++ b/Lib/test/test_ast.py
@@ -743,6 +743,11 @@ def test_issue40614_feature_version(self):
         with self.assertRaises(SyntaxError):
             ast.parse('f"{x=}"', feature_version=(3, 7))
 
+    def test_assignment_expression_feature_version(self):
+        ast.parse('(x := 0)', feature_version=(3, 8))
+        with self.assertRaises(SyntaxError):
+            ast.parse('(x := 0)', feature_version=(3, 7))
+
     def test_constant_as_name(self):
         for constant in "True", "False", "None":
             expr = ast.Expression(ast.Name(constant, ast.Load()))
diff --git a/Misc/NEWS.d/next/Core and Builtins/2022-07-18-04-48-34.gh-issue-94947.df9gUw.rst b/Misc/NEWS.d/next/Core and Builtins/2022-07-18-04-48-34.gh-issue-94947.df9gUw.rst
new file mode 100644
index 0000000000000..360ea67048fe2
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2022-07-18-04-48-34.gh-issue-94947.df9gUw.rst	
@@ -0,0 +1 @@
+:func:`ast.parse` will no longer parse assignment expressions when passed ``feature_version`` less than ``(3, 8)``. Patch by Shantanu Jain.
diff --git a/Parser/parser.c b/Parser/parser.c
index e60d8acdc5268..91e83e92cd8b3 100644
--- a/Parser/parser.c
+++ b/Parser/parser.c
@@ -11223,7 +11223,7 @@ assignment_expression_rule(Parser *p)
             UNUSED(_end_lineno); // Only used by EXTRA macro
             int _end_col_offset = _token->end_col_offset;
             UNUSED(_end_col_offset); // Only used by EXTRA macro
-            _res = _PyAST_NamedExpr ( CHECK ( expr_ty , _PyPegen_set_expr_context ( p , a , Store ) ) , b , EXTRA );
+            _res = CHECK_VERSION ( expr_ty , 8 , "Assignment expressions are" , _PyAST_NamedExpr ( CHECK ( expr_ty , _PyPegen_set_expr_context ( p , a , Store ) ) , b , EXTRA ) );
             if (_res == NULL && PyErr_Occurred()) {
                 p->error_indicator = 1;
                 p->level--;


From webhook-mailer at python.org  Mon Jul 18 08:42:54 2022
From: webhook-mailer at python.org (tiran)
Date: Mon, 18 Jul 2022 12:42:54 -0000
Subject: [Python-checkins] [3.11] gh-94847: Don't force inlining in debug
 builds of libmpdec (GH-94848) (GH-94951)
Message-ID: <mailman.78.1658148175.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/4607e884e50227c3e7d784dd3a0b6809b4fb5fbf
commit: 4607e884e50227c3e7d784dd3a0b6809b4fb5fbf
branch: 3.11
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: tiran <christian at python.org>
date: 2022-07-18T14:42:42+02:00
summary:

[3.11] gh-94847: Don't force inlining in debug builds of libmpdec (GH-94848) (GH-94951)

Co-authored-by: Christian Heimes <christian at python.org>

files:
A Misc/NEWS.d/next/Build/2022-07-14-11-13-26.gh-issue-94847.s3Kr5p.rst
M configure
M configure.ac

diff --git a/Misc/NEWS.d/next/Build/2022-07-14-11-13-26.gh-issue-94847.s3Kr5p.rst b/Misc/NEWS.d/next/Build/2022-07-14-11-13-26.gh-issue-94847.s3Kr5p.rst
new file mode 100644
index 0000000000000..a6d1e7277da4c
--- /dev/null
+++ b/Misc/NEWS.d/next/Build/2022-07-14-11-13-26.gh-issue-94847.s3Kr5p.rst
@@ -0,0 +1,2 @@
+Fixed ``_decimal`` module build issue on GCC when compiling with LTO and
+pydebug. Debug builds no longer force inlining of functions.
diff --git a/configure b/configure
index be8935937c8f4..078bb5bef1350 100755
--- a/configure
+++ b/configure
@@ -11990,6 +11990,12 @@ else
   LIBMPDEC_LDFLAGS="-lm \$(LIBMPDEC_A)"
   LIBMPDEC_INTERNAL="\$(LIBMPDEC_A)"
 
+    if test "x$with_pydebug" = xyes; then :
+
+    as_fn_append LIBMPDEC_CFLAGS " -DTEST_COVERAGE"
+
+fi
+
 fi
 
 
diff --git a/configure.ac b/configure.ac
index 695576a46e87e..09f3f902a6b58 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3628,6 +3628,11 @@ AS_VAR_IF([with_system_libmpdec], [yes], [
   LIBMPDEC_CFLAGS="-I\$(srcdir)/Modules/_decimal/libmpdec"
   LIBMPDEC_LDFLAGS="-lm \$(LIBMPDEC_A)"
   LIBMPDEC_INTERNAL="\$(LIBMPDEC_A)"
+
+  dnl Disable forced inlining in debug builds, see GH-94847
+  AS_VAR_IF([with_pydebug], [yes], [
+    AS_VAR_APPEND([LIBMPDEC_CFLAGS], [" -DTEST_COVERAGE"])
+  ])
 ])
 
 AC_SUBST([LIBMPDEC_CFLAGS])


From webhook-mailer at python.org  Mon Jul 18 09:48:14 2022
From: webhook-mailer at python.org (miss-islington)
Date: Mon, 18 Jul 2022 13:48:14 -0000
Subject: [Python-checkins] GH-94857: fix test_io refleak (GH-94858)
Message-ID: <mailman.79.1658152094.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/631160c262b40bf4ce3da6cd7bbb972ae2e9fc91
commit: 631160c262b40bf4ce3da6cd7bbb972ae2e9fc91
branch: main
author: Kumar Aditya <59607654+kumaraditya303 at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-18T06:48:04-07:00
summary:

GH-94857: fix test_io refleak (GH-94858)

files:
A Misc/NEWS.d/next/Library/2022-07-15-08-13-51.gh-issue-94857.9_KvZJ.rst
M Modules/_io/textio.c

diff --git a/Misc/NEWS.d/next/Library/2022-07-15-08-13-51.gh-issue-94857.9_KvZJ.rst b/Misc/NEWS.d/next/Library/2022-07-15-08-13-51.gh-issue-94857.9_KvZJ.rst
new file mode 100644
index 0000000000000..e684415595d1d
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2022-07-15-08-13-51.gh-issue-94857.9_KvZJ.rst
@@ -0,0 +1 @@
+Fix refleak in ``_io.TextIOWrapper.reconfigure``. Patch by Kumar Aditya.
diff --git a/Modules/_io/textio.c b/Modules/_io/textio.c
index 660396b8b03ea..89094d66f3834 100644
--- a/Modules/_io/textio.c
+++ b/Modules/_io/textio.c
@@ -1247,6 +1247,7 @@ textiowrapper_change_encoding(textio *self, PyObject *encoding,
         if (errors == Py_None) {
             errors = self->errors;
         }
+        Py_INCREF(encoding);
     }
     else {
         if (_PyUnicode_EqualToASCIIString(encoding, "locale")) {
@@ -1254,6 +1255,8 @@ textiowrapper_change_encoding(textio *self, PyObject *encoding,
             if (encoding == NULL) {
                 return -1;
             }
+        } else {
+            Py_INCREF(encoding);
         }
         if (errors == Py_None) {
             errors = &_Py_ID(strict);
@@ -1262,6 +1265,7 @@ textiowrapper_change_encoding(textio *self, PyObject *encoding,
 
     const char *c_errors = PyUnicode_AsUTF8(errors);
     if (c_errors == NULL) {
+        Py_DECREF(encoding);
         return -1;
     }
 
@@ -1269,16 +1273,17 @@ textiowrapper_change_encoding(textio *self, PyObject *encoding,
     PyObject *codec_info = _PyCodec_LookupTextEncoding(
         PyUnicode_AsUTF8(encoding), "codecs.open()");
     if (codec_info == NULL) {
+        Py_DECREF(encoding);
         return -1;
     }
     if (_textiowrapper_set_decoder(self, codec_info, c_errors) != 0 ||
             _textiowrapper_set_encoder(self, codec_info, c_errors) != 0) {
         Py_DECREF(codec_info);
+        Py_DECREF(encoding);
         return -1;
     }
     Py_DECREF(codec_info);
 
-    Py_INCREF(encoding);
     Py_INCREF(errors);
     Py_SETREF(self->encoding, encoding);
     Py_SETREF(self->errors, errors);


From webhook-mailer at python.org  Mon Jul 18 10:18:15 2022
From: webhook-mailer at python.org (miss-islington)
Date: Mon, 18 Jul 2022 14:18:15 -0000
Subject: [Python-checkins] GH-94857: fix test_io refleak (GH-94858)
Message-ID: <mailman.80.1658153896.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/a914fa979e0d6043da4b591e02d2b99d26853411
commit: a914fa979e0d6043da4b591e02d2b99d26853411
branch: 3.11
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-18T07:17:55-07:00
summary:

GH-94857: fix test_io refleak (GH-94858)

(cherry picked from commit 631160c262b40bf4ce3da6cd7bbb972ae2e9fc91)

Co-authored-by: Kumar Aditya <59607654+kumaraditya303 at users.noreply.github.com>

files:
A Misc/NEWS.d/next/Library/2022-07-15-08-13-51.gh-issue-94857.9_KvZJ.rst
M Modules/_io/textio.c

diff --git a/Misc/NEWS.d/next/Library/2022-07-15-08-13-51.gh-issue-94857.9_KvZJ.rst b/Misc/NEWS.d/next/Library/2022-07-15-08-13-51.gh-issue-94857.9_KvZJ.rst
new file mode 100644
index 0000000000000..e684415595d1d
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2022-07-15-08-13-51.gh-issue-94857.9_KvZJ.rst
@@ -0,0 +1 @@
+Fix refleak in ``_io.TextIOWrapper.reconfigure``. Patch by Kumar Aditya.
diff --git a/Modules/_io/textio.c b/Modules/_io/textio.c
index 660396b8b03ea..89094d66f3834 100644
--- a/Modules/_io/textio.c
+++ b/Modules/_io/textio.c
@@ -1247,6 +1247,7 @@ textiowrapper_change_encoding(textio *self, PyObject *encoding,
         if (errors == Py_None) {
             errors = self->errors;
         }
+        Py_INCREF(encoding);
     }
     else {
         if (_PyUnicode_EqualToASCIIString(encoding, "locale")) {
@@ -1254,6 +1255,8 @@ textiowrapper_change_encoding(textio *self, PyObject *encoding,
             if (encoding == NULL) {
                 return -1;
             }
+        } else {
+            Py_INCREF(encoding);
         }
         if (errors == Py_None) {
             errors = &_Py_ID(strict);
@@ -1262,6 +1265,7 @@ textiowrapper_change_encoding(textio *self, PyObject *encoding,
 
     const char *c_errors = PyUnicode_AsUTF8(errors);
     if (c_errors == NULL) {
+        Py_DECREF(encoding);
         return -1;
     }
 
@@ -1269,16 +1273,17 @@ textiowrapper_change_encoding(textio *self, PyObject *encoding,
     PyObject *codec_info = _PyCodec_LookupTextEncoding(
         PyUnicode_AsUTF8(encoding), "codecs.open()");
     if (codec_info == NULL) {
+        Py_DECREF(encoding);
         return -1;
     }
     if (_textiowrapper_set_decoder(self, codec_info, c_errors) != 0 ||
             _textiowrapper_set_encoder(self, codec_info, c_errors) != 0) {
         Py_DECREF(codec_info);
+        Py_DECREF(encoding);
         return -1;
     }
     Py_DECREF(codec_info);
 
-    Py_INCREF(encoding);
     Py_INCREF(errors);
     Py_SETREF(self->encoding, encoding);
     Py_SETREF(self->errors, errors);


From webhook-mailer at python.org  Mon Jul 18 11:07:01 2022
From: webhook-mailer at python.org (markshannon)
Date: Mon, 18 Jul 2022 15:07:01 -0000
Subject: [Python-checkins] GH-94739: Mark stacks of exception handling
 blocks for setting frame.f_lineno in the debugger. (GH-94958)
Message-ID: <mailman.81.1658156822.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/2f8bff6879c5d76d143068e8bc867196a7d28afc
commit: 2f8bff6879c5d76d143068e8bc867196a7d28afc
branch: main
author: Mark Shannon <mark at hotpy.org>
committer: markshannon <mark at hotpy.org>
date: 2022-07-18T16:06:42+01:00
summary:

GH-94739: Mark stacks of exception handling blocks for setting frame.f_lineno in the debugger. (GH-94958)

files:
A Misc/NEWS.d/next/Core and Builtins/2022-07-18-14-19-21.gh-issue-94739.NQJQi7.rst
M Include/internal/pycore_code.h
M Lib/test/test_sys_settrace.py
M Objects/frameobject.c
M Python/ceval.c

diff --git a/Include/internal/pycore_code.h b/Include/internal/pycore_code.h
index c975f1cb74f3d..61e40eb8a94c2 100644
--- a/Include/internal/pycore_code.h
+++ b/Include/internal/pycore_code.h
@@ -390,6 +390,19 @@ read_obj(uint16_t *p)
     return (PyObject *)val;
 }
 
+/* See Objects/exception_handling_notes.txt for details.
+ */
+static inline unsigned char *
+parse_varint(unsigned char *p, int *result) {
+    int val = p[0] & 63;
+    while (p[0] & 64) {
+        p++;
+        val = (val << 6) | (p[0] & 63);
+    }
+    *result = val;
+    return p+1;
+}
+
 static inline int
 write_varint(uint8_t *ptr, unsigned int val)
 {
diff --git a/Lib/test/test_sys_settrace.py b/Lib/test/test_sys_settrace.py
index 4f2dd4f9eade3..8d0c3171441a1 100644
--- a/Lib/test/test_sys_settrace.py
+++ b/Lib/test/test_sys_settrace.py
@@ -1879,7 +1879,7 @@ def test_jump_out_of_block_backwards(output):
             output.append(6)
         output.append(7)
 
-    @async_jump_test(4, 5, [3], (ValueError, 'into'))
+    @async_jump_test(4, 5, [3, 5])
     async def test_jump_out_of_async_for_block_forwards(output):
         for i in [1]:
             async for i in asynciter([1, 2]):
@@ -1921,7 +1921,7 @@ def test_jump_in_nested_finally(output):
                 output.append(8)
             output.append(9)
 
-    @jump_test(6, 7, [2], (ValueError, 'within'))
+    @jump_test(6, 7, [2, 7], (ZeroDivisionError, ''))
     def test_jump_in_nested_finally_2(output):
         try:
             output.append(2)
@@ -1932,7 +1932,7 @@ def test_jump_in_nested_finally_2(output):
             output.append(7)
         output.append(8)
 
-    @jump_test(6, 11, [2], (ValueError, 'within'))
+    @jump_test(6, 11, [2, 11], (ZeroDivisionError, ''))
     def test_jump_in_nested_finally_3(output):
         try:
             output.append(2)
@@ -2043,8 +2043,8 @@ def test_jump_backwards_out_of_try_except_block(output):
             output.append(5)
             raise
 
-    @jump_test(5, 7, [4], (ValueError, 'within'))
-    def test_no_jump_between_except_blocks(output):
+    @jump_test(5, 7, [4, 7, 8])
+    def test_jump_between_except_blocks(output):
         try:
             1/0
         except ZeroDivisionError:
@@ -2054,8 +2054,19 @@ def test_no_jump_between_except_blocks(output):
             output.append(7)
         output.append(8)
 
-    @jump_test(5, 6, [4], (ValueError, 'within'))
-    def test_no_jump_within_except_block(output):
+    @jump_test(5, 7, [4, 7, 8])
+    def test_jump_from_except_to_finally(output):
+        try:
+            1/0
+        except ZeroDivisionError:
+            output.append(4)
+            output.append(5)
+        finally:
+            output.append(7)
+        output.append(8)
+
+    @jump_test(5, 6, [4, 6, 7])
+    def test_jump_within_except_block(output):
         try:
             1/0
         except:
@@ -2290,7 +2301,7 @@ def test_no_jump_backwards_into_for_block(output):
             output.append(2)
         output.append(3)
 
-    @async_jump_test(3, 2, [2, 2], (ValueError, 'within'))
+    @async_jump_test(3, 2, [2, 2], (ValueError, "can't jump into the body of a for loop"))
     async def test_no_jump_backwards_into_async_for_block(output):
         async for i in asynciter([1, 2]):
             output.append(2)
@@ -2355,8 +2366,8 @@ def test_jump_backwards_into_try_except_block(output):
         output.append(6)
 
     # 'except' with a variable creates an implicit finally block
-    @jump_test(5, 7, [4], (ValueError, 'within'))
-    def test_no_jump_between_except_blocks_2(output):
+    @jump_test(5, 7, [4, 7, 8])
+    def test_jump_between_except_blocks_2(output):
         try:
             1/0
         except ZeroDivisionError:
@@ -2392,7 +2403,7 @@ def test_jump_out_of_finally_block(output):
         finally:
             output.append(5)
 
-    @jump_test(1, 5, [], (ValueError, "into an exception"))
+    @jump_test(1, 5, [], (ValueError, "can't jump into an 'except' block as there's no exception"))
     def test_no_jump_into_bare_except_block(output):
         output.append(1)
         try:
@@ -2400,7 +2411,7 @@ def test_no_jump_into_bare_except_block(output):
         except:
             output.append(5)
 
-    @jump_test(1, 5, [], (ValueError, "into an exception"))
+    @jump_test(1, 5, [], (ValueError, "can't jump into an 'except' block as there's no exception"))
     def test_no_jump_into_qualified_except_block(output):
         output.append(1)
         try:
@@ -2408,7 +2419,7 @@ def test_no_jump_into_qualified_except_block(output):
         except Exception:
             output.append(5)
 
-    @jump_test(3, 6, [2, 5, 6], (ValueError, "into an exception"))
+    @jump_test(3, 6, [2, 5, 6], (ValueError, "can't jump into an 'except' block as there's no exception"))
     def test_no_jump_into_bare_except_block_from_try_block(output):
         try:
             output.append(2)
@@ -2419,7 +2430,7 @@ def test_no_jump_into_bare_except_block_from_try_block(output):
             raise
         output.append(8)
 
-    @jump_test(3, 6, [2], (ValueError, "into an exception"))
+    @jump_test(3, 6, [2], (ValueError, "can't jump into an 'except' block as there's no exception"))
     def test_no_jump_into_qualified_except_block_from_try_block(output):
         try:
             output.append(2)
@@ -2430,8 +2441,8 @@ def test_no_jump_into_qualified_except_block_from_try_block(output):
             raise
         output.append(8)
 
-    @jump_test(7, 1, [1, 3, 6], (ValueError, "within"))
-    def test_no_jump_out_of_bare_except_block(output):
+    @jump_test(7, 1, [1, 3, 6, 1, 3, 6, 7])
+    def test_jump_out_of_bare_except_block(output):
         output.append(1)
         try:
             output.append(3)
@@ -2440,8 +2451,8 @@ def test_no_jump_out_of_bare_except_block(output):
             output.append(6)
             output.append(7)
 
-    @jump_test(7, 1, [1, 3, 6], (ValueError, "within"))
-    def test_no_jump_out_of_qualified_except_block(output):
+    @jump_test(7, 1, [1, 3, 6, 1, 3, 6, 7])
+    def test_jump_out_of_qualified_except_block(output):
         output.append(1)
         try:
             output.append(3)
diff --git a/Misc/NEWS.d/next/Core and Builtins/2022-07-18-14-19-21.gh-issue-94739.NQJQi7.rst b/Misc/NEWS.d/next/Core and Builtins/2022-07-18-14-19-21.gh-issue-94739.NQJQi7.rst
new file mode 100644
index 0000000000000..7476892c423b1
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2022-07-18-14-19-21.gh-issue-94739.NQJQi7.rst	
@@ -0,0 +1 @@
+Allow jumping within, out of, and across exception handlers in the debugger.
diff --git a/Objects/frameobject.c b/Objects/frameobject.c
index 6f4de65cc7c0d..3e97b75d4bf5a 100644
--- a/Objects/frameobject.c
+++ b/Objects/frameobject.c
@@ -138,6 +138,7 @@ typedef enum kind {
     Except = 2,
     Object = 3,
     Null = 4,
+    Lasti = 5,
 } Kind;
 
 static int
@@ -162,6 +163,8 @@ compatible_kind(Kind from, Kind to) {
 #define MAX_STACK_ENTRIES (63/BITS_PER_BLOCK)
 #define WILL_OVERFLOW (1ULL<<((MAX_STACK_ENTRIES-1)*BITS_PER_BLOCK))
 
+#define EMPTY_STACK 0
+
 static inline int64_t
 push_value(int64_t stack, Kind kind)
 {
@@ -185,6 +188,69 @@ top_of_stack(int64_t stack)
     return stack & ((1<<BITS_PER_BLOCK)-1);
 }
 
+static int64_t
+pop_to_level(int64_t stack, int level) {
+    if (level == 0) {
+        return EMPTY_STACK;
+    }
+    int64_t max_item = (1<<BITS_PER_BLOCK) - 1;
+    int64_t level_max_stack = max_item << ((level-1) * BITS_PER_BLOCK);
+    while (stack > level_max_stack) {
+        stack = pop_value(stack);
+    }
+    return stack;
+}
+
+#if 0
+/* These functions are useful for debugging the stack marking code */
+
+static char
+tos_char(int64_t stack) {
+    switch(top_of_stack(stack)) {
+        case Iterator:
+            return 'I';
+        case Except:
+            return 'E';
+        case Object:
+            return 'O';
+        case Lasti:
+            return 'L';
+        case Null:
+            return 'N';
+    }
+}
+
+static void
+print_stack(int64_t stack) {
+    if (stack < 0) {
+        if (stack == UNINITIALIZED) {
+            printf("---");
+        }
+        else if (stack == OVERFLOWED) {
+            printf("OVERFLOWED");
+        }
+        else {
+            printf("??");
+        }
+        return;
+    }
+    while (stack) {
+        printf("%c", tos_char(stack));
+        stack = pop_value(stack);
+    }
+}
+
+static void
+print_stacks(int64_t *stacks, int n) {
+    for (int i = 0; i < n; i++) {
+        printf("%d: ", i);
+        print_stack(stacks[i]);
+        printf("\n");
+    }
+}
+
+#endif
+
 static int64_t *
 mark_stacks(PyCodeObject *code_obj, int len)
 {
@@ -204,7 +270,7 @@ mark_stacks(PyCodeObject *code_obj, int len)
     for (int i = 1; i <= len; i++) {
         stacks[i] = UNINITIALIZED;
     }
-    stacks[0] = 0;
+    stacks[0] = EMPTY_STACK;
     if (code_obj->co_flags & (CO_GENERATOR | CO_COROUTINE | CO_ASYNC_GENERATOR))
     {
         // Generators get sent None while starting:
@@ -213,6 +279,7 @@ mark_stacks(PyCodeObject *code_obj, int len)
     int todo = 1;
     while (todo) {
         todo = 0;
+        /* Scan instructions */
         for (i = 0; i < len; i++) {
             int64_t next_stack = stacks[i];
             if (next_stack == UNINITIALIZED) {
@@ -296,23 +363,25 @@ mark_stacks(PyCodeObject *code_obj, int len)
                     break;
                 }
                 case END_ASYNC_FOR:
-                    next_stack = pop_value(pop_value(pop_value(next_stack)));
+                    next_stack = pop_value(pop_value(next_stack));
                     stacks[i+1] = next_stack;
                     break;
                 case PUSH_EXC_INFO:
+                    next_stack = push_value(next_stack, Except);
+                    stacks[i+1] = next_stack;
+                    break;
                 case POP_EXCEPT:
-                    /* These instructions only appear in exception handlers, which
-                     * skip this switch ever since the move to zero-cost exceptions
-                     * (their stack remains UNINITIALIZED because nothing sets it).
-                     *
-                     * Note that explain_incompatible_stack interprets an
-                     * UNINITIALIZED stack as belonging to an exception handler.
-                     */
-                    Py_UNREACHABLE();
+                    next_stack = pop_value(next_stack);
+                    stacks[i+1] = next_stack;
                     break;
                 case RETURN_VALUE:
+                    assert(pop_value(next_stack) == EMPTY_STACK);
+                    assert(top_of_stack(next_stack) == Object);
+                    break;
                 case RAISE_VARARGS:
+                    break;
                 case RERAISE:
+                    assert(top_of_stack(next_stack) == Except);
                     /* End of block */
                     break;
                 case PUSH_NULL:
@@ -331,6 +400,7 @@ mark_stacks(PyCodeObject *code_obj, int len)
                 }
                 case LOAD_ATTR:
                 {
+                    assert(top_of_stack(next_stack) == Object);
                     int j = get_arg(code, i);
                     if (j & 1) {
                         next_stack = pop_value(next_stack);
@@ -340,6 +410,16 @@ mark_stacks(PyCodeObject *code_obj, int len)
                     stacks[i+1] = next_stack;
                     break;
                 }
+                case CALL:
+                {
+                    int args = get_arg(code, i);
+                    for (int j = 0; j < args+2; j++) {
+                        next_stack = pop_value(next_stack);
+                    }
+                    next_stack = push_value(next_stack, Object);
+                    stacks[i+1] = next_stack;
+                    break;
+                }
                 default:
                 {
                     int delta = PyCompile_OpcodeStackEffect(opcode, _Py_OPARG(code[i]));
@@ -355,6 +435,34 @@ mark_stacks(PyCodeObject *code_obj, int len)
                 }
             }
         }
+        /* Scan exception table */
+        unsigned char *start = (unsigned char *)PyBytes_AS_STRING(code_obj->co_exceptiontable);
+        unsigned char *end = start + PyBytes_GET_SIZE(code_obj->co_exceptiontable);
+        unsigned char *scan = start;
+        while (scan < end) {
+            int start_offset, size, handler;
+            scan = parse_varint(scan, &start_offset);
+            assert(start_offset >= 0 && start_offset < len);
+            scan = parse_varint(scan, &size);
+            assert(size >= 0 && start_offset+size <= len);
+            scan = parse_varint(scan, &handler);
+            assert(handler >= 0 && handler < len);
+            int depth_and_lasti;
+            scan = parse_varint(scan, &depth_and_lasti);
+            int level = depth_and_lasti >> 1;
+            int lasti = depth_and_lasti & 1;
+            if (stacks[start_offset] != UNINITIALIZED) {
+                if (stacks[handler] == UNINITIALIZED) {
+                    todo = 1;
+                    uint64_t target_stack = pop_to_level(stacks[start_offset], level);
+                    if (lasti) {
+                        target_stack = push_value(target_stack, Lasti);
+                    }
+                    target_stack = push_value(target_stack, Except);
+                    stacks[handler] = target_stack;
+                }
+            }
+        }
     }
     Py_DECREF(co_code);
     return stacks;
@@ -395,6 +503,8 @@ explain_incompatible_stack(int64_t to_stack)
     switch(target_kind) {
         case Except:
             return "can't jump into an 'except' block as there's no exception";
+        case Lasti:
+            return "can't jump into a re-raising block as there's no location";
         case Object:
         case Null:
             return "incompatible stacks";
@@ -650,7 +760,7 @@ frame_setlineno(PyFrameObject *f, PyObject* p_new_lineno, void *Py_UNUSED(ignore
                     msg = "stack to deep to analyze";
                 }
                 else if (start_stack == UNINITIALIZED) {
-                    msg = "can't jump from within an exception handler";
+                    msg = "can't jump from unreachable code";
                 }
                 else {
                     msg = explain_incompatible_stack(target_stack);
diff --git a/Python/ceval.c b/Python/ceval.c
index 2a0ce63d435d7..88d13c83bc2e6 100644
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -6089,20 +6089,6 @@ positional_only_passed_as_keyword(PyThreadState *tstate, PyCodeObject *co,
 
 }
 
-/* Exception table parsing code.
- * See Objects/exception_table_notes.txt for details.
- */
-
-static inline unsigned char *
-parse_varint(unsigned char *p, int *result) {
-    int val = p[0] & 63;
-    while (p[0] & 64) {
-        p++;
-        val = (val << 6) | (p[0] & 63);
-    }
-    *result = val;
-    return p+1;
-}
 
 static inline unsigned char *
 scan_back_to_entry_start(unsigned char *p) {


From webhook-mailer at python.org  Mon Jul 18 11:07:36 2022
From: webhook-mailer at python.org (serhiy-storchaka)
Date: Mon, 18 Jul 2022 15:07:36 -0000
Subject: [Python-checkins] gh-94930: skipitem() in getargs.c should return
 non-NULL on error (GH-94931)
Message-ID: <mailman.82.1658156856.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/067f0da33506f70c36a67d5f3d8d011c8dae10c9
commit: 067f0da33506f70c36a67d5f3d8d011c8dae10c9
branch: main
author: Serhiy Storchaka <storchaka at gmail.com>
committer: serhiy-storchaka <storchaka at gmail.com>
date: 2022-07-18T18:07:31+03:00
summary:

gh-94930: skipitem() in getargs.c should return non-NULL on error (GH-94931)

files:
A Misc/NEWS.d/next/C API/2022-07-17-18-21-40.gh-issue-94930.gPFGDL.rst
M Lib/test/test_getargs2.py
M Modules/_testcapimodule.c
M Python/getargs.c

diff --git a/Lib/test/test_getargs2.py b/Lib/test/test_getargs2.py
index 7c11c6cd33a84..899e5463315e1 100644
--- a/Lib/test/test_getargs2.py
+++ b/Lib/test/test_getargs2.py
@@ -877,9 +877,19 @@ def test_s_hash(self):
     def test_s_hash_int(self):
         # "s#" without PY_SSIZE_T_CLEAN defined.
         from _testcapi import getargs_s_hash_int
-        self.assertRaises(SystemError, getargs_s_hash_int, "abc")
-        self.assertRaises(SystemError, getargs_s_hash_int, x=42)
-        # getargs_s_hash_int() don't raise SystemError because skipitem() is not called.
+        from _testcapi import getargs_s_hash_int2
+        buf = bytearray([1, 2])
+        self.assertRaises(SystemError, getargs_s_hash_int, buf, "abc")
+        self.assertRaises(SystemError, getargs_s_hash_int, buf, x=42)
+        self.assertRaises(SystemError, getargs_s_hash_int, buf, x="abc")
+        self.assertRaises(SystemError, getargs_s_hash_int2, buf, ("abc",))
+        self.assertRaises(SystemError, getargs_s_hash_int2, buf, x=42)
+        self.assertRaises(SystemError, getargs_s_hash_int2, buf, x="abc")
+        buf.append(3)  # still mutable -- not locked by a buffer export
+        # getargs_s_hash_int(buf) may not raise SystemError because skipitem()
+        # is not called. But it is an implementation detail.
+        # getargs_s_hash_int(buf)
+        # getargs_s_hash_int2(buf)
 
     def test_z(self):
         from _testcapi import getargs_z
diff --git a/Misc/NEWS.d/next/C API/2022-07-17-18-21-40.gh-issue-94930.gPFGDL.rst b/Misc/NEWS.d/next/C API/2022-07-17-18-21-40.gh-issue-94930.gPFGDL.rst
new file mode 100644
index 0000000000000..5b79d757b1e4a
--- /dev/null
+++ b/Misc/NEWS.d/next/C API/2022-07-17-18-21-40.gh-issue-94930.gPFGDL.rst	
@@ -0,0 +1,2 @@
+Fix ``SystemError`` raised when :c:func:`PyArg_ParseTupleAndKeywords` is
+used with ``#`` in ``(...)`` but without ``PY_SSIZE_T_CLEAN`` defined.
diff --git a/Modules/_testcapimodule.c b/Modules/_testcapimodule.c
index 436c701a7a3fa..6b9afe2aa2415 100644
--- a/Modules/_testcapimodule.c
+++ b/Modules/_testcapimodule.c
@@ -6035,6 +6035,7 @@ test_macros(PyObject *self, PyObject *Py_UNUSED(args))
 static PyObject *negative_dictoffset(PyObject *, PyObject *);
 static PyObject *test_buildvalue_issue38913(PyObject *, PyObject *);
 static PyObject *getargs_s_hash_int(PyObject *, PyObject *, PyObject*);
+static PyObject *getargs_s_hash_int2(PyObject *, PyObject *, PyObject*);
 
 static PyMethodDef TestMethods[] = {
     {"raise_exception",         raise_exception,                 METH_VARARGS},
@@ -6157,6 +6158,8 @@ static PyMethodDef TestMethods[] = {
     {"getargs_s_hash",          getargs_s_hash,                  METH_VARARGS},
     {"getargs_s_hash_int",      _PyCFunction_CAST(getargs_s_hash_int),
       METH_VARARGS|METH_KEYWORDS},
+    {"getargs_s_hash_int2",      _PyCFunction_CAST(getargs_s_hash_int2),
+      METH_VARARGS|METH_KEYWORDS},
     {"getargs_z",               getargs_z,                       METH_VARARGS},
     {"getargs_z_star",          getargs_z_star,                  METH_VARARGS},
     {"getargs_z_hash",          getargs_z_hash,                  METH_VARARGS},
@@ -7794,11 +7797,27 @@ PyAPI_FUNC(int) PyArg_ParseTupleAndKeywords(PyObject *, PyObject *,
 static PyObject *
 getargs_s_hash_int(PyObject *self, PyObject *args, PyObject *kwargs)
 {
-    static char *keywords[] = {"", "x", NULL};
+    static char *keywords[] = {"", "", "x", NULL};
+    Py_buffer buf = {NULL};
+    const char *s;
+    int len;
+    int i = 0;
+    if (!PyArg_ParseTupleAndKeywords(args, kwargs, "w*|s#i", keywords, &buf, &s, &len, &i))
+        return NULL;
+    PyBuffer_Release(&buf);
+    Py_RETURN_NONE;
+}
+
+static PyObject *
+getargs_s_hash_int2(PyObject *self, PyObject *args, PyObject *kwargs)
+{
+    static char *keywords[] = {"", "", "x", NULL};
+    Py_buffer buf = {NULL};
     const char *s;
     int len;
     int i = 0;
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|s#i", keywords, &s, &len, &i))
+    if (!PyArg_ParseTupleAndKeywords(args, kwargs, "w*|(s#)i", keywords, &buf, &s, &len, &i))
         return NULL;
+    PyBuffer_Release(&buf);
     Py_RETURN_NONE;
 }
diff --git a/Python/getargs.c b/Python/getargs.c
index fb4a5124beab8..41881162ff2fb 100644
--- a/Python/getargs.c
+++ b/Python/getargs.c
@@ -2641,9 +2641,7 @@ skipitem(const char **p_format, va_list *p_va, int flags)
             if (*format == '#') {
                 if (p_va != NULL) {
                     if (!(flags & FLAG_SIZE_T)) {
-                        PyErr_SetString(PyExc_SystemError,
-                                "PY_SSIZE_T_CLEAN macro must be defined for '#' formats");
-                        return NULL;
+                        return "PY_SSIZE_T_CLEAN macro must be defined for '#' formats";
                     }
                     (void) va_arg(*p_va, Py_ssize_t *);
                 }


From webhook-mailer at python.org  Mon Jul 18 11:41:32 2022
From: webhook-mailer at python.org (miss-islington)
Date: Mon, 18 Jul 2022 15:41:32 -0000
Subject: [Python-checkins] gh-94930: skipitem() in getargs.c should return
 non-NULL on error (GH-94931)
Message-ID: <mailman.83.1658158893.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/ec6ed6681d7334f2694ca62c035a8fe6b2b60ab3
commit: ec6ed6681d7334f2694ca62c035a8fe6b2b60ab3
branch: 3.11
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-18T08:41:22-07:00
summary:

gh-94930: skipitem() in getargs.c should return non-NULL on error (GH-94931)

(cherry picked from commit 067f0da33506f70c36a67d5f3d8d011c8dae10c9)

Co-authored-by: Serhiy Storchaka <storchaka at gmail.com>

files:
A Misc/NEWS.d/next/C API/2022-07-17-18-21-40.gh-issue-94930.gPFGDL.rst
M Lib/test/test_getargs2.py
M Modules/_testcapimodule.c
M Python/getargs.c

diff --git a/Lib/test/test_getargs2.py b/Lib/test/test_getargs2.py
index 571cabb5f13a0..fd1952c5845db 100644
--- a/Lib/test/test_getargs2.py
+++ b/Lib/test/test_getargs2.py
@@ -878,9 +878,19 @@ def test_s_hash(self):
     def test_s_hash_int(self):
         # "s#" without PY_SSIZE_T_CLEAN defined.
         from _testcapi import getargs_s_hash_int
-        self.assertRaises(SystemError, getargs_s_hash_int, "abc")
-        self.assertRaises(SystemError, getargs_s_hash_int, x=42)
-        # getargs_s_hash_int() don't raise SystemError because skipitem() is not called.
+        from _testcapi import getargs_s_hash_int2
+        buf = bytearray([1, 2])
+        self.assertRaises(SystemError, getargs_s_hash_int, buf, "abc")
+        self.assertRaises(SystemError, getargs_s_hash_int, buf, x=42)
+        self.assertRaises(SystemError, getargs_s_hash_int, buf, x="abc")
+        self.assertRaises(SystemError, getargs_s_hash_int2, buf, ("abc",))
+        self.assertRaises(SystemError, getargs_s_hash_int2, buf, x=42)
+        self.assertRaises(SystemError, getargs_s_hash_int2, buf, x="abc")
+        buf.append(3)  # still mutable -- not locked by a buffer export
+        # getargs_s_hash_int(buf) may not raise SystemError because skipitem()
+        # is not called. But it is an implementation detail.
+        # getargs_s_hash_int(buf)
+        # getargs_s_hash_int2(buf)
 
     def test_z(self):
         from _testcapi import getargs_z
diff --git a/Misc/NEWS.d/next/C API/2022-07-17-18-21-40.gh-issue-94930.gPFGDL.rst b/Misc/NEWS.d/next/C API/2022-07-17-18-21-40.gh-issue-94930.gPFGDL.rst
new file mode 100644
index 0000000000000..5b79d757b1e4a
--- /dev/null
+++ b/Misc/NEWS.d/next/C API/2022-07-17-18-21-40.gh-issue-94930.gPFGDL.rst	
@@ -0,0 +1,2 @@
+Fix ``SystemError`` raised when :c:func:`PyArg_ParseTupleAndKeywords` is
+used with ``#`` in ``(...)`` but without ``PY_SSIZE_T_CLEAN`` defined.
diff --git a/Modules/_testcapimodule.c b/Modules/_testcapimodule.c
index 1d557fe4df6f9..3467c041f710e 100644
--- a/Modules/_testcapimodule.c
+++ b/Modules/_testcapimodule.c
@@ -6002,6 +6002,7 @@ settrace_to_record(PyObject *self, PyObject *list)
 static PyObject *negative_dictoffset(PyObject *, PyObject *);
 static PyObject *test_buildvalue_issue38913(PyObject *, PyObject *);
 static PyObject *getargs_s_hash_int(PyObject *, PyObject *, PyObject*);
+static PyObject *getargs_s_hash_int2(PyObject *, PyObject *, PyObject*);
 
 static PyMethodDef TestMethods[] = {
     {"raise_exception",         raise_exception,                 METH_VARARGS},
@@ -6116,6 +6117,8 @@ static PyMethodDef TestMethods[] = {
     {"getargs_s_hash",          getargs_s_hash,                  METH_VARARGS},
     {"getargs_s_hash_int",      _PyCFunction_CAST(getargs_s_hash_int),
       METH_VARARGS|METH_KEYWORDS},
+    {"getargs_s_hash_int2",      _PyCFunction_CAST(getargs_s_hash_int2),
+      METH_VARARGS|METH_KEYWORDS},
     {"getargs_z",               getargs_z,                       METH_VARARGS},
     {"getargs_z_star",          getargs_z_star,                  METH_VARARGS},
     {"getargs_z_hash",          getargs_z_hash,                  METH_VARARGS},
@@ -7835,11 +7838,27 @@ PyAPI_FUNC(int) PyArg_ParseTupleAndKeywords(PyObject *, PyObject *,
 static PyObject *
 getargs_s_hash_int(PyObject *self, PyObject *args, PyObject *kwargs)
 {
-    static char *keywords[] = {"", "x", NULL};
+    static char *keywords[] = {"", "", "x", NULL};
+    Py_buffer buf = {NULL};
+    const char *s;
+    int len;
+    int i = 0;
+    if (!PyArg_ParseTupleAndKeywords(args, kwargs, "w*|s#i", keywords, &buf, &s, &len, &i))
+        return NULL;
+    PyBuffer_Release(&buf);
+    Py_RETURN_NONE;
+}
+
+static PyObject *
+getargs_s_hash_int2(PyObject *self, PyObject *args, PyObject *kwargs)
+{
+    static char *keywords[] = {"", "", "x", NULL};
+    Py_buffer buf = {NULL};
     const char *s;
     int len;
     int i = 0;
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|s#i", keywords, &s, &len, &i))
+    if (!PyArg_ParseTupleAndKeywords(args, kwargs, "w*|(s#)i", keywords, &buf, &s, &len, &i))
         return NULL;
+    PyBuffer_Release(&buf);
     Py_RETURN_NONE;
 }
diff --git a/Python/getargs.c b/Python/getargs.c
index d7ba9a1e28239..4b5fd1c93bdb5 100644
--- a/Python/getargs.c
+++ b/Python/getargs.c
@@ -2695,9 +2695,7 @@ skipitem(const char **p_format, va_list *p_va, int flags)
             if (*format == '#') {
                 if (p_va != NULL) {
                     if (!(flags & FLAG_SIZE_T)) {
-                        PyErr_SetString(PyExc_SystemError,
-                                "PY_SSIZE_T_CLEAN macro must be defined for '#' formats");
-                        return NULL;
+                        return "PY_SSIZE_T_CLEAN macro must be defined for '#' formats";
                     }
                     (void) va_arg(*p_va, Py_ssize_t *);
                 }


From webhook-mailer at python.org  Mon Jul 18 12:00:57 2022
From: webhook-mailer at python.org (brandtbucher)
Date: Mon, 18 Jul 2022 16:00:57 -0000
Subject: [Python-checkins] GH-94893: Ignore caches when adding
 LOAD_FAST_CHECKs (GH-94894)
Message-ID: <mailman.84.1658160058.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/b407312a24f12de76a928394099decd64f6049a6
commit: b407312a24f12de76a928394099decd64f6049a6
branch: main
author: Brandt Bucher <brandtbucher at microsoft.com>
committer: brandtbucher <brandtbucher at gmail.com>
date: 2022-07-18T09:00:41-07:00
summary:

GH-94893: Ignore caches when adding LOAD_FAST_CHECKs (GH-94894)

files:
A Misc/NEWS.d/next/Core and Builtins/2022-07-15-22-47-44.gh-issue-94893.YiJYcW.rst
M Objects/frameobject.c

diff --git a/Misc/NEWS.d/next/Core and Builtins/2022-07-15-22-47-44.gh-issue-94893.YiJYcW.rst b/Misc/NEWS.d/next/Core and Builtins/2022-07-15-22-47-44.gh-issue-94893.YiJYcW.rst
new file mode 100644
index 0000000000000..6384ef92c6543
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2022-07-15-22-47-44.gh-issue-94893.YiJYcW.rst	
@@ -0,0 +1,2 @@
+Fix an issue where frame object manipulations could corrupt inline bytecode
+caches.
diff --git a/Objects/frameobject.c b/Objects/frameobject.c
index 3e97b75d4bf5a..fe8eaa341fb33 100644
--- a/Objects/frameobject.c
+++ b/Objects/frameobject.c
@@ -603,7 +603,8 @@ add_load_fast_null_checks(PyCodeObject *co)
     int changed = 0;
     _Py_CODEUNIT *instructions = _PyCode_CODE(co);
     for (Py_ssize_t i = 0; i < Py_SIZE(co); i++) {
-        switch (_Py_OPCODE(instructions[i])) {
+        int opcode = _Py_OPCODE(instructions[i]);
+        switch (opcode) {
             case LOAD_FAST:
             case LOAD_FAST__LOAD_FAST:
             case LOAD_FAST__LOAD_CONST:
@@ -619,6 +620,7 @@ add_load_fast_null_checks(PyCodeObject *co)
                 _Py_SET_OPCODE(instructions[i], STORE_FAST);
                 break;
         }
+        i += _PyOpcode_Caches[_PyOpcode_Deopt[opcode]];
     }
     if (changed) {
         // invalidate cached co_code object


From webhook-mailer at python.org  Mon Jul 18 12:38:56 2022
From: webhook-mailer at python.org (terryjreedy)
Date: Mon, 18 Jul 2022 16:38:56 -0000
Subject: [Python-checkins] In ast doc, update 'below' to 'above' (#94967)
Message-ID: <mailman.85.1658162337.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/7b617be4ab6df871cfa9d2127908cb1373578dc0
commit: 7b617be4ab6df871cfa9d2127908cb1373578dc0
branch: main
author: Terry Jan Reedy <tjreedy at udel.edu>
committer: terryjreedy <tjreedy at udel.edu>
date: 2022-07-18T12:38:52-04:00
summary:

In ast doc, update 'below' to 'above' (#94967)

The included asdl file was moved from 'below' to 'above' in 3.9.

files:
M Doc/library/ast.rst

diff --git a/Doc/library/ast.rst b/Doc/library/ast.rst
index 7ad21026f690f..6a9c23a81867e 100644
--- a/Doc/library/ast.rst
+++ b/Doc/library/ast.rst
@@ -45,7 +45,7 @@ Node classes
 
    This is the base of all AST node classes.  The actual node classes are
    derived from the :file:`Parser/Python.asdl` file, which is reproduced
-   :ref:`below <abstract-grammar>`.  They are defined in the :mod:`_ast` C
+   :ref:`above <abstract-grammar>`.  They are defined in the :mod:`_ast` C
    module and re-exported in :mod:`ast`.
 
    There is one class defined for each left-hand side symbol in the abstract


From webhook-mailer at python.org  Mon Jul 18 12:45:22 2022
From: webhook-mailer at python.org (miss-islington)
Date: Mon, 18 Jul 2022 16:45:22 -0000
Subject: [Python-checkins] In ast doc, update 'below' to 'above' (GH-94967)
Message-ID: <mailman.86.1658162722.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/a923eb47c29a1cbcbc12e1996700f50b0f3bf19e
commit: a923eb47c29a1cbcbc12e1996700f50b0f3bf19e
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-18T09:45:09-07:00
summary:

In ast doc, update 'below' to 'above' (GH-94967)


The included asdl file was moved from 'below' to 'above' in 3.9.
(cherry picked from commit 7b617be4ab6df871cfa9d2127908cb1373578dc0)

Co-authored-by: Terry Jan Reedy <tjreedy at udel.edu>

files:
M Doc/library/ast.rst

diff --git a/Doc/library/ast.rst b/Doc/library/ast.rst
index e29b5e88d71d4..1133f022da56c 100644
--- a/Doc/library/ast.rst
+++ b/Doc/library/ast.rst
@@ -45,7 +45,7 @@ Node classes
 
    This is the base of all AST node classes.  The actual node classes are
    derived from the :file:`Parser/Python.asdl` file, which is reproduced
-   :ref:`below <abstract-grammar>`.  They are defined in the :mod:`_ast` C
+   :ref:`above <abstract-grammar>`.  They are defined in the :mod:`_ast` C
    module and re-exported in :mod:`ast`.
 
    There is one class defined for each left-hand side symbol in the abstract


From webhook-mailer at python.org  Mon Jul 18 12:46:31 2022
From: webhook-mailer at python.org (miss-islington)
Date: Mon, 18 Jul 2022 16:46:31 -0000
Subject: [Python-checkins] In ast doc, update 'below' to 'above' (GH-94967)
Message-ID: <mailman.87.1658162791.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/37ec0bdf16006e4a1eaaae60ca40201f55a3240a
commit: 37ec0bdf16006e4a1eaaae60ca40201f55a3240a
branch: 3.11
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-18T09:46:26-07:00
summary:

In ast doc, update 'below' to 'above' (GH-94967)


The included asdl file was moved from 'below' to 'above' in 3.9.
(cherry picked from commit 7b617be4ab6df871cfa9d2127908cb1373578dc0)

Co-authored-by: Terry Jan Reedy <tjreedy at udel.edu>

files:
M Doc/library/ast.rst

diff --git a/Doc/library/ast.rst b/Doc/library/ast.rst
index b10aa7cd50d17..041a099b2043b 100644
--- a/Doc/library/ast.rst
+++ b/Doc/library/ast.rst
@@ -45,7 +45,7 @@ Node classes
 
    This is the base of all AST node classes.  The actual node classes are
    derived from the :file:`Parser/Python.asdl` file, which is reproduced
-   :ref:`below <abstract-grammar>`.  They are defined in the :mod:`_ast` C
+   :ref:`above <abstract-grammar>`.  They are defined in the :mod:`_ast` C
    module and re-exported in :mod:`ast`.
 
    There is one class defined for each left-hand side symbol in the abstract


From webhook-mailer at python.org  Mon Jul 18 13:04:18 2022
From: webhook-mailer at python.org (markshannon)
Date: Mon, 18 Jul 2022 17:04:18 -0000
Subject: [Python-checkins] Remove out of date reference to YIELD_FROM from
 docs. (#94966)
Message-ID: <mailman.88.1658163859.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/c41d4d09172bf28ba9e5760498bd494a3521a123
commit: c41d4d09172bf28ba9e5760498bd494a3521a123
branch: main
author: Mark Shannon <mark at hotpy.org>
committer: markshannon <mark at hotpy.org>
date: 2022-07-18T18:04:07+01:00
summary:

Remove out of date reference to YIELD_FROM from docs. (#94966)

files:
M Doc/library/dis.rst

diff --git a/Doc/library/dis.rst b/Doc/library/dis.rst
index 9173c1bcf5e7b..85bd94b4eae94 100644
--- a/Doc/library/dis.rst
+++ b/Doc/library/dis.rst
@@ -604,12 +604,6 @@ iterations of the loop.
     .. versionchanged:: 3.11
        oparg set to be the stack depth, for efficient handling on frames.
 
-.. opcode:: YIELD_FROM
-
-   Pops TOS and delegates to it as a subiterator from a :term:`generator`.
-
-   .. versionadded:: 3.3
-
 
 .. opcode:: SETUP_ANNOTATIONS
 


From webhook-mailer at python.org  Mon Jul 18 13:10:32 2022
From: webhook-mailer at python.org (brandtbucher)
Date: Mon, 18 Jul 2022 17:10:32 -0000
Subject: [Python-checkins] GH-94822: Don't specialize when metaclasses are
 involved (GH-94892)
Message-ID: <mailman.89.1658164232.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/daf68ba92f315bfd239a0c993f9f683fb90325fb
commit: daf68ba92f315bfd239a0c993f9f683fb90325fb
branch: main
author: Brandt Bucher <brandtbucher at microsoft.com>
committer: brandtbucher <brandtbucher at gmail.com>
date: 2022-07-18T10:10:22-07:00
summary:

GH-94822: Don't specialize when metaclasses are involved (GH-94892)

files:
A Misc/NEWS.d/next/Core and Builtins/2022-07-15-22-16-08.gh-issue-94822.zRRzBN.rst
M Lib/test/test_opcache.py
M Python/specialize.c

diff --git a/Lib/test/test_opcache.py b/Lib/test/test_opcache.py
index 61f337d70ea78..5c032d59b13f1 100644
--- a/Lib/test/test_opcache.py
+++ b/Lib/test/test_opcache.py
@@ -1,5 +1,6 @@
 import unittest
 
+
 class TestLoadAttrCache(unittest.TestCase):
     def test_descriptor_added_after_optimization(self):
         class Descriptor:
@@ -21,3 +22,346 @@ def f(o):
         Descriptor.__set__ = lambda *args: None
 
         self.assertEqual(f(o), 2)
+
+    def test_metaclass_descriptor_added_after_optimization(self):
+        class Descriptor:
+            pass
+
+        class Metaclass(type):
+            attribute = Descriptor()
+
+        class Class(metaclass=Metaclass):
+            attribute = True
+
+        def __get__(self, instance, owner):
+            return False
+
+        def __set__(self, instance, value):
+            return None
+
+        def f():
+            return Class.attribute
+
+        for _ in range(1025):
+            self.assertTrue(f())
+
+        Descriptor.__get__ = __get__
+        Descriptor.__set__ = __set__
+
+        for _ in range(1025):
+            self.assertFalse(f())
+
+    def test_metaclass_descriptor_shadows_class_attribute(self):
+        class Metaclass(type):
+            @property
+            def attribute(self):
+                return True
+
+        class Class(metaclass=Metaclass):
+            attribute = False
+
+        def f():
+            return Class.attribute
+
+        for _ in range(1025):
+            self.assertTrue(f())
+
+    def test_metaclass_set_descriptor_after_optimization(self):
+        class Metaclass(type):
+            pass
+
+        class Class(metaclass=Metaclass):
+            attribute = True
+
+        @property
+        def attribute(self):
+            return False
+
+        def f():
+            return Class.attribute
+
+        for _ in range(1025):
+            self.assertTrue(f())
+
+        Metaclass.attribute = attribute
+
+        for _ in range(1025):
+            self.assertFalse(f())
+
+    def test_metaclass_del_descriptor_after_optimization(self):
+        class Metaclass(type):
+            @property
+            def attribute(self):
+                return True
+
+        class Class(metaclass=Metaclass):
+            attribute = False
+
+        def f():
+            return Class.attribute
+
+        for _ in range(1025):
+            self.assertTrue(f())
+
+        del Metaclass.attribute
+
+        for _ in range(1025):
+            self.assertFalse(f())
+
+    def test_type_descriptor_shadows_attribute_method(self):
+        class Class:
+            mro = None
+
+        def f():
+            return Class.mro
+
+        for _ in range(1025):
+            self.assertIsNone(f())
+
+    def test_type_descriptor_shadows_attribute_member(self):
+        class Class:
+            __base__ = None
+
+        def f():
+            return Class.__base__
+
+        for _ in range(1025):
+            self.assertIs(f(), object)
+
+    def test_type_descriptor_shadows_attribute_getset(self):
+        class Class:
+            __name__ = "Spam"
+
+        def f():
+            return Class.__name__
+
+        for _ in range(1025):
+            self.assertEqual(f(), "Class")
+
+    def test_metaclass_getattribute(self):
+        class Metaclass(type):
+            def __getattribute__(self, name):
+                return True
+
+        class Class(metaclass=Metaclass):
+            attribute = False
+
+        def f():
+            return Class.attribute
+
+        for _ in range(1025):
+            self.assertTrue(f())
+
+    def test_metaclass_swap(self):
+        class OldMetaclass(type):
+            @property
+            def attribute(self):
+                return True
+
+        class NewMetaclass(type):
+            @property
+            def attribute(self):
+                return False
+
+        class Class(metaclass=OldMetaclass):
+            pass
+
+        def f():
+            return Class.attribute
+
+        for _ in range(1025):
+            self.assertTrue(f())
+
+        Class.__class__ = NewMetaclass
+
+        for _ in range(1025):
+            self.assertFalse(f())
+
+
+class TestLoadMethodCache(unittest.TestCase):
+    def test_descriptor_added_after_optimization(self):
+        class Descriptor:
+            pass
+
+        class Class:
+            attribute = Descriptor()
+
+        def __get__(self, instance, owner):
+            return lambda: False
+
+        def __set__(self, instance, value):
+            return None
+
+        def attribute():
+            return True
+
+        instance = Class()
+        instance.attribute = attribute
+
+        def f():
+            return instance.attribute()
+
+        for _ in range(1025):
+            self.assertTrue(f())
+
+        Descriptor.__get__ = __get__
+        Descriptor.__set__ = __set__
+
+        for _ in range(1025):
+            self.assertFalse(f())
+
+    def test_metaclass_descriptor_added_after_optimization(self):
+        class Descriptor:
+            pass
+
+        class Metaclass(type):
+            attribute = Descriptor()
+
+        class Class(metaclass=Metaclass):
+            def attribute():
+                return True
+
+        def __get__(self, instance, owner):
+            return lambda: False
+
+        def __set__(self, instance, value):
+            return None
+
+        def f():
+            return Class.attribute()
+
+        for _ in range(1025):
+            self.assertTrue(f())
+
+        Descriptor.__get__ = __get__
+        Descriptor.__set__ = __set__
+
+        for _ in range(1025):
+            self.assertFalse(f())
+
+    def test_metaclass_descriptor_shadows_class_attribute(self):
+        class Metaclass(type):
+            @property
+            def attribute(self):
+                return lambda: True
+
+        class Class(metaclass=Metaclass):
+            def attribute():
+                return False
+
+        def f():
+            return Class.attribute()
+
+        for _ in range(1025):
+            self.assertTrue(f())
+
+    def test_metaclass_set_descriptor_after_optimization(self):
+        class Metaclass(type):
+            pass
+
+        class Class(metaclass=Metaclass):
+            def attribute():
+                return True
+
+        @property
+        def attribute(self):
+            return lambda: False
+
+        def f():
+            return Class.attribute()
+
+        for _ in range(1025):
+            self.assertTrue(f())
+
+        Metaclass.attribute = attribute
+
+        for _ in range(1025):
+            self.assertFalse(f())
+
+    def test_metaclass_del_descriptor_after_optimization(self):
+        class Metaclass(type):
+            @property
+            def attribute(self):
+                return lambda: True
+
+        class Class(metaclass=Metaclass):
+            def attribute():
+                return False
+
+        def f():
+            return Class.attribute()
+
+        for _ in range(1025):
+            self.assertTrue(f())
+
+        del Metaclass.attribute
+
+        for _ in range(1025):
+            self.assertFalse(f())
+
+    def test_type_descriptor_shadows_attribute_method(self):
+        class Class:
+            def mro():
+                return ["Spam", "eggs"]
+
+        def f():
+            return Class.mro()
+
+        for _ in range(1025):
+            self.assertEqual(f(), ["Spam", "eggs"])
+
+    def test_type_descriptor_shadows_attribute_member(self):
+        class Class:
+            def __base__():
+                return "Spam"
+
+        def f():
+            return Class.__base__()
+
+        for _ in range(1025):
+            self.assertNotEqual(f(), "Spam")
+
+    def test_metaclass_getattribute(self):
+        class Metaclass(type):
+            def __getattribute__(self, name):
+                return lambda: True
+
+        class Class(metaclass=Metaclass):
+            def attribute():
+                return False
+
+        def f():
+            return Class.attribute()
+
+        for _ in range(1025):
+            self.assertTrue(f())
+
+    def test_metaclass_swap(self):
+        class OldMetaclass(type):
+            @property
+            def attribute(self):
+                return lambda: True
+
+        class NewMetaclass(type):
+            @property
+            def attribute(self):
+                return lambda: False
+
+        class Class(metaclass=OldMetaclass):
+            pass
+
+        def f():
+            return Class.attribute()
+
+        for _ in range(1025):
+            self.assertTrue(f())
+
+        Class.__class__ = NewMetaclass
+
+        for _ in range(1025):
+            self.assertFalse(f())
+
+
+if __name__ == "__main__":
+    import unittest
+    unittest.main()
diff --git a/Misc/NEWS.d/next/Core and Builtins/2022-07-15-22-16-08.gh-issue-94822.zRRzBN.rst b/Misc/NEWS.d/next/Core and Builtins/2022-07-15-22-16-08.gh-issue-94822.zRRzBN.rst
new file mode 100644
index 0000000000000..5b24918e49770
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2022-07-15-22-16-08.gh-issue-94822.zRRzBN.rst	
@@ -0,0 +1,2 @@
+Fix an issue where lookups of metaclass descriptors may be ignored when an
+identically-named attribute also exists on the class itself.
diff --git a/Python/specialize.c b/Python/specialize.c
index 66cae44fa8f3d..6f1f3cbc71f43 100644
--- a/Python/specialize.c
+++ b/Python/specialize.c
@@ -945,6 +945,10 @@ specialize_class_load_attr(PyObject *owner, _Py_CODEUNIT *instr,
                              PyObject *name)
 {
     _PyLoadMethodCache *cache = (_PyLoadMethodCache *)(instr + 1);
+    if (!PyType_CheckExact(owner) || _PyType_Lookup(Py_TYPE(owner), name)) {
+        SPECIALIZATION_FAIL(LOAD_ATTR, SPEC_FAIL_ATTR_METACLASS_ATTRIBUTE);
+        return -1;
+    }
     PyObject *descr = NULL;
     DescriptorClassification kind = 0;
     kind = analyze_descriptor((PyTypeObject *)owner, name, &descr, 0);
@@ -957,12 +961,7 @@ specialize_class_load_attr(PyObject *owner, _Py_CODEUNIT *instr,
             return 0;
 #ifdef Py_STATS
         case ABSENT:
-            if (_PyType_Lookup(Py_TYPE(owner), name) != NULL) {
-                SPECIALIZATION_FAIL(LOAD_ATTR, SPEC_FAIL_ATTR_METACLASS_ATTRIBUTE);
-            }
-            else {
-                SPECIALIZATION_FAIL(LOAD_ATTR, SPEC_FAIL_EXPECTED_ERROR);
-            }
+            SPECIALIZATION_FAIL(LOAD_ATTR, SPEC_FAIL_EXPECTED_ERROR);
             return -1;
 #endif
         default:


From webhook-mailer at python.org  Mon Jul 18 13:24:48 2022
From: webhook-mailer at python.org (terryjreedy)
Date: Mon, 18 Jul 2022 17:24:48 -0000
Subject: [Python-checkins] Fix incorrect double indent in ast doc (#94976)
Message-ID: <mailman.90.1658165088.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/a25a803c4c452c70da11be3e80004b47646bff4c
commit: a25a803c4c452c70da11be3e80004b47646bff4c
branch: main
author: Terry Jan Reedy <tjreedy at udel.edu>
committer: terryjreedy <tjreedy at udel.edu>
date: 2022-07-18T13:24:18-04:00
summary:

Fix incorrect double indent in ast doc (#94976)

Warning directive indent was 4 rather than 3 spaces.

files:
M Doc/library/ast.rst

diff --git a/Doc/library/ast.rst b/Doc/library/ast.rst
index 6a9c23a81867e..9aa545d82007f 100644
--- a/Doc/library/ast.rst
+++ b/Doc/library/ast.rst
@@ -1951,7 +1951,7 @@ and classes for traversing abstract syntax trees:
 
    If source contains a null character ('\0'), :exc:`ValueError` is raised.
 
-    .. warning::
+   .. warning::
       Note that successfully parsing source code into an AST object doesn't
       guarantee that the source code provided is valid Python code that can
       be executed as the compilation step can raise further :exc:`SyntaxError`


From webhook-mailer at python.org  Mon Jul 18 13:33:56 2022
From: webhook-mailer at python.org (miss-islington)
Date: Mon, 18 Jul 2022 17:33:56 -0000
Subject: [Python-checkins] Fix incorrect double indent in ast doc (GH-94976)
Message-ID: <mailman.91.1658165637.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/95ae29d508af16be5221692eecdfe7077ebd5f3f
commit: 95ae29d508af16be5221692eecdfe7077ebd5f3f
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-18T10:33:47-07:00
summary:

Fix incorrect double indent in ast doc (GH-94976)


Warning directive indent was 4 rather than 3 spaces.
(cherry picked from commit a25a803c4c452c70da11be3e80004b47646bff4c)

Co-authored-by: Terry Jan Reedy <tjreedy at udel.edu>

files:
M Doc/library/ast.rst

diff --git a/Doc/library/ast.rst b/Doc/library/ast.rst
index 1133f022da56c..bbafcee5246f8 100644
--- a/Doc/library/ast.rst
+++ b/Doc/library/ast.rst
@@ -1919,7 +1919,7 @@ and classes for traversing abstract syntax trees:
 
    If source contains a null character ('\0'), :exc:`ValueError` is raised.
 
-    .. warning::
+   .. warning::
       Note that successfully parsing source code into an AST object doesn't
       guarantee that the source code provided is valid Python code that can
       be executed as the compilation step can raise further :exc:`SyntaxError`


From webhook-mailer at python.org  Mon Jul 18 13:34:13 2022
From: webhook-mailer at python.org (miss-islington)
Date: Mon, 18 Jul 2022 17:34:13 -0000
Subject: [Python-checkins] Fix incorrect double indent in ast doc (GH-94976)
Message-ID: <mailman.92.1658165654.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/a5c8cecf294716d05f5aaf740321cb57ccc84b46
commit: a5c8cecf294716d05f5aaf740321cb57ccc84b46
branch: 3.11
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-18T10:34:09-07:00
summary:

Fix incorrect double indent in ast doc (GH-94976)


Warning directive indent was 4 rather than 3 spaces.
(cherry picked from commit a25a803c4c452c70da11be3e80004b47646bff4c)

Co-authored-by: Terry Jan Reedy <tjreedy at udel.edu>

files:
M Doc/library/ast.rst

diff --git a/Doc/library/ast.rst b/Doc/library/ast.rst
index 041a099b2043b..b3c59c745ba61 100644
--- a/Doc/library/ast.rst
+++ b/Doc/library/ast.rst
@@ -1950,7 +1950,7 @@ and classes for traversing abstract syntax trees:
 
    If source contains a null character ('\0'), :exc:`ValueError` is raised.
 
-    .. warning::
+   .. warning::
       Note that successfully parsing source code into an AST object doesn't
       guarantee that the source code provided is valid Python code that can
       be executed as the compilation step can raise further :exc:`SyntaxError`


From webhook-mailer at python.org  Mon Jul 18 14:55:31 2022
From: webhook-mailer at python.org (brandtbucher)
Date: Mon, 18 Jul 2022 18:55:31 -0000
Subject: [Python-checkins] [3.11] GH-94822: Don't specialize when
 metaclasses are involved (GH-94892) (GH-94980)
Message-ID: <mailman.93.1658170531.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/eda2f90094731a7a1a30bc4a50a6c1bc050a4b2c
commit: eda2f90094731a7a1a30bc4a50a6c1bc050a4b2c
branch: 3.11
author: Brandt Bucher <brandtbucher at microsoft.com>
committer: brandtbucher <brandtbucher at gmail.com>
date: 2022-07-18T11:55:07-07:00
summary:

[3.11] GH-94822: Don't specialize when metaclasses are involved (GH-94892) (GH-94980)

(cherry picked from commit daf68ba92f315bfd239a0c993f9f683fb90325fb)

Co-authored-by: Brandt Bucher <brandtbucher at microsoft.com>

files:
A Misc/NEWS.d/next/Core and Builtins/2022-07-15-22-16-08.gh-issue-94822.zRRzBN.rst
M Lib/test/test_opcache.py
M Python/specialize.c

diff --git a/Lib/test/test_opcache.py b/Lib/test/test_opcache.py
index 61f337d70ea78..5c032d59b13f1 100644
--- a/Lib/test/test_opcache.py
+++ b/Lib/test/test_opcache.py
@@ -1,5 +1,6 @@
 import unittest
 
+
 class TestLoadAttrCache(unittest.TestCase):
     def test_descriptor_added_after_optimization(self):
         class Descriptor:
@@ -21,3 +22,346 @@ def f(o):
         Descriptor.__set__ = lambda *args: None
 
         self.assertEqual(f(o), 2)
+
+    def test_metaclass_descriptor_added_after_optimization(self):
+        class Descriptor:
+            pass
+
+        class Metaclass(type):
+            attribute = Descriptor()
+
+        class Class(metaclass=Metaclass):
+            attribute = True
+
+        def __get__(self, instance, owner):
+            return False
+
+        def __set__(self, instance, value):
+            return None
+
+        def f():
+            return Class.attribute
+
+        for _ in range(1025):
+            self.assertTrue(f())
+
+        Descriptor.__get__ = __get__
+        Descriptor.__set__ = __set__
+
+        for _ in range(1025):
+            self.assertFalse(f())
+
+    def test_metaclass_descriptor_shadows_class_attribute(self):
+        class Metaclass(type):
+            @property
+            def attribute(self):
+                return True
+
+        class Class(metaclass=Metaclass):
+            attribute = False
+
+        def f():
+            return Class.attribute
+
+        for _ in range(1025):
+            self.assertTrue(f())
+
+    def test_metaclass_set_descriptor_after_optimization(self):
+        class Metaclass(type):
+            pass
+
+        class Class(metaclass=Metaclass):
+            attribute = True
+
+        @property
+        def attribute(self):
+            return False
+
+        def f():
+            return Class.attribute
+
+        for _ in range(1025):
+            self.assertTrue(f())
+
+        Metaclass.attribute = attribute
+
+        for _ in range(1025):
+            self.assertFalse(f())
+
+    def test_metaclass_del_descriptor_after_optimization(self):
+        class Metaclass(type):
+            @property
+            def attribute(self):
+                return True
+
+        class Class(metaclass=Metaclass):
+            attribute = False
+
+        def f():
+            return Class.attribute
+
+        for _ in range(1025):
+            self.assertTrue(f())
+
+        del Metaclass.attribute
+
+        for _ in range(1025):
+            self.assertFalse(f())
+
+    def test_type_descriptor_shadows_attribute_method(self):
+        class Class:
+            mro = None
+
+        def f():
+            return Class.mro
+
+        for _ in range(1025):
+            self.assertIsNone(f())
+
+    def test_type_descriptor_shadows_attribute_member(self):
+        class Class:
+            __base__ = None
+
+        def f():
+            return Class.__base__
+
+        for _ in range(1025):
+            self.assertIs(f(), object)
+
+    def test_type_descriptor_shadows_attribute_getset(self):
+        class Class:
+            __name__ = "Spam"
+
+        def f():
+            return Class.__name__
+
+        for _ in range(1025):
+            self.assertEqual(f(), "Class")
+
+    def test_metaclass_getattribute(self):
+        class Metaclass(type):
+            def __getattribute__(self, name):
+                return True
+
+        class Class(metaclass=Metaclass):
+            attribute = False
+
+        def f():
+            return Class.attribute
+
+        for _ in range(1025):
+            self.assertTrue(f())
+
+    def test_metaclass_swap(self):
+        class OldMetaclass(type):
+            @property
+            def attribute(self):
+                return True
+
+        class NewMetaclass(type):
+            @property
+            def attribute(self):
+                return False
+
+        class Class(metaclass=OldMetaclass):
+            pass
+
+        def f():
+            return Class.attribute
+
+        for _ in range(1025):
+            self.assertTrue(f())
+
+        Class.__class__ = NewMetaclass
+
+        for _ in range(1025):
+            self.assertFalse(f())
+
+
+class TestLoadMethodCache(unittest.TestCase):
+    def test_descriptor_added_after_optimization(self):
+        class Descriptor:
+            pass
+
+        class Class:
+            attribute = Descriptor()
+
+        def __get__(self, instance, owner):
+            return lambda: False
+
+        def __set__(self, instance, value):
+            return None
+
+        def attribute():
+            return True
+
+        instance = Class()
+        instance.attribute = attribute
+
+        def f():
+            return instance.attribute()
+
+        for _ in range(1025):
+            self.assertTrue(f())
+
+        Descriptor.__get__ = __get__
+        Descriptor.__set__ = __set__
+
+        for _ in range(1025):
+            self.assertFalse(f())
+
+    def test_metaclass_descriptor_added_after_optimization(self):
+        class Descriptor:
+            pass
+
+        class Metaclass(type):
+            attribute = Descriptor()
+
+        class Class(metaclass=Metaclass):
+            def attribute():
+                return True
+
+        def __get__(self, instance, owner):
+            return lambda: False
+
+        def __set__(self, instance, value):
+            return None
+
+        def f():
+            return Class.attribute()
+
+        for _ in range(1025):
+            self.assertTrue(f())
+
+        Descriptor.__get__ = __get__
+        Descriptor.__set__ = __set__
+
+        for _ in range(1025):
+            self.assertFalse(f())
+
+    def test_metaclass_descriptor_shadows_class_attribute(self):
+        class Metaclass(type):
+            @property
+            def attribute(self):
+                return lambda: True
+
+        class Class(metaclass=Metaclass):
+            def attribute():
+                return False
+
+        def f():
+            return Class.attribute()
+
+        for _ in range(1025):
+            self.assertTrue(f())
+
+    def test_metaclass_set_descriptor_after_optimization(self):
+        class Metaclass(type):
+            pass
+
+        class Class(metaclass=Metaclass):
+            def attribute():
+                return True
+
+        @property
+        def attribute(self):
+            return lambda: False
+
+        def f():
+            return Class.attribute()
+
+        for _ in range(1025):
+            self.assertTrue(f())
+
+        Metaclass.attribute = attribute
+
+        for _ in range(1025):
+            self.assertFalse(f())
+
+    def test_metaclass_del_descriptor_after_optimization(self):
+        class Metaclass(type):
+            @property
+            def attribute(self):
+                return lambda: True
+
+        class Class(metaclass=Metaclass):
+            def attribute():
+                return False
+
+        def f():
+            return Class.attribute()
+
+        for _ in range(1025):
+            self.assertTrue(f())
+
+        del Metaclass.attribute
+
+        for _ in range(1025):
+            self.assertFalse(f())
+
+    def test_type_descriptor_shadows_attribute_method(self):
+        class Class:
+            def mro():
+                return ["Spam", "eggs"]
+
+        def f():
+            return Class.mro()
+
+        for _ in range(1025):
+            self.assertEqual(f(), ["Spam", "eggs"])
+
+    def test_type_descriptor_shadows_attribute_member(self):
+        class Class:
+            def __base__():
+                return "Spam"
+
+        def f():
+            return Class.__base__()
+
+        for _ in range(1025):
+            self.assertNotEqual(f(), "Spam")
+
+    def test_metaclass_getattribute(self):
+        class Metaclass(type):
+            def __getattribute__(self, name):
+                return lambda: True
+
+        class Class(metaclass=Metaclass):
+            def attribute():
+                return False
+
+        def f():
+            return Class.attribute()
+
+        for _ in range(1025):
+            self.assertTrue(f())
+
+    def test_metaclass_swap(self):
+        class OldMetaclass(type):
+            @property
+            def attribute(self):
+                return lambda: True
+
+        class NewMetaclass(type):
+            @property
+            def attribute(self):
+                return lambda: False
+
+        class Class(metaclass=OldMetaclass):
+            pass
+
+        def f():
+            return Class.attribute()
+
+        for _ in range(1025):
+            self.assertTrue(f())
+
+        Class.__class__ = NewMetaclass
+
+        for _ in range(1025):
+            self.assertFalse(f())
+
+
+if __name__ == "__main__":
+    import unittest
+    unittest.main()
diff --git a/Misc/NEWS.d/next/Core and Builtins/2022-07-15-22-16-08.gh-issue-94822.zRRzBN.rst b/Misc/NEWS.d/next/Core and Builtins/2022-07-15-22-16-08.gh-issue-94822.zRRzBN.rst
new file mode 100644
index 0000000000000..5b24918e49770
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2022-07-15-22-16-08.gh-issue-94822.zRRzBN.rst	
@@ -0,0 +1,2 @@
+Fix an issue where lookups of metaclass descriptors may be ignored when an
+identically-named attribute also exists on the class itself.
diff --git a/Python/specialize.c b/Python/specialize.c
index cf7bc32a205be..5f2c6b390633e 100644
--- a/Python/specialize.c
+++ b/Python/specialize.c
@@ -871,6 +871,10 @@ specialize_class_load_method(PyObject *owner, _Py_CODEUNIT *instr,
                              PyObject *name)
 {
     _PyLoadMethodCache *cache = (_PyLoadMethodCache *)(instr + 1);
+    if (!PyType_CheckExact(owner) || _PyType_Lookup(Py_TYPE(owner), name)) {
+        SPECIALIZATION_FAIL(LOAD_METHOD, SPEC_FAIL_LOAD_METHOD_METACLASS_ATTRIBUTE);
+        return -1;
+    }
     PyObject *descr = NULL;
     DescriptorClassification kind = 0;
     kind = analyze_descriptor((PyTypeObject *)owner, name, &descr, 0);
@@ -883,12 +887,7 @@ specialize_class_load_method(PyObject *owner, _Py_CODEUNIT *instr,
             return 0;
 #ifdef Py_STATS
         case ABSENT:
-            if (_PyType_Lookup(Py_TYPE(owner), name) != NULL) {
-                SPECIALIZATION_FAIL(LOAD_METHOD, SPEC_FAIL_LOAD_METHOD_METACLASS_ATTRIBUTE);
-            }
-            else {
-                SPECIALIZATION_FAIL(LOAD_METHOD, SPEC_FAIL_EXPECTED_ERROR);
-            }
+            SPECIALIZATION_FAIL(LOAD_METHOD, SPEC_FAIL_EXPECTED_ERROR);
             return -1;
 #endif
         default:


From webhook-mailer at python.org  Mon Jul 18 15:31:24 2022
From: webhook-mailer at python.org (pganssle)
Date: Mon, 18 Jul 2022 19:31:24 -0000
Subject: [Python-checkins] Fix documentation to include possible Exception
 (#94818)
Message-ID: <mailman.94.1658172685.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/fc0dc9203d6ed03a5f3f3d0bed16ecda16e04269
commit: fc0dc9203d6ed03a5f3f3d0bed16ecda16e04269
branch: main
author: Guy Yagev <yourlefthandman8 at gmail.com>
committer: pganssle <1377457+pganssle at users.noreply.github.com>
date: 2022-07-18T15:31:17-04:00
summary:

Fix documentation to include possible Exception (#94818)

files:
M Doc/library/datetime.rst

diff --git a/Doc/library/datetime.rst b/Doc/library/datetime.rst
index ef1535c84bd5a..710f83c72e285 100644
--- a/Doc/library/datetime.rst
+++ b/Doc/library/datetime.rst
@@ -1370,8 +1370,8 @@ Instance methods:
    time and this method relies on the platform C :c:func:`mktime`
    function to perform the conversion. Since :class:`.datetime`
    supports wider range of values than :c:func:`mktime` on many
-   platforms, this method may raise :exc:`OverflowError` for times far
-   in the past or far in the future.
+   platforms, this method may raise :exc:`OverflowError` or :exc:`OSError`
+   for times far in the past or far in the future.
 
    For aware :class:`.datetime` instances, the return value is computed
    as::


From webhook-mailer at python.org  Mon Jul 18 15:43:46 2022
From: webhook-mailer at python.org (pablogsal)
Date: Mon, 18 Jul 2022 19:43:46 -0000
Subject: [Python-checkins] [3.10] gh-94947: Disallow parsing walrus with
 feature_version < (3, 8) (GH-94948) (#94969)
Message-ID: <mailman.95.1658173427.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/dda9198021b3c34a4882c8524f720b2f83a56ea1
commit: dda9198021b3c34a4882c8524f720b2f83a56ea1
branch: 3.10
author: Shantanu <12621235+hauntsaninja at users.noreply.github.com>
committer: pablogsal <Pablogsal at gmail.com>
date: 2022-07-18T20:43:23+01:00
summary:

[3.10] gh-94947: Disallow parsing walrus with feature_version < (3, 8) (GH-94948) (#94969)

* gh-94947: Disallow parsing walrus with feature_version < (3, 8)

* oops, commit the parser

* ?? Added by blurb_it.

Co-authored-by: blurb-it[bot] <43283697+blurb-it[bot]@users.noreply.github.com>.
(cherry picked from commit ae0be5a53bb4caee3de4888341addd9c94133f2d)

Co-authored-by: Shantanu <12621235+hauntsaninja at users.noreply.github.com>

files:
A Misc/NEWS.d/next/Core and Builtins/2022-07-18-04-48-34.gh-issue-94947.df9gUw.rst
M Grammar/python.gram
M Lib/test/test_ast.py
M Parser/parser.c

diff --git a/Grammar/python.gram b/Grammar/python.gram
index 0dff08cdb35bf..783f23f058e7b 100644
--- a/Grammar/python.gram
+++ b/Grammar/python.gram
@@ -515,7 +515,9 @@ star_named_expression[expr_ty]:
 
 
 assignment_expression[expr_ty]:
-    | a=NAME ':=' ~ b=expression { _PyAST_NamedExpr(CHECK(expr_ty, _PyPegen_set_expr_context(p, a, Store)), b, EXTRA) }
+    | a=NAME ':=' ~ b=expression {
+        CHECK_VERSION(expr_ty, 8, "Assignment expressions are",
+        _PyAST_NamedExpr(CHECK(expr_ty, _PyPegen_set_expr_context(p, a, Store)), b, EXTRA)) }
 
 named_expression[expr_ty]:
     | assignment_expression
diff --git a/Lib/test/test_ast.py b/Lib/test/test_ast.py
index 95af9e2aa690c..9dcc860a6bc41 100644
--- a/Lib/test/test_ast.py
+++ b/Lib/test/test_ast.py
@@ -691,6 +691,11 @@ def test_issue40614_feature_version(self):
         with self.assertRaises(SyntaxError):
             ast.parse('f"{x=}"', feature_version=(3, 7))
 
+    def test_assignment_expression_feature_version(self):
+        ast.parse('(x := 0)', feature_version=(3, 8))
+        with self.assertRaises(SyntaxError):
+            ast.parse('(x := 0)', feature_version=(3, 7))
+
     def test_constant_as_name(self):
         for constant in "True", "False", "None":
             expr = ast.Expression(ast.Name(constant, ast.Load()))
diff --git a/Misc/NEWS.d/next/Core and Builtins/2022-07-18-04-48-34.gh-issue-94947.df9gUw.rst b/Misc/NEWS.d/next/Core and Builtins/2022-07-18-04-48-34.gh-issue-94947.df9gUw.rst
new file mode 100644
index 0000000000000..360ea67048fe2
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2022-07-18-04-48-34.gh-issue-94947.df9gUw.rst	
@@ -0,0 +1 @@
+:func:`ast.parse` will no longer parse assignment expressions when passed ``feature_version`` less than ``(3, 8)``. Patch by Shantanu Jain.
diff --git a/Parser/parser.c b/Parser/parser.c
index 670e58a255ab4..7116af45255f0 100644
--- a/Parser/parser.c
+++ b/Parser/parser.c
@@ -10582,7 +10582,7 @@ assignment_expression_rule(Parser *p)
             UNUSED(_end_lineno); // Only used by EXTRA macro
             int _end_col_offset = _token->end_col_offset;
             UNUSED(_end_col_offset); // Only used by EXTRA macro
-            _res = _PyAST_NamedExpr ( CHECK ( expr_ty , _PyPegen_set_expr_context ( p , a , Store ) ) , b , EXTRA );
+            _res = CHECK_VERSION ( expr_ty , 8 , "Assignment expressions are" , _PyAST_NamedExpr ( CHECK ( expr_ty , _PyPegen_set_expr_context ( p , a , Store ) ) , b , EXTRA ) );
             if (_res == NULL && PyErr_Occurred()) {
                 p->error_indicator = 1;
                 p->level--;


From webhook-mailer at python.org  Mon Jul 18 16:08:43 2022
From: webhook-mailer at python.org (brandtbucher)
Date: Mon, 18 Jul 2022 20:08:43 -0000
Subject: [Python-checkins] Revert "gh-94816: Improve coverage of
 decode_linetable (GH-94853)" (GH-94982)
Message-ID: <mailman.96.1658174923.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/4b5360c7d5ad3c5452782ebd7e40f82cc32a39e1
commit: 4b5360c7d5ad3c5452782ebd7e40f82cc32a39e1
branch: main
author: Michael Droettboom <mdboom at gmail.com>
committer: brandtbucher <brandtbucher at gmail.com>
date: 2022-07-18T13:08:31-07:00
summary:

Revert "gh-94816: Improve coverage of decode_linetable (GH-94853)" (GH-94982)

This reverts commit 20b9d2a658059c8c1624400f60bb6ba19a31ee9b.

files:
M Lib/test/test_code.py

diff --git a/Lib/test/test_code.py b/Lib/test/test_code.py
index 9110ce062b398..fd68f6dee7915 100644
--- a/Lib/test/test_code.py
+++ b/Lib/test/test_code.py
@@ -17,7 +17,6 @@
 freevars: ()
 nlocals: 2
 flags: 3
-lnotab: [4, 1, 10, 2]
 consts: ('None', '<code object g>')
 
 >>> dump(f(4).__code__)
@@ -31,7 +30,6 @@
 freevars: ('x',)
 nlocals: 1
 flags: 19
-lnotab: [4, 1]
 consts: ('None',)
 
 >>> def h(x, y):
@@ -52,7 +50,6 @@
 freevars: ()
 nlocals: 5
 flags: 3
-lnotab: [2, 1, 10, 1, 10, 1, 10, 1]
 consts: ('None',)
 
 >>> def attrs(obj):
@@ -71,7 +68,6 @@
 freevars: ()
 nlocals: 1
 flags: 3
-lnotab: [2, 1, 46, 1, 46, 1]
 consts: ('None',)
 
 >>> def optimize_away():
@@ -91,7 +87,6 @@
 freevars: ()
 nlocals: 0
 flags: 3
-lnotab: [2, 2, 2, 1, 2, 1]
 consts: ("'doc string'", 'None')
 
 >>> def keywordonly_args(a,b,*,k1):
@@ -109,7 +104,6 @@
 freevars: ()
 nlocals: 3
 flags: 3
-lnotab: [2, 1]
 consts: ('None',)
 
 >>> def posonly_args(a,b,/,c):
@@ -127,7 +121,6 @@
 freevars: ()
 nlocals: 3
 flags: 3
-lnotab: [2, 1]
 consts: ('None',)
 
 """
@@ -168,7 +161,6 @@ def dump(co):
                  "kwonlyargcount", "names", "varnames",
                  "cellvars", "freevars", "nlocals", "flags"]:
         print("%s: %s" % (attr, getattr(co, "co_" + attr)))
-    print("lnotab:", list(co.co_lnotab))
     print("consts:", tuple(consts(co.co_consts)))
 
 # Needed for test_closure_injection below
@@ -436,21 +428,6 @@ def func():
             self.assertIsNone(line)
             self.assertEqual(end_line, new_code.co_firstlineno + 1)
 
-    def test_large_lnotab(self):
-        d = {}
-        lines = (
-            ["def f():"] +
-            [""] * (1 << 17) +
-            ["    pass"] * (1 << 17)
-        )
-        source = "\n".join(lines)
-        exec(source, d)
-        code = d["f"].__code__
-
-        expected = 1032 * [0, 127] + [0, 9] + ((1 << 17) - 1) * [2, 1]
-        expected[0] = 2
-        self.assertEqual(list(code.co_lnotab), expected)
-
 
 def isinterned(s):
     return s is sys.intern(('_' + s + '_')[1:-1])


From webhook-mailer at python.org  Mon Jul 18 16:22:56 2022
From: webhook-mailer at python.org (ethanfurman)
Date: Mon, 18 Jul 2022 20:22:56 -0000
Subject: [Python-checkins] Revert "gh-93910: [Enum] restore member.member
 restriction while keeping performance boost (GH-94913)" (#94985)
Message-ID: <mailman.97.1658175777.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/73eab9f35ca17c7c3b813c717673934b0ab8ed64
commit: 73eab9f35ca17c7c3b813c717673934b0ab8ed64
branch: main
author: Ethan Furman <ethan at stoneleaf.us>
committer: ethanfurman <ethan at stoneleaf.us>
date: 2022-07-18T13:22:52-07:00
summary:

Revert "gh-93910: [Enum] restore member.member restriction while keeping performance boost (GH-94913)" (#94985)

This reverts commit c20186c3972ff38577c4c5e32ca86748210983d2.

files:
M Lib/enum.py
M Lib/test/test_enum.py

diff --git a/Lib/enum.py b/Lib/enum.py
index 80945c116bfe5..935e2bd15d0af 100644
--- a/Lib/enum.py
+++ b/Lib/enum.py
@@ -1112,14 +1112,6 @@ def __new__(cls, value):
     def __init__(self, *args, **kwds):
         pass
 
-    def __getattribute__(self, name):
-        self_dict = super().__getattribute__('__dict__')
-        cls = super().__getattribute__('__class__')
-        value = super().__getattribute__(name)
-        if isinstance(value, cls) and name not in self_dict and name in self._member_names_:
-            raise AttributeError("<enum '%s'> member has no attribute %r" % (cls.__name__, name))
-        return super().__getattribute__(name)
-
     def _generate_next_value_(name, start, count, last_values):
         """
         Generate the next value when not given.
diff --git a/Lib/test/test_enum.py b/Lib/test/test_enum.py
index 69fba9a13c89a..bfab0bd4b07f5 100644
--- a/Lib/test/test_enum.py
+++ b/Lib/test/test_enum.py
@@ -2646,6 +2646,7 @@ class Private(Enum):
         self.assertEqual(Private._Private__corporal, 'Radar')
         self.assertEqual(Private._Private__major_, 'Hoolihan')
 
+    @unittest.skip("Accessing all values retained for performance reasons, see GH-93910")
     def test_exception_for_member_from_member_access(self):
         with self.assertRaisesRegex(AttributeError, "<enum .Di.> member has no attribute .NO."):
             class Di(Enum):
@@ -2653,12 +2654,6 @@ class Di(Enum):
                 NO = 0
             nope = Di.YES.NO
 
-    def test_no_exception_for_overridden_member_from_member_access(self):
-        class Di(Enum):
-            YES = 1
-            NO = 0
-        Di.YES.NO = Di.NO
-        nope = Di.YES.NO
 
     def test_dynamic_members_with_static_methods(self):
         #


From webhook-mailer at python.org  Mon Jul 18 16:56:43 2022
From: webhook-mailer at python.org (gpshead)
Date: Mon, 18 Jul 2022 20:56:43 -0000
Subject: [Python-checkins] Revert "gh-93910: [Enum] restore member.member
 restriction while keeping performance boost (GH-94913)" (#94981)
Message-ID: <mailman.98.1658177804.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/be84daf52aec7b963a743d0c2d66dbd175810803
commit: be84daf52aec7b963a743d0c2d66dbd175810803
branch: 3.11
author: Ethan Furman <ethan at stoneleaf.us>
committer: gpshead <greg at krypto.org>
date: 2022-07-18T13:56:21-07:00
summary:

Revert "gh-93910: [Enum] restore member.member restriction while keeping performance boost (GH-94913)" (#94981)

This reverts commit 30f28ac296e506b336e0ab56c41422a53c36d0c2.

files:
M Lib/enum.py
M Lib/test/test_enum.py

diff --git a/Lib/enum.py b/Lib/enum.py
index f5c29edffcf9f..63ca1605353a7 100644
--- a/Lib/enum.py
+++ b/Lib/enum.py
@@ -1125,14 +1125,6 @@ def __new__(cls, value):
     def __init__(self, *args, **kwds):
         pass
 
-    def __getattribute__(self, name):
-        self_dict = super().__getattribute__('__dict__')
-        cls = super().__getattribute__('__class__')
-        value = super().__getattribute__(name)
-        if isinstance(value, cls) and name not in self_dict and name in self._member_names_:
-            raise AttributeError("<enum '%s'> member has no attribute %r" % (cls.__name__, name))
-        return super().__getattribute__(name)
-
     def _generate_next_value_(name, start, count, last_values):
         """
         Generate the next value when not given.
diff --git a/Lib/test/test_enum.py b/Lib/test/test_enum.py
index 80834f2529ae9..4a42c73817210 100644
--- a/Lib/test/test_enum.py
+++ b/Lib/test/test_enum.py
@@ -2611,6 +2611,7 @@ class Private(Enum):
         self.assertEqual(Private._Private__corporal, 'Radar')
         self.assertEqual(Private._Private__major_, 'Hoolihan')
 
+    @unittest.skip("Accessing all values retained for performance reasons, see GH-93910")
     def test_exception_for_member_from_member_access(self):
         with self.assertRaisesRegex(AttributeError, "<enum .Di.> member has no attribute .NO."):
             class Di(Enum):
@@ -2618,12 +2619,6 @@ class Di(Enum):
                 NO = 0
             nope = Di.YES.NO
 
-    def test_no_exception_for_overridden_member_from_member_access(self):
-        class Di(Enum):
-            YES = 1
-            NO = 0
-        Di.YES.NO = Di.NO
-        nope = Di.YES.NO
 
     def test_dynamic_members_with_static_methods(self):
         #


From webhook-mailer at python.org  Mon Jul 18 17:10:59 2022
From: webhook-mailer at python.org (pablogsal)
Date: Mon, 18 Jul 2022 21:10:59 -0000
Subject: [Python-checkins] gh-94949: Disallow parsing parenthesised ctx mgr
 with old feature_version (#94950)
Message-ID: <mailman.99.1658178660.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/0daba822212cd5d6c63384a27f390f0945330c2b
commit: 0daba822212cd5d6c63384a27f390f0945330c2b
branch: main
author: Shantanu <12621235+hauntsaninja at users.noreply.github.com>
committer: pablogsal <Pablogsal at gmail.com>
date: 2022-07-18T22:10:49+01:00
summary:

gh-94949: Disallow parsing parenthesised ctx mgr with old feature_version (#94950)

* gh-94949: Disallow parsing parenthesised ctx manager with old feature_version

* ?? Added by blurb_it.

* Allow it with feature_version=(3, 9) as well

Co-authored-by: blurb-it[bot] <43283697+blurb-it[bot]@users.noreply.github.com>

files:
A Misc/NEWS.d/next/Core and Builtins/2022-07-18-05-10-29.gh-issue-94949.OsZ7_s.rst
M Grammar/python.gram
M Lib/test/test_ast.py
M Parser/parser.c

diff --git a/Grammar/python.gram b/Grammar/python.gram
index 6a8bb942fffcc..6a81e14decbde 100644
--- a/Grammar/python.gram
+++ b/Grammar/python.gram
@@ -391,7 +391,7 @@ for_stmt[stmt_ty]:
 with_stmt[stmt_ty]:
     | invalid_with_stmt_indent
     | 'with' '(' a[asdl_withitem_seq*]=','.with_item+ ','? ')' ':' b=block {
-        _PyAST_With(a, b, NULL, EXTRA) }
+        CHECK_VERSION(stmt_ty, 9, "Parenthesized context managers are", _PyAST_With(a, b, NULL, EXTRA)) }
     | 'with' a[asdl_withitem_seq*]=','.with_item+ ':' tc=[TYPE_COMMENT] b=block {
         _PyAST_With(a, b, NEW_TYPE_COMMENT(p, tc), EXTRA) }
     | ASYNC 'with' '(' a[asdl_withitem_seq*]=','.with_item+ ','? ')' ':' b=block {
diff --git a/Lib/test/test_ast.py b/Lib/test/test_ast.py
index 5d7e4419560b8..480089aa8af44 100644
--- a/Lib/test/test_ast.py
+++ b/Lib/test/test_ast.py
@@ -738,6 +738,14 @@ def test_ast_asdl_signature(self):
         expressions[0] = f"expr = {ast.expr.__subclasses__()[0].__doc__}"
         self.assertCountEqual(ast.expr.__doc__.split("\n"), expressions)
 
+    def test_parenthesized_with_feature_version(self):
+        ast.parse('with (CtxManager() as example): ...', feature_version=(3, 10))
+        # While advertised as a feature in Python 3.10, this was allowed starting 3.9
+        ast.parse('with (CtxManager() as example): ...', feature_version=(3, 9))
+        with self.assertRaises(SyntaxError):
+            ast.parse('with (CtxManager() as example): ...', feature_version=(3, 8))
+        ast.parse('with CtxManager() as example: ...', feature_version=(3, 8))
+
     def test_issue40614_feature_version(self):
         ast.parse('f"{x=}"', feature_version=(3, 8))
         with self.assertRaises(SyntaxError):
diff --git a/Misc/NEWS.d/next/Core and Builtins/2022-07-18-05-10-29.gh-issue-94949.OsZ7_s.rst b/Misc/NEWS.d/next/Core and Builtins/2022-07-18-05-10-29.gh-issue-94949.OsZ7_s.rst
new file mode 100644
index 0000000000000..bc452d434da0f
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2022-07-18-05-10-29.gh-issue-94949.OsZ7_s.rst	
@@ -0,0 +1 @@
+:func:`ast.parse` will no longer parse parenthesized context managers when passed ``feature_version`` less than ``(3, 9)``. Patch by Shantanu Jain.
diff --git a/Parser/parser.c b/Parser/parser.c
index 309c249141d71..f4082aba56a27 100644
--- a/Parser/parser.c
+++ b/Parser/parser.c
@@ -6515,7 +6515,7 @@ with_stmt_rule(Parser *p)
             UNUSED(_end_lineno); // Only used by EXTRA macro
             int _end_col_offset = _token->end_col_offset;
             UNUSED(_end_col_offset); // Only used by EXTRA macro
-            _res = _PyAST_With ( a , b , NULL , EXTRA );
+            _res = CHECK_VERSION ( stmt_ty , 9 , "Parenthesized context managers are" , _PyAST_With ( a , b , NULL , EXTRA ) );
             if (_res == NULL && PyErr_Occurred()) {
                 p->error_indicator = 1;
                 p->level--;


From webhook-mailer at python.org  Mon Jul 18 17:57:59 2022
From: webhook-mailer at python.org (miss-islington)
Date: Mon, 18 Jul 2022 21:57:59 -0000
Subject: [Python-checkins] gh-94949: Disallow parsing parenthesised ctx mgr
 with old feature_version (GH-94950)
Message-ID: <mailman.100.1658181480.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/7733aa048e74a7caee9afed9be95d070c432f7e9
commit: 7733aa048e74a7caee9afed9be95d070c432f7e9
branch: 3.11
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-18T14:57:45-07:00
summary:

gh-94949: Disallow parsing parenthesised ctx mgr with old feature_version (GH-94950)


* gh-94949: Disallow parsing parenthesised ctx manager with old feature_version

* ?? Added by blurb_it.

* Allow it with feature_version=(3, 9) as well

Co-authored-by: blurb-it[bot] <43283697+blurb-it[bot]@users.noreply.github.com>
(cherry picked from commit 0daba822212cd5d6c63384a27f390f0945330c2b)

Co-authored-by: Shantanu <12621235+hauntsaninja at users.noreply.github.com>

files:
A Misc/NEWS.d/next/Core and Builtins/2022-07-18-05-10-29.gh-issue-94949.OsZ7_s.rst
M Grammar/python.gram
M Lib/test/test_ast.py
M Parser/parser.c

diff --git a/Grammar/python.gram b/Grammar/python.gram
index 6a8bb942fffcc..6a81e14decbde 100644
--- a/Grammar/python.gram
+++ b/Grammar/python.gram
@@ -391,7 +391,7 @@ for_stmt[stmt_ty]:
 with_stmt[stmt_ty]:
     | invalid_with_stmt_indent
     | 'with' '(' a[asdl_withitem_seq*]=','.with_item+ ','? ')' ':' b=block {
-        _PyAST_With(a, b, NULL, EXTRA) }
+        CHECK_VERSION(stmt_ty, 9, "Parenthesized context managers are", _PyAST_With(a, b, NULL, EXTRA)) }
     | 'with' a[asdl_withitem_seq*]=','.with_item+ ':' tc=[TYPE_COMMENT] b=block {
         _PyAST_With(a, b, NEW_TYPE_COMMENT(p, tc), EXTRA) }
     | ASYNC 'with' '(' a[asdl_withitem_seq*]=','.with_item+ ','? ')' ':' b=block {
diff --git a/Lib/test/test_ast.py b/Lib/test/test_ast.py
index 5d7e4419560b8..480089aa8af44 100644
--- a/Lib/test/test_ast.py
+++ b/Lib/test/test_ast.py
@@ -738,6 +738,14 @@ def test_ast_asdl_signature(self):
         expressions[0] = f"expr = {ast.expr.__subclasses__()[0].__doc__}"
         self.assertCountEqual(ast.expr.__doc__.split("\n"), expressions)
 
+    def test_parenthesized_with_feature_version(self):
+        ast.parse('with (CtxManager() as example): ...', feature_version=(3, 10))
+        # While advertised as a feature in Python 3.10, this was allowed starting 3.9
+        ast.parse('with (CtxManager() as example): ...', feature_version=(3, 9))
+        with self.assertRaises(SyntaxError):
+            ast.parse('with (CtxManager() as example): ...', feature_version=(3, 8))
+        ast.parse('with CtxManager() as example: ...', feature_version=(3, 8))
+
     def test_issue40614_feature_version(self):
         ast.parse('f"{x=}"', feature_version=(3, 8))
         with self.assertRaises(SyntaxError):
diff --git a/Misc/NEWS.d/next/Core and Builtins/2022-07-18-05-10-29.gh-issue-94949.OsZ7_s.rst b/Misc/NEWS.d/next/Core and Builtins/2022-07-18-05-10-29.gh-issue-94949.OsZ7_s.rst
new file mode 100644
index 0000000000000..bc452d434da0f
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2022-07-18-05-10-29.gh-issue-94949.OsZ7_s.rst	
@@ -0,0 +1 @@
+:func:`ast.parse` will no longer parse parenthesized context managers when passed ``feature_version`` less than ``(3, 9)``. Patch by Shantanu Jain.
diff --git a/Parser/parser.c b/Parser/parser.c
index 91e83e92cd8b3..e578fd73ad9b0 100644
--- a/Parser/parser.c
+++ b/Parser/parser.c
@@ -6515,7 +6515,7 @@ with_stmt_rule(Parser *p)
             UNUSED(_end_lineno); // Only used by EXTRA macro
             int _end_col_offset = _token->end_col_offset;
             UNUSED(_end_col_offset); // Only used by EXTRA macro
-            _res = _PyAST_With ( a , b , NULL , EXTRA );
+            _res = CHECK_VERSION ( stmt_ty , 9 , "Parenthesized context managers are" , _PyAST_With ( a , b , NULL , EXTRA ) );
             if (_res == NULL && PyErr_Occurred()) {
                 p->error_indicator = 1;
                 p->level--;


From webhook-mailer at python.org  Mon Jul 18 21:04:18 2022
From: webhook-mailer at python.org (ericsnowcurrently)
Date: Tue, 19 Jul 2022 01:04:18 -0000
Subject: [Python-checkins] gh-94673: [c-analyzer] Add a Script to Identify
 Static Types (#94989)
Message-ID: <mailman.101.1658192659.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/7a1a85d64088a9eaefaf30d6aa50711cb4ed8245
commit: 7a1a85d64088a9eaefaf30d6aa50711cb4ed8245
branch: main
author: Eric Snow <ericsnowcurrently at gmail.com>
committer: ericsnowcurrently <ericsnowcurrently at gmail.com>
date: 2022-07-18T19:03:57-06:00
summary:

gh-94673: [c-analyzer] Add a Script to Identify Static Types (#94989)

issue: https://github.com/python/cpython/issues/94673

files:
A Tools/c-analyzer/cpython/_builtin_types.py
M Objects/exceptions.c
M Tools/c-analyzer/c_common/tables.py
M Tools/c-analyzer/cpython/__main__.py
M Tools/c-analyzer/cpython/globals-to-fix.tsv

diff --git a/Objects/exceptions.c b/Objects/exceptions.c
index e212e02352efb..9aab683fd1ca7 100644
--- a/Objects/exceptions.c
+++ b/Objects/exceptions.c
@@ -600,17 +600,9 @@ StopIteration_traverse(PyStopIterationObject *self, visitproc visit, void *arg)
     return BaseException_traverse((PyBaseExceptionObject *)self, visit, arg);
 }
 
-ComplexExtendsException(
-    PyExc_Exception,       /* base */
-    StopIteration,         /* name */
-    StopIteration,         /* prefix for *_init, etc */
-    0,                     /* new */
-    0,                     /* methods */
-    StopIteration_members, /* members */
-    0,                     /* getset */
-    0,                     /* str */
-    "Signal the end from iterator.__next__()."
-);
+ComplexExtendsException(PyExc_Exception, StopIteration, StopIteration,
+                        0, 0, StopIteration_members, 0, 0,
+                        "Signal the end from iterator.__next__().");
 
 
 /*
diff --git a/Tools/c-analyzer/c_common/tables.py b/Tools/c-analyzer/c_common/tables.py
index 130be6beba5f8..fe8e8cf473de4 100644
--- a/Tools/c-analyzer/c_common/tables.py
+++ b/Tools/c-analyzer/c_common/tables.py
@@ -1,3 +1,4 @@
+from collections import namedtuple
 import csv
 import re
 import textwrap
@@ -225,7 +226,11 @@ def _normalize_table_file_props(header, sep):
 def resolve_columns(specs):
     if isinstance(specs, str):
         specs = specs.replace(',', ' ').strip().split()
-    return _resolve_colspecs(specs)
+    resolved = []
+    for raw in specs:
+        column = ColumnSpec.from_raw(raw)
+        resolved.append(column)
+    return resolved
 
 
 def build_table(specs, *, sep=' ', defaultwidth=None):
@@ -233,37 +238,145 @@ def build_table(specs, *, sep=' ', defaultwidth=None):
     return _build_table(columns, sep=sep, defaultwidth=defaultwidth)
 
 
-_COLSPEC_RE = re.compile(textwrap.dedent(r'''
-    ^
-    (?:
-        \[
-        (
-            (?: [^\s\]] [^\]]* )?
-            [^\s\]]
-        )  # <label>
-        ]
-    )?
-    ( \w+ )  # <field>
-    (?:
+class ColumnSpec(namedtuple('ColumnSpec', 'field label fmt')):
+
+    REGEX = re.compile(textwrap.dedent(r'''
+        ^
         (?:
-            :
-            ( [<^>] )  # <align>
-            ( \d+ )  # <width1>
-        )
-        |
+            \[
+            (
+                (?: [^\s\]] [^\]]* )?
+                [^\s\]]
+            )  # <label>
+            ]
+        )?
+        ( [-\w]+ )  # <field>
         (?:
             (?:
                 :
-                ( \d+ )  # <width2>
-            )?
+                ( [<^>] )  # <align>
+                ( \d+ )?  # <width1>
+            )
+            |
             (?:
-                :
-                ( .*? )  # <fmt>
-            )?
-        )
-    )?
-    $
-'''), re.VERBOSE)
+                (?:
+                    :
+                    ( \d+ )  # <width2>
+                )?
+                (?:
+                    :
+                    ( .*? )  # <fmt>
+                )?
+            )
+        )?
+        $
+    '''), re.VERBOSE)
+
+    @classmethod
+    def from_raw(cls, raw):
+        if not raw:
+            raise ValueError('missing column spec')
+        elif isinstance(raw, cls):
+            return raw
+
+        if isinstance(raw, str):
+            *values, _ = cls._parse(raw)
+        else:
+            *values, _ = cls._normalize(raw)
+        if values is None:
+            raise ValueError(f'unsupported column spec {raw!r}')
+        return cls(*values)
+
+    @classmethod
+    def parse(cls, specstr):
+        parsed = cls._parse(specstr)
+        if not parsed:
+            return None
+        *values, _ = parsed
+        return cls(*values)
+
+    @classmethod
+    def _parse(cls, specstr):
+        m = cls.REGEX.match(specstr)
+        if not m:
+            return None
+        (label, field,
+         align, width1,
+         width2, fmt,
+         ) = m.groups()
+        if not label:
+            label = field
+        if fmt:
+            assert not align and not width1, (specstr,)
+            _parsed = _parse_fmt(fmt)
+            if not _parsed:
+                raise NotImplementedError
+            elif width2:
+                width, _ = _parsed
+                if width != int(width2):
+                    raise NotImplementedError(specstr)
+        elif width2:
+            fmt = width2
+            width = int(width2)
+        else:
+            assert not fmt, (fmt, specstr)
+            if align:
+                width = int(width1) if width1 else len(label)
+                fmt = f'{align}{width}'
+            else:
+                width = None
+        return field, label, fmt, width
+
+    @classmethod
+    def _normalize(cls, spec):
+        if len(spec) == 1:
+            raw, = spec
+            raise NotImplementedError
+            return _resolve_column(raw)
+
+        if len(spec) == 4:
+            label, field, width, fmt = spec
+            if width:
+                if not fmt:
+                    fmt = str(width)
+                elif _parse_fmt(fmt)[0] != width:
+                    raise ValueError(f'width mismatch in {spec}')
+        elif len(raw) == 3:
+            label, field, fmt = spec
+            if not field:
+                label, field = None, label
+            elif not isinstance(field, str) or not field.isidentifier():
+                # XXX This doesn't seem right...
+                fmt = f'{field}:{fmt}' if fmt else field
+                label, field = None, label
+        elif len(raw) == 2:
+            label = None
+            field, fmt = raw
+            if not field:
+                field, fmt = fmt, None
+            elif not field.isidentifier() or fmt.isidentifier():
+                label, field = field, fmt
+        else:
+            raise NotImplementedError
+
+        fmt = f':{fmt}' if fmt else ''
+        if label:
+            return cls._parse(f'[{label}]{field}{fmt}')
+        else:
+            return cls._parse(f'{field}{fmt}')
+
+    @property
+    def width(self):
+        if not self.fmt:
+            return None
+        parsed = _parse_fmt(self.fmt)
+        if not parsed:
+            return None
+        width, _ = parsed
+        return width
+
+    def resolve_width(self, default=None):
+        return _resolve_width(self.width, self.fmt, self.label, default)
 
 
 def _parse_fmt(fmt):
@@ -272,100 +385,31 @@ def _parse_fmt(fmt):
         width = fmt[1:]
         if width.isdigit():
             return int(width), align
-    return None, None
+    elif fmt.isdigit():
+        return int(fmt), '<'
+    return None
 
 
-def _parse_colspec(raw):
-    m = _COLSPEC_RE.match(raw)
-    if not m:
-        return None
-    label, field, align, width1, width2, fmt = m.groups()
-    if not label:
-        label = field
-    if width1:
-        width = None
-        fmt = f'{align}{width1}'
-    elif width2:
-        width = int(width2)
-        if fmt:
-            _width, _ = _parse_fmt(fmt)
-            if _width == width:
-                width = None
-    else:
-        width = None
-    return field, label, width, fmt
-
-
-def _normalize_colspec(spec):
-    if len(spec) == 1:
-        raw, = spec
-        return _resolve_column(raw)
-
-    if len(spec) == 4:
-        label, field, width, fmt = spec
-        if width:
-            fmt = f'{width}:{fmt}' if fmt else width
-    elif len(raw) == 3:
-        label, field, fmt = spec
-        if not field:
-            label, field = None, label
-        elif not isinstance(field, str) or not field.isidentifier():
-            fmt = f'{field}:{fmt}' if fmt else field
-            label, field = None, label
-    elif len(raw) == 2:
-        label = None
-        field, fmt = raw
-        if not field:
-            field, fmt = fmt, None
-        elif not field.isidentifier() or fmt.isidentifier():
-            label, field = field, fmt
-    else:
-        raise NotImplementedError
-
-    fmt = f':{fmt}' if fmt else ''
-    if label:
-        return _parse_colspec(f'[{label}]{field}{fmt}')
-    else:
-        return _parse_colspec(f'{field}{fmt}')
-
-
-def _resolve_colspec(raw):
-    if isinstance(raw, str):
-        spec = _parse_colspec(raw)
-    else:
-        spec = _normalize_colspec(raw)
-    if spec is None:
-        raise ValueError(f'unsupported column spec {raw!r}')
-    return spec
-
-
-def _resolve_colspecs(columns):
-    parsed = []
-    for raw in columns:
-        column = _resolve_colspec(raw)
-        parsed.append(column)
-    return parsed
-
-
-def _resolve_width(spec, defaultwidth):
-    _, label, width, fmt = spec
+def _resolve_width(width, fmt, label, default):
     if width:
         if not isinstance(width, int):
             raise NotImplementedError
         return width
-    elif width and fmt:
-        width, _ = _parse_fmt(fmt)
-        if width:
-            return width
-
-    if not defaultwidth:
+    elif fmt:
+        parsed = _parse_fmt(fmt)
+        if parsed:
+            width, _ = parsed
+            if width:
+                return width
+
+    if not default:
         return WIDTH
-    elif not hasattr(defaultwidth, 'get'):
-        return defaultwidth or WIDTH
-
-    defaultwidths = defaultwidth
-    defaultwidth = defaultwidths.get(None) or WIDTH
-    return defaultwidths.get(label) or defaultwidth
+    elif hasattr(default, 'get'):
+        defaults = default
+        default = defaults.get(None) or WIDTH
+        return defaults.get(label) or default
+    else:
+        return default or WIDTH
 
 
 def _build_table(columns, *, sep=' ', defaultwidth=None):
@@ -373,16 +417,13 @@ def _build_table(columns, *, sep=' ', defaultwidth=None):
     div = []
     rowfmt = []
     for spec in columns:
-        label, field, _, colfmt = spec
-        width = _resolve_width(spec, defaultwidth)
-        if colfmt:
-            colfmt = f':{colfmt}'
-        else:
-            colfmt = f':{width}'
+        width = spec.resolve_width(defaultwidth)
+        colfmt = spec.fmt
+        colfmt = f':{spec.fmt}' if spec.fmt else f':{width}'
 
-        header.append(f' {{:^{width}}} '.format(label))
+        header.append(f' {{:^{width}}} '.format(spec.label))
         div.append('-' * (width + 2))
-        rowfmt.append(f' {{{field}{colfmt}}} ')
+        rowfmt.append(f' {{{spec.field}{colfmt}}} ')
     return (
         sep.join(header),
         sep.join(div),
diff --git a/Tools/c-analyzer/cpython/__main__.py b/Tools/c-analyzer/cpython/__main__.py
index be331d50427d5..2b9e4233b95ac 100644
--- a/Tools/c-analyzer/cpython/__main__.py
+++ b/Tools/c-analyzer/cpython/__main__.py
@@ -20,7 +20,7 @@
 import c_analyzer.__main__ as c_analyzer
 import c_analyzer as _c_analyzer
 from c_analyzer.info import UNKNOWN
-from . import _analyzer, _capi, _files, _parser, REPO_ROOT
+from . import _analyzer, _builtin_types, _capi, _files, _parser, REPO_ROOT
 
 
 logger = logging.getLogger(__name__)
@@ -325,6 +325,47 @@ def cmd_capi(filenames=None, *,
         print(line)
 
 
+def _cli_builtin_types(parser):
+    parser.add_argument('--format', dest='fmt', default='table')
+#    parser.add_argument('--summary', dest='format',
+#                        action='store_const', const='summary')
+    def process_format(args, *, argv=None):
+        orig = args.fmt
+        args.fmt = _builtin_types.resolve_format(args.fmt)
+        if isinstance(args.fmt, str):
+            if args.fmt not in _builtin_types._FORMATS:
+                parser.error(f'unsupported format {orig!r}')
+
+    parser.add_argument('--include-modules', dest='showmodules',
+                        action='store_true')
+    def process_modules(args, *, argv=None):
+        pass
+
+    return [
+        process_format,
+        process_modules,
+    ]
+
+
+def cmd_builtin_types(fmt, *,
+                      showmodules=False,
+                      verbosity=VERBOSITY,
+                      ):
+    render = _builtin_types.get_renderer(fmt)
+    types = _builtin_types.iter_builtin_types()
+    match = _builtin_types.resolve_matcher(showmodules)
+    if match:
+        types = (t for t in types if match(t, log=lambda msg: logger.log(1, msg)))
+
+    lines = render(
+        types,
+#        verbose=verbosity > VERBOSITY,
+    )
+    print()
+    for line in lines:
+        print(line)
+
+
 # We do not define any other cmd_*() handlers here,
 # favoring those defined elsewhere.
 
@@ -354,6 +395,11 @@ def cmd_capi(filenames=None, *,
         [_cli_capi],
         cmd_capi,
     ),
+    'builtin-types': (
+        'show the builtin types',
+        [_cli_builtin_types],
+        cmd_builtin_types,
+    ),
 }
 
 
diff --git a/Tools/c-analyzer/cpython/_builtin_types.py b/Tools/c-analyzer/cpython/_builtin_types.py
new file mode 100644
index 0000000000000..faa0b7a82a8bb
--- /dev/null
+++ b/Tools/c-analyzer/cpython/_builtin_types.py
@@ -0,0 +1,365 @@
+from collections import namedtuple
+import os.path
+import re
+import textwrap
+
+from c_common import tables
+from . import REPO_ROOT
+from ._files import iter_header_files, iter_filenames
+
+
+CAPI_PREFIX = os.path.join('Include', '')
+INTERNAL_PREFIX = os.path.join('Include', 'internal', '')
+
+REGEX = re.compile(textwrap.dedent(rf'''
+    (?:
+        ^
+        (?:
+            (?:
+                (?:
+                    (?:
+                        (?:
+                            ( static )  # <static>
+                            \s+
+                            |
+                            ( extern )  # <extern>
+                            \s+
+                         )?
+                        PyTypeObject \s+
+                     )
+                    |
+                    (?:
+                        ( PyAPI_DATA )  # <capi>
+                        \s* [(] \s* PyTypeObject \s* [)] \s*
+                     )
+                 )
+                (\w+)  # <name>
+                \s*
+                (?:
+                    (?:
+                        ( = \s* {{ )  # <def>
+                        $
+                     )
+                    |
+                    ( ; )  # <decl>
+                 )
+             )
+            |
+            (?:
+                # These are specific to Objects/exceptions.c:
+                (?:
+                    SimpleExtendsException
+                    |
+                    MiddlingExtendsException
+                    |
+                    ComplexExtendsException
+                 )
+                \( \w+ \s* , \s*
+                ( \w+ )  # <excname>
+                \s* ,
+             )
+         )
+    )
+'''), re.VERBOSE)
+
+
+def _parse_line(line):
+    m = re.match(REGEX, line)
+    if not m:
+        return None
+    (static, extern, capi,
+     name,
+     def_, decl,
+     excname,
+     ) = m.groups()
+    if def_:
+        isdecl = False
+        if extern or capi:
+            raise NotImplementedError(line)
+        kind = 'static' if static else None
+    elif excname:
+        name = f'_PyExc_{excname}'
+        isdecl = False
+        kind = 'static'
+    else:
+        isdecl = True
+        if static:
+            kind = 'static'
+        elif extern:
+            kind = 'extern'
+        elif capi:
+            kind = 'capi'
+        else:
+            kind = None
+    return name, isdecl, kind
+
+
+class BuiltinTypeDecl(namedtuple('BuiltinTypeDecl', 'file lno name kind')):
+
+    KINDS = {
+        'static',
+        'extern',
+        'capi',
+        'forward',
+    }
+
+    @classmethod
+    def from_line(cls, line, filename, lno):
+        # This is similar to ._capi.CAPIItem.from_line().
+        parsed = _parse_line(line)
+        if not parsed:
+            return None
+        name, isdecl, kind = parsed
+        if not isdecl:
+            return None
+        return cls.from_parsed(name, kind, filename, lno)
+
+    @classmethod
+    def from_parsed(cls, name, kind, filename, lno):
+        if not kind:
+            kind = 'forward'
+        return cls.from_values(filename, lno, name, kind)
+
+    @classmethod
+    def from_values(cls, filename, lno, name, kind):
+        if kind not in cls.KINDS:
+            raise ValueError(f'unsupported kind {kind!r}')
+        self = cls(filename, lno, name, kind)
+        if self.kind not in ('extern', 'capi') and self.api:
+            raise NotImplementedError(self)
+        elif self.kind == 'capi' and not self.api:
+            raise NotImplementedError(self)
+        return self
+
+    @property
+    def relfile(self):
+        return self.file[len(REPO_ROOT) + 1:]
+
+    @property
+    def api(self):
+        return self.relfile.startswith(CAPI_PREFIX)
+
+    @property
+    def internal(self):
+        return self.relfile.startswith(INTERNAL_PREFIX)
+
+    @property
+    def private(self):
+        if not self.name.startswith('_'):
+            return False
+        return self.api and not self.internal
+
+    @property
+    def public(self):
+        if self.kind != 'capi':
+            return False
+        return not self.internal and not self.private
+
+
+class BuiltinTypeInfo(namedtuple('BuiltinTypeInfo', 'file lno name static decl')):
+
+    @classmethod
+    def from_line(cls, line, filename, lno, *, decls=None):
+        parsed = _parse_line(line)
+        if not parsed:
+            return None
+        name, isdecl, kind = parsed
+        if isdecl:
+            return None
+        return cls.from_parsed(name, kind, filename, lno, decls=decls)
+
+    @classmethod
+    def from_parsed(cls, name, kind, filename, lno, *, decls=None):
+        if not kind:
+            static = False
+        elif kind == 'static':
+            static = True
+        else:
+            raise NotImplementedError((filename, line, kind))
+        decl = decls.get(name) if decls else None
+        return cls(filename, lno, name, static, decl)
+
+    @property
+    def relfile(self):
+        return self.file[len(REPO_ROOT) + 1:]
+
+    @property
+    def exported(self):
+        return not self.static
+
+    @property
+    def api(self):
+        if not self.decl:
+            return False
+        return self.decl.api
+
+    @property
+    def internal(self):
+        if not self.decl:
+            return False
+        return self.decl.internal
+
+    @property
+    def private(self):
+        if not self.decl:
+            return False
+        return self.decl.private
+
+    @property
+    def public(self):
+        if not self.decl:
+            return False
+        return self.decl.public
+
+    @property
+    def inmodule(self):
+        return self.relfile.startswith('Modules' + os.path.sep)
+
+    def render_rowvalues(self, kinds):
+        row = {
+            'name': self.name,
+            **{k: '' for k in kinds},
+            'filename': f'{self.relfile}:{self.lno}',
+        }
+        if self.static:
+            kind = 'static'
+        else:
+            if self.internal:
+                kind = 'internal'
+            elif self.private:
+                kind = 'private'
+            elif self.public:
+                kind = 'public'
+            else:
+                kind = 'global'
+        row['kind'] = kind
+        row[kind] = kind
+        return row
+
+
+def _ensure_decl(decl, decls):
+    prev = decls.get(decl.name)
+    if prev:
+        if decl.kind == 'forward':
+            return None
+        if prev.kind != 'forward':
+            if decl.kind == prev.kind and decl.file == prev.file:
+                assert decl.lno != prev.lno, (decl, prev)
+                return None
+            raise NotImplementedError(f'duplicate {decl} (was {prev}')
+    decls[decl.name] = decl
+
+
+def iter_builtin_types(filenames=None):
+    decls = {}
+    seen = set()
+    for filename in iter_header_files():
+        seen.add(filename)
+        with open(filename) as infile:
+            for lno, line in enumerate(infile, 1):
+                decl = BuiltinTypeDecl.from_line(line, filename, lno)
+                if not decl:
+                    continue
+                _ensure_decl(decl, decls)
+    srcfiles = []
+    for filename in iter_filenames():
+        if filename.endswith('.c'):
+            srcfiles.append(filename)
+            continue
+        if filename in seen:
+            continue
+        with open(filename) as infile:
+            for lno, line in enumerate(infile, 1):
+                decl = BuiltinTypeDecl.from_line(line, filename, lno)
+                if not decl:
+                    continue
+                _ensure_decl(decl, decls)
+
+    for filename in srcfiles:
+        with open(filename) as infile:
+            localdecls = {}
+            for lno, line in enumerate(infile, 1):
+                parsed = _parse_line(line)
+                if not parsed:
+                    continue
+                name, isdecl, kind = parsed
+                if isdecl:
+                    decl = BuiltinTypeDecl.from_parsed(name, kind, filename, lno)
+                    if not decl:
+                        raise NotImplementedError((filename, line))
+                    _ensure_decl(decl, localdecls)
+                else:
+                    builtin = BuiltinTypeInfo.from_parsed(
+                            name, kind, filename, lno,
+                            decls=decls if name in decls else localdecls)
+                    if not builtin:
+                        raise NotImplementedError((filename, line))
+                    yield builtin
+
+
+def resolve_matcher(showmodules=False):
+    def match(info, *, log=None):
+        if not info.inmodule:
+            return True
+        if log is not None:
+            log(f'ignored {info.name!r}')
+        return False
+    return match
+
+
+##################################
+# CLI rendering
+
+def resolve_format(fmt):
+    if not fmt:
+        return 'table'
+    elif isinstance(fmt, str) and fmt in _FORMATS:
+        return fmt
+    else:
+        raise NotImplementedError(fmt)
+
+
+def get_renderer(fmt):
+    fmt = resolve_format(fmt)
+    if isinstance(fmt, str):
+        try:
+            return _FORMATS[fmt]
+        except KeyError:
+            raise ValueError(f'unsupported format {fmt!r}')
+    else:
+        raise NotImplementedError(fmt)
+
+
+def render_table(types):
+    types = sorted(types, key=(lambda t: t.name))
+    colspecs = tables.resolve_columns(
+            'name:<33 static:^ global:^ internal:^ private:^ public:^ filename:<30')
+    header, div, rowfmt = tables.build_table(colspecs)
+    leader = ' ' * sum(c.width+2 for c in colspecs[:3]) + '   '
+    yield leader + f'{"API":^29}'
+    yield leader + '-' * 29
+    yield header
+    yield div
+    kinds = [c[0] for c in colspecs[1:-1]]
+    counts = {k: 0 for k in kinds}
+    base = {k: '' for k in kinds}
+    for t in types:
+        row = t.render_rowvalues(kinds)
+        kind = row['kind']
+        yield rowfmt.format(**row)
+        counts[kind] += 1
+    yield ''
+    yield f'total: {sum(counts.values()):>3}'
+    for kind in kinds:
+        yield f'  {kind:>10}: {counts[kind]:>3}'
+
+
+def render_repr(types):
+    for t in types:
+        yield repr(t)
+
+
+_FORMATS = {
+    'table': render_table,
+    'repr': render_repr,
+}
diff --git a/Tools/c-analyzer/cpython/globals-to-fix.tsv b/Tools/c-analyzer/cpython/globals-to-fix.tsv
index c92f64df1c5de..bc9d6aabb0936 100644
--- a/Tools/c-analyzer/cpython/globals-to-fix.tsv
+++ b/Tools/c-analyzer/cpython/globals-to-fix.tsv
@@ -7,7 +7,7 @@ filename	funcname	name	reason
 # global objects to fix in core code
 
 #-----------------------
-# static types
+# exported builtin types (C-API)
 
 Objects/boolobject.c	-	PyBool_Type	-
 Objects/bytearrayobject.c	-	PyByteArrayIter_Type	-
@@ -18,8 +18,6 @@ Objects/capsule.c	-	PyCapsule_Type	-
 Objects/cellobject.c	-	PyCell_Type	-
 Objects/classobject.c	-	PyInstanceMethod_Type	-
 Objects/classobject.c	-	PyMethod_Type	-
-Objects/codeobject.c	-	_PyLineIterator	-
-Objects/codeobject.c	-	_PyPositionsIterator	-
 Objects/codeobject.c	-	PyCode_Type	-
 Objects/complexobject.c	-	PyComplex_Type	-
 Objects/descrobject.c	-	PyClassMethodDescr_Type	-
@@ -42,16 +40,12 @@ Objects/dictobject.c	-	PyDictValues_Type	-
 Objects/dictobject.c	-	PyDict_Type	-
 Objects/enumobject.c	-	PyEnum_Type	-
 Objects/enumobject.c	-	PyReversed_Type	-
-Objects/exceptions.c	-	_PyExc_BaseExceptionGroup	-
-Objects/exceptions.c	-	_PyExc_EncodingWarning	-
 Objects/fileobject.c	-	PyStdPrinter_Type	-
-Objects/floatobject.c	-	FloatInfoType	-
 Objects/floatobject.c	-	PyFloat_Type	-
 Objects/frameobject.c	-	PyFrame_Type	-
 Objects/funcobject.c	-	PyClassMethod_Type	-
 Objects/funcobject.c	-	PyFunction_Type	-
 Objects/funcobject.c	-	PyStaticMethod_Type	-
-Objects/genericaliasobject.c	-	_Py_GenericAliasIterType	-
 Objects/genericaliasobject.c	-	Py_GenericAliasType	-
 Objects/genobject.c	-	PyAsyncGen_Type	-
 Objects/genobject.c	-	PyCoro_Type	-
@@ -63,13 +57,10 @@ Objects/genobject.c	-	_PyCoroWrapper_Type	-
 Objects/interpreteridobject.c	-	_PyInterpreterID_Type	-
 Objects/iterobject.c	-	PyCallIter_Type	-
 Objects/iterobject.c	-	PySeqIter_Type	-
-Objects/iterobject.c	-	_PyAnextAwaitable_Type	-
 Objects/listobject.c	-	PyListIter_Type	-
 Objects/listobject.c	-	PyListRevIter_Type	-
 Objects/listobject.c	-	PyList_Type	-
-Objects/longobject.c	-	Int_InfoType	-
 Objects/longobject.c	-	PyLong_Type	-
-Objects/memoryobject.c	-	_PyMemoryIter_Type	-
 Objects/memoryobject.c	-	PyMemoryView_Type	-
 Objects/memoryobject.c	-	_PyManagedBuffer_Type	-
 Objects/methodobject.c	-	PyCFunction_Type	-
@@ -91,7 +82,6 @@ Objects/rangeobject.c	-	PyRange_Type	-
 Objects/setobject.c	-	PyFrozenSet_Type	-
 Objects/setobject.c	-	PySetIter_Type	-
 Objects/setobject.c	-	PySet_Type	-
-Objects/setobject.c	-	_PySetDummy_Type	-
 Objects/sliceobject.c	-	PyEllipsis_Type	-
 Objects/sliceobject.c	-	PySlice_Type	-
 Objects/tupleobject.c	-	PyTupleIter_Type	-
@@ -99,11 +89,8 @@ Objects/tupleobject.c	-	PyTuple_Type	-
 Objects/typeobject.c	-	PyBaseObject_Type	-
 Objects/typeobject.c	-	PySuper_Type	-
 Objects/typeobject.c	-	PyType_Type	-
-Objects/unicodeobject.c	-	EncodingMapType	-
 Objects/unicodeobject.c	-	PyUnicodeIter_Type	-
 Objects/unicodeobject.c	-	PyUnicode_Type	-
-Objects/unionobject.c	-	_PyUnion_Type	-
-Objects/unionobject.c	-	_Py_UnionType	-
 Objects/weakrefobject.c	-	_PyWeakref_CallableProxyType	-
 Objects/weakrefobject.c	-	_PyWeakref_ProxyType	-
 Objects/weakrefobject.c	-	_PyWeakref_RefType	-
@@ -113,8 +100,23 @@ Python/bltinmodule.c	-	PyZip_Type	-
 Python/context.c	-	PyContextToken_Type	-
 Python/context.c	-	PyContextVar_Type	-
 Python/context.c	-	PyContext_Type	-
+Python/traceback.c	-	PyTraceBack_Type	-
+
+#-----------------------
+# other exported builtin types
+
+# Not in a .h file:
+Objects/codeobject.c	-	_PyLineIterator	-
+# Not in a .h file:
+Objects/codeobject.c	-	_PyPositionsIterator	-
+Objects/genericaliasobject.c	-	_Py_GenericAliasIterType	-
+# Not in a .h file:
+Objects/iterobject.c	-	_PyAnextAwaitable_Type	-
+# Not in a .h file:
+Objects/memoryobject.c	-	_PyMemoryIter_Type	-
+#Objects/unicodeobject.c	-	_PyUnicodeASCIIIter_Type	-
+Objects/unionobject.c	-	_PyUnion_Type	-
 Python/context.c	-	_PyContextTokenMissing_Type	-
-Python/errors.c	-	UnraisableHookArgsType	-
 Python/hamt.c	-	_PyHamtItems_Type	-
 Python/hamt.c	-	_PyHamtKeys_Type	-
 Python/hamt.c	-	_PyHamtValues_Type	-
@@ -123,17 +125,32 @@ Python/hamt.c	-	_PyHamt_BitmapNode_Type	-
 Python/hamt.c	-	_PyHamt_CollisionNode_Type	-
 Python/hamt.c	-	_PyHamt_Type	-
 Python/symtable.c	-	PySTEntry_Type	-
+
+#-----------------------
+# private static builtin types
+
+Objects/setobject.c	-	_PySetDummy_Type	-
+Objects/unicodeobject.c	-	EncodingMapType	-
+#Objects/unicodeobject.c	-	PyFieldNameIter_Type	-
+#Objects/unicodeobject.c	-	PyFormatterIter_Type	-
+
+#-----------------------
+# static builtin structseq
+
+Objects/floatobject.c	-	FloatInfoType	-
+Objects/longobject.c	-	Int_InfoType	-
+Python/errors.c	-	UnraisableHookArgsType	-
 Python/sysmodule.c	-	AsyncGenHooksType	-
 Python/sysmodule.c	-	FlagsType	-
 Python/sysmodule.c	-	Hash_InfoType	-
 Python/sysmodule.c	-	VersionInfoType	-
 Python/thread.c	-	ThreadInfoType	-
-Python/traceback.c	-	PyTraceBack_Type	-
 
 #-----------------------
 # builtin exception types
 
 Objects/exceptions.c	-	_PyExc_BaseException	-
+Objects/exceptions.c	-	_PyExc_BaseExceptionGroup	-
 Objects/exceptions.c	-	_PyExc_UnicodeEncodeError	-
 Objects/exceptions.c	-	_PyExc_UnicodeDecodeError	-
 Objects/exceptions.c	-	_PyExc_UnicodeTranslateError	-
@@ -197,9 +214,11 @@ Objects/exceptions.c	-	_PyExc_ImportWarning	-
 Objects/exceptions.c	-	_PyExc_UnicodeWarning	-
 Objects/exceptions.c	-	_PyExc_BytesWarning	-
 Objects/exceptions.c	-	_PyExc_ResourceWarning	-
+Objects/exceptions.c	-	_PyExc_EncodingWarning	-
 Objects/exceptions.c	-	PyExc_EnvironmentError	-
 Objects/exceptions.c	-	PyExc_IOError	-
 Objects/exceptions.c	-	PyExc_BaseException	-
+Objects/exceptions.c	-	PyExc_BaseExceptionGroup	-
 Objects/exceptions.c	-	PyExc_Exception	-
 Objects/exceptions.c	-	PyExc_TypeError	-
 Objects/exceptions.c	-	PyExc_StopAsyncIteration	-
@@ -263,6 +282,7 @@ Objects/exceptions.c	-	PyExc_ImportWarning	-
 Objects/exceptions.c	-	PyExc_UnicodeWarning	-
 Objects/exceptions.c	-	PyExc_BytesWarning	-
 Objects/exceptions.c	-	PyExc_ResourceWarning	-
+Objects/exceptions.c	-	PyExc_EncodingWarning	-
 
 #-----------------------
 # singletons
@@ -354,8 +374,6 @@ Objects/unicodeobject.c	-	static_strings	-
 # other
 
 # initialized once
-Objects/exceptions.c	-	PyExc_BaseExceptionGroup	-
-Objects/exceptions.c	-	PyExc_EncodingWarning	-
 # XXX This should have been found by the analyzer but wasn't:
 Python/context.c	-	_token_missing	-
 # XXX This should have been found by the analyzer but wasn't:


From webhook-mailer at python.org  Mon Jul 18 22:12:56 2022
From: webhook-mailer at python.org (JelleZijlstra)
Date: Tue, 19 Jul 2022 02:12:56 -0000
Subject: [Python-checkins] test_concurrent_futures: Fix unneeded/confusing
 format call (#93119)
Message-ID: <mailman.102.1658196778.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/3f2dd0a7c0b1a5112f2164dce78fcfaa0c4b39c7
commit: 3f2dd0a7c0b1a5112f2164dce78fcfaa0c4b39c7
branch: main
author: Florian Bruhin <me at the-compiler.org>
committer: JelleZijlstra <jelle.zijlstra at gmail.com>
date: 2022-07-18T19:12:40-07:00
summary:

test_concurrent_futures: Fix unneeded/confusing format call (#93119)

Added in 339fd46cb764277cbbdc3e78dcc5b45b156bb6ae - but as noted in a comment, the test only tests ThreadPoolExecutor.

files:
M Lib/test/test_concurrent_futures.py

diff --git a/Lib/test/test_concurrent_futures.py b/Lib/test/test_concurrent_futures.py
index f50255bd57560..e294bd3a0957c 100644
--- a/Lib/test/test_concurrent_futures.py
+++ b/Lib/test/test_concurrent_futures.py
@@ -485,7 +485,7 @@ def test_cancel_futures_wait_false(self):
                 t = ThreadPoolExecutor()
                 t.submit(sleep_and_print, .1, "apple")
                 t.shutdown(wait=False, cancel_futures=True)
-            """.format(executor_type=self.executor_type.__name__))
+            """)
         # Errors in atexit hooks don't change the process exit code, check
         # stderr manually.
         self.assertFalse(err)


From webhook-mailer at python.org  Mon Jul 18 22:38:10 2022
From: webhook-mailer at python.org (miss-islington)
Date: Tue, 19 Jul 2022 02:38:10 -0000
Subject: [Python-checkins] test_concurrent_futures: Fix unneeded/confusing
 format call (GH-93119)
Message-ID: <mailman.103.1658198291.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/96e15167b0a902db206f0868f081b3d73e4e18fc
commit: 96e15167b0a902db206f0868f081b3d73e4e18fc
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-18T19:38:05-07:00
summary:

test_concurrent_futures: Fix unneeded/confusing format call (GH-93119)


Added in 339fd46cb764277cbbdc3e78dcc5b45b156bb6ae - but as noted in a comment, the test only tests ThreadPoolExecutor.
(cherry picked from commit 3f2dd0a7c0b1a5112f2164dce78fcfaa0c4b39c7)

Co-authored-by: Florian Bruhin <me at the-compiler.org>

files:
M Lib/test/test_concurrent_futures.py

diff --git a/Lib/test/test_concurrent_futures.py b/Lib/test/test_concurrent_futures.py
index d8e091979aee3..e5eed9958111b 100644
--- a/Lib/test/test_concurrent_futures.py
+++ b/Lib/test/test_concurrent_futures.py
@@ -485,7 +485,7 @@ def test_cancel_futures_wait_false(self):
                 t = ThreadPoolExecutor()
                 t.submit(sleep_and_print, .1, "apple")
                 t.shutdown(wait=False, cancel_futures=True)
-            """.format(executor_type=self.executor_type.__name__))
+            """)
         # Errors in atexit hooks don't change the process exit code, check
         # stderr manually.
         self.assertFalse(err)


From webhook-mailer at python.org  Mon Jul 18 22:42:24 2022
From: webhook-mailer at python.org (miss-islington)
Date: Tue, 19 Jul 2022 02:42:24 -0000
Subject: [Python-checkins] test_concurrent_futures: Fix unneeded/confusing
 format call (GH-93119)
Message-ID: <mailman.104.1658198545.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/fbd24068c2c82004297f3d267509f878e70a8730
commit: fbd24068c2c82004297f3d267509f878e70a8730
branch: 3.11
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-18T19:42:19-07:00
summary:

test_concurrent_futures: Fix unneeded/confusing format call (GH-93119)


Added in 339fd46cb764277cbbdc3e78dcc5b45b156bb6ae - but as noted in a comment, the test only tests ThreadPoolExecutor.
(cherry picked from commit 3f2dd0a7c0b1a5112f2164dce78fcfaa0c4b39c7)

Co-authored-by: Florian Bruhin <me at the-compiler.org>

files:
M Lib/test/test_concurrent_futures.py

diff --git a/Lib/test/test_concurrent_futures.py b/Lib/test/test_concurrent_futures.py
index 6f3b4609232bb..f0473495fdc65 100644
--- a/Lib/test/test_concurrent_futures.py
+++ b/Lib/test/test_concurrent_futures.py
@@ -484,7 +484,7 @@ def test_cancel_futures_wait_false(self):
                 t = ThreadPoolExecutor()
                 t.submit(sleep_and_print, .1, "apple")
                 t.shutdown(wait=False, cancel_futures=True)
-            """.format(executor_type=self.executor_type.__name__))
+            """)
         # Errors in atexit hooks don't change the process exit code, check
         # stderr manually.
         self.assertFalse(err)


From webhook-mailer at python.org  Tue Jul 19 02:25:07 2022
From: webhook-mailer at python.org (pablogsal)
Date: Tue, 19 Jul 2022 06:25:07 -0000
Subject: [Python-checkins] [3.10] gh-94949: Disallow parsing parenthesised
 ctx mgr with old feature_version (GH-94950) (#94990)
Message-ID: <mailman.105.1658211908.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/906b345dddb4cc5f72a11a10c4e3f1f7712919c0
commit: 906b345dddb4cc5f72a11a10c4e3f1f7712919c0
branch: 3.10
author: Shantanu <12621235+hauntsaninja at users.noreply.github.com>
committer: pablogsal <Pablogsal at gmail.com>
date: 2022-07-19T07:24:48+01:00
summary:

[3.10] gh-94949: Disallow parsing parenthesised ctx mgr with old feature_version (GH-94950) (#94990)

(cherry picked from commit 0daba822212cd5d6c63384a27f390f0945330c2b)

Co-authored-by: Shantanu <12621235+hauntsaninja at users.noreply.github.com>

files:
A Misc/NEWS.d/next/Core and Builtins/2022-07-18-05-10-29.gh-issue-94949.OsZ7_s.rst
M Grammar/python.gram
M Lib/test/test_ast.py
M Parser/parser.c

diff --git a/Grammar/python.gram b/Grammar/python.gram
index 783f23f058e7b..7570748c3f9b7 100644
--- a/Grammar/python.gram
+++ b/Grammar/python.gram
@@ -192,7 +192,7 @@ for_stmt[stmt_ty]:
 with_stmt[stmt_ty]:
     | invalid_with_stmt_indent
     | 'with' '(' a[asdl_withitem_seq*]=','.with_item+ ','? ')' ':' b=block {
-        _PyAST_With(a, b, NULL, EXTRA) }
+        CHECK_VERSION(stmt_ty, 9, "Parenthesized context managers are", _PyAST_With(a, b, NULL, EXTRA)) }
     | 'with' a[asdl_withitem_seq*]=','.with_item+ ':' tc=[TYPE_COMMENT] b=block {
         _PyAST_With(a, b, NEW_TYPE_COMMENT(p, tc), EXTRA) }
     | ASYNC 'with' '(' a[asdl_withitem_seq*]=','.with_item+ ','? ')' ':' b=block {
diff --git a/Lib/test/test_ast.py b/Lib/test/test_ast.py
index 9dcc860a6bc41..eb861096f65cb 100644
--- a/Lib/test/test_ast.py
+++ b/Lib/test/test_ast.py
@@ -686,6 +686,14 @@ def test_ast_asdl_signature(self):
         expressions[0] = f"expr = {ast.expr.__subclasses__()[0].__doc__}"
         self.assertCountEqual(ast.expr.__doc__.split("\n"), expressions)
 
+    def test_parenthesized_with_feature_version(self):
+        ast.parse('with (CtxManager() as example): ...', feature_version=(3, 10))
+        # While advertised as a feature in Python 3.10, this was allowed starting 3.9
+        ast.parse('with (CtxManager() as example): ...', feature_version=(3, 9))
+        with self.assertRaises(SyntaxError):
+            ast.parse('with (CtxManager() as example): ...', feature_version=(3, 8))
+        ast.parse('with CtxManager() as example: ...', feature_version=(3, 8))
+
     def test_issue40614_feature_version(self):
         ast.parse('f"{x=}"', feature_version=(3, 8))
         with self.assertRaises(SyntaxError):
diff --git a/Misc/NEWS.d/next/Core and Builtins/2022-07-18-05-10-29.gh-issue-94949.OsZ7_s.rst b/Misc/NEWS.d/next/Core and Builtins/2022-07-18-05-10-29.gh-issue-94949.OsZ7_s.rst
new file mode 100644
index 0000000000000..bc452d434da0f
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2022-07-18-05-10-29.gh-issue-94949.OsZ7_s.rst	
@@ -0,0 +1 @@
+:func:`ast.parse` will no longer parse parenthesized context managers when passed ``feature_version`` less than ``(3, 9)``. Patch by Shantanu Jain.
diff --git a/Parser/parser.c b/Parser/parser.c
index 7116af45255f0..c0080e80b5654 100644
--- a/Parser/parser.c
+++ b/Parser/parser.c
@@ -4657,7 +4657,7 @@ with_stmt_rule(Parser *p)
             UNUSED(_end_lineno); // Only used by EXTRA macro
             int _end_col_offset = _token->end_col_offset;
             UNUSED(_end_col_offset); // Only used by EXTRA macro
-            _res = _PyAST_With ( a , b , NULL , EXTRA );
+            _res = CHECK_VERSION ( stmt_ty , 9 , "Parenthesized context managers are" , _PyAST_With ( a , b , NULL , EXTRA ) );
             if (_res == NULL && PyErr_Occurred()) {
                 p->error_indicator = 1;
                 p->level--;


From webhook-mailer at python.org  Tue Jul 19 07:58:52 2022
From: webhook-mailer at python.org (iritkatriel)
Date: Tue, 19 Jul 2022 11:58:52 -0000
Subject: [Python-checkins] Remove out of date reference to YIELD_FROM from
 docs. (GH-94966) (GH-94975)
Message-ID: <mailman.106.1658231933.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/d2be44230eaade5c367af6ec9df649502b574dac
commit: d2be44230eaade5c367af6ec9df649502b574dac
branch: 3.11
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: iritkatriel <1055913+iritkatriel at users.noreply.github.com>
date: 2022-07-19T12:58:44+01:00
summary:

Remove out of date reference to YIELD_FROM from docs. (GH-94966) (GH-94975)

(cherry picked from commit c41d4d09172bf28ba9e5760498bd494a3521a123)

Co-authored-by: Mark Shannon <mark at hotpy.org>

Co-authored-by: Mark Shannon <mark at hotpy.org>

files:
M Doc/library/dis.rst

diff --git a/Doc/library/dis.rst b/Doc/library/dis.rst
index 6f882b6d712ab..c303ab9a1ff85 100644
--- a/Doc/library/dis.rst
+++ b/Doc/library/dis.rst
@@ -588,12 +588,6 @@ iterations of the loop.
    Pops TOS and yields it from a :term:`generator`.
 
 
-.. opcode:: YIELD_FROM
-
-   Pops TOS and delegates to it as a subiterator from a :term:`generator`.
-
-   .. versionadded:: 3.3
-
 
 .. opcode:: SETUP_ANNOTATIONS
 


From webhook-mailer at python.org  Tue Jul 19 11:33:37 2022
From: webhook-mailer at python.org (markshannon)
Date: Tue, 19 Jul 2022 15:33:37 -0000
Subject: [Python-checkins] GH-94979: Pop the exception stack when jumping
 out of exception handlers. (#95003)
Message-ID: <mailman.107.1658244819.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/3f738600f623b88bc90ec12587f75babb6f1025e
commit: 3f738600f623b88bc90ec12587f75babb6f1025e
branch: main
author: Mark Shannon <mark at hotpy.org>
committer: markshannon <mark at hotpy.org>
date: 2022-07-19T16:33:18+01:00
summary:

GH-94979: Pop the exception stack when jumping out of exception handlers. (#95003)

files:
M Objects/frameobject.c

diff --git a/Objects/frameobject.c b/Objects/frameobject.c
index fe8eaa341fb33..9e5450af52a72 100644
--- a/Objects/frameobject.c
+++ b/Objects/frameobject.c
@@ -182,10 +182,31 @@ pop_value(int64_t stack)
     return Py_ARITHMETIC_RIGHT_SHIFT(int64_t, stack, BITS_PER_BLOCK);
 }
 
+#define MASK ((1<<BITS_PER_BLOCK)-1)
+
 static inline Kind
 top_of_stack(int64_t stack)
 {
-    return stack & ((1<<BITS_PER_BLOCK)-1);
+    return stack & MASK;
+}
+
+static inline Kind
+peek(int64_t stack, int n)
+{
+    assert(n >= 1);
+    return (stack>>(BITS_PER_BLOCK*(n-1))) & MASK;
+}
+
+static Kind
+stack_swap(int64_t stack, int n)
+{
+    assert(n >= 1);
+    Kind to_swap = peek(stack, n);
+    Kind top = top_of_stack(stack);
+    int shift = BITS_PER_BLOCK*(n-1);
+    int64_t replaced_low = (stack & ~(MASK << shift)) | (top << shift);
+    int64_t replaced_top = (replaced_low & ~MASK) | to_swap;
+    return replaced_top;
 }
 
 static int64_t
@@ -218,6 +239,7 @@ tos_char(int64_t stack) {
         case Null:
             return 'N';
     }
+    return '?';
 }
 
 static void
@@ -371,6 +393,7 @@ mark_stacks(PyCodeObject *code_obj, int len)
                     stacks[i+1] = next_stack;
                     break;
                 case POP_EXCEPT:
+                    assert(top_of_stack(next_stack) == Except);
                     next_stack = pop_value(next_stack);
                     stacks[i+1] = next_stack;
                     break;
@@ -420,6 +443,20 @@ mark_stacks(PyCodeObject *code_obj, int len)
                     stacks[i+1] = next_stack;
                     break;
                 }
+                case SWAP:
+                {
+                    int n = get_arg(code, i);
+                    next_stack = stack_swap(next_stack, n);
+                    stacks[i+1] = next_stack;
+                    break;
+                }
+                case COPY:
+                {
+                    int n = get_arg(code, i);
+                    next_stack = push_value(next_stack, peek(next_stack, n));
+                    stacks[i+1] = next_stack;
+                    break;
+                }
                 default:
                 {
                     int delta = PyCompile_OpcodeStackEffect(opcode, _Py_OPARG(code[i]));
@@ -556,13 +593,6 @@ first_line_not_before(int *lines, int len, int line)
     return result;
 }
 
-static void
-frame_stack_pop(PyFrameObject *f)
-{
-    PyObject *v = _PyFrame_StackPop(f->f_frame);
-    Py_XDECREF(v);
-}
-
 static PyFrameState
 _PyFrame_GetState(PyFrameObject *frame)
 {
@@ -782,7 +812,20 @@ frame_setlineno(PyFrameObject *f, PyObject* p_new_lineno, void *Py_UNUSED(ignore
         start_stack = pop_value(start_stack);
     }
     while (start_stack > best_stack) {
-        frame_stack_pop(f);
+        if (top_of_stack(start_stack) == Except) {
+            /* Pop exception stack as well as the evaluation stack */
+            PyThreadState *tstate = _PyThreadState_GET();
+            _PyErr_StackItem *exc_info = tstate->exc_info;
+            PyObject *value = exc_info->exc_value;
+            PyObject *exc = _PyFrame_StackPop(f->f_frame);
+            assert(PyExceptionInstance_Check(exc) || exc == Py_None);
+            exc_info->exc_value = exc;
+            Py_XDECREF(value);
+        }
+        else {
+            PyObject *v = _PyFrame_StackPop(f->f_frame);
+            Py_XDECREF(v);
+        }
         start_stack = pop_value(start_stack);
     }
     /* Finally set the new lasti and return OK. */


From webhook-mailer at python.org  Tue Jul 19 12:42:49 2022
From: webhook-mailer at python.org (brandtbucher)
Date: Tue, 19 Jul 2022 16:42:49 -0000
Subject: [Python-checkins] GH-91153: Handle mutating __index__ methods in
 bytearray item assignment (GH-94891)
Message-ID: <mailman.108.1658248970.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/f36589510b8708fa224d799d5b328deab558aa4e
commit: f36589510b8708fa224d799d5b328deab558aa4e
branch: main
author: Brandt Bucher <brandtbucher at microsoft.com>
committer: brandtbucher <brandtbucher at gmail.com>
date: 2022-07-19T09:42:40-07:00
summary:

GH-91153: Handle mutating __index__ methods in bytearray item assignment (GH-94891)

files:
A Misc/NEWS.d/next/Core and Builtins/2022-07-15-16-15-04.gh-issue-91153.HiBmtt.rst
M Lib/test/test_bytes.py
M Modules/_testcapimodule.c
M Objects/bytearrayobject.c

diff --git a/Lib/test/test_bytes.py b/Lib/test/test_bytes.py
index b457ff6ca849c..521e391b8d5f9 100644
--- a/Lib/test/test_bytes.py
+++ b/Lib/test/test_bytes.py
@@ -1710,6 +1710,23 @@ def test_repeat_after_setslice(self):
         self.assertEqual(b1, b)
         self.assertEqual(b3, b'xcxcxc')
 
+    def test_mutating_index(self):
+        class Boom:
+            def __index__(self):
+                b.clear()
+                return 0
+
+        with self.subTest("tp_as_mapping"):
+            b = bytearray(b'Now you see me...')
+            with self.assertRaises(IndexError):
+                b[0] = Boom()
+
+        with self.subTest("tp_as_sequence"):
+            _testcapi = import_helper.import_module('_testcapi')
+            b = bytearray(b'Now you see me...')
+            with self.assertRaises(IndexError):
+                _testcapi.sequence_setitem(b, 0, Boom())
+
 
 class AssortedBytesTest(unittest.TestCase):
     #
diff --git a/Misc/NEWS.d/next/Core and Builtins/2022-07-15-16-15-04.gh-issue-91153.HiBmtt.rst b/Misc/NEWS.d/next/Core and Builtins/2022-07-15-16-15-04.gh-issue-91153.HiBmtt.rst
new file mode 100644
index 0000000000000..2caa0170f75bc
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2022-07-15-16-15-04.gh-issue-91153.HiBmtt.rst	
@@ -0,0 +1,2 @@
+Fix an issue where a :class:`bytearray` item assignment could crash if it's
+resized by the new value's :meth:`__index__` method.
diff --git a/Modules/_testcapimodule.c b/Modules/_testcapimodule.c
index 6b9afe2aa2415..02635c427200d 100644
--- a/Modules/_testcapimodule.c
+++ b/Modules/_testcapimodule.c
@@ -5484,6 +5484,21 @@ sequence_getitem(PyObject *self, PyObject *args)
 }
 
 
+static PyObject *
+sequence_setitem(PyObject *self, PyObject *args)
+{
+    Py_ssize_t i;
+    PyObject *seq, *val;
+    if (!PyArg_ParseTuple(args, "OnO", &seq, &i, &val)) {
+        return NULL;
+    }
+    if (PySequence_SetItem(seq, i, val)) {
+        return NULL;
+    }
+    Py_RETURN_NONE;
+}
+
+
 /* Functions for testing C calling conventions (METH_*) are named meth_*,
  * e.g. "meth_varargs" for METH_VARARGS.
  *
@@ -6303,6 +6318,7 @@ static PyMethodDef TestMethods[] = {
 #endif
     {"write_unraisable_exc", test_write_unraisable_exc, METH_VARARGS},
     {"sequence_getitem", sequence_getitem, METH_VARARGS},
+    {"sequence_setitem", sequence_setitem, METH_VARARGS},
     {"meth_varargs", meth_varargs, METH_VARARGS},
     {"meth_varargs_keywords", _PyCFunction_CAST(meth_varargs_keywords), METH_VARARGS|METH_KEYWORDS},
     {"meth_o", meth_o, METH_O},
diff --git a/Objects/bytearrayobject.c b/Objects/bytearrayobject.c
index d017962641487..b2962fd137d93 100644
--- a/Objects/bytearrayobject.c
+++ b/Objects/bytearrayobject.c
@@ -563,22 +563,28 @@ bytearray_setslice(PyByteArrayObject *self, Py_ssize_t lo, Py_ssize_t hi,
 static int
 bytearray_setitem(PyByteArrayObject *self, Py_ssize_t i, PyObject *value)
 {
-    int ival;
+    int ival = -1;
 
-    if (i < 0)
+    // GH-91153: We need to do this *before* the size check, in case value has a
+    // nasty __index__ method that changes the size of the bytearray:
+    if (value && !_getbytevalue(value, &ival)) {
+        return -1;
+    }
+
+    if (i < 0) {
         i += Py_SIZE(self);
+    }
 
     if (i < 0 || i >= Py_SIZE(self)) {
         PyErr_SetString(PyExc_IndexError, "bytearray index out of range");
         return -1;
     }
 
-    if (value == NULL)
+    if (value == NULL) {
         return bytearray_setslice(self, i, i+1, NULL);
+    }
 
-    if (!_getbytevalue(value, &ival))
-        return -1;
-
+    assert(0 <= ival && ival < 256);
     PyByteArray_AS_STRING(self)[i] = ival;
     return 0;
 }
@@ -593,11 +599,21 @@ bytearray_ass_subscript(PyByteArrayObject *self, PyObject *index, PyObject *valu
     if (_PyIndex_Check(index)) {
         Py_ssize_t i = PyNumber_AsSsize_t(index, PyExc_IndexError);
 
-        if (i == -1 && PyErr_Occurred())
+        if (i == -1 && PyErr_Occurred()) {
             return -1;
+        }
 
-        if (i < 0)
+        int ival = -1;
+
+        // GH-91153: We need to do this *before* the size check, in case values
+        // has a nasty __index__ method that changes the size of the bytearray:
+        if (values && !_getbytevalue(values, &ival)) {
+            return -1;
+        }
+
+        if (i < 0) {
             i += PyByteArray_GET_SIZE(self);
+        }
 
         if (i < 0 || i >= Py_SIZE(self)) {
             PyErr_SetString(PyExc_IndexError, "bytearray index out of range");
@@ -612,9 +628,7 @@ bytearray_ass_subscript(PyByteArrayObject *self, PyObject *index, PyObject *valu
             slicelen = 1;
         }
         else {
-            int ival;
-            if (!_getbytevalue(values, &ival))
-                return -1;
+            assert(0 <= ival && ival < 256);
             buf[i] = (char)ival;
             return 0;
         }


From webhook-mailer at python.org  Tue Jul 19 12:49:06 2022
From: webhook-mailer at python.org (iritkatriel)
Date: Tue, 19 Jul 2022 16:49:06 -0000
Subject: [Python-checkins] gh-93678: move normalize_basic_block and
 extend_block call into optimize_cfg (GH-95002)
Message-ID: <mailman.109.1658249347.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/ea11c1774274aa9f4d6eee863d37632aa79a0ace
commit: ea11c1774274aa9f4d6eee863d37632aa79a0ace
branch: main
author: Irit Katriel <1055913+iritkatriel at users.noreply.github.com>
committer: iritkatriel <1055913+iritkatriel at users.noreply.github.com>
date: 2022-07-19T17:48:56+01:00
summary:

gh-93678: move normalize_basic_block and extend_block call into optimize_cfg (GH-95002)

files:
M Python/compile.c

diff --git a/Python/compile.c b/Python/compile.c
index 427fb2a369481..30d8fdbb969ba 100644
--- a/Python/compile.c
+++ b/Python/compile.c
@@ -85,6 +85,10 @@
          (opcode) == SETUP_WITH || \
          (opcode) == SETUP_CLEANUP)
 
+/* opcodes that must be last in the basicblock */
+#define IS_TERMINATOR_OPCODE(opcode) \
+        (IS_JUMP_OPCODE(opcode) || IS_SCOPE_EXIT_OPCODE(opcode))
+
 /* opcodes which are not emitted in codegen stage, only by the assembler */
 #define IS_ASSEMBLER_OPCODE(opcode) \
         ((opcode) == JUMP_FORWARD || \
@@ -262,7 +266,7 @@ typedef struct basicblock_ {
 
 
 static struct instr *
-basicblock_last_instr(basicblock *b) {
+basicblock_last_instr(const basicblock *b) {
     if (b->b_iused) {
         return &b->b_instr[b->b_iused - 1];
     }
@@ -270,19 +274,19 @@ basicblock_last_instr(basicblock *b) {
 }
 
 static inline int
-basicblock_returns(basicblock *b) {
+basicblock_returns(const basicblock *b) {
     struct instr *last = basicblock_last_instr(b);
     return last && last->i_opcode == RETURN_VALUE;
 }
 
 static inline int
-basicblock_exits_scope(basicblock *b) {
+basicblock_exits_scope(const basicblock *b) {
     struct instr *last = basicblock_last_instr(b);
     return last && IS_SCOPE_EXIT_OPCODE(last->i_opcode);
 }
 
 static inline int
-basicblock_nofallthrough(basicblock *b) {
+basicblock_nofallthrough(const basicblock *b) {
     struct instr *last = basicblock_last_instr(b);
     return (last &&
             (IS_SCOPE_EXIT_OPCODE(last->i_opcode) ||
@@ -1243,18 +1247,12 @@ PyCompile_OpcodeStackEffect(int opcode, int oparg)
     return stack_effect(opcode, oparg, -1);
 }
 
-static int
-is_end_of_basic_block(struct instr *instr)
-{
-    int opcode = instr->i_opcode;
-    return IS_JUMP_OPCODE(opcode) || IS_SCOPE_EXIT_OPCODE(opcode);
-}
-
 static int
 compiler_use_new_implicit_block_if_needed(struct compiler *c)
 {
     basicblock *b = c->u->u_curblock;
-    if (b->b_iused && is_end_of_basic_block(basicblock_last_instr(b))) {
+    struct instr *last = basicblock_last_instr(b);
+    if (last && IS_TERMINATOR_OPCODE(last->i_opcode)) {
         basicblock *b = compiler_new_block(c);
         if (b == NULL) {
             return -1;
@@ -8553,18 +8551,6 @@ assemble(struct compiler *c, int addNone)
         ADDOP(c, RETURN_VALUE);
     }
 
-    for (basicblock *b = c->u->u_blocks; b != NULL; b = b->b_list) {
-        if (normalize_basic_block(b)) {
-            return NULL;
-        }
-    }
-
-    for (basicblock *b = c->u->u_blocks; b != NULL; b = b->b_list) {
-        if (extend_block(b)) {
-            return NULL;
-        }
-    }
-
     assert(PyDict_GET_SIZE(c->u->u_varnames) < INT_MAX);
     assert(PyDict_GET_SIZE(c->u->u_cellvars) < INT_MAX);
     assert(PyDict_GET_SIZE(c->u->u_freevars) < INT_MAX);
@@ -8622,12 +8608,12 @@ assemble(struct compiler *c, int addNone)
     if (optimize_cfg(entryblock, consts, c->c_const_cache)) {
         goto error;
     }
-    if (duplicate_exits_without_lineno(entryblock)) {
-        return NULL;
-    }
     if (trim_unused_consts(entryblock, consts)) {
         goto error;
     }
+    if (duplicate_exits_without_lineno(entryblock)) {
+        return NULL;
+    }
     propagate_line_numbers(entryblock);
     guarantee_lineno_for_exits(entryblock, c->u->u_firstlineno);
 
@@ -9323,8 +9309,8 @@ clean_basic_block(basicblock *bb) {
 
 static int
 normalize_basic_block(basicblock *bb) {
-    /* Mark blocks as exit and/or nofallthrough.
-     Raise SystemError if CFG is malformed. */
+    /* Skip over empty blocks.
+     * Raise SystemError if jump or exit is not last instruction in the block. */
     for (int i = 0; i < bb->b_iused; i++) {
         int opcode = bb->b_instr[i].i_opcode;
         assert(!IS_ASSEMBLER_OPCODE(opcode));
@@ -9461,8 +9447,7 @@ propagate_line_numbers(basicblock *entryblock) {
    The consts object should still be in list form to allow new constants
    to be appended.
 
-   All transformations keep the code size the same or smaller.
-   For those that reduce size, the gaps are initially filled with
+   Code trasnformations that reduce code size initially fill the gaps with
    NOPs.  Later those NOPs are removed.
 */
 
@@ -9470,6 +9455,16 @@ static int
 optimize_cfg(basicblock *entryblock, PyObject *consts, PyObject *const_cache)
 {
     assert(PyDict_CheckExact(const_cache));
+    for (basicblock *b = entryblock; b != NULL; b = b->b_next) {
+        if (normalize_basic_block(b)) {
+            return -1;
+        }
+    }
+    for (basicblock *b = entryblock; b != NULL; b = b->b_next) {
+        if (extend_block(b)) {
+            return -1;
+        }
+    }
     for (basicblock *b = entryblock; b != NULL; b = b->b_next) {
         if (optimize_basic_block(const_cache, b, consts)) {
             return -1;


From webhook-mailer at python.org  Tue Jul 19 13:04:56 2022
From: webhook-mailer at python.org (miss-islington)
Date: Tue, 19 Jul 2022 17:04:56 -0000
Subject: [Python-checkins] GH-91153: Handle mutating __index__ methods in
 bytearray item assignment (GH-94891)
Message-ID: <mailman.110.1658250298.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/2d79804bb00908d6563522c86f81128123752c5e
commit: 2d79804bb00908d6563522c86f81128123752c5e
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-19T10:04:47-07:00
summary:

GH-91153: Handle mutating __index__ methods in bytearray item assignment (GH-94891)

(cherry picked from commit f36589510b8708fa224d799d5b328deab558aa4e)

Co-authored-by: Brandt Bucher <brandtbucher at microsoft.com>

files:
A Misc/NEWS.d/next/Core and Builtins/2022-07-15-16-15-04.gh-issue-91153.HiBmtt.rst
M Lib/test/test_bytes.py
M Modules/_testcapimodule.c
M Objects/bytearrayobject.c

diff --git a/Lib/test/test_bytes.py b/Lib/test/test_bytes.py
index 13ad238242d0c..72c5e1849f4f5 100644
--- a/Lib/test/test_bytes.py
+++ b/Lib/test/test_bytes.py
@@ -1698,6 +1698,23 @@ def test_repeat_after_setslice(self):
         self.assertEqual(b1, b)
         self.assertEqual(b3, b'xcxcxc')
 
+    def test_mutating_index(self):
+        class Boom:
+            def __index__(self):
+                b.clear()
+                return 0
+
+        with self.subTest("tp_as_mapping"):
+            b = bytearray(b'Now you see me...')
+            with self.assertRaises(IndexError):
+                b[0] = Boom()
+
+        with self.subTest("tp_as_sequence"):
+            _testcapi = import_helper.import_module('_testcapi')
+            b = bytearray(b'Now you see me...')
+            with self.assertRaises(IndexError):
+                _testcapi.sequence_setitem(b, 0, Boom())
+
 
 class AssortedBytesTest(unittest.TestCase):
     #
diff --git a/Misc/NEWS.d/next/Core and Builtins/2022-07-15-16-15-04.gh-issue-91153.HiBmtt.rst b/Misc/NEWS.d/next/Core and Builtins/2022-07-15-16-15-04.gh-issue-91153.HiBmtt.rst
new file mode 100644
index 0000000000000..2caa0170f75bc
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2022-07-15-16-15-04.gh-issue-91153.HiBmtt.rst	
@@ -0,0 +1,2 @@
+Fix an issue where a :class:`bytearray` item assignment could crash if it's
+resized by the new value's :meth:`__index__` method.
diff --git a/Modules/_testcapimodule.c b/Modules/_testcapimodule.c
index aaf29ad011544..f4826c2e90432 100644
--- a/Modules/_testcapimodule.c
+++ b/Modules/_testcapimodule.c
@@ -5388,6 +5388,21 @@ sequence_getitem(PyObject *self, PyObject *args)
 }
 
 
+static PyObject *
+sequence_setitem(PyObject *self, PyObject *args)
+{
+    Py_ssize_t i;
+    PyObject *seq, *val;
+    if (!PyArg_ParseTuple(args, "OnO", &seq, &i, &val)) {
+        return NULL;
+    }
+    if (PySequence_SetItem(seq, i, val)) {
+        return NULL;
+    }
+    Py_RETURN_NONE;
+}
+
+
 /* Functions for testing C calling conventions (METH_*) are named meth_*,
  * e.g. "meth_varargs" for METH_VARARGS.
  *
@@ -5884,6 +5899,7 @@ static PyMethodDef TestMethods[] = {
 #endif
     {"write_unraisable_exc", test_write_unraisable_exc, METH_VARARGS},
     {"sequence_getitem", sequence_getitem, METH_VARARGS},
+    {"sequence_setitem", sequence_setitem, METH_VARARGS},
     {"meth_varargs", meth_varargs, METH_VARARGS},
     {"meth_varargs_keywords", (PyCFunction)(void(*)(void))meth_varargs_keywords, METH_VARARGS|METH_KEYWORDS},
     {"meth_o", meth_o, METH_O},
diff --git a/Objects/bytearrayobject.c b/Objects/bytearrayobject.c
index 1ab9621b1f265..2a675d5d460db 100644
--- a/Objects/bytearrayobject.c
+++ b/Objects/bytearrayobject.c
@@ -577,22 +577,28 @@ bytearray_setslice(PyByteArrayObject *self, Py_ssize_t lo, Py_ssize_t hi,
 static int
 bytearray_setitem(PyByteArrayObject *self, Py_ssize_t i, PyObject *value)
 {
-    int ival;
+    int ival = -1;
 
-    if (i < 0)
+    // GH-91153: We need to do this *before* the size check, in case value has a
+    // nasty __index__ method that changes the size of the bytearray:
+    if (value && !_getbytevalue(value, &ival)) {
+        return -1;
+    }
+
+    if (i < 0) {
         i += Py_SIZE(self);
+    }
 
     if (i < 0 || i >= Py_SIZE(self)) {
         PyErr_SetString(PyExc_IndexError, "bytearray index out of range");
         return -1;
     }
 
-    if (value == NULL)
+    if (value == NULL) {
         return bytearray_setslice(self, i, i+1, NULL);
+    }
 
-    if (!_getbytevalue(value, &ival))
-        return -1;
-
+    assert(0 <= ival && ival < 256);
     PyByteArray_AS_STRING(self)[i] = ival;
     return 0;
 }
@@ -607,11 +613,21 @@ bytearray_ass_subscript(PyByteArrayObject *self, PyObject *index, PyObject *valu
     if (_PyIndex_Check(index)) {
         Py_ssize_t i = PyNumber_AsSsize_t(index, PyExc_IndexError);
 
-        if (i == -1 && PyErr_Occurred())
+        if (i == -1 && PyErr_Occurred()) {
             return -1;
+        }
 
-        if (i < 0)
+        int ival = -1;
+
+        // GH-91153: We need to do this *before* the size check, in case values
+        // has a nasty __index__ method that changes the size of the bytearray:
+        if (values && !_getbytevalue(values, &ival)) {
+            return -1;
+        }
+
+        if (i < 0) {
             i += PyByteArray_GET_SIZE(self);
+        }
 
         if (i < 0 || i >= Py_SIZE(self)) {
             PyErr_SetString(PyExc_IndexError, "bytearray index out of range");
@@ -626,9 +642,7 @@ bytearray_ass_subscript(PyByteArrayObject *self, PyObject *index, PyObject *valu
             slicelen = 1;
         }
         else {
-            int ival;
-            if (!_getbytevalue(values, &ival))
-                return -1;
+            assert(0 <= ival && ival < 256);
             buf[i] = (char)ival;
             return 0;
         }


From webhook-mailer at python.org  Tue Jul 19 13:12:53 2022
From: webhook-mailer at python.org (miss-islington)
Date: Tue, 19 Jul 2022 17:12:53 -0000
Subject: [Python-checkins] GH-91153: Handle mutating __index__ methods in
 bytearray item assignment (GH-94891)
Message-ID: <mailman.111.1658250774.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/9487e8d250783b48eec1d240eddac809584e11a0
commit: 9487e8d250783b48eec1d240eddac809584e11a0
branch: 3.11
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-19T10:12:39-07:00
summary:

GH-91153: Handle mutating __index__ methods in bytearray item assignment (GH-94891)

(cherry picked from commit f36589510b8708fa224d799d5b328deab558aa4e)

Co-authored-by: Brandt Bucher <brandtbucher at microsoft.com>

files:
A Misc/NEWS.d/next/Core and Builtins/2022-07-15-16-15-04.gh-issue-91153.HiBmtt.rst
M Lib/test/test_bytes.py
M Modules/_testcapimodule.c
M Objects/bytearrayobject.c

diff --git a/Lib/test/test_bytes.py b/Lib/test/test_bytes.py
index b457ff6ca849c..521e391b8d5f9 100644
--- a/Lib/test/test_bytes.py
+++ b/Lib/test/test_bytes.py
@@ -1710,6 +1710,23 @@ def test_repeat_after_setslice(self):
         self.assertEqual(b1, b)
         self.assertEqual(b3, b'xcxcxc')
 
+    def test_mutating_index(self):
+        class Boom:
+            def __index__(self):
+                b.clear()
+                return 0
+
+        with self.subTest("tp_as_mapping"):
+            b = bytearray(b'Now you see me...')
+            with self.assertRaises(IndexError):
+                b[0] = Boom()
+
+        with self.subTest("tp_as_sequence"):
+            _testcapi = import_helper.import_module('_testcapi')
+            b = bytearray(b'Now you see me...')
+            with self.assertRaises(IndexError):
+                _testcapi.sequence_setitem(b, 0, Boom())
+
 
 class AssortedBytesTest(unittest.TestCase):
     #
diff --git a/Misc/NEWS.d/next/Core and Builtins/2022-07-15-16-15-04.gh-issue-91153.HiBmtt.rst b/Misc/NEWS.d/next/Core and Builtins/2022-07-15-16-15-04.gh-issue-91153.HiBmtt.rst
new file mode 100644
index 0000000000000..2caa0170f75bc
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2022-07-15-16-15-04.gh-issue-91153.HiBmtt.rst	
@@ -0,0 +1,2 @@
+Fix an issue where a :class:`bytearray` item assignment could crash if it's
+resized by the new value's :meth:`__index__` method.
diff --git a/Modules/_testcapimodule.c b/Modules/_testcapimodule.c
index 3467c041f710e..9aa7fcacb86cb 100644
--- a/Modules/_testcapimodule.c
+++ b/Modules/_testcapimodule.c
@@ -5489,6 +5489,21 @@ sequence_getitem(PyObject *self, PyObject *args)
 }
 
 
+static PyObject *
+sequence_setitem(PyObject *self, PyObject *args)
+{
+    Py_ssize_t i;
+    PyObject *seq, *val;
+    if (!PyArg_ParseTuple(args, "OnO", &seq, &i, &val)) {
+        return NULL;
+    }
+    if (PySequence_SetItem(seq, i, val)) {
+        return NULL;
+    }
+    Py_RETURN_NONE;
+}
+
+
 /* Functions for testing C calling conventions (METH_*) are named meth_*,
  * e.g. "meth_varargs" for METH_VARARGS.
  *
@@ -6272,6 +6287,7 @@ static PyMethodDef TestMethods[] = {
 #endif
     {"write_unraisable_exc", test_write_unraisable_exc, METH_VARARGS},
     {"sequence_getitem", sequence_getitem, METH_VARARGS},
+    {"sequence_setitem", sequence_setitem, METH_VARARGS},
     {"meth_varargs", meth_varargs, METH_VARARGS},
     {"meth_varargs_keywords", _PyCFunction_CAST(meth_varargs_keywords), METH_VARARGS|METH_KEYWORDS},
     {"meth_o", meth_o, METH_O},
diff --git a/Objects/bytearrayobject.c b/Objects/bytearrayobject.c
index b9436d9aa5b1a..dfeed68416cff 100644
--- a/Objects/bytearrayobject.c
+++ b/Objects/bytearrayobject.c
@@ -563,22 +563,28 @@ bytearray_setslice(PyByteArrayObject *self, Py_ssize_t lo, Py_ssize_t hi,
 static int
 bytearray_setitem(PyByteArrayObject *self, Py_ssize_t i, PyObject *value)
 {
-    int ival;
+    int ival = -1;
 
-    if (i < 0)
+    // GH-91153: We need to do this *before* the size check, in case value has a
+    // nasty __index__ method that changes the size of the bytearray:
+    if (value && !_getbytevalue(value, &ival)) {
+        return -1;
+    }
+
+    if (i < 0) {
         i += Py_SIZE(self);
+    }
 
     if (i < 0 || i >= Py_SIZE(self)) {
         PyErr_SetString(PyExc_IndexError, "bytearray index out of range");
         return -1;
     }
 
-    if (value == NULL)
+    if (value == NULL) {
         return bytearray_setslice(self, i, i+1, NULL);
+    }
 
-    if (!_getbytevalue(value, &ival))
-        return -1;
-
+    assert(0 <= ival && ival < 256);
     PyByteArray_AS_STRING(self)[i] = ival;
     return 0;
 }
@@ -593,11 +599,21 @@ bytearray_ass_subscript(PyByteArrayObject *self, PyObject *index, PyObject *valu
     if (_PyIndex_Check(index)) {
         Py_ssize_t i = PyNumber_AsSsize_t(index, PyExc_IndexError);
 
-        if (i == -1 && PyErr_Occurred())
+        if (i == -1 && PyErr_Occurred()) {
             return -1;
+        }
 
-        if (i < 0)
+        int ival = -1;
+
+        // GH-91153: We need to do this *before* the size check, in case values
+        // has a nasty __index__ method that changes the size of the bytearray:
+        if (values && !_getbytevalue(values, &ival)) {
+            return -1;
+        }
+
+        if (i < 0) {
             i += PyByteArray_GET_SIZE(self);
+        }
 
         if (i < 0 || i >= Py_SIZE(self)) {
             PyErr_SetString(PyExc_IndexError, "bytearray index out of range");
@@ -612,9 +628,7 @@ bytearray_ass_subscript(PyByteArrayObject *self, PyObject *index, PyObject *valu
             slicelen = 1;
         }
         else {
-            int ival;
-            if (!_getbytevalue(values, &ival))
-                return -1;
+            assert(0 <= ival && ival < 256);
             buf[i] = (char)ival;
             return 0;
         }


From webhook-mailer at python.org  Tue Jul 19 14:26:48 2022
From: webhook-mailer at python.org (erlend-aasland)
Date: Tue, 19 Jul 2022 18:26:48 -0000
Subject: [Python-checkins] [3.10] gh-94998: Remove incorrectly backported
 Lib/test/test_sqlite3 directory (#95016)
Message-ID: <mailman.112.1658255209.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/374afb4a4e93d3faafcf1d08fcd650d8ee8798ca
commit: 374afb4a4e93d3faafcf1d08fcd650d8ee8798ca
branch: 3.10
author: Erlend Egeberg Aasland <erlend.aasland at protonmail.com>
committer: erlend-aasland <erlend.aasland at protonmail.com>
date: 2022-07-19T20:26:38+02:00
summary:

[3.10] gh-94998: Remove incorrectly backported Lib/test/test_sqlite3 directory (#95016)

files:
D Lib/test/test_sqlite3/test_dbapi.py

diff --git a/Lib/test/test_sqlite3/test_dbapi.py b/Lib/test/test_sqlite3/test_dbapi.py
deleted file mode 100644
index 18e84e9e58632..0000000000000
--- a/Lib/test/test_sqlite3/test_dbapi.py
+++ /dev/null
@@ -1,1892 +0,0 @@
-# pysqlite2/test/dbapi.py: tests for DB-API compliance
-#
-# Copyright (C) 2004-2010 Gerhard H?ring <gh at ghaering.de>
-#
-# This file is part of pysqlite.
-#
-# This software is provided 'as-is', without any express or implied
-# warranty.  In no event will the authors be held liable for any damages
-# arising from the use of this software.
-#
-# Permission is granted to anyone to use this software for any purpose,
-# including commercial applications, and to alter it and redistribute it
-# freely, subject to the following restrictions:
-#
-# 1. The origin of this software must not be misrepresented; you must not
-#    claim that you wrote the original software. If you use this software
-#    in a product, an acknowledgment in the product documentation would be
-#    appreciated but is not required.
-# 2. Altered source versions must be plainly marked as such, and must not be
-#    misrepresented as being the original software.
-# 3. This notice may not be removed or altered from any source distribution.
-
-import contextlib
-import os
-import sqlite3 as sqlite
-import subprocess
-import sys
-import threading
-import unittest
-import urllib.parse
-
-from test.support import SHORT_TIMEOUT, check_disallow_instantiation
-from test.support import threading_helper
-from _testcapi import INT_MAX, ULLONG_MAX
-from os import SEEK_SET, SEEK_CUR, SEEK_END
-from test.support.os_helper import TESTFN, TESTFN_UNDECODABLE, unlink, temp_dir, FakePath
-
-
-# Helper for temporary memory databases
-def memory_database(*args, **kwargs):
-    cx = sqlite.connect(":memory:", *args, **kwargs)
-    return contextlib.closing(cx)
-
-
-# Temporarily limit a database connection parameter
- at contextlib.contextmanager
-def cx_limit(cx, category=sqlite.SQLITE_LIMIT_SQL_LENGTH, limit=128):
-    try:
-        _prev = cx.setlimit(category, limit)
-        yield limit
-    finally:
-        cx.setlimit(category, _prev)
-
-
-class ModuleTests(unittest.TestCase):
-    def test_api_level(self):
-        self.assertEqual(sqlite.apilevel, "2.0",
-                         "apilevel is %s, should be 2.0" % sqlite.apilevel)
-
-    def test_deprecated_version(self):
-        msg = "deprecated and will be removed in Python 3.14"
-        for attr in "version", "version_info":
-            with self.subTest(attr=attr):
-                with self.assertWarnsRegex(DeprecationWarning, msg) as cm:
-                    getattr(sqlite, attr)
-                self.assertEqual(cm.filename,  __file__)
-                with self.assertWarnsRegex(DeprecationWarning, msg) as cm:
-                    getattr(sqlite.dbapi2, attr)
-                self.assertEqual(cm.filename,  __file__)
-
-    def test_thread_safety(self):
-        self.assertIn(sqlite.threadsafety, {0, 1, 3},
-                      "threadsafety is %d, should be 0, 1 or 3" %
-                      sqlite.threadsafety)
-
-    def test_param_style(self):
-        self.assertEqual(sqlite.paramstyle, "qmark",
-                         "paramstyle is '%s', should be 'qmark'" %
-                         sqlite.paramstyle)
-
-    def test_warning(self):
-        self.assertTrue(issubclass(sqlite.Warning, Exception),
-                     "Warning is not a subclass of Exception")
-
-    def test_error(self):
-        self.assertTrue(issubclass(sqlite.Error, Exception),
-                        "Error is not a subclass of Exception")
-
-    def test_interface_error(self):
-        self.assertTrue(issubclass(sqlite.InterfaceError, sqlite.Error),
-                        "InterfaceError is not a subclass of Error")
-
-    def test_database_error(self):
-        self.assertTrue(issubclass(sqlite.DatabaseError, sqlite.Error),
-                        "DatabaseError is not a subclass of Error")
-
-    def test_data_error(self):
-        self.assertTrue(issubclass(sqlite.DataError, sqlite.DatabaseError),
-                        "DataError is not a subclass of DatabaseError")
-
-    def test_operational_error(self):
-        self.assertTrue(issubclass(sqlite.OperationalError, sqlite.DatabaseError),
-                        "OperationalError is not a subclass of DatabaseError")
-
-    def test_integrity_error(self):
-        self.assertTrue(issubclass(sqlite.IntegrityError, sqlite.DatabaseError),
-                        "IntegrityError is not a subclass of DatabaseError")
-
-    def test_internal_error(self):
-        self.assertTrue(issubclass(sqlite.InternalError, sqlite.DatabaseError),
-                        "InternalError is not a subclass of DatabaseError")
-
-    def test_programming_error(self):
-        self.assertTrue(issubclass(sqlite.ProgrammingError, sqlite.DatabaseError),
-                        "ProgrammingError is not a subclass of DatabaseError")
-
-    def test_not_supported_error(self):
-        self.assertTrue(issubclass(sqlite.NotSupportedError,
-                                   sqlite.DatabaseError),
-                        "NotSupportedError is not a subclass of DatabaseError")
-
-    def test_module_constants(self):
-        consts = [
-            "SQLITE_ABORT",
-            "SQLITE_ALTER_TABLE",
-            "SQLITE_ANALYZE",
-            "SQLITE_ATTACH",
-            "SQLITE_AUTH",
-            "SQLITE_BUSY",
-            "SQLITE_CANTOPEN",
-            "SQLITE_CONSTRAINT",
-            "SQLITE_CORRUPT",
-            "SQLITE_CREATE_INDEX",
-            "SQLITE_CREATE_TABLE",
-            "SQLITE_CREATE_TEMP_INDEX",
-            "SQLITE_CREATE_TEMP_TABLE",
-            "SQLITE_CREATE_TEMP_TRIGGER",
-            "SQLITE_CREATE_TEMP_VIEW",
-            "SQLITE_CREATE_TRIGGER",
-            "SQLITE_CREATE_VIEW",
-            "SQLITE_CREATE_VTABLE",
-            "SQLITE_DELETE",
-            "SQLITE_DENY",
-            "SQLITE_DETACH",
-            "SQLITE_DONE",
-            "SQLITE_DROP_INDEX",
-            "SQLITE_DROP_TABLE",
-            "SQLITE_DROP_TEMP_INDEX",
-            "SQLITE_DROP_TEMP_TABLE",
-            "SQLITE_DROP_TEMP_TRIGGER",
-            "SQLITE_DROP_TEMP_VIEW",
-            "SQLITE_DROP_TRIGGER",
-            "SQLITE_DROP_VIEW",
-            "SQLITE_DROP_VTABLE",
-            "SQLITE_EMPTY",
-            "SQLITE_ERROR",
-            "SQLITE_FORMAT",
-            "SQLITE_FULL",
-            "SQLITE_FUNCTION",
-            "SQLITE_IGNORE",
-            "SQLITE_INSERT",
-            "SQLITE_INTERNAL",
-            "SQLITE_INTERRUPT",
-            "SQLITE_IOERR",
-            "SQLITE_LOCKED",
-            "SQLITE_MISMATCH",
-            "SQLITE_MISUSE",
-            "SQLITE_NOLFS",
-            "SQLITE_NOMEM",
-            "SQLITE_NOTADB",
-            "SQLITE_NOTFOUND",
-            "SQLITE_OK",
-            "SQLITE_PERM",
-            "SQLITE_PRAGMA",
-            "SQLITE_PROTOCOL",
-            "SQLITE_RANGE",
-            "SQLITE_READ",
-            "SQLITE_READONLY",
-            "SQLITE_REINDEX",
-            "SQLITE_ROW",
-            "SQLITE_SAVEPOINT",
-            "SQLITE_SCHEMA",
-            "SQLITE_SELECT",
-            "SQLITE_TOOBIG",
-            "SQLITE_TRANSACTION",
-            "SQLITE_UPDATE",
-            # Run-time limit categories
-            "SQLITE_LIMIT_LENGTH",
-            "SQLITE_LIMIT_SQL_LENGTH",
-            "SQLITE_LIMIT_COLUMN",
-            "SQLITE_LIMIT_EXPR_DEPTH",
-            "SQLITE_LIMIT_COMPOUND_SELECT",
-            "SQLITE_LIMIT_VDBE_OP",
-            "SQLITE_LIMIT_FUNCTION_ARG",
-            "SQLITE_LIMIT_ATTACHED",
-            "SQLITE_LIMIT_LIKE_PATTERN_LENGTH",
-            "SQLITE_LIMIT_VARIABLE_NUMBER",
-            "SQLITE_LIMIT_TRIGGER_DEPTH",
-        ]
-        if sqlite.sqlite_version_info >= (3, 7, 17):
-            consts += ["SQLITE_NOTICE", "SQLITE_WARNING"]
-        if sqlite.sqlite_version_info >= (3, 8, 3):
-            consts.append("SQLITE_RECURSIVE")
-        if sqlite.sqlite_version_info >= (3, 8, 7):
-            consts.append("SQLITE_LIMIT_WORKER_THREADS")
-        consts += ["PARSE_DECLTYPES", "PARSE_COLNAMES"]
-        # Extended result codes
-        consts += [
-            "SQLITE_ABORT_ROLLBACK",
-            "SQLITE_BUSY_RECOVERY",
-            "SQLITE_CANTOPEN_FULLPATH",
-            "SQLITE_CANTOPEN_ISDIR",
-            "SQLITE_CANTOPEN_NOTEMPDIR",
-            "SQLITE_CORRUPT_VTAB",
-            "SQLITE_IOERR_ACCESS",
-            "SQLITE_IOERR_BLOCKED",
-            "SQLITE_IOERR_CHECKRESERVEDLOCK",
-            "SQLITE_IOERR_CLOSE",
-            "SQLITE_IOERR_DELETE",
-            "SQLITE_IOERR_DELETE_NOENT",
-            "SQLITE_IOERR_DIR_CLOSE",
-            "SQLITE_IOERR_DIR_FSYNC",
-            "SQLITE_IOERR_FSTAT",
-            "SQLITE_IOERR_FSYNC",
-            "SQLITE_IOERR_LOCK",
-            "SQLITE_IOERR_NOMEM",
-            "SQLITE_IOERR_RDLOCK",
-            "SQLITE_IOERR_READ",
-            "SQLITE_IOERR_SEEK",
-            "SQLITE_IOERR_SHMLOCK",
-            "SQLITE_IOERR_SHMMAP",
-            "SQLITE_IOERR_SHMOPEN",
-            "SQLITE_IOERR_SHMSIZE",
-            "SQLITE_IOERR_SHORT_READ",
-            "SQLITE_IOERR_TRUNCATE",
-            "SQLITE_IOERR_UNLOCK",
-            "SQLITE_IOERR_WRITE",
-            "SQLITE_LOCKED_SHAREDCACHE",
-            "SQLITE_READONLY_CANTLOCK",
-            "SQLITE_READONLY_RECOVERY",
-        ]
-        if sqlite.sqlite_version_info >= (3, 7, 16):
-            consts += [
-                "SQLITE_CONSTRAINT_CHECK",
-                "SQLITE_CONSTRAINT_COMMITHOOK",
-                "SQLITE_CONSTRAINT_FOREIGNKEY",
-                "SQLITE_CONSTRAINT_FUNCTION",
-                "SQLITE_CONSTRAINT_NOTNULL",
-                "SQLITE_CONSTRAINT_PRIMARYKEY",
-                "SQLITE_CONSTRAINT_TRIGGER",
-                "SQLITE_CONSTRAINT_UNIQUE",
-                "SQLITE_CONSTRAINT_VTAB",
-                "SQLITE_READONLY_ROLLBACK",
-            ]
-        if sqlite.sqlite_version_info >= (3, 7, 17):
-            consts += [
-                "SQLITE_IOERR_MMAP",
-                "SQLITE_NOTICE_RECOVER_ROLLBACK",
-                "SQLITE_NOTICE_RECOVER_WAL",
-            ]
-        if sqlite.sqlite_version_info >= (3, 8, 0):
-            consts += [
-                "SQLITE_BUSY_SNAPSHOT",
-                "SQLITE_IOERR_GETTEMPPATH",
-                "SQLITE_WARNING_AUTOINDEX",
-            ]
-        if sqlite.sqlite_version_info >= (3, 8, 1):
-            consts += ["SQLITE_CANTOPEN_CONVPATH", "SQLITE_IOERR_CONVPATH"]
-        if sqlite.sqlite_version_info >= (3, 8, 2):
-            consts.append("SQLITE_CONSTRAINT_ROWID")
-        if sqlite.sqlite_version_info >= (3, 8, 3):
-            consts.append("SQLITE_READONLY_DBMOVED")
-        if sqlite.sqlite_version_info >= (3, 8, 7):
-            consts.append("SQLITE_AUTH_USER")
-        if sqlite.sqlite_version_info >= (3, 9, 0):
-            consts.append("SQLITE_IOERR_VNODE")
-        if sqlite.sqlite_version_info >= (3, 10, 0):
-            consts.append("SQLITE_IOERR_AUTH")
-        if sqlite.sqlite_version_info >= (3, 14, 1):
-            consts.append("SQLITE_OK_LOAD_PERMANENTLY")
-        if sqlite.sqlite_version_info >= (3, 21, 0):
-            consts += [
-                "SQLITE_IOERR_BEGIN_ATOMIC",
-                "SQLITE_IOERR_COMMIT_ATOMIC",
-                "SQLITE_IOERR_ROLLBACK_ATOMIC",
-            ]
-        if sqlite.sqlite_version_info >= (3, 22, 0):
-            consts += [
-                "SQLITE_ERROR_MISSING_COLLSEQ",
-                "SQLITE_ERROR_RETRY",
-                "SQLITE_READONLY_CANTINIT",
-                "SQLITE_READONLY_DIRECTORY",
-            ]
-        if sqlite.sqlite_version_info >= (3, 24, 0):
-            consts += ["SQLITE_CORRUPT_SEQUENCE", "SQLITE_LOCKED_VTAB"]
-        if sqlite.sqlite_version_info >= (3, 25, 0):
-            consts += ["SQLITE_CANTOPEN_DIRTYWAL", "SQLITE_ERROR_SNAPSHOT"]
-        if sqlite.sqlite_version_info >= (3, 31, 0):
-            consts += [
-                "SQLITE_CANTOPEN_SYMLINK",
-                "SQLITE_CONSTRAINT_PINNED",
-                "SQLITE_OK_SYMLINK",
-            ]
-        if sqlite.sqlite_version_info >= (3, 32, 0):
-            consts += [
-                "SQLITE_BUSY_TIMEOUT",
-                "SQLITE_CORRUPT_INDEX",
-                "SQLITE_IOERR_DATA",
-            ]
-        if sqlite.sqlite_version_info >= (3, 34, 0):
-            consts.append("SQLITE_IOERR_CORRUPTFS")
-        for const in consts:
-            with self.subTest(const=const):
-                self.assertTrue(hasattr(sqlite, const))
-
-    def test_error_code_on_exception(self):
-        err_msg = "unable to open database file"
-        if sys.platform.startswith("win"):
-            err_code = sqlite.SQLITE_CANTOPEN_ISDIR
-        else:
-            err_code = sqlite.SQLITE_CANTOPEN
-
-        with temp_dir() as db:
-            with self.assertRaisesRegex(sqlite.Error, err_msg) as cm:
-                sqlite.connect(db)
-            e = cm.exception
-            self.assertEqual(e.sqlite_errorcode, err_code)
-            self.assertTrue(e.sqlite_errorname.startswith("SQLITE_CANTOPEN"))
-
-    @unittest.skipIf(sqlite.sqlite_version_info <= (3, 7, 16),
-                     "Requires SQLite 3.7.16 or newer")
-    def test_extended_error_code_on_exception(self):
-        with memory_database() as con:
-            with con:
-                con.execute("create table t(t integer check(t > 0))")
-            errmsg = "constraint failed"
-            with self.assertRaisesRegex(sqlite.IntegrityError, errmsg) as cm:
-                con.execute("insert into t values(-1)")
-            exc = cm.exception
-            self.assertEqual(exc.sqlite_errorcode,
-                             sqlite.SQLITE_CONSTRAINT_CHECK)
-            self.assertEqual(exc.sqlite_errorname, "SQLITE_CONSTRAINT_CHECK")
-
-    def test_disallow_instantiation(self):
-        cx = sqlite.connect(":memory:")
-        check_disallow_instantiation(self, type(cx("select 1")))
-        check_disallow_instantiation(self, sqlite.Blob)
-
-    def test_complete_statement(self):
-        self.assertFalse(sqlite.complete_statement("select t"))
-        self.assertTrue(sqlite.complete_statement("create table t(t);"))
-
-
-class ConnectionTests(unittest.TestCase):
-
-    def setUp(self):
-        self.cx = sqlite.connect(":memory:")
-        cu = self.cx.cursor()
-        cu.execute("create table test(id integer primary key, name text)")
-        cu.execute("insert into test(name) values (?)", ("foo",))
-
-    def tearDown(self):
-        self.cx.close()
-
-    def test_commit(self):
-        self.cx.commit()
-
-    def test_commit_after_no_changes(self):
-        """
-        A commit should also work when no changes were made to the database.
-        """
-        self.cx.commit()
-        self.cx.commit()
-
-    def test_rollback(self):
-        self.cx.rollback()
-
-    def test_rollback_after_no_changes(self):
-        """
-        A rollback should also work when no changes were made to the database.
-        """
-        self.cx.rollback()
-        self.cx.rollback()
-
-    def test_cursor(self):
-        cu = self.cx.cursor()
-
-    def test_failed_open(self):
-        YOU_CANNOT_OPEN_THIS = "/foo/bar/bla/23534/mydb.db"
-        with self.assertRaises(sqlite.OperationalError):
-            sqlite.connect(YOU_CANNOT_OPEN_THIS)
-
-    def test_close(self):
-        self.cx.close()
-
-    def test_use_after_close(self):
-        sql = "select 1"
-        cu = self.cx.cursor()
-        res = cu.execute(sql)
-        self.cx.close()
-        self.assertRaises(sqlite.ProgrammingError, res.fetchall)
-        self.assertRaises(sqlite.ProgrammingError, cu.execute, sql)
-        self.assertRaises(sqlite.ProgrammingError, cu.executemany, sql, [])
-        self.assertRaises(sqlite.ProgrammingError, cu.executescript, sql)
-        self.assertRaises(sqlite.ProgrammingError, self.cx.execute, sql)
-        self.assertRaises(sqlite.ProgrammingError,
-                          self.cx.executemany, sql, [])
-        self.assertRaises(sqlite.ProgrammingError, self.cx.executescript, sql)
-        self.assertRaises(sqlite.ProgrammingError,
-                          self.cx.create_function, "t", 1, lambda x: x)
-        self.assertRaises(sqlite.ProgrammingError, self.cx.cursor)
-        with self.assertRaises(sqlite.ProgrammingError):
-            with self.cx:
-                pass
-
-    def test_exceptions(self):
-        # Optional DB-API extension.
-        self.assertEqual(self.cx.Warning, sqlite.Warning)
-        self.assertEqual(self.cx.Error, sqlite.Error)
-        self.assertEqual(self.cx.InterfaceError, sqlite.InterfaceError)
-        self.assertEqual(self.cx.DatabaseError, sqlite.DatabaseError)
-        self.assertEqual(self.cx.DataError, sqlite.DataError)
-        self.assertEqual(self.cx.OperationalError, sqlite.OperationalError)
-        self.assertEqual(self.cx.IntegrityError, sqlite.IntegrityError)
-        self.assertEqual(self.cx.InternalError, sqlite.InternalError)
-        self.assertEqual(self.cx.ProgrammingError, sqlite.ProgrammingError)
-        self.assertEqual(self.cx.NotSupportedError, sqlite.NotSupportedError)
-
-    def test_in_transaction(self):
-        # Can't use db from setUp because we want to test initial state.
-        cx = sqlite.connect(":memory:")
-        cu = cx.cursor()
-        self.assertEqual(cx.in_transaction, False)
-        cu.execute("create table transactiontest(id integer primary key, name text)")
-        self.assertEqual(cx.in_transaction, False)
-        cu.execute("insert into transactiontest(name) values (?)", ("foo",))
-        self.assertEqual(cx.in_transaction, True)
-        cu.execute("select name from transactiontest where name=?", ["foo"])
-        row = cu.fetchone()
-        self.assertEqual(cx.in_transaction, True)
-        cx.commit()
-        self.assertEqual(cx.in_transaction, False)
-        cu.execute("select name from transactiontest where name=?", ["foo"])
-        row = cu.fetchone()
-        self.assertEqual(cx.in_transaction, False)
-
-    def test_in_transaction_ro(self):
-        with self.assertRaises(AttributeError):
-            self.cx.in_transaction = True
-
-    def test_connection_exceptions(self):
-        exceptions = [
-            "DataError",
-            "DatabaseError",
-            "Error",
-            "IntegrityError",
-            "InterfaceError",
-            "NotSupportedError",
-            "OperationalError",
-            "ProgrammingError",
-            "Warning",
-        ]
-        for exc in exceptions:
-            with self.subTest(exc=exc):
-                self.assertTrue(hasattr(self.cx, exc))
-                self.assertIs(getattr(sqlite, exc), getattr(self.cx, exc))
-
-    def test_interrupt_on_closed_db(self):
-        cx = sqlite.connect(":memory:")
-        cx.close()
-        with self.assertRaises(sqlite.ProgrammingError):
-            cx.interrupt()
-
-    def test_interrupt(self):
-        self.assertIsNone(self.cx.interrupt())
-
-    def test_drop_unused_refs(self):
-        for n in range(500):
-            cu = self.cx.execute(f"select {n}")
-            self.assertEqual(cu.fetchone()[0], n)
-
-    def test_connection_limits(self):
-        category = sqlite.SQLITE_LIMIT_SQL_LENGTH
-        saved_limit = self.cx.getlimit(category)
-        try:
-            new_limit = 10
-            prev_limit = self.cx.setlimit(category, new_limit)
-            self.assertEqual(saved_limit, prev_limit)
-            self.assertEqual(self.cx.getlimit(category), new_limit)
-            msg = "query string is too large"
-            self.assertRaisesRegex(sqlite.DataError, msg,
-                                   self.cx.execute, "select 1 as '16'")
-        finally:  # restore saved limit
-            self.cx.setlimit(category, saved_limit)
-
-    def test_connection_bad_limit_category(self):
-        msg = "'category' is out of bounds"
-        cat = 1111
-        self.assertRaisesRegex(sqlite.ProgrammingError, msg,
-                               self.cx.getlimit, cat)
-        self.assertRaisesRegex(sqlite.ProgrammingError, msg,
-                               self.cx.setlimit, cat, 0)
-
-    def test_connection_init_bad_isolation_level(self):
-        msg = (
-            "isolation_level string must be '', 'DEFERRED', 'IMMEDIATE', or "
-            "'EXCLUSIVE'"
-        )
-        levels = (
-            "BOGUS",
-            " ",
-            "DEFERRE",
-            "IMMEDIAT",
-            "EXCLUSIV",
-            "DEFERREDS",
-            "IMMEDIATES",
-            "EXCLUSIVES",
-        )
-        for level in levels:
-            with self.subTest(level=level):
-                with self.assertRaisesRegex(ValueError, msg):
-                    memory_database(isolation_level=level)
-                with memory_database() as cx:
-                    with self.assertRaisesRegex(ValueError, msg):
-                        cx.isolation_level = level
-                    # Check that the default level is not changed
-                    self.assertEqual(cx.isolation_level, "")
-
-    def test_connection_init_good_isolation_levels(self):
-        for level in ("", "DEFERRED", "IMMEDIATE", "EXCLUSIVE", None):
-            with self.subTest(level=level):
-                with memory_database(isolation_level=level) as cx:
-                    self.assertEqual(cx.isolation_level, level)
-                with memory_database() as cx:
-                    self.assertEqual(cx.isolation_level, "")
-                    cx.isolation_level = level
-                    self.assertEqual(cx.isolation_level, level)
-
-    def test_connection_reinit(self):
-        db = ":memory:"
-        cx = sqlite.connect(db)
-        cx.text_factory = bytes
-        cx.row_factory = sqlite.Row
-        cu = cx.cursor()
-        cu.execute("create table foo (bar)")
-        cu.executemany("insert into foo (bar) values (?)",
-                       ((str(v),) for v in range(4)))
-        cu.execute("select bar from foo")
-
-        rows = [r for r in cu.fetchmany(2)]
-        self.assertTrue(all(isinstance(r, sqlite.Row) for r in rows))
-        self.assertEqual([r[0] for r in rows], [b"0", b"1"])
-
-        cx.__init__(db)
-        cx.execute("create table foo (bar)")
-        cx.executemany("insert into foo (bar) values (?)",
-                       ((v,) for v in ("a", "b", "c", "d")))
-
-        # This uses the old database, old row factory, but new text factory
-        rows = [r for r in cu.fetchall()]
-        self.assertTrue(all(isinstance(r, sqlite.Row) for r in rows))
-        self.assertEqual([r[0] for r in rows], ["2", "3"])
-
-    def test_connection_bad_reinit(self):
-        cx = sqlite.connect(":memory:")
-        with cx:
-            cx.execute("create table t(t)")
-        with temp_dir() as db:
-            self.assertRaisesRegex(sqlite.OperationalError,
-                                   "unable to open database file",
-                                   cx.__init__, db)
-            self.assertRaisesRegex(sqlite.ProgrammingError,
-                                   "Base Connection.__init__ not called",
-                                   cx.executemany, "insert into t values(?)",
-                                   ((v,) for v in range(3)))
-
-
-class UninitialisedConnectionTests(unittest.TestCase):
-    def setUp(self):
-        self.cx = sqlite.Connection.__new__(sqlite.Connection)
-
-    def test_uninit_operations(self):
-        funcs = (
-            lambda: self.cx.isolation_level,
-            lambda: self.cx.total_changes,
-            lambda: self.cx.in_transaction,
-            lambda: self.cx.iterdump(),
-            lambda: self.cx.cursor(),
-            lambda: self.cx.close(),
-        )
-        for func in funcs:
-            with self.subTest(func=func):
-                self.assertRaisesRegex(sqlite.ProgrammingError,
-                                       "Base Connection.__init__ not called",
-                                       func)
-
-
- at unittest.skipUnless(hasattr(sqlite.Connection, "serialize"),
-                     "Needs SQLite serialize API")
-class SerializeTests(unittest.TestCase):
-    def test_serialize_deserialize(self):
-        with memory_database() as cx:
-            with cx:
-                cx.execute("create table t(t)")
-            data = cx.serialize()
-            self.assertEqual(len(data), 8192)
-
-            # Remove test table, verify that it was removed.
-            with cx:
-                cx.execute("drop table t")
-            regex = "no such table"
-            with self.assertRaisesRegex(sqlite.OperationalError, regex):
-                cx.execute("select t from t")
-
-            # Deserialize and verify that test table is restored.
-            cx.deserialize(data)
-            cx.execute("select t from t")
-
-    def test_deserialize_wrong_args(self):
-        dataset = (
-            (BufferError, memoryview(b"blob")[::2]),
-            (TypeError, []),
-            (TypeError, 1),
-            (TypeError, None),
-        )
-        for exc, arg in dataset:
-            with self.subTest(exc=exc, arg=arg):
-                with memory_database() as cx:
-                    self.assertRaises(exc, cx.deserialize, arg)
-
-    def test_deserialize_corrupt_database(self):
-        with memory_database() as cx:
-            regex = "file is not a database"
-            with self.assertRaisesRegex(sqlite.DatabaseError, regex):
-                cx.deserialize(b"\0\1\3")
-                # SQLite does not generate an error until you try to query the
-                # deserialized database.
-                cx.execute("create table fail(f)")
-
-
-class OpenTests(unittest.TestCase):
-    _sql = "create table test(id integer)"
-
-    def test_open_with_path_like_object(self):
-        """ Checks that we can successfully connect to a database using an object that
-            is PathLike, i.e. has __fspath__(). """
-        path = FakePath(TESTFN)
-        self.addCleanup(unlink, path)
-        self.assertFalse(os.path.exists(path))
-        with contextlib.closing(sqlite.connect(path)) as cx:
-            self.assertTrue(os.path.exists(path))
-            cx.execute(self._sql)
-
-    @unittest.skipIf(sys.platform == "win32", "skipped on Windows")
-    @unittest.skipIf(sys.platform == "darwin", "skipped on macOS")
-    @unittest.skipUnless(TESTFN_UNDECODABLE, "only works if there are undecodable paths")
-    def test_open_with_undecodable_path(self):
-        path = TESTFN_UNDECODABLE
-        self.addCleanup(unlink, path)
-        self.assertFalse(os.path.exists(path))
-        with contextlib.closing(sqlite.connect(path)) as cx:
-            self.assertTrue(os.path.exists(path))
-            cx.execute(self._sql)
-
-    def test_open_uri(self):
-        path = TESTFN
-        self.addCleanup(unlink, path)
-        uri = "file:" + urllib.parse.quote(os.fsencode(path))
-        self.assertFalse(os.path.exists(path))
-        with contextlib.closing(sqlite.connect(uri, uri=True)) as cx:
-            self.assertTrue(os.path.exists(path))
-            cx.execute(self._sql)
-
-    def test_open_unquoted_uri(self):
-        path = TESTFN
-        self.addCleanup(unlink, path)
-        uri = "file:" + path
-        self.assertFalse(os.path.exists(path))
-        with contextlib.closing(sqlite.connect(uri, uri=True)) as cx:
-            self.assertTrue(os.path.exists(path))
-            cx.execute(self._sql)
-
-    def test_open_uri_readonly(self):
-        path = TESTFN
-        self.addCleanup(unlink, path)
-        uri = "file:" + urllib.parse.quote(os.fsencode(path)) + "?mode=ro"
-        self.assertFalse(os.path.exists(path))
-        # Cannot create new DB
-        with self.assertRaises(sqlite.OperationalError):
-            sqlite.connect(uri, uri=True)
-        self.assertFalse(os.path.exists(path))
-        sqlite.connect(path).close()
-        self.assertTrue(os.path.exists(path))
-        # Cannot modify new DB
-        with contextlib.closing(sqlite.connect(uri, uri=True)) as cx:
-            with self.assertRaises(sqlite.OperationalError):
-                cx.execute(self._sql)
-
-    @unittest.skipIf(sys.platform == "win32", "skipped on Windows")
-    @unittest.skipIf(sys.platform == "darwin", "skipped on macOS")
-    @unittest.skipUnless(TESTFN_UNDECODABLE, "only works if there are undecodable paths")
-    def test_open_undecodable_uri(self):
-        path = TESTFN_UNDECODABLE
-        self.addCleanup(unlink, path)
-        uri = "file:" + urllib.parse.quote(path)
-        self.assertFalse(os.path.exists(path))
-        with contextlib.closing(sqlite.connect(uri, uri=True)) as cx:
-            self.assertTrue(os.path.exists(path))
-            cx.execute(self._sql)
-
-    def test_factory_database_arg(self):
-        def factory(database, *args, **kwargs):
-            nonlocal database_arg
-            database_arg = database
-            return sqlite.Connection(":memory:", *args, **kwargs)
-
-        for database in (TESTFN, os.fsencode(TESTFN),
-                         FakePath(TESTFN), FakePath(os.fsencode(TESTFN))):
-            database_arg = None
-            sqlite.connect(database, factory=factory).close()
-            self.assertEqual(database_arg, database)
-
-    def test_database_keyword(self):
-        with contextlib.closing(sqlite.connect(database=":memory:")) as cx:
-            self.assertEqual(type(cx), sqlite.Connection)
-
-
-class CursorTests(unittest.TestCase):
-    def setUp(self):
-        self.cx = sqlite.connect(":memory:")
-        self.cu = self.cx.cursor()
-        self.cu.execute(
-            "create table test(id integer primary key, name text, "
-            "income number, unique_test text unique)"
-        )
-        self.cu.execute("insert into test(name) values (?)", ("foo",))
-
-    def tearDown(self):
-        self.cu.close()
-        self.cx.close()
-
-    def test_execute_no_args(self):
-        self.cu.execute("delete from test")
-
-    def test_execute_illegal_sql(self):
-        with self.assertRaises(sqlite.OperationalError):
-            self.cu.execute("select asdf")
-
-    def test_execute_multiple_statements(self):
-        msg = "You can only execute one statement at a time"
-        dataset = (
-            "select 1; select 2",
-            "select 1; // c++ comments are not allowed",
-            "select 1; *not a comment",
-            "select 1; -*not a comment",
-            "select 1; /* */ a",
-            "select 1; /**/a",
-            "select 1; -",
-            "select 1; /",
-            "select 1; -\n- select 2",
-            """select 1;
-               -- comment
-               select 2
-            """,
-        )
-        for query in dataset:
-            with self.subTest(query=query):
-                with self.assertRaisesRegex(sqlite.ProgrammingError, msg):
-                    self.cu.execute(query)
-
-    def test_execute_with_appended_comments(self):
-        dataset = (
-            "select 1; -- foo bar",
-            "select 1; --",
-            "select 1; /*",  # Unclosed comments ending in \0 are skipped.
-            """
-            select 5+4;
-
-            /*
-            foo
-            */
-            """,
-        )
-        for query in dataset:
-            with self.subTest(query=query):
-                self.cu.execute(query)
-
-    def test_execute_wrong_sql_arg(self):
-        with self.assertRaises(TypeError):
-            self.cu.execute(42)
-
-    def test_execute_arg_int(self):
-        self.cu.execute("insert into test(id) values (?)", (42,))
-
-    def test_execute_arg_float(self):
-        self.cu.execute("insert into test(income) values (?)", (2500.32,))
-
-    def test_execute_arg_string(self):
-        self.cu.execute("insert into test(name) values (?)", ("Hugo",))
-
-    def test_execute_arg_string_with_zero_byte(self):
-        self.cu.execute("insert into test(name) values (?)", ("Hu\x00go",))
-
-        self.cu.execute("select name from test where id=?", (self.cu.lastrowid,))
-        row = self.cu.fetchone()
-        self.assertEqual(row[0], "Hu\x00go")
-
-    def test_execute_non_iterable(self):
-        with self.assertRaises(sqlite.ProgrammingError) as cm:
-            self.cu.execute("insert into test(id) values (?)", 42)
-        self.assertEqual(str(cm.exception), 'parameters are of unsupported type')
-
-    def test_execute_wrong_no_of_args1(self):
-        # too many parameters
-        with self.assertRaises(sqlite.ProgrammingError):
-            self.cu.execute("insert into test(id) values (?)", (17, "Egon"))
-
-    def test_execute_wrong_no_of_args2(self):
-        # too little parameters
-        with self.assertRaises(sqlite.ProgrammingError):
-            self.cu.execute("insert into test(id) values (?)")
-
-    def test_execute_wrong_no_of_args3(self):
-        # no parameters, parameters are needed
-        with self.assertRaises(sqlite.ProgrammingError):
-            self.cu.execute("insert into test(id) values (?)")
-
-    def test_execute_param_list(self):
-        self.cu.execute("insert into test(name) values ('foo')")
-        self.cu.execute("select name from test where name=?", ["foo"])
-        row = self.cu.fetchone()
-        self.assertEqual(row[0], "foo")
-
-    def test_execute_param_sequence(self):
-        class L:
-            def __len__(self):
-                return 1
-            def __getitem__(self, x):
-                assert x == 0
-                return "foo"
-
-        self.cu.execute("insert into test(name) values ('foo')")
-        self.cu.execute("select name from test where name=?", L())
-        row = self.cu.fetchone()
-        self.assertEqual(row[0], "foo")
-
-    def test_execute_param_sequence_bad_len(self):
-        # Issue41662: Error in __len__() was overridden with ProgrammingError.
-        class L:
-            def __len__(self):
-                1/0
-            def __getitem__(slf, x):
-                raise AssertionError
-
-        self.cu.execute("insert into test(name) values ('foo')")
-        with self.assertRaises(ZeroDivisionError):
-            self.cu.execute("select name from test where name=?", L())
-
-    def test_execute_too_many_params(self):
-        category = sqlite.SQLITE_LIMIT_VARIABLE_NUMBER
-        msg = "too many SQL variables"
-        with cx_limit(self.cx, category=category, limit=1):
-            self.cu.execute("select * from test where id=?", (1,))
-            with self.assertRaisesRegex(sqlite.OperationalError, msg):
-                self.cu.execute("select * from test where id!=? and id!=?",
-                                (1, 2))
-
-    def test_execute_dict_mapping(self):
-        self.cu.execute("insert into test(name) values ('foo')")
-        self.cu.execute("select name from test where name=:name", {"name": "foo"})
-        row = self.cu.fetchone()
-        self.assertEqual(row[0], "foo")
-
-    def test_execute_dict_mapping_mapping(self):
-        class D(dict):
-            def __missing__(self, key):
-                return "foo"
-
-        self.cu.execute("insert into test(name) values ('foo')")
-        self.cu.execute("select name from test where name=:name", D())
-        row = self.cu.fetchone()
-        self.assertEqual(row[0], "foo")
-
-    def test_execute_dict_mapping_too_little_args(self):
-        self.cu.execute("insert into test(name) values ('foo')")
-        with self.assertRaises(sqlite.ProgrammingError):
-            self.cu.execute("select name from test where name=:name and id=:id", {"name": "foo"})
-
-    def test_execute_dict_mapping_no_args(self):
-        self.cu.execute("insert into test(name) values ('foo')")
-        with self.assertRaises(sqlite.ProgrammingError):
-            self.cu.execute("select name from test where name=:name")
-
-    def test_execute_dict_mapping_unnamed(self):
-        self.cu.execute("insert into test(name) values ('foo')")
-        with self.assertRaises(sqlite.ProgrammingError):
-            self.cu.execute("select name from test where name=?", {"name": "foo"})
-
-    def test_close(self):
-        self.cu.close()
-
-    def test_rowcount_execute(self):
-        self.cu.execute("delete from test")
-        self.cu.execute("insert into test(name) values ('foo')")
-        self.cu.execute("insert into test(name) values ('foo')")
-        self.cu.execute("update test set name='bar'")
-        self.assertEqual(self.cu.rowcount, 2)
-
-    def test_rowcount_select(self):
-        """
-        pysqlite does not know the rowcount of SELECT statements, because we
-        don't fetch all rows after executing the select statement. The rowcount
-        has thus to be -1.
-        """
-        self.cu.execute("select 5 union select 6")
-        self.assertEqual(self.cu.rowcount, -1)
-
-    def test_rowcount_executemany(self):
-        self.cu.execute("delete from test")
-        self.cu.executemany("insert into test(name) values (?)", [(1,), (2,), (3,)])
-        self.assertEqual(self.cu.rowcount, 3)
-
-    @unittest.skipIf(sqlite.sqlite_version_info < (3, 35, 0),
-                     "Requires SQLite 3.35.0 or newer")
-    def test_rowcount_update_returning(self):
-        # gh-93421: rowcount is updated correctly for UPDATE...RETURNING queries
-        self.cu.execute("update test set name='bar' where name='foo' returning 1")
-        self.assertEqual(self.cu.fetchone()[0], 1)
-        self.assertEqual(self.cu.rowcount, 1)
-
-    def test_rowcount_prefixed_with_comment(self):
-        # gh-79579: rowcount is updated even if query is prefixed with comments
-        self.cu.execute("""
-            -- foo
-            insert into test(name) values ('foo'), ('foo')
-        """)
-        self.assertEqual(self.cu.rowcount, 2)
-        self.cu.execute("""
-            /* -- messy *r /* /* ** *- *--
-            */
-            /* one more */ insert into test(name) values ('messy')
-        """)
-        self.assertEqual(self.cu.rowcount, 1)
-        self.cu.execute("/* bar */ update test set name='bar' where name='foo'")
-        self.assertEqual(self.cu.rowcount, 3)
-
-    def test_rowcount_vaccuum(self):
-        data = ((1,), (2,), (3,))
-        self.cu.executemany("insert into test(income) values(?)", data)
-        self.assertEqual(self.cu.rowcount, 3)
-        self.cx.commit()
-        self.cu.execute("vacuum")
-        self.assertEqual(self.cu.rowcount, -1)
-
-    def test_total_changes(self):
-        self.cu.execute("insert into test(name) values ('foo')")
-        self.cu.execute("insert into test(name) values ('foo')")
-        self.assertLess(2, self.cx.total_changes, msg='total changes reported wrong value')
-
-    # Checks for executemany:
-    # Sequences are required by the DB-API, iterators
-    # enhancements in pysqlite.
-
-    def test_execute_many_sequence(self):
-        self.cu.executemany("insert into test(income) values (?)", [(x,) for x in range(100, 110)])
-
-    def test_execute_many_iterator(self):
-        class MyIter:
-            def __init__(self):
-                self.value = 5
-
-            def __iter__(self):
-                return self
-
-            def __next__(self):
-                if self.value == 10:
-                    raise StopIteration
-                else:
-                    self.value += 1
-                    return (self.value,)
-
-        self.cu.executemany("insert into test(income) values (?)", MyIter())
-
-    def test_execute_many_generator(self):
-        def mygen():
-            for i in range(5):
-                yield (i,)
-
-        self.cu.executemany("insert into test(income) values (?)", mygen())
-
-    def test_execute_many_wrong_sql_arg(self):
-        with self.assertRaises(TypeError):
-            self.cu.executemany(42, [(3,)])
-
-    def test_execute_many_select(self):
-        with self.assertRaises(sqlite.ProgrammingError):
-            self.cu.executemany("select ?", [(3,)])
-
-    def test_execute_many_not_iterable(self):
-        with self.assertRaises(TypeError):
-            self.cu.executemany("insert into test(income) values (?)", 42)
-
-    def test_fetch_iter(self):
-        # Optional DB-API extension.
-        self.cu.execute("delete from test")
-        self.cu.execute("insert into test(id) values (?)", (5,))
-        self.cu.execute("insert into test(id) values (?)", (6,))
-        self.cu.execute("select id from test order by id")
-        lst = []
-        for row in self.cu:
-            lst.append(row[0])
-        self.assertEqual(lst[0], 5)
-        self.assertEqual(lst[1], 6)
-
-    def test_fetchone(self):
-        self.cu.execute("select name from test")
-        row = self.cu.fetchone()
-        self.assertEqual(row[0], "foo")
-        row = self.cu.fetchone()
-        self.assertEqual(row, None)
-
-    def test_fetchone_no_statement(self):
-        cur = self.cx.cursor()
-        row = cur.fetchone()
-        self.assertEqual(row, None)
-
-    def test_array_size(self):
-        # must default to 1
-        self.assertEqual(self.cu.arraysize, 1)
-
-        # now set to 2
-        self.cu.arraysize = 2
-
-        # now make the query return 3 rows
-        self.cu.execute("delete from test")
-        self.cu.execute("insert into test(name) values ('A')")
-        self.cu.execute("insert into test(name) values ('B')")
-        self.cu.execute("insert into test(name) values ('C')")
-        self.cu.execute("select name from test")
-        res = self.cu.fetchmany()
-
-        self.assertEqual(len(res), 2)
-
-    def test_fetchmany(self):
-        self.cu.execute("select name from test")
-        res = self.cu.fetchmany(100)
-        self.assertEqual(len(res), 1)
-        res = self.cu.fetchmany(100)
-        self.assertEqual(res, [])
-
-    def test_fetchmany_kw_arg(self):
-        """Checks if fetchmany works with keyword arguments"""
-        self.cu.execute("select name from test")
-        res = self.cu.fetchmany(size=100)
-        self.assertEqual(len(res), 1)
-
-    def test_fetchall(self):
-        self.cu.execute("select name from test")
-        res = self.cu.fetchall()
-        self.assertEqual(len(res), 1)
-        res = self.cu.fetchall()
-        self.assertEqual(res, [])
-
-    def test_setinputsizes(self):
-        self.cu.setinputsizes([3, 4, 5])
-
-    def test_setoutputsize(self):
-        self.cu.setoutputsize(5, 0)
-
-    def test_setoutputsize_no_column(self):
-        self.cu.setoutputsize(42)
-
-    def test_cursor_connection(self):
-        # Optional DB-API extension.
-        self.assertEqual(self.cu.connection, self.cx)
-
-    def test_wrong_cursor_callable(self):
-        with self.assertRaises(TypeError):
-            def f(): pass
-            cur = self.cx.cursor(f)
-
-    def test_cursor_wrong_class(self):
-        class Foo: pass
-        foo = Foo()
-        with self.assertRaises(TypeError):
-            cur = sqlite.Cursor(foo)
-
-    def test_last_row_id_on_replace(self):
-        """
-        INSERT OR REPLACE and REPLACE INTO should produce the same behavior.
-        """
-        sql = '{} INTO test(id, unique_test) VALUES (?, ?)'
-        for statement in ('INSERT OR REPLACE', 'REPLACE'):
-            with self.subTest(statement=statement):
-                self.cu.execute(sql.format(statement), (1, 'foo'))
-                self.assertEqual(self.cu.lastrowid, 1)
-
-    def test_last_row_id_on_ignore(self):
-        self.cu.execute(
-            "insert or ignore into test(unique_test) values (?)",
-            ('test',))
-        self.assertEqual(self.cu.lastrowid, 2)
-        self.cu.execute(
-            "insert or ignore into test(unique_test) values (?)",
-            ('test',))
-        self.assertEqual(self.cu.lastrowid, 2)
-
-    def test_last_row_id_insert_o_r(self):
-        results = []
-        for statement in ('FAIL', 'ABORT', 'ROLLBACK'):
-            sql = 'INSERT OR {} INTO test(unique_test) VALUES (?)'
-            with self.subTest(statement='INSERT OR {}'.format(statement)):
-                self.cu.execute(sql.format(statement), (statement,))
-                results.append((statement, self.cu.lastrowid))
-                with self.assertRaises(sqlite.IntegrityError):
-                    self.cu.execute(sql.format(statement), (statement,))
-                results.append((statement, self.cu.lastrowid))
-        expected = [
-            ('FAIL', 2), ('FAIL', 2),
-            ('ABORT', 3), ('ABORT', 3),
-            ('ROLLBACK', 4), ('ROLLBACK', 4),
-        ]
-        self.assertEqual(results, expected)
-
-    def test_column_count(self):
-        # Check that column count is updated correctly for cached statements
-        select = "select * from test"
-        res = self.cu.execute(select)
-        old_count = len(res.description)
-        # Add a new column and execute the cached select query again
-        self.cu.execute("alter table test add newcol")
-        res = self.cu.execute(select)
-        new_count = len(res.description)
-        self.assertEqual(new_count - old_count, 1)
-
-    def test_same_query_in_multiple_cursors(self):
-        cursors = [self.cx.execute("select 1") for _ in range(3)]
-        for cu in cursors:
-            self.assertEqual(cu.fetchall(), [(1,)])
-
-
-class BlobTests(unittest.TestCase):
-    def setUp(self):
-        self.cx = sqlite.connect(":memory:")
-        self.cx.execute("create table test(b blob)")
-        self.data = b"this blob data string is exactly fifty bytes long!"
-        self.cx.execute("insert into test(b) values (?)", (self.data,))
-        self.blob = self.cx.blobopen("test", "b", 1)
-
-    def tearDown(self):
-        self.blob.close()
-        self.cx.close()
-
-    def test_blob_is_a_blob(self):
-        self.assertIsInstance(self.blob, sqlite.Blob)
-
-    def test_blob_seek_and_tell(self):
-        self.blob.seek(10)
-        self.assertEqual(self.blob.tell(), 10)
-
-        self.blob.seek(10, SEEK_SET)
-        self.assertEqual(self.blob.tell(), 10)
-
-        self.blob.seek(10, SEEK_CUR)
-        self.assertEqual(self.blob.tell(), 20)
-
-        self.blob.seek(-10, SEEK_END)
-        self.assertEqual(self.blob.tell(), 40)
-
-    def test_blob_seek_error(self):
-        msg_oor = "offset out of blob range"
-        msg_orig = "'origin' should be os.SEEK_SET, os.SEEK_CUR, or os.SEEK_END"
-        msg_of = "seek offset results in overflow"
-
-        dataset = (
-            (ValueError, msg_oor, lambda: self.blob.seek(1000)),
-            (ValueError, msg_oor, lambda: self.blob.seek(-10)),
-            (ValueError, msg_orig, lambda: self.blob.seek(10, -1)),
-            (ValueError, msg_orig, lambda: self.blob.seek(10, 3)),
-        )
-        for exc, msg, fn in dataset:
-            with self.subTest(exc=exc, msg=msg, fn=fn):
-                self.assertRaisesRegex(exc, msg, fn)
-
-        # Force overflow errors
-        self.blob.seek(1, SEEK_SET)
-        with self.assertRaisesRegex(OverflowError, msg_of):
-            self.blob.seek(INT_MAX, SEEK_CUR)
-        with self.assertRaisesRegex(OverflowError, msg_of):
-            self.blob.seek(INT_MAX, SEEK_END)
-
-    def test_blob_read(self):
-        buf = self.blob.read()
-        self.assertEqual(buf, self.data)
-
-    def test_blob_read_oversized(self):
-        buf = self.blob.read(len(self.data) * 2)
-        self.assertEqual(buf, self.data)
-
-    def test_blob_read_advance_offset(self):
-        n = 10
-        buf = self.blob.read(n)
-        self.assertEqual(buf, self.data[:n])
-        self.assertEqual(self.blob.tell(), n)
-
-    def test_blob_read_at_offset(self):
-        self.blob.seek(10)
-        self.assertEqual(self.blob.read(10), self.data[10:20])
-
-    def test_blob_read_error_row_changed(self):
-        self.cx.execute("update test set b='aaaa' where rowid=1")
-        with self.assertRaises(sqlite.OperationalError):
-            self.blob.read()
-
-    def test_blob_write(self):
-        new_data = b"new data".ljust(50)
-        self.blob.write(new_data)
-        row = self.cx.execute("select b from test").fetchone()
-        self.assertEqual(row[0], new_data)
-
-    def test_blob_write_at_offset(self):
-        new_data = b"c" * 25
-        self.blob.seek(25)
-        self.blob.write(new_data)
-        row = self.cx.execute("select b from test").fetchone()
-        self.assertEqual(row[0], self.data[:25] + new_data)
-
-    def test_blob_write_advance_offset(self):
-        self.blob.write(b"d"*10)
-        self.assertEqual(self.blob.tell(), 10)
-
-    def test_blob_write_error_length(self):
-        with self.assertRaisesRegex(ValueError, "data longer than blob"):
-            self.blob.write(b"a" * 1000)
-
-        self.blob.seek(0, SEEK_SET)
-        n = len(self.blob)
-        self.blob.write(b"a" * (n-1))
-        self.blob.write(b"a")
-        with self.assertRaisesRegex(ValueError, "data longer than blob"):
-            self.blob.write(b"a")
-
-    def test_blob_write_error_row_changed(self):
-        self.cx.execute("update test set b='aaaa' where rowid=1")
-        with self.assertRaises(sqlite.OperationalError):
-            self.blob.write(b"aaa")
-
-    def test_blob_write_error_readonly(self):
-        ro_blob = self.cx.blobopen("test", "b", 1, readonly=True)
-        with self.assertRaisesRegex(sqlite.OperationalError, "readonly"):
-            ro_blob.write(b"aaa")
-        ro_blob.close()
-
-    def test_blob_open_error(self):
-        dataset = (
-            (("test", "b", 1), {"name": "notexisting"}),
-            (("notexisting", "b", 1), {}),
-            (("test", "notexisting", 1), {}),
-            (("test", "b", 2), {}),
-        )
-        regex = "no such"
-        for args, kwds in dataset:
-            with self.subTest(args=args, kwds=kwds):
-                with self.assertRaisesRegex(sqlite.OperationalError, regex):
-                    self.cx.blobopen(*args, **kwds)
-
-    def test_blob_length(self):
-        self.assertEqual(len(self.blob), 50)
-
-    def test_blob_get_item(self):
-        self.assertEqual(self.blob[5], ord("b"))
-        self.assertEqual(self.blob[6], ord("l"))
-        self.assertEqual(self.blob[7], ord("o"))
-        self.assertEqual(self.blob[8], ord("b"))
-        self.assertEqual(self.blob[-1], ord("!"))
-
-    def test_blob_set_item(self):
-        self.blob[0] = ord("b")
-        expected = b"b" + self.data[1:]
-        actual = self.cx.execute("select b from test").fetchone()[0]
-        self.assertEqual(actual, expected)
-
-    def test_blob_set_item_with_offset(self):
-        self.blob.seek(0, SEEK_END)
-        self.assertEqual(self.blob.read(), b"")  # verify that we're at EOB
-        self.blob[0] = ord("T")
-        self.blob[-1] = ord(".")
-        self.blob.seek(0, SEEK_SET)
-        expected = b"This blob data string is exactly fifty bytes long."
-        self.assertEqual(self.blob.read(), expected)
-
-    def test_blob_set_slice_buffer_object(self):
-        from array import array
-        self.blob[0:5] = memoryview(b"12345")
-        self.assertEqual(self.blob[0:5], b"12345")
-
-        self.blob[0:5] = bytearray(b"23456")
-        self.assertEqual(self.blob[0:5], b"23456")
-
-        self.blob[0:5] = array("b", [1, 2, 3, 4, 5])
-        self.assertEqual(self.blob[0:5], b"\x01\x02\x03\x04\x05")
-
-    def test_blob_set_item_negative_index(self):
-        self.blob[-1] = 255
-        self.assertEqual(self.blob[-1], 255)
-
-    def test_blob_get_slice(self):
-        self.assertEqual(self.blob[5:14], b"blob data")
-
-    def test_blob_get_empty_slice(self):
-        self.assertEqual(self.blob[5:5], b"")
-
-    def test_blob_get_slice_negative_index(self):
-        self.assertEqual(self.blob[5:-5], self.data[5:-5])
-
-    def test_blob_get_slice_with_skip(self):
-        self.assertEqual(self.blob[0:10:2], b"ti lb")
-
-    def test_blob_set_slice(self):
-        self.blob[0:5] = b"12345"
-        expected = b"12345" + self.data[5:]
-        actual = self.cx.execute("select b from test").fetchone()[0]
-        self.assertEqual(actual, expected)
-
-    def test_blob_set_empty_slice(self):
-        self.blob[0:0] = b""
-        self.assertEqual(self.blob[:], self.data)
-
-    def test_blob_set_slice_with_skip(self):
-        self.blob[0:10:2] = b"12345"
-        actual = self.cx.execute("select b from test").fetchone()[0]
-        expected = b"1h2s3b4o5 " + self.data[10:]
-        self.assertEqual(actual, expected)
-
-    def test_blob_mapping_invalid_index_type(self):
-        msg = "indices must be integers"
-        with self.assertRaisesRegex(TypeError, msg):
-            self.blob[5:5.5]
-        with self.assertRaisesRegex(TypeError, msg):
-            self.blob[1.5]
-        with self.assertRaisesRegex(TypeError, msg):
-            self.blob["a"] = b"b"
-
-    def test_blob_get_item_error(self):
-        dataset = [len(self.blob), 105, -105]
-        for idx in dataset:
-            with self.subTest(idx=idx):
-                with self.assertRaisesRegex(IndexError, "index out of range"):
-                    self.blob[idx]
-        with self.assertRaisesRegex(IndexError, "cannot fit 'int'"):
-            self.blob[ULLONG_MAX]
-
-        # Provoke read error
-        self.cx.execute("update test set b='aaaa' where rowid=1")
-        with self.assertRaises(sqlite.OperationalError):
-            self.blob[0]
-
-    def test_blob_set_item_error(self):
-        with self.assertRaisesRegex(TypeError, "cannot be interpreted"):
-            self.blob[0] = b"multiple"
-        with self.assertRaisesRegex(TypeError, "cannot be interpreted"):
-            self.blob[0] = b"1"
-        with self.assertRaisesRegex(TypeError, "cannot be interpreted"):
-            self.blob[0] = bytearray(b"1")
-        with self.assertRaisesRegex(TypeError, "doesn't support.*deletion"):
-            del self.blob[0]
-        with self.assertRaisesRegex(IndexError, "Blob index out of range"):
-            self.blob[1000] = 0
-        with self.assertRaisesRegex(ValueError, "must be in range"):
-            self.blob[0] = -1
-        with self.assertRaisesRegex(ValueError, "must be in range"):
-            self.blob[0] = 256
-        # Overflow errors are overridden with ValueError
-        with self.assertRaisesRegex(ValueError, "must be in range"):
-            self.blob[0] = 2**65
-
-    def test_blob_set_slice_error(self):
-        with self.assertRaisesRegex(IndexError, "wrong size"):
-            self.blob[5:10] = b"a"
-        with self.assertRaisesRegex(IndexError, "wrong size"):
-            self.blob[5:10] = b"a" * 1000
-        with self.assertRaisesRegex(TypeError, "doesn't support.*deletion"):
-            del self.blob[5:10]
-        with self.assertRaisesRegex(ValueError, "step cannot be zero"):
-            self.blob[5:10:0] = b"12345"
-        with self.assertRaises(BufferError):
-            self.blob[5:10] = memoryview(b"abcde")[::2]
-
-    def test_blob_sequence_not_supported(self):
-        with self.assertRaisesRegex(TypeError, "unsupported operand"):
-            self.blob + self.blob
-        with self.assertRaisesRegex(TypeError, "unsupported operand"):
-            self.blob * 5
-        with self.assertRaisesRegex(TypeError, "is not iterable"):
-            b"a" in self.blob
-
-    def test_blob_context_manager(self):
-        data = b"a" * 50
-        with self.cx.blobopen("test", "b", 1) as blob:
-            blob.write(data)
-        actual = self.cx.execute("select b from test").fetchone()[0]
-        self.assertEqual(actual, data)
-
-        # Check that __exit__ closed the blob
-        with self.assertRaisesRegex(sqlite.ProgrammingError, "closed blob"):
-            blob.read()
-
-    def test_blob_context_manager_reraise_exceptions(self):
-        class DummyException(Exception):
-            pass
-        with self.assertRaisesRegex(DummyException, "reraised"):
-            with self.cx.blobopen("test", "b", 1) as blob:
-                raise DummyException("reraised")
-
-
-    def test_blob_closed(self):
-        with memory_database() as cx:
-            cx.execute("create table test(b blob)")
-            cx.execute("insert into test values (zeroblob(100))")
-            blob = cx.blobopen("test", "b", 1)
-            blob.close()
-
-            msg = "Cannot operate on a closed blob"
-            with self.assertRaisesRegex(sqlite.ProgrammingError, msg):
-                blob.read()
-            with self.assertRaisesRegex(sqlite.ProgrammingError, msg):
-                blob.write(b"")
-            with self.assertRaisesRegex(sqlite.ProgrammingError, msg):
-                blob.seek(0)
-            with self.assertRaisesRegex(sqlite.ProgrammingError, msg):
-                blob.tell()
-            with self.assertRaisesRegex(sqlite.ProgrammingError, msg):
-                blob.__enter__()
-            with self.assertRaisesRegex(sqlite.ProgrammingError, msg):
-                blob.__exit__(None, None, None)
-            with self.assertRaisesRegex(sqlite.ProgrammingError, msg):
-                len(blob)
-            with self.assertRaisesRegex(sqlite.ProgrammingError, msg):
-                blob[0]
-            with self.assertRaisesRegex(sqlite.ProgrammingError, msg):
-                blob[0:1]
-            with self.assertRaisesRegex(sqlite.ProgrammingError, msg):
-                blob[0] = b""
-
-    def test_blob_closed_db_read(self):
-        with memory_database() as cx:
-            cx.execute("create table test(b blob)")
-            cx.execute("insert into test(b) values (zeroblob(100))")
-            blob = cx.blobopen("test", "b", 1)
-            cx.close()
-            self.assertRaisesRegex(sqlite.ProgrammingError,
-                                   "Cannot operate on a closed database",
-                                   blob.read)
-
-
-class ThreadTests(unittest.TestCase):
-    def setUp(self):
-        self.con = sqlite.connect(":memory:")
-        self.cur = self.con.cursor()
-        self.cur.execute("create table test(name text, b blob)")
-        self.cur.execute("insert into test values('blob', zeroblob(1))")
-
-    def tearDown(self):
-        self.cur.close()
-        self.con.close()
-
-    @threading_helper.reap_threads
-    def _run_test(self, fn, *args, **kwds):
-        def run(err):
-            try:
-                fn(*args, **kwds)
-                err.append("did not raise ProgrammingError")
-            except sqlite.ProgrammingError:
-                pass
-            except:
-                err.append("raised wrong exception")
-
-        err = []
-        t = threading.Thread(target=run, kwargs={"err": err})
-        t.start()
-        t.join()
-        if err:
-            self.fail("\n".join(err))
-
-    def test_check_connection_thread(self):
-        fns = [
-            lambda: self.con.cursor(),
-            lambda: self.con.commit(),
-            lambda: self.con.rollback(),
-            lambda: self.con.close(),
-            lambda: self.con.set_trace_callback(None),
-            lambda: self.con.set_authorizer(None),
-            lambda: self.con.create_collation("foo", None),
-            lambda: self.con.setlimit(sqlite.SQLITE_LIMIT_LENGTH, -1),
-            lambda: self.con.getlimit(sqlite.SQLITE_LIMIT_LENGTH),
-            lambda: self.con.blobopen("test", "b", 1),
-        ]
-        if hasattr(sqlite.Connection, "serialize"):
-            fns.append(lambda: self.con.serialize())
-            fns.append(lambda: self.con.deserialize(b""))
-        if sqlite.sqlite_version_info >= (3, 25, 0):
-            fns.append(lambda: self.con.create_window_function("foo", 0, None))
-
-        for fn in fns:
-            with self.subTest(fn=fn):
-                self._run_test(fn)
-
-    def test_check_cursor_thread(self):
-        fns = [
-            lambda: self.cur.execute("insert into test(name) values('a')"),
-            lambda: self.cur.close(),
-            lambda: self.cur.execute("select name from test"),
-            lambda: self.cur.fetchone(),
-        ]
-        for fn in fns:
-            with self.subTest(fn=fn):
-                self._run_test(fn)
-
-
-    @threading_helper.reap_threads
-    def test_dont_check_same_thread(self):
-        def run(con, err):
-            try:
-                con.execute("select 1")
-            except sqlite.Error:
-                err.append("multi-threading not allowed")
-
-        con = sqlite.connect(":memory:", check_same_thread=False)
-        err = []
-        t = threading.Thread(target=run, kwargs={"con": con, "err": err})
-        t.start()
-        t.join()
-        self.assertEqual(len(err), 0, "\n".join(err))
-
-
-class ConstructorTests(unittest.TestCase):
-    def test_date(self):
-        d = sqlite.Date(2004, 10, 28)
-
-    def test_time(self):
-        t = sqlite.Time(12, 39, 35)
-
-    def test_timestamp(self):
-        ts = sqlite.Timestamp(2004, 10, 28, 12, 39, 35)
-
-    def test_date_from_ticks(self):
-        d = sqlite.DateFromTicks(42)
-
-    def test_time_from_ticks(self):
-        t = sqlite.TimeFromTicks(42)
-
-    def test_timestamp_from_ticks(self):
-        ts = sqlite.TimestampFromTicks(42)
-
-    def test_binary(self):
-        b = sqlite.Binary(b"\0'")
-
-class ExtensionTests(unittest.TestCase):
-    def test_script_string_sql(self):
-        con = sqlite.connect(":memory:")
-        cur = con.cursor()
-        cur.executescript("""
-            -- bla bla
-            /* a stupid comment */
-            create table a(i);
-            insert into a(i) values (5);
-            """)
-        cur.execute("select i from a")
-        res = cur.fetchone()[0]
-        self.assertEqual(res, 5)
-
-    def test_script_syntax_error(self):
-        con = sqlite.connect(":memory:")
-        cur = con.cursor()
-        with self.assertRaises(sqlite.OperationalError):
-            cur.executescript("create table test(x); asdf; create table test2(x)")
-
-    def test_script_error_normal(self):
-        con = sqlite.connect(":memory:")
-        cur = con.cursor()
-        with self.assertRaises(sqlite.OperationalError):
-            cur.executescript("create table test(sadfsadfdsa); select foo from hurz;")
-
-    def test_cursor_executescript_as_bytes(self):
-        con = sqlite.connect(":memory:")
-        cur = con.cursor()
-        with self.assertRaises(TypeError):
-            cur.executescript(b"create table test(foo); insert into test(foo) values (5);")
-
-    def test_cursor_executescript_with_null_characters(self):
-        con = sqlite.connect(":memory:")
-        cur = con.cursor()
-        with self.assertRaises(ValueError):
-            cur.executescript("""
-                create table a(i);\0
-                insert into a(i) values (5);
-                """)
-
-    def test_cursor_executescript_with_surrogates(self):
-        con = sqlite.connect(":memory:")
-        cur = con.cursor()
-        with self.assertRaises(UnicodeEncodeError):
-            cur.executescript("""
-                create table a(s);
-                insert into a(s) values ('\ud8ff');
-                """)
-
-    def test_cursor_executescript_too_large_script(self):
-        msg = "query string is too large"
-        with memory_database() as cx, cx_limit(cx) as lim:
-            cx.executescript("select 'almost too large'".ljust(lim))
-            with self.assertRaisesRegex(sqlite.DataError, msg):
-                cx.executescript("select 'too large'".ljust(lim+1))
-
-    def test_cursor_executescript_tx_control(self):
-        con = sqlite.connect(":memory:")
-        con.execute("begin")
-        self.assertTrue(con.in_transaction)
-        con.executescript("select 1")
-        self.assertFalse(con.in_transaction)
-
-    def test_connection_execute(self):
-        con = sqlite.connect(":memory:")
-        result = con.execute("select 5").fetchone()[0]
-        self.assertEqual(result, 5, "Basic test of Connection.execute")
-
-    def test_connection_executemany(self):
-        con = sqlite.connect(":memory:")
-        con.execute("create table test(foo)")
-        con.executemany("insert into test(foo) values (?)", [(3,), (4,)])
-        result = con.execute("select foo from test order by foo").fetchall()
-        self.assertEqual(result[0][0], 3, "Basic test of Connection.executemany")
-        self.assertEqual(result[1][0], 4, "Basic test of Connection.executemany")
-
-    def test_connection_executescript(self):
-        con = sqlite.connect(":memory:")
-        con.executescript("create table test(foo); insert into test(foo) values (5);")
-        result = con.execute("select foo from test").fetchone()[0]
-        self.assertEqual(result, 5, "Basic test of Connection.executescript")
-
-class ClosedConTests(unittest.TestCase):
-    def test_closed_con_cursor(self):
-        con = sqlite.connect(":memory:")
-        con.close()
-        with self.assertRaises(sqlite.ProgrammingError):
-            cur = con.cursor()
-
-    def test_closed_con_commit(self):
-        con = sqlite.connect(":memory:")
-        con.close()
-        with self.assertRaises(sqlite.ProgrammingError):
-            con.commit()
-
-    def test_closed_con_rollback(self):
-        con = sqlite.connect(":memory:")
-        con.close()
-        with self.assertRaises(sqlite.ProgrammingError):
-            con.rollback()
-
-    def test_closed_cur_execute(self):
-        con = sqlite.connect(":memory:")
-        cur = con.cursor()
-        con.close()
-        with self.assertRaises(sqlite.ProgrammingError):
-            cur.execute("select 4")
-
-    def test_closed_create_function(self):
-        con = sqlite.connect(":memory:")
-        con.close()
-        def f(x): return 17
-        with self.assertRaises(sqlite.ProgrammingError):
-            con.create_function("foo", 1, f)
-
-    def test_closed_create_aggregate(self):
-        con = sqlite.connect(":memory:")
-        con.close()
-        class Agg:
-            def __init__(self):
-                pass
-            def step(self, x):
-                pass
-            def finalize(self):
-                return 17
-        with self.assertRaises(sqlite.ProgrammingError):
-            con.create_aggregate("foo", 1, Agg)
-
-    def test_closed_set_authorizer(self):
-        con = sqlite.connect(":memory:")
-        con.close()
-        def authorizer(*args):
-            return sqlite.DENY
-        with self.assertRaises(sqlite.ProgrammingError):
-            con.set_authorizer(authorizer)
-
-    def test_closed_set_progress_callback(self):
-        con = sqlite.connect(":memory:")
-        con.close()
-        def progress(): pass
-        with self.assertRaises(sqlite.ProgrammingError):
-            con.set_progress_handler(progress, 100)
-
-    def test_closed_call(self):
-        con = sqlite.connect(":memory:")
-        con.close()
-        with self.assertRaises(sqlite.ProgrammingError):
-            con()
-
-class ClosedCurTests(unittest.TestCase):
-    def test_closed(self):
-        con = sqlite.connect(":memory:")
-        cur = con.cursor()
-        cur.close()
-
-        for method_name in ("execute", "executemany", "executescript", "fetchall", "fetchmany", "fetchone"):
-            if method_name in ("execute", "executescript"):
-                params = ("select 4 union select 5",)
-            elif method_name == "executemany":
-                params = ("insert into foo(bar) values (?)", [(3,), (4,)])
-            else:
-                params = []
-
-            with self.assertRaises(sqlite.ProgrammingError):
-                method = getattr(cur, method_name)
-                method(*params)
-
-
-class SqliteOnConflictTests(unittest.TestCase):
-    """
-    Tests for SQLite's "insert on conflict" feature.
-
-    See https://www.sqlite.org/lang_conflict.html for details.
-    """
-
-    def setUp(self):
-        self.cx = sqlite.connect(":memory:")
-        self.cu = self.cx.cursor()
-        self.cu.execute("""
-          CREATE TABLE test(
-            id INTEGER PRIMARY KEY, name TEXT, unique_name TEXT UNIQUE
-          );
-        """)
-
-    def tearDown(self):
-        self.cu.close()
-        self.cx.close()
-
-    def test_on_conflict_rollback_with_explicit_transaction(self):
-        self.cx.isolation_level = None  # autocommit mode
-        self.cu = self.cx.cursor()
-        # Start an explicit transaction.
-        self.cu.execute("BEGIN")
-        self.cu.execute("INSERT INTO test(name) VALUES ('abort_test')")
-        self.cu.execute("INSERT OR ROLLBACK INTO test(unique_name) VALUES ('foo')")
-        with self.assertRaises(sqlite.IntegrityError):
-            self.cu.execute("INSERT OR ROLLBACK INTO test(unique_name) VALUES ('foo')")
-        # Use connection to commit.
-        self.cx.commit()
-        self.cu.execute("SELECT name, unique_name from test")
-        # Transaction should have rolled back and nothing should be in table.
-        self.assertEqual(self.cu.fetchall(), [])
-
-    def test_on_conflict_abort_raises_with_explicit_transactions(self):
-        # Abort cancels the current sql statement but doesn't change anything
-        # about the current transaction.
-        self.cx.isolation_level = None  # autocommit mode
-        self.cu = self.cx.cursor()
-        # Start an explicit transaction.
-        self.cu.execute("BEGIN")
-        self.cu.execute("INSERT INTO test(name) VALUES ('abort_test')")
-        self.cu.execute("INSERT OR ABORT INTO test(unique_name) VALUES ('foo')")
-        with self.assertRaises(sqlite.IntegrityError):
-            self.cu.execute("INSERT OR ABORT INTO test(unique_name) VALUES ('foo')")
-        self.cx.commit()
-        self.cu.execute("SELECT name, unique_name FROM test")
-        # Expect the first two inserts to work, third to do nothing.
-        self.assertEqual(self.cu.fetchall(), [('abort_test', None), (None, 'foo',)])
-
-    def test_on_conflict_rollback_without_transaction(self):
-        # Start of implicit transaction
-        self.cu.execute("INSERT INTO test(name) VALUES ('abort_test')")
-        self.cu.execute("INSERT OR ROLLBACK INTO test(unique_name) VALUES ('foo')")
-        with self.assertRaises(sqlite.IntegrityError):
-            self.cu.execute("INSERT OR ROLLBACK INTO test(unique_name) VALUES ('foo')")
-        self.cu.execute("SELECT name, unique_name FROM test")
-        # Implicit transaction is rolled back on error.
-        self.assertEqual(self.cu.fetchall(), [])
-
-    def test_on_conflict_abort_raises_without_transactions(self):
-        # Abort cancels the current sql statement but doesn't change anything
-        # about the current transaction.
-        self.cu.execute("INSERT INTO test(name) VALUES ('abort_test')")
-        self.cu.execute("INSERT OR ABORT INTO test(unique_name) VALUES ('foo')")
-        with self.assertRaises(sqlite.IntegrityError):
-            self.cu.execute("INSERT OR ABORT INTO test(unique_name) VALUES ('foo')")
-        # Make sure all other values were inserted.
-        self.cu.execute("SELECT name, unique_name FROM test")
-        self.assertEqual(self.cu.fetchall(), [('abort_test', None), (None, 'foo',)])
-
-    def test_on_conflict_fail(self):
-        self.cu.execute("INSERT OR FAIL INTO test(unique_name) VALUES ('foo')")
-        with self.assertRaises(sqlite.IntegrityError):
-            self.cu.execute("INSERT OR FAIL INTO test(unique_name) VALUES ('foo')")
-        self.assertEqual(self.cu.fetchall(), [])
-
-    def test_on_conflict_ignore(self):
-        self.cu.execute("INSERT OR IGNORE INTO test(unique_name) VALUES ('foo')")
-        # Nothing should happen.
-        self.cu.execute("INSERT OR IGNORE INTO test(unique_name) VALUES ('foo')")
-        self.cu.execute("SELECT unique_name FROM test")
-        self.assertEqual(self.cu.fetchall(), [('foo',)])
-
-    def test_on_conflict_replace(self):
-        self.cu.execute("INSERT OR REPLACE INTO test(name, unique_name) VALUES ('Data!', 'foo')")
-        # There shouldn't be an IntegrityError exception.
-        self.cu.execute("INSERT OR REPLACE INTO test(name, unique_name) VALUES ('Very different data!', 'foo')")
-        self.cu.execute("SELECT name, unique_name FROM test")
-        self.assertEqual(self.cu.fetchall(), [('Very different data!', 'foo')])
-
-
-class MultiprocessTests(unittest.TestCase):
-    CONNECTION_TIMEOUT = SHORT_TIMEOUT / 1000.  # Defaults to 30 ms
-
-    def tearDown(self):
-        unlink(TESTFN)
-
-    def test_ctx_mgr_rollback_if_commit_failed(self):
-        # bpo-27334: ctx manager does not rollback if commit fails
-        SCRIPT = f"""if 1:
-            import sqlite3
-            def wait():
-                print("started")
-                assert "database is locked" in input()
-
-            cx = sqlite3.connect("{TESTFN}", timeout={self.CONNECTION_TIMEOUT})
-            cx.create_function("wait", 0, wait)
-            with cx:
-                cx.execute("create table t(t)")
-            try:
-                # execute two transactions; both will try to lock the db
-                cx.executescript('''
-                    -- start a transaction and wait for parent
-                    begin transaction;
-                    select * from t;
-                    select wait();
-                    rollback;
-
-                    -- start a new transaction; would fail if parent holds lock
-                    begin transaction;
-                    select * from t;
-                    rollback;
-                ''')
-            finally:
-                cx.close()
-        """
-
-        # spawn child process
-        proc = subprocess.Popen(
-            [sys.executable, "-c", SCRIPT],
-            encoding="utf-8",
-            bufsize=0,
-            stdin=subprocess.PIPE,
-            stdout=subprocess.PIPE,
-        )
-        self.addCleanup(proc.communicate)
-
-        # wait for child process to start
-        self.assertEqual("started", proc.stdout.readline().strip())
-
-        cx = sqlite.connect(TESTFN, timeout=self.CONNECTION_TIMEOUT)
-        try:  # context manager should correctly release the db lock
-            with cx:
-                cx.execute("insert into t values('test')")
-        except sqlite.OperationalError as exc:
-            proc.stdin.write(str(exc))
-        else:
-            proc.stdin.write("no error")
-        finally:
-            cx.close()
-
-        # terminate child process
-        self.assertIsNone(proc.returncode)
-        try:
-            proc.communicate(input="end", timeout=SHORT_TIMEOUT)
-        except subprocess.TimeoutExpired:
-            proc.kill()
-            proc.communicate()
-            raise
-        self.assertEqual(proc.returncode, 0)
-
-
-if __name__ == "__main__":
-    unittest.main()


From webhook-mailer at python.org  Tue Jul 19 14:39:25 2022
From: webhook-mailer at python.org (zooba)
Date: Tue, 19 Jul 2022 18:39:25 -0000
Subject: [Python-checkins] gh-91256: Ensure help text has the program name
 even before getpath is called (GH-94929)
Message-ID: <mailman.113.1658255966.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/49aeff49d71fa4bd935212340410311f13879447
commit: 49aeff49d71fa4bd935212340410311f13879447
branch: main
author: Steve Dower <steve.dower at python.org>
committer: zooba <steve.dower at microsoft.com>
date: 2022-07-19T19:39:11+01:00
summary:

gh-91256: Ensure help text has the program name even before getpath is called (GH-94929)

files:
A Misc/NEWS.d/next/Core and Builtins/2022-07-17-15-54-29.gh-issue-91256.z7i7Q5.rst
M Python/initconfig.c

diff --git a/Misc/NEWS.d/next/Core and Builtins/2022-07-17-15-54-29.gh-issue-91256.z7i7Q5.rst b/Misc/NEWS.d/next/Core and Builtins/2022-07-17-15-54-29.gh-issue-91256.z7i7Q5.rst
new file mode 100644
index 0000000000000..802a614fd48d7
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2022-07-17-15-54-29.gh-issue-91256.z7i7Q5.rst	
@@ -0,0 +1 @@
+Ensures the program name is known for help text during interpreter startup.
diff --git a/Python/initconfig.c b/Python/initconfig.c
index 355f9869290bb..d29c69345a2bb 100644
--- a/Python/initconfig.c
+++ b/Python/initconfig.c
@@ -2310,6 +2310,9 @@ config_parse_cmdline(PyConfig *config, PyWideStringList *warnoptions,
     const PyWideStringList *argv = &config->argv;
     int print_version = 0;
     const wchar_t* program = config->program_name;
+    if (!program && argv->length >= 1) {
+        program = argv->items[0];
+    }
 
     _PyOS_ResetGetOpt();
     do {


From webhook-mailer at python.org  Tue Jul 19 14:58:09 2022
From: webhook-mailer at python.org (serhiy-storchaka)
Date: Tue, 19 Jul 2022 18:58:09 -0000
Subject: [Python-checkins] [3.10] gh-94930: skipitem() in getargs.c should
 return non-NULL on error (GH-94931) (GH-94963)
Message-ID: <mailman.114.1658257090.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/31a390e43f2ea2608c5ec04de7d012df14f16fda
commit: 31a390e43f2ea2608c5ec04de7d012df14f16fda
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: serhiy-storchaka <storchaka at gmail.com>
date: 2022-07-19T21:57:59+03:00
summary:

[3.10] gh-94930: skipitem() in getargs.c should return non-NULL on error (GH-94931) (GH-94963)

(cherry picked from commit 067f0da33506f70c36a67d5f3d8d011c8dae10c9)

Co-authored-by: Serhiy Storchaka <storchaka at gmail.com>

files:
A Misc/NEWS.d/next/C API/2022-07-17-18-21-40.gh-issue-94930.gPFGDL.rst
M Lib/test/test_getargs2.py
M Modules/_testcapimodule.c
M Python/getargs.c

diff --git a/Lib/test/test_getargs2.py b/Lib/test/test_getargs2.py
index 571cabb5f13a0..fd1952c5845db 100644
--- a/Lib/test/test_getargs2.py
+++ b/Lib/test/test_getargs2.py
@@ -878,9 +878,19 @@ def test_s_hash(self):
     def test_s_hash_int(self):
         # "s#" without PY_SSIZE_T_CLEAN defined.
         from _testcapi import getargs_s_hash_int
-        self.assertRaises(SystemError, getargs_s_hash_int, "abc")
-        self.assertRaises(SystemError, getargs_s_hash_int, x=42)
-        # getargs_s_hash_int() don't raise SystemError because skipitem() is not called.
+        from _testcapi import getargs_s_hash_int2
+        buf = bytearray([1, 2])
+        self.assertRaises(SystemError, getargs_s_hash_int, buf, "abc")
+        self.assertRaises(SystemError, getargs_s_hash_int, buf, x=42)
+        self.assertRaises(SystemError, getargs_s_hash_int, buf, x="abc")
+        self.assertRaises(SystemError, getargs_s_hash_int2, buf, ("abc",))
+        self.assertRaises(SystemError, getargs_s_hash_int2, buf, x=42)
+        self.assertRaises(SystemError, getargs_s_hash_int2, buf, x="abc")
+        buf.append(3)  # still mutable -- not locked by a buffer export
+        # getargs_s_hash_int(buf) may not raise SystemError because skipitem()
+        # is not called. But it is an implementation detail.
+        # getargs_s_hash_int(buf)
+        # getargs_s_hash_int2(buf)
 
     def test_z(self):
         from _testcapi import getargs_z
diff --git a/Misc/NEWS.d/next/C API/2022-07-17-18-21-40.gh-issue-94930.gPFGDL.rst b/Misc/NEWS.d/next/C API/2022-07-17-18-21-40.gh-issue-94930.gPFGDL.rst
new file mode 100644
index 0000000000000..5b79d757b1e4a
--- /dev/null
+++ b/Misc/NEWS.d/next/C API/2022-07-17-18-21-40.gh-issue-94930.gPFGDL.rst	
@@ -0,0 +1,2 @@
+Fix ``SystemError`` raised when :c:func:`PyArg_ParseTupleAndKeywords` is
+used with ``#`` in ``(...)`` but without ``PY_SSIZE_T_CLEAN`` defined.
diff --git a/Modules/_testcapimodule.c b/Modules/_testcapimodule.c
index f4826c2e90432..7cce4e5a3f3bc 100644
--- a/Modules/_testcapimodule.c
+++ b/Modules/_testcapimodule.c
@@ -5634,6 +5634,7 @@ test_fatal_error(PyObject *self, PyObject *args)
 
 static PyObject *test_buildvalue_issue38913(PyObject *, PyObject *);
 static PyObject *getargs_s_hash_int(PyObject *, PyObject *, PyObject*);
+static PyObject *getargs_s_hash_int2(PyObject *, PyObject *, PyObject*);
 
 static PyMethodDef TestMethods[] = {
     {"raise_exception",         raise_exception,                 METH_VARARGS},
@@ -5745,6 +5746,8 @@ static PyMethodDef TestMethods[] = {
     {"getargs_s_hash",          getargs_s_hash,                  METH_VARARGS},
     {"getargs_s_hash_int",      (PyCFunction)(void(*)(void))getargs_s_hash_int,
       METH_VARARGS|METH_KEYWORDS},
+    {"getargs_s_hash_int2",      (PyCFunction)(void(*)(void))getargs_s_hash_int2,
+      METH_VARARGS|METH_KEYWORDS},
     {"getargs_z",               getargs_z,                       METH_VARARGS},
     {"getargs_z_star",          getargs_z_star,                  METH_VARARGS},
     {"getargs_z_hash",          getargs_z_hash,                  METH_VARARGS},
@@ -7435,11 +7438,27 @@ PyAPI_FUNC(int) PyArg_ParseTupleAndKeywords(PyObject *, PyObject *,
 static PyObject *
 getargs_s_hash_int(PyObject *self, PyObject *args, PyObject *kwargs)
 {
-    static char *keywords[] = {"", "x", NULL};
+    static char *keywords[] = {"", "", "x", NULL};
+    Py_buffer buf = {NULL};
+    const char *s;
+    int len;
+    int i = 0;
+    if (!PyArg_ParseTupleAndKeywords(args, kwargs, "w*|s#i", keywords, &buf, &s, &len, &i))
+        return NULL;
+    PyBuffer_Release(&buf);
+    Py_RETURN_NONE;
+}
+
+static PyObject *
+getargs_s_hash_int2(PyObject *self, PyObject *args, PyObject *kwargs)
+{
+    static char *keywords[] = {"", "", "x", NULL};
+    Py_buffer buf = {NULL};
     const char *s;
     int len;
     int i = 0;
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|s#i", keywords, &s, &len, &i))
+    if (!PyArg_ParseTupleAndKeywords(args, kwargs, "w*|(s#)i", keywords, &buf, &s, &len, &i))
         return NULL;
+    PyBuffer_Release(&buf);
     Py_RETURN_NONE;
 }
diff --git a/Python/getargs.c b/Python/getargs.c
index 92fc0aff322d2..d92ea2d8e6b46 100644
--- a/Python/getargs.c
+++ b/Python/getargs.c
@@ -2533,9 +2533,7 @@ skipitem(const char **p_format, va_list *p_va, int flags)
             if (*format == '#') {
                 if (p_va != NULL) {
                     if (!(flags & FLAG_SIZE_T)) {
-                        PyErr_SetString(PyExc_SystemError,
-                                "PY_SSIZE_T_CLEAN macro must be defined for '#' formats");
-                        return NULL;
+                        return "PY_SSIZE_T_CLEAN macro must be defined for '#' formats";
                     }
                     (void) va_arg(*p_va, Py_ssize_t *);
                 }


From webhook-mailer at python.org  Tue Jul 19 15:03:25 2022
From: webhook-mailer at python.org (miss-islington)
Date: Tue, 19 Jul 2022 19:03:25 -0000
Subject: [Python-checkins] gh-91256: Ensure help text has the program name
 even before getpath is called (GH-94929)
Message-ID: <mailman.115.1658257406.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/bb8e20a329f83cdeb74e5a6cc5a4079349ba2a87
commit: bb8e20a329f83cdeb74e5a6cc5a4079349ba2a87
branch: 3.11
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-19T12:03:15-07:00
summary:

gh-91256: Ensure help text has the program name even before getpath is called (GH-94929)

(cherry picked from commit 49aeff49d71fa4bd935212340410311f13879447)

Co-authored-by: Steve Dower <steve.dower at python.org>

files:
A Misc/NEWS.d/next/Core and Builtins/2022-07-17-15-54-29.gh-issue-91256.z7i7Q5.rst
M Python/initconfig.c

diff --git a/Misc/NEWS.d/next/Core and Builtins/2022-07-17-15-54-29.gh-issue-91256.z7i7Q5.rst b/Misc/NEWS.d/next/Core and Builtins/2022-07-17-15-54-29.gh-issue-91256.z7i7Q5.rst
new file mode 100644
index 0000000000000..802a614fd48d7
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2022-07-17-15-54-29.gh-issue-91256.z7i7Q5.rst	
@@ -0,0 +1 @@
+Ensures the program name is known for help text during interpreter startup.
diff --git a/Python/initconfig.c b/Python/initconfig.c
index 86dcdd9a8bd6b..d31385039932b 100644
--- a/Python/initconfig.c
+++ b/Python/initconfig.c
@@ -2295,6 +2295,9 @@ config_parse_cmdline(PyConfig *config, PyWideStringList *warnoptions,
     const PyWideStringList *argv = &config->argv;
     int print_version = 0;
     const wchar_t* program = config->program_name;
+    if (!program && argv->length >= 1) {
+        program = argv->items[0];
+    }
 
     _PyOS_ResetGetOpt();
     do {


From webhook-mailer at python.org  Tue Jul 19 17:04:30 2022
From: webhook-mailer at python.org (erlend-aasland)
Date: Tue, 19 Jul 2022 21:04:30 -0000
Subject: [Python-checkins] gh-93370: Don't print deprecated pysqlite version
 in test_sqlite3 (#95017)
Message-ID: <mailman.116.1658264671.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/be09bae608cae90e50dbf71b585b5ee386fdd952
commit: be09bae608cae90e50dbf71b585b5ee386fdd952
branch: main
author: Erlend Egeberg Aasland <erlend.aasland at protonmail.com>
committer: erlend-aasland <erlend.aasland at protonmail.com>
date: 2022-07-19T23:04:20+02:00
summary:

gh-93370: Don't print deprecated pysqlite version in test_sqlite3 (#95017)

files:
M Lib/test/test_sqlite3/__init__.py

diff --git a/Lib/test/test_sqlite3/__init__.py b/Lib/test/test_sqlite3/__init__.py
index c3cab8f0acdc0..d777fca82da4b 100644
--- a/Lib/test/test_sqlite3/__init__.py
+++ b/Lib/test/test_sqlite3/__init__.py
@@ -12,6 +12,4 @@ def load_tests(*args):
     return load_package_tests(pkg_dir, *args)
 
 if verbose:
-    print("test_sqlite3: testing with version",
-          "{!r}, sqlite_version {!r}".format(sqlite3.version,
-                                             sqlite3.sqlite_version))
+    print(f"test_sqlite3: testing with SQLite version {sqlite3.sqlite_version}")


From webhook-mailer at python.org  Wed Jul 20 01:42:11 2022
From: webhook-mailer at python.org (serhiy-storchaka)
Date: Wed, 20 Jul 2022 05:42:11 -0000
Subject: [Python-checkins] gh-95007: Remove the NoneType return converter
 (GH-95019)
Message-ID: <mailman.117.1658295733.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/74b5e4ce80858ac5c7d03411cb8cce7e6865f181
commit: 74b5e4ce80858ac5c7d03411cb8cce7e6865f181
branch: main
author: Serhiy Storchaka <storchaka at gmail.com>
committer: serhiy-storchaka <storchaka at gmail.com>
date: 2022-07-20T08:42:02+03:00
summary:

gh-95007: Remove the NoneType return converter (GH-95019)

It has confusing semantic which does not provide any benefit (the
only difference is that you should write "return Py_None" instead
of "Py_RETURN_NONE"), it is not currently used, and it is broken.

files:
M Tools/clinic/clinic.py

diff --git a/Tools/clinic/clinic.py b/Tools/clinic/clinic.py
index 0041363c46be2..36bfc7050507e 100755
--- a/Tools/clinic/clinic.py
+++ b/Tools/clinic/clinic.py
@@ -3826,17 +3826,6 @@ def render(self, function, data):
 
 add_c_return_converter(CReturnConverter, 'object')
 
-class NoneType_return_converter(CReturnConverter):
-    def render(self, function, data):
-        self.declare(data)
-        data.return_conversion.append('''
-if (_return_value != Py_None) {
-    goto exit;
-}
-return_value = Py_None;
-Py_INCREF(Py_None);
-'''.strip())
-
 class bool_return_converter(CReturnConverter):
     type = 'int'
 


From webhook-mailer at python.org  Wed Jul 20 01:48:39 2022
From: webhook-mailer at python.org (terryjreedy)
Date: Wed, 20 Jul 2022 05:48:39 -0000
Subject: [Python-checkins] Remove blurb boilerplate from news item (#95033)
Message-ID: <mailman.118.1658296120.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/88e4eeba25df999866b23448b95dce2769c2da86
commit: 88e4eeba25df999866b23448b95dce2769c2da86
branch: main
author: Terry Jan Reedy <tjreedy at udel.edu>
committer: terryjreedy <tjreedy at udel.edu>
date: 2022-07-20T01:48:35-04:00
summary:

Remove blurb boilerplate from news item (#95033)

files:
M Misc/NEWS.d/next/Tests/2022-07-05-17-53-13.gh-issue-91330.Qys5IL.rst

diff --git a/Misc/NEWS.d/next/Tests/2022-07-05-17-53-13.gh-issue-91330.Qys5IL.rst b/Misc/NEWS.d/next/Tests/2022-07-05-17-53-13.gh-issue-91330.Qys5IL.rst
index 315521102f4ec..6f44dcfd7e66a 100644
--- a/Misc/NEWS.d/next/Tests/2022-07-05-17-53-13.gh-issue-91330.Qys5IL.rst
+++ b/Misc/NEWS.d/next/Tests/2022-07-05-17-53-13.gh-issue-91330.Qys5IL.rst
@@ -1,7 +1,2 @@
 Added more tests for :mod:`dataclasses` to cover behavior with data
 descriptor-based fields.
-
-# Write your Misc/NEWS entry below.  It should be a simple ReST paragraph. #
-Don't start with "- Issue #<n>: " or "- gh-issue-<n>: " or that sort of
-stuff.
-###########################################################################


From webhook-mailer at python.org  Wed Jul 20 02:23:34 2022
From: webhook-mailer at python.org (terryjreedy)
Date: Wed, 20 Jul 2022 06:23:34 -0000
Subject: [Python-checkins] [3.11] Remove blurb boilerplate from news
 item(#95033) (#95036)
Message-ID: <mailman.119.1658298216.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/b3aec3ea58b6d8a492819666fe67164957f10dd9
commit: b3aec3ea58b6d8a492819666fe67164957f10dd9
branch: 3.11
author: Terry Jan Reedy <tjreedy at udel.edu>
committer: terryjreedy <tjreedy at udel.edu>
date: 2022-07-20T02:23:28-04:00
summary:

[3.11] Remove blurb boilerplate from news item(#95033) (#95036)

Cherry-picked from 88e4eeba25df999866b23448b95dce2769c2da86

files:
M Misc/NEWS.d/3.11.0b4.rst

diff --git a/Misc/NEWS.d/3.11.0b4.rst b/Misc/NEWS.d/3.11.0b4.rst
index 144a73222001c..8340b7686ff2b 100644
--- a/Misc/NEWS.d/3.11.0b4.rst
+++ b/Misc/NEWS.d/3.11.0b4.rst
@@ -840,11 +840,6 @@ slashes because they denote UNC paths.
 Added more tests for :mod:`dataclasses` to cover behavior with data
 descriptor-based fields.
 
-# Write your Misc/NEWS entry below.  It should be a simple ReST paragraph. #
-Don't start with "- Issue #<n>: " or "- gh-issue-<n>: " or that sort of
-stuff.
-###########################################################################
-
 ..
 
 .. date: 2022-06-27-21-27-20


From webhook-mailer at python.org  Wed Jul 20 02:23:35 2022
From: webhook-mailer at python.org (corona10)
Date: Wed, 20 Jul 2022 06:23:35 -0000
Subject: [Python-checkins] GH-90699: fix ref counting of static immortal
 strings (gh-94850)
Message-ID: <mailman.120.1658298216.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/1834133e66d95a143c9df5f068b3109927aefd65
commit: 1834133e66d95a143c9df5f068b3109927aefd65
branch: main
author: Kumar Aditya <59607654+kumaraditya303 at users.noreply.github.com>
committer: corona10 <donghee.na92 at gmail.com>
date: 2022-07-20T15:23:30+09:00
summary:

GH-90699: fix ref counting of static immortal strings (gh-94850)

files:
A Misc/NEWS.d/next/Core and Builtins/2022-07-14-10-07-53.gh-issue-90699.x3aG9m.rst
M Modules/_io/textio.c
M Objects/boolobject.c

diff --git a/Misc/NEWS.d/next/Core and Builtins/2022-07-14-10-07-53.gh-issue-90699.x3aG9m.rst b/Misc/NEWS.d/next/Core and Builtins/2022-07-14-10-07-53.gh-issue-90699.x3aG9m.rst
new file mode 100644
index 0000000000000..795f4df987eb9
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2022-07-14-10-07-53.gh-issue-90699.x3aG9m.rst	
@@ -0,0 +1 @@
+Fix reference counting bug in :meth:`bool.__repr__`. Patch by Kumar Aditya.
diff --git a/Modules/_io/textio.c b/Modules/_io/textio.c
index 89094d66f3834..3369694653fd9 100644
--- a/Modules/_io/textio.c
+++ b/Modules/_io/textio.c
@@ -2244,7 +2244,7 @@ _textiowrapper_readline(textio *self, Py_ssize_t limit)
         Py_CLEAR(chunks);
     }
     if (line == NULL) {
-        line = &_Py_STR(empty);
+        line = Py_NewRef(&_Py_STR(empty));
     }
 
     return line;
diff --git a/Objects/boolobject.c b/Objects/boolobject.c
index ff7218760ab36..8a20e368d4a42 100644
--- a/Objects/boolobject.c
+++ b/Objects/boolobject.c
@@ -9,7 +9,8 @@
 static PyObject *
 bool_repr(PyObject *self)
 {
-    return self == Py_True ? &_Py_ID(True) : &_Py_ID(False);
+    PyObject *res = self == Py_True ? &_Py_ID(True) : &_Py_ID(False);
+    return Py_NewRef(res);
 }
 
 /* Function to return a bool from a C long */


From webhook-mailer at python.org  Wed Jul 20 02:53:38 2022
From: webhook-mailer at python.org (tiran)
Date: Wed, 20 Jul 2022 06:53:38 -0000
Subject: [Python-checkins] gh-93939: Use new MODULE_name_STATE in
 wasm_assets script (GH-95035)
Message-ID: <mailman.121.1658300019.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/0f34c7e2d3163525813dbd644f30db58e6d36af2
commit: 0f34c7e2d3163525813dbd644f30db58e6d36af2
branch: main
author: Christian Heimes <christian at python.org>
committer: tiran <christian at python.org>
date: 2022-07-20T08:53:26+02:00
summary:

gh-93939: Use new MODULE_name_STATE in wasm_assets script (GH-95035)

files:
M Tools/wasm/wasm_assets.py

diff --git a/Tools/wasm/wasm_assets.py b/Tools/wasm/wasm_assets.py
index a59db9db7cdd2..07450ac928dcd 100755
--- a/Tools/wasm/wasm_assets.py
+++ b/Tools/wasm/wasm_assets.py
@@ -165,14 +165,13 @@ def detect_extension_modules(args: argparse.Namespace):
     loc = {}
     exec(data, globals(), loc)
 
-    for name, value in loc["build_time_vars"].items():
-        if value not in {"yes", "missing", "disabled", "n/a"}:
+    for key, value in loc["build_time_vars"].items():
+        if not key.startswith("MODULE_") or not key.endswith("_STATE"):
             continue
-        if not name.startswith("MODULE_"):
-            continue
-        if name.endswith(("_CFLAGS", "_DEPS", "_LDFLAGS")):
-            continue
-        modname = name.removeprefix("MODULE_").lower()
+        if value not in {"yes", "disabled", "missing", "n/a"}:
+            raise ValueError(f"Unsupported value '{value}' for {key}")
+
+        modname = key[7:-6].lower()
         if modname not in modules:
             modules[modname] = value == "yes"
     return modules


From webhook-mailer at python.org  Wed Jul 20 02:56:56 2022
From: webhook-mailer at python.org (miss-islington)
Date: Wed, 20 Jul 2022 06:56:56 -0000
Subject: [Python-checkins] GH-90699: fix ref counting of static immortal
 strings (gh-94850)
Message-ID: <mailman.122.1658300217.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/84d58ad17baec0dda8a5ffd8d925343391e45b3e
commit: 84d58ad17baec0dda8a5ffd8d925343391e45b3e
branch: 3.11
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-19T23:56:47-07:00
summary:

GH-90699: fix ref counting of static immortal strings (gh-94850)

(cherry picked from commit 1834133e66d95a143c9df5f068b3109927aefd65)

Co-authored-by: Kumar Aditya <59607654+kumaraditya303 at users.noreply.github.com>

files:
A Misc/NEWS.d/next/Core and Builtins/2022-07-14-10-07-53.gh-issue-90699.x3aG9m.rst
M Modules/_io/textio.c
M Objects/boolobject.c

diff --git a/Misc/NEWS.d/next/Core and Builtins/2022-07-14-10-07-53.gh-issue-90699.x3aG9m.rst b/Misc/NEWS.d/next/Core and Builtins/2022-07-14-10-07-53.gh-issue-90699.x3aG9m.rst
new file mode 100644
index 0000000000000..795f4df987eb9
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2022-07-14-10-07-53.gh-issue-90699.x3aG9m.rst	
@@ -0,0 +1 @@
+Fix reference counting bug in :meth:`bool.__repr__`. Patch by Kumar Aditya.
diff --git a/Modules/_io/textio.c b/Modules/_io/textio.c
index 89094d66f3834..3369694653fd9 100644
--- a/Modules/_io/textio.c
+++ b/Modules/_io/textio.c
@@ -2244,7 +2244,7 @@ _textiowrapper_readline(textio *self, Py_ssize_t limit)
         Py_CLEAR(chunks);
     }
     if (line == NULL) {
-        line = &_Py_STR(empty);
+        line = Py_NewRef(&_Py_STR(empty));
     }
 
     return line;
diff --git a/Objects/boolobject.c b/Objects/boolobject.c
index ff7218760ab36..8a20e368d4a42 100644
--- a/Objects/boolobject.c
+++ b/Objects/boolobject.c
@@ -9,7 +9,8 @@
 static PyObject *
 bool_repr(PyObject *self)
 {
-    return self == Py_True ? &_Py_ID(True) : &_Py_ID(False);
+    PyObject *res = self == Py_True ? &_Py_ID(True) : &_Py_ID(False);
+    return Py_NewRef(res);
 }
 
 /* Function to return a bool from a C long */


From webhook-mailer at python.org  Wed Jul 20 03:18:04 2022
From: webhook-mailer at python.org (miss-islington)
Date: Wed, 20 Jul 2022 07:18:04 -0000
Subject: [Python-checkins] gh-93939: Use new MODULE_name_STATE in
 wasm_assets script (GH-95035)
Message-ID: <mailman.123.1658301486.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/e98728ab4d4ab9e69ce05ae4da4031bbc80f457b
commit: e98728ab4d4ab9e69ce05ae4da4031bbc80f457b
branch: 3.11
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-20T00:17:52-07:00
summary:

gh-93939: Use new MODULE_name_STATE in wasm_assets script (GH-95035)

(cherry picked from commit 0f34c7e2d3163525813dbd644f30db58e6d36af2)

Co-authored-by: Christian Heimes <christian at python.org>

files:
M Tools/wasm/wasm_assets.py

diff --git a/Tools/wasm/wasm_assets.py b/Tools/wasm/wasm_assets.py
index b7e83517cae03..40acea2efaef2 100755
--- a/Tools/wasm/wasm_assets.py
+++ b/Tools/wasm/wasm_assets.py
@@ -175,14 +175,13 @@ def detect_extension_modules(args: argparse.Namespace):
     loc = {}
     exec(data, globals(), loc)
 
-    for name, value in loc["build_time_vars"].items():
-        if value not in {"yes", "missing", "disabled", "n/a"}:
+    for key, value in loc["build_time_vars"].items():
+        if not key.startswith("MODULE_") or not key.endswith("_STATE"):
             continue
-        if not name.startswith("MODULE_"):
-            continue
-        if name.endswith(("_CFLAGS", "_DEPS", "_LDFLAGS")):
-            continue
-        modname = name.removeprefix("MODULE_").lower()
+        if value not in {"yes", "disabled", "missing", "n/a"}:
+            raise ValueError(f"Unsupported value '{value}' for {key}")
+
+        modname = key[7:-6].lower()
         if modname not in modules:
             modules[modname] = value == "yes"
     return modules


From webhook-mailer at python.org  Wed Jul 20 03:18:15 2022
From: webhook-mailer at python.org (terryjreedy)
Date: Wed, 20 Jul 2022 07:18:15 -0000
Subject: [Python-checkins] gh-90654: Add item missing from idlelib/NEWS.txt
 (#95038)
Message-ID: <mailman.124.1658301496.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/acb105a7c1f435f93fee08e292ee12438f716abd
commit: acb105a7c1f435f93fee08e292ee12438f716abd
branch: main
author: Terry Jan Reedy <tjreedy at udel.edu>
committer: terryjreedy <tjreedy at udel.edu>
date: 2022-07-20T03:18:10-04:00
summary:

gh-90654: Add item missing from idlelib/NEWS.txt (#95038)

files:
M Lib/idlelib/NEWS.txt

diff --git a/Lib/idlelib/NEWS.txt b/Lib/idlelib/NEWS.txt
index 441ec41ed76b2..086b2060766cf 100644
--- a/Lib/idlelib/NEWS.txt
+++ b/Lib/idlelib/NEWS.txt
@@ -30,6 +30,8 @@ Released on 2021-10-04
 =========================
 
 
+bpo-45193: Make completion boxes appear on Ubuntu again.
+
 bpo-40128: Mostly fix completions on macOS when not using tcl/tk 8.6.11
 (as with 3.9).
 


From webhook-mailer at python.org  Wed Jul 20 03:42:48 2022
From: webhook-mailer at python.org (miss-islington)
Date: Wed, 20 Jul 2022 07:42:48 -0000
Subject: [Python-checkins] gh-90654: Add item missing from idlelib/NEWS.txt
 (GH-95038)
Message-ID: <mailman.125.1658302969.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/28478c7a0b3026f902e54cf3c1788d6fd36a7f9e
commit: 28478c7a0b3026f902e54cf3c1788d6fd36a7f9e
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-20T00:42:36-07:00
summary:

gh-90654: Add item missing from idlelib/NEWS.txt (GH-95038)

(cherry picked from commit acb105a7c1f435f93fee08e292ee12438f716abd)

Co-authored-by: Terry Jan Reedy <tjreedy at udel.edu>

files:
M Lib/idlelib/NEWS.txt

diff --git a/Lib/idlelib/NEWS.txt b/Lib/idlelib/NEWS.txt
index 424e971c8bb31..74404405aca9f 100644
--- a/Lib/idlelib/NEWS.txt
+++ b/Lib/idlelib/NEWS.txt
@@ -30,6 +30,8 @@ Released on 2021-10-04
 =========================
 
 
+bpo-45193: Make completion boxes appear on Ubuntu again.
+
 bpo-40128: Mostly fix completions on macOS when not using tcl/tk 8.6.11
 (as with 3.9).
 


From webhook-mailer at python.org  Wed Jul 20 03:43:32 2022
From: webhook-mailer at python.org (miss-islington)
Date: Wed, 20 Jul 2022 07:43:32 -0000
Subject: [Python-checkins] gh-90654: Add item missing from idlelib/NEWS.txt
 (GH-95038)
Message-ID: <mailman.126.1658303013.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/1093804b8855f95a27aabb4ed853f8138b82b261
commit: 1093804b8855f95a27aabb4ed853f8138b82b261
branch: 3.11
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-20T00:43:27-07:00
summary:

gh-90654: Add item missing from idlelib/NEWS.txt (GH-95038)

(cherry picked from commit acb105a7c1f435f93fee08e292ee12438f716abd)

Co-authored-by: Terry Jan Reedy <tjreedy at udel.edu>

files:
M Lib/idlelib/NEWS.txt

diff --git a/Lib/idlelib/NEWS.txt b/Lib/idlelib/NEWS.txt
index 441ec41ed76b2..086b2060766cf 100644
--- a/Lib/idlelib/NEWS.txt
+++ b/Lib/idlelib/NEWS.txt
@@ -30,6 +30,8 @@ Released on 2021-10-04
 =========================
 
 
+bpo-45193: Make completion boxes appear on Ubuntu again.
+
 bpo-40128: Mostly fix completions on macOS when not using tcl/tk 8.6.11
 (as with 3.9).
 


From webhook-mailer at python.org  Wed Jul 20 04:16:53 2022
From: webhook-mailer at python.org (terryjreedy)
Date: Wed, 20 Jul 2022 08:16:53 -0000
Subject: [Python-checkins] [3.10] gh-90654: Update maintenance NEWS header
 (#94355)
Message-ID: <mailman.127.1658305014.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/1c3b2fe0fa6bc5b3300edd0a8fb9facaeb61f5b1
commit: 1c3b2fe0fa6bc5b3300edd0a8fb9facaeb61f5b1
branch: 3.10
author: Terry Jan Reedy <tjreedy at udel.edu>
committer: terryjreedy <tjreedy at udel.edu>
date: 2022-07-20T04:16:42-04:00
summary:

[3.10] gh-90654: Update maintenance NEWS header (#94355)

files:
M Lib/idlelib/NEWS.txt

diff --git a/Lib/idlelib/NEWS.txt b/Lib/idlelib/NEWS.txt
index 74404405aca9f..dcfb1209ac736 100644
--- a/Lib/idlelib/NEWS.txt
+++ b/Lib/idlelib/NEWS.txt
@@ -1,6 +1,6 @@
 What's New in IDLE 3.10.z
-after 3.10.0 until 3.10.?
-Released on 2022-05-16
+after 3.10.0 until 3.10.10?
+Released 2023-04-03?
 =========================
 
 
@@ -29,7 +29,6 @@ What's New in IDLE 3.10.0
 Released on 2021-10-04
 =========================
 
-
 bpo-45193: Make completion boxes appear on Ubuntu again.
 
 bpo-40128: Mostly fix completions on macOS when not using tcl/tk 8.6.11


From webhook-mailer at python.org  Wed Jul 20 05:39:09 2022
From: webhook-mailer at python.org (terryjreedy)
Date: Wed, 20 Jul 2022 09:39:09 -0000
Subject: [Python-checkins] gh-90654: Remove unneeded blank line (#95044)
Message-ID: <mailman.128.1658309950.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/bd390ef825c5f2ad86e0966173a6bcaca85a56f2
commit: bd390ef825c5f2ad86e0966173a6bcaca85a56f2
branch: main
author: Terry Jan Reedy <tjreedy at udel.edu>
committer: terryjreedy <tjreedy at udel.edu>
date: 2022-07-20T05:38:56-04:00
summary:

gh-90654: Remove unneeded blank line (#95044)

files:
M Lib/idlelib/NEWS.txt

diff --git a/Lib/idlelib/NEWS.txt b/Lib/idlelib/NEWS.txt
index 086b2060766cf..05308a0b114af 100644
--- a/Lib/idlelib/NEWS.txt
+++ b/Lib/idlelib/NEWS.txt
@@ -29,7 +29,6 @@ What's New in IDLE 3.10.0
 Released on 2021-10-04
 =========================
 
-
 bpo-45193: Make completion boxes appear on Ubuntu again.
 
 bpo-40128: Mostly fix completions on macOS when not using tcl/tk 8.6.11


From webhook-mailer at python.org  Wed Jul 20 05:53:44 2022
From: webhook-mailer at python.org (corona10)
Date: Wed, 20 Jul 2022 09:53:44 -0000
Subject: [Python-checkins] GH-94851: fix immortal objects refcounting in
 compiler (gh-95040)
Message-ID: <mailman.129.1658310825.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/74761548862eb5a324c23d86a6233d884f386f2e
commit: 74761548862eb5a324c23d86a6233d884f386f2e
branch: main
author: Kumar Aditya <59607654+kumaraditya303 at users.noreply.github.com>
committer: corona10 <donghee.na92 at gmail.com>
date: 2022-07-20T18:53:27+09:00
summary:

GH-94851: fix immortal objects refcounting in compiler (gh-95040)

files:
M Python/compile.c

diff --git a/Python/compile.c b/Python/compile.c
index 30d8fdbb969ba..20eca059d30f1 100644
--- a/Python/compile.c
+++ b/Python/compile.c
@@ -4857,7 +4857,7 @@ compiler_joined_str(struct compiler *c, expr_ty e)
     Py_ssize_t value_count = asdl_seq_LEN(e->v.JoinedStr.values);
     if (value_count > STACK_USE_GUIDELINE) {
         _Py_DECLARE_STR(empty, "");
-        ADDOP_LOAD_CONST_NEW(c, &_Py_STR(empty));
+        ADDOP_LOAD_CONST_NEW(c, Py_NewRef(&_Py_STR(empty)));
         ADDOP_NAME(c, LOAD_METHOD, &_Py_ID(join), names);
         ADDOP_I(c, BUILD_LIST, 0);
         for (Py_ssize_t i = 0; i < asdl_seq_LEN(e->v.JoinedStr.values); i++) {


From webhook-mailer at python.org  Wed Jul 20 06:42:14 2022
From: webhook-mailer at python.org (miss-islington)
Date: Wed, 20 Jul 2022 10:42:14 -0000
Subject: [Python-checkins] GH-94851: fix immortal objects refcounting in
 compiler (gh-95040)
Message-ID: <mailman.130.1658313736.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/16cb8ca52e404ceadbbbad4c5af498e76feefa1c
commit: 16cb8ca52e404ceadbbbad4c5af498e76feefa1c
branch: 3.11
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-20T03:42:05-07:00
summary:

GH-94851: fix immortal objects refcounting in compiler (gh-95040)

(cherry picked from commit 74761548862eb5a324c23d86a6233d884f386f2e)

Co-authored-by: Kumar Aditya <59607654+kumaraditya303 at users.noreply.github.com>

files:
M Python/compile.c

diff --git a/Python/compile.c b/Python/compile.c
index 42f3730e220f5..3fe0930e7aebf 100644
--- a/Python/compile.c
+++ b/Python/compile.c
@@ -4912,7 +4912,7 @@ compiler_joined_str(struct compiler *c, expr_ty e)
     Py_ssize_t value_count = asdl_seq_LEN(e->v.JoinedStr.values);
     if (value_count > STACK_USE_GUIDELINE) {
         _Py_DECLARE_STR(empty, "");
-        ADDOP_LOAD_CONST_NEW(c, &_Py_STR(empty));
+        ADDOP_LOAD_CONST_NEW(c, Py_NewRef(&_Py_STR(empty)));
         ADDOP_NAME(c, LOAD_METHOD, &_Py_ID(join), names);
         ADDOP_I(c, BUILD_LIST, 0);
         for (Py_ssize_t i = 0; i < asdl_seq_LEN(e->v.JoinedStr.values); i++) {


From webhook-mailer at python.org  Wed Jul 20 11:55:18 2022
From: webhook-mailer at python.org (serhiy-storchaka)
Date: Wed, 20 Jul 2022 15:55:18 -0000
Subject: [Python-checkins] gh-94844: Add pathlib support to shutil archive
 management (GH-94846)
Message-ID: <mailman.131.1658332519.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/ed4441567ec480d1e4d8f982bd1f7347e4d03c42
commit: ed4441567ec480d1e4d8f982bd1f7347e4d03c42
branch: main
author: Oleg Iarygin <oleg at arhadthedev.net>
committer: serhiy-storchaka <storchaka at gmail.com>
date: 2022-07-20T18:55:12+03:00
summary:

gh-94844: Add pathlib support to shutil archive management (GH-94846)

Co-authored-by: Barney Gale <barney.gale at gmail.com>

files:
M Lib/shutil.py

diff --git a/Lib/shutil.py b/Lib/shutil.py
index f4128647861b8..b49437cd1f3e8 100644
--- a/Lib/shutil.py
+++ b/Lib/shutil.py
@@ -1118,6 +1118,8 @@ def make_archive(base_name, format, root_dir=None, base_dir=None, verbose=0,
     save_cwd = None
     if root_dir is not None:
         if support_root_dir:
+            # Support path-like base_name here for backwards-compatibility.
+            base_name = os.fspath(base_name)
             kwargs['root_dir'] = root_dir
         else:
             save_cwd = os.getcwd()


From webhook-mailer at python.org  Wed Jul 20 12:07:55 2022
From: webhook-mailer at python.org (erlend-aasland)
Date: Wed, 20 Jul 2022 16:07:55 -0000
Subject: [Python-checkins] gh-94998: Remove redundant condition in
 test_sqlite3/__main__.py (#95052)
Message-ID: <mailman.132.1658333276.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/9d09e7b0263c248659f3b4a2c597fca9ac4f8f91
commit: 9d09e7b0263c248659f3b4a2c597fca9ac4f8f91
branch: main
author: Erlend Egeberg Aasland <erlend.aasland at protonmail.com>
committer: erlend-aasland <erlend.aasland at protonmail.com>
date: 2022-07-20T18:07:47+02:00
summary:

gh-94998: Remove redundant condition in test_sqlite3/__main__.py (#95052)

files:
M Lib/test/test_sqlite3/__main__.py

diff --git a/Lib/test/test_sqlite3/__main__.py b/Lib/test/test_sqlite3/__main__.py
index 51eddc3c2fde0..ca6a8347fbd23 100644
--- a/Lib/test/test_sqlite3/__main__.py
+++ b/Lib/test/test_sqlite3/__main__.py
@@ -1,5 +1,4 @@
 from test.test_sqlite3 import load_tests  # Needed for the "load tests" protocol.
 import unittest
 
-if __name__ == "__main__":
-    unittest.main()
+unittest.main()


From webhook-mailer at python.org  Wed Jul 20 12:19:40 2022
From: webhook-mailer at python.org (miss-islington)
Date: Wed, 20 Jul 2022 16:19:40 -0000
Subject: [Python-checkins] gh-94844: Add pathlib support to shutil archive
 management (GH-94846)
Message-ID: <mailman.133.1658333980.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/6cc9489a3aa65fca2903bc162a93b9d572593a6c
commit: 6cc9489a3aa65fca2903bc162a93b9d572593a6c
branch: 3.11
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-20T09:19:35-07:00
summary:

gh-94844: Add pathlib support to shutil archive management (GH-94846)


Co-authored-by: Barney Gale <barney.gale at gmail.com>
(cherry picked from commit ed4441567ec480d1e4d8f982bd1f7347e4d03c42)

Co-authored-by: Oleg Iarygin <oleg at arhadthedev.net>

files:
M Lib/shutil.py

diff --git a/Lib/shutil.py b/Lib/shutil.py
index 27946de343002..6093e11374294 100644
--- a/Lib/shutil.py
+++ b/Lib/shutil.py
@@ -1117,6 +1117,8 @@ def make_archive(base_name, format, root_dir=None, base_dir=None, verbose=0,
     save_cwd = None
     if root_dir is not None:
         if support_root_dir:
+            # Support path-like base_name here for backwards-compatibility.
+            base_name = os.fspath(base_name)
             kwargs['root_dir'] = root_dir
         else:
             save_cwd = os.getcwd()


From webhook-mailer at python.org  Wed Jul 20 12:24:43 2022
From: webhook-mailer at python.org (miss-islington)
Date: Wed, 20 Jul 2022 16:24:43 -0000
Subject: [Python-checkins] gh-94844: Add pathlib support to shutil archive
 management (GH-94846)
Message-ID: <mailman.134.1658334284.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/cbe3ad51ed63e2e5afc408f0bbeb8bb0e9fb7f44
commit: cbe3ad51ed63e2e5afc408f0bbeb8bb0e9fb7f44
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-20T09:24:33-07:00
summary:

gh-94844: Add pathlib support to shutil archive management (GH-94846)


Co-authored-by: Barney Gale <barney.gale at gmail.com>
(cherry picked from commit ed4441567ec480d1e4d8f982bd1f7347e4d03c42)

Co-authored-by: Oleg Iarygin <oleg at arhadthedev.net>

files:
M Lib/shutil.py

diff --git a/Lib/shutil.py b/Lib/shutil.py
index 90dcaa7d7682a..0d278801b8a6c 100644
--- a/Lib/shutil.py
+++ b/Lib/shutil.py
@@ -1108,6 +1108,8 @@ def make_archive(base_name, format, root_dir=None, base_dir=None, verbose=0,
     save_cwd = None
     if root_dir is not None:
         if support_root_dir:
+            # Support path-like base_name here for backwards-compatibility.
+            base_name = os.fspath(base_name)
             kwargs['root_dir'] = root_dir
         else:
             save_cwd = os.getcwd()


From webhook-mailer at python.org  Wed Jul 20 13:02:07 2022
From: webhook-mailer at python.org (miss-islington)
Date: Wed, 20 Jul 2022 17:02:07 -0000
Subject: [Python-checkins] gh-94998: Remove redundant condition in
 test_sqlite3/__main__.py (GH-95052)
Message-ID: <mailman.135.1658336528.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/2ac10964239f1677b0da5fc40794da1f40c779c2
commit: 2ac10964239f1677b0da5fc40794da1f40c779c2
branch: 3.11
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-20T10:01:58-07:00
summary:

gh-94998: Remove redundant condition in test_sqlite3/__main__.py (GH-95052)

(cherry picked from commit 9d09e7b0263c248659f3b4a2c597fca9ac4f8f91)

Co-authored-by: Erlend Egeberg Aasland <erlend.aasland at protonmail.com>

files:
M Lib/test/test_sqlite3/__main__.py

diff --git a/Lib/test/test_sqlite3/__main__.py b/Lib/test/test_sqlite3/__main__.py
index 51eddc3c2fde0..ca6a8347fbd23 100644
--- a/Lib/test/test_sqlite3/__main__.py
+++ b/Lib/test/test_sqlite3/__main__.py
@@ -1,5 +1,4 @@
 from test.test_sqlite3 import load_tests  # Needed for the "load tests" protocol.
 import unittest
 
-if __name__ == "__main__":
-    unittest.main()
+unittest.main()


From webhook-mailer at python.org  Wed Jul 20 15:24:14 2022
From: webhook-mailer at python.org (erlend-aasland)
Date: Wed, 20 Jul 2022 19:24:14 -0000
Subject: [Python-checkins] gh-54781: Move NEWS item to Tests,
 and improve wording (#95063)
Message-ID: <mailman.136.1658345055.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/8ede67cdcf36d5f6988cb935a6f85a1e14196f78
commit: 8ede67cdcf36d5f6988cb935a6f85a1e14196f78
branch: main
author: Erlend Egeberg Aasland <erlend.aasland at protonmail.com>
committer: erlend-aasland <erlend.aasland at protonmail.com>
date: 2022-07-20T21:23:59+02:00
summary:

gh-54781: Move NEWS item to Tests, and improve wording (#95063)

files:
M Misc/NEWS.d/3.11.0a2.rst

diff --git a/Misc/NEWS.d/3.11.0a2.rst b/Misc/NEWS.d/3.11.0a2.rst
index 1f742a29ebcc9..8ae8847d846b1 100644
--- a/Misc/NEWS.d/3.11.0a2.rst
+++ b/Misc/NEWS.d/3.11.0a2.rst
@@ -702,16 +702,6 @@ details. Patch by Jochem Schulenklopper.
 
 ..
 
-.. bpo: 10572
-.. date: 2021-01-07-01-25-38
-.. nonce: gEEZ9z
-.. section: Library
-
-Move :mod:`sqlite3` tests to ``/Lib/test/test_sqlite3``. Patch by Erlend E.
-Aasland.
-
-..
-
 .. bpo: 41374
 .. date: 2020-07-27-19-21-05
 .. nonce: cd-kFL
@@ -956,6 +946,16 @@ use a stricter regular expression. Patch by Victor Stinner.
 
 ..
 
+.. bpo: 10572
+.. date: 2021-01-07-01-25-38
+.. nonce: gEEZ9z
+.. section: Tests
+
+Rename :mod:`sqlite3` tests from ``test_sqlite`` to ``test_sqlite3``, and
+relocate them to ``Lib/test/test_sqlite3``. Patch by Erlend E. Aasland.
+
+..
+
 .. bpo: 43158
 .. date: 2021-11-01-12-51-46
 .. nonce: fghS6w


From webhook-mailer at python.org  Wed Jul 20 15:26:06 2022
From: webhook-mailer at python.org (erlend-aasland)
Date: Wed, 20 Jul 2022 19:26:06 -0000
Subject: [Python-checkins] GH-94382: port multiprocessing static types to
 heap types (#94336)
Message-ID: <mailman.137.1658345167.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/000a4eebe735b6aa527516cf70f5290c2b5163bf
commit: 000a4eebe735b6aa527516cf70f5290c2b5163bf
branch: main
author: Kumar Aditya <59607654+kumaraditya303 at users.noreply.github.com>
committer: erlend-aasland <erlend.aasland at protonmail.com>
date: 2022-07-20T21:26:01+02:00
summary:

GH-94382: port multiprocessing static types to heap types (#94336)

files:
A Misc/NEWS.d/next/Library/2022-07-03-16-41-03.gh-issue-94382.zuVZeM.rst
M Modules/_multiprocessing/multiprocessing.c
M Modules/_multiprocessing/multiprocessing.h
M Modules/_multiprocessing/semaphore.c

diff --git a/Misc/NEWS.d/next/Library/2022-07-03-16-41-03.gh-issue-94382.zuVZeM.rst b/Misc/NEWS.d/next/Library/2022-07-03-16-41-03.gh-issue-94382.zuVZeM.rst
new file mode 100644
index 0000000000000..d79300778f762
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2022-07-03-16-41-03.gh-issue-94382.zuVZeM.rst
@@ -0,0 +1 @@
+Port static types of ``_multiprocessing`` module to heap types. Patch by Kumar Aditya.
diff --git a/Modules/_multiprocessing/multiprocessing.c b/Modules/_multiprocessing/multiprocessing.c
index ed89a1e29a433..2463e1e1a8bf7 100644
--- a/Modules/_multiprocessing/multiprocessing.c
+++ b/Modules/_multiprocessing/multiprocessing.c
@@ -196,33 +196,39 @@ multiprocessing_exec(PyObject *module)
 {
 #ifdef HAVE_MP_SEMAPHORE
 
-    /* Add _PyMp_SemLock type to module */
-    if (PyModule_AddType(module, &_PyMp_SemLockType) < 0) {
+    PyTypeObject *semlock_type = (PyTypeObject *)PyType_FromModuleAndSpec(
+                module, &_PyMp_SemLockType_spec, NULL);
+
+    if (semlock_type == NULL) {
+        return -1;
+    }
+    int rc = PyModule_AddType(module, semlock_type);
+    Py_DECREF(semlock_type);
+    if (rc < 0) {
         return -1;
     }
 
-    {
-        PyObject *py_sem_value_max;
-        /* Some systems define SEM_VALUE_MAX as an unsigned value that
-         * causes it to be negative when used as an int (NetBSD).
-         *
-         * Issue #28152: Use (0) instead of 0 to fix a warning on dead code
-         * when using clang -Wunreachable-code. */
-        if ((int)(SEM_VALUE_MAX) < (0))
-            py_sem_value_max = PyLong_FromLong(INT_MAX);
-        else
-            py_sem_value_max = PyLong_FromLong(SEM_VALUE_MAX);
-
-        if (py_sem_value_max == NULL) {
-            return -1;
-        }
-        if (PyDict_SetItemString(_PyMp_SemLockType.tp_dict, "SEM_VALUE_MAX",
-                             py_sem_value_max) < 0) {
-            Py_DECREF(py_sem_value_max);
-            return -1;
-        }
+    PyObject *py_sem_value_max;
+    /* Some systems define SEM_VALUE_MAX as an unsigned value that
+     * causes it to be negative when used as an int (NetBSD).
+     *
+     * Issue #28152: Use (0) instead of 0 to fix a warning on dead code
+     * when using clang -Wunreachable-code. */
+    if ((int)(SEM_VALUE_MAX) < (0)) {
+        py_sem_value_max = PyLong_FromLong(INT_MAX);
+    }
+    else {
+        py_sem_value_max = PyLong_FromLong(SEM_VALUE_MAX);
+    }
+    if (py_sem_value_max == NULL) {
+        return -1;
+    }
+    if (PyDict_SetItemString(semlock_type->tp_dict, "SEM_VALUE_MAX",
+                         py_sem_value_max) < 0) {
         Py_DECREF(py_sem_value_max);
+        return -1;
     }
+    Py_DECREF(py_sem_value_max);
 
 #endif
 
@@ -276,6 +282,7 @@ static PyModuleDef_Slot multiprocessing_slots[] = {
 static struct PyModuleDef multiprocessing_module = {
     PyModuleDef_HEAD_INIT,
     .m_name = "_multiprocessing",
+    .m_size = 0,
     .m_methods = module_methods,
     .m_slots = multiprocessing_slots,
 };
diff --git a/Modules/_multiprocessing/multiprocessing.h b/Modules/_multiprocessing/multiprocessing.h
index 3a8314b1db833..b595e5a8dd18d 100644
--- a/Modules/_multiprocessing/multiprocessing.h
+++ b/Modules/_multiprocessing/multiprocessing.h
@@ -89,7 +89,7 @@ PyObject *_PyMp_SetError(PyObject *Type, int num);
  * Externs - not all will really exist on all platforms
  */
 
-extern PyTypeObject _PyMp_SemLockType;
+extern PyType_Spec _PyMp_SemLockType_spec;
 extern PyObject *_PyMp_sem_unlink(const char *name);
 
 #endif /* MULTIPROCESSING_H */
diff --git a/Modules/_multiprocessing/semaphore.c b/Modules/_multiprocessing/semaphore.c
index f5fd3257f066a..58fb0eb96aeee 100644
--- a/Modules/_multiprocessing/semaphore.c
+++ b/Modules/_multiprocessing/semaphore.c
@@ -568,10 +568,13 @@ _multiprocessing_SemLock__rebuild_impl(PyTypeObject *type, SEM_HANDLE handle,
 static void
 semlock_dealloc(SemLockObject* self)
 {
+    PyTypeObject *tp = Py_TYPE(self);
+    PyObject_GC_UnTrack(self);
     if (self->handle != SEM_FAILED)
         SEM_CLOSE(self->handle);
     PyMem_Free(self->name);
-    Py_TYPE(self)->tp_free((PyObject*)self);
+    tp->tp_free(self);
+    Py_DECREF(tp);
 }
 
 /*[clinic input]
@@ -701,6 +704,13 @@ _multiprocessing_SemLock___exit___impl(SemLockObject *self,
     return _multiprocessing_SemLock_release_impl(self);
 }
 
+static int
+semlock_traverse(SemLockObject *s, visitproc visit, void *arg)
+{
+    Py_VISIT(Py_TYPE(s));
+    return 0;
+}
+
 /*
  * Semaphore methods
  */
@@ -739,45 +749,26 @@ static PyMemberDef semlock_members[] = {
  * Semaphore type
  */
 
-PyTypeObject _PyMp_SemLockType = {
-    PyVarObject_HEAD_INIT(NULL, 0)
-    /* tp_name           */ "_multiprocessing.SemLock",
-    /* tp_basicsize      */ sizeof(SemLockObject),
-    /* tp_itemsize       */ 0,
-    /* tp_dealloc        */ (destructor)semlock_dealloc,
-    /* tp_vectorcall_offset */ 0,
-    /* tp_getattr        */ 0,
-    /* tp_setattr        */ 0,
-    /* tp_as_async       */ 0,
-    /* tp_repr           */ 0,
-    /* tp_as_number      */ 0,
-    /* tp_as_sequence    */ 0,
-    /* tp_as_mapping     */ 0,
-    /* tp_hash           */ 0,
-    /* tp_call           */ 0,
-    /* tp_str            */ 0,
-    /* tp_getattro       */ 0,
-    /* tp_setattro       */ 0,
-    /* tp_as_buffer      */ 0,
-    /* tp_flags          */ Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE,
-    /* tp_doc            */ "Semaphore/Mutex type",
-    /* tp_traverse       */ 0,
-    /* tp_clear          */ 0,
-    /* tp_richcompare    */ 0,
-    /* tp_weaklistoffset */ 0,
-    /* tp_iter           */ 0,
-    /* tp_iternext       */ 0,
-    /* tp_methods        */ semlock_methods,
-    /* tp_members        */ semlock_members,
-    /* tp_getset         */ 0,
-    /* tp_base           */ 0,
-    /* tp_dict           */ 0,
-    /* tp_descr_get      */ 0,
-    /* tp_descr_set      */ 0,
-    /* tp_dictoffset     */ 0,
-    /* tp_init           */ 0,
-    /* tp_alloc          */ 0,
-    /* tp_new            */ _multiprocessing_SemLock,
+static PyType_Slot _PyMp_SemLockType_slots[] = {
+    {Py_tp_dealloc, semlock_dealloc},
+    {Py_tp_getattro, PyObject_GenericGetAttr},
+    {Py_tp_setattro, PyObject_GenericSetAttr},
+    {Py_tp_methods, semlock_methods},
+    {Py_tp_members, semlock_members},
+    {Py_tp_alloc, PyType_GenericAlloc},
+    {Py_tp_new, _multiprocessing_SemLock},
+    {Py_tp_traverse, semlock_traverse},
+    {Py_tp_free, PyObject_GC_Del},
+    {Py_tp_doc, (void *)PyDoc_STR("Semaphore/Mutex type")},
+    {0, 0},
+};
+
+PyType_Spec _PyMp_SemLockType_spec = {
+    .name = "_multiprocessing.SemLock",
+    .basicsize = sizeof(SemLockObject),
+    .flags = (Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE |
+              Py_TPFLAGS_HAVE_GC | Py_TPFLAGS_IMMUTABLETYPE),
+    .slots = _PyMp_SemLockType_slots,
 };
 
 /*


From webhook-mailer at python.org  Wed Jul 20 15:33:51 2022
From: webhook-mailer at python.org (miss-islington)
Date: Wed, 20 Jul 2022 19:33:51 -0000
Subject: [Python-checkins] gh-54781: Move NEWS item to Tests,
 and improve wording (GH-95063)
Message-ID: <mailman.138.1658345632.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/6515738c0e6b2ff3ed5ce40fb0d61632648efbe3
commit: 6515738c0e6b2ff3ed5ce40fb0d61632648efbe3
branch: 3.11
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-20T12:33:38-07:00
summary:

gh-54781: Move NEWS item to Tests, and improve wording (GH-95063)

(cherry picked from commit 8ede67cdcf36d5f6988cb935a6f85a1e14196f78)

Co-authored-by: Erlend Egeberg Aasland <erlend.aasland at protonmail.com>

files:
M Misc/NEWS.d/3.11.0a2.rst

diff --git a/Misc/NEWS.d/3.11.0a2.rst b/Misc/NEWS.d/3.11.0a2.rst
index 1f742a29ebcc9..8ae8847d846b1 100644
--- a/Misc/NEWS.d/3.11.0a2.rst
+++ b/Misc/NEWS.d/3.11.0a2.rst
@@ -702,16 +702,6 @@ details. Patch by Jochem Schulenklopper.
 
 ..
 
-.. bpo: 10572
-.. date: 2021-01-07-01-25-38
-.. nonce: gEEZ9z
-.. section: Library
-
-Move :mod:`sqlite3` tests to ``/Lib/test/test_sqlite3``. Patch by Erlend E.
-Aasland.
-
-..
-
 .. bpo: 41374
 .. date: 2020-07-27-19-21-05
 .. nonce: cd-kFL
@@ -956,6 +946,16 @@ use a stricter regular expression. Patch by Victor Stinner.
 
 ..
 
+.. bpo: 10572
+.. date: 2021-01-07-01-25-38
+.. nonce: gEEZ9z
+.. section: Tests
+
+Rename :mod:`sqlite3` tests from ``test_sqlite`` to ``test_sqlite3``, and
+relocate them to ``Lib/test/test_sqlite3``. Patch by Erlend E. Aasland.
+
+..
+
 .. bpo: 43158
 .. date: 2021-11-01-12-51-46
 .. nonce: fghS6w


From webhook-mailer at python.org  Wed Jul 20 15:38:11 2022
From: webhook-mailer at python.org (erlend-aasland)
Date: Wed, 20 Jul 2022 19:38:11 -0000
Subject: [Python-checkins] gh-90016: Deprecate default sqlite3 adapters and
 converters (#94276)
Message-ID: <mailman.139.1658345892.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/6dadf6ca019f2e19ca8f0344903be0c539263c30
commit: 6dadf6ca019f2e19ca8f0344903be0c539263c30
branch: main
author: Erlend Egeberg Aasland <erlend.aasland at protonmail.com>
committer: erlend-aasland <erlend.aasland at protonmail.com>
date: 2022-07-20T21:37:59+02:00
summary:

gh-90016: Deprecate default sqlite3 adapters and converters (#94276)

Co-authored-by: CAM Gerlach <CAM.Gerlach at Gerlach.CAM>

files:
A Misc/NEWS.d/next/Library/2022-06-25-23-44-44.gh-issue-90016.EB409s.rst
D Doc/includes/sqlite3/pysqlite_datetime.py
M Doc/library/sqlite3.rst
M Doc/whatsnew/3.12.rst
M Lib/sqlite3/dbapi2.py
M Lib/test/test_sqlite3/test_regression.py
M Lib/test/test_sqlite3/test_types.py

diff --git a/Doc/includes/sqlite3/pysqlite_datetime.py b/Doc/includes/sqlite3/pysqlite_datetime.py
deleted file mode 100644
index 5d843f906b306..0000000000000
--- a/Doc/includes/sqlite3/pysqlite_datetime.py
+++ /dev/null
@@ -1,22 +0,0 @@
-import sqlite3
-import datetime
-
-con = sqlite3.connect(":memory:", detect_types=sqlite3.PARSE_DECLTYPES|sqlite3.PARSE_COLNAMES)
-cur = con.cursor()
-cur.execute("create table test(d date, ts timestamp)")
-
-today = datetime.date.today()
-now = datetime.datetime.now()
-
-cur.execute("insert into test(d, ts) values (?, ?)", (today, now))
-cur.execute("select d, ts from test")
-row = cur.fetchone()
-print(today, "=>", row[0], type(row[0]))
-print(now, "=>", row[1], type(row[1]))
-
-cur.execute('select current_date as "d [date]", current_timestamp as "ts [timestamp]"')
-row = cur.fetchone()
-print("current_date", row[0], type(row[0]))
-print("current_timestamp", row[1], type(row[1]))
-
-con.close()
diff --git a/Doc/library/sqlite3.rst b/Doc/library/sqlite3.rst
index d2997dc925178..a7581f2fcbd8c 100644
--- a/Doc/library/sqlite3.rst
+++ b/Doc/library/sqlite3.rst
@@ -1333,6 +1333,8 @@ This function can then be registered using :func:`register_adapter`.
 .. literalinclude:: ../includes/sqlite3/adapter_point_2.py
 
 
+.. _sqlite3-converters:
+
 Converting SQLite values to custom Python types
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
@@ -1373,27 +1375,28 @@ The following example illustrates the implicit and explicit approaches:
 .. literalinclude:: ../includes/sqlite3/converter_point.py
 
 
-Default adapters and converters
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-There are default adapters for the date and datetime types in the datetime
-module. They will be sent as ISO dates/ISO timestamps to SQLite.
+.. _sqlite3-default-converters:
 
-The default converters are registered under the name "date" for
-:class:`datetime.date` and under the name "timestamp" for
-:class:`datetime.datetime`.
+Default adapters and converters (deprecated)
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-This way, you can use date/timestamps from Python without any additional
-fiddling in most cases. The format of the adapters is also compatible with the
-experimental SQLite date/time functions.
+.. note::
 
-The following example demonstrates this.
+   The default adapters and converters are deprecated as of Python 3.12.
+   Instead, use the :ref:`sqlite3-adapter-converter-recipes`
+   and tailor them to your needs.
 
-.. literalinclude:: ../includes/sqlite3/pysqlite_datetime.py
+The deprecated default adapters and converters consist of:
 
-If a timestamp stored in SQLite has a fractional part longer than 6
-numbers, its value will be truncated to microsecond precision by the
-timestamp converter.
+* An adapter for :class:`datetime.date` objects to :class:`strings <str>` in
+  `ISO 8601`_ format.
+* An adapter for :class:`datetime.datetime` objects to strings in
+  ISO 8601 format.
+* A converter for :ref:`declared <sqlite3-converters>` "date" types to
+  :class:`datetime.date` objects.
+* A converter for declared "timestamp" types to
+  :class:`datetime.datetime` objects.
+  Fractional parts will be truncated to 6 digits (microsecond precision).
 
 .. note::
 
@@ -1402,6 +1405,10 @@ timestamp converter.
    offsets in timestamps, either leave converters disabled, or register an
    offset-aware converter with :func:`register_converter`.
 
+.. deprecated:: 3.12
+
+.. _ISO 8601: https://en.wikipedia.org/wiki/ISO_8601
+
 
 .. _sqlite3-adapter-converter-recipes:
 
diff --git a/Doc/whatsnew/3.12.rst b/Doc/whatsnew/3.12.rst
index 942196c03fd92..15282a755c8ac 100644
--- a/Doc/whatsnew/3.12.rst
+++ b/Doc/whatsnew/3.12.rst
@@ -135,6 +135,12 @@ Deprecated
 * :class:`typing.Hashable` and :class:`typing.Sized` aliases for :class:`collections.abc.Hashable`
   and :class:`collections.abc.Sized`. (:gh:`94309`)
 
+* The :mod:`sqlite3` :ref:`default adapters and converters
+  <sqlite3-default-converters>` are now deprecated.
+  Instead, use the :ref:`sqlite3-adapter-converter-recipes`
+  and tailor them to your needs.
+  (Contributed by Erlend E. Aasland in :gh:`90016`.)
+
 
 Pending Removal in Python 3.13
 ------------------------------
diff --git a/Lib/sqlite3/dbapi2.py b/Lib/sqlite3/dbapi2.py
index 3b6d2f7ba2d59..56fc0461e6c92 100644
--- a/Lib/sqlite3/dbapi2.py
+++ b/Lib/sqlite3/dbapi2.py
@@ -55,16 +55,25 @@ def TimestampFromTicks(ticks):
 collections.abc.Sequence.register(Row)
 
 def register_adapters_and_converters():
+    from warnings import warn
+
+    msg = ("The default {what} is deprecated as of Python 3.12; "
+           "see the sqlite3 documentation for suggested replacement recipes")
+
     def adapt_date(val):
+        warn(msg.format(what="date adapter"), DeprecationWarning, stacklevel=2)
         return val.isoformat()
 
     def adapt_datetime(val):
+        warn(msg.format(what="datetime adapter"), DeprecationWarning, stacklevel=2)
         return val.isoformat(" ")
 
     def convert_date(val):
+        warn(msg.format(what="date converter"), DeprecationWarning, stacklevel=2)
         return datetime.date(*map(int, val.split(b"-")))
 
     def convert_timestamp(val):
+        warn(msg.format(what="timestamp converter"), DeprecationWarning, stacklevel=2)
         datepart, timepart = val.split(b" ")
         year, month, day = map(int, datepart.split(b"-"))
         timepart_full = timepart.split(b".")
diff --git a/Lib/test/test_sqlite3/test_regression.py b/Lib/test/test_sqlite3/test_regression.py
index 0b727cecb0e8c..ad83a97c8c40d 100644
--- a/Lib/test/test_sqlite3/test_regression.py
+++ b/Lib/test/test_sqlite3/test_regression.py
@@ -129,7 +129,8 @@ def test_type_map_usage(self):
         con = sqlite.connect(":memory:",detect_types=sqlite.PARSE_DECLTYPES)
         cur = con.cursor()
         cur.execute("create table foo(bar timestamp)")
-        cur.execute("insert into foo(bar) values (?)", (datetime.datetime.now(),))
+        with self.assertWarnsRegex(DeprecationWarning, "adapter"):
+            cur.execute("insert into foo(bar) values (?)", (datetime.datetime.now(),))
         cur.execute(SELECT)
         cur.execute("drop table foo")
         cur.execute("create table foo(bar integer)")
@@ -305,7 +306,8 @@ def test_convert_timestamp_microsecond_padding(self):
         cur.execute("INSERT INTO t (x) VALUES ('2012-04-04 15:06:00.123456789')")
 
         cur.execute("SELECT * FROM t")
-        values = [x[0] for x in cur.fetchall()]
+        with self.assertWarnsRegex(DeprecationWarning, "converter"):
+            values = [x[0] for x in cur.fetchall()]
 
         self.assertEqual(values, [
             datetime.datetime(2012, 4, 4, 15, 6, 0, 456000),
diff --git a/Lib/test/test_sqlite3/test_types.py b/Lib/test/test_sqlite3/test_types.py
index 177cd10235039..62318823510d4 100644
--- a/Lib/test/test_sqlite3/test_types.py
+++ b/Lib/test/test_sqlite3/test_types.py
@@ -496,38 +496,51 @@ def tearDown(self):
 
     def test_sqlite_date(self):
         d = sqlite.Date(2004, 2, 14)
-        self.cur.execute("insert into test(d) values (?)", (d,))
+        with self.assertWarnsRegex(DeprecationWarning, "adapter") as cm:
+            self.cur.execute("insert into test(d) values (?)", (d,))
+        self.assertEqual(cm.filename, __file__)
         self.cur.execute("select d from test")
-        d2 = self.cur.fetchone()[0]
+        with self.assertWarnsRegex(DeprecationWarning, "converter") as cm:
+            d2 = self.cur.fetchone()[0]
+        self.assertEqual(cm.filename, __file__)
         self.assertEqual(d, d2)
 
     def test_sqlite_timestamp(self):
         ts = sqlite.Timestamp(2004, 2, 14, 7, 15, 0)
-        self.cur.execute("insert into test(ts) values (?)", (ts,))
+        with self.assertWarnsRegex(DeprecationWarning, "adapter") as cm:
+            self.cur.execute("insert into test(ts) values (?)", (ts,))
+        self.assertEqual(cm.filename, __file__)
         self.cur.execute("select ts from test")
-        ts2 = self.cur.fetchone()[0]
+        with self.assertWarnsRegex(DeprecationWarning, "converter") as cm:
+            ts2 = self.cur.fetchone()[0]
+        self.assertEqual(cm.filename, __file__)
         self.assertEqual(ts, ts2)
 
     def test_sql_timestamp(self):
         now = datetime.datetime.utcnow()
         self.cur.execute("insert into test(ts) values (current_timestamp)")
         self.cur.execute("select ts from test")
-        ts = self.cur.fetchone()[0]
+        with self.assertWarnsRegex(DeprecationWarning, "converter"):
+            ts = self.cur.fetchone()[0]
         self.assertEqual(type(ts), datetime.datetime)
         self.assertEqual(ts.year, now.year)
 
     def test_date_time_sub_seconds(self):
         ts = sqlite.Timestamp(2004, 2, 14, 7, 15, 0, 500000)
-        self.cur.execute("insert into test(ts) values (?)", (ts,))
+        with self.assertWarnsRegex(DeprecationWarning, "adapter"):
+            self.cur.execute("insert into test(ts) values (?)", (ts,))
         self.cur.execute("select ts from test")
-        ts2 = self.cur.fetchone()[0]
+        with self.assertWarnsRegex(DeprecationWarning, "converter"):
+            ts2 = self.cur.fetchone()[0]
         self.assertEqual(ts, ts2)
 
     def test_date_time_sub_seconds_floating_point(self):
         ts = sqlite.Timestamp(2004, 2, 14, 7, 15, 0, 510241)
-        self.cur.execute("insert into test(ts) values (?)", (ts,))
+        with self.assertWarnsRegex(DeprecationWarning, "adapter"):
+            self.cur.execute("insert into test(ts) values (?)", (ts,))
         self.cur.execute("select ts from test")
-        ts2 = self.cur.fetchone()[0]
+        with self.assertWarnsRegex(DeprecationWarning, "converter"):
+            ts2 = self.cur.fetchone()[0]
         self.assertEqual(ts, ts2)
 
 
diff --git a/Misc/NEWS.d/next/Library/2022-06-25-23-44-44.gh-issue-90016.EB409s.rst b/Misc/NEWS.d/next/Library/2022-06-25-23-44-44.gh-issue-90016.EB409s.rst
new file mode 100644
index 0000000000000..040ba44be2b91
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2022-06-25-23-44-44.gh-issue-90016.EB409s.rst
@@ -0,0 +1,2 @@
+Deprecate :mod:`sqlite3` :ref:`default adapters and converters
+<sqlite3-default-converters>`. Patch by Erlend E. Aasland.


From webhook-mailer at python.org  Wed Jul 20 16:25:02 2022
From: webhook-mailer at python.org (erlend-aasland)
Date: Wed, 20 Jul 2022 20:25:02 -0000
Subject: [Python-checkins] gh-91102: Port 8-argument _warnings.warn_explicit
 to Argument Clinic (#92891)
Message-ID: <mailman.140.1658348703.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/41e0585ffabfcd227718a247a02285ea590ed51e
commit: 41e0585ffabfcd227718a247a02285ea590ed51e
branch: main
author: Oleg Iarygin <oleg at arhadthedev.net>
committer: erlend-aasland <erlend.aasland at protonmail.com>
date: 2022-07-20T22:24:51+02:00
summary:

gh-91102: Port 8-argument _warnings.warn_explicit to Argument Clinic (#92891)

Co-authored-by: Erlend E. Aasland <erlend.aasland at protonmail.com>

files:
A Misc/NEWS.d/next/Core and Builtins/2022-05-11-09-16-54.gh-issue-91102.lenv9h.rst
M Python/_warnings.c
M Python/clinic/_warnings.c.h

diff --git a/Misc/NEWS.d/next/Core and Builtins/2022-05-11-09-16-54.gh-issue-91102.lenv9h.rst b/Misc/NEWS.d/next/Core and Builtins/2022-05-11-09-16-54.gh-issue-91102.lenv9h.rst
new file mode 100644
index 0000000000000..b2bdf9d5322f3
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2022-05-11-09-16-54.gh-issue-91102.lenv9h.rst	
@@ -0,0 +1 @@
+:meth:`_warnings.warn_explicit` is ported to Argument Clinic.
diff --git a/Python/_warnings.c b/Python/_warnings.c
index 601dae8fb4655..1b9e107ea30b1 100644
--- a/Python/_warnings.c
+++ b/Python/_warnings.c
@@ -1030,28 +1030,31 @@ get_source_line(PyInterpreterState *interp, PyObject *module_globals, int lineno
     return source_line;
 }
 
+/*[clinic input]
+warn_explicit as warnings_warn_explicit
+
+    message: object
+    category: object
+    filename: unicode
+    lineno: int
+    module as mod: object = NULL
+    registry: object = None
+    module_globals: object = None
+    source as sourceobj: object = None
+
+Issue a warning, or maybe ignore it or raise an exception.
+[clinic start generated code]*/
+
 static PyObject *
-warnings_warn_explicit(PyObject *self, PyObject *args, PyObject *kwds)
+warnings_warn_explicit_impl(PyObject *module, PyObject *message,
+                            PyObject *category, PyObject *filename,
+                            int lineno, PyObject *mod, PyObject *registry,
+                            PyObject *module_globals, PyObject *sourceobj)
+/*[clinic end generated code: output=c49c62b15a49a186 input=df6eeb8b45e712f1]*/
 {
-    static char *kwd_list[] = {"message", "category", "filename", "lineno",
-                                "module", "registry", "module_globals",
-                                "source", 0};
-    PyObject *message;
-    PyObject *category;
-    PyObject *filename;
-    int lineno;
-    PyObject *module = NULL;
-    PyObject *registry = NULL;
-    PyObject *module_globals = NULL;
-    PyObject *sourceobj = NULL;
     PyObject *source_line = NULL;
     PyObject *returned;
 
-    if (!PyArg_ParseTupleAndKeywords(args, kwds, "OOUi|OOOO:warn_explicit",
-                kwd_list, &message, &category, &filename, &lineno, &module,
-                &registry, &module_globals, &sourceobj))
-        return NULL;
-
     PyThreadState *tstate = get_current_tstate();
     if (tstate == NULL) {
         return NULL;
@@ -1070,8 +1073,8 @@ warnings_warn_explicit(PyObject *self, PyObject *args, PyObject *kwds)
             return NULL;
         }
     }
-    returned = warn_explicit(tstate, category, message, filename, lineno, module,
-                             registry, source_line, sourceobj);
+    returned = warn_explicit(tstate, category, message, filename, lineno,
+                             mod, registry, source_line, sourceobj);
     Py_XDECREF(source_line);
     return returned;
 }
@@ -1331,13 +1334,9 @@ _PyErr_WarnUnawaitedCoroutine(PyObject *coro)
     }
 }
 
-PyDoc_STRVAR(warn_explicit_doc,
-"Low-level interface to warnings functionality.");
-
 static PyMethodDef warnings_functions[] = {
     WARNINGS_WARN_METHODDEF
-    {"warn_explicit", _PyCFunction_CAST(warnings_warn_explicit),
-        METH_VARARGS | METH_KEYWORDS, warn_explicit_doc},
+    WARNINGS_WARN_EXPLICIT_METHODDEF
     {"_filters_mutated", _PyCFunction_CAST(warnings_filters_mutated), METH_NOARGS,
         NULL},
     /* XXX(brett.cannon): add showwarning? */
diff --git a/Python/clinic/_warnings.c.h b/Python/clinic/_warnings.c.h
index aa85c2a0d4d92..926fb32e7c261 100644
--- a/Python/clinic/_warnings.c.h
+++ b/Python/clinic/_warnings.c.h
@@ -66,4 +66,85 @@ warnings_warn(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObjec
 exit:
     return return_value;
 }
-/*[clinic end generated code: output=0435c68611fa2fe9 input=a9049054013a1b77]*/
+
+PyDoc_STRVAR(warnings_warn_explicit__doc__,
+"warn_explicit($module, /, message, category, filename, lineno,\n"
+"              module=<unrepresentable>, registry=None,\n"
+"              module_globals=None, source=None)\n"
+"--\n"
+"\n"
+"Issue a warning, or maybe ignore it or raise an exception.");
+
+#define WARNINGS_WARN_EXPLICIT_METHODDEF    \
+    {"warn_explicit", _PyCFunction_CAST(warnings_warn_explicit), METH_FASTCALL|METH_KEYWORDS, warnings_warn_explicit__doc__},
+
+static PyObject *
+warnings_warn_explicit_impl(PyObject *module, PyObject *message,
+                            PyObject *category, PyObject *filename,
+                            int lineno, PyObject *mod, PyObject *registry,
+                            PyObject *module_globals, PyObject *sourceobj);
+
+static PyObject *
+warnings_warn_explicit(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+{
+    PyObject *return_value = NULL;
+    static const char * const _keywords[] = {"message", "category", "filename", "lineno", "module", "registry", "module_globals", "source", NULL};
+    static _PyArg_Parser _parser = {NULL, _keywords, "warn_explicit", 0};
+    PyObject *argsbuf[8];
+    Py_ssize_t noptargs = nargs + (kwnames ? PyTuple_GET_SIZE(kwnames) : 0) - 4;
+    PyObject *message;
+    PyObject *category;
+    PyObject *filename;
+    int lineno;
+    PyObject *mod = NULL;
+    PyObject *registry = Py_None;
+    PyObject *module_globals = Py_None;
+    PyObject *sourceobj = Py_None;
+
+    args = _PyArg_UnpackKeywords(args, nargs, NULL, kwnames, &_parser, 4, 8, 0, argsbuf);
+    if (!args) {
+        goto exit;
+    }
+    message = args[0];
+    category = args[1];
+    if (!PyUnicode_Check(args[2])) {
+        _PyArg_BadArgument("warn_explicit", "argument 'filename'", "str", args[2]);
+        goto exit;
+    }
+    if (PyUnicode_READY(args[2]) == -1) {
+        goto exit;
+    }
+    filename = args[2];
+    lineno = _PyLong_AsInt(args[3]);
+    if (lineno == -1 && PyErr_Occurred()) {
+        goto exit;
+    }
+    if (!noptargs) {
+        goto skip_optional_pos;
+    }
+    if (args[4]) {
+        mod = args[4];
+        if (!--noptargs) {
+            goto skip_optional_pos;
+        }
+    }
+    if (args[5]) {
+        registry = args[5];
+        if (!--noptargs) {
+            goto skip_optional_pos;
+        }
+    }
+    if (args[6]) {
+        module_globals = args[6];
+        if (!--noptargs) {
+            goto skip_optional_pos;
+        }
+    }
+    sourceobj = args[7];
+skip_optional_pos:
+    return_value = warnings_warn_explicit_impl(module, message, category, filename, lineno, mod, registry, module_globals, sourceobj);
+
+exit:
+    return return_value;
+}
+/*[clinic end generated code: output=596b370838b95386 input=a9049054013a1b77]*/


From webhook-mailer at python.org  Wed Jul 20 17:27:40 2022
From: webhook-mailer at python.org (brandtbucher)
Date: Wed, 20 Jul 2022 21:27:40 -0000
Subject: [Python-checkins] GH-91409: Don't overwrite valid locations with
 NOP locations (GH-95067)
Message-ID: <mailman.141.1658352461.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/742d4614e1a645d765dbf76c19bd9a818239b1cb
commit: 742d4614e1a645d765dbf76c19bd9a818239b1cb
branch: main
author: Brandt Bucher <brandtbucher at microsoft.com>
committer: brandtbucher <brandtbucher at gmail.com>
date: 2022-07-20T14:27:31-07:00
summary:

GH-91409: Don't overwrite valid locations with NOP locations (GH-95067)

files:
A Misc/NEWS.d/next/Core and Builtins/2022-07-20-13-46-01.gh-issue-91409.dhL8Zo.rst
M Lib/test/test_compile.py
M Python/compile.c

diff --git a/Lib/test/test_compile.py b/Lib/test/test_compile.py
index bc022a9f5cbe7..19e47cb44f60a 100644
--- a/Lib/test/test_compile.py
+++ b/Lib/test/test_compile.py
@@ -1202,6 +1202,44 @@ def test_multiline_assert_rewritten_as_method_call(self):
         tree.body[0] = new_node
         compile(tree, "<test>", "exec")
 
+    def test_push_null_load_global_positions(self):
+        source_template = """
+        import abc, dis
+        import ast as art
+
+        abc = None
+        dix = dis
+        ast = art
+
+        def f():
+        {}
+        """
+        for body in [
+            "    abc.a()",
+            "    art.a()",
+            "    ast.a()",
+            "    dis.a()",
+            "    dix.a()",
+            "    abc[...]()",
+            "    art()()",
+            "   (ast or ...)()",
+            "   [dis]()",
+            "   (dix + ...)()",
+        ]:
+            with self.subTest(body):
+                namespace = {}
+                source = textwrap.dedent(source_template.format(body))
+                exec(source, namespace)
+                code = namespace["f"].__code__
+                self.assertOpcodeSourcePositionIs(
+                    code,
+                    "LOAD_GLOBAL",
+                    line=10,
+                    end_line=10,
+                    column=4,
+                    end_column=7,
+                )
+
 
 class TestExpressionStackSize(unittest.TestCase):
     # These tests check that the computed stack size for a code object
diff --git a/Misc/NEWS.d/next/Core and Builtins/2022-07-20-13-46-01.gh-issue-91409.dhL8Zo.rst b/Misc/NEWS.d/next/Core and Builtins/2022-07-20-13-46-01.gh-issue-91409.dhL8Zo.rst
new file mode 100644
index 0000000000000..2bc0d8224c6a0
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2022-07-20-13-46-01.gh-issue-91409.dhL8Zo.rst	
@@ -0,0 +1,2 @@
+Fix incorrect source location info caused by certain optimizations in the
+bytecode compiler.
diff --git a/Python/compile.c b/Python/compile.c
index 20eca059d30f1..52b7d9242eb2b 100644
--- a/Python/compile.c
+++ b/Python/compile.c
@@ -9278,7 +9278,10 @@ clean_basic_block(basicblock *bb) {
             /* or, if the next instruction has same line number or no line number */
             if (src < bb->b_iused - 1) {
                 int next_lineno = bb->b_instr[src+1].i_loc.lineno;
-                if (next_lineno < 0 || next_lineno == lineno) {
+                if (next_lineno == lineno) {
+                    continue;
+                }
+                if (next_lineno < 0) {
                     bb->b_instr[src+1].i_loc = bb->b_instr[src].i_loc;
                     continue;
                 }


From webhook-mailer at python.org  Wed Jul 20 17:34:22 2022
From: webhook-mailer at python.org (miss-islington)
Date: Wed, 20 Jul 2022 21:34:22 -0000
Subject: [Python-checkins] gh-82116: add comment explaining use of
 `list(scandir_it)` in pathlib. (GH-94939)
Message-ID: <mailman.142.1658352863.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/fd4a42d8902107647f9b7b0b6a6247e7d5253fa7
commit: fd4a42d8902107647f9b7b0b6a6247e7d5253fa7
branch: main
author: Barney Gale <barney.gale at gmail.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-20T14:34:13-07:00
summary:

gh-82116: add comment explaining use of `list(scandir_it)` in pathlib. (GH-94939)



Automerge-Triggered-By: GH:brettcannon

files:
M Lib/pathlib.py

diff --git a/Lib/pathlib.py b/Lib/pathlib.py
index 69e7d558a056f..62dd0fa1b1237 100644
--- a/Lib/pathlib.py
+++ b/Lib/pathlib.py
@@ -299,6 +299,8 @@ def __init__(self, pat, child_parts, flavour):
 
     def _select_from(self, parent_path, is_dir, exists, scandir):
         try:
+            # We must close the scandir() object before proceeding to
+            # avoid exhausting file descriptors when globbing deep trees.
             with scandir(parent_path) as scandir_it:
                 entries = list(scandir_it)
             for entry in entries:
@@ -330,6 +332,8 @@ def __init__(self, pat, child_parts, flavour):
     def _iterate_directories(self, parent_path, is_dir, scandir):
         yield parent_path
         try:
+            # We must close the scandir() object before proceeding to
+            # avoid exhausting file descriptors when globbing deep trees.
             with scandir(parent_path) as scandir_it:
                 entries = list(scandir_it)
             for entry in entries:


From webhook-mailer at python.org  Wed Jul 20 17:48:02 2022
From: webhook-mailer at python.org (miss-islington)
Date: Wed, 20 Jul 2022 21:48:02 -0000
Subject: [Python-checkins] docs: use 'recursively' in the description of
 rglob, and mention globs in the os equivalences (GH-94954)
Message-ID: <mailman.143.1658353683.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/6e2fbdab9220e20bc0e7f9e20987bb1e18532585
commit: 6e2fbdab9220e20bc0e7f9e20987bb1e18532585
branch: main
author: Ned Batchelder <ned at nedbatchelder.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-20T14:47:43-07:00
summary:

docs: use 'recursively' in the description of rglob, and mention globs in the os equivalences (GH-94954)



The r in `rglob` stands for "recursively", so use the word in the description. Also, glob and rglob can usefully be mentioned as the pathlib equivalent of os.walk.

Automerge-Triggered-By: GH:brettcannon

files:
M Doc/library/pathlib.rst

diff --git a/Doc/library/pathlib.rst b/Doc/library/pathlib.rst
index d5cda3adc8d51..04549184be2ae 100644
--- a/Doc/library/pathlib.rst
+++ b/Doc/library/pathlib.rst
@@ -1122,8 +1122,8 @@ call fails (for example because the path doesn't exist).
 
 .. method:: Path.rglob(pattern)
 
-   This is like calling :func:`Path.glob` with "``**/``" added in front of the
-   given relative *pattern*::
+   Glob the given relative *pattern* recursively.  This is like calling
+   :func:`Path.glob` with "``**/``" added in front of the *pattern*::
 
       >>> sorted(Path().rglob("*.py"))
       [PosixPath('build/lib/pathlib.py'),


From webhook-mailer at python.org  Wed Jul 20 18:01:51 2022
From: webhook-mailer at python.org (brandtbucher)
Date: Wed, 20 Jul 2022 22:01:51 -0000
Subject: [Python-checkins] [3.11] GH-91409: Don't overwrite valid locations
 with NOP locations (GH-95067) (GH-95068)
Message-ID: <mailman.144.1658354513.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/e2fce3a8e77d33d52d47b567964ddebd6984a097
commit: e2fce3a8e77d33d52d47b567964ddebd6984a097
branch: 3.11
author: Brandt Bucher <brandtbucher at microsoft.com>
committer: brandtbucher <brandtbucher at gmail.com>
date: 2022-07-20T15:01:42-07:00
summary:

[3.11] GH-91409: Don't overwrite valid locations with NOP locations (GH-95067) (GH-95068)

(cherry picked from commit 742d4614e1a645d765dbf76c19bd9a818239b1cb)

files:
A Misc/NEWS.d/next/Core and Builtins/2022-07-20-13-46-01.gh-issue-91409.dhL8Zo.rst
M Lib/test/test_compile.py
M Python/compile.c

diff --git a/Lib/test/test_compile.py b/Lib/test/test_compile.py
index 80b32dee0665f..e22696499e236 100644
--- a/Lib/test/test_compile.py
+++ b/Lib/test/test_compile.py
@@ -1166,6 +1166,44 @@ def test_multiline_assert_rewritten_as_method_call(self):
         tree.body[0] = new_node
         compile(tree, "<test>", "exec")
 
+    def test_push_null_load_global_positions(self):
+        source_template = """
+        import abc, dis
+        import ast as art
+
+        abc = None
+        dix = dis
+        ast = art
+
+        def f():
+        {}
+        """
+        for body in [
+            "    abc.a()",
+            "    art.a()",
+            "    ast.a()",
+            "    dis.a()",
+            "    dix.a()",
+            "    abc[...]()",
+            "    art()()",
+            "   (ast or ...)()",
+            "   [dis]()",
+            "   (dix + ...)()",
+        ]:
+            with self.subTest(body):
+                namespace = {}
+                source = textwrap.dedent(source_template.format(body))
+                exec(source, namespace)
+                code = namespace["f"].__code__
+                self.assertOpcodeSourcePositionIs(
+                    code,
+                    "LOAD_GLOBAL",
+                    line=10,
+                    end_line=10,
+                    column=4,
+                    end_column=7,
+                )
+
 
 class TestExpressionStackSize(unittest.TestCase):
     # These tests check that the computed stack size for a code object
diff --git a/Misc/NEWS.d/next/Core and Builtins/2022-07-20-13-46-01.gh-issue-91409.dhL8Zo.rst b/Misc/NEWS.d/next/Core and Builtins/2022-07-20-13-46-01.gh-issue-91409.dhL8Zo.rst
new file mode 100644
index 0000000000000..2bc0d8224c6a0
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2022-07-20-13-46-01.gh-issue-91409.dhL8Zo.rst	
@@ -0,0 +1,2 @@
+Fix incorrect source location info caused by certain optimizations in the
+bytecode compiler.
diff --git a/Python/compile.c b/Python/compile.c
index 3fe0930e7aebf..e8acd8597778d 100644
--- a/Python/compile.c
+++ b/Python/compile.c
@@ -9045,7 +9045,10 @@ clean_basic_block(basicblock *bb) {
             /* or, if the next instruction has same line number or no line number */
             if (src < bb->b_iused - 1) {
                 int next_lineno = bb->b_instr[src+1].i_lineno;
-                if (next_lineno < 0 || next_lineno == lineno) {
+                if (next_lineno == lineno) {
+                    continue;
+                }
+                if (next_lineno < 0) {
                     COPY_INSTR_LOC(bb->b_instr[src], bb->b_instr[src+1]);
                     continue;
                 }


From webhook-mailer at python.org  Wed Jul 20 18:03:44 2022
From: webhook-mailer at python.org (terryjreedy)
Date: Wed, 20 Jul 2022 22:03:44 -0000
Subject: [Python-checkins] gh-90654: Remove unneeded blank line (GH-95044)
 (#95047)
Message-ID: <mailman.145.1658354625.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/57375d1d74c971fb4aabbe911e8b25f18465e648
commit: 57375d1d74c971fb4aabbe911e8b25f18465e648
branch: 3.11
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: terryjreedy <tjreedy at udel.edu>
date: 2022-07-20T18:03:35-04:00
summary:

gh-90654: Remove unneeded blank line (GH-95044) (#95047)

(cherry picked from commit bd390ef825c5f2ad86e0966173a6bcaca85a56f2)

Co-authored-by: Terry Jan Reedy <tjreedy at udel.edu>

Co-authored-by: Terry Jan Reedy <tjreedy at udel.edu>

files:
M Lib/idlelib/NEWS.txt

diff --git a/Lib/idlelib/NEWS.txt b/Lib/idlelib/NEWS.txt
index 086b2060766cf..05308a0b114af 100644
--- a/Lib/idlelib/NEWS.txt
+++ b/Lib/idlelib/NEWS.txt
@@ -29,7 +29,6 @@ What's New in IDLE 3.10.0
 Released on 2021-10-04
 =========================
 
-
 bpo-45193: Make completion boxes appear on Ubuntu again.
 
 bpo-40128: Mostly fix completions on macOS when not using tcl/tk 8.6.11


From webhook-mailer at python.org  Wed Jul 20 20:01:44 2022
From: webhook-mailer at python.org (zooba)
Date: Thu, 21 Jul 2022 00:01:44 -0000
Subject: [Python-checkins] GH-95029: Describe Windows Store package
 isolation and redirection in more detail (GH-95030)
Message-ID: <mailman.146.1658361705.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/b1924b10069fb797845284552fb9da931b1ffdb9
commit: b1924b10069fb797845284552fb9da931b1ffdb9
branch: main
author: Anthony Shaw <anthony.p.shaw at gmail.com>
committer: zooba <steve.dower at microsoft.com>
date: 2022-07-21T01:01:23+01:00
summary:

GH-95029: Describe Windows Store package isolation and redirection in more detail (GH-95030)

files:
M Doc/using/windows.rst

diff --git a/Doc/using/windows.rst b/Doc/using/windows.rst
index d7e0a5e13825a..7d2fcb586b3f2 100644
--- a/Doc/using/windows.rst
+++ b/Doc/using/windows.rst
@@ -34,7 +34,7 @@ developers using Python for any kind of project.
 
 :ref:`windows-store` is a simple installation of Python that is suitable for
 running scripts and packages, and using IDLE or other development environments.
-It requires Windows 10, but can be safely installed without corrupting other
+It requires Windows 10 and above, but can be safely installed without corrupting other
 programs. It also provides many convenient commands for launching Python and
 its tools.
 
@@ -348,14 +348,42 @@ Python in Start and right-click to select Uninstall. Uninstalling will
 remove all packages you installed directly into this Python installation, but
 will not remove any virtual environments
 
-Known Issues
+Known issues
 ------------
 
+Redirection of local data, registry, and temporary paths
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
 Because of restrictions on Microsoft Store apps, Python scripts may not have
-full write access to shared locations such as ``TEMP`` and the registry.
+full write access to shared locations such as :envvar:`TEMP` and the registry.
 Instead, it will write to a private copy. If your scripts must modify the
 shared locations, you will need to install the full installer.
 
+At runtime, Python will use a private copy of well-known Windows folders and the registry.
+For example, if the environment variable :envvar:`%APPDATA%` is :file:`c:\\Users\\<user>\\AppData\\`,
+then when writing to :file:`C:\\Users\\<user>\\AppData\\Local` will write to
+:file:`C:\\Users\\<user>\\AppData\\Local\\Packages\\PythonSoftwareFoundation.Python.3.8_qbz5n2kfra8p0\\LocalCache\\Local\\`.
+
+When reading files, Windows will return the file from the private folder, or if that does not exist, the
+real Windows directory. For example reading :file:`C:\\Windows\\System32` returns the contents of :file:`C:\\Windows\\System32`
+plus the contents of :file:`C:\\Program Files\\WindowsApps\\package_name\\VFS\\SystemX86`.
+
+You can find the real path of any existing file using :func:`os.path.realpath`:
+
+.. code-block:: python
+
+  >>> import os
+  >>> test_file = 'C:\\Users\\example\\AppData\\Local\\test.txt'
+  >>> os.path.realpath(test_file)
+  'C:\\Users\\example\\AppData\\Local\\Packages\\PythonSoftwareFoundation.Python.3.8_qbz5n2kfra8p0\\LocalCache\\Local\\test.txt'
+
+When writing to the Windows Registry, the following behaviors exist:
+
+* Reading from ``HKLM\\Software`` is allowed and results are merged with the :file:`registry.dat` file in the package.
+* Writing to ``HKLM\\Software`` is not allowed if the corresponding key/value exists, i.e. modifying existing keys.
+* Writing to ``HKLM\\Software`` is allowed as long as a corresponding key/value does not exist in the package
+  and the user has the correct access permissions.
+
 For more detail on the technical basis for these limitations, please consult
 Microsoft's documentation on packaged full-trust apps, currently available at
 `docs.microsoft.com/en-us/windows/msix/desktop/desktop-to-uwp-behind-the-scenes


From webhook-mailer at python.org  Wed Jul 20 20:10:41 2022
From: webhook-mailer at python.org (miss-islington)
Date: Thu, 21 Jul 2022 00:10:41 -0000
Subject: [Python-checkins] GH-95029: Describe Windows Store package
 isolation and redirection in more detail (GH-95030)
Message-ID: <mailman.147.1658362242.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/b60c3d2f7efede5d80bde2aec0b558b12814a0b3
commit: b60c3d2f7efede5d80bde2aec0b558b12814a0b3
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-20T17:10:32-07:00
summary:

GH-95029: Describe Windows Store package isolation and redirection in more detail (GH-95030)

(cherry picked from commit b1924b10069fb797845284552fb9da931b1ffdb9)

Co-authored-by: Anthony Shaw <anthony.p.shaw at gmail.com>

files:
M Doc/using/windows.rst

diff --git a/Doc/using/windows.rst b/Doc/using/windows.rst
index cbc70b6b173f7..992767ab1c1e0 100644
--- a/Doc/using/windows.rst
+++ b/Doc/using/windows.rst
@@ -34,7 +34,7 @@ developers using Python for any kind of project.
 
 :ref:`windows-store` is a simple installation of Python that is suitable for
 running scripts and packages, and using IDLE or other development environments.
-It requires Windows 10, but can be safely installed without corrupting other
+It requires Windows 10 and above, but can be safely installed without corrupting other
 programs. It also provides many convenient commands for launching Python and
 its tools.
 
@@ -331,14 +331,42 @@ Python in Start and right-click to select Uninstall. Uninstalling will
 remove all packages you installed directly into this Python installation, but
 will not remove any virtual environments
 
-Known Issues
+Known issues
 ------------
 
+Redirection of local data, registry, and temporary paths
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
 Because of restrictions on Microsoft Store apps, Python scripts may not have
-full write access to shared locations such as ``TEMP`` and the registry.
+full write access to shared locations such as :envvar:`TEMP` and the registry.
 Instead, it will write to a private copy. If your scripts must modify the
 shared locations, you will need to install the full installer.
 
+At runtime, Python will use a private copy of well-known Windows folders and the registry.
+For example, if the environment variable :envvar:`%APPDATA%` is :file:`c:\\Users\\<user>\\AppData\\`,
+then when writing to :file:`C:\\Users\\<user>\\AppData\\Local` will write to
+:file:`C:\\Users\\<user>\\AppData\\Local\\Packages\\PythonSoftwareFoundation.Python.3.8_qbz5n2kfra8p0\\LocalCache\\Local\\`.
+
+When reading files, Windows will return the file from the private folder, or if that does not exist, the
+real Windows directory. For example reading :file:`C:\\Windows\\System32` returns the contents of :file:`C:\\Windows\\System32`
+plus the contents of :file:`C:\\Program Files\\WindowsApps\\package_name\\VFS\\SystemX86`.
+
+You can find the real path of any existing file using :func:`os.path.realpath`:
+
+.. code-block:: python
+
+  >>> import os
+  >>> test_file = 'C:\\Users\\example\\AppData\\Local\\test.txt'
+  >>> os.path.realpath(test_file)
+  'C:\\Users\\example\\AppData\\Local\\Packages\\PythonSoftwareFoundation.Python.3.8_qbz5n2kfra8p0\\LocalCache\\Local\\test.txt'
+
+When writing to the Windows Registry, the following behaviors exist:
+
+* Reading from ``HKLM\\Software`` is allowed and results are merged with the :file:`registry.dat` file in the package.
+* Writing to ``HKLM\\Software`` is not allowed if the corresponding key/value exists, i.e. modifying existing keys.
+* Writing to ``HKLM\\Software`` is allowed as long as a corresponding key/value does not exist in the package
+  and the user has the correct access permissions.
+
 For more detail on the technical basis for these limitations, please consult
 Microsoft's documentation on packaged full-trust apps, currently available at
 `docs.microsoft.com/en-us/windows/msix/desktop/desktop-to-uwp-behind-the-scenes


From webhook-mailer at python.org  Wed Jul 20 20:11:06 2022
From: webhook-mailer at python.org (miss-islington)
Date: Thu, 21 Jul 2022 00:11:06 -0000
Subject: [Python-checkins] GH-95029: Describe Windows Store package
 isolation and redirection in more detail (GH-95030)
Message-ID: <mailman.148.1658362268.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/e2e8ec0760775a9c2f2d48399e515a4f8cfd92c0
commit: e2e8ec0760775a9c2f2d48399e515a4f8cfd92c0
branch: 3.11
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-20T17:11:01-07:00
summary:

GH-95029: Describe Windows Store package isolation and redirection in more detail (GH-95030)

(cherry picked from commit b1924b10069fb797845284552fb9da931b1ffdb9)

Co-authored-by: Anthony Shaw <anthony.p.shaw at gmail.com>

files:
M Doc/using/windows.rst

diff --git a/Doc/using/windows.rst b/Doc/using/windows.rst
index 26003a20e5293..7fb40a38a6fbc 100644
--- a/Doc/using/windows.rst
+++ b/Doc/using/windows.rst
@@ -34,7 +34,7 @@ developers using Python for any kind of project.
 
 :ref:`windows-store` is a simple installation of Python that is suitable for
 running scripts and packages, and using IDLE or other development environments.
-It requires Windows 10, but can be safely installed without corrupting other
+It requires Windows 10 and above, but can be safely installed without corrupting other
 programs. It also provides many convenient commands for launching Python and
 its tools.
 
@@ -335,14 +335,42 @@ Python in Start and right-click to select Uninstall. Uninstalling will
 remove all packages you installed directly into this Python installation, but
 will not remove any virtual environments
 
-Known Issues
+Known issues
 ------------
 
+Redirection of local data, registry, and temporary paths
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
 Because of restrictions on Microsoft Store apps, Python scripts may not have
-full write access to shared locations such as ``TEMP`` and the registry.
+full write access to shared locations such as :envvar:`TEMP` and the registry.
 Instead, it will write to a private copy. If your scripts must modify the
 shared locations, you will need to install the full installer.
 
+At runtime, Python will use a private copy of well-known Windows folders and the registry.
+For example, if the environment variable :envvar:`%APPDATA%` is :file:`c:\\Users\\<user>\\AppData\\`,
+then when writing to :file:`C:\\Users\\<user>\\AppData\\Local` will write to
+:file:`C:\\Users\\<user>\\AppData\\Local\\Packages\\PythonSoftwareFoundation.Python.3.8_qbz5n2kfra8p0\\LocalCache\\Local\\`.
+
+When reading files, Windows will return the file from the private folder, or if that does not exist, the
+real Windows directory. For example reading :file:`C:\\Windows\\System32` returns the contents of :file:`C:\\Windows\\System32`
+plus the contents of :file:`C:\\Program Files\\WindowsApps\\package_name\\VFS\\SystemX86`.
+
+You can find the real path of any existing file using :func:`os.path.realpath`:
+
+.. code-block:: python
+
+  >>> import os
+  >>> test_file = 'C:\\Users\\example\\AppData\\Local\\test.txt'
+  >>> os.path.realpath(test_file)
+  'C:\\Users\\example\\AppData\\Local\\Packages\\PythonSoftwareFoundation.Python.3.8_qbz5n2kfra8p0\\LocalCache\\Local\\test.txt'
+
+When writing to the Windows Registry, the following behaviors exist:
+
+* Reading from ``HKLM\\Software`` is allowed and results are merged with the :file:`registry.dat` file in the package.
+* Writing to ``HKLM\\Software`` is not allowed if the corresponding key/value exists, i.e. modifying existing keys.
+* Writing to ``HKLM\\Software`` is allowed as long as a corresponding key/value does not exist in the package
+  and the user has the correct access permissions.
+
 For more detail on the technical basis for these limitations, please consult
 Microsoft's documentation on packaged full-trust apps, currently available at
 `docs.microsoft.com/en-us/windows/msix/desktop/desktop-to-uwp-behind-the-scenes


From webhook-mailer at python.org  Thu Jul 21 07:35:55 2022
From: webhook-mailer at python.org (serhiy-storchaka)
Date: Thu, 21 Jul 2022 11:35:55 -0000
Subject: [Python-checkins] gh-95010: Fix asyncio
 GenericWatcherTests.test_create_subprocess_fails_with_inactive_watcher
 (GH-95009)
Message-ID: <mailman.149.1658403356.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/834bd5dd766cf212fb20d65d8a046c62a33006d4
commit: 834bd5dd766cf212fb20d65d8a046c62a33006d4
branch: main
author: Thomas Grainger <tagrain at gmail.com>
committer: serhiy-storchaka <storchaka at gmail.com>
date: 2022-07-21T14:35:20+03:00
summary:

gh-95010: Fix asyncio GenericWatcherTests.test_create_subprocess_fails_with_inactive_watcher (GH-95009)

The test was never run, because it was missing the TestCase class.
The test failed because the wrong attribute was patched.

files:
M Lib/test/test_asyncio/test_subprocess.py

diff --git a/Lib/test/test_asyncio/test_subprocess.py b/Lib/test/test_asyncio/test_subprocess.py
index 305330a691834..961c463f8dc11 100644
--- a/Lib/test/test_asyncio/test_subprocess.py
+++ b/Lib/test/test_asyncio/test_subprocess.py
@@ -700,34 +700,40 @@ class SubprocessPidfdWatcherTests(SubprocessWatcherMixin,
                                       test_utils.TestCase):
         Watcher = unix_events.PidfdChildWatcher
 
-else:
-    # Windows
-    class SubprocessProactorTests(SubprocessMixin, test_utils.TestCase):
-
-        def setUp(self):
-            super().setUp()
-            self.loop = asyncio.ProactorEventLoop()
-            self.set_event_loop(self.loop)
 
+    class GenericWatcherTests(test_utils.TestCase):
 
-class GenericWatcherTests:
+        def test_create_subprocess_fails_with_inactive_watcher(self):
+            watcher = mock.create_autospec(
+                asyncio.AbstractChildWatcher,
+                **{"__enter__.return_value.is_active.return_value": False}
+            )
 
-    def test_create_subprocess_fails_with_inactive_watcher(self):
+            async def execute():
+                asyncio.set_child_watcher(watcher)
 
-        async def execute():
-            watcher = mock.create_authspec(asyncio.AbstractChildWatcher)
-            watcher.is_active.return_value = False
-            asyncio.set_child_watcher(watcher)
+                with self.assertRaises(RuntimeError):
+                    await subprocess.create_subprocess_exec(
+                        os_helper.FakePath(sys.executable), '-c', 'pass')
 
-            with self.assertRaises(RuntimeError):
-                await subprocess.create_subprocess_exec(
-                    os_helper.FakePath(sys.executable), '-c', 'pass')
+                watcher.add_child_handler.assert_not_called()
 
-            watcher.add_child_handler.assert_not_called()
-
-        self.assertIsNone(self.loop.run_until_complete(execute()))
+            with asyncio.Runner(loop_factory=asyncio.new_event_loop) as runner:
+                self.assertIsNone(runner.run(execute()))
+            self.assertListEqual(watcher.mock_calls, [
+                mock.call.__enter__(),
+                mock.call.__enter__().is_active(),
+                mock.call.__exit__(RuntimeError, mock.ANY, mock.ANY),
+            ])
 
+else:
+    # Windows
+    class SubprocessProactorTests(SubprocessMixin, test_utils.TestCase):
 
+        def setUp(self):
+            super().setUp()
+            self.loop = asyncio.ProactorEventLoop()
+            self.set_event_loop(self.loop)
 
 
 if __name__ == '__main__':


From webhook-mailer at python.org  Thu Jul 21 09:01:16 2022
From: webhook-mailer at python.org (miss-islington)
Date: Thu, 21 Jul 2022 13:01:16 -0000
Subject: [Python-checkins] gh-95010: Fix asyncio
 GenericWatcherTests.test_create_subprocess_fails_with_inactive_watcher
 (GH-95009)
Message-ID: <mailman.150.1658408477.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/d19b5d85339653ec54658e67aa55ddf40f6461c5
commit: d19b5d85339653ec54658e67aa55ddf40f6461c5
branch: 3.11
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-21T06:01:05-07:00
summary:

gh-95010: Fix asyncio GenericWatcherTests.test_create_subprocess_fails_with_inactive_watcher (GH-95009)


The test was never run, because it was missing the TestCase class.
The test failed because the wrong attribute was patched.
(cherry picked from commit 834bd5dd766cf212fb20d65d8a046c62a33006d4)

Co-authored-by: Thomas Grainger <tagrain at gmail.com>

files:
M Lib/test/test_asyncio/test_subprocess.py

diff --git a/Lib/test/test_asyncio/test_subprocess.py b/Lib/test/test_asyncio/test_subprocess.py
index 305330a691834..961c463f8dc11 100644
--- a/Lib/test/test_asyncio/test_subprocess.py
+++ b/Lib/test/test_asyncio/test_subprocess.py
@@ -700,34 +700,40 @@ class SubprocessPidfdWatcherTests(SubprocessWatcherMixin,
                                       test_utils.TestCase):
         Watcher = unix_events.PidfdChildWatcher
 
-else:
-    # Windows
-    class SubprocessProactorTests(SubprocessMixin, test_utils.TestCase):
-
-        def setUp(self):
-            super().setUp()
-            self.loop = asyncio.ProactorEventLoop()
-            self.set_event_loop(self.loop)
 
+    class GenericWatcherTests(test_utils.TestCase):
 
-class GenericWatcherTests:
+        def test_create_subprocess_fails_with_inactive_watcher(self):
+            watcher = mock.create_autospec(
+                asyncio.AbstractChildWatcher,
+                **{"__enter__.return_value.is_active.return_value": False}
+            )
 
-    def test_create_subprocess_fails_with_inactive_watcher(self):
+            async def execute():
+                asyncio.set_child_watcher(watcher)
 
-        async def execute():
-            watcher = mock.create_authspec(asyncio.AbstractChildWatcher)
-            watcher.is_active.return_value = False
-            asyncio.set_child_watcher(watcher)
+                with self.assertRaises(RuntimeError):
+                    await subprocess.create_subprocess_exec(
+                        os_helper.FakePath(sys.executable), '-c', 'pass')
 
-            with self.assertRaises(RuntimeError):
-                await subprocess.create_subprocess_exec(
-                    os_helper.FakePath(sys.executable), '-c', 'pass')
+                watcher.add_child_handler.assert_not_called()
 
-            watcher.add_child_handler.assert_not_called()
-
-        self.assertIsNone(self.loop.run_until_complete(execute()))
+            with asyncio.Runner(loop_factory=asyncio.new_event_loop) as runner:
+                self.assertIsNone(runner.run(execute()))
+            self.assertListEqual(watcher.mock_calls, [
+                mock.call.__enter__(),
+                mock.call.__enter__().is_active(),
+                mock.call.__exit__(RuntimeError, mock.ANY, mock.ANY),
+            ])
 
+else:
+    # Windows
+    class SubprocessProactorTests(SubprocessMixin, test_utils.TestCase):
 
+        def setUp(self):
+            super().setUp()
+            self.loop = asyncio.ProactorEventLoop()
+            self.set_event_loop(self.loop)
 
 
 if __name__ == '__main__':


From webhook-mailer at python.org  Thu Jul 21 09:50:10 2022
From: webhook-mailer at python.org (markshannon)
Date: Thu, 21 Jul 2022 13:50:10 -0000
Subject: [Python-checkins] Fix PyCode_Addr2Location when addrq < 0 (GH-95091)
Message-ID: <mailman.151.1658411411.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/a6daaf2a132efbb1965b4502ff8a8cf3b5afed0e
commit: a6daaf2a132efbb1965b4502ff8a8cf3b5afed0e
branch: main
author: Ken Jin <28750310+Fidget-Spinner at users.noreply.github.com>
committer: markshannon <mark at hotpy.org>
date: 2022-07-21T14:49:49+01:00
summary:

Fix PyCode_Addr2Location when addrq < 0 (GH-95091)

files:
A Misc/NEWS.d/next/Core and Builtins/2022-07-21-19-19-20.gh-issue-95060.4xdT1f.rst
M Objects/codeobject.c

diff --git a/Misc/NEWS.d/next/Core and Builtins/2022-07-21-19-19-20.gh-issue-95060.4xdT1f.rst b/Misc/NEWS.d/next/Core and Builtins/2022-07-21-19-19-20.gh-issue-95060.4xdT1f.rst
new file mode 100644
index 0000000000000..160999e82bf08
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2022-07-21-19-19-20.gh-issue-95060.4xdT1f.rst	
@@ -0,0 +1,2 @@
+Undocumented ``PyCode_Addr2Location`` function now properly returns when
+``addrq`` argument is less than zero.
diff --git a/Objects/codeobject.c b/Objects/codeobject.c
index d4fa0e38aed62..76e430ae1c501 100644
--- a/Objects/codeobject.c
+++ b/Objects/codeobject.c
@@ -971,6 +971,7 @@ PyCode_Addr2Location(PyCodeObject *co, int addrq,
     if (addrq < 0) {
         *start_line = *end_line = co->co_firstlineno;
         *start_column = *end_column = 0;
+        return 1;
     }
     assert(addrq >= 0 && addrq < _PyCode_NBYTES(co));
     PyCodeAddressRange bounds;


From webhook-mailer at python.org  Thu Jul 21 11:23:42 2022
From: webhook-mailer at python.org (miss-islington)
Date: Thu, 21 Jul 2022 15:23:42 -0000
Subject: [Python-checkins] [3.11] GH-95060: Fix PyCode_Addr2Location when
 addrq < 0 (GH-95094)
Message-ID: <mailman.152.1658417023.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/e693f84cf79d81a10c9c63ab46cdf0fe2ebe9c10
commit: e693f84cf79d81a10c9c63ab46cdf0fe2ebe9c10
branch: 3.11
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-21T08:23:06-07:00
summary:

[3.11] GH-95060: Fix PyCode_Addr2Location when addrq < 0 (GH-95094)



(cherry picked from commit a6daaf2a132efbb1965b4502ff8a8cf3b5afed0e)


Co-authored-by: Ken Jin <28750310+Fidget-Spinner at users.noreply.github.com>

files:
A Misc/NEWS.d/next/Core and Builtins/2022-07-21-19-19-20.gh-issue-95060.4xdT1f.rst
M Objects/codeobject.c

diff --git a/Misc/NEWS.d/next/Core and Builtins/2022-07-21-19-19-20.gh-issue-95060.4xdT1f.rst b/Misc/NEWS.d/next/Core and Builtins/2022-07-21-19-19-20.gh-issue-95060.4xdT1f.rst
new file mode 100644
index 0000000000000..160999e82bf08
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2022-07-21-19-19-20.gh-issue-95060.4xdT1f.rst	
@@ -0,0 +1,2 @@
+Undocumented ``PyCode_Addr2Location`` function now properly returns when
+``addrq`` argument is less than zero.
diff --git a/Objects/codeobject.c b/Objects/codeobject.c
index 4859b1ecebe50..35576a283b824 100644
--- a/Objects/codeobject.c
+++ b/Objects/codeobject.c
@@ -969,6 +969,7 @@ PyCode_Addr2Location(PyCodeObject *co, int addrq,
     if (addrq < 0) {
         *start_line = *end_line = co->co_firstlineno;
         *start_column = *end_column = 0;
+        return 1;
     }
     assert(addrq >= 0 && addrq < _PyCode_NBYTES(co));
     PyCodeAddressRange bounds;


From webhook-mailer at python.org  Thu Jul 21 14:44:39 2022
From: webhook-mailer at python.org (miss-islington)
Date: Thu, 21 Jul 2022 18:44:39 -0000
Subject: [Python-checkins] gh-95095: Use SSL_CTX_get_max_proto_version
 instead of SSL_CTX_ctrl (GH-95096)
Message-ID: <mailman.153.1658429080.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/936f71e5d4f50f2238b0320d44f7fb5f88e39809
commit: 936f71e5d4f50f2238b0320d44f7fb5f88e39809
branch: main
author: David Benjamin <davidben at davidben.net>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-21T11:44:30-07:00
summary:

gh-95095: Use SSL_CTX_get_max_proto_version instead of SSL_CTX_ctrl (GH-95096)



The wrapper macros are more readable and match the form recommended in
the OpenSSL documentation. They also slightly less error-prone, as the
mapping of arguments to SSL_CTX_ctrl is not always clear. (Though in
this case it's straightforward.)
https://www.openssl.org/docs/man1.1.1/man3/SSL_CTX_get_max_proto_version.html

files:
M Modules/_ssl.c

diff --git a/Modules/_ssl.c b/Modules/_ssl.c
index 78c02c1cd82fb..bf8bd9dea89b6 100644
--- a/Modules/_ssl.c
+++ b/Modules/_ssl.c
@@ -3515,7 +3515,7 @@ set_min_max_proto_version(PySSLContext *self, PyObject *arg, int what)
 static PyObject *
 get_minimum_version(PySSLContext *self, void *c)
 {
-    int v = SSL_CTX_ctrl(self->ctx, SSL_CTRL_GET_MIN_PROTO_VERSION, 0, NULL);
+    int v = SSL_CTX_get_min_proto_version(self->ctx);
     if (v == 0) {
         v = PY_PROTO_MINIMUM_SUPPORTED;
     }
@@ -3531,7 +3531,7 @@ set_minimum_version(PySSLContext *self, PyObject *arg, void *c)
 static PyObject *
 get_maximum_version(PySSLContext *self, void *c)
 {
-    int v = SSL_CTX_ctrl(self->ctx, SSL_CTRL_GET_MAX_PROTO_VERSION, 0, NULL);
+    int v = SSL_CTX_get_max_proto_version(self->ctx);
     if (v == 0) {
         v = PY_PROTO_MAXIMUM_SUPPORTED;
     }


From webhook-mailer at python.org  Thu Jul 21 15:11:20 2022
From: webhook-mailer at python.org (miss-islington)
Date: Thu, 21 Jul 2022 19:11:20 -0000
Subject: [Python-checkins] gh-95095: Use SSL_CTX_get_max_proto_version
 instead of SSL_CTX_ctrl (GH-95096)
Message-ID: <mailman.154.1658430681.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/8fd2d36c1c6da78b2402fcb8bcefdad8428c8bc3
commit: 8fd2d36c1c6da78b2402fcb8bcefdad8428c8bc3
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-21T12:10:53-07:00
summary:

gh-95095: Use SSL_CTX_get_max_proto_version instead of SSL_CTX_ctrl (GH-95096)


The wrapper macros are more readable and match the form recommended in
the OpenSSL documentation. They also slightly less error-prone, as the
mapping of arguments to SSL_CTX_ctrl is not always clear. (Though in
this case it's straightforward.)
https://www.openssl.org/docs/man1.1.1/man3/SSL_CTX_get_max_proto_version.html
(cherry picked from commit 936f71e5d4f50f2238b0320d44f7fb5f88e39809)

Co-authored-by: David Benjamin <davidben at davidben.net>

files:
M Modules/_ssl.c

diff --git a/Modules/_ssl.c b/Modules/_ssl.c
index 51bb2d00e3e8a..f1bb39f57b229 100644
--- a/Modules/_ssl.c
+++ b/Modules/_ssl.c
@@ -3518,7 +3518,7 @@ set_min_max_proto_version(PySSLContext *self, PyObject *arg, int what)
 static PyObject *
 get_minimum_version(PySSLContext *self, void *c)
 {
-    int v = SSL_CTX_ctrl(self->ctx, SSL_CTRL_GET_MIN_PROTO_VERSION, 0, NULL);
+    int v = SSL_CTX_get_min_proto_version(self->ctx);
     if (v == 0) {
         v = PY_PROTO_MINIMUM_SUPPORTED;
     }
@@ -3534,7 +3534,7 @@ set_minimum_version(PySSLContext *self, PyObject *arg, void *c)
 static PyObject *
 get_maximum_version(PySSLContext *self, void *c)
 {
-    int v = SSL_CTX_ctrl(self->ctx, SSL_CTRL_GET_MAX_PROTO_VERSION, 0, NULL);
+    int v = SSL_CTX_get_max_proto_version(self->ctx);
     if (v == 0) {
         v = PY_PROTO_MAXIMUM_SUPPORTED;
     }


From webhook-mailer at python.org  Thu Jul 21 15:11:20 2022
From: webhook-mailer at python.org (miss-islington)
Date: Thu, 21 Jul 2022 19:11:20 -0000
Subject: [Python-checkins] gh-95095: Use SSL_CTX_get_max_proto_version
 instead of SSL_CTX_ctrl (GH-95096)
Message-ID: <mailman.155.1658430681.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/120f226889b3b89e0cb804baccd6e9e3af76a39a
commit: 120f226889b3b89e0cb804baccd6e9e3af76a39a
branch: 3.11
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-21T12:11:07-07:00
summary:

gh-95095: Use SSL_CTX_get_max_proto_version instead of SSL_CTX_ctrl (GH-95096)


The wrapper macros are more readable and match the form recommended in
the OpenSSL documentation. They also slightly less error-prone, as the
mapping of arguments to SSL_CTX_ctrl is not always clear. (Though in
this case it's straightforward.)
https://www.openssl.org/docs/man1.1.1/man3/SSL_CTX_get_max_proto_version.html
(cherry picked from commit 936f71e5d4f50f2238b0320d44f7fb5f88e39809)

Co-authored-by: David Benjamin <davidben at davidben.net>

files:
M Modules/_ssl.c

diff --git a/Modules/_ssl.c b/Modules/_ssl.c
index 6d5c0199b7883..6071202104fa7 100644
--- a/Modules/_ssl.c
+++ b/Modules/_ssl.c
@@ -3518,7 +3518,7 @@ set_min_max_proto_version(PySSLContext *self, PyObject *arg, int what)
 static PyObject *
 get_minimum_version(PySSLContext *self, void *c)
 {
-    int v = SSL_CTX_ctrl(self->ctx, SSL_CTRL_GET_MIN_PROTO_VERSION, 0, NULL);
+    int v = SSL_CTX_get_min_proto_version(self->ctx);
     if (v == 0) {
         v = PY_PROTO_MINIMUM_SUPPORTED;
     }
@@ -3534,7 +3534,7 @@ set_minimum_version(PySSLContext *self, PyObject *arg, void *c)
 static PyObject *
 get_maximum_version(PySSLContext *self, void *c)
 {
-    int v = SSL_CTX_ctrl(self->ctx, SSL_CTRL_GET_MAX_PROTO_VERSION, 0, NULL);
+    int v = SSL_CTX_get_max_proto_version(self->ctx);
     if (v == 0) {
         v = PY_PROTO_MAXIMUM_SUPPORTED;
     }


From webhook-mailer at python.org  Thu Jul 21 16:26:09 2022
From: webhook-mailer at python.org (JelleZijlstra)
Date: Thu, 21 Jul 2022 20:26:09 -0000
Subject: [Python-checkins] gh-95105: Return Iterator from
 wsgiref.types.InputStream.__iter__ (#95106)
Message-ID: <mailman.156.1658435170.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/b4378948a066821ce5147940ce3c1a80bc018b3c
commit: b4378948a066821ce5147940ce3c1a80bc018b3c
branch: main
author: Shantanu <12621235+hauntsaninja at users.noreply.github.com>
committer: JelleZijlstra <jelle.zijlstra at gmail.com>
date: 2022-07-21T13:26:04-07:00
summary:

gh-95105: Return Iterator from wsgiref.types.InputStream.__iter__ (#95106)

files:
A Misc/NEWS.d/next/Library/2022-07-21-19-55-49.gh-issue-95105.BIX2Km.rst
M Lib/wsgiref/types.py

diff --git a/Lib/wsgiref/types.py b/Lib/wsgiref/types.py
index 9e74a6c7312b1..ef0aead5b28b6 100644
--- a/Lib/wsgiref/types.py
+++ b/Lib/wsgiref/types.py
@@ -1,6 +1,6 @@
 """WSGI-related types for static type checking"""
 
-from collections.abc import Callable, Iterable
+from collections.abc import Callable, Iterable, Iterator
 from types import TracebackType
 from typing import Any, Protocol, TypeAlias
 
@@ -35,7 +35,7 @@ class InputStream(Protocol):
     def read(self, size: int = ..., /) -> bytes: ...
     def readline(self, size: int = ..., /) -> bytes: ...
     def readlines(self, hint: int = ..., /) -> list[bytes]: ...
-    def __iter__(self) -> Iterable[bytes]: ...
+    def __iter__(self) -> Iterator[bytes]: ...
 
 class ErrorStream(Protocol):
     """WSGI error stream as defined in PEP 3333"""
diff --git a/Misc/NEWS.d/next/Library/2022-07-21-19-55-49.gh-issue-95105.BIX2Km.rst b/Misc/NEWS.d/next/Library/2022-07-21-19-55-49.gh-issue-95105.BIX2Km.rst
new file mode 100644
index 0000000000000..58af62b1edc87
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2022-07-21-19-55-49.gh-issue-95105.BIX2Km.rst
@@ -0,0 +1 @@
+:meth:`wsgiref.types.InputStream.__iter__` should return ``Iterator[bytes]``, not ``Iterable[bytes]``. Patch by Shantanu Jain.


From webhook-mailer at python.org  Thu Jul 21 16:52:38 2022
From: webhook-mailer at python.org (miss-islington)
Date: Thu, 21 Jul 2022 20:52:38 -0000
Subject: [Python-checkins] gh-95105: Return Iterator from
 wsgiref.types.InputStream.__iter__ (GH-95106)
Message-ID: <mailman.157.1658436759.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/deacc3c9a64801ec5ea497bf618b9de2cf32a86f
commit: deacc3c9a64801ec5ea497bf618b9de2cf32a86f
branch: 3.11
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-21T13:52:11-07:00
summary:

gh-95105: Return Iterator from wsgiref.types.InputStream.__iter__ (GH-95106)

(cherry picked from commit b4378948a066821ce5147940ce3c1a80bc018b3c)

Co-authored-by: Shantanu <12621235+hauntsaninja at users.noreply.github.com>

files:
A Misc/NEWS.d/next/Library/2022-07-21-19-55-49.gh-issue-95105.BIX2Km.rst
M Lib/wsgiref/types.py

diff --git a/Lib/wsgiref/types.py b/Lib/wsgiref/types.py
index 9e74a6c7312b1..ef0aead5b28b6 100644
--- a/Lib/wsgiref/types.py
+++ b/Lib/wsgiref/types.py
@@ -1,6 +1,6 @@
 """WSGI-related types for static type checking"""
 
-from collections.abc import Callable, Iterable
+from collections.abc import Callable, Iterable, Iterator
 from types import TracebackType
 from typing import Any, Protocol, TypeAlias
 
@@ -35,7 +35,7 @@ class InputStream(Protocol):
     def read(self, size: int = ..., /) -> bytes: ...
     def readline(self, size: int = ..., /) -> bytes: ...
     def readlines(self, hint: int = ..., /) -> list[bytes]: ...
-    def __iter__(self) -> Iterable[bytes]: ...
+    def __iter__(self) -> Iterator[bytes]: ...
 
 class ErrorStream(Protocol):
     """WSGI error stream as defined in PEP 3333"""
diff --git a/Misc/NEWS.d/next/Library/2022-07-21-19-55-49.gh-issue-95105.BIX2Km.rst b/Misc/NEWS.d/next/Library/2022-07-21-19-55-49.gh-issue-95105.BIX2Km.rst
new file mode 100644
index 0000000000000..58af62b1edc87
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2022-07-21-19-55-49.gh-issue-95105.BIX2Km.rst
@@ -0,0 +1 @@
+:meth:`wsgiref.types.InputStream.__iter__` should return ``Iterator[bytes]``, not ``Iterable[bytes]``. Patch by Shantanu Jain.


From webhook-mailer at python.org  Thu Jul 21 20:00:56 2022
From: webhook-mailer at python.org (terryjreedy)
Date: Fri, 22 Jul 2022 00:00:56 -0000
Subject: [Python-checkins] gh-95112: Fix What's New 3.10 contribution note
 periods (#95114)
Message-ID: <mailman.158.1658448056.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/c944649ffc06f155acea8454f9449fdccad0a74e
commit: c944649ffc06f155acea8454f9449fdccad0a74e
branch: main
author: Terry Jan Reedy <tjreedy at udel.edu>
committer: terryjreedy <tjreedy at udel.edu>
date: 2022-07-21T20:00:52-04:00
summary:

gh-95112: Fix What's New 3.10 contribution note periods (#95114)

Some are missing, a few placed after the ')'.
One ') was missing.

files:
M Doc/whatsnew/3.10.rst

diff --git a/Doc/whatsnew/3.10.rst b/Doc/whatsnew/3.10.rst
index e6e97d98f87f2..d0fbf0d216de3 100644
--- a/Doc/whatsnew/3.10.rst
+++ b/Doc/whatsnew/3.10.rst
@@ -230,7 +230,7 @@ have been incorporated. Some of the most notable ones are as follows:
                                               ^
         SyntaxError: expected ':'
 
-    (Contributed by Pablo Galindo in :issue:`42997`)
+    (Contributed by Pablo Galindo in :issue:`42997`.)
 
 * Unparenthesised tuples in comprehensions targets:
 
@@ -242,7 +242,7 @@ have been incorporated. Some of the most notable ones are as follows:
              ^
         SyntaxError: did you forget parentheses around the comprehension target?
 
-    (Contributed by Pablo Galindo in :issue:`43017`)
+    (Contributed by Pablo Galindo in :issue:`43017`.)
 
 * Missing commas in collection literals and between expressions:
 
@@ -257,7 +257,7 @@ have been incorporated. Some of the most notable ones are as follows:
                ^
         SyntaxError: invalid syntax. Perhaps you forgot a comma?
 
-    (Contributed by Pablo Galindo in :issue:`43822`)
+    (Contributed by Pablo Galindo in :issue:`43822`.)
 
 * Multiple Exception types without parentheses:
 
@@ -271,7 +271,7 @@ have been incorporated. Some of the most notable ones are as follows:
                    ^
         SyntaxError: multiple exception types must be parenthesized
 
-    (Contributed by Pablo Galindo in :issue:`43149`)
+    (Contributed by Pablo Galindo in :issue:`43149`.)
 
 * Missing ``:`` and values in dictionary literals:
 
@@ -293,7 +293,7 @@ have been incorporated. Some of the most notable ones are as follows:
                                 ^
         SyntaxError: ':' expected after dictionary key
 
-    (Contributed by Pablo Galindo in :issue:`43823`)
+    (Contributed by Pablo Galindo in :issue:`43823`.)
 
 * ``try`` blocks without ``except`` or ``finally`` blocks:
 
@@ -307,7 +307,7 @@ have been incorporated. Some of the most notable ones are as follows:
             ^^^^^^^^^
         SyntaxError: expected 'except' or 'finally' block
 
-    (Contributed by Pablo Galindo in :issue:`44305`)
+    (Contributed by Pablo Galindo in :issue:`44305`.)
 
 * Usage of ``=`` instead of ``==`` in comparisons:
 
@@ -319,7 +319,7 @@ have been incorporated. Some of the most notable ones are as follows:
                                ^
         SyntaxError: cannot assign to attribute here. Maybe you meant '==' instead of '='?
 
-    (Contributed by Pablo Galindo in :issue:`43797`)
+    (Contributed by Pablo Galindo in :issue:`43797`.)
 
 * Usage of ``*`` in f-strings:
 
@@ -331,7 +331,7 @@ have been incorporated. Some of the most notable ones are as follows:
              ^
         SyntaxError: f-string: cannot use starred expression here
 
-    (Contributed by Pablo Galindo in :issue:`41064`)
+    (Contributed by Pablo Galindo in :issue:`41064`.)
 
 IndentationErrors
 ~~~~~~~~~~~~~~~~~
@@ -1048,7 +1048,7 @@ keyword-only.  This will probably be the most common usage:
 
 Here, ``z`` and ``t`` are keyword-only parameters, while ``x`` and
 ``y`` are not.
-(Contributed by Eric V. Smith in :issue:`43532`)
+(Contributed by Eric V. Smith in :issue:`43532`.)
 
 .. _distutils-deprecated:
 
@@ -1266,11 +1266,11 @@ pathlib
 -------
 
 Add slice support to :attr:`PurePath.parents <pathlib.PurePath.parents>`.
-(Contributed by Joshua Cannon in :issue:`35498`)
+(Contributed by Joshua Cannon in :issue:`35498`.)
 
 Add negative indexing support to :attr:`PurePath.parents
 <pathlib.PurePath.parents>`.
-(Contributed by Yaroslav Pankovych in :issue:`21041`)
+(Contributed by Yaroslav Pankovych in :issue:`21041`.)
 
 Add :meth:`Path.hardlink_to <pathlib.Path.hardlink_to>` method that
 supersedes :meth:`~pathlib.Path.link_to`. The new method has the same argument
@@ -1288,7 +1288,7 @@ platform
 Add :func:`platform.freedesktop_os_release()` to retrieve operation system
 identification from `freedesktop.org os-release
 <https://www.freedesktop.org/software/systemd/man/os-release.html>`_ standard file.
-(Contributed by Christian Heimes in :issue:`28468`)
+(Contributed by Christian Heimes in :issue:`28468`.)
 
 pprint
 ------
@@ -1473,7 +1473,7 @@ and to match the behavior of static type checkers specified in the PEP.
 
 Add new function :func:`typing.is_typeddict` to introspect if an annotation
 is a :class:`typing.TypedDict`.
-(Contributed by Patrick Reader in :issue:`41792`)
+(Contributed by Patrick Reader in :issue:`41792`.)
 
 Subclasses of ``typing.Protocol`` which only have data variables declared
 will now raise a ``TypeError`` when checked with ``isinstance`` unless they
@@ -1481,14 +1481,14 @@ are decorated with :func:`runtime_checkable`.  Previously, these checks
 passed silently.  Users should decorate their
 subclasses with the :func:`runtime_checkable` decorator
 if they want runtime protocols.
-(Contributed by Yurii Karabas in :issue:`38908`)
+(Contributed by Yurii Karabas in :issue:`38908`.)
 
 Importing from the ``typing.io`` and ``typing.re`` submodules will now emit
 :exc:`DeprecationWarning`.  These submodules have been deprecated since
 Python 3.8 and will be removed in a future version of Python.  Anything
 belonging to those submodules should be imported directly from
 :mod:`typing` instead.
-(Contributed by Sebastian Rittau in :issue:`38291`)
+(Contributed by Sebastian Rittau in :issue:`38291`.)
 
 unittest
 --------
@@ -1566,7 +1566,7 @@ Optimizations
   strings, and the function object lazily converts this into the annotations dict
   on demand.  This optimization cuts the CPU time needed to define an annotated
   function by half.
-  (Contributed by Yurii Karabas and Inada Naoki in :issue:`42202`)
+  (Contributed by Yurii Karabas and Inada Naoki in :issue:`42202`.)
 
 * Substring search functions such as ``str1 in str2`` and ``str2.find(str1)``
   now sometimes use Crochemore & Perrin's "Two-Way" string searching
@@ -1575,16 +1575,16 @@ Optimizations
 
 * Add micro-optimizations to ``_PyType_Lookup()`` to improve type attribute cache lookup
   performance in the common case of cache hits. This makes the interpreter 1.04 times faster
-  on average. (Contributed by Dino Viehland in :issue:`43452`)
+  on average. (Contributed by Dino Viehland in :issue:`43452`.)
 
 * The following built-in functions now support the faster :pep:`590` vectorcall calling convention:
   :func:`map`, :func:`filter`, :func:`reversed`, :func:`bool` and :func:`float`.
-  (Contributed by Dong-hee Na and Jeroen Demeyer in :issue:`43575`, :issue:`43287`, :issue:`41922`, :issue:`41873` and :issue:`41870`)
+  (Contributed by Dong-hee Na and Jeroen Demeyer in :issue:`43575`, :issue:`43287`, :issue:`41922`, :issue:`41873` and :issue:`41870`.)
 
 * :class:`BZ2File` performance is improved by removing internal ``RLock``.
   This makes :class:`BZ2File` thread unsafe in the face of multiple simultaneous
   readers or writers, just like its equivalent classes in :mod:`gzip` and
-  :mod:`lzma` have always been.  (Contributed by Inada Naoki in :issue:`43785`).
+  :mod:`lzma` have always been.  (Contributed by Inada Naoki in :issue:`43785`.)
 
 .. _whatsnew310-deprecated:
 
@@ -1600,7 +1600,7 @@ Deprecated
   :keyword:`for`, :keyword:`if`, :keyword:`in`, :keyword:`is` and :keyword:`or`.
   In future releases it will be changed to syntax warning, and finally to
   syntax error.
-  (Contributed by Serhiy Storchaka in :issue:`43833`).
+  (Contributed by Serhiy Storchaka in :issue:`43833`.)
 
 * Starting in this release, there will be a concerted effort to begin
   cleaning up old import semantics that were kept for Python 2.7
@@ -1788,7 +1788,7 @@ Deprecated
   :exc:`DeprecationWarning`.  These submodules will be removed in a future version
   of Python.  Anything belonging to these submodules should be imported directly
   from :mod:`typing` instead.
-  (Contributed by Sebastian Rittau in :issue:`38291`)
+  (Contributed by Sebastian Rittau in :issue:`38291`.)
 
 .. _whatsnew310-removed:
 
@@ -1871,7 +1871,7 @@ Changes in the Python syntax
   syntax error.  To get rid of the warning and make the code compatible with
   future releases just add a space between the numeric literal and the
   following keyword.
-  (Contributed by Serhiy Storchaka in :issue:`43833`).
+  (Contributed by Serhiy Storchaka in :issue:`43833`.)
 
 .. _changes-python-api:
 
@@ -1981,7 +1981,7 @@ CPython bytecode changes
 
 * The ``MAKE_FUNCTION`` instruction now accepts either a dict or a tuple of
   strings as the function's annotations.
-  (Contributed by Yurii Karabas and Inada Naoki in :issue:`42202`)
+  (Contributed by Yurii Karabas and Inada Naoki in :issue:`42202`.)
 
 Build Changes
 =============
@@ -2197,7 +2197,7 @@ Porting to Python 3.10
   directory. These files must not be included directly, as they are already
   included in ``Python.h``: :ref:`Include Files <api-includes>`. If they have
   been included directly, consider including ``Python.h`` instead.
-  (Contributed by Nicholas Sim in :issue:`35134`)
+  (Contributed by Nicholas Sim in :issue:`35134`.)
 
 * Use the :c:data:`Py_TPFLAGS_IMMUTABLETYPE` type flag to create immutable type
   objects. Do not rely on :c:data:`Py_TPFLAGS_HEAPTYPE` to decide if a type
@@ -2207,7 +2207,7 @@ Porting to Python 3.10
 
 * The undocumented function ``Py_FrozenMain`` has been removed from the
   limited API. The function is mainly useful for custom builds of Python.
-  (Contributed by Petr Viktorin in :issue:`26241`)
+  (Contributed by Petr Viktorin in :issue:`26241`.)
 
 Deprecated
 ----------


From webhook-mailer at python.org  Thu Jul 21 20:08:57 2022
From: webhook-mailer at python.org (miss-islington)
Date: Fri, 22 Jul 2022 00:08:57 -0000
Subject: [Python-checkins] gh-95112: Fix What's New 3.10 contribution note
 periods (GH-95114)
Message-ID: <mailman.159.1658448537.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/79561860cda4349a5579b93b95d4622f81670360
commit: 79561860cda4349a5579b93b95d4622f81670360
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-21T17:08:47-07:00
summary:

gh-95112: Fix What's New 3.10 contribution note periods (GH-95114)


Some are missing, a few placed after the ')'.
One ') was missing.
(cherry picked from commit c944649ffc06f155acea8454f9449fdccad0a74e)

Co-authored-by: Terry Jan Reedy <tjreedy at udel.edu>

files:
M Doc/whatsnew/3.10.rst

diff --git a/Doc/whatsnew/3.10.rst b/Doc/whatsnew/3.10.rst
index 2ae3417283862..322e15e5e90a9 100644
--- a/Doc/whatsnew/3.10.rst
+++ b/Doc/whatsnew/3.10.rst
@@ -230,7 +230,7 @@ have been incorporated. Some of the most notable ones are as follows:
                                               ^
         SyntaxError: expected ':'
 
-    (Contributed by Pablo Galindo in :issue:`42997`)
+    (Contributed by Pablo Galindo in :issue:`42997`.)
 
 * Unparenthesised tuples in comprehensions targets:
 
@@ -242,7 +242,7 @@ have been incorporated. Some of the most notable ones are as follows:
              ^
         SyntaxError: did you forget parentheses around the comprehension target?
 
-    (Contributed by Pablo Galindo in :issue:`43017`)
+    (Contributed by Pablo Galindo in :issue:`43017`.)
 
 * Missing commas in collection literals and between expressions:
 
@@ -257,7 +257,7 @@ have been incorporated. Some of the most notable ones are as follows:
                ^
         SyntaxError: invalid syntax. Perhaps you forgot a comma?
 
-    (Contributed by Pablo Galindo in :issue:`43822`)
+    (Contributed by Pablo Galindo in :issue:`43822`.)
 
 * Multiple Exception types without parentheses:
 
@@ -271,7 +271,7 @@ have been incorporated. Some of the most notable ones are as follows:
                    ^
         SyntaxError: multiple exception types must be parenthesized
 
-    (Contributed by Pablo Galindo in :issue:`43149`)
+    (Contributed by Pablo Galindo in :issue:`43149`.)
 
 * Missing ``:`` and values in dictionary literals:
 
@@ -293,7 +293,7 @@ have been incorporated. Some of the most notable ones are as follows:
                                 ^
         SyntaxError: ':' expected after dictionary key
 
-    (Contributed by Pablo Galindo in :issue:`43823`)
+    (Contributed by Pablo Galindo in :issue:`43823`.)
 
 * ``try`` blocks without ``except`` or ``finally`` blocks:
 
@@ -307,7 +307,7 @@ have been incorporated. Some of the most notable ones are as follows:
             ^^^^^^^^^
         SyntaxError: expected 'except' or 'finally' block
 
-    (Contributed by Pablo Galindo in :issue:`44305`)
+    (Contributed by Pablo Galindo in :issue:`44305`.)
 
 * Usage of ``=`` instead of ``==`` in comparisons:
 
@@ -319,7 +319,7 @@ have been incorporated. Some of the most notable ones are as follows:
                                ^
         SyntaxError: cannot assign to attribute here. Maybe you meant '==' instead of '='?
 
-    (Contributed by Pablo Galindo in :issue:`43797`)
+    (Contributed by Pablo Galindo in :issue:`43797`.)
 
 * Usage of ``*`` in f-strings:
 
@@ -331,7 +331,7 @@ have been incorporated. Some of the most notable ones are as follows:
              ^
         SyntaxError: f-string: cannot use starred expression here
 
-    (Contributed by Pablo Galindo in :issue:`41064`)
+    (Contributed by Pablo Galindo in :issue:`41064`.)
 
 IndentationErrors
 ~~~~~~~~~~~~~~~~~
@@ -1048,7 +1048,7 @@ keyword-only.  This will probably be the most common usage:
 
 Here, ``z`` and ``t`` are keyword-only parameters, while ``x`` and
 ``y`` are not.
-(Contributed by Eric V. Smith in :issue:`43532`)
+(Contributed by Eric V. Smith in :issue:`43532`.)
 
 .. _distutils-deprecated:
 
@@ -1255,11 +1255,11 @@ pathlib
 -------
 
 Add slice support to :attr:`PurePath.parents <pathlib.PurePath.parents>`.
-(Contributed by Joshua Cannon in :issue:`35498`)
+(Contributed by Joshua Cannon in :issue:`35498`.)
 
 Add negative indexing support to :attr:`PurePath.parents
 <pathlib.PurePath.parents>`.
-(Contributed by Yaroslav Pankovych in :issue:`21041`)
+(Contributed by Yaroslav Pankovych in :issue:`21041`.)
 
 Add :meth:`Path.hardlink_to <pathlib.Path.hardlink_to>` method that
 supersedes :meth:`~pathlib.Path.link_to`. The new method has the same argument
@@ -1277,7 +1277,7 @@ platform
 Add :func:`platform.freedesktop_os_release()` to retrieve operation system
 identification from `freedesktop.org os-release
 <https://www.freedesktop.org/software/systemd/man/os-release.html>`_ standard file.
-(Contributed by Christian Heimes in :issue:`28468`)
+(Contributed by Christian Heimes in :issue:`28468`.)
 
 pprint
 ------
@@ -1462,7 +1462,7 @@ and to match the behavior of static type checkers specified in the PEP.
 
 Add new function :func:`typing.is_typeddict` to introspect if an annotation
 is a :class:`typing.TypedDict`.
-(Contributed by Patrick Reader in :issue:`41792`)
+(Contributed by Patrick Reader in :issue:`41792`.)
 
 Subclasses of ``typing.Protocol`` which only have data variables declared
 will now raise a ``TypeError`` when checked with ``isinstance`` unless they
@@ -1470,14 +1470,14 @@ are decorated with :func:`runtime_checkable`.  Previously, these checks
 passed silently.  Users should decorate their
 subclasses with the :func:`runtime_checkable` decorator
 if they want runtime protocols.
-(Contributed by Yurii Karabas in :issue:`38908`)
+(Contributed by Yurii Karabas in :issue:`38908`.)
 
 Importing from the ``typing.io`` and ``typing.re`` submodules will now emit
 :exc:`DeprecationWarning`.  These submodules have been deprecated since
 Python 3.8 and will be removed in a future version of Python.  Anything
 belonging to those submodules should be imported directly from
 :mod:`typing` instead.
-(Contributed by Sebastian Rittau in :issue:`38291`)
+(Contributed by Sebastian Rittau in :issue:`38291`.)
 
 unittest
 --------
@@ -1562,7 +1562,7 @@ Optimizations
   strings, and the function object lazily converts this into the annotations dict
   on demand.  This optimization cuts the CPU time needed to define an annotated
   function by half.
-  (Contributed by Yurii Karabas and Inada Naoki in :issue:`42202`)
+  (Contributed by Yurii Karabas and Inada Naoki in :issue:`42202`.)
 
 * Substring search functions such as ``str1 in str2`` and ``str2.find(str1)``
   now sometimes use Crochemore & Perrin's "Two-Way" string searching
@@ -1571,16 +1571,16 @@ Optimizations
 
 * Add micro-optimizations to ``_PyType_Lookup()`` to improve type attribute cache lookup
   performance in the common case of cache hits. This makes the interpreter 1.04 times faster
-  on average. (Contributed by Dino Viehland in :issue:`43452`)
+  on average. (Contributed by Dino Viehland in :issue:`43452`.)
 
 * The following built-in functions now support the faster :pep:`590` vectorcall calling convention:
   :func:`map`, :func:`filter`, :func:`reversed`, :func:`bool` and :func:`float`.
-  (Contributed by Dong-hee Na and Jeroen Demeyer in :issue:`43575`, :issue:`43287`, :issue:`41922`, :issue:`41873` and :issue:`41870`)
+  (Contributed by Dong-hee Na and Jeroen Demeyer in :issue:`43575`, :issue:`43287`, :issue:`41922`, :issue:`41873` and :issue:`41870`.)
 
 * :class:`BZ2File` performance is improved by removing internal ``RLock``.
   This makes :class:`BZ2File` thread unsafe in the face of multiple simultaneous
   readers or writers, just like its equivalent classes in :mod:`gzip` and
-  :mod:`lzma` have always been.  (Contributed by Inada Naoki in :issue:`43785`).
+  :mod:`lzma` have always been.  (Contributed by Inada Naoki in :issue:`43785`.)
 
 .. _whatsnew310-deprecated:
 
@@ -1596,7 +1596,7 @@ Deprecated
   :keyword:`for`, :keyword:`if`, :keyword:`in`, :keyword:`is` and :keyword:`or`.
   In future releases it will be changed to syntax warning, and finally to
   syntax error.
-  (Contributed by Serhiy Storchaka in :issue:`43833`).
+  (Contributed by Serhiy Storchaka in :issue:`43833`.)
 
 * Starting in this release, there will be a concerted effort to begin
   cleaning up old import semantics that were kept for Python 2.7
@@ -1784,7 +1784,7 @@ Deprecated
   :exc:`DeprecationWarning`.  These submodules will be removed in a future version
   of Python.  Anything belonging to these submodules should be imported directly
   from :mod:`typing` instead.
-  (Contributed by Sebastian Rittau in :issue:`38291`)
+  (Contributed by Sebastian Rittau in :issue:`38291`.)
 
 .. _whatsnew310-removed:
 
@@ -1867,7 +1867,7 @@ Changes in the Python syntax
   syntax error.  To get rid of the warning and make the code compatible with
   future releases just add a space between the numeric literal and the
   following keyword.
-  (Contributed by Serhiy Storchaka in :issue:`43833`).
+  (Contributed by Serhiy Storchaka in :issue:`43833`.)
 
 .. _changes-python-api:
 
@@ -1977,7 +1977,7 @@ CPython bytecode changes
 
 * The ``MAKE_FUNCTION`` instruction now accepts either a dict or a tuple of
   strings as the function's annotations.
-  (Contributed by Yurii Karabas and Inada Naoki in :issue:`42202`)
+  (Contributed by Yurii Karabas and Inada Naoki in :issue:`42202`.)
 
 Build Changes
 =============
@@ -2193,7 +2193,7 @@ Porting to Python 3.10
   directory. These files must not be included directly, as they are already
   included in ``Python.h``: :ref:`Include Files <api-includes>`. If they have
   been included directly, consider including ``Python.h`` instead.
-  (Contributed by Nicholas Sim in :issue:`35134`)
+  (Contributed by Nicholas Sim in :issue:`35134`.)
 
 * Use the :c:data:`Py_TPFLAGS_IMMUTABLETYPE` type flag to create immutable type
   objects. Do not rely on :c:data:`Py_TPFLAGS_HEAPTYPE` to decide if a type
@@ -2203,7 +2203,7 @@ Porting to Python 3.10
 
 * The undocumented function ``Py_FrozenMain`` has been removed from the
   limited API. The function is mainly useful for custom builds of Python.
-  (Contributed by Petr Viktorin in :issue:`26241`)
+  (Contributed by Petr Viktorin in :issue:`26241`.)
 
 Deprecated
 ----------


From webhook-mailer at python.org  Thu Jul 21 20:09:19 2022
From: webhook-mailer at python.org (miss-islington)
Date: Fri, 22 Jul 2022 00:09:19 -0000
Subject: [Python-checkins] gh-95112: Fix What's New 3.10 contribution note
 periods (GH-95114)
Message-ID: <mailman.160.1658448560.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/6c43f3e4961de18c237222217ffcacfee1278cef
commit: 6c43f3e4961de18c237222217ffcacfee1278cef
branch: 3.11
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-21T17:09:14-07:00
summary:

gh-95112: Fix What's New 3.10 contribution note periods (GH-95114)


Some are missing, a few placed after the ')'.
One ') was missing.
(cherry picked from commit c944649ffc06f155acea8454f9449fdccad0a74e)

Co-authored-by: Terry Jan Reedy <tjreedy at udel.edu>

files:
M Doc/whatsnew/3.10.rst

diff --git a/Doc/whatsnew/3.10.rst b/Doc/whatsnew/3.10.rst
index e6e97d98f87f2..d0fbf0d216de3 100644
--- a/Doc/whatsnew/3.10.rst
+++ b/Doc/whatsnew/3.10.rst
@@ -230,7 +230,7 @@ have been incorporated. Some of the most notable ones are as follows:
                                               ^
         SyntaxError: expected ':'
 
-    (Contributed by Pablo Galindo in :issue:`42997`)
+    (Contributed by Pablo Galindo in :issue:`42997`.)
 
 * Unparenthesised tuples in comprehensions targets:
 
@@ -242,7 +242,7 @@ have been incorporated. Some of the most notable ones are as follows:
              ^
         SyntaxError: did you forget parentheses around the comprehension target?
 
-    (Contributed by Pablo Galindo in :issue:`43017`)
+    (Contributed by Pablo Galindo in :issue:`43017`.)
 
 * Missing commas in collection literals and between expressions:
 
@@ -257,7 +257,7 @@ have been incorporated. Some of the most notable ones are as follows:
                ^
         SyntaxError: invalid syntax. Perhaps you forgot a comma?
 
-    (Contributed by Pablo Galindo in :issue:`43822`)
+    (Contributed by Pablo Galindo in :issue:`43822`.)
 
 * Multiple Exception types without parentheses:
 
@@ -271,7 +271,7 @@ have been incorporated. Some of the most notable ones are as follows:
                    ^
         SyntaxError: multiple exception types must be parenthesized
 
-    (Contributed by Pablo Galindo in :issue:`43149`)
+    (Contributed by Pablo Galindo in :issue:`43149`.)
 
 * Missing ``:`` and values in dictionary literals:
 
@@ -293,7 +293,7 @@ have been incorporated. Some of the most notable ones are as follows:
                                 ^
         SyntaxError: ':' expected after dictionary key
 
-    (Contributed by Pablo Galindo in :issue:`43823`)
+    (Contributed by Pablo Galindo in :issue:`43823`.)
 
 * ``try`` blocks without ``except`` or ``finally`` blocks:
 
@@ -307,7 +307,7 @@ have been incorporated. Some of the most notable ones are as follows:
             ^^^^^^^^^
         SyntaxError: expected 'except' or 'finally' block
 
-    (Contributed by Pablo Galindo in :issue:`44305`)
+    (Contributed by Pablo Galindo in :issue:`44305`.)
 
 * Usage of ``=`` instead of ``==`` in comparisons:
 
@@ -319,7 +319,7 @@ have been incorporated. Some of the most notable ones are as follows:
                                ^
         SyntaxError: cannot assign to attribute here. Maybe you meant '==' instead of '='?
 
-    (Contributed by Pablo Galindo in :issue:`43797`)
+    (Contributed by Pablo Galindo in :issue:`43797`.)
 
 * Usage of ``*`` in f-strings:
 
@@ -331,7 +331,7 @@ have been incorporated. Some of the most notable ones are as follows:
              ^
         SyntaxError: f-string: cannot use starred expression here
 
-    (Contributed by Pablo Galindo in :issue:`41064`)
+    (Contributed by Pablo Galindo in :issue:`41064`.)
 
 IndentationErrors
 ~~~~~~~~~~~~~~~~~
@@ -1048,7 +1048,7 @@ keyword-only.  This will probably be the most common usage:
 
 Here, ``z`` and ``t`` are keyword-only parameters, while ``x`` and
 ``y`` are not.
-(Contributed by Eric V. Smith in :issue:`43532`)
+(Contributed by Eric V. Smith in :issue:`43532`.)
 
 .. _distutils-deprecated:
 
@@ -1266,11 +1266,11 @@ pathlib
 -------
 
 Add slice support to :attr:`PurePath.parents <pathlib.PurePath.parents>`.
-(Contributed by Joshua Cannon in :issue:`35498`)
+(Contributed by Joshua Cannon in :issue:`35498`.)
 
 Add negative indexing support to :attr:`PurePath.parents
 <pathlib.PurePath.parents>`.
-(Contributed by Yaroslav Pankovych in :issue:`21041`)
+(Contributed by Yaroslav Pankovych in :issue:`21041`.)
 
 Add :meth:`Path.hardlink_to <pathlib.Path.hardlink_to>` method that
 supersedes :meth:`~pathlib.Path.link_to`. The new method has the same argument
@@ -1288,7 +1288,7 @@ platform
 Add :func:`platform.freedesktop_os_release()` to retrieve operation system
 identification from `freedesktop.org os-release
 <https://www.freedesktop.org/software/systemd/man/os-release.html>`_ standard file.
-(Contributed by Christian Heimes in :issue:`28468`)
+(Contributed by Christian Heimes in :issue:`28468`.)
 
 pprint
 ------
@@ -1473,7 +1473,7 @@ and to match the behavior of static type checkers specified in the PEP.
 
 Add new function :func:`typing.is_typeddict` to introspect if an annotation
 is a :class:`typing.TypedDict`.
-(Contributed by Patrick Reader in :issue:`41792`)
+(Contributed by Patrick Reader in :issue:`41792`.)
 
 Subclasses of ``typing.Protocol`` which only have data variables declared
 will now raise a ``TypeError`` when checked with ``isinstance`` unless they
@@ -1481,14 +1481,14 @@ are decorated with :func:`runtime_checkable`.  Previously, these checks
 passed silently.  Users should decorate their
 subclasses with the :func:`runtime_checkable` decorator
 if they want runtime protocols.
-(Contributed by Yurii Karabas in :issue:`38908`)
+(Contributed by Yurii Karabas in :issue:`38908`.)
 
 Importing from the ``typing.io`` and ``typing.re`` submodules will now emit
 :exc:`DeprecationWarning`.  These submodules have been deprecated since
 Python 3.8 and will be removed in a future version of Python.  Anything
 belonging to those submodules should be imported directly from
 :mod:`typing` instead.
-(Contributed by Sebastian Rittau in :issue:`38291`)
+(Contributed by Sebastian Rittau in :issue:`38291`.)
 
 unittest
 --------
@@ -1566,7 +1566,7 @@ Optimizations
   strings, and the function object lazily converts this into the annotations dict
   on demand.  This optimization cuts the CPU time needed to define an annotated
   function by half.
-  (Contributed by Yurii Karabas and Inada Naoki in :issue:`42202`)
+  (Contributed by Yurii Karabas and Inada Naoki in :issue:`42202`.)
 
 * Substring search functions such as ``str1 in str2`` and ``str2.find(str1)``
   now sometimes use Crochemore & Perrin's "Two-Way" string searching
@@ -1575,16 +1575,16 @@ Optimizations
 
 * Add micro-optimizations to ``_PyType_Lookup()`` to improve type attribute cache lookup
   performance in the common case of cache hits. This makes the interpreter 1.04 times faster
-  on average. (Contributed by Dino Viehland in :issue:`43452`)
+  on average. (Contributed by Dino Viehland in :issue:`43452`.)
 
 * The following built-in functions now support the faster :pep:`590` vectorcall calling convention:
   :func:`map`, :func:`filter`, :func:`reversed`, :func:`bool` and :func:`float`.
-  (Contributed by Dong-hee Na and Jeroen Demeyer in :issue:`43575`, :issue:`43287`, :issue:`41922`, :issue:`41873` and :issue:`41870`)
+  (Contributed by Dong-hee Na and Jeroen Demeyer in :issue:`43575`, :issue:`43287`, :issue:`41922`, :issue:`41873` and :issue:`41870`.)
 
 * :class:`BZ2File` performance is improved by removing internal ``RLock``.
   This makes :class:`BZ2File` thread unsafe in the face of multiple simultaneous
   readers or writers, just like its equivalent classes in :mod:`gzip` and
-  :mod:`lzma` have always been.  (Contributed by Inada Naoki in :issue:`43785`).
+  :mod:`lzma` have always been.  (Contributed by Inada Naoki in :issue:`43785`.)
 
 .. _whatsnew310-deprecated:
 
@@ -1600,7 +1600,7 @@ Deprecated
   :keyword:`for`, :keyword:`if`, :keyword:`in`, :keyword:`is` and :keyword:`or`.
   In future releases it will be changed to syntax warning, and finally to
   syntax error.
-  (Contributed by Serhiy Storchaka in :issue:`43833`).
+  (Contributed by Serhiy Storchaka in :issue:`43833`.)
 
 * Starting in this release, there will be a concerted effort to begin
   cleaning up old import semantics that were kept for Python 2.7
@@ -1788,7 +1788,7 @@ Deprecated
   :exc:`DeprecationWarning`.  These submodules will be removed in a future version
   of Python.  Anything belonging to these submodules should be imported directly
   from :mod:`typing` instead.
-  (Contributed by Sebastian Rittau in :issue:`38291`)
+  (Contributed by Sebastian Rittau in :issue:`38291`.)
 
 .. _whatsnew310-removed:
 
@@ -1871,7 +1871,7 @@ Changes in the Python syntax
   syntax error.  To get rid of the warning and make the code compatible with
   future releases just add a space between the numeric literal and the
   following keyword.
-  (Contributed by Serhiy Storchaka in :issue:`43833`).
+  (Contributed by Serhiy Storchaka in :issue:`43833`.)
 
 .. _changes-python-api:
 
@@ -1981,7 +1981,7 @@ CPython bytecode changes
 
 * The ``MAKE_FUNCTION`` instruction now accepts either a dict or a tuple of
   strings as the function's annotations.
-  (Contributed by Yurii Karabas and Inada Naoki in :issue:`42202`)
+  (Contributed by Yurii Karabas and Inada Naoki in :issue:`42202`.)
 
 Build Changes
 =============
@@ -2197,7 +2197,7 @@ Porting to Python 3.10
   directory. These files must not be included directly, as they are already
   included in ``Python.h``: :ref:`Include Files <api-includes>`. If they have
   been included directly, consider including ``Python.h`` instead.
-  (Contributed by Nicholas Sim in :issue:`35134`)
+  (Contributed by Nicholas Sim in :issue:`35134`.)
 
 * Use the :c:data:`Py_TPFLAGS_IMMUTABLETYPE` type flag to create immutable type
   objects. Do not rely on :c:data:`Py_TPFLAGS_HEAPTYPE` to decide if a type
@@ -2207,7 +2207,7 @@ Porting to Python 3.10
 
 * The undocumented function ``Py_FrozenMain`` has been removed from the
   limited API. The function is mainly useful for custom builds of Python.
-  (Contributed by Petr Viktorin in :issue:`26241`)
+  (Contributed by Petr Viktorin in :issue:`26241`.)
 
 Deprecated
 ----------


From webhook-mailer at python.org  Thu Jul 21 20:36:28 2022
From: webhook-mailer at python.org (terryjreedy)
Date: Fri, 22 Jul 2022 00:36:28 -0000
Subject: [Python-checkins] gh-95112: Fix What's New 3.11 contribution note
 periods (#95115)
Message-ID: <mailman.161.1658450188.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/8df8ef974374a3bb3ca3eef1ee676f7f173dad5c
commit: 8df8ef974374a3bb3ca3eef1ee676f7f173dad5c
branch: main
author: Terry Jan Reedy <tjreedy at udel.edu>
committer: terryjreedy <tjreedy at udel.edu>
date: 2022-07-21T20:35:56-04:00
summary:

gh-95112: Fix What's New 3.11 contribution note periods (#95115)

Some are missing, a few placed after the ')'.

files:
M Doc/whatsnew/3.11.rst

diff --git a/Doc/whatsnew/3.11.rst b/Doc/whatsnew/3.11.rst
index 63afbbb7f18e0..9cfed1c29afca 100644
--- a/Doc/whatsnew/3.11.rst
+++ b/Doc/whatsnew/3.11.rst
@@ -546,7 +546,7 @@ inspect
   line number, column and end column). The affected functions are:
   :func:`inspect.getframeinfo`, :func:`inspect.getouterframes`, :func:`inspect.getinnerframes`,
   :func:`inspect.stack` and :func:`inspect.trace`. (Contributed by Pablo Galindo in
-  :gh:`88116`)
+  :gh:`88116`.)
 
 locale
 ------
@@ -621,7 +621,7 @@ socket
 * :meth:`~socket.create_connection` has an option to raise, in case of
   failure to connect, an :exc:`ExceptionGroup` containing all errors
   instead of only raising the last error.
-  (Contributed by Irit Katriel in :issue:`29980`).
+  (Contributed by Irit Katriel in :issue:`29980`.)
 
 sqlite3
 -------
@@ -671,7 +671,7 @@ sqlite3
 
 * Add :meth:`~sqlite3.Connection.blobopen` to :class:`sqlite3.Connection`.
   :class:`sqlite3.Blob` allows incremental I/O operations on blobs.
-  (Contributed by Aviv Palivoda and Erlend E. Aasland in :issue:`24905`)
+  (Contributed by Aviv Palivoda and Erlend E. Aasland in :issue:`24905`.)
 
 
 sys
@@ -815,7 +815,7 @@ tkinter
 unicodedata
 -----------
 
-* The Unicode database has been updated to version 14.0.0. (:issue:`45190`).
+* The Unicode database has been updated to version 14.0.0. (Contributed by  Benjamin Peterson in :issue:`45190`).
 
 
 unittest
@@ -1533,7 +1533,7 @@ Build Changes
 * Freelists for object structs can now be disabled. A new :program:`configure`
   option :option:`!--without-freelists` can be used to disable all freelists
   except empty tuple singleton.
-  (Contributed by Christian Heimes in :issue:`45522`)
+  (Contributed by Christian Heimes in :issue:`45522`.)
 
 * ``Modules/Setup`` and ``Modules/makesetup`` have been improved and tied up.
   Extension modules can now be built through ``makesetup``. All except some


From webhook-mailer at python.org  Thu Jul 21 20:37:00 2022
From: webhook-mailer at python.org (terryjreedy)
Date: Fri, 22 Jul 2022 00:37:00 -0000
Subject: [Python-checkins] gh-95112: Fix What's New 3.12 contribution note
 periods (#95118)
Message-ID: <mailman.162.1658450221.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/d06c552e35fa80f71d927daa4c8465ee13f37cfc
commit: d06c552e35fa80f71d927daa4c8465ee13f37cfc
branch: main
author: Terry Jan Reedy <tjreedy at udel.edu>
committer: terryjreedy <tjreedy at udel.edu>
date: 2022-07-21T20:36:53-04:00
summary:

gh-95112: Fix What's New 3.12 contribution note periods (#95118)

A couple, so far, are missing.

files:
M Doc/whatsnew/3.12.rst

diff --git a/Doc/whatsnew/3.12.rst b/Doc/whatsnew/3.12.rst
index 15282a755c8ac..4a37e282b2a79 100644
--- a/Doc/whatsnew/3.12.rst
+++ b/Doc/whatsnew/3.12.rst
@@ -133,7 +133,7 @@ Deprecated
 ==========
 
 * :class:`typing.Hashable` and :class:`typing.Sized` aliases for :class:`collections.abc.Hashable`
-  and :class:`collections.abc.Sized`. (:gh:`94309`)
+  and :class:`collections.abc.Sized`. (:gh:`94309`.)
 
 * The :mod:`sqlite3` :ref:`default adapters and converters
   <sqlite3-default-converters>` are now deprecated.
@@ -264,7 +264,7 @@ Removed
   ``OptimizedUnicode`` can either use ``str`` explicitly, or rely on the
   default value which is also ``str``.
 
-  (Contributed by Erlend E. Aasland in :gh:`92548`)
+  (Contributed by Erlend E. Aasland in :gh:`92548`.)
 
 * The ``--experimental-isolated-subinterpreters`` configure flag
   (and corresponding ``EXPERIMENTAL_ISOLATED_SUBINTERPRETERS``)


From webhook-mailer at python.org  Thu Jul 21 20:38:20 2022
From: webhook-mailer at python.org (miss-islington)
Date: Fri, 22 Jul 2022 00:38:20 -0000
Subject: [Python-checkins] Fix typo in PROTOCOL_TO_TLS_VERSION in test_ssl
 (GH-95119)
Message-ID: <mailman.163.1658450302.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/934b25dcc492dcbca4da9d63d0d71dc940fc0375
commit: 934b25dcc492dcbca4da9d63d0d71dc940fc0375
branch: main
author: David Benjamin <davidben at google.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-21T17:38:15-07:00
summary:

Fix typo in PROTOCOL_TO_TLS_VERSION in test_ssl (GH-95119)



This appears to be a typo. It causes try_protocol_combo to try to turn
on SSL 3.0 when testing PROTOCOL_SSLv23 (aka PROTOCOL_TLS), which
doesn't make any sense. Fix it to be PROTOCOL_SSLv3.

Without this, try_protocol_combo is actually setting
context.minimum_version to SSLv3 when called as
try_protocol_combo(ssl.PROTOCOL_TLS, ssl.PROTOCOL_TLS, True)

One would think this causes a no-ssl3 OpenSSL build to fail, but OpenSSL
forgot to make SSL_CTX_set_min_proto_version(SSL3_VERSION) does not
notice no-ssl3, so this typo has gone undetected. But we should still
fix the typo because, presumably, a future version of OpenSSL will
remove SSL 3.0 and do so more thoroughly, at which point this will
break.

files:
M Lib/test/test_ssl.py

diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py
index 65f5d4a6d7094..0d0d14ac00260 100644
--- a/Lib/test/test_ssl.py
+++ b/Lib/test/test_ssl.py
@@ -47,7 +47,7 @@
 
 PROTOCOL_TO_TLS_VERSION = {}
 for proto, ver in (
-    ("PROTOCOL_SSLv23", "SSLv3"),
+    ("PROTOCOL_SSLv3", "SSLv3"),
     ("PROTOCOL_TLSv1", "TLSv1"),
     ("PROTOCOL_TLSv1_1", "TLSv1_1"),
 ):


From webhook-mailer at python.org  Thu Jul 21 20:45:10 2022
From: webhook-mailer at python.org (miss-islington)
Date: Fri, 22 Jul 2022 00:45:10 -0000
Subject: [Python-checkins] gh-95112: Fix What's New 3.11 contribution note
 periods (GH-95115)
Message-ID: <mailman.164.1658450711.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/a61aa529654b54e6dfee6ecf4bd61e8266c9ac30
commit: a61aa529654b54e6dfee6ecf4bd61e8266c9ac30
branch: 3.11
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-21T17:44:54-07:00
summary:

gh-95112: Fix What's New 3.11 contribution note periods (GH-95115)


Some are missing, a few placed after the ')'.
(cherry picked from commit 8df8ef974374a3bb3ca3eef1ee676f7f173dad5c)

Co-authored-by: Terry Jan Reedy <tjreedy at udel.edu>

files:
M Doc/whatsnew/3.11.rst

diff --git a/Doc/whatsnew/3.11.rst b/Doc/whatsnew/3.11.rst
index 58ecf335f87b1..defa0f78c75ca 100644
--- a/Doc/whatsnew/3.11.rst
+++ b/Doc/whatsnew/3.11.rst
@@ -546,7 +546,7 @@ inspect
   line number, column and end column). The affected functions are:
   :func:`inspect.getframeinfo`, :func:`inspect.getouterframes`, :func:`inspect.getinnerframes`,
   :func:`inspect.stack` and :func:`inspect.trace`. (Contributed by Pablo Galindo in
-  :gh:`88116`)
+  :gh:`88116`.)
 
 locale
 ------
@@ -621,7 +621,7 @@ socket
 * :meth:`~socket.create_connection` has an option to raise, in case of
   failure to connect, an :exc:`ExceptionGroup` containing all errors
   instead of only raising the last error.
-  (Contributed by Irit Katriel in :issue:`29980`).
+  (Contributed by Irit Katriel in :issue:`29980`.)
 
 sqlite3
 -------
@@ -671,7 +671,7 @@ sqlite3
 
 * Add :meth:`~sqlite3.Connection.blobopen` to :class:`sqlite3.Connection`.
   :class:`sqlite3.Blob` allows incremental I/O operations on blobs.
-  (Contributed by Aviv Palivoda and Erlend E. Aasland in :issue:`24905`)
+  (Contributed by Aviv Palivoda and Erlend E. Aasland in :issue:`24905`.)
 
 
 sys
@@ -815,7 +815,7 @@ tkinter
 unicodedata
 -----------
 
-* The Unicode database has been updated to version 14.0.0. (:issue:`45190`).
+* The Unicode database has been updated to version 14.0.0. (Contributed by  Benjamin Peterson in :issue:`45190`).
 
 
 unittest
@@ -1538,7 +1538,7 @@ Build Changes
 * Freelists for object structs can now be disabled. A new :program:`configure`
   option :option:`!--without-freelists` can be used to disable all freelists
   except empty tuple singleton.
-  (Contributed by Christian Heimes in :issue:`45522`)
+  (Contributed by Christian Heimes in :issue:`45522`.)
 
 * ``Modules/Setup`` and ``Modules/makesetup`` have been improved and tied up.
   Extension modules can now be built through ``makesetup``. All except some


From webhook-mailer at python.org  Fri Jul 22 03:34:52 2022
From: webhook-mailer at python.org (erlend-aasland)
Date: Fri, 22 Jul 2022 07:34:52 -0000
Subject: [Python-checkins] gh-81040: Improve sqlite3.Cursor.rowcount docs
 (#94940)
Message-ID: <mailman.165.1658475294.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/f9b3706df65c4962646587b437a4eb39289dfd4c
commit: f9b3706df65c4962646587b437a4eb39289dfd4c
branch: main
author: Erlend Egeberg Aasland <erlend.aasland at protonmail.com>
committer: erlend-aasland <erlend.aasland at protonmail.com>
date: 2022-07-22T09:34:39+02:00
summary:

gh-81040: Improve sqlite3.Cursor.rowcount docs (#94940)

files:
M Doc/library/sqlite3.rst

diff --git a/Doc/library/sqlite3.rst b/Doc/library/sqlite3.rst
index a7581f2fcbd8c..583a36d1ef46d 100644
--- a/Doc/library/sqlite3.rst
+++ b/Doc/library/sqlite3.rst
@@ -966,18 +966,11 @@ Cursor Objects
 
    .. attribute:: rowcount
 
-      Although the :class:`Cursor` class of the :mod:`sqlite3` module implements this
-      attribute, the database engine's own support for the determination of "rows
-      affected"/"rows selected" is quirky.
-
-      For :meth:`executemany` statements, the number of modifications are summed up
-      into :attr:`rowcount`.
-
-      As required by the Python DB API Spec, the :attr:`rowcount` attribute "is -1 in
-      case no ``executeXX()`` has been performed on the cursor or the rowcount of the
-      last operation is not determinable by the interface". This includes ``SELECT``
-      statements because we cannot determine the number of rows a query produced
-      until all rows were fetched.
+      Read-only attribute that provides the number of modified rows for
+      ``INSERT``, ``UPDATE``, ``DELETE``, and ``REPLACE`` statements;
+      is ``-1`` for other statements,
+      including :abbr:`CTE (Common Table Expression)` queries.
+      It is only updated by the :meth:`execute` and :meth:`executemany` methods.
 
    .. attribute:: lastrowid
 


From webhook-mailer at python.org  Fri Jul 22 03:42:01 2022
From: webhook-mailer at python.org (miss-islington)
Date: Fri, 22 Jul 2022 07:42:01 -0000
Subject: [Python-checkins] gh-81040: Improve sqlite3.Cursor.rowcount docs
 (GH-94940)
Message-ID: <mailman.166.1658475722.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/02f1cac28283d05d239fc3db12594a5a036bda14
commit: 02f1cac28283d05d239fc3db12594a5a036bda14
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-22T00:41:56-07:00
summary:

gh-81040: Improve sqlite3.Cursor.rowcount docs (GH-94940)

(cherry picked from commit f9b3706df65c4962646587b437a4eb39289dfd4c)

Co-authored-by: Erlend Egeberg Aasland <erlend.aasland at protonmail.com>

files:
M Doc/library/sqlite3.rst

diff --git a/Doc/library/sqlite3.rst b/Doc/library/sqlite3.rst
index 808adb1323015..c17756844856b 100644
--- a/Doc/library/sqlite3.rst
+++ b/Doc/library/sqlite3.rst
@@ -793,18 +793,11 @@ Cursor Objects
 
    .. attribute:: rowcount
 
-      Although the :class:`Cursor` class of the :mod:`sqlite3` module implements this
-      attribute, the database engine's own support for the determination of "rows
-      affected"/"rows selected" is quirky.
-
-      For :meth:`executemany` statements, the number of modifications are summed up
-      into :attr:`rowcount`.
-
-      As required by the Python DB API Spec, the :attr:`rowcount` attribute "is -1 in
-      case no ``executeXX()`` has been performed on the cursor or the rowcount of the
-      last operation is not determinable by the interface". This includes ``SELECT``
-      statements because we cannot determine the number of rows a query produced
-      until all rows were fetched.
+      Read-only attribute that provides the number of modified rows for
+      ``INSERT``, ``UPDATE``, ``DELETE``, and ``REPLACE`` statements;
+      is ``-1`` for other statements,
+      including :abbr:`CTE (Common Table Expression)` queries.
+      It is only updated by the :meth:`execute` and :meth:`executemany` methods.
 
    .. attribute:: lastrowid
 


From webhook-mailer at python.org  Fri Jul 22 03:43:17 2022
From: webhook-mailer at python.org (miss-islington)
Date: Fri, 22 Jul 2022 07:43:17 -0000
Subject: [Python-checkins] gh-81040: Improve sqlite3.Cursor.rowcount docs
 (GH-94940)
Message-ID: <mailman.167.1658475799.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/12b56e4b78a68b06f7e64aa349218f75ebb75ee6
commit: 12b56e4b78a68b06f7e64aa349218f75ebb75ee6
branch: 3.11
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-22T00:43:12-07:00
summary:

gh-81040: Improve sqlite3.Cursor.rowcount docs (GH-94940)

(cherry picked from commit f9b3706df65c4962646587b437a4eb39289dfd4c)

Co-authored-by: Erlend Egeberg Aasland <erlend.aasland at protonmail.com>

files:
M Doc/library/sqlite3.rst

diff --git a/Doc/library/sqlite3.rst b/Doc/library/sqlite3.rst
index 9da7b5403cca3..28f3b32014afa 100644
--- a/Doc/library/sqlite3.rst
+++ b/Doc/library/sqlite3.rst
@@ -956,18 +956,11 @@ Cursor Objects
 
    .. attribute:: rowcount
 
-      Although the :class:`Cursor` class of the :mod:`sqlite3` module implements this
-      attribute, the database engine's own support for the determination of "rows
-      affected"/"rows selected" is quirky.
-
-      For :meth:`executemany` statements, the number of modifications are summed up
-      into :attr:`rowcount`.
-
-      As required by the Python DB API Spec, the :attr:`rowcount` attribute "is -1 in
-      case no ``executeXX()`` has been performed on the cursor or the rowcount of the
-      last operation is not determinable by the interface". This includes ``SELECT``
-      statements because we cannot determine the number of rows a query produced
-      until all rows were fetched.
+      Read-only attribute that provides the number of modified rows for
+      ``INSERT``, ``UPDATE``, ``DELETE``, and ``REPLACE`` statements;
+      is ``-1`` for other statements,
+      including :abbr:`CTE (Common Table Expression)` queries.
+      It is only updated by the :meth:`execute` and :meth:`executemany` methods.
 
    .. attribute:: lastrowid
 


From webhook-mailer at python.org  Fri Jul 22 12:19:17 2022
From: webhook-mailer at python.org (Mariatta)
Date: Fri, 22 Jul 2022 16:19:17 -0000
Subject: [Python-checkins] Use Markdown Headers in GitHub Issue templates
 (GH-95111)
Message-ID: <mailman.168.1658506757.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/8a808952a61b4bd572d95f5efbff1680c59aa507
commit: 8a808952a61b4bd572d95f5efbff1680c59aa507
branch: main
author: Mariatta Wijaya <Mariatta at users.noreply.github.com>
committer: Mariatta <Mariatta at users.noreply.github.com>
date: 2022-07-22T09:19:08-07:00
summary:

Use Markdown Headers in GitHub Issue templates (GH-95111)

The Issue templates are using the markup to make text bold.
We should be using proper text headers instead.

I replaced the **bold** text markup with L1 headers.

files:
M .github/ISSUE_TEMPLATE/bug.md
M .github/ISSUE_TEMPLATE/crash.md
M .github/ISSUE_TEMPLATE/documentation.md
M .github/ISSUE_TEMPLATE/feature.md

diff --git a/.github/ISSUE_TEMPLATE/bug.md b/.github/ISSUE_TEMPLATE/bug.md
index 7bdca2112b287..1d93e0735e50f 100644
--- a/.github/ISSUE_TEMPLATE/bug.md
+++ b/.github/ISSUE_TEMPLATE/bug.md
@@ -15,12 +15,12 @@ labels: "type-bug"
     your problem has already been reported
 -->
 
-**Bug report**
+# Bug report
 
 A clear and concise description of what the bug is.
 Include a minimal, reproducible example (https://stackoverflow.com/help/minimal-reproducible-example), if possible.
 
-**Your environment**
+# Your environment
 
 <!-- Include as many relevant details as possible about the environment you experienced the bug in -->
 
diff --git a/.github/ISSUE_TEMPLATE/crash.md b/.github/ISSUE_TEMPLATE/crash.md
index 28d7bfec19381..dad3423db0341 100644
--- a/.github/ISSUE_TEMPLATE/crash.md
+++ b/.github/ISSUE_TEMPLATE/crash.md
@@ -13,15 +13,15 @@ labels: "type-crash"
   For CPython, a "crash" is when Python itself fails, leading to a traceback in the C stack.
 -->
 
-**Crash report**
+# Crash report
 
 Tell us what happened, ideally including a minimal, reproducible example (https://stackoverflow.com/help/minimal-reproducible-example).
 
-**Error messages**
+# Error messages
 
 Enter any relevant error message caused by the crash, including a core dump if there is one.
 
-**Your environment**
+# Your environment
 
 <!-- Include as many relevant details as possible about the environment you experienced the bug in -->
 
diff --git a/.github/ISSUE_TEMPLATE/documentation.md b/.github/ISSUE_TEMPLATE/documentation.md
index 669c92adb4753..174fd39171d47 100644
--- a/.github/ISSUE_TEMPLATE/documentation.md
+++ b/.github/ISSUE_TEMPLATE/documentation.md
@@ -4,6 +4,6 @@ about: Report a problem with the documentation
 labels: "docs"
 ---
 
-**Documentation**
+# Documentation
 
 (A clear and concise description of the issue.)
diff --git a/.github/ISSUE_TEMPLATE/feature.md b/.github/ISSUE_TEMPLATE/feature.md
index 635ea43545f49..ed051e945f812 100644
--- a/.github/ISSUE_TEMPLATE/feature.md
+++ b/.github/ISSUE_TEMPLATE/feature.md
@@ -4,16 +4,16 @@ about: Submit a proposal for a new CPython feature or enhancement
 labels: "type-feature"
 ---
 
-**Feature or enhancement**
+# Feature or enhancement
 
 (A clear and concise description of your proposal.)
 
-**Pitch**
+# Pitch
 
 (Explain why this feature or enhancement should be implemented and how it would be used.
  Add examples, if applicable.)
 
-**Previous discussion**
+# Previous discussion
 
 <!--
   New features to Python should first be discussed elsewhere before creating issues on GitHub,


From webhook-mailer at python.org  Fri Jul 22 12:37:32 2022
From: webhook-mailer at python.org (zware)
Date: Fri, 22 Jul 2022 16:37:32 -0000
Subject: [Python-checkins] Closes gh-95133: docs,
 fix indentation level in TestCase.assertLogs example (GH-95134)
Message-ID: <mailman.169.1658507853.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/2a9c227ac11f7d8fc6d756542dd3410be0a6b6b0
commit: 2a9c227ac11f7d8fc6d756542dd3410be0a6b6b0
branch: main
author: Alexandru M?r??teanu <alexei at users.noreply.github.com>
committer: zware <zachary.ware at gmail.com>
date: 2022-07-22T11:37:22-05:00
summary:

Closes gh-95133: docs, fix indentation level in TestCase.assertLogs example (GH-95134)

files:
M Doc/library/unittest.rst

diff --git a/Doc/library/unittest.rst b/Doc/library/unittest.rst
index 331f67cba23b5..38be6b82b492d 100644
--- a/Doc/library/unittest.rst
+++ b/Doc/library/unittest.rst
@@ -1150,8 +1150,8 @@ Test cases
       Example::
 
          with self.assertLogs('foo', level='INFO') as cm:
-            logging.getLogger('foo').info('first message')
-            logging.getLogger('foo.bar').error('second message')
+             logging.getLogger('foo').info('first message')
+             logging.getLogger('foo.bar').error('second message')
          self.assertEqual(cm.output, ['INFO:foo:first message',
                                       'ERROR:foo.bar:second message'])
 


From webhook-mailer at python.org  Fri Jul 22 12:45:30 2022
From: webhook-mailer at python.org (miss-islington)
Date: Fri, 22 Jul 2022 16:45:30 -0000
Subject: [Python-checkins] Closes gh-95133: docs,
 fix indentation level in TestCase.assertLogs example (GH-95134)
Message-ID: <mailman.170.1658508332.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/6a3b6c2cee91a09243ed7db99a5bbd1539cc5a02
commit: 6a3b6c2cee91a09243ed7db99a5bbd1539cc5a02
branch: 3.11
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-22T09:45:20-07:00
summary:

Closes gh-95133: docs, fix indentation level in TestCase.assertLogs example (GH-95134)

(cherry picked from commit 2a9c227ac11f7d8fc6d756542dd3410be0a6b6b0)

Co-authored-by: Alexandru M?r??teanu <alexei at users.noreply.github.com>

files:
M Doc/library/unittest.rst

diff --git a/Doc/library/unittest.rst b/Doc/library/unittest.rst
index e07a32b88b1c3..87571d896e112 100644
--- a/Doc/library/unittest.rst
+++ b/Doc/library/unittest.rst
@@ -1150,8 +1150,8 @@ Test cases
       Example::
 
          with self.assertLogs('foo', level='INFO') as cm:
-            logging.getLogger('foo').info('first message')
-            logging.getLogger('foo.bar').error('second message')
+             logging.getLogger('foo').info('first message')
+             logging.getLogger('foo.bar').error('second message')
          self.assertEqual(cm.output, ['INFO:foo:first message',
                                       'ERROR:foo.bar:second message'])
 


From webhook-mailer at python.org  Fri Jul 22 12:46:03 2022
From: webhook-mailer at python.org (miss-islington)
Date: Fri, 22 Jul 2022 16:46:03 -0000
Subject: [Python-checkins] Closes gh-95133: docs,
 fix indentation level in TestCase.assertLogs example (GH-95134)
Message-ID: <mailman.171.1658508364.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/e50a63ed180a93bb7de1f6f91cb8ba23a817875d
commit: e50a63ed180a93bb7de1f6f91cb8ba23a817875d
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-22T09:45:58-07:00
summary:

Closes gh-95133: docs, fix indentation level in TestCase.assertLogs example (GH-95134)

(cherry picked from commit 2a9c227ac11f7d8fc6d756542dd3410be0a6b6b0)

Co-authored-by: Alexandru M?r??teanu <alexei at users.noreply.github.com>

files:
M Doc/library/unittest.rst

diff --git a/Doc/library/unittest.rst b/Doc/library/unittest.rst
index 67fec60263a4c..0c3fc31b93a94 100644
--- a/Doc/library/unittest.rst
+++ b/Doc/library/unittest.rst
@@ -1122,8 +1122,8 @@ Test cases
       Example::
 
          with self.assertLogs('foo', level='INFO') as cm:
-            logging.getLogger('foo').info('first message')
-            logging.getLogger('foo.bar').error('second message')
+             logging.getLogger('foo').info('first message')
+             logging.getLogger('foo.bar').error('second message')
          self.assertEqual(cm.output, ['INFO:foo:first message',
                                       'ERROR:foo.bar:second message'])
 


From webhook-mailer at python.org  Fri Jul 22 12:46:46 2022
From: webhook-mailer at python.org (zware)
Date: Fri, 22 Jul 2022 16:46:46 -0000
Subject: [Python-checkins] Fix incorrect directive in multiprocessing module
 documentation (GH-93517)
Message-ID: <mailman.172.1658508407.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/346aabf916e8f6d9ea9fa9b9e21502faec92e502
commit: 346aabf916e8f6d9ea9fa9b9e21502faec92e502
branch: main
author: oda-gitso <105083118+oda-gitso at users.noreply.github.com>
committer: zware <zachary.ware at gmail.com>
date: 2022-07-22T11:46:42-05:00
summary:

Fix incorrect directive in multiprocessing module documentation (GH-93517)

files:
M Doc/library/multiprocessing.rst

diff --git a/Doc/library/multiprocessing.rst b/Doc/library/multiprocessing.rst
index a8e35bc084747..3eb98791726de 100644
--- a/Doc/library/multiprocessing.rst
+++ b/Doc/library/multiprocessing.rst
@@ -1706,7 +1706,7 @@ their parent process exits.  The manager classes are defined in the
    shutdown times out, the process is terminated. If terminating the process
    also times out, the process is killed.
 
-   .. versionchanged: 3.11
+   .. versionchanged:: 3.11
       Added the *shutdown_timeout* parameter.
 
    .. method:: start([initializer[, initargs]])


From webhook-mailer at python.org  Fri Jul 22 12:51:23 2022
From: webhook-mailer at python.org (zware)
Date: Fri, 22 Jul 2022 16:51:23 -0000
Subject: [Python-checkins] Fix scheme count in `sysconfig` whatsnew entry
 (GH-94110)
Message-ID: <mailman.173.1658508685.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/9c47cf337c595618dcac81efdefb8254e8ee2edf
commit: 9c47cf337c595618dcac81efdefb8254e8ee2edf
branch: main
author: Frank Dana <ferdnyc at gmail.com>
committer: zware <zachary.ware at gmail.com>
date: 2022-07-22T11:51:14-05:00
summary:

Fix scheme count in `sysconfig` whatsnew entry (GH-94110)

files:
M Doc/whatsnew/3.11.rst

diff --git a/Doc/whatsnew/3.11.rst b/Doc/whatsnew/3.11.rst
index 9cfed1c29afca..8b2cb90fb1553 100644
--- a/Doc/whatsnew/3.11.rst
+++ b/Doc/whatsnew/3.11.rst
@@ -694,7 +694,7 @@ sys
 sysconfig
 ---------
 
-* Two new :ref:`installation schemes <installation_paths>`
+* Three new :ref:`installation schemes <installation_paths>`
   (*posix_venv*, *nt_venv* and *venv*) were added and are used when Python
   creates new virtual environments or when it is running from a virtual
   environment.


From webhook-mailer at python.org  Fri Jul 22 12:57:21 2022
From: webhook-mailer at python.org (miss-islington)
Date: Fri, 22 Jul 2022 16:57:21 -0000
Subject: [Python-checkins] Fix incorrect directive in multiprocessing module
 documentation (GH-93517)
Message-ID: <mailman.174.1658509042.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/791c3fd2c9cb0c02d9389fdf96016b2fcfb9c36c
commit: 791c3fd2c9cb0c02d9389fdf96016b2fcfb9c36c
branch: 3.11
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-22T09:57:07-07:00
summary:

Fix incorrect directive in multiprocessing module documentation (GH-93517)

(cherry picked from commit 346aabf916e8f6d9ea9fa9b9e21502faec92e502)

Co-authored-by: oda-gitso <105083118+oda-gitso at users.noreply.github.com>

files:
M Doc/library/multiprocessing.rst

diff --git a/Doc/library/multiprocessing.rst b/Doc/library/multiprocessing.rst
index a8e35bc084747..3eb98791726de 100644
--- a/Doc/library/multiprocessing.rst
+++ b/Doc/library/multiprocessing.rst
@@ -1706,7 +1706,7 @@ their parent process exits.  The manager classes are defined in the
    shutdown times out, the process is terminated. If terminating the process
    also times out, the process is killed.
 
-   .. versionchanged: 3.11
+   .. versionchanged:: 3.11
       Added the *shutdown_timeout* parameter.
 
    .. method:: start([initializer[, initargs]])


From webhook-mailer at python.org  Fri Jul 22 12:58:41 2022
From: webhook-mailer at python.org (miss-islington)
Date: Fri, 22 Jul 2022 16:58:41 -0000
Subject: [Python-checkins] Fix scheme count in `sysconfig` whatsnew entry
 (GH-94110)
Message-ID: <mailman.175.1658509121.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/0fda8742a4059d84dbd37f2c75cc1ecebadeba56
commit: 0fda8742a4059d84dbd37f2c75cc1ecebadeba56
branch: 3.11
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-22T09:58:34-07:00
summary:

Fix scheme count in `sysconfig` whatsnew entry (GH-94110)

(cherry picked from commit 9c47cf337c595618dcac81efdefb8254e8ee2edf)

Co-authored-by: Frank Dana <ferdnyc at gmail.com>

files:
M Doc/whatsnew/3.11.rst

diff --git a/Doc/whatsnew/3.11.rst b/Doc/whatsnew/3.11.rst
index defa0f78c75ca..b26e0049a4a4c 100644
--- a/Doc/whatsnew/3.11.rst
+++ b/Doc/whatsnew/3.11.rst
@@ -694,7 +694,7 @@ sys
 sysconfig
 ---------
 
-* Two new :ref:`installation schemes <installation_paths>`
+* Three new :ref:`installation schemes <installation_paths>`
   (*posix_venv*, *nt_venv* and *venv*) were added and are used when Python
   creates new virtual environments or when it is running from a virtual
   environment.


From webhook-mailer at python.org  Fri Jul 22 13:03:26 2022
From: webhook-mailer at python.org (zware)
Date: Fri, 22 Jul 2022 17:03:26 -0000
Subject: [Python-checkins] Fix async method reference links in
 `compound_stmts` docs (GH-94935)
Message-ID: <mailman.176.1658509407.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/79d2f549adcbbefd4f2c0a0c9dd572bbbf252c62
commit: 79d2f549adcbbefd4f2c0a0c9dd572bbbf252c62
branch: main
author: July Tikhonov <july.tikh at gmail.com>
committer: zware <zachary.ware at gmail.com>
date: 2022-07-22T12:03:17-05:00
summary:

Fix async method reference links in `compound_stmts` docs (GH-94935)

files:
M Doc/reference/compound_stmts.rst

diff --git a/Doc/reference/compound_stmts.rst b/Doc/reference/compound_stmts.rst
index 688407195f05d..93c1720220f04 100644
--- a/Doc/reference/compound_stmts.rst
+++ b/Doc/reference/compound_stmts.rst
@@ -1495,7 +1495,7 @@ Is semantically equivalent to::
     else:
         SUITE2
 
-See also :meth:`__aiter__` and :meth:`__anext__` for details.
+See also :meth:`~object.__aiter__` and :meth:`~object.__anext__` for details.
 
 It is a :exc:`SyntaxError` to use an ``async for`` statement outside the
 body of a coroutine function.
@@ -1537,7 +1537,7 @@ is semantically equivalent to::
         if not hit_except:
             await aexit(manager, None, None, None)
 
-See also :meth:`__aenter__` and :meth:`__aexit__` for details.
+See also :meth:`~object.__aenter__` and :meth:`~object.__aexit__` for details.
 
 It is a :exc:`SyntaxError` to use an ``async with`` statement outside the
 body of a coroutine function.


From webhook-mailer at python.org  Fri Jul 22 13:11:34 2022
From: webhook-mailer at python.org (miss-islington)
Date: Fri, 22 Jul 2022 17:11:34 -0000
Subject: [Python-checkins] Fix async method reference links in
 `compound_stmts` docs (GH-94935)
Message-ID: <mailman.177.1658509895.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/665e5585f4f30e1ae73b478dc3f954d80e5c95b4
commit: 665e5585f4f30e1ae73b478dc3f954d80e5c95b4
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-22T10:11:25-07:00
summary:

Fix async method reference links in `compound_stmts` docs (GH-94935)

(cherry picked from commit 79d2f549adcbbefd4f2c0a0c9dd572bbbf252c62)

Co-authored-by: July Tikhonov <july.tikh at gmail.com>

files:
M Doc/reference/compound_stmts.rst

diff --git a/Doc/reference/compound_stmts.rst b/Doc/reference/compound_stmts.rst
index 871c101996b15..2b429681e1a6d 100644
--- a/Doc/reference/compound_stmts.rst
+++ b/Doc/reference/compound_stmts.rst
@@ -1447,7 +1447,7 @@ Is semantically equivalent to::
     else:
         SUITE2
 
-See also :meth:`__aiter__` and :meth:`__anext__` for details.
+See also :meth:`~object.__aiter__` and :meth:`~object.__anext__` for details.
 
 It is a :exc:`SyntaxError` to use an ``async for`` statement outside the
 body of a coroutine function.
@@ -1489,7 +1489,7 @@ is semantically equivalent to::
         if not hit_except:
             await aexit(manager, None, None, None)
 
-See also :meth:`__aenter__` and :meth:`__aexit__` for details.
+See also :meth:`~object.__aenter__` and :meth:`~object.__aexit__` for details.
 
 It is a :exc:`SyntaxError` to use an ``async with`` statement outside the
 body of a coroutine function.


From webhook-mailer at python.org  Fri Jul 22 13:13:12 2022
From: webhook-mailer at python.org (miss-islington)
Date: Fri, 22 Jul 2022 17:13:12 -0000
Subject: [Python-checkins] Fix async method reference links in
 `compound_stmts` docs (GH-94935)
Message-ID: <mailman.178.1658509993.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/e99496e1c20253d0d2e2e016509cd9c2fa24dd85
commit: e99496e1c20253d0d2e2e016509cd9c2fa24dd85
branch: 3.11
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-22T10:13:02-07:00
summary:

Fix async method reference links in `compound_stmts` docs (GH-94935)

(cherry picked from commit 79d2f549adcbbefd4f2c0a0c9dd572bbbf252c62)

Co-authored-by: July Tikhonov <july.tikh at gmail.com>

files:
M Doc/reference/compound_stmts.rst

diff --git a/Doc/reference/compound_stmts.rst b/Doc/reference/compound_stmts.rst
index 688407195f05d..93c1720220f04 100644
--- a/Doc/reference/compound_stmts.rst
+++ b/Doc/reference/compound_stmts.rst
@@ -1495,7 +1495,7 @@ Is semantically equivalent to::
     else:
         SUITE2
 
-See also :meth:`__aiter__` and :meth:`__anext__` for details.
+See also :meth:`~object.__aiter__` and :meth:`~object.__anext__` for details.
 
 It is a :exc:`SyntaxError` to use an ``async for`` statement outside the
 body of a coroutine function.
@@ -1537,7 +1537,7 @@ is semantically equivalent to::
         if not hit_except:
             await aexit(manager, None, None, None)
 
-See also :meth:`__aenter__` and :meth:`__aexit__` for details.
+See also :meth:`~object.__aenter__` and :meth:`~object.__aexit__` for details.
 
 It is a :exc:`SyntaxError` to use an ``async with`` statement outside the
 body of a coroutine function.


From webhook-mailer at python.org  Fri Jul 22 14:04:30 2022
From: webhook-mailer at python.org (brandtbucher)
Date: Fri, 22 Jul 2022 18:04:30 -0000
Subject: [Python-checkins] GH-95113: Don't use EXTENDED_ARG_QUICK in
 unquickened code (GH-95121)
Message-ID: <mailman.179.1658513071.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/e402b26b7fb953a2f0c17a0044bb6d6cbd726e54
commit: e402b26b7fb953a2f0c17a0044bb6d6cbd726e54
branch: main
author: Brandt Bucher <brandtbucher at microsoft.com>
committer: brandtbucher <brandtbucher at gmail.com>
date: 2022-07-22T11:04:20-07:00
summary:

GH-95113: Don't use EXTENDED_ARG_QUICK in unquickened code (GH-95121)

files:
A Misc/NEWS.d/next/Core and Builtins/2022-07-21-17-54-52.gh-issue-95113.NnSLpT.rst
M Include/internal/pycore_opcode.h
M Lib/test/test_dis.py
M Objects/codeobject.c
M Python/ceval.c
M Python/compile.c
M Python/specialize.c
M Tools/scripts/generate_opcode_h.py

diff --git a/Include/internal/pycore_opcode.h b/Include/internal/pycore_opcode.h
index 3ca678d3dd85b..90bf5bbd1baa0 100644
--- a/Include/internal/pycore_opcode.h
+++ b/Include/internal/pycore_opcode.h
@@ -16,8 +16,6 @@ extern const uint8_t _PyOpcode_Caches[256];
 
 extern const uint8_t _PyOpcode_Deopt[256];
 
-extern const uint8_t _PyOpcode_Original[256];
-
 #ifdef NEED_OPCODE_TABLES
 static const uint32_t _PyOpcode_RelativeJump[9] = {
     0U,
@@ -240,192 +238,6 @@ const uint8_t _PyOpcode_Deopt[256] = {
     [WITH_EXCEPT_START] = WITH_EXCEPT_START,
     [YIELD_VALUE] = YIELD_VALUE,
 };
-
-const uint8_t _PyOpcode_Original[256] = {
-    [ASYNC_GEN_WRAP] = ASYNC_GEN_WRAP,
-    [BEFORE_ASYNC_WITH] = BEFORE_ASYNC_WITH,
-    [BEFORE_WITH] = BEFORE_WITH,
-    [BINARY_OP] = BINARY_OP,
-    [BINARY_OP_ADAPTIVE] = BINARY_OP,
-    [BINARY_OP_ADD_FLOAT] = BINARY_OP,
-    [BINARY_OP_ADD_INT] = BINARY_OP,
-    [BINARY_OP_ADD_UNICODE] = BINARY_OP,
-    [BINARY_OP_INPLACE_ADD_UNICODE] = BINARY_OP,
-    [BINARY_OP_MULTIPLY_FLOAT] = BINARY_OP,
-    [BINARY_OP_MULTIPLY_INT] = BINARY_OP,
-    [BINARY_OP_SUBTRACT_FLOAT] = BINARY_OP,
-    [BINARY_OP_SUBTRACT_INT] = BINARY_OP,
-    [BINARY_SLICE] = BINARY_SLICE,
-    [BINARY_SUBSCR] = BINARY_SUBSCR,
-    [BINARY_SUBSCR_ADAPTIVE] = BINARY_SUBSCR,
-    [BINARY_SUBSCR_DICT] = BINARY_SUBSCR,
-    [BINARY_SUBSCR_GETITEM] = BINARY_SUBSCR,
-    [BINARY_SUBSCR_LIST_INT] = BINARY_SUBSCR,
-    [BINARY_SUBSCR_TUPLE_INT] = BINARY_SUBSCR,
-    [BUILD_CONST_KEY_MAP] = BUILD_CONST_KEY_MAP,
-    [BUILD_LIST] = BUILD_LIST,
-    [BUILD_MAP] = BUILD_MAP,
-    [BUILD_SET] = BUILD_SET,
-    [BUILD_SLICE] = BUILD_SLICE,
-    [BUILD_STRING] = BUILD_STRING,
-    [BUILD_TUPLE] = BUILD_TUPLE,
-    [CACHE] = CACHE,
-    [CALL] = CALL,
-    [CALL_ADAPTIVE] = CALL,
-    [CALL_BOUND_METHOD_EXACT_ARGS] = CALL,
-    [CALL_BUILTIN_CLASS] = CALL,
-    [CALL_BUILTIN_FAST_WITH_KEYWORDS] = CALL,
-    [CALL_FUNCTION_EX] = CALL_FUNCTION_EX,
-    [CALL_METHOD_DESCRIPTOR_FAST_WITH_KEYWORDS] = CALL,
-    [CALL_NO_KW_BUILTIN_FAST] = CALL,
-    [CALL_NO_KW_BUILTIN_O] = CALL,
-    [CALL_NO_KW_ISINSTANCE] = CALL,
-    [CALL_NO_KW_LEN] = CALL,
-    [CALL_NO_KW_LIST_APPEND] = CALL,
-    [CALL_NO_KW_METHOD_DESCRIPTOR_FAST] = CALL,
-    [CALL_NO_KW_METHOD_DESCRIPTOR_NOARGS] = CALL,
-    [CALL_NO_KW_METHOD_DESCRIPTOR_O] = CALL,
-    [CALL_NO_KW_STR_1] = CALL,
-    [CALL_NO_KW_TUPLE_1] = CALL,
-    [CALL_NO_KW_TYPE_1] = CALL,
-    [CALL_PY_EXACT_ARGS] = CALL,
-    [CALL_PY_WITH_DEFAULTS] = CALL,
-    [CHECK_EG_MATCH] = CHECK_EG_MATCH,
-    [CHECK_EXC_MATCH] = CHECK_EXC_MATCH,
-    [COMPARE_OP] = COMPARE_OP,
-    [COMPARE_OP_ADAPTIVE] = COMPARE_OP,
-    [COMPARE_OP_FLOAT_JUMP] = COMPARE_OP,
-    [COMPARE_OP_INT_JUMP] = COMPARE_OP,
-    [COMPARE_OP_STR_JUMP] = COMPARE_OP,
-    [CONTAINS_OP] = CONTAINS_OP,
-    [COPY] = COPY,
-    [COPY_FREE_VARS] = COPY_FREE_VARS,
-    [DELETE_ATTR] = DELETE_ATTR,
-    [DELETE_DEREF] = DELETE_DEREF,
-    [DELETE_FAST] = DELETE_FAST,
-    [DELETE_GLOBAL] = DELETE_GLOBAL,
-    [DELETE_NAME] = DELETE_NAME,
-    [DELETE_SUBSCR] = DELETE_SUBSCR,
-    [DICT_MERGE] = DICT_MERGE,
-    [DICT_UPDATE] = DICT_UPDATE,
-    [END_ASYNC_FOR] = END_ASYNC_FOR,
-    [EXTENDED_ARG] = EXTENDED_ARG_QUICK,
-    [EXTENDED_ARG_QUICK] = EXTENDED_ARG_QUICK,
-    [FORMAT_VALUE] = FORMAT_VALUE,
-    [FOR_ITER] = FOR_ITER,
-    [FOR_ITER_ADAPTIVE] = FOR_ITER,
-    [FOR_ITER_LIST] = FOR_ITER,
-    [FOR_ITER_RANGE] = FOR_ITER,
-    [GET_AITER] = GET_AITER,
-    [GET_ANEXT] = GET_ANEXT,
-    [GET_AWAITABLE] = GET_AWAITABLE,
-    [GET_ITER] = GET_ITER,
-    [GET_LEN] = GET_LEN,
-    [GET_YIELD_FROM_ITER] = GET_YIELD_FROM_ITER,
-    [IMPORT_FROM] = IMPORT_FROM,
-    [IMPORT_NAME] = IMPORT_NAME,
-    [IMPORT_STAR] = IMPORT_STAR,
-    [IS_OP] = IS_OP,
-    [JUMP_BACKWARD] = JUMP_BACKWARD,
-    [JUMP_BACKWARD_NO_INTERRUPT] = JUMP_BACKWARD_NO_INTERRUPT,
-    [JUMP_BACKWARD_QUICK] = JUMP_BACKWARD,
-    [JUMP_FORWARD] = JUMP_FORWARD,
-    [JUMP_IF_FALSE_OR_POP] = JUMP_IF_FALSE_OR_POP,
-    [JUMP_IF_TRUE_OR_POP] = JUMP_IF_TRUE_OR_POP,
-    [KW_NAMES] = KW_NAMES,
-    [LIST_APPEND] = LIST_APPEND,
-    [LIST_EXTEND] = LIST_EXTEND,
-    [LIST_TO_TUPLE] = LIST_TO_TUPLE,
-    [LOAD_ASSERTION_ERROR] = LOAD_ASSERTION_ERROR,
-    [LOAD_ATTR] = LOAD_ATTR,
-    [LOAD_ATTR_ADAPTIVE] = LOAD_ATTR,
-    [LOAD_ATTR_CLASS] = LOAD_ATTR,
-    [LOAD_ATTR_INSTANCE_VALUE] = LOAD_ATTR,
-    [LOAD_ATTR_METHOD_LAZY_DICT] = LOAD_ATTR,
-    [LOAD_ATTR_METHOD_NO_DICT] = LOAD_ATTR,
-    [LOAD_ATTR_METHOD_WITH_DICT] = LOAD_ATTR,
-    [LOAD_ATTR_METHOD_WITH_VALUES] = LOAD_ATTR,
-    [LOAD_ATTR_MODULE] = LOAD_ATTR,
-    [LOAD_ATTR_PROPERTY] = LOAD_ATTR,
-    [LOAD_ATTR_SLOT] = LOAD_ATTR,
-    [LOAD_ATTR_WITH_HINT] = LOAD_ATTR,
-    [LOAD_BUILD_CLASS] = LOAD_BUILD_CLASS,
-    [LOAD_CLASSDEREF] = LOAD_CLASSDEREF,
-    [LOAD_CLOSURE] = LOAD_CLOSURE,
-    [LOAD_CONST] = LOAD_CONST,
-    [LOAD_CONST__LOAD_FAST] = LOAD_CONST,
-    [LOAD_DEREF] = LOAD_DEREF,
-    [LOAD_FAST] = LOAD_FAST,
-    [LOAD_FAST_CHECK] = LOAD_FAST_CHECK,
-    [LOAD_FAST__LOAD_CONST] = LOAD_FAST,
-    [LOAD_FAST__LOAD_FAST] = LOAD_FAST,
-    [LOAD_GLOBAL] = LOAD_GLOBAL,
-    [LOAD_GLOBAL_ADAPTIVE] = LOAD_GLOBAL,
-    [LOAD_GLOBAL_BUILTIN] = LOAD_GLOBAL,
-    [LOAD_GLOBAL_MODULE] = LOAD_GLOBAL,
-    [LOAD_NAME] = LOAD_NAME,
-    [MAKE_CELL] = MAKE_CELL,
-    [MAKE_FUNCTION] = MAKE_FUNCTION,
-    [MAP_ADD] = MAP_ADD,
-    [MATCH_CLASS] = MATCH_CLASS,
-    [MATCH_KEYS] = MATCH_KEYS,
-    [MATCH_MAPPING] = MATCH_MAPPING,
-    [MATCH_SEQUENCE] = MATCH_SEQUENCE,
-    [NOP] = NOP,
-    [POP_EXCEPT] = POP_EXCEPT,
-    [POP_JUMP_BACKWARD_IF_FALSE] = POP_JUMP_BACKWARD_IF_FALSE,
-    [POP_JUMP_BACKWARD_IF_NONE] = POP_JUMP_BACKWARD_IF_NONE,
-    [POP_JUMP_BACKWARD_IF_NOT_NONE] = POP_JUMP_BACKWARD_IF_NOT_NONE,
-    [POP_JUMP_BACKWARD_IF_TRUE] = POP_JUMP_BACKWARD_IF_TRUE,
-    [POP_JUMP_FORWARD_IF_FALSE] = POP_JUMP_FORWARD_IF_FALSE,
-    [POP_JUMP_FORWARD_IF_NONE] = POP_JUMP_FORWARD_IF_NONE,
-    [POP_JUMP_FORWARD_IF_NOT_NONE] = POP_JUMP_FORWARD_IF_NOT_NONE,
-    [POP_JUMP_FORWARD_IF_TRUE] = POP_JUMP_FORWARD_IF_TRUE,
-    [POP_TOP] = POP_TOP,
-    [PREP_RERAISE_STAR] = PREP_RERAISE_STAR,
-    [PRINT_EXPR] = PRINT_EXPR,
-    [PUSH_EXC_INFO] = PUSH_EXC_INFO,
-    [PUSH_NULL] = PUSH_NULL,
-    [RAISE_VARARGS] = RAISE_VARARGS,
-    [RERAISE] = RERAISE,
-    [RESUME] = RESUME,
-    [RESUME_QUICK] = RESUME,
-    [RETURN_GENERATOR] = RETURN_GENERATOR,
-    [RETURN_VALUE] = RETURN_VALUE,
-    [SEND] = SEND,
-    [SETUP_ANNOTATIONS] = SETUP_ANNOTATIONS,
-    [SET_ADD] = SET_ADD,
-    [SET_UPDATE] = SET_UPDATE,
-    [STORE_ATTR] = STORE_ATTR,
-    [STORE_ATTR_ADAPTIVE] = STORE_ATTR,
-    [STORE_ATTR_INSTANCE_VALUE] = STORE_ATTR,
-    [STORE_ATTR_SLOT] = STORE_ATTR,
-    [STORE_ATTR_WITH_HINT] = STORE_ATTR,
-    [STORE_DEREF] = STORE_DEREF,
-    [STORE_FAST] = STORE_FAST,
-    [STORE_FAST__LOAD_FAST] = STORE_FAST,
-    [STORE_FAST__STORE_FAST] = STORE_FAST,
-    [STORE_GLOBAL] = STORE_GLOBAL,
-    [STORE_NAME] = STORE_NAME,
-    [STORE_SLICE] = STORE_SLICE,
-    [STORE_SUBSCR] = STORE_SUBSCR,
-    [STORE_SUBSCR_ADAPTIVE] = STORE_SUBSCR,
-    [STORE_SUBSCR_DICT] = STORE_SUBSCR,
-    [STORE_SUBSCR_LIST_INT] = STORE_SUBSCR,
-    [SWAP] = SWAP,
-    [UNARY_INVERT] = UNARY_INVERT,
-    [UNARY_NEGATIVE] = UNARY_NEGATIVE,
-    [UNARY_NOT] = UNARY_NOT,
-    [UNARY_POSITIVE] = UNARY_POSITIVE,
-    [UNPACK_EX] = UNPACK_EX,
-    [UNPACK_SEQUENCE] = UNPACK_SEQUENCE,
-    [UNPACK_SEQUENCE_ADAPTIVE] = UNPACK_SEQUENCE,
-    [UNPACK_SEQUENCE_LIST] = UNPACK_SEQUENCE,
-    [UNPACK_SEQUENCE_TUPLE] = UNPACK_SEQUENCE,
-    [UNPACK_SEQUENCE_TWO_TUPLE] = UNPACK_SEQUENCE,
-    [WITH_EXCEPT_START] = WITH_EXCEPT_START,
-    [YIELD_VALUE] = YIELD_VALUE,
-};
 #endif   // NEED_OPCODE_TABLES
 
 #ifdef Py_DEBUG
diff --git a/Lib/test/test_dis.py b/Lib/test/test_dis.py
index 440e4ed5eacfb..f07e7c8605478 100644
--- a/Lib/test/test_dis.py
+++ b/Lib/test/test_dis.py
@@ -744,7 +744,7 @@ def extended_arg_quick():
 %3d           0 RESUME                   0
 
 %3d           2 LOAD_CONST               1 (Ellipsis)
-              4 EXTENDED_ARG_QUICK       1
+              4 EXTENDED_ARG             1
               6 UNPACK_EX              256
               8 STORE_FAST               0 (_)
              10 STORE_FAST               0 (_)
diff --git a/Misc/NEWS.d/next/Core and Builtins/2022-07-21-17-54-52.gh-issue-95113.NnSLpT.rst b/Misc/NEWS.d/next/Core and Builtins/2022-07-21-17-54-52.gh-issue-95113.NnSLpT.rst
new file mode 100644
index 0000000000000..c2ff6c90ac8c1
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2022-07-21-17-54-52.gh-issue-95113.NnSLpT.rst	
@@ -0,0 +1,4 @@
+Replace all ``EXTENDED_ARG_QUICK`` instructions with basic
+:opcode:`EXTENDED_ARG` instructions in unquickened code. Consumers of
+non-adaptive bytecode should be able to handle extended arguments the same
+way they were handled in CPython 3.10 and older.
diff --git a/Objects/codeobject.c b/Objects/codeobject.c
index 76e430ae1c501..2f757c4d8a986 100644
--- a/Objects/codeobject.c
+++ b/Objects/codeobject.c
@@ -1418,7 +1418,7 @@ deopt_code(_Py_CODEUNIT *instructions, Py_ssize_t len)
 {
     for (int i = 0; i < len; i++) {
         _Py_CODEUNIT instruction = instructions[i];
-        int opcode = _PyOpcode_Original[_Py_OPCODE(instruction)];
+        int opcode = _PyOpcode_Deopt[_Py_OPCODE(instruction)];
         int caches = _PyOpcode_Caches[opcode];
         instructions[i] = _Py_MAKECODEUNIT(opcode, _Py_OPARG(instruction));
         while (caches--) {
diff --git a/Python/ceval.c b/Python/ceval.c
index 88d13c83bc2e6..3a9b0e569f02a 100644
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -5631,8 +5631,16 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, _PyInterpreterFrame *frame, int
             assert(oparg);
             oparg <<= 8;
             oparg |= _Py_OPARG(*next_instr);
+            // We might be tracing. To avoid breaking tracing guarantees in 
+            // quickened instructions, always deoptimize the next opcode:
             opcode = _PyOpcode_Deopt[_Py_OPCODE(*next_instr)];
             PRE_DISPATCH_GOTO();
+            // CPython hasn't traced the following instruction historically
+            // (DO_TRACING would clobber our extended oparg anyways), so just
+            // skip our usual cframe.use_tracing check before dispatch. Also,
+            // make sure the next instruction isn't a RESUME, since that needs
+            // to trace properly (and shouldn't have an extended arg anyways):
+            assert(opcode != RESUME);
             DISPATCH_GOTO();
         }
 
diff --git a/Python/compile.c b/Python/compile.c
index 52b7d9242eb2b..9db61fb47de78 100644
--- a/Python/compile.c
+++ b/Python/compile.c
@@ -211,13 +211,13 @@ write_instr(_Py_CODEUNIT *codestr, struct instr *instruction, int ilen)
     int caches = _PyOpcode_Caches[opcode];
     switch (ilen - caches) {
         case 4:
-            *codestr++ = _Py_MAKECODEUNIT(EXTENDED_ARG_QUICK, (oparg >> 24) & 0xFF);
+            *codestr++ = _Py_MAKECODEUNIT(EXTENDED_ARG, (oparg >> 24) & 0xFF);
             /* fall through */
         case 3:
-            *codestr++ = _Py_MAKECODEUNIT(EXTENDED_ARG_QUICK, (oparg >> 16) & 0xFF);
+            *codestr++ = _Py_MAKECODEUNIT(EXTENDED_ARG, (oparg >> 16) & 0xFF);
             /* fall through */
         case 2:
-            *codestr++ = _Py_MAKECODEUNIT(EXTENDED_ARG_QUICK, (oparg >> 8) & 0xFF);
+            *codestr++ = _Py_MAKECODEUNIT(EXTENDED_ARG, (oparg >> 8) & 0xFF);
             /* fall through */
         case 1:
             *codestr++ = _Py_MAKECODEUNIT(opcode, oparg & 0xFF);
diff --git a/Python/specialize.c b/Python/specialize.c
index 6f1f3cbc71f43..53b2ae82b9836 100644
--- a/Python/specialize.c
+++ b/Python/specialize.c
@@ -295,6 +295,9 @@ _PyCode_Quicken(PyCodeObject *code)
         else {
             assert(!_PyOpcode_Caches[opcode]);
             switch (opcode) {
+                case EXTENDED_ARG:
+                    _Py_SET_OPCODE(instructions[i], EXTENDED_ARG_QUICK);
+                    break;
                 case JUMP_BACKWARD:
                     _Py_SET_OPCODE(instructions[i], JUMP_BACKWARD_QUICK);
                     break;
diff --git a/Tools/scripts/generate_opcode_h.py b/Tools/scripts/generate_opcode_h.py
index 1d21af8cac281..9ff264af9cdc2 100644
--- a/Tools/scripts/generate_opcode_h.py
+++ b/Tools/scripts/generate_opcode_h.py
@@ -131,7 +131,6 @@ def main(opcode_py, outfile='Include/opcode.h', internaloutfile='Include/interna
 
         iobj.write("\nextern const uint8_t _PyOpcode_Caches[256];\n")
         iobj.write("\nextern const uint8_t _PyOpcode_Deopt[256];\n")
-        iobj.write("\nextern const uint8_t _PyOpcode_Original[256];\n")
         iobj.write("\n#ifdef NEED_OPCODE_TABLES\n")
         write_int_array_from_ops("_PyOpcode_RelativeJump", opcode['hasjrel'], iobj)
         write_int_array_from_ops("_PyOpcode_Jump", opcode['hasjrel'] + opcode['hasjabs'], iobj)
@@ -153,12 +152,6 @@ def main(opcode_py, outfile='Include/opcode.h', internaloutfile='Include/interna
         for opt, deopt in sorted(deoptcodes.items()):
             iobj.write(f"    [{opt}] = {deopt},\n")
         iobj.write("};\n")
-        iobj.write("\nconst uint8_t _PyOpcode_Original[256] = {\n")
-        for opt, deopt in sorted(deoptcodes.items()):
-            if opt.startswith("EXTENDED_ARG"):
-                deopt = "EXTENDED_ARG_QUICK"
-            iobj.write(f"    [{opt}] = {deopt},\n")
-        iobj.write("};\n")
         iobj.write("#endif   // NEED_OPCODE_TABLES\n")
 
         fobj.write("\n")


From webhook-mailer at python.org  Fri Jul 22 14:56:21 2022
From: webhook-mailer at python.org (brandtbucher)
Date: Fri, 22 Jul 2022 18:56:21 -0000
Subject: [Python-checkins] [3.11] GH-95113: Don't use EXTENDED_ARG_QUICK in
 unquickened code (GH-95121) (GH-95143)
Message-ID: <mailman.180.1658516182.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/5a48ab01e93c92594eac777c499d1e728ddf1f7e
commit: 5a48ab01e93c92594eac777c499d1e728ddf1f7e
branch: 3.11
author: Brandt Bucher <brandtbucher at microsoft.com>
committer: brandtbucher <brandtbucher at gmail.com>
date: 2022-07-22T11:56:10-07:00
summary:

[3.11] GH-95113: Don't use EXTENDED_ARG_QUICK in unquickened code (GH-95121) (GH-95143)

(cherry picked from commit e402b26b7fb953a2f0c17a0044bb6d6cbd726e54)

files:
A Misc/NEWS.d/next/Core and Builtins/2022-07-21-17-54-52.gh-issue-95113.NnSLpT.rst
M Include/internal/pycore_opcode.h
M Lib/test/test_dis.py
M Objects/codeobject.c
M Python/ceval.c
M Python/compile.c
M Python/specialize.c
M Tools/scripts/generate_opcode_h.py

diff --git a/Include/internal/pycore_opcode.h b/Include/internal/pycore_opcode.h
index 09f6501467133..eadcba1add0ae 100644
--- a/Include/internal/pycore_opcode.h
+++ b/Include/internal/pycore_opcode.h
@@ -16,8 +16,6 @@ extern const uint8_t _PyOpcode_Caches[256];
 
 extern const uint8_t _PyOpcode_Deopt[256];
 
-extern const uint8_t _PyOpcode_Original[256];
-
 #ifdef NEED_OPCODE_TABLES
 static const uint32_t _PyOpcode_RelativeJump[8] = {
     0U,
@@ -237,190 +235,6 @@ const uint8_t _PyOpcode_Deopt[256] = {
     [WITH_EXCEPT_START] = WITH_EXCEPT_START,
     [YIELD_VALUE] = YIELD_VALUE,
 };
-
-const uint8_t _PyOpcode_Original[256] = {
-    [ASYNC_GEN_WRAP] = ASYNC_GEN_WRAP,
-    [BEFORE_ASYNC_WITH] = BEFORE_ASYNC_WITH,
-    [BEFORE_WITH] = BEFORE_WITH,
-    [BINARY_OP] = BINARY_OP,
-    [BINARY_OP_ADAPTIVE] = BINARY_OP,
-    [BINARY_OP_ADD_FLOAT] = BINARY_OP,
-    [BINARY_OP_ADD_INT] = BINARY_OP,
-    [BINARY_OP_ADD_UNICODE] = BINARY_OP,
-    [BINARY_OP_INPLACE_ADD_UNICODE] = BINARY_OP,
-    [BINARY_OP_MULTIPLY_FLOAT] = BINARY_OP,
-    [BINARY_OP_MULTIPLY_INT] = BINARY_OP,
-    [BINARY_OP_SUBTRACT_FLOAT] = BINARY_OP,
-    [BINARY_OP_SUBTRACT_INT] = BINARY_OP,
-    [BINARY_SUBSCR] = BINARY_SUBSCR,
-    [BINARY_SUBSCR_ADAPTIVE] = BINARY_SUBSCR,
-    [BINARY_SUBSCR_DICT] = BINARY_SUBSCR,
-    [BINARY_SUBSCR_GETITEM] = BINARY_SUBSCR,
-    [BINARY_SUBSCR_LIST_INT] = BINARY_SUBSCR,
-    [BINARY_SUBSCR_TUPLE_INT] = BINARY_SUBSCR,
-    [BUILD_CONST_KEY_MAP] = BUILD_CONST_KEY_MAP,
-    [BUILD_LIST] = BUILD_LIST,
-    [BUILD_MAP] = BUILD_MAP,
-    [BUILD_SET] = BUILD_SET,
-    [BUILD_SLICE] = BUILD_SLICE,
-    [BUILD_STRING] = BUILD_STRING,
-    [BUILD_TUPLE] = BUILD_TUPLE,
-    [CACHE] = CACHE,
-    [CALL] = CALL,
-    [CALL_ADAPTIVE] = CALL,
-    [CALL_FUNCTION_EX] = CALL_FUNCTION_EX,
-    [CALL_PY_EXACT_ARGS] = CALL,
-    [CALL_PY_WITH_DEFAULTS] = CALL,
-    [CHECK_EG_MATCH] = CHECK_EG_MATCH,
-    [CHECK_EXC_MATCH] = CHECK_EXC_MATCH,
-    [COMPARE_OP] = COMPARE_OP,
-    [COMPARE_OP_ADAPTIVE] = COMPARE_OP,
-    [COMPARE_OP_FLOAT_JUMP] = COMPARE_OP,
-    [COMPARE_OP_INT_JUMP] = COMPARE_OP,
-    [COMPARE_OP_STR_JUMP] = COMPARE_OP,
-    [CONTAINS_OP] = CONTAINS_OP,
-    [COPY] = COPY,
-    [COPY_FREE_VARS] = COPY_FREE_VARS,
-    [DELETE_ATTR] = DELETE_ATTR,
-    [DELETE_DEREF] = DELETE_DEREF,
-    [DELETE_FAST] = DELETE_FAST,
-    [DELETE_GLOBAL] = DELETE_GLOBAL,
-    [DELETE_NAME] = DELETE_NAME,
-    [DELETE_SUBSCR] = DELETE_SUBSCR,
-    [DICT_MERGE] = DICT_MERGE,
-    [DICT_UPDATE] = DICT_UPDATE,
-    [END_ASYNC_FOR] = END_ASYNC_FOR,
-    [EXTENDED_ARG] = EXTENDED_ARG_QUICK,
-    [EXTENDED_ARG_QUICK] = EXTENDED_ARG_QUICK,
-    [FORMAT_VALUE] = FORMAT_VALUE,
-    [FOR_ITER] = FOR_ITER,
-    [GET_AITER] = GET_AITER,
-    [GET_ANEXT] = GET_ANEXT,
-    [GET_AWAITABLE] = GET_AWAITABLE,
-    [GET_ITER] = GET_ITER,
-    [GET_LEN] = GET_LEN,
-    [GET_YIELD_FROM_ITER] = GET_YIELD_FROM_ITER,
-    [IMPORT_FROM] = IMPORT_FROM,
-    [IMPORT_NAME] = IMPORT_NAME,
-    [IMPORT_STAR] = IMPORT_STAR,
-    [IS_OP] = IS_OP,
-    [JUMP_BACKWARD] = JUMP_BACKWARD,
-    [JUMP_BACKWARD_NO_INTERRUPT] = JUMP_BACKWARD_NO_INTERRUPT,
-    [JUMP_BACKWARD_QUICK] = JUMP_BACKWARD,
-    [JUMP_FORWARD] = JUMP_FORWARD,
-    [JUMP_IF_FALSE_OR_POP] = JUMP_IF_FALSE_OR_POP,
-    [JUMP_IF_TRUE_OR_POP] = JUMP_IF_TRUE_OR_POP,
-    [KW_NAMES] = KW_NAMES,
-    [LIST_APPEND] = LIST_APPEND,
-    [LIST_EXTEND] = LIST_EXTEND,
-    [LIST_TO_TUPLE] = LIST_TO_TUPLE,
-    [LOAD_ASSERTION_ERROR] = LOAD_ASSERTION_ERROR,
-    [LOAD_ATTR] = LOAD_ATTR,
-    [LOAD_ATTR_ADAPTIVE] = LOAD_ATTR,
-    [LOAD_ATTR_INSTANCE_VALUE] = LOAD_ATTR,
-    [LOAD_ATTR_MODULE] = LOAD_ATTR,
-    [LOAD_ATTR_SLOT] = LOAD_ATTR,
-    [LOAD_ATTR_WITH_HINT] = LOAD_ATTR,
-    [LOAD_BUILD_CLASS] = LOAD_BUILD_CLASS,
-    [LOAD_CLASSDEREF] = LOAD_CLASSDEREF,
-    [LOAD_CLOSURE] = LOAD_CLOSURE,
-    [LOAD_CONST] = LOAD_CONST,
-    [LOAD_CONST__LOAD_FAST] = LOAD_CONST,
-    [LOAD_DEREF] = LOAD_DEREF,
-    [LOAD_FAST] = LOAD_FAST,
-    [LOAD_FAST__LOAD_CONST] = LOAD_FAST,
-    [LOAD_FAST__LOAD_FAST] = LOAD_FAST,
-    [LOAD_GLOBAL] = LOAD_GLOBAL,
-    [LOAD_GLOBAL_ADAPTIVE] = LOAD_GLOBAL,
-    [LOAD_GLOBAL_BUILTIN] = LOAD_GLOBAL,
-    [LOAD_GLOBAL_MODULE] = LOAD_GLOBAL,
-    [LOAD_METHOD] = LOAD_METHOD,
-    [LOAD_METHOD_ADAPTIVE] = LOAD_METHOD,
-    [LOAD_METHOD_CLASS] = LOAD_METHOD,
-    [LOAD_METHOD_MODULE] = LOAD_METHOD,
-    [LOAD_METHOD_NO_DICT] = LOAD_METHOD,
-    [LOAD_METHOD_WITH_DICT] = LOAD_METHOD,
-    [LOAD_METHOD_WITH_VALUES] = LOAD_METHOD,
-    [LOAD_NAME] = LOAD_NAME,
-    [MAKE_CELL] = MAKE_CELL,
-    [MAKE_FUNCTION] = MAKE_FUNCTION,
-    [MAP_ADD] = MAP_ADD,
-    [MATCH_CLASS] = MATCH_CLASS,
-    [MATCH_KEYS] = MATCH_KEYS,
-    [MATCH_MAPPING] = MATCH_MAPPING,
-    [MATCH_SEQUENCE] = MATCH_SEQUENCE,
-    [NOP] = NOP,
-    [POP_EXCEPT] = POP_EXCEPT,
-    [POP_JUMP_BACKWARD_IF_FALSE] = POP_JUMP_BACKWARD_IF_FALSE,
-    [POP_JUMP_BACKWARD_IF_NONE] = POP_JUMP_BACKWARD_IF_NONE,
-    [POP_JUMP_BACKWARD_IF_NOT_NONE] = POP_JUMP_BACKWARD_IF_NOT_NONE,
-    [POP_JUMP_BACKWARD_IF_TRUE] = POP_JUMP_BACKWARD_IF_TRUE,
-    [POP_JUMP_FORWARD_IF_FALSE] = POP_JUMP_FORWARD_IF_FALSE,
-    [POP_JUMP_FORWARD_IF_NONE] = POP_JUMP_FORWARD_IF_NONE,
-    [POP_JUMP_FORWARD_IF_NOT_NONE] = POP_JUMP_FORWARD_IF_NOT_NONE,
-    [POP_JUMP_FORWARD_IF_TRUE] = POP_JUMP_FORWARD_IF_TRUE,
-    [POP_TOP] = POP_TOP,
-    [PRECALL] = PRECALL,
-    [PRECALL_ADAPTIVE] = PRECALL,
-    [PRECALL_BOUND_METHOD] = PRECALL,
-    [PRECALL_BUILTIN_CLASS] = PRECALL,
-    [PRECALL_BUILTIN_FAST_WITH_KEYWORDS] = PRECALL,
-    [PRECALL_METHOD_DESCRIPTOR_FAST_WITH_KEYWORDS] = PRECALL,
-    [PRECALL_NO_KW_BUILTIN_FAST] = PRECALL,
-    [PRECALL_NO_KW_BUILTIN_O] = PRECALL,
-    [PRECALL_NO_KW_ISINSTANCE] = PRECALL,
-    [PRECALL_NO_KW_LEN] = PRECALL,
-    [PRECALL_NO_KW_LIST_APPEND] = PRECALL,
-    [PRECALL_NO_KW_METHOD_DESCRIPTOR_FAST] = PRECALL,
-    [PRECALL_NO_KW_METHOD_DESCRIPTOR_NOARGS] = PRECALL,
-    [PRECALL_NO_KW_METHOD_DESCRIPTOR_O] = PRECALL,
-    [PRECALL_NO_KW_STR_1] = PRECALL,
-    [PRECALL_NO_KW_TUPLE_1] = PRECALL,
-    [PRECALL_NO_KW_TYPE_1] = PRECALL,
-    [PRECALL_PYFUNC] = PRECALL,
-    [PREP_RERAISE_STAR] = PREP_RERAISE_STAR,
-    [PRINT_EXPR] = PRINT_EXPR,
-    [PUSH_EXC_INFO] = PUSH_EXC_INFO,
-    [PUSH_NULL] = PUSH_NULL,
-    [RAISE_VARARGS] = RAISE_VARARGS,
-    [RERAISE] = RERAISE,
-    [RESUME] = RESUME,
-    [RESUME_QUICK] = RESUME,
-    [RETURN_GENERATOR] = RETURN_GENERATOR,
-    [RETURN_VALUE] = RETURN_VALUE,
-    [SEND] = SEND,
-    [SETUP_ANNOTATIONS] = SETUP_ANNOTATIONS,
-    [SET_ADD] = SET_ADD,
-    [SET_UPDATE] = SET_UPDATE,
-    [STORE_ATTR] = STORE_ATTR,
-    [STORE_ATTR_ADAPTIVE] = STORE_ATTR,
-    [STORE_ATTR_INSTANCE_VALUE] = STORE_ATTR,
-    [STORE_ATTR_SLOT] = STORE_ATTR,
-    [STORE_ATTR_WITH_HINT] = STORE_ATTR,
-    [STORE_DEREF] = STORE_DEREF,
-    [STORE_FAST] = STORE_FAST,
-    [STORE_FAST__LOAD_FAST] = STORE_FAST,
-    [STORE_FAST__STORE_FAST] = STORE_FAST,
-    [STORE_GLOBAL] = STORE_GLOBAL,
-    [STORE_NAME] = STORE_NAME,
-    [STORE_SUBSCR] = STORE_SUBSCR,
-    [STORE_SUBSCR_ADAPTIVE] = STORE_SUBSCR,
-    [STORE_SUBSCR_DICT] = STORE_SUBSCR,
-    [STORE_SUBSCR_LIST_INT] = STORE_SUBSCR,
-    [SWAP] = SWAP,
-    [UNARY_INVERT] = UNARY_INVERT,
-    [UNARY_NEGATIVE] = UNARY_NEGATIVE,
-    [UNARY_NOT] = UNARY_NOT,
-    [UNARY_POSITIVE] = UNARY_POSITIVE,
-    [UNPACK_EX] = UNPACK_EX,
-    [UNPACK_SEQUENCE] = UNPACK_SEQUENCE,
-    [UNPACK_SEQUENCE_ADAPTIVE] = UNPACK_SEQUENCE,
-    [UNPACK_SEQUENCE_LIST] = UNPACK_SEQUENCE,
-    [UNPACK_SEQUENCE_TUPLE] = UNPACK_SEQUENCE,
-    [UNPACK_SEQUENCE_TWO_TUPLE] = UNPACK_SEQUENCE,
-    [WITH_EXCEPT_START] = WITH_EXCEPT_START,
-    [YIELD_VALUE] = YIELD_VALUE,
-};
 #endif   // NEED_OPCODE_TABLES
 
 #ifdef Py_DEBUG
diff --git a/Lib/test/test_dis.py b/Lib/test/test_dis.py
index b00f329e0068b..6d16021a61205 100644
--- a/Lib/test/test_dis.py
+++ b/Lib/test/test_dis.py
@@ -638,7 +638,7 @@ def extended_arg_quick():
 %3d           0 RESUME                   0
 
 %3d           2 LOAD_CONST               1 (Ellipsis)
-              4 EXTENDED_ARG_QUICK       1
+              4 EXTENDED_ARG             1
               6 UNPACK_EX              256
               8 STORE_FAST               0 (_)
              10 STORE_FAST               0 (_)
diff --git a/Misc/NEWS.d/next/Core and Builtins/2022-07-21-17-54-52.gh-issue-95113.NnSLpT.rst b/Misc/NEWS.d/next/Core and Builtins/2022-07-21-17-54-52.gh-issue-95113.NnSLpT.rst
new file mode 100644
index 0000000000000..c2ff6c90ac8c1
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2022-07-21-17-54-52.gh-issue-95113.NnSLpT.rst	
@@ -0,0 +1,4 @@
+Replace all ``EXTENDED_ARG_QUICK`` instructions with basic
+:opcode:`EXTENDED_ARG` instructions in unquickened code. Consumers of
+non-adaptive bytecode should be able to handle extended arguments the same
+way they were handled in CPython 3.10 and older.
diff --git a/Objects/codeobject.c b/Objects/codeobject.c
index 35576a283b824..40ac19d543b1e 100644
--- a/Objects/codeobject.c
+++ b/Objects/codeobject.c
@@ -1416,7 +1416,7 @@ deopt_code(_Py_CODEUNIT *instructions, Py_ssize_t len)
 {
     for (int i = 0; i < len; i++) {
         _Py_CODEUNIT instruction = instructions[i];
-        int opcode = _PyOpcode_Original[_Py_OPCODE(instruction)];
+        int opcode = _PyOpcode_Deopt[_Py_OPCODE(instruction)];
         int caches = _PyOpcode_Caches[opcode];
         instructions[i] = _Py_MAKECODEUNIT(opcode, _Py_OPARG(instruction));
         while (caches--) {
diff --git a/Python/ceval.c b/Python/ceval.c
index c69ea21c14993..d40bf275a17da 100644
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -5590,8 +5590,16 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, _PyInterpreterFrame *frame, int
             assert(oparg);
             oparg <<= 8;
             oparg |= _Py_OPARG(*next_instr);
+            // We might be tracing. To avoid breaking tracing guarantees in 
+            // quickened instructions, always deoptimize the next opcode:
             opcode = _PyOpcode_Deopt[_Py_OPCODE(*next_instr)];
             PRE_DISPATCH_GOTO();
+            // CPython hasn't traced the following instruction historically
+            // (DO_TRACING would clobber our extended oparg anyways), so just
+            // skip our usual cframe.use_tracing check before dispatch. Also,
+            // make sure the next instruction isn't a RESUME, since that needs
+            // to trace properly (and shouldn't have an extended arg anyways):
+            assert(opcode != RESUME);
             DISPATCH_GOTO();
         }
 
diff --git a/Python/compile.c b/Python/compile.c
index e8acd8597778d..8895ac7e10a5f 100644
--- a/Python/compile.c
+++ b/Python/compile.c
@@ -211,13 +211,13 @@ write_instr(_Py_CODEUNIT *codestr, struct instr *instruction, int ilen)
     int caches = _PyOpcode_Caches[opcode];
     switch (ilen - caches) {
         case 4:
-            *codestr++ = _Py_MAKECODEUNIT(EXTENDED_ARG_QUICK, (oparg >> 24) & 0xFF);
+            *codestr++ = _Py_MAKECODEUNIT(EXTENDED_ARG, (oparg >> 24) & 0xFF);
             /* fall through */
         case 3:
-            *codestr++ = _Py_MAKECODEUNIT(EXTENDED_ARG_QUICK, (oparg >> 16) & 0xFF);
+            *codestr++ = _Py_MAKECODEUNIT(EXTENDED_ARG, (oparg >> 16) & 0xFF);
             /* fall through */
         case 2:
-            *codestr++ = _Py_MAKECODEUNIT(EXTENDED_ARG_QUICK, (oparg >> 8) & 0xFF);
+            *codestr++ = _Py_MAKECODEUNIT(EXTENDED_ARG, (oparg >> 8) & 0xFF);
             /* fall through */
         case 1:
             *codestr++ = _Py_MAKECODEUNIT(opcode, oparg & 0xFF);
diff --git a/Python/specialize.c b/Python/specialize.c
index 5f2c6b390633e..b318cb5742fae 100644
--- a/Python/specialize.c
+++ b/Python/specialize.c
@@ -275,6 +275,9 @@ _PyCode_Quicken(PyCodeObject *code)
         else {
             assert(!_PyOpcode_Caches[opcode]);
             switch (opcode) {
+                case EXTENDED_ARG:
+                    _Py_SET_OPCODE(instructions[i], EXTENDED_ARG_QUICK);
+                    break;
                 case JUMP_BACKWARD:
                     _Py_SET_OPCODE(instructions[i], JUMP_BACKWARD_QUICK);
                     break;
diff --git a/Tools/scripts/generate_opcode_h.py b/Tools/scripts/generate_opcode_h.py
index e1f4f01ae1de0..6a04297879f2c 100644
--- a/Tools/scripts/generate_opcode_h.py
+++ b/Tools/scripts/generate_opcode_h.py
@@ -117,7 +117,6 @@ def main(opcode_py, outfile='Include/opcode.h', internaloutfile='Include/interna
 
         iobj.write("\nextern const uint8_t _PyOpcode_Caches[256];\n")
         iobj.write("\nextern const uint8_t _PyOpcode_Deopt[256];\n")
-        iobj.write("\nextern const uint8_t _PyOpcode_Original[256];\n")
         iobj.write("\n#ifdef NEED_OPCODE_TABLES\n")
         write_int_array_from_ops("_PyOpcode_RelativeJump", opcode['hasjrel'], iobj)
         write_int_array_from_ops("_PyOpcode_Jump", opcode['hasjrel'] + opcode['hasjabs'], iobj)
@@ -138,12 +137,6 @@ def main(opcode_py, outfile='Include/opcode.h', internaloutfile='Include/interna
         for opt, deopt in sorted(deoptcodes.items()):
             iobj.write(f"    [{opt}] = {deopt},\n")
         iobj.write("};\n")
-        iobj.write("\nconst uint8_t _PyOpcode_Original[256] = {\n")
-        for opt, deopt in sorted(deoptcodes.items()):
-            if opt.startswith("EXTENDED_ARG"):
-                deopt = "EXTENDED_ARG_QUICK"
-            iobj.write(f"    [{opt}] = {deopt},\n")
-        iobj.write("};\n")
         iobj.write("#endif   // NEED_OPCODE_TABLES\n")
 
         fobj.write("\n")


From webhook-mailer at python.org  Fri Jul 22 16:12:04 2022
From: webhook-mailer at python.org (zware)
Date: Fri, 22 Jul 2022 20:12:04 -0000
Subject: [Python-checkins] Fix copy-friendliness of tutorial example
 (GH-93424)
Message-ID: <mailman.181.1658520725.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/34d11f1b0c0e1936a37581e0fb0daec637afca47
commit: 34d11f1b0c0e1936a37581e0fb0daec637afca47
branch: main
author: Chenwei Xiao <chanvinxiao at 163.com>
committer: zware <zachary.ware at gmail.com>
date: 2022-07-22T15:11:48-05:00
summary:

Fix copy-friendliness of tutorial example (GH-93424)

files:
M Doc/tutorial/stdlib2.rst

diff --git a/Doc/tutorial/stdlib2.rst b/Doc/tutorial/stdlib2.rst
index abdf5abda984f..0c101c1f20723 100644
--- a/Doc/tutorial/stdlib2.rst
+++ b/Doc/tutorial/stdlib2.rst
@@ -108,6 +108,7 @@ placeholders such as the current date, image sequence number, or file format::
    >>> photofiles = ['img_1074.jpg', 'img_1076.jpg', 'img_1077.jpg']
    >>> class BatchRename(Template):
    ...     delimiter = '%'
+   ...
    >>> fmt = input('Enter rename style (%d-date %n-seqnum %f-format):  ')
    Enter rename style (%d-date %n-seqnum %f-format):  Ashley_%n%f
 


From webhook-mailer at python.org  Fri Jul 22 16:13:21 2022
From: webhook-mailer at python.org (brandtbucher)
Date: Fri, 22 Jul 2022 20:13:21 -0000
Subject: [Python-checkins] GH-94036: Fix more attribute location quirks
 (GH-95028)
Message-ID: <mailman.182.1658520802.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/900bfc53cb133e8bc2b122362ec04256f623d5b0
commit: 900bfc53cb133e8bc2b122362ec04256f623d5b0
branch: main
author: Brandt Bucher <brandtbucher at microsoft.com>
committer: brandtbucher <brandtbucher at gmail.com>
date: 2022-07-22T13:13:16-07:00
summary:

GH-94036: Fix more attribute location quirks (GH-95028)

files:
A Misc/NEWS.d/next/Core and Builtins/2022-07-19-16-30-59.gh-issue-94036._6Utkm.rst
M Lib/test/test_compile.py
M Python/compile.c

diff --git a/Lib/test/test_compile.py b/Lib/test/test_compile.py
index 19e47cb44f60a..11940bec492d8 100644
--- a/Lib/test/test_compile.py
+++ b/Lib/test/test_compile.py
@@ -1240,6 +1240,66 @@ def f():
                     end_column=7,
                 )
 
+    def test_attribute_augassign(self):
+        source = "(\n lhs  \n   .    \n     rhs      \n       ) += 42"
+        code = compile(source, "<test>", "exec")
+        self.assertOpcodeSourcePositionIs(
+            code, "LOAD_ATTR", line=4, end_line=4, column=5, end_column=8
+        )
+        self.assertOpcodeSourcePositionIs(
+            code, "STORE_ATTR", line=4, end_line=4, column=5, end_column=8
+        )
+
+    def test_attribute_del(self):
+        source = "del (\n lhs  \n   .    \n     rhs      \n       )"
+        code = compile(source, "<test>", "exec")
+        self.assertOpcodeSourcePositionIs(
+            code, "DELETE_ATTR", line=4, end_line=4, column=5, end_column=8
+        )
+
+    def test_attribute_load(self):
+        source = "(\n lhs  \n   .    \n     rhs      \n       )"
+        code = compile(source, "<test>", "exec")
+        self.assertOpcodeSourcePositionIs(
+            code, "LOAD_ATTR", line=4, end_line=4, column=5, end_column=8
+        )
+
+    def test_attribute_store(self):
+        source = "(\n lhs  \n   .    \n     rhs      \n       ) = 42"
+        code = compile(source, "<test>", "exec")
+        self.assertOpcodeSourcePositionIs(
+            code, "STORE_ATTR", line=4, end_line=4, column=5, end_column=8
+        )
+
+    def test_method_call(self):
+        source = "(\n lhs  \n   .    \n     rhs      \n       )()"
+        code = compile(source, "<test>", "exec")
+        self.assertOpcodeSourcePositionIs(
+            code, "LOAD_ATTR", line=4, end_line=4, column=5, end_column=8
+        )
+        self.assertOpcodeSourcePositionIs(
+            code, "CALL", line=4, end_line=5, column=5, end_column=10
+        )
+
+    def test_weird_attribute_position_regressions(self):
+        def f():
+            (bar.
+        baz)
+            (bar.
+        baz(
+        ))
+            files().setdefault(
+                0
+            ).setdefault(
+                0
+            )
+        for line, end_line, column, end_column in f.__code__.co_positions():
+            self.assertIsNotNone(line)
+            self.assertIsNotNone(end_line)
+            self.assertIsNotNone(column)
+            self.assertIsNotNone(end_column)
+            self.assertLessEqual((line, column), (end_line, end_column))
+
 
 class TestExpressionStackSize(unittest.TestCase):
     # These tests check that the computed stack size for a code object
diff --git a/Misc/NEWS.d/next/Core and Builtins/2022-07-19-16-30-59.gh-issue-94036._6Utkm.rst b/Misc/NEWS.d/next/Core and Builtins/2022-07-19-16-30-59.gh-issue-94036._6Utkm.rst
new file mode 100644
index 0000000000000..b0f0367736263
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2022-07-19-16-30-59.gh-issue-94036._6Utkm.rst	
@@ -0,0 +1,2 @@
+Fix incorrect source location info for some multi-line attribute accesses
+and method calls.
diff --git a/Python/compile.c b/Python/compile.c
index 9db61fb47de78..94ce8669a1fd4 100644
--- a/Python/compile.c
+++ b/Python/compile.c
@@ -4729,19 +4729,29 @@ is_import_originated(struct compiler *c, expr_ty e)
     return flags & DEF_IMPORT;
 }
 
+// If an attribute access spans multiple lines, update the current start
+// location to point to the attribute name.
 static void
-update_location_to_match_attr(struct compiler *c, expr_ty meth)
+update_start_location_to_match_attr(struct compiler *c, expr_ty attr)
 {
-    if (meth->lineno != meth->end_lineno) {
-        // Make start location match attribute
-        c->u->u_loc.lineno = c->u->u_loc.end_lineno = meth->end_lineno;
-        int len = (int)PyUnicode_GET_LENGTH(meth->v.Attribute.attr);
-        if (len <= meth->end_col_offset) {
-            c->u->u_loc.col_offset = meth->end_col_offset - len;
+    assert(attr->kind == Attribute_kind);
+    struct location *loc = &c->u->u_loc;
+    if (loc->lineno != attr->end_lineno) {
+        loc->lineno = attr->end_lineno;
+        int len = (int)PyUnicode_GET_LENGTH(attr->v.Attribute.attr);
+        if (len <= attr->end_col_offset) {
+            loc->col_offset = attr->end_col_offset - len;
         }
         else {
             // GH-94694: Somebody's compiling weird ASTs. Just drop the columns:
-            c->u->u_loc.col_offset = c->u->u_loc.end_col_offset = -1;
+            loc->col_offset = -1;
+            loc->end_col_offset = -1;
+        }
+        // Make sure the end position still follows the start position, even for
+        // weird ASTs:
+        loc->end_lineno = Py_MAX(loc->lineno, loc->end_lineno);
+        if (loc->lineno == loc->end_lineno) {
+            loc->end_col_offset = Py_MAX(loc->col_offset, loc->end_col_offset);
         }
     }
 }
@@ -4788,7 +4798,7 @@ maybe_optimize_method_call(struct compiler *c, expr_ty e)
     /* Alright, we can optimize the code. */
     VISIT(c, expr, meth->v.Attribute.value);
     SET_LOC(c, meth);
-    update_location_to_match_attr(c, meth);
+    update_start_location_to_match_attr(c, meth);
     ADDOP_NAME(c, LOAD_METHOD, meth->v.Attribute.attr, names);
     VISIT_SEQ(c, expr, e->v.Call.args);
 
@@ -4799,7 +4809,7 @@ maybe_optimize_method_call(struct compiler *c, expr_ty e)
         };
     }
     SET_LOC(c, e);
-    update_location_to_match_attr(c, meth);
+    update_start_location_to_match_attr(c, meth);
     ADDOP_I(c, CALL, argsl + kwdsl);
     return 1;
 }
@@ -5811,23 +5821,18 @@ compiler_visit_expr1(struct compiler *c, expr_ty e)
     /* The following exprs can be assignment targets. */
     case Attribute_kind:
         VISIT(c, expr, e->v.Attribute.value);
+        update_start_location_to_match_attr(c, e);
         switch (e->v.Attribute.ctx) {
         case Load:
         {
-            int old_lineno = c->u->u_loc.lineno;
-            c->u->u_loc.lineno = e->end_lineno;
             ADDOP_NAME(c, LOAD_ATTR, e->v.Attribute.attr, names);
-            c->u->u_loc.lineno = old_lineno;
             break;
         }
         case Store:
             if (forbidden_name(c, e->v.Attribute.attr, e->v.Attribute.ctx)) {
                 return 0;
             }
-            int old_lineno = c->u->u_loc.lineno;
-            c->u->u_loc.lineno = e->end_lineno;
             ADDOP_NAME(c, STORE_ATTR, e->v.Attribute.attr, names);
-            c->u->u_loc.lineno = old_lineno;
             break;
         case Del:
             ADDOP_NAME(c, DELETE_ATTR, e->v.Attribute.attr, names);
@@ -5898,10 +5903,8 @@ compiler_augassign(struct compiler *c, stmt_ty s)
     case Attribute_kind:
         VISIT(c, expr, e->v.Attribute.value);
         ADDOP_I(c, COPY, 1);
-        int old_lineno = c->u->u_loc.lineno;
-        c->u->u_loc.lineno = e->end_lineno;
+        update_start_location_to_match_attr(c, e);
         ADDOP_NAME(c, LOAD_ATTR, e->v.Attribute.attr, names);
-        c->u->u_loc.lineno = old_lineno;
         break;
     case Subscript_kind:
         VISIT(c, expr, e->v.Subscript.value);
@@ -5941,7 +5944,7 @@ compiler_augassign(struct compiler *c, stmt_ty s)
 
     switch (e->kind) {
     case Attribute_kind:
-        c->u->u_loc.lineno = e->end_lineno;
+        update_start_location_to_match_attr(c, e);
         ADDOP_I(c, SWAP, 2);
         ADDOP_NAME(c, STORE_ATTR, e->v.Attribute.attr, names);
         break;


From webhook-mailer at python.org  Fri Jul 22 16:21:21 2022
From: webhook-mailer at python.org (miss-islington)
Date: Fri, 22 Jul 2022 20:21:21 -0000
Subject: [Python-checkins] Fix copy-friendliness of tutorial example
 (GH-93424)
Message-ID: <mailman.183.1658521282.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/9f4d0e807d86c4d57d1e24c4feba7917b9f173d5
commit: 9f4d0e807d86c4d57d1e24c4feba7917b9f173d5
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-22T13:21:07-07:00
summary:

Fix copy-friendliness of tutorial example (GH-93424)

(cherry picked from commit 34d11f1b0c0e1936a37581e0fb0daec637afca47)

Co-authored-by: Chenwei Xiao <chanvinxiao at 163.com>

files:
M Doc/tutorial/stdlib2.rst

diff --git a/Doc/tutorial/stdlib2.rst b/Doc/tutorial/stdlib2.rst
index 298034d3b4844..857754274da20 100644
--- a/Doc/tutorial/stdlib2.rst
+++ b/Doc/tutorial/stdlib2.rst
@@ -108,6 +108,7 @@ placeholders such as the current date, image sequence number, or file format::
    >>> photofiles = ['img_1074.jpg', 'img_1076.jpg', 'img_1077.jpg']
    >>> class BatchRename(Template):
    ...     delimiter = '%'
+   ...
    >>> fmt = input('Enter rename style (%d-date %n-seqnum %f-format):  ')
    Enter rename style (%d-date %n-seqnum %f-format):  Ashley_%n%f
 


From webhook-mailer at python.org  Fri Jul 22 16:21:45 2022
From: webhook-mailer at python.org (miss-islington)
Date: Fri, 22 Jul 2022 20:21:45 -0000
Subject: [Python-checkins] Fix copy-friendliness of tutorial example
 (GH-93424)
Message-ID: <mailman.184.1658521306.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/3a33e9b7a0e8a81f36c2972193937f85a5ff94c3
commit: 3a33e9b7a0e8a81f36c2972193937f85a5ff94c3
branch: 3.11
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-22T13:21:41-07:00
summary:

Fix copy-friendliness of tutorial example (GH-93424)

(cherry picked from commit 34d11f1b0c0e1936a37581e0fb0daec637afca47)

Co-authored-by: Chenwei Xiao <chanvinxiao at 163.com>

files:
M Doc/tutorial/stdlib2.rst

diff --git a/Doc/tutorial/stdlib2.rst b/Doc/tutorial/stdlib2.rst
index 69ec0d4727c0b..24cf0970e4832 100644
--- a/Doc/tutorial/stdlib2.rst
+++ b/Doc/tutorial/stdlib2.rst
@@ -108,6 +108,7 @@ placeholders such as the current date, image sequence number, or file format::
    >>> photofiles = ['img_1074.jpg', 'img_1076.jpg', 'img_1077.jpg']
    >>> class BatchRename(Template):
    ...     delimiter = '%'
+   ...
    >>> fmt = input('Enter rename style (%d-date %n-seqnum %f-format):  ')
    Enter rename style (%d-date %n-seqnum %f-format):  Ashley_%n%f
 


From webhook-mailer at python.org  Fri Jul 22 19:28:21 2022
From: webhook-mailer at python.org (brandtbucher)
Date: Fri, 22 Jul 2022 23:28:21 -0000
Subject: [Python-checkins] GH-94438: Handle extended arguments and
 conditional pops in mark_stacks (GH-95110)
Message-ID: <mailman.185.1658532503.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/e4d3a96a113070fde433834a6c9fb79ebeebad4a
commit: e4d3a96a113070fde433834a6c9fb79ebeebad4a
branch: main
author: Brandt Bucher <brandtbucher at microsoft.com>
committer: brandtbucher <brandtbucher at gmail.com>
date: 2022-07-22T16:28:03-07:00
summary:

GH-94438: Handle extended arguments and conditional pops in mark_stacks (GH-95110)

files:
A Misc/NEWS.d/next/Core and Builtins/2022-07-22-12-53-34.gh-issue-94438.hNqACc.rst
M Lib/test/test_sys_settrace.py
M Objects/frameobject.c

diff --git a/Lib/test/test_sys_settrace.py b/Lib/test/test_sys_settrace.py
index 8d0c3171441a1..9f1aa81dbcd24 100644
--- a/Lib/test/test_sys_settrace.py
+++ b/Lib/test/test_sys_settrace.py
@@ -2685,6 +2685,42 @@ def test_jump_with_null_on_stack_load_attr(output):
         )
         output.append(15)
 
+    @jump_test(2, 3, [1, 3])
+    def test_jump_extended_args_unpack_ex_simple(output):
+        output.append(1)
+        _, *_, _ = output.append(2) or "Spam"
+        output.append(3)
+
+    @jump_test(3, 4, [1, 4, 4, 5])
+    def test_jump_extended_args_unpack_ex_tricky(output):
+        output.append(1)
+        (
+            _, *_, _
+        ) = output.append(4) or "Spam"
+        output.append(5)
+
+    def test_jump_extended_args_for_iter(self):
+        # In addition to failing when extended arg handling is broken, this can
+        # also hang for a *very* long time:
+        source = [
+            "def f(output):",
+            "    output.append(1)",
+            "    for _ in spam:",
+            *(f"        output.append({i})" for i in range(3, 100_000)),
+            f"    output.append(100_000)",
+        ]
+        namespace = {}
+        exec("\n".join(source), namespace)
+        f = namespace["f"]
+        self.run_test(f,  2, 100_000, [1, 100_000])
+
+    @jump_test(2, 3, [1, 3])
+    def test_jump_or_pop(output):
+        output.append(1)
+        _ = output.append(2) and "Spam"
+        output.append(3)
+
+
 class TestExtendedArgs(unittest.TestCase):
 
     def setUp(self):
diff --git a/Misc/NEWS.d/next/Core and Builtins/2022-07-22-12-53-34.gh-issue-94438.hNqACc.rst b/Misc/NEWS.d/next/Core and Builtins/2022-07-22-12-53-34.gh-issue-94438.hNqACc.rst
new file mode 100644
index 0000000000000..2a7249a833c2e
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2022-07-22-12-53-34.gh-issue-94438.hNqACc.rst	
@@ -0,0 +1,4 @@
+Fix an issue that caused extended opcode arguments and some conditional pops
+to be ignored when calculating valid jump targets for assignments to the
+``f_lineno`` attribute of frame objects. In some cases, this could cause
+inconsistent internal state, resulting in a hard crash of the interpreter.
diff --git a/Objects/frameobject.c b/Objects/frameobject.c
index 9e5450af52a72..26b38bae780c7 100644
--- a/Objects/frameobject.c
+++ b/Objects/frameobject.c
@@ -319,11 +319,15 @@ mark_stacks(PyCodeObject *code_obj, int len)
                     int64_t target_stack;
                     int j = get_arg(code, i);
                     if (opcode == POP_JUMP_FORWARD_IF_FALSE ||
-                        opcode == POP_JUMP_FORWARD_IF_TRUE) {
+                        opcode == POP_JUMP_FORWARD_IF_TRUE ||
+                        opcode == JUMP_IF_FALSE_OR_POP ||
+                        opcode == JUMP_IF_TRUE_OR_POP)
+                    {
                         j += i + 1;
                     }
-                    else if (opcode == POP_JUMP_BACKWARD_IF_FALSE ||
-                             opcode == POP_JUMP_BACKWARD_IF_TRUE) {
+                    else {
+                        assert(opcode == POP_JUMP_BACKWARD_IF_FALSE ||
+                               opcode == POP_JUMP_BACKWARD_IF_TRUE);
                         j = i + 1 - j;
                     }
                     assert(j < len);
@@ -459,7 +463,8 @@ mark_stacks(PyCodeObject *code_obj, int len)
                 }
                 default:
                 {
-                    int delta = PyCompile_OpcodeStackEffect(opcode, _Py_OPARG(code[i]));
+                    int delta = PyCompile_OpcodeStackEffect(opcode, get_arg(code, i));
+                    assert(delta != PY_INVALID_STACK_EFFECT);
                     while (delta < 0) {
                         next_stack = pop_value(next_stack);
                         delta++;


From webhook-mailer at python.org  Fri Jul 22 19:49:02 2022
From: webhook-mailer at python.org (miss-islington)
Date: Fri, 22 Jul 2022 23:49:02 -0000
Subject: [Python-checkins] GH-94438: Handle extended arguments and
 conditional pops in mark_stacks (GH-95110)
Message-ID: <mailman.186.1658533743.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/bbdacb402bb441972312372f7b2104a51c32350e
commit: bbdacb402bb441972312372f7b2104a51c32350e
branch: 3.11
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-22T16:48:53-07:00
summary:

GH-94438: Handle extended arguments and conditional pops in mark_stacks (GH-95110)

(cherry picked from commit e4d3a96a113070fde433834a6c9fb79ebeebad4a)

Co-authored-by: Brandt Bucher <brandtbucher at microsoft.com>

files:
A Misc/NEWS.d/next/Core and Builtins/2022-07-22-12-53-34.gh-issue-94438.hNqACc.rst
M Lib/test/test_sys_settrace.py
M Objects/frameobject.c

diff --git a/Lib/test/test_sys_settrace.py b/Lib/test/test_sys_settrace.py
index 4f2dd4f9eade3..d77deae32cd5c 100644
--- a/Lib/test/test_sys_settrace.py
+++ b/Lib/test/test_sys_settrace.py
@@ -2674,6 +2674,42 @@ def test_jump_with_null_on_stack_load_attr(output):
         )
         output.append(15)
 
+    @jump_test(2, 3, [1, 3])
+    def test_jump_extended_args_unpack_ex_simple(output):
+        output.append(1)
+        _, *_, _ = output.append(2) or "Spam"
+        output.append(3)
+
+    @jump_test(3, 4, [1, 4, 4, 5])
+    def test_jump_extended_args_unpack_ex_tricky(output):
+        output.append(1)
+        (
+            _, *_, _
+        ) = output.append(4) or "Spam"
+        output.append(5)
+
+    def test_jump_extended_args_for_iter(self):
+        # In addition to failing when extended arg handling is broken, this can
+        # also hang for a *very* long time:
+        source = [
+            "def f(output):",
+            "    output.append(1)",
+            "    for _ in spam:",
+            *(f"        output.append({i})" for i in range(3, 100_000)),
+            f"    output.append(100_000)",
+        ]
+        namespace = {}
+        exec("\n".join(source), namespace)
+        f = namespace["f"]
+        self.run_test(f,  2, 100_000, [1, 100_000])
+
+    @jump_test(2, 3, [1, 3])
+    def test_jump_or_pop(output):
+        output.append(1)
+        _ = output.append(2) and "Spam"
+        output.append(3)
+
+
 class TestExtendedArgs(unittest.TestCase):
 
     def setUp(self):
diff --git a/Misc/NEWS.d/next/Core and Builtins/2022-07-22-12-53-34.gh-issue-94438.hNqACc.rst b/Misc/NEWS.d/next/Core and Builtins/2022-07-22-12-53-34.gh-issue-94438.hNqACc.rst
new file mode 100644
index 0000000000000..2a7249a833c2e
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2022-07-22-12-53-34.gh-issue-94438.hNqACc.rst	
@@ -0,0 +1,4 @@
+Fix an issue that caused extended opcode arguments and some conditional pops
+to be ignored when calculating valid jump targets for assignments to the
+``f_lineno`` attribute of frame objects. In some cases, this could cause
+inconsistent internal state, resulting in a hard crash of the interpreter.
diff --git a/Objects/frameobject.c b/Objects/frameobject.c
index 78113366c0d7e..47e108b9ae79b 100644
--- a/Objects/frameobject.c
+++ b/Objects/frameobject.c
@@ -230,11 +230,15 @@ mark_stacks(PyCodeObject *code_obj, int len)
                     int64_t target_stack;
                     int j = get_arg(code, i);
                     if (opcode == POP_JUMP_FORWARD_IF_FALSE ||
-                        opcode == POP_JUMP_FORWARD_IF_TRUE) {
+                        opcode == POP_JUMP_FORWARD_IF_TRUE ||
+                        opcode == JUMP_IF_FALSE_OR_POP ||
+                        opcode == JUMP_IF_TRUE_OR_POP)
+                    {
                         j += i + 1;
                     }
-                    else if (opcode == POP_JUMP_BACKWARD_IF_FALSE ||
-                             opcode == POP_JUMP_BACKWARD_IF_TRUE) {
+                    else {
+                        assert(opcode == POP_JUMP_BACKWARD_IF_FALSE ||
+                               opcode == POP_JUMP_BACKWARD_IF_TRUE);
                         j = i + 1 - j;
                     }
                     assert(j < len);
@@ -334,7 +338,8 @@ mark_stacks(PyCodeObject *code_obj, int len)
                     break;
                 default:
                 {
-                    int delta = PyCompile_OpcodeStackEffect(opcode, _Py_OPARG(code[i]));
+                    int delta = PyCompile_OpcodeStackEffect(opcode, get_arg(code, i));
+                    assert(delta != PY_INVALID_STACK_EFFECT);
                     while (delta < 0) {
                         next_stack = pop_value(next_stack);
                         delta++;


From webhook-mailer at python.org  Fri Jul 22 19:55:50 2022
From: webhook-mailer at python.org (miss-islington)
Date: Fri, 22 Jul 2022 23:55:50 -0000
Subject: [Python-checkins] gh-90385: Add `pathlib.Path.walk()` method
 (GH-92517)
Message-ID: <mailman.187.1658534151.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/c1e929858ad96fc6e41bc637e5ec9343b4f7e3c7
commit: c1e929858ad96fc6e41bc637e5ec9343b4f7e3c7
branch: main
author: Stanislav Zmiev <zertarx at gmail.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-22T16:55:46-07:00
summary:

gh-90385: Add `pathlib.Path.walk()` method (GH-92517)



Automerge-Triggered-By: GH:brettcannon

files:
A Misc/NEWS.d/next/Library/2022-05-10-16-30-40.gh-issue-90385.1_wBRQ.rst
M Doc/library/pathlib.rst
M Lib/pathlib.py
M Lib/test/support/os_helper.py
M Lib/test/test_pathlib.py

diff --git a/Doc/library/pathlib.rst b/Doc/library/pathlib.rst
index 04549184be2ae..19944bd7bd0a8 100644
--- a/Doc/library/pathlib.rst
+++ b/Doc/library/pathlib.rst
@@ -946,6 +946,101 @@ call fails (for example because the path doesn't exist).
    to the directory after creating the iterator, whether a path object for
    that file be included is unspecified.
 
+.. method:: Path.walk(top_down=True, on_error=None, follow_symlinks=False)
+
+   Generate the file names in a directory tree by walking the tree
+   either top-down or bottom-up.
+
+   For each directory in the directory tree rooted at *self* (including
+   *self* but excluding '.' and '..'), the method yields a 3-tuple of
+   ``(dirpath, dirnames, filenames)``.
+
+   *dirpath* is a :class:`Path` to the directory currently being walked,
+   *dirnames* is a list of strings for the names of subdirectories in *dirpath*
+   (excluding ``'.'`` and ``'..'``), and *filenames* is a list of strings for
+   the names of the non-directory files in *dirpath*. To get a full path
+   (which begins with *self*) to a file or directory in *dirpath*, do
+   ``dirpath / name``. Whether or not the lists are sorted is file
+   system-dependent.
+
+   If the optional argument *top_down* is true (which is the default), the triple for a
+   directory is generated before the triples for any of its subdirectories
+   (directories are walked top-down).  If *top_down* is false, the triple
+   for a directory is generated after the triples for all of its subdirectories
+   (directories are walked bottom-up). No matter the value of *top_down*, the
+   list of subdirectories is retrieved before the triples for the directory and
+   its subdirectories are walked.
+
+   When *top_down* is true, the caller can modify the *dirnames* list in-place
+   (for example, using :keyword:`del` or slice assignment), and :meth:`Path.walk`
+   will only recurse into the subdirectories whose names remain in *dirnames*.
+   This can be used to prune the search, or to impose a specific order of visiting,
+   or even to inform :meth:`Path.walk` about directories the caller creates or
+   renames before it resumes :meth:`Path.walk` again. Modifying *dirnames* when
+   *top_down* is false has no effect on the behavior of :meth:`Path.walk()` since the
+   directories in *dirnames* have already been generated by the time *dirnames*
+   is yielded to the caller.
+
+   By default, errors from :func:`os.scandir` are ignored.  If the optional
+   argument *on_error* is specified, it should be a callable; it will be
+   called with one argument, an :exc:`OSError` instance. The callable can handle the
+   error to continue the walk or re-raise it to stop the walk. Note that the
+   filename is available as the ``filename`` attribute of the exception object.
+
+   By default, :meth:`Path.walk` does not follow symbolic links, and instead adds them
+   to the *filenames* list. Set *follow_symlinks* to true to resolve symlinks
+   and place them in *dirnames* and *filenames* as appropriate for their targets, and
+   consequently visit directories pointed to by symlinks (where supported).
+
+   .. note::
+
+      Be aware that setting *follow_symlinks* to true can lead to infinite
+      recursion if a link points to a parent directory of itself. :meth:`Path.walk`
+      does not keep track of the directories it has already visited.
+
+   .. note::
+      :meth:`Path.walk` assumes the directories it walks are not modified during
+      execution. For example, if a directory from *dirnames* has been replaced
+      with a symlink and *follow_symlinks* is false, :meth:`Path.walk` will
+      still try to descend into it. To prevent such behavior, remove directories
+      from *dirnames* as appropriate.
+
+   .. note::
+
+      Unlike :func:`os.walk`, :meth:`Path.walk` lists symlinks to directories in
+      *filenames* if *follow_symlinks* is false.
+
+   This example displays the number of bytes used by all files in each directory,
+   while ignoring ``__pycache__`` directories::
+
+      from pathlib import Path
+      for root, dirs, files in Path("cpython/Lib/concurrent").walk(on_error=print):
+        print(
+            root,
+            "consumes",
+            sum((root / file).stat().st_size for file in files),
+            "bytes in",
+            len(files),
+            "non-directory files"
+        )
+        if '__pycache__' in dirs:
+              dirs.remove('__pycache__')
+
+   This next example is a simple implementation of :func:`shutil.rmtree`.
+   Walking the tree bottom-up is essential as :func:`rmdir` doesn't allow
+   deleting a directory before it is empty::
+
+      # Delete everything reachable from the directory "top".
+      # CAUTION:  This is dangerous! For example, if top == Path('/'),
+      # it could delete all of your files.
+      for root, dirs, files in top.walk(topdown=False):
+          for name in files:
+              (root / name).unlink()
+          for name in dirs:
+              (root / name).rmdir()
+
+   .. versionadded:: 3.12
+
 .. method:: Path.lchmod(mode)
 
    Like :meth:`Path.chmod` but, if the path points to a symbolic link, the
@@ -1285,6 +1380,7 @@ Below is a table mapping various :mod:`os` functions to their corresponding
 :func:`os.path.expanduser`             :meth:`Path.expanduser` and
                                        :meth:`Path.home`
 :func:`os.listdir`                     :meth:`Path.iterdir`
+:func:`os.walk`                        :meth:`Path.walk`
 :func:`os.path.isdir`                  :meth:`Path.is_dir`
 :func:`os.path.isfile`                 :meth:`Path.is_file`
 :func:`os.path.islink`                 :meth:`Path.is_symlink`
diff --git a/Lib/pathlib.py b/Lib/pathlib.py
index 62dd0fa1b1237..2aee71742b23e 100644
--- a/Lib/pathlib.py
+++ b/Lib/pathlib.py
@@ -1321,6 +1321,49 @@ def expanduser(self):
 
         return self
 
+    def walk(self, top_down=True, on_error=None, follow_symlinks=False):
+        """Walk the directory tree from this directory, similar to os.walk()."""
+        sys.audit("pathlib.Path.walk", self, on_error, follow_symlinks)
+        return self._walk(top_down, on_error, follow_symlinks)
+
+    def _walk(self, top_down, on_error, follow_symlinks):
+        # We may not have read permission for self, in which case we can't
+        # get a list of the files the directory contains. os.walk
+        # always suppressed the exception then, rather than blow up for a
+        # minor reason when (say) a thousand readable directories are still
+        # left to visit. That logic is copied here.
+        try:
+            scandir_it = self._scandir()
+        except OSError as error:
+            if on_error is not None:
+                on_error(error)
+            return
+
+        with scandir_it:
+            dirnames = []
+            filenames = []
+            for entry in scandir_it:
+                try:
+                    is_dir = entry.is_dir(follow_symlinks=follow_symlinks)
+                except OSError:
+                    # Carried over from os.path.isdir().
+                    is_dir = False
+
+                if is_dir:
+                    dirnames.append(entry.name)
+                else:
+                    filenames.append(entry.name)
+
+        if top_down:
+            yield self, dirnames, filenames
+
+        for dirname in dirnames:
+            dirpath = self._make_child_relpath(dirname)
+            yield from dirpath._walk(top_down, on_error, follow_symlinks)
+
+        if not top_down:
+            yield self, dirnames, filenames
+
 
 class PosixPath(Path, PurePosixPath):
     """Path subclass for non-Windows systems.
diff --git a/Lib/test/support/os_helper.py b/Lib/test/support/os_helper.py
index 4edb1abec202a..61d12f59e4a60 100644
--- a/Lib/test/support/os_helper.py
+++ b/Lib/test/support/os_helper.py
@@ -572,7 +572,7 @@ def fs_is_case_insensitive(directory):
 
 
 class FakePath:
-    """Simple implementing of the path protocol.
+    """Simple implementation of the path protocol.
     """
     def __init__(self, path):
         self.path = path
diff --git a/Lib/test/test_pathlib.py b/Lib/test/test_pathlib.py
index a42619853399f..6f3b2a4df890b 100644
--- a/Lib/test/test_pathlib.py
+++ b/Lib/test/test_pathlib.py
@@ -2478,6 +2478,203 @@ def test_complex_symlinks_relative(self):
     def test_complex_symlinks_relative_dot_dot(self):
         self._check_complex_symlinks(os.path.join('dirA', '..'))
 
+class WalkTests(unittest.TestCase):
+
+    def setUp(self):
+        self.addCleanup(os_helper.rmtree, os_helper.TESTFN)
+
+        # Build:
+        #     TESTFN/
+        #       TEST1/              a file kid and two directory kids
+        #         tmp1
+        #         SUB1/             a file kid and a directory kid
+        #           tmp2
+        #           SUB11/          no kids
+        #         SUB2/             a file kid and a dirsymlink kid
+        #           tmp3
+        #           SUB21/          not readable
+        #             tmp5
+        #           link/           a symlink to TEST2
+        #           broken_link
+        #           broken_link2
+        #           broken_link3
+        #       TEST2/
+        #         tmp4              a lone file
+        self.walk_path = pathlib.Path(os_helper.TESTFN, "TEST1")
+        self.sub1_path = self.walk_path / "SUB1"
+        self.sub11_path = self.sub1_path / "SUB11"
+        self.sub2_path = self.walk_path / "SUB2"
+        sub21_path= self.sub2_path / "SUB21"
+        tmp1_path = self.walk_path / "tmp1"
+        tmp2_path = self.sub1_path / "tmp2"
+        tmp3_path = self.sub2_path / "tmp3"
+        tmp5_path = sub21_path / "tmp3"
+        self.link_path = self.sub2_path / "link"
+        t2_path = pathlib.Path(os_helper.TESTFN, "TEST2")
+        tmp4_path = pathlib.Path(os_helper.TESTFN, "TEST2", "tmp4")
+        broken_link_path = self.sub2_path / "broken_link"
+        broken_link2_path = self.sub2_path / "broken_link2"
+        broken_link3_path = self.sub2_path / "broken_link3"
+
+        os.makedirs(self.sub11_path)
+        os.makedirs(self.sub2_path)
+        os.makedirs(sub21_path)
+        os.makedirs(t2_path)
+
+        for path in tmp1_path, tmp2_path, tmp3_path, tmp4_path, tmp5_path:
+            with open(path, "x", encoding='utf-8') as f:
+                f.write(f"I'm {path} and proud of it.  Blame test_pathlib.\n")
+
+        if os_helper.can_symlink():
+            os.symlink(os.path.abspath(t2_path), self.link_path)
+            os.symlink('broken', broken_link_path, True)
+            os.symlink(pathlib.Path('tmp3', 'broken'), broken_link2_path, True)
+            os.symlink(pathlib.Path('SUB21', 'tmp5'), broken_link3_path, True)
+            self.sub2_tree = (self.sub2_path, ["SUB21"],
+                              ["broken_link", "broken_link2", "broken_link3",
+                               "link", "tmp3"])
+        else:
+            self.sub2_tree = (self.sub2_path, ["SUB21"], ["tmp3"])
+
+        if not is_emscripten:
+            # Emscripten fails with inaccessible directories.
+            os.chmod(sub21_path, 0)
+        try:
+            os.listdir(sub21_path)
+        except PermissionError:
+            self.addCleanup(os.chmod, sub21_path, stat.S_IRWXU)
+        else:
+            os.chmod(sub21_path, stat.S_IRWXU)
+            os.unlink(tmp5_path)
+            os.rmdir(sub21_path)
+            del self.sub2_tree[1][:1]
+
+    def test_walk_topdown(self):
+        all = list(self.walk_path.walk())
+
+        self.assertEqual(len(all), 4)
+        # We can't know which order SUB1 and SUB2 will appear in.
+        # Not flipped:  TESTFN, SUB1, SUB11, SUB2
+        #     flipped:  TESTFN, SUB2, SUB1, SUB11
+        flipped = all[0][1][0] != "SUB1"
+        all[0][1].sort()
+        all[3 - 2 * flipped][-1].sort()
+        all[3 - 2 * flipped][1].sort()
+        self.assertEqual(all[0], (self.walk_path, ["SUB1", "SUB2"], ["tmp1"]))
+        self.assertEqual(all[1 + flipped], (self.sub1_path, ["SUB11"], ["tmp2"]))
+        self.assertEqual(all[2 + flipped], (self.sub11_path, [], []))
+        self.assertEqual(all[3 - 2 * flipped], self.sub2_tree)
+
+    def test_walk_prune(self, walk_path=None):
+        if walk_path is None:
+            walk_path = self.walk_path
+        # Prune the search.
+        all = []
+        for root, dirs, files in walk_path.walk():
+            all.append((root, dirs, files))
+            if 'SUB1' in dirs:
+                # Note that this also mutates the dirs we appended to all!
+                dirs.remove('SUB1')
+
+        self.assertEqual(len(all), 2)
+        self.assertEqual(all[0], (self.walk_path, ["SUB2"], ["tmp1"]))
+
+        all[1][-1].sort()
+        all[1][1].sort()
+        self.assertEqual(all[1], self.sub2_tree)
+
+    def test_file_like_path(self):
+        self.test_walk_prune(FakePath(self.walk_path).__fspath__())
+
+    def test_walk_bottom_up(self):
+        all = list(self.walk_path.walk( top_down=False))
+
+        self.assertEqual(len(all), 4, all)
+        # We can't know which order SUB1 and SUB2 will appear in.
+        # Not flipped:  SUB11, SUB1, SUB2, TESTFN
+        #     flipped:  SUB2, SUB11, SUB1, TESTFN
+        flipped = all[3][1][0] != "SUB1"
+        all[3][1].sort()
+        all[2 - 2 * flipped][-1].sort()
+        all[2 - 2 * flipped][1].sort()
+        self.assertEqual(all[3],
+                         (self.walk_path, ["SUB1", "SUB2"], ["tmp1"]))
+        self.assertEqual(all[flipped],
+                         (self.sub11_path, [], []))
+        self.assertEqual(all[flipped + 1],
+                         (self.sub1_path, ["SUB11"], ["tmp2"]))
+        self.assertEqual(all[2 - 2 * flipped],
+                         self.sub2_tree)
+
+    @os_helper.skip_unless_symlink
+    def test_walk_follow_symlinks(self):
+        walk_it = self.walk_path.walk(follow_symlinks=True)
+        for root, dirs, files in walk_it:
+            if root == self.link_path:
+                self.assertEqual(dirs, [])
+                self.assertEqual(files, ["tmp4"])
+                break
+        else:
+            self.fail("Didn't follow symlink with follow_symlinks=True")
+
+    def test_walk_symlink_location(self):
+        # Tests whether symlinks end up in filenames or dirnames depending
+        # on the `follow_symlinks` argument.
+        walk_it = self.walk_path.walk(follow_symlinks=False)
+        for root, dirs, files in walk_it:
+            if root == self.sub2_path:
+                self.assertIn("link", files)
+                break
+        else:
+            self.fail("symlink not found")
+
+        walk_it = self.walk_path.walk(follow_symlinks=True)
+        for root, dirs, files in walk_it:
+            if root == self.sub2_path:
+                self.assertIn("link", dirs)
+                break
+
+    def test_walk_bad_dir(self):
+        errors = []
+        walk_it = self.walk_path.walk(on_error=errors.append)
+        root, dirs, files = next(walk_it)
+        self.assertEqual(errors, [])
+        dir1 = 'SUB1'
+        path1 = root / dir1
+        path1new = (root / dir1).with_suffix(".new")
+        path1.rename(path1new)
+        try:
+            roots = [r for r, _, _ in walk_it]
+            self.assertTrue(errors)
+            self.assertNotIn(path1, roots)
+            self.assertNotIn(path1new, roots)
+            for dir2 in dirs:
+                if dir2 != dir1:
+                    self.assertIn(root / dir2, roots)
+        finally:
+            path1new.rename(path1)
+
+    def test_walk_many_open_files(self):
+        depth = 30
+        base = pathlib.Path(os_helper.TESTFN, 'deep')
+        path = pathlib.Path(base, *(['d']*depth))
+        path.mkdir(parents=True)
+
+        iters = [base.walk(top_down=False) for _ in range(100)]
+        for i in range(depth + 1):
+            expected = (path, ['d'] if i else [], [])
+            for it in iters:
+                self.assertEqual(next(it), expected)
+            path = path.parent
+
+        iters = [base.walk(top_down=True) for _ in range(100)]
+        path = base
+        for i in range(depth + 1):
+            expected = (path, ['d'] if i < depth else [], [])
+            for it in iters:
+                self.assertEqual(next(it), expected)
+            path = path / 'd'
+
 
 class PathTest(_BasePathTest, unittest.TestCase):
     cls = pathlib.Path
diff --git a/Misc/NEWS.d/next/Library/2022-05-10-16-30-40.gh-issue-90385.1_wBRQ.rst b/Misc/NEWS.d/next/Library/2022-05-10-16-30-40.gh-issue-90385.1_wBRQ.rst
new file mode 100644
index 0000000000000..24aa4403f8a68
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2022-05-10-16-30-40.gh-issue-90385.1_wBRQ.rst
@@ -0,0 +1 @@
+Add :meth:`pathlib.Path.walk` as an alternative to :func:`os.walk`.


From webhook-mailer at python.org  Fri Jul 22 20:31:15 2022
From: webhook-mailer at python.org (brandtbucher)
Date: Sat, 23 Jul 2022 00:31:15 -0000
Subject: [Python-checkins] [3.11] GH-94036: Fix more attribute location
 quirks (GH-95028) (GH-95156)
Message-ID: <mailman.188.1658536275.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/064462a719509c1382207387e3a3ef187f7b55bf
commit: 064462a719509c1382207387e3a3ef187f7b55bf
branch: 3.11
author: Brandt Bucher <brandtbucher at microsoft.com>
committer: brandtbucher <brandtbucher at gmail.com>
date: 2022-07-22T17:31:06-07:00
summary:

[3.11] GH-94036: Fix more attribute location quirks (GH-95028) (GH-95156)

(cherry picked from commit 900bfc53cb133e8bc2b122362ec04256f623d5b0)

files:
A Misc/NEWS.d/next/Core and Builtins/2022-07-19-16-30-59.gh-issue-94036._6Utkm.rst
M Lib/test/test_compile.py
M Python/compile.c

diff --git a/Lib/test/test_compile.py b/Lib/test/test_compile.py
index e22696499e236..edde54aaca00c 100644
--- a/Lib/test/test_compile.py
+++ b/Lib/test/test_compile.py
@@ -1204,6 +1204,66 @@ def f():
                     end_column=7,
                 )
 
+    def test_attribute_augassign(self):
+        source = "(\n lhs  \n   .    \n     rhs      \n       ) += 42"
+        code = compile(source, "<test>", "exec")
+        self.assertOpcodeSourcePositionIs(
+            code, "LOAD_ATTR", line=4, end_line=4, column=5, end_column=8
+        )
+        self.assertOpcodeSourcePositionIs(
+            code, "STORE_ATTR", line=4, end_line=4, column=5, end_column=8
+        )
+
+    def test_attribute_del(self):
+        source = "del (\n lhs  \n   .    \n     rhs      \n       )"
+        code = compile(source, "<test>", "exec")
+        self.assertOpcodeSourcePositionIs(
+            code, "DELETE_ATTR", line=4, end_line=4, column=5, end_column=8
+        )
+
+    def test_attribute_load(self):
+        source = "(\n lhs  \n   .    \n     rhs      \n       )"
+        code = compile(source, "<test>", "exec")
+        self.assertOpcodeSourcePositionIs(
+            code, "LOAD_ATTR", line=4, end_line=4, column=5, end_column=8
+        )
+
+    def test_attribute_store(self):
+        source = "(\n lhs  \n   .    \n     rhs      \n       ) = 42"
+        code = compile(source, "<test>", "exec")
+        self.assertOpcodeSourcePositionIs(
+            code, "STORE_ATTR", line=4, end_line=4, column=5, end_column=8
+        )
+
+    def test_method_call(self):
+        source = "(\n lhs  \n   .    \n     rhs      \n       )()"
+        code = compile(source, "<test>", "exec")
+        self.assertOpcodeSourcePositionIs(
+            code, "LOAD_METHOD", line=4, end_line=4, column=5, end_column=8
+        )
+        self.assertOpcodeSourcePositionIs(
+            code, "CALL", line=4, end_line=5, column=5, end_column=10
+        )
+
+    def test_weird_attribute_position_regressions(self):
+        def f():
+            (bar.
+        baz)
+            (bar.
+        baz(
+        ))
+            files().setdefault(
+                0
+            ).setdefault(
+                0
+            )
+        for line, end_line, column, end_column in f.__code__.co_positions():
+            self.assertIsNotNone(line)
+            self.assertIsNotNone(end_line)
+            self.assertIsNotNone(column)
+            self.assertIsNotNone(end_column)
+            self.assertLessEqual((line, column), (end_line, end_column))
+
 
 class TestExpressionStackSize(unittest.TestCase):
     # These tests check that the computed stack size for a code object
diff --git a/Misc/NEWS.d/next/Core and Builtins/2022-07-19-16-30-59.gh-issue-94036._6Utkm.rst b/Misc/NEWS.d/next/Core and Builtins/2022-07-19-16-30-59.gh-issue-94036._6Utkm.rst
new file mode 100644
index 0000000000000..b0f0367736263
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2022-07-19-16-30-59.gh-issue-94036._6Utkm.rst	
@@ -0,0 +1,2 @@
+Fix incorrect source location info for some multi-line attribute accesses
+and method calls.
diff --git a/Python/compile.c b/Python/compile.c
index 8895ac7e10a5f..32fd58e6c4fd9 100644
--- a/Python/compile.c
+++ b/Python/compile.c
@@ -4783,19 +4783,29 @@ is_import_originated(struct compiler *c, expr_ty e)
     return flags & DEF_IMPORT;
 }
 
+// If an attribute access spans multiple lines, update the current start
+// location to point to the attribute name.
 static void
-update_location_to_match_attr(struct compiler *c, expr_ty meth)
+update_start_location_to_match_attr(struct compiler *c, expr_ty attr)
 {
-    if (meth->lineno != meth->end_lineno) {
-        // Make start location match attribute
-        c->u->u_lineno = c->u->u_end_lineno = meth->end_lineno;
-        int len = (int)PyUnicode_GET_LENGTH(meth->v.Attribute.attr);
-        if (len <= meth->end_col_offset) {
-            c->u->u_col_offset = meth->end_col_offset - len;
+    assert(attr->kind == Attribute_kind);
+    if (c->u->u_lineno != attr->end_lineno) {
+        c->u->u_lineno = attr->end_lineno;
+        int len = (int)PyUnicode_GET_LENGTH(attr->v.Attribute.attr);
+        if (len <= attr->end_col_offset) {
+            c->u->u_col_offset = attr->end_col_offset - len;
         }
         else {
             // GH-94694: Somebody's compiling weird ASTs. Just drop the columns:
-            c->u->u_col_offset = c->u->u_end_col_offset = -1;
+            c->u->u_col_offset = -1;
+            c->u->u_end_col_offset = -1;
+        }
+        // Make sure the end position still follows the start position, even for
+        // weird ASTs:
+        c->u->u_end_lineno = Py_MAX(c->u->u_lineno, c->u->u_end_lineno);
+        if (c->u->u_lineno == c->u->u_end_lineno) {
+            c->u->u_end_col_offset = Py_MAX(c->u->u_col_offset,
+                                            c->u->u_end_col_offset);
         }
     }
 }
@@ -4842,7 +4852,7 @@ maybe_optimize_method_call(struct compiler *c, expr_ty e)
     /* Alright, we can optimize the code. */
     VISIT(c, expr, meth->v.Attribute.value);
     SET_LOC(c, meth);
-    update_location_to_match_attr(c, meth);
+    update_start_location_to_match_attr(c, meth);
     ADDOP_NAME(c, LOAD_METHOD, meth->v.Attribute.attr, names);
     VISIT_SEQ(c, expr, e->v.Call.args);
 
@@ -4853,7 +4863,7 @@ maybe_optimize_method_call(struct compiler *c, expr_ty e)
         };
     }
     SET_LOC(c, e);
-    update_location_to_match_attr(c, meth);
+    update_start_location_to_match_attr(c, meth);
     ADDOP_I(c, PRECALL, argsl + kwdsl);
     ADDOP_I(c, CALL, argsl + kwdsl);
     return 1;
@@ -5863,23 +5873,18 @@ compiler_visit_expr1(struct compiler *c, expr_ty e)
     /* The following exprs can be assignment targets. */
     case Attribute_kind:
         VISIT(c, expr, e->v.Attribute.value);
+        update_start_location_to_match_attr(c, e);
         switch (e->v.Attribute.ctx) {
         case Load:
         {
-            int old_lineno = c->u->u_lineno;
-            c->u->u_lineno = e->end_lineno;
             ADDOP_NAME(c, LOAD_ATTR, e->v.Attribute.attr, names);
-            c->u->u_lineno = old_lineno;
             break;
         }
         case Store:
             if (forbidden_name(c, e->v.Attribute.attr, e->v.Attribute.ctx)) {
                 return 0;
             }
-            int old_lineno = c->u->u_lineno;
-            c->u->u_lineno = e->end_lineno;
             ADDOP_NAME(c, STORE_ATTR, e->v.Attribute.attr, names);
-            c->u->u_lineno = old_lineno;
             break;
         case Del:
             ADDOP_NAME(c, DELETE_ATTR, e->v.Attribute.attr, names);
@@ -5945,10 +5950,8 @@ compiler_augassign(struct compiler *c, stmt_ty s)
     case Attribute_kind:
         VISIT(c, expr, e->v.Attribute.value);
         ADDOP_I(c, COPY, 1);
-        int old_lineno = c->u->u_lineno;
-        c->u->u_lineno = e->end_lineno;
+        update_start_location_to_match_attr(c, e);
         ADDOP_NAME(c, LOAD_ATTR, e->v.Attribute.attr, names);
-        c->u->u_lineno = old_lineno;
         break;
     case Subscript_kind:
         VISIT(c, expr, e->v.Subscript.value);
@@ -5980,7 +5983,7 @@ compiler_augassign(struct compiler *c, stmt_ty s)
 
     switch (e->kind) {
     case Attribute_kind:
-        c->u->u_lineno = e->end_lineno;
+        update_start_location_to_match_attr(c, e);
         ADDOP_I(c, SWAP, 2);
         ADDOP_NAME(c, STORE_ATTR, e->v.Attribute.attr, names);
         break;


From webhook-mailer at python.org  Sat Jul 23 03:51:33 2022
From: webhook-mailer at python.org (erlend-aasland)
Date: Sat, 23 Jul 2022 07:51:33 -0000
Subject: [Python-checkins] gh-95132: Correctly relay *args and **kwds from
 sqlite3.connect to factory (#95146)
Message-ID: <mailman.189.1658562694.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/a3d4d15f53777662ce0957500e5a538ce7161f5e
commit: a3d4d15f53777662ce0957500e5a538ce7161f5e
branch: main
author: Erlend Egeberg Aasland <erlend.aasland at innova.no>
committer: erlend-aasland <erlend.aasland at protonmail.com>
date: 2022-07-23T09:51:28+02:00
summary:

gh-95132: Correctly relay *args and **kwds from sqlite3.connect to factory (#95146)

This PR partially reverts gh-24421 (PR) and fixes the remaining concerns
given in gh-93044 (issue):

- keyword arguments are passed as positional arguments to factory()
- if an argument is not passed to sqlite3.connect(), its default value
  is passed to factory()

Co-authored-by: Serhiy Storchaka <storchaka at gmail.com>

files:
A Misc/NEWS.d/next/Library/2022-07-22-21-18-17.gh-issue-95132.n9anlw.rst
M Lib/test/test_sqlite3/test_factory.py
M Modules/_sqlite/clinic/module.c.h
M Modules/_sqlite/connection.c
M Modules/_sqlite/module.c

diff --git a/Lib/test/test_sqlite3/test_factory.py b/Lib/test/test_sqlite3/test_factory.py
index 71603faa02840..7fdc45ab69243 100644
--- a/Lib/test/test_sqlite3/test_factory.py
+++ b/Lib/test/test_sqlite3/test_factory.py
@@ -50,6 +50,26 @@ def __init__(self, *args, **kwargs):
                 con = sqlite.connect(":memory:", factory=factory)
                 self.assertIsInstance(con, factory)
 
+    def test_connection_factory_relayed_call(self):
+        # gh-95132: keyword args must not be passed as positional args
+        class Factory(sqlite.Connection):
+            def __init__(self, *args, **kwargs):
+                kwargs["isolation_level"] = None
+                super(Factory, self).__init__(*args, **kwargs)
+
+        con = sqlite.connect(":memory:", factory=Factory)
+        self.assertIsNone(con.isolation_level)
+        self.assertIsInstance(con, Factory)
+
+    def test_connection_factory_as_positional_arg(self):
+        class Factory(sqlite.Connection):
+            def __init__(self, *args, **kwargs):
+                super(Factory, self).__init__(*args, **kwargs)
+
+        con = sqlite.connect(":memory:", 5.0, 0, None, True, Factory)
+        self.assertIsNone(con.isolation_level)
+        self.assertIsInstance(con, Factory)
+
 
 class CursorFactoryTests(unittest.TestCase):
     def setUp(self):
diff --git a/Misc/NEWS.d/next/Library/2022-07-22-21-18-17.gh-issue-95132.n9anlw.rst b/Misc/NEWS.d/next/Library/2022-07-22-21-18-17.gh-issue-95132.n9anlw.rst
new file mode 100644
index 0000000000000..64666ad84fb4a
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2022-07-22-21-18-17.gh-issue-95132.n9anlw.rst
@@ -0,0 +1,4 @@
+Fix a :mod:`sqlite3` regression where ``*args`` and ``**kwds`` were
+incorrectly relayed from :py:func:`~sqlite3.connect` to the
+:class:`~sqlite3.Connection` factory. The regression was introduced in 3.11a1
+with PR 24421 (:gh:`85128`). Patch by Erlend E. Aasland.`
diff --git a/Modules/_sqlite/clinic/module.c.h b/Modules/_sqlite/clinic/module.c.h
index ef0dd4d1c103e..3e932a6117eb2 100644
--- a/Modules/_sqlite/clinic/module.c.h
+++ b/Modules/_sqlite/clinic/module.c.h
@@ -2,116 +2,6 @@
 preserve
 [clinic start generated code]*/
 
-PyDoc_STRVAR(pysqlite_connect__doc__,
-"connect($module, /, database, timeout=5.0, detect_types=0,\n"
-"        isolation_level=<unrepresentable>, check_same_thread=True,\n"
-"        factory=ConnectionType, cached_statements=128, uri=False)\n"
-"--\n"
-"\n"
-"Opens a connection to the SQLite database file database.\n"
-"\n"
-"You can use \":memory:\" to open a database connection to a database that resides\n"
-"in RAM instead of on disk.");
-
-#define PYSQLITE_CONNECT_METHODDEF    \
-    {"connect", _PyCFunction_CAST(pysqlite_connect), METH_FASTCALL|METH_KEYWORDS, pysqlite_connect__doc__},
-
-static PyObject *
-pysqlite_connect_impl(PyObject *module, PyObject *database, double timeout,
-                      int detect_types, PyObject *isolation_level,
-                      int check_same_thread, PyObject *factory,
-                      int cached_statements, int uri);
-
-static PyObject *
-pysqlite_connect(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
-{
-    PyObject *return_value = NULL;
-    static const char * const _keywords[] = {"database", "timeout", "detect_types", "isolation_level", "check_same_thread", "factory", "cached_statements", "uri", NULL};
-    static _PyArg_Parser _parser = {NULL, _keywords, "connect", 0};
-    PyObject *argsbuf[8];
-    Py_ssize_t noptargs = nargs + (kwnames ? PyTuple_GET_SIZE(kwnames) : 0) - 1;
-    PyObject *database;
-    double timeout = 5.0;
-    int detect_types = 0;
-    PyObject *isolation_level = NULL;
-    int check_same_thread = 1;
-    PyObject *factory = (PyObject*)clinic_state()->ConnectionType;
-    int cached_statements = 128;
-    int uri = 0;
-
-    args = _PyArg_UnpackKeywords(args, nargs, NULL, kwnames, &_parser, 1, 8, 0, argsbuf);
-    if (!args) {
-        goto exit;
-    }
-    database = args[0];
-    if (!noptargs) {
-        goto skip_optional_pos;
-    }
-    if (args[1]) {
-        if (PyFloat_CheckExact(args[1])) {
-            timeout = PyFloat_AS_DOUBLE(args[1]);
-        }
-        else
-        {
-            timeout = PyFloat_AsDouble(args[1]);
-            if (timeout == -1.0 && PyErr_Occurred()) {
-                goto exit;
-            }
-        }
-        if (!--noptargs) {
-            goto skip_optional_pos;
-        }
-    }
-    if (args[2]) {
-        detect_types = _PyLong_AsInt(args[2]);
-        if (detect_types == -1 && PyErr_Occurred()) {
-            goto exit;
-        }
-        if (!--noptargs) {
-            goto skip_optional_pos;
-        }
-    }
-    if (args[3]) {
-        isolation_level = args[3];
-        if (!--noptargs) {
-            goto skip_optional_pos;
-        }
-    }
-    if (args[4]) {
-        check_same_thread = _PyLong_AsInt(args[4]);
-        if (check_same_thread == -1 && PyErr_Occurred()) {
-            goto exit;
-        }
-        if (!--noptargs) {
-            goto skip_optional_pos;
-        }
-    }
-    if (args[5]) {
-        factory = args[5];
-        if (!--noptargs) {
-            goto skip_optional_pos;
-        }
-    }
-    if (args[6]) {
-        cached_statements = _PyLong_AsInt(args[6]);
-        if (cached_statements == -1 && PyErr_Occurred()) {
-            goto exit;
-        }
-        if (!--noptargs) {
-            goto skip_optional_pos;
-        }
-    }
-    uri = PyObject_IsTrue(args[7]);
-    if (uri < 0) {
-        goto exit;
-    }
-skip_optional_pos:
-    return_value = pysqlite_connect_impl(module, database, timeout, detect_types, isolation_level, check_same_thread, factory, cached_statements, uri);
-
-exit:
-    return return_value;
-}
-
 PyDoc_STRVAR(pysqlite_complete_statement__doc__,
 "complete_statement($module, /, statement)\n"
 "--\n"
@@ -292,4 +182,4 @@ pysqlite_adapt(PyObject *module, PyObject *const *args, Py_ssize_t nargs)
 exit:
     return return_value;
 }
-/*[clinic end generated code: output=9ac18606b0eaec03 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=d7f142e9a7a80468 input=a9049054013a1b77]*/
diff --git a/Modules/_sqlite/connection.c b/Modules/_sqlite/connection.c
index b6b7417fc0a6c..ceb77bbf8420f 100644
--- a/Modules/_sqlite/connection.c
+++ b/Modules/_sqlite/connection.c
@@ -140,6 +140,7 @@ class IsolationLevel_converter(CConverter):
 [python start generated code]*/
 /*[python end generated code: output=da39a3ee5e6b4b0d input=cbcfe85b253061c2]*/
 
+// NB: This needs to be in sync with the sqlite3.connect docstring
 /*[clinic input]
 _sqlite3.Connection.__init__ as pysqlite_connection_init
 
diff --git a/Modules/_sqlite/module.c b/Modules/_sqlite/module.c
index eca25b94a4817..707aae160ab4f 100644
--- a/Modules/_sqlite/module.c
+++ b/Modules/_sqlite/module.c
@@ -42,47 +42,44 @@ module _sqlite3
 [clinic start generated code]*/
 /*[clinic end generated code: output=da39a3ee5e6b4b0d input=81e330492d57488e]*/
 
-// NOTE: This must equal sqlite3.Connection.__init__ argument spec!
-/*[clinic input]
-_sqlite3.connect as pysqlite_connect
-
-    database: object
-    timeout: double = 5.0
-    detect_types: int = 0
-    isolation_level: object = NULL
-    check_same_thread: bool(accept={int}) = True
-    factory: object(c_default='(PyObject*)clinic_state()->ConnectionType') = ConnectionType
-    cached_statements: int = 128
-    uri: bool = False
-
-Opens a connection to the SQLite database file database.
-
-You can use ":memory:" to open a database connection to a database that resides
-in RAM instead of on disk.
-[clinic start generated code]*/
+// NB: This needs to be in sync with the Connection.__init__ docstring.
+PyDoc_STRVAR(module_connect_doc,
+"connect($module, /, database, timeout=5.0, detect_types=0,\n"
+"        isolation_level='', check_same_thread=True,\n"
+"        factory=ConnectionType, cached_statements=128, uri=False)\n"
+"--\n"
+"\n"
+"Opens a connection to the SQLite database file database.\n"
+"\n"
+"You can use \":memory:\" to open a database connection to a database that resides\n"
+"in RAM instead of on disk.");
+
+#define PYSQLITE_CONNECT_METHODDEF    \
+    {"connect", _PyCFunction_CAST(module_connect), METH_FASTCALL|METH_KEYWORDS, module_connect_doc},
 
 static PyObject *
-pysqlite_connect_impl(PyObject *module, PyObject *database, double timeout,
-                      int detect_types, PyObject *isolation_level,
-                      int check_same_thread, PyObject *factory,
-                      int cached_statements, int uri)
-/*[clinic end generated code: output=450ac9078b4868bb input=e16914663ddf93ce]*/
+module_connect(PyObject *module, PyObject *const *args, Py_ssize_t nargsf,
+               PyObject *kwnames)
 {
-    if (isolation_level == NULL) {
-        isolation_level = PyUnicode_FromString("");
-        if (isolation_level == NULL) {
-            return NULL;
-        }
+    pysqlite_state *state = pysqlite_get_state(module);
+    PyObject *factory = (PyObject *)state->ConnectionType;
+
+    static const int FACTORY_POS = 5;
+    Py_ssize_t nargs = PyVectorcall_NARGS(nargsf);
+    if (nargs > FACTORY_POS) {
+        factory = args[FACTORY_POS];
     }
-    else {
-        Py_INCREF(isolation_level);
+    else if (kwnames != NULL) {
+        for (Py_ssize_t i = 0; i < PyTuple_GET_SIZE(kwnames); i++) {
+            PyObject *item = PyTuple_GET_ITEM(kwnames, i);  // borrowed ref.
+            if (PyUnicode_CompareWithASCIIString(item, "factory") == 0) {
+                factory = args[nargs + i];
+                break;
+            }
+        }
     }
-    PyObject *res = PyObject_CallFunction(factory, "OdiOiOii", database,
-                                          timeout, detect_types,
-                                          isolation_level, check_same_thread,
-                                          factory, cached_statements, uri);
-    Py_DECREF(isolation_level);
-    return res;
+
+    return PyObject_Vectorcall(factory, args, nargsf, kwnames);
 }
 
 /*[clinic input]


From webhook-mailer at python.org  Sat Jul 23 04:23:38 2022
From: webhook-mailer at python.org (erlend-aasland)
Date: Sat, 23 Jul 2022 08:23:38 -0000
Subject: [Python-checkins] [3.11] gh-95132: Correctly relay *args and **kwds
 from sqlite3.connect to factory (GH-95146) (#95158)
Message-ID: <mailman.190.1658564619.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/5d3f2fbf37cd8faa9830490ac244b051d3879990
commit: 5d3f2fbf37cd8faa9830490ac244b051d3879990
branch: 3.11
author: Erlend Egeberg Aasland <erlend.aasland at innova.no>
committer: erlend-aasland <erlend.aasland at protonmail.com>
date: 2022-07-23T10:23:19+02:00
summary:

[3.11] gh-95132: Correctly relay *args and **kwds from sqlite3.connect to factory (GH-95146) (#95158)

This PR partially reverts gh-24421 (PR) and fixes the remaining concerns
given in gh-93044 (issue):

- keyword arguments are passed as positional arguments to factory()
- if an argument is not passed to sqlite3.connect(), its default value
  is passed to factory()

Co-authored-by: Serhiy Storchaka <storchaka at gmail.com>.
(cherry picked from commit a3d4d15f53777662ce0957500e5a538ce7161f5e)

Co-authored-by: Erlend Egeberg Aasland <erlend.aasland at innova.no>

files:
A Misc/NEWS.d/next/Library/2022-07-22-21-18-17.gh-issue-95132.n9anlw.rst
M Lib/test/test_sqlite3/test_factory.py
M Modules/_sqlite/clinic/module.c.h
M Modules/_sqlite/connection.c
M Modules/_sqlite/module.c

diff --git a/Lib/test/test_sqlite3/test_factory.py b/Lib/test/test_sqlite3/test_factory.py
index 420855ba34b60..cdaf12588a7f4 100644
--- a/Lib/test/test_sqlite3/test_factory.py
+++ b/Lib/test/test_sqlite3/test_factory.py
@@ -50,6 +50,26 @@ def __init__(self, *args, **kwargs):
                 con = sqlite.connect(":memory:", factory=factory)
                 self.assertIsInstance(con, factory)
 
+    def test_connection_factory_relayed_call(self):
+        # gh-95132: keyword args must not be passed as positional args
+        class Factory(sqlite.Connection):
+            def __init__(self, *args, **kwargs):
+                kwargs["isolation_level"] = None
+                super(Factory, self).__init__(*args, **kwargs)
+
+        con = sqlite.connect(":memory:", factory=Factory)
+        self.assertIsNone(con.isolation_level)
+        self.assertIsInstance(con, Factory)
+
+    def test_connection_factory_as_positional_arg(self):
+        class Factory(sqlite.Connection):
+            def __init__(self, *args, **kwargs):
+                super(Factory, self).__init__(*args, **kwargs)
+
+        con = sqlite.connect(":memory:", 5.0, 0, None, True, Factory)
+        self.assertIsNone(con.isolation_level)
+        self.assertIsInstance(con, Factory)
+
 
 class CursorFactoryTests(unittest.TestCase):
     def setUp(self):
diff --git a/Misc/NEWS.d/next/Library/2022-07-22-21-18-17.gh-issue-95132.n9anlw.rst b/Misc/NEWS.d/next/Library/2022-07-22-21-18-17.gh-issue-95132.n9anlw.rst
new file mode 100644
index 0000000000000..64666ad84fb4a
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2022-07-22-21-18-17.gh-issue-95132.n9anlw.rst
@@ -0,0 +1,4 @@
+Fix a :mod:`sqlite3` regression where ``*args`` and ``**kwds`` were
+incorrectly relayed from :py:func:`~sqlite3.connect` to the
+:class:`~sqlite3.Connection` factory. The regression was introduced in 3.11a1
+with PR 24421 (:gh:`85128`). Patch by Erlend E. Aasland.`
diff --git a/Modules/_sqlite/clinic/module.c.h b/Modules/_sqlite/clinic/module.c.h
index a5a900ebe9712..f5278078a36a5 100644
--- a/Modules/_sqlite/clinic/module.c.h
+++ b/Modules/_sqlite/clinic/module.c.h
@@ -2,116 +2,6 @@
 preserve
 [clinic start generated code]*/
 
-PyDoc_STRVAR(pysqlite_connect__doc__,
-"connect($module, /, database, timeout=5.0, detect_types=0,\n"
-"        isolation_level=<unrepresentable>, check_same_thread=True,\n"
-"        factory=ConnectionType, cached_statements=128, uri=False)\n"
-"--\n"
-"\n"
-"Opens a connection to the SQLite database file database.\n"
-"\n"
-"You can use \":memory:\" to open a database connection to a database that resides\n"
-"in RAM instead of on disk.");
-
-#define PYSQLITE_CONNECT_METHODDEF    \
-    {"connect", _PyCFunction_CAST(pysqlite_connect), METH_FASTCALL|METH_KEYWORDS, pysqlite_connect__doc__},
-
-static PyObject *
-pysqlite_connect_impl(PyObject *module, PyObject *database, double timeout,
-                      int detect_types, PyObject *isolation_level,
-                      int check_same_thread, PyObject *factory,
-                      int cached_statements, int uri);
-
-static PyObject *
-pysqlite_connect(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
-{
-    PyObject *return_value = NULL;
-    static const char * const _keywords[] = {"database", "timeout", "detect_types", "isolation_level", "check_same_thread", "factory", "cached_statements", "uri", NULL};
-    static _PyArg_Parser _parser = {NULL, _keywords, "connect", 0};
-    PyObject *argsbuf[8];
-    Py_ssize_t noptargs = nargs + (kwnames ? PyTuple_GET_SIZE(kwnames) : 0) - 1;
-    PyObject *database;
-    double timeout = 5.0;
-    int detect_types = 0;
-    PyObject *isolation_level = NULL;
-    int check_same_thread = 1;
-    PyObject *factory = (PyObject*)clinic_state()->ConnectionType;
-    int cached_statements = 128;
-    int uri = 0;
-
-    args = _PyArg_UnpackKeywords(args, nargs, NULL, kwnames, &_parser, 1, 8, 0, argsbuf);
-    if (!args) {
-        goto exit;
-    }
-    database = args[0];
-    if (!noptargs) {
-        goto skip_optional_pos;
-    }
-    if (args[1]) {
-        if (PyFloat_CheckExact(args[1])) {
-            timeout = PyFloat_AS_DOUBLE(args[1]);
-        }
-        else
-        {
-            timeout = PyFloat_AsDouble(args[1]);
-            if (timeout == -1.0 && PyErr_Occurred()) {
-                goto exit;
-            }
-        }
-        if (!--noptargs) {
-            goto skip_optional_pos;
-        }
-    }
-    if (args[2]) {
-        detect_types = _PyLong_AsInt(args[2]);
-        if (detect_types == -1 && PyErr_Occurred()) {
-            goto exit;
-        }
-        if (!--noptargs) {
-            goto skip_optional_pos;
-        }
-    }
-    if (args[3]) {
-        isolation_level = args[3];
-        if (!--noptargs) {
-            goto skip_optional_pos;
-        }
-    }
-    if (args[4]) {
-        check_same_thread = _PyLong_AsInt(args[4]);
-        if (check_same_thread == -1 && PyErr_Occurred()) {
-            goto exit;
-        }
-        if (!--noptargs) {
-            goto skip_optional_pos;
-        }
-    }
-    if (args[5]) {
-        factory = args[5];
-        if (!--noptargs) {
-            goto skip_optional_pos;
-        }
-    }
-    if (args[6]) {
-        cached_statements = _PyLong_AsInt(args[6]);
-        if (cached_statements == -1 && PyErr_Occurred()) {
-            goto exit;
-        }
-        if (!--noptargs) {
-            goto skip_optional_pos;
-        }
-    }
-    uri = PyObject_IsTrue(args[7]);
-    if (uri < 0) {
-        goto exit;
-    }
-skip_optional_pos:
-    return_value = pysqlite_connect_impl(module, database, timeout, detect_types, isolation_level, check_same_thread, factory, cached_statements, uri);
-
-exit:
-    return return_value;
-}
-
 PyDoc_STRVAR(pysqlite_complete_statement__doc__,
 "complete_statement($module, /, statement)\n"
 "--\n"
@@ -332,4 +222,4 @@ pysqlite_adapt(PyObject *module, PyObject *const *args, Py_ssize_t nargs)
 exit:
     return return_value;
 }
-/*[clinic end generated code: output=fe62f28efd8a5c63 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=ecaf4e0a239c2685 input=a9049054013a1b77]*/
diff --git a/Modules/_sqlite/connection.c b/Modules/_sqlite/connection.c
index 99949baa0c62b..20982558840bb 100644
--- a/Modules/_sqlite/connection.c
+++ b/Modules/_sqlite/connection.c
@@ -140,6 +140,7 @@ class IsolationLevel_converter(CConverter):
 [python start generated code]*/
 /*[python end generated code: output=da39a3ee5e6b4b0d input=cbcfe85b253061c2]*/
 
+// NB: This needs to be in sync with the sqlite3.connect docstring
 /*[clinic input]
 _sqlite3.Connection.__init__ as pysqlite_connection_init
 
diff --git a/Modules/_sqlite/module.c b/Modules/_sqlite/module.c
index 8c64e416b12c6..e633a63ae9e1b 100644
--- a/Modules/_sqlite/module.c
+++ b/Modules/_sqlite/module.c
@@ -42,47 +42,44 @@ module _sqlite3
 [clinic start generated code]*/
 /*[clinic end generated code: output=da39a3ee5e6b4b0d input=81e330492d57488e]*/
 
-// NOTE: This must equal sqlite3.Connection.__init__ argument spec!
-/*[clinic input]
-_sqlite3.connect as pysqlite_connect
-
-    database: object
-    timeout: double = 5.0
-    detect_types: int = 0
-    isolation_level: object = NULL
-    check_same_thread: bool(accept={int}) = True
-    factory: object(c_default='(PyObject*)clinic_state()->ConnectionType') = ConnectionType
-    cached_statements: int = 128
-    uri: bool = False
-
-Opens a connection to the SQLite database file database.
-
-You can use ":memory:" to open a database connection to a database that resides
-in RAM instead of on disk.
-[clinic start generated code]*/
+// NB: This needs to be in sync with the Connection.__init__ docstring.
+PyDoc_STRVAR(module_connect_doc,
+"connect($module, /, database, timeout=5.0, detect_types=0,\n"
+"        isolation_level='', check_same_thread=True,\n"
+"        factory=ConnectionType, cached_statements=128, uri=False)\n"
+"--\n"
+"\n"
+"Opens a connection to the SQLite database file database.\n"
+"\n"
+"You can use \":memory:\" to open a database connection to a database that resides\n"
+"in RAM instead of on disk.");
+
+#define PYSQLITE_CONNECT_METHODDEF    \
+    {"connect", _PyCFunction_CAST(module_connect), METH_FASTCALL|METH_KEYWORDS, module_connect_doc},
 
 static PyObject *
-pysqlite_connect_impl(PyObject *module, PyObject *database, double timeout,
-                      int detect_types, PyObject *isolation_level,
-                      int check_same_thread, PyObject *factory,
-                      int cached_statements, int uri)
-/*[clinic end generated code: output=450ac9078b4868bb input=e16914663ddf93ce]*/
+module_connect(PyObject *module, PyObject *const *args, Py_ssize_t nargsf,
+               PyObject *kwnames)
 {
-    if (isolation_level == NULL) {
-        isolation_level = PyUnicode_FromString("");
-        if (isolation_level == NULL) {
-            return NULL;
-        }
+    pysqlite_state *state = pysqlite_get_state(module);
+    PyObject *factory = (PyObject *)state->ConnectionType;
+
+    static const int FACTORY_POS = 5;
+    Py_ssize_t nargs = PyVectorcall_NARGS(nargsf);
+    if (nargs > FACTORY_POS) {
+        factory = args[FACTORY_POS];
     }
-    else {
-        Py_INCREF(isolation_level);
+    else if (kwnames != NULL) {
+        for (Py_ssize_t i = 0; i < PyTuple_GET_SIZE(kwnames); i++) {
+            PyObject *item = PyTuple_GET_ITEM(kwnames, i);  // borrowed ref.
+            if (PyUnicode_CompareWithASCIIString(item, "factory") == 0) {
+                factory = args[nargs + i];
+                break;
+            }
+        }
     }
-    PyObject *res = PyObject_CallFunction(factory, "OdiOiOii", database,
-                                          timeout, detect_types,
-                                          isolation_level, check_same_thread,
-                                          factory, cached_statements, uri);
-    Py_DECREF(isolation_level);
-    return res;
+
+    return PyObject_Vectorcall(factory, args, nargsf, kwnames);
 }
 
 /*[clinic input]


From webhook-mailer at python.org  Sat Jul 23 05:25:49 2022
From: webhook-mailer at python.org (Fidget-Spinner)
Date: Sat, 23 Jul 2022 09:25:49 -0000
Subject: [Python-checkins] Doc: Add omitted secondary prompt in inputoutput
 tutorial (GH-30317)
Message-ID: <mailman.191.1658568350.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/de28ee8f755760fda13b481a34b1f326984d293a
commit: de28ee8f755760fda13b481a34b1f326984d293a
branch: main
author: Chenwei Xiao <chanvinxiao at 163.com>
committer: Fidget-Spinner <28750310+Fidget-Spinner at users.noreply.github.com>
date: 2022-07-23T17:25:42+08:00
summary:

Doc: Add omitted secondary prompt in inputoutput tutorial (GH-30317)

For the continuation lines, "..." should present as secondary prompt

files:
M Doc/tutorial/inputoutput.rst

diff --git a/Doc/tutorial/inputoutput.rst b/Doc/tutorial/inputoutput.rst
index 324238228d626..d3414005a5343 100644
--- a/Doc/tutorial/inputoutput.rst
+++ b/Doc/tutorial/inputoutput.rst
@@ -166,7 +166,7 @@ are referred to by using the name of the argument. ::
 Positional and keyword arguments can be arbitrarily combined::
 
    >>> print('The story of {0}, {1}, and {other}.'.format('Bill', 'Manfred',
-                                                          other='Georg'))
+   ...                                                    other='Georg'))
    The story of Bill, Manfred, and Georg.
 
 If you have a really long format string that you don't want to split up, it


From webhook-mailer at python.org  Sat Jul 23 05:33:22 2022
From: webhook-mailer at python.org (miss-islington)
Date: Sat, 23 Jul 2022 09:33:22 -0000
Subject: [Python-checkins] Doc: Add omitted secondary prompt in inputoutput
 tutorial (GH-30317)
Message-ID: <mailman.192.1658568803.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/a1a1fd0dee22c9d49040503f6506dfc9308657c0
commit: a1a1fd0dee22c9d49040503f6506dfc9308657c0
branch: 3.11
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-23T02:33:17-07:00
summary:

Doc: Add omitted secondary prompt in inputoutput tutorial (GH-30317)


For the continuation lines, "..." should present as secondary prompt
(cherry picked from commit de28ee8f755760fda13b481a34b1f326984d293a)

Co-authored-by: Chenwei Xiao <chanvinxiao at 163.com>

files:
M Doc/tutorial/inputoutput.rst

diff --git a/Doc/tutorial/inputoutput.rst b/Doc/tutorial/inputoutput.rst
index 324238228d626..d3414005a5343 100644
--- a/Doc/tutorial/inputoutput.rst
+++ b/Doc/tutorial/inputoutput.rst
@@ -166,7 +166,7 @@ are referred to by using the name of the argument. ::
 Positional and keyword arguments can be arbitrarily combined::
 
    >>> print('The story of {0}, {1}, and {other}.'.format('Bill', 'Manfred',
-                                                          other='Georg'))
+   ...                                                    other='Georg'))
    The story of Bill, Manfred, and Georg.
 
 If you have a really long format string that you don't want to split up, it


From webhook-mailer at python.org  Sat Jul 23 05:35:00 2022
From: webhook-mailer at python.org (tiran)
Date: Sat, 23 Jul 2022 09:35:00 -0000
Subject: [Python-checkins] gh-89758: Track all socket module dependencies
 (#95157)
Message-ID: <mailman.193.1658568901.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/41a5b84eaf7c52d1d4aa0a8d3d135a09f5f7190e
commit: 41a5b84eaf7c52d1d4aa0a8d3d135a09f5f7190e
branch: main
author: Christian Heimes <christian at python.org>
committer: tiran <christian at python.org>
date: 2022-07-23T11:34:50+02:00
summary:

gh-89758: Track all socket module dependencies (#95157)

files:
M Makefile.pre.in

diff --git a/Makefile.pre.in b/Makefile.pre.in
index 98df01963ca5a..dd0216572e601 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -2528,7 +2528,7 @@ MODULE__SHA1_DEPS=$(srcdir)/Modules/hashlib.h
 MODULE__SHA256_DEPS=$(srcdir)/Modules/hashlib.h
 MODULE__SHA3_DEPS=$(srcdir)/Modules/_sha3/sha3.c $(srcdir)/Modules/_sha3/sha3.h $(srcdir)/Modules/hashlib.h
 MODULE__SHA512_DEPS=$(srcdir)/Modules/hashlib.h
-MODULE__SOCKET_DEPS=$(srcdir)/Modules/socketmodule.h
+MODULE__SOCKET_DEPS=$(srcdir)/Modules/socketmodule.h $(srcdir)/Modules/addrinfo.h $(srcdir)/Modules/getaddrinfo.c $(srcdir)/Modules/getnameinfo.c
 MODULE__SSL_DEPS=$(srcdir)/Modules/_ssl.h $(srcdir)/Modules/_ssl/cert.c $(srcdir)/Modules/_ssl/debughelpers.c $(srcdir)/Modules/_ssl/misc.c $(srcdir)/Modules/_ssl_data.h $(srcdir)/Modules/_ssl_data_111.h $(srcdir)/Modules/_ssl_data_300.h $(srcdir)/Modules/socketmodule.h
 MODULE__TESTCAPI_DEPS=$(srcdir)/Modules/testcapi_long.h $(srcdir)/Modules/_testcapi/parts.h
 MODULE__SQLITE3_DEPS=$(srcdir)/Modules/_sqlite/connection.h $(srcdir)/Modules/_sqlite/cursor.h $(srcdir)/Modules/_sqlite/microprotocols.h $(srcdir)/Modules/_sqlite/module.h $(srcdir)/Modules/_sqlite/prepare_protocol.h $(srcdir)/Modules/_sqlite/row.h $(srcdir)/Modules/_sqlite/util.h


From webhook-mailer at python.org  Sat Jul 23 06:03:28 2022
From: webhook-mailer at python.org (miss-islington)
Date: Sat, 23 Jul 2022 10:03:28 -0000
Subject: [Python-checkins] gh-89758: Track all socket module dependencies
 (GH-95157)
Message-ID: <mailman.194.1658570609.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/62bc052c1eebce3f6e68e7a18ea3cf4bc05e1527
commit: 62bc052c1eebce3f6e68e7a18ea3cf4bc05e1527
branch: 3.11
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-23T03:03:05-07:00
summary:

gh-89758: Track all socket module dependencies (GH-95157)

(cherry picked from commit 41a5b84eaf7c52d1d4aa0a8d3d135a09f5f7190e)

Co-authored-by: Christian Heimes <christian at python.org>

files:
M Makefile.pre.in

diff --git a/Makefile.pre.in b/Makefile.pre.in
index f43956b6b7cf6..e145315c45ca6 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -2535,7 +2535,7 @@ MODULE__SHA1_DEPS=$(srcdir)/Modules/hashlib.h
 MODULE__SHA256_DEPS=$(srcdir)/Modules/hashlib.h
 MODULE__SHA3_DEPS=$(srcdir)/Modules/_sha3/sha3.c $(srcdir)/Modules/_sha3/sha3.h $(srcdir)/Modules/hashlib.h
 MODULE__SHA512_DEPS=$(srcdir)/Modules/hashlib.h
-MODULE__SOCKET_DEPS=$(srcdir)/Modules/socketmodule.h
+MODULE__SOCKET_DEPS=$(srcdir)/Modules/socketmodule.h $(srcdir)/Modules/addrinfo.h $(srcdir)/Modules/getaddrinfo.c $(srcdir)/Modules/getnameinfo.c
 MODULE__SSL_DEPS=$(srcdir)/Modules/_ssl.h $(srcdir)/Modules/_ssl/cert.c $(srcdir)/Modules/_ssl/debughelpers.c $(srcdir)/Modules/_ssl/misc.c $(srcdir)/Modules/_ssl_data.h $(srcdir)/Modules/_ssl_data_111.h $(srcdir)/Modules/_ssl_data_300.h $(srcdir)/Modules/socketmodule.h
 MODULE__TESTCAPI_DEPS=$(srcdir)/Modules/testcapi_long.h
 MODULE__SQLITE3_DEPS=$(srcdir)/Modules/_sqlite/connection.h $(srcdir)/Modules/_sqlite/cursor.h $(srcdir)/Modules/_sqlite/microprotocols.h $(srcdir)/Modules/_sqlite/module.h $(srcdir)/Modules/_sqlite/prepare_protocol.h $(srcdir)/Modules/_sqlite/row.h $(srcdir)/Modules/_sqlite/util.h


From webhook-mailer at python.org  Sat Jul 23 06:26:39 2022
From: webhook-mailer at python.org (tiran)
Date: Sat, 23 Jul 2022 10:26:39 -0000
Subject: [Python-checkins] gh-90473: Fix more tests on platforms without
 umask (GH-95164)
Message-ID: <mailman.195.1658572000.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/68393248947adaa61962cd44e9d49c44017ba94f
commit: 68393248947adaa61962cd44e9d49c44017ba94f
branch: main
author: Christian Heimes <christian at python.org>
committer: tiran <christian at python.org>
date: 2022-07-23T12:26:31+02:00
summary:

gh-90473: Fix more tests on platforms without umask (GH-95164)

files:
M Lib/distutils/tests/test_dir_util.py
M Lib/test/support/os_helper.py
M Lib/test/test_os.py

diff --git a/Lib/distutils/tests/test_dir_util.py b/Lib/distutils/tests/test_dir_util.py
index f3ba0ee33b4bc..ebd89f320dca8 100644
--- a/Lib/distutils/tests/test_dir_util.py
+++ b/Lib/distutils/tests/test_dir_util.py
@@ -11,7 +11,7 @@
 
 from distutils import log
 from distutils.tests import support
-from test.support import run_unittest, is_emscripten
+from test.support import run_unittest, is_emscripten, is_wasi
 
 
 class DirUtilTestCase(support.TempdirManager, unittest.TestCase):
@@ -55,7 +55,10 @@ def test_mkpath_remove_tree_verbosity(self):
 
     @unittest.skipIf(sys.platform.startswith('win'),
         "This test is only appropriate for POSIX-like systems.")
-    @unittest.skipIf(is_emscripten, "Emscripten's umask is a stub.")
+    @unittest.skipIf(
+        is_emscripten or is_wasi,
+        "Emscripten's/WASI's umask is a stub."
+    )
     def test_mkpath_with_custom_mode(self):
         # Get and set the current umask value for testing mode bits.
         umask = os.umask(0o002)
diff --git a/Lib/test/support/os_helper.py b/Lib/test/support/os_helper.py
index 61d12f59e4a60..f37a442aa0e6c 100644
--- a/Lib/test/support/os_helper.py
+++ b/Lib/test/support/os_helper.py
@@ -658,6 +658,11 @@ def temp_umask(umask):
             yield
         finally:
             os.umask(oldmask)
+else:
+    @contextlib.contextmanager
+    def temp_umask(umask):
+        """no-op on platforms without umask()"""
+        yield
 
 
 class EnvironmentVarGuard(collections.abc.MutableMapping):
diff --git a/Lib/test/test_os.py b/Lib/test/test_os.py
index 29f69a8f475b2..9970b234b4831 100644
--- a/Lib/test/test_os.py
+++ b/Lib/test/test_os.py
@@ -1607,6 +1607,10 @@ def test_mode(self):
                 self.assertEqual(os.stat(path).st_mode & 0o777, 0o555)
                 self.assertEqual(os.stat(parent).st_mode & 0o777, 0o775)
 
+    @unittest.skipIf(
+        support.is_emscripten or support.is_wasi,
+        "Emscripten's/WASI's umask is a stub."
+    )
     def test_exist_ok_existing_directory(self):
         path = os.path.join(os_helper.TESTFN, 'dir1')
         mode = 0o777
@@ -1621,6 +1625,10 @@ def test_exist_ok_existing_directory(self):
         # Issue #25583: A drive root could raise PermissionError on Windows
         os.makedirs(os.path.abspath('/'), exist_ok=True)
 
+    @unittest.skipIf(
+        support.is_emscripten or support.is_wasi,
+        "Emscripten's/WASI's umask is a stub."
+    )
     def test_exist_ok_s_isgid_directory(self):
         path = os.path.join(os_helper.TESTFN, 'dir1')
         S_ISGID = stat.S_ISGID


From webhook-mailer at python.org  Sat Jul 23 06:28:24 2022
From: webhook-mailer at python.org (Fidget-Spinner)
Date: Sat, 23 Jul 2022 10:28:24 -0000
Subject: [Python-checkins] Doc: Add omitted secondary prompt in inputoutput
 tutorial (GH-30317) (#95159)
Message-ID: <mailman.196.1658572105.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/e71e6e2ce5dcb88125ddb83c09af1b906611108b
commit: e71e6e2ce5dcb88125ddb83c09af1b906611108b
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: Fidget-Spinner <28750310+Fidget-Spinner at users.noreply.github.com>
date: 2022-07-23T18:28:15+08:00
summary:

Doc: Add omitted secondary prompt in inputoutput tutorial (GH-30317) (#95159)

For the continuation lines, "..." should present as secondary prompt
(cherry picked from commit de28ee8f755760fda13b481a34b1f326984d293a)

Co-authored-by: Chenwei Xiao <chanvinxiao at 163.com>

Co-authored-by: Chenwei Xiao <chanvinxiao at 163.com>

files:
M Doc/tutorial/inputoutput.rst

diff --git a/Doc/tutorial/inputoutput.rst b/Doc/tutorial/inputoutput.rst
index 324238228d626..d3414005a5343 100644
--- a/Doc/tutorial/inputoutput.rst
+++ b/Doc/tutorial/inputoutput.rst
@@ -166,7 +166,7 @@ are referred to by using the name of the argument. ::
 Positional and keyword arguments can be arbitrarily combined::
 
    >>> print('The story of {0}, {1}, and {other}.'.format('Bill', 'Manfred',
-                                                          other='Georg'))
+   ...                                                    other='Georg'))
    The story of Bill, Manfred, and Georg.
 
 If you have a really long format string that you don't want to split up, it


From webhook-mailer at python.org  Sat Jul 23 06:29:08 2022
From: webhook-mailer at python.org (tiran)
Date: Sat, 23 Jul 2022 10:29:08 -0000
Subject: [Python-checkins] gh-90473: Check for HAVE_KILL in
 main.c:exit_sigint (GH-95165)
Message-ID: <mailman.197.1658572148.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/d291a82df33cd8c917a374fef2a2373beda78b77
commit: d291a82df33cd8c917a374fef2a2373beda78b77
branch: main
author: Christian Heimes <christian at python.org>
committer: tiran <christian at python.org>
date: 2022-07-23T12:29:00+02:00
summary:

gh-90473: Check for HAVE_KILL in main.c:exit_sigint (GH-95165)

files:
M Modules/main.c

diff --git a/Modules/main.c b/Modules/main.c
index 90f237293b856..aa523fc58d93f 100644
--- a/Modules/main.c
+++ b/Modules/main.c
@@ -649,7 +649,7 @@ exit_sigint(void)
      * SIG_DFL handler for SIGINT if KeyboardInterrupt went unhandled.
      * If we don't, a calling process such as a shell may not know
      * about the user's ^C.  https://www.cons.org/cracauer/sigint.html */
-#if defined(HAVE_GETPID) && !defined(MS_WINDOWS)
+#if defined(HAVE_GETPID) && defined(HAVE_KILL) && !defined(MS_WINDOWS)
     if (PyOS_setsig(SIGINT, SIG_DFL) == SIG_ERR) {
         perror("signal");  /* Impossible in normal environments. */
     } else {


From webhook-mailer at python.org  Sat Jul 23 06:51:34 2022
From: webhook-mailer at python.org (miss-islington)
Date: Sat, 23 Jul 2022 10:51:34 -0000
Subject: [Python-checkins] gh-90473: Fix more tests on platforms without
 umask (GH-95164)
Message-ID: <mailman.198.1658573495.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/0d688bd2b6f572afb9783c3520345c9accc0ca6c
commit: 0d688bd2b6f572afb9783c3520345c9accc0ca6c
branch: 3.11
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-23T03:51:29-07:00
summary:

gh-90473: Fix more tests on platforms without umask (GH-95164)

(cherry picked from commit 68393248947adaa61962cd44e9d49c44017ba94f)

Co-authored-by: Christian Heimes <christian at python.org>

files:
M Lib/distutils/tests/test_dir_util.py
M Lib/test/support/os_helper.py
M Lib/test/test_os.py

diff --git a/Lib/distutils/tests/test_dir_util.py b/Lib/distutils/tests/test_dir_util.py
index f3ba0ee33b4bc..ebd89f320dca8 100644
--- a/Lib/distutils/tests/test_dir_util.py
+++ b/Lib/distutils/tests/test_dir_util.py
@@ -11,7 +11,7 @@
 
 from distutils import log
 from distutils.tests import support
-from test.support import run_unittest, is_emscripten
+from test.support import run_unittest, is_emscripten, is_wasi
 
 
 class DirUtilTestCase(support.TempdirManager, unittest.TestCase):
@@ -55,7 +55,10 @@ def test_mkpath_remove_tree_verbosity(self):
 
     @unittest.skipIf(sys.platform.startswith('win'),
         "This test is only appropriate for POSIX-like systems.")
-    @unittest.skipIf(is_emscripten, "Emscripten's umask is a stub.")
+    @unittest.skipIf(
+        is_emscripten or is_wasi,
+        "Emscripten's/WASI's umask is a stub."
+    )
     def test_mkpath_with_custom_mode(self):
         # Get and set the current umask value for testing mode bits.
         umask = os.umask(0o002)
diff --git a/Lib/test/support/os_helper.py b/Lib/test/support/os_helper.py
index 1ac8a946060e7..f599cc752196e 100644
--- a/Lib/test/support/os_helper.py
+++ b/Lib/test/support/os_helper.py
@@ -653,6 +653,11 @@ def temp_umask(umask):
             yield
         finally:
             os.umask(oldmask)
+else:
+    @contextlib.contextmanager
+    def temp_umask(umask):
+        """no-op on platforms without umask()"""
+        yield
 
 
 class EnvironmentVarGuard(collections.abc.MutableMapping):
diff --git a/Lib/test/test_os.py b/Lib/test/test_os.py
index 29f69a8f475b2..9970b234b4831 100644
--- a/Lib/test/test_os.py
+++ b/Lib/test/test_os.py
@@ -1607,6 +1607,10 @@ def test_mode(self):
                 self.assertEqual(os.stat(path).st_mode & 0o777, 0o555)
                 self.assertEqual(os.stat(parent).st_mode & 0o777, 0o775)
 
+    @unittest.skipIf(
+        support.is_emscripten or support.is_wasi,
+        "Emscripten's/WASI's umask is a stub."
+    )
     def test_exist_ok_existing_directory(self):
         path = os.path.join(os_helper.TESTFN, 'dir1')
         mode = 0o777
@@ -1621,6 +1625,10 @@ def test_exist_ok_existing_directory(self):
         # Issue #25583: A drive root could raise PermissionError on Windows
         os.makedirs(os.path.abspath('/'), exist_ok=True)
 
+    @unittest.skipIf(
+        support.is_emscripten or support.is_wasi,
+        "Emscripten's/WASI's umask is a stub."
+    )
     def test_exist_ok_s_isgid_directory(self):
         path = os.path.join(os_helper.TESTFN, 'dir1')
         S_ISGID = stat.S_ISGID


From webhook-mailer at python.org  Sat Jul 23 07:09:16 2022
From: webhook-mailer at python.org (miss-islington)
Date: Sat, 23 Jul 2022 11:09:16 -0000
Subject: [Python-checkins] gh-90473: Check for HAVE_KILL in
 main.c:exit_sigint (GH-95165)
Message-ID: <mailman.199.1658574558.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/f15be2fad115ebe1cafc6fa372cc517ba7065ecf
commit: f15be2fad115ebe1cafc6fa372cc517ba7065ecf
branch: 3.11
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-23T04:09:10-07:00
summary:

gh-90473: Check for HAVE_KILL in main.c:exit_sigint (GH-95165)

(cherry picked from commit d291a82df33cd8c917a374fef2a2373beda78b77)

Co-authored-by: Christian Heimes <christian at python.org>

files:
M Modules/main.c

diff --git a/Modules/main.c b/Modules/main.c
index cca669bdbf4b8..6904e3f76e891 100644
--- a/Modules/main.c
+++ b/Modules/main.c
@@ -640,7 +640,7 @@ exit_sigint(void)
      * SIG_DFL handler for SIGINT if KeyboardInterrupt went unhandled.
      * If we don't, a calling process such as a shell may not know
      * about the user's ^C.  https://www.cons.org/cracauer/sigint.html */
-#if defined(HAVE_GETPID) && !defined(MS_WINDOWS)
+#if defined(HAVE_GETPID) && defined(HAVE_KILL) && !defined(MS_WINDOWS)
     if (PyOS_setsig(SIGINT, SIG_DFL) == SIG_ERR) {
         perror("signal");  /* Impossible in normal environments. */
     } else {


From webhook-mailer at python.org  Sat Jul 23 14:35:55 2022
From: webhook-mailer at python.org (pablogsal)
Date: Sat, 23 Jul 2022 18:35:55 -0000
Subject: [Python-checkins] gh-93351: Add news entry and what's new entry for
 changes in gh-93351 (#95175)
Message-ID: <mailman.200.1658601357.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/9762572d0aa3569ba82eeceb708ddea9f12918fd
commit: 9762572d0aa3569ba82eeceb708ddea9f12918fd
branch: main
author: Pablo Galindo Salgado <Pablogsal at gmail.com>
committer: pablogsal <Pablogsal at gmail.com>
date: 2022-07-23T19:35:44+01:00
summary:

gh-93351: Add news entry and what's new entry for changes in gh-93351 (#95175)

files:
A Misc/NEWS.d/next/Core and Builtins/2022-07-23-19-16-25.gh-issue-93351.0Jyvu-.rst
M Doc/whatsnew/3.11.rst

diff --git a/Doc/whatsnew/3.11.rst b/Doc/whatsnew/3.11.rst
index 8b2cb90fb1553..0bdf3d1e4d965 100644
--- a/Doc/whatsnew/3.11.rst
+++ b/Doc/whatsnew/3.11.rst
@@ -1501,6 +1501,10 @@ Changes in the Python API
   is larger than the population size, a :exc:`ValueError` is raised.
   (Contributed by Raymond Hettinger in :issue:`40465`.)
 
+* :class:`ast.AST` node positions are now validated when provided to
+  :func:`compile` and other related functions. If invalid positions are detected,
+  a :exc:`ValueError` will be raised. (Contributed by Pablo Galindo in :gh:`93351`)
+
 
 Build Changes
 =============
diff --git a/Misc/NEWS.d/next/Core and Builtins/2022-07-23-19-16-25.gh-issue-93351.0Jyvu-.rst b/Misc/NEWS.d/next/Core and Builtins/2022-07-23-19-16-25.gh-issue-93351.0Jyvu-.rst
new file mode 100644
index 0000000000000..97cf8055ac54b
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2022-07-23-19-16-25.gh-issue-93351.0Jyvu-.rst	
@@ -0,0 +1,3 @@
+:class:`ast.AST` node positions are now validated when provided to
+:func:`compile` and other related functions. If invalid positions are
+detected, a :exc:`ValueError` will be raised.


From webhook-mailer at python.org  Sat Jul 23 14:44:51 2022
From: webhook-mailer at python.org (pablogsal)
Date: Sat, 23 Jul 2022 18:44:51 -0000
Subject: [Python-checkins] [3.11] gh-93351: Add news entry and what's new
 entry for changes in gh-93351 (GH-95175) (#95178)
Message-ID: <mailman.201.1658601892.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/e8edbda8972e83c86db1cb5b51ba9002c4923b6e
commit: e8edbda8972e83c86db1cb5b51ba9002c4923b6e
branch: 3.11
author: Pablo Galindo Salgado <Pablogsal at gmail.com>
committer: pablogsal <Pablogsal at gmail.com>
date: 2022-07-23T19:44:44+01:00
summary:

[3.11] gh-93351: Add news entry and what's new entry for changes in gh-93351 (GH-95175) (#95178)

(cherry picked from commit 9762572d0aa3569ba82eeceb708ddea9f12918fd)

Co-authored-by: Pablo Galindo Salgado <Pablogsal at gmail.com>

files:
A Misc/NEWS.d/next/Core and Builtins/2022-07-23-19-16-25.gh-issue-93351.0Jyvu-.rst
M Doc/whatsnew/3.11.rst

diff --git a/Doc/whatsnew/3.11.rst b/Doc/whatsnew/3.11.rst
index b26e0049a4a4c..87796d541356f 100644
--- a/Doc/whatsnew/3.11.rst
+++ b/Doc/whatsnew/3.11.rst
@@ -1506,6 +1506,10 @@ Changes in the Python API
   is larger than the population size, a :exc:`ValueError` is raised.
   (Contributed by Raymond Hettinger in :issue:`40465`.)
 
+* :class:`ast.AST` node positions are now validated when provided to
+  :func:`compile` and other related functions. If invalid positions are detected,
+  a :exc:`ValueError` will be raised. (Contributed by Pablo Galindo in :gh:`93351`)
+
 
 Build Changes
 =============
diff --git a/Misc/NEWS.d/next/Core and Builtins/2022-07-23-19-16-25.gh-issue-93351.0Jyvu-.rst b/Misc/NEWS.d/next/Core and Builtins/2022-07-23-19-16-25.gh-issue-93351.0Jyvu-.rst
new file mode 100644
index 0000000000000..97cf8055ac54b
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2022-07-23-19-16-25.gh-issue-93351.0Jyvu-.rst	
@@ -0,0 +1,3 @@
+:class:`ast.AST` node positions are now validated when provided to
+:func:`compile` and other related functions. If invalid positions are
+detected, a :exc:`ValueError` will be raised.


From webhook-mailer at python.org  Sat Jul 23 17:42:14 2022
From: webhook-mailer at python.org (tiran)
Date: Sat, 23 Jul 2022 21:42:14 -0000
Subject: [Python-checkins] gh-90385: Add skip_unless_symlink decorator to
 test_walk_symlink_location (GH-95182)
Message-ID: <mailman.202.1658612535.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/23f6944c37e0d57c1e065d5f71a4cd0f5f5b3111
commit: 23f6944c37e0d57c1e065d5f71a4cd0f5f5b3111
branch: main
author: Christian Heimes <christian at python.org>
committer: tiran <christian at python.org>
date: 2022-07-23T23:42:04+02:00
summary:

gh-90385: Add skip_unless_symlink decorator to test_walk_symlink_location (GH-95182)

files:
M Lib/test/test_pathlib.py

diff --git a/Lib/test/test_pathlib.py b/Lib/test/test_pathlib.py
index 6f3b2a4df890b..e14b0fca55360 100644
--- a/Lib/test/test_pathlib.py
+++ b/Lib/test/test_pathlib.py
@@ -2617,6 +2617,7 @@ def test_walk_follow_symlinks(self):
         else:
             self.fail("Didn't follow symlink with follow_symlinks=True")
 
+    @os_helper.skip_unless_symlink
     def test_walk_symlink_location(self):
         # Tests whether symlinks end up in filenames or dirnames depending
         # on the `follow_symlinks` argument.


From webhook-mailer at python.org  Sat Jul 23 19:07:22 2022
From: webhook-mailer at python.org (rhettinger)
Date: Sat, 23 Jul 2022 23:07:22 -0000
Subject: [Python-checkins] Compute v only when needed. (#95183)
Message-ID: <mailman.203.1658617643.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/a2fbc511985f77c16c0f4a6fc6d3da9ab81a86b7
commit: a2fbc511985f77c16c0f4a6fc6d3da9ab81a86b7
branch: main
author: Raymond Hettinger <rhettinger at users.noreply.github.com>
committer: rhettinger <rhettinger at users.noreply.github.com>
date: 2022-07-23T18:07:17-05:00
summary:

Compute v only when needed. (#95183)

files:
M Lib/random.py

diff --git a/Lib/random.py b/Lib/random.py
index 00849bd7e732f..ef0034adce5e7 100644
--- a/Lib/random.py
+++ b/Lib/random.py
@@ -787,7 +787,6 @@ def binomialvariate(self, n=1, p=0.5):
         while True:
 
             u = random()
-            v = random()
             u -= 0.5
             us = 0.5 - _fabs(u)
             k = _floor((2.0 * a / us + b) * u + c)
@@ -796,6 +795,7 @@ def binomialvariate(self, n=1, p=0.5):
 
             # The early-out "squeeze" test substantially reduces
             # the number of acceptance condition evaluations.
+            v = random()
             if us >= 0.07 and v <= vr:
                 return k
 


From webhook-mailer at python.org  Sat Jul 23 22:42:45 2022
From: webhook-mailer at python.org (methane)
Date: Sun, 24 Jul 2022 02:42:45 -0000
Subject: [Python-checkins] gh-93157: Fix fileinput didn't support `errors`
 in `inplace` mode (GH-95128)
Message-ID: <mailman.204.1658630566.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/5c7f3bcdafedd60a385e8ca5403bc6b0b7a862b3
commit: 5c7f3bcdafedd60a385e8ca5403bc6b0b7a862b3
branch: main
author: Inada Naoki <songofacandy at gmail.com>
committer: methane <songofacandy at gmail.com>
date: 2022-07-24T11:42:11+09:00
summary:

gh-93157: Fix fileinput didn't support `errors` in `inplace` mode (GH-95128)

files:
A Misc/NEWS.d/next/Library/2022-07-22-17-19-57.gh-issue-93157.RXByAk.rst
M Lib/fileinput.py
M Lib/test/test_fileinput.py

diff --git a/Lib/fileinput.py b/Lib/fileinput.py
index 9f41c18510dec..e234dc9ea65f1 100644
--- a/Lib/fileinput.py
+++ b/Lib/fileinput.py
@@ -335,18 +335,21 @@ def _readline(self):
                     pass
                 # The next few lines may raise OSError
                 os.rename(self._filename, self._backupfilename)
-                self._file = open(self._backupfilename, self._mode, encoding=encoding)
+                self._file = open(self._backupfilename, self._mode,
+                                  encoding=encoding, errors=self._errors)
                 try:
                     perm = os.fstat(self._file.fileno()).st_mode
                 except OSError:
-                    self._output = open(self._filename, self._write_mode, encoding=encoding)
+                    self._output = open(self._filename, self._write_mode,
+                                        encoding=encoding, errors=self._errors)
                 else:
                     mode = os.O_CREAT | os.O_WRONLY | os.O_TRUNC
                     if hasattr(os, 'O_BINARY'):
                         mode |= os.O_BINARY
 
                     fd = os.open(self._filename, mode, perm)
-                    self._output = os.fdopen(fd, self._write_mode, encoding=encoding)
+                    self._output = os.fdopen(fd, self._write_mode,
+                                             encoding=encoding, errors=self._errors)
                     try:
                         os.chmod(self._filename, perm)
                     except OSError:
diff --git a/Lib/test/test_fileinput.py b/Lib/test/test_fileinput.py
index 819200010a223..ac20c74baa09e 100644
--- a/Lib/test/test_fileinput.py
+++ b/Lib/test/test_fileinput.py
@@ -326,6 +326,16 @@ def test_inplace_binary_write_mode(self):
         with open(temp_file, 'rb') as f:
             self.assertEqual(f.read(), b'New line.')
 
+    def test_inplace_encoding_errors(self):
+        temp_file = self.writeTmp(b'Initial text \x88', mode='wb')
+        with FileInput(temp_file, inplace=True,
+                       encoding="ascii", errors="replace") as fobj:
+            line = fobj.readline()
+            self.assertEqual(line, 'Initial text \ufffd')
+            print("New line \x88")
+        with open(temp_file, 'rb') as f:
+            self.assertEqual(f.read().rstrip(b'\r\n'), b'New line ?')
+
     def test_file_hook_backward_compatibility(self):
         def old_hook(filename, mode):
             return io.StringIO("I used to receive only filename and mode")
diff --git a/Misc/NEWS.d/next/Library/2022-07-22-17-19-57.gh-issue-93157.RXByAk.rst b/Misc/NEWS.d/next/Library/2022-07-22-17-19-57.gh-issue-93157.RXByAk.rst
new file mode 100644
index 0000000000000..054b318ec63f0
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2022-07-22-17-19-57.gh-issue-93157.RXByAk.rst
@@ -0,0 +1,2 @@
+Fix :mod:`fileinput` module didn't support ``errors`` option when
+``inplace`` is true.


From webhook-mailer at python.org  Sat Jul 23 23:02:54 2022
From: webhook-mailer at python.org (miss-islington)
Date: Sun, 24 Jul 2022 03:02:54 -0000
Subject: [Python-checkins] gh-93157: Fix fileinput didn't support `errors`
 in `inplace` mode (GH-95128)
Message-ID: <mailman.205.1658631775.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/4a682b4f1ae3c32d0abd874cda4d2419398f4469
commit: 4a682b4f1ae3c32d0abd874cda4d2419398f4469
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-23T20:02:40-07:00
summary:

gh-93157: Fix fileinput didn't support `errors` in `inplace` mode (GH-95128)

(cherry picked from commit 5c7f3bcdafedd60a385e8ca5403bc6b0b7a862b3)

Co-authored-by: Inada Naoki <songofacandy at gmail.com>

files:
A Misc/NEWS.d/next/Library/2022-07-22-17-19-57.gh-issue-93157.RXByAk.rst
M Lib/fileinput.py
M Lib/test/test_fileinput.py

diff --git a/Lib/fileinput.py b/Lib/fileinput.py
index 35347185da048..2ce2f911435b4 100644
--- a/Lib/fileinput.py
+++ b/Lib/fileinput.py
@@ -355,18 +355,21 @@ def _readline(self):
                     pass
                 # The next few lines may raise OSError
                 os.rename(self._filename, self._backupfilename)
-                self._file = open(self._backupfilename, self._mode, encoding=encoding)
+                self._file = open(self._backupfilename, self._mode,
+                                  encoding=encoding, errors=self._errors)
                 try:
                     perm = os.fstat(self._file.fileno()).st_mode
                 except OSError:
-                    self._output = open(self._filename, self._write_mode, encoding=encoding)
+                    self._output = open(self._filename, self._write_mode,
+                                        encoding=encoding, errors=self._errors)
                 else:
                     mode = os.O_CREAT | os.O_WRONLY | os.O_TRUNC
                     if hasattr(os, 'O_BINARY'):
                         mode |= os.O_BINARY
 
                     fd = os.open(self._filename, mode, perm)
-                    self._output = os.fdopen(fd, self._write_mode, encoding=encoding)
+                    self._output = os.fdopen(fd, self._write_mode,
+                                             encoding=encoding, errors=self._errors)
                     try:
                         os.chmod(self._filename, perm)
                     except OSError:
diff --git a/Lib/test/test_fileinput.py b/Lib/test/test_fileinput.py
index cae0eb1b5f657..21924ff41a72a 100644
--- a/Lib/test/test_fileinput.py
+++ b/Lib/test/test_fileinput.py
@@ -336,6 +336,16 @@ def test_inplace_binary_write_mode(self):
         with open(temp_file, 'rb') as f:
             self.assertEqual(f.read(), b'New line.')
 
+    def test_inplace_encoding_errors(self):
+        temp_file = self.writeTmp(b'Initial text \x88', mode='wb')
+        with FileInput(temp_file, inplace=True,
+                       encoding="ascii", errors="replace") as fobj:
+            line = fobj.readline()
+            self.assertEqual(line, 'Initial text \ufffd')
+            print("New line \x88")
+        with open(temp_file, 'rb') as f:
+            self.assertEqual(f.read().rstrip(b'\r\n'), b'New line ?')
+
     def test_file_hook_backward_compatibility(self):
         def old_hook(filename, mode):
             return io.StringIO("I used to receive only filename and mode")
diff --git a/Misc/NEWS.d/next/Library/2022-07-22-17-19-57.gh-issue-93157.RXByAk.rst b/Misc/NEWS.d/next/Library/2022-07-22-17-19-57.gh-issue-93157.RXByAk.rst
new file mode 100644
index 0000000000000..054b318ec63f0
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2022-07-22-17-19-57.gh-issue-93157.RXByAk.rst
@@ -0,0 +1,2 @@
+Fix :mod:`fileinput` module didn't support ``errors`` option when
+``inplace`` is true.


From webhook-mailer at python.org  Sat Jul 23 23:05:15 2022
From: webhook-mailer at python.org (miss-islington)
Date: Sun, 24 Jul 2022 03:05:15 -0000
Subject: [Python-checkins] gh-93157: Fix fileinput didn't support `errors`
 in `inplace` mode (GH-95128)
Message-ID: <mailman.206.1658631916.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/22f06d6ce344ba80f2213fbe12fe951ca77cab4e
commit: 22f06d6ce344ba80f2213fbe12fe951ca77cab4e
branch: 3.11
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-23T20:05:10-07:00
summary:

gh-93157: Fix fileinput didn't support `errors` in `inplace` mode (GH-95128)

(cherry picked from commit 5c7f3bcdafedd60a385e8ca5403bc6b0b7a862b3)

Co-authored-by: Inada Naoki <songofacandy at gmail.com>

files:
A Misc/NEWS.d/next/Library/2022-07-22-17-19-57.gh-issue-93157.RXByAk.rst
M Lib/fileinput.py
M Lib/test/test_fileinput.py

diff --git a/Lib/fileinput.py b/Lib/fileinput.py
index 9f41c18510dec..e234dc9ea65f1 100644
--- a/Lib/fileinput.py
+++ b/Lib/fileinput.py
@@ -335,18 +335,21 @@ def _readline(self):
                     pass
                 # The next few lines may raise OSError
                 os.rename(self._filename, self._backupfilename)
-                self._file = open(self._backupfilename, self._mode, encoding=encoding)
+                self._file = open(self._backupfilename, self._mode,
+                                  encoding=encoding, errors=self._errors)
                 try:
                     perm = os.fstat(self._file.fileno()).st_mode
                 except OSError:
-                    self._output = open(self._filename, self._write_mode, encoding=encoding)
+                    self._output = open(self._filename, self._write_mode,
+                                        encoding=encoding, errors=self._errors)
                 else:
                     mode = os.O_CREAT | os.O_WRONLY | os.O_TRUNC
                     if hasattr(os, 'O_BINARY'):
                         mode |= os.O_BINARY
 
                     fd = os.open(self._filename, mode, perm)
-                    self._output = os.fdopen(fd, self._write_mode, encoding=encoding)
+                    self._output = os.fdopen(fd, self._write_mode,
+                                             encoding=encoding, errors=self._errors)
                     try:
                         os.chmod(self._filename, perm)
                     except OSError:
diff --git a/Lib/test/test_fileinput.py b/Lib/test/test_fileinput.py
index 819200010a223..ac20c74baa09e 100644
--- a/Lib/test/test_fileinput.py
+++ b/Lib/test/test_fileinput.py
@@ -326,6 +326,16 @@ def test_inplace_binary_write_mode(self):
         with open(temp_file, 'rb') as f:
             self.assertEqual(f.read(), b'New line.')
 
+    def test_inplace_encoding_errors(self):
+        temp_file = self.writeTmp(b'Initial text \x88', mode='wb')
+        with FileInput(temp_file, inplace=True,
+                       encoding="ascii", errors="replace") as fobj:
+            line = fobj.readline()
+            self.assertEqual(line, 'Initial text \ufffd')
+            print("New line \x88")
+        with open(temp_file, 'rb') as f:
+            self.assertEqual(f.read().rstrip(b'\r\n'), b'New line ?')
+
     def test_file_hook_backward_compatibility(self):
         def old_hook(filename, mode):
             return io.StringIO("I used to receive only filename and mode")
diff --git a/Misc/NEWS.d/next/Library/2022-07-22-17-19-57.gh-issue-93157.RXByAk.rst b/Misc/NEWS.d/next/Library/2022-07-22-17-19-57.gh-issue-93157.RXByAk.rst
new file mode 100644
index 0000000000000..054b318ec63f0
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2022-07-22-17-19-57.gh-issue-93157.RXByAk.rst
@@ -0,0 +1,2 @@
+Fix :mod:`fileinput` module didn't support ``errors`` option when
+``inplace`` is true.


From webhook-mailer at python.org  Sun Jul 24 02:04:15 2022
From: webhook-mailer at python.org (tiran)
Date: Sun, 24 Jul 2022 06:04:15 -0000
Subject: [Python-checkins] gh-95174: Handle missing waitpid and
 gethostbyname in WASI (GH-95181)
Message-ID: <mailman.207.1658642655.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/8184f0fce3b734413e3d3a282f1425d3cb8507fd
commit: 8184f0fce3b734413e3d3a282f1425d3cb8507fd
branch: main
author: Christian Heimes <christian at python.org>
committer: tiran <christian at python.org>
date: 2022-07-24T08:04:06+02:00
summary:

gh-95174: Handle missing waitpid and gethostbyname in WASI (GH-95181)

files:
M Lib/subprocess.py
M Lib/uuid.py

diff --git a/Lib/subprocess.py b/Lib/subprocess.py
index e10b01047ebef..7ae8df154b481 100644
--- a/Lib/subprocess.py
+++ b/Lib/subprocess.py
@@ -102,8 +102,19 @@
 else:
     if _can_fork_exec:
         from _posixsubprocess import fork_exec as _fork_exec
+        # used in methods that are called by __del__
+        _waitpid = os.waitpid
+        _waitstatus_to_exitcode = os.waitstatus_to_exitcode
+        _WIFSTOPPED = os.WIFSTOPPED
+        _WSTOPSIG = os.WSTOPSIG
+        _WNOHANG = os.WNOHANG
     else:
         _fork_exec = None
+        _waitpid = None
+        _waitstatus_to_exitcode = None
+        _WIFSTOPPED = None
+        _WSTOPSIG = None
+        _WNOHANG = None
     import select
     import selectors
 
@@ -1890,19 +1901,19 @@ def _execute_child(self, args, executable, preexec_fn, close_fds,
 
 
         def _handle_exitstatus(self, sts,
-                               waitstatus_to_exitcode=os.waitstatus_to_exitcode,
-                               _WIFSTOPPED=os.WIFSTOPPED,
-                               _WSTOPSIG=os.WSTOPSIG):
+                               _waitstatus_to_exitcode=_waitstatus_to_exitcode,
+                               _WIFSTOPPED=_WIFSTOPPED,
+                               _WSTOPSIG=_WSTOPSIG):
             """All callers to this function MUST hold self._waitpid_lock."""
             # This method is called (indirectly) by __del__, so it cannot
             # refer to anything outside of its local scope.
             if _WIFSTOPPED(sts):
                 self.returncode = -_WSTOPSIG(sts)
             else:
-                self.returncode = waitstatus_to_exitcode(sts)
+                self.returncode = _waitstatus_to_exitcode(sts)
 
-        def _internal_poll(self, _deadstate=None, _waitpid=os.waitpid,
-                _WNOHANG=os.WNOHANG, _ECHILD=errno.ECHILD):
+        def _internal_poll(self, _deadstate=None, _waitpid=_waitpid,
+                _WNOHANG=_WNOHANG, _ECHILD=errno.ECHILD):
             """Check if child process has terminated.  Returns returncode
             attribute.
 
diff --git a/Lib/uuid.py b/Lib/uuid.py
index f179d68e8265a..8fe2479f3f22c 100644
--- a/Lib/uuid.py
+++ b/Lib/uuid.py
@@ -524,6 +524,8 @@ def _ip_getnode():
 def _arp_getnode():
     """Get the hardware address on Unix by running arp."""
     import os, socket
+    if not hasattr(socket, "gethostbyname"):
+        return None
     try:
         ip_addr = socket.gethostbyname(socket.gethostname())
     except OSError:


From webhook-mailer at python.org  Sun Jul 24 02:30:46 2022
From: webhook-mailer at python.org (miss-islington)
Date: Sun, 24 Jul 2022 06:30:46 -0000
Subject: [Python-checkins] gh-95174: Handle missing waitpid and
 gethostbyname in WASI (GH-95181)
Message-ID: <mailman.208.1658644248.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/00cda6b530a5718f17e286da72aa4a743ada63a6
commit: 00cda6b530a5718f17e286da72aa4a743ada63a6
branch: 3.11
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-23T23:30:39-07:00
summary:

gh-95174: Handle missing waitpid and gethostbyname in WASI (GH-95181)

(cherry picked from commit 8184f0fce3b734413e3d3a282f1425d3cb8507fd)

Co-authored-by: Christian Heimes <christian at python.org>

files:
M Lib/subprocess.py
M Lib/uuid.py

diff --git a/Lib/subprocess.py b/Lib/subprocess.py
index e10b01047ebef..7ae8df154b481 100644
--- a/Lib/subprocess.py
+++ b/Lib/subprocess.py
@@ -102,8 +102,19 @@
 else:
     if _can_fork_exec:
         from _posixsubprocess import fork_exec as _fork_exec
+        # used in methods that are called by __del__
+        _waitpid = os.waitpid
+        _waitstatus_to_exitcode = os.waitstatus_to_exitcode
+        _WIFSTOPPED = os.WIFSTOPPED
+        _WSTOPSIG = os.WSTOPSIG
+        _WNOHANG = os.WNOHANG
     else:
         _fork_exec = None
+        _waitpid = None
+        _waitstatus_to_exitcode = None
+        _WIFSTOPPED = None
+        _WSTOPSIG = None
+        _WNOHANG = None
     import select
     import selectors
 
@@ -1890,19 +1901,19 @@ def _execute_child(self, args, executable, preexec_fn, close_fds,
 
 
         def _handle_exitstatus(self, sts,
-                               waitstatus_to_exitcode=os.waitstatus_to_exitcode,
-                               _WIFSTOPPED=os.WIFSTOPPED,
-                               _WSTOPSIG=os.WSTOPSIG):
+                               _waitstatus_to_exitcode=_waitstatus_to_exitcode,
+                               _WIFSTOPPED=_WIFSTOPPED,
+                               _WSTOPSIG=_WSTOPSIG):
             """All callers to this function MUST hold self._waitpid_lock."""
             # This method is called (indirectly) by __del__, so it cannot
             # refer to anything outside of its local scope.
             if _WIFSTOPPED(sts):
                 self.returncode = -_WSTOPSIG(sts)
             else:
-                self.returncode = waitstatus_to_exitcode(sts)
+                self.returncode = _waitstatus_to_exitcode(sts)
 
-        def _internal_poll(self, _deadstate=None, _waitpid=os.waitpid,
-                _WNOHANG=os.WNOHANG, _ECHILD=errno.ECHILD):
+        def _internal_poll(self, _deadstate=None, _waitpid=_waitpid,
+                _WNOHANG=_WNOHANG, _ECHILD=errno.ECHILD):
             """Check if child process has terminated.  Returns returncode
             attribute.
 
diff --git a/Lib/uuid.py b/Lib/uuid.py
index f179d68e8265a..8fe2479f3f22c 100644
--- a/Lib/uuid.py
+++ b/Lib/uuid.py
@@ -524,6 +524,8 @@ def _ip_getnode():
 def _arp_getnode():
     """Get the hardware address on Unix by running arp."""
     import os, socket
+    if not hasattr(socket, "gethostbyname"):
+        return None
     try:
         ip_addr = socket.gethostbyname(socket.gethostname())
     except OSError:


From webhook-mailer at python.org  Sun Jul 24 05:55:32 2022
From: webhook-mailer at python.org (pfmoore)
Date: Sun, 24 Jul 2022 09:55:32 -0000
Subject: [Python-checkins] gh-95194: upgrade bundled pip to 22.2 (gh-95195)
Message-ID: <mailman.209.1658656534.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/068ffafa5465e9388a940692d1720266a1b37257
commit: 068ffafa5465e9388a940692d1720266a1b37257
branch: main
author: St?phane Bidoul <stephane.bidoul at gmail.com>
committer: pfmoore <p.f.moore at gmail.com>
date: 2022-07-24T10:55:25+01:00
summary:

gh-95194: upgrade bundled pip to 22.2 (gh-95195)

upgrade bundled pip to 22.2

files:
A Lib/ensurepip/_bundled/pip-22.2-py3-none-any.whl
A Misc/NEWS.d/next/Library/2022-07-24-09-15-35.gh-issue-95194.ERVmqG.rst
D Lib/ensurepip/_bundled/pip-22.0.4-py3-none-any.whl
M Lib/ensurepip/__init__.py

diff --git a/Lib/ensurepip/__init__.py b/Lib/ensurepip/__init__.py
index 1f25825f3febf..c4d116ea122e0 100644
--- a/Lib/ensurepip/__init__.py
+++ b/Lib/ensurepip/__init__.py
@@ -11,7 +11,7 @@
 __all__ = ["version", "bootstrap"]
 _PACKAGE_NAMES = ('setuptools', 'pip')
 _SETUPTOOLS_VERSION = "58.1.0"
-_PIP_VERSION = "22.0.4"
+_PIP_VERSION = "22.2"
 _PROJECTS = [
     ("setuptools", _SETUPTOOLS_VERSION, "py3"),
     ("pip", _PIP_VERSION, "py3"),
diff --git a/Lib/ensurepip/_bundled/pip-22.0.4-py3-none-any.whl b/Lib/ensurepip/_bundled/pip-22.0.4-py3-none-any.whl
deleted file mode 100644
index 7ba048e245227..0000000000000
Binary files a/Lib/ensurepip/_bundled/pip-22.0.4-py3-none-any.whl and /dev/null differ
diff --git a/Lib/ensurepip/_bundled/pip-22.2-py3-none-any.whl b/Lib/ensurepip/_bundled/pip-22.2-py3-none-any.whl
new file mode 100644
index 0000000000000..9c43960aafd5e
Binary files /dev/null and b/Lib/ensurepip/_bundled/pip-22.2-py3-none-any.whl differ
diff --git a/Misc/NEWS.d/next/Library/2022-07-24-09-15-35.gh-issue-95194.ERVmqG.rst b/Misc/NEWS.d/next/Library/2022-07-24-09-15-35.gh-issue-95194.ERVmqG.rst
new file mode 100644
index 0000000000000..c69651923b410
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2022-07-24-09-15-35.gh-issue-95194.ERVmqG.rst
@@ -0,0 +1 @@
+Upgrade bundled pip to 22.2.


From webhook-mailer at python.org  Sun Jul 24 06:18:42 2022
From: webhook-mailer at python.org (miss-islington)
Date: Sun, 24 Jul 2022 10:18:42 -0000
Subject: [Python-checkins] gh-95194: upgrade bundled pip to 22.2 (gh-95195)
Message-ID: <mailman.210.1658657924.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/227a1973d5eba9d0cf2119f63b48f36dbba9e179
commit: 227a1973d5eba9d0cf2119f63b48f36dbba9e179
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-24T03:18:33-07:00
summary:

gh-95194: upgrade bundled pip to 22.2 (gh-95195)


upgrade bundled pip to 22.2
(cherry picked from commit 068ffafa5465e9388a940692d1720266a1b37257)

Co-authored-by: St?phane Bidoul <stephane.bidoul at gmail.com>

files:
A Lib/ensurepip/_bundled/pip-22.2-py3-none-any.whl
A Misc/NEWS.d/next/Library/2022-07-24-09-15-35.gh-issue-95194.ERVmqG.rst
D Lib/ensurepip/_bundled/pip-22.0.4-py3-none-any.whl
M Lib/ensurepip/__init__.py

diff --git a/Lib/ensurepip/__init__.py b/Lib/ensurepip/__init__.py
index a82dbadce1635..0f1483d11eb19 100644
--- a/Lib/ensurepip/__init__.py
+++ b/Lib/ensurepip/__init__.py
@@ -12,7 +12,7 @@
 __all__ = ["version", "bootstrap"]
 _PACKAGE_NAMES = ('setuptools', 'pip')
 _SETUPTOOLS_VERSION = "58.1.0"
-_PIP_VERSION = "22.0.4"
+_PIP_VERSION = "22.2"
 _PROJECTS = [
     ("setuptools", _SETUPTOOLS_VERSION, "py3"),
     ("pip", _PIP_VERSION, "py3"),
diff --git a/Lib/ensurepip/_bundled/pip-22.0.4-py3-none-any.whl b/Lib/ensurepip/_bundled/pip-22.0.4-py3-none-any.whl
deleted file mode 100644
index 7ba048e245227..0000000000000
Binary files a/Lib/ensurepip/_bundled/pip-22.0.4-py3-none-any.whl and /dev/null differ
diff --git a/Lib/ensurepip/_bundled/pip-22.2-py3-none-any.whl b/Lib/ensurepip/_bundled/pip-22.2-py3-none-any.whl
new file mode 100644
index 0000000000000..9c43960aafd5e
Binary files /dev/null and b/Lib/ensurepip/_bundled/pip-22.2-py3-none-any.whl differ
diff --git a/Misc/NEWS.d/next/Library/2022-07-24-09-15-35.gh-issue-95194.ERVmqG.rst b/Misc/NEWS.d/next/Library/2022-07-24-09-15-35.gh-issue-95194.ERVmqG.rst
new file mode 100644
index 0000000000000..c69651923b410
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2022-07-24-09-15-35.gh-issue-95194.ERVmqG.rst
@@ -0,0 +1 @@
+Upgrade bundled pip to 22.2.


From webhook-mailer at python.org  Sun Jul 24 06:22:17 2022
From: webhook-mailer at python.org (miss-islington)
Date: Sun, 24 Jul 2022 10:22:17 -0000
Subject: [Python-checkins] gh-95194: upgrade bundled pip to 22.2 (gh-95195)
Message-ID: <mailman.211.1658658138.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/9639cc1126fb68f35f9c4c7f83760def94c2ead4
commit: 9639cc1126fb68f35f9c4c7f83760def94c2ead4
branch: 3.11
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-24T03:22:12-07:00
summary:

gh-95194: upgrade bundled pip to 22.2 (gh-95195)


upgrade bundled pip to 22.2
(cherry picked from commit 068ffafa5465e9388a940692d1720266a1b37257)

Co-authored-by: St?phane Bidoul <stephane.bidoul at gmail.com>

files:
A Lib/ensurepip/_bundled/pip-22.2-py3-none-any.whl
A Misc/NEWS.d/next/Library/2022-07-24-09-15-35.gh-issue-95194.ERVmqG.rst
D Lib/ensurepip/_bundled/pip-22.0.4-py3-none-any.whl
M Lib/ensurepip/__init__.py

diff --git a/Lib/ensurepip/__init__.py b/Lib/ensurepip/__init__.py
index 1f25825f3febf..c4d116ea122e0 100644
--- a/Lib/ensurepip/__init__.py
+++ b/Lib/ensurepip/__init__.py
@@ -11,7 +11,7 @@
 __all__ = ["version", "bootstrap"]
 _PACKAGE_NAMES = ('setuptools', 'pip')
 _SETUPTOOLS_VERSION = "58.1.0"
-_PIP_VERSION = "22.0.4"
+_PIP_VERSION = "22.2"
 _PROJECTS = [
     ("setuptools", _SETUPTOOLS_VERSION, "py3"),
     ("pip", _PIP_VERSION, "py3"),
diff --git a/Lib/ensurepip/_bundled/pip-22.0.4-py3-none-any.whl b/Lib/ensurepip/_bundled/pip-22.0.4-py3-none-any.whl
deleted file mode 100644
index 7ba048e245227..0000000000000
Binary files a/Lib/ensurepip/_bundled/pip-22.0.4-py3-none-any.whl and /dev/null differ
diff --git a/Lib/ensurepip/_bundled/pip-22.2-py3-none-any.whl b/Lib/ensurepip/_bundled/pip-22.2-py3-none-any.whl
new file mode 100644
index 0000000000000..9c43960aafd5e
Binary files /dev/null and b/Lib/ensurepip/_bundled/pip-22.2-py3-none-any.whl differ
diff --git a/Misc/NEWS.d/next/Library/2022-07-24-09-15-35.gh-issue-95194.ERVmqG.rst b/Misc/NEWS.d/next/Library/2022-07-24-09-15-35.gh-issue-95194.ERVmqG.rst
new file mode 100644
index 0000000000000..c69651923b410
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2022-07-24-09-15-35.gh-issue-95194.ERVmqG.rst
@@ -0,0 +1 @@
+Upgrade bundled pip to 22.2.


From webhook-mailer at python.org  Sun Jul 24 07:01:07 2022
From: webhook-mailer at python.org (pfmoore)
Date: Sun, 24 Jul 2022 11:01:07 -0000
Subject: [Python-checkins] gh-95199: upgrade bundled setuptools to 63.2.0
 (gh-95200)
Message-ID: <mailman.212.1658660468.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/3c94d3395edbcd299cbdacd09660ed88e654eeef
commit: 3c94d3395edbcd299cbdacd09660ed88e654eeef
branch: main
author: St?phane Bidoul <stephane.bidoul at gmail.com>
committer: pfmoore <p.f.moore at gmail.com>
date: 2022-07-24T12:01:03+01:00
summary:

gh-95199: upgrade bundled setuptools to 63.2.0 (gh-95200)

files:
A Lib/ensurepip/_bundled/setuptools-63.2.0-py3-none-any.whl
A Misc/NEWS.d/next/Library/2022-07-24-12-00-06.gh-issue-95199.-5A64k.rst
D Lib/ensurepip/_bundled/setuptools-58.1.0-py3-none-any.whl
M Lib/ensurepip/__init__.py

diff --git a/Lib/ensurepip/__init__.py b/Lib/ensurepip/__init__.py
index c4d116ea122e0..d88387398e83a 100644
--- a/Lib/ensurepip/__init__.py
+++ b/Lib/ensurepip/__init__.py
@@ -10,7 +10,7 @@
 
 __all__ = ["version", "bootstrap"]
 _PACKAGE_NAMES = ('setuptools', 'pip')
-_SETUPTOOLS_VERSION = "58.1.0"
+_SETUPTOOLS_VERSION = "63.2.0"
 _PIP_VERSION = "22.2"
 _PROJECTS = [
     ("setuptools", _SETUPTOOLS_VERSION, "py3"),
diff --git a/Lib/ensurepip/_bundled/setuptools-58.1.0-py3-none-any.whl b/Lib/ensurepip/_bundled/setuptools-58.1.0-py3-none-any.whl
deleted file mode 100644
index 18c8c22958f1f..0000000000000
Binary files a/Lib/ensurepip/_bundled/setuptools-58.1.0-py3-none-any.whl and /dev/null differ
diff --git a/Lib/ensurepip/_bundled/setuptools-63.2.0-py3-none-any.whl b/Lib/ensurepip/_bundled/setuptools-63.2.0-py3-none-any.whl
new file mode 100644
index 0000000000000..e3b5446eb59cb
Binary files /dev/null and b/Lib/ensurepip/_bundled/setuptools-63.2.0-py3-none-any.whl differ
diff --git a/Misc/NEWS.d/next/Library/2022-07-24-12-00-06.gh-issue-95199.-5A64k.rst b/Misc/NEWS.d/next/Library/2022-07-24-12-00-06.gh-issue-95199.-5A64k.rst
new file mode 100644
index 0000000000000..f3d9cf3306b8d
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2022-07-24-12-00-06.gh-issue-95199.-5A64k.rst
@@ -0,0 +1 @@
+Upgrade bundled setuptools to 63.2.0.


From webhook-mailer at python.org  Sun Jul 24 07:28:38 2022
From: webhook-mailer at python.org (miss-islington)
Date: Sun, 24 Jul 2022 11:28:38 -0000
Subject: [Python-checkins] gh-95199: upgrade bundled setuptools to 63.2.0
 (gh-95200)
Message-ID: <mailman.213.1658662119.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/687dd507606d73b0bb23eba6dbcbbd29ee82a238
commit: 687dd507606d73b0bb23eba6dbcbbd29ee82a238
branch: 3.11
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-24T04:28:24-07:00
summary:

gh-95199: upgrade bundled setuptools to 63.2.0 (gh-95200)

(cherry picked from commit 3c94d3395edbcd299cbdacd09660ed88e654eeef)

Co-authored-by: St?phane Bidoul <stephane.bidoul at gmail.com>

files:
A Lib/ensurepip/_bundled/setuptools-63.2.0-py3-none-any.whl
A Misc/NEWS.d/next/Library/2022-07-24-12-00-06.gh-issue-95199.-5A64k.rst
D Lib/ensurepip/_bundled/setuptools-58.1.0-py3-none-any.whl
M Lib/ensurepip/__init__.py

diff --git a/Lib/ensurepip/__init__.py b/Lib/ensurepip/__init__.py
index c4d116ea122e0..d88387398e83a 100644
--- a/Lib/ensurepip/__init__.py
+++ b/Lib/ensurepip/__init__.py
@@ -10,7 +10,7 @@
 
 __all__ = ["version", "bootstrap"]
 _PACKAGE_NAMES = ('setuptools', 'pip')
-_SETUPTOOLS_VERSION = "58.1.0"
+_SETUPTOOLS_VERSION = "63.2.0"
 _PIP_VERSION = "22.2"
 _PROJECTS = [
     ("setuptools", _SETUPTOOLS_VERSION, "py3"),
diff --git a/Lib/ensurepip/_bundled/setuptools-58.1.0-py3-none-any.whl b/Lib/ensurepip/_bundled/setuptools-58.1.0-py3-none-any.whl
deleted file mode 100644
index 18c8c22958f1f..0000000000000
Binary files a/Lib/ensurepip/_bundled/setuptools-58.1.0-py3-none-any.whl and /dev/null differ
diff --git a/Lib/ensurepip/_bundled/setuptools-63.2.0-py3-none-any.whl b/Lib/ensurepip/_bundled/setuptools-63.2.0-py3-none-any.whl
new file mode 100644
index 0000000000000..e3b5446eb59cb
Binary files /dev/null and b/Lib/ensurepip/_bundled/setuptools-63.2.0-py3-none-any.whl differ
diff --git a/Misc/NEWS.d/next/Library/2022-07-24-12-00-06.gh-issue-95199.-5A64k.rst b/Misc/NEWS.d/next/Library/2022-07-24-12-00-06.gh-issue-95199.-5A64k.rst
new file mode 100644
index 0000000000000..f3d9cf3306b8d
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2022-07-24-12-00-06.gh-issue-95199.-5A64k.rst
@@ -0,0 +1 @@
+Upgrade bundled setuptools to 63.2.0.


From webhook-mailer at python.org  Sun Jul 24 07:43:11 2022
From: webhook-mailer at python.org (miss-islington)
Date: Sun, 24 Jul 2022 11:43:11 -0000
Subject: [Python-checkins] gh-95199: upgrade bundled setuptools to 63.2.0
 (gh-95200)
Message-ID: <mailman.214.1658662992.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/6d332a6cfa371cdb45c180b3da72d491569b2b02
commit: 6d332a6cfa371cdb45c180b3da72d491569b2b02
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-24T04:43:05-07:00
summary:

gh-95199: upgrade bundled setuptools to 63.2.0 (gh-95200)

(cherry picked from commit 3c94d3395edbcd299cbdacd09660ed88e654eeef)

Co-authored-by: St?phane Bidoul <stephane.bidoul at gmail.com>

files:
A Lib/ensurepip/_bundled/setuptools-63.2.0-py3-none-any.whl
A Misc/NEWS.d/next/Library/2022-07-24-12-00-06.gh-issue-95199.-5A64k.rst
D Lib/ensurepip/_bundled/setuptools-58.1.0-py3-none-any.whl
M Lib/ensurepip/__init__.py

diff --git a/Lib/ensurepip/__init__.py b/Lib/ensurepip/__init__.py
index 0f1483d11eb19..189cfb2425923 100644
--- a/Lib/ensurepip/__init__.py
+++ b/Lib/ensurepip/__init__.py
@@ -11,7 +11,7 @@
 
 __all__ = ["version", "bootstrap"]
 _PACKAGE_NAMES = ('setuptools', 'pip')
-_SETUPTOOLS_VERSION = "58.1.0"
+_SETUPTOOLS_VERSION = "63.2.0"
 _PIP_VERSION = "22.2"
 _PROJECTS = [
     ("setuptools", _SETUPTOOLS_VERSION, "py3"),
diff --git a/Lib/ensurepip/_bundled/setuptools-58.1.0-py3-none-any.whl b/Lib/ensurepip/_bundled/setuptools-58.1.0-py3-none-any.whl
deleted file mode 100644
index 18c8c22958f1f..0000000000000
Binary files a/Lib/ensurepip/_bundled/setuptools-58.1.0-py3-none-any.whl and /dev/null differ
diff --git a/Lib/ensurepip/_bundled/setuptools-63.2.0-py3-none-any.whl b/Lib/ensurepip/_bundled/setuptools-63.2.0-py3-none-any.whl
new file mode 100644
index 0000000000000..e3b5446eb59cb
Binary files /dev/null and b/Lib/ensurepip/_bundled/setuptools-63.2.0-py3-none-any.whl differ
diff --git a/Misc/NEWS.d/next/Library/2022-07-24-12-00-06.gh-issue-95199.-5A64k.rst b/Misc/NEWS.d/next/Library/2022-07-24-12-00-06.gh-issue-95199.-5A64k.rst
new file mode 100644
index 0000000000000..f3d9cf3306b8d
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2022-07-24-12-00-06.gh-issue-95199.-5A64k.rst
@@ -0,0 +1 @@
+Upgrade bundled setuptools to 63.2.0.


From webhook-mailer at python.org  Sun Jul 24 10:59:01 2022
From: webhook-mailer at python.org (pablogsal)
Date: Sun, 24 Jul 2022 14:59:01 -0000
Subject: [Python-checkins] gh-95185: Check recursion depth in the AST
 constructor (#95186)
Message-ID: <mailman.215.1658674742.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/00474472944944b346d8409cfded84bb299f601a
commit: 00474472944944b346d8409cfded84bb299f601a
branch: main
author: Pablo Galindo Salgado <Pablogsal at gmail.com>
committer: pablogsal <Pablogsal at gmail.com>
date: 2022-07-24T15:58:52+01:00
summary:

gh-95185: Check recursion depth in the AST constructor (#95186)

Co-authored-by: Serhiy Storchaka <storchaka at gmail.com>

files:
A Misc/NEWS.d/next/Core and Builtins/2022-07-24-00-27-47.gh-issue-95185.ghYTZx.rst
M Include/internal/pycore_ast_state.h
M Lib/test/test_ast.py
M Parser/asdl_c.py
M Python/Python-ast.c

diff --git a/Include/internal/pycore_ast_state.h b/Include/internal/pycore_ast_state.h
index da78bba3b69bd..f15b4905eed14 100644
--- a/Include/internal/pycore_ast_state.h
+++ b/Include/internal/pycore_ast_state.h
@@ -12,6 +12,8 @@ extern "C" {
 
 struct ast_state {
     int initialized;
+    int recursion_depth;
+    int recursion_limit;
     PyObject *AST_type;
     PyObject *Add_singleton;
     PyObject *Add_type;
diff --git a/Lib/test/test_ast.py b/Lib/test/test_ast.py
index 480089aa8af44..9734218c21be3 100644
--- a/Lib/test/test_ast.py
+++ b/Lib/test/test_ast.py
@@ -793,6 +793,27 @@ def next(self):
                     return self
         enum._test_simple_enum(_Precedence, ast._Precedence)
 
+    @support.cpython_only
+    def test_ast_recursion_limit(self):
+        fail_depth = sys.getrecursionlimit() * 3
+        crash_depth = sys.getrecursionlimit() * 300
+        success_depth = int(fail_depth * 0.75)
+
+        def check_limit(prefix, repeated):
+            expect_ok = prefix + repeated * success_depth
+            ast.parse(expect_ok)
+            for depth in (fail_depth, crash_depth):
+                broken = prefix + repeated * depth
+                details = "Compiling ({!r} + {!r} * {})".format(
+                            prefix, repeated, depth)
+                with self.assertRaises(RecursionError, msg=details):
+                    ast.parse(broken)
+
+        check_limit("a", "()")
+        check_limit("a", ".b")
+        check_limit("a", "[0]")
+        check_limit("a", "*a")
+
 
 class ASTHelpers_Test(unittest.TestCase):
     maxDiff = None
diff --git a/Misc/NEWS.d/next/Core and Builtins/2022-07-24-00-27-47.gh-issue-95185.ghYTZx.rst b/Misc/NEWS.d/next/Core and Builtins/2022-07-24-00-27-47.gh-issue-95185.ghYTZx.rst
new file mode 100644
index 0000000000000..de156bab2f51f
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2022-07-24-00-27-47.gh-issue-95185.ghYTZx.rst	
@@ -0,0 +1,3 @@
+Prevented crashes in the AST constructor when compiling some absurdly long
+expressions like ``"+0"*1000000``. :exc:`RecursionError` is now raised
+instead. Patch by Pablo Galindo
diff --git a/Parser/asdl_c.py b/Parser/asdl_c.py
index bf391a3ae1653..13dd44ca0cdc3 100755
--- a/Parser/asdl_c.py
+++ b/Parser/asdl_c.py
@@ -1112,6 +1112,8 @@ def visitModule(self, mod):
         for dfn in mod.dfns:
             self.visit(dfn)
         self.file.write(textwrap.dedent('''
+                state->recursion_depth = 0;
+                state->recursion_limit = 0;
                 state->initialized = 1;
                 return 1;
             }
@@ -1259,8 +1261,14 @@ def func_begin(self, name):
         self.emit('if (!o) {', 1)
         self.emit("Py_RETURN_NONE;", 2)
         self.emit("}", 1)
+        self.emit("if (++state->recursion_depth > state->recursion_limit) {", 1)
+        self.emit("PyErr_SetString(PyExc_RecursionError,", 2)
+        self.emit('"maximum recursion depth exceeded during ast construction");', 3)
+        self.emit("return 0;", 2)
+        self.emit("}", 1)
 
     def func_end(self):
+        self.emit("state->recursion_depth--;", 1)
         self.emit("return result;", 1)
         self.emit("failed:", 0)
         self.emit("Py_XDECREF(value);", 1)
@@ -1371,7 +1379,32 @@ class PartingShots(StaticVisitor):
     if (state == NULL) {
         return NULL;
     }
-    return ast2obj_mod(state, t);
+
+    int recursion_limit = Py_GetRecursionLimit();
+    int starting_recursion_depth;
+    /* Be careful here to prevent overflow. */
+    int COMPILER_STACK_FRAME_SCALE = 3;
+    PyThreadState *tstate = _PyThreadState_GET();
+    if (!tstate) {
+        return 0;
+    }
+    state->recursion_limit = (recursion_limit < INT_MAX / COMPILER_STACK_FRAME_SCALE) ?
+        recursion_limit * COMPILER_STACK_FRAME_SCALE : recursion_limit;
+    int recursion_depth = tstate->recursion_limit - tstate->recursion_remaining;
+    starting_recursion_depth = (recursion_depth < INT_MAX / COMPILER_STACK_FRAME_SCALE) ?
+        recursion_depth * COMPILER_STACK_FRAME_SCALE : recursion_depth;
+    state->recursion_depth = starting_recursion_depth;
+
+    PyObject *result = ast2obj_mod(state, t);
+
+    /* Check that the recursion depth counting balanced correctly */
+    if (result && state->recursion_depth != starting_recursion_depth) {
+        PyErr_Format(PyExc_SystemError,
+            "AST constructor recursion depth mismatch (before=%d, after=%d)",
+            starting_recursion_depth, state->recursion_depth);
+        return 0;
+    }
+    return result;
 }
 
 /* mode is 0 for "exec", 1 for "eval" and 2 for "single" input */
@@ -1437,6 +1470,8 @@ def visit(self, object):
 def generate_ast_state(module_state, f):
     f.write('struct ast_state {\n')
     f.write('    int initialized;\n')
+    f.write('    int recursion_depth;\n')
+    f.write('    int recursion_limit;\n')
     for s in module_state:
         f.write('    PyObject *' + s + ';\n')
     f.write('};')
diff --git a/Python/Python-ast.c b/Python/Python-ast.c
index e52a72d43bcbd..f485af675ccff 100644
--- a/Python/Python-ast.c
+++ b/Python/Python-ast.c
@@ -1851,6 +1851,8 @@ init_types(struct ast_state *state)
         "TypeIgnore(int lineno, string tag)");
     if (!state->TypeIgnore_type) return 0;
 
+    state->recursion_depth = 0;
+    state->recursion_limit = 0;
     state->initialized = 1;
     return 1;
 }
@@ -3610,6 +3612,11 @@ ast2obj_mod(struct ast_state *state, void* _o)
     if (!o) {
         Py_RETURN_NONE;
     }
+    if (++state->recursion_depth > state->recursion_limit) {
+        PyErr_SetString(PyExc_RecursionError,
+            "maximum recursion depth exceeded during ast construction");
+        return 0;
+    }
     switch (o->kind) {
     case Module_kind:
         tp = (PyTypeObject *)state->Module_type;
@@ -3665,6 +3672,7 @@ ast2obj_mod(struct ast_state *state, void* _o)
         Py_DECREF(value);
         break;
     }
+    state->recursion_depth--;
     return result;
 failed:
     Py_XDECREF(value);
@@ -3681,6 +3689,11 @@ ast2obj_stmt(struct ast_state *state, void* _o)
     if (!o) {
         Py_RETURN_NONE;
     }
+    if (++state->recursion_depth > state->recursion_limit) {
+        PyErr_SetString(PyExc_RecursionError,
+            "maximum recursion depth exceeded during ast construction");
+        return 0;
+    }
     switch (o->kind) {
     case FunctionDef_kind:
         tp = (PyTypeObject *)state->FunctionDef_type;
@@ -4224,6 +4237,7 @@ ast2obj_stmt(struct ast_state *state, void* _o)
     if (PyObject_SetAttr(result, state->end_col_offset, value) < 0)
         goto failed;
     Py_DECREF(value);
+    state->recursion_depth--;
     return result;
 failed:
     Py_XDECREF(value);
@@ -4240,6 +4254,11 @@ ast2obj_expr(struct ast_state *state, void* _o)
     if (!o) {
         Py_RETURN_NONE;
     }
+    if (++state->recursion_depth > state->recursion_limit) {
+        PyErr_SetString(PyExc_RecursionError,
+            "maximum recursion depth exceeded during ast construction");
+        return 0;
+    }
     switch (o->kind) {
     case BoolOp_kind:
         tp = (PyTypeObject *)state->BoolOp_type;
@@ -4701,6 +4720,7 @@ ast2obj_expr(struct ast_state *state, void* _o)
     if (PyObject_SetAttr(result, state->end_col_offset, value) < 0)
         goto failed;
     Py_DECREF(value);
+    state->recursion_depth--;
     return result;
 failed:
     Py_XDECREF(value);
@@ -4843,6 +4863,11 @@ ast2obj_comprehension(struct ast_state *state, void* _o)
     if (!o) {
         Py_RETURN_NONE;
     }
+    if (++state->recursion_depth > state->recursion_limit) {
+        PyErr_SetString(PyExc_RecursionError,
+            "maximum recursion depth exceeded during ast construction");
+        return 0;
+    }
     tp = (PyTypeObject *)state->comprehension_type;
     result = PyType_GenericNew(tp, NULL, NULL);
     if (!result) return NULL;
@@ -4866,6 +4891,7 @@ ast2obj_comprehension(struct ast_state *state, void* _o)
     if (PyObject_SetAttr(result, state->is_async, value) == -1)
         goto failed;
     Py_DECREF(value);
+    state->recursion_depth--;
     return result;
 failed:
     Py_XDECREF(value);
@@ -4882,6 +4908,11 @@ ast2obj_excepthandler(struct ast_state *state, void* _o)
     if (!o) {
         Py_RETURN_NONE;
     }
+    if (++state->recursion_depth > state->recursion_limit) {
+        PyErr_SetString(PyExc_RecursionError,
+            "maximum recursion depth exceeded during ast construction");
+        return 0;
+    }
     switch (o->kind) {
     case ExceptHandler_kind:
         tp = (PyTypeObject *)state->ExceptHandler_type;
@@ -4925,6 +4956,7 @@ ast2obj_excepthandler(struct ast_state *state, void* _o)
     if (PyObject_SetAttr(result, state->end_col_offset, value) < 0)
         goto failed;
     Py_DECREF(value);
+    state->recursion_depth--;
     return result;
 failed:
     Py_XDECREF(value);
@@ -4941,6 +4973,11 @@ ast2obj_arguments(struct ast_state *state, void* _o)
     if (!o) {
         Py_RETURN_NONE;
     }
+    if (++state->recursion_depth > state->recursion_limit) {
+        PyErr_SetString(PyExc_RecursionError,
+            "maximum recursion depth exceeded during ast construction");
+        return 0;
+    }
     tp = (PyTypeObject *)state->arguments_type;
     result = PyType_GenericNew(tp, NULL, NULL);
     if (!result) return NULL;
@@ -4979,6 +5016,7 @@ ast2obj_arguments(struct ast_state *state, void* _o)
     if (PyObject_SetAttr(result, state->defaults, value) == -1)
         goto failed;
     Py_DECREF(value);
+    state->recursion_depth--;
     return result;
 failed:
     Py_XDECREF(value);
@@ -4995,6 +5033,11 @@ ast2obj_arg(struct ast_state *state, void* _o)
     if (!o) {
         Py_RETURN_NONE;
     }
+    if (++state->recursion_depth > state->recursion_limit) {
+        PyErr_SetString(PyExc_RecursionError,
+            "maximum recursion depth exceeded during ast construction");
+        return 0;
+    }
     tp = (PyTypeObject *)state->arg_type;
     result = PyType_GenericNew(tp, NULL, NULL);
     if (!result) return NULL;
@@ -5033,6 +5076,7 @@ ast2obj_arg(struct ast_state *state, void* _o)
     if (PyObject_SetAttr(result, state->end_col_offset, value) < 0)
         goto failed;
     Py_DECREF(value);
+    state->recursion_depth--;
     return result;
 failed:
     Py_XDECREF(value);
@@ -5049,6 +5093,11 @@ ast2obj_keyword(struct ast_state *state, void* _o)
     if (!o) {
         Py_RETURN_NONE;
     }
+    if (++state->recursion_depth > state->recursion_limit) {
+        PyErr_SetString(PyExc_RecursionError,
+            "maximum recursion depth exceeded during ast construction");
+        return 0;
+    }
     tp = (PyTypeObject *)state->keyword_type;
     result = PyType_GenericNew(tp, NULL, NULL);
     if (!result) return NULL;
@@ -5082,6 +5131,7 @@ ast2obj_keyword(struct ast_state *state, void* _o)
     if (PyObject_SetAttr(result, state->end_col_offset, value) < 0)
         goto failed;
     Py_DECREF(value);
+    state->recursion_depth--;
     return result;
 failed:
     Py_XDECREF(value);
@@ -5098,6 +5148,11 @@ ast2obj_alias(struct ast_state *state, void* _o)
     if (!o) {
         Py_RETURN_NONE;
     }
+    if (++state->recursion_depth > state->recursion_limit) {
+        PyErr_SetString(PyExc_RecursionError,
+            "maximum recursion depth exceeded during ast construction");
+        return 0;
+    }
     tp = (PyTypeObject *)state->alias_type;
     result = PyType_GenericNew(tp, NULL, NULL);
     if (!result) return NULL;
@@ -5131,6 +5186,7 @@ ast2obj_alias(struct ast_state *state, void* _o)
     if (PyObject_SetAttr(result, state->end_col_offset, value) < 0)
         goto failed;
     Py_DECREF(value);
+    state->recursion_depth--;
     return result;
 failed:
     Py_XDECREF(value);
@@ -5147,6 +5203,11 @@ ast2obj_withitem(struct ast_state *state, void* _o)
     if (!o) {
         Py_RETURN_NONE;
     }
+    if (++state->recursion_depth > state->recursion_limit) {
+        PyErr_SetString(PyExc_RecursionError,
+            "maximum recursion depth exceeded during ast construction");
+        return 0;
+    }
     tp = (PyTypeObject *)state->withitem_type;
     result = PyType_GenericNew(tp, NULL, NULL);
     if (!result) return NULL;
@@ -5160,6 +5221,7 @@ ast2obj_withitem(struct ast_state *state, void* _o)
     if (PyObject_SetAttr(result, state->optional_vars, value) == -1)
         goto failed;
     Py_DECREF(value);
+    state->recursion_depth--;
     return result;
 failed:
     Py_XDECREF(value);
@@ -5176,6 +5238,11 @@ ast2obj_match_case(struct ast_state *state, void* _o)
     if (!o) {
         Py_RETURN_NONE;
     }
+    if (++state->recursion_depth > state->recursion_limit) {
+        PyErr_SetString(PyExc_RecursionError,
+            "maximum recursion depth exceeded during ast construction");
+        return 0;
+    }
     tp = (PyTypeObject *)state->match_case_type;
     result = PyType_GenericNew(tp, NULL, NULL);
     if (!result) return NULL;
@@ -5194,6 +5261,7 @@ ast2obj_match_case(struct ast_state *state, void* _o)
     if (PyObject_SetAttr(result, state->body, value) == -1)
         goto failed;
     Py_DECREF(value);
+    state->recursion_depth--;
     return result;
 failed:
     Py_XDECREF(value);
@@ -5210,6 +5278,11 @@ ast2obj_pattern(struct ast_state *state, void* _o)
     if (!o) {
         Py_RETURN_NONE;
     }
+    if (++state->recursion_depth > state->recursion_limit) {
+        PyErr_SetString(PyExc_RecursionError,
+            "maximum recursion depth exceeded during ast construction");
+        return 0;
+    }
     switch (o->kind) {
     case MatchValue_kind:
         tp = (PyTypeObject *)state->MatchValue_type;
@@ -5349,6 +5422,7 @@ ast2obj_pattern(struct ast_state *state, void* _o)
     if (PyObject_SetAttr(result, state->end_col_offset, value) < 0)
         goto failed;
     Py_DECREF(value);
+    state->recursion_depth--;
     return result;
 failed:
     Py_XDECREF(value);
@@ -5365,6 +5439,11 @@ ast2obj_type_ignore(struct ast_state *state, void* _o)
     if (!o) {
         Py_RETURN_NONE;
     }
+    if (++state->recursion_depth > state->recursion_limit) {
+        PyErr_SetString(PyExc_RecursionError,
+            "maximum recursion depth exceeded during ast construction");
+        return 0;
+    }
     switch (o->kind) {
     case TypeIgnore_kind:
         tp = (PyTypeObject *)state->TypeIgnore_type;
@@ -5382,6 +5461,7 @@ ast2obj_type_ignore(struct ast_state *state, void* _o)
         Py_DECREF(value);
         break;
     }
+    state->recursion_depth--;
     return result;
 failed:
     Py_XDECREF(value);
@@ -12234,7 +12314,32 @@ PyObject* PyAST_mod2obj(mod_ty t)
     if (state == NULL) {
         return NULL;
     }
-    return ast2obj_mod(state, t);
+
+    int recursion_limit = Py_GetRecursionLimit();
+    int starting_recursion_depth;
+    /* Be careful here to prevent overflow. */
+    int COMPILER_STACK_FRAME_SCALE = 3;
+    PyThreadState *tstate = _PyThreadState_GET();
+    if (!tstate) {
+        return 0;
+    }
+    state->recursion_limit = (recursion_limit < INT_MAX / COMPILER_STACK_FRAME_SCALE) ?
+        recursion_limit * COMPILER_STACK_FRAME_SCALE : recursion_limit;
+    int recursion_depth = tstate->recursion_limit - tstate->recursion_remaining;
+    starting_recursion_depth = (recursion_depth < INT_MAX / COMPILER_STACK_FRAME_SCALE) ?
+        recursion_depth * COMPILER_STACK_FRAME_SCALE : recursion_depth;
+    state->recursion_depth = starting_recursion_depth;
+
+    PyObject *result = ast2obj_mod(state, t);
+
+    /* Check that the recursion depth counting balanced correctly */
+    if (result && state->recursion_depth != starting_recursion_depth) {
+        PyErr_Format(PyExc_SystemError,
+            "AST constructor recursion depth mismatch (before=%d, after=%d)",
+            starting_recursion_depth, state->recursion_depth);
+        return 0;
+    }
+    return result;
 }
 
 /* mode is 0 for "exec", 1 for "eval" and 2 for "single" input */


From webhook-mailer at python.org  Sun Jul 24 15:21:33 2022
From: webhook-mailer at python.org (rhettinger)
Date: Sun, 24 Jul 2022 19:21:33 -0000
Subject: [Python-checkins] log2() is faster than log() (#95214)
Message-ID: <mailman.216.1658690494.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/eb9c8a8bea9128b31d4a604c4a1f27ec9b45f333
commit: eb9c8a8bea9128b31d4a604c4a1f27ec9b45f333
branch: main
author: Raymond Hettinger <rhettinger at users.noreply.github.com>
committer: rhettinger <rhettinger at users.noreply.github.com>
date: 2022-07-24T14:21:29-05:00
summary:

log2() is faster than log() (#95214)

files:
M Lib/random.py

diff --git a/Lib/random.py b/Lib/random.py
index ef0034adce5e7..76627309e288b 100644
--- a/Lib/random.py
+++ b/Lib/random.py
@@ -50,7 +50,7 @@
 from math import log as _log, exp as _exp, pi as _pi, e as _e, ceil as _ceil
 from math import sqrt as _sqrt, acos as _acos, cos as _cos, sin as _sin
 from math import tau as TWOPI, floor as _floor, isfinite as _isfinite
-from math import lgamma as _lgamma, fabs as _fabs
+from math import lgamma as _lgamma, fabs as _fabs, log2 as _log2
 from os import urandom as _urandom
 from _collections_abc import Sequence as _Sequence
 from operator import index as _index
@@ -764,11 +764,11 @@ def binomialvariate(self, n=1, p=0.5):
             # BG: Geometric method by Devroye with running time of O(np).
             # https://dl.acm.org/doi/pdf/10.1145/42372.42381
             x = y = 0
-            c = _log(1.0 - p)
+            c = _log2(1.0 - p)
             if not c:
                 return x
             while True:
-                y += _floor(_log(random()) / c) + 1
+                y += _floor(_log2(random()) / c) + 1
                 if y > n:
                     return x
                 x += 1


From webhook-mailer at python.org  Sun Jul 24 16:18:14 2022
From: webhook-mailer at python.org (gvanrossum)
Date: Sun, 24 Jul 2022 20:18:14 -0000
Subject: [Python-checkins] gh-95051: ensure that timeouts scheduled with
 `asyncio.Timeout` that have already expired are deliverered promptly
 (#95109)
Message-ID: <mailman.217.1658693895.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/0c6f898005099be189ee65bcfda659f5fc13b802
commit: 0c6f898005099be189ee65bcfda659f5fc13b802
branch: main
author: Thomas Grainger <tagrain at gmail.com>
committer: gvanrossum <gvanrossum at gmail.com>
date: 2022-07-24T13:18:05-07:00
summary:

gh-95051: ensure that timeouts scheduled with `asyncio.Timeout` that have already expired are deliverered promptly (#95109)

Co-authored-by: Kumar Aditya <59607654+kumaraditya303 at users.noreply.github.com>

files:
A Misc/NEWS.d/next/Library/2022-07-21-22-59-22.gh-issue-95109.usxA9r.rst
M Doc/library/asyncio-task.rst
M Lib/asyncio/timeouts.py
M Lib/test/test_asyncio/test_timeouts.py

diff --git a/Doc/library/asyncio-task.rst b/Doc/library/asyncio-task.rst
index a307d22e456eb..a6b638c112409 100644
--- a/Doc/library/asyncio-task.rst
+++ b/Doc/library/asyncio-task.rst
@@ -625,6 +625,9 @@ Timeouts
 
             If *when* is a float, it is set as the new deadline.
 
+            if *when* is in the past, the timeout will trigger on the next
+            iteration of the event loop.
+
         .. method:: expired() -> bool
 
            Return whether the context manager has exceeded its deadline
diff --git a/Lib/asyncio/timeouts.py b/Lib/asyncio/timeouts.py
index a89205348ff24..94d25535fbc05 100644
--- a/Lib/asyncio/timeouts.py
+++ b/Lib/asyncio/timeouts.py
@@ -52,10 +52,10 @@ def reschedule(self, when: Optional[float]) -> None:
             self._timeout_handler = None
         else:
             loop = events.get_running_loop()
-            self._timeout_handler = loop.call_at(
-                when,
-                self._on_timeout,
-            )
+            if when <= loop.time():
+                self._timeout_handler = loop.call_soon(self._on_timeout)
+            else:
+                self._timeout_handler = loop.call_at(when, self._on_timeout)
 
     def expired(self) -> bool:
         """Is timeout expired during execution?"""
diff --git a/Lib/test/test_asyncio/test_timeouts.py b/Lib/test/test_asyncio/test_timeouts.py
index 9801541e55b7f..b9bac6f783776 100644
--- a/Lib/test/test_asyncio/test_timeouts.py
+++ b/Lib/test/test_asyncio/test_timeouts.py
@@ -105,6 +105,30 @@ async def test_timeout_zero(self):
         self.assertLess(t1-t0, 2)
         self.assertTrue(t0 <= cm.when() <= t1)
 
+    async def test_timeout_zero_sleep_zero(self):
+        loop = asyncio.get_running_loop()
+        t0 = loop.time()
+        with self.assertRaises(TimeoutError):
+            async with asyncio.timeout(0) as cm:
+                await asyncio.sleep(0)
+        t1 = loop.time()
+        self.assertTrue(cm.expired())
+        # 2 sec for slow CI boxes
+        self.assertLess(t1-t0, 2)
+        self.assertTrue(t0 <= cm.when() <= t1)
+
+    async def test_timeout_in_the_past_sleep_zero(self):
+        loop = asyncio.get_running_loop()
+        t0 = loop.time()
+        with self.assertRaises(TimeoutError):
+            async with asyncio.timeout(-11) as cm:
+                await asyncio.sleep(0)
+        t1 = loop.time()
+        self.assertTrue(cm.expired())
+        # 2 sec for slow CI boxes
+        self.assertLess(t1-t0, 2)
+        self.assertTrue(t0 >= cm.when() <= t1)
+
     async def test_foreign_exception_passed(self):
         with self.assertRaises(KeyError):
             async with asyncio.timeout(0.01) as cm:
diff --git a/Misc/NEWS.d/next/Library/2022-07-21-22-59-22.gh-issue-95109.usxA9r.rst b/Misc/NEWS.d/next/Library/2022-07-21-22-59-22.gh-issue-95109.usxA9r.rst
new file mode 100644
index 0000000000000..40196dd214a28
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2022-07-21-22-59-22.gh-issue-95109.usxA9r.rst
@@ -0,0 +1 @@
+Ensure that timeouts scheduled with :class:`asyncio.Timeout` that have already expired are delivered promptly.


From webhook-mailer at python.org  Sun Jul 24 17:33:15 2022
From: webhook-mailer at python.org (pablogsal)
Date: Sun, 24 Jul 2022 21:33:15 -0000
Subject: [Python-checkins] gh-95173: Revert commit
 51ed2c56a1852cd6b09c85ba81312dc9782772ce (#95176)
Message-ID: <mailman.218.1658698397.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/9007dec606b790c05e158e588b696f3c210c2795
commit: 9007dec606b790c05e158e588b696f3c210c2795
branch: main
author: Pablo Galindo Salgado <Pablogsal at gmail.com>
committer: pablogsal <Pablogsal at gmail.com>
date: 2022-07-24T22:33:06+01:00
summary:

gh-95173: Revert commit 51ed2c56a1852cd6b09c85ba81312dc9782772ce (#95176)

files:
M Doc/whatsnew/3.11.rst
M Objects/listobject.c

diff --git a/Doc/whatsnew/3.11.rst b/Doc/whatsnew/3.11.rst
index 0bdf3d1e4d965..b7ec8ad55471b 100644
--- a/Doc/whatsnew/3.11.rst
+++ b/Doc/whatsnew/3.11.rst
@@ -1473,13 +1473,6 @@ Changes in the Python API
   the ``'utf-8'`` encoding.
   (Contributed by Srinivas Reddy Thatiparthy (??????????  ?????? ?????????) in :issue:`41137`.)
 
-* When sorting using tuples as keys, the order of the result may differ
-  from earlier releases if the tuple elements don't define a total
-  ordering (see :ref:`expressions-value-comparisons` for
-  information on total ordering).  It's generally true that the result
-  of sorting simply isn't well-defined in the absence of a total ordering
-  on list elements.
-
 * :mod:`calendar`: The :class:`calendar.LocaleTextCalendar` and
   :class:`calendar.LocaleHTMLCalendar` classes now use
   :func:`locale.getlocale`, instead of using :func:`locale.getdefaultlocale`,
diff --git a/Objects/listobject.c b/Objects/listobject.c
index 83dfb7da01dfc..822954bee432f 100644
--- a/Objects/listobject.c
+++ b/Objects/listobject.c
@@ -1226,13 +1226,6 @@ struct s_MergeState {
      * of tuples. It may be set to safe_object_compare, but the idea is that hopefully
      * we can assume more, and use one of the special-case compares. */
     int (*tuple_elem_compare)(PyObject *, PyObject *, MergeState *);
-
-    /* Used by unsafe_tuple_compare to record whether the very first tuple
-     * elements resolved the last comparison attempt. If so, next time a
-     * method that may avoid PyObject_RichCompareBool() entirely is tried.
-     * 0 for false, 1 for true.
-     */
-    int first_tuple_items_resolved_it;
 };
 
 /* binarysort is the best method for sorting small arrays: it does
@@ -2205,24 +2198,7 @@ unsafe_float_compare(PyObject *v, PyObject *w, MergeState *ms)
  * using the same pre-sort check as we use for ms->key_compare,
  * but run on the list [x[0] for x in L]. This allows us to optimize compares
  * on two levels (as long as [x[0] for x in L] is type-homogeneous.) The idea is
- * that most tuple compares don't involve x[1:].
- * However, that may not be right. When it is right, we can win by calling the
- * relatively cheap ms->tuple_elem_compare on the first pair of elements, to
- * see whether v[0] < w[0] or w[0] < v[0]. If either are so, we're done.
- * Else we proceed as in the tuple compare, comparing the remaining pairs via
- * the probably more expensive PyObject_RichCompareBool(..., Py_EQ) until (if
- * ever) that says "no, not equal!". Then, if we're still on the first pair,
- * ms->tuple_elem_compare can resolve it, else PyObject_RichCompareBool(...,
- * Py_LT) finishes the job.
- * In any case, ms->first_tuple_items_resolved_it keeps track of whether the
- * most recent tuple comparison was resolved by the first pair. If so, the
- * next attempt starts by trying the cheap tests on the first pair again, else
- * PyObject_RichCompareBool(..., Py_EQ) is used from the start.
- * There are cases where PyObject_RichCompareBool(..., Py_EQ) is much cheaper!
- * For example, that can return "almost immediately" if passed the same
- * object twice (it special-cases object identity for Py_EQ), which can,
- * potentially, be unboundedly faster than ms->tuple_elem_compare.
- */
+ * that most tuple compares don't involve x[1:]. */
 static int
 unsafe_tuple_compare(PyObject *v, PyObject *w, MergeState *ms)
 {
@@ -2238,52 +2214,26 @@ unsafe_tuple_compare(PyObject *v, PyObject *w, MergeState *ms)
 
     vt = (PyTupleObject *)v;
     wt = (PyTupleObject *)w;
-    i = 0;
-    if (ms->first_tuple_items_resolved_it) {
-        /* See whether fast compares of the first elements settle it. */
-        k = ms->tuple_elem_compare(vt->ob_item[0], wt->ob_item[0], ms);
-        if (k) /* error, or v < w */
-            return k;
-        k = ms->tuple_elem_compare(wt->ob_item[0], vt->ob_item[0], ms);
-        if (k > 0) /* w < v */
-            return 0;
-        if (k < 0) /* error */
-            return -1;
-        /* We have
-         *     not (v[0] < w[0]) and not (w[0] < v[0])
-         * which implies, for a total order, that the first elements are
-         * equal. So skip them in the loop.
-         */
-        i = 1;
-        ms->first_tuple_items_resolved_it = 0;
-    }
-    /* Now first_tuple_items_resolved_it was 0 on entry, or was forced to 0
-     * at the end of the `if` block just above.
-     */
-    assert(! ms->first_tuple_items_resolved_it);
 
     vlen = Py_SIZE(vt);
     wlen = Py_SIZE(wt);
-    for (; i < vlen && i < wlen; i++) {
+
+    for (i = 0; i < vlen && i < wlen; i++) {
         k = PyObject_RichCompareBool(vt->ob_item[i], wt->ob_item[i], Py_EQ);
-        if (!k) { /* not equal */
-            if (i) {
-                return PyObject_RichCompareBool(vt->ob_item[i], wt->ob_item[i],
-                                                Py_LT);
-            }
-            else {
-                ms->first_tuple_items_resolved_it = 1;
-                return ms->tuple_elem_compare(vt->ob_item[0], wt->ob_item[0],
-                                              ms);
-            }
-        }
         if (k < 0)
             return -1;
+        if (!k)
+            break;
     }
-    /* all equal until we fell off the end */
-    return vlen < wlen;
 
- }
+    if (i >= vlen || i >= wlen)
+        return vlen < wlen;
+
+    if (i == 0)
+        return ms->tuple_elem_compare(vt->ob_item[i], wt->ob_item[i], ms);
+    else
+        return PyObject_RichCompareBool(vt->ob_item[i], wt->ob_item[i], Py_LT);
+}
 
 /* An adaptive, stable, natural mergesort.  See listsort.txt.
  * Returns Py_None on success, NULL on error.  Even in case of error, the
@@ -2466,7 +2416,6 @@ list_sort_impl(PyListObject *self, PyObject *keyfunc, int reverse)
             }
 
             ms.key_compare = unsafe_tuple_compare;
-            ms.first_tuple_items_resolved_it = 1; /* be optimistic */
         }
     }
     /* End of pre-sort check: ms is now set properly! */


From webhook-mailer at python.org  Sun Jul 24 18:01:52 2022
From: webhook-mailer at python.org (miss-islington)
Date: Sun, 24 Jul 2022 22:01:52 -0000
Subject: [Python-checkins] gh-95173: Revert commit
 51ed2c56a1852cd6b09c85ba81312dc9782772ce (GH-95176)
Message-ID: <mailman.219.1658700113.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/88ea2b69524982cd61eb0b463c77da45fb6e7e2a
commit: 88ea2b69524982cd61eb0b463c77da45fb6e7e2a
branch: 3.11
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-24T15:01:47-07:00
summary:

gh-95173: Revert commit 51ed2c56a1852cd6b09c85ba81312dc9782772ce (GH-95176)

(cherry picked from commit 9007dec606b790c05e158e588b696f3c210c2795)

Co-authored-by: Pablo Galindo Salgado <Pablogsal at gmail.com>

files:
M Doc/whatsnew/3.11.rst
M Objects/listobject.c

diff --git a/Doc/whatsnew/3.11.rst b/Doc/whatsnew/3.11.rst
index 87796d541356f..ec634037743f5 100644
--- a/Doc/whatsnew/3.11.rst
+++ b/Doc/whatsnew/3.11.rst
@@ -1478,13 +1478,6 @@ Changes in the Python API
   the ``'utf-8'`` encoding.
   (Contributed by Srinivas Reddy Thatiparthy (??????????  ?????? ?????????) in :issue:`41137`.)
 
-* When sorting using tuples as keys, the order of the result may differ
-  from earlier releases if the tuple elements don't define a total
-  ordering (see :ref:`expressions-value-comparisons` for
-  information on total ordering).  It's generally true that the result
-  of sorting simply isn't well-defined in the absence of a total ordering
-  on list elements.
-
 * :mod:`calendar`: The :class:`calendar.LocaleTextCalendar` and
   :class:`calendar.LocaleHTMLCalendar` classes now use
   :func:`locale.getlocale`, instead of using :func:`locale.getdefaultlocale`,
diff --git a/Objects/listobject.c b/Objects/listobject.c
index 0a99ec919b8c8..8e3d02ab17ea9 100644
--- a/Objects/listobject.c
+++ b/Objects/listobject.c
@@ -1226,13 +1226,6 @@ struct s_MergeState {
      * of tuples. It may be set to safe_object_compare, but the idea is that hopefully
      * we can assume more, and use one of the special-case compares. */
     int (*tuple_elem_compare)(PyObject *, PyObject *, MergeState *);
-
-    /* Used by unsafe_tuple_compare to record whether the very first tuple
-     * elements resolved the last comparison attempt. If so, next time a
-     * method that may avoid PyObject_RichCompareBool() entirely is tried.
-     * 0 for false, 1 for true.
-     */
-    int first_tuple_items_resolved_it;
 };
 
 /* binarysort is the best method for sorting small arrays: it does
@@ -2205,24 +2198,7 @@ unsafe_float_compare(PyObject *v, PyObject *w, MergeState *ms)
  * using the same pre-sort check as we use for ms->key_compare,
  * but run on the list [x[0] for x in L]. This allows us to optimize compares
  * on two levels (as long as [x[0] for x in L] is type-homogeneous.) The idea is
- * that most tuple compares don't involve x[1:].
- * However, that may not be right. When it is right, we can win by calling the
- * relatively cheap ms->tuple_elem_compare on the first pair of elements, to
- * see whether v[0] < w[0] or w[0] < v[0]. If either are so, we're done.
- * Else we proceed as in the tuple compare, comparing the remaining pairs via
- * the probably more expensive PyObject_RichCompareBool(..., Py_EQ) until (if
- * ever) that says "no, not equal!". Then, if we're still on the first pair,
- * ms->tuple_elem_compare can resolve it, else PyObject_RichCompareBool(...,
- * Py_LT) finishes the job.
- * In any case, ms->first_tuple_items_resolved_it keeps track of whether the
- * most recent tuple comparison was resolved by the first pair. If so, the
- * next attempt starts by trying the cheap tests on the first pair again, else
- * PyObject_RichCompareBool(..., Py_EQ) is used from the start.
- * There are cases where PyObject_RichCompareBool(..., Py_EQ) is much cheaper!
- * For example, that can return "almost immediately" if passed the same
- * object twice (it special-cases object identity for Py_EQ), which can,
- * potentially, be unboundedly faster than ms->tuple_elem_compare.
- */
+ * that most tuple compares don't involve x[1:]. */
 static int
 unsafe_tuple_compare(PyObject *v, PyObject *w, MergeState *ms)
 {
@@ -2238,52 +2214,26 @@ unsafe_tuple_compare(PyObject *v, PyObject *w, MergeState *ms)
 
     vt = (PyTupleObject *)v;
     wt = (PyTupleObject *)w;
-    i = 0;
-    if (ms->first_tuple_items_resolved_it) {
-        /* See whether fast compares of the first elements settle it. */
-        k = ms->tuple_elem_compare(vt->ob_item[0], wt->ob_item[0], ms);
-        if (k) /* error, or v < w */
-            return k;
-        k = ms->tuple_elem_compare(wt->ob_item[0], vt->ob_item[0], ms);
-        if (k > 0) /* w < v */
-            return 0;
-        if (k < 0) /* error */
-            return -1;
-        /* We have
-         *     not (v[0] < w[0]) and not (w[0] < v[0])
-         * which implies, for a total order, that the first elements are
-         * equal. So skip them in the loop.
-         */
-        i = 1;
-        ms->first_tuple_items_resolved_it = 0;
-    }
-    /* Now first_tuple_items_resolved_it was 0 on entry, or was forced to 0
-     * at the end of the `if` block just above.
-     */
-    assert(! ms->first_tuple_items_resolved_it);
 
     vlen = Py_SIZE(vt);
     wlen = Py_SIZE(wt);
-    for (; i < vlen && i < wlen; i++) {
+
+    for (i = 0; i < vlen && i < wlen; i++) {
         k = PyObject_RichCompareBool(vt->ob_item[i], wt->ob_item[i], Py_EQ);
-        if (!k) { /* not equal */
-            if (i) {
-                return PyObject_RichCompareBool(vt->ob_item[i], wt->ob_item[i],
-                                                Py_LT);
-            }
-            else {
-                ms->first_tuple_items_resolved_it = 1;
-                return ms->tuple_elem_compare(vt->ob_item[0], wt->ob_item[0],
-                                              ms);
-            }
-        }
         if (k < 0)
             return -1;
+        if (!k)
+            break;
     }
-    /* all equal until we fell off the end */
-    return vlen < wlen;
 
- }
+    if (i >= vlen || i >= wlen)
+        return vlen < wlen;
+
+    if (i == 0)
+        return ms->tuple_elem_compare(vt->ob_item[i], wt->ob_item[i], ms);
+    else
+        return PyObject_RichCompareBool(vt->ob_item[i], wt->ob_item[i], Py_LT);
+}
 
 /* An adaptive, stable, natural mergesort.  See listsort.txt.
  * Returns Py_None on success, NULL on error.  Even in case of error, the
@@ -2466,7 +2416,6 @@ list_sort_impl(PyListObject *self, PyObject *keyfunc, int reverse)
             }
 
             ms.key_compare = unsafe_tuple_compare;
-            ms.first_tuple_items_resolved_it = 1; /* be optimistic */
         }
     }
     /* End of pre-sort check: ms is now set properly! */


From webhook-mailer at python.org  Sun Jul 24 20:53:16 2022
From: webhook-mailer at python.org (jaraco)
Date: Mon, 25 Jul 2022 00:53:16 -0000
Subject: [Python-checkins] gh-95218: Move tests for importlib.resources into
 test_importlib.resources. (#95219)
Message-ID: <mailman.220.1658710398.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/3e718cf880e8994d76f6296a502497c16a956644
commit: 3e718cf880e8994d76f6296a502497c16a956644
branch: main
author: Jason R. Coombs <jaraco at jaraco.com>
committer: jaraco <jaraco at jaraco.com>
date: 2022-07-24T20:53:10-04:00
summary:

gh-95218: Move tests for importlib.resources into test_importlib.resources. (#95219)

* gh-95218: Move tests for importlib.resources into test_importlib.resources.

* Also update makefile

* Include test_importlib/resources in code ownership rule.

files:
A Lib/test/test_importlib/resources/data01/__init__.py
A Lib/test/test_importlib/resources/data01/binary.file
A Lib/test/test_importlib/resources/data01/subdirectory/__init__.py
A Lib/test/test_importlib/resources/data01/subdirectory/binary.file
A Lib/test/test_importlib/resources/data01/utf-16.file
A Lib/test/test_importlib/resources/data01/utf-8.file
A Lib/test/test_importlib/resources/data02/__init__.py
A Lib/test/test_importlib/resources/data02/one/__init__.py
A Lib/test/test_importlib/resources/data02/one/resource1.txt
A Lib/test/test_importlib/resources/data02/two/__init__.py
A Lib/test/test_importlib/resources/data02/two/resource2.txt
A Lib/test/test_importlib/resources/data03/__init__.py
A Lib/test/test_importlib/resources/data03/namespace/portion1/__init__.py
A Lib/test/test_importlib/resources/data03/namespace/portion2/__init__.py
A Lib/test/test_importlib/resources/data03/namespace/resource1.txt
A Lib/test/test_importlib/resources/namespacedata01/binary.file
A Lib/test/test_importlib/resources/namespacedata01/utf-16.file
A Lib/test/test_importlib/resources/namespacedata01/utf-8.file
A Lib/test/test_importlib/resources/test_compatibilty_files.py
A Lib/test/test_importlib/resources/test_contents.py
A Lib/test/test_importlib/resources/test_files.py
A Lib/test/test_importlib/resources/test_open.py
A Lib/test/test_importlib/resources/test_path.py
A Lib/test/test_importlib/resources/test_read.py
A Lib/test/test_importlib/resources/test_reader.py
A Lib/test/test_importlib/resources/test_resource.py
A Lib/test/test_importlib/resources/update-zips.py
A Lib/test/test_importlib/resources/zipdata01/__init__.py
A Lib/test/test_importlib/resources/zipdata01/ziptestdata.zip
A Lib/test/test_importlib/resources/zipdata02/__init__.py
A Lib/test/test_importlib/resources/zipdata02/ziptestdata.zip
A Misc/NEWS.d/next/Tests/2022-07-24-17-24-42.gh-issue-95218.zfBLtu.rst
D Lib/test/test_importlib/data01/__init__.py
D Lib/test/test_importlib/data01/binary.file
D Lib/test/test_importlib/data01/subdirectory/__init__.py
D Lib/test/test_importlib/data01/subdirectory/binary.file
D Lib/test/test_importlib/data01/utf-16.file
D Lib/test/test_importlib/data01/utf-8.file
D Lib/test/test_importlib/data02/__init__.py
D Lib/test/test_importlib/data02/one/__init__.py
D Lib/test/test_importlib/data02/one/resource1.txt
D Lib/test/test_importlib/data02/two/__init__.py
D Lib/test/test_importlib/data02/two/resource2.txt
D Lib/test/test_importlib/data03/__init__.py
D Lib/test/test_importlib/data03/namespace/portion1/__init__.py
D Lib/test/test_importlib/data03/namespace/portion2/__init__.py
D Lib/test/test_importlib/data03/namespace/resource1.txt
D Lib/test/test_importlib/namespacedata01/binary.file
D Lib/test/test_importlib/namespacedata01/utf-16.file
D Lib/test/test_importlib/namespacedata01/utf-8.file
D Lib/test/test_importlib/test_compatibilty_files.py
D Lib/test/test_importlib/test_contents.py
D Lib/test/test_importlib/test_files.py
D Lib/test/test_importlib/test_open.py
D Lib/test/test_importlib/test_path.py
D Lib/test/test_importlib/test_read.py
D Lib/test/test_importlib/test_reader.py
D Lib/test/test_importlib/test_resource.py
D Lib/test/test_importlib/update-zips.py
D Lib/test/test_importlib/zipdata01/__init__.py
D Lib/test/test_importlib/zipdata01/ziptestdata.zip
D Lib/test/test_importlib/zipdata02/__init__.py
D Lib/test/test_importlib/zipdata02/ziptestdata.zip
M .gitattributes
M .github/CODEOWNERS
M Lib/test/test_importlib/resources/util.py
M Makefile.pre.in

diff --git a/.gitattributes b/.gitattributes
index fb11ddb6dfae1..79f7b712aa459 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -28,8 +28,8 @@ Lib/test/cjkencodings/*                    noeol
 Lib/test/coding20731.py                    noeol
 Lib/test/decimaltestdata/*.decTest         noeol
 Lib/test/test_email/data/*.txt             noeol
-Lib/test/test_importlib/data01/*           noeol
-Lib/test/test_importlib/namespacedata01/*  noeol
+Lib/test/test_importlib/resources/data01/*           noeol
+Lib/test/test_importlib/resources/namespacedata01/*  noeol
 Lib/test/xmltestdata/*                     noeol
 
 # CRLF files
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 013e1cbd7241d..df79aa6503e0c 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -61,7 +61,7 @@ Python/pythonrun.c            @iritkatriel
 # bytecode.
 **/*import*.c                 @brettcannon @encukou @ericsnowcurrently @ncoghlan @warsaw
 **/*import*.py                @brettcannon @encukou @ericsnowcurrently @ncoghlan @warsaw
-**/importlib/resources/*      @jaraco @warsaw @brettcannon
+**/*importlib/resources/*      @jaraco @warsaw @brettcannon
 **/importlib/metadata/*       @jaraco @warsaw
 
 # Dates and times
diff --git a/Lib/test/test_importlib/data01/__init__.py b/Lib/test/test_importlib/resources/data01/__init__.py
similarity index 100%
rename from Lib/test/test_importlib/data01/__init__.py
rename to Lib/test/test_importlib/resources/data01/__init__.py
diff --git a/Lib/test/test_importlib/data01/binary.file b/Lib/test/test_importlib/resources/data01/binary.file
similarity index 100%
rename from Lib/test/test_importlib/data01/binary.file
rename to Lib/test/test_importlib/resources/data01/binary.file
diff --git a/Lib/test/test_importlib/data01/subdirectory/__init__.py b/Lib/test/test_importlib/resources/data01/subdirectory/__init__.py
similarity index 100%
rename from Lib/test/test_importlib/data01/subdirectory/__init__.py
rename to Lib/test/test_importlib/resources/data01/subdirectory/__init__.py
diff --git a/Lib/test/test_importlib/data01/subdirectory/binary.file b/Lib/test/test_importlib/resources/data01/subdirectory/binary.file
similarity index 100%
rename from Lib/test/test_importlib/data01/subdirectory/binary.file
rename to Lib/test/test_importlib/resources/data01/subdirectory/binary.file
diff --git a/Lib/test/test_importlib/data01/utf-16.file b/Lib/test/test_importlib/resources/data01/utf-16.file
similarity index 100%
rename from Lib/test/test_importlib/data01/utf-16.file
rename to Lib/test/test_importlib/resources/data01/utf-16.file
diff --git a/Lib/test/test_importlib/data01/utf-8.file b/Lib/test/test_importlib/resources/data01/utf-8.file
similarity index 100%
rename from Lib/test/test_importlib/data01/utf-8.file
rename to Lib/test/test_importlib/resources/data01/utf-8.file
diff --git a/Lib/test/test_importlib/data02/__init__.py b/Lib/test/test_importlib/resources/data02/__init__.py
similarity index 100%
rename from Lib/test/test_importlib/data02/__init__.py
rename to Lib/test/test_importlib/resources/data02/__init__.py
diff --git a/Lib/test/test_importlib/data02/one/__init__.py b/Lib/test/test_importlib/resources/data02/one/__init__.py
similarity index 100%
rename from Lib/test/test_importlib/data02/one/__init__.py
rename to Lib/test/test_importlib/resources/data02/one/__init__.py
diff --git a/Lib/test/test_importlib/data02/one/resource1.txt b/Lib/test/test_importlib/resources/data02/one/resource1.txt
similarity index 100%
rename from Lib/test/test_importlib/data02/one/resource1.txt
rename to Lib/test/test_importlib/resources/data02/one/resource1.txt
diff --git a/Lib/test/test_importlib/data02/two/__init__.py b/Lib/test/test_importlib/resources/data02/two/__init__.py
similarity index 100%
rename from Lib/test/test_importlib/data02/two/__init__.py
rename to Lib/test/test_importlib/resources/data02/two/__init__.py
diff --git a/Lib/test/test_importlib/data02/two/resource2.txt b/Lib/test/test_importlib/resources/data02/two/resource2.txt
similarity index 100%
rename from Lib/test/test_importlib/data02/two/resource2.txt
rename to Lib/test/test_importlib/resources/data02/two/resource2.txt
diff --git a/Lib/test/test_importlib/data03/__init__.py b/Lib/test/test_importlib/resources/data03/__init__.py
similarity index 100%
rename from Lib/test/test_importlib/data03/__init__.py
rename to Lib/test/test_importlib/resources/data03/__init__.py
diff --git a/Lib/test/test_importlib/data03/namespace/portion1/__init__.py b/Lib/test/test_importlib/resources/data03/namespace/portion1/__init__.py
similarity index 100%
rename from Lib/test/test_importlib/data03/namespace/portion1/__init__.py
rename to Lib/test/test_importlib/resources/data03/namespace/portion1/__init__.py
diff --git a/Lib/test/test_importlib/data03/namespace/portion2/__init__.py b/Lib/test/test_importlib/resources/data03/namespace/portion2/__init__.py
similarity index 100%
rename from Lib/test/test_importlib/data03/namespace/portion2/__init__.py
rename to Lib/test/test_importlib/resources/data03/namespace/portion2/__init__.py
diff --git a/Lib/test/test_importlib/data03/namespace/resource1.txt b/Lib/test/test_importlib/resources/data03/namespace/resource1.txt
similarity index 100%
rename from Lib/test/test_importlib/data03/namespace/resource1.txt
rename to Lib/test/test_importlib/resources/data03/namespace/resource1.txt
diff --git a/Lib/test/test_importlib/namespacedata01/binary.file b/Lib/test/test_importlib/resources/namespacedata01/binary.file
similarity index 100%
rename from Lib/test/test_importlib/namespacedata01/binary.file
rename to Lib/test/test_importlib/resources/namespacedata01/binary.file
diff --git a/Lib/test/test_importlib/namespacedata01/utf-16.file b/Lib/test/test_importlib/resources/namespacedata01/utf-16.file
similarity index 100%
rename from Lib/test/test_importlib/namespacedata01/utf-16.file
rename to Lib/test/test_importlib/resources/namespacedata01/utf-16.file
diff --git a/Lib/test/test_importlib/namespacedata01/utf-8.file b/Lib/test/test_importlib/resources/namespacedata01/utf-8.file
similarity index 100%
rename from Lib/test/test_importlib/namespacedata01/utf-8.file
rename to Lib/test/test_importlib/resources/namespacedata01/utf-8.file
diff --git a/Lib/test/test_importlib/test_compatibilty_files.py b/Lib/test/test_importlib/resources/test_compatibilty_files.py
similarity index 99%
rename from Lib/test/test_importlib/test_compatibilty_files.py
rename to Lib/test/test_importlib/resources/test_compatibilty_files.py
index 9a823f2d93058..6fa18a24973f6 100644
--- a/Lib/test/test_importlib/test_compatibilty_files.py
+++ b/Lib/test/test_importlib/resources/test_compatibilty_files.py
@@ -8,7 +8,7 @@
     wrap_spec,
 )
 
-from .resources import util
+from . import util
 
 
 class CompatibilityFilesTests(unittest.TestCase):
diff --git a/Lib/test/test_importlib/test_contents.py b/Lib/test/test_importlib/resources/test_contents.py
similarity index 97%
rename from Lib/test/test_importlib/test_contents.py
rename to Lib/test/test_importlib/resources/test_contents.py
index 3323bf5b5cf56..1a13f043a86f0 100644
--- a/Lib/test/test_importlib/test_contents.py
+++ b/Lib/test/test_importlib/resources/test_contents.py
@@ -2,7 +2,7 @@
 from importlib import resources
 
 from . import data01
-from .resources import util
+from . import util
 
 
 class ContentsTests:
diff --git a/Lib/test/test_importlib/test_files.py b/Lib/test/test_importlib/resources/test_files.py
similarity index 97%
rename from Lib/test/test_importlib/test_files.py
rename to Lib/test/test_importlib/resources/test_files.py
index b9170d83bea91..4665ed7cc00dc 100644
--- a/Lib/test/test_importlib/test_files.py
+++ b/Lib/test/test_importlib/resources/test_files.py
@@ -4,7 +4,7 @@
 from importlib import resources
 from importlib.abc import Traversable
 from . import data01
-from .resources import util
+from . import util
 
 
 class FilesTests:
diff --git a/Lib/test/test_importlib/test_open.py b/Lib/test/test_importlib/resources/test_open.py
similarity index 98%
rename from Lib/test/test_importlib/test_open.py
rename to Lib/test/test_importlib/resources/test_open.py
index df75e343d2c5b..0554c41ba67d0 100644
--- a/Lib/test/test_importlib/test_open.py
+++ b/Lib/test/test_importlib/resources/test_open.py
@@ -2,7 +2,7 @@
 
 from importlib import resources
 from . import data01
-from .resources import util
+from . import util
 
 
 class CommonBinaryTests(util.CommonTests, unittest.TestCase):
diff --git a/Lib/test/test_importlib/test_path.py b/Lib/test/test_importlib/resources/test_path.py
similarity index 98%
rename from Lib/test/test_importlib/test_path.py
rename to Lib/test/test_importlib/resources/test_path.py
index 6fc41f301d1ca..adcf75feea78e 100644
--- a/Lib/test/test_importlib/test_path.py
+++ b/Lib/test/test_importlib/resources/test_path.py
@@ -3,7 +3,7 @@
 
 from importlib import resources
 from . import data01
-from .resources import util
+from . import util
 
 
 class CommonTests(util.CommonTests, unittest.TestCase):
diff --git a/Lib/test/test_importlib/test_read.py b/Lib/test/test_importlib/resources/test_read.py
similarity index 98%
rename from Lib/test/test_importlib/test_read.py
rename to Lib/test/test_importlib/resources/test_read.py
index ebd72267776d9..0ca8ee9d02856 100644
--- a/Lib/test/test_importlib/test_read.py
+++ b/Lib/test/test_importlib/resources/test_read.py
@@ -2,7 +2,7 @@
 
 from importlib import import_module, resources
 from . import data01
-from .resources import util
+from . import util
 
 
 class CommonBinaryTests(util.CommonTests, unittest.TestCase):
diff --git a/Lib/test/test_importlib/test_reader.py b/Lib/test/test_importlib/resources/test_reader.py
similarity index 100%
rename from Lib/test/test_importlib/test_reader.py
rename to Lib/test/test_importlib/resources/test_reader.py
diff --git a/Lib/test/test_importlib/test_resource.py b/Lib/test/test_importlib/resources/test_resource.py
similarity index 99%
rename from Lib/test/test_importlib/test_resource.py
rename to Lib/test/test_importlib/resources/test_resource.py
index 834b8bd8a2818..1d6df0cc84317 100644
--- a/Lib/test/test_importlib/test_resource.py
+++ b/Lib/test/test_importlib/resources/test_resource.py
@@ -5,7 +5,7 @@
 
 from . import data01
 from . import zipdata01, zipdata02
-from .resources import util
+from . import util
 from importlib import resources, import_module
 from test.support import import_helper
 from test.support.os_helper import unlink
diff --git a/Lib/test/test_importlib/update-zips.py b/Lib/test/test_importlib/resources/update-zips.py
similarity index 100%
rename from Lib/test/test_importlib/update-zips.py
rename to Lib/test/test_importlib/resources/update-zips.py
diff --git a/Lib/test/test_importlib/resources/util.py b/Lib/test/test_importlib/resources/util.py
index 11c8aa80806dc..f80c9cd01d66e 100644
--- a/Lib/test/test_importlib/resources/util.py
+++ b/Lib/test/test_importlib/resources/util.py
@@ -5,8 +5,8 @@
 import types
 from pathlib import Path, PurePath
 
-from .. import data01
-from .. import zipdata01
+from . import data01
+from . import zipdata01
 from importlib.abc import ResourceReader
 from test.support import import_helper
 
diff --git a/Lib/test/test_importlib/zipdata01/__init__.py b/Lib/test/test_importlib/resources/zipdata01/__init__.py
similarity index 100%
rename from Lib/test/test_importlib/zipdata01/__init__.py
rename to Lib/test/test_importlib/resources/zipdata01/__init__.py
diff --git a/Lib/test/test_importlib/zipdata01/ziptestdata.zip b/Lib/test/test_importlib/resources/zipdata01/ziptestdata.zip
similarity index 100%
rename from Lib/test/test_importlib/zipdata01/ziptestdata.zip
rename to Lib/test/test_importlib/resources/zipdata01/ziptestdata.zip
diff --git a/Lib/test/test_importlib/zipdata02/__init__.py b/Lib/test/test_importlib/resources/zipdata02/__init__.py
similarity index 100%
rename from Lib/test/test_importlib/zipdata02/__init__.py
rename to Lib/test/test_importlib/resources/zipdata02/__init__.py
diff --git a/Lib/test/test_importlib/zipdata02/ziptestdata.zip b/Lib/test/test_importlib/resources/zipdata02/ziptestdata.zip
similarity index 100%
rename from Lib/test/test_importlib/zipdata02/ziptestdata.zip
rename to Lib/test/test_importlib/resources/zipdata02/ziptestdata.zip
diff --git a/Makefile.pre.in b/Makefile.pre.in
index dd0216572e601..ab44f2158e92d 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -1926,15 +1926,6 @@ TESTSUBDIRS=	distutils/tests \
 		test/test_importlib \
 		test/test_importlib/builtin \
 		test/test_importlib/data \
-		test/test_importlib/data01 \
-		test/test_importlib/data01/subdirectory \
-		test/test_importlib/data02 \
-		test/test_importlib/data02/one \
-		test/test_importlib/data02/two \
-		test/test_importlib/data03 \
-		test/test_importlib/data03/namespace \
-		test/test_importlib/data03/namespace/portion1 \
-		test/test_importlib/data03/namespace/portion2 \
 		test/test_importlib/extension \
 		test/test_importlib/frozen \
 		test/test_importlib/import_ \
@@ -1958,12 +1949,21 @@ TESTSUBDIRS=	distutils/tests \
 		test/test_importlib/namespace_pkgs/project3 \
 		test/test_importlib/namespace_pkgs/project3/parent \
 		test/test_importlib/namespace_pkgs/project3/parent/child \
-		test/test_importlib/namespacedata01 \
 		test/test_importlib/partial \
 		test/test_importlib/resources \
+		test/test_importlib/resources/data01 \
+		test/test_importlib/resources/data01/subdirectory \
+		test/test_importlib/resources/data02 \
+		test/test_importlib/resources/data02/one \
+		test/test_importlib/resources/data02/two \
+		test/test_importlib/resources/data03 \
+		test/test_importlib/resources/data03/namespace \
+		test/test_importlib/resources/data03/namespace/portion1 \
+		test/test_importlib/resources/data03/namespace/portion2 \
+		test/test_importlib/resources/namespacedata01 \
+		test/test_importlib/resources/zipdata01 \
+		test/test_importlib/resources/zipdata02 \
 		test/test_importlib/source \
-		test/test_importlib/zipdata01 \
-		test/test_importlib/zipdata02 \
 		test/test_json \
 		test/test_lib2to3 \
 		test/test_lib2to3/data \
diff --git a/Misc/NEWS.d/next/Tests/2022-07-24-17-24-42.gh-issue-95218.zfBLtu.rst b/Misc/NEWS.d/next/Tests/2022-07-24-17-24-42.gh-issue-95218.zfBLtu.rst
new file mode 100644
index 0000000000000..7326689657a7a
--- /dev/null
+++ b/Misc/NEWS.d/next/Tests/2022-07-24-17-24-42.gh-issue-95218.zfBLtu.rst
@@ -0,0 +1 @@
+Move tests for importlib.resources into test_importlib.resources.


From webhook-mailer at python.org  Mon Jul 25 00:44:50 2022
From: webhook-mailer at python.org (tiran)
Date: Mon, 25 Jul 2022 04:44:50 -0000
Subject: [Python-checkins] gh-95212: make multiprocessing test case
 parallel-safe (GH-95213)
Message-ID: <mailman.221.1658724291.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/5956de16cd00e7e1cf5cbf3d7b4a930eaa928321
commit: 5956de16cd00e7e1cf5cbf3d7b4a930eaa928321
branch: main
author: Christian Heimes <christian at python.org>
committer: tiran <christian at python.org>
date: 2022-07-25T06:44:40+02:00
summary:

gh-95212: make multiprocessing test case parallel-safe (GH-95213)

files:
A Misc/NEWS.d/next/Tests/2022-07-24-20-19-05.gh-issue-95212.fHiU4e.rst
M Lib/test/_test_multiprocessing.py

diff --git a/Lib/test/_test_multiprocessing.py b/Lib/test/_test_multiprocessing.py
index e3e7ee39ebdb8..b78586c560a68 100644
--- a/Lib/test/_test_multiprocessing.py
+++ b/Lib/test/_test_multiprocessing.py
@@ -3973,7 +3973,7 @@ def test_shared_memory_recreate(self):
             'multiprocessing.shared_memory._make_filename') as mock_make_filename:
 
             NAME_PREFIX = shared_memory._SHM_NAME_PREFIX
-            names = ['test01_fn', 'test02_fn']
+            names = [self._new_shm_name('test03_fn'), self._new_shm_name('test04_fn')]
             # Prepend NAME_PREFIX which can be '/psm_' or 'wnsm_', necessary
             # because some POSIX compliant systems require name to start with /
             names = [NAME_PREFIX + name for name in names]
diff --git a/Misc/NEWS.d/next/Tests/2022-07-24-20-19-05.gh-issue-95212.fHiU4e.rst b/Misc/NEWS.d/next/Tests/2022-07-24-20-19-05.gh-issue-95212.fHiU4e.rst
new file mode 100644
index 0000000000000..44cea181cc1f1
--- /dev/null
+++ b/Misc/NEWS.d/next/Tests/2022-07-24-20-19-05.gh-issue-95212.fHiU4e.rst
@@ -0,0 +1,2 @@
+Make multiprocessing test case ``test_shared_memory_recreate``
+parallel-safe.


From webhook-mailer at python.org  Mon Jul 25 01:11:34 2022
From: webhook-mailer at python.org (miss-islington)
Date: Mon, 25 Jul 2022 05:11:34 -0000
Subject: [Python-checkins] gh-95212: make multiprocessing test case
 parallel-safe (GH-95213)
Message-ID: <mailman.222.1658725895.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/49d038496e851f6571a267cfd387dd7094bdd832
commit: 49d038496e851f6571a267cfd387dd7094bdd832
branch: 3.11
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-24T22:11:30-07:00
summary:

gh-95212: make multiprocessing test case parallel-safe (GH-95213)

(cherry picked from commit 5956de16cd00e7e1cf5cbf3d7b4a930eaa928321)

Co-authored-by: Christian Heimes <christian at python.org>

files:
A Misc/NEWS.d/next/Tests/2022-07-24-20-19-05.gh-issue-95212.fHiU4e.rst
M Lib/test/_test_multiprocessing.py

diff --git a/Lib/test/_test_multiprocessing.py b/Lib/test/_test_multiprocessing.py
index 4f0df0f508f73..599c3f2abf33c 100644
--- a/Lib/test/_test_multiprocessing.py
+++ b/Lib/test/_test_multiprocessing.py
@@ -3971,7 +3971,7 @@ def test_shared_memory_recreate(self):
             'multiprocessing.shared_memory._make_filename') as mock_make_filename:
 
             NAME_PREFIX = shared_memory._SHM_NAME_PREFIX
-            names = ['test01_fn', 'test02_fn']
+            names = [self._new_shm_name('test03_fn'), self._new_shm_name('test04_fn')]
             # Prepend NAME_PREFIX which can be '/psm_' or 'wnsm_', necessary
             # because some POSIX compliant systems require name to start with /
             names = [NAME_PREFIX + name for name in names]
diff --git a/Misc/NEWS.d/next/Tests/2022-07-24-20-19-05.gh-issue-95212.fHiU4e.rst b/Misc/NEWS.d/next/Tests/2022-07-24-20-19-05.gh-issue-95212.fHiU4e.rst
new file mode 100644
index 0000000000000..44cea181cc1f1
--- /dev/null
+++ b/Misc/NEWS.d/next/Tests/2022-07-24-20-19-05.gh-issue-95212.fHiU4e.rst
@@ -0,0 +1,2 @@
+Make multiprocessing test case ``test_shared_memory_recreate``
+parallel-safe.


From webhook-mailer at python.org  Mon Jul 25 01:11:46 2022
From: webhook-mailer at python.org (miss-islington)
Date: Mon, 25 Jul 2022 05:11:46 -0000
Subject: [Python-checkins] gh-95212: make multiprocessing test case
 parallel-safe (GH-95213)
Message-ID: <mailman.223.1658725907.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/40f41ba5f4f27a5e0949108286320c2057541643
commit: 40f41ba5f4f27a5e0949108286320c2057541643
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-24T22:11:41-07:00
summary:

gh-95212: make multiprocessing test case parallel-safe (GH-95213)

(cherry picked from commit 5956de16cd00e7e1cf5cbf3d7b4a930eaa928321)

Co-authored-by: Christian Heimes <christian at python.org>

files:
A Misc/NEWS.d/next/Tests/2022-07-24-20-19-05.gh-issue-95212.fHiU4e.rst
M Lib/test/_test_multiprocessing.py

diff --git a/Lib/test/_test_multiprocessing.py b/Lib/test/_test_multiprocessing.py
index de1a99a2723d2..8dced90c53835 100644
--- a/Lib/test/_test_multiprocessing.py
+++ b/Lib/test/_test_multiprocessing.py
@@ -3910,7 +3910,7 @@ def test_shared_memory_recreate(self):
             'multiprocessing.shared_memory._make_filename') as mock_make_filename:
 
             NAME_PREFIX = shared_memory._SHM_NAME_PREFIX
-            names = ['test01_fn', 'test02_fn']
+            names = [self._new_shm_name('test03_fn'), self._new_shm_name('test04_fn')]
             # Prepend NAME_PREFIX which can be '/psm_' or 'wnsm_', necessary
             # because some POSIX compliant systems require name to start with /
             names = [NAME_PREFIX + name for name in names]
diff --git a/Misc/NEWS.d/next/Tests/2022-07-24-20-19-05.gh-issue-95212.fHiU4e.rst b/Misc/NEWS.d/next/Tests/2022-07-24-20-19-05.gh-issue-95212.fHiU4e.rst
new file mode 100644
index 0000000000000..44cea181cc1f1
--- /dev/null
+++ b/Misc/NEWS.d/next/Tests/2022-07-24-20-19-05.gh-issue-95212.fHiU4e.rst
@@ -0,0 +1,2 @@
+Make multiprocessing test case ``test_shared_memory_recreate``
+parallel-safe.


From webhook-mailer at python.org  Mon Jul 25 02:17:44 2022
From: webhook-mailer at python.org (serhiy-storchaka)
Date: Mon, 25 Jul 2022 06:17:44 -0000
Subject: [Python-checkins] gh-95087: Fix IndexError in parsing invalid date
 in the email module (GH-95201)
Message-ID: <mailman.224.1658729866.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/ea5ed0ba51c10cfdde7651a475438551964dfdfc
commit: ea5ed0ba51c10cfdde7651a475438551964dfdfc
branch: main
author: Serhiy Storchaka <storchaka at gmail.com>
committer: serhiy-storchaka <storchaka at gmail.com>
date: 2022-07-25T09:17:25+03:00
summary:

gh-95087: Fix IndexError in parsing invalid date in the email module (GH-95201)

Co-authored-by: wouter bolsterlee <wouter at bolsterl.ee>

files:
A Misc/NEWS.d/next/Library/2022-07-24-12-59-02.gh-issue-95087.VvqXkN.rst
M Lib/email/_parseaddr.py
M Lib/test/test_email/test_email.py
M Lib/test/test_email/test_utils.py

diff --git a/Lib/email/_parseaddr.py b/Lib/email/_parseaddr.py
index ba5ad5a36d06b..febe411355d6b 100644
--- a/Lib/email/_parseaddr.py
+++ b/Lib/email/_parseaddr.py
@@ -95,6 +95,8 @@ def _parsedate_tz(data):
         return None
     data = data[:5]
     [dd, mm, yy, tm, tz] = data
+    if not (dd and mm and yy):
+        return None
     mm = mm.lower()
     if mm not in _monthnames:
         dd, mm = mm, dd.lower()
@@ -110,6 +112,8 @@ def _parsedate_tz(data):
         yy, tm = tm, yy
     if yy[-1] == ',':
         yy = yy[:-1]
+        if not yy:
+            return None
     if not yy[0].isdigit():
         yy, tz = tz, yy
     if tm[-1] == ',':
diff --git a/Lib/test/test_email/test_email.py b/Lib/test/test_email/test_email.py
index 0bf679b4c56ca..44b405740c440 100644
--- a/Lib/test/test_email/test_email.py
+++ b/Lib/test/test_email/test_email.py
@@ -3047,33 +3047,43 @@ def test_formatdate_usegmt(self):
 
     # parsedate and parsedate_tz will become deprecated interfaces someday
     def test_parsedate_returns_None_for_invalid_strings(self):
-        self.assertIsNone(utils.parsedate(''))
-        self.assertIsNone(utils.parsedate_tz(''))
-        self.assertIsNone(utils.parsedate(' '))
-        self.assertIsNone(utils.parsedate_tz(' '))
-        self.assertIsNone(utils.parsedate('0'))
-        self.assertIsNone(utils.parsedate_tz('0'))
-        self.assertIsNone(utils.parsedate('A Complete Waste of Time'))
-        self.assertIsNone(utils.parsedate_tz('A Complete Waste of Time'))
-        self.assertIsNone(utils.parsedate_tz('Wed, 3 Apr 2002 12.34.56.78+0800'))
+        # See also test_parsedate_to_datetime_with_invalid_raises_valueerror
+        # in test_utils.
+        invalid_dates = [
+            '',
+            ' ',
+            '0',
+            'A Complete Waste of Time',
+            'Wed, 3 Apr 2002 12.34.56.78+0800',
+            '17 June , 2022',
+            'Friday, -Nov-82 16:14:55 EST',
+            'Friday, Nov--82 16:14:55 EST',
+            'Friday, 19-Nov- 16:14:55 EST',
+        ]
+        for dtstr in invalid_dates:
+            with self.subTest(dtstr=dtstr):
+                self.assertIsNone(utils.parsedate(dtstr))
+                self.assertIsNone(utils.parsedate_tz(dtstr))
         # Not a part of the spec but, but this has historically worked:
         self.assertIsNone(utils.parsedate(None))
         self.assertIsNone(utils.parsedate_tz(None))
 
     def test_parsedate_compact(self):
+        self.assertEqual(utils.parsedate_tz('Wed, 3 Apr 2002 14:58:26 +0800'),
+                         (2002, 4, 3, 14, 58, 26, 0, 1, -1, 28800))
         # The FWS after the comma is optional
-        self.assertEqual(utils.parsedate('Wed,3 Apr 2002 14:58:26 +0800'),
-                         utils.parsedate('Wed, 3 Apr 2002 14:58:26 +0800'))
+        self.assertEqual(utils.parsedate_tz('Wed,3 Apr 2002 14:58:26 +0800'),
+                         (2002, 4, 3, 14, 58, 26, 0, 1, -1, 28800))
+        # The comma is optional
+        self.assertEqual(utils.parsedate_tz('Wed 3 Apr 2002 14:58:26 +0800'),
+                         (2002, 4, 3, 14, 58, 26, 0, 1, -1, 28800))
 
     def test_parsedate_no_dayofweek(self):
-        eq = self.assertEqual
-        eq(utils.parsedate_tz('25 Feb 2003 13:47:26 -0800'),
-           (2003, 2, 25, 13, 47, 26, 0, 1, -1, -28800))
-
-    def test_parsedate_compact_no_dayofweek(self):
         eq = self.assertEqual
         eq(utils.parsedate_tz('5 Feb 2003 13:47:26 -0800'),
            (2003, 2, 5, 13, 47, 26, 0, 1, -1, -28800))
+        eq(utils.parsedate_tz('February 5, 2003 13:47:26 -0800'),
+           (2003, 2, 5, 13, 47, 26, 0, 1, -1, -28800))
 
     def test_parsedate_no_space_before_positive_offset(self):
         self.assertEqual(utils.parsedate_tz('Wed, 3 Apr 2002 14:58:26+0800'),
@@ -3084,7 +3094,6 @@ def test_parsedate_no_space_before_negative_offset(self):
         self.assertEqual(utils.parsedate_tz('Wed, 3 Apr 2002 14:58:26-0800'),
            (2002, 4, 3, 14, 58, 26, 0, 1, -1, -28800))
 
-
     def test_parsedate_accepts_time_with_dots(self):
         eq = self.assertEqual
         eq(utils.parsedate_tz('5 Feb 2003 13.47.26 -0800'),
@@ -3092,6 +3101,20 @@ def test_parsedate_accepts_time_with_dots(self):
         eq(utils.parsedate_tz('5 Feb 2003 13.47 -0800'),
            (2003, 2, 5, 13, 47, 0, 0, 1, -1, -28800))
 
+    def test_parsedate_rfc_850(self):
+        self.assertEqual(utils.parsedate_tz('Friday, 19-Nov-82 16:14:55 EST'),
+           (1982, 11, 19, 16, 14, 55, 0, 1, -1, -18000))
+
+    def test_parsedate_no_seconds(self):
+        self.assertEqual(utils.parsedate_tz('Wed, 3 Apr 2002 14:58 +0800'),
+                         (2002, 4, 3, 14, 58, 0, 0, 1, -1, 28800))
+
+    def test_parsedate_dot_time_delimiter(self):
+        self.assertEqual(utils.parsedate_tz('Wed, 3 Apr 2002 14.58.26 +0800'),
+                         (2002, 4, 3, 14, 58, 26, 0, 1, -1, 28800))
+        self.assertEqual(utils.parsedate_tz('Wed, 3 Apr 2002 14.58 +0800'),
+                         (2002, 4, 3, 14, 58, 0, 0, 1, -1, 28800))
+
     def test_parsedate_acceptable_to_time_functions(self):
         eq = self.assertEqual
         timetup = utils.parsedate('5 Feb 2003 13:47:26 -0800')
diff --git a/Lib/test/test_email/test_utils.py b/Lib/test/test_email/test_utils.py
index e3d3eaebc9369..78afb358035e8 100644
--- a/Lib/test/test_email/test_utils.py
+++ b/Lib/test/test_email/test_utils.py
@@ -49,12 +49,21 @@ def test_parsedate_to_datetime_naive(self):
             self.naive_dt)
 
     def test_parsedate_to_datetime_with_invalid_raises_valueerror(self):
-        invalid_dates = ['',
-                         '0',
-                         'A Complete Waste of Time'
-                         'Tue, 06 Jun 2017 27:39:33 +0600',
-                         'Tue, 06 Jun 2017 07:39:33 +2600',
-                         'Tue, 06 Jun 2017 27:39:33']
+        # See also test_parsedate_returns_None_for_invalid_strings in test_email.
+        invalid_dates = [
+            '',
+            ' ',
+            '0',
+            'A Complete Waste of Time',
+            'Wed, 3 Apr 2002 12.34.56.78+0800'
+            'Tue, 06 Jun 2017 27:39:33 +0600',
+            'Tue, 06 Jun 2017 07:39:33 +2600',
+            'Tue, 06 Jun 2017 27:39:33',
+            '17 June , 2022',
+            'Friday, -Nov-82 16:14:55 EST',
+            'Friday, Nov--82 16:14:55 EST',
+            'Friday, 19-Nov- 16:14:55 EST',
+        ]
         for dtstr in invalid_dates:
             with self.subTest(dtstr=dtstr):
                 self.assertRaises(ValueError, utils.parsedate_to_datetime, dtstr)
diff --git a/Misc/NEWS.d/next/Library/2022-07-24-12-59-02.gh-issue-95087.VvqXkN.rst b/Misc/NEWS.d/next/Library/2022-07-24-12-59-02.gh-issue-95087.VvqXkN.rst
new file mode 100644
index 0000000000000..48a5c1af74907
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2022-07-24-12-59-02.gh-issue-95087.VvqXkN.rst
@@ -0,0 +1 @@
+Fix IndexError in parsing invalid date in the :mod:`email` module.


From webhook-mailer at python.org  Mon Jul 25 02:39:10 2022
From: webhook-mailer at python.org (miss-islington)
Date: Mon, 25 Jul 2022 06:39:10 -0000
Subject: [Python-checkins] gh-95087: Fix IndexError in parsing invalid date
 in the email module (GH-95201)
Message-ID: <mailman.225.1658731150.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/94eb1e9789eacf855919cddade7d7d0d26b4f08d
commit: 94eb1e9789eacf855919cddade7d7d0d26b4f08d
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-24T23:39:00-07:00
summary:

gh-95087: Fix IndexError in parsing invalid date in the email module (GH-95201)


Co-authored-by: wouter bolsterlee <wouter at bolsterl.ee>
(cherry picked from commit ea5ed0ba51c10cfdde7651a475438551964dfdfc)

Co-authored-by: Serhiy Storchaka <storchaka at gmail.com>

files:
A Misc/NEWS.d/next/Library/2022-07-24-12-59-02.gh-issue-95087.VvqXkN.rst
M Lib/email/_parseaddr.py
M Lib/test/test_email/test_email.py
M Lib/test/test_email/test_utils.py

diff --git a/Lib/email/_parseaddr.py b/Lib/email/_parseaddr.py
index ba5ad5a36d06b..febe411355d6b 100644
--- a/Lib/email/_parseaddr.py
+++ b/Lib/email/_parseaddr.py
@@ -95,6 +95,8 @@ def _parsedate_tz(data):
         return None
     data = data[:5]
     [dd, mm, yy, tm, tz] = data
+    if not (dd and mm and yy):
+        return None
     mm = mm.lower()
     if mm not in _monthnames:
         dd, mm = mm, dd.lower()
@@ -110,6 +112,8 @@ def _parsedate_tz(data):
         yy, tm = tm, yy
     if yy[-1] == ',':
         yy = yy[:-1]
+        if not yy:
+            return None
     if not yy[0].isdigit():
         yy, tz = tz, yy
     if tm[-1] == ',':
diff --git a/Lib/test/test_email/test_email.py b/Lib/test/test_email/test_email.py
index 3a5663ac01d0f..8b16cca9bf543 100644
--- a/Lib/test/test_email/test_email.py
+++ b/Lib/test/test_email/test_email.py
@@ -3016,33 +3016,43 @@ def test_formatdate_usegmt(self):
 
     # parsedate and parsedate_tz will become deprecated interfaces someday
     def test_parsedate_returns_None_for_invalid_strings(self):
-        self.assertIsNone(utils.parsedate(''))
-        self.assertIsNone(utils.parsedate_tz(''))
-        self.assertIsNone(utils.parsedate(' '))
-        self.assertIsNone(utils.parsedate_tz(' '))
-        self.assertIsNone(utils.parsedate('0'))
-        self.assertIsNone(utils.parsedate_tz('0'))
-        self.assertIsNone(utils.parsedate('A Complete Waste of Time'))
-        self.assertIsNone(utils.parsedate_tz('A Complete Waste of Time'))
-        self.assertIsNone(utils.parsedate_tz('Wed, 3 Apr 2002 12.34.56.78+0800'))
+        # See also test_parsedate_to_datetime_with_invalid_raises_valueerror
+        # in test_utils.
+        invalid_dates = [
+            '',
+            ' ',
+            '0',
+            'A Complete Waste of Time',
+            'Wed, 3 Apr 2002 12.34.56.78+0800',
+            '17 June , 2022',
+            'Friday, -Nov-82 16:14:55 EST',
+            'Friday, Nov--82 16:14:55 EST',
+            'Friday, 19-Nov- 16:14:55 EST',
+        ]
+        for dtstr in invalid_dates:
+            with self.subTest(dtstr=dtstr):
+                self.assertIsNone(utils.parsedate(dtstr))
+                self.assertIsNone(utils.parsedate_tz(dtstr))
         # Not a part of the spec but, but this has historically worked:
         self.assertIsNone(utils.parsedate(None))
         self.assertIsNone(utils.parsedate_tz(None))
 
     def test_parsedate_compact(self):
+        self.assertEqual(utils.parsedate_tz('Wed, 3 Apr 2002 14:58:26 +0800'),
+                         (2002, 4, 3, 14, 58, 26, 0, 1, -1, 28800))
         # The FWS after the comma is optional
-        self.assertEqual(utils.parsedate('Wed,3 Apr 2002 14:58:26 +0800'),
-                         utils.parsedate('Wed, 3 Apr 2002 14:58:26 +0800'))
+        self.assertEqual(utils.parsedate_tz('Wed,3 Apr 2002 14:58:26 +0800'),
+                         (2002, 4, 3, 14, 58, 26, 0, 1, -1, 28800))
+        # The comma is optional
+        self.assertEqual(utils.parsedate_tz('Wed 3 Apr 2002 14:58:26 +0800'),
+                         (2002, 4, 3, 14, 58, 26, 0, 1, -1, 28800))
 
     def test_parsedate_no_dayofweek(self):
-        eq = self.assertEqual
-        eq(utils.parsedate_tz('25 Feb 2003 13:47:26 -0800'),
-           (2003, 2, 25, 13, 47, 26, 0, 1, -1, -28800))
-
-    def test_parsedate_compact_no_dayofweek(self):
         eq = self.assertEqual
         eq(utils.parsedate_tz('5 Feb 2003 13:47:26 -0800'),
            (2003, 2, 5, 13, 47, 26, 0, 1, -1, -28800))
+        eq(utils.parsedate_tz('February 5, 2003 13:47:26 -0800'),
+           (2003, 2, 5, 13, 47, 26, 0, 1, -1, -28800))
 
     def test_parsedate_no_space_before_positive_offset(self):
         self.assertEqual(utils.parsedate_tz('Wed, 3 Apr 2002 14:58:26+0800'),
@@ -3053,7 +3063,6 @@ def test_parsedate_no_space_before_negative_offset(self):
         self.assertEqual(utils.parsedate_tz('Wed, 3 Apr 2002 14:58:26-0800'),
            (2002, 4, 3, 14, 58, 26, 0, 1, -1, -28800))
 
-
     def test_parsedate_accepts_time_with_dots(self):
         eq = self.assertEqual
         eq(utils.parsedate_tz('5 Feb 2003 13.47.26 -0800'),
@@ -3061,6 +3070,20 @@ def test_parsedate_accepts_time_with_dots(self):
         eq(utils.parsedate_tz('5 Feb 2003 13.47 -0800'),
            (2003, 2, 5, 13, 47, 0, 0, 1, -1, -28800))
 
+    def test_parsedate_rfc_850(self):
+        self.assertEqual(utils.parsedate_tz('Friday, 19-Nov-82 16:14:55 EST'),
+           (1982, 11, 19, 16, 14, 55, 0, 1, -1, -18000))
+
+    def test_parsedate_no_seconds(self):
+        self.assertEqual(utils.parsedate_tz('Wed, 3 Apr 2002 14:58 +0800'),
+                         (2002, 4, 3, 14, 58, 0, 0, 1, -1, 28800))
+
+    def test_parsedate_dot_time_delimiter(self):
+        self.assertEqual(utils.parsedate_tz('Wed, 3 Apr 2002 14.58.26 +0800'),
+                         (2002, 4, 3, 14, 58, 26, 0, 1, -1, 28800))
+        self.assertEqual(utils.parsedate_tz('Wed, 3 Apr 2002 14.58 +0800'),
+                         (2002, 4, 3, 14, 58, 0, 0, 1, -1, 28800))
+
     def test_parsedate_acceptable_to_time_functions(self):
         eq = self.assertEqual
         timetup = utils.parsedate('5 Feb 2003 13:47:26 -0800')
diff --git a/Lib/test/test_email/test_utils.py b/Lib/test/test_email/test_utils.py
index e3d3eaebc9369..78afb358035e8 100644
--- a/Lib/test/test_email/test_utils.py
+++ b/Lib/test/test_email/test_utils.py
@@ -49,12 +49,21 @@ def test_parsedate_to_datetime_naive(self):
             self.naive_dt)
 
     def test_parsedate_to_datetime_with_invalid_raises_valueerror(self):
-        invalid_dates = ['',
-                         '0',
-                         'A Complete Waste of Time'
-                         'Tue, 06 Jun 2017 27:39:33 +0600',
-                         'Tue, 06 Jun 2017 07:39:33 +2600',
-                         'Tue, 06 Jun 2017 27:39:33']
+        # See also test_parsedate_returns_None_for_invalid_strings in test_email.
+        invalid_dates = [
+            '',
+            ' ',
+            '0',
+            'A Complete Waste of Time',
+            'Wed, 3 Apr 2002 12.34.56.78+0800'
+            'Tue, 06 Jun 2017 27:39:33 +0600',
+            'Tue, 06 Jun 2017 07:39:33 +2600',
+            'Tue, 06 Jun 2017 27:39:33',
+            '17 June , 2022',
+            'Friday, -Nov-82 16:14:55 EST',
+            'Friday, Nov--82 16:14:55 EST',
+            'Friday, 19-Nov- 16:14:55 EST',
+        ]
         for dtstr in invalid_dates:
             with self.subTest(dtstr=dtstr):
                 self.assertRaises(ValueError, utils.parsedate_to_datetime, dtstr)
diff --git a/Misc/NEWS.d/next/Library/2022-07-24-12-59-02.gh-issue-95087.VvqXkN.rst b/Misc/NEWS.d/next/Library/2022-07-24-12-59-02.gh-issue-95087.VvqXkN.rst
new file mode 100644
index 0000000000000..48a5c1af74907
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2022-07-24-12-59-02.gh-issue-95087.VvqXkN.rst
@@ -0,0 +1 @@
+Fix IndexError in parsing invalid date in the :mod:`email` module.


From webhook-mailer at python.org  Mon Jul 25 02:40:22 2022
From: webhook-mailer at python.org (miss-islington)
Date: Mon, 25 Jul 2022 06:40:22 -0000
Subject: [Python-checkins] gh-95087: Fix IndexError in parsing invalid date
 in the email module (GH-95201)
Message-ID: <mailman.226.1658731222.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/3ec139fa4d0a898b1f9cd98313bdf6fd9fd7728e
commit: 3ec139fa4d0a898b1f9cd98313bdf6fd9fd7728e
branch: 3.11
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-24T23:40:17-07:00
summary:

gh-95087: Fix IndexError in parsing invalid date in the email module (GH-95201)


Co-authored-by: wouter bolsterlee <wouter at bolsterl.ee>
(cherry picked from commit ea5ed0ba51c10cfdde7651a475438551964dfdfc)

Co-authored-by: Serhiy Storchaka <storchaka at gmail.com>

files:
A Misc/NEWS.d/next/Library/2022-07-24-12-59-02.gh-issue-95087.VvqXkN.rst
M Lib/email/_parseaddr.py
M Lib/test/test_email/test_email.py
M Lib/test/test_email/test_utils.py

diff --git a/Lib/email/_parseaddr.py b/Lib/email/_parseaddr.py
index ba5ad5a36d06b..febe411355d6b 100644
--- a/Lib/email/_parseaddr.py
+++ b/Lib/email/_parseaddr.py
@@ -95,6 +95,8 @@ def _parsedate_tz(data):
         return None
     data = data[:5]
     [dd, mm, yy, tm, tz] = data
+    if not (dd and mm and yy):
+        return None
     mm = mm.lower()
     if mm not in _monthnames:
         dd, mm = mm, dd.lower()
@@ -110,6 +112,8 @@ def _parsedate_tz(data):
         yy, tm = tm, yy
     if yy[-1] == ',':
         yy = yy[:-1]
+        if not yy:
+            return None
     if not yy[0].isdigit():
         yy, tz = tz, yy
     if tm[-1] == ',':
diff --git a/Lib/test/test_email/test_email.py b/Lib/test/test_email/test_email.py
index 2b1e2b864feda..ca8212825ffca 100644
--- a/Lib/test/test_email/test_email.py
+++ b/Lib/test/test_email/test_email.py
@@ -3048,33 +3048,43 @@ def test_formatdate_usegmt(self):
 
     # parsedate and parsedate_tz will become deprecated interfaces someday
     def test_parsedate_returns_None_for_invalid_strings(self):
-        self.assertIsNone(utils.parsedate(''))
-        self.assertIsNone(utils.parsedate_tz(''))
-        self.assertIsNone(utils.parsedate(' '))
-        self.assertIsNone(utils.parsedate_tz(' '))
-        self.assertIsNone(utils.parsedate('0'))
-        self.assertIsNone(utils.parsedate_tz('0'))
-        self.assertIsNone(utils.parsedate('A Complete Waste of Time'))
-        self.assertIsNone(utils.parsedate_tz('A Complete Waste of Time'))
-        self.assertIsNone(utils.parsedate_tz('Wed, 3 Apr 2002 12.34.56.78+0800'))
+        # See also test_parsedate_to_datetime_with_invalid_raises_valueerror
+        # in test_utils.
+        invalid_dates = [
+            '',
+            ' ',
+            '0',
+            'A Complete Waste of Time',
+            'Wed, 3 Apr 2002 12.34.56.78+0800',
+            '17 June , 2022',
+            'Friday, -Nov-82 16:14:55 EST',
+            'Friday, Nov--82 16:14:55 EST',
+            'Friday, 19-Nov- 16:14:55 EST',
+        ]
+        for dtstr in invalid_dates:
+            with self.subTest(dtstr=dtstr):
+                self.assertIsNone(utils.parsedate(dtstr))
+                self.assertIsNone(utils.parsedate_tz(dtstr))
         # Not a part of the spec but, but this has historically worked:
         self.assertIsNone(utils.parsedate(None))
         self.assertIsNone(utils.parsedate_tz(None))
 
     def test_parsedate_compact(self):
+        self.assertEqual(utils.parsedate_tz('Wed, 3 Apr 2002 14:58:26 +0800'),
+                         (2002, 4, 3, 14, 58, 26, 0, 1, -1, 28800))
         # The FWS after the comma is optional
-        self.assertEqual(utils.parsedate('Wed,3 Apr 2002 14:58:26 +0800'),
-                         utils.parsedate('Wed, 3 Apr 2002 14:58:26 +0800'))
+        self.assertEqual(utils.parsedate_tz('Wed,3 Apr 2002 14:58:26 +0800'),
+                         (2002, 4, 3, 14, 58, 26, 0, 1, -1, 28800))
+        # The comma is optional
+        self.assertEqual(utils.parsedate_tz('Wed 3 Apr 2002 14:58:26 +0800'),
+                         (2002, 4, 3, 14, 58, 26, 0, 1, -1, 28800))
 
     def test_parsedate_no_dayofweek(self):
-        eq = self.assertEqual
-        eq(utils.parsedate_tz('25 Feb 2003 13:47:26 -0800'),
-           (2003, 2, 25, 13, 47, 26, 0, 1, -1, -28800))
-
-    def test_parsedate_compact_no_dayofweek(self):
         eq = self.assertEqual
         eq(utils.parsedate_tz('5 Feb 2003 13:47:26 -0800'),
            (2003, 2, 5, 13, 47, 26, 0, 1, -1, -28800))
+        eq(utils.parsedate_tz('February 5, 2003 13:47:26 -0800'),
+           (2003, 2, 5, 13, 47, 26, 0, 1, -1, -28800))
 
     def test_parsedate_no_space_before_positive_offset(self):
         self.assertEqual(utils.parsedate_tz('Wed, 3 Apr 2002 14:58:26+0800'),
@@ -3085,7 +3095,6 @@ def test_parsedate_no_space_before_negative_offset(self):
         self.assertEqual(utils.parsedate_tz('Wed, 3 Apr 2002 14:58:26-0800'),
            (2002, 4, 3, 14, 58, 26, 0, 1, -1, -28800))
 
-
     def test_parsedate_accepts_time_with_dots(self):
         eq = self.assertEqual
         eq(utils.parsedate_tz('5 Feb 2003 13.47.26 -0800'),
@@ -3093,6 +3102,20 @@ def test_parsedate_accepts_time_with_dots(self):
         eq(utils.parsedate_tz('5 Feb 2003 13.47 -0800'),
            (2003, 2, 5, 13, 47, 0, 0, 1, -1, -28800))
 
+    def test_parsedate_rfc_850(self):
+        self.assertEqual(utils.parsedate_tz('Friday, 19-Nov-82 16:14:55 EST'),
+           (1982, 11, 19, 16, 14, 55, 0, 1, -1, -18000))
+
+    def test_parsedate_no_seconds(self):
+        self.assertEqual(utils.parsedate_tz('Wed, 3 Apr 2002 14:58 +0800'),
+                         (2002, 4, 3, 14, 58, 0, 0, 1, -1, 28800))
+
+    def test_parsedate_dot_time_delimiter(self):
+        self.assertEqual(utils.parsedate_tz('Wed, 3 Apr 2002 14.58.26 +0800'),
+                         (2002, 4, 3, 14, 58, 26, 0, 1, -1, 28800))
+        self.assertEqual(utils.parsedate_tz('Wed, 3 Apr 2002 14.58 +0800'),
+                         (2002, 4, 3, 14, 58, 0, 0, 1, -1, 28800))
+
     def test_parsedate_acceptable_to_time_functions(self):
         eq = self.assertEqual
         timetup = utils.parsedate('5 Feb 2003 13:47:26 -0800')
diff --git a/Lib/test/test_email/test_utils.py b/Lib/test/test_email/test_utils.py
index e3d3eaebc9369..78afb358035e8 100644
--- a/Lib/test/test_email/test_utils.py
+++ b/Lib/test/test_email/test_utils.py
@@ -49,12 +49,21 @@ def test_parsedate_to_datetime_naive(self):
             self.naive_dt)
 
     def test_parsedate_to_datetime_with_invalid_raises_valueerror(self):
-        invalid_dates = ['',
-                         '0',
-                         'A Complete Waste of Time'
-                         'Tue, 06 Jun 2017 27:39:33 +0600',
-                         'Tue, 06 Jun 2017 07:39:33 +2600',
-                         'Tue, 06 Jun 2017 27:39:33']
+        # See also test_parsedate_returns_None_for_invalid_strings in test_email.
+        invalid_dates = [
+            '',
+            ' ',
+            '0',
+            'A Complete Waste of Time',
+            'Wed, 3 Apr 2002 12.34.56.78+0800'
+            'Tue, 06 Jun 2017 27:39:33 +0600',
+            'Tue, 06 Jun 2017 07:39:33 +2600',
+            'Tue, 06 Jun 2017 27:39:33',
+            '17 June , 2022',
+            'Friday, -Nov-82 16:14:55 EST',
+            'Friday, Nov--82 16:14:55 EST',
+            'Friday, 19-Nov- 16:14:55 EST',
+        ]
         for dtstr in invalid_dates:
             with self.subTest(dtstr=dtstr):
                 self.assertRaises(ValueError, utils.parsedate_to_datetime, dtstr)
diff --git a/Misc/NEWS.d/next/Library/2022-07-24-12-59-02.gh-issue-95087.VvqXkN.rst b/Misc/NEWS.d/next/Library/2022-07-24-12-59-02.gh-issue-95087.VvqXkN.rst
new file mode 100644
index 0000000000000..48a5c1af74907
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2022-07-24-12-59-02.gh-issue-95087.VvqXkN.rst
@@ -0,0 +1 @@
+Fix IndexError in parsing invalid date in the :mod:`email` module.


From webhook-mailer at python.org  Mon Jul 25 03:43:10 2022
From: webhook-mailer at python.org (erlend-aasland)
Date: Mon, 25 Jul 2022 07:43:10 -0000
Subject: [Python-checkins] gh-95205: Improve wasm README (#95206)
Message-ID: <mailman.227.1658734992.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/310f94871a923f6cf3dc9259e732ce2376578b26
commit: 310f94871a923f6cf3dc9259e732ce2376578b26
branch: main
author: Erlend Egeberg Aasland <erlend.aasland at innova.no>
committer: erlend-aasland <erlend.aasland at protonmail.com>
date: 2022-07-25T09:42:50+02:00
summary:

gh-95205: Improve wasm README (#95206)

Co-authored-by: Christian Heimes <christian at python.org>

files:
M Tools/wasm/README.md

diff --git a/Tools/wasm/README.md b/Tools/wasm/README.md
index 40f23a396f671..b9d773b226959 100644
--- a/Tools/wasm/README.md
+++ b/Tools/wasm/README.md
@@ -23,16 +23,20 @@ to a repository checkout.
 Christian Heimes maintains a container image with Emscripten SDK, Python
 build dependencies, WASI-SDK, wasmtime, and several additional tools.
 
+From within your local CPython repo clone, run one of the following commands:
+
 ```
 # Fedora, RHEL, CentOS
-podman run --rm -ti -v $(pwd):/python-wasm/cpython:Z quay.io/tiran/cpythonbuild:emsdk3
+podman run --rm -ti -v $(pwd):/python-wasm/cpython:Z -w /python-wasm/cpython quay.io/tiran/cpythonbuild:emsdk3
 
 # other
-docker run --rm -ti -v $(pwd):/python-wasm/cpython quay.io/tiran/cpythonbuild:emsdk3
+docker run --rm -ti -v $(pwd):/python-wasm/cpython -w /python-wasm/cpython quay.io/tiran/cpythonbuild:emsdk3
 ```
 
 ### Compile a build Python interpreter
 
+From within the container, run the following commands:
+
 ```shell
 mkdir -p builddir/build
 pushd builddir/build


From webhook-mailer at python.org  Mon Jul 25 05:53:02 2022
From: webhook-mailer at python.org (miss-islington)
Date: Mon, 25 Jul 2022 09:53:02 -0000
Subject: [Python-checkins] gh-95205: Improve wasm README (GH-95206)
Message-ID: <mailman.228.1658742783.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/df95ad3d721f90bd1339fa12353d9b633ad9d27e
commit: df95ad3d721f90bd1339fa12353d9b633ad9d27e
branch: 3.11
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-25T02:52:47-07:00
summary:

gh-95205: Improve wasm README (GH-95206)


Co-authored-by: Christian Heimes <christian at python.org>
(cherry picked from commit 310f94871a923f6cf3dc9259e732ce2376578b26)

Co-authored-by: Erlend Egeberg Aasland <erlend.aasland at innova.no>

files:
M Tools/wasm/README.md

diff --git a/Tools/wasm/README.md b/Tools/wasm/README.md
index 40f23a396f671..b9d773b226959 100644
--- a/Tools/wasm/README.md
+++ b/Tools/wasm/README.md
@@ -23,16 +23,20 @@ to a repository checkout.
 Christian Heimes maintains a container image with Emscripten SDK, Python
 build dependencies, WASI-SDK, wasmtime, and several additional tools.
 
+From within your local CPython repo clone, run one of the following commands:
+
 ```
 # Fedora, RHEL, CentOS
-podman run --rm -ti -v $(pwd):/python-wasm/cpython:Z quay.io/tiran/cpythonbuild:emsdk3
+podman run --rm -ti -v $(pwd):/python-wasm/cpython:Z -w /python-wasm/cpython quay.io/tiran/cpythonbuild:emsdk3
 
 # other
-docker run --rm -ti -v $(pwd):/python-wasm/cpython quay.io/tiran/cpythonbuild:emsdk3
+docker run --rm -ti -v $(pwd):/python-wasm/cpython -w /python-wasm/cpython quay.io/tiran/cpythonbuild:emsdk3
 ```
 
 ### Compile a build Python interpreter
 
+From within the container, run the following commands:
+
 ```shell
 mkdir -p builddir/build
 pushd builddir/build


From webhook-mailer at python.org  Mon Jul 25 05:54:50 2022
From: webhook-mailer at python.org (corona10)
Date: Mon, 25 Jul 2022 09:54:50 -0000
Subject: [Python-checkins] gh-95233: Correct grp.getgrgid parameter name in
 documentation (gid -> id) (gh-95232)
Message-ID: <mailman.229.1658742891.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/df7c8b95372169fb9d23140d35f91970ba32189d
commit: df7c8b95372169fb9d23140d35f91970ba32189d
branch: main
author: Adam Dangoor <adamdangoor at gmail.com>
committer: corona10 <donghee.na92 at gmail.com>
date: 2022-07-25T18:54:42+09:00
summary:

gh-95233: Correct grp.getgrgid parameter name in documentation (gid -> id) (gh-95232)

files:
M Doc/library/grp.rst

diff --git a/Doc/library/grp.rst b/Doc/library/grp.rst
index fbfb922d3e052..baa31752a2c75 100644
--- a/Doc/library/grp.rst
+++ b/Doc/library/grp.rst
@@ -38,7 +38,7 @@ accessible via :func:`getgrnam` or :func:`getgrgid`.)
 It defines the following items:
 
 
-.. function:: getgrgid(gid)
+.. function:: getgrgid(id)
 
    Return the group database entry for the given numeric group ID. :exc:`KeyError`
    is raised if the entry asked for cannot be found.


From webhook-mailer at python.org  Mon Jul 25 06:20:14 2022
From: webhook-mailer at python.org (tiran)
Date: Mon, 25 Jul 2022 10:20:14 -0000
Subject: [Python-checkins] gh-85454: Remove links from historical mentions
 of distutils (GH-95192)
Message-ID: <mailman.230.1658744415.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/d58be48369186590d4dfa204bf6b4c432b665281
commit: d58be48369186590d4dfa204bf6b4c432b665281
branch: main
author: Oleg Iarygin <oleg at arhadthedev.net>
committer: tiran <christian at python.org>
date: 2022-07-25T12:20:09+02:00
summary:

gh-85454: Remove links from historical mentions of distutils (GH-95192)

files:
M Doc/distributing/index.rst
M Doc/whatsnew/2.0.rst
M Doc/whatsnew/3.2.rst
M Doc/whatsnew/3.5.rst
M Doc/whatsnew/3.6.rst
M Doc/whatsnew/3.7.rst
M Misc/NEWS.d/3.10.0a1.rst
M Misc/NEWS.d/3.10.0b1.rst
M Misc/NEWS.d/3.11.0a1.rst
M Misc/NEWS.d/3.8.0a1.rst
M Misc/NEWS.d/3.8.0a4.rst
M Misc/NEWS.d/3.9.0a5.rst
M Misc/NEWS.d/next/Build/2022-06-28-09-42-10.gh-issue-93939._VWxKW.rst

diff --git a/Doc/distributing/index.rst b/Doc/distributing/index.rst
index 136cf4e77b154..2ae2726d4e4b9 100644
--- a/Doc/distributing/index.rst
+++ b/Doc/distributing/index.rst
@@ -41,21 +41,21 @@ Key terms
   file format standards. They maintain a variety of tools, documentation
   and issue trackers on both `GitHub <https://github.com/pypa>`__ and
   `Bitbucket <https://bitbucket.org/pypa/>`__.
-* :mod:`distutils` is the original build and distribution system first added
-  to the Python standard library in 1998. While direct use of :mod:`distutils`
+* ``distutils`` is the original build and distribution system first added
+  to the Python standard library in 1998. While direct use of ``distutils``
   is being phased out, it still laid the foundation for the current packaging
   and distribution infrastructure, and it not only remains part of the
   standard library, but its name lives on in other ways (such as the name
   of the mailing list used to coordinate Python packaging standards
   development).
-* `setuptools`_ is a (largely) drop-in replacement for :mod:`distutils` first
+* `setuptools`_ is a (largely) drop-in replacement for ``distutils`` first
   published in 2004. Its most notable addition over the unmodified
-  :mod:`distutils` tools was the ability to declare dependencies on other
+  ``distutils`` tools was the ability to declare dependencies on other
   packages. It is currently recommended as a more regularly updated
-  alternative to :mod:`distutils` that offers consistent support for more
+  alternative to ``distutils`` that offers consistent support for more
   recent packaging standards across a wide range of Python versions.
 * `wheel`_ (in this context) is a project that adds the ``bdist_wheel``
-  command to :mod:`distutils`/`setuptools`_. This produces a cross platform
+  command to ``distutils``/`setuptools`_. This produces a cross platform
   binary packaging format (called "wheels" or "wheel files" and defined in
   :pep:`427`) that allows Python libraries, even those including binary
   extensions, to be installed on a system without needing to be built
diff --git a/Doc/whatsnew/2.0.rst b/Doc/whatsnew/2.0.rst
index 24fc39be6161c..9b28dbc190337 100644
--- a/Doc/whatsnew/2.0.rst
+++ b/Doc/whatsnew/2.0.rst
@@ -820,7 +820,7 @@ packages, which made administering a Python installation something of  a chore.
 
 The SIG for distribution utilities, shepherded by Greg Ward, has created the
 Distutils, a system to make package installation much easier.  They form the
-:mod:`distutils` package, a new part of Python's standard library. In the best
+``distutils`` package, a new part of Python's standard library. In the best
 case, installing a Python module from source will require the same steps: first
 you simply mean unpack the tarball or zip archive, and the run "``python
 setup.py install``".  The platform will be automatically detected, the compiler
diff --git a/Doc/whatsnew/3.2.rst b/Doc/whatsnew/3.2.rst
index 9dd849f9e9e72..31f2ea85ffd23 100644
--- a/Doc/whatsnew/3.2.rst
+++ b/Doc/whatsnew/3.2.rst
@@ -2056,7 +2056,7 @@ information:
   such as "3.2".
 
 It also provides access to the paths and variables corresponding to one of
-seven named schemes used by :mod:`distutils`.  Those include *posix_prefix*,
+seven named schemes used by ``distutils``.  Those include *posix_prefix*,
 *posix_home*, *posix_user*, *nt*, *nt_user*, *os2*, *os2_home*:
 
 * :func:`~sysconfig.get_paths` makes a dictionary containing installation paths
diff --git a/Doc/whatsnew/3.5.rst b/Doc/whatsnew/3.5.rst
index 1defee4090f28..537007b42fc6b 100644
--- a/Doc/whatsnew/3.5.rst
+++ b/Doc/whatsnew/3.5.rst
@@ -1079,7 +1079,7 @@ Both the ``build`` and ``build_ext`` commands now accept a ``-j`` option to
 enable parallel building of extension modules.
 (Contributed by Antoine Pitrou in :issue:`5309`.)
 
-The :mod:`distutils` module now supports ``xz`` compression, and can be
+The ``distutils`` module now supports ``xz`` compression, and can be
 enabled by passing ``xztar`` as an argument to ``bdist --format``.
 (Contributed by Serhiy Storchaka in :issue:`16314`.)
 
diff --git a/Doc/whatsnew/3.6.rst b/Doc/whatsnew/3.6.rst
index e54475fd83c97..a587086ea7763 100644
--- a/Doc/whatsnew/3.6.rst
+++ b/Doc/whatsnew/3.6.rst
@@ -1012,7 +1012,7 @@ distutils
 ---------
 
 The ``default_format`` attribute has been removed from
-:class:`distutils.command.sdist.sdist` and the ``formats``
+``distutils.command.sdist.sdist`` and the ``formats``
 attribute defaults to ``['gztar']``. Although not anticipated,
 any code relying on the presence of ``default_format`` may
 need to be adapted. See :issue:`27819` for more details.
@@ -1986,7 +1986,7 @@ distutils
 ~~~~~~~~~
 
 The undocumented ``extra_path`` argument to the
-:class:`~distutils.Distribution` constructor is now considered deprecated
+``distutils.Distribution`` constructor is now considered deprecated
 and will raise a warning if set.   Support for this parameter will be
 removed in a future Python release.  See :issue:`27919` for details.
 
@@ -2243,7 +2243,7 @@ Changes in the Python API
   accepting additional keyword arguments will need to adjust their calls to
   :meth:`type.__new__` (whether direct or via :class:`super`) accordingly.
 
-* In :class:`distutils.command.sdist.sdist`, the ``default_format``
+* In ``distutils.command.sdist.sdist``, the ``default_format``
   attribute has been removed and is no longer honored. Instead, the
   gzipped tarfile format is the default on all platforms and no
   platform-specific selection is made.
diff --git a/Doc/whatsnew/3.7.rst b/Doc/whatsnew/3.7.rst
index 68901fa27eccf..fd99682f3a4fa 100644
--- a/Doc/whatsnew/3.7.rst
+++ b/Doc/whatsnew/3.7.rst
@@ -1906,7 +1906,7 @@ Other CPython Implementation Changes
   variables were defined.  Previously, the order was undefined.
   (Contributed by Raymond Hettinger in :issue:`32690`.)
 
-* The :mod:`distutils` ``upload`` command no longer tries to change CR
+* The ``distutils`` ``upload`` command no longer tries to change CR
   end-of-line characters to CRLF.  This fixes a corruption issue with sdists
   that ended with a byte equivalent to CR.
   (Contributed by Bo Bayles in :issue:`32304`.)
@@ -2181,7 +2181,7 @@ The following features and APIs have been removed from Python 3.7:
   :func:`ssl.wrap_socket` or :class:`ssl.SSLContext`.
   (Contributed by Christian Heimes in :issue:`32951`.)
 
-* The unused :mod:`distutils` ``install_misc`` command has been removed.
+* The unused ``distutils`` ``install_misc`` command has been removed.
   (Contributed by Eric N. Vander Weele in :issue:`29218`.)
 
 
diff --git a/Misc/NEWS.d/3.10.0a1.rst b/Misc/NEWS.d/3.10.0a1.rst
index 1c1c2d54e8c20..471811662644b 100644
--- a/Misc/NEWS.d/3.10.0a1.rst
+++ b/Misc/NEWS.d/3.10.0a1.rst
@@ -2204,7 +2204,7 @@ Handle cases where the ``end_lineno`` is ``None`` on
 .. nonce: zwl5Hc
 .. section: Library
 
-:mod:`distutils` upload creates SHA2-256 and Blake2b-256 digests. MD5
+``distutils`` upload creates SHA2-256 and Blake2b-256 digests. MD5
 digests is skipped if platform blocks MD5.
 
 ..
diff --git a/Misc/NEWS.d/3.10.0b1.rst b/Misc/NEWS.d/3.10.0b1.rst
index 2a3d358edde90..f29fc6632db26 100644
--- a/Misc/NEWS.d/3.10.0b1.rst
+++ b/Misc/NEWS.d/3.10.0b1.rst
@@ -1142,7 +1142,7 @@ name>`` instead of ``SQL logic error``. Patch by Erlend E. Aasland.
 .. nonce: GK9a0l
 .. section: Library
 
-Install schemes in :mod:`distutils.command.install` are now loaded from
+Install schemes in ``distutils.command.install`` are now loaded from
 :mod:`sysconfig`.
 
 ..
@@ -1152,7 +1152,7 @@ Install schemes in :mod:`distutils.command.install` are now loaded from
 .. nonce: SenEje
 .. section: Library
 
-:mod:`distutils.sysconfig` has been merged to :mod:`sysconfig`.
+``distutils.sysconfig`` has been merged to :mod:`sysconfig`.
 
 ..
 
diff --git a/Misc/NEWS.d/3.11.0a1.rst b/Misc/NEWS.d/3.11.0a1.rst
index 33841d9e4e39b..7670e482ede5b 100644
--- a/Misc/NEWS.d/3.11.0a1.rst
+++ b/Misc/NEWS.d/3.11.0a1.rst
@@ -1445,7 +1445,7 @@ asynchronous.
 .. nonce: NOwcDJ
 .. section: Library
 
-Fix clang rpath issue in :mod:`distutils`. The UnixCCompiler now uses
+Fix clang rpath issue in ``distutils``. The UnixCCompiler now uses
 correct clang option to add a runtime library directory (rpath) to a shared
 library.
 
@@ -2798,7 +2798,7 @@ documentation for deprecations.
 .. nonce: rvyf2v
 .. section: Library
 
-Restore back :func:`parse_makefile` in :mod:`distutils.sysconfig` because it
+Restore back :func:`parse_makefile` in ``distutils.sysconfig`` because it
 behaves differently than the similar implementation in :mod:`sysconfig`.
 
 ..
diff --git a/Misc/NEWS.d/3.8.0a1.rst b/Misc/NEWS.d/3.8.0a1.rst
index d95055a59da32..991bbc128670b 100644
--- a/Misc/NEWS.d/3.8.0a1.rst
+++ b/Misc/NEWS.d/3.8.0a1.rst
@@ -17,7 +17,7 @@ malicious or buggy certificate can result into segfault. Vulnerability
 .. section: Security
 
 The :option:`-I` command line option (run Python in isolated mode) is now
-also copied by the :mod:`multiprocessing` and :mod:`distutils` modules when
+also copied by the :mod:`multiprocessing` and ``distutils`` modules when
 spawning child processes. Previously, only :option:`-E` and :option:`-s`
 options (enabled by :option:`-I`) were copied.
 
@@ -2270,7 +2270,7 @@ last release was in 2000. Mac OS 9 last release was in 2001.
 .. nonce: laV_IE
 .. section: Library
 
-:func:`~distutils.utils.check_environ` of :mod:`distutils.utils` now catches
+:func:`~distutils.utils.check_environ` of ``distutils.utils`` now catches
 :exc:`KeyError` on calling :func:`pwd.getpwuid`: don't create the ``HOME``
 environment variable in this case.
 
@@ -3070,7 +3070,7 @@ Add deprecation warning when `loop` is used in methods: `asyncio.sleep`,
 .. nonce: Pr3-iG
 .. section: Library
 
-ZIP files created by :mod:`distutils` will now include entries for
+ZIP files created by ``distutils`` will now include entries for
 directories.
 
 ..
@@ -3720,7 +3720,7 @@ Deprecate passing non-ThreadPoolExecutor instances to
 .. section: Library
 
 Restore ``msilib.Win64`` to preserve backwards compatibility since it's
-already used by :mod:`distutils`' ``bdist_msi`` command.
+already used by ``distutils``' ``bdist_msi`` command.
 
 ..
 
diff --git a/Misc/NEWS.d/3.8.0a4.rst b/Misc/NEWS.d/3.8.0a4.rst
index fc952fa9dcc8e..a21de196aa965 100644
--- a/Misc/NEWS.d/3.8.0a4.rst
+++ b/Misc/NEWS.d/3.8.0a4.rst
@@ -338,7 +338,7 @@ unexpected cache miss.
 .. nonce: MW1TLt
 .. section: Library
 
-Fix :mod:`distutils.sysconfig` if :data:`sys.executable` is ``None`` or an
+Fix ``distutils.sysconfig`` if :data:`sys.executable` is ``None`` or an
 empty string: use :func:`os.getcwd` to initialize ``project_base``.  Fix
 also the distutils build command: don't use :data:`sys.executable` if it is
 ``None`` or an empty string.
@@ -350,7 +350,7 @@ also the distutils build command: don't use :data:`sys.executable` if it is
 .. nonce: Fg4EXb
 .. section: Library
 
-:func:`shutil.which` and :func:`distutils.spawn.find_executable` now use
+:func:`shutil.which` and ``distutils.spawn.find_executable`` now use
 ``os.confstr("CS_PATH")`` if available instead of :data:`os.defpath`, if the
 ``PATH`` environment variable is not set. Moreover, don't use
 ``os.confstr("CS_PATH")`` nor :data:`os.defpath` if the ``PATH`` environment
diff --git a/Misc/NEWS.d/3.9.0a5.rst b/Misc/NEWS.d/3.9.0a5.rst
index 49a118ad7e430..25342d21d8f0b 100644
--- a/Misc/NEWS.d/3.9.0a5.rst
+++ b/Misc/NEWS.d/3.9.0a5.rst
@@ -623,7 +623,7 @@ connections.
 .. nonce: 5a822c
 .. section: Library
 
-Reimplement :func:`distutils.spawn.spawn` function with the
+Reimplement ``distutils.spawn.spawn`` function with the
 :mod:`subprocess` module.
 
 ..
@@ -1022,7 +1022,7 @@ lock-related objects from :mod:`threading`) around 49-day uptime.
 .. nonce: MnHdYl
 .. section: Windows
 
-:mod:`distutils` will no longer statically link :file:`vcruntime140.dll`
+``distutils`` will no longer statically link :file:`vcruntime140.dll`
 when a redistributable version is unavailable. All future releases of
 CPython will include a copy of this DLL to ensure distributed extensions can
 continue to load.
diff --git a/Misc/NEWS.d/next/Build/2022-06-28-09-42-10.gh-issue-93939._VWxKW.rst b/Misc/NEWS.d/next/Build/2022-06-28-09-42-10.gh-issue-93939._VWxKW.rst
index fa1e9e6be5c64..ab873bc839f4e 100644
--- a/Misc/NEWS.d/next/Build/2022-06-28-09-42-10.gh-issue-93939._VWxKW.rst
+++ b/Misc/NEWS.d/next/Build/2022-06-28-09-42-10.gh-issue-93939._VWxKW.rst
@@ -1,2 +1,2 @@
 C extension modules are now built by ``configure`` and ``make``
-instead of :mod:`distutils` and ``setup.py``.
+instead of ``distutils`` and ``setup.py``.


From webhook-mailer at python.org  Mon Jul 25 07:11:46 2022
From: webhook-mailer at python.org (markshannon)
Date: Mon, 25 Jul 2022 11:11:46 -0000
Subject: [Python-checkins] [3.11] GH-94739: Backport GH-94958 to 3.11
 (#94965)
Message-ID: <mailman.231.1658747508.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/e5ff5ec3ffb869ff410311c57aa05ff8fb17956a
commit: e5ff5ec3ffb869ff410311c57aa05ff8fb17956a
branch: 3.11
author: Mark Shannon <mark at hotpy.org>
committer: markshannon <mark at hotpy.org>
date: 2022-07-25T12:11:06+01:00
summary:

[3.11] GH-94739: Backport GH-94958 to 3.11 (#94965)

files:
A Misc/NEWS.d/next/Core and Builtins/2022-07-18-14-19-21.gh-issue-94739.NQJQi7.rst
M Include/internal/pycore_code.h
M Lib/test/test_sys_settrace.py
M Objects/frameobject.c
M Python/ceval.c

diff --git a/Include/internal/pycore_code.h b/Include/internal/pycore_code.h
index 9528c8996a443..3a24a65426985 100644
--- a/Include/internal/pycore_code.h
+++ b/Include/internal/pycore_code.h
@@ -438,6 +438,19 @@ read_obj(uint16_t *p)
     return (PyObject *)val;
 }
 
+/* See Objects/exception_handling_notes.txt for details.
+ */
+static inline unsigned char *
+parse_varint(unsigned char *p, int *result) {
+    int val = p[0] & 63;
+    while (p[0] & 64) {
+        p++;
+        val = (val << 6) | (p[0] & 63);
+    }
+    *result = val;
+    return p+1;
+}
+
 static inline int
 write_varint(uint8_t *ptr, unsigned int val)
 {
diff --git a/Lib/test/test_sys_settrace.py b/Lib/test/test_sys_settrace.py
index d77deae32cd5c..9f1aa81dbcd24 100644
--- a/Lib/test/test_sys_settrace.py
+++ b/Lib/test/test_sys_settrace.py
@@ -1879,7 +1879,7 @@ def test_jump_out_of_block_backwards(output):
             output.append(6)
         output.append(7)
 
-    @async_jump_test(4, 5, [3], (ValueError, 'into'))
+    @async_jump_test(4, 5, [3, 5])
     async def test_jump_out_of_async_for_block_forwards(output):
         for i in [1]:
             async for i in asynciter([1, 2]):
@@ -1921,7 +1921,7 @@ def test_jump_in_nested_finally(output):
                 output.append(8)
             output.append(9)
 
-    @jump_test(6, 7, [2], (ValueError, 'within'))
+    @jump_test(6, 7, [2, 7], (ZeroDivisionError, ''))
     def test_jump_in_nested_finally_2(output):
         try:
             output.append(2)
@@ -1932,7 +1932,7 @@ def test_jump_in_nested_finally_2(output):
             output.append(7)
         output.append(8)
 
-    @jump_test(6, 11, [2], (ValueError, 'within'))
+    @jump_test(6, 11, [2, 11], (ZeroDivisionError, ''))
     def test_jump_in_nested_finally_3(output):
         try:
             output.append(2)
@@ -2043,8 +2043,8 @@ def test_jump_backwards_out_of_try_except_block(output):
             output.append(5)
             raise
 
-    @jump_test(5, 7, [4], (ValueError, 'within'))
-    def test_no_jump_between_except_blocks(output):
+    @jump_test(5, 7, [4, 7, 8])
+    def test_jump_between_except_blocks(output):
         try:
             1/0
         except ZeroDivisionError:
@@ -2054,8 +2054,19 @@ def test_no_jump_between_except_blocks(output):
             output.append(7)
         output.append(8)
 
-    @jump_test(5, 6, [4], (ValueError, 'within'))
-    def test_no_jump_within_except_block(output):
+    @jump_test(5, 7, [4, 7, 8])
+    def test_jump_from_except_to_finally(output):
+        try:
+            1/0
+        except ZeroDivisionError:
+            output.append(4)
+            output.append(5)
+        finally:
+            output.append(7)
+        output.append(8)
+
+    @jump_test(5, 6, [4, 6, 7])
+    def test_jump_within_except_block(output):
         try:
             1/0
         except:
@@ -2290,7 +2301,7 @@ def test_no_jump_backwards_into_for_block(output):
             output.append(2)
         output.append(3)
 
-    @async_jump_test(3, 2, [2, 2], (ValueError, 'within'))
+    @async_jump_test(3, 2, [2, 2], (ValueError, "can't jump into the body of a for loop"))
     async def test_no_jump_backwards_into_async_for_block(output):
         async for i in asynciter([1, 2]):
             output.append(2)
@@ -2355,8 +2366,8 @@ def test_jump_backwards_into_try_except_block(output):
         output.append(6)
 
     # 'except' with a variable creates an implicit finally block
-    @jump_test(5, 7, [4], (ValueError, 'within'))
-    def test_no_jump_between_except_blocks_2(output):
+    @jump_test(5, 7, [4, 7, 8])
+    def test_jump_between_except_blocks_2(output):
         try:
             1/0
         except ZeroDivisionError:
@@ -2392,7 +2403,7 @@ def test_jump_out_of_finally_block(output):
         finally:
             output.append(5)
 
-    @jump_test(1, 5, [], (ValueError, "into an exception"))
+    @jump_test(1, 5, [], (ValueError, "can't jump into an 'except' block as there's no exception"))
     def test_no_jump_into_bare_except_block(output):
         output.append(1)
         try:
@@ -2400,7 +2411,7 @@ def test_no_jump_into_bare_except_block(output):
         except:
             output.append(5)
 
-    @jump_test(1, 5, [], (ValueError, "into an exception"))
+    @jump_test(1, 5, [], (ValueError, "can't jump into an 'except' block as there's no exception"))
     def test_no_jump_into_qualified_except_block(output):
         output.append(1)
         try:
@@ -2408,7 +2419,7 @@ def test_no_jump_into_qualified_except_block(output):
         except Exception:
             output.append(5)
 
-    @jump_test(3, 6, [2, 5, 6], (ValueError, "into an exception"))
+    @jump_test(3, 6, [2, 5, 6], (ValueError, "can't jump into an 'except' block as there's no exception"))
     def test_no_jump_into_bare_except_block_from_try_block(output):
         try:
             output.append(2)
@@ -2419,7 +2430,7 @@ def test_no_jump_into_bare_except_block_from_try_block(output):
             raise
         output.append(8)
 
-    @jump_test(3, 6, [2], (ValueError, "into an exception"))
+    @jump_test(3, 6, [2], (ValueError, "can't jump into an 'except' block as there's no exception"))
     def test_no_jump_into_qualified_except_block_from_try_block(output):
         try:
             output.append(2)
@@ -2430,8 +2441,8 @@ def test_no_jump_into_qualified_except_block_from_try_block(output):
             raise
         output.append(8)
 
-    @jump_test(7, 1, [1, 3, 6], (ValueError, "within"))
-    def test_no_jump_out_of_bare_except_block(output):
+    @jump_test(7, 1, [1, 3, 6, 1, 3, 6, 7])
+    def test_jump_out_of_bare_except_block(output):
         output.append(1)
         try:
             output.append(3)
@@ -2440,8 +2451,8 @@ def test_no_jump_out_of_bare_except_block(output):
             output.append(6)
             output.append(7)
 
-    @jump_test(7, 1, [1, 3, 6], (ValueError, "within"))
-    def test_no_jump_out_of_qualified_except_block(output):
+    @jump_test(7, 1, [1, 3, 6, 1, 3, 6, 7])
+    def test_jump_out_of_qualified_except_block(output):
         output.append(1)
         try:
             output.append(3)
diff --git a/Misc/NEWS.d/next/Core and Builtins/2022-07-18-14-19-21.gh-issue-94739.NQJQi7.rst b/Misc/NEWS.d/next/Core and Builtins/2022-07-18-14-19-21.gh-issue-94739.NQJQi7.rst
new file mode 100644
index 0000000000000..7476892c423b1
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2022-07-18-14-19-21.gh-issue-94739.NQJQi7.rst	
@@ -0,0 +1 @@
+Allow jumping within, out of, and across exception handlers in the debugger.
diff --git a/Objects/frameobject.c b/Objects/frameobject.c
index 47e108b9ae79b..1ddfec2fb08ab 100644
--- a/Objects/frameobject.c
+++ b/Objects/frameobject.c
@@ -138,6 +138,7 @@ typedef enum kind {
     Except = 2,
     Object = 3,
     Null = 4,
+    Lasti = 5,
 } Kind;
 
 static int
@@ -162,6 +163,8 @@ compatible_kind(Kind from, Kind to) {
 #define MAX_STACK_ENTRIES (63/BITS_PER_BLOCK)
 #define WILL_OVERFLOW (1ULL<<((MAX_STACK_ENTRIES-1)*BITS_PER_BLOCK))
 
+#define EMPTY_STACK 0
+
 static inline int64_t
 push_value(int64_t stack, Kind kind)
 {
@@ -179,12 +182,97 @@ pop_value(int64_t stack)
     return Py_ARITHMETIC_RIGHT_SHIFT(int64_t, stack, BITS_PER_BLOCK);
 }
 
+#define MASK ((1<<BITS_PER_BLOCK)-1)
+
 static inline Kind
 top_of_stack(int64_t stack)
 {
-    return stack & ((1<<BITS_PER_BLOCK)-1);
+    return stack & MASK;
+}
+
+static inline Kind
+peek(int64_t stack, int n)
+{
+    assert(n >= 1);
+    return (stack>>(BITS_PER_BLOCK*(n-1))) & MASK;
+}
+
+static Kind
+stack_swap(int64_t stack, int n)
+{
+    assert(n >= 1);
+    Kind to_swap = peek(stack, n);
+    Kind top = top_of_stack(stack);
+    int shift = BITS_PER_BLOCK*(n-1);
+    int64_t replaced_low = (stack & ~(MASK << shift)) | (top << shift);
+    int64_t replaced_top = (replaced_low & ~MASK) | to_swap;
+    return replaced_top;
+}
+
+static int64_t
+pop_to_level(int64_t stack, int level) {
+    if (level == 0) {
+        return EMPTY_STACK;
+    }
+    int64_t max_item = (1<<BITS_PER_BLOCK) - 1;
+    int64_t level_max_stack = max_item << ((level-1) * BITS_PER_BLOCK);
+    while (stack > level_max_stack) {
+        stack = pop_value(stack);
+    }
+    return stack;
+}
+
+#if 0
+/* These functions are useful for debugging the stack marking code */
+
+static char
+tos_char(int64_t stack) {
+    switch(top_of_stack(stack)) {
+        case Iterator:
+            return 'I';
+        case Except:
+            return 'E';
+        case Object:
+            return 'O';
+        case Lasti:
+            return 'L';
+        case Null:
+            return 'N';
+    }
+    return '?';
 }
 
+static void
+print_stack(int64_t stack) {
+    if (stack < 0) {
+        if (stack == UNINITIALIZED) {
+            printf("---");
+        }
+        else if (stack == OVERFLOWED) {
+            printf("OVERFLOWED");
+        }
+        else {
+            printf("??");
+        }
+        return;
+    }
+    while (stack) {
+        printf("%c", tos_char(stack));
+        stack = pop_value(stack);
+    }
+}
+
+static void
+print_stacks(int64_t *stacks, int n) {
+    for (int i = 0; i < n; i++) {
+        printf("%d: ", i);
+        print_stack(stacks[i]);
+        printf("\n");
+    }
+}
+
+#endif
+
 static int64_t *
 mark_stacks(PyCodeObject *code_obj, int len)
 {
@@ -204,7 +292,7 @@ mark_stacks(PyCodeObject *code_obj, int len)
     for (int i = 1; i <= len; i++) {
         stacks[i] = UNINITIALIZED;
     }
-    stacks[0] = 0;
+    stacks[0] = EMPTY_STACK;
     if (code_obj->co_flags & (CO_GENERATOR | CO_COROUTINE | CO_ASYNC_GENERATOR))
     {
         // Generators get sent None while starting:
@@ -213,6 +301,7 @@ mark_stacks(PyCodeObject *code_obj, int len)
     int todo = 1;
     while (todo) {
         todo = 0;
+        /* Scan instructions */
         for (i = 0; i < len; i++) {
             int64_t next_stack = stacks[i];
             if (next_stack == UNINITIALIZED) {
@@ -300,23 +389,26 @@ mark_stacks(PyCodeObject *code_obj, int len)
                     break;
                 }
                 case END_ASYNC_FOR:
-                    next_stack = pop_value(pop_value(pop_value(next_stack)));
+                    next_stack = pop_value(pop_value(next_stack));
                     stacks[i+1] = next_stack;
                     break;
                 case PUSH_EXC_INFO:
+                    next_stack = push_value(next_stack, Except);
+                    stacks[i+1] = next_stack;
+                    break;
                 case POP_EXCEPT:
-                    /* These instructions only appear in exception handlers, which
-                     * skip this switch ever since the move to zero-cost exceptions
-                     * (their stack remains UNINITIALIZED because nothing sets it).
-                     *
-                     * Note that explain_incompatible_stack interprets an
-                     * UNINITIALIZED stack as belonging to an exception handler.
-                     */
-                    Py_UNREACHABLE();
+                    assert(top_of_stack(next_stack) == Except);
+                    next_stack = pop_value(next_stack);
+                    stacks[i+1] = next_stack;
                     break;
                 case RETURN_VALUE:
+                    assert(pop_value(next_stack) == EMPTY_STACK);
+                    assert(top_of_stack(next_stack) == Object);
+                    break;
                 case RAISE_VARARGS:
+                    break;
                 case RERAISE:
+                    assert(top_of_stack(next_stack) == Except);
                     /* End of block */
                     break;
                 case PUSH_NULL:
@@ -331,11 +423,33 @@ mark_stacks(PyCodeObject *code_obj, int len)
                     stacks[i+1] = next_stack;
                     break;
                 case LOAD_METHOD:
+                    assert(top_of_stack(next_stack) == Object);
                     next_stack = pop_value(next_stack);
                     next_stack = push_value(next_stack, Null);
                     next_stack = push_value(next_stack, Object);
                     stacks[i+1] = next_stack;
                     break;
+                case CALL:
+                {
+                    next_stack = pop_value(pop_value(next_stack));
+                    next_stack = push_value(next_stack, Object);
+                    stacks[i+1] = next_stack;
+                    break;
+                }
+                case SWAP:
+                {
+                    int n = get_arg(code, i);
+                    next_stack = stack_swap(next_stack, n);
+                    stacks[i+1] = next_stack;
+                    break;
+                }
+                case COPY:
+                {
+                    int n = get_arg(code, i);
+                    next_stack = push_value(next_stack, peek(next_stack, n));
+                    stacks[i+1] = next_stack;
+                    break;
+                }
                 default:
                 {
                     int delta = PyCompile_OpcodeStackEffect(opcode, get_arg(code, i));
@@ -352,6 +466,34 @@ mark_stacks(PyCodeObject *code_obj, int len)
                 }
             }
         }
+        /* Scan exception table */
+        unsigned char *start = (unsigned char *)PyBytes_AS_STRING(code_obj->co_exceptiontable);
+        unsigned char *end = start + PyBytes_GET_SIZE(code_obj->co_exceptiontable);
+        unsigned char *scan = start;
+        while (scan < end) {
+            int start_offset, size, handler;
+            scan = parse_varint(scan, &start_offset);
+            assert(start_offset >= 0 && start_offset < len);
+            scan = parse_varint(scan, &size);
+            assert(size >= 0 && start_offset+size <= len);
+            scan = parse_varint(scan, &handler);
+            assert(handler >= 0 && handler < len);
+            int depth_and_lasti;
+            scan = parse_varint(scan, &depth_and_lasti);
+            int level = depth_and_lasti >> 1;
+            int lasti = depth_and_lasti & 1;
+            if (stacks[start_offset] != UNINITIALIZED) {
+                if (stacks[handler] == UNINITIALIZED) {
+                    todo = 1;
+                    uint64_t target_stack = pop_to_level(stacks[start_offset], level);
+                    if (lasti) {
+                        target_stack = push_value(target_stack, Lasti);
+                    }
+                    target_stack = push_value(target_stack, Except);
+                    stacks[handler] = target_stack;
+                }
+            }
+        }
     }
     Py_DECREF(co_code);
     return stacks;
@@ -392,6 +534,8 @@ explain_incompatible_stack(int64_t to_stack)
     switch(target_kind) {
         case Except:
             return "can't jump into an 'except' block as there's no exception";
+        case Lasti:
+            return "can't jump into a re-raising block as there's no location";
         case Object:
         case Null:
             return "incompatible stacks";
@@ -443,13 +587,6 @@ first_line_not_before(int *lines, int len, int line)
     return result;
 }
 
-static void
-frame_stack_pop(PyFrameObject *f)
-{
-    PyObject *v = _PyFrame_StackPop(f->f_frame);
-    Py_XDECREF(v);
-}
-
 static PyFrameState
 _PyFrame_GetState(PyFrameObject *frame)
 {
@@ -617,7 +754,7 @@ frame_setlineno(PyFrameObject *f, PyObject* p_new_lineno, void *Py_UNUSED(ignore
                     msg = "stack to deep to analyze";
                 }
                 else if (start_stack == UNINITIALIZED) {
-                    msg = "can't jump from within an exception handler";
+                    msg = "can't jump from unreachable code";
                 }
                 else {
                     msg = explain_incompatible_stack(target_stack);
@@ -637,7 +774,20 @@ frame_setlineno(PyFrameObject *f, PyObject* p_new_lineno, void *Py_UNUSED(ignore
         start_stack = pop_value(start_stack);
     }
     while (start_stack > best_stack) {
-        frame_stack_pop(f);
+        if (top_of_stack(start_stack) == Except) {
+            /* Pop exception stack as well as the evaluation stack */
+            PyThreadState *tstate = _PyThreadState_GET();
+            _PyErr_StackItem *exc_info = tstate->exc_info;
+            PyObject *value = exc_info->exc_value;
+            PyObject *exc = _PyFrame_StackPop(f->f_frame);
+            assert(PyExceptionInstance_Check(exc) || exc == Py_None);
+            exc_info->exc_value = exc;
+            Py_XDECREF(value);
+        }
+        else {
+            PyObject *v = _PyFrame_StackPop(f->f_frame);
+            Py_XDECREF(v);
+        }
         start_stack = pop_value(start_stack);
     }
     /* Finally set the new lasti and return OK. */
diff --git a/Python/ceval.c b/Python/ceval.c
index d40bf275a17da..31cdb554279e3 100644
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -6056,20 +6056,6 @@ positional_only_passed_as_keyword(PyThreadState *tstate, PyCodeObject *co,
 
 }
 
-/* Exception table parsing code.
- * See Objects/exception_table_notes.txt for details.
- */
-
-static inline unsigned char *
-parse_varint(unsigned char *p, int *result) {
-    int val = p[0] & 63;
-    while (p[0] & 64) {
-        p++;
-        val = (val << 6) | (p[0] & 63);
-    }
-    *result = val;
-    return p+1;
-}
 
 static inline unsigned char *
 scan_back_to_entry_start(unsigned char *p) {


From webhook-mailer at python.org  Mon Jul 25 09:50:57 2022
From: webhook-mailer at python.org (ambv)
Date: Mon, 25 Jul 2022 13:50:57 -0000
Subject: [Python-checkins] gh-85454: Remove distutils documentation (#95239)
Message-ID: <mailman.232.1658757058.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/a566912049722386478c075b83534fa9f7a1de45
commit: a566912049722386478c075b83534fa9f7a1de45
branch: main
author: Christian Heimes <christian at python.org>
committer: ambv <lukasz at langa.pl>
date: 2022-07-25T15:50:46+02:00
summary:

gh-85454: Remove distutils documentation (#95239)

Most places now refer to setuptools or link to setuptools documentation.
Some examples like zipapp need to be updated later.

files:
D Doc/distutils/_setuptools_disclaimer.rst
D Doc/distutils/apiref.rst
D Doc/distutils/builtdist.rst
D Doc/distutils/commandref.rst
D Doc/distutils/configfile.rst
D Doc/distutils/examples.rst
D Doc/distutils/extending.rst
D Doc/distutils/index.rst
D Doc/distutils/introduction.rst
D Doc/distutils/packageindex.rst
D Doc/distutils/setupscript.rst
D Doc/distutils/sourcedist.rst
D Doc/distutils/uploading.rst
D Doc/library/distutils.rst
M Doc/contents.rst
M Doc/extending/building.rst
M Doc/extending/windows.rst
M Doc/install/index.rst
M Doc/library/distribution.rst
M Doc/library/sysconfig.rst
M Doc/library/venv.rst
M Doc/using/configure.rst
M Doc/using/windows.rst
M Doc/whatsnew/2.7.rst
M Doc/whatsnew/3.4.rst

diff --git a/Doc/contents.rst b/Doc/contents.rst
index 8690de77bf3d8..464f93bdf85f9 100644
--- a/Doc/contents.rst
+++ b/Doc/contents.rst
@@ -27,5 +27,4 @@
 .. toctree::
    :hidden:
 
-   distutils/index.rst
    install/index.rst
diff --git a/Doc/distutils/_setuptools_disclaimer.rst b/Doc/distutils/_setuptools_disclaimer.rst
deleted file mode 100644
index cc75858326d44..0000000000000
--- a/Doc/distutils/_setuptools_disclaimer.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-.. note::
-
-   This document is being retained solely until the ``setuptools`` documentation
-   at https://setuptools.readthedocs.io/en/latest/setuptools.html
-   independently covers all of the relevant information currently included here.
diff --git a/Doc/distutils/apiref.rst b/Doc/distutils/apiref.rst
deleted file mode 100644
index 87c928555554a..0000000000000
--- a/Doc/distutils/apiref.rst
+++ /dev/null
@@ -1,2041 +0,0 @@
-.. _api-reference:
-
-*************
-API Reference
-*************
-
-.. seealso::
-
-   `New and changed setup.py arguments in setuptools`_
-      The ``setuptools`` project adds new capabilities to the ``setup`` function
-      and other APIs, makes the API consistent across different Python versions,
-      and is hence recommended over using ``distutils`` directly.
-
-.. _New and changed setup.py arguments in setuptools: https://web.archive.org/web/20210614192516/https://setuptools.pypa.io/en/stable/userguide/keywords.html
-
-.. include:: ./_setuptools_disclaimer.rst
-
-:mod:`distutils.core` --- Core Distutils functionality
-======================================================
-
-.. module:: distutils.core
-   :synopsis: The core Distutils functionality
-
-
-The :mod:`distutils.core` module is the only module that needs to be installed
-to use the Distutils. It provides the :func:`setup` (which is called from the
-setup script). Indirectly provides the  :class:`distutils.dist.Distribution` and
-:class:`distutils.cmd.Command` class.
-
-
-.. function:: setup(arguments)
-
-   The basic do-everything function that does most everything you could ever ask
-   for from a Distutils method.
-
-   The setup function takes a large number of arguments. These are laid out in the
-   following table.
-
-   .. tabularcolumns:: |l|L|L|
-
-   +--------------------+--------------------------------+-------------------------------------------------------------+
-   | argument name      | value                          | type                                                        |
-   +====================+================================+=============================================================+
-   | *name*             | The name of the package        | a string                                                    |
-   +--------------------+--------------------------------+-------------------------------------------------------------+
-   | *version*          | The version number of the      | a string                                                    |
-   |                    | package; see                   |                                                             |
-   |                    | :mod:`distutils.version`       |                                                             |
-   +--------------------+--------------------------------+-------------------------------------------------------------+
-   | *description*      | A single line describing the   | a string                                                    |
-   |                    | package                        |                                                             |
-   +--------------------+--------------------------------+-------------------------------------------------------------+
-   | *long_description* | Longer description of the      | a string                                                    |
-   |                    | package                        |                                                             |
-   +--------------------+--------------------------------+-------------------------------------------------------------+
-   | *author*           | The name of the package author | a string                                                    |
-   +--------------------+--------------------------------+-------------------------------------------------------------+
-   | *author_email*     | The email address of the       | a string                                                    |
-   |                    | package author                 |                                                             |
-   +--------------------+--------------------------------+-------------------------------------------------------------+
-   | *maintainer*       | The name of the current        | a string                                                    |
-   |                    | maintainer, if different from  |                                                             |
-   |                    | the author. Note that if       |                                                             |
-   |                    | the maintainer is provided,    |                                                             |
-   |                    | distutils will use it as the   |                                                             |
-   |                    | author in :file:`PKG-INFO`     |                                                             |
-   +--------------------+--------------------------------+-------------------------------------------------------------+
-   | *maintainer_email* | The email address of the       | a string                                                    |
-   |                    | current maintainer, if         |                                                             |
-   |                    | different from the author      |                                                             |
-   +--------------------+--------------------------------+-------------------------------------------------------------+
-   | *url*              | A URL for the package          | a string                                                    |
-   |                    | (homepage)                     |                                                             |
-   +--------------------+--------------------------------+-------------------------------------------------------------+
-   | *download_url*     | A URL to download the package  | a string                                                    |
-   +--------------------+--------------------------------+-------------------------------------------------------------+
-   | *packages*         | A list of Python packages that | a list of strings                                           |
-   |                    | distutils will manipulate      |                                                             |
-   +--------------------+--------------------------------+-------------------------------------------------------------+
-   | *py_modules*       | A list of Python modules that  | a list of strings                                           |
-   |                    | distutils will manipulate      |                                                             |
-   +--------------------+--------------------------------+-------------------------------------------------------------+
-   | *scripts*          | A list of standalone script    | a list of strings                                           |
-   |                    | files to be built and          |                                                             |
-   |                    | installed                      |                                                             |
-   +--------------------+--------------------------------+-------------------------------------------------------------+
-   | *ext_modules*      | A list of Python extensions to | a list of instances of                                      |
-   |                    | be built                       | :class:`distutils.core.Extension`                           |
-   +--------------------+--------------------------------+-------------------------------------------------------------+
-   | *classifiers*      | A list of categories for the   | a list of strings; valid classifiers are listed on `PyPI    |
-   |                    | package                        | <https://pypi.org/classifiers>`_.                           |
-   +--------------------+--------------------------------+-------------------------------------------------------------+
-   | *distclass*        | the :class:`Distribution`      | a subclass of                                               |
-   |                    | class to use                   | :class:`distutils.core.Distribution`                        |
-   +--------------------+--------------------------------+-------------------------------------------------------------+
-   | *script_name*      | The name of the setup.py       | a string                                                    |
-   |                    | script - defaults to           |                                                             |
-   |                    | ``sys.argv[0]``                |                                                             |
-   +--------------------+--------------------------------+-------------------------------------------------------------+
-   | *script_args*      | Arguments to supply to the     | a list of strings                                           |
-   |                    | setup script                   |                                                             |
-   +--------------------+--------------------------------+-------------------------------------------------------------+
-   | *options*          | default options for the setup  | a dictionary                                                |
-   |                    | script                         |                                                             |
-   +--------------------+--------------------------------+-------------------------------------------------------------+
-   | *license*          | The license for the package    | a string                                                    |
-   +--------------------+--------------------------------+-------------------------------------------------------------+
-   | *keywords*         | Descriptive meta-data, see     | a list of strings or a comma-separated string               |
-   |                    | :pep:`314`                     |                                                             |
-   +--------------------+--------------------------------+-------------------------------------------------------------+
-   | *platforms*        |                                | a list of strings or a comma-separated string               |
-   +--------------------+--------------------------------+-------------------------------------------------------------+
-   | *cmdclass*         | A mapping of command names to  | a dictionary                                                |
-   |                    | :class:`Command` subclasses    |                                                             |
-   +--------------------+--------------------------------+-------------------------------------------------------------+
-   | *data_files*       | A list of data files to        | a list                                                      |
-   |                    | install                        |                                                             |
-   +--------------------+--------------------------------+-------------------------------------------------------------+
-   | *package_dir*      | A mapping of package to        | a dictionary                                                |
-   |                    | directory names                |                                                             |
-   +--------------------+--------------------------------+-------------------------------------------------------------+
-
-
-
-.. function:: run_setup(script_name[, script_args=None, stop_after='run'])
-
-   Run a setup script in a somewhat controlled environment, and return  the
-   :class:`distutils.dist.Distribution` instance that drives things.   This is
-   useful if you need to find out the distribution meta-data  (passed as keyword
-   args from *script* to :func:`setup`), or  the contents of the config files or
-   command-line.
-
-   *script_name* is a file that will be read and run with :func:`exec`.  ``sys.argv[0]``
-   will be replaced with *script* for the duration of the call.  *script_args* is a
-   list of strings; if supplied, ``sys.argv[1:]`` will be replaced by *script_args*
-   for the duration  of the call.
-
-   *stop_after* tells :func:`setup` when to stop processing; possible  values:
-
-   .. tabularcolumns:: |l|L|
-
-   +---------------+---------------------------------------------+
-   | value         | description                                 |
-   +===============+=============================================+
-   | *init*        | Stop after the :class:`Distribution`        |
-   |               | instance has been created  and populated    |
-   |               | with the keyword arguments to :func:`setup` |
-   +---------------+---------------------------------------------+
-   | *config*      | Stop after config files have been parsed    |
-   |               | (and their data stored in the               |
-   |               | :class:`Distribution` instance)             |
-   +---------------+---------------------------------------------+
-   | *commandline* | Stop after the command-line                 |
-   |               | (``sys.argv[1:]`` or  *script_args*) have   |
-   |               | been parsed (and the data stored in the     |
-   |               | :class:`Distribution` instance.)            |
-   +---------------+---------------------------------------------+
-   | *run*         | Stop after all commands have been run (the  |
-   |               | same as  if :func:`setup` had been called   |
-   |               | in the usual way). This is the default      |
-   |               | value.                                      |
-   +---------------+---------------------------------------------+
-
-In addition, the :mod:`distutils.core` module exposed a number of  classes that
-live elsewhere.
-
-* :class:`~distutils.extension.Extension` from :mod:`distutils.extension`
-
-* :class:`~distutils.cmd.Command` from :mod:`distutils.cmd`
-
-* :class:`~distutils.dist.Distribution` from :mod:`distutils.dist`
-
-A short description of each of these follows, but see the relevant module for
-the full reference.
-
-
-.. class:: Extension
-
-   The Extension class describes a single C or C++ extension module in a setup
-   script. It accepts the following keyword arguments in its constructor:
-
-   .. tabularcolumns:: |l|L|l|
-
-   +------------------------+--------------------------------+---------------------------+
-   | argument name          | value                          | type                      |
-   +========================+================================+===========================+
-   | *name*                 | the full name of the           | a string                  |
-   |                        | extension, including any       |                           |
-   |                        | packages --- ie. *not* a       |                           |
-   |                        | filename or pathname, but      |                           |
-   |                        | Python dotted name             |                           |
-   +------------------------+--------------------------------+---------------------------+
-   | *sources*              | list of source filenames,      | a list of strings         |
-   |                        | relative to the distribution   |                           |
-   |                        | root (where the setup script   |                           |
-   |                        | lives), in Unix form           |                           |
-   |                        | (slash-separated) for          |                           |
-   |                        | portability.                   |                           |
-   |                        | Source files may be C, C++,    |                           |
-   |                        | SWIG (.i), platform-specific   |                           |
-   |                        | resource files, or whatever    |                           |
-   |                        | else is recognized by the      |                           |
-   |                        | :command:`build_ext` command   |                           |
-   |                        | as source for a Python         |                           |
-   |                        | extension.                     |                           |
-   +------------------------+--------------------------------+---------------------------+
-   | *include_dirs*         | list of directories to search  | a list of strings         |
-   |                        | for C/C++ header files (in     |                           |
-   |                        | Unix form for portability)     |                           |
-   +------------------------+--------------------------------+---------------------------+
-   | *define_macros*        | list of macros to define; each | a list of tuples          |
-   |                        | macro is defined using a       |                           |
-   |                        | 2-tuple ``(name, value)``,     |                           |
-   |                        | where *value* is               |                           |
-   |                        | either the string to define it |                           |
-   |                        | to or ``None`` to define it    |                           |
-   |                        | without a particular value     |                           |
-   |                        | (equivalent of ``#define FOO`` |                           |
-   |                        | in source or :option:`!-DFOO`  |                           |
-   |                        | on Unix C compiler command     |                           |
-   |                        | line)                          |                           |
-   +------------------------+--------------------------------+---------------------------+
-   | *undef_macros*         | list of macros to undefine     | a list of strings         |
-   |                        | explicitly                     |                           |
-   +------------------------+--------------------------------+---------------------------+
-   | *library_dirs*         | list of directories to search  | a list of strings         |
-   |                        | for C/C++ libraries at link    |                           |
-   |                        | time                           |                           |
-   +------------------------+--------------------------------+---------------------------+
-   | *libraries*            | list of library names (not     | a list of strings         |
-   |                        | filenames or paths) to link    |                           |
-   |                        | against                        |                           |
-   +------------------------+--------------------------------+---------------------------+
-   | *runtime_library_dirs* | list of directories to search  | a list of strings         |
-   |                        | for C/C++ libraries at run     |                           |
-   |                        | time (for shared extensions,   |                           |
-   |                        | this is when the extension is  |                           |
-   |                        | loaded)                        |                           |
-   +------------------------+--------------------------------+---------------------------+
-   | *extra_objects*        | list of extra files to link    | a list of strings         |
-   |                        | with (eg. object files not     |                           |
-   |                        | implied by 'sources', static   |                           |
-   |                        | library that must be           |                           |
-   |                        | explicitly specified, binary   |                           |
-   |                        | resource files, etc.)          |                           |
-   +------------------------+--------------------------------+---------------------------+
-   | *extra_compile_args*   | any extra platform- and        | a list of strings         |
-   |                        | compiler-specific information  |                           |
-   |                        | to use when compiling the      |                           |
-   |                        | source files in 'sources'. For |                           |
-   |                        | platforms and compilers where  |                           |
-   |                        | a command line makes sense,    |                           |
-   |                        | this is typically a list of    |                           |
-   |                        | command-line arguments, but    |                           |
-   |                        | for other platforms it could   |                           |
-   |                        | be anything.                   |                           |
-   +------------------------+--------------------------------+---------------------------+
-   | *extra_link_args*      | any extra platform- and        | a list of strings         |
-   |                        | compiler-specific information  |                           |
-   |                        | to use when linking object     |                           |
-   |                        | files together to create the   |                           |
-   |                        | extension (or to create a new  |                           |
-   |                        | static Python interpreter).    |                           |
-   |                        | Similar interpretation as for  |                           |
-   |                        | 'extra_compile_args'.          |                           |
-   +------------------------+--------------------------------+---------------------------+
-   | *export_symbols*       | list of symbols to be exported | a list of strings         |
-   |                        | from a shared extension. Not   |                           |
-   |                        | used on all platforms, and not |                           |
-   |                        | generally necessary for Python |                           |
-   |                        | extensions, which typically    |                           |
-   |                        | export exactly one symbol:     |                           |
-   |                        | ``init`` + extension_name.     |                           |
-   +------------------------+--------------------------------+---------------------------+
-   | *depends*              | list of files that the         | a list of strings         |
-   |                        | extension depends on           |                           |
-   +------------------------+--------------------------------+---------------------------+
-   | *language*             | extension language (i.e.       | a string                  |
-   |                        | ``'c'``, ``'c++'``,            |                           |
-   |                        | ``'objc'``). Will be detected  |                           |
-   |                        | from the source extensions if  |                           |
-   |                        | not provided.                  |                           |
-   +------------------------+--------------------------------+---------------------------+
-   | *optional*             | specifies that a build failure | a boolean                 |
-   |                        | in the extension should not    |                           |
-   |                        | abort the build process, but   |                           |
-   |                        | simply skip the extension.     |                           |
-   +------------------------+--------------------------------+---------------------------+
-
-   .. versionchanged:: 3.8
-
-      On Unix, C extensions are no longer linked to libpython except on
-      Android and Cygwin.
-
-
-.. class:: Distribution
-
-   A :class:`Distribution` describes how to build, install and package up a Python
-   software package.
-
-   See the :func:`setup` function for a list of keyword arguments accepted  by the
-   Distribution constructor. :func:`setup` creates a Distribution instance.
-
-   .. versionchanged:: 3.7
-      :class:`~distutils.core.Distribution` now warns if ``classifiers``,
-      ``keywords`` and ``platforms`` fields are not specified as a list or
-      a string.
-
-.. class:: Command
-
-   A :class:`Command` class (or rather, an instance of one of its subclasses)
-   implement a single distutils command.
-
-
-:mod:`distutils.ccompiler` --- CCompiler base class
-===================================================
-
-.. module:: distutils.ccompiler
-   :synopsis: Abstract CCompiler class
-
-
-This module provides the abstract base class for the :class:`CCompiler`
-classes.  A :class:`CCompiler` instance can be used for all the compile  and
-link steps needed to build a single project. Methods are provided to  set
-options for the compiler --- macro definitions, include directories,  link path,
-libraries and the like.
-
-This module provides the following functions.
-
-
-.. function:: gen_lib_options(compiler, library_dirs, runtime_library_dirs, libraries)
-
-   Generate linker options for searching library directories and linking with
-   specific libraries.  *libraries* and *library_dirs* are, respectively, lists of
-   library names (not filenames!) and search directories.  Returns a list of
-   command-line options suitable for use with some compiler (depending on the two
-   format strings passed in).
-
-
-.. function:: gen_preprocess_options(macros, include_dirs)
-
-   Generate C pre-processor options (:option:`!-D`, :option:`!-U`, :option:`!-I`) as
-   used by at least two types of compilers: the typical Unix compiler and Visual
-   C++. *macros* is the usual thing, a list of 1- or 2-tuples, where ``(name,)``
-   means undefine (:option:`!-U`) macro *name*, and ``(name, value)`` means define
-   (:option:`!-D`) macro *name* to *value*.  *include_dirs* is just a list of
-   directory names to be added to the header file search path (:option:`!-I`).
-   Returns a list of command-line options suitable for either Unix compilers or
-   Visual C++.
-
-
-.. function:: get_default_compiler(osname, platform)
-
-   Determine the default compiler to use for the given platform.
-
-   *osname* should be one of the standard Python OS names (i.e. the ones returned
-   by ``os.name``) and *platform* the common value returned by ``sys.platform`` for
-   the platform in question.
-
-   The default values are ``os.name`` and ``sys.platform`` in case the parameters
-   are not given.
-
-
-.. function:: new_compiler(plat=None, compiler=None, verbose=0, dry_run=0, force=0)
-
-   Factory function to generate an instance of some CCompiler subclass for the
-   supplied platform/compiler combination. *plat* defaults to ``os.name`` (eg.
-   ``'posix'``, ``'nt'``), and *compiler*  defaults to the default compiler for
-   that platform. Currently only ``'posix'`` and ``'nt'`` are supported, and the
-   default compilers are "traditional Unix interface" (:class:`UnixCCompiler`
-   class) and Visual C++ (:class:`MSVCCompiler` class).  Note that it's perfectly
-   possible to ask for a Unix compiler object under Windows, and a Microsoft
-   compiler object under Unix---if you supply a value for *compiler*, *plat* is
-   ignored.
-
-   .. % Is the posix/nt only thing still true? macOS seems to work, and
-   .. % returns a UnixCCompiler instance. How to document this... hmm.
-
-
-.. function:: show_compilers()
-
-   Print list of available compilers (used by the :option:`!--help-compiler` options
-   to :command:`build`, :command:`build_ext`, :command:`build_clib`).
-
-
-.. class:: CCompiler([verbose=0, dry_run=0, force=0])
-
-   The abstract base class :class:`CCompiler` defines the interface that  must be
-   implemented by real compiler classes.  The class also has  some utility methods
-   used by several compiler classes.
-
-   The basic idea behind a compiler abstraction class is that each instance can be
-   used for all the compile/link steps in building a single project.  Thus,
-   attributes common to all of those compile and link steps --- include
-   directories, macros to define, libraries to link against, etc. --- are
-   attributes of the compiler instance.  To allow for variability in how individual
-   files are treated, most of those attributes may be varied on a per-compilation
-   or per-link basis.
-
-   The constructor for each subclass creates an instance of the Compiler object.
-   Flags are *verbose* (show verbose output), *dry_run* (don't actually execute the
-   steps) and *force* (rebuild everything, regardless of dependencies). All of
-   these flags default to ``0`` (off). Note that you probably don't want to
-   instantiate :class:`CCompiler` or one of its subclasses directly - use the
-   :func:`distutils.CCompiler.new_compiler` factory function instead.
-
-   The following methods allow you to manually alter compiler options for  the
-   instance of the Compiler class.
-
-
-   .. method:: CCompiler.add_include_dir(dir)
-
-      Add *dir* to the list of directories that will be searched for header files.
-      The compiler is instructed to search directories in the order in which they are
-      supplied by successive calls to :meth:`add_include_dir`.
-
-
-   .. method:: CCompiler.set_include_dirs(dirs)
-
-      Set the list of directories that will be searched to *dirs* (a list of strings).
-      Overrides any preceding calls to :meth:`add_include_dir`; subsequent calls to
-      :meth:`add_include_dir` add to the list passed to :meth:`set_include_dirs`.
-      This does not affect any list of standard include directories that the compiler
-      may search by default.
-
-
-   .. method:: CCompiler.add_library(libname)
-
-      Add *libname* to the list of libraries that will be included in all links driven
-      by this compiler object.  Note that *libname* should \*not\* be the name of a
-      file containing a library, but the name of the library itself: the actual
-      filename will be inferred by the linker, the compiler, or the compiler class
-      (depending on the platform).
-
-      The linker will be instructed to link against libraries in the order they were
-      supplied to :meth:`add_library` and/or :meth:`set_libraries`.  It is perfectly
-      valid to duplicate library names; the linker will be instructed to link against
-      libraries as many times as they are mentioned.
-
-
-   .. method:: CCompiler.set_libraries(libnames)
-
-      Set the list of libraries to be included in all links driven by this compiler
-      object to *libnames* (a list of strings).  This does not affect any standard
-      system libraries that the linker may include by default.
-
-
-   .. method:: CCompiler.add_library_dir(dir)
-
-      Add *dir* to the list of directories that will be searched for libraries
-      specified to :meth:`add_library` and :meth:`set_libraries`.  The linker will be
-      instructed to search for libraries in the order they are supplied to
-      :meth:`add_library_dir` and/or :meth:`set_library_dirs`.
-
-
-   .. method:: CCompiler.set_library_dirs(dirs)
-
-      Set the list of library search directories to *dirs* (a list of strings).  This
-      does not affect any standard library search path that the linker may search by
-      default.
-
-
-   .. method:: CCompiler.add_runtime_library_dir(dir)
-
-      Add *dir* to the list of directories that will be searched for shared libraries
-      at runtime.
-
-
-   .. method:: CCompiler.set_runtime_library_dirs(dirs)
-
-      Set the list of directories to search for shared libraries at runtime to *dirs*
-      (a list of strings).  This does not affect any standard search path that the
-      runtime linker may search by default.
-
-
-   .. method:: CCompiler.define_macro(name[, value=None])
-
-      Define a preprocessor macro for all compilations driven by this compiler object.
-      The optional parameter *value* should be a string; if it is not supplied, then
-      the macro will be defined without an explicit value and the exact outcome
-      depends on the compiler used.
-
-      .. XXX true? does ANSI say anything about this?
-
-
-   .. method:: CCompiler.undefine_macro(name)
-
-      Undefine a preprocessor macro for all compilations driven by this compiler
-      object.  If the same macro is defined by :meth:`define_macro` and
-      undefined by :meth:`undefine_macro` the last call takes precedence
-      (including multiple redefinitions or undefinitions).  If the macro is
-      redefined/undefined on a per-compilation basis (ie. in the call to
-      :meth:`compile`), then that takes precedence.
-
-
-   .. method:: CCompiler.add_link_object(object)
-
-      Add *object* to the list of object files (or analogues, such as explicitly named
-      library files or the output of "resource compilers") to be included in every
-      link driven by this compiler object.
-
-
-   .. method:: CCompiler.set_link_objects(objects)
-
-      Set the list of object files (or analogues) to be included in every link to
-      *objects*.  This does not affect any standard object files that the linker may
-      include by default (such as system libraries).
-
-   The following methods implement methods for autodetection of compiler  options,
-   providing some functionality similar to GNU :program:`autoconf`.
-
-
-   .. method:: CCompiler.detect_language(sources)
-
-      Detect the language of a given file, or list of files. Uses the  instance
-      attributes :attr:`language_map` (a dictionary), and  :attr:`language_order` (a
-      list) to do the job.
-
-
-   .. method:: CCompiler.find_library_file(dirs, lib[, debug=0])
-
-      Search the specified list of directories for a static or shared library file
-      *lib* and return the full path to that file.  If *debug* is true, look for a
-      debugging version (if that makes sense on the current platform).  Return
-      ``None`` if *lib* wasn't found in any of the specified directories.
-
-
-   .. method:: CCompiler.has_function(funcname [, includes=None, include_dirs=None, libraries=None, library_dirs=None])
-
-      Return a boolean indicating whether *funcname* is supported on the current
-      platform.  The optional arguments can be used to augment the compilation
-      environment by providing additional include files and paths and libraries and
-      paths.
-
-
-   .. method:: CCompiler.library_dir_option(dir)
-
-      Return the compiler option to add *dir* to the list of directories searched for
-      libraries.
-
-
-   .. method:: CCompiler.library_option(lib)
-
-      Return the compiler option to add *lib* to the list of libraries linked into the
-      shared library or executable.
-
-
-   .. method:: CCompiler.runtime_library_dir_option(dir)
-
-      Return the compiler option to add *dir* to the list of directories searched for
-      runtime libraries.
-
-
-   .. method:: CCompiler.set_executables(**args)
-
-      Define the executables (and options for them) that will be run to perform the
-      various stages of compilation.  The exact set of executables that may be
-      specified here depends on the compiler class (via the 'executables' class
-      attribute), but most will have:
-
-      +--------------+------------------------------------------+
-      | attribute    | description                              |
-      +==============+==========================================+
-      | *compiler*   | the C/C++ compiler                       |
-      +--------------+------------------------------------------+
-      | *linker_so*  | linker used to create shared objects and |
-      |              | libraries                                |
-      +--------------+------------------------------------------+
-      | *linker_exe* | linker used to create binary executables |
-      +--------------+------------------------------------------+
-      | *archiver*   | static library creator                   |
-      +--------------+------------------------------------------+
-
-      On platforms with a command-line (Unix, DOS/Windows), each of these is a string
-      that will be split into executable name and (optional) list of arguments.
-      (Splitting the string is done similarly to how Unix shells operate: words are
-      delimited by spaces, but quotes and backslashes can override this.  See
-      :func:`distutils.util.split_quoted`.)
-
-   The following methods invoke stages in the build process.
-
-
-   .. method:: CCompiler.compile(sources[, output_dir=None, macros=None, include_dirs=None, debug=0, extra_preargs=None, extra_postargs=None, depends=None])
-
-      Compile one or more source files. Generates object files (e.g.  transforms a
-      :file:`.c` file to a :file:`.o` file.)
-
-      *sources* must be a list of filenames, most likely C/C++ files, but in reality
-      anything that can be handled by a particular compiler and compiler class (eg.
-      :class:`MSVCCompiler` can handle resource files in *sources*).  Return a list of
-      object filenames, one per source filename in *sources*.  Depending on the
-      implementation, not all source files will necessarily be compiled, but all
-      corresponding object filenames will be returned.
-
-      If *output_dir* is given, object files will be put under it, while retaining
-      their original path component.  That is, :file:`foo/bar.c` normally compiles to
-      :file:`foo/bar.o` (for a Unix implementation); if *output_dir* is *build*, then
-      it would compile to :file:`build/foo/bar.o`.
-
-      *macros*, if given, must be a list of macro definitions.  A macro definition is
-      either a ``(name, value)`` 2-tuple or a ``(name,)`` 1-tuple. The former defines
-      a macro; if the value is ``None``, the macro is defined without an explicit
-      value.  The 1-tuple case undefines a macro.  Later
-      definitions/redefinitions/undefinitions take precedence.
-
-      *include_dirs*, if given, must be a list of strings, the directories to add to
-      the default include file search path for this compilation only.
-
-      *debug* is a boolean; if true, the compiler will be instructed to output debug
-      symbols in (or alongside) the object file(s).
-
-      *extra_preargs* and *extra_postargs* are implementation-dependent. On platforms
-      that have the notion of a command-line (e.g. Unix, DOS/Windows), they are most
-      likely lists of strings: extra command-line arguments to prepend/append to the
-      compiler command line.  On other platforms, consult the implementation class
-      documentation.  In any event, they are intended as an escape hatch for those
-      occasions when the abstract compiler framework doesn't cut the mustard.
-
-      *depends*, if given, is a list of filenames that all targets depend on.  If a
-      source file is older than any file in depends, then the source file will be
-      recompiled.  This supports dependency tracking, but only at a coarse
-      granularity.
-
-      Raises :exc:`CompileError` on failure.
-
-
-   .. method:: CCompiler.create_static_lib(objects, output_libname[, output_dir=None, debug=0, target_lang=None])
-
-      Link a bunch of stuff together to create a static library file. The "bunch of
-      stuff" consists of the list of object files supplied as *objects*, the extra
-      object files supplied to :meth:`add_link_object` and/or
-      :meth:`set_link_objects`, the libraries supplied to :meth:`add_library` and/or
-      :meth:`set_libraries`, and the libraries supplied as *libraries* (if any).
-
-      *output_libname* should be a library name, not a filename; the filename will be
-      inferred from the library name.  *output_dir* is the directory where the library
-      file will be put.
-
-      .. XXX defaults to what?
-
-      *debug* is a boolean; if true, debugging information will be included in the
-      library (note that on most platforms, it is the compile step where this matters:
-      the *debug* flag is included here just for consistency).
-
-      *target_lang* is the target language for which the given objects are being
-      compiled. This allows specific linkage time treatment of certain languages.
-
-      Raises :exc:`LibError` on failure.
-
-
-   .. method:: CCompiler.link(target_desc, objects, output_filename[, output_dir=None, libraries=None, library_dirs=None, runtime_library_dirs=None, export_symbols=None, debug=0, extra_preargs=None, extra_postargs=None, build_temp=None, target_lang=None])
-
-      Link a bunch of stuff together to create an executable or shared library file.
-
-      The "bunch of stuff" consists of the list of object files supplied as *objects*.
-      *output_filename* should be a filename.  If *output_dir* is supplied,
-      *output_filename* is relative to it (i.e. *output_filename* can provide
-      directory components if needed).
-
-      *libraries* is a list of libraries to link against.  These are library names,
-      not filenames, since they're translated into filenames in a platform-specific
-      way (eg. *foo* becomes :file:`libfoo.a` on Unix and :file:`foo.lib` on
-      DOS/Windows).  However, they can include a directory component, which means the
-      linker will look in that specific directory rather than searching all the normal
-      locations.
-
-      *library_dirs*, if supplied, should be a list of directories to search for
-      libraries that were specified as bare library names (ie. no directory
-      component).  These are on top of the system default and those supplied to
-      :meth:`add_library_dir` and/or :meth:`set_library_dirs`.  *runtime_library_dirs*
-      is a list of directories that will be embedded into the shared library and used
-      to search for other shared libraries that \*it\* depends on at run-time.  (This
-      may only be relevant on Unix.)
-
-      *export_symbols* is a list of symbols that the shared library will export.
-      (This appears to be relevant only on Windows.)
-
-      *debug* is as for :meth:`compile` and :meth:`create_static_lib`,  with the
-      slight distinction that it actually matters on most platforms (as opposed to
-      :meth:`create_static_lib`, which includes a *debug* flag mostly for form's
-      sake).
-
-      *extra_preargs* and *extra_postargs* are as for :meth:`compile`  (except of
-      course that they supply command-line arguments for the particular linker being
-      used).
-
-      *target_lang* is the target language for which the given objects are being
-      compiled. This allows specific linkage time treatment of certain languages.
-
-      Raises :exc:`LinkError` on failure.
-
-
-   .. method:: CCompiler.link_executable(objects, output_progname[, output_dir=None, libraries=None, library_dirs=None, runtime_library_dirs=None, debug=0, extra_preargs=None, extra_postargs=None, target_lang=None])
-
-      Link an executable.  *output_progname* is the name of the file executable, while
-      *objects* are a list of object filenames to link in. Other arguments  are as for
-      the :meth:`link` method.
-
-
-   .. method:: CCompiler.link_shared_lib(objects, output_libname[, output_dir=None, libraries=None, library_dirs=None, runtime_library_dirs=None, export_symbols=None, debug=0, extra_preargs=None, extra_postargs=None, build_temp=None, target_lang=None])
-
-      Link a shared library. *output_libname* is the name of the output  library,
-      while *objects* is a list of object filenames to link in.  Other arguments are
-      as for the :meth:`link` method.
-
-
-   .. method:: CCompiler.link_shared_object(objects, output_filename[, output_dir=None, libraries=None, library_dirs=None, runtime_library_dirs=None, export_symbols=None, debug=0, extra_preargs=None, extra_postargs=None, build_temp=None, target_lang=None])
-
-      Link a shared object. *output_filename* is the name of the shared object that
-      will be created, while *objects* is a list of object filenames  to link in.
-      Other arguments are as for the :meth:`link` method.
-
-
-   .. method:: CCompiler.preprocess(source[, output_file=None, macros=None, include_dirs=None, extra_preargs=None, extra_postargs=None])
-
-      Preprocess a single C/C++ source file, named in *source*. Output will be written
-      to file named *output_file*, or *stdout* if *output_file* not supplied.
-      *macros* is a list of macro definitions as for :meth:`compile`, which will
-      augment the macros set with :meth:`define_macro` and :meth:`undefine_macro`.
-      *include_dirs* is a list of directory names that will be added to the  default
-      list, in the same way as :meth:`add_include_dir`.
-
-      Raises :exc:`PreprocessError` on failure.
-
-   The following utility methods are defined by the :class:`CCompiler` class, for
-   use by the various concrete subclasses.
-
-
-   .. method:: CCompiler.executable_filename(basename[, strip_dir=0, output_dir=''])
-
-      Returns the filename of the executable for the given *basename*.  Typically for
-      non-Windows platforms this is the same as the basename,  while Windows will get
-      a :file:`.exe` added.
-
-
-   .. method:: CCompiler.library_filename(libname[, lib_type='static', strip_dir=0, output_dir=''])
-
-      Returns the filename for the given library name on the current platform. On Unix
-      a library with *lib_type* of ``'static'`` will typically  be of the form
-      :file:`liblibname.a`, while a *lib_type* of ``'dynamic'``  will be of the form
-      :file:`liblibname.so`.
-
-
-   .. method:: CCompiler.object_filenames(source_filenames[, strip_dir=0, output_dir=''])
-
-      Returns the name of the object files for the given source files.
-      *source_filenames* should be a list of filenames.
-
-
-   .. method:: CCompiler.shared_object_filename(basename[, strip_dir=0, output_dir=''])
-
-      Returns the name of a shared object file for the given file name *basename*.
-
-
-   .. method:: CCompiler.execute(func, args[, msg=None, level=1])
-
-      Invokes :func:`distutils.util.execute`. This method invokes a  Python function
-      *func* with the given arguments *args*, after  logging and taking into account
-      the *dry_run* flag.
-
-
-   .. method:: CCompiler.spawn(cmd)
-
-      Invokes :func:`distutils.util.spawn`. This invokes an external  process to run
-      the given command.
-
-
-   .. method:: CCompiler.mkpath(name[, mode=511])
-
-      Invokes :func:`distutils.dir_util.mkpath`. This creates a directory  and any
-      missing ancestor directories.
-
-
-   .. method:: CCompiler.move_file(src, dst)
-
-      Invokes :meth:`distutils.file_util.move_file`. Renames *src* to  *dst*.
-
-
-   .. method:: CCompiler.announce(msg[, level=1])
-
-      Write a message using :func:`distutils.log.debug`.
-
-
-   .. method:: CCompiler.warn(msg)
-
-      Write a warning message *msg* to standard error.
-
-
-   .. method:: CCompiler.debug_print(msg)
-
-      If the *debug* flag is set on this :class:`CCompiler` instance, print  *msg* to
-      standard output, otherwise do nothing.
-
-.. % \subsection{Compiler-specific modules}
-.. %
-.. % The following modules implement concrete subclasses of the abstract
-.. % \class{CCompiler} class. They should not be instantiated directly, but should
-.. % be created using \function{distutils.ccompiler.new_compiler()} factory
-.. % function.
-
-
-:mod:`distutils.unixccompiler` --- Unix C Compiler
-==================================================
-
-.. module:: distutils.unixccompiler
-   :synopsis: UNIX C Compiler
-
-
-This module provides the :class:`UnixCCompiler` class, a subclass of
-:class:`CCompiler` that handles the typical Unix-style command-line  C compiler:
-
-* macros defined with :option:`!-Dname[=value]`
-
-* macros undefined with :option:`!-Uname`
-
-* include search directories specified with :option:`!-Idir`
-
-* libraries specified with :option:`!-llib`
-
-* library search directories specified with :option:`!-Ldir`
-
-* compile handled by :program:`cc` (or similar) executable with :option:`!-c`
-  option: compiles :file:`.c` to :file:`.o`
-
-* link static library handled by :program:`ar` command (possibly with
-  :program:`ranlib`)
-
-* link shared library handled by :program:`cc` :option:`!-shared`
-
-
-:mod:`distutils.msvccompiler` --- Microsoft Compiler
-====================================================
-
-.. module:: distutils.msvccompiler
-   :synopsis: Microsoft Compiler
-
-.. XXX: This is *waaaaay* out of date!
-
-This module provides :class:`MSVCCompiler`, an implementation of the abstract
-:class:`CCompiler` class for Microsoft Visual Studio. Typically, extension
-modules need to be compiled with the same compiler that was used to compile
-Python. For Python 2.3 and earlier, the compiler was Visual Studio 6. For Python
-2.4 and 2.5, the compiler is Visual Studio .NET 2003.
-
-:class:`MSVCCompiler` will normally choose the right compiler, linker etc. on
-its own. To override this choice, the environment variables *DISTUTILS_USE_SDK*
-and *MSSdk* must be both set. *MSSdk* indicates that the current environment has
-been setup by the SDK's ``SetEnv.Cmd`` script, or that the environment variables
-had been registered when the SDK was installed; *DISTUTILS_USE_SDK* indicates
-that the distutils user has made an explicit choice to override the compiler
-selection by :class:`MSVCCompiler`.
-
-
-:mod:`distutils.bcppcompiler` --- Borland Compiler
-==================================================
-
-.. module:: distutils.bcppcompiler
-
-
-This module provides :class:`BorlandCCompiler`, a subclass of the abstract
-:class:`CCompiler` class for the Borland C++ compiler.
-
-
-:mod:`distutils.cygwincompiler` --- Cygwin Compiler
-===================================================
-
-.. module:: distutils.cygwinccompiler
-
-
-This module provides the :class:`CygwinCCompiler` class, a subclass of
-:class:`UnixCCompiler` that handles the Cygwin port of the GNU C compiler to
-Windows.  It also contains the Mingw32CCompiler class which handles the mingw32
-port of GCC (same as cygwin in no-cygwin mode).
-
-
-:mod:`distutils.archive_util` ---  Archiving utilities
-======================================================
-
-.. module:: distutils.archive_util
-   :synopsis: Utility functions for creating archive files (tarballs, zip files, ...)
-
-
-This module provides a few functions for creating archive files, such as
-tarballs or zipfiles.
-
-
-.. function:: make_archive(base_name, format[, root_dir=None, base_dir=None, verbose=0, dry_run=0])
-
-   Create an archive file (eg. ``zip`` or ``tar``).  *base_name*  is the name of
-   the file to create, minus any format-specific extension;  *format* is the
-   archive format: one of ``zip``, ``tar``, ``gztar``, ``bztar``, ``xztar``, or
-   ``ztar``. *root_dir* is a directory that will be the root directory of the
-   archive; ie. we typically ``chdir`` into *root_dir* before  creating the
-   archive.  *base_dir* is the directory where we start  archiving from; ie.
-   *base_dir* will be the common prefix of all files and directories in the
-   archive.  *root_dir* and *base_dir* both default to the current directory.
-   Returns the name of the archive file.
-
-   .. versionchanged:: 3.5
-      Added support for the ``xztar`` format.
-
-
-.. function:: make_tarball(base_name, base_dir[, compress='gzip', verbose=0, dry_run=0])
-
-   'Create an (optional compressed) archive as a tar file from all files in and
-   under *base_dir*. *compress* must be ``'gzip'`` (the default),
-   ``'bzip2'``, ``'xz'``, ``'compress'``, or ``None``.  For the ``'compress'``
-   method the compression utility named by :program:`compress` must be on the
-   default program search path, so this is probably Unix-specific.  The output
-   tar file will be named :file:`base_dir.tar`, possibly plus the appropriate
-   compression extension (``.gz``, ``.bz2``, ``.xz`` or ``.Z``).  Return the
-   output filename.
-
-   .. versionchanged:: 3.5
-      Added support for the ``xz`` compression.
-
-
-.. function:: make_zipfile(base_name, base_dir[, verbose=0, dry_run=0])
-
-   Create a zip file from all files in and under *base_dir*.  The output zip file
-   will be named *base_name* + :file:`.zip`.  Uses either the  :mod:`zipfile` Python
-   module (if available) or the InfoZIP :file:`zip`  utility (if installed and
-   found on the default search path).  If neither  tool is available, raises
-   :exc:`DistutilsExecError`.   Returns the name of the output zip file.
-
-
-:mod:`distutils.dep_util` --- Dependency checking
-=================================================
-
-.. module:: distutils.dep_util
-   :synopsis: Utility functions for simple dependency checking
-
-
-This module provides functions for performing simple, timestamp-based
-dependency of files and groups of files; also, functions based entirely  on such
-timestamp dependency analysis.
-
-
-.. function:: newer(source, target)
-
-   Return true if *source* exists and is more recently modified than *target*, or
-   if *source* exists and *target* doesn't. Return false if both exist and *target*
-   is the same age or newer  than *source*. Raise :exc:`DistutilsFileError` if
-   *source* does not exist.
-
-
-.. function:: newer_pairwise(sources, targets)
-
-   Walk two filename lists in parallel, testing if each source is newer than its
-   corresponding target.  Return a pair of lists (*sources*, *targets*) where
-   source is newer than target, according to the semantics of :func:`newer`.
-
-   .. % % equivalent to a listcomp...
-
-
-.. function:: newer_group(sources, target[, missing='error'])
-
-   Return true if *target* is out-of-date with respect to any file listed in
-   *sources*.  In other words, if *target* exists and is newer than every file in
-   *sources*, return false; otherwise return true. *missing* controls what we do
-   when a source file is missing; the default (``'error'``) is to blow up with an
-   :exc:`OSError` from  inside :func:`os.stat`; if it is ``'ignore'``, we silently
-   drop any missing source files; if it is ``'newer'``, any missing source files
-   make us assume that *target* is out-of-date (this is handy in "dry-run" mode:
-   it'll make you pretend to carry out commands that wouldn't work because inputs
-   are missing, but that doesn't matter because you're not actually going to run
-   the commands).
-
-
-:mod:`distutils.dir_util` --- Directory tree operations
-=======================================================
-
-.. module:: distutils.dir_util
-   :synopsis: Utility functions for operating on directories and directory trees
-
-
-This module provides functions for operating on directories and trees of
-directories.
-
-
-.. function:: mkpath(name[, mode=0o777, verbose=0, dry_run=0])
-
-   Create a directory and any missing ancestor directories.  If the directory
-   already exists (or if *name* is the empty string, which means the current
-   directory, which of course exists), then do nothing.  Raise
-   :exc:`DistutilsFileError` if unable to create some directory along the way (eg.
-   some sub-path exists, but is a file rather than a directory).  If *verbose* is
-   true, print a one-line summary of each mkdir to stdout.  Return the list of
-   directories actually created.
-
-
-.. function:: create_tree(base_dir, files[, mode=0o777, verbose=0, dry_run=0])
-
-   Create all the empty directories under *base_dir* needed to put *files* there.
-   *base_dir* is just the name of a directory which doesn't necessarily exist
-   yet; *files* is a list of filenames to be interpreted relative to *base_dir*.
-   *base_dir* + the directory portion of every file in *files* will be created if
-   it doesn't already exist.  *mode*, *verbose* and *dry_run* flags  are as for
-   :func:`mkpath`.
-
-
-.. function:: copy_tree(src, dst[, preserve_mode=1, preserve_times=1, preserve_symlinks=0, update=0, verbose=0, dry_run=0])
-
-   Copy an entire directory tree *src* to a new location *dst*.  Both *src* and
-   *dst* must be directory names.  If *src* is not a directory, raise
-   :exc:`DistutilsFileError`.  If *dst* does  not exist, it is created with
-   :func:`mkpath`.  The end result of the  copy is that every file in *src* is
-   copied to *dst*, and  directories under *src* are recursively copied to *dst*.
-   Return the list of files that were copied or might have been copied, using their
-   output name. The return value is unaffected by *update* or *dry_run*: it is
-   simply the list of all files under *src*, with the names changed to be under
-   *dst*.
-
-   *preserve_mode* and *preserve_times* are the same as for
-   :func:`distutils.file_util.copy_file`; note that they only apply to
-   regular files, not to
-   directories.  If *preserve_symlinks* is true, symlinks will be copied as
-   symlinks (on platforms that support them!); otherwise (the default), the
-   destination of the symlink will be copied.  *update* and *verbose* are the same
-   as for :func:`copy_file`.
-
-   Files in *src* that begin with :file:`.nfs` are skipped (more information on
-   these files is available in answer D2 of the `NFS FAQ page
-   <http://nfs.sourceforge.net/#section_d>`_).
-
-   .. versionchanged:: 3.3.1
-      NFS files are ignored.
-
-.. function:: remove_tree(directory[, verbose=0, dry_run=0])
-
-   Recursively remove *directory* and all files and directories underneath it. Any
-   errors are ignored (apart from being reported to ``sys.stdout`` if *verbose* is
-   true).
-
-
-:mod:`distutils.file_util` --- Single file operations
-=====================================================
-
-.. module:: distutils.file_util
-   :synopsis: Utility functions for operating on single files
-
-
-This module contains some utility functions for operating on individual files.
-
-
-.. function:: copy_file(src, dst[, preserve_mode=1, preserve_times=1, update=0, link=None, verbose=0, dry_run=0])
-
-   Copy file *src* to *dst*. If *dst* is a directory, then *src* is copied there
-   with the same name; otherwise, it must be a filename. (If the file exists, it
-   will be ruthlessly clobbered.) If *preserve_mode* is true (the default), the
-   file's mode (type and permission bits, or whatever is analogous on the
-   current platform) is copied. If *preserve_times* is true (the default), the
-   last-modified and last-access times are copied as well. If *update* is true,
-   *src* will only be copied if *dst* does not exist, or if *dst* does exist but
-   is older than *src*.
-
-   *link* allows you to make hard links (using :func:`os.link`) or symbolic links
-   (using :func:`os.symlink`) instead of copying: set it to ``'hard'`` or
-   ``'sym'``; if it is ``None`` (the default), files are copied. Don't set *link*
-   on systems that don't support it: :func:`copy_file` doesn't check if hard or
-   symbolic linking is available.  It uses :func:`_copy_file_contents` to copy file
-   contents.
-
-   Return a tuple ``(dest_name, copied)``: *dest_name* is the actual  name of the
-   output file, and *copied* is true if the file was copied  (or would have been
-   copied, if *dry_run* true).
-
-   .. % XXX if the destination file already exists, we clobber it if
-   .. % copying, but blow up if linking.  Hmmm.  And I don't know what
-   .. % macostools.copyfile() does.  Should definitely be consistent, and
-   .. % should probably blow up if destination exists and we would be
-   .. % changing it (ie. it's not already a hard/soft link to src OR
-   .. % (not update) and (src newer than dst)).
-
-
-.. function:: move_file(src, dst[, verbose, dry_run])
-
-   Move file *src* to *dst*. If *dst* is a directory, the file will be moved into
-   it with the same name; otherwise, *src* is just renamed to *dst*.  Returns the
-   new full name of the file.
-
-   .. warning::
-
-      Handles cross-device moves on Unix using :func:`copy_file`.  What about
-      other systems?
-
-
-.. function:: write_file(filename, contents)
-
-   Create a file called *filename* and write *contents* (a sequence of strings
-   without line terminators) to it.
-
-
-:mod:`distutils.util` --- Miscellaneous other utility functions
-===============================================================
-
-.. module:: distutils.util
-   :synopsis: Miscellaneous other utility functions
-
-
-This module contains other assorted bits and pieces that don't fit into  any
-other utility module.
-
-
-.. function:: get_platform()
-
-   Return a string that identifies the current platform.  This is used mainly to
-   distinguish platform-specific build directories and platform-specific built
-   distributions.  Typically includes the OS name and version and the
-   architecture (as supplied by 'os.uname()'), although the exact information
-   included depends on the OS; e.g., on Linux, the kernel version isn't
-   particularly important.
-
-   Examples of returned values:
-
-   * ``linux-i586``
-   * ``linux-alpha``
-   * ``solaris-2.6-sun4u``
-
-   For non-POSIX platforms, currently just returns ``sys.platform``.
-
-   For macOS systems the OS version reflects the minimal version on which
-   binaries will run (that is, the value of ``MACOSX_DEPLOYMENT_TARGET``
-   during the build of Python), not the OS version of the current system.
-
-   For universal binary builds on macOS the architecture value reflects
-   the universal binary status instead of the architecture of the current
-   processor. For 32-bit universal binaries the architecture is ``fat``,
-   for 64-bit universal binaries the architecture is ``fat64``, and
-   for 4-way universal binaries the architecture is ``universal``. Starting
-   from Python 2.7 and Python 3.2 the architecture ``fat3`` is used for
-   a 3-way universal build (ppc, i386, x86_64) and ``intel`` is used for
-   a universal build with the i386 and x86_64 architectures
-
-   Examples of returned values on macOS:
-
-   * ``macosx-10.3-ppc``
-
-   * ``macosx-10.3-fat``
-
-   * ``macosx-10.5-universal``
-
-   * ``macosx-10.6-intel``
-
-   For AIX, Python 3.9 and later return a string starting with "aix", followed
-   by additional fields (separated by ``'-'``) that represent the combined
-   values of AIX Version, Release and Technology Level (first field), Build Date
-   (second field), and bit-size (third field). Python 3.8 and earlier returned
-   only a single additional field with the AIX Version and Release.
-
-   Examples of returned values on AIX:
-
-   * ``aix-5307-0747-32`` # 32-bit build on AIX ``oslevel -s``: 5300-07-00-0000
-
-   * ``aix-7105-1731-64`` # 64-bit build on AIX ``oslevel -s``: 7100-05-01-1731
-
-   * ``aix-7.2``          # Legacy form reported in Python 3.8 and earlier
-
-   .. versionchanged:: 3.9
-      The AIX platform string format now also includes the technology level,
-      build date, and ABI bit-size.
-
-
-.. function:: convert_path(pathname)
-
-   Return 'pathname' as a name that will work on the native filesystem, i.e. split
-   it on '/' and put it back together again using the current directory separator.
-   Needed because filenames in the setup script are always supplied in Unix style,
-   and have to be converted to the local convention before we can actually use them
-   in the filesystem.  Raises :exc:`ValueError` on non-Unix-ish systems if
-   *pathname* either  starts or ends with a slash.
-
-
-.. function:: change_root(new_root, pathname)
-
-   Return *pathname* with *new_root* prepended.  If *pathname* is relative, this is
-   equivalent to ``os.path.join(new_root,pathname)`` Otherwise, it requires making
-   *pathname* relative and then joining the two, which is tricky on DOS/Windows.
-
-
-.. function:: check_environ()
-
-   Ensure that 'os.environ' has all the environment variables we guarantee that
-   users can use in config files, command-line options, etc.  Currently this
-   includes:
-
-   * :envvar:`HOME` - user's home directory (Unix only)
-   * :envvar:`PLAT` - description of the current platform, including hardware and
-     OS (see :func:`get_platform`)
-
-
-.. function:: subst_vars(s, local_vars)
-
-   Perform shell/Perl-style variable substitution on *s*.  Every occurrence of
-   ``$`` followed by a name is considered a variable, and variable is substituted
-   by the value found in the *local_vars* dictionary, or in ``os.environ`` if it's
-   not in *local_vars*. *os.environ* is first checked/augmented to guarantee that
-   it contains certain values: see :func:`check_environ`.  Raise :exc:`ValueError`
-   for any variables not found in either *local_vars* or ``os.environ``.
-
-   Note that this is not a full-fledged string interpolation function. A valid
-   ``$variable`` can consist only of upper and lower case letters, numbers and an
-   underscore. No { } or ( ) style quoting is available.
-
-
-.. function:: split_quoted(s)
-
-   Split a string up according to Unix shell-like rules for quotes and backslashes.
-   In short: words are delimited by spaces, as long as those spaces are not escaped
-   by a backslash, or inside a quoted string. Single and double quotes are
-   equivalent, and the quote characters can be backslash-escaped.  The backslash is
-   stripped from any two-character escape sequence, leaving only the escaped
-   character.  The quote characters are stripped from any quoted string.  Returns a
-   list of words.
-
-   .. % Should probably be moved into the standard library.
-
-
-.. function:: execute(func, args[, msg=None, verbose=0, dry_run=0])
-
-   Perform some action that affects the outside world (for instance, writing to the
-   filesystem).  Such actions are special because they are disabled by the
-   *dry_run* flag.  This method takes  care of all that bureaucracy for you; all
-   you have to do is supply the function to call and an argument tuple for it (to
-   embody the "external action" being performed), and an optional message to print.
-
-
-.. function:: strtobool(val)
-
-   Convert a string representation of truth to true (1) or false (0).
-
-   True values are ``y``, ``yes``, ``t``, ``true``, ``on``  and ``1``; false values
-   are ``n``, ``no``, ``f``, ``false``,  ``off`` and ``0``.  Raises
-   :exc:`ValueError` if *val*  is anything else.
-
-
-.. function:: byte_compile(py_files[, optimize=0, force=0, prefix=None, base_dir=None, verbose=1, dry_run=0, direct=None])
-
-   Byte-compile a collection of Python source files to :file:`.pyc` files in a
-   :file:`__pycache__` subdirectory (see :pep:`3147` and :pep:`488`).
-   *py_files* is a list of files to compile; any files that don't end in
-   :file:`.py` are silently skipped.  *optimize* must be one of the following:
-
-   * ``0`` - don't optimize
-   * ``1`` - normal optimization (like ``python -O``)
-   * ``2`` - extra optimization (like ``python -OO``)
-
-   If *force* is true, all files are recompiled regardless of timestamps.
-
-   The source filename encoded in each :term:`bytecode` file defaults to the filenames
-   listed in *py_files*; you can modify these with *prefix* and *basedir*.
-   *prefix* is a string that will be stripped off of each source filename, and
-   *base_dir* is a directory name that will be prepended (after *prefix* is
-   stripped).  You can supply either or both (or neither) of *prefix* and
-   *base_dir*, as you wish.
-
-   If *dry_run* is true, doesn't actually do anything that would affect the
-   filesystem.
-
-   Byte-compilation is either done directly in this interpreter process with the
-   standard :mod:`py_compile` module, or indirectly by writing a temporary script
-   and executing it.  Normally, you should let :func:`byte_compile` figure out to
-   use direct compilation or not (see the source for details).  The *direct* flag
-   is used by the script generated in indirect mode; unless you know what you're
-   doing, leave it set to ``None``.
-
-   .. versionchanged:: 3.2.3
-      Create ``.pyc`` files with an :func:`import magic tag
-      <imp.get_tag>` in their name, in a :file:`__pycache__` subdirectory
-      instead of files without tag in the current directory.
-
-   .. versionchanged:: 3.5
-      Create ``.pyc`` files according to :pep:`488`.
-
-
-.. function:: rfc822_escape(header)
-
-   Return a version of *header* escaped for inclusion in an :rfc:`822` header, by
-   ensuring there are 8 spaces space after each newline. Note that it does no other
-   modification of the string.
-
-   .. % this _can_ be replaced
-
-.. % \subsection{Distutils objects}
-
-
-:mod:`distutils.dist` --- The Distribution class
-================================================
-
-.. module:: distutils.dist
-   :synopsis: Provides the Distribution class, which represents the module distribution being
-              built/installed/distributed
-
-
-This module provides the :class:`~distutils.core.Distribution` class, which
-represents the module distribution being built/installed/distributed.
-
-
-:mod:`distutils.extension` --- The Extension class
-==================================================
-
-.. module:: distutils.extension
-   :synopsis: Provides the Extension class, used to describe C/C++ extension modules in setup
-              scripts
-
-
-This module provides the :class:`Extension` class, used to describe C/C++
-extension modules in setup scripts.
-
-.. % \subsection{Ungrouped modules}
-.. % The following haven't been moved into a more appropriate section yet.
-
-
-:mod:`distutils.debug` --- Distutils debug mode
-===============================================
-
-.. module:: distutils.debug
-   :synopsis: Provides the debug flag for distutils
-
-
-This module provides the DEBUG flag.
-
-
-:mod:`distutils.errors` --- Distutils exceptions
-================================================
-
-.. module:: distutils.errors
-   :synopsis: Provides standard distutils exceptions
-
-
-Provides exceptions used by the Distutils modules.  Note that Distutils modules
-may raise standard exceptions; in particular, SystemExit is usually raised for
-errors that are obviously the end-user's fault (eg. bad command-line arguments).
-
-This module is safe to use in ``from ... import *`` mode; it only exports
-symbols whose names start with ``Distutils`` and end with ``Error``.
-
-
-:mod:`distutils.fancy_getopt` --- Wrapper around the standard getopt module
-===========================================================================
-
-.. module:: distutils.fancy_getopt
-   :synopsis: Additional getopt functionality
-
-
-This module provides a wrapper around the standard :mod:`getopt`  module that
-provides the following additional features:
-
-* short and long options are tied together
-
-* options have help strings, so :func:`fancy_getopt` could potentially  create a
-  complete usage summary
-
-* options set attributes of a passed-in object
-
-* boolean options can have "negative aliases" --- eg. if :option:`!--quiet` is
-  the "negative alias" of :option:`!--verbose`, then :option:`!--quiet` on the
-  command line sets *verbose* to false.
-
-.. function:: fancy_getopt(options, negative_opt, object, args)
-
-   Wrapper function. *options* is a list of ``(long_option, short_option,
-   help_string)`` 3-tuples as described in the constructor for
-   :class:`FancyGetopt`. *negative_opt* should be a dictionary mapping option names
-   to option names, both the key and value should be in the *options* list.
-   *object* is an object which will be used to store values (see the :meth:`getopt`
-   method of the :class:`FancyGetopt` class). *args* is the argument list. Will use
-   ``sys.argv[1:]`` if you  pass ``None`` as *args*.
-
-
-.. function:: wrap_text(text, width)
-
-   Wraps *text* to less than *width* wide.
-
-
-.. class:: FancyGetopt([option_table=None])
-
-   The option_table is a list of 3-tuples: ``(long_option, short_option,
-   help_string)``
-
-   If an option takes an argument, its *long_option* should have ``'='`` appended;
-   *short_option* should just be a single character, no ``':'`` in any case.
-   *short_option* should be ``None`` if a *long_option*  doesn't have a
-   corresponding *short_option*. All option tuples must have long options.
-
-The :class:`FancyGetopt` class provides the following methods:
-
-
-.. method:: FancyGetopt.getopt([args=None, object=None])
-
-   Parse command-line options in args. Store as attributes on *object*.
-
-   If *args* is ``None`` or not supplied, uses ``sys.argv[1:]``.  If *object* is
-   ``None`` or not supplied, creates a new :class:`OptionDummy` instance, stores
-   option values there, and returns a tuple ``(args, object)``.  If *object* is
-   supplied, it is modified in place and :func:`getopt` just returns *args*; in
-   both cases, the returned *args* is a modified copy of the passed-in *args* list,
-   which is left untouched.
-
-   .. % and args returned are?
-
-
-.. method:: FancyGetopt.get_option_order()
-
-   Returns the list of ``(option, value)`` tuples processed by the previous run of
-   :meth:`getopt`  Raises :exc:`RuntimeError` if :meth:`getopt` hasn't been called
-   yet.
-
-
-.. method:: FancyGetopt.generate_help([header=None])
-
-   Generate help text (a list of strings, one per suggested line of output) from
-   the option table for this :class:`FancyGetopt` object.
-
-   If supplied, prints the supplied *header* at the top of the help.
-
-
-:mod:`distutils.filelist` --- The FileList class
-================================================
-
-.. module:: distutils.filelist
-   :synopsis: The FileList class, used for poking about the file system and
-              building lists of files.
-
-
-This module provides the :class:`FileList` class, used for poking about the
-filesystem and building lists of files.
-
-
-:mod:`distutils.log` --- Simple :pep:`282`-style logging
-========================================================
-
-.. module:: distutils.log
-   :synopsis: A simple logging mechanism, :pep:`282`-style
-
-
-:mod:`distutils.spawn` --- Spawn a sub-process
-==============================================
-
-.. module:: distutils.spawn
-   :synopsis: Provides the spawn() function
-
-
-This module provides the :func:`spawn` function, a front-end to  various
-platform-specific functions for launching another program in a  sub-process.
-Also provides :func:`find_executable` to search the path for a given executable
-name.
-
-
-:mod:`distutils.sysconfig` --- System configuration information
-===============================================================
-
-.. module:: distutils.sysconfig
-   :synopsis: Low-level access to configuration information of the Python interpreter.
-.. deprecated:: 3.10
-   :mod:`distutils.sysconfig` has been merged into :mod:`sysconfig`.
-.. moduleauthor:: Fred L. Drake, Jr. <fdrake at acm.org>
-.. moduleauthor:: Greg Ward <gward at python.net>
-.. sectionauthor:: Fred L. Drake, Jr. <fdrake at acm.org>
-
-
-The :mod:`distutils.sysconfig` module provides access to Python's low-level
-configuration information.  The specific configuration variables available
-depend heavily on the platform and configuration. The specific variables depend
-on the build process for the specific version of Python being run; the variables
-are those found in the :file:`Makefile` and configuration header that are
-installed with Python on Unix systems.  The configuration header is called
-:file:`pyconfig.h` for Python versions starting with 2.2, and :file:`config.h`
-for earlier versions of Python.
-
-Some additional functions are provided which perform some useful manipulations
-for other parts of the :mod:`distutils` package.
-
-
-.. data:: PREFIX
-
-   The result of ``os.path.normpath(sys.prefix)``.
-
-
-.. data:: EXEC_PREFIX
-
-   The result of ``os.path.normpath(sys.exec_prefix)``.
-
-
-.. function:: get_config_var(name)
-
-   Return the value of a single variable.  This is equivalent to
-   ``get_config_vars().get(name)``.
-
-
-.. function:: get_config_vars(...)
-
-   Return a set of variable definitions.  If there are no arguments, this returns a
-   dictionary mapping names of configuration variables to values.  If arguments are
-   provided, they should be strings, and the return value will be a sequence giving
-   the associated values. If a given name does not have a corresponding value,
-   ``None`` will be included for that variable.
-
-
-.. function:: get_config_h_filename()
-
-   Return the full path name of the configuration header.  For Unix, this will be
-   the header generated by the :program:`configure` script; for other platforms the
-   header will have been supplied directly by the Python source distribution.  The
-   file is a platform-specific text file.
-
-
-.. function:: get_makefile_filename()
-
-   Return the full path name of the :file:`Makefile` used to build Python.  For
-   Unix, this will be a file generated by the :program:`configure` script; the
-   meaning for other platforms will vary.  The file is a platform-specific text
-   file, if it exists. This function is only useful on POSIX platforms.
-
-The following functions are deprecated together with this module and they
-have no direct replacement.
-
-
-.. function:: get_python_inc([plat_specific[, prefix]])
-
-   Return the directory for either the general or platform-dependent C include
-   files.  If *plat_specific* is true, the platform-dependent include directory is
-   returned; if false or omitted, the platform-independent directory is returned.
-   If *prefix* is given, it is used as either the prefix instead of
-   :const:`PREFIX`, or as the exec-prefix instead of :const:`EXEC_PREFIX` if
-   *plat_specific* is true.
-
-
-.. function:: get_python_lib([plat_specific[, standard_lib[, prefix]]])
-
-   Return the directory for either the general or platform-dependent library
-   installation.  If *plat_specific* is true, the platform-dependent include
-   directory is returned; if false or omitted, the platform-independent directory
-   is returned.  If *prefix* is given, it is used as either the prefix instead of
-   :const:`PREFIX`, or as the exec-prefix instead of :const:`EXEC_PREFIX` if
-   *plat_specific* is true.  If *standard_lib* is true, the directory for the
-   standard library is returned rather than the directory for the installation of
-   third-party extensions.
-
-The following function is only intended for use within the :mod:`distutils`
-package.
-
-
-.. function:: customize_compiler(compiler)
-
-   Do any platform-specific customization of a
-   :class:`distutils.ccompiler.CCompiler` instance.
-
-   This function is only needed on Unix at this time, but should be called
-   consistently to support forward-compatibility.  It inserts the information that
-   varies across Unix flavors and is stored in Python's :file:`Makefile`.  This
-   information includes the selected compiler, compiler and linker options, and the
-   extension used by the linker for shared objects.
-
-This function is even more special-purpose, and should only be used from
-Python's own build procedures.
-
-
-.. function:: set_python_build()
-
-   Inform the :mod:`distutils.sysconfig` module that it is being used as part of
-   the build process for Python.  This changes a lot of relative locations for
-   files, allowing them to be located in the build area rather than in an installed
-   Python.
-
-
-:mod:`distutils.text_file` --- The TextFile class
-=================================================
-
-.. module:: distutils.text_file
-   :synopsis: Provides the TextFile class, a simple interface to text files
-
-
-This module provides the :class:`TextFile` class, which gives an interface  to
-text files that (optionally) takes care of stripping comments, ignoring  blank
-lines, and joining lines with backslashes.
-
-
-.. class:: TextFile([filename=None, file=None, **options])
-
-   This class provides a file-like object that takes care of all  the things you
-   commonly want to do when processing a text file  that has some line-by-line
-   syntax: strip comments (as long as ``#``  is your comment character), skip blank
-   lines, join adjacent lines by escaping the newline (ie. backslash at end of
-   line), strip leading and/or trailing whitespace.  All of these are optional and
-   independently controllable.
-
-   The class provides a :meth:`warn` method so you can generate  warning messages
-   that report physical line number, even if the  logical line in question spans
-   multiple physical lines.  Also  provides :meth:`unreadline` for implementing
-   line-at-a-time lookahead.
-
-   :class:`TextFile` instances are create with either *filename*, *file*, or both.
-   :exc:`RuntimeError` is raised if both are ``None``. *filename* should be a
-   string, and *file* a file object (or something that provides :meth:`readline`
-   and :meth:`close`  methods).  It is recommended that you supply at least
-   *filename*,  so that :class:`TextFile` can include it in warning messages.  If
-   *file* is not supplied, :class:`TextFile` creates its own using the
-   :func:`open` built-in function.
-
-   The options are all boolean, and affect the values returned by :meth:`readline`
-
-   .. tabularcolumns:: |l|L|l|
-
-   +------------------+--------------------------------+---------+
-   | option name      | description                    | default |
-   +==================+================================+=========+
-   | *strip_comments* | strip from ``'#'`` to          | true    |
-   |                  | end-of-line, as well as any    |         |
-   |                  | whitespace leading up to the   |         |
-   |                  | ``'#'``\ ---unless it is       |         |
-   |                  | escaped by a backslash         |         |
-   +------------------+--------------------------------+---------+
-   | *lstrip_ws*      | strip leading whitespace from  | false   |
-   |                  | each line before returning it  |         |
-   +------------------+--------------------------------+---------+
-   | *rstrip_ws*      | strip trailing whitespace      | true    |
-   |                  | (including line terminator!)   |         |
-   |                  | from each line before          |         |
-   |                  | returning it.                  |         |
-   +------------------+--------------------------------+---------+
-   | *skip_blanks*    | skip lines that are empty      | true    |
-   |                  | \*after\* stripping comments   |         |
-   |                  | and whitespace.  (If both      |         |
-   |                  | lstrip_ws and rstrip_ws are    |         |
-   |                  | false, then some lines may     |         |
-   |                  | consist of solely whitespace:  |         |
-   |                  | these will \*not\* be skipped, |         |
-   |                  | even if *skip_blanks* is       |         |
-   |                  | true.)                         |         |
-   +------------------+--------------------------------+---------+
-   | *join_lines*     | if a backslash is the last     | false   |
-   |                  | non-newline character on a     |         |
-   |                  | line after stripping comments  |         |
-   |                  | and whitespace, join the       |         |
-   |                  | following line to it to form   |         |
-   |                  | one logical line; if N         |         |
-   |                  | consecutive lines end with a   |         |
-   |                  | backslash, then N+1 physical   |         |
-   |                  | lines will be joined to form   |         |
-   |                  | one logical line.              |         |
-   +------------------+--------------------------------+---------+
-   | *collapse_join*  | strip leading whitespace from  | false   |
-   |                  | lines that are joined to their |         |
-   |                  | predecessor; only matters if   |         |
-   |                  | ``(join_lines and not          |         |
-   |                  | lstrip_ws)``                   |         |
-   +------------------+--------------------------------+---------+
-
-   Note that since *rstrip_ws* can strip the trailing newline, the semantics of
-   :meth:`readline` must differ from those of the built-in file object's
-   :meth:`readline` method!  In particular, :meth:`readline`  returns ``None`` for
-   end-of-file: an empty string might just be a  blank line (or an all-whitespace
-   line), if *rstrip_ws* is true  but *skip_blanks* is not.
-
-
-   .. method:: TextFile.open(filename)
-
-      Open a new file *filename*.  This overrides any *file* or *filename*
-      constructor arguments.
-
-
-   .. method:: TextFile.close()
-
-      Close the current file and forget everything we know about it (including the
-      filename and the current line number).
-
-
-   .. method:: TextFile.warn(msg[,line=None])
-
-      Print (to stderr) a warning message tied to the current logical line in the
-      current file.  If the current logical line in the file spans multiple physical
-      lines, the warning refers to the whole range, such as ``"lines 3-5"``.  If
-      *line* is supplied,  it overrides the current line number; it may be a list or
-      tuple  to indicate a range of physical lines, or an integer for a  single
-      physical line.
-
-
-   .. method:: TextFile.readline()
-
-      Read and return a single logical line from the current file (or from an internal
-      buffer if lines have previously been "unread" with :meth:`unreadline`).  If the
-      *join_lines* option  is true, this may involve reading multiple physical lines
-      concatenated into a single string.  Updates the current line number,  so calling
-      :meth:`warn` after :meth:`readline` emits a warning  about the physical line(s)
-      just read.  Returns ``None`` on end-of-file,  since the empty string can occur
-      if *rstrip_ws* is true but  *strip_blanks* is not.
-
-
-   .. method:: TextFile.readlines()
-
-      Read and return the list of all logical lines remaining in the current file.
-      This updates the current line number to the last line of the file.
-
-
-   .. method:: TextFile.unreadline(line)
-
-      Push *line* (a string) onto an internal buffer that will be checked by future
-      :meth:`readline` calls.  Handy for implementing a parser with line-at-a-time
-      lookahead. Note that lines that are "unread" with :meth:`unreadline` are not
-      subsequently re-cleansed (whitespace  stripped, or whatever) when read with
-      :meth:`readline`. If multiple calls are made to :meth:`unreadline` before a call
-      to :meth:`readline`, the lines will be returned most in most recent first order.
-
-
-:mod:`distutils.version` --- Version number classes
-===================================================
-
-.. module:: distutils.version
-   :synopsis: Implements classes that represent module version numbers.
-
-
-.. % todo
-.. % \section{Distutils Commands}
-.. %
-.. % This part of Distutils implements the various Distutils commands, such
-.. % as \code{build}, \code{install} \&c. Each command is implemented as a
-.. % separate module, with the command name as the name of the module.
-
-
-:mod:`distutils.cmd` --- Abstract base class for Distutils commands
-===================================================================
-
-.. module:: distutils.cmd
-   :synopsis: Provides the abstract base class :class:`~distutils.cmd.Command`. This class
-              is subclassed by the modules in the distutils.command subpackage.
-
-
-This module supplies the abstract base class :class:`Command`.
-
-
-.. class:: Command(dist)
-
-   Abstract base class for defining command classes, the "worker bees" of the
-   Distutils.  A useful analogy for command classes is to think of them as
-   subroutines with local variables called *options*.  The options are declared
-   in :meth:`initialize_options` and defined (given their final values) in
-   :meth:`finalize_options`, both of which must be defined by every command
-   class.  The distinction between the two is necessary because option values
-   might come from the outside world (command line, config file, ...), and any
-   options dependent on other options must be computed after these outside
-   influences have been processed --- hence :meth:`finalize_options`.  The body
-   of the subroutine, where it does all its work based on the values of its
-   options, is the :meth:`run` method, which must also be implemented by every
-   command class.
-
-   The class constructor takes a single argument *dist*, a
-   :class:`~distutils.core.Distribution` instance.
-
-
-Creating a new Distutils command
-================================
-
-This section outlines the steps to create a new Distutils command.
-
-A new command lives in a module in the :mod:`distutils.command` package. There
-is a sample template in that directory called :file:`command_template`.  Copy
-this file to a new module with the same name as the new command you're
-implementing.  This module should implement a class with the same name as the
-module (and the command).  So, for instance, to create the command
-``peel_banana`` (so that users can run ``setup.py peel_banana``), you'd copy
-:file:`command_template` to :file:`distutils/command/peel_banana.py`, then edit
-it so that it's implementing the class :class:`peel_banana`, a subclass of
-:class:`distutils.cmd.Command`.
-
-Subclasses of :class:`Command` must define the following methods.
-
-.. method:: Command.initialize_options()
-
-   Set default values for all the options that this command supports.  Note that
-   these defaults may be overridden by other commands, by the setup script, by
-   config files, or by the command-line.  Thus, this is not the place to code
-   dependencies between options; generally, :meth:`initialize_options`
-   implementations are just a bunch of ``self.foo = None`` assignments.
-
-
-.. method:: Command.finalize_options()
-
-   Set final values for all the options that this command supports. This is
-   always called as late as possible, ie.  after any option assignments from the
-   command-line or from other commands have been done.  Thus, this is the place
-   to code option dependencies: if *foo* depends on *bar*, then it is safe to
-   set *foo* from *bar* as long as *foo* still has the same value it was
-   assigned in :meth:`initialize_options`.
-
-
-.. method:: Command.run()
-
-   A command's raison d'etre: carry out the action it exists to perform, controlled
-   by the options initialized in :meth:`initialize_options`, customized by other
-   commands, the setup script, the command-line, and config files, and finalized in
-   :meth:`finalize_options`.  All terminal output and filesystem interaction should
-   be done by :meth:`run`.
-
-
-.. attribute:: Command.sub_commands
-
-   *sub_commands* formalizes the notion of a "family" of commands,
-   e.g. ``install`` as the parent with sub-commands ``install_lib``,
-   ``install_headers``, etc.  The parent of a family of commands defines
-   *sub_commands* as a class attribute; it's a list of 2-tuples ``(command_name,
-   predicate)``, with *command_name* a string and *predicate* a function, a
-   string or ``None``.  *predicate* is a method of the parent command that
-   determines whether the corresponding command is applicable in the current
-   situation.  (E.g. ``install_headers`` is only applicable if we have any C
-   header files to install.)  If *predicate* is ``None``, that command is always
-   applicable.
-
-   *sub_commands* is usually defined at the *end* of a class, because
-   predicates can be methods of the class, so they must already have been
-   defined.  The canonical example is the :command:`install` command.
-
-
-:mod:`distutils.command` --- Individual Distutils commands
-==========================================================
-
-.. module:: distutils.command
-   :synopsis: Contains one module for each standard Distutils command.
-
-
-.. % \subsubsection{Individual Distutils commands}
-.. % todo
-
-
-:mod:`distutils.command.bdist` --- Build a binary installer
-===========================================================
-
-.. module:: distutils.command.bdist
-   :synopsis: Build a binary installer for a package
-
-
-.. % todo
-
-
-:mod:`distutils.command.bdist_packager` --- Abstract base class for packagers
-=============================================================================
-
-.. module:: distutils.command.bdist_packager
-   :synopsis: Abstract base class for packagers
-
-
-.. % todo
-
-
-:mod:`distutils.command.bdist_dumb` --- Build a "dumb" installer
-================================================================
-
-.. module:: distutils.command.bdist_dumb
-   :synopsis: Build a "dumb" installer - a simple archive of files
-
-
-.. % todo
-
-
-:mod:`distutils.command.bdist_rpm` --- Build a binary distribution as a Redhat RPM and SRPM
-===========================================================================================
-
-.. module:: distutils.command.bdist_rpm
-   :synopsis: Build a binary distribution as a Redhat RPM and SRPM
-
-
-.. % todo
-
-
-:mod:`distutils.command.sdist` --- Build a source distribution
-==============================================================
-
-.. module:: distutils.command.sdist
-   :synopsis: Build a source distribution
-
-
-.. % todo
-
-
-:mod:`distutils.command.build` --- Build all files of a package
-===============================================================
-
-.. module:: distutils.command.build
-   :synopsis: Build all files of a package
-
-
-.. % todo
-
-
-:mod:`distutils.command.build_clib` --- Build any C libraries in a package
-==========================================================================
-
-.. module:: distutils.command.build_clib
-   :synopsis: Build any C libraries in a package
-
-
-.. % todo
-
-
-:mod:`distutils.command.build_ext` --- Build any extensions in a package
-========================================================================
-
-.. module:: distutils.command.build_ext
-   :synopsis: Build any extensions in a package
-
-
-.. % todo
-
-
-:mod:`distutils.command.build_py` --- Build the .py/.pyc files of a package
-===========================================================================
-
-.. module:: distutils.command.build_py
-   :synopsis: Build the .py/.pyc files of a package
-
-
-.. class:: build_py
-
-.. class:: build_py_2to3
-
-   Alternative implementation of build_py which also runs the
-   2to3 conversion library on each .py file that is going to be
-   installed. To use this in a setup.py file for a distribution
-   that is designed to run with both Python 2.x and 3.x, add::
-
-     try:
-         from distutils.command.build_py import build_py_2to3 as build_py
-     except ImportError:
-         from distutils.command.build_py import build_py
-
-   to your setup.py, and later::
-
-      cmdclass = {'build_py': build_py}
-
-   to the invocation of setup().
-
-
-:mod:`distutils.command.build_scripts` --- Build the scripts of a package
-=========================================================================
-
-.. module:: distutils.command.build_scripts
-   :synopsis: Build the scripts of a package
-
-
-.. % todo
-
-
-:mod:`distutils.command.clean` --- Clean a package build area
-=============================================================
-
-.. module:: distutils.command.clean
-   :synopsis: Clean a package build area
-
-This command removes the temporary files created by :command:`build`
-and its subcommands, like intermediary compiled object files.  With
-the ``--all`` option, the complete build directory will be removed.
-
-Extension modules built :ref:`in place <distutils-build-ext-inplace>`
-will not be cleaned, as they are not in the build directory.
-
-
-:mod:`distutils.command.config` --- Perform package configuration
-=================================================================
-
-.. module:: distutils.command.config
-   :synopsis: Perform package configuration
-
-
-.. % todo
-
-
-:mod:`distutils.command.install` --- Install a package
-======================================================
-
-.. module:: distutils.command.install
-   :synopsis: Install a package
-
-
-.. % todo
-
-
-:mod:`distutils.command.install_data` --- Install data files from a package
-===========================================================================
-
-.. module:: distutils.command.install_data
-   :synopsis: Install data files from a package
-
-
-.. % todo
-
-
-:mod:`distutils.command.install_headers` --- Install C/C++ header files from a package
-======================================================================================
-
-.. module:: distutils.command.install_headers
-   :synopsis: Install C/C++ header files from a package
-
-
-.. % todo
-
-
-:mod:`distutils.command.install_lib` --- Install library files from a package
-=============================================================================
-
-.. module:: distutils.command.install_lib
-   :synopsis: Install library files from a package
-
-
-.. % todo
-
-
-:mod:`distutils.command.install_scripts` --- Install script files from a package
-================================================================================
-
-.. module:: distutils.command.install_scripts
-   :synopsis: Install script files from a package
-
-
-.. % todo
-
-
-:mod:`distutils.command.register` --- Register a module with the Python Package Index
-=====================================================================================
-
-.. module:: distutils.command.register
-   :synopsis: Register a module with the Python Package Index
-
-
-The ``register`` command registers the package with the Python Package  Index.
-This is described in more detail in :pep:`301`.
-
-.. % todo
-
-
-:mod:`distutils.command.check` --- Check the meta-data of a package
-===================================================================
-
-.. module:: distutils.command.check
-   :synopsis: Check the meta-data of a package
-
-
-The ``check`` command performs some tests on the meta-data of a package.
-For example, it verifies that all required meta-data are provided as
-the arguments passed to the :func:`setup` function.
-
-.. % todo
diff --git a/Doc/distutils/builtdist.rst b/Doc/distutils/builtdist.rst
deleted file mode 100644
index c1d9ea533dab6..0000000000000
--- a/Doc/distutils/builtdist.rst
+++ /dev/null
@@ -1,392 +0,0 @@
-.. _built-dist:
-
-****************************
-Creating Built Distributions
-****************************
-
-.. include:: ./_setuptools_disclaimer.rst
-
-A "built distribution" is what you're probably used to thinking of either as a
-"binary package" or an "installer" (depending on your background).  It's not
-necessarily binary, though, because it might contain only Python source code
-and/or byte-code; and we don't call it a package, because that word is already
-spoken for in Python.  (And "installer" is a term specific to the world of
-mainstream desktop systems.)
-
-A built distribution is how you make life as easy as possible for installers of
-your module distribution: for users of RPM-based Linux systems, it's a binary
-RPM; for Windows users, it's an executable installer; for Debian-based Linux
-users, it's a Debian package; and so forth.  Obviously, no one person will be
-able to create built distributions for every platform under the sun, so the
-Distutils are designed to enable module developers to concentrate on their
-specialty---writing code and creating source distributions---while an
-intermediary species called *packagers* springs up to turn source distributions
-into built distributions for as many platforms as there are packagers.
-
-Of course, the module developer could be their own packager; or the packager could
-be a volunteer "out there" somewhere who has access to a platform which the
-original developer does not; or it could be software periodically grabbing new
-source distributions and turning them into built distributions for as many
-platforms as the software has access to.  Regardless of who they are, a packager
-uses the setup script and the :command:`bdist` command family to generate built
-distributions.
-
-As a simple example, if I run the following command in the Distutils source
-tree::
-
-   python setup.py bdist
-
-then the Distutils builds my module distribution (the Distutils itself in this
-case), does a "fake" installation (also in the :file:`build` directory), and
-creates the default type of built distribution for my platform.  The default
-format for built distributions is a "dumb" tar file on Unix, and a simple
-executable installer on Windows.  (That tar file is considered "dumb" because it
-has to be unpacked in a specific location to work.)
-
-Thus, the above command on a Unix system creates
-:file:`Distutils-1.0.{plat}.tar.gz`; unpacking this tarball from the right place
-installs the Distutils just as though you had downloaded the source distribution
-and run ``python setup.py install``.  (The "right place" is either the root of
-the filesystem or  Python's :file:`{prefix}` directory, depending on the options
-given to the :command:`bdist_dumb` command; the default is to make dumb
-distributions relative to :file:`{prefix}`.)
-
-Obviously, for pure Python distributions, this isn't any simpler than just
-running ``python setup.py install``\ ---but for non-pure distributions, which
-include extensions that would need to be compiled, it can mean the difference
-between someone being able to use your extensions or not.  And creating "smart"
-built distributions, such as an RPM package or an executable installer for
-Windows, is far more convenient for users even if your distribution doesn't
-include any extensions.
-
-The :command:`bdist` command has a :option:`!--formats` option, similar to the
-:command:`sdist` command, which you can use to select the types of built
-distribution to generate: for example, ::
-
-   python setup.py bdist --format=zip
-
-would, when run on a Unix system, create
-:file:`Distutils-1.0.{plat}.zip`\ ---again, this archive would be unpacked
-from the root directory to install the Distutils.
-
-The available formats for built distributions are:
-
-+-------------+------------------------------+---------+
-| Format      | Description                  | Notes   |
-+=============+==============================+=========+
-| ``gztar``   | gzipped tar file             | \(1)    |
-|             | (:file:`.tar.gz`)            |         |
-+-------------+------------------------------+---------+
-| ``bztar``   | bzipped tar file             |         |
-|             | (:file:`.tar.bz2`)           |         |
-+-------------+------------------------------+---------+
-| ``xztar``   | xzipped tar file             |         |
-|             | (:file:`.tar.xz`)            |         |
-+-------------+------------------------------+---------+
-| ``ztar``    | compressed tar file          | \(3)    |
-|             | (:file:`.tar.Z`)             |         |
-+-------------+------------------------------+---------+
-| ``tar``     | tar file (:file:`.tar`)      |         |
-+-------------+------------------------------+---------+
-| ``zip``     | zip file (:file:`.zip`)      | (2),(4) |
-+-------------+------------------------------+---------+
-| ``rpm``     | RPM                          | \(5)    |
-+-------------+------------------------------+---------+
-| ``pkgtool`` | Solaris :program:`pkgtool`   |         |
-+-------------+------------------------------+---------+
-| ``sdux``    | HP-UX :program:`swinstall`   |         |
-+-------------+------------------------------+---------+
-| ``msi``     | Microsoft Installer.         |         |
-+-------------+------------------------------+---------+
-
-.. versionchanged:: 3.5
-   Added support for the ``xztar`` format.
-
-
-Notes:
-
-(1)
-   default on Unix
-
-(2)
-   default on Windows
-
-(3)
-   requires external :program:`compress` utility.
-
-(4)
-   requires either external :program:`zip` utility or :mod:`zipfile` module (part
-   of the standard Python library since Python 1.6)
-
-(5)
-   requires external :program:`rpm` utility, version 3.0.4 or better (use ``rpm
-   --version`` to find out which version you have)
-
-You don't have to use the :command:`bdist` command with the :option:`!--formats`
-option; you can also use the command that directly implements the format you're
-interested in.  Some of these :command:`bdist` "sub-commands" actually generate
-several similar formats; for instance, the :command:`bdist_dumb` command
-generates all the "dumb" archive formats (``tar``, ``gztar``, ``bztar``,
-``xztar``, ``ztar``, and ``zip``), and :command:`bdist_rpm` generates both
-binary and source RPMs.  The :command:`bdist` sub-commands, and the formats
-generated by each, are:
-
-+--------------------------+-------------------------------------+
-| Command                  | Formats                             |
-+==========================+=====================================+
-| :command:`bdist_dumb`    | tar, gztar, bztar, xztar, ztar, zip |
-+--------------------------+-------------------------------------+
-| :command:`bdist_rpm`     | rpm, srpm                           |
-+--------------------------+-------------------------------------+
-
-The following sections give details on the individual :command:`bdist_\*`
-commands.
-
-
-.. .. _creating-dumb:
-
-.. Creating dumb built distributions
-.. =================================
-
-.. XXX Need to document absolute vs. prefix-relative packages here, but first
-   I have to implement it!
-
-
-.. _creating-rpms:
-
-Creating RPM packages
-=====================
-
-The RPM format is used by many popular Linux distributions, including Red Hat,
-SuSE, and Mandrake.  If one of these (or any of the other RPM-based Linux
-distributions) is your usual environment, creating RPM packages for other users
-of that same distribution is trivial. Depending on the complexity of your module
-distribution and differences between Linux distributions, you may also be able
-to create RPMs that work on different RPM-based distributions.
-
-The usual way to create an RPM of your module distribution is to run the
-:command:`bdist_rpm` command::
-
-   python setup.py bdist_rpm
-
-or the :command:`bdist` command with the :option:`!--format` option::
-
-   python setup.py bdist --formats=rpm
-
-The former allows you to specify RPM-specific options; the latter allows  you to
-easily specify multiple formats in one run.  If you need to do both, you can
-explicitly specify multiple :command:`bdist_\*` commands and their options::
-
-   python setup.py bdist_rpm --packager="John Doe <jdoe at example.org>"
-
-Creating RPM packages is driven by a :file:`.spec` file, much as using the
-Distutils is driven by the setup script.  To make your life easier, the
-:command:`bdist_rpm` command normally creates a :file:`.spec` file based on the
-information you supply in the setup script, on the command line, and in any
-Distutils configuration files.  Various options and sections in the
-:file:`.spec` file are derived from options in the setup script as follows:
-
-+------------------------------------------+----------------------------------------------+
-| RPM :file:`.spec` file option or section | Distutils setup script option                |
-+==========================================+==============================================+
-| Name                                     | ``name``                                     |
-+------------------------------------------+----------------------------------------------+
-| Summary (in preamble)                    | ``description``                              |
-+------------------------------------------+----------------------------------------------+
-| Version                                  | ``version``                                  |
-+------------------------------------------+----------------------------------------------+
-| Vendor                                   | ``author`` and ``author_email``,             |
-|                                          | or  --- & ``maintainer`` and                 |
-|                                          | ``maintainer_email``                         |
-+------------------------------------------+----------------------------------------------+
-| Copyright                                | ``license``                                  |
-+------------------------------------------+----------------------------------------------+
-| Url                                      | ``url``                                      |
-+------------------------------------------+----------------------------------------------+
-| %description (section)                   | ``long_description``                         |
-+------------------------------------------+----------------------------------------------+
-
-Additionally, there are many options in :file:`.spec` files that don't have
-corresponding options in the setup script.  Most of these are handled through
-options to the :command:`bdist_rpm` command as follows:
-
-+-------------------------------+-----------------------------+-------------------------+
-| RPM :file:`.spec` file option | :command:`bdist_rpm` option | default value           |
-| or section                    |                             |                         |
-+===============================+=============================+=========================+
-| Release                       | ``release``                 | "1"                     |
-+-------------------------------+-----------------------------+-------------------------+
-| Group                         | ``group``                   | "Development/Libraries" |
-+-------------------------------+-----------------------------+-------------------------+
-| Vendor                        | ``vendor``                  | (see above)             |
-+-------------------------------+-----------------------------+-------------------------+
-| Packager                      | ``packager``                | (none)                  |
-+-------------------------------+-----------------------------+-------------------------+
-| Provides                      | ``provides``                | (none)                  |
-+-------------------------------+-----------------------------+-------------------------+
-| Requires                      | ``requires``                | (none)                  |
-+-------------------------------+-----------------------------+-------------------------+
-| Conflicts                     | ``conflicts``               | (none)                  |
-+-------------------------------+-----------------------------+-------------------------+
-| Obsoletes                     | ``obsoletes``               | (none)                  |
-+-------------------------------+-----------------------------+-------------------------+
-| Distribution                  | ``distribution_name``       | (none)                  |
-+-------------------------------+-----------------------------+-------------------------+
-| BuildRequires                 | ``build_requires``          | (none)                  |
-+-------------------------------+-----------------------------+-------------------------+
-| Icon                          | ``icon``                    | (none)                  |
-+-------------------------------+-----------------------------+-------------------------+
-
-Obviously, supplying even a few of these options on the command-line would be
-tedious and error-prone, so it's usually best to put them in the setup
-configuration file, :file:`setup.cfg`\ ---see section :ref:`setup-config`.  If
-you distribute or package many Python module distributions, you might want to
-put options that apply to all of them in your personal Distutils configuration
-file (:file:`~/.pydistutils.cfg`).  If you want to temporarily disable
-this file, you can pass the :option:`!--no-user-cfg` option to :file:`setup.py`.
-
-There are three steps to building a binary RPM package, all of which are
-handled automatically by the Distutils:
-
-#. create a :file:`.spec` file, which describes the package (analogous  to the
-   Distutils setup script; in fact, much of the information in the  setup script
-   winds up in the :file:`.spec` file)
-
-#. create the source RPM
-
-#. create the "binary" RPM (which may or may not contain binary code, depending
-   on whether your module distribution contains Python extensions)
-
-Normally, RPM bundles the last two steps together; when you use the Distutils,
-all three steps are typically bundled together.
-
-If you wish, you can separate these three steps.  You can use the
-:option:`!--spec-only` option to make :command:`bdist_rpm` just create the
-:file:`.spec` file and exit; in this case, the :file:`.spec` file will be
-written to the "distribution directory"---normally :file:`dist/`, but
-customizable with the :option:`!--dist-dir` option.  (Normally, the :file:`.spec`
-file winds up deep in the "build tree," in a temporary directory created by
-:command:`bdist_rpm`.)
-
-.. % \XXX{this isn't implemented yet---is it needed?!}
-.. % You can also specify a custom \file{.spec} file with the
-.. % \longprogramopt{spec-file} option; used in conjunction with
-.. % \longprogramopt{spec-only}, this gives you an opportunity to customize
-.. % the \file{.spec} file manually:
-.. %
-.. % \ begin{verbatim}
-.. % > python setup.py bdist_rpm --spec-only
-.. % # ...edit dist/FooBar-1.0.spec
-.. % > python setup.py bdist_rpm --spec-file=dist/FooBar-1.0.spec
-.. % \ end{verbatim}
-.. %
-.. % (Although a better way to do this is probably to override the standard
-.. % \command{bdist\_rpm} command with one that writes whatever else you want
-.. % to the \file{.spec} file.)
-
-
-.. _cross-compile-windows:
-
-Cross-compiling on Windows
-==========================
-
-Starting with Python 2.6, distutils is capable of cross-compiling between
-Windows platforms.  In practice, this means that with the correct tools
-installed, you can use a 32bit version of Windows to create 64bit extensions
-and vice-versa.
-
-To build for an alternate platform, specify the :option:`!--plat-name` option
-to the build command.  Valid values are currently 'win32', and  'win-amd64'.
-For example, on a 32bit version of Windows, you could execute::
-
-   python setup.py build --plat-name=win-amd64
-
-to build a 64bit version of your extension.
-
-would create a 64bit installation executable on your 32bit version of Windows.
-
-To cross-compile, you must download the Python source code and cross-compile
-Python itself for the platform you are targeting - it is not possible from a
-binary installation of Python (as the .lib etc file for other platforms are
-not included.)  In practice, this means the user of a 32 bit operating
-system will need to use Visual Studio 2008 to open the
-:file:`PCbuild/PCbuild.sln` solution in the Python source tree and build the
-"x64" configuration of the 'pythoncore' project before cross-compiling
-extensions is possible.
-
-Note that by default, Visual Studio 2008 does not install 64bit compilers or
-tools.  You may need to reexecute the Visual Studio setup process and select
-these tools (using Control Panel->[Add/Remove] Programs is a convenient way to
-check or modify your existing install.)
-
-.. _postinstallation-script:
-
-The Postinstallation script
----------------------------
-
-Starting with Python 2.3, a postinstallation script can be specified with the
-:option:`!--install-script` option.  The basename of the script must be
-specified, and the script filename must also be listed in the scripts argument
-to the setup function.
-
-This script will be run at installation time on the target system after all the
-files have been copied, with ``argv[1]`` set to :option:`!-install`, and again at
-uninstallation time before the files are removed with ``argv[1]`` set to
-:option:`!-remove`.
-
-The installation script runs embedded in the windows installer, every output
-(``sys.stdout``, ``sys.stderr``) is redirected into a buffer and will be
-displayed in the GUI after the script has finished.
-
-Some functions especially useful in this context are available as additional
-built-in functions in the installation script.
-
-
-.. function:: directory_created(path)
-              file_created(path)
-
-   These functions should be called when a directory or file is created by the
-   postinstall script at installation time.  It will register *path* with the
-   uninstaller, so that it will be removed when the distribution is uninstalled.
-   To be safe, directories are only removed if they are empty.
-
-
-.. function:: get_special_folder_path(csidl_string)
-
-   This function can be used to retrieve special folder locations on Windows like
-   the Start Menu or the Desktop.  It returns the full path to the folder.
-   *csidl_string* must be one of the following strings::
-
-      "CSIDL_APPDATA"
-
-      "CSIDL_COMMON_STARTMENU"
-      "CSIDL_STARTMENU"
-
-      "CSIDL_COMMON_DESKTOPDIRECTORY"
-      "CSIDL_DESKTOPDIRECTORY"
-
-      "CSIDL_COMMON_STARTUP"
-      "CSIDL_STARTUP"
-
-      "CSIDL_COMMON_PROGRAMS"
-      "CSIDL_PROGRAMS"
-
-      "CSIDL_FONTS"
-
-   If the folder cannot be retrieved, :exc:`OSError` is raised.
-
-   Which folders are available depends on the exact Windows version, and probably
-   also the configuration.  For details refer to Microsoft's documentation of the
-   :c:func:`SHGetSpecialFolderPath` function.
-
-
-.. function:: create_shortcut(target, description, filename[, arguments[, workdir[, iconpath[, iconindex]]]])
-
-   This function creates a shortcut. *target* is the path to the program to be
-   started by the shortcut. *description* is the description of the shortcut.
-   *filename* is the title of the shortcut that the user will see. *arguments*
-   specifies the command line arguments, if any. *workdir* is the working directory
-   for the program. *iconpath* is the file containing the icon for the shortcut,
-   and *iconindex* is the index of the icon in the file *iconpath*.  Again, for
-   details consult the Microsoft documentation for the :class:`IShellLink`
-   interface.
diff --git a/Doc/distutils/commandref.rst b/Doc/distutils/commandref.rst
deleted file mode 100644
index 3e247e68d3a05..0000000000000
--- a/Doc/distutils/commandref.rst
+++ /dev/null
@@ -1,105 +0,0 @@
-.. _reference:
-
-*****************
-Command Reference
-*****************
-
-.. include:: ./_setuptools_disclaimer.rst
-
-.. % \section{Building modules: the \protect\command{build} command family}
-.. % \label{build-cmds}
-.. % \subsubsection{\protect\command{build}}
-.. % \label{build-cmd}
-.. % \subsubsection{\protect\command{build\_py}}
-.. % \label{build-py-cmd}
-.. % \subsubsection{\protect\command{build\_ext}}
-.. % \label{build-ext-cmd}
-.. % \subsubsection{\protect\command{build\_clib}}
-.. % \label{build-clib-cmd}
-
-
-.. _install-cmd:
-
-Installing modules: the :command:`install` command family
-=========================================================
-
-The install command ensures that the build commands have been run and then runs
-the subcommands :command:`install_lib`, :command:`install_data` and
-:command:`install_scripts`.
-
-.. % \subsubsection{\protect\command{install\_lib}}
-.. % \label{install-lib-cmd}
-
-
-.. _install-data-cmd:
-
-:command:`install_data`
------------------------
-
-This command installs all data files provided with the distribution.
-
-
-.. _install-scripts-cmd:
-
-:command:`install_scripts`
---------------------------
-
-This command installs all (Python) scripts in the distribution.
-
-.. % \subsection{Cleaning up: the \protect\command{clean} command}
-.. % \label{clean-cmd}
-
-
-.. _sdist-cmd:
-
-Creating a source distribution: the :command:`sdist` command
-============================================================
-
-.. XXX fragment moved down from above: needs context!
-
-The manifest template commands are:
-
-+-------------------------------------------+-----------------------------------------------+
-| Command                                   | Description                                   |
-+===========================================+===============================================+
-| :command:`include pat1 pat2 ...`          | include all files matching any of the listed  |
-|                                           | patterns                                      |
-+-------------------------------------------+-----------------------------------------------+
-| :command:`exclude pat1 pat2 ...`          | exclude all files matching any of the listed  |
-|                                           | patterns                                      |
-+-------------------------------------------+-----------------------------------------------+
-| :command:`recursive-include dir pat1 pat2 | include all files under *dir* matching any of |
-| ...`                                      | the listed patterns                           |
-+-------------------------------------------+-----------------------------------------------+
-| :command:`recursive-exclude dir pat1 pat2 | exclude all files under *dir* matching any of |
-| ...`                                      | the listed patterns                           |
-+-------------------------------------------+-----------------------------------------------+
-| :command:`global-include pat1 pat2 ...`   | include all files anywhere in the source tree |
-|                                           | matching --- & any of the listed patterns     |
-+-------------------------------------------+-----------------------------------------------+
-| :command:`global-exclude pat1 pat2 ...`   | exclude all files anywhere in the source tree |
-|                                           | matching --- & any of the listed patterns     |
-+-------------------------------------------+-----------------------------------------------+
-| :command:`prune dir`                      | exclude all files under *dir*                 |
-+-------------------------------------------+-----------------------------------------------+
-| :command:`graft dir`                      | include all files under *dir*                 |
-+-------------------------------------------+-----------------------------------------------+
-
-The patterns here are Unix-style "glob" patterns: ``*`` matches any sequence of
-regular filename characters, ``?`` matches any single regular filename
-character, and ``[range]`` matches any of the characters in *range* (e.g.,
-``a-z``, ``a-zA-Z``, ``a-f0-9_.``).  The definition of "regular filename
-character" is platform-specific: on Unix it is anything except slash; on Windows
-anything except backslash or colon.
-
-.. XXX Windows support not there yet
-
-.. % \section{Creating a built distribution: the
-.. % \protect\command{bdist} command family}
-.. % \label{bdist-cmds}
-
-.. % \subsection{\protect\command{bdist}}
-.. % \subsection{\protect\command{bdist\_dumb}}
-.. % \subsection{\protect\command{bdist\_rpm}}
-
-
diff --git a/Doc/distutils/configfile.rst b/Doc/distutils/configfile.rst
deleted file mode 100644
index 2a5c8329e318b..0000000000000
--- a/Doc/distutils/configfile.rst
+++ /dev/null
@@ -1,144 +0,0 @@
-.. _setup-config:
-
-************************************
-Writing the Setup Configuration File
-************************************
-
-.. include:: ./_setuptools_disclaimer.rst
-
-Often, it's not possible to write down everything needed to build a distribution
-*a priori*: you may need to get some information from the user, or from the
-user's system, in order to proceed.  As long as that information is fairly
-simple---a list of directories to search for C header files or libraries, for
-example---then providing a configuration file, :file:`setup.cfg`, for users to
-edit is a cheap and easy way to solicit it.  Configuration files also let you
-provide default values for any command option, which the installer can then
-override either on the command-line or by editing the config file.
-
-The setup configuration file is a useful middle-ground between the setup
-script---which, ideally, would be opaque to installers [#]_---and the command-line to
-the setup script, which is outside of your control and entirely up to the
-installer.  In fact, :file:`setup.cfg` (and any other Distutils configuration
-files present on the target system) are processed after the contents of the
-setup script, but before the command-line.  This has  several useful
-consequences:
-
-.. % (If you have more advanced needs, such as determining which extensions
-.. % to build based on what capabilities are present on the target system,
-.. % then you need the Distutils ``auto-configuration'' facility.  This
-.. % started to appear in Distutils 0.9 but, as of this writing, isn't mature
-.. % or stable enough yet for real-world use.)
-
-* installers can override some of what you put in :file:`setup.py` by editing
-  :file:`setup.cfg`
-
-* you can provide non-standard defaults for options that are not easily set in
-  :file:`setup.py`
-
-* installers can override anything in :file:`setup.cfg` using the command-line
-  options to :file:`setup.py`
-
-The basic syntax of the configuration file is simple:
-
-.. code-block:: ini
-
-   [command]
-   option=value
-   ...
-
-where *command* is one of the Distutils commands (e.g. :command:`build_py`,
-:command:`install`), and *option* is one of the options that command supports.
-Any number of options can be supplied for each command, and any number of
-command sections can be included in the file.  Blank lines are ignored, as are
-comments, which run from a ``'#'`` character until the end of the line.  Long
-option values can be split across multiple lines simply by indenting the
-continuation lines.
-
-You can find out the list of options supported by a particular command with the
-universal :option:`!--help` option, e.g.
-
-.. code-block:: shell-session
-
-   $ python setup.py --help build_ext
-   [...]
-   Options for 'build_ext' command:
-     --build-lib (-b)     directory for compiled extension modules
-     --build-temp (-t)    directory for temporary files (build by-products)
-     --inplace (-i)       ignore build-lib and put compiled extensions into the
-                          source directory alongside your pure Python modules
-     --include-dirs (-I)  list of directories to search for header files
-     --define (-D)        C preprocessor macros to define
-     --undef (-U)         C preprocessor macros to undefine
-     --swig-opts          list of SWIG command line options
-   [...]
-
-Note that an option spelled :option:`!--foo-bar` on the command-line  is spelled
-``foo_bar`` in configuration files.
-
-.. _distutils-build-ext-inplace:
-
-For example, say you want your extensions to be built "in-place"---that is, you
-have an extension :mod:`pkg.ext`, and you want the compiled extension file
-(:file:`ext.so` on Unix, say) to be put in the same source directory as your
-pure Python modules :mod:`pkg.mod1` and :mod:`pkg.mod2`.  You can always use the
-:option:`!--inplace` option on the command-line to ensure this:
-
-.. code-block:: sh
-
-   python setup.py build_ext --inplace
-
-But this requires that you always specify the :command:`build_ext` command
-explicitly, and remember to provide :option:`!--inplace`. An easier way is to
-"set and forget" this option, by encoding it in :file:`setup.cfg`, the
-configuration file for this distribution:
-
-.. code-block:: ini
-
-   [build_ext]
-   inplace=1
-
-This will affect all builds of this module distribution, whether or not you
-explicitly specify :command:`build_ext`.  If you include :file:`setup.cfg` in
-your source distribution, it will also affect end-user builds---which is
-probably a bad idea for this option, since always building extensions in-place
-would break installation of the module distribution.  In certain peculiar cases,
-though, modules are built right in their installation directory, so this is
-conceivably a useful ability.  (Distributing extensions that expect to be built
-in their installation directory is almost always a bad idea, though.)
-
-Another example: certain commands take a lot of options that don't change from
-run to run; for example, :command:`bdist_rpm` needs to know everything required
-to generate a "spec" file for creating an RPM distribution.  Some of this
-information comes from the setup script, and some is automatically generated by
-the Distutils (such as the list of files installed).  But some of it has to be
-supplied as options to :command:`bdist_rpm`, which would be very tedious to do
-on the command-line for every run.  Hence, here is a snippet from the Distutils'
-own :file:`setup.cfg`:
-
-.. code-block:: ini
-
-   [bdist_rpm]
-   release = 1
-   packager = Greg Ward <gward at python.net>
-   doc_files = CHANGES.txt
-               README.txt
-               USAGE.txt
-               doc/
-               examples/
-
-Note that the ``doc_files`` option is simply a whitespace-separated string
-split across multiple lines for readability.
-
-
-.. seealso::
-
-   :ref:`inst-config-syntax` in "Installing Python Modules"
-      More information on the configuration files is available in the manual for
-      system administrators.
-
-
-.. rubric:: Footnotes
-
-.. [#] This ideal probably won't be achieved until auto-configuration is fully
-   supported by the Distutils.
-
diff --git a/Doc/distutils/examples.rst b/Doc/distutils/examples.rst
deleted file mode 100644
index e492b7f605759..0000000000000
--- a/Doc/distutils/examples.rst
+++ /dev/null
@@ -1,340 +0,0 @@
-.. _distutils_examples:
-
-******************
-Distutils Examples
-******************
-
-.. include:: ./_setuptools_disclaimer.rst
-
-This chapter provides a number of basic examples to help get started with
-distutils.  Additional information about using distutils can be found in the
-Distutils Cookbook.
-
-
-.. seealso::
-
-   `Distutils Cookbook <https://wiki.python.org/moin/Distutils/Cookbook>`_
-      Collection of recipes showing how to achieve more control over distutils.
-
-
-.. _pure-mod:
-
-Pure Python distribution (by module)
-====================================
-
-If you're just distributing a couple of modules, especially if they don't live
-in a particular package, you can specify them individually using the
-``py_modules`` option in the setup script.
-
-In the simplest case, you'll have two files to worry about: a setup script and
-the single module you're distributing, :file:`foo.py` in this example::
-
-   <root>/
-           setup.py
-           foo.py
-
-(In all diagrams in this section, *<root>* will refer to the distribution root
-directory.)  A minimal setup script to describe this situation would be::
-
-   from distutils.core import setup
-   setup(name='foo',
-         version='1.0',
-         py_modules=['foo'],
-         )
-
-Note that the name of the distribution is specified independently with the
-``name`` option, and there's no rule that says it has to be the same as
-the name of the sole module in the distribution (although that's probably a good
-convention to follow).  However, the distribution name is used to generate
-filenames, so you should stick to letters, digits, underscores, and hyphens.
-
-Since ``py_modules`` is a list, you can of course specify multiple
-modules, eg. if you're distributing modules :mod:`foo` and :mod:`bar`, your
-setup might look like this::
-
-   <root>/
-           setup.py
-           foo.py
-           bar.py
-
-and the setup script might be  ::
-
-   from distutils.core import setup
-   setup(name='foobar',
-         version='1.0',
-         py_modules=['foo', 'bar'],
-         )
-
-You can put module source files into another directory, but if you have enough
-modules to do that, it's probably easier to specify modules by package rather
-than listing them individually.
-
-
-.. _pure-pkg:
-
-Pure Python distribution (by package)
-=====================================
-
-If you have more than a couple of modules to distribute, especially if they are
-in multiple packages, it's probably easier to specify whole packages rather than
-individual modules.  This works even if your modules are not in a package; you
-can just tell the Distutils to process modules from the root package, and that
-works the same as any other package (except that you don't have to have an
-:file:`__init__.py` file).
-
-The setup script from the last example could also be written as  ::
-
-   from distutils.core import setup
-   setup(name='foobar',
-         version='1.0',
-         packages=[''],
-         )
-
-(The empty string stands for the root package.)
-
-If those two files are moved into a subdirectory, but remain in the root
-package, e.g.::
-
-   <root>/
-           setup.py
-           src/      foo.py
-                     bar.py
-
-then you would still specify the root package, but you have to tell the
-Distutils where source files in the root package live::
-
-   from distutils.core import setup
-   setup(name='foobar',
-         version='1.0',
-         package_dir={'': 'src'},
-         packages=[''],
-         )
-
-More typically, though, you will want to distribute multiple modules in the same
-package (or in sub-packages).  For example, if the :mod:`foo`  and :mod:`bar`
-modules belong in package :mod:`foobar`, one way to layout your source tree is
-::
-
-   <root>/
-           setup.py
-           foobar/
-                    __init__.py
-                    foo.py
-                    bar.py
-
-This is in fact the default layout expected by the Distutils, and the one that
-requires the least work to describe in your setup script::
-
-   from distutils.core import setup
-   setup(name='foobar',
-         version='1.0',
-         packages=['foobar'],
-         )
-
-If you want to put modules in directories not named for their package, then you
-need to use the ``package_dir`` option again.  For example, if the
-:file:`src` directory holds modules in the :mod:`foobar` package::
-
-   <root>/
-           setup.py
-           src/
-                    __init__.py
-                    foo.py
-                    bar.py
-
-an appropriate setup script would be  ::
-
-   from distutils.core import setup
-   setup(name='foobar',
-         version='1.0',
-         package_dir={'foobar': 'src'},
-         packages=['foobar'],
-         )
-
-Or, you might put modules from your main package right in the distribution
-root::
-
-   <root>/
-           setup.py
-           __init__.py
-           foo.py
-           bar.py
-
-in which case your setup script would be  ::
-
-   from distutils.core import setup
-   setup(name='foobar',
-         version='1.0',
-         package_dir={'foobar': ''},
-         packages=['foobar'],
-         )
-
-(The empty string also stands for the current directory.)
-
-If you have sub-packages, they must be explicitly listed in ``packages``,
-but any entries in ``package_dir`` automatically extend to sub-packages.
-(In other words, the Distutils does *not* scan your source tree, trying to
-figure out which directories correspond to Python packages by looking for
-:file:`__init__.py` files.)  Thus, if the default layout grows a sub-package::
-
-   <root>/
-           setup.py
-           foobar/
-                    __init__.py
-                    foo.py
-                    bar.py
-                    subfoo/
-                              __init__.py
-                              blah.py
-
-then the corresponding setup script would be  ::
-
-   from distutils.core import setup
-   setup(name='foobar',
-         version='1.0',
-         packages=['foobar', 'foobar.subfoo'],
-         )
-
-
-.. _single-ext:
-
-Single extension module
-=======================
-
-Extension modules are specified using the ``ext_modules`` option.
-``package_dir`` has no effect on where extension source files are found;
-it only affects the source for pure Python modules.  The simplest  case, a
-single extension module in a single C source file, is::
-
-   <root>/
-           setup.py
-           foo.c
-
-If the :mod:`foo` extension belongs in the root package, the setup script for
-this could be  ::
-
-   from distutils.core import setup
-   from distutils.extension import Extension
-   setup(name='foobar',
-         version='1.0',
-         ext_modules=[Extension('foo', ['foo.c'])],
-         )
-
-If the extension actually belongs in a package, say :mod:`foopkg`, then
-
-With exactly the same source tree layout, this extension can be put in the
-:mod:`foopkg` package simply by changing the name of the extension::
-
-   from distutils.core import setup
-   from distutils.extension import Extension
-   setup(name='foobar',
-         version='1.0',
-         ext_modules=[Extension('foopkg.foo', ['foo.c'])],
-         )
-
-Checking a package
-==================
-
-The ``check`` command allows you to verify if your package meta-data
-meet the minimum requirements to build a distribution.
-
-To run it, just call it using your :file:`setup.py` script. If something is
-missing, ``check`` will display a warning.
-
-Let's take an example with a simple script::
-
-    from distutils.core import setup
-
-    setup(name='foobar')
-
-Running the ``check`` command will display some warnings:
-
-.. code-block:: shell-session
-
-    $ python setup.py check
-    running check
-    warning: check: missing required meta-data: version, url
-    warning: check: missing meta-data: either (author and author_email) or
-             (maintainer and maintainer_email) should be supplied
-
-
-If you use the reStructuredText syntax in the ``long_description`` field and
-`docutils`_  is installed you can check if the syntax is fine with the
-``check`` command, using the ``restructuredtext`` option.
-
-For example, if the :file:`setup.py` script is changed like this::
-
-    from distutils.core import setup
-
-    desc = """\
-    My description
-    ==============
-
-    This is the description of the ``foobar`` package.
-    """
-
-    setup(name='foobar', version='1', author='tarek',
-        author_email='tarek at ziade.org',
-        url='http://example.com', long_description=desc)
-
-Where the long description is broken, ``check`` will be able to detect it
-by using the :mod:`docutils` parser:
-
-.. code-block:: shell-session
-
-    $ python setup.py check --restructuredtext
-    running check
-    warning: check: Title underline too short. (line 2)
-    warning: check: Could not finish the parsing.
-
-Reading the metadata
-=====================
-
-The :func:`distutils.core.setup` function provides a command-line interface
-that allows you to query the metadata fields of a project through the
-``setup.py`` script of a given project:
-
-.. code-block:: shell-session
-
-    $ python setup.py --name
-    distribute
-
-This call reads the ``name`` metadata by running the
-:func:`distutils.core.setup`  function. Although, when a source or binary
-distribution is created with Distutils, the metadata fields are written
-in a static file called :file:`PKG-INFO`. When a Distutils-based project is
-installed in Python, the :file:`PKG-INFO` file is copied alongside the modules
-and packages of the distribution under :file:`NAME-VERSION-pyX.X.egg-info`,
-where ``NAME`` is the name of the project, ``VERSION`` its version as defined
-in the Metadata, and ``pyX.X`` the major and minor version of Python like
-``2.7`` or ``3.2``.
-
-You can read back this static file, by using the
-:class:`distutils.dist.DistributionMetadata` class and its
-:func:`read_pkg_file` method::
-
-    >>> from distutils.dist import DistributionMetadata
-    >>> metadata = DistributionMetadata()
-    >>> metadata.read_pkg_file(open('distribute-0.6.8-py2.7.egg-info'))
-    >>> metadata.name
-    'distribute'
-    >>> metadata.version
-    '0.6.8'
-    >>> metadata.description
-    'Easily download, build, install, upgrade, and uninstall Python packages'
-
-Notice that the class can also be instantiated with a metadata file path to
-loads its values::
-
-    >>> pkg_info_path = 'distribute-0.6.8-py2.7.egg-info'
-    >>> DistributionMetadata(pkg_info_path).name
-    'distribute'
-
-
-.. % \section{Multiple extension modules}
-.. % \label{multiple-ext}
-
-.. % \section{Putting it all together}
-
-
-.. _docutils: http://docutils.sourceforge.net
diff --git a/Doc/distutils/extending.rst b/Doc/distutils/extending.rst
deleted file mode 100644
index 1075e81779a7b..0000000000000
--- a/Doc/distutils/extending.rst
+++ /dev/null
@@ -1,98 +0,0 @@
-.. _extending-distutils:
-
-*******************
-Extending Distutils
-*******************
-
-.. include:: ./_setuptools_disclaimer.rst
-
-Distutils can be extended in various ways.  Most extensions take the form of new
-commands or replacements for existing commands.  New commands may be written to
-support new types of platform-specific packaging, for example, while
-replacements for existing commands may be made to modify details of how the
-command operates on a package.
-
-Most extensions of the distutils are made within :file:`setup.py` scripts that
-want to modify existing commands; many simply add a few file extensions that
-should be copied into packages in addition to :file:`.py` files as a
-convenience.
-
-Most distutils command implementations are subclasses of the
-:class:`distutils.cmd.Command` class.  New commands may directly inherit from
-:class:`Command`, while replacements often derive from :class:`Command`
-indirectly, directly subclassing the command they are replacing.  Commands are
-required to derive from :class:`Command`.
-
-.. % \section{Extending existing commands}
-.. % \label{extend-existing}
-
-.. % \section{Writing new commands}
-.. % \label{new-commands}
-.. % \XXX{Would an uninstall command be a good example here?}
-
-
-Integrating new commands
-========================
-
-There are different ways to integrate new command implementations into
-distutils.  The most difficult is to lobby for the inclusion of the new features
-in distutils itself, and wait for (and require) a version of Python that
-provides that support.  This is really hard for many reasons.
-
-The most common, and possibly the most reasonable for most needs, is to include
-the new implementations with your :file:`setup.py` script, and cause the
-:func:`distutils.core.setup` function use them::
-
-   from distutils.command.build_py import build_py as _build_py
-   from distutils.core import setup
-
-   class build_py(_build_py):
-       """Specialized Python source builder."""
-
-       # implement whatever needs to be different...
-
-   setup(cmdclass={'build_py': build_py},
-         ...)
-
-This approach is most valuable if the new implementations must be used to use a
-particular package, as everyone interested in the package will need to have the
-new command implementation.
-
-Beginning with Python 2.4, a third option is available, intended to allow new
-commands to be added which can support existing :file:`setup.py` scripts without
-requiring modifications to the Python installation.  This is expected to allow
-third-party extensions to provide support for additional packaging systems, but
-the commands can be used for anything distutils commands can be used for.  A new
-configuration option, ``command_packages`` (command-line option
-:option:`!--command-packages`), can be used to specify additional packages to be
-searched for modules implementing commands.  Like all distutils options, this
-can be specified on the command line or in a configuration file.  This option
-can only be set in the ``[global]`` section of a configuration file, or before
-any commands on the command line.  If set in a configuration file, it can be
-overridden from the command line; setting it to an empty string on the command
-line causes the default to be used.  This should never be set in a configuration
-file provided with a package.
-
-This new option can be used to add any number of packages to the list of
-packages searched for command implementations; multiple package names should be
-separated by commas.  When not specified, the search is only performed in the
-:mod:`distutils.command` package.  When :file:`setup.py` is run with the option
-``--command-packages distcmds,buildcmds``, however, the packages
-:mod:`distutils.command`, :mod:`distcmds`, and :mod:`buildcmds` will be searched
-in that order.  New commands are expected to be implemented in modules of the
-same name as the command by classes sharing the same name.  Given the example
-command line option above, the command :command:`bdist_openpkg` could be
-implemented by the class :class:`distcmds.bdist_openpkg.bdist_openpkg` or
-:class:`buildcmds.bdist_openpkg.bdist_openpkg`.
-
-
-Adding new distribution types
-=============================
-
-Commands that create distributions (files in the :file:`dist/` directory) need
-to add ``(command, filename)`` pairs to ``self.distribution.dist_files`` so that
-:command:`upload` can upload it to PyPI.  The *filename* in the pair contains no
-path information, only the name of the file itself.  In dry-run mode, pairs
-should still be added to represent what would have been created.
-
-
diff --git a/Doc/distutils/index.rst b/Doc/distutils/index.rst
deleted file mode 100644
index 2ccddc38b5f26..0000000000000
--- a/Doc/distutils/index.rst
+++ /dev/null
@@ -1,49 +0,0 @@
-.. _distutils-index:
-
-##############################################
-  Distributing Python Modules (Legacy version)
-##############################################
-
-:Authors: Greg Ward, Anthony Baxter
-:Email: distutils-sig at python.org
-
-.. seealso::
-
-   :ref:`distributing-index`
-      The up to date module distribution documentations
-
-.. note::
-
-   The entire ``distutils`` package has been deprecated and will be
-   removed in Python 3.12. This documentation is retained as a
-   reference only, and will be removed with the package. See the
-   :ref:`What's New <distutils-deprecated>` entry for more information.
-
-.. include:: ./_setuptools_disclaimer.rst
-
-.. note::
-
-   This guide only covers the basic tools for building and distributing
-   extensions that are provided as part of this version of Python. Third party
-   tools offer easier to use and more secure alternatives. Refer to the `quick
-   recommendations section <https://packaging.python.org/guides/tool-recommendations/>`__
-   in the Python Packaging User Guide for more information.
-
-This document describes the Python Distribution Utilities ("Distutils") from
-the module developer's point of view, describing the underlying capabilities
-that ``setuptools`` builds on to allow Python developers to make Python modules
-and extensions readily available to a wider audience.
-
-.. toctree::
-   :maxdepth: 2
-   :numbered:
-
-   introduction.rst
-   setupscript.rst
-   configfile.rst
-   sourcedist.rst
-   builtdist.rst
-   examples.rst
-   extending.rst
-   commandref.rst
-   apiref.rst
diff --git a/Doc/distutils/introduction.rst b/Doc/distutils/introduction.rst
deleted file mode 100644
index 87ed178e52bd4..0000000000000
--- a/Doc/distutils/introduction.rst
+++ /dev/null
@@ -1,203 +0,0 @@
-.. _distutils-intro:
-
-****************************
-An Introduction to Distutils
-****************************
-
-.. include:: ./_setuptools_disclaimer.rst
-
-This document covers using the Distutils to distribute your Python modules,
-concentrating on the role of developer/distributor: if you're looking for
-information on installing Python modules, you should refer to the
-:ref:`install-index` chapter.
-
-
-.. _distutils-concepts:
-
-Concepts & Terminology
-======================
-
-Using the Distutils is quite simple, both for module developers and for
-users/administrators installing third-party modules.  As a developer, your
-responsibilities (apart from writing solid, well-documented and well-tested
-code, of course!) are:
-
-* write a setup script (:file:`setup.py` by convention)
-
-* (optional) write a setup configuration file
-
-* create a source distribution
-
-* (optional) create one or more built (binary) distributions
-
-Each of these tasks is covered in this document.
-
-Not all module developers have access to a multitude of platforms, so it's not
-always feasible to expect them to create a multitude of built distributions.  It
-is hoped that a class of intermediaries, called *packagers*, will arise to
-address this need.  Packagers will take source distributions released by module
-developers, build them on one or more platforms, and release the resulting built
-distributions.  Thus, users on the most popular platforms will be able to
-install most popular Python module distributions in the most natural way for
-their platform, without having to run a single setup script or compile a line of
-code.
-
-
-.. _distutils-simple-example:
-
-A Simple Example
-================
-
-The setup script is usually quite simple, although since it's written in Python,
-there are no arbitrary limits to what you can do with it, though you should be
-careful about putting arbitrarily expensive operations in your setup script.
-Unlike, say, Autoconf-style configure scripts, the setup script may be run
-multiple times in the course of building and installing your module
-distribution.
-
-If all you want to do is distribute a module called :mod:`foo`, contained in a
-file :file:`foo.py`, then your setup script can be as simple as this::
-
-   from distutils.core import setup
-   setup(name='foo',
-         version='1.0',
-         py_modules=['foo'],
-         )
-
-Some observations:
-
-* most information that you supply to the Distutils is supplied as keyword
-  arguments to the :func:`setup` function
-
-* those keyword arguments fall into two categories: package metadata (name,
-  version number) and information about what's in the package (a list of pure
-  Python modules, in this case)
-
-* modules are specified by module name, not filename (the same will hold true
-  for packages and extensions)
-
-* it's recommended that you supply a little more metadata, in particular your
-  name, email address and a URL for the project (see section :ref:`setup-script`
-  for an example)
-
-To create a source distribution for this module, you would create a setup
-script, :file:`setup.py`, containing the above code, and run this command from a
-terminal::
-
-   python setup.py sdist
-
-For Windows, open a command prompt window (:menuselection:`Start -->
-Accessories`) and change the command to::
-
-   setup.py sdist
-
-:command:`sdist` will create an archive file (e.g., tarball on Unix, ZIP file on Windows)
-containing your setup script :file:`setup.py`, and your module :file:`foo.py`.
-The archive file will be named :file:`foo-1.0.tar.gz` (or :file:`.zip`), and
-will unpack into a directory :file:`foo-1.0`.
-
-If an end-user wishes to install your :mod:`foo` module, all they have to do is
-download :file:`foo-1.0.tar.gz` (or :file:`.zip`), unpack it, and---from the
-:file:`foo-1.0` directory---run ::
-
-   python setup.py install
-
-which will ultimately copy :file:`foo.py` to the appropriate directory for
-third-party modules in their Python installation.
-
-This simple example demonstrates some fundamental concepts of the Distutils.
-First, both developers and installers have the same basic user interface, i.e.
-the setup script.  The difference is which Distutils *commands* they use: the
-:command:`sdist` command is almost exclusively for module developers, while
-:command:`install` is more often for installers (although most developers will
-want to install their own code occasionally).
-
-Other useful built distribution formats are RPM, implemented by the
-:command:`bdist_rpm` command, Solaris :program:`pkgtool`
-(:command:`bdist_pkgtool`), and HP-UX :program:`swinstall`
-(:command:`bdist_sdux`).  For example, the following command will create an RPM
-file called :file:`foo-1.0.noarch.rpm`::
-
-   python setup.py bdist_rpm
-
-(The :command:`bdist_rpm` command uses the :command:`rpm` executable, therefore
-this has to be run on an RPM-based system such as Red Hat Linux, SuSE Linux, or
-Mandrake Linux.)
-
-You can find out what distribution formats are available at any time by running
-::
-
-   python setup.py bdist --help-formats
-
-
-.. _python-terms:
-
-General Python terminology
-==========================
-
-If you're reading this document, you probably have a good idea of what modules,
-extensions, and so forth are.  Nevertheless, just to be sure that everyone is
-operating from a common starting point, we offer the following glossary of
-common Python terms:
-
-module
-   the basic unit of code reusability in Python: a block of code imported by some
-   other code.  Three types of modules concern us here: pure Python modules,
-   extension modules, and packages.
-
-pure Python module
-   a module written in Python and contained in a single :file:`.py` file (and
-   possibly associated :file:`.pyc` files).  Sometimes referred to as a
-   "pure module."
-
-extension module
-   a module written in the low-level language of the Python implementation: C/C++
-   for Python, Java for Jython. Typically contained in a single dynamically
-   loadable pre-compiled file, e.g. a shared object (:file:`.so`) file for Python
-   extensions on Unix, a DLL (given the :file:`.pyd` extension) for Python
-   extensions on Windows, or a Java class file for Jython extensions.  (Note that
-   currently, the Distutils only handles C/C++ extensions for Python.)
-
-package
-   a module that contains other modules; typically contained in a directory in the
-   filesystem and distinguished from other directories by the presence of a file
-   :file:`__init__.py`.
-
-root package
-   the root of the hierarchy of packages.  (This isn't really a package, since it
-   doesn't have an :file:`__init__.py` file.  But we have to call it something.)
-   The vast majority of the standard library is in the root package, as are many
-   small, standalone third-party modules that don't belong to a larger module
-   collection. Unlike regular packages, modules in the root package can be found in
-   many directories: in fact, every directory listed in ``sys.path`` contributes
-   modules to the root package.
-
-
-.. _distutils-term:
-
-Distutils-specific terminology
-==============================
-
-The following terms apply more specifically to the domain of distributing Python
-modules using the Distutils:
-
-module distribution
-   a collection of Python modules distributed together as a single downloadable
-   resource and meant to be installed *en masse*.  Examples of some well-known
-   module distributions are NumPy, SciPy, Pillow,
-   or mxBase.  (This would be called a *package*, except that term is
-   already taken in the Python context: a single module distribution may contain
-   zero, one, or many Python packages.)
-
-pure module distribution
-   a module distribution that contains only pure Python modules and packages.
-   Sometimes referred to as a "pure distribution."
-
-non-pure module distribution
-   a module distribution that contains at least one extension module.  Sometimes
-   referred to as a "non-pure distribution."
-
-distribution root
-   the top-level directory of your source tree (or  source distribution); the
-   directory where :file:`setup.py` exists.  Generally  :file:`setup.py` will be
-   run from this directory.
diff --git a/Doc/distutils/packageindex.rst b/Doc/distutils/packageindex.rst
deleted file mode 100644
index ccb9a598b2b7a..0000000000000
--- a/Doc/distutils/packageindex.rst
+++ /dev/null
@@ -1,16 +0,0 @@
-:orphan:
-
-.. _package-index:
-
-*******************************
-The Python Package Index (PyPI)
-*******************************
-
-The `Python Package Index (PyPI)`_ stores metadata describing distributions
-packaged with distutils and other publishing tools, as well the distribution
-archives themselves.
-
-References to up to date PyPI documentation can be found at
-:ref:`publishing-python-packages`.
-
-.. _Python Package Index (PyPI): https://pypi.org
diff --git a/Doc/distutils/setupscript.rst b/Doc/distutils/setupscript.rst
deleted file mode 100644
index 4386a60b664bf..0000000000000
--- a/Doc/distutils/setupscript.rst
+++ /dev/null
@@ -1,713 +0,0 @@
-.. _setup-script:
-
-************************
-Writing the Setup Script
-************************
-
-.. include:: ./_setuptools_disclaimer.rst
-
-The setup script is the centre of all activity in building, distributing, and
-installing modules using the Distutils.  The main purpose of the setup script is
-to describe your module distribution to the Distutils, so that the various
-commands that operate on your modules do the right thing.  As we saw in section
-:ref:`distutils-simple-example` above, the setup script consists mainly of a call to
-:func:`setup`, and most information supplied to the Distutils by the module
-developer is supplied as keyword arguments to :func:`setup`.
-
-Here's a slightly more involved example, which we'll follow for the next couple
-of sections: the Distutils' own setup script.  (Keep in mind that although the
-Distutils are included with Python 1.6 and later, they also have an independent
-existence so that Python 1.5.2 users can use them to install other module
-distributions.  The Distutils' own setup script, shown here, is used to install
-the package into Python 1.5.2.) ::
-
-    #!/usr/bin/env python
-
-    from distutils.core import setup
-
-    setup(name='Distutils',
-          version='1.0',
-          description='Python Distribution Utilities',
-          author='Greg Ward',
-          author_email='gward at python.net',
-          url='https://www.python.org/sigs/distutils-sig/',
-          packages=['distutils', 'distutils.command'],
-         )
-
-There are only two differences between this and the trivial one-file
-distribution presented in section :ref:`distutils-simple-example`: more metadata, and the
-specification of pure Python modules by package, rather than by module.  This is
-important since the Distutils consist of a couple of dozen modules split into
-(so far) two packages; an explicit list of every module would be tedious to
-generate and difficult to maintain.  For more information on the additional
-meta-data, see section :ref:`meta-data`.
-
-Note that any pathnames (files or directories) supplied in the setup script
-should be written using the Unix convention, i.e. slash-separated.  The
-Distutils will take care of converting this platform-neutral representation into
-whatever is appropriate on your current platform before actually using the
-pathname.  This makes your setup script portable across operating systems, which
-of course is one of the major goals of the Distutils.  In this spirit, all
-pathnames in this document are slash-separated.
-
-This, of course, only applies to pathnames given to Distutils functions.  If
-you, for example, use standard Python functions such as :func:`glob.glob` or
-:func:`os.listdir` to specify files, you should be careful to write portable
-code instead of hardcoding path separators::
-
-    glob.glob(os.path.join('mydir', 'subdir', '*.html'))
-    os.listdir(os.path.join('mydir', 'subdir'))
-
-
-.. _listing-packages:
-
-Listing whole packages
-======================
-
-The ``packages`` option tells the Distutils to process (build, distribute,
-install, etc.) all pure Python modules found in each package mentioned in the
-``packages`` list.  In order to do this, of course, there has to be a
-correspondence between package names and directories in the filesystem.  The
-default correspondence is the most obvious one, i.e. package :mod:`distutils` is
-found in the directory :file:`distutils` relative to the distribution root.
-Thus, when you say ``packages = ['foo']`` in your setup script, you are
-promising that the Distutils will find a file :file:`foo/__init__.py` (which
-might be spelled differently on your system, but you get the idea) relative to
-the directory where your setup script lives.  If you break this promise, the
-Distutils will issue a warning but still process the broken package anyway.
-
-If you use a different convention to lay out your source directory, that's no
-problem: you just have to supply the ``package_dir`` option to tell the
-Distutils about your convention.  For example, say you keep all Python source
-under :file:`lib`, so that modules in the "root package" (i.e., not in any
-package at all) are in :file:`lib`, modules in the :mod:`foo` package are in
-:file:`lib/foo`, and so forth.  Then you would put ::
-
-    package_dir = {'': 'lib'}
-
-in your setup script.  The keys to this dictionary are package names, and an
-empty package name stands for the root package.  The values are directory names
-relative to your distribution root.  In this case, when you say ``packages =
-['foo']``, you are promising that the file :file:`lib/foo/__init__.py` exists.
-
-Another possible convention is to put the :mod:`foo` package right in
-:file:`lib`, the :mod:`foo.bar` package in :file:`lib/bar`, etc.  This would be
-written in the setup script as ::
-
-    package_dir = {'foo': 'lib'}
-
-A ``package: dir`` entry in the ``package_dir`` dictionary implicitly
-applies to all packages below *package*, so the :mod:`foo.bar` case is
-automatically handled here.  In this example, having ``packages = ['foo',
-'foo.bar']`` tells the Distutils to look for :file:`lib/__init__.py` and
-:file:`lib/bar/__init__.py`.  (Keep in mind that although ``package_dir``
-applies recursively, you must explicitly list all packages in
-``packages``: the Distutils will *not* recursively scan your source tree
-looking for any directory with an :file:`__init__.py` file.)
-
-
-.. _listing-modules:
-
-Listing individual modules
-==========================
-
-For a small module distribution, you might prefer to list all modules rather
-than listing packages---especially the case of a single module that goes in the
-"root package" (i.e., no package at all).  This simplest case was shown in
-section :ref:`distutils-simple-example`; here is a slightly more involved example::
-
-    py_modules = ['mod1', 'pkg.mod2']
-
-This describes two modules, one of them in the "root" package, the other in the
-:mod:`pkg` package.  Again, the default package/directory layout implies that
-these two modules can be found in :file:`mod1.py` and :file:`pkg/mod2.py`, and
-that :file:`pkg/__init__.py` exists as well. And again, you can override the
-package/directory correspondence using the ``package_dir`` option.
-
-
-.. _describing-extensions:
-
-Describing extension modules
-============================
-
-Just as writing Python extension modules is a bit more complicated than writing
-pure Python modules, describing them to the Distutils is a bit more complicated.
-Unlike pure modules, it's not enough just to list modules or packages and expect
-the Distutils to go out and find the right files; you have to specify the
-extension name, source file(s), and any compile/link requirements (include
-directories, libraries to link with, etc.).
-
-.. XXX read over this section
-
-All of this is done through another keyword argument to :func:`setup`, the
-``ext_modules`` option.  ``ext_modules`` is just a list of
-:class:`~distutils.core.Extension` instances, each of which describes a
-single extension module.
-Suppose your distribution includes a single extension, called :mod:`foo` and
-implemented by :file:`foo.c`.  If no additional instructions to the
-compiler/linker are needed, describing this extension is quite simple::
-
-    Extension('foo', ['foo.c'])
-
-The :class:`Extension` class can be imported from :mod:`distutils.core` along
-with :func:`setup`.  Thus, the setup script for a module distribution that
-contains only this one extension and nothing else might be::
-
-    from distutils.core import setup, Extension
-    setup(name='foo',
-          version='1.0',
-          ext_modules=[Extension('foo', ['foo.c'])],
-          )
-
-The :class:`Extension` class (actually, the underlying extension-building
-machinery implemented by the :command:`build_ext` command) supports a great deal
-of flexibility in describing Python extensions, which is explained in the
-following sections.
-
-
-Extension names and packages
-----------------------------
-
-The first argument to the :class:`~distutils.core.Extension` constructor is
-always the name of the extension, including any package names.  For example, ::
-
-    Extension('foo', ['src/foo1.c', 'src/foo2.c'])
-
-describes an extension that lives in the root package, while ::
-
-    Extension('pkg.foo', ['src/foo1.c', 'src/foo2.c'])
-
-describes the same extension in the :mod:`pkg` package.  The source files and
-resulting object code are identical in both cases; the only difference is where
-in the filesystem (and therefore where in Python's namespace hierarchy) the
-resulting extension lives.
-
-If you have a number of extensions all in the same package (or all under the
-same base package), use the ``ext_package`` keyword argument to
-:func:`setup`.  For example, ::
-
-    setup(...,
-          ext_package='pkg',
-          ext_modules=[Extension('foo', ['foo.c']),
-                       Extension('subpkg.bar', ['bar.c'])],
-         )
-
-will compile :file:`foo.c` to the extension :mod:`pkg.foo`, and :file:`bar.c` to
-:mod:`pkg.subpkg.bar`.
-
-
-Extension source files
-----------------------
-
-The second argument to the :class:`~distutils.core.Extension` constructor is
-a list of source
-files.  Since the Distutils currently only support C, C++, and Objective-C
-extensions, these are normally C/C++/Objective-C source files.  (Be sure to use
-appropriate extensions to distinguish C++ source files: :file:`.cc` and
-:file:`.cpp` seem to be recognized by both Unix and Windows compilers.)
-
-However, you can also include SWIG interface (:file:`.i`) files in the list; the
-:command:`build_ext` command knows how to deal with SWIG extensions: it will run
-SWIG on the interface file and compile the resulting C/C++ file into your
-extension.
-
-.. XXX SWIG support is rough around the edges and largely untested!
-
-This warning notwithstanding, options to SWIG can be currently passed like
-this::
-
-    setup(...,
-          ext_modules=[Extension('_foo', ['foo.i'],
-                                 swig_opts=['-modern', '-I../include'])],
-          py_modules=['foo'],
-         )
-
-Or on the commandline like this::
-
-    > python setup.py build_ext --swig-opts="-modern -I../include"
-
-On some platforms, you can include non-source files that are processed by the
-compiler and included in your extension.  Currently, this just means Windows
-message text (:file:`.mc`) files and resource definition (:file:`.rc`) files for
-Visual C++. These will be compiled to binary resource (:file:`.res`) files and
-linked into the executable.
-
-
-Preprocessor options
---------------------
-
-Three optional arguments to :class:`~distutils.core.Extension` will help if
-you need to specify include directories to search or preprocessor macros to
-define/undefine: ``include_dirs``, ``define_macros``, and ``undef_macros``.
-
-For example, if your extension requires header files in the :file:`include`
-directory under your distribution root, use the ``include_dirs`` option::
-
-    Extension('foo', ['foo.c'], include_dirs=['include'])
-
-You can specify absolute directories there; if you know that your extension will
-only be built on Unix systems with X11R6 installed to :file:`/usr`, you can get
-away with ::
-
-    Extension('foo', ['foo.c'], include_dirs=['/usr/include/X11'])
-
-You should avoid this sort of non-portable usage if you plan to distribute your
-code: it's probably better to write C code like  ::
-
-    #include <X11/Xlib.h>
-
-If you need to include header files from some other Python extension, you can
-take advantage of the fact that header files are installed in a consistent way
-by the Distutils :command:`install_headers` command.  For example, the Numerical
-Python header files are installed (on a standard Unix installation) to
-:file:`/usr/local/include/python1.5/Numerical`. (The exact location will differ
-according to your platform and Python installation.)  Since the Python include
-directory---\ :file:`/usr/local/include/python1.5` in this case---is always
-included in the search path when building Python extensions, the best approach
-is to write C code like  ::
-
-    #include <Numerical/arrayobject.h>
-
-If you must put the :file:`Numerical` include directory right into your header
-search path, though, you can find that directory using the Distutils
-:mod:`distutils.sysconfig` module::
-
-    from distutils.sysconfig import get_python_inc
-    incdir = os.path.join(get_python_inc(plat_specific=1), 'Numerical')
-    setup(...,
-          Extension(..., include_dirs=[incdir]),
-          )
-
-Even though this is quite portable---it will work on any Python installation,
-regardless of platform---it's probably easier to just write your C code in the
-sensible way.
-
-You can define and undefine pre-processor macros with the ``define_macros`` and
-``undef_macros`` options. ``define_macros`` takes a list of ``(name, value)``
-tuples, where ``name`` is the name of the macro to define (a string) and
-``value`` is its value: either a string or ``None``.  (Defining a macro ``FOO``
-to ``None`` is the equivalent of a bare ``#define FOO`` in your C source: with
-most compilers, this sets ``FOO`` to the string ``1``.)  ``undef_macros`` is
-just a list of macros to undefine.
-
-For example::
-
-    Extension(...,
-              define_macros=[('NDEBUG', '1'),
-                             ('HAVE_STRFTIME', None)],
-              undef_macros=['HAVE_FOO', 'HAVE_BAR'])
-
-is the equivalent of having this at the top of every C source file::
-
-    #define NDEBUG 1
-    #define HAVE_STRFTIME
-    #undef HAVE_FOO
-    #undef HAVE_BAR
-
-
-Library options
----------------
-
-You can also specify the libraries to link against when building your extension,
-and the directories to search for those libraries.  The ``libraries`` option is
-a list of libraries to link against, ``library_dirs`` is a list of directories
-to search for libraries at  link-time, and ``runtime_library_dirs`` is a list of
-directories to  search for shared (dynamically loaded) libraries at run-time.
-
-For example, if you need to link against libraries known to be in the standard
-library search path on target systems ::
-
-    Extension(...,
-              libraries=['gdbm', 'readline'])
-
-If you need to link with libraries in a non-standard location, you'll have to
-include the location in ``library_dirs``::
-
-    Extension(...,
-              library_dirs=['/usr/X11R6/lib'],
-              libraries=['X11', 'Xt'])
-
-(Again, this sort of non-portable construct should be avoided if you intend to
-distribute your code.)
-
-.. XXX Should mention clib libraries here or somewhere else!
-
-
-Other options
--------------
-
-There are still some other options which can be used to handle special cases.
-
-The ``optional`` option is a boolean; if it is true,
-a build failure in the extension will not abort the build process, but
-instead simply not install the failing extension.
-
-The ``extra_objects`` option is a list of object files to be passed to the
-linker. These files must not have extensions, as the default extension for the
-compiler is used.
-
-``extra_compile_args`` and ``extra_link_args`` can be used to
-specify additional command line options for the respective compiler and linker
-command lines.
-
-``export_symbols`` is only useful on Windows.  It can contain a list of
-symbols (functions or variables) to be exported. This option is not needed when
-building compiled extensions: Distutils  will automatically add ``initmodule``
-to the list of exported symbols.
-
-The ``depends`` option is a list of files that the extension depends on
-(for example header files). The build command will call the compiler on the
-sources to rebuild extension if any on this files has been modified since the
-previous build.
-
-Relationships between Distributions and Packages
-================================================
-
-A distribution may relate to packages in three specific ways:
-
-#. It can require packages or modules.
-
-#. It can provide packages or modules.
-
-#. It can obsolete packages or modules.
-
-These relationships can be specified using keyword arguments to the
-:func:`distutils.core.setup` function.
-
-Dependencies on other Python modules and packages can be specified by supplying
-the *requires* keyword argument to :func:`setup`. The value must be a list of
-strings.  Each string specifies a package that is required, and optionally what
-versions are sufficient.
-
-To specify that any version of a module or package is required, the string
-should consist entirely of the module or package name. Examples include
-``'mymodule'`` and ``'xml.parsers.expat'``.
-
-If specific versions are required, a sequence of qualifiers can be supplied in
-parentheses.  Each qualifier may consist of a comparison operator and a version
-number.  The accepted comparison operators are::
-
-    <    >    ==
-    <=   >=   !=
-
-These can be combined by using multiple qualifiers separated by commas (and
-optional whitespace).  In this case, all of the qualifiers must be matched; a
-logical AND is used to combine the evaluations.
-
-Let's look at a bunch of examples:
-
-+-------------------------+----------------------------------------------+
-| Requires Expression     | Explanation                                  |
-+=========================+==============================================+
-| ``==1.0``               | Only version ``1.0`` is compatible           |
-+-------------------------+----------------------------------------------+
-| ``>1.0, !=1.5.1, <2.0`` | Any version after ``1.0`` and before ``2.0`` |
-|                         | is compatible, except ``1.5.1``              |
-+-------------------------+----------------------------------------------+
-
-Now that we can specify dependencies, we also need to be able to specify what we
-provide that other distributions can require.  This is done using the *provides*
-keyword argument to :func:`setup`. The value for this keyword is a list of
-strings, each of which names a Python module or package, and optionally
-identifies the version.  If the version is not specified, it is assumed to match
-that of the distribution.
-
-Some examples:
-
-+---------------------+----------------------------------------------+
-| Provides Expression | Explanation                                  |
-+=====================+==============================================+
-| ``mypkg``           | Provide ``mypkg``, using the distribution    |
-|                     | version                                      |
-+---------------------+----------------------------------------------+
-| ``mypkg (1.1)``     | Provide ``mypkg`` version 1.1, regardless of |
-|                     | the distribution version                     |
-+---------------------+----------------------------------------------+
-
-A package can declare that it obsoletes other packages using the *obsoletes*
-keyword argument.  The value for this is similar to that of the *requires*
-keyword: a list of strings giving module or package specifiers.  Each specifier
-consists of a module or package name optionally followed by one or more version
-qualifiers.  Version qualifiers are given in parentheses after the module or
-package name.
-
-The versions identified by the qualifiers are those that are obsoleted by the
-distribution being described.  If no qualifiers are given, all versions of the
-named module or package are understood to be obsoleted.
-
-.. _distutils-installing-scripts:
-
-Installing Scripts
-==================
-
-So far we have been dealing with pure and non-pure Python modules, which are
-usually not run by themselves but imported by scripts.
-
-Scripts are files containing Python source code, intended to be started from the
-command line.  Scripts don't require Distutils to do anything very complicated.
-The only clever feature is that if the first line of the script starts with
-``#!`` and contains the word "python", the Distutils will adjust the first line
-to refer to the current interpreter location. By default, it is replaced with
-the current interpreter location.  The :option:`!--executable` (or :option:`!-e`)
-option will allow the interpreter path to be explicitly overridden.
-
-The ``scripts`` option simply is a list of files to be handled in this
-way.  From the PyXML setup script::
-
-    setup(...,
-          scripts=['scripts/xmlproc_parse', 'scripts/xmlproc_val']
-          )
-
-.. versionchanged:: 3.1
-   All the scripts will also be added to the ``MANIFEST`` file if no template is
-   provided.  See :ref:`manifest`.
-
-
-.. _distutils-installing-package-data:
-
-Installing Package Data
-=======================
-
-Often, additional files need to be installed into a package.  These files are
-often data that's closely related to the package's implementation, or text files
-containing documentation that might be of interest to programmers using the
-package.  These files are called :dfn:`package data`.
-
-Package data can be added to packages using the ``package_data`` keyword
-argument to the :func:`setup` function.  The value must be a mapping from
-package name to a list of relative path names that should be copied into the
-package.  The paths are interpreted as relative to the directory containing the
-package (information from the ``package_dir`` mapping is used if appropriate);
-that is, the files are expected to be part of the package in the source
-directories. They may contain glob patterns as well.
-
-The path names may contain directory portions; any necessary directories will be
-created in the installation.
-
-For example, if a package should contain a subdirectory with several data files,
-the files can be arranged like this in the source tree::
-
-    setup.py
-    src/
-        mypkg/
-            __init__.py
-            module.py
-            data/
-                tables.dat
-                spoons.dat
-                forks.dat
-
-The corresponding call to :func:`setup` might be::
-
-    setup(...,
-          packages=['mypkg'],
-          package_dir={'mypkg': 'src/mypkg'},
-          package_data={'mypkg': ['data/*.dat']},
-          )
-
-
-.. versionchanged:: 3.1
-   All the files that match ``package_data`` will be added to the ``MANIFEST``
-   file if no template is provided.  See :ref:`manifest`.
-
-
-.. _distutils-additional-files:
-
-Installing Additional Files
-===========================
-
-The ``data_files`` option can be used to specify additional files needed
-by the module distribution: configuration files, message catalogs, data files,
-anything which doesn't fit in the previous categories.
-
-``data_files`` specifies a sequence of (*directory*, *files*) pairs in the
-following way::
-
-    setup(...,
-          data_files=[('bitmaps', ['bm/b1.gif', 'bm/b2.gif']),
-                      ('config', ['cfg/data.cfg'])],
-         )
-
-Each (*directory*, *files*) pair in the sequence specifies the installation
-directory and the files to install there.
-
-Each file name in *files* is interpreted relative to the :file:`setup.py`
-script at the top of the package source distribution. Note that you can
-specify the directory where the data files will be installed, but you cannot
-rename the data files themselves.
-
-The *directory* should be a relative path. It is interpreted relative to the
-installation prefix (Python's ``sys.prefix`` for system installations;
-``site.USER_BASE`` for user installations). Distutils allows *directory* to be
-an absolute installation path, but this is discouraged since it is
-incompatible with the wheel packaging format. No directory information from
-*files* is used to determine the final location of the installed file; only
-the name of the file is used.
-
-You can specify the ``data_files`` options as a simple sequence of files
-without specifying a target directory, but this is not recommended, and the
-:command:`install` command will print a warning in this case. To install data
-files directly in the target directory, an empty string should be given as the
-directory.
-
-.. versionchanged:: 3.1
-   All the files that match ``data_files`` will be added to the ``MANIFEST``
-   file if no template is provided.  See :ref:`manifest`.
-
-
-.. _meta-data:
-
-Additional meta-data
-====================
-
-The setup script may include additional meta-data beyond the name and version.
-This information includes:
-
-+----------------------+---------------------------+-----------------+--------+
-| Meta-Data            | Description               | Value           | Notes  |
-+======================+===========================+=================+========+
-| ``name``             | name of the package       | short string    | \(1)   |
-+----------------------+---------------------------+-----------------+--------+
-| ``version``          | version of this release   | short string    | (1)(2) |
-+----------------------+---------------------------+-----------------+--------+
-| ``author``           | package author's name     | short string    | \(3)   |
-+----------------------+---------------------------+-----------------+--------+
-| ``author_email``     | email address of the      | email address   | \(3)   |
-|                      | package author            |                 |        |
-+----------------------+---------------------------+-----------------+--------+
-| ``maintainer``       | package maintainer's name | short string    | \(3)   |
-+----------------------+---------------------------+-----------------+--------+
-| ``maintainer_email`` | email address of the      | email address   | \(3)   |
-|                      | package maintainer        |                 |        |
-+----------------------+---------------------------+-----------------+--------+
-| ``url``              | home page for the package | URL             | \(1)   |
-+----------------------+---------------------------+-----------------+--------+
-| ``description``      | short, summary            | short string    |        |
-|                      | description of the        |                 |        |
-|                      | package                   |                 |        |
-+----------------------+---------------------------+-----------------+--------+
-| ``long_description`` | longer description of the | long string     | \(4)   |
-|                      | package                   |                 |        |
-+----------------------+---------------------------+-----------------+--------+
-| ``download_url``     | location where the        | URL             |        |
-|                      | package may be downloaded |                 |        |
-+----------------------+---------------------------+-----------------+--------+
-| ``classifiers``      | a list of classifiers     | list of strings | (6)(7) |
-+----------------------+---------------------------+-----------------+--------+
-| ``platforms``        | a list of platforms       | list of strings | (6)(8) |
-+----------------------+---------------------------+-----------------+--------+
-| ``keywords``         | a list of keywords        | list of strings | (6)(8) |
-+----------------------+---------------------------+-----------------+--------+
-| ``license``          | license for the package   | short string    | \(5)   |
-+----------------------+---------------------------+-----------------+--------+
-
-Notes:
-
-(1)
-    These fields are required.
-
-(2)
-    It is recommended that versions take the form *major.minor[.patch[.sub]]*.
-
-(3)
-    Either the author or the maintainer must be identified. If maintainer is
-    provided, distutils lists it as the author in :file:`PKG-INFO`.
-
-(4)
-    The ``long_description`` field is used by PyPI when you publish a package,
-    to build its project page.
-
-(5)
-    The ``license`` field is a text indicating the license covering the
-    package where the license is not a selection from the "License" Trove
-    classifiers. See the ``Classifier`` field. Notice that
-    there's a ``licence`` distribution option which is deprecated but still
-    acts as an alias for ``license``.
-
-(6)
-    This field must be a list.
-
-(7)
-    The valid classifiers are listed on
-    `PyPI <https://pypi.org/classifiers>`_.
-
-(8)
-    To preserve backward compatibility, this field also accepts a string. If
-    you pass a comma-separated string ``'foo, bar'``, it will be converted to
-    ``['foo', 'bar']``, Otherwise, it will be converted to a list of one
-    string.
-
-'short string'
-    A single line of text, not more than 200 characters.
-
-'long string'
-    Multiple lines of plain text in reStructuredText format (see
-    http://docutils.sourceforge.net/).
-
-'list of strings'
-    See below.
-
-Encoding the version information is an art in itself. Python packages generally
-adhere to the version format *major.minor[.patch][sub]*. The major number is 0
-for initial, experimental releases of software. It is incremented for releases
-that represent major milestones in a package. The minor number is incremented
-when important new features are added to the package. The patch number
-increments when bug-fix releases are made. Additional trailing version
-information is sometimes used to indicate sub-releases.  These are
-"a1,a2,...,aN" (for alpha releases, where functionality and API may change),
-"b1,b2,...,bN" (for beta releases, which only fix bugs) and "pr1,pr2,...,prN"
-(for final pre-release release testing). Some examples:
-
-0.1.0
-    the first, experimental release of a package
-
-1.0.1a2
-    the second alpha release of the first patch version of 1.0
-
-``classifiers`` must be specified in a list::
-
-    setup(...,
-          classifiers=[
-              'Development Status :: 4 - Beta',
-              'Environment :: Console',
-              'Environment :: Web Environment',
-              'Intended Audience :: End Users/Desktop',
-              'Intended Audience :: Developers',
-              'Intended Audience :: System Administrators',
-              'License :: OSI Approved :: Python Software Foundation License',
-              'Operating System :: MacOS :: MacOS X',
-              'Operating System :: Microsoft :: Windows',
-              'Operating System :: POSIX',
-              'Programming Language :: Python',
-              'Topic :: Communications :: Email',
-              'Topic :: Office/Business',
-              'Topic :: Software Development :: Bug Tracking',
-              ],
-          )
-
-.. versionchanged:: 3.7
-   :class:`~distutils.core.setup` now warns when ``classifiers``, ``keywords``
-   or ``platforms`` fields are not specified as a list or a string.
-
-.. _debug-setup-script:
-
-Debugging the setup script
-==========================
-
-Sometimes things go wrong, and the setup script doesn't do what the developer
-wants.
-
-Distutils catches any exceptions when running the setup script, and print a
-simple error message before the script is terminated.  The motivation for this
-behaviour is to not confuse administrators who don't know much about Python and
-are trying to install a package.  If they get a big long traceback from deep
-inside the guts of Distutils, they may think the package or the Python
-installation is broken because they don't read all the way down to the bottom
-and see that it's a permission problem.
-
-On the other hand, this doesn't help the developer to find the cause of the
-failure. For this purpose, the :envvar:`DISTUTILS_DEBUG` environment variable can be set
-to anything except an empty string, and distutils will now print detailed
-information about what it is doing, dump the full traceback when an exception
-occurs, and print the whole command line when an external program (like a C
-compiler) fails.
diff --git a/Doc/distutils/sourcedist.rst b/Doc/distutils/sourcedist.rst
deleted file mode 100644
index b55d01157f3ee..0000000000000
--- a/Doc/distutils/sourcedist.rst
+++ /dev/null
@@ -1,245 +0,0 @@
-.. _source-dist:
-
-******************************
-Creating a Source Distribution
-******************************
-
-.. include:: ./_setuptools_disclaimer.rst
-
-As shown in section :ref:`distutils-simple-example`, you use the :command:`sdist` command
-to create a source distribution.  In the simplest case, ::
-
-   python setup.py sdist
-
-(assuming you haven't specified any :command:`sdist` options in the setup script
-or config file), :command:`sdist` creates the archive of the default format for
-the current platform.  The default format is a gzip'ed tar file
-(:file:`.tar.gz`) on Unix, and ZIP file on Windows.
-
-You can specify as many formats as you like using the :option:`!--formats`
-option, for example::
-
-   python setup.py sdist --formats=gztar,zip
-
-to create a gzipped tarball and a zip file.  The available formats are:
-
-+-----------+-------------------------+-------------+
-| Format    | Description             | Notes       |
-+===========+=========================+=============+
-| ``zip``   | zip file (:file:`.zip`) | (1),(3)     |
-+-----------+-------------------------+-------------+
-| ``gztar`` | gzip'ed tar file        | \(2)        |
-|           | (:file:`.tar.gz`)       |             |
-+-----------+-------------------------+-------------+
-| ``bztar`` | bzip2'ed tar file       | \(5)        |
-|           | (:file:`.tar.bz2`)      |             |
-+-----------+-------------------------+-------------+
-| ``xztar`` | xz'ed tar file          | \(5)        |
-|           | (:file:`.tar.xz`)       |             |
-+-----------+-------------------------+-------------+
-| ``ztar``  | compressed tar file     | (4),(5)     |
-|           | (:file:`.tar.Z`)        |             |
-+-----------+-------------------------+-------------+
-| ``tar``   | tar file (:file:`.tar`) | \(5)        |
-+-----------+-------------------------+-------------+
-
-.. versionchanged:: 3.5
-   Added support for the ``xztar`` format.
-
-Notes:
-
-(1)
-   default on Windows
-
-(2)
-   default on Unix
-
-(3)
-   requires either external :program:`zip` utility or :mod:`zipfile` module (part
-   of the standard Python library since Python 1.6)
-
-(4)
-   requires the :program:`compress` program. Notice that this format is now
-   pending for deprecation and will be removed in the future versions of Python.
-(5)
-  deprecated by `PEP 527 <https://peps.python.org/pep-0527/>`_;
-  `PyPI <https://pypi.org>`_ only accepts ``.zip`` and ``.tar.gz`` files.
-
-When using any ``tar`` format (``gztar``, ``bztar``, ``xztar``, ``ztar`` or
-``tar``), under Unix you can specify the ``owner`` and ``group`` names
-that will be set for each member of the archive.
-
-For example, if you want all files of the archive to be owned by root::
-
-    python setup.py sdist --owner=root --group=root
-
-
-.. _manifest:
-
-Specifying the files to distribute
-==================================
-
-If you don't supply an explicit list of files (or instructions on how to
-generate one), the :command:`sdist` command puts a minimal default set into the
-source distribution:
-
-* all Python source files implied by the ``py_modules`` and
-  ``packages`` options
-
-* all C source files mentioned in the ``ext_modules`` or
-  ``libraries`` options
-
-  .. XXX getting C library sources currently broken---no
-         :meth:`get_source_files` method in :file:`build_clib.py`!
-
-* scripts identified by the ``scripts`` option
-  See :ref:`distutils-installing-scripts`.
-
-* anything that looks like a test script: :file:`test/test\*.py` (currently, the
-  Distutils don't do anything with test scripts except include them in source
-  distributions, but in the future there will be a standard for testing Python
-  module distributions)
-
-* Any of the standard README files (:file:`README`, :file:`README.txt`,
-  or :file:`README.rst`), :file:`setup.py` (or whatever you called your setup
-  script), and :file:`setup.cfg`.
-
-* all files that matches the ``package_data`` metadata.
-  See :ref:`distutils-installing-package-data`.
-
-* all files that matches the ``data_files`` metadata.
-  See :ref:`distutils-additional-files`.
-
-Sometimes this is enough, but usually you will want to specify additional files
-to distribute.  The typical way to do this is to write a *manifest template*,
-called :file:`MANIFEST.in` by default.  The manifest template is just a list of
-instructions for how to generate your manifest file, :file:`MANIFEST`, which is
-the exact list of files to include in your source distribution.  The
-:command:`sdist` command processes this template and generates a manifest based
-on its instructions and what it finds in the filesystem.
-
-If you prefer to roll your own manifest file, the format is simple: one filename
-per line, regular files (or symlinks to them) only.  If you do supply your own
-:file:`MANIFEST`, you must specify everything: the default set of files
-described above does not apply in this case.
-
-.. versionchanged:: 3.1
-   An existing generated :file:`MANIFEST` will be regenerated without
-   :command:`sdist` comparing its modification time to the one of
-   :file:`MANIFEST.in` or :file:`setup.py`.
-
-.. versionchanged:: 3.1.3
-   :file:`MANIFEST` files start with a comment indicating they are generated.
-   Files without this comment are not overwritten or removed.
-
-.. versionchanged:: 3.2.2
-   :command:`sdist` will read a :file:`MANIFEST` file if no :file:`MANIFEST.in`
-   exists, like it used to do.
-
-.. versionchanged:: 3.7
-   :file:`README.rst` is now included in the list of distutils standard READMEs.
-
-
-The manifest template has one command per line, where each command specifies a
-set of files to include or exclude from the source distribution.  For an
-example, again we turn to the Distutils' own manifest template:
-
-.. code-block:: none
-
-   include *.txt
-   recursive-include examples *.txt *.py
-   prune examples/sample?/build
-
-The meanings should be fairly clear: include all files in the distribution root
-matching :file:`\*.txt`, all files anywhere under the :file:`examples` directory
-matching :file:`\*.txt` or :file:`\*.py`, and exclude all directories matching
-:file:`examples/sample?/build`.  All of this is done *after* the standard
-include set, so you can exclude files from the standard set with explicit
-instructions in the manifest template.  (Or, you can use the
-:option:`!--no-defaults` option to disable the standard set entirely.)  There are
-several other commands available in the manifest template mini-language; see
-section :ref:`sdist-cmd`.
-
-The order of commands in the manifest template matters: initially, we have the
-list of default files as described above, and each command in the template adds
-to or removes from that list of files.  Once we have fully processed the
-manifest template, we remove files that should not be included in the source
-distribution:
-
-* all files in the Distutils "build" tree (default :file:`build/`)
-
-* all files in directories named :file:`RCS`, :file:`CVS`, :file:`.svn`,
-  :file:`.hg`, :file:`.git`, :file:`.bzr` or :file:`_darcs`
-
-Now we have our complete list of files, which is written to the manifest for
-future reference, and then used to build the source distribution archive(s).
-
-You can disable the default set of included files with the
-:option:`!--no-defaults` option, and you can disable the standard exclude set
-with :option:`!--no-prune`.
-
-Following the Distutils' own manifest template, let's trace how the
-:command:`sdist` command builds the list of files to include in the Distutils
-source distribution:
-
-#. include all Python source files in the :file:`distutils` and
-   :file:`distutils/command` subdirectories (because packages corresponding to
-   those two directories were mentioned in the ``packages`` option in the
-   setup script---see section :ref:`setup-script`)
-
-#. include :file:`README.txt`, :file:`setup.py`, and :file:`setup.cfg` (standard
-   files)
-
-#. include :file:`test/test\*.py` (standard files)
-
-#. include :file:`\*.txt` in the distribution root (this will find
-   :file:`README.txt` a second time, but such redundancies are weeded out later)
-
-#. include anything matching :file:`\*.txt` or :file:`\*.py` in the sub-tree
-   under :file:`examples`,
-
-#. exclude all files in the sub-trees starting at directories matching
-   :file:`examples/sample?/build`\ ---this may exclude files included by the
-   previous two steps, so it's important that the ``prune`` command in the manifest
-   template comes after the ``recursive-include`` command
-
-#. exclude the entire :file:`build` tree, and any :file:`RCS`, :file:`CVS`,
-   :file:`.svn`, :file:`.hg`, :file:`.git`, :file:`.bzr` and :file:`_darcs`
-   directories
-
-Just like in the setup script, file and directory names in the manifest template
-should always be slash-separated; the Distutils will take care of converting
-them to the standard representation on your platform. That way, the manifest
-template is portable across operating systems.
-
-
-.. _manifest-options:
-
-Manifest-related options
-========================
-
-The normal course of operations for the :command:`sdist` command is as follows:
-
-* if the manifest file (:file:`MANIFEST` by default) exists and the first line
-  does not have a comment indicating it is generated from :file:`MANIFEST.in`,
-  then it is used as is, unaltered
-
-* if the manifest file doesn't exist or has been previously automatically
-  generated, read :file:`MANIFEST.in` and create the manifest
-
-* if neither :file:`MANIFEST` nor :file:`MANIFEST.in` exist, create a manifest
-  with just the default file set
-
-* use the list of files now in :file:`MANIFEST` (either just generated or read
-  in) to create the source distribution archive(s)
-
-There are a couple of options that modify this behaviour.  First, use the
-:option:`!--no-defaults` and :option:`!--no-prune` to disable the standard
-"include" and "exclude" sets.
-
-Second, you might just want to (re)generate the manifest, but not create a source
-distribution::
-
-   python setup.py sdist --manifest-only
-
-:option:`!-o` is a shortcut for :option:`!--manifest-only`.
diff --git a/Doc/distutils/uploading.rst b/Doc/distutils/uploading.rst
deleted file mode 100644
index 4c391cab072ea..0000000000000
--- a/Doc/distutils/uploading.rst
+++ /dev/null
@@ -1,8 +0,0 @@
-:orphan:
-
-***************************************
-Uploading Packages to the Package Index
-***************************************
-
-References to up to date PyPI documentation can be found at
-:ref:`publishing-python-packages`.
diff --git a/Doc/extending/building.rst b/Doc/extending/building.rst
index 53817074ab1ee..880bb33ee5671 100644
--- a/Doc/extending/building.rst
+++ b/Doc/extending/building.rst
@@ -11,7 +11,7 @@ A C extension for CPython is a shared library (e.g. a ``.so`` file on Linux,
 
 To be importable, the shared library must be available on :envvar:`PYTHONPATH`,
 and must be named after the module name, with an appropriate extension.
-When using distutils, the correct filename is generated automatically.
+When using setuptools, the correct filename is generated automatically.
 
 The initialization function has the signature:
 
@@ -45,122 +45,12 @@ See the *"Multiple modules in one library"* section in :pep:`489` for details.
 
 .. highlight:: c
 
-Building C and C++ Extensions with distutils
-============================================
+.. _setuptools-index:
 
-.. sectionauthor:: Martin v. L?wis <martin at v.loewis.de>
+Building C and C++ Extensions with setuptools
+=============================================
 
-Extension modules can be built using distutils,  which is included in Python.
-Since distutils also supports creation of binary packages, users don't
-necessarily need a compiler and distutils to install the extension.
-
-A distutils package contains a driver script, :file:`setup.py`. This is a plain
-Python file, which, in the most simple case, could look like this:
-
-.. code-block:: python3
-
-   from distutils.core import setup, Extension
-
-   module1 = Extension('demo',
-                       sources = ['demo.c'])
-
-   setup (name = 'PackageName',
-          version = '1.0',
-          description = 'This is a demo package',
-          ext_modules = [module1])
-
-
-With this :file:`setup.py`, and a file :file:`demo.c`, running ::
-
-   python setup.py build
-
-will compile :file:`demo.c`, and produce an extension module named ``demo`` in
-the :file:`build` directory. Depending on the system, the module file will end
-up in a subdirectory :file:`build/lib.system`, and may have a name like
-:file:`demo.so` or :file:`demo.pyd`.
-
-In the :file:`setup.py`, all execution is performed by calling the ``setup``
-function. This takes a variable number of keyword arguments, of which the
-example above uses only a subset. Specifically, the example specifies
-meta-information to build packages, and it specifies the contents of the
-package.  Normally, a package will contain additional modules, like Python
-source modules, documentation, subpackages, etc. Please refer to the distutils
-documentation in :ref:`distutils-index` to learn more about the features of
-distutils; this section explains building extension modules only.
-
-It is common to pre-compute arguments to :func:`setup`, to better structure the
-driver script. In the example above, the ``ext_modules`` argument to
-:func:`~distutils.core.setup` is a list of extension modules, each of which is
-an instance of
-the :class:`~distutils.extension.Extension`. In the example, the instance
-defines an extension named ``demo`` which is build by compiling a single source
-file, :file:`demo.c`.
-
-In many cases, building an extension is more complex, since additional
-preprocessor defines and libraries may be needed. This is demonstrated in the
-example below.
-
-.. code-block:: python3
-
-   from distutils.core import setup, Extension
-
-   module1 = Extension('demo',
-                       define_macros = [('MAJOR_VERSION', '1'),
-                                        ('MINOR_VERSION', '0')],
-                       include_dirs = ['/usr/local/include'],
-                       libraries = ['tcl83'],
-                       library_dirs = ['/usr/local/lib'],
-                       sources = ['demo.c'])
-
-   setup (name = 'PackageName',
-          version = '1.0',
-          description = 'This is a demo package',
-          author = 'Martin v. Loewis',
-          author_email = 'martin at v.loewis.de',
-          url = 'https://docs.python.org/extending/building',
-          long_description = '''
-   This is really just a demo package.
-   ''',
-          ext_modules = [module1])
-
-
-In this example, :func:`~distutils.core.setup` is called with additional
-meta-information, which
-is recommended when distribution packages have to be built. For the extension
-itself, it specifies preprocessor defines, include directories, library
-directories, and libraries. Depending on the compiler, distutils passes this
-information in different ways to the compiler. For example, on Unix, this may
-result in the compilation commands ::
-
-   gcc -DNDEBUG -g -O3 -Wall -Wstrict-prototypes -fPIC -DMAJOR_VERSION=1 -DMINOR_VERSION=0 -I/usr/local/include -I/usr/local/include/python2.2 -c demo.c -o build/temp.linux-i686-2.2/demo.o
-
-   gcc -shared build/temp.linux-i686-2.2/demo.o -L/usr/local/lib -ltcl83 -o build/lib.linux-i686-2.2/demo.so
-
-These lines are for demonstration purposes only; distutils users should trust
-that distutils gets the invocations right.
-
-
-.. _distributing:
-
-Distributing your extension modules
-===================================
-
-When an extension has been successfully built, there are three ways to use it.
-
-End-users will typically want to install the module, they do so by running ::
-
-   python setup.py install
-
-Module maintainers should produce source packages; to do so, they run ::
-
-   python setup.py sdist
-
-In some cases, additional files need to be included in a source distribution;
-this is done through a :file:`MANIFEST.in` file; see :ref:`manifest` for details.
-
-If the source distribution has been built successfully, maintainers can also
-create binary distributions. Depending on the platform, one of the following
-commands can be used to do so. ::
-
-   python setup.py bdist_rpm
-   python setup.py bdist_dumb
+Python 3.12 and newer no longer come with distutils. Please refer to the
+``setuptools`` documentation at
+https://setuptools.readthedocs.io/en/latest/setuptools.html
+to learn more about how build and distribute C/C++ extensions with setuptools.
diff --git a/Doc/extending/windows.rst b/Doc/extending/windows.rst
index 28d0350f6f114..1129b0968bc4e 100644
--- a/Doc/extending/windows.rst
+++ b/Doc/extending/windows.rst
@@ -34,10 +34,10 @@ A Cookbook Approach
 ===================
 
 There are two approaches to building extension modules on Windows, just as there
-are on Unix: use the :mod:`distutils` package to control the build process, or
-do things manually.  The distutils approach works well for most extensions;
-documentation on using :mod:`distutils` to build and package extension modules
-is available in :ref:`distutils-index`.  If you find you really need to do
+are on Unix: use the ``setuptools`` package to control the build process, or
+do things manually.  The setuptools approach works well for most extensions;
+documentation on using ``setuptools`` to build and package extension modules
+is available in :ref:`setuptools-index`.  If you find you really need to do
 things manually, it may be instructive to study the project file for the
 :source:`winsound <PCbuild/winsound.vcxproj>` standard library module.
 
diff --git a/Doc/install/index.rst b/Doc/install/index.rst
index 63b64b95fc721..0923267d06601 100644
--- a/Doc/install/index.rst
+++ b/Doc/install/index.rst
@@ -23,7 +23,11 @@
       The up to date module installation documentation. For regular Python
       usage, you almost certainly want that document rather than this one.
 
-.. include:: ../distutils/_setuptools_disclaimer.rst
+.. note::
+
+   This document is being retained solely until the ``setuptools`` documentation
+   at https://setuptools.readthedocs.io/en/latest/setuptools.html
+   independently covers all of the relevant information currently included here.
 
 .. note::
 
diff --git a/Doc/library/distribution.rst b/Doc/library/distribution.rst
index 8d4befe41b329..bec1ca3cc3913 100644
--- a/Doc/library/distribution.rst
+++ b/Doc/library/distribution.rst
@@ -9,7 +9,6 @@ with a local index server, or without any index server at all.
 
 .. toctree::
 
-   distutils.rst
    ensurepip.rst
    venv.rst
    zipapp.rst
diff --git a/Doc/library/distutils.rst b/Doc/library/distutils.rst
deleted file mode 100644
index 31c4ae5b23906..0000000000000
--- a/Doc/library/distutils.rst
+++ /dev/null
@@ -1,49 +0,0 @@
-:mod:`distutils` --- Building and installing Python modules
-===========================================================
-
-.. module:: distutils
-   :synopsis: Support for building and installing Python modules into an
-              existing Python installation.
-
-.. sectionauthor:: Fred L. Drake, Jr. <fdrake at acm.org>
-
---------------
-
-:mod:`distutils` is deprecated with removal planned for Python 3.12.
-See the :ref:`What's New <distutils-deprecated>` entry for more information.
-
---------------
-
-The :mod:`distutils` package provides support for building and installing
-additional modules into a Python installation.  The new modules may be either
-100%-pure Python, or may be extension modules written in C, or may be
-collections of Python packages which include modules coded in both Python and C.
-
-Most Python users will *not* want to use this module directly, but instead
-use the cross-version tools maintained by the Python Packaging Authority. In
-particular,
-`setuptools <https://setuptools.readthedocs.io/en/latest/>`__ is an
-enhanced alternative to :mod:`distutils` that provides:
-
-* support for declaring project dependencies
-* additional mechanisms for configuring which files to include in source
-  releases (including plugins for integration with version control systems)
-* the ability to declare project "entry points", which can be used as the
-  basis for application plugin systems
-* the ability to automatically generate Windows command line executables at
-  installation time rather than needing to prebuild them
-* consistent behaviour across all supported Python versions
-
-The recommended `pip <https://pip.pypa.io/>`__ installer runs all
-``setup.py`` scripts with ``setuptools``, even if the script itself only
-imports ``distutils``. Refer to the
-`Python Packaging User Guide <https://packaging.python.org>`_ for more
-information.
-
-For the benefits of packaging tool authors and users seeking a deeper
-understanding of the details of the current packaging and distribution
-system, the legacy :mod:`distutils` based user documentation and API
-reference remain available:
-
-* :ref:`install-index`
-* :ref:`distutils-index`
diff --git a/Doc/library/sysconfig.rst b/Doc/library/sysconfig.rst
index fa18d62d22af5..024988777030f 100644
--- a/Doc/library/sysconfig.rst
+++ b/Doc/library/sysconfig.rst
@@ -25,7 +25,7 @@ Configuration variables
 
 A Python distribution contains a :file:`Makefile` and a :file:`pyconfig.h`
 header file that are necessary to build both the Python binary itself and
-third-party C extensions compiled using :mod:`distutils`.
+third-party C extensions compiled using ``setuptools``.
 
 :mod:`sysconfig` puts all variables found in these files in a dictionary that
 can be accessed using :func:`get_config_vars` or :func:`get_config_var`.
diff --git a/Doc/library/venv.rst b/Doc/library/venv.rst
index 3cf143d552ac8..513a982c6ede6 100644
--- a/Doc/library/venv.rst
+++ b/Doc/library/venv.rst
@@ -64,7 +64,7 @@ Creating virtual environments
    Python installation).
 
    When a virtual environment is active, any options that change the
-   installation path will be ignored from all :mod:`distutils` configuration
+   installation path will be ignored from all ``setuptools`` configuration
    files to prevent projects being inadvertently installed outside of the
    virtual environment.
 
diff --git a/Doc/using/configure.rst b/Doc/using/configure.rst
index 80c0dc08dae73..580cbd814f786 100644
--- a/Doc/using/configure.rst
+++ b/Doc/using/configure.rst
@@ -599,7 +599,7 @@ Main files of the build system
 * :file:`pyconfig.h` (created by :file:`configure`);
 * :file:`Modules/Setup`: C extensions built by the Makefile using
   :file:`Module/makesetup` shell script;
-* :file:`setup.py`: C extensions built using the :mod:`distutils` module.
+* :file:`setup.py`: C extensions built using the ``setuptools`` package.
 
 Main build steps
 ----------------
diff --git a/Doc/using/windows.rst b/Doc/using/windows.rst
index 7d2fcb586b3f2..1025c14e397df 100644
--- a/Doc/using/windows.rst
+++ b/Doc/using/windows.rst
@@ -1187,11 +1187,10 @@ shipped with PyWin32.  It is an embeddable IDE with a built-in debugger.
 cx_Freeze
 ---------
 
-`cx_Freeze <https://cx-freeze.readthedocs.io/en/latest/>`_ is a :mod:`distutils`
-extension (see :ref:`extending-distutils`) which wraps Python scripts into
-executable Windows programs (:file:`{*}.exe` files).  When you have done this,
-you can distribute your application without requiring your users to install
-Python.
+`cx_Freeze <https://cx-freeze.readthedocs.io/en/latest/>`_ is a ``distutils``
+extension which wraps Python scripts into executable Windows programs
+(:file:`{*}.exe` files).  When you have done this, you can distribute your
+application without requiring your users to install Python.
 
 
 Compiling Python on Windows
diff --git a/Doc/whatsnew/2.7.rst b/Doc/whatsnew/2.7.rst
index f753055c16ee2..59d68a192b8f7 100644
--- a/Doc/whatsnew/2.7.rst
+++ b/Doc/whatsnew/2.7.rst
@@ -2697,7 +2697,7 @@ projects.
 
 However, as this migration is currently still incomplete, the legacy
 versions of those guides remaining available as :ref:`install-index`
-and :ref:`distutils-index`.
+and :ref:`setuptools-index`.
 
 .. seealso::
 
diff --git a/Doc/whatsnew/3.4.rst b/Doc/whatsnew/3.4.rst
index a09b60ffb331e..95e86550bc032 100644
--- a/Doc/whatsnew/3.4.rst
+++ b/Doc/whatsnew/3.4.rst
@@ -247,7 +247,7 @@ projects.
 
 However, as this migration is currently still incomplete, the legacy
 versions of those guides remaining available as :ref:`install-index`
-and :ref:`distutils-index`.
+and :ref:`setuptools-index`.
 
 .. seealso::
 


From webhook-mailer at python.org  Mon Jul 25 12:16:32 2022
From: webhook-mailer at python.org (ambv)
Date: Mon, 25 Jul 2022 16:16:32 -0000
Subject: [Python-checkins] gh-93610: Improve docs for importlib.resources
 (#93611)
Message-ID: <mailman.233.1658765793.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/ccd7c7a0bde2587ee0e1e685f4651b50d90bd464
commit: ccd7c7a0bde2587ee0e1e685f4651b50d90bd464
branch: main
author: Petr Viktorin <encukou at gmail.com>
committer: ambv <lukasz at langa.pl>
date: 2022-07-25T18:16:17+02:00
summary:

gh-93610: Improve docs for importlib.resources (#93611)

Co-authored-by: Adam Turner <9087854+AA-Turner at users.noreply.github.com>
Co-authored-by: Stanley <46876382+slateny at users.noreply.github.com>
Co-authored-by: ?ukasz Langa <lukasz at langa.pl>

files:
M Doc/library/importlib.resources.abc.rst
M Doc/library/importlib.resources.rst
M Doc/library/importlib.rst
M Doc/library/modules.rst

diff --git a/Doc/library/importlib.resources.abc.rst b/Doc/library/importlib.resources.abc.rst
index 6b0e1e04c8852..d281ac032216a 100644
--- a/Doc/library/importlib.resources.abc.rst
+++ b/Doc/library/importlib.resources.abc.rst
@@ -1,3 +1,15 @@
+:mod:`importlib.resources.abc` -- Abstract base classes for resources
+---------------------------------------------------------------------
+
+.. module:: importlib.resources.abc
+    :synopsis: Abstract base classes for resources
+
+**Source code:** :source:`Lib/importlib/resources/abc.py`
+
+--------------
+
+.. versionadded:: 3.11
+
 .. class:: ResourceReader
 
     *Superseded by TraversableResources*
@@ -72,251 +84,6 @@
         The abstract method returns an iterable of no items.
 
 
-.. class:: ResourceLoader
-
-    An abstract base class for a :term:`loader` which implements the optional
-    :pep:`302` protocol for loading arbitrary resources from the storage
-    back-end.
-
-    .. deprecated:: 3.7
-       This ABC is deprecated in favour of supporting resource loading
-       through :class:`importlib.abc.ResourceReader`.
-
-    .. abstractmethod:: get_data(path)
-
-        An abstract method to return the bytes for the data located at *path*.
-        Loaders that have a file-like storage back-end
-        that allows storing arbitrary data
-        can implement this abstract method to give direct access
-        to the data stored. :exc:`OSError` is to be raised if the *path* cannot
-        be found. The *path* is expected to be constructed using a module's
-        :attr:`__file__` attribute or an item from a package's :attr:`__path__`.
-
-        .. versionchanged:: 3.4
-           Raises :exc:`OSError` instead of :exc:`NotImplementedError`.
-
-
-.. class:: InspectLoader
-
-    An abstract base class for a :term:`loader` which implements the optional
-    :pep:`302` protocol for loaders that inspect modules.
-
-    .. method:: get_code(fullname)
-
-        Return the code object for a module, or ``None`` if the module does not
-        have a code object (as would be the case, for example, for a built-in
-        module).  Raise an :exc:`ImportError` if loader cannot find the
-        requested module.
-
-        .. note::
-           While the method has a default implementation, it is suggested that
-           it be overridden if possible for performance.
-
-        .. index::
-           single: universal newlines; importlib.abc.InspectLoader.get_source method
-
-        .. versionchanged:: 3.4
-           No longer abstract and a concrete implementation is provided.
-
-    .. abstractmethod:: get_source(fullname)
-
-        An abstract method to return the source of a module. It is returned as
-        a text string using :term:`universal newlines`, translating all
-        recognized line separators into ``'\n'`` characters.  Returns ``None``
-        if no source is available (e.g. a built-in module). Raises
-        :exc:`ImportError` if the loader cannot find the module specified.
-
-        .. versionchanged:: 3.4
-           Raises :exc:`ImportError` instead of :exc:`NotImplementedError`.
-
-    .. method:: is_package(fullname)
-
-        An optional method to return a true value if the module is a package, a
-        false value otherwise. :exc:`ImportError` is raised if the
-        :term:`loader` cannot find the module.
-
-        .. versionchanged:: 3.4
-           Raises :exc:`ImportError` instead of :exc:`NotImplementedError`.
-
-    .. staticmethod:: source_to_code(data, path='<string>')
-
-        Create a code object from Python source.
-
-        The *data* argument can be whatever the :func:`compile` function
-        supports (i.e. string or bytes). The *path* argument should be
-        the "path" to where the source code originated from, which can be an
-        abstract concept (e.g. location in a zip file).
-
-        With the subsequent code object one can execute it in a module by
-        running ``exec(code, module.__dict__)``.
-
-        .. versionadded:: 3.4
-
-        .. versionchanged:: 3.5
-           Made the method static.
-
-    .. method:: exec_module(module)
-
-       Implementation of :meth:`Loader.exec_module`.
-
-       .. versionadded:: 3.4
-
-    .. method:: load_module(fullname)
-
-       Implementation of :meth:`Loader.load_module`.
-
-       .. deprecated:: 3.4
-          use :meth:`exec_module` instead.
-
-
-.. class:: ExecutionLoader
-
-    An abstract base class which inherits from :class:`InspectLoader` that,
-    when implemented, helps a module to be executed as a script. The ABC
-    represents an optional :pep:`302` protocol.
-
-    .. abstractmethod:: get_filename(fullname)
-
-        An abstract method that is to return the value of :attr:`__file__` for
-        the specified module. If no path is available, :exc:`ImportError` is
-        raised.
-
-        If source code is available, then the method should return the path to
-        the source file, regardless of whether a bytecode was used to load the
-        module.
-
-        .. versionchanged:: 3.4
-           Raises :exc:`ImportError` instead of :exc:`NotImplementedError`.
-
-
-.. class:: FileLoader(fullname, path)
-
-   An abstract base class which inherits from :class:`ResourceLoader` and
-   :class:`ExecutionLoader`, providing concrete implementations of
-   :meth:`ResourceLoader.get_data` and :meth:`ExecutionLoader.get_filename`.
-
-   The *fullname* argument is a fully resolved name of the module the loader is
-   to handle. The *path* argument is the path to the file for the module.
-
-   .. versionadded:: 3.3
-
-   .. attribute:: name
-
-      The name of the module the loader can handle.
-
-   .. attribute:: path
-
-      Path to the file of the module.
-
-   .. method:: load_module(fullname)
-
-      Calls super's ``load_module()``.
-
-      .. deprecated:: 3.4
-         Use :meth:`Loader.exec_module` instead.
-
-   .. abstractmethod:: get_filename(fullname)
-
-      Returns :attr:`path`.
-
-   .. abstractmethod:: get_data(path)
-
-      Reads *path* as a binary file and returns the bytes from it.
-
-
-.. class:: SourceLoader
-
-    An abstract base class for implementing source (and optionally bytecode)
-    file loading. The class inherits from both :class:`ResourceLoader` and
-    :class:`ExecutionLoader`, requiring the implementation of:
-
-    * :meth:`ResourceLoader.get_data`
-    * :meth:`ExecutionLoader.get_filename`
-          Should only return the path to the source file; sourceless
-          loading is not supported.
-
-    The abstract methods defined by this class are to add optional bytecode
-    file support. Not implementing these optional methods (or causing them to
-    raise :exc:`NotImplementedError`) causes the loader to
-    only work with source code. Implementing the methods allows the loader to
-    work with source *and* bytecode files; it does not allow for *sourceless*
-    loading where only bytecode is provided.  Bytecode files are an
-    optimization to speed up loading by removing the parsing step of Python's
-    compiler, and so no bytecode-specific API is exposed.
-
-    .. method:: path_stats(path)
-
-        Optional abstract method which returns a :class:`dict` containing
-        metadata about the specified path.  Supported dictionary keys are:
-
-        - ``'mtime'`` (mandatory): an integer or floating-point number
-          representing the modification time of the source code;
-        - ``'size'`` (optional): the size in bytes of the source code.
-
-        Any other keys in the dictionary are ignored, to allow for future
-        extensions. If the path cannot be handled, :exc:`OSError` is raised.
-
-        .. versionadded:: 3.3
-
-        .. versionchanged:: 3.4
-           Raise :exc:`OSError` instead of :exc:`NotImplementedError`.
-
-    .. method:: path_mtime(path)
-
-        Optional abstract method which returns the modification time for the
-        specified path.
-
-        .. deprecated:: 3.3
-           This method is deprecated in favour of :meth:`path_stats`.  You don't
-           have to implement it, but it is still available for compatibility
-           purposes. Raise :exc:`OSError` if the path cannot be handled.
-
-        .. versionchanged:: 3.4
-           Raise :exc:`OSError` instead of :exc:`NotImplementedError`.
-
-    .. method:: set_data(path, data)
-
-        Optional abstract method which writes the specified bytes to a file
-        path. Any intermediate directories which do not exist are to be created
-        automatically.
-
-        When writing to the path fails because the path is read-only
-        (:attr:`errno.EACCES`/:exc:`PermissionError`), do not propagate the
-        exception.
-
-        .. versionchanged:: 3.4
-           No longer raises :exc:`NotImplementedError` when called.
-
-    .. method:: get_code(fullname)
-
-        Concrete implementation of :meth:`InspectLoader.get_code`.
-
-    .. method:: exec_module(module)
-
-       Concrete implementation of :meth:`Loader.exec_module`.
-
-       .. versionadded:: 3.4
-
-    .. method:: load_module(fullname)
-
-       Concrete implementation of :meth:`Loader.load_module`.
-
-       .. deprecated:: 3.4
-          Use :meth:`exec_module` instead.
-
-    .. method:: get_source(fullname)
-
-        Concrete implementation of :meth:`InspectLoader.get_source`.
-
-    .. method:: is_package(fullname)
-
-        Concrete implementation of :meth:`InspectLoader.is_package`. A module
-        is determined to be a package if its file path (as provided by
-        :meth:`ExecutionLoader.get_filename`) is a file named
-        ``__init__`` when the file extension is removed **and** the module name
-        itself does not end in ``__init__``.
-
-
 .. class:: Traversable
 
     An object with a subset of pathlib.Path methods suitable for
@@ -369,8 +136,8 @@
 
     An abstract base class for resource readers capable of serving
     the :meth:`importlib.resources.files` interface. Subclasses
-    :class:`importlib.abc.ResourceReader` and provides
-    concrete implementations of the :class:`importlib.abc.ResourceReader`'s
+    :class:`importlib.resources.abc.ResourceReader` and provides
+    concrete implementations of the :class:`importlib.resources.abc.ResourceReader`'s
     abstract methods. Therefore, any loader supplying
     :class:`importlib.abc.TraversableReader` also supplies ResourceReader.
 
@@ -381,5 +148,5 @@
 
     .. abstractmethod:: files()
 
-       Returns a :class:`importlib.abc.Traversable` object for the loaded
+       Returns a :class:`importlib.resources.abc.Traversable` object for the loaded
        package.
diff --git a/Doc/library/importlib.resources.rst b/Doc/library/importlib.resources.rst
index b88c9882de44b..d367dcee7c207 100644
--- a/Doc/library/importlib.resources.rst
+++ b/Doc/library/importlib.resources.rst
@@ -17,7 +17,9 @@ text mode.
 
 Resources are roughly akin to files inside directories, though it's important
 to keep in mind that this is just a metaphor.  Resources and packages **do
-not** have to exist as physical files and directories on the file system.
+not** have to exist as physical files and directories on the file system:
+for example, a package and its resources can be imported from a zip file using
+:py:mod:`zipimport`.
 
 .. note::
 
@@ -33,47 +35,36 @@ not** have to exist as physical files and directories on the file system.
    on `using importlib.resources
    <http://importlib-resources.readthedocs.io/en/latest/using.html>`_ and
    `migrating from pkg_resources to importlib.resources
-   <http://importlib-resources.readthedocs.io/en/latest/migration.html>`_
-   and
-   `migrating legacy usage <https://importlib-resources.readthedocs.io/en/latest/using.html#migrating-from-legacy>`_.
+   <http://importlib-resources.readthedocs.io/en/latest/migration.html>`_.
 
-Loaders that wish to support resource reading should implement a
+:class:`Loaders <importlib.abc.Loader>` that wish to support resource reading should implement a
 ``get_resource_reader(fullname)`` method as specified by
-:class:`importlib.abc.ResourceReader`.
-
-The following types are defined.
+:class:`importlib.resources.abc.ResourceReader`.
 
 .. data:: Package
 
-    The ``Package`` type is defined as ``Union[str, ModuleType]``.  This means
-    that where the function describes accepting a ``Package``, you can pass in
-    either a string or a module.  Module objects must have a resolvable
-    ``__spec__.submodule_search_locations`` that is not ``None``.
-
-.. data:: Resource
-
-    This type describes the resource names passed into the various functions
-    in this package.  This is defined as ``Union[str, os.PathLike]``.
-
-
-The following functions are available.
+    Whenever a function accepts a ``Package`` argument, you can pass in
+    either a :class:`module object <types.ModuleType>` or a module name
+    as a string.  You can only pass module objects whose
+    ``__spec__.submodule_search_locations`` is not ``None``.
 
+    The ``Package`` type is defined as ``Union[str, ModuleType]``.
 
 .. function:: files(package)
 
-    Returns an :class:`importlib.resources.abc.Traversable` object
+    Returns a :class:`~importlib.resources.abc.Traversable` object
     representing the resource container for the package (think directory)
     and its resources (think files). A Traversable may contain other
     containers (think subdirectories).
 
     *package* is either a name or a module object which conforms to the
-    ``Package`` requirements.
+    :data:`Package` requirements.
 
     .. versionadded:: 3.9
 
 .. function:: as_file(traversable)
 
-    Given a :class:`importlib.resources.abc.Traversable` object representing
+    Given a :class:`~importlib.resources.abc.Traversable` object representing
     a file, typically from :func:`importlib.resources.files`, return
     a context manager for use in a :keyword:`with` statement.
     The context manager provides a :class:`pathlib.Path` object.
@@ -87,6 +78,22 @@ The following functions are available.
 
     .. versionadded:: 3.9
 
+Deprecated functions
+--------------------
+
+An older, deprecated set of functions is still available, but is
+scheduled for removal in a future version of Python.
+The main drawback of these functions is that they do not support
+directories: they assume all resources are located directly within a *package*.
+
+.. data:: Resource
+
+    For *resource* arguments of the functions below, you can pass in
+    the name of a resource as a string or
+    a :class:`path-like object <os.PathLike>`.
+
+    The ``Resource`` type is defined as ``Union[str, os.PathLike]``.
+
 .. function:: open_binary(package, resource)
 
     Open for binary reading the *resource* within *package*.
@@ -97,7 +104,11 @@ The following functions are available.
     sub-resources (i.e. it cannot be a directory).  This function returns a
     ``typing.BinaryIO`` instance, a binary I/O stream open for reading.
 
-   .. deprecated:: 3.11
+    .. deprecated:: 3.11
+
+       Calls to this function can be replaced by::
+
+          files(package).joinpath(resource).open('rb')
 
 
 .. function:: open_text(package, resource, encoding='utf-8', errors='strict')
@@ -114,7 +125,11 @@ The following functions are available.
     This function returns a ``typing.TextIO`` instance, a text I/O stream open
     for reading.
 
-   .. deprecated:: 3.11
+    .. deprecated:: 3.11
+
+       Calls to this function can be replaced by::
+
+          files(package).joinpath(resource).open('r', encoding=encoding)
 
 
 .. function:: read_binary(package, resource)
@@ -128,7 +143,11 @@ The following functions are available.
     sub-resources (i.e. it cannot be a directory).  This function returns the
     contents of the resource as :class:`bytes`.
 
-   .. deprecated:: 3.11
+    .. deprecated:: 3.11
+
+       Calls to this function can be replaced by::
+
+          files(package).joinpath(resource).read_bytes()
 
 
 .. function:: read_text(package, resource, encoding='utf-8', errors='strict')
@@ -143,7 +162,11 @@ The following functions are available.
     have the same meaning as with built-in :func:`open`.  This function
     returns the contents of the resource as :class:`str`.
 
-   .. deprecated:: 3.11
+    .. deprecated:: 3.11
+
+       Calls to this function can be replaced by::
+
+          files(package).joinpath(resource).read_text(encoding=encoding)
 
 
 .. function:: path(package, resource)
@@ -160,17 +183,26 @@ The following functions are available.
     within *package*; it may not contain path separators and it may not have
     sub-resources (i.e. it cannot be a directory).
 
-   .. deprecated:: 3.11
+    .. deprecated:: 3.11
+
+       Calls to this function can be replaced using :func:`as_file`::
+
+          as_file(files(package).joinpath(resource))
 
 
 .. function:: is_resource(package, name)
 
     Return ``True`` if there is a resource named *name* in the package,
-    otherwise ``False``.  Remember that directories are *not* resources!
+    otherwise ``False``.
+    This function does not consider directories to be resources.
     *package* is either a name or a module object which conforms to the
     ``Package`` requirements.
 
-   .. deprecated:: 3.11
+    .. deprecated:: 3.11
+
+       Calls to this function can be replaced by::
+
+          files(package).joinpath(resource).is_file()
 
 
 .. function:: contents(package)
@@ -182,4 +214,8 @@ The following functions are available.
     *package* is either a name or a module object which conforms to the
     ``Package`` requirements.
 
-   .. deprecated:: 3.11
+    .. deprecated:: 3.11
+
+       Calls to this function can be replaced by::
+
+          (resource.name for resource in files(package).iterdir() if resource.is_file())
diff --git a/Doc/library/importlib.rst b/Doc/library/importlib.rst
index 44bf703e93a84..c29d69c143cfe 100644
--- a/Doc/library/importlib.rst
+++ b/Doc/library/importlib.rst
@@ -401,7 +401,7 @@ ABC hierarchy::
 
     Loaders that wish to support resource reading should implement a
     :meth:`get_resource_reader` method as specified by
-    :class:`importlib.abc.ResourceReader`.
+    :class:`importlib.resources.abc.ResourceReader`.
 
     .. versionchanged:: 3.7
        Introduced the optional :meth:`get_resource_reader` method.
@@ -508,7 +508,250 @@ ABC hierarchy::
            The import machinery now takes care of this automatically.
 
 
-.. include:: importlib.resources.abc.rst
+.. class:: ResourceLoader
+
+    An abstract base class for a :term:`loader` which implements the optional
+    :pep:`302` protocol for loading arbitrary resources from the storage
+    back-end.
+
+    .. deprecated:: 3.7
+       This ABC is deprecated in favour of supporting resource loading
+       through :class:`importlib.resources.abc.ResourceReader`.
+
+    .. abstractmethod:: get_data(path)
+
+        An abstract method to return the bytes for the data located at *path*.
+        Loaders that have a file-like storage back-end
+        that allows storing arbitrary data
+        can implement this abstract method to give direct access
+        to the data stored. :exc:`OSError` is to be raised if the *path* cannot
+        be found. The *path* is expected to be constructed using a module's
+        :attr:`__file__` attribute or an item from a package's :attr:`__path__`.
+
+        .. versionchanged:: 3.4
+           Raises :exc:`OSError` instead of :exc:`NotImplementedError`.
+
+
+.. class:: InspectLoader
+
+    An abstract base class for a :term:`loader` which implements the optional
+    :pep:`302` protocol for loaders that inspect modules.
+
+    .. method:: get_code(fullname)
+
+        Return the code object for a module, or ``None`` if the module does not
+        have a code object (as would be the case, for example, for a built-in
+        module).  Raise an :exc:`ImportError` if loader cannot find the
+        requested module.
+
+        .. note::
+           While the method has a default implementation, it is suggested that
+           it be overridden if possible for performance.
+
+        .. index::
+           single: universal newlines; importlib.abc.InspectLoader.get_source method
+
+        .. versionchanged:: 3.4
+           No longer abstract and a concrete implementation is provided.
+
+    .. abstractmethod:: get_source(fullname)
+
+        An abstract method to return the source of a module. It is returned as
+        a text string using :term:`universal newlines`, translating all
+        recognized line separators into ``'\n'`` characters.  Returns ``None``
+        if no source is available (e.g. a built-in module). Raises
+        :exc:`ImportError` if the loader cannot find the module specified.
+
+        .. versionchanged:: 3.4
+           Raises :exc:`ImportError` instead of :exc:`NotImplementedError`.
+
+    .. method:: is_package(fullname)
+
+        An optional method to return a true value if the module is a package, a
+        false value otherwise. :exc:`ImportError` is raised if the
+        :term:`loader` cannot find the module.
+
+        .. versionchanged:: 3.4
+           Raises :exc:`ImportError` instead of :exc:`NotImplementedError`.
+
+    .. staticmethod:: source_to_code(data, path='<string>')
+
+        Create a code object from Python source.
+
+        The *data* argument can be whatever the :func:`compile` function
+        supports (i.e. string or bytes). The *path* argument should be
+        the "path" to where the source code originated from, which can be an
+        abstract concept (e.g. location in a zip file).
+
+        With the subsequent code object one can execute it in a module by
+        running ``exec(code, module.__dict__)``.
+
+        .. versionadded:: 3.4
+
+        .. versionchanged:: 3.5
+           Made the method static.
+
+    .. method:: exec_module(module)
+
+       Implementation of :meth:`Loader.exec_module`.
+
+       .. versionadded:: 3.4
+
+    .. method:: load_module(fullname)
+
+       Implementation of :meth:`Loader.load_module`.
+
+       .. deprecated:: 3.4
+          use :meth:`exec_module` instead.
+
+
+.. class:: ExecutionLoader
+
+    An abstract base class which inherits from :class:`InspectLoader` that,
+    when implemented, helps a module to be executed as a script. The ABC
+    represents an optional :pep:`302` protocol.
+
+    .. abstractmethod:: get_filename(fullname)
+
+        An abstract method that is to return the value of :attr:`__file__` for
+        the specified module. If no path is available, :exc:`ImportError` is
+        raised.
+
+        If source code is available, then the method should return the path to
+        the source file, regardless of whether a bytecode was used to load the
+        module.
+
+        .. versionchanged:: 3.4
+           Raises :exc:`ImportError` instead of :exc:`NotImplementedError`.
+
+
+.. class:: FileLoader(fullname, path)
+
+   An abstract base class which inherits from :class:`ResourceLoader` and
+   :class:`ExecutionLoader`, providing concrete implementations of
+   :meth:`ResourceLoader.get_data` and :meth:`ExecutionLoader.get_filename`.
+
+   The *fullname* argument is a fully resolved name of the module the loader is
+   to handle. The *path* argument is the path to the file for the module.
+
+   .. versionadded:: 3.3
+
+   .. attribute:: name
+
+      The name of the module the loader can handle.
+
+   .. attribute:: path
+
+      Path to the file of the module.
+
+   .. method:: load_module(fullname)
+
+      Calls super's ``load_module()``.
+
+      .. deprecated:: 3.4
+         Use :meth:`Loader.exec_module` instead.
+
+   .. abstractmethod:: get_filename(fullname)
+
+      Returns :attr:`path`.
+
+   .. abstractmethod:: get_data(path)
+
+      Reads *path* as a binary file and returns the bytes from it.
+
+
+.. class:: SourceLoader
+
+    An abstract base class for implementing source (and optionally bytecode)
+    file loading. The class inherits from both :class:`ResourceLoader` and
+    :class:`ExecutionLoader`, requiring the implementation of:
+
+    * :meth:`ResourceLoader.get_data`
+    * :meth:`ExecutionLoader.get_filename`
+          Should only return the path to the source file; sourceless
+          loading is not supported.
+
+    The abstract methods defined by this class are to add optional bytecode
+    file support. Not implementing these optional methods (or causing them to
+    raise :exc:`NotImplementedError`) causes the loader to
+    only work with source code. Implementing the methods allows the loader to
+    work with source *and* bytecode files; it does not allow for *sourceless*
+    loading where only bytecode is provided.  Bytecode files are an
+    optimization to speed up loading by removing the parsing step of Python's
+    compiler, and so no bytecode-specific API is exposed.
+
+    .. method:: path_stats(path)
+
+        Optional abstract method which returns a :class:`dict` containing
+        metadata about the specified path.  Supported dictionary keys are:
+
+        - ``'mtime'`` (mandatory): an integer or floating-point number
+          representing the modification time of the source code;
+        - ``'size'`` (optional): the size in bytes of the source code.
+
+        Any other keys in the dictionary are ignored, to allow for future
+        extensions. If the path cannot be handled, :exc:`OSError` is raised.
+
+        .. versionadded:: 3.3
+
+        .. versionchanged:: 3.4
+           Raise :exc:`OSError` instead of :exc:`NotImplementedError`.
+
+    .. method:: path_mtime(path)
+
+        Optional abstract method which returns the modification time for the
+        specified path.
+
+        .. deprecated:: 3.3
+           This method is deprecated in favour of :meth:`path_stats`.  You don't
+           have to implement it, but it is still available for compatibility
+           purposes. Raise :exc:`OSError` if the path cannot be handled.
+
+        .. versionchanged:: 3.4
+           Raise :exc:`OSError` instead of :exc:`NotImplementedError`.
+
+    .. method:: set_data(path, data)
+
+        Optional abstract method which writes the specified bytes to a file
+        path. Any intermediate directories which do not exist are to be created
+        automatically.
+
+        When writing to the path fails because the path is read-only
+        (:attr:`errno.EACCES`/:exc:`PermissionError`), do not propagate the
+        exception.
+
+        .. versionchanged:: 3.4
+           No longer raises :exc:`NotImplementedError` when called.
+
+    .. method:: get_code(fullname)
+
+        Concrete implementation of :meth:`InspectLoader.get_code`.
+
+    .. method:: exec_module(module)
+
+       Concrete implementation of :meth:`Loader.exec_module`.
+
+       .. versionadded:: 3.4
+
+    .. method:: load_module(fullname)
+
+       Concrete implementation of :meth:`Loader.load_module`.
+
+       .. deprecated:: 3.4
+          Use :meth:`exec_module` instead.
+
+    .. method:: get_source(fullname)
+
+        Concrete implementation of :meth:`InspectLoader.get_source`.
+
+    .. method:: is_package(fullname)
+
+        Concrete implementation of :meth:`InspectLoader.is_package`. A module
+        is determined to be a package if its file path (as provided by
+        :meth:`ExecutionLoader.get_filename`) is a file named
+        ``__init__`` when the file extension is removed **and** the module name
+        itself does not end in ``__init__``.
+
 
 
 :mod:`importlib.machinery` -- Importers and path hooks
diff --git a/Doc/library/modules.rst b/Doc/library/modules.rst
index 6cf6eb28a1e05..8c5936a4d8de2 100644
--- a/Doc/library/modules.rst
+++ b/Doc/library/modules.rst
@@ -18,5 +18,6 @@ The full list of modules described in this chapter is:
    runpy.rst
    importlib.rst
    importlib.resources.rst
+   importlib.resources.abc.rst
    importlib.metadata.rst
    sys_path_init.rst


From webhook-mailer at python.org  Mon Jul 25 12:24:51 2022
From: webhook-mailer at python.org (ambv)
Date: Mon, 25 Jul 2022 16:24:51 -0000
Subject: [Python-checkins] gh-93963: Document importlib.abc deprecations
 (#94546)
Message-ID: <mailman.234.1658766293.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/10b12dd92ab6e29b573706dd6adb3d8eb63ae81b
commit: 10b12dd92ab6e29b573706dd6adb3d8eb63ae81b
branch: main
author: Hugo van Kemenade <hugovk at users.noreply.github.com>
committer: ambv <lukasz at langa.pl>
date: 2022-07-25T18:24:42+02:00
summary:

gh-93963: Document importlib.abc deprecations (#94546)

files:
M Doc/library/importlib.resources.abc.rst
M Doc/whatsnew/3.12.rst

diff --git a/Doc/library/importlib.resources.abc.rst b/Doc/library/importlib.resources.abc.rst
index d281ac032216a..57fffe0d905cb 100644
--- a/Doc/library/importlib.resources.abc.rst
+++ b/Doc/library/importlib.resources.abc.rst
@@ -45,6 +45,9 @@
 
     .. versionadded:: 3.7
 
+    .. deprecated-removed:: 3.12 3.14
+       Use :class:`importlib.resources.abc.TraversableResources` instead.
+
     .. abstractmethod:: open_resource(resource)
 
         Returns an opened, :term:`file-like object` for binary reading
@@ -91,6 +94,9 @@
 
     .. versionadded:: 3.9
 
+    .. deprecated-removed:: 3.12 3.14
+       Use :class:`importlib.resources.abc.Traversable` instead.
+
     .. attribute:: name
 
        Abstract. The base name of this object without any parent references.
@@ -146,6 +152,9 @@
 
     .. versionadded:: 3.9
 
+    .. deprecated-removed:: 3.12 3.14
+       Use :class:`importlib.resources.abc.TraversableResources` instead.
+
     .. abstractmethod:: files()
 
        Returns a :class:`importlib.resources.abc.Traversable` object for the loaded
diff --git a/Doc/whatsnew/3.12.rst b/Doc/whatsnew/3.12.rst
index 4a37e282b2a79..03020559362b1 100644
--- a/Doc/whatsnew/3.12.rst
+++ b/Doc/whatsnew/3.12.rst
@@ -180,6 +180,24 @@ APIs:
 * :func:`unittest.getTestCaseNames` (:gh:`50096`)
 * :class:`webbrowser.MacOSX` (:gh:`86421`)
 
+Pending Removal in Python 3.14
+==============================
+
+* Deprecated the following :mod:`importlib.abc` classes, scheduled for removal in
+  Python 3.14:
+
+  * :class:`importlib.abc.ResourceReader`
+  * :class:`importlib.abc.Traversable`
+  * :class:`importlib.abc.TraversableResources`
+
+  Use :mod:`importlib.resources.abc` classes instead:
+
+  * :class:`importlib.resources.abc.TraversableResources`
+  * :class:`importlib.resources.abc.Traversable`
+  * :class:`importlib.resources.abc.TraversableResources`
+
+  (Contributed by Jason R. Coombs and Hugo van Kemenade in :gh:`93963`.)
+
 Pending Removal in Future Versions
 ----------------------------------
 


From webhook-mailer at python.org  Mon Jul 25 12:26:55 2022
From: webhook-mailer at python.org (ambv)
Date: Mon, 25 Jul 2022 16:26:55 -0000
Subject: [Python-checkins] gh-93610: Improve docs for importlib.resources
 (GH-93611) (GH-95247)
Message-ID: <mailman.235.1658766416.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/92170517d7e7ae2ebbc9c0c7d5bfec5de6703b21
commit: 92170517d7e7ae2ebbc9c0c7d5bfec5de6703b21
branch: 3.11
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: ambv <lukasz at langa.pl>
date: 2022-07-25T18:26:46+02:00
summary:

gh-93610: Improve docs for importlib.resources (GH-93611) (GH-95247)

(cherry picked from commit ccd7c7a0bde2587ee0e1e685f4651b50d90bd464)

Co-authored-by: Petr Viktorin <encukou at gmail.com>
Co-authored-by: Adam Turner <9087854+AA-Turner at users.noreply.github.com>
Co-authored-by: Stanley <46876382+slateny at users.noreply.github.com>
Co-authored-by: ?ukasz Langa <lukasz at langa.pl>

files:
M Doc/library/importlib.resources.abc.rst
M Doc/library/importlib.resources.rst
M Doc/library/importlib.rst
M Doc/library/modules.rst

diff --git a/Doc/library/importlib.resources.abc.rst b/Doc/library/importlib.resources.abc.rst
index 6b0e1e04c8852..d281ac032216a 100644
--- a/Doc/library/importlib.resources.abc.rst
+++ b/Doc/library/importlib.resources.abc.rst
@@ -1,3 +1,15 @@
+:mod:`importlib.resources.abc` -- Abstract base classes for resources
+---------------------------------------------------------------------
+
+.. module:: importlib.resources.abc
+    :synopsis: Abstract base classes for resources
+
+**Source code:** :source:`Lib/importlib/resources/abc.py`
+
+--------------
+
+.. versionadded:: 3.11
+
 .. class:: ResourceReader
 
     *Superseded by TraversableResources*
@@ -72,251 +84,6 @@
         The abstract method returns an iterable of no items.
 
 
-.. class:: ResourceLoader
-
-    An abstract base class for a :term:`loader` which implements the optional
-    :pep:`302` protocol for loading arbitrary resources from the storage
-    back-end.
-
-    .. deprecated:: 3.7
-       This ABC is deprecated in favour of supporting resource loading
-       through :class:`importlib.abc.ResourceReader`.
-
-    .. abstractmethod:: get_data(path)
-
-        An abstract method to return the bytes for the data located at *path*.
-        Loaders that have a file-like storage back-end
-        that allows storing arbitrary data
-        can implement this abstract method to give direct access
-        to the data stored. :exc:`OSError` is to be raised if the *path* cannot
-        be found. The *path* is expected to be constructed using a module's
-        :attr:`__file__` attribute or an item from a package's :attr:`__path__`.
-
-        .. versionchanged:: 3.4
-           Raises :exc:`OSError` instead of :exc:`NotImplementedError`.
-
-
-.. class:: InspectLoader
-
-    An abstract base class for a :term:`loader` which implements the optional
-    :pep:`302` protocol for loaders that inspect modules.
-
-    .. method:: get_code(fullname)
-
-        Return the code object for a module, or ``None`` if the module does not
-        have a code object (as would be the case, for example, for a built-in
-        module).  Raise an :exc:`ImportError` if loader cannot find the
-        requested module.
-
-        .. note::
-           While the method has a default implementation, it is suggested that
-           it be overridden if possible for performance.
-
-        .. index::
-           single: universal newlines; importlib.abc.InspectLoader.get_source method
-
-        .. versionchanged:: 3.4
-           No longer abstract and a concrete implementation is provided.
-
-    .. abstractmethod:: get_source(fullname)
-
-        An abstract method to return the source of a module. It is returned as
-        a text string using :term:`universal newlines`, translating all
-        recognized line separators into ``'\n'`` characters.  Returns ``None``
-        if no source is available (e.g. a built-in module). Raises
-        :exc:`ImportError` if the loader cannot find the module specified.
-
-        .. versionchanged:: 3.4
-           Raises :exc:`ImportError` instead of :exc:`NotImplementedError`.
-
-    .. method:: is_package(fullname)
-
-        An optional method to return a true value if the module is a package, a
-        false value otherwise. :exc:`ImportError` is raised if the
-        :term:`loader` cannot find the module.
-
-        .. versionchanged:: 3.4
-           Raises :exc:`ImportError` instead of :exc:`NotImplementedError`.
-
-    .. staticmethod:: source_to_code(data, path='<string>')
-
-        Create a code object from Python source.
-
-        The *data* argument can be whatever the :func:`compile` function
-        supports (i.e. string or bytes). The *path* argument should be
-        the "path" to where the source code originated from, which can be an
-        abstract concept (e.g. location in a zip file).
-
-        With the subsequent code object one can execute it in a module by
-        running ``exec(code, module.__dict__)``.
-
-        .. versionadded:: 3.4
-
-        .. versionchanged:: 3.5
-           Made the method static.
-
-    .. method:: exec_module(module)
-
-       Implementation of :meth:`Loader.exec_module`.
-
-       .. versionadded:: 3.4
-
-    .. method:: load_module(fullname)
-
-       Implementation of :meth:`Loader.load_module`.
-
-       .. deprecated:: 3.4
-          use :meth:`exec_module` instead.
-
-
-.. class:: ExecutionLoader
-
-    An abstract base class which inherits from :class:`InspectLoader` that,
-    when implemented, helps a module to be executed as a script. The ABC
-    represents an optional :pep:`302` protocol.
-
-    .. abstractmethod:: get_filename(fullname)
-
-        An abstract method that is to return the value of :attr:`__file__` for
-        the specified module. If no path is available, :exc:`ImportError` is
-        raised.
-
-        If source code is available, then the method should return the path to
-        the source file, regardless of whether a bytecode was used to load the
-        module.
-
-        .. versionchanged:: 3.4
-           Raises :exc:`ImportError` instead of :exc:`NotImplementedError`.
-
-
-.. class:: FileLoader(fullname, path)
-
-   An abstract base class which inherits from :class:`ResourceLoader` and
-   :class:`ExecutionLoader`, providing concrete implementations of
-   :meth:`ResourceLoader.get_data` and :meth:`ExecutionLoader.get_filename`.
-
-   The *fullname* argument is a fully resolved name of the module the loader is
-   to handle. The *path* argument is the path to the file for the module.
-
-   .. versionadded:: 3.3
-
-   .. attribute:: name
-
-      The name of the module the loader can handle.
-
-   .. attribute:: path
-
-      Path to the file of the module.
-
-   .. method:: load_module(fullname)
-
-      Calls super's ``load_module()``.
-
-      .. deprecated:: 3.4
-         Use :meth:`Loader.exec_module` instead.
-
-   .. abstractmethod:: get_filename(fullname)
-
-      Returns :attr:`path`.
-
-   .. abstractmethod:: get_data(path)
-
-      Reads *path* as a binary file and returns the bytes from it.
-
-
-.. class:: SourceLoader
-
-    An abstract base class for implementing source (and optionally bytecode)
-    file loading. The class inherits from both :class:`ResourceLoader` and
-    :class:`ExecutionLoader`, requiring the implementation of:
-
-    * :meth:`ResourceLoader.get_data`
-    * :meth:`ExecutionLoader.get_filename`
-          Should only return the path to the source file; sourceless
-          loading is not supported.
-
-    The abstract methods defined by this class are to add optional bytecode
-    file support. Not implementing these optional methods (or causing them to
-    raise :exc:`NotImplementedError`) causes the loader to
-    only work with source code. Implementing the methods allows the loader to
-    work with source *and* bytecode files; it does not allow for *sourceless*
-    loading where only bytecode is provided.  Bytecode files are an
-    optimization to speed up loading by removing the parsing step of Python's
-    compiler, and so no bytecode-specific API is exposed.
-
-    .. method:: path_stats(path)
-
-        Optional abstract method which returns a :class:`dict` containing
-        metadata about the specified path.  Supported dictionary keys are:
-
-        - ``'mtime'`` (mandatory): an integer or floating-point number
-          representing the modification time of the source code;
-        - ``'size'`` (optional): the size in bytes of the source code.
-
-        Any other keys in the dictionary are ignored, to allow for future
-        extensions. If the path cannot be handled, :exc:`OSError` is raised.
-
-        .. versionadded:: 3.3
-
-        .. versionchanged:: 3.4
-           Raise :exc:`OSError` instead of :exc:`NotImplementedError`.
-
-    .. method:: path_mtime(path)
-
-        Optional abstract method which returns the modification time for the
-        specified path.
-
-        .. deprecated:: 3.3
-           This method is deprecated in favour of :meth:`path_stats`.  You don't
-           have to implement it, but it is still available for compatibility
-           purposes. Raise :exc:`OSError` if the path cannot be handled.
-
-        .. versionchanged:: 3.4
-           Raise :exc:`OSError` instead of :exc:`NotImplementedError`.
-
-    .. method:: set_data(path, data)
-
-        Optional abstract method which writes the specified bytes to a file
-        path. Any intermediate directories which do not exist are to be created
-        automatically.
-
-        When writing to the path fails because the path is read-only
-        (:attr:`errno.EACCES`/:exc:`PermissionError`), do not propagate the
-        exception.
-
-        .. versionchanged:: 3.4
-           No longer raises :exc:`NotImplementedError` when called.
-
-    .. method:: get_code(fullname)
-
-        Concrete implementation of :meth:`InspectLoader.get_code`.
-
-    .. method:: exec_module(module)
-
-       Concrete implementation of :meth:`Loader.exec_module`.
-
-       .. versionadded:: 3.4
-
-    .. method:: load_module(fullname)
-
-       Concrete implementation of :meth:`Loader.load_module`.
-
-       .. deprecated:: 3.4
-          Use :meth:`exec_module` instead.
-
-    .. method:: get_source(fullname)
-
-        Concrete implementation of :meth:`InspectLoader.get_source`.
-
-    .. method:: is_package(fullname)
-
-        Concrete implementation of :meth:`InspectLoader.is_package`. A module
-        is determined to be a package if its file path (as provided by
-        :meth:`ExecutionLoader.get_filename`) is a file named
-        ``__init__`` when the file extension is removed **and** the module name
-        itself does not end in ``__init__``.
-
-
 .. class:: Traversable
 
     An object with a subset of pathlib.Path methods suitable for
@@ -369,8 +136,8 @@
 
     An abstract base class for resource readers capable of serving
     the :meth:`importlib.resources.files` interface. Subclasses
-    :class:`importlib.abc.ResourceReader` and provides
-    concrete implementations of the :class:`importlib.abc.ResourceReader`'s
+    :class:`importlib.resources.abc.ResourceReader` and provides
+    concrete implementations of the :class:`importlib.resources.abc.ResourceReader`'s
     abstract methods. Therefore, any loader supplying
     :class:`importlib.abc.TraversableReader` also supplies ResourceReader.
 
@@ -381,5 +148,5 @@
 
     .. abstractmethod:: files()
 
-       Returns a :class:`importlib.abc.Traversable` object for the loaded
+       Returns a :class:`importlib.resources.abc.Traversable` object for the loaded
        package.
diff --git a/Doc/library/importlib.resources.rst b/Doc/library/importlib.resources.rst
index b88c9882de44b..d367dcee7c207 100644
--- a/Doc/library/importlib.resources.rst
+++ b/Doc/library/importlib.resources.rst
@@ -17,7 +17,9 @@ text mode.
 
 Resources are roughly akin to files inside directories, though it's important
 to keep in mind that this is just a metaphor.  Resources and packages **do
-not** have to exist as physical files and directories on the file system.
+not** have to exist as physical files and directories on the file system:
+for example, a package and its resources can be imported from a zip file using
+:py:mod:`zipimport`.
 
 .. note::
 
@@ -33,47 +35,36 @@ not** have to exist as physical files and directories on the file system.
    on `using importlib.resources
    <http://importlib-resources.readthedocs.io/en/latest/using.html>`_ and
    `migrating from pkg_resources to importlib.resources
-   <http://importlib-resources.readthedocs.io/en/latest/migration.html>`_
-   and
-   `migrating legacy usage <https://importlib-resources.readthedocs.io/en/latest/using.html#migrating-from-legacy>`_.
+   <http://importlib-resources.readthedocs.io/en/latest/migration.html>`_.
 
-Loaders that wish to support resource reading should implement a
+:class:`Loaders <importlib.abc.Loader>` that wish to support resource reading should implement a
 ``get_resource_reader(fullname)`` method as specified by
-:class:`importlib.abc.ResourceReader`.
-
-The following types are defined.
+:class:`importlib.resources.abc.ResourceReader`.
 
 .. data:: Package
 
-    The ``Package`` type is defined as ``Union[str, ModuleType]``.  This means
-    that where the function describes accepting a ``Package``, you can pass in
-    either a string or a module.  Module objects must have a resolvable
-    ``__spec__.submodule_search_locations`` that is not ``None``.
-
-.. data:: Resource
-
-    This type describes the resource names passed into the various functions
-    in this package.  This is defined as ``Union[str, os.PathLike]``.
-
-
-The following functions are available.
+    Whenever a function accepts a ``Package`` argument, you can pass in
+    either a :class:`module object <types.ModuleType>` or a module name
+    as a string.  You can only pass module objects whose
+    ``__spec__.submodule_search_locations`` is not ``None``.
 
+    The ``Package`` type is defined as ``Union[str, ModuleType]``.
 
 .. function:: files(package)
 
-    Returns an :class:`importlib.resources.abc.Traversable` object
+    Returns a :class:`~importlib.resources.abc.Traversable` object
     representing the resource container for the package (think directory)
     and its resources (think files). A Traversable may contain other
     containers (think subdirectories).
 
     *package* is either a name or a module object which conforms to the
-    ``Package`` requirements.
+    :data:`Package` requirements.
 
     .. versionadded:: 3.9
 
 .. function:: as_file(traversable)
 
-    Given a :class:`importlib.resources.abc.Traversable` object representing
+    Given a :class:`~importlib.resources.abc.Traversable` object representing
     a file, typically from :func:`importlib.resources.files`, return
     a context manager for use in a :keyword:`with` statement.
     The context manager provides a :class:`pathlib.Path` object.
@@ -87,6 +78,22 @@ The following functions are available.
 
     .. versionadded:: 3.9
 
+Deprecated functions
+--------------------
+
+An older, deprecated set of functions is still available, but is
+scheduled for removal in a future version of Python.
+The main drawback of these functions is that they do not support
+directories: they assume all resources are located directly within a *package*.
+
+.. data:: Resource
+
+    For *resource* arguments of the functions below, you can pass in
+    the name of a resource as a string or
+    a :class:`path-like object <os.PathLike>`.
+
+    The ``Resource`` type is defined as ``Union[str, os.PathLike]``.
+
 .. function:: open_binary(package, resource)
 
     Open for binary reading the *resource* within *package*.
@@ -97,7 +104,11 @@ The following functions are available.
     sub-resources (i.e. it cannot be a directory).  This function returns a
     ``typing.BinaryIO`` instance, a binary I/O stream open for reading.
 
-   .. deprecated:: 3.11
+    .. deprecated:: 3.11
+
+       Calls to this function can be replaced by::
+
+          files(package).joinpath(resource).open('rb')
 
 
 .. function:: open_text(package, resource, encoding='utf-8', errors='strict')
@@ -114,7 +125,11 @@ The following functions are available.
     This function returns a ``typing.TextIO`` instance, a text I/O stream open
     for reading.
 
-   .. deprecated:: 3.11
+    .. deprecated:: 3.11
+
+       Calls to this function can be replaced by::
+
+          files(package).joinpath(resource).open('r', encoding=encoding)
 
 
 .. function:: read_binary(package, resource)
@@ -128,7 +143,11 @@ The following functions are available.
     sub-resources (i.e. it cannot be a directory).  This function returns the
     contents of the resource as :class:`bytes`.
 
-   .. deprecated:: 3.11
+    .. deprecated:: 3.11
+
+       Calls to this function can be replaced by::
+
+          files(package).joinpath(resource).read_bytes()
 
 
 .. function:: read_text(package, resource, encoding='utf-8', errors='strict')
@@ -143,7 +162,11 @@ The following functions are available.
     have the same meaning as with built-in :func:`open`.  This function
     returns the contents of the resource as :class:`str`.
 
-   .. deprecated:: 3.11
+    .. deprecated:: 3.11
+
+       Calls to this function can be replaced by::
+
+          files(package).joinpath(resource).read_text(encoding=encoding)
 
 
 .. function:: path(package, resource)
@@ -160,17 +183,26 @@ The following functions are available.
     within *package*; it may not contain path separators and it may not have
     sub-resources (i.e. it cannot be a directory).
 
-   .. deprecated:: 3.11
+    .. deprecated:: 3.11
+
+       Calls to this function can be replaced using :func:`as_file`::
+
+          as_file(files(package).joinpath(resource))
 
 
 .. function:: is_resource(package, name)
 
     Return ``True`` if there is a resource named *name* in the package,
-    otherwise ``False``.  Remember that directories are *not* resources!
+    otherwise ``False``.
+    This function does not consider directories to be resources.
     *package* is either a name or a module object which conforms to the
     ``Package`` requirements.
 
-   .. deprecated:: 3.11
+    .. deprecated:: 3.11
+
+       Calls to this function can be replaced by::
+
+          files(package).joinpath(resource).is_file()
 
 
 .. function:: contents(package)
@@ -182,4 +214,8 @@ The following functions are available.
     *package* is either a name or a module object which conforms to the
     ``Package`` requirements.
 
-   .. deprecated:: 3.11
+    .. deprecated:: 3.11
+
+       Calls to this function can be replaced by::
+
+          (resource.name for resource in files(package).iterdir() if resource.is_file())
diff --git a/Doc/library/importlib.rst b/Doc/library/importlib.rst
index 44bf703e93a84..c29d69c143cfe 100644
--- a/Doc/library/importlib.rst
+++ b/Doc/library/importlib.rst
@@ -401,7 +401,7 @@ ABC hierarchy::
 
     Loaders that wish to support resource reading should implement a
     :meth:`get_resource_reader` method as specified by
-    :class:`importlib.abc.ResourceReader`.
+    :class:`importlib.resources.abc.ResourceReader`.
 
     .. versionchanged:: 3.7
        Introduced the optional :meth:`get_resource_reader` method.
@@ -508,7 +508,250 @@ ABC hierarchy::
            The import machinery now takes care of this automatically.
 
 
-.. include:: importlib.resources.abc.rst
+.. class:: ResourceLoader
+
+    An abstract base class for a :term:`loader` which implements the optional
+    :pep:`302` protocol for loading arbitrary resources from the storage
+    back-end.
+
+    .. deprecated:: 3.7
+       This ABC is deprecated in favour of supporting resource loading
+       through :class:`importlib.resources.abc.ResourceReader`.
+
+    .. abstractmethod:: get_data(path)
+
+        An abstract method to return the bytes for the data located at *path*.
+        Loaders that have a file-like storage back-end
+        that allows storing arbitrary data
+        can implement this abstract method to give direct access
+        to the data stored. :exc:`OSError` is to be raised if the *path* cannot
+        be found. The *path* is expected to be constructed using a module's
+        :attr:`__file__` attribute or an item from a package's :attr:`__path__`.
+
+        .. versionchanged:: 3.4
+           Raises :exc:`OSError` instead of :exc:`NotImplementedError`.
+
+
+.. class:: InspectLoader
+
+    An abstract base class for a :term:`loader` which implements the optional
+    :pep:`302` protocol for loaders that inspect modules.
+
+    .. method:: get_code(fullname)
+
+        Return the code object for a module, or ``None`` if the module does not
+        have a code object (as would be the case, for example, for a built-in
+        module).  Raise an :exc:`ImportError` if loader cannot find the
+        requested module.
+
+        .. note::
+           While the method has a default implementation, it is suggested that
+           it be overridden if possible for performance.
+
+        .. index::
+           single: universal newlines; importlib.abc.InspectLoader.get_source method
+
+        .. versionchanged:: 3.4
+           No longer abstract and a concrete implementation is provided.
+
+    .. abstractmethod:: get_source(fullname)
+
+        An abstract method to return the source of a module. It is returned as
+        a text string using :term:`universal newlines`, translating all
+        recognized line separators into ``'\n'`` characters.  Returns ``None``
+        if no source is available (e.g. a built-in module). Raises
+        :exc:`ImportError` if the loader cannot find the module specified.
+
+        .. versionchanged:: 3.4
+           Raises :exc:`ImportError` instead of :exc:`NotImplementedError`.
+
+    .. method:: is_package(fullname)
+
+        An optional method to return a true value if the module is a package, a
+        false value otherwise. :exc:`ImportError` is raised if the
+        :term:`loader` cannot find the module.
+
+        .. versionchanged:: 3.4
+           Raises :exc:`ImportError` instead of :exc:`NotImplementedError`.
+
+    .. staticmethod:: source_to_code(data, path='<string>')
+
+        Create a code object from Python source.
+
+        The *data* argument can be whatever the :func:`compile` function
+        supports (i.e. string or bytes). The *path* argument should be
+        the "path" to where the source code originated from, which can be an
+        abstract concept (e.g. location in a zip file).
+
+        With the subsequent code object one can execute it in a module by
+        running ``exec(code, module.__dict__)``.
+
+        .. versionadded:: 3.4
+
+        .. versionchanged:: 3.5
+           Made the method static.
+
+    .. method:: exec_module(module)
+
+       Implementation of :meth:`Loader.exec_module`.
+
+       .. versionadded:: 3.4
+
+    .. method:: load_module(fullname)
+
+       Implementation of :meth:`Loader.load_module`.
+
+       .. deprecated:: 3.4
+          use :meth:`exec_module` instead.
+
+
+.. class:: ExecutionLoader
+
+    An abstract base class which inherits from :class:`InspectLoader` that,
+    when implemented, helps a module to be executed as a script. The ABC
+    represents an optional :pep:`302` protocol.
+
+    .. abstractmethod:: get_filename(fullname)
+
+        An abstract method that is to return the value of :attr:`__file__` for
+        the specified module. If no path is available, :exc:`ImportError` is
+        raised.
+
+        If source code is available, then the method should return the path to
+        the source file, regardless of whether a bytecode was used to load the
+        module.
+
+        .. versionchanged:: 3.4
+           Raises :exc:`ImportError` instead of :exc:`NotImplementedError`.
+
+
+.. class:: FileLoader(fullname, path)
+
+   An abstract base class which inherits from :class:`ResourceLoader` and
+   :class:`ExecutionLoader`, providing concrete implementations of
+   :meth:`ResourceLoader.get_data` and :meth:`ExecutionLoader.get_filename`.
+
+   The *fullname* argument is a fully resolved name of the module the loader is
+   to handle. The *path* argument is the path to the file for the module.
+
+   .. versionadded:: 3.3
+
+   .. attribute:: name
+
+      The name of the module the loader can handle.
+
+   .. attribute:: path
+
+      Path to the file of the module.
+
+   .. method:: load_module(fullname)
+
+      Calls super's ``load_module()``.
+
+      .. deprecated:: 3.4
+         Use :meth:`Loader.exec_module` instead.
+
+   .. abstractmethod:: get_filename(fullname)
+
+      Returns :attr:`path`.
+
+   .. abstractmethod:: get_data(path)
+
+      Reads *path* as a binary file and returns the bytes from it.
+
+
+.. class:: SourceLoader
+
+    An abstract base class for implementing source (and optionally bytecode)
+    file loading. The class inherits from both :class:`ResourceLoader` and
+    :class:`ExecutionLoader`, requiring the implementation of:
+
+    * :meth:`ResourceLoader.get_data`
+    * :meth:`ExecutionLoader.get_filename`
+          Should only return the path to the source file; sourceless
+          loading is not supported.
+
+    The abstract methods defined by this class are to add optional bytecode
+    file support. Not implementing these optional methods (or causing them to
+    raise :exc:`NotImplementedError`) causes the loader to
+    only work with source code. Implementing the methods allows the loader to
+    work with source *and* bytecode files; it does not allow for *sourceless*
+    loading where only bytecode is provided.  Bytecode files are an
+    optimization to speed up loading by removing the parsing step of Python's
+    compiler, and so no bytecode-specific API is exposed.
+
+    .. method:: path_stats(path)
+
+        Optional abstract method which returns a :class:`dict` containing
+        metadata about the specified path.  Supported dictionary keys are:
+
+        - ``'mtime'`` (mandatory): an integer or floating-point number
+          representing the modification time of the source code;
+        - ``'size'`` (optional): the size in bytes of the source code.
+
+        Any other keys in the dictionary are ignored, to allow for future
+        extensions. If the path cannot be handled, :exc:`OSError` is raised.
+
+        .. versionadded:: 3.3
+
+        .. versionchanged:: 3.4
+           Raise :exc:`OSError` instead of :exc:`NotImplementedError`.
+
+    .. method:: path_mtime(path)
+
+        Optional abstract method which returns the modification time for the
+        specified path.
+
+        .. deprecated:: 3.3
+           This method is deprecated in favour of :meth:`path_stats`.  You don't
+           have to implement it, but it is still available for compatibility
+           purposes. Raise :exc:`OSError` if the path cannot be handled.
+
+        .. versionchanged:: 3.4
+           Raise :exc:`OSError` instead of :exc:`NotImplementedError`.
+
+    .. method:: set_data(path, data)
+
+        Optional abstract method which writes the specified bytes to a file
+        path. Any intermediate directories which do not exist are to be created
+        automatically.
+
+        When writing to the path fails because the path is read-only
+        (:attr:`errno.EACCES`/:exc:`PermissionError`), do not propagate the
+        exception.
+
+        .. versionchanged:: 3.4
+           No longer raises :exc:`NotImplementedError` when called.
+
+    .. method:: get_code(fullname)
+
+        Concrete implementation of :meth:`InspectLoader.get_code`.
+
+    .. method:: exec_module(module)
+
+       Concrete implementation of :meth:`Loader.exec_module`.
+
+       .. versionadded:: 3.4
+
+    .. method:: load_module(fullname)
+
+       Concrete implementation of :meth:`Loader.load_module`.
+
+       .. deprecated:: 3.4
+          Use :meth:`exec_module` instead.
+
+    .. method:: get_source(fullname)
+
+        Concrete implementation of :meth:`InspectLoader.get_source`.
+
+    .. method:: is_package(fullname)
+
+        Concrete implementation of :meth:`InspectLoader.is_package`. A module
+        is determined to be a package if its file path (as provided by
+        :meth:`ExecutionLoader.get_filename`) is a file named
+        ``__init__`` when the file extension is removed **and** the module name
+        itself does not end in ``__init__``.
+
 
 
 :mod:`importlib.machinery` -- Importers and path hooks
diff --git a/Doc/library/modules.rst b/Doc/library/modules.rst
index 6cf6eb28a1e05..8c5936a4d8de2 100644
--- a/Doc/library/modules.rst
+++ b/Doc/library/modules.rst
@@ -18,5 +18,6 @@ The full list of modules described in this chapter is:
    runpy.rst
    importlib.rst
    importlib.resources.rst
+   importlib.resources.abc.rst
    importlib.metadata.rst
    sys_path_init.rst


From webhook-mailer at python.org  Mon Jul 25 12:47:14 2022
From: webhook-mailer at python.org (erlend-aasland)
Date: Mon, 25 Jul 2022 16:47:14 -0000
Subject: [Python-checkins] gh-95235: Document undocumented parameters in
 sqlite3 functions and methods (#95236)
Message-ID: <mailman.236.1658767635.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/ac6a94c669cba8c8384a61b4304c87cc83728335
commit: ac6a94c669cba8c8384a61b4304c87cc83728335
branch: main
author: Erlend Egeberg Aasland <erlend.aasland at protonmail.com>
committer: erlend-aasland <erlend.aasland at protonmail.com>
date: 2022-07-25T18:46:55+02:00
summary:

gh-95235: Document undocumented parameters in sqlite3 functions and methods (#95236)

Co-authored-by: CAM Gerlach <CAM.Gerlach at Gerlach.CAM>

files:
M Doc/library/sqlite3.rst

diff --git a/Doc/library/sqlite3.rst b/Doc/library/sqlite3.rst
index 583a36d1ef46d..956079b9bf31b 100644
--- a/Doc/library/sqlite3.rst
+++ b/Doc/library/sqlite3.rst
@@ -583,7 +583,7 @@ Connection Objects
 
    .. method:: set_authorizer(authorizer_callback)
 
-      This routine registers a callback. The callback is invoked for each attempt to
+      Register callable *authorizer_callback* to be invoked for each attempt to
       access a column of a table in the database. The callback should return
       :const:`SQLITE_OK` if access is allowed, :const:`SQLITE_DENY` if the entire SQL
       statement should be aborted with an error and :const:`SQLITE_IGNORE` if the
@@ -609,7 +609,7 @@ Connection Objects
 
    .. method:: set_progress_handler(progress_handler, n)
 
-      This routine registers a callback. The callback is invoked for every *n*
+      Register callable *progress_handler* to be invoked for every *n*
       instructions of the SQLite virtual machine. This is useful if you want to
       get called from SQLite during long-running operations, for example to update
       a GUI.
@@ -624,8 +624,8 @@ Connection Objects
 
    .. method:: set_trace_callback(trace_callback)
 
-      Registers *trace_callback* to be called for each SQL statement that is
-      actually executed by the SQLite backend.
+      Register callable *trace_callback* to be invoked for each SQL statement
+      that is actually executed by the SQLite backend.
 
       The only argument passed to the callback is the statement (as
       :class:`str`) that is being executed. The return value of the callback is
@@ -648,8 +648,10 @@ Connection Objects
 
    .. method:: enable_load_extension(enabled, /)
 
-      This routine allows/disallows the SQLite engine to load SQLite extensions
-      from shared libraries.  SQLite extensions can define new functions,
+      Enable the SQLite engine to load SQLite extensions from shared libraries
+      if *enabled* is :const:`True`;
+      else, disallow loading SQLite extensions.
+      SQLite extensions can define new functions,
       aggregates or whole new virtual table implementations.  One well-known
       extension is the fulltext-search extension distributed with SQLite.
 
@@ -666,9 +668,9 @@ Connection Objects
 
    .. method:: load_extension(path, /)
 
-      This routine loads an SQLite extension from a shared library.  You have to
-      enable extension loading with :meth:`enable_load_extension` before you can
-      use this routine.
+      Load an SQLite extension from a shared library located at *path*.
+      Enable extension loading with :meth:`enable_load_extension` before
+      calling this method.
 
       Loadable extensions are disabled by default. See [#f1]_.
 
@@ -877,8 +879,10 @@ Cursor Objects
 
    .. method:: execute(sql, parameters=(), /)
 
-      Execute an SQL statement. Values may be bound to the statement using
-      :ref:`placeholders <sqlite3-placeholders>`.
+      Execute SQL statement *sql*.
+      Bind values to the statement using :ref:`placeholders
+      <sqlite3-placeholders>` that map to the :term:`sequence` or :class:`dict`
+      *parameters*.
 
       :meth:`execute` will only execute a single SQL statement. If you try to execute
       more than one statement with it, it will raise a :exc:`ProgrammingError`. Use
@@ -893,7 +897,7 @@ Cursor Objects
 
    .. method:: executemany(sql, seq_of_parameters, /)
 
-      Execute a :ref:`parameterized <sqlite3-placeholders>` SQL command
+      Execute :ref:`parameterized <sqlite3-placeholders>` SQL statement *sql*
       against all parameter sequences or mappings found in the sequence
       *seq_of_parameters*.  It is also possible to use an
       :term:`iterator` yielding parameters instead of a sequence.
@@ -908,7 +912,7 @@ Cursor Objects
 
    .. method:: executescript(sql_script, /)
 
-      Execute multiple SQL statements at once.
+      Execute the SQL statements in *sql_script*.
       If there is a pending transaciton,
       an implicit ``COMMIT`` statement is executed first.
       No other implicit transaction control is performed;


From webhook-mailer at python.org  Mon Jul 25 12:55:06 2022
From: webhook-mailer at python.org (miss-islington)
Date: Mon, 25 Jul 2022 16:55:06 -0000
Subject: [Python-checkins] gh-95235: Document undocumented parameters in
 sqlite3 functions and methods (GH-95236)
Message-ID: <mailman.237.1658768108.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/4c10dbab4e677a2aa2e37211d418293a542c3bc4
commit: 4c10dbab4e677a2aa2e37211d418293a542c3bc4
branch: 3.11
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-25T09:55:01-07:00
summary:

gh-95235: Document undocumented parameters in sqlite3 functions and methods (GH-95236)


Co-authored-by: CAM Gerlach <CAM.Gerlach at Gerlach.CAM>
(cherry picked from commit ac6a94c669cba8c8384a61b4304c87cc83728335)

Co-authored-by: Erlend Egeberg Aasland <erlend.aasland at protonmail.com>

files:
M Doc/library/sqlite3.rst

diff --git a/Doc/library/sqlite3.rst b/Doc/library/sqlite3.rst
index 28f3b32014afa..3d01eb5475f1a 100644
--- a/Doc/library/sqlite3.rst
+++ b/Doc/library/sqlite3.rst
@@ -573,7 +573,7 @@ Connection Objects
 
    .. method:: set_authorizer(authorizer_callback)
 
-      This routine registers a callback. The callback is invoked for each attempt to
+      Register callable *authorizer_callback* to be invoked for each attempt to
       access a column of a table in the database. The callback should return
       :const:`SQLITE_OK` if access is allowed, :const:`SQLITE_DENY` if the entire SQL
       statement should be aborted with an error and :const:`SQLITE_IGNORE` if the
@@ -599,7 +599,7 @@ Connection Objects
 
    .. method:: set_progress_handler(progress_handler, n)
 
-      This routine registers a callback. The callback is invoked for every *n*
+      Register callable *progress_handler* to be invoked for every *n*
       instructions of the SQLite virtual machine. This is useful if you want to
       get called from SQLite during long-running operations, for example to update
       a GUI.
@@ -614,8 +614,8 @@ Connection Objects
 
    .. method:: set_trace_callback(trace_callback)
 
-      Registers *trace_callback* to be called for each SQL statement that is
-      actually executed by the SQLite backend.
+      Register callable *trace_callback* to be invoked for each SQL statement
+      that is actually executed by the SQLite backend.
 
       The only argument passed to the callback is the statement (as
       :class:`str`) that is being executed. The return value of the callback is
@@ -638,8 +638,10 @@ Connection Objects
 
    .. method:: enable_load_extension(enabled, /)
 
-      This routine allows/disallows the SQLite engine to load SQLite extensions
-      from shared libraries.  SQLite extensions can define new functions,
+      Enable the SQLite engine to load SQLite extensions from shared libraries
+      if *enabled* is :const:`True`;
+      else, disallow loading SQLite extensions.
+      SQLite extensions can define new functions,
       aggregates or whole new virtual table implementations.  One well-known
       extension is the fulltext-search extension distributed with SQLite.
 
@@ -656,9 +658,9 @@ Connection Objects
 
    .. method:: load_extension(path, /)
 
-      This routine loads an SQLite extension from a shared library.  You have to
-      enable extension loading with :meth:`enable_load_extension` before you can
-      use this routine.
+      Load an SQLite extension from a shared library located at *path*.
+      Enable extension loading with :meth:`enable_load_extension` before
+      calling this method.
 
       Loadable extensions are disabled by default. See [#f1]_.
 
@@ -867,8 +869,10 @@ Cursor Objects
 
    .. method:: execute(sql, parameters=(), /)
 
-      Execute an SQL statement. Values may be bound to the statement using
-      :ref:`placeholders <sqlite3-placeholders>`.
+      Execute SQL statement *sql*.
+      Bind values to the statement using :ref:`placeholders
+      <sqlite3-placeholders>` that map to the :term:`sequence` or :class:`dict`
+      *parameters*.
 
       :meth:`execute` will only execute a single SQL statement. If you try to execute
       more than one statement with it, it will raise a :exc:`ProgrammingError`. Use
@@ -883,7 +887,7 @@ Cursor Objects
 
    .. method:: executemany(sql, seq_of_parameters, /)
 
-      Execute a :ref:`parameterized <sqlite3-placeholders>` SQL command
+      Execute :ref:`parameterized <sqlite3-placeholders>` SQL statement *sql*
       against all parameter sequences or mappings found in the sequence
       *seq_of_parameters*.  It is also possible to use an
       :term:`iterator` yielding parameters instead of a sequence.
@@ -898,7 +902,7 @@ Cursor Objects
 
    .. method:: executescript(sql_script, /)
 
-      Execute multiple SQL statements at once.
+      Execute the SQL statements in *sql_script*.
       If there is a pending transaciton,
       an implicit ``COMMIT`` statement is executed first.
       No other implicit transaction control is performed;


From webhook-mailer at python.org  Mon Jul 25 12:55:53 2022
From: webhook-mailer at python.org (miss-islington)
Date: Mon, 25 Jul 2022 16:55:53 -0000
Subject: [Python-checkins] gh-95235: Document undocumented parameters in
 sqlite3 functions and methods (GH-95236)
Message-ID: <mailman.238.1658768154.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/0418d9f2f3c6736dcf00703a8d3cbe5b19cfb83e
commit: 0418d9f2f3c6736dcf00703a8d3cbe5b19cfb83e
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-25T09:55:46-07:00
summary:

gh-95235: Document undocumented parameters in sqlite3 functions and methods (GH-95236)


Co-authored-by: CAM Gerlach <CAM.Gerlach at Gerlach.CAM>
(cherry picked from commit ac6a94c669cba8c8384a61b4304c87cc83728335)

Co-authored-by: Erlend Egeberg Aasland <erlend.aasland at protonmail.com>

files:
M Doc/library/sqlite3.rst

diff --git a/Doc/library/sqlite3.rst b/Doc/library/sqlite3.rst
index c17756844856b..868e2a55a71b5 100644
--- a/Doc/library/sqlite3.rst
+++ b/Doc/library/sqlite3.rst
@@ -487,7 +487,7 @@ Connection Objects
 
    .. method:: set_authorizer(authorizer_callback)
 
-      This routine registers a callback. The callback is invoked for each attempt to
+      Register callable *authorizer_callback* to be invoked for each attempt to
       access a column of a table in the database. The callback should return
       :const:`SQLITE_OK` if access is allowed, :const:`SQLITE_DENY` if the entire SQL
       statement should be aborted with an error and :const:`SQLITE_IGNORE` if the
@@ -508,7 +508,7 @@ Connection Objects
 
    .. method:: set_progress_handler(progress_handler, n)
 
-      This routine registers a callback. The callback is invoked for every *n*
+      Register callable *progress_handler* to be invoked for every *n*
       instructions of the SQLite virtual machine. This is useful if you want to
       get called from SQLite during long-running operations, for example to update
       a GUI.
@@ -523,8 +523,8 @@ Connection Objects
 
    .. method:: set_trace_callback(trace_callback)
 
-      Registers *trace_callback* to be called for each SQL statement that is
-      actually executed by the SQLite backend.
+      Register callable *trace_callback* to be invoked for each SQL statement
+      that is actually executed by the SQLite backend.
 
       The only argument passed to the callback is the statement (as
       :class:`str`) that is being executed. The return value of the callback is
@@ -547,8 +547,10 @@ Connection Objects
 
    .. method:: enable_load_extension(enabled, /)
 
-      This routine allows/disallows the SQLite engine to load SQLite extensions
-      from shared libraries.  SQLite extensions can define new functions,
+      Enable the SQLite engine to load SQLite extensions from shared libraries
+      if *enabled* is :const:`True`;
+      else, disallow loading SQLite extensions.
+      SQLite extensions can define new functions,
       aggregates or whole new virtual table implementations.  One well-known
       extension is the fulltext-search extension distributed with SQLite.
 
@@ -565,9 +567,9 @@ Connection Objects
 
    .. method:: load_extension(path, /)
 
-      This routine loads an SQLite extension from a shared library.  You have to
-      enable extension loading with :meth:`enable_load_extension` before you can
-      use this routine.
+      Load an SQLite extension from a shared library located at *path*.
+      Enable extension loading with :meth:`enable_load_extension` before
+      calling this method.
 
       Loadable extensions are disabled by default. See [#f1]_.
 
@@ -704,8 +706,10 @@ Cursor Objects
 
    .. method:: execute(sql, parameters=(), /)
 
-      Execute an SQL statement. Values may be bound to the statement using
-      :ref:`placeholders <sqlite3-placeholders>`.
+      Execute SQL statement *sql*.
+      Bind values to the statement using :ref:`placeholders
+      <sqlite3-placeholders>` that map to the :term:`sequence` or :class:`dict`
+      *parameters*.
 
       :meth:`execute` will only execute a single SQL statement. If you try to execute
       more than one statement with it, it will raise a :exc:`Warning`. Use
@@ -720,7 +724,7 @@ Cursor Objects
 
    .. method:: executemany(sql, seq_of_parameters, /)
 
-      Execute a :ref:`parameterized <sqlite3-placeholders>` SQL command
+      Execute :ref:`parameterized <sqlite3-placeholders>` SQL statement *sql*
       against all parameter sequences or mappings found in the sequence
       *seq_of_parameters*.  It is also possible to use an
       :term:`iterator` yielding parameters instead of a sequence.
@@ -735,7 +739,7 @@ Cursor Objects
 
    .. method:: executescript(sql_script, /)
 
-      Execute multiple SQL statements at once.
+      Execute the SQL statements in *sql_script*.
       If there is a pending transaciton,
       an implicit ``COMMIT`` statement is executed first.
       No other implicit transaction control is performed;


From webhook-mailer at python.org  Mon Jul 25 13:44:08 2022
From: webhook-mailer at python.org (miss-islington)
Date: Mon, 25 Jul 2022 17:44:08 -0000
Subject: [Python-checkins] GH-94851: check refcnt of immortal objects after
 finalization (GH-95001)
Message-ID: <mailman.239.1658771049.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/73ee5a6b865fbd2e89b5b1f0a33bd7bcc7176c21
commit: 73ee5a6b865fbd2e89b5b1f0a33bd7bcc7176c21
branch: main
author: Kumar Aditya <59607654+kumaraditya303 at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-25T10:43:59-07:00
summary:

GH-94851: check refcnt of immortal objects after finalization (GH-95001)

files:
M Include/internal/pycore_object.h
M Include/internal/pycore_runtime_init_generated.h
M Python/pylifecycle.c
M Tools/scripts/generate_global_objects.py

diff --git a/Include/internal/pycore_object.h b/Include/internal/pycore_object.h
index d4f66b65cc9ff..1bb2da71704dd 100644
--- a/Include/internal/pycore_object.h
+++ b/Include/internal/pycore_object.h
@@ -14,9 +14,14 @@ extern "C" {
 #include "pycore_pystate.h"       // _PyInterpreterState_GET()
 #include "pycore_runtime.h"       // _PyRuntime
 
+/* This value provides *effective* immortality, meaning the object should never
+    be deallocated (until runtime finalization).  See PEP 683 for more details about
+    immortality, as well as a proposed mechanism for proper immortality. */
+#define _PyObject_IMMORTAL_REFCNT 999999999
+
 #define _PyObject_IMMORTAL_INIT(type) \
     { \
-        .ob_refcnt = 999999999, \
+        .ob_refcnt = _PyObject_IMMORTAL_REFCNT, \
         .ob_type = (type), \
     }
 #define _PyVarObject_IMMORTAL_INIT(type, size) \
diff --git a/Include/internal/pycore_runtime_init_generated.h b/Include/internal/pycore_runtime_init_generated.h
index ddaab07727b81..9fe7c31dcb449 100644
--- a/Include/internal/pycore_runtime_init_generated.h
+++ b/Include/internal/pycore_runtime_init_generated.h
@@ -1740,6 +1740,4408 @@ _PyUnicode_InitStaticStrings(void) {
     string = &_Py_ID(write);
     PyUnicode_InternInPlace(&string);
 }
+
+#ifdef Py_DEBUG
+static inline void
+_PyStaticObjects_CheckRefcnt(void) {
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + -5]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + -5]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + -4]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + -4]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + -3]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + -3]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + -2]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + -2]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + -1]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + -1]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 0]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 0]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 1]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 1]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 2]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 2]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 3]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 3]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 4]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 4]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 5]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 5]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 6]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 6]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 7]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 7]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 8]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 8]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 9]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 9]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 10]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 10]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 11]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 11]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 12]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 12]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 13]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 13]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 14]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 14]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 15]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 15]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 16]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 16]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 17]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 17]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 18]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 18]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 19]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 19]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 20]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 20]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 21]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 21]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 22]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 22]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 23]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 23]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 24]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 24]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 25]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 25]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 26]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 26]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 27]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 27]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 28]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 28]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 29]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 29]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 30]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 30]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 31]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 31]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 32]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 32]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 33]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 33]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 34]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 34]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 35]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 35]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 36]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 36]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 37]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 37]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 38]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 38]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 39]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 39]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 40]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 40]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 41]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 41]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 42]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 42]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 43]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 43]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 44]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 44]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 45]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 45]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 46]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 46]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 47]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 47]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 48]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 48]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 49]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 49]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 50]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 50]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 51]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 51]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 52]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 52]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 53]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 53]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 54]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 54]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 55]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 55]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 56]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 56]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 57]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 57]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 58]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 58]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 59]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 59]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 60]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 60]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 61]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 61]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 62]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 62]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 63]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 63]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 64]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 64]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 65]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 65]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 66]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 66]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 67]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 67]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 68]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 68]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 69]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 69]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 70]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 70]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 71]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 71]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 72]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 72]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 73]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 73]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 74]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 74]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 75]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 75]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 76]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 76]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 77]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 77]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 78]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 78]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 79]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 79]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 80]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 80]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 81]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 81]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 82]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 82]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 83]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 83]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 84]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 84]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 85]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 85]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 86]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 86]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 87]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 87]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 88]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 88]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 89]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 89]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 90]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 90]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 91]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 91]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 92]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 92]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 93]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 93]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 94]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 94]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 95]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 95]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 96]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 96]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 97]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 97]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 98]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 98]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 99]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 99]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 100]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 100]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 101]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 101]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 102]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 102]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 103]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 103]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 104]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 104]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 105]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 105]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 106]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 106]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 107]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 107]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 108]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 108]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 109]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 109]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 110]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 110]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 111]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 111]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 112]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 112]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 113]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 113]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 114]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 114]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 115]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 115]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 116]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 116]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 117]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 117]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 118]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 118]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 119]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 119]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 120]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 120]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 121]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 121]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 122]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 122]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 123]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 123]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 124]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 124]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 125]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 125]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 126]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 126]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 127]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 127]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 128]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 128]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 129]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 129]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 130]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 130]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 131]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 131]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 132]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 132]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 133]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 133]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 134]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 134]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 135]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 135]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 136]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 136]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 137]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 137]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 138]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 138]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 139]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 139]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 140]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 140]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 141]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 141]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 142]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 142]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 143]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 143]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 144]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 144]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 145]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 145]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 146]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 146]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 147]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 147]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 148]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 148]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 149]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 149]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 150]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 150]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 151]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 151]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 152]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 152]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 153]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 153]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 154]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 154]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 155]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 155]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 156]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 156]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 157]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 157]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 158]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 158]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 159]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 159]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 160]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 160]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 161]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 161]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 162]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 162]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 163]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 163]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 164]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 164]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 165]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 165]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 166]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 166]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 167]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 167]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 168]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 168]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 169]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 169]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 170]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 170]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 171]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 171]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 172]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 172]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 173]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 173]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 174]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 174]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 175]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 175]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 176]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 176]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 177]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 177]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 178]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 178]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 179]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 179]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 180]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 180]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 181]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 181]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 182]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 182]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 183]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 183]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 184]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 184]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 185]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 185]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 186]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 186]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 187]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 187]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 188]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 188]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 189]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 189]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 190]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 190]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 191]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 191]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 192]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 192]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 193]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 193]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 194]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 194]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 195]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 195]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 196]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 196]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 197]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 197]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 198]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 198]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 199]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 199]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 200]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 200]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 201]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 201]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 202]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 202]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 203]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 203]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 204]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 204]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 205]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 205]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 206]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 206]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 207]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 207]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 208]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 208]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 209]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 209]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 210]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 210]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 211]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 211]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 212]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 212]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 213]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 213]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 214]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 214]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 215]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 215]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 216]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 216]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 217]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 217]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 218]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 218]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 219]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 219]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 220]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 220]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 221]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 221]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 222]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 222]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 223]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 223]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 224]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 224]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 225]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 225]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 226]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 226]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 227]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 227]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 228]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 228]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 229]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 229]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 230]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 230]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 231]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 231]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 232]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 232]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 233]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 233]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 234]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 234]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 235]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 235]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 236]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 236]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 237]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 237]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 238]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 238]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 239]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 239]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 240]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 240]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 241]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 241]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 242]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 242]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 243]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 243]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 244]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 244]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 245]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 245]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 246]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 246]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 247]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 247]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 248]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 248]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 249]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 249]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 250]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 250]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 251]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 251]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 252]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 252]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 253]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 253]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 254]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 254]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 255]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 255]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 256]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + 256]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_empty)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_empty));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[0]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[0]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[1]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[1]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[2]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[2]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[3]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[3]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[4]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[4]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[5]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[5]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[6]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[6]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[7]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[7]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[8]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[8]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[9]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[9]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[10]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[10]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[11]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[11]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[12]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[12]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[13]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[13]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[14]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[14]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[15]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[15]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[16]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[16]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[17]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[17]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[18]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[18]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[19]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[19]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[20]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[20]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[21]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[21]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[22]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[22]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[23]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[23]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[24]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[24]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[25]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[25]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[26]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[26]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[27]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[27]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[28]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[28]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[29]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[29]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[30]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[30]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[31]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[31]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[32]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[32]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[33]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[33]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[34]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[34]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[35]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[35]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[36]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[36]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[37]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[37]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[38]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[38]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[39]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[39]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[40]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[40]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[41]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[41]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[42]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[42]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[43]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[43]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[44]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[44]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[45]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[45]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[46]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[46]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[47]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[47]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[48]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[48]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[49]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[49]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[50]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[50]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[51]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[51]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[52]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[52]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[53]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[53]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[54]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[54]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[55]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[55]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[56]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[56]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[57]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[57]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[58]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[58]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[59]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[59]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[60]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[60]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[61]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[61]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[62]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[62]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[63]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[63]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[64]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[64]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[65]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[65]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[66]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[66]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[67]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[67]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[68]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[68]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[69]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[69]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[70]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[70]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[71]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[71]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[72]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[72]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[73]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[73]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[74]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[74]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[75]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[75]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[76]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[76]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[77]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[77]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[78]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[78]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[79]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[79]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[80]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[80]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[81]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[81]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[82]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[82]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[83]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[83]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[84]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[84]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[85]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[85]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[86]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[86]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[87]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[87]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[88]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[88]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[89]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[89]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[90]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[90]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[91]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[91]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[92]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[92]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[93]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[93]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[94]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[94]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[95]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[95]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[96]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[96]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[97]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[97]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[98]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[98]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[99]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[99]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[100]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[100]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[101]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[101]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[102]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[102]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[103]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[103]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[104]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[104]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[105]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[105]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[106]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[106]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[107]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[107]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[108]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[108]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[109]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[109]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[110]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[110]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[111]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[111]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[112]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[112]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[113]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[113]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[114]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[114]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[115]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[115]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[116]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[116]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[117]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[117]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[118]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[118]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[119]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[119]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[120]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[120]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[121]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[121]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[122]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[122]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[123]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[123]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[124]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[124]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[125]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[125]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[126]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[126]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[127]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[127]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[128]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[128]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[129]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[129]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[130]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[130]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[131]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[131]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[132]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[132]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[133]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[133]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[134]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[134]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[135]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[135]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[136]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[136]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[137]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[137]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[138]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[138]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[139]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[139]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[140]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[140]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[141]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[141]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[142]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[142]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[143]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[143]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[144]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[144]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[145]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[145]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[146]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[146]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[147]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[147]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[148]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[148]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[149]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[149]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[150]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[150]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[151]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[151]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[152]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[152]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[153]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[153]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[154]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[154]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[155]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[155]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[156]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[156]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[157]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[157]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[158]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[158]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[159]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[159]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[160]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[160]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[161]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[161]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[162]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[162]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[163]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[163]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[164]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[164]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[165]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[165]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[166]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[166]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[167]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[167]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[168]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[168]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[169]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[169]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[170]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[170]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[171]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[171]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[172]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[172]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[173]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[173]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[174]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[174]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[175]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[175]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[176]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[176]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[177]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[177]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[178]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[178]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[179]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[179]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[180]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[180]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[181]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[181]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[182]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[182]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[183]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[183]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[184]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[184]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[185]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[185]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[186]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[186]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[187]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[187]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[188]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[188]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[189]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[189]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[190]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[190]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[191]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[191]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[192]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[192]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[193]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[193]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[194]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[194]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[195]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[195]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[196]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[196]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[197]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[197]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[198]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[198]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[199]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[199]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[200]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[200]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[201]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[201]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[202]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[202]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[203]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[203]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[204]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[204]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[205]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[205]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[206]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[206]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[207]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[207]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[208]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[208]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[209]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[209]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[210]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[210]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[211]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[211]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[212]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[212]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[213]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[213]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[214]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[214]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[215]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[215]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[216]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[216]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[217]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[217]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[218]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[218]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[219]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[219]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[220]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[220]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[221]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[221]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[222]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[222]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[223]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[223]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[224]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[224]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[225]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[225]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[226]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[226]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[227]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[227]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[228]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[228]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[229]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[229]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[230]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[230]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[231]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[231]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[232]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[232]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[233]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[233]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[234]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[234]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[235]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[235]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[236]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[236]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[237]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[237]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[238]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[238]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[239]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[239]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[240]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[240]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[241]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[241]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[242]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[242]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[243]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[243]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[244]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[244]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[245]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[245]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[246]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[246]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[247]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[247]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[248]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[248]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[249]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[249]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[250]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[250]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[251]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[251]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[252]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[252]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[253]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[253]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[254]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[254]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(bytes_characters)[255]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(bytes_characters)[255]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_STR(anon_dictcomp)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_STR(anon_dictcomp));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_STR(anon_genexpr)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_STR(anon_genexpr));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_STR(anon_lambda)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_STR(anon_lambda));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_STR(anon_listcomp)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_STR(anon_listcomp));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_STR(anon_module)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_STR(anon_module));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_STR(anon_setcomp)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_STR(anon_setcomp));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_STR(anon_string)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_STR(anon_string));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_STR(anon_unknown)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_STR(anon_unknown));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_STR(close_br)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_STR(close_br));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_STR(comma_sep)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_STR(comma_sep));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_STR(dbl_close_br)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_STR(dbl_close_br));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_STR(dbl_open_br)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_STR(dbl_open_br));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_STR(dbl_percent)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_STR(dbl_percent));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_STR(dot)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_STR(dot));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_STR(dot_locals)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_STR(dot_locals));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_STR(empty)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_STR(empty));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_STR(list_err)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_STR(list_err));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_STR(newline)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_STR(newline));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_STR(open_br)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_STR(open_br));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_STR(percent)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_STR(percent));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_STR(utf_8)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_STR(utf_8));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(False)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(False));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(Py_Repr)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(Py_Repr));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(TextIOWrapper)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(TextIOWrapper));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(True)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(True));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(WarningMessage)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(WarningMessage));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(_)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(_));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(__IOBase_closed)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(__IOBase_closed));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(__abc_tpflags__)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(__abc_tpflags__));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(__abs__)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(__abs__));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(__abstractmethods__)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(__abstractmethods__));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(__add__)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(__add__));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(__aenter__)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(__aenter__));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(__aexit__)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(__aexit__));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(__aiter__)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(__aiter__));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(__all__)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(__all__));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(__and__)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(__and__));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(__anext__)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(__anext__));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(__annotations__)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(__annotations__));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(__args__)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(__args__));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(__await__)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(__await__));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(__bases__)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(__bases__));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(__bool__)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(__bool__));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(__build_class__)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(__build_class__));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(__builtins__)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(__builtins__));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(__bytes__)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(__bytes__));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(__call__)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(__call__));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(__cantrace__)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(__cantrace__));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(__class__)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(__class__));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(__class_getitem__)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(__class_getitem__));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(__classcell__)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(__classcell__));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(__complex__)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(__complex__));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(__contains__)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(__contains__));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(__copy__)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(__copy__));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(__del__)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(__del__));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(__delattr__)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(__delattr__));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(__delete__)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(__delete__));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(__delitem__)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(__delitem__));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(__dict__)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(__dict__));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(__dictoffset__)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(__dictoffset__));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(__dir__)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(__dir__));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(__divmod__)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(__divmod__));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(__doc__)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(__doc__));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(__enter__)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(__enter__));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(__eq__)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(__eq__));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(__exit__)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(__exit__));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(__file__)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(__file__));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(__float__)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(__float__));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(__floordiv__)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(__floordiv__));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(__format__)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(__format__));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(__fspath__)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(__fspath__));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(__ge__)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(__ge__));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(__get__)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(__get__));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(__getattr__)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(__getattr__));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(__getattribute__)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(__getattribute__));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(__getinitargs__)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(__getinitargs__));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(__getitem__)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(__getitem__));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(__getnewargs__)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(__getnewargs__));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(__getnewargs_ex__)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(__getnewargs_ex__));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(__getstate__)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(__getstate__));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(__gt__)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(__gt__));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(__hash__)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(__hash__));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(__iadd__)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(__iadd__));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(__iand__)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(__iand__));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(__ifloordiv__)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(__ifloordiv__));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(__ilshift__)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(__ilshift__));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(__imatmul__)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(__imatmul__));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(__imod__)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(__imod__));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(__import__)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(__import__));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(__imul__)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(__imul__));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(__index__)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(__index__));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(__init__)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(__init__));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(__init_subclass__)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(__init_subclass__));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(__instancecheck__)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(__instancecheck__));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(__int__)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(__int__));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(__invert__)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(__invert__));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(__ior__)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(__ior__));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(__ipow__)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(__ipow__));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(__irshift__)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(__irshift__));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(__isabstractmethod__)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(__isabstractmethod__));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(__isub__)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(__isub__));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(__iter__)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(__iter__));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(__itruediv__)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(__itruediv__));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(__ixor__)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(__ixor__));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(__le__)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(__le__));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(__len__)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(__len__));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(__length_hint__)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(__length_hint__));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(__lltrace__)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(__lltrace__));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(__loader__)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(__loader__));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(__lshift__)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(__lshift__));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(__lt__)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(__lt__));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(__main__)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(__main__));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(__matmul__)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(__matmul__));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(__missing__)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(__missing__));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(__mod__)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(__mod__));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(__module__)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(__module__));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(__mro_entries__)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(__mro_entries__));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(__mul__)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(__mul__));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(__name__)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(__name__));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(__ne__)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(__ne__));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(__neg__)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(__neg__));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(__new__)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(__new__));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(__newobj__)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(__newobj__));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(__newobj_ex__)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(__newobj_ex__));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(__next__)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(__next__));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(__notes__)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(__notes__));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(__or__)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(__or__));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(__orig_class__)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(__orig_class__));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(__origin__)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(__origin__));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(__package__)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(__package__));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(__parameters__)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(__parameters__));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(__path__)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(__path__));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(__pos__)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(__pos__));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(__pow__)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(__pow__));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(__prepare__)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(__prepare__));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(__qualname__)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(__qualname__));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(__radd__)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(__radd__));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(__rand__)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(__rand__));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(__rdivmod__)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(__rdivmod__));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(__reduce__)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(__reduce__));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(__reduce_ex__)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(__reduce_ex__));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(__repr__)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(__repr__));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(__reversed__)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(__reversed__));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(__rfloordiv__)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(__rfloordiv__));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(__rlshift__)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(__rlshift__));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(__rmatmul__)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(__rmatmul__));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(__rmod__)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(__rmod__));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(__rmul__)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(__rmul__));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(__ror__)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(__ror__));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(__round__)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(__round__));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(__rpow__)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(__rpow__));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(__rrshift__)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(__rrshift__));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(__rshift__)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(__rshift__));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(__rsub__)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(__rsub__));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(__rtruediv__)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(__rtruediv__));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(__rxor__)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(__rxor__));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(__set__)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(__set__));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(__set_name__)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(__set_name__));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(__setattr__)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(__setattr__));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(__setitem__)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(__setitem__));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(__setstate__)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(__setstate__));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(__sizeof__)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(__sizeof__));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(__slotnames__)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(__slotnames__));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(__slots__)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(__slots__));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(__spec__)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(__spec__));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(__str__)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(__str__));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(__sub__)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(__sub__));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(__subclasscheck__)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(__subclasscheck__));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(__subclasshook__)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(__subclasshook__));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(__truediv__)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(__truediv__));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(__trunc__)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(__trunc__));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(__typing_is_unpacked_typevartuple__)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(__typing_is_unpacked_typevartuple__));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(__typing_prepare_subst__)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(__typing_prepare_subst__));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(__typing_subst__)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(__typing_subst__));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(__typing_unpacked_tuple_args__)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(__typing_unpacked_tuple_args__));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(__warningregistry__)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(__warningregistry__));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(__weaklistoffset__)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(__weaklistoffset__));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(__weakref__)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(__weakref__));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(__xor__)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(__xor__));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(_abc_impl)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(_abc_impl));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(_annotation)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(_annotation));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(_blksize)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(_blksize));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(_bootstrap)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(_bootstrap));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(_dealloc_warn)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(_dealloc_warn));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(_finalizing)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(_finalizing));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(_find_and_load)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(_find_and_load));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(_fix_up_module)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(_fix_up_module));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(_get_sourcefile)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(_get_sourcefile));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(_handle_fromlist)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(_handle_fromlist));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(_initializing)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(_initializing));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(_is_text_encoding)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(_is_text_encoding));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(_lock_unlock_module)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(_lock_unlock_module));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(_showwarnmsg)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(_showwarnmsg));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(_shutdown)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(_shutdown));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(_slotnames)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(_slotnames));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(_uninitialized_submodules)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(_uninitialized_submodules));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(_warn_unawaited_coroutine)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(_warn_unawaited_coroutine));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(_xoptions)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(_xoptions));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(add)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(add));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(append)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(append));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(big)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(big));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(buffer)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(buffer));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(builtins)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(builtins));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(c_call)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(c_call));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(c_exception)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(c_exception));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(c_return)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(c_return));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(call)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(call));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(clear)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(clear));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(close)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(close));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(closed)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(closed));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(code)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(code));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(copy)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(copy));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(copyreg)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(copyreg));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(decode)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(decode));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(default)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(default));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(defaultaction)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(defaultaction));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(dictcomp)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(dictcomp));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(difference_update)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(difference_update));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(dispatch_table)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(dispatch_table));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(displayhook)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(displayhook));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(encode)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(encode));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(encoding)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(encoding));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(end_lineno)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(end_lineno));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(end_offset)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(end_offset));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(errors)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(errors));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(excepthook)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(excepthook));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(exception)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(exception));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(extend)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(extend));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(filename)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(filename));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(fileno)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(fileno));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(fillvalue)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(fillvalue));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(filters)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(filters));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(find_class)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(find_class));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(flush)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(flush));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(genexpr)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(genexpr));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(get)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(get));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(get_source)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(get_source));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(getattr)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(getattr));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(getstate)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(getstate));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(ignore)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(ignore));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(importlib)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(importlib));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(inf)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(inf));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(intersection)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(intersection));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(isatty)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(isatty));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(isinstance)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(isinstance));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(items)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(items));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(iter)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(iter));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(join)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(join));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(keys)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(keys));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(lambda)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(lambda));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(last_traceback)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(last_traceback));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(last_type)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(last_type));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(last_value)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(last_value));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(latin1)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(latin1));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(len)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(len));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(line)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(line));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(lineno)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(lineno));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(listcomp)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(listcomp));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(little)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(little));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(locale)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(locale));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(match)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(match));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(metaclass)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(metaclass));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(mode)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(mode));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(modules)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(modules));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(mro)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(mro));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(msg)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(msg));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(n_fields)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(n_fields));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(n_sequence_fields)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(n_sequence_fields));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(n_unnamed_fields)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(n_unnamed_fields));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(name)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(name));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(newlines)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(newlines));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(next)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(next));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(obj)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(obj));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(offset)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(offset));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(onceregistry)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(onceregistry));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(opcode)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(opcode));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(open)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(open));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(parent)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(parent));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(path)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(path));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(peek)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(peek));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(persistent_id)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(persistent_id));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(persistent_load)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(persistent_load));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(print_file_and_line)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(print_file_and_line));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(ps1)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(ps1));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(ps2)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(ps2));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(raw)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(raw));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(read)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(read));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(read1)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(read1));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(readable)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(readable));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(readall)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(readall));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(readinto)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(readinto));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(readinto1)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(readinto1));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(readline)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(readline));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(reducer_override)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(reducer_override));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(reload)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(reload));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(replace)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(replace));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(reset)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(reset));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(return)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(return));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(reversed)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(reversed));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(seek)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(seek));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(seekable)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(seekable));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(send)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(send));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(setcomp)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(setcomp));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(setstate)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(setstate));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(sort)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(sort));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(stderr)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(stderr));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(stdin)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(stdin));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(stdout)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(stdout));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(strict)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(strict));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(symmetric_difference_update)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(symmetric_difference_update));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(tell)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(tell));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(text)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(text));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(threading)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(threading));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(throw)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(throw));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(top)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(top));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(truncate)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(truncate));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(unraisablehook)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(unraisablehook));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(values)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(values));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(version)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(version));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(warnings)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(warnings));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(warnoptions)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(warnoptions));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(writable)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(writable));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_ID(write)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_ID(write));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).ascii[0]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).ascii[0]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).ascii[1]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).ascii[1]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).ascii[2]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).ascii[2]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).ascii[3]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).ascii[3]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).ascii[4]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).ascii[4]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).ascii[5]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).ascii[5]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).ascii[6]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).ascii[6]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).ascii[7]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).ascii[7]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).ascii[8]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).ascii[8]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).ascii[9]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).ascii[9]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).ascii[10]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).ascii[10]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).ascii[11]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).ascii[11]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).ascii[12]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).ascii[12]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).ascii[13]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).ascii[13]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).ascii[14]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).ascii[14]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).ascii[15]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).ascii[15]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).ascii[16]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).ascii[16]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).ascii[17]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).ascii[17]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).ascii[18]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).ascii[18]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).ascii[19]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).ascii[19]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).ascii[20]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).ascii[20]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).ascii[21]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).ascii[21]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).ascii[22]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).ascii[22]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).ascii[23]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).ascii[23]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).ascii[24]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).ascii[24]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).ascii[25]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).ascii[25]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).ascii[26]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).ascii[26]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).ascii[27]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).ascii[27]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).ascii[28]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).ascii[28]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).ascii[29]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).ascii[29]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).ascii[30]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).ascii[30]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).ascii[31]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).ascii[31]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).ascii[32]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).ascii[32]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).ascii[33]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).ascii[33]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).ascii[34]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).ascii[34]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).ascii[35]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).ascii[35]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).ascii[36]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).ascii[36]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).ascii[37]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).ascii[37]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).ascii[38]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).ascii[38]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).ascii[39]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).ascii[39]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).ascii[40]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).ascii[40]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).ascii[41]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).ascii[41]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).ascii[42]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).ascii[42]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).ascii[43]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).ascii[43]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).ascii[44]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).ascii[44]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).ascii[45]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).ascii[45]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).ascii[46]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).ascii[46]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).ascii[47]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).ascii[47]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).ascii[48]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).ascii[48]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).ascii[49]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).ascii[49]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).ascii[50]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).ascii[50]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).ascii[51]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).ascii[51]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).ascii[52]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).ascii[52]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).ascii[53]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).ascii[53]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).ascii[54]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).ascii[54]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).ascii[55]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).ascii[55]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).ascii[56]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).ascii[56]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).ascii[57]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).ascii[57]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).ascii[58]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).ascii[58]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).ascii[59]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).ascii[59]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).ascii[60]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).ascii[60]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).ascii[61]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).ascii[61]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).ascii[62]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).ascii[62]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).ascii[63]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).ascii[63]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).ascii[64]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).ascii[64]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).ascii[65]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).ascii[65]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).ascii[66]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).ascii[66]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).ascii[67]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).ascii[67]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).ascii[68]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).ascii[68]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).ascii[69]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).ascii[69]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).ascii[70]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).ascii[70]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).ascii[71]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).ascii[71]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).ascii[72]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).ascii[72]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).ascii[73]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).ascii[73]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).ascii[74]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).ascii[74]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).ascii[75]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).ascii[75]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).ascii[76]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).ascii[76]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).ascii[77]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).ascii[77]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).ascii[78]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).ascii[78]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).ascii[79]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).ascii[79]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).ascii[80]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).ascii[80]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).ascii[81]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).ascii[81]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).ascii[82]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).ascii[82]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).ascii[83]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).ascii[83]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).ascii[84]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).ascii[84]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).ascii[85]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).ascii[85]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).ascii[86]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).ascii[86]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).ascii[87]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).ascii[87]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).ascii[88]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).ascii[88]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).ascii[89]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).ascii[89]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).ascii[90]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).ascii[90]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).ascii[91]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).ascii[91]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).ascii[92]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).ascii[92]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).ascii[93]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).ascii[93]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).ascii[94]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).ascii[94]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).ascii[95]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).ascii[95]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).ascii[96]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).ascii[96]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).ascii[97]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).ascii[97]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).ascii[98]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).ascii[98]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).ascii[99]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).ascii[99]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).ascii[100]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).ascii[100]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).ascii[101]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).ascii[101]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).ascii[102]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).ascii[102]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).ascii[103]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).ascii[103]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).ascii[104]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).ascii[104]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).ascii[105]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).ascii[105]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).ascii[106]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).ascii[106]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).ascii[107]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).ascii[107]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).ascii[108]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).ascii[108]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).ascii[109]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).ascii[109]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).ascii[110]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).ascii[110]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).ascii[111]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).ascii[111]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).ascii[112]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).ascii[112]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).ascii[113]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).ascii[113]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).ascii[114]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).ascii[114]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).ascii[115]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).ascii[115]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).ascii[116]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).ascii[116]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).ascii[117]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).ascii[117]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).ascii[118]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).ascii[118]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).ascii[119]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).ascii[119]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).ascii[120]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).ascii[120]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).ascii[121]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).ascii[121]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).ascii[122]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).ascii[122]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).ascii[123]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).ascii[123]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).ascii[124]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).ascii[124]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).ascii[125]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).ascii[125]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).ascii[126]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).ascii[126]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).ascii[127]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).ascii[127]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).latin1[128 - 128]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).latin1[128 - 128]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).latin1[129 - 128]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).latin1[129 - 128]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).latin1[130 - 128]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).latin1[130 - 128]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).latin1[131 - 128]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).latin1[131 - 128]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).latin1[132 - 128]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).latin1[132 - 128]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).latin1[133 - 128]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).latin1[133 - 128]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).latin1[134 - 128]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).latin1[134 - 128]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).latin1[135 - 128]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).latin1[135 - 128]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).latin1[136 - 128]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).latin1[136 - 128]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).latin1[137 - 128]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).latin1[137 - 128]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).latin1[138 - 128]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).latin1[138 - 128]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).latin1[139 - 128]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).latin1[139 - 128]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).latin1[140 - 128]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).latin1[140 - 128]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).latin1[141 - 128]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).latin1[141 - 128]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).latin1[142 - 128]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).latin1[142 - 128]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).latin1[143 - 128]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).latin1[143 - 128]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).latin1[144 - 128]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).latin1[144 - 128]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).latin1[145 - 128]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).latin1[145 - 128]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).latin1[146 - 128]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).latin1[146 - 128]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).latin1[147 - 128]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).latin1[147 - 128]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).latin1[148 - 128]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).latin1[148 - 128]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).latin1[149 - 128]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).latin1[149 - 128]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).latin1[150 - 128]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).latin1[150 - 128]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).latin1[151 - 128]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).latin1[151 - 128]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).latin1[152 - 128]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).latin1[152 - 128]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).latin1[153 - 128]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).latin1[153 - 128]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).latin1[154 - 128]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).latin1[154 - 128]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).latin1[155 - 128]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).latin1[155 - 128]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).latin1[156 - 128]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).latin1[156 - 128]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).latin1[157 - 128]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).latin1[157 - 128]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).latin1[158 - 128]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).latin1[158 - 128]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).latin1[159 - 128]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).latin1[159 - 128]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).latin1[160 - 128]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).latin1[160 - 128]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).latin1[161 - 128]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).latin1[161 - 128]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).latin1[162 - 128]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).latin1[162 - 128]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).latin1[163 - 128]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).latin1[163 - 128]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).latin1[164 - 128]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).latin1[164 - 128]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).latin1[165 - 128]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).latin1[165 - 128]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).latin1[166 - 128]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).latin1[166 - 128]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).latin1[167 - 128]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).latin1[167 - 128]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).latin1[168 - 128]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).latin1[168 - 128]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).latin1[169 - 128]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).latin1[169 - 128]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).latin1[170 - 128]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).latin1[170 - 128]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).latin1[171 - 128]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).latin1[171 - 128]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).latin1[172 - 128]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).latin1[172 - 128]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).latin1[173 - 128]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).latin1[173 - 128]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).latin1[174 - 128]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).latin1[174 - 128]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).latin1[175 - 128]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).latin1[175 - 128]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).latin1[176 - 128]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).latin1[176 - 128]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).latin1[177 - 128]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).latin1[177 - 128]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).latin1[178 - 128]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).latin1[178 - 128]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).latin1[179 - 128]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).latin1[179 - 128]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).latin1[180 - 128]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).latin1[180 - 128]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).latin1[181 - 128]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).latin1[181 - 128]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).latin1[182 - 128]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).latin1[182 - 128]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).latin1[183 - 128]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).latin1[183 - 128]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).latin1[184 - 128]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).latin1[184 - 128]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).latin1[185 - 128]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).latin1[185 - 128]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).latin1[186 - 128]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).latin1[186 - 128]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).latin1[187 - 128]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).latin1[187 - 128]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).latin1[188 - 128]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).latin1[188 - 128]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).latin1[189 - 128]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).latin1[189 - 128]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).latin1[190 - 128]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).latin1[190 - 128]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).latin1[191 - 128]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).latin1[191 - 128]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).latin1[192 - 128]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).latin1[192 - 128]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).latin1[193 - 128]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).latin1[193 - 128]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).latin1[194 - 128]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).latin1[194 - 128]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).latin1[195 - 128]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).latin1[195 - 128]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).latin1[196 - 128]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).latin1[196 - 128]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).latin1[197 - 128]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).latin1[197 - 128]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).latin1[198 - 128]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).latin1[198 - 128]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).latin1[199 - 128]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).latin1[199 - 128]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).latin1[200 - 128]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).latin1[200 - 128]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).latin1[201 - 128]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).latin1[201 - 128]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).latin1[202 - 128]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).latin1[202 - 128]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).latin1[203 - 128]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).latin1[203 - 128]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).latin1[204 - 128]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).latin1[204 - 128]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).latin1[205 - 128]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).latin1[205 - 128]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).latin1[206 - 128]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).latin1[206 - 128]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).latin1[207 - 128]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).latin1[207 - 128]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).latin1[208 - 128]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).latin1[208 - 128]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).latin1[209 - 128]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).latin1[209 - 128]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).latin1[210 - 128]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).latin1[210 - 128]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).latin1[211 - 128]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).latin1[211 - 128]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).latin1[212 - 128]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).latin1[212 - 128]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).latin1[213 - 128]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).latin1[213 - 128]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).latin1[214 - 128]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).latin1[214 - 128]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).latin1[215 - 128]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).latin1[215 - 128]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).latin1[216 - 128]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).latin1[216 - 128]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).latin1[217 - 128]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).latin1[217 - 128]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).latin1[218 - 128]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).latin1[218 - 128]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).latin1[219 - 128]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).latin1[219 - 128]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).latin1[220 - 128]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).latin1[220 - 128]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).latin1[221 - 128]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).latin1[221 - 128]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).latin1[222 - 128]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).latin1[222 - 128]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).latin1[223 - 128]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).latin1[223 - 128]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).latin1[224 - 128]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).latin1[224 - 128]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).latin1[225 - 128]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).latin1[225 - 128]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).latin1[226 - 128]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).latin1[226 - 128]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).latin1[227 - 128]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).latin1[227 - 128]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).latin1[228 - 128]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).latin1[228 - 128]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).latin1[229 - 128]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).latin1[229 - 128]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).latin1[230 - 128]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).latin1[230 - 128]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).latin1[231 - 128]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).latin1[231 - 128]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).latin1[232 - 128]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).latin1[232 - 128]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).latin1[233 - 128]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).latin1[233 - 128]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).latin1[234 - 128]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).latin1[234 - 128]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).latin1[235 - 128]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).latin1[235 - 128]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).latin1[236 - 128]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).latin1[236 - 128]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).latin1[237 - 128]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).latin1[237 - 128]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).latin1[238 - 128]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).latin1[238 - 128]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).latin1[239 - 128]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).latin1[239 - 128]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).latin1[240 - 128]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).latin1[240 - 128]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).latin1[241 - 128]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).latin1[241 - 128]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).latin1[242 - 128]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).latin1[242 - 128]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).latin1[243 - 128]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).latin1[243 - 128]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).latin1[244 - 128]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).latin1[244 - 128]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).latin1[245 - 128]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).latin1[245 - 128]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).latin1[246 - 128]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).latin1[246 - 128]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).latin1[247 - 128]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).latin1[247 - 128]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).latin1[248 - 128]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).latin1[248 - 128]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).latin1[249 - 128]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).latin1[249 - 128]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).latin1[250 - 128]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).latin1[250 - 128]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).latin1[251 - 128]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).latin1[251 - 128]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).latin1[252 - 128]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).latin1[252 - 128]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).latin1[253 - 128]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).latin1[253 - 128]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).latin1[254 - 128]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).latin1[254 - 128]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(strings).latin1[255 - 128]) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(strings).latin1[255 - 128]);
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+    if (Py_REFCNT((PyObject *)&_Py_SINGLETON(tuple_empty)) < _PyObject_IMMORTAL_REFCNT) {
+        _PyObject_Dump((PyObject *)&_Py_SINGLETON(tuple_empty));
+        Py_FatalError("immortal object has less refcnt than expected _PyObject_IMMORTAL_REFCNT");
+    };
+}
+#endif
 /* End auto-generated code */
 #ifdef __cplusplus
 }
diff --git a/Python/pylifecycle.c b/Python/pylifecycle.c
index 65e7f23e963b5..13efa6fbf883d 100644
--- a/Python/pylifecycle.c
+++ b/Python/pylifecycle.c
@@ -1687,6 +1687,9 @@ finalize_interp_types(PyInterpreterState *interp)
 
     _PyUnicode_Fini(interp);
     _PyFloat_Fini(interp);
+#ifdef Py_DEBUG
+    _PyStaticObjects_CheckRefcnt();
+#endif
 }
 
 
diff --git a/Tools/scripts/generate_global_objects.py b/Tools/scripts/generate_global_objects.py
index 27e3530f38574..f3a11f5f7e596 100644
--- a/Tools/scripts/generate_global_objects.py
+++ b/Tools/scripts/generate_global_objects.py
@@ -250,6 +250,7 @@ def generate_runtime_init(identifiers, strings):
 
     # Generate the file.
     with open_for_changes(filename, orig) as outfile:
+        immortal_objects = []
         printer = Printer(outfile)
         printer.write(before)
         printer.write(START)
@@ -259,31 +260,39 @@ def generate_runtime_init(identifiers, strings):
                 with printer.block('.small_ints =', ','):
                     for i in range(-nsmallnegints, nsmallposints):
                         printer.write(f'_PyLong_DIGIT_INIT({i}),')
+                        immortal_objects.append(f'(PyObject *)&_Py_SINGLETON(small_ints)[_PY_NSMALLNEGINTS + {i}]')
                 printer.write('')
                 # Global bytes objects.
                 printer.write('.bytes_empty = _PyBytes_SIMPLE_INIT(0, 0),')
+                immortal_objects.append(f'(PyObject *)&_Py_SINGLETON(bytes_empty)')
                 with printer.block('.bytes_characters =', ','):
                     for i in range(256):
                         printer.write(f'_PyBytes_CHAR_INIT({i}),')
+                        immortal_objects.append(f'(PyObject *)&_Py_SINGLETON(bytes_characters)[{i}]')
                 printer.write('')
                 # Global strings.
                 with printer.block('.strings =', ','):
                     with printer.block('.literals =', ','):
                         for literal, name in sorted(strings.items(), key=lambda x: x[1]):
                             printer.write(f'INIT_STR({name}, "{literal}"),')
+                            immortal_objects.append(f'(PyObject *)&_Py_STR({name})')
                     with printer.block('.identifiers =', ','):
                         for name in sorted(identifiers):
                             assert name.isidentifier(), name
                             printer.write(f'INIT_ID({name}),')
+                            immortal_objects.append(f'(PyObject *)&_Py_ID({name})')
                     with printer.block('.ascii =', ','):
                         for i in range(128):
                             printer.write(f'_PyASCIIObject_INIT("\\x{i:02x}"),')
+                            immortal_objects.append(f'(PyObject *)&_Py_SINGLETON(strings).ascii[{i}]')
                     with printer.block('.latin1 =', ','):
                         for i in range(128, 256):
                             printer.write(f'_PyUnicode_LATIN1_INIT("\\x{i:02x}"),')
+                            immortal_objects.append(f'(PyObject *)&_Py_SINGLETON(strings).latin1[{i} - 128]')
                 printer.write('')
                 with printer.block('.tuple_empty =', ','):
                     printer.write('.ob_base = _PyVarObject_IMMORTAL_INIT(&PyTuple_Type, 0)')
+                    immortal_objects.append(f'(PyObject *)&_Py_SINGLETON(tuple_empty)')
         printer.write('')
         printer.write("static inline void")
         with printer.block("_PyUnicode_InitStaticStrings(void)"):
@@ -293,6 +302,16 @@ def generate_runtime_init(identifiers, strings):
                 # since iter_files() ignores .h files.
                 printer.write(f'string = &_Py_ID({i});')
                 printer.write(f'PyUnicode_InternInPlace(&string);')
+        printer.write('')
+        printer.write('#ifdef Py_DEBUG')
+        printer.write("static inline void")
+        with printer.block("_PyStaticObjects_CheckRefcnt(void)"):
+            for i in immortal_objects:
+                with printer.block(f'if (Py_REFCNT({i}) < _PyObject_IMMORTAL_REFCNT)', ';'):
+                    printer.write(f'_PyObject_Dump({i});')
+                    printer.write(f'Py_FatalError("immortal object has less refcnt than '
+                                    'expected _PyObject_IMMORTAL_REFCNT");')
+        printer.write('#endif')
         printer.write(END)
         printer.write(after)
 


From webhook-mailer at python.org  Mon Jul 25 14:05:22 2022
From: webhook-mailer at python.org (ethanfurman)
Date: Mon, 25 Jul 2022 18:05:22 -0000
Subject: [Python-checkins] gh-95077: [Enum] add code-based deprecation
 warnings for member.member access (GH-95083)
Message-ID: <mailman.240.1658772323.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/4e704d7847f2333f581f87e31b42e44a471df93a
commit: 4e704d7847f2333f581f87e31b42e44a471df93a
branch: main
author: Ethan Furman <ethan at stoneleaf.us>
committer: ethanfurman <ethan at stoneleaf.us>
date: 2022-07-25T11:05:10-07:00
summary:

gh-95077: [Enum] add code-based deprecation warnings for member.member access (GH-95083)

* issue deprecation warning for member.member access
* always store member property in current class
* remove __getattr__

files:
A Misc/NEWS.d/next/Library/2022-07-22-00-58-49.gh-issue-95077.4Z6CNC.rst
M Doc/howto/enum.rst
M Doc/library/enum.rst
M Lib/enum.py
M Lib/test/test_enum.py

diff --git a/Doc/howto/enum.rst b/Doc/howto/enum.rst
index 7b1cf75fa81f0..376934a0e7936 100644
--- a/Doc/howto/enum.rst
+++ b/Doc/howto/enum.rst
@@ -945,23 +945,12 @@ but remain normal attributes.
 """"""""""""""""""""
 
 Enum members are instances of their enum class, and are normally accessed as
-``EnumClass.member``.  In Python versions ``3.5`` to ``3.10`` you could access
-members from other members -- this practice was discouraged, and in ``3.11``
-:class:`Enum` returns to not allowing it::
-
-    >>> class FieldTypes(Enum):
-    ...     name = 0
-    ...     value = 1
-    ...     size = 2
-    ...
-    >>> FieldTypes.value.size
-    Traceback (most recent call last):
-    ...
-    AttributeError: <enum 'FieldTypes'> member has no attribute 'size'
-
+``EnumClass.member``.  In Python versions starting with ``3.5`` you could access
+members from other members -- this practice is discouraged, is deprecated
+in ``3.12``, and will be removed in ``3.14``.
 
 .. versionchanged:: 3.5
-.. versionchanged:: 3.11
+.. versionchanged:: 3.12
 
 
 Creating members that are mixed with other data types
diff --git a/Doc/library/enum.rst b/Doc/library/enum.rst
index b1333c7dd5cf9..01743b002ba96 100644
--- a/Doc/library/enum.rst
+++ b/Doc/library/enum.rst
@@ -176,13 +176,6 @@ Data Types
         >>> dir(Color)
         ['BLUE', 'GREEN', 'RED', '__class__', '__contains__', '__doc__', '__getitem__', '__init_subclass__', '__iter__', '__len__', '__members__', '__module__', '__name__', '__qualname__']
 
-   .. method:: EnumType.__getattr__(cls, name)
-
-      Returns the Enum member in *cls* matching *name*, or raises an :exc:`AttributeError`::
-
-        >>> Color.GREEN
-        <Color.GREEN: 2>
-
    .. method:: EnumType.__getitem__(cls, name)
 
       Returns the Enum member in *cls* matching *name*, or raises an :exc:`KeyError`::
diff --git a/Lib/enum.py b/Lib/enum.py
index 935e2bd15d0af..8ef69589a1469 100644
--- a/Lib/enum.py
+++ b/Lib/enum.py
@@ -185,19 +185,35 @@ class property(DynamicClassAttribute):
     a corresponding enum member.
     """
 
+    member = None
+
     def __get__(self, instance, ownerclass=None):
         if instance is None:
-            try:
-                return ownerclass._member_map_[self.name]
-            except KeyError:
+            if self.member is not None:
+                return self.member
+            else:
                 raise AttributeError(
                         '%r has no attribute %r' % (ownerclass, self.name)
                         )
         else:
             if self.fget is None:
-                raise AttributeError(
-                        '%r member has no attribute %r' % (ownerclass, self.name)
+                if self.member is None:   # not sure this can happen, but just in case
+                    raise AttributeError(
+                            '%r has no attribute %r' % (ownerclass, self.name)
+                            )
+                # issue warning deprecating this behavior
+                import warnings
+                warnings.warn(
+                        "`member.member` access (e.g. `Color.RED.BLUE`) is "
+                        "deprecated and will be removed in 3.14.",
+                        DeprecationWarning,
+                        stacklevel=2,
                         )
+                return self.member
+                # XXX: uncomment in 3.14 and remove warning above
+                # raise AttributeError(
+                #         '%r member has no attribute %r' % (ownerclass, self.name)
+                #         )
             else:
                 return self.fget(instance)
 
@@ -299,30 +315,20 @@ def __set_name__(self, enum_class, member_name):
                 enum_class._member_names_.append(member_name)
         # get redirect in place before adding to _member_map_
         # but check for other instances in parent classes first
-        need_override = False
         descriptor = None
         for base in enum_class.__mro__[1:]:
             descriptor = base.__dict__.get(member_name)
             if descriptor is not None:
                 if isinstance(descriptor, (property, DynamicClassAttribute)):
                     break
-                else:
-                    need_override = True
-                    # keep looking for an enum.property
-        if descriptor and not need_override:
-            # previous enum.property found, no further action needed
-            pass
-        elif descriptor and need_override:
-            redirect = property()
-            redirect.__set_name__(enum_class, member_name)
-            # Previous enum.property found, but some other inherited attribute
-            # is in the way; copy fget, fset, fdel to this one.
-            redirect.fget = descriptor.fget
-            redirect.fset = descriptor.fset
-            redirect.fdel = descriptor.fdel
-            setattr(enum_class, member_name, redirect)
-        else:
-            setattr(enum_class, member_name, enum_member)
+        redirect = property()
+        redirect.member = enum_member
+        redirect.__set_name__(enum_class, member_name)
+        if descriptor:
+            redirect.fget = getattr(descriptor, 'fget', None)
+            redirect.fset = getattr(descriptor, 'fset', None)
+            redirect.fdel = getattr(descriptor, 'fdel', None)
+        setattr(enum_class, member_name, redirect)
         # now add to _member_map_ (even aliases)
         enum_class._member_map_[member_name] = enum_member
         try:
@@ -740,22 +746,6 @@ def __dir__(cls):
             # return whatever mixed-in data type has
             return sorted(set(dir(cls._member_type_)) | interesting)
 
-    def __getattr__(cls, name):
-        """
-        Return the enum member matching `name`
-
-        We use __getattr__ instead of descriptors or inserting into the enum
-        class' __dict__ in order to support `name` and `value` being both
-        properties for enum members (which live in the class' __dict__) and
-        enum members themselves.
-        """
-        if _is_dunder(name):
-            raise AttributeError(name)
-        try:
-            return cls._member_map_[name]
-        except KeyError:
-            raise AttributeError(name) from None
-
     def __getitem__(cls, name):
         """
         Return the member matching `name`.
@@ -1200,10 +1190,10 @@ def __reduce_ex__(self, proto):
     # enum.property is used to provide access to the `name` and
     # `value` attributes of enum members while keeping some measure of
     # protection from modification, while still allowing for an enumeration
-    # to have members named `name` and `value`.  This works because enumeration
-    # members are not set directly on the enum class; they are kept in a
-    # separate structure, _member_map_, which is where enum.property looks for
-    # them
+    # to have members named `name` and `value`.  This works because each
+    # instance of enum.property saves its companion member, which it returns
+    # on class lookup; on instance lookup it either executes a provided function
+    # or raises an AttributeError.
 
     @property
     def name(self):
@@ -1677,10 +1667,12 @@ def convert_class(cls):
                     value = gnv(name, 1, len(member_names), gnv_last_values)
                 if value in value2member_map:
                     # an alias to an existing member
+                    member = value2member_map[value]
                     redirect = property()
+                    redirect.member = member
                     redirect.__set_name__(enum_class, name)
                     setattr(enum_class, name, redirect)
-                    member_map[name] = value2member_map[value]
+                    member_map[name] = member
                 else:
                     # create the member
                     if use_args:
@@ -1696,6 +1688,7 @@ def convert_class(cls):
                     member.__objclass__ = enum_class
                     member.__init__(value)
                     redirect = property()
+                    redirect.member = member
                     redirect.__set_name__(enum_class, name)
                     setattr(enum_class, name, redirect)
                     member_map[name] = member
@@ -1723,10 +1716,12 @@ def convert_class(cls):
                     value = value.value
                 if value in value2member_map:
                     # an alias to an existing member
+                    member = value2member_map[value]
                     redirect = property()
+                    redirect.member = member
                     redirect.__set_name__(enum_class, name)
                     setattr(enum_class, name, redirect)
-                    member_map[name] = value2member_map[value]
+                    member_map[name] = member
                 else:
                     # create the member
                     if use_args:
@@ -1743,6 +1738,7 @@ def convert_class(cls):
                     member.__init__(value)
                     member._sort_order_ = len(member_names)
                     redirect = property()
+                    redirect.member = member
                     redirect.__set_name__(enum_class, name)
                     setattr(enum_class, name, redirect)
                     member_map[name] = member
diff --git a/Lib/test/test_enum.py b/Lib/test/test_enum.py
index bfab0bd4b07f5..9d16fbc2777d7 100644
--- a/Lib/test/test_enum.py
+++ b/Lib/test/test_enum.py
@@ -2646,7 +2646,10 @@ class Private(Enum):
         self.assertEqual(Private._Private__corporal, 'Radar')
         self.assertEqual(Private._Private__major_, 'Hoolihan')
 
-    @unittest.skip("Accessing all values retained for performance reasons, see GH-93910")
+    @unittest.skipIf(
+            python_version <= (3, 13),
+            'member.member access currently deprecated',
+            )
     def test_exception_for_member_from_member_access(self):
         with self.assertRaisesRegex(AttributeError, "<enum .Di.> member has no attribute .NO."):
             class Di(Enum):
@@ -2654,6 +2657,17 @@ class Di(Enum):
                 NO = 0
             nope = Di.YES.NO
 
+    @unittest.skipIf(
+            python_version > (3, 13),
+            'member.member access now raises',
+            )
+    def test_warning_for_member_from_member_access(self):
+        with self.assertWarnsRegex(DeprecationWarning, '`member.member` access .* is deprecated and will be removed in 3.14'):
+            class Di(Enum):
+                YES = 1
+                NO = 0
+            warn = Di.YES.NO
+        self.assertIs(warn, Di.NO)
 
     def test_dynamic_members_with_static_methods(self):
         #
diff --git a/Misc/NEWS.d/next/Library/2022-07-22-00-58-49.gh-issue-95077.4Z6CNC.rst b/Misc/NEWS.d/next/Library/2022-07-22-00-58-49.gh-issue-95077.4Z6CNC.rst
new file mode 100644
index 0000000000000..09f350067cd31
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2022-07-22-00-58-49.gh-issue-95077.4Z6CNC.rst
@@ -0,0 +1 @@
+Add deprecation warning for enum ``member.member`` access (e.g. ``Color.RED.BLUE``).


From webhook-mailer at python.org  Mon Jul 25 14:30:25 2022
From: webhook-mailer at python.org (miss-islington)
Date: Mon, 25 Jul 2022 18:30:25 -0000
Subject: [Python-checkins] gh-92546: Move pprint benchmark into
 pyperformance (GH-94613)
Message-ID: <mailman.241.1658773826.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/c5140945c723ae6c4b7ee81ff720ac8ea4b52cfd
commit: c5140945c723ae6c4b7ee81ff720ac8ea4b52cfd
branch: main
author: Oleg Iarygin <oleg at arhadthedev.net>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-25T11:30:13-07:00
summary:

gh-92546: Move pprint benchmark into pyperformance (GH-94613)



This PR couples with https://github.com/python/pyperformance/pull/222 and supersedes https://github.com/python/cpython/pull/92560. Inspired by https://github.com/python/cpython/issues/93096#issuecomment-1134576471.

Automerge-Triggered-By: GH:ericsnowcurrently

files:
A Misc/NEWS.d/next/Library/2022-07-06-21-24-03.gh-issue-92546.s5Upkh.rst
M Lib/pprint.py

diff --git a/Lib/pprint.py b/Lib/pprint.py
index 575688d8eb6f4..34ed12637e228 100644
--- a/Lib/pprint.py
+++ b/Lib/pprint.py
@@ -637,19 +637,6 @@ def _recursion(object):
             % (type(object).__name__, id(object)))
 
 
-def _perfcheck(object=None):
-    import time
-    if object is None:
-        object = [("string", (1, 2), [3, 4], {5: 6, 7: 8})] * 100000
-    p = PrettyPrinter()
-    t1 = time.perf_counter()
-    p._safe_repr(object, {}, None, 0, True)
-    t2 = time.perf_counter()
-    p.pformat(object)
-    t3 = time.perf_counter()
-    print("_safe_repr:", t2 - t1)
-    print("pformat:", t3 - t2)
-
 def _wrap_bytes_repr(object, width, allowance):
     current = b''
     last = len(object) // 4 * 4
@@ -666,6 +653,3 @@ def _wrap_bytes_repr(object, width, allowance):
             current = candidate
     if current:
         yield repr(current)
-
-if __name__ == "__main__":
-    _perfcheck()
diff --git a/Misc/NEWS.d/next/Library/2022-07-06-21-24-03.gh-issue-92546.s5Upkh.rst b/Misc/NEWS.d/next/Library/2022-07-06-21-24-03.gh-issue-92546.s5Upkh.rst
new file mode 100644
index 0000000000000..0ea676ef5b0d8
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2022-07-06-21-24-03.gh-issue-92546.s5Upkh.rst
@@ -0,0 +1,2 @@
+An undocumented ``python -m pprint`` benchmark is moved into ``pprint``
+suite of pyperformance. Patch by Oleg Iarygin.


From webhook-mailer at python.org  Mon Jul 25 14:47:41 2022
From: webhook-mailer at python.org (ericsnowcurrently)
Date: Mon, 25 Jul 2022 18:47:41 -0000
Subject: [Python-checkins] gh-94673: Add _PyStaticType_InitBuiltin() (#95152)
Message-ID: <mailman.242.1658774862.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/4a1dd734311891662a6fc3394f93db98c93e7219
commit: 4a1dd734311891662a6fc3394f93db98c93e7219
branch: main
author: Eric Snow <ericsnowcurrently at gmail.com>
committer: ericsnowcurrently <ericsnowcurrently at gmail.com>
date: 2022-07-25T12:47:31-06:00
summary:

gh-94673: Add _PyStaticType_InitBuiltin() (#95152)

This is the first of several precursors to storing tp_subclasses (and tp_weaklist) on the interpreter state for static builtin types.

We do the following:

* add `_PyStaticType_InitBuiltin()`
* add `_Py_TPFLAGS_STATIC_BUILTIN`
* set it on all static builtin types in `_PyStaticType_InitBuiltin()`
* shuffle some code around to be able to use _PyStaticType_InitBuiltin()
    * rename `_PyStructSequence_InitType()` to `_PyStructSequence_InitBuiltinWithFlags()`
    * add `_PyStructSequence_InitBuiltin()`.

files:
M Include/internal/pycore_structseq.h
M Include/internal/pycore_typeobject.h
M Include/object.h
M Objects/exceptions.c
M Objects/floatobject.c
M Objects/longobject.c
M Objects/object.c
M Objects/structseq.c
M Objects/typeobject.c
M Objects/unicodeobject.c
M Python/errors.c
M Python/sysmodule.c
M Python/thread.c

diff --git a/Include/internal/pycore_structseq.h b/Include/internal/pycore_structseq.h
index 0199c790e24ce..d10a921c55ff8 100644
--- a/Include/internal/pycore_structseq.h
+++ b/Include/internal/pycore_structseq.h
@@ -15,11 +15,18 @@ PyAPI_FUNC(PyTypeObject *) _PyStructSequence_NewType(
     PyStructSequence_Desc *desc,
     unsigned long tp_flags);
 
-PyAPI_FUNC(int) _PyStructSequence_InitType(
+PyAPI_FUNC(int) _PyStructSequence_InitBuiltinWithFlags(
     PyTypeObject *type,
     PyStructSequence_Desc *desc,
     unsigned long tp_flags);
 
+static inline int
+_PyStructSequence_InitBuiltin(PyTypeObject *type,
+                              PyStructSequence_Desc *desc)
+{
+    return _PyStructSequence_InitBuiltinWithFlags(type, desc, 0);
+}
+
 extern void _PyStructSequence_FiniType(PyTypeObject *type);
 
 #ifdef __cplusplus
diff --git a/Include/internal/pycore_typeobject.h b/Include/internal/pycore_typeobject.h
index c480a3a57b436..46f3bf78b133e 100644
--- a/Include/internal/pycore_typeobject.h
+++ b/Include/internal/pycore_typeobject.h
@@ -41,6 +41,7 @@ struct type_cache {
 
 extern PyStatus _PyTypes_InitSlotDefs(void);
 
+extern int _PyStaticType_InitBuiltin(PyTypeObject *type);
 extern void _PyStaticType_Dealloc(PyTypeObject *type);
 
 
diff --git a/Include/object.h b/Include/object.h
index a12b754c8ed8f..c00b9eb583420 100644
--- a/Include/object.h
+++ b/Include/object.h
@@ -352,6 +352,9 @@ given type object has a specified feature.
 
 #ifndef Py_LIMITED_API
 
+/* Track types initialized using _PyStaticType_InitBuiltin(). */
+#define _Py_TPFLAGS_STATIC_BUILTIN (1 << 1)
+
 /* Placement of dict (and values) pointers are managed by the VM, not by the type.
  * The VM will automatically set tp_dictoffset. Should not be used for variable sized
  * classes, such as classes that extend tuple.
diff --git a/Objects/exceptions.c b/Objects/exceptions.c
index 9aab683fd1ca7..e06a8f4173cf8 100644
--- a/Objects/exceptions.c
+++ b/Objects/exceptions.c
@@ -3556,8 +3556,7 @@ _PyExc_InitTypes(PyInterpreterState *interp)
 
     for (size_t i=0; i < Py_ARRAY_LENGTH(static_exceptions); i++) {
         PyTypeObject *exc = static_exceptions[i].exc;
-
-        if (PyType_Ready(exc) < 0) {
+        if (_PyStaticType_InitBuiltin(exc) < 0) {
             return -1;
         }
     }
diff --git a/Objects/floatobject.c b/Objects/floatobject.c
index 47d308b8eb370..4b1b24f2e702a 100644
--- a/Objects/floatobject.c
+++ b/Objects/floatobject.c
@@ -1992,7 +1992,8 @@ _PyFloat_InitTypes(PyInterpreterState *interp)
 
     /* Init float info */
     if (FloatInfoType.tp_name == NULL) {
-        if (PyStructSequence_InitType2(&FloatInfoType, &floatinfo_desc) < 0) {
+        if (_PyStructSequence_InitBuiltin(&FloatInfoType,
+                                          &floatinfo_desc) < 0) {
             return _PyStatus_ERR("can't init float info type");
         }
     }
diff --git a/Objects/longobject.c b/Objects/longobject.c
index 4a1e5caf5a284..90ed02b8c27a1 100644
--- a/Objects/longobject.c
+++ b/Objects/longobject.c
@@ -6135,7 +6135,7 @@ _PyLong_InitTypes(PyInterpreterState *interp)
 
     /* initialize int_info */
     if (Int_InfoType.tp_name == NULL) {
-        if (PyStructSequence_InitType2(&Int_InfoType, &int_info_desc) < 0) {
+        if (_PyStructSequence_InitBuiltin(&Int_InfoType, &int_info_desc) < 0) {
             return _PyStatus_ERR("can't init int info type");
         }
     }
diff --git a/Objects/object.c b/Objects/object.c
index 75aee909a3b49..758b79eff5b3e 100644
--- a/Objects/object.c
+++ b/Objects/object.c
@@ -1975,8 +1975,8 @@ _PyTypes_InitTypes(PyInterpreterState *interp)
     // All other static types (unless initialized elsewhere)
     for (size_t i=0; i < Py_ARRAY_LENGTH(static_types); i++) {
         PyTypeObject *type = static_types[i];
-        if (PyType_Ready(type) < 0) {
-            return _PyStatus_ERR("Can't initialize types");
+        if (_PyStaticType_InitBuiltin(type) < 0) {
+            return _PyStatus_ERR("Can't initialize builtin type");
         }
         if (type == &PyType_Type) {
             // Sanitify checks of the two most important types
diff --git a/Objects/structseq.c b/Objects/structseq.c
index 229e3d893ff6a..24cd0e705969b 100644
--- a/Objects/structseq.c
+++ b/Objects/structseq.c
@@ -432,11 +432,21 @@ initialize_structseq_dict(PyStructSequence_Desc *desc, PyObject* dict,
     return -1;
 }
 
-static void
-initialize_members(PyStructSequence_Desc *desc, PyMemberDef* members,
-                   Py_ssize_t n_members) {
-    Py_ssize_t i, k;
+static PyMemberDef *
+initialize_members(PyStructSequence_Desc *desc,
+                   Py_ssize_t *pn_members, Py_ssize_t *pn_unnamed_members)
+{
+    PyMemberDef *members;
+    Py_ssize_t n_members, n_unnamed_members;
+
+    n_members = count_members(desc, &n_unnamed_members);
+    members = PyMem_NEW(PyMemberDef, n_members - n_unnamed_members + 1);
+    if (members == NULL) {
+        PyErr_NoMemory();
+        return NULL;
+    }
 
+    Py_ssize_t i, k;
     for (i = k = 0; i < n_members; ++i) {
         if (desc->fields[i].name == PyStructSequence_UnnamedField) {
             continue;
@@ -453,30 +463,17 @@ initialize_members(PyStructSequence_Desc *desc, PyMemberDef* members,
         k++;
     }
     members[k].name = NULL;
+
+    *pn_members = n_members;
+    *pn_unnamed_members = n_unnamed_members;
+    return members;
 }
 
 
-int
-_PyStructSequence_InitType(PyTypeObject *type, PyStructSequence_Desc *desc,
-                           unsigned long tp_flags)
+static void
+initialize_static_fields(PyTypeObject *type, PyStructSequence_Desc *desc,
+                         PyMemberDef *tp_members, unsigned long tp_flags)
 {
-    PyMemberDef *members;
-    Py_ssize_t n_members, n_unnamed_members;
-
-#ifdef Py_TRACE_REFS
-    /* if the type object was chained, unchain it first
-       before overwriting its storage */
-    if (type->ob_base.ob_base._ob_next) {
-        _Py_ForgetReference((PyObject *)type);
-    }
-#endif
-
-    /* PyTypeObject has already been initialized */
-    if (Py_REFCNT(type) != 0) {
-        PyErr_BadInternalCall();
-        return -1;
-    }
-
     type->tp_name = desc->name;
     type->tp_basicsize = sizeof(PyStructSequence) - sizeof(PyObject *);
     type->tp_itemsize = sizeof(PyObject *);
@@ -488,25 +485,20 @@ _PyStructSequence_InitType(PyTypeObject *type, PyStructSequence_Desc *desc,
     type->tp_new = structseq_new;
     type->tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC | tp_flags;
     type->tp_traverse = (traverseproc) structseq_traverse;
+    type->tp_members = tp_members;
+}
 
-    n_members = count_members(desc, &n_unnamed_members);
-    members = PyMem_NEW(PyMemberDef, n_members - n_unnamed_members + 1);
-    if (members == NULL) {
-        PyErr_NoMemory();
-        return -1;
-    }
-    initialize_members(desc, members, n_members);
-    type->tp_members = members;
-
+static int
+initialize_static_type(PyTypeObject *type, PyStructSequence_Desc *desc,
+                       Py_ssize_t n_members, Py_ssize_t n_unnamed_members) {
+    /* initialize_static_fields() should have been called already. */
     if (PyType_Ready(type) < 0) {
-        PyMem_Free(members);
         return -1;
     }
     Py_INCREF(type);
 
     if (initialize_structseq_dict(
             desc, type->tp_dict, n_members, n_unnamed_members) < 0) {
-        PyMem_Free(members);
         Py_DECREF(type);
         return -1;
     }
@@ -514,10 +506,63 @@ _PyStructSequence_InitType(PyTypeObject *type, PyStructSequence_Desc *desc,
     return 0;
 }
 
+int
+_PyStructSequence_InitBuiltinWithFlags(PyTypeObject *type,
+                                       PyStructSequence_Desc *desc,
+                                       unsigned long tp_flags)
+{
+    PyMemberDef *members;
+    Py_ssize_t n_members, n_unnamed_members;
+
+    members = initialize_members(desc, &n_members, &n_unnamed_members);
+    if (members == NULL) {
+        return -1;
+    }
+    initialize_static_fields(type, desc, members, tp_flags);
+    if (_PyStaticType_InitBuiltin(type) < 0) {
+        PyMem_Free(members);
+        PyErr_Format(PyExc_RuntimeError,
+                     "Can't initialize builtin type %s",
+                     desc->name);
+        return -1;
+    }
+    if (initialize_static_type(type, desc, n_members, n_unnamed_members) < 0) {
+        PyMem_Free(members);
+        return -1;
+    }
+    return 0;
+}
+
 int
 PyStructSequence_InitType2(PyTypeObject *type, PyStructSequence_Desc *desc)
 {
-    return _PyStructSequence_InitType(type, desc, 0);
+    PyMemberDef *members;
+    Py_ssize_t n_members, n_unnamed_members;
+
+#ifdef Py_TRACE_REFS
+    /* if the type object was chained, unchain it first
+       before overwriting its storage */
+    if (type->ob_base.ob_base._ob_next) {
+        _Py_ForgetReference((PyObject *)type);
+    }
+#endif
+
+    /* PyTypeObject has already been initialized */
+    if (Py_REFCNT(type) != 0) {
+        PyErr_BadInternalCall();
+        return -1;
+    }
+
+    members = initialize_members(desc, &n_members, &n_unnamed_members);
+    if (members == NULL) {
+        return -1;
+    }
+    initialize_static_fields(type, desc, members, 0);
+    if (initialize_static_type(type, desc, n_members, n_unnamed_members) < 0) {
+        PyMem_Free(members);
+        return -1;
+    }
+    return 0;
 }
 
 void
@@ -569,13 +614,10 @@ _PyStructSequence_NewType(PyStructSequence_Desc *desc, unsigned long tp_flags)
     Py_ssize_t n_members, n_unnamed_members;
 
     /* Initialize MemberDefs */
-    n_members = count_members(desc, &n_unnamed_members);
-    members = PyMem_NEW(PyMemberDef, n_members - n_unnamed_members + 1);
+    members = initialize_members(desc, &n_members, &n_unnamed_members);
     if (members == NULL) {
-        PyErr_NoMemory();
         return NULL;
     }
-    initialize_members(desc, members, n_members);
 
     /* Initialize Slots */
     slots[0] = (PyType_Slot){Py_tp_dealloc, (destructor)structseq_dealloc};
diff --git a/Objects/typeobject.c b/Objects/typeobject.c
index 5ebff6084f4a9..8510196b6123b 100644
--- a/Objects/typeobject.c
+++ b/Objects/typeobject.c
@@ -6650,6 +6650,14 @@ PyType_Ready(PyTypeObject *type)
     return 0;
 }
 
+int
+_PyStaticType_InitBuiltin(PyTypeObject *self)
+{
+    self->tp_flags = self->tp_flags | _Py_TPFLAGS_STATIC_BUILTIN;
+
+    return PyType_Ready(self);
+}
+
 
 static int
 add_subclass(PyTypeObject *base, PyTypeObject *type)
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
index 669ffe7072746..7e3caf1af14c5 100644
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -14604,13 +14604,13 @@ _PyUnicode_InitTypes(PyInterpreterState *interp)
         return _PyStatus_OK();
     }
 
-    if (PyType_Ready(&EncodingMapType) < 0) {
+    if (_PyStaticType_InitBuiltin(&EncodingMapType) < 0) {
         goto error;
     }
-    if (PyType_Ready(&PyFieldNameIter_Type) < 0) {
+    if (_PyStaticType_InitBuiltin(&PyFieldNameIter_Type) < 0) {
         goto error;
     }
-    if (PyType_Ready(&PyFormatterIter_Type) < 0) {
+    if (_PyStaticType_InitBuiltin(&PyFormatterIter_Type) < 0) {
         goto error;
     }
     return _PyStatus_OK();
diff --git a/Python/errors.c b/Python/errors.c
index b6b5d9b046ce8..2aa748c60c370 100644
--- a/Python/errors.c
+++ b/Python/errors.c
@@ -1229,8 +1229,8 @@ _PyErr_InitTypes(PyInterpreterState *interp)
     }
 
     if (UnraisableHookArgsType.tp_name == NULL) {
-        if (PyStructSequence_InitType2(&UnraisableHookArgsType,
-                                       &UnraisableHookArgs_desc) < 0) {
+        if (_PyStructSequence_InitBuiltin(&UnraisableHookArgsType,
+                                          &UnraisableHookArgs_desc) < 0) {
             return _PyStatus_ERR("failed to initialize UnraisableHookArgs type");
         }
     }
diff --git a/Python/sysmodule.c b/Python/sysmodule.c
index a5fa551b95764..e861d9cbce415 100644
--- a/Python/sysmodule.c
+++ b/Python/sysmodule.c
@@ -28,7 +28,7 @@ Data members:
 #include "pycore_pymath.h"        // _PY_SHORT_FLOAT_REPR
 #include "pycore_pymem.h"         // _PyMem_SetDefaultAllocator()
 #include "pycore_pystate.h"       // _PyThreadState_GET()
-#include "pycore_structseq.h"     // _PyStructSequence_InitType()
+#include "pycore_structseq.h"     // _PyStructSequence_InitBuiltinWithFlags()
 #include "pycore_tuple.h"         // _PyTuple_FromArray()
 
 #include "frameobject.h"          // PyFrame_FastToLocalsWithError()
@@ -2921,7 +2921,7 @@ _PySys_InitCore(PyThreadState *tstate, PyObject *sysdict)
     SET_SYS("int_info", PyLong_GetInfo());
     /* initialize hash_info */
     if (Hash_InfoType.tp_name == NULL) {
-        if (PyStructSequence_InitType2(&Hash_InfoType, &hash_info_desc) < 0) {
+        if (_PyStructSequence_InitBuiltin(&Hash_InfoType, &hash_info_desc) < 0) {
             goto type_init_failed;
         }
     }
@@ -2943,14 +2943,18 @@ _PySys_InitCore(PyThreadState *tstate, PyObject *sysdict)
     SET_SYS_FROM_STRING("abiflags", ABIFLAGS);
 #endif
 
+#define ENSURE_INFO_TYPE(TYPE, DESC) \
+    do { \
+        if (TYPE.tp_name == NULL) { \
+            if (_PyStructSequence_InitBuiltinWithFlags( \
+                    &TYPE, &DESC, Py_TPFLAGS_DISALLOW_INSTANTIATION) < 0) { \
+                goto type_init_failed; \
+            } \
+        } \
+    } while (0)
+
     /* version_info */
-    if (VersionInfoType.tp_name == NULL) {
-        if (_PyStructSequence_InitType(&VersionInfoType,
-                                       &version_info_desc,
-                                       Py_TPFLAGS_DISALLOW_INSTANTIATION) < 0) {
-            goto type_init_failed;
-        }
-    }
+    ENSURE_INFO_TYPE(VersionInfoType, version_info_desc);
     version_info = make_version_info(tstate);
     SET_SYS("version_info", version_info);
 
@@ -2958,27 +2962,18 @@ _PySys_InitCore(PyThreadState *tstate, PyObject *sysdict)
     SET_SYS("implementation", make_impl_info(version_info));
 
     // sys.flags: updated in-place later by _PySys_UpdateConfig()
-    if (FlagsType.tp_name == 0) {
-        if (_PyStructSequence_InitType(&FlagsType, &flags_desc,
-                                       Py_TPFLAGS_DISALLOW_INSTANTIATION) < 0) {
-            goto type_init_failed;
-        }
-    }
+    ENSURE_INFO_TYPE(FlagsType, flags_desc);
     SET_SYS("flags", make_flags(tstate->interp));
 
 #if defined(MS_WINDOWS)
     /* getwindowsversion */
-    if (WindowsVersionType.tp_name == 0) {
-        if (_PyStructSequence_InitType(&WindowsVersionType,
-                                       &windows_version_desc,
-                                       Py_TPFLAGS_DISALLOW_INSTANTIATION) < 0) {
-            goto type_init_failed;
-        }
-    }
+    ENSURE_INFO_TYPE(WindowsVersionType, windows_version_desc);
 
     SET_SYS_FROM_STRING("_vpath", VPATH);
 #endif
 
+#undef ENSURE_INFO_TYPE
+
     /* float repr style: 0.03 (short) vs 0.029999999999999999 (legacy) */
 #if _PY_SHORT_FLOAT_REPR == 1
     SET_SYS_FROM_STRING("float_repr_style", "short");
@@ -2990,7 +2985,7 @@ _PySys_InitCore(PyThreadState *tstate, PyObject *sysdict)
 
     /* initialize asyncgen_hooks */
     if (AsyncGenHooksType.tp_name == NULL) {
-        if (PyStructSequence_InitType2(
+        if (_PyStructSequence_InitBuiltin(
                 &AsyncGenHooksType, &asyncgen_hooks_desc) < 0) {
             goto type_init_failed;
         }
diff --git a/Python/thread.c b/Python/thread.c
index 846f02545271c..d3211219dffe6 100644
--- a/Python/thread.c
+++ b/Python/thread.c
@@ -155,7 +155,8 @@ PyThread_GetInfo(void)
 #endif
 
     if (ThreadInfoType.tp_name == 0) {
-        if (PyStructSequence_InitType2(&ThreadInfoType, &threadinfo_desc) < 0)
+        if (_PyStructSequence_InitBuiltin(&ThreadInfoType,
+                                          &threadinfo_desc) < 0)
             return NULL;
     }
 


From webhook-mailer at python.org  Mon Jul 25 15:10:42 2022
From: webhook-mailer at python.org (tiran)
Date: Mon, 25 Jul 2022 19:10:42 -0000
Subject: [Python-checkins] gh-85454: Remove distutils.ccompiler from
 Tools/c-analyzer (GH-95171)
Message-ID: <mailman.243.1658776243.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/a15ae19ffba33282d21440a8fb7c39af26b7d25e
commit: a15ae19ffba33282d21440a8fb7c39af26b7d25e
branch: main
author: Dong-hee Na <donghee.na at python.org>
committer: tiran <christian at python.org>
date: 2022-07-25T21:10:30+02:00
summary:

gh-85454: Remove distutils.ccompiler from Tools/c-analyzer (GH-95171)

files:
M Tools/c-analyzer/c_parser/preprocessor/__init__.py

diff --git a/Tools/c-analyzer/c_parser/preprocessor/__init__.py b/Tools/c-analyzer/c_parser/preprocessor/__init__.py
index e38176fee31fa..c154137bf42f0 100644
--- a/Tools/c-analyzer/c_parser/preprocessor/__init__.py
+++ b/Tools/c-analyzer/c_parser/preprocessor/__init__.py
@@ -1,7 +1,9 @@
 import contextlib
-import distutils.ccompiler
 import logging
+import os
 import os.path
+import re
+import sys
 
 from c_common.fsutil import match_glob as _match_glob
 from c_common.tables import parse_table as _parse_table
@@ -168,9 +170,17 @@ def handling_errors(ignore_exc=None, *, log_err=None):
 }
 
 
+def _get_default_compiler():
+    if re.match('cygwin.*', sys.platform) is not None:
+        return 'unix'
+    if os.name == 'nt':
+        return 'msvc'
+    return 'unix'
+
+
 def _get_preprocessor(tool):
     if tool is True:
-        tool = distutils.ccompiler.get_default_compiler()
+        tool = _get_default_compiler()
     preprocess = _COMPILERS.get(tool)
     if preprocess is None:
         raise ValueError(f'unsupported tool {tool}')


From webhook-mailer at python.org  Mon Jul 25 16:23:46 2022
From: webhook-mailer at python.org (ericsnowcurrently)
Date: Mon, 25 Jul 2022 20:23:46 -0000
Subject: [Python-checkins] gh-94673: Always Finalize Static Builtin Types
 (#95153)
Message-ID: <mailman.244.1658780627.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/2d26449b06f310d72eb7df58a7133a16d47d30ed
commit: 2d26449b06f310d72eb7df58a7133a16d47d30ed
branch: main
author: Eric Snow <ericsnowcurrently at gmail.com>
committer: ericsnowcurrently <ericsnowcurrently at gmail.com>
date: 2022-07-25T14:23:41-06:00
summary:

gh-94673: Always Finalize Static Builtin Types (#95153)

Static builtin types are finalized by calling _PyStaticType_Dealloc().  Before this change, we were skipping finalizing such a type if it still had subtypes (i.e. its tp_subclasses hadn't been cleared yet).  The problem is that types hold several heap objects, which leak if we skip the type's finalization.  This change addresses that.

For context, there's an old comment (from e9e3eab0b86) that says the following:

   // If a type still has subtypes, it cannot be deallocated.
   // A subtype can inherit attributes and methods of its parent type,
   // and a type must no longer be used once it's deallocated.

However, it isn't clear that is actually still true.  Clearing tp_dict should mean it isn't a problem.

Furthermore, the only subtypes that might still be around come from extension modules that didn't clean them up when unloaded (i.e. extensions that do not implement multi-phase initialization, AKA PEP 489).  Those objects are already leaking, so this change doesn't change anything in that regard.  Instead, this change means more objects gets cleaned up that before.

files:
M Objects/typeobject.c
M Python/pylifecycle.c

diff --git a/Objects/typeobject.c b/Objects/typeobject.c
index 8510196b6123b..f9e6f6372ab4d 100644
--- a/Objects/typeobject.c
+++ b/Objects/typeobject.c
@@ -65,6 +65,8 @@ lookup_maybe_method(PyObject *self, PyObject *attr, int *unbound);
 static int
 slot_tp_setattro(PyObject *self, PyObject *name, PyObject *value);
 
+static inline PyTypeObject * subclass_from_ref(PyObject *ref);
+
 /*
  * finds the beginning of the docstring's introspection signature.
  * if present, returns a pointer pointing to the first '('.
@@ -309,12 +311,11 @@ PyType_Modified(PyTypeObject *type)
         Py_ssize_t i = 0;
         PyObject *ref;
         while (PyDict_Next(subclasses, &i, NULL, &ref)) {
-            assert(PyWeakref_CheckRef(ref));
-            PyObject *obj = PyWeakref_GET_OBJECT(ref);
-            if (obj == Py_None) {
+            PyTypeObject *subclass = subclass_from_ref(ref);  // borrowed
+            if (subclass == NULL) {
                 continue;
             }
-            PyType_Modified(_PyType_CAST(obj));
+            PyType_Modified(subclass);
         }
     }
 
@@ -4211,23 +4212,48 @@ type_dealloc_common(PyTypeObject *type)
 }
 
 
-void
-_PyStaticType_Dealloc(PyTypeObject *type)
+static void
+clear_static_tp_subclasses(PyTypeObject *type)
 {
-    // If a type still has subtypes, it cannot be deallocated.
-    // A subtype can inherit attributes and methods of its parent type,
-    // and a type must no longer be used once it's deallocated.
-    if (type->tp_subclasses != NULL) {
+    if (type->tp_subclasses == NULL) {
         return;
     }
 
+    /* Normally it would be a problem to finalize the type if its
+       tp_subclasses wasn't cleared first.  However, this is only
+       ever called at the end of runtime finalization, so we can be
+       more liberal in cleaning up.  If the given type still has
+       subtypes at this point then some extension module did not
+       correctly finalize its objects.
+
+       We can safely obliterate such subtypes since the extension
+       module and its objects won't be used again, except maybe if
+       the runtime were re-initialized.  In that case the sticky
+       situation would only happen if the module were re-imported
+       then and only if the subtype were stored in a global and only
+       if that global were not overwritten during import.  We'd be
+       fine since the extension is otherwise unsafe and unsupported
+       in that situation, and likely problematic already.
+
+       In any case, this situation means at least some memory is
+       going to leak.  This mostly only affects embedding scenarios.
+     */
+
+    // For now we just clear tp_subclasses.
+
+    Py_CLEAR(type->tp_subclasses);
+}
+
+void
+_PyStaticType_Dealloc(PyTypeObject *type)
+{
     type_dealloc_common(type);
 
     Py_CLEAR(type->tp_dict);
     Py_CLEAR(type->tp_bases);
     Py_CLEAR(type->tp_mro);
     Py_CLEAR(type->tp_cache);
-    // type->tp_subclasses is NULL
+    clear_static_tp_subclasses(type);
 
     // PyObject_ClearWeakRefs() raises an exception if Py_REFCNT() != 0
     if (Py_REFCNT(type) == 0) {
@@ -4296,14 +4322,12 @@ _PyType_GetSubclasses(PyTypeObject *self)
     Py_ssize_t i = 0;
     PyObject *ref;  // borrowed ref
     while (PyDict_Next(subclasses, &i, NULL, &ref)) {
-        assert(PyWeakref_CheckRef(ref));
-        PyObject *obj = PyWeakref_GET_OBJECT(ref);  // borrowed ref
-        if (obj == Py_None) {
+        PyTypeObject *subclass = subclass_from_ref(ref);  // borrowed
+        if (subclass == NULL) {
             continue;
         }
-        assert(PyType_Check(obj));
 
-        if (PyList_Append(list, obj) < 0) {
+        if (PyList_Append(list, _PyObject_CAST(subclass)) < 0) {
             Py_DECREF(list);
             return NULL;
         }
@@ -6708,6 +6732,42 @@ add_all_subclasses(PyTypeObject *type, PyObject *bases)
     return res;
 }
 
+static inline PyTypeObject *
+subclass_from_ref(PyObject *ref)
+{
+    assert(PyWeakref_CheckRef(ref));
+    PyObject *obj = PyWeakref_GET_OBJECT(ref);  // borrowed ref
+    assert(obj != NULL);
+    if (obj == Py_None) {
+        return NULL;
+    }
+    assert(PyType_Check(obj));
+    return _PyType_CAST(obj);
+}
+
+static PyObject *
+get_subclasses_key(PyTypeObject *type, PyTypeObject *base)
+{
+    PyObject *key = PyLong_FromVoidPtr((void *) type);
+    if (key != NULL) {
+        return key;
+    }
+    PyErr_Clear();
+
+    /* This basically means we're out of memory.
+       We fall back to manually traversing the values. */
+    Py_ssize_t i = 0;
+    PyObject *ref;  // borrowed ref
+    while (PyDict_Next((PyObject *)base->tp_subclasses, &i, &key, &ref)) {
+        PyTypeObject *subclass = subclass_from_ref(ref);  // borrowed
+        if (subclass == type) {
+            return Py_NewRef(key);
+        }
+    }
+    /* It wasn't found. */
+    return NULL;
+}
+
 static void
 remove_subclass(PyTypeObject *base, PyTypeObject *type)
 {
@@ -6717,8 +6777,8 @@ remove_subclass(PyTypeObject *base, PyTypeObject *type)
     }
     assert(PyDict_CheckExact(subclasses));
 
-    PyObject *key = PyLong_FromVoidPtr((void *) type);
-    if (key == NULL || PyDict_DelItem(subclasses, key)) {
+    PyObject *key = get_subclasses_key(type, base);
+    if (key != NULL && PyDict_DelItem(subclasses, key)) {
         /* This can happen if the type initialization errored out before
            the base subclasses were updated (e.g. a non-str __qualname__
            was passed in the type dict). */
@@ -8811,13 +8871,10 @@ recurse_down_subclasses(PyTypeObject *type, PyObject *attr_name,
     Py_ssize_t i = 0;
     PyObject *ref;
     while (PyDict_Next(subclasses, &i, NULL, &ref)) {
-        assert(PyWeakref_CheckRef(ref));
-        PyObject *obj = PyWeakref_GET_OBJECT(ref);
-        assert(obj != NULL);
-        if (obj == Py_None) {
+        PyTypeObject *subclass = subclass_from_ref(ref);  // borrowed
+        if (subclass == NULL) {
             continue;
         }
-        PyTypeObject *subclass = _PyType_CAST(obj);
 
         /* Avoid recursing down into unaffected classes */
         PyObject *dict = subclass->tp_dict;
diff --git a/Python/pylifecycle.c b/Python/pylifecycle.c
index 13efa6fbf883d..11a45800533e0 100644
--- a/Python/pylifecycle.c
+++ b/Python/pylifecycle.c
@@ -1672,9 +1672,10 @@ finalize_interp_types(PyInterpreterState *interp)
     _PyLong_FiniTypes(interp);
     _PyThread_FiniType(interp);
     _PyErr_FiniTypes(interp);
-    _PyTypes_Fini(interp);
     _PyTypes_FiniTypes(interp);
 
+    _PyTypes_Fini(interp);
+
     // Call _PyUnicode_ClearInterned() before _PyDict_Fini() since it uses
     // a dict internally.
     _PyUnicode_ClearInterned(interp);


From webhook-mailer at python.org  Mon Jul 25 17:31:11 2022
From: webhook-mailer at python.org (pablogsal)
Date: Mon, 25 Jul 2022 21:31:11 -0000
Subject: [Python-checkins] GH-92678: Expose managed dict clear and visit
 functions (#95246)
Message-ID: <mailman.245.1658784671.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/27055d766ab0ee5ddcfbd1fb51fb47419af1ddba
commit: 27055d766ab0ee5ddcfbd1fb51fb47419af1ddba
branch: main
author: Mark Shannon <mark at hotpy.org>
committer: pablogsal <Pablogsal at gmail.com>
date: 2022-07-25T22:30:53+01:00
summary:

GH-92678: Expose managed dict clear and visit functions (#95246)

files:
A Misc/NEWS.d/next/C API/2022-07-25-15-54-27.gh-issue-92678.ziZpxz.rst
M Include/cpython/dictobject.h
M Lib/test/test_capi.py
M Modules/_testcapimodule.c
M Objects/dictobject.c

diff --git a/Include/cpython/dictobject.h b/Include/cpython/dictobject.h
index 565ad791a6cb2..c2e4a46e76195 100644
--- a/Include/cpython/dictobject.h
+++ b/Include/cpython/dictobject.h
@@ -83,3 +83,6 @@ typedef struct {
 
 PyAPI_FUNC(PyObject *) _PyDictView_New(PyObject *, PyTypeObject *);
 PyAPI_FUNC(PyObject *) _PyDictView_Intersect(PyObject* self, PyObject *other);
+
+PyAPI_FUNC(int) _PyObject_VisitManagedDict(PyObject *self, visitproc visit, void *arg);
+PyAPI_FUNC(void) _PyObject_ClearManagedDict(PyObject *self);
diff --git a/Lib/test/test_capi.py b/Lib/test/test_capi.py
index 7e571ab4f9e59..a88a17d3c5578 100644
--- a/Lib/test/test_capi.py
+++ b/Lib/test/test_capi.py
@@ -722,6 +722,20 @@ def test_export_symbols(self):
             with self.subTest(name=name):
                 self.assertTrue(hasattr(ctypes.pythonapi, name))
 
+    def test_clear_managed_dict(self):
+
+        class C:
+            def __init__(self):
+                self.a = 1
+
+        c = C()
+        _testcapi.clear_managed_dict(c)
+        self.assertEqual(c.__dict__, {})
+        c = C()
+        self.assertEqual(c.__dict__, {'a':1})
+        _testcapi.clear_managed_dict(c)
+        self.assertEqual(c.__dict__, {})
+
 
 class TestPendingCalls(unittest.TestCase):
 
diff --git a/Misc/NEWS.d/next/C API/2022-07-25-15-54-27.gh-issue-92678.ziZpxz.rst b/Misc/NEWS.d/next/C API/2022-07-25-15-54-27.gh-issue-92678.ziZpxz.rst
new file mode 100644
index 0000000000000..52473c9dfab94
--- /dev/null
+++ b/Misc/NEWS.d/next/C API/2022-07-25-15-54-27.gh-issue-92678.ziZpxz.rst	
@@ -0,0 +1,3 @@
+Adds unstable C-API functions ``_PyObject_VisitManagedDict`` and
+``_PyObject_ClearManagedDict`` to allow C extensions to allow the VM to
+manage their object's dictionaries.
diff --git a/Modules/_testcapimodule.c b/Modules/_testcapimodule.c
index 02635c427200d..b9f75d154ee5c 100644
--- a/Modules/_testcapimodule.c
+++ b/Modules/_testcapimodule.c
@@ -6009,6 +6009,13 @@ settrace_to_record(PyObject *self, PyObject *list)
     Py_RETURN_NONE;
 }
 
+static PyObject *
+clear_managed_dict(PyObject *self, PyObject *obj)
+{
+    _PyObject_ClearManagedDict(obj);
+    Py_RETURN_NONE;
+}
+
 
 static PyObject *
 test_macros(PyObject *self, PyObject *Py_UNUSED(args))
@@ -6347,6 +6354,7 @@ static PyMethodDef TestMethods[] = {
     {"test_code_api", test_code_api, METH_NOARGS, NULL},
     {"settrace_to_record", settrace_to_record, METH_O, NULL},
     {"test_macros", test_macros, METH_NOARGS, NULL},
+    {"clear_managed_dict", clear_managed_dict, METH_O, NULL},
     {NULL, NULL} /* sentinel */
 };
 
diff --git a/Objects/dictobject.c b/Objects/dictobject.c
index ebbd22ee7c145..25e191fb8eadb 100644
--- a/Objects/dictobject.c
+++ b/Objects/dictobject.c
@@ -5583,6 +5583,35 @@ _PyObject_FreeInstanceAttributes(PyObject *self)
     free_values(*values_ptr);
 }
 
+int
+_PyObject_VisitManagedDict(PyObject *self, visitproc visit, void *arg)
+{
+    PyTypeObject *tp = Py_TYPE(self);
+    if((tp->tp_flags & Py_TPFLAGS_MANAGED_DICT) == 0) {
+        return 0;
+    }
+    assert(tp->tp_dictoffset);
+    int err = _PyObject_VisitInstanceAttributes(self, visit, arg);
+    if (err) {
+        return err;
+    }
+    Py_VISIT(*_PyObject_ManagedDictPointer(self));
+    return 0;
+}
+
+
+void
+_PyObject_ClearManagedDict(PyObject *self)
+{
+    PyTypeObject *tp = Py_TYPE(self);
+    if((tp->tp_flags & Py_TPFLAGS_MANAGED_DICT) == 0) {
+        return;
+    }
+    _PyObject_FreeInstanceAttributes(self);
+    *_PyObject_ValuesPointer(self) = NULL;
+    Py_CLEAR(*_PyObject_ManagedDictPointer(self));
+}
+
 PyObject *
 PyObject_GenericGetDict(PyObject *obj, void *context)
 {


From webhook-mailer at python.org  Mon Jul 25 18:06:05 2022
From: webhook-mailer at python.org (pablogsal)
Date: Mon, 25 Jul 2022 22:06:05 -0000
Subject: [Python-checkins] [3.11] GH-92678: Expose managed dict clear and
 visit functions (GH-95246). (#95256)
Message-ID: <mailman.246.1658786766.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/7f731943393d57cf26ed5f2353e6e53084cd55fd
commit: 7f731943393d57cf26ed5f2353e6e53084cd55fd
branch: 3.11
author: Pablo Galindo Salgado <Pablogsal at gmail.com>
committer: pablogsal <Pablogsal at gmail.com>
date: 2022-07-25T23:05:27+01:00
summary:

[3.11] GH-92678: Expose managed dict clear and visit functions (GH-95246). (#95256)

Co-authored-by: Mark Shannon <mark at hotpy.org>

files:
A Misc/NEWS.d/next/C API/2022-07-25-15-54-27.gh-issue-92678.ziZpxz.rst
M Include/cpython/dictobject.h
M Lib/test/test_capi.py
M Modules/_testcapimodule.c
M Objects/dictobject.c

diff --git a/Include/cpython/dictobject.h b/Include/cpython/dictobject.h
index 033eaeb4c9751..b586f75281b62 100644
--- a/Include/cpython/dictobject.h
+++ b/Include/cpython/dictobject.h
@@ -76,3 +76,6 @@ typedef struct {
 
 PyAPI_FUNC(PyObject *) _PyDictView_New(PyObject *, PyTypeObject *);
 PyAPI_FUNC(PyObject *) _PyDictView_Intersect(PyObject* self, PyObject *other);
+
+PyAPI_FUNC(int) _PyObject_VisitManagedDict(PyObject *self, visitproc visit, void *arg);
+PyAPI_FUNC(void) _PyObject_ClearManagedDict(PyObject *self);
diff --git a/Lib/test/test_capi.py b/Lib/test/test_capi.py
index 904ae9bc47ecf..fba78fa443955 100644
--- a/Lib/test/test_capi.py
+++ b/Lib/test/test_capi.py
@@ -705,6 +705,20 @@ def test_export_symbols(self):
             with self.subTest(name=name):
                 self.assertTrue(hasattr(ctypes.pythonapi, name))
 
+    def test_clear_managed_dict(self):
+
+        class C:
+            def __init__(self):
+                self.a = 1
+
+        c = C()
+        _testcapi.clear_managed_dict(c)
+        self.assertEqual(c.__dict__, {})
+        c = C()
+        self.assertEqual(c.__dict__, {'a':1})
+        _testcapi.clear_managed_dict(c)
+        self.assertEqual(c.__dict__, {})
+
 
 class TestPendingCalls(unittest.TestCase):
 
diff --git a/Misc/NEWS.d/next/C API/2022-07-25-15-54-27.gh-issue-92678.ziZpxz.rst b/Misc/NEWS.d/next/C API/2022-07-25-15-54-27.gh-issue-92678.ziZpxz.rst
new file mode 100644
index 0000000000000..52473c9dfab94
--- /dev/null
+++ b/Misc/NEWS.d/next/C API/2022-07-25-15-54-27.gh-issue-92678.ziZpxz.rst	
@@ -0,0 +1,3 @@
+Adds unstable C-API functions ``_PyObject_VisitManagedDict`` and
+``_PyObject_ClearManagedDict`` to allow C extensions to allow the VM to
+manage their object's dictionaries.
diff --git a/Modules/_testcapimodule.c b/Modules/_testcapimodule.c
index 9aa7fcacb86cb..9022ee4d49a83 100644
--- a/Modules/_testcapimodule.c
+++ b/Modules/_testcapimodule.c
@@ -6014,6 +6014,14 @@ settrace_to_record(PyObject *self, PyObject *list)
     Py_RETURN_NONE;
 }
 
+static PyObject *
+clear_managed_dict(PyObject *self, PyObject *obj)
+{
+    _PyObject_ClearManagedDict(obj);
+    Py_RETURN_NONE;
+}
+
+
 static PyObject *negative_dictoffset(PyObject *, PyObject *);
 static PyObject *test_buildvalue_issue38913(PyObject *, PyObject *);
 static PyObject *getargs_s_hash_int(PyObject *, PyObject *, PyObject*);
@@ -6315,6 +6323,7 @@ static PyMethodDef TestMethods[] = {
     {"get_feature_macros", get_feature_macros, METH_NOARGS, NULL},
     {"test_code_api", test_code_api, METH_NOARGS, NULL},
     {"settrace_to_record", settrace_to_record, METH_O, NULL},
+    {"clear_managed_dict", clear_managed_dict, METH_O, NULL},
     {NULL, NULL} /* sentinel */
 };
 
diff --git a/Objects/dictobject.c b/Objects/dictobject.c
index ebbd22ee7c145..25e191fb8eadb 100644
--- a/Objects/dictobject.c
+++ b/Objects/dictobject.c
@@ -5583,6 +5583,35 @@ _PyObject_FreeInstanceAttributes(PyObject *self)
     free_values(*values_ptr);
 }
 
+int
+_PyObject_VisitManagedDict(PyObject *self, visitproc visit, void *arg)
+{
+    PyTypeObject *tp = Py_TYPE(self);
+    if((tp->tp_flags & Py_TPFLAGS_MANAGED_DICT) == 0) {
+        return 0;
+    }
+    assert(tp->tp_dictoffset);
+    int err = _PyObject_VisitInstanceAttributes(self, visit, arg);
+    if (err) {
+        return err;
+    }
+    Py_VISIT(*_PyObject_ManagedDictPointer(self));
+    return 0;
+}
+
+
+void
+_PyObject_ClearManagedDict(PyObject *self)
+{
+    PyTypeObject *tp = Py_TYPE(self);
+    if((tp->tp_flags & Py_TPFLAGS_MANAGED_DICT) == 0) {
+        return;
+    }
+    _PyObject_FreeInstanceAttributes(self);
+    *_PyObject_ValuesPointer(self) = NULL;
+    Py_CLEAR(*_PyObject_ManagedDictPointer(self));
+}
+
 PyObject *
 PyObject_GenericGetDict(PyObject *obj, void *context)
 {


From webhook-mailer at python.org  Mon Jul 25 22:11:05 2022
From: webhook-mailer at python.org (sweeneyde)
Date: Tue, 26 Jul 2022 02:11:05 -0000
Subject: [Python-checkins] gh-91247: Use memcpy for list and tuple repeat
 (#91482)
Message-ID: <mailman.247.1658801466.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/2ef73be891eb95064e268341e38e81d008add480
commit: 2ef73be891eb95064e268341e38e81d008add480
branch: main
author: Pieter Eendebak <pieter.eendebak at gmail.com>
committer: sweeneyde <36520290+sweeneyde at users.noreply.github.com>
date: 2022-07-25T22:10:23-04:00
summary:

gh-91247: Use memcpy for list and tuple repeat (#91482)

* Add _Py_memory_repeat function to pycore_list

* Add _Py_RefcntAdd function to pycore_object

* Use the new functions in tuplerepeat, list_repeat, and list_inplace_repeat

files:
A Misc/NEWS.d/next/Core and Builtins/2022-03-22-13-12-27.bpo-47091.tJcy-P.rst
M Include/internal/pycore_list.h
M Include/internal/pycore_object.h
M Objects/listobject.c
M Objects/tupleobject.c

diff --git a/Include/internal/pycore_list.h b/Include/internal/pycore_list.h
index 7721f6c2e222a..691d13bc8d9ff 100644
--- a/Include/internal/pycore_list.h
+++ b/Include/internal/pycore_list.h
@@ -56,6 +56,19 @@ _PyList_AppendTakeRef(PyListObject *self, PyObject *newitem)
     return _PyList_AppendTakeRefListResize(self, newitem);
 }
 
+// Repeat the bytes of a buffer in place
+static inline void
+_Py_memory_repeat(char* dest, Py_ssize_t len_dest, Py_ssize_t len_src)
+{
+    assert(len_src > 0);
+    Py_ssize_t copied = len_src;
+    while (copied < len_dest) {
+        Py_ssize_t bytes_to_copy = Py_MIN(copied, len_dest - copied);
+        memcpy(dest + copied, dest, bytes_to_copy);
+        copied += bytes_to_copy;
+    }
+}
+
 typedef struct {
     PyObject_HEAD
     Py_ssize_t it_index;
diff --git a/Include/internal/pycore_object.h b/Include/internal/pycore_object.h
index 1bb2da71704dd..c7490799d816a 100644
--- a/Include/internal/pycore_object.h
+++ b/Include/internal/pycore_object.h
@@ -37,6 +37,16 @@ PyAPI_FUNC(void) _Py_NO_RETURN _Py_FatalRefcountErrorFunc(
 #define _Py_FatalRefcountError(message) \
     _Py_FatalRefcountErrorFunc(__func__, (message))
 
+// Increment reference count by n
+static inline void _Py_RefcntAdd(PyObject* op, Py_ssize_t n)
+{
+#ifdef Py_REF_DEBUG
+    _Py_RefTotal += n;
+#endif
+    op->ob_refcnt += n;
+}
+#define _Py_RefcntAdd(op, n) _Py_RefcntAdd(_PyObject_CAST(op), n)
+
 static inline void
 _Py_DECREF_SPECIALIZED(PyObject *op, const destructor destruct)
 {
diff --git a/Misc/NEWS.d/next/Core and Builtins/2022-03-22-13-12-27.bpo-47091.tJcy-P.rst b/Misc/NEWS.d/next/Core and Builtins/2022-03-22-13-12-27.bpo-47091.tJcy-P.rst
new file mode 100644
index 0000000000000..72a39b5ebc710
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2022-03-22-13-12-27.bpo-47091.tJcy-P.rst	
@@ -0,0 +1 @@
+Improve performance of repetition of :class:`list` and :class:`tuple` by using ``memcpy`` to copy data and performing the reference increments in one step.
diff --git a/Objects/listobject.c b/Objects/listobject.c
index 822954bee432f..9afa68f9fe100 100644
--- a/Objects/listobject.c
+++ b/Objects/listobject.c
@@ -551,47 +551,41 @@ list_concat(PyListObject *a, PyObject *bb)
 static PyObject *
 list_repeat(PyListObject *a, Py_ssize_t n)
 {
-    Py_ssize_t size;
-    PyListObject *np;
-    if (n < 0)
-        n = 0;
-    if (n > 0 && Py_SIZE(a) > PY_SSIZE_T_MAX / n)
-        return PyErr_NoMemory();
-    size = Py_SIZE(a) * n;
-    if (size == 0)
+    const Py_ssize_t input_size = Py_SIZE(a);
+    if (input_size == 0 || n <= 0)
         return PyList_New(0);
-    np = (PyListObject *) list_new_prealloc(size);
+    assert(n > 0);
+
+    if (input_size > PY_SSIZE_T_MAX / n)
+        return PyErr_NoMemory();
+    Py_ssize_t output_size = input_size * n;
+
+    PyListObject *np = (PyListObject *) list_new_prealloc(output_size);
     if (np == NULL)
         return NULL;
+
     PyObject **dest = np->ob_item;
-    PyObject **dest_end = dest + size;
-    if (Py_SIZE(a) == 1) {
+    if (input_size == 1) {
         PyObject *elem = a->ob_item[0];
-        Py_SET_REFCNT(elem, Py_REFCNT(elem) + n);
-#ifdef Py_REF_DEBUG
-        _Py_RefTotal += n;
-#endif
+        _Py_RefcntAdd(elem, n);
+        PyObject **dest_end = dest + output_size;
         while (dest < dest_end) {
             *dest++ = elem;
         }
     }
     else {
         PyObject **src = a->ob_item;
-        PyObject **src_end = src + Py_SIZE(a);
+        PyObject **src_end = src + input_size;
         while (src < src_end) {
-            Py_SET_REFCNT(*src, Py_REFCNT(*src) + n);
-#ifdef Py_REF_DEBUG
-            _Py_RefTotal += n;
-#endif
-            *dest++ = *src++;
-        }
-        // Now src chases after dest in the same buffer
-        src = np->ob_item;
-        while (dest < dest_end) {
+            _Py_RefcntAdd(*src, n);
             *dest++ = *src++;
         }
+
+        _Py_memory_repeat((char *)np->ob_item, sizeof(PyObject *)*output_size,
+                                        sizeof(PyObject *)*input_size);
     }
-    Py_SET_SIZE(np, size);
+
+    Py_SET_SIZE(np, output_size);
     return (PyObject *) np;
 }
 
@@ -743,12 +737,8 @@ PyList_SetSlice(PyObject *a, Py_ssize_t ilow, Py_ssize_t ihigh, PyObject *v)
 static PyObject *
 list_inplace_repeat(PyListObject *self, Py_ssize_t n)
 {
-    PyObject **items;
-    Py_ssize_t size, i, j, p;
-
-
-    size = PyList_GET_SIZE(self);
-    if (size == 0 || n == 1) {
+    Py_ssize_t input_size = PyList_GET_SIZE(self);
+    if (input_size == 0 || n == 1) {
         Py_INCREF(self);
         return (PyObject *)self;
     }
@@ -759,22 +749,21 @@ list_inplace_repeat(PyListObject *self, Py_ssize_t n)
         return (PyObject *)self;
     }
 
-    if (size > PY_SSIZE_T_MAX / n) {
+    if (input_size > PY_SSIZE_T_MAX / n) {
         return PyErr_NoMemory();
     }
+    Py_ssize_t output_size = input_size * n;
 
-    if (list_resize(self, size*n) < 0)
+    if (list_resize(self, output_size) < 0)
         return NULL;
 
-    p = size;
-    items = self->ob_item;
-    for (i = 1; i < n; i++) { /* Start counting at 1, not 0 */
-        for (j = 0; j < size; j++) {
-            PyObject *o = items[j];
-            Py_INCREF(o);
-            items[p++] = o;
-        }
+    PyObject **items = self->ob_item;
+    for (Py_ssize_t j = 0; j < input_size; j++) {
+        _Py_RefcntAdd(items[j], n-1);
     }
+    _Py_memory_repeat((char *)items, sizeof(PyObject *)*output_size,
+                      sizeof(PyObject *)*input_size);
+
     Py_INCREF(self);
     return (PyObject *)self;
 }
diff --git a/Objects/tupleobject.c b/Objects/tupleobject.c
index dfb8597b876e5..240af0a907527 100644
--- a/Objects/tupleobject.c
+++ b/Objects/tupleobject.c
@@ -495,9 +495,8 @@ tupleconcat(PyTupleObject *a, PyObject *bb)
 static PyObject *
 tuplerepeat(PyTupleObject *a, Py_ssize_t n)
 {
-    Py_ssize_t size;
-    PyTupleObject *np;
-    if (Py_SIZE(a) == 0 || n == 1) {
+    const Py_ssize_t input_size = Py_SIZE(a);
+    if (input_size == 0 || n == 1) {
         if (PyTuple_CheckExact(a)) {
             /* Since tuples are immutable, we can return a shared
                copy in this case */
@@ -505,42 +504,38 @@ tuplerepeat(PyTupleObject *a, Py_ssize_t n)
             return (PyObject *)a;
         }
     }
-    if (Py_SIZE(a) == 0 || n <= 0) {
+    if (input_size == 0 || n <= 0) {
         return tuple_get_empty();
     }
-    if (n > PY_SSIZE_T_MAX / Py_SIZE(a))
+    assert(n>0);
+
+    if (input_size > PY_SSIZE_T_MAX / n)
         return PyErr_NoMemory();
-    size = Py_SIZE(a) * n;
-    np = tuple_alloc(size);
+    Py_ssize_t output_size = input_size * n;
+
+    PyTupleObject *np = tuple_alloc(output_size);
     if (np == NULL)
         return NULL;
+
     PyObject **dest = np->ob_item;
-    PyObject **dest_end = dest + size;
-    if (Py_SIZE(a) == 1) {
+    if (input_size == 1) {
         PyObject *elem = a->ob_item[0];
-        Py_SET_REFCNT(elem, Py_REFCNT(elem) + n);
-#ifdef Py_REF_DEBUG
-        _Py_RefTotal += n;
-#endif
+        _Py_RefcntAdd(elem, n);
+        PyObject **dest_end = dest + output_size;
         while (dest < dest_end) {
             *dest++ = elem;
         }
     }
     else {
         PyObject **src = a->ob_item;
-        PyObject **src_end = src + Py_SIZE(a);
+        PyObject **src_end = src + input_size;
         while (src < src_end) {
-            Py_SET_REFCNT(*src, Py_REFCNT(*src) + n);
-#ifdef Py_REF_DEBUG
-            _Py_RefTotal += n;
-#endif
-            *dest++ = *src++;
-        }
-        // Now src chases after dest in the same buffer
-        src = np->ob_item;
-        while (dest < dest_end) {
+            _Py_RefcntAdd(*src, n);
             *dest++ = *src++;
         }
+
+        _Py_memory_repeat((char *)np->ob_item, sizeof(PyObject *)*output_size,
+                          sizeof(PyObject *)*input_size);
     }
     _PyObject_GC_TRACK(np);
     return (PyObject *) np;


From webhook-mailer at python.org  Tue Jul 26 02:12:35 2022
From: webhook-mailer at python.org (serhiy-storchaka)
Date: Tue, 26 Jul 2022 06:12:35 -0000
Subject: [Python-checkins] gh-95041: Fix several minor issues in
 syslog.openlog() (GH-95058)
Message-ID: <mailman.248.1658815956.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/68c555a50a2b74731b0db0f4dcbf51b2c11d4853
commit: 68c555a50a2b74731b0db0f4dcbf51b2c11d4853
branch: main
author: Serhiy Storchaka <storchaka at gmail.com>
committer: serhiy-storchaka <storchaka at gmail.com>
date: 2022-07-26T09:12:10+03:00
summary:

gh-95041: Fix several minor issues in syslog.openlog() (GH-95058)

* syslog_get_argv() swallows exceptions, but not in all cases.
* if ident is non UTF-8 encodable, syslog.openlog() fails after setting the
  global reference to ident. Now the C string saved internally in the previous
  call to openlog() points to the freed memory.
* PySys_Audit() can crash if ident is NULL.
* There may be a race condition with syslog.syslog(), because the global
  reference to ident is decrefed before setting the new value.
* Possible use of freed memory if syslog.openlog() is called while
  the GIL is released in syslog.syslog().

files:
M Modules/syslogmodule.c

diff --git a/Modules/syslogmodule.c b/Modules/syslogmodule.c
index 2655a0c94bbd9..27b176aeb6dba 100644
--- a/Modules/syslogmodule.c
+++ b/Modules/syslogmodule.c
@@ -87,6 +87,10 @@ syslog_get_argv(void)
     }
 
     scriptobj = PyList_GetItem(argv, 0);
+    if (scriptobj == NULL) {
+        PyErr_Clear();
+        return NULL;
+    }
     if (!PyUnicode_Check(scriptobj)) {
         return(NULL);
     }
@@ -96,16 +100,16 @@ syslog_get_argv(void)
     }
 
     slash = PyUnicode_FindChar(scriptobj, SEP, 0, scriptlen, -1);
-    if (slash == -2)
+    if (slash == -2) {
+        PyErr_Clear();
         return NULL;
+    }
     if (slash != -1) {
         return PyUnicode_Substring(scriptobj, slash + 1, scriptlen);
     } else {
         Py_INCREF(scriptobj);
         return(scriptobj);
     }
-
-    return(NULL);
 }
 
 
@@ -114,42 +118,41 @@ syslog_openlog(PyObject * self, PyObject * args, PyObject *kwds)
 {
     long logopt = 0;
     long facility = LOG_USER;
-    PyObject *new_S_ident_o = NULL;
+    PyObject *ident = NULL;
     static char *keywords[] = {"ident", "logoption", "facility", 0};
-    const char *ident = NULL;
+    const char *ident_str = NULL;
 
     if (!PyArg_ParseTupleAndKeywords(args, kwds,
-                          "|Ull:openlog", keywords, &new_S_ident_o, &logopt, &facility))
+                          "|Ull:openlog", keywords, &ident, &logopt, &facility))
         return NULL;
 
-    if (new_S_ident_o) {
-        Py_INCREF(new_S_ident_o);
+    if (ident) {
+        Py_INCREF(ident);
     }
-
-    /*  get sys.argv[0] or NULL if we can't for some reason  */
-    if (!new_S_ident_o) {
-        new_S_ident_o = syslog_get_argv();
+    else {
+        /* get sys.argv[0] or NULL if we can't for some reason  */
+        ident = syslog_get_argv();
     }
 
-    Py_XDECREF(S_ident_o);
-    S_ident_o = new_S_ident_o;
-
-    /* At this point, S_ident_o should be INCREF()ed.  openlog(3) does not
-     * make a copy, and syslog(3) later uses it.  We can't garbagecollect it
+    /* At this point, ident should be INCREF()ed.  openlog(3) does not
+     * make a copy, and syslog(3) later uses it.  We can't garbagecollect it.
      * If NULL, just let openlog figure it out (probably using C argv[0]).
      */
-    if (S_ident_o) {
-        ident = PyUnicode_AsUTF8(S_ident_o);
-        if (ident == NULL)
+    if (ident) {
+        ident_str = PyUnicode_AsUTF8(ident);
+        if (ident_str == NULL) {
+            Py_DECREF(ident);
             return NULL;
+        }
     }
-
-    if (PySys_Audit("syslog.openlog", "sll", ident, logopt, facility) < 0) {
+    if (PySys_Audit("syslog.openlog", "Oll", ident ? ident : Py_None, logopt, facility) < 0) {
+        Py_DECREF(ident);
         return NULL;
     }
 
-    openlog(ident, logopt, facility);
+    openlog(ident_str, logopt, facility);
     S_log_open = 1;
+    Py_XSETREF(S_ident_o, ident);
 
     Py_RETURN_NONE;
 }
@@ -193,9 +196,15 @@ syslog_syslog(PyObject * self, PyObject * args)
         }
     }
 
+    /* Incref ident, because it can be decrefed if syslog.openlog() is
+     * called when the GIL is released.
+     */
+    PyObject *ident = S_ident_o;
+    Py_XINCREF(ident);
     Py_BEGIN_ALLOW_THREADS;
     syslog(priority, "%s", message);
     Py_END_ALLOW_THREADS;
+    Py_XDECREF(ident);
     Py_RETURN_NONE;
 }
 
@@ -355,4 +364,4 @@ PyMODINIT_FUNC
 PyInit_syslog(void)
 {
     return PyModuleDef_Init(&syslogmodule);
-}
\ No newline at end of file
+}


From webhook-mailer at python.org  Tue Jul 26 02:29:28 2022
From: webhook-mailer at python.org (erlend-aasland)
Date: Tue, 26 Jul 2022 06:29:28 -0000
Subject: [Python-checkins] gh-95235: Add explicit parameter list to some
 sqlite3 methods (#95240)
Message-ID: <mailman.249.1658816969.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/5012bedc7ca7d78b5a42bf60eef55bac263f4060
commit: 5012bedc7ca7d78b5a42bf60eef55bac263f4060
branch: main
author: Erlend Egeberg Aasland <erlend.aasland at protonmail.com>
committer: erlend-aasland <erlend.aasland at protonmail.com>
date: 2022-07-26T08:29:18+02:00
summary:

gh-95235: Add explicit parameter list to some sqlite3 methods (#95240)

Co-authored-by: CAM Gerlach <CAM.Gerlach at Gerlach.CAM>

files:
M Doc/library/sqlite3.rst

diff --git a/Doc/library/sqlite3.rst b/Doc/library/sqlite3.rst
index 956079b9bf31b..b75549448d403 100644
--- a/Doc/library/sqlite3.rst
+++ b/Doc/library/sqlite3.rst
@@ -286,7 +286,7 @@ Module functions and constants
        Can be ``"DEFERRED"`` (default), ``"EXCLUSIVE"`` or ``"IMMEDIATE"``;
        or :const:`None` to disable opening transactions implicitly.
        See :ref:`sqlite3-controlling-transactions` for more.
-   :type isolation_level: str | None
+   :type isolation_level: str | :const:`None`
 
    :param check_same_thread:
        If :const:`True` (default), only the creating thread may use the connection.
@@ -316,7 +316,7 @@ Module functions and constants
        enabling various :ref:`sqlite3-uri-tricks`.
    :type uri: bool
 
-   :rtype: sqlite3.Connection
+   :rtype: Connection
 
    .. audit-event:: sqlite3.connect database sqlite3.connect
    .. audit-event:: sqlite3.connect/handle connection_handle sqlite3.connect
@@ -434,13 +434,36 @@ Connection Objects
 
    .. method:: blobopen(table, column, row, /, *, readonly=False, name="main")
 
-      Open a :class:`Blob` handle to the :abbr:`BLOB (Binary Large OBject)`
-      located in table name *table*, column name *column*, and row index *row*
-      of database *name*.
-      When *readonly* is :const:`True` the blob is opened without write
-      permissions.
-      Trying to open a blob in a ``WITHOUT ROWID`` table will raise
-      :exc:`OperationalError`.
+      Open a :class:`Blob` handle to an existing
+      :abbr:`BLOB (Binary Large OBject)`.
+
+      :param table:
+          The name of the table where the blob is located.
+      :type table: str
+
+      :param column:
+          The name of the column where the blob is located.
+      :type column: str
+
+      :param row:
+          The name of the row where the blob is located.
+      :type row: str
+
+      :param readonly:
+          Set to :const:`True` if the blob should be opened without write
+          permissions.
+          Defaults to :const:`False`.
+      :type readonly: bool
+
+      :param name:
+          The name of the database where the blob is located.
+          Defaults to ``"main"``.
+      :type name: str
+
+      :raises OperationalError:
+          When trying to open a blob in a ``WITHOUT ROWID`` table.
+
+      :rtype: Blob
 
       .. note::
 
@@ -486,21 +509,35 @@ Connection Objects
 
    .. method:: create_function(name, narg, func, *, deterministic=False)
 
-      Creates a user-defined function that you can later use from within SQL
-      statements under the function name *name*. *narg* is the number of
-      parameters the function accepts (if *narg* is -1, the function may
-      take any number of arguments), and *func* is a Python callable that is
-      called as the SQL function. If *deterministic* is true, the created function
-      is marked as `deterministic <https://sqlite.org/deterministic.html>`_, which
-      allows SQLite to perform additional optimizations. This flag is supported by
-      SQLite 3.8.3 or higher, :exc:`NotSupportedError` will be raised if used
-      with older versions.
+      Create or remove a user-defined SQL function.
+
+      :param name:
+          The name of the SQL function.
+      :type name: str
+
+      :param narg:
+          The number of arguments the SQL function can accept.
+          If ``-1``, it may take any number of arguments.
+      :type narg: int
 
-      The function can return any of
-      :ref:`the types natively supported by SQLite <sqlite3-types>`.
+      :param func:
+          A callable that is called when the SQL function is invoked.
+          The callable must return :ref:`a type natively supported by SQLite
+          <sqlite3-types>`.
+          Set to :const:`None` to remove an existing SQL function.
+      :type func: :term:`callback` | :const:`None`
 
-      .. versionchanged:: 3.8
-         The *deterministic* parameter was added.
+      :param deterministic:
+          If :const:`True`, the created SQL function is marked as
+          `deterministic <https://sqlite.org/deterministic.html>`_,
+          which allows SQLite to perform additional optimizations.
+      :type deterministic: bool
+
+      :raises NotSupportedError:
+          If *deterministic* is used with SQLite versions older than 3.8.3.
+
+      .. versionadded:: 3.8
+         The *deterministic* parameter.
 
       Example:
 
@@ -509,15 +546,29 @@ Connection Objects
 
    .. method:: create_aggregate(name, /, n_arg, aggregate_class)
 
-      Creates a user-defined aggregate function.
+      Create or remove a user-defined SQL aggregate function.
+
+      :param name:
+          The name of the SQL aggregate function.
+      :type name: str
 
-      The aggregate class must implement a ``step`` method, which accepts the number
-      of parameters *n_arg* (if *n_arg* is -1, the function may take
-      any number of arguments), and a ``finalize`` method which will return the
-      final result of the aggregate.
+      :param n_arg:
+          The number of arguments the SQL aggregate function can accept.
+          If ``-1``, it may take any number of arguments.
+      :type n_arg: int
 
-      The ``finalize`` method can return any of
-      :ref:`the types natively supported by SQLite <sqlite3-types>`.
+      :param aggregate_class:
+          A class must implement the following methods:
+
+          * ``step()``: Add a row to the aggregate.
+          * ``finalize()``: Return the final result of the aggregate as
+            :ref:`a type natively supported by SQLite <sqlite3-types>`.
+
+          The number of arguments that the ``step()`` method must accept
+          is controlled by *n_arg*.
+
+          Set to :const:`None` to remove an existing SQL aggregate function.
+      :type aggregate_class: :term:`class` | :const:`None`
 
       Example:
 
@@ -526,25 +577,36 @@ Connection Objects
 
    .. method:: create_window_function(name, num_params, aggregate_class, /)
 
-      Creates user-defined aggregate window function *name*.
+      Create or remove a user-defined aggregate window function.
+
+      :param name:
+          The name of the SQL aggregate window function to create or remove.
+      :type name: str
+
+      :param num_params:
+          The number of arguments the SQL aggregate window function can accept.
+          If ``-1``, it may take any number of arguments.
+      :type num_params: int
+
+      :param aggregate_class:
+          A class that must implement the following methods:
 
-      *aggregate_class* must implement the following methods:
+          * ``step()``: Add a row to the current window.
+          * ``value()``: Return the current value of the aggregate.
+          * ``inverse()``: Remove a row from the current window.
+          * ``finalize()``: Return the final result of the aggregate as
+            :ref:`a type natively supported by SQLite <sqlite3-types>`.
 
-      * ``step``: adds a row to the current window
-      * ``value``: returns the current value of the aggregate
-      * ``inverse``: removes a row from the current window
-      * ``finalize``: returns the final value of the aggregate
+          The number of arguments that the ``step()`` and ``value()`` methods
+          must accept is controlled by *num_params*.
 
-      ``step`` and ``value`` accept *num_params* number of parameters,
-      unless *num_params* is ``-1``, in which case they may take any number of
-      arguments.
-      ``finalize`` and ``value`` can return any of
-      :ref:`the types natively supported by SQLite <sqlite3-types>`.
-      Call :meth:`create_window_function` with
-      *aggregate_class* set to :const:`None` to clear window function *name*.
+          Set to :const:`None` to remove an existing SQL aggregate window function.
 
-      Aggregate window functions are supported by SQLite 3.25.0 and higher.
-      :exc:`NotSupportedError` will be raised if used with older versions.
+      :raises NotSupportedError:
+          If used with a version of SQLite older than 3.25.0,
+          which does not support aggregate window functions.
+
+      :type aggregate_class: :term:`class` | :const:`None`
 
       .. versionadded:: 3.11
 
@@ -744,29 +806,43 @@ Connection Objects
 
    .. method:: backup(target, *, pages=-1, progress=None, name="main", sleep=0.250)
 
-      This method makes a backup of an SQLite database even while it's being accessed
-      by other clients, or concurrently by the same connection.  The copy will be
-      written into the mandatory argument *target*, that must be another
-      :class:`Connection` instance.
-
-      By default, or when *pages* is either ``0`` or a negative integer, the entire
-      database is copied in a single step; otherwise the method performs a loop
-      copying up to *pages* pages at a time.
-
-      If *progress* is specified, it must either be ``None`` or a callable object that
-      will be executed at each iteration with three integer arguments, respectively
-      the *status* of the last iteration, the *remaining* number of pages still to be
-      copied and the *total* number of pages.
-
-      The *name* argument specifies the database name that will be copied: it must be
-      a string containing either ``"main"``, the default, to indicate the main
-      database, ``"temp"`` to indicate the temporary database or the name specified
-      after the ``AS`` keyword in an ``ATTACH DATABASE`` statement for an attached
-      database.
-
-      The *sleep* argument specifies the number of seconds to sleep by between
-      successive attempts to backup remaining pages, can be specified either as an
-      integer or a floating point value.
+      Create a backup of an SQLite database.
+
+      Works even if the database is being accessed by other clients
+      or concurrently by the same connection.
+
+      :param target:
+          The database connection to save the backup to.
+      :type target: Connection
+
+      :param pages:
+          The number of pages to copy at a time.
+          If equal to or less than ``0``,
+          the entire database is copied in a single step.
+          Defaults to ``-1``.
+      :type pages: int
+
+      :param progress:
+          If set to a callable, it is invoked with three integer arguments for
+          every backup iteration:
+          the *status* of the last iteration,
+          the *remaining* number of pages still to be copied,
+          and the *total* number of pages.
+          Defaults to :const:`None`.
+      :type progress: :term:`callback` |?:const:`None`
+
+      :param name:
+          The name of the database to back up.
+          Either ``"main"`` (the default) for the main database,
+          ``"temp"`` for the temporary database,
+          or the name of a custom database as attached using the
+          ``ATTACH DATABASE`` SQL statment.
+      :type name: str
+
+      :param sleep:
+          The number of seconds to sleep between successive attempts
+          to back up remaining pages.
+      :type sleep: float
 
       Example 1, copy an existing database into another::
 


From webhook-mailer at python.org  Tue Jul 26 02:35:42 2022
From: webhook-mailer at python.org (miss-islington)
Date: Tue, 26 Jul 2022 06:35:42 -0000
Subject: [Python-checkins] gh-95041: Fix several minor issues in
 syslog.openlog() (GH-95058)
Message-ID: <mailman.250.1658817343.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/dd0c1a3577618c30598a0a57f9a91e316605f6b9
commit: dd0c1a3577618c30598a0a57f9a91e316605f6b9
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-25T23:35:25-07:00
summary:

gh-95041: Fix several minor issues in syslog.openlog() (GH-95058)


* syslog_get_argv() swallows exceptions, but not in all cases.
* if ident is non UTF-8 encodable, syslog.openlog() fails after setting the
  global reference to ident. Now the C string saved internally in the previous
  call to openlog() points to the freed memory.
* PySys_Audit() can crash if ident is NULL.
* There may be a race condition with syslog.syslog(), because the global
  reference to ident is decrefed before setting the new value.
* Possible use of freed memory if syslog.openlog() is called while
  the GIL is released in syslog.syslog().
(cherry picked from commit 68c555a50a2b74731b0db0f4dcbf51b2c11d4853)

Co-authored-by: Serhiy Storchaka <storchaka at gmail.com>

files:
M Modules/syslogmodule.c

diff --git a/Modules/syslogmodule.c b/Modules/syslogmodule.c
index 0f2fea15b3a6f..95e5effafd58f 100644
--- a/Modules/syslogmodule.c
+++ b/Modules/syslogmodule.c
@@ -87,6 +87,10 @@ syslog_get_argv(void)
     }
 
     scriptobj = PyList_GetItem(argv, 0);
+    if (scriptobj == NULL) {
+        PyErr_Clear();
+        return NULL;
+    }
     if (!PyUnicode_Check(scriptobj)) {
         return(NULL);
     }
@@ -96,16 +100,16 @@ syslog_get_argv(void)
     }
 
     slash = PyUnicode_FindChar(scriptobj, SEP, 0, scriptlen, -1);
-    if (slash == -2)
+    if (slash == -2) {
+        PyErr_Clear();
         return NULL;
+    }
     if (slash != -1) {
         return PyUnicode_Substring(scriptobj, slash + 1, scriptlen);
     } else {
         Py_INCREF(scriptobj);
         return(scriptobj);
     }
-
-    return(NULL);
 }
 
 
@@ -114,42 +118,41 @@ syslog_openlog(PyObject * self, PyObject * args, PyObject *kwds)
 {
     long logopt = 0;
     long facility = LOG_USER;
-    PyObject *new_S_ident_o = NULL;
+    PyObject *ident = NULL;
     static char *keywords[] = {"ident", "logoption", "facility", 0};
-    const char *ident = NULL;
+    const char *ident_str = NULL;
 
     if (!PyArg_ParseTupleAndKeywords(args, kwds,
-                          "|Ull:openlog", keywords, &new_S_ident_o, &logopt, &facility))
+                          "|Ull:openlog", keywords, &ident, &logopt, &facility))
         return NULL;
 
-    if (new_S_ident_o) {
-        Py_INCREF(new_S_ident_o);
+    if (ident) {
+        Py_INCREF(ident);
     }
-
-    /*  get sys.argv[0] or NULL if we can't for some reason  */
-    if (!new_S_ident_o) {
-        new_S_ident_o = syslog_get_argv();
+    else {
+        /* get sys.argv[0] or NULL if we can't for some reason  */
+        ident = syslog_get_argv();
     }
 
-    Py_XDECREF(S_ident_o);
-    S_ident_o = new_S_ident_o;
-
-    /* At this point, S_ident_o should be INCREF()ed.  openlog(3) does not
-     * make a copy, and syslog(3) later uses it.  We can't garbagecollect it
+    /* At this point, ident should be INCREF()ed.  openlog(3) does not
+     * make a copy, and syslog(3) later uses it.  We can't garbagecollect it.
      * If NULL, just let openlog figure it out (probably using C argv[0]).
      */
-    if (S_ident_o) {
-        ident = PyUnicode_AsUTF8(S_ident_o);
-        if (ident == NULL)
+    if (ident) {
+        ident_str = PyUnicode_AsUTF8(ident);
+        if (ident_str == NULL) {
+            Py_DECREF(ident);
             return NULL;
+        }
     }
-
-    if (PySys_Audit("syslog.openlog", "sll", ident, logopt, facility) < 0) {
+    if (PySys_Audit("syslog.openlog", "Oll", ident ? ident : Py_None, logopt, facility) < 0) {
+        Py_DECREF(ident);
         return NULL;
     }
 
-    openlog(ident, logopt, facility);
+    openlog(ident_str, logopt, facility);
     S_log_open = 1;
+    Py_XSETREF(S_ident_o, ident);
 
     Py_RETURN_NONE;
 }
@@ -193,9 +196,15 @@ syslog_syslog(PyObject * self, PyObject * args)
         }
     }
 
+    /* Incref ident, because it can be decrefed if syslog.openlog() is
+     * called when the GIL is released.
+     */
+    PyObject *ident = S_ident_o;
+    Py_XINCREF(ident);
     Py_BEGIN_ALLOW_THREADS;
     syslog(priority, "%s", message);
     Py_END_ALLOW_THREADS;
+    Py_XDECREF(ident);
     Py_RETURN_NONE;
 }
 
@@ -355,4 +364,4 @@ PyMODINIT_FUNC
 PyInit_syslog(void)
 {
     return PyModuleDef_Init(&syslogmodule);
-}
\ No newline at end of file
+}


From webhook-mailer at python.org  Tue Jul 26 03:06:17 2022
From: webhook-mailer at python.org (rhettinger)
Date: Tue, 26 Jul 2022 07:06:17 -0000
Subject: [Python-checkins] Clarifying the documentation on library/syslog
 (GH-92587)
Message-ID: <mailman.251.1658819178.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/b7ce4625fe2a8a4d6c1db6b39b52c7f97d384caa
commit: b7ce4625fe2a8a4d6c1db6b39b52c7f97d384caa
branch: main
author: Nicolas Haller <nicolas at haller.im>
committer: rhettinger <rhettinger at users.noreply.github.com>
date: 2022-07-26T02:06:06-05:00
summary:

Clarifying the documentation on library/syslog (GH-92587)

files:
M Doc/library/syslog.rst

diff --git a/Doc/library/syslog.rst b/Doc/library/syslog.rst
index d264a3340c98b..ce51856ab7be1 100644
--- a/Doc/library/syslog.rst
+++ b/Doc/library/syslog.rst
@@ -29,10 +29,15 @@ The module defines the following functions:
    value given in the :func:`openlog` call is used.
 
    If :func:`openlog` has not been called prior to the call to :func:`syslog`,
-   ``openlog()`` will be called with no arguments.
+   :func:`openlog` will be called with no arguments.
 
    .. audit-event:: syslog.syslog priority,message syslog.syslog
 
+   .. versionchanged:: 3.2
+      In previous versions, :func:`openlog` would not be called automatically if
+      it wasn't called prior to the call to :func:`syslog`, deferring to the syslog
+      implementation to call ``openlog()``.
+
 
 .. function:: openlog([ident[, logoption[, facility]]])
 
@@ -51,8 +56,7 @@ The module defines the following functions:
 
    .. versionchanged:: 3.2
       In previous versions, keyword arguments were not allowed, and *ident* was
-      required.  The default for *ident* was dependent on the system libraries,
-      and often was ``python`` instead of the name of the Python program file.
+      required.
 
 
 .. function:: closelog()


From webhook-mailer at python.org  Tue Jul 26 03:23:43 2022
From: webhook-mailer at python.org (rhettinger)
Date: Tue, 26 Jul 2022 07:23:43 -0000
Subject: [Python-checkins] Statistics inv_cdf sync with corresponding random
 module normal distributions (#95265)
Message-ID: <mailman.252.1658820224.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/4395ff1e6a18fb26c7a66b1c29b34ed60ddd001c
commit: 4395ff1e6a18fb26c7a66b1c29b34ed60ddd001c
branch: main
author: Raymond Hettinger <rhettinger at users.noreply.github.com>
committer: rhettinger <rhettinger at users.noreply.github.com>
date: 2022-07-26T02:23:33-05:00
summary:

Statistics inv_cdf sync with corresponding random module normal distributions (#95265)

files:
M Lib/statistics.py
M Lib/test/test_statistics.py
M Modules/_statisticsmodule.c

diff --git a/Lib/statistics.py b/Lib/statistics.py
index 9d775e74f81c6..c78d64518853e 100644
--- a/Lib/statistics.py
+++ b/Lib/statistics.py
@@ -1221,8 +1221,6 @@ def inv_cdf(self, p):
         """
         if p <= 0.0 or p >= 1.0:
             raise StatisticsError('p must be in the range 0.0 < p < 1.0')
-        if self._sigma <= 0.0:
-            raise StatisticsError('cdf() not defined when sigma at or below zero')
         return _normal_dist_inv_cdf(p, self._mu, self._sigma)
 
     def quantiles(self, n=4):
diff --git a/Lib/test/test_statistics.py b/Lib/test/test_statistics.py
index 6de98241c294d..bf85525dd129a 100644
--- a/Lib/test/test_statistics.py
+++ b/Lib/test/test_statistics.py
@@ -2801,9 +2801,10 @@ def test_inv_cdf(self):
             iq.inv_cdf(1.0)                         # p is one
         with self.assertRaises(self.module.StatisticsError):
             iq.inv_cdf(1.1)                         # p over one
-        with self.assertRaises(self.module.StatisticsError):
-            iq = NormalDist(100, 0)                 # sigma is zero
-            iq.inv_cdf(0.5)
+
+        # Supported case:
+        iq = NormalDist(100, 0)                     # sigma is zero
+        self.assertEqual(iq.inv_cdf(0.5), 100)
 
         # Special values
         self.assertTrue(math.isnan(Z.inv_cdf(float('NaN'))))
diff --git a/Modules/_statisticsmodule.c b/Modules/_statisticsmodule.c
index 78c0676a01f02..b9d1e4f161603 100644
--- a/Modules/_statisticsmodule.c
+++ b/Modules/_statisticsmodule.c
@@ -31,7 +31,7 @@ _statistics__normal_dist_inv_cdf_impl(PyObject *module, double p, double mu,
 /*[clinic end generated code: output=02fd19ddaab36602 input=24715a74be15296a]*/
 {
     double q, num, den, r, x;
-    if (p <= 0.0 || p >= 1.0 || sigma <= 0.0) {
+    if (p <= 0.0 || p >= 1.0) {
         goto error;
     }
 


From webhook-mailer at python.org  Tue Jul 26 04:12:58 2022
From: webhook-mailer at python.org (erlend-aasland)
Date: Tue, 26 Jul 2022 08:12:58 -0000
Subject: [Python-checkins] [3.10] gh-95235: Add explicit parameter list to
 some sqlite3 methods (GH-95240) (#95268)
Message-ID: <mailman.253.1658823180.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/a4fd732155771d7bedd7cd7e372b2387e93d1dbc
commit: a4fd732155771d7bedd7cd7e372b2387e93d1dbc
branch: 3.10
author: Erlend Egeberg Aasland <erlend.aasland at protonmail.com>
committer: erlend-aasland <erlend.aasland at protonmail.com>
date: 2022-07-26T10:12:50+02:00
summary:

[3.10] gh-95235: Add explicit parameter list to some sqlite3 methods (GH-95240) (#95268)

Co-authored-by: CAM Gerlach <CAM.Gerlach at Gerlach.CAM>.
(cherry picked from commit 5012bedc7ca7d78b5a42bf60eef55bac263f4060)

Co-authored-by: Erlend Egeberg Aasland <erlend.aasland at protonmail.com>

files:
M Doc/library/sqlite3.rst

diff --git a/Doc/library/sqlite3.rst b/Doc/library/sqlite3.rst
index 868e2a55a71b5..2c7438afd828f 100644
--- a/Doc/library/sqlite3.rst
+++ b/Doc/library/sqlite3.rst
@@ -258,7 +258,7 @@ Module functions and constants
        Can be ``"DEFERRED"`` (default), ``"EXCLUSIVE"`` or ``"IMMEDIATE"``;
        or :const:`None` to disable opening transactions implicitly.
        See :ref:`sqlite3-controlling-transactions` for more.
-   :type isolation_level: str | None
+   :type isolation_level: str | :const:`None`
 
    :param check_same_thread:
        If :const:`True` (default), only the creating thread may use the connection.
@@ -288,7 +288,7 @@ Module functions and constants
        enabling various :ref:`sqlite3-uri-tricks`.
    :type uri: bool
 
-   :rtype: sqlite3.Connection
+   :rtype: Connection
 
    .. audit-event:: sqlite3.connect database sqlite3.connect
    .. audit-event:: sqlite3.connect/handle connection_handle sqlite3.connect
@@ -423,21 +423,35 @@ Connection Objects
 
    .. method:: create_function(name, narg, func, *, deterministic=False)
 
-      Creates a user-defined function that you can later use from within SQL
-      statements under the function name *name*. *narg* is the number of
-      parameters the function accepts (if *narg* is -1, the function may
-      take any number of arguments), and *func* is a Python callable that is
-      called as the SQL function. If *deterministic* is true, the created function
-      is marked as `deterministic <https://sqlite.org/deterministic.html>`_, which
-      allows SQLite to perform additional optimizations. This flag is supported by
-      SQLite 3.8.3 or higher, :exc:`NotSupportedError` will be raised if used
-      with older versions.
+      Create or remove a user-defined SQL function.
 
-      The function can return any of
-      :ref:`the types natively supported by SQLite <sqlite3-types>`.
+      :param name:
+          The name of the SQL function.
+      :type name: str
 
-      .. versionchanged:: 3.8
-         The *deterministic* parameter was added.
+      :param narg:
+          The number of arguments the SQL function can accept.
+          If ``-1``, it may take any number of arguments.
+      :type narg: int
+
+      :param func:
+          A callable that is called when the SQL function is invoked.
+          The callable must return :ref:`a type natively supported by SQLite
+          <sqlite3-types>`.
+          Set to :const:`None` to remove an existing SQL function.
+      :type func: :term:`callback` | :const:`None`
+
+      :param deterministic:
+          If :const:`True`, the created SQL function is marked as
+          `deterministic <https://sqlite.org/deterministic.html>`_,
+          which allows SQLite to perform additional optimizations.
+      :type deterministic: bool
+
+      :raises NotSupportedError:
+          If *deterministic* is used with SQLite versions older than 3.8.3.
+
+      .. versionadded:: 3.8
+         The *deterministic* parameter.
 
       Example:
 
@@ -446,15 +460,29 @@ Connection Objects
 
    .. method:: create_aggregate(name, /, n_arg, aggregate_class)
 
-      Creates a user-defined aggregate function.
+      Create or remove a user-defined SQL aggregate function.
+
+      :param name:
+          The name of the SQL aggregate function.
+      :type name: str
+
+      :param n_arg:
+          The number of arguments the SQL aggregate function can accept.
+          If ``-1``, it may take any number of arguments.
+      :type n_arg: int
+
+      :param aggregate_class:
+          A class must implement the following methods:
 
-      The aggregate class must implement a ``step`` method, which accepts the number
-      of parameters *n_arg* (if *n_arg* is -1, the function may take
-      any number of arguments), and a ``finalize`` method which will return the
-      final result of the aggregate.
+          * ``step()``: Add a row to the aggregate.
+          * ``finalize()``: Return the final result of the aggregate as
+            :ref:`a type natively supported by SQLite <sqlite3-types>`.
 
-      The ``finalize`` method can return any of
-      :ref:`the types natively supported by SQLite <sqlite3-types>`.
+          The number of arguments that the ``step()`` method must accept
+          is controlled by *n_arg*.
+
+          Set to :const:`None` to remove an existing SQL aggregate function.
+      :type aggregate_class: :term:`class` | :const:`None`
 
       Example:
 
@@ -643,29 +671,43 @@ Connection Objects
 
    .. method:: backup(target, *, pages=-1, progress=None, name="main", sleep=0.250)
 
-      This method makes a backup of an SQLite database even while it's being accessed
-      by other clients, or concurrently by the same connection.  The copy will be
-      written into the mandatory argument *target*, that must be another
-      :class:`Connection` instance.
-
-      By default, or when *pages* is either ``0`` or a negative integer, the entire
-      database is copied in a single step; otherwise the method performs a loop
-      copying up to *pages* pages at a time.
-
-      If *progress* is specified, it must either be ``None`` or a callable object that
-      will be executed at each iteration with three integer arguments, respectively
-      the *status* of the last iteration, the *remaining* number of pages still to be
-      copied and the *total* number of pages.
-
-      The *name* argument specifies the database name that will be copied: it must be
-      a string containing either ``"main"``, the default, to indicate the main
-      database, ``"temp"`` to indicate the temporary database or the name specified
-      after the ``AS`` keyword in an ``ATTACH DATABASE`` statement for an attached
-      database.
-
-      The *sleep* argument specifies the number of seconds to sleep by between
-      successive attempts to backup remaining pages, can be specified either as an
-      integer or a floating point value.
+      Create a backup of an SQLite database.
+
+      Works even if the database is being accessed by other clients
+      or concurrently by the same connection.
+
+      :param target:
+          The database connection to save the backup to.
+      :type target: Connection
+
+      :param pages:
+          The number of pages to copy at a time.
+          If equal to or less than ``0``,
+          the entire database is copied in a single step.
+          Defaults to ``-1``.
+      :type pages: int
+
+      :param progress:
+          If set to a callable, it is invoked with three integer arguments for
+          every backup iteration:
+          the *status* of the last iteration,
+          the *remaining* number of pages still to be copied,
+          and the *total* number of pages.
+          Defaults to :const:`None`.
+      :type progress: :term:`callback` |?:const:`None`
+
+      :param name:
+          The name of the database to back up.
+          Either ``"main"`` (the default) for the main database,
+          ``"temp"`` for the temporary database,
+          or the name of a custom database as attached using the
+          ``ATTACH DATABASE`` SQL statment.
+      :type name: str
+
+      :param sleep:
+          The number of seconds to sleep between successive attempts
+          to back up remaining pages.
+      :type sleep: float
 
       Example 1, copy an existing database into another::
 


From webhook-mailer at python.org  Tue Jul 26 05:12:50 2022
From: webhook-mailer at python.org (tiran)
Date: Tue, 26 Jul 2022 09:12:50 -0000
Subject: [Python-checkins] gh-95205: Improve WASM README.md (GH-95267)
Message-ID: <mailman.254.1658826771.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/e8f3e8f0ab8aa5d667229ce9694e6e1477e524fd
commit: e8f3e8f0ab8aa5d667229ce9694e6e1477e524fd
branch: main
author: Christian Heimes <christian at python.org>
committer: tiran <christian at python.org>
date: 2022-07-26T11:12:42+02:00
summary:

gh-95205: Improve WASM README.md (GH-95267)

Co-authored-by: Erlend Egeberg Aasland <erlend.aasland at protonmail.com>

files:
A Tools/wasm/wasi-env
M Tools/wasm/README.md

diff --git a/Tools/wasm/README.md b/Tools/wasm/README.md
index b9d773b226959..c1daddda463bb 100644
--- a/Tools/wasm/README.md
+++ b/Tools/wasm/README.md
@@ -69,12 +69,9 @@ popd
 ```
 
 Serve `python.html` with a local webserver and open the file in a browser.
-
-```shell
-emrun builddir/emscripten-browser/python.html
-```
-
-or
+Python comes with a minimal web server script that sets necessary HTTP
+headers like COOP, COEP, and mimetypes. Run the script outside the container
+and from the root of the CPython checkout.
 
 ```shell
 ./Tools/wasm/wasm_webserver.py
@@ -84,6 +81,7 @@ and open http://localhost:8000/builddir/emscripten-browser/python.html . This
 directory structure enables the *C/C++ DevTools Support (DWARF)* to load C
 and header files with debug builds.
 
+
 ### Cross compile to wasm32-emscripten for node
 
 ```shell
@@ -232,6 +230,28 @@ WASI builds require [WASI SDK](https://github.com/WebAssembly/wasi-sdk) 15.0+
 and currently [wasix](https://github.com/singlestore-labs/wasix) for POSIX
 compatibility stubs.
 
+## Cross-compile to wasm32-wasi
+
+The script ``wasi-env`` sets necessary compiler and linker flags as well as
+``pkg-config`` overrides. The script assumes that WASI-SDK is installed in
+``/opt/wasi-sdk`` or ``$WASI_SDK_PATH``.
+
+```shell
+mkdir -p builddir/wasi
+pushd builddir/wasi
+
+CONFIG_SITE=../../Tools/wasm/config.site-wasm32-wasi \
+  CFLAGS="-isystem /opt/wasix/include" \
+  LDFLAGS="-L/opt/wasix/lib -lwasix" \
+  ../../Tools/wasm/wasi-env ../../configure -C \
+    --host=wasm32-unknown-wasi \
+    --build=$(../../config.guess) \
+    --with-build-python=$(pwd)/../build/python
+
+make -j$(nproc)
+popd
+```
+
 ## WASI limitations and issues (WASI SDK 15.0)
 
 A lot of Emscripten limitations also apply to WASI. Noticable restrictions
@@ -376,6 +396,16 @@ git clone https://github.com/emscripten-core/emsdk.git /opt/emsdk
 /opt/emsdk/emsdk activate latest
 ```
 
+### Optionally: enable ccache for EMSDK
+
+The ``EM_COMPILER_WRAPPER`` must be set after the EMSDK environment is
+sourced. Otherwise the source script removes the environment variable.
+
+```
+. /opt/emsdk/emsdk_env.sh
+EM_COMPILER_WRAPPER=ccache
+```
+
 ### Optionally: pre-build and cache static libraries
 
 Emscripten SDK provides static builds of core libraries without PIC
@@ -384,12 +414,8 @@ PIC. To populate the build cache, run:
 
 ```shell
 . /opt/emsdk/emsdk_env.sh
-embuilder build --force zlib bzip2
-embuilder build --force --pic \
-    zlib bzip2 libc-mt libdlmalloc-mt libsockets-mt \
-    libstubs libcompiler_rt libcompiler_rt-mt crtbegin libhtml5 \
-    libc++-mt-noexcept libc++abi-mt-noexcept \
-    libal libGL-mt libstubs-debug libc-mt-debug
+embuilder build zlib bzip2 MINIMAL_PIC
+embuilder build --pic zlib bzip2 MINIMAL_PIC
 ```
 
 ### Install [WASI-SDK](https://github.com/WebAssembly/wasi-sdk)
@@ -424,3 +450,9 @@ ln -srf -t /usr/local/bin/ ~/.wasmtime/bin/wasmtime
 git clone https://github.com/singlestore-labs/wasix.git ~/wasix
 make install -C ~/wasix
 ```
+
+### WASI debugging
+
+* ``wasmtime run -g`` generates debugging symbols for gdb and lldb.
+* The environment variable ``RUST_LOG=wasi_common`` enables debug and
+  trace logging.
diff --git a/Tools/wasm/wasi-env b/Tools/wasm/wasi-env
new file mode 100755
index 0000000000000..600072b02fb8a
--- /dev/null
+++ b/Tools/wasm/wasi-env
@@ -0,0 +1,68 @@
+#!/bin/sh
+set -e
+
+# function
+usage() {
+    echo "wasi-env - Run command with WASI-SDK"
+    echo ""
+    echo "wasi-env is a helper to set various environment variables to"
+    echo "run configure and make with WASI-SDK. A WASI-SDK must be either"
+    echo "installed at /opt/wasi-sdk or the env var 'WASI_SDK_PATH' must"
+    echo "set to the root of a WASI-SDK."
+    echo ""
+    echo "Usage: wasi-env command [...]"
+    echo ""
+    echo "    -h --help     display this help and exit"
+    echo ""
+}
+
+case $1 in
+    -h|--help)
+        usage
+        exit
+        ;;
+esac
+
+if test -z "$1"; then
+    echo "ERROR: command required" >&2
+    usage
+    exit 1
+fi
+
+WASI_SDK_PATH="${WASI_SDK_PATH:-/opt/wasi-sdk}"
+
+if ! test -x "${WASI_SDK_PATH}/bin/clang"; then
+    echo "Error: ${WASI_SDK_PATH}/bin/clang does not exist." >&2
+    exit 2
+fi
+
+# --sysroot is required if WASI-SDK is not installed in /opt/wasi-sdk.
+WASI_SYSROOT="${WASI_SDK_PATH}/share/wasi-sysroot"
+CC="${WASI_SDK_PATH}/bin/clang --sysroot=${WASI_SYSROOT}"
+CPP="${WASI_SDK_PATH}/bin/clang-cpp --sysroot=${WASI_SYSROOT}"
+CXX="${WASI_SDK_PATH}/bin/clang++ --sysroot=${WASI_SYSROOT}"
+
+# use ccache if available
+if command -v ccache >/dev/null 2>&1; then
+    CC="ccache ${CC}"
+    CPP="ccache ${CPP}"
+    CXX="ccache ${CXX}"
+fi
+
+LDSHARED="${WASI_SDK_PATH}/bin/wasm-ld"
+AR="${WASI_SDK_PATH}/bin/llvm-ar"
+RANLIB="${WASI_SDK_PATH}/bin/ranlib"
+
+# instruct pkg-config to use sysroot
+PKG_CONFIG_PATH=""
+PKG_CONFIG_LIBDIR="${WASI_SYSROOT}/lib/pkgconfig:${WASI_SYSROOT}/share/pkgconfig"
+PKG_CONFIG_SYSROOT_DIR="${WASI_SYSROOT}"
+
+PATH="${WASI_SDK_PATH}/bin:$PATH"
+
+export WASI_SDK_PATH
+export CC CPP CXX LDSHARED AR RANLIB
+export PKG_CONFIG_PATH PKG_CONFIG_LIBDIR PKG_CONFIG_SYSROOT_DIR
+export PATH
+
+exec "$@"


From webhook-mailer at python.org  Tue Jul 26 05:16:56 2022
From: webhook-mailer at python.org (tiran)
Date: Tue, 26 Jul 2022 09:16:56 -0000
Subject: [Python-checkins] gh-95174: Handle missing dup() and constants in
 WASI (GH-95229)
Message-ID: <mailman.255.1658827017.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/0d35a59ce3242b7326890a8c8cc41b321192ec9a
commit: 0d35a59ce3242b7326890a8c8cc41b321192ec9a
branch: main
author: Christian Heimes <christian at python.org>
committer: tiran <christian at python.org>
date: 2022-07-26T11:16:51+02:00
summary:

gh-95174: Handle missing dup() and constants in WASI (GH-95229)

- check for ``dup()`` libc function
- handle missing ``F_DUPFD`` in ``dup2()`` replacement function
- add workaround for WASI libc bug in MSG_TRUNC
- ESHUTDOWN is missing, use EPIPE instead
- POLLPRI is missing, define as 0 (no-op)

files:
A Misc/NEWS.d/next/Build/2022-07-25-08-59-35.gh-issue-95174.g8woUW.rst
M Modules/clinic/posixmodule.c.h
M Modules/errnomodule.c
M Modules/posixmodule.c
M Modules/selectmodule.c
M Modules/socketmodule.c
M PC/pyconfig.h
M Python/dup2.c
M Python/fileutils.c
M configure
M configure.ac
M pyconfig.h.in

diff --git a/Misc/NEWS.d/next/Build/2022-07-25-08-59-35.gh-issue-95174.g8woUW.rst b/Misc/NEWS.d/next/Build/2022-07-25-08-59-35.gh-issue-95174.g8woUW.rst
new file mode 100644
index 0000000000000..05f29955072c5
--- /dev/null
+++ b/Misc/NEWS.d/next/Build/2022-07-25-08-59-35.gh-issue-95174.g8woUW.rst
@@ -0,0 +1,2 @@
+Python now detects missing ``dup`` function in WASI and works around some
+missing :mod:`errno`, :mod:`select`, and :mod:`socket` constants.
diff --git a/Modules/clinic/posixmodule.c.h b/Modules/clinic/posixmodule.c.h
index 1ce7d86204e6f..3847349e5f6c3 100644
--- a/Modules/clinic/posixmodule.c.h
+++ b/Modules/clinic/posixmodule.c.h
@@ -4685,6 +4685,8 @@ os_dup(PyObject *module, PyObject *arg)
     return return_value;
 }
 
+#if ((defined(HAVE_DUP3) || defined(F_DUPFD) || defined(MS_WINDOWS)))
+
 PyDoc_STRVAR(os_dup2__doc__,
 "dup2($module, /, fd, fd2, inheritable=True)\n"
 "--\n"
@@ -4740,6 +4742,8 @@ os_dup2(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObject *kwn
     return return_value;
 }
 
+#endif /* ((defined(HAVE_DUP3) || defined(F_DUPFD) || defined(MS_WINDOWS))) */
+
 #if defined(HAVE_LOCKF)
 
 PyDoc_STRVAR(os_lockf__doc__,
@@ -9105,6 +9109,10 @@ os_waitstatus_to_exitcode(PyObject *module, PyObject *const *args, Py_ssize_t na
     #define OS_TCSETPGRP_METHODDEF
 #endif /* !defined(OS_TCSETPGRP_METHODDEF) */
 
+#ifndef OS_DUP2_METHODDEF
+    #define OS_DUP2_METHODDEF
+#endif /* !defined(OS_DUP2_METHODDEF) */
+
 #ifndef OS_LOCKF_METHODDEF
     #define OS_LOCKF_METHODDEF
 #endif /* !defined(OS_LOCKF_METHODDEF) */
@@ -9352,4 +9360,4 @@ os_waitstatus_to_exitcode(PyObject *module, PyObject *const *args, Py_ssize_t na
 #ifndef OS_WAITSTATUS_TO_EXITCODE_METHODDEF
     #define OS_WAITSTATUS_TO_EXITCODE_METHODDEF
 #endif /* !defined(OS_WAITSTATUS_TO_EXITCODE_METHODDEF) */
-/*[clinic end generated code: output=bae15f09a1b3d2e7 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=9ff792e207a18392 input=a9049054013a1b77]*/
diff --git a/Modules/errnomodule.c b/Modules/errnomodule.c
index bf6766e02349c..0516e7367050c 100644
--- a/Modules/errnomodule.c
+++ b/Modules/errnomodule.c
@@ -280,6 +280,10 @@ errno_exec(PyObject *module)
 #ifdef ENOANO
     add_errcode("ENOANO", ENOANO, "No anode");
 #endif
+#if defined(__wasi__) && !defined(ESHUTDOWN)
+    // WASI SDK 16 does not have ESHUTDOWN, shutdown results in EPIPE.
+    #define ESHUTDOWN EPIPE
+#endif
 #ifdef ESHUTDOWN
     add_errcode("ESHUTDOWN", ESHUTDOWN, "Cannot send after transport endpoint shutdown");
 #else
diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
index 40229bce0f403..2e89e2fb1d66c 100644
--- a/Modules/posixmodule.c
+++ b/Modules/posixmodule.c
@@ -9316,7 +9316,9 @@ os_dup_impl(PyObject *module, int fd)
     return _Py_dup(fd);
 }
 
-
+// dup2() is either provided by libc or dup2.c with AC_REPLACE_FUNCS().
+// dup2.c provides working dup2() if and only if F_DUPFD is available.
+#if (defined(HAVE_DUP3) || defined(F_DUPFD) || defined(MS_WINDOWS))
 /*[clinic input]
 os.dup2 -> int
     fd: int
@@ -9416,6 +9418,7 @@ os_dup2_impl(PyObject *module, int fd, int fd2, int inheritable)
 
     return res;
 }
+#endif
 
 
 #ifdef HAVE_LOCKF
diff --git a/Modules/selectmodule.c b/Modules/selectmodule.c
index 5c36eaaedeb70..4eea928a2683a 100644
--- a/Modules/selectmodule.c
+++ b/Modules/selectmodule.c
@@ -63,6 +63,11 @@ extern void bzero(void *, int);
 #  define SOCKET int
 #endif
 
+// WASI SDK 16 does not have POLLPRIO, define as no-op
+#if defined(__wasi__) && !defined(POLLPRI)
+#  define POLLPRI 0
+#endif
+
 typedef struct {
     PyObject *close;
     PyTypeObject *poll_Type;
diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
index 9b4155e164f10..5641613452b3a 100644
--- a/Modules/socketmodule.c
+++ b/Modules/socketmodule.c
@@ -7786,6 +7786,10 @@ PyInit__socket(void)
     PyModule_AddIntMacro(m, MSG_EOR);
 #endif
 #ifdef  MSG_TRUNC
+    // workaround for https://github.com/WebAssembly/wasi-libc/issues/305
+    #if defined(__wasi__) && !defined(__WASI_RIFLAGS_RECV_DATA_TRUNCATED)
+    #  define __WASI_RIFLAGS_RECV_DATA_TRUNCATED 2
+    #endif
     PyModule_AddIntMacro(m, MSG_TRUNC);
 #endif
 #ifdef  MSG_CTRUNC
diff --git a/PC/pyconfig.h b/PC/pyconfig.h
index 87d55fa07e51e..1135a121fcfdd 100644
--- a/PC/pyconfig.h
+++ b/PC/pyconfig.h
@@ -678,6 +678,9 @@ Py_NO_ENABLE_SHARED to find out.  Also support MS_NO_COREDLL for b/w compat */
 /* Define if you have the 'inet_pton' function. */
 #define HAVE_INET_PTON 1
 
+/* Define to 1 if you have the `dup' function. */
+#define HAVE_DUP 1
+
 /* framework name */
 #define _PYTHONFRAMEWORK ""
 
diff --git a/Python/dup2.c b/Python/dup2.c
index 7c6bbfce11dbf..a1df049209916 100644
--- a/Python/dup2.c
+++ b/Python/dup2.c
@@ -11,6 +11,7 @@
  * Return fd2 if all went well; return BADEXIT otherwise.
  */
 
+#include <errno.h>
 #include <fcntl.h>
 #include <unistd.h>
 
@@ -20,12 +21,17 @@ int
 dup2(int fd1, int fd2)
 {
     if (fd1 != fd2) {
+#ifdef F_DUPFD
         if (fcntl(fd1, F_GETFL) < 0)
             return BADEXIT;
         if (fcntl(fd2, F_GETFL) >= 0)
             close(fd2);
         if (fcntl(fd1, F_DUPFD, fd2) < 0)
             return BADEXIT;
+#else
+        errno = ENOTSUP;
+        return BADEXIT;
+#endif
     }
     return fd2;
 }
diff --git a/Python/fileutils.c b/Python/fileutils.c
index 7e5d01f6e63d3..fb1e5ef9a0302 100644
--- a/Python/fileutils.c
+++ b/Python/fileutils.c
@@ -2366,7 +2366,7 @@ _Py_dup(int fd)
         return -1;
     }
 
-#else
+#elif HAVE_DUP
     Py_BEGIN_ALLOW_THREADS
     _Py_BEGIN_SUPPRESS_IPH
     fd = dup(fd);
@@ -2383,6 +2383,10 @@ _Py_dup(int fd)
         _Py_END_SUPPRESS_IPH
         return -1;
     }
+#else
+    errno = ENOTSUP;
+    PyErr_SetFromErrno(PyExc_OSError);
+    return -1;
 #endif
     return fd;
 }
diff --git a/configure b/configure
index d607c5e5d37a0..be045f2da3ceb 100755
--- a/configure
+++ b/configure
@@ -15545,7 +15545,7 @@ fi
 # checks for library functions
 for ac_func in  \
   accept4 alarm bind_textdomain_codeset chmod chown clock close_range confstr \
-  copy_file_range ctermid dup3 execv explicit_bzero explicit_memset \
+  copy_file_range ctermid dup dup3 execv explicit_bzero explicit_memset \
   faccessat fchmod fchmodat fchown fchownat fdopendir fdwalk fexecve \
   fork fork1 fpathconf fstatat ftime ftruncate futimens futimes futimesat \
   gai_strerror getegid getentropy geteuid getgid getgrgid getgrgid_r \
diff --git a/configure.ac b/configure.ac
index c5924169e03a0..a952324f4922c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4653,7 +4653,7 @@ fi
 # checks for library functions
 AC_CHECK_FUNCS([ \
   accept4 alarm bind_textdomain_codeset chmod chown clock close_range confstr \
-  copy_file_range ctermid dup3 execv explicit_bzero explicit_memset \
+  copy_file_range ctermid dup dup3 execv explicit_bzero explicit_memset \
   faccessat fchmod fchmodat fchown fchownat fdopendir fdwalk fexecve \
   fork fork1 fpathconf fstatat ftime ftruncate futimens futimes futimesat \
   gai_strerror getegid getentropy geteuid getgid getgrgid getgrgid_r \
diff --git a/pyconfig.h.in b/pyconfig.h.in
index aa9fc559fa251..37f748393e739 100644
--- a/pyconfig.h.in
+++ b/pyconfig.h.in
@@ -278,6 +278,9 @@
 /* Define to 1 if you have the `dlopen' function. */
 #undef HAVE_DLOPEN
 
+/* Define to 1 if you have the `dup' function. */
+#undef HAVE_DUP
+
 /* Define to 1 if you have the `dup2' function. */
 #undef HAVE_DUP2
 


From webhook-mailer at python.org  Tue Jul 26 05:43:17 2022
From: webhook-mailer at python.org (ambv)
Date: Tue, 26 Jul 2022 09:43:17 -0000
Subject: [Python-checkins] gh-95066: ast: Replace assert with ValueError
 (GH-95072)
Message-ID: <mailman.256.1658828598.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/a5dde0fe4fa13b4ccfec4e27502b19bbbb7e5bb0
commit: a5dde0fe4fa13b4ccfec4e27502b19bbbb7e5bb0
branch: main
author: Shantanu <12621235+hauntsaninja at users.noreply.github.com>
committer: ambv <lukasz at langa.pl>
date: 2022-07-26T11:43:09+02:00
summary:

gh-95066: ast: Replace assert with ValueError (GH-95072)

Co-authored-by: blurb-it[bot] <43283697+blurb-it[bot]@users.noreply.github.com>

files:
A Misc/NEWS.d/next/Library/2022-07-20-22-49-48.gh-issue-95066.TuCu0E.rst
M Lib/ast.py
M Lib/test/test_ast.py

diff --git a/Lib/ast.py b/Lib/ast.py
index 4e2ae859245f9..ebf4529f79b06 100644
--- a/Lib/ast.py
+++ b/Lib/ast.py
@@ -42,7 +42,8 @@ def parse(source, filename='<unknown>', mode='exec', *,
         flags |= PyCF_TYPE_COMMENTS
     if isinstance(feature_version, tuple):
         major, minor = feature_version  # Should be a 2-tuple.
-        assert major == 3
+        if major != 3:
+            raise ValueError(f"Unsupported major version: {major}")
         feature_version = minor
     elif feature_version is None:
         feature_version = -1
diff --git a/Lib/test/test_ast.py b/Lib/test/test_ast.py
index 9734218c21be3..de34ccff2ef05 100644
--- a/Lib/test/test_ast.py
+++ b/Lib/test/test_ast.py
@@ -756,6 +756,12 @@ def test_assignment_expression_feature_version(self):
         with self.assertRaises(SyntaxError):
             ast.parse('(x := 0)', feature_version=(3, 7))
 
+    def test_invalid_major_feature_version(self):
+        with self.assertRaises(ValueError):
+            ast.parse('pass', feature_version=(2, 7))
+        with self.assertRaises(ValueError):
+            ast.parse('pass', feature_version=(4, 0))
+
     def test_constant_as_name(self):
         for constant in "True", "False", "None":
             expr = ast.Expression(ast.Name(constant, ast.Load()))
diff --git a/Misc/NEWS.d/next/Library/2022-07-20-22-49-48.gh-issue-95066.TuCu0E.rst b/Misc/NEWS.d/next/Library/2022-07-20-22-49-48.gh-issue-95066.TuCu0E.rst
new file mode 100644
index 0000000000000..05ae4a6a2761a
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2022-07-20-22-49-48.gh-issue-95066.TuCu0E.rst
@@ -0,0 +1 @@
+Replaced assert with exception in :func:`ast.parse`, when ``feature_version`` has an invalid major version. Patch by Shantanu Jain.


From webhook-mailer at python.org  Tue Jul 26 06:07:53 2022
From: webhook-mailer at python.org (ambv)
Date: Tue, 26 Jul 2022 10:07:53 -0000
Subject: [Python-checkins] gh-94821: Fix autobind of empty unix domain
 address (GH-94826) (GH-94875)
Message-ID: <mailman.257.1658830073.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/cd0a59f1fa32fc1e4730c52c761f4d0190833587
commit: cd0a59f1fa32fc1e4730c52c761f4d0190833587
branch: 3.9
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: ambv <lukasz at langa.pl>
date: 2022-07-26T12:07:41+02:00
summary:

gh-94821: Fix autobind of empty unix domain address (GH-94826) (GH-94875)

When binding a unix socket to an empty address on Linux, the socket is
automatically bound to an available address in the abstract namespace.

    >>> s = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
    >>> s.bind("")
    >>> s.getsockname()
    b'\x0075499'

Since python 3.9, the socket is bound to the one address:

    >>> s.getsockname()
    b'\x00'

And trying to bind multiple sockets will fail with:

    Traceback (most recent call last):
      File "/home/nsoffer/src/cpython/Lib/test/test_socket.py", line 5553, in testAutobind
        s2.bind("")
    OSError: [Errno 98] Address already in use

Added 2 tests:
- Auto binding empty address on Linux
- Failing to bind an empty address on other platforms

Fixes f6b3a07b7df6 (bpo-44493: Add missing terminated NUL in sockaddr_un's length (GH-26866)
(cherry picked from commit c22f134211743cd5ad14cec1dd4f527bee542b4c)

Co-authored-by: Nir Soffer <nsoffer at redhat.com>

files:
A Misc/NEWS.d/next/Library/2022-07-14-00-43-52.gh-issue-94821.e17ghU.rst
M Lib/test/test_socket.py
M Modules/socketmodule.c

diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py
index 5712b46f7f111..127d61cb6a89e 100755
--- a/Lib/test/test_socket.py
+++ b/Lib/test/test_socket.py
@@ -5417,6 +5417,20 @@ def testBytearrayName(self):
             s.bind(bytearray(b"\x00python\x00test\x00"))
             self.assertEqual(s.getsockname(), b"\x00python\x00test\x00")
 
+    def testAutobind(self):
+        # Check that binding to an empty string binds to an available address
+        # in the abstract namespace as specified in unix(7) "Autobind feature".
+        abstract_address = b"^\0[0-9a-f]{5}"
+        with socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) as s1:
+            s1.bind("")
+            self.assertRegex(s1.getsockname(), abstract_address)
+            # Each socket is bound to a different abstract address.
+            with socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) as s2:
+                s2.bind("")
+                self.assertRegex(s2.getsockname(), abstract_address)
+                self.assertNotEqual(s1.getsockname(), s2.getsockname())
+
+
 @unittest.skipUnless(hasattr(socket, 'AF_UNIX'), 'test needs socket.AF_UNIX')
 class TestUnixDomain(unittest.TestCase):
 
@@ -5486,6 +5500,11 @@ def testUnencodableAddr(self):
         self.addCleanup(support.unlink, path)
         self.assertEqual(self.sock.getsockname(), path)
 
+    @unittest.skipIf(sys.platform == 'linux', 'Linux specific test')
+    def testEmptyAddress(self):
+        # Test that binding empty address fails.
+        self.assertRaises(OSError, self.sock.bind, "")
+
 
 class BufferIOTest(SocketConnectedTest):
     """
diff --git a/Misc/NEWS.d/next/Library/2022-07-14-00-43-52.gh-issue-94821.e17ghU.rst b/Misc/NEWS.d/next/Library/2022-07-14-00-43-52.gh-issue-94821.e17ghU.rst
new file mode 100644
index 0000000000000..bf7885aef8cbf
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2022-07-14-00-43-52.gh-issue-94821.e17ghU.rst
@@ -0,0 +1,2 @@
+Fix binding of unix socket to empty address on Linux to use an available
+address from the abstract namespace, instead of "\0".
diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
index 6d6c92e4c95d1..133470f9b8193 100644
--- a/Modules/socketmodule.c
+++ b/Modules/socketmodule.c
@@ -1715,8 +1715,10 @@ getsockaddrarg(PySocketSockObject *s, PyObject *args,
 
         struct sockaddr_un* addr = &addrbuf->un;
 #ifdef __linux__
-        if (path.len > 0 && *(const char *)path.buf == 0) {
-            /* Linux abstract namespace extension */
+        if (path.len == 0 || *(const char *)path.buf == 0) {
+            /* Linux abstract namespace extension:
+               - Empty address auto-binding to an abstract address
+               - Address that starts with null byte */
             if ((size_t)path.len > sizeof addr->sun_path) {
                 PyErr_SetString(PyExc_OSError,
                                 "AF_UNIX path too long");


From webhook-mailer at python.org  Tue Jul 26 06:13:15 2022
From: webhook-mailer at python.org (pablogsal)
Date: Tue, 26 Jul 2022 10:13:15 -0000
Subject: [Python-checkins] Python 3.11.0b5
Message-ID: <mailman.258.1658830396.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/0771d71eea30316020a86b0eec071feb6d82d350
commit: 0771d71eea30316020a86b0eec071feb6d82d350
branch: 3.11
author: Pablo Galindo <pablogsal at gmail.com>
committer: pablogsal <Pablogsal at gmail.com>
date: 2022-07-25T23:21:18+01:00
summary:

Python 3.11.0b5

files:
A Misc/NEWS.d/3.11.0b5.rst
D Misc/NEWS.d/next/Build/2022-07-12-13-39-18.gh-issue-94773.koHKm5.rst
D Misc/NEWS.d/next/Build/2022-07-13-10-13-10.gh-issue-94801.3xUB24.rst
D Misc/NEWS.d/next/Build/2022-07-14-02-45-44.gh-issue-94841.lLRTdf.rst
D Misc/NEWS.d/next/Build/2022-07-14-11-13-26.gh-issue-94847.s3Kr5p.rst
D Misc/NEWS.d/next/C API/2022-07-12-17-39-32.gh-issue-94731.9CPJNU.rst
D Misc/NEWS.d/next/C API/2022-07-16-14-57-23.gh-issue-94864.Pb41ab.rst
D Misc/NEWS.d/next/C API/2022-07-17-18-21-40.gh-issue-94930.gPFGDL.rst
D Misc/NEWS.d/next/C API/2022-07-25-15-54-27.gh-issue-92678.ziZpxz.rst
D Misc/NEWS.d/next/Core and Builtins/2022-07-14-10-07-53.gh-issue-90699.x3aG9m.rst
D Misc/NEWS.d/next/Core and Builtins/2022-07-15-16-15-04.gh-issue-91153.HiBmtt.rst
D Misc/NEWS.d/next/Core and Builtins/2022-07-15-22-16-08.gh-issue-94822.zRRzBN.rst
D Misc/NEWS.d/next/Core and Builtins/2022-07-16-08-14-17.gh-issue-94869.eRwMsX.rst
D Misc/NEWS.d/next/Core and Builtins/2022-07-17-15-54-29.gh-issue-91256.z7i7Q5.rst
D Misc/NEWS.d/next/Core and Builtins/2022-07-18-04-48-34.gh-issue-94947.df9gUw.rst
D Misc/NEWS.d/next/Core and Builtins/2022-07-18-05-10-29.gh-issue-94949.OsZ7_s.rst
D Misc/NEWS.d/next/Core and Builtins/2022-07-18-14-19-21.gh-issue-94739.NQJQi7.rst
D Misc/NEWS.d/next/Core and Builtins/2022-07-19-16-30-59.gh-issue-94036._6Utkm.rst
D Misc/NEWS.d/next/Core and Builtins/2022-07-20-13-46-01.gh-issue-91409.dhL8Zo.rst
D Misc/NEWS.d/next/Core and Builtins/2022-07-21-17-54-52.gh-issue-95113.NnSLpT.rst
D Misc/NEWS.d/next/Core and Builtins/2022-07-21-19-19-20.gh-issue-95060.4xdT1f.rst
D Misc/NEWS.d/next/Core and Builtins/2022-07-22-12-53-34.gh-issue-94438.hNqACc.rst
D Misc/NEWS.d/next/Core and Builtins/2022-07-23-19-16-25.gh-issue-93351.0Jyvu-.rst
D Misc/NEWS.d/next/Library/2022-03-16-14-24-14.bpo-47025.qtT3CE.rst
D Misc/NEWS.d/next/Library/2022-06-26-10-59-15.gh-issue-89988.K8rnmt.rst
D Misc/NEWS.d/next/Library/2022-07-14-00-43-52.gh-issue-94821.e17ghU.rst
D Misc/NEWS.d/next/Library/2022-07-15-08-13-51.gh-issue-94857.9_KvZJ.rst
D Misc/NEWS.d/next/Library/2022-07-21-19-55-49.gh-issue-95105.BIX2Km.rst
D Misc/NEWS.d/next/Library/2022-07-22-17-19-57.gh-issue-93157.RXByAk.rst
D Misc/NEWS.d/next/Library/2022-07-22-21-18-17.gh-issue-95132.n9anlw.rst
D Misc/NEWS.d/next/Library/2022-07-24-09-15-35.gh-issue-95194.ERVmqG.rst
D Misc/NEWS.d/next/Library/2022-07-24-12-00-06.gh-issue-95199.-5A64k.rst
D Misc/NEWS.d/next/Library/2022-07-24-12-59-02.gh-issue-95087.VvqXkN.rst
D Misc/NEWS.d/next/Tests/2022-07-24-20-19-05.gh-issue-95212.fHiU4e.rst
D Misc/NEWS.d/next/Windows/2022-07-12-20-45-43.gh-issue-94772.uNMmdG.rst
D Misc/NEWS.d/next/Windows/2022-07-16-16-18-32.gh-issue-90844.vwITT3.rst
M Include/patchlevel.h
M Lib/pydoc_data/topics.py
M README.rst

diff --git a/Include/patchlevel.h b/Include/patchlevel.h
index 42b907386ce22..d6cc2a0d07f56 100644
--- a/Include/patchlevel.h
+++ b/Include/patchlevel.h
@@ -20,10 +20,10 @@
 #define PY_MINOR_VERSION        11
 #define PY_MICRO_VERSION        0
 #define PY_RELEASE_LEVEL        PY_RELEASE_LEVEL_BETA
-#define PY_RELEASE_SERIAL       4
+#define PY_RELEASE_SERIAL       5
 
 /* Version as a string */
-#define PY_VERSION              "3.11.0b4+"
+#define PY_VERSION              "3.11.0b5"
 /*--end constants--*/
 
 /* Version as a single 4-byte hex number, e.g. 0x010502B2 == 1.5.2b2.
diff --git a/Lib/pydoc_data/topics.py b/Lib/pydoc_data/topics.py
index 99760e6cab21c..535432725b2b6 100644
--- a/Lib/pydoc_data/topics.py
+++ b/Lib/pydoc_data/topics.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Autogenerated by Sphinx on Mon Jul 11 16:25:08 2022
+# Autogenerated by Sphinx on Mon Jul 25 23:19:30 2022
 topics = {'assert': 'The "assert" statement\n'
            '**********************\n'
            '\n'
diff --git a/Misc/NEWS.d/3.11.0b5.rst b/Misc/NEWS.d/3.11.0b5.rst
new file mode 100644
index 0000000000000..36e9290246bd0
--- /dev/null
+++ b/Misc/NEWS.d/3.11.0b5.rst
@@ -0,0 +1,349 @@
+.. date: 2022-07-23-19-16-25
+.. gh-issue: 93351
+.. nonce: 0Jyvu-
+.. release date: 2022-07-25
+.. section: Core and Builtins
+
+:class:`ast.AST` node positions are now validated when provided to
+:func:`compile` and other related functions. If invalid positions are
+detected, a :exc:`ValueError` will be raised.
+
+..
+
+.. date: 2022-07-22-12-53-34
+.. gh-issue: 94438
+.. nonce: hNqACc
+.. section: Core and Builtins
+
+Fix an issue that caused extended opcode arguments and some conditional pops
+to be ignored when calculating valid jump targets for assignments to the
+``f_lineno`` attribute of frame objects. In some cases, this could cause
+inconsistent internal state, resulting in a hard crash of the interpreter.
+
+..
+
+.. date: 2022-07-21-19-19-20
+.. gh-issue: 95060
+.. nonce: 4xdT1f
+.. section: Core and Builtins
+
+Undocumented ``PyCode_Addr2Location`` function now properly returns when
+``addrq`` argument is less than zero.
+
+..
+
+.. date: 2022-07-21-17-54-52
+.. gh-issue: 95113
+.. nonce: NnSLpT
+.. section: Core and Builtins
+
+Replace all ``EXTENDED_ARG_QUICK`` instructions with basic
+:opcode:`EXTENDED_ARG` instructions in unquickened code. Consumers of
+non-adaptive bytecode should be able to handle extended arguments the same
+way they were handled in CPython 3.10 and older.
+
+..
+
+.. date: 2022-07-20-13-46-01
+.. gh-issue: 91409
+.. nonce: dhL8Zo
+.. section: Core and Builtins
+
+Fix incorrect source location info caused by certain optimizations in the
+bytecode compiler.
+
+..
+
+.. date: 2022-07-19-16-30-59
+.. gh-issue: 94036
+.. nonce: _6Utkm
+.. section: Core and Builtins
+
+Fix incorrect source location info for some multi-line attribute accesses
+and method calls.
+
+..
+
+.. date: 2022-07-18-14-19-21
+.. gh-issue: 94739
+.. nonce: NQJQi7
+.. section: Core and Builtins
+
+Allow jumping within, out of, and across exception handlers in the debugger.
+
+..
+
+.. date: 2022-07-18-05-10-29
+.. gh-issue: 94949
+.. nonce: OsZ7_s
+.. section: Core and Builtins
+
+:func:`ast.parse` will no longer parse parenthesized context managers when
+passed ``feature_version`` less than ``(3, 9)``. Patch by Shantanu Jain.
+
+..
+
+.. date: 2022-07-18-04-48-34
+.. gh-issue: 94947
+.. nonce: df9gUw
+.. section: Core and Builtins
+
+:func:`ast.parse` will no longer parse assignment expressions when passed
+``feature_version`` less than ``(3, 8)``. Patch by Shantanu Jain.
+
+..
+
+.. date: 2022-07-17-15-54-29
+.. gh-issue: 91256
+.. nonce: z7i7Q5
+.. section: Core and Builtins
+
+Ensures the program name is known for help text during interpreter startup.
+
+..
+
+.. date: 2022-07-16-08-14-17
+.. gh-issue: 94869
+.. nonce: eRwMsX
+.. section: Core and Builtins
+
+Fix the column offsets for some expressions in multi-line f-strings
+:mod:`ast` nodes. Patch by Pablo Galindo.
+
+..
+
+.. date: 2022-07-15-22-16-08
+.. gh-issue: 94822
+.. nonce: zRRzBN
+.. section: Core and Builtins
+
+Fix an issue where lookups of metaclass descriptors may be ignored when an
+identically-named attribute also exists on the class itself.
+
+..
+
+.. date: 2022-07-15-16-15-04
+.. gh-issue: 91153
+.. nonce: HiBmtt
+.. section: Core and Builtins
+
+Fix an issue where a :class:`bytearray` item assignment could crash if it's
+resized by the new value's :meth:`__index__` method.
+
+..
+
+.. date: 2022-07-14-10-07-53
+.. gh-issue: 90699
+.. nonce: x3aG9m
+.. section: Core and Builtins
+
+Fix reference counting bug in :meth:`bool.__repr__`. Patch by Kumar Aditya.
+
+..
+
+.. date: 2022-07-24-12-59-02
+.. gh-issue: 95087
+.. nonce: VvqXkN
+.. section: Library
+
+Fix IndexError in parsing invalid date in the :mod:`email` module.
+
+..
+
+.. date: 2022-07-24-12-00-06
+.. gh-issue: 95199
+.. nonce: -5A64k
+.. section: Library
+
+Upgrade bundled setuptools to 63.2.0.
+
+..
+
+.. date: 2022-07-24-09-15-35
+.. gh-issue: 95194
+.. nonce: ERVmqG
+.. section: Library
+
+Upgrade bundled pip to 22.2.
+
+..
+
+.. date: 2022-07-22-21-18-17
+.. gh-issue: 95132
+.. nonce: n9anlw
+.. section: Library
+
+Fix a :mod:`sqlite3` regression where ``*args`` and ``**kwds`` were
+incorrectly relayed from :py:func:`~sqlite3.connect` to the
+:class:`~sqlite3.Connection` factory. The regression was introduced in
+3.11a1 with PR 24421 (:gh:`85128`). Patch by Erlend E. Aasland.`
+
+..
+
+.. date: 2022-07-22-17-19-57
+.. gh-issue: 93157
+.. nonce: RXByAk
+.. section: Library
+
+Fix :mod:`fileinput` module didn't support ``errors`` option when
+``inplace`` is true.
+
+..
+
+.. date: 2022-07-21-19-55-49
+.. gh-issue: 95105
+.. nonce: BIX2Km
+.. section: Library
+
+:meth:`wsgiref.types.InputStream.__iter__` should return
+``Iterator[bytes]``, not ``Iterable[bytes]``. Patch by Shantanu Jain.
+
+..
+
+.. date: 2022-07-15-08-13-51
+.. gh-issue: 94857
+.. nonce: 9_KvZJ
+.. section: Library
+
+Fix refleak in ``_io.TextIOWrapper.reconfigure``. Patch by Kumar Aditya.
+
+..
+
+.. date: 2022-07-14-00-43-52
+.. gh-issue: 94821
+.. nonce: e17ghU
+.. section: Library
+
+Fix binding of unix socket to empty address on Linux to use an available
+address from the abstract namespace, instead of "\0".
+
+..
+
+.. date: 2022-06-26-10-59-15
+.. gh-issue: 89988
+.. nonce: K8rnmt
+.. section: Library
+
+Fix memory leak in :class:`pickle.Pickler` when looking up
+:attr:`dispatch_table`. Patch by Kumar Aditya.
+
+..
+
+.. bpo: 47025
+.. date: 2022-03-16-14-24-14
+.. nonce: qtT3CE
+.. section: Library
+
+Drop support for :class:`bytes` on :attr:`sys.path`.
+
+..
+
+.. date: 2022-07-24-20-19-05
+.. gh-issue: 95212
+.. nonce: fHiU4e
+.. section: Tests
+
+Make multiprocessing test case ``test_shared_memory_recreate``
+parallel-safe.
+
+..
+
+.. date: 2022-07-14-11-13-26
+.. gh-issue: 94847
+.. nonce: s3Kr5p
+.. section: Build
+
+Fixed ``_decimal`` module build issue on GCC when compiling with LTO and
+pydebug. Debug builds no longer force inlining of functions.
+
+..
+
+.. date: 2022-07-14-02-45-44
+.. gh-issue: 94841
+.. nonce: lLRTdf
+.. section: Build
+
+Fix the possible performance regression of :c:func:`PyObject_Free` compiled
+with MSVC version 1932.
+
+..
+
+.. date: 2022-07-13-10-13-10
+.. gh-issue: 94801
+.. nonce: 3xUB24
+.. section: Build
+
+``configure`` now uses custom flags like ``ZLIB_CFLAGS`` and ``ZLIB_LIBS``
+when searching for headers and libraries.
+
+..
+
+.. date: 2022-07-12-13-39-18
+.. gh-issue: 94773
+.. nonce: koHKm5
+.. section: Build
+
+``deepfreeze.py`` now supports code object with frozensets that contain
+incompatible, unsortable types.
+
+..
+
+.. date: 2022-07-16-16-18-32
+.. gh-issue: 90844
+.. nonce: vwITT3
+.. section: Windows
+
+Allow virtual environments to correctly launch when they have spaces in the
+path.
+
+..
+
+.. date: 2022-07-12-20-45-43
+.. gh-issue: 94772
+.. nonce: uNMmdG
+.. section: Windows
+
+Fix incorrect handling of shebang lines in py.exe launcher
+
+..
+
+.. date: 2022-07-25-15-54-27
+.. gh-issue: 92678
+.. nonce: ziZpxz
+.. section: C API
+
+Adds unstable C-API functions ``_PyObject_VisitManagedDict`` and
+``_PyObject_ClearManagedDict`` to allow C extensions to allow the VM to
+manage their object's dictionaries.
+
+..
+
+.. date: 2022-07-17-18-21-40
+.. gh-issue: 94930
+.. nonce: gPFGDL
+.. section: C API
+
+Fix ``SystemError`` raised when :c:func:`PyArg_ParseTupleAndKeywords` is
+used with ``#`` in ``(...)`` but without ``PY_SSIZE_T_CLEAN`` defined.
+
+..
+
+.. date: 2022-07-16-14-57-23
+.. gh-issue: 94864
+.. nonce: Pb41ab
+.. section: C API
+
+Fix ``PyArg_Parse*`` with deprecated format units "u" and "Z". It returned 1
+(success) when warnings are turned into exceptions.
+
+..
+
+.. date: 2022-07-12-17-39-32
+.. gh-issue: 94731
+.. nonce: 9CPJNU
+.. section: C API
+
+Python again uses C-style casts for most casting operations when compiled
+with C++. This may trigger compiler warnings, if they are enabled with e.g.
+``-Wold-style-cast `` or ``-Wzero-as-null-pointer-constant`` options for
+``g++``.
diff --git a/Misc/NEWS.d/next/Build/2022-07-12-13-39-18.gh-issue-94773.koHKm5.rst b/Misc/NEWS.d/next/Build/2022-07-12-13-39-18.gh-issue-94773.koHKm5.rst
deleted file mode 100644
index ed7e40c91103d..0000000000000
--- a/Misc/NEWS.d/next/Build/2022-07-12-13-39-18.gh-issue-94773.koHKm5.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-``deepfreeze.py`` now supports code object with frozensets that contain
-incompatible, unsortable types.
diff --git a/Misc/NEWS.d/next/Build/2022-07-13-10-13-10.gh-issue-94801.3xUB24.rst b/Misc/NEWS.d/next/Build/2022-07-13-10-13-10.gh-issue-94801.3xUB24.rst
deleted file mode 100644
index 5caf84f96da13..0000000000000
--- a/Misc/NEWS.d/next/Build/2022-07-13-10-13-10.gh-issue-94801.3xUB24.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-``configure`` now uses custom flags like ``ZLIB_CFLAGS`` and ``ZLIB_LIBS``
-when searching for headers and libraries.
diff --git a/Misc/NEWS.d/next/Build/2022-07-14-02-45-44.gh-issue-94841.lLRTdf.rst b/Misc/NEWS.d/next/Build/2022-07-14-02-45-44.gh-issue-94841.lLRTdf.rst
deleted file mode 100644
index f7ad4f88a51db..0000000000000
--- a/Misc/NEWS.d/next/Build/2022-07-14-02-45-44.gh-issue-94841.lLRTdf.rst
+++ /dev/null
@@ -1 +0,0 @@
-Fix the possible performance regression of :c:func:`PyObject_Free` compiled with MSVC version 1932.
diff --git a/Misc/NEWS.d/next/Build/2022-07-14-11-13-26.gh-issue-94847.s3Kr5p.rst b/Misc/NEWS.d/next/Build/2022-07-14-11-13-26.gh-issue-94847.s3Kr5p.rst
deleted file mode 100644
index a6d1e7277da4c..0000000000000
--- a/Misc/NEWS.d/next/Build/2022-07-14-11-13-26.gh-issue-94847.s3Kr5p.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Fixed ``_decimal`` module build issue on GCC when compiling with LTO and
-pydebug. Debug builds no longer force inlining of functions.
diff --git a/Misc/NEWS.d/next/C API/2022-07-12-17-39-32.gh-issue-94731.9CPJNU.rst b/Misc/NEWS.d/next/C API/2022-07-12-17-39-32.gh-issue-94731.9CPJNU.rst
deleted file mode 100644
index b7816d28215e7..0000000000000
--- a/Misc/NEWS.d/next/C API/2022-07-12-17-39-32.gh-issue-94731.9CPJNU.rst	
+++ /dev/null
@@ -1,3 +0,0 @@
-Python again uses C-style casts for most casting operations when compiled
-with C++. This may trigger compiler warnings, if they are enabled with e.g.
-``-Wold-style-cast `` or ``-Wzero-as-null-pointer-constant`` options for ``g++``.
diff --git a/Misc/NEWS.d/next/C API/2022-07-16-14-57-23.gh-issue-94864.Pb41ab.rst b/Misc/NEWS.d/next/C API/2022-07-16-14-57-23.gh-issue-94864.Pb41ab.rst
deleted file mode 100644
index ed2a954778020..0000000000000
--- a/Misc/NEWS.d/next/C API/2022-07-16-14-57-23.gh-issue-94864.Pb41ab.rst	
+++ /dev/null
@@ -1,2 +0,0 @@
-Fix ``PyArg_Parse*`` with deprecated format units "u" and "Z". It returned 1
-(success) when warnings are turned into exceptions.
diff --git a/Misc/NEWS.d/next/C API/2022-07-17-18-21-40.gh-issue-94930.gPFGDL.rst b/Misc/NEWS.d/next/C API/2022-07-17-18-21-40.gh-issue-94930.gPFGDL.rst
deleted file mode 100644
index 5b79d757b1e4a..0000000000000
--- a/Misc/NEWS.d/next/C API/2022-07-17-18-21-40.gh-issue-94930.gPFGDL.rst	
+++ /dev/null
@@ -1,2 +0,0 @@
-Fix ``SystemError`` raised when :c:func:`PyArg_ParseTupleAndKeywords` is
-used with ``#`` in ``(...)`` but without ``PY_SSIZE_T_CLEAN`` defined.
diff --git a/Misc/NEWS.d/next/C API/2022-07-25-15-54-27.gh-issue-92678.ziZpxz.rst b/Misc/NEWS.d/next/C API/2022-07-25-15-54-27.gh-issue-92678.ziZpxz.rst
deleted file mode 100644
index 52473c9dfab94..0000000000000
--- a/Misc/NEWS.d/next/C API/2022-07-25-15-54-27.gh-issue-92678.ziZpxz.rst	
+++ /dev/null
@@ -1,3 +0,0 @@
-Adds unstable C-API functions ``_PyObject_VisitManagedDict`` and
-``_PyObject_ClearManagedDict`` to allow C extensions to allow the VM to
-manage their object's dictionaries.
diff --git a/Misc/NEWS.d/next/Core and Builtins/2022-07-14-10-07-53.gh-issue-90699.x3aG9m.rst b/Misc/NEWS.d/next/Core and Builtins/2022-07-14-10-07-53.gh-issue-90699.x3aG9m.rst
deleted file mode 100644
index 795f4df987eb9..0000000000000
--- a/Misc/NEWS.d/next/Core and Builtins/2022-07-14-10-07-53.gh-issue-90699.x3aG9m.rst	
+++ /dev/null
@@ -1 +0,0 @@
-Fix reference counting bug in :meth:`bool.__repr__`. Patch by Kumar Aditya.
diff --git a/Misc/NEWS.d/next/Core and Builtins/2022-07-15-16-15-04.gh-issue-91153.HiBmtt.rst b/Misc/NEWS.d/next/Core and Builtins/2022-07-15-16-15-04.gh-issue-91153.HiBmtt.rst
deleted file mode 100644
index 2caa0170f75bc..0000000000000
--- a/Misc/NEWS.d/next/Core and Builtins/2022-07-15-16-15-04.gh-issue-91153.HiBmtt.rst	
+++ /dev/null
@@ -1,2 +0,0 @@
-Fix an issue where a :class:`bytearray` item assignment could crash if it's
-resized by the new value's :meth:`__index__` method.
diff --git a/Misc/NEWS.d/next/Core and Builtins/2022-07-15-22-16-08.gh-issue-94822.zRRzBN.rst b/Misc/NEWS.d/next/Core and Builtins/2022-07-15-22-16-08.gh-issue-94822.zRRzBN.rst
deleted file mode 100644
index 5b24918e49770..0000000000000
--- a/Misc/NEWS.d/next/Core and Builtins/2022-07-15-22-16-08.gh-issue-94822.zRRzBN.rst	
+++ /dev/null
@@ -1,2 +0,0 @@
-Fix an issue where lookups of metaclass descriptors may be ignored when an
-identically-named attribute also exists on the class itself.
diff --git a/Misc/NEWS.d/next/Core and Builtins/2022-07-16-08-14-17.gh-issue-94869.eRwMsX.rst b/Misc/NEWS.d/next/Core and Builtins/2022-07-16-08-14-17.gh-issue-94869.eRwMsX.rst
deleted file mode 100644
index 2ccf91b0cd99a..0000000000000
--- a/Misc/NEWS.d/next/Core and Builtins/2022-07-16-08-14-17.gh-issue-94869.eRwMsX.rst	
+++ /dev/null
@@ -1,2 +0,0 @@
-Fix the column offsets for some expressions in multi-line f-strings
-:mod:`ast` nodes. Patch by Pablo Galindo.
diff --git a/Misc/NEWS.d/next/Core and Builtins/2022-07-17-15-54-29.gh-issue-91256.z7i7Q5.rst b/Misc/NEWS.d/next/Core and Builtins/2022-07-17-15-54-29.gh-issue-91256.z7i7Q5.rst
deleted file mode 100644
index 802a614fd48d7..0000000000000
--- a/Misc/NEWS.d/next/Core and Builtins/2022-07-17-15-54-29.gh-issue-91256.z7i7Q5.rst	
+++ /dev/null
@@ -1 +0,0 @@
-Ensures the program name is known for help text during interpreter startup.
diff --git a/Misc/NEWS.d/next/Core and Builtins/2022-07-18-04-48-34.gh-issue-94947.df9gUw.rst b/Misc/NEWS.d/next/Core and Builtins/2022-07-18-04-48-34.gh-issue-94947.df9gUw.rst
deleted file mode 100644
index 360ea67048fe2..0000000000000
--- a/Misc/NEWS.d/next/Core and Builtins/2022-07-18-04-48-34.gh-issue-94947.df9gUw.rst	
+++ /dev/null
@@ -1 +0,0 @@
-:func:`ast.parse` will no longer parse assignment expressions when passed ``feature_version`` less than ``(3, 8)``. Patch by Shantanu Jain.
diff --git a/Misc/NEWS.d/next/Core and Builtins/2022-07-18-05-10-29.gh-issue-94949.OsZ7_s.rst b/Misc/NEWS.d/next/Core and Builtins/2022-07-18-05-10-29.gh-issue-94949.OsZ7_s.rst
deleted file mode 100644
index bc452d434da0f..0000000000000
--- a/Misc/NEWS.d/next/Core and Builtins/2022-07-18-05-10-29.gh-issue-94949.OsZ7_s.rst	
+++ /dev/null
@@ -1 +0,0 @@
-:func:`ast.parse` will no longer parse parenthesized context managers when passed ``feature_version`` less than ``(3, 9)``. Patch by Shantanu Jain.
diff --git a/Misc/NEWS.d/next/Core and Builtins/2022-07-18-14-19-21.gh-issue-94739.NQJQi7.rst b/Misc/NEWS.d/next/Core and Builtins/2022-07-18-14-19-21.gh-issue-94739.NQJQi7.rst
deleted file mode 100644
index 7476892c423b1..0000000000000
--- a/Misc/NEWS.d/next/Core and Builtins/2022-07-18-14-19-21.gh-issue-94739.NQJQi7.rst	
+++ /dev/null
@@ -1 +0,0 @@
-Allow jumping within, out of, and across exception handlers in the debugger.
diff --git a/Misc/NEWS.d/next/Core and Builtins/2022-07-19-16-30-59.gh-issue-94036._6Utkm.rst b/Misc/NEWS.d/next/Core and Builtins/2022-07-19-16-30-59.gh-issue-94036._6Utkm.rst
deleted file mode 100644
index b0f0367736263..0000000000000
--- a/Misc/NEWS.d/next/Core and Builtins/2022-07-19-16-30-59.gh-issue-94036._6Utkm.rst	
+++ /dev/null
@@ -1,2 +0,0 @@
-Fix incorrect source location info for some multi-line attribute accesses
-and method calls.
diff --git a/Misc/NEWS.d/next/Core and Builtins/2022-07-20-13-46-01.gh-issue-91409.dhL8Zo.rst b/Misc/NEWS.d/next/Core and Builtins/2022-07-20-13-46-01.gh-issue-91409.dhL8Zo.rst
deleted file mode 100644
index 2bc0d8224c6a0..0000000000000
--- a/Misc/NEWS.d/next/Core and Builtins/2022-07-20-13-46-01.gh-issue-91409.dhL8Zo.rst	
+++ /dev/null
@@ -1,2 +0,0 @@
-Fix incorrect source location info caused by certain optimizations in the
-bytecode compiler.
diff --git a/Misc/NEWS.d/next/Core and Builtins/2022-07-21-17-54-52.gh-issue-95113.NnSLpT.rst b/Misc/NEWS.d/next/Core and Builtins/2022-07-21-17-54-52.gh-issue-95113.NnSLpT.rst
deleted file mode 100644
index c2ff6c90ac8c1..0000000000000
--- a/Misc/NEWS.d/next/Core and Builtins/2022-07-21-17-54-52.gh-issue-95113.NnSLpT.rst	
+++ /dev/null
@@ -1,4 +0,0 @@
-Replace all ``EXTENDED_ARG_QUICK`` instructions with basic
-:opcode:`EXTENDED_ARG` instructions in unquickened code. Consumers of
-non-adaptive bytecode should be able to handle extended arguments the same
-way they were handled in CPython 3.10 and older.
diff --git a/Misc/NEWS.d/next/Core and Builtins/2022-07-21-19-19-20.gh-issue-95060.4xdT1f.rst b/Misc/NEWS.d/next/Core and Builtins/2022-07-21-19-19-20.gh-issue-95060.4xdT1f.rst
deleted file mode 100644
index 160999e82bf08..0000000000000
--- a/Misc/NEWS.d/next/Core and Builtins/2022-07-21-19-19-20.gh-issue-95060.4xdT1f.rst	
+++ /dev/null
@@ -1,2 +0,0 @@
-Undocumented ``PyCode_Addr2Location`` function now properly returns when
-``addrq`` argument is less than zero.
diff --git a/Misc/NEWS.d/next/Core and Builtins/2022-07-22-12-53-34.gh-issue-94438.hNqACc.rst b/Misc/NEWS.d/next/Core and Builtins/2022-07-22-12-53-34.gh-issue-94438.hNqACc.rst
deleted file mode 100644
index 2a7249a833c2e..0000000000000
--- a/Misc/NEWS.d/next/Core and Builtins/2022-07-22-12-53-34.gh-issue-94438.hNqACc.rst	
+++ /dev/null
@@ -1,4 +0,0 @@
-Fix an issue that caused extended opcode arguments and some conditional pops
-to be ignored when calculating valid jump targets for assignments to the
-``f_lineno`` attribute of frame objects. In some cases, this could cause
-inconsistent internal state, resulting in a hard crash of the interpreter.
diff --git a/Misc/NEWS.d/next/Core and Builtins/2022-07-23-19-16-25.gh-issue-93351.0Jyvu-.rst b/Misc/NEWS.d/next/Core and Builtins/2022-07-23-19-16-25.gh-issue-93351.0Jyvu-.rst
deleted file mode 100644
index 97cf8055ac54b..0000000000000
--- a/Misc/NEWS.d/next/Core and Builtins/2022-07-23-19-16-25.gh-issue-93351.0Jyvu-.rst	
+++ /dev/null
@@ -1,3 +0,0 @@
-:class:`ast.AST` node positions are now validated when provided to
-:func:`compile` and other related functions. If invalid positions are
-detected, a :exc:`ValueError` will be raised.
diff --git a/Misc/NEWS.d/next/Library/2022-03-16-14-24-14.bpo-47025.qtT3CE.rst b/Misc/NEWS.d/next/Library/2022-03-16-14-24-14.bpo-47025.qtT3CE.rst
deleted file mode 100644
index 1c7c7ace9706d..0000000000000
--- a/Misc/NEWS.d/next/Library/2022-03-16-14-24-14.bpo-47025.qtT3CE.rst
+++ /dev/null
@@ -1 +0,0 @@
-Drop support for :class:`bytes` on :attr:`sys.path`.
diff --git a/Misc/NEWS.d/next/Library/2022-06-26-10-59-15.gh-issue-89988.K8rnmt.rst b/Misc/NEWS.d/next/Library/2022-06-26-10-59-15.gh-issue-89988.K8rnmt.rst
deleted file mode 100644
index 811a8d6031e0b..0000000000000
--- a/Misc/NEWS.d/next/Library/2022-06-26-10-59-15.gh-issue-89988.K8rnmt.rst
+++ /dev/null
@@ -1 +0,0 @@
-Fix memory leak in :class:`pickle.Pickler` when looking up :attr:`dispatch_table`. Patch by Kumar Aditya.
diff --git a/Misc/NEWS.d/next/Library/2022-07-14-00-43-52.gh-issue-94821.e17ghU.rst b/Misc/NEWS.d/next/Library/2022-07-14-00-43-52.gh-issue-94821.e17ghU.rst
deleted file mode 100644
index bf7885aef8cbf..0000000000000
--- a/Misc/NEWS.d/next/Library/2022-07-14-00-43-52.gh-issue-94821.e17ghU.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Fix binding of unix socket to empty address on Linux to use an available
-address from the abstract namespace, instead of "\0".
diff --git a/Misc/NEWS.d/next/Library/2022-07-15-08-13-51.gh-issue-94857.9_KvZJ.rst b/Misc/NEWS.d/next/Library/2022-07-15-08-13-51.gh-issue-94857.9_KvZJ.rst
deleted file mode 100644
index e684415595d1d..0000000000000
--- a/Misc/NEWS.d/next/Library/2022-07-15-08-13-51.gh-issue-94857.9_KvZJ.rst
+++ /dev/null
@@ -1 +0,0 @@
-Fix refleak in ``_io.TextIOWrapper.reconfigure``. Patch by Kumar Aditya.
diff --git a/Misc/NEWS.d/next/Library/2022-07-21-19-55-49.gh-issue-95105.BIX2Km.rst b/Misc/NEWS.d/next/Library/2022-07-21-19-55-49.gh-issue-95105.BIX2Km.rst
deleted file mode 100644
index 58af62b1edc87..0000000000000
--- a/Misc/NEWS.d/next/Library/2022-07-21-19-55-49.gh-issue-95105.BIX2Km.rst
+++ /dev/null
@@ -1 +0,0 @@
-:meth:`wsgiref.types.InputStream.__iter__` should return ``Iterator[bytes]``, not ``Iterable[bytes]``. Patch by Shantanu Jain.
diff --git a/Misc/NEWS.d/next/Library/2022-07-22-17-19-57.gh-issue-93157.RXByAk.rst b/Misc/NEWS.d/next/Library/2022-07-22-17-19-57.gh-issue-93157.RXByAk.rst
deleted file mode 100644
index 054b318ec63f0..0000000000000
--- a/Misc/NEWS.d/next/Library/2022-07-22-17-19-57.gh-issue-93157.RXByAk.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Fix :mod:`fileinput` module didn't support ``errors`` option when
-``inplace`` is true.
diff --git a/Misc/NEWS.d/next/Library/2022-07-22-21-18-17.gh-issue-95132.n9anlw.rst b/Misc/NEWS.d/next/Library/2022-07-22-21-18-17.gh-issue-95132.n9anlw.rst
deleted file mode 100644
index 64666ad84fb4a..0000000000000
--- a/Misc/NEWS.d/next/Library/2022-07-22-21-18-17.gh-issue-95132.n9anlw.rst
+++ /dev/null
@@ -1,4 +0,0 @@
-Fix a :mod:`sqlite3` regression where ``*args`` and ``**kwds`` were
-incorrectly relayed from :py:func:`~sqlite3.connect` to the
-:class:`~sqlite3.Connection` factory. The regression was introduced in 3.11a1
-with PR 24421 (:gh:`85128`). Patch by Erlend E. Aasland.`
diff --git a/Misc/NEWS.d/next/Library/2022-07-24-09-15-35.gh-issue-95194.ERVmqG.rst b/Misc/NEWS.d/next/Library/2022-07-24-09-15-35.gh-issue-95194.ERVmqG.rst
deleted file mode 100644
index c69651923b410..0000000000000
--- a/Misc/NEWS.d/next/Library/2022-07-24-09-15-35.gh-issue-95194.ERVmqG.rst
+++ /dev/null
@@ -1 +0,0 @@
-Upgrade bundled pip to 22.2.
diff --git a/Misc/NEWS.d/next/Library/2022-07-24-12-00-06.gh-issue-95199.-5A64k.rst b/Misc/NEWS.d/next/Library/2022-07-24-12-00-06.gh-issue-95199.-5A64k.rst
deleted file mode 100644
index f3d9cf3306b8d..0000000000000
--- a/Misc/NEWS.d/next/Library/2022-07-24-12-00-06.gh-issue-95199.-5A64k.rst
+++ /dev/null
@@ -1 +0,0 @@
-Upgrade bundled setuptools to 63.2.0.
diff --git a/Misc/NEWS.d/next/Library/2022-07-24-12-59-02.gh-issue-95087.VvqXkN.rst b/Misc/NEWS.d/next/Library/2022-07-24-12-59-02.gh-issue-95087.VvqXkN.rst
deleted file mode 100644
index 48a5c1af74907..0000000000000
--- a/Misc/NEWS.d/next/Library/2022-07-24-12-59-02.gh-issue-95087.VvqXkN.rst
+++ /dev/null
@@ -1 +0,0 @@
-Fix IndexError in parsing invalid date in the :mod:`email` module.
diff --git a/Misc/NEWS.d/next/Tests/2022-07-24-20-19-05.gh-issue-95212.fHiU4e.rst b/Misc/NEWS.d/next/Tests/2022-07-24-20-19-05.gh-issue-95212.fHiU4e.rst
deleted file mode 100644
index 44cea181cc1f1..0000000000000
--- a/Misc/NEWS.d/next/Tests/2022-07-24-20-19-05.gh-issue-95212.fHiU4e.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Make multiprocessing test case ``test_shared_memory_recreate``
-parallel-safe.
diff --git a/Misc/NEWS.d/next/Windows/2022-07-12-20-45-43.gh-issue-94772.uNMmdG.rst b/Misc/NEWS.d/next/Windows/2022-07-12-20-45-43.gh-issue-94772.uNMmdG.rst
deleted file mode 100644
index bb5ab754484eb..0000000000000
--- a/Misc/NEWS.d/next/Windows/2022-07-12-20-45-43.gh-issue-94772.uNMmdG.rst
+++ /dev/null
@@ -1 +0,0 @@
-Fix incorrect handling of shebang lines in py.exe launcher
diff --git a/Misc/NEWS.d/next/Windows/2022-07-16-16-18-32.gh-issue-90844.vwITT3.rst b/Misc/NEWS.d/next/Windows/2022-07-16-16-18-32.gh-issue-90844.vwITT3.rst
deleted file mode 100644
index 8d9e850a5b5b7..0000000000000
--- a/Misc/NEWS.d/next/Windows/2022-07-16-16-18-32.gh-issue-90844.vwITT3.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Allow virtual environments to correctly launch when they have spaces in the
-path.
diff --git a/README.rst b/README.rst
index 32bb5cad66cc7..60eb20615f3c8 100644
--- a/README.rst
+++ b/README.rst
@@ -1,4 +1,4 @@
-This is Python version 3.11.0 beta 4
+This is Python version 3.11.0 beta 5
 ====================================
 
 .. image:: https://github.com/python/cpython/workflows/Tests/badge.svg


From webhook-mailer at python.org  Tue Jul 26 06:16:19 2022
From: webhook-mailer at python.org (ambv)
Date: Tue, 26 Jul 2022 10:16:19 -0000
Subject: [Python-checkins] gh-95051: ensure that timeouts scheduled with
 `asyncio.Timeout` that have already expired are deliverered promptly
 (GH-95109) (GH-95216)
Message-ID: <mailman.259.1658830580.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/19d953682e86ad51b19313ddba8ddb2602d6efd3
commit: 19d953682e86ad51b19313ddba8ddb2602d6efd3
branch: 3.11
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: ambv <lukasz at langa.pl>
date: 2022-07-26T12:16:12+02:00
summary:

gh-95051: ensure that timeouts scheduled with `asyncio.Timeout` that have already expired are deliverered promptly (GH-95109) (GH-95216)

Co-authored-by: Kumar Aditya <59607654+kumaraditya303 at users.noreply.github.com>
(cherry picked from commit 0c6f898005099be189ee65bcfda659f5fc13b802)

Co-authored-by: Thomas Grainger <tagrain at gmail.com>

files:
A Misc/NEWS.d/next/Library/2022-07-21-22-59-22.gh-issue-95109.usxA9r.rst
M Doc/library/asyncio-task.rst
M Lib/asyncio/timeouts.py
M Lib/test/test_asyncio/test_timeouts.py

diff --git a/Doc/library/asyncio-task.rst b/Doc/library/asyncio-task.rst
index a307d22e456eb..a6b638c112409 100644
--- a/Doc/library/asyncio-task.rst
+++ b/Doc/library/asyncio-task.rst
@@ -625,6 +625,9 @@ Timeouts
 
             If *when* is a float, it is set as the new deadline.
 
+            if *when* is in the past, the timeout will trigger on the next
+            iteration of the event loop.
+
         .. method:: expired() -> bool
 
            Return whether the context manager has exceeded its deadline
diff --git a/Lib/asyncio/timeouts.py b/Lib/asyncio/timeouts.py
index a89205348ff24..94d25535fbc05 100644
--- a/Lib/asyncio/timeouts.py
+++ b/Lib/asyncio/timeouts.py
@@ -52,10 +52,10 @@ def reschedule(self, when: Optional[float]) -> None:
             self._timeout_handler = None
         else:
             loop = events.get_running_loop()
-            self._timeout_handler = loop.call_at(
-                when,
-                self._on_timeout,
-            )
+            if when <= loop.time():
+                self._timeout_handler = loop.call_soon(self._on_timeout)
+            else:
+                self._timeout_handler = loop.call_at(when, self._on_timeout)
 
     def expired(self) -> bool:
         """Is timeout expired during execution?"""
diff --git a/Lib/test/test_asyncio/test_timeouts.py b/Lib/test/test_asyncio/test_timeouts.py
index ef1ab0acb390d..3a54297050f14 100644
--- a/Lib/test/test_asyncio/test_timeouts.py
+++ b/Lib/test/test_asyncio/test_timeouts.py
@@ -106,6 +106,30 @@ async def test_timeout_zero(self):
         self.assertLess(t1-t0, 2)
         self.assertTrue(t0 <= cm.when() <= t1)
 
+    async def test_timeout_zero_sleep_zero(self):
+        loop = asyncio.get_running_loop()
+        t0 = loop.time()
+        with self.assertRaises(TimeoutError):
+            async with asyncio.timeout(0) as cm:
+                await asyncio.sleep(0)
+        t1 = loop.time()
+        self.assertTrue(cm.expired())
+        # 2 sec for slow CI boxes
+        self.assertLess(t1-t0, 2)
+        self.assertTrue(t0 <= cm.when() <= t1)
+
+    async def test_timeout_in_the_past_sleep_zero(self):
+        loop = asyncio.get_running_loop()
+        t0 = loop.time()
+        with self.assertRaises(TimeoutError):
+            async with asyncio.timeout(-11) as cm:
+                await asyncio.sleep(0)
+        t1 = loop.time()
+        self.assertTrue(cm.expired())
+        # 2 sec for slow CI boxes
+        self.assertLess(t1-t0, 2)
+        self.assertTrue(t0 >= cm.when() <= t1)
+
     async def test_foreign_exception_passed(self):
         with self.assertRaises(KeyError):
             async with asyncio.timeout(0.01) as cm:
diff --git a/Misc/NEWS.d/next/Library/2022-07-21-22-59-22.gh-issue-95109.usxA9r.rst b/Misc/NEWS.d/next/Library/2022-07-21-22-59-22.gh-issue-95109.usxA9r.rst
new file mode 100644
index 0000000000000..40196dd214a28
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2022-07-21-22-59-22.gh-issue-95109.usxA9r.rst
@@ -0,0 +1 @@
+Ensure that timeouts scheduled with :class:`asyncio.Timeout` that have already expired are delivered promptly.


From webhook-mailer at python.org  Tue Jul 26 06:17:13 2022
From: webhook-mailer at python.org (ambv)
Date: Tue, 26 Jul 2022 10:17:13 -0000
Subject: [Python-checkins] gh-95205: Improve WASM README.md (GH-95267)
 (GH-95270)
Message-ID: <mailman.260.1658830635.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/6284f232584d6e201f342b984bf45af85b8be25f
commit: 6284f232584d6e201f342b984bf45af85b8be25f
branch: 3.11
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: ambv <lukasz at langa.pl>
date: 2022-07-26T12:17:05+02:00
summary:

gh-95205: Improve WASM README.md (GH-95267) (GH-95270)

Co-authored-by: Erlend Egeberg Aasland <erlend.aasland at protonmail.com>
(cherry picked from commit e8f3e8f0ab8aa5d667229ce9694e6e1477e524fd)

Co-authored-by: Christian Heimes <christian at python.org>

files:
A Tools/wasm/wasi-env
M Tools/wasm/README.md

diff --git a/Tools/wasm/README.md b/Tools/wasm/README.md
index b9d773b226959..c1daddda463bb 100644
--- a/Tools/wasm/README.md
+++ b/Tools/wasm/README.md
@@ -69,12 +69,9 @@ popd
 ```
 
 Serve `python.html` with a local webserver and open the file in a browser.
-
-```shell
-emrun builddir/emscripten-browser/python.html
-```
-
-or
+Python comes with a minimal web server script that sets necessary HTTP
+headers like COOP, COEP, and mimetypes. Run the script outside the container
+and from the root of the CPython checkout.
 
 ```shell
 ./Tools/wasm/wasm_webserver.py
@@ -84,6 +81,7 @@ and open http://localhost:8000/builddir/emscripten-browser/python.html . This
 directory structure enables the *C/C++ DevTools Support (DWARF)* to load C
 and header files with debug builds.
 
+
 ### Cross compile to wasm32-emscripten for node
 
 ```shell
@@ -232,6 +230,28 @@ WASI builds require [WASI SDK](https://github.com/WebAssembly/wasi-sdk) 15.0+
 and currently [wasix](https://github.com/singlestore-labs/wasix) for POSIX
 compatibility stubs.
 
+## Cross-compile to wasm32-wasi
+
+The script ``wasi-env`` sets necessary compiler and linker flags as well as
+``pkg-config`` overrides. The script assumes that WASI-SDK is installed in
+``/opt/wasi-sdk`` or ``$WASI_SDK_PATH``.
+
+```shell
+mkdir -p builddir/wasi
+pushd builddir/wasi
+
+CONFIG_SITE=../../Tools/wasm/config.site-wasm32-wasi \
+  CFLAGS="-isystem /opt/wasix/include" \
+  LDFLAGS="-L/opt/wasix/lib -lwasix" \
+  ../../Tools/wasm/wasi-env ../../configure -C \
+    --host=wasm32-unknown-wasi \
+    --build=$(../../config.guess) \
+    --with-build-python=$(pwd)/../build/python
+
+make -j$(nproc)
+popd
+```
+
 ## WASI limitations and issues (WASI SDK 15.0)
 
 A lot of Emscripten limitations also apply to WASI. Noticable restrictions
@@ -376,6 +396,16 @@ git clone https://github.com/emscripten-core/emsdk.git /opt/emsdk
 /opt/emsdk/emsdk activate latest
 ```
 
+### Optionally: enable ccache for EMSDK
+
+The ``EM_COMPILER_WRAPPER`` must be set after the EMSDK environment is
+sourced. Otherwise the source script removes the environment variable.
+
+```
+. /opt/emsdk/emsdk_env.sh
+EM_COMPILER_WRAPPER=ccache
+```
+
 ### Optionally: pre-build and cache static libraries
 
 Emscripten SDK provides static builds of core libraries without PIC
@@ -384,12 +414,8 @@ PIC. To populate the build cache, run:
 
 ```shell
 . /opt/emsdk/emsdk_env.sh
-embuilder build --force zlib bzip2
-embuilder build --force --pic \
-    zlib bzip2 libc-mt libdlmalloc-mt libsockets-mt \
-    libstubs libcompiler_rt libcompiler_rt-mt crtbegin libhtml5 \
-    libc++-mt-noexcept libc++abi-mt-noexcept \
-    libal libGL-mt libstubs-debug libc-mt-debug
+embuilder build zlib bzip2 MINIMAL_PIC
+embuilder build --pic zlib bzip2 MINIMAL_PIC
 ```
 
 ### Install [WASI-SDK](https://github.com/WebAssembly/wasi-sdk)
@@ -424,3 +450,9 @@ ln -srf -t /usr/local/bin/ ~/.wasmtime/bin/wasmtime
 git clone https://github.com/singlestore-labs/wasix.git ~/wasix
 make install -C ~/wasix
 ```
+
+### WASI debugging
+
+* ``wasmtime run -g`` generates debugging symbols for gdb and lldb.
+* The environment variable ``RUST_LOG=wasi_common`` enables debug and
+  trace logging.
diff --git a/Tools/wasm/wasi-env b/Tools/wasm/wasi-env
new file mode 100755
index 0000000000000..600072b02fb8a
--- /dev/null
+++ b/Tools/wasm/wasi-env
@@ -0,0 +1,68 @@
+#!/bin/sh
+set -e
+
+# function
+usage() {
+    echo "wasi-env - Run command with WASI-SDK"
+    echo ""
+    echo "wasi-env is a helper to set various environment variables to"
+    echo "run configure and make with WASI-SDK. A WASI-SDK must be either"
+    echo "installed at /opt/wasi-sdk or the env var 'WASI_SDK_PATH' must"
+    echo "set to the root of a WASI-SDK."
+    echo ""
+    echo "Usage: wasi-env command [...]"
+    echo ""
+    echo "    -h --help     display this help and exit"
+    echo ""
+}
+
+case $1 in
+    -h|--help)
+        usage
+        exit
+        ;;
+esac
+
+if test -z "$1"; then
+    echo "ERROR: command required" >&2
+    usage
+    exit 1
+fi
+
+WASI_SDK_PATH="${WASI_SDK_PATH:-/opt/wasi-sdk}"
+
+if ! test -x "${WASI_SDK_PATH}/bin/clang"; then
+    echo "Error: ${WASI_SDK_PATH}/bin/clang does not exist." >&2
+    exit 2
+fi
+
+# --sysroot is required if WASI-SDK is not installed in /opt/wasi-sdk.
+WASI_SYSROOT="${WASI_SDK_PATH}/share/wasi-sysroot"
+CC="${WASI_SDK_PATH}/bin/clang --sysroot=${WASI_SYSROOT}"
+CPP="${WASI_SDK_PATH}/bin/clang-cpp --sysroot=${WASI_SYSROOT}"
+CXX="${WASI_SDK_PATH}/bin/clang++ --sysroot=${WASI_SYSROOT}"
+
+# use ccache if available
+if command -v ccache >/dev/null 2>&1; then
+    CC="ccache ${CC}"
+    CPP="ccache ${CPP}"
+    CXX="ccache ${CXX}"
+fi
+
+LDSHARED="${WASI_SDK_PATH}/bin/wasm-ld"
+AR="${WASI_SDK_PATH}/bin/llvm-ar"
+RANLIB="${WASI_SDK_PATH}/bin/ranlib"
+
+# instruct pkg-config to use sysroot
+PKG_CONFIG_PATH=""
+PKG_CONFIG_LIBDIR="${WASI_SYSROOT}/lib/pkgconfig:${WASI_SYSROOT}/share/pkgconfig"
+PKG_CONFIG_SYSROOT_DIR="${WASI_SYSROOT}"
+
+PATH="${WASI_SDK_PATH}/bin:$PATH"
+
+export WASI_SDK_PATH
+export CC CPP CXX LDSHARED AR RANLIB
+export PKG_CONFIG_PATH PKG_CONFIG_LIBDIR PKG_CONFIG_SYSROOT_DIR
+export PATH
+
+exec "$@"


From webhook-mailer at python.org  Tue Jul 26 06:18:05 2022
From: webhook-mailer at python.org (ambv)
Date: Tue, 26 Jul 2022 10:18:05 -0000
Subject: [Python-checkins] gh-95235: Add explicit parameter list to some
 sqlite3 methods (GH-95240) (GH-95263)
Message-ID: <mailman.261.1658830685.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/5a9920fcf5002d09f52532ccd33af12022dc11c1
commit: 5a9920fcf5002d09f52532ccd33af12022dc11c1
branch: 3.11
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: ambv <lukasz at langa.pl>
date: 2022-07-26T12:17:59+02:00
summary:

gh-95235: Add explicit parameter list to some sqlite3 methods (GH-95240) (GH-95263)

Co-authored-by: CAM Gerlach <CAM.Gerlach at Gerlach.CAM>
(cherry picked from commit 5012bedc7ca7d78b5a42bf60eef55bac263f4060)

Co-authored-by: Erlend Egeberg Aasland <erlend.aasland at protonmail.com>

files:
M Doc/library/sqlite3.rst

diff --git a/Doc/library/sqlite3.rst b/Doc/library/sqlite3.rst
index 3d01eb5475f1a..392487ee6f643 100644
--- a/Doc/library/sqlite3.rst
+++ b/Doc/library/sqlite3.rst
@@ -276,7 +276,7 @@ Module functions and constants
        Can be ``"DEFERRED"`` (default), ``"EXCLUSIVE"`` or ``"IMMEDIATE"``;
        or :const:`None` to disable opening transactions implicitly.
        See :ref:`sqlite3-controlling-transactions` for more.
-   :type isolation_level: str | None
+   :type isolation_level: str | :const:`None`
 
    :param check_same_thread:
        If :const:`True` (default), only the creating thread may use the connection.
@@ -306,7 +306,7 @@ Module functions and constants
        enabling various :ref:`sqlite3-uri-tricks`.
    :type uri: bool
 
-   :rtype: sqlite3.Connection
+   :rtype: Connection
 
    .. audit-event:: sqlite3.connect database sqlite3.connect
    .. audit-event:: sqlite3.connect/handle connection_handle sqlite3.connect
@@ -424,13 +424,36 @@ Connection Objects
 
    .. method:: blobopen(table, column, row, /, *, readonly=False, name="main")
 
-      Open a :class:`Blob` handle to the :abbr:`BLOB (Binary Large OBject)`
-      located in table name *table*, column name *column*, and row index *row*
-      of database *name*.
-      When *readonly* is :const:`True` the blob is opened without write
-      permissions.
-      Trying to open a blob in a ``WITHOUT ROWID`` table will raise
-      :exc:`OperationalError`.
+      Open a :class:`Blob` handle to an existing
+      :abbr:`BLOB (Binary Large OBject)`.
+
+      :param table:
+          The name of the table where the blob is located.
+      :type table: str
+
+      :param column:
+          The name of the column where the blob is located.
+      :type column: str
+
+      :param row:
+          The name of the row where the blob is located.
+      :type row: str
+
+      :param readonly:
+          Set to :const:`True` if the blob should be opened without write
+          permissions.
+          Defaults to :const:`False`.
+      :type readonly: bool
+
+      :param name:
+          The name of the database where the blob is located.
+          Defaults to ``"main"``.
+      :type name: str
+
+      :raises OperationalError:
+          When trying to open a blob in a ``WITHOUT ROWID`` table.
+
+      :rtype: Blob
 
       .. note::
 
@@ -476,21 +499,35 @@ Connection Objects
 
    .. method:: create_function(name, narg, func, *, deterministic=False)
 
-      Creates a user-defined function that you can later use from within SQL
-      statements under the function name *name*. *narg* is the number of
-      parameters the function accepts (if *narg* is -1, the function may
-      take any number of arguments), and *func* is a Python callable that is
-      called as the SQL function. If *deterministic* is true, the created function
-      is marked as `deterministic <https://sqlite.org/deterministic.html>`_, which
-      allows SQLite to perform additional optimizations. This flag is supported by
-      SQLite 3.8.3 or higher, :exc:`NotSupportedError` will be raised if used
-      with older versions.
+      Create or remove a user-defined SQL function.
+
+      :param name:
+          The name of the SQL function.
+      :type name: str
+
+      :param narg:
+          The number of arguments the SQL function can accept.
+          If ``-1``, it may take any number of arguments.
+      :type narg: int
 
-      The function can return any of
-      :ref:`the types natively supported by SQLite <sqlite3-types>`.
+      :param func:
+          A callable that is called when the SQL function is invoked.
+          The callable must return :ref:`a type natively supported by SQLite
+          <sqlite3-types>`.
+          Set to :const:`None` to remove an existing SQL function.
+      :type func: :term:`callback` | :const:`None`
 
-      .. versionchanged:: 3.8
-         The *deterministic* parameter was added.
+      :param deterministic:
+          If :const:`True`, the created SQL function is marked as
+          `deterministic <https://sqlite.org/deterministic.html>`_,
+          which allows SQLite to perform additional optimizations.
+      :type deterministic: bool
+
+      :raises NotSupportedError:
+          If *deterministic* is used with SQLite versions older than 3.8.3.
+
+      .. versionadded:: 3.8
+         The *deterministic* parameter.
 
       Example:
 
@@ -499,15 +536,29 @@ Connection Objects
 
    .. method:: create_aggregate(name, /, n_arg, aggregate_class)
 
-      Creates a user-defined aggregate function.
+      Create or remove a user-defined SQL aggregate function.
+
+      :param name:
+          The name of the SQL aggregate function.
+      :type name: str
 
-      The aggregate class must implement a ``step`` method, which accepts the number
-      of parameters *n_arg* (if *n_arg* is -1, the function may take
-      any number of arguments), and a ``finalize`` method which will return the
-      final result of the aggregate.
+      :param n_arg:
+          The number of arguments the SQL aggregate function can accept.
+          If ``-1``, it may take any number of arguments.
+      :type n_arg: int
 
-      The ``finalize`` method can return any of
-      :ref:`the types natively supported by SQLite <sqlite3-types>`.
+      :param aggregate_class:
+          A class must implement the following methods:
+
+          * ``step()``: Add a row to the aggregate.
+          * ``finalize()``: Return the final result of the aggregate as
+            :ref:`a type natively supported by SQLite <sqlite3-types>`.
+
+          The number of arguments that the ``step()`` method must accept
+          is controlled by *n_arg*.
+
+          Set to :const:`None` to remove an existing SQL aggregate function.
+      :type aggregate_class: :term:`class` | :const:`None`
 
       Example:
 
@@ -516,25 +567,36 @@ Connection Objects
 
    .. method:: create_window_function(name, num_params, aggregate_class, /)
 
-      Creates user-defined aggregate window function *name*.
+      Create or remove a user-defined aggregate window function.
+
+      :param name:
+          The name of the SQL aggregate window function to create or remove.
+      :type name: str
+
+      :param num_params:
+          The number of arguments the SQL aggregate window function can accept.
+          If ``-1``, it may take any number of arguments.
+      :type num_params: int
+
+      :param aggregate_class:
+          A class that must implement the following methods:
 
-      *aggregate_class* must implement the following methods:
+          * ``step()``: Add a row to the current window.
+          * ``value()``: Return the current value of the aggregate.
+          * ``inverse()``: Remove a row from the current window.
+          * ``finalize()``: Return the final result of the aggregate as
+            :ref:`a type natively supported by SQLite <sqlite3-types>`.
 
-      * ``step``: adds a row to the current window
-      * ``value``: returns the current value of the aggregate
-      * ``inverse``: removes a row from the current window
-      * ``finalize``: returns the final value of the aggregate
+          The number of arguments that the ``step()`` and ``value()`` methods
+          must accept is controlled by *num_params*.
 
-      ``step`` and ``value`` accept *num_params* number of parameters,
-      unless *num_params* is ``-1``, in which case they may take any number of
-      arguments.
-      ``finalize`` and ``value`` can return any of
-      :ref:`the types natively supported by SQLite <sqlite3-types>`.
-      Call :meth:`create_window_function` with
-      *aggregate_class* set to :const:`None` to clear window function *name*.
+          Set to :const:`None` to remove an existing SQL aggregate window function.
 
-      Aggregate window functions are supported by SQLite 3.25.0 and higher.
-      :exc:`NotSupportedError` will be raised if used with older versions.
+      :raises NotSupportedError:
+          If used with a version of SQLite older than 3.25.0,
+          which does not support aggregate window functions.
+
+      :type aggregate_class: :term:`class` | :const:`None`
 
       .. versionadded:: 3.11
 
@@ -734,29 +796,43 @@ Connection Objects
 
    .. method:: backup(target, *, pages=-1, progress=None, name="main", sleep=0.250)
 
-      This method makes a backup of an SQLite database even while it's being accessed
-      by other clients, or concurrently by the same connection.  The copy will be
-      written into the mandatory argument *target*, that must be another
-      :class:`Connection` instance.
-
-      By default, or when *pages* is either ``0`` or a negative integer, the entire
-      database is copied in a single step; otherwise the method performs a loop
-      copying up to *pages* pages at a time.
-
-      If *progress* is specified, it must either be ``None`` or a callable object that
-      will be executed at each iteration with three integer arguments, respectively
-      the *status* of the last iteration, the *remaining* number of pages still to be
-      copied and the *total* number of pages.
-
-      The *name* argument specifies the database name that will be copied: it must be
-      a string containing either ``"main"``, the default, to indicate the main
-      database, ``"temp"`` to indicate the temporary database or the name specified
-      after the ``AS`` keyword in an ``ATTACH DATABASE`` statement for an attached
-      database.
-
-      The *sleep* argument specifies the number of seconds to sleep by between
-      successive attempts to backup remaining pages, can be specified either as an
-      integer or a floating point value.
+      Create a backup of an SQLite database.
+
+      Works even if the database is being accessed by other clients
+      or concurrently by the same connection.
+
+      :param target:
+          The database connection to save the backup to.
+      :type target: Connection
+
+      :param pages:
+          The number of pages to copy at a time.
+          If equal to or less than ``0``,
+          the entire database is copied in a single step.
+          Defaults to ``-1``.
+      :type pages: int
+
+      :param progress:
+          If set to a callable, it is invoked with three integer arguments for
+          every backup iteration:
+          the *status* of the last iteration,
+          the *remaining* number of pages still to be copied,
+          and the *total* number of pages.
+          Defaults to :const:`None`.
+      :type progress: :term:`callback` |?:const:`None`
+
+      :param name:
+          The name of the database to back up.
+          Either ``"main"`` (the default) for the main database,
+          ``"temp"`` for the temporary database,
+          or the name of a custom database as attached using the
+          ``ATTACH DATABASE`` SQL statment.
+      :type name: str
+
+      :param sleep:
+          The number of seconds to sleep between successive attempts
+          to back up remaining pages.
+      :type sleep: float
 
       Example 1, copy an existing database into another::
 


From webhook-mailer at python.org  Tue Jul 26 06:19:27 2022
From: webhook-mailer at python.org (ambv)
Date: Tue, 26 Jul 2022 10:19:27 -0000
Subject: [Python-checkins] [3.11] gh-95185: Check recursion depth in the AST
 constructor (GH-95186) (GH-95208)
Message-ID: <mailman.262.1658830768.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/86eb500068bb62b74a3865bf25d82ba0b027b943
commit: 86eb500068bb62b74a3865bf25d82ba0b027b943
branch: 3.11
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: ambv <lukasz at langa.pl>
date: 2022-07-26T12:19:22+02:00
summary:

[3.11] gh-95185: Check recursion depth in the AST constructor (GH-95186) (GH-95208)

Co-authored-by: Serhiy Storchaka <storchaka at gmail.com>
(cherry picked from commit 00474472944944b346d8409cfded84bb299f601a)

Co-authored-by: Pablo Galindo Salgado <Pablogsal at gmail.com>

files:
A Misc/NEWS.d/next/Core and Builtins/2022-07-24-00-27-47.gh-issue-95185.ghYTZx.rst
M Doc/data/python3.11.abi
M Include/internal/pycore_ast_state.h
M Lib/test/test_ast.py
M Parser/asdl_c.py
M Python/Python-ast.c

diff --git a/Doc/data/python3.11.abi b/Doc/data/python3.11.abi
index 98cdaf9524bbc..969a25b917a84 100644
--- a/Doc/data/python3.11.abi
+++ b/Doc/data/python3.11.abi
@@ -1639,7 +1639,7 @@
     <elf-symbol name='_PyNotImplemented_Type' size='408' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='_PyOS_ReadlineTState' size='8' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='_PyParser_TokenNames' size='520' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='_PyRuntime' size='166672' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
+    <elf-symbol name='_PyRuntime' size='166680' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='_PySet_Dummy' size='8' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='_PyWeakref_CallableProxyType' size='408' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='_PyWeakref_ProxyType' size='408' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
@@ -1825,7 +1825,7 @@
     </class-decl>
     <typedef-decl name='PyThreadState' type-id='type-id-9' filepath='./Include/pytypedefs.h' line='24' column='1' id='type-id-25'/>
     <pointer-type-def type-id='type-id-25' size-in-bits='64' id='type-id-10'/>
-    <class-decl name='_is' size-in-bits='861888' is-struct='yes' visibility='default' filepath='./Include/internal/pycore_interp.h' line='78' column='1' id='type-id-26'>
+    <class-decl name='_is' size-in-bits='861952' is-struct='yes' visibility='default' filepath='./Include/internal/pycore_interp.h' line='78' column='1' id='type-id-26'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='next' type-id='type-id-11' visibility='default' filepath='./Include/internal/pycore_interp.h' line='80' column='1'/>
       </data-member>
@@ -1964,13 +1964,13 @@
       <data-member access='public' layout-offset-in-bits='57280'>
         <var-decl name='ast' type-id='type-id-49' visibility='default' filepath='./Include/internal/pycore_interp.h' line='175' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='72384'>
+      <data-member access='public' layout-offset-in-bits='72448'>
         <var-decl name='type_cache' type-id='type-id-50' visibility='default' filepath='./Include/internal/pycore_interp.h' line='176' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='858816'>
+      <data-member access='public' layout-offset-in-bits='858880'>
         <var-decl name='callable_cache' type-id='type-id-51' visibility='default' filepath='./Include/internal/pycore_interp.h' line='177' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='859008'>
+      <data-member access='public' layout-offset-in-bits='859072'>
         <var-decl name='_initial_thread' type-id='type-id-25' visibility='default' filepath='./Include/internal/pycore_interp.h' line='192' column='1'/>
       </data-member>
     </class-decl>
@@ -1995,7 +1995,7 @@
     <typedef-decl name='uint64_t' type-id='type-id-55' filepath='/usr/include/x86_64-linux-gnu/bits/stdint-uintn.h' line='27' column='1' id='type-id-19'/>
     <type-decl name='long int' size-in-bits='64' id='type-id-53'/>
     <typedef-decl name='size_t' type-id='type-id-16' filepath='/usr/lib/gcc/x86_64-linux-gnu/9/include/stddef.h' line='209' column='1' id='type-id-54'/>
-    <class-decl name='pyruntimestate' size-in-bits='1333376' is-struct='yes' visibility='default' filepath='./Include/internal/pycore_runtime.h' line='59' column='1' id='type-id-56'>
+    <class-decl name='pyruntimestate' size-in-bits='1333440' is-struct='yes' visibility='default' filepath='./Include/internal/pycore_runtime.h' line='59' column='1' id='type-id-56'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='_initialized' type-id='type-id-8' visibility='default' filepath='./Include/internal/pycore_runtime.h' line='64' column='1'/>
       </data-member>
@@ -2269,7 +2269,7 @@
     </class-decl>
     <typedef-decl name='__ssize_t' type-id='type-id-53' filepath='/usr/include/x86_64-linux-gnu/bits/types.h' line='193' column='1' id='type-id-110'/>
     <typedef-decl name='ssize_t' type-id='type-id-110' filepath='/usr/include/x86_64-linux-gnu/sys/types.h' line='108' column='1' id='type-id-111'/>
-    <typedef-decl name='Py_ssize_t' type-id='type-id-111' filepath='./Include/pyport.h' line='179' column='1' id='type-id-36'/>
+    <typedef-decl name='Py_ssize_t' type-id='type-id-111' filepath='./Include/pyport.h' line='131' column='1' id='type-id-36'/>
     <typedef-decl name='PyTypeObject' type-id='type-id-76' filepath='./Include/pytypedefs.h' line='20' column='1' id='type-id-112'/>
     <pointer-type-def type-id='type-id-112' size-in-bits='64' id='type-id-74'/>
     <typedef-decl name='PyObject' type-id='type-id-109' filepath='./Include/pytypedefs.h' line='18' column='1' id='type-id-108'/>
@@ -2487,7 +2487,7 @@
     <typedef-decl name='objobjargproc' type-id='type-id-158' filepath='./Include/object.h' line='205' column='1' id='type-id-156'/>
     <typedef-decl name='PyMappingMethods' type-id='type-id-155' filepath='./Include/cpython/object.h' line='126' column='1' id='type-id-154'/>
     <pointer-type-def type-id='type-id-154' size-in-bits='64' id='type-id-85'/>
-    <typedef-decl name='Py_hash_t' type-id='type-id-36' filepath='./Include/pyport.h' line='193' column='1' id='type-id-159'/>
+    <typedef-decl name='Py_hash_t' type-id='type-id-36' filepath='./Include/pyport.h' line='145' column='1' id='type-id-159'/>
     <pointer-type-def type-id='type-id-160' size-in-bits='64' id='type-id-161'/>
     <typedef-decl name='hashfunc' type-id='type-id-161' filepath='./Include/object.h' line='219' column='1' id='type-id-86'/>
     <typedef-decl name='getattrofunc' type-id='type-id-135' filepath='./Include/object.h' line='215' column='1' id='type-id-88'/>
@@ -5079,714 +5079,720 @@
     </class-decl>
     <typedef-decl name='PyBaseExceptionObject' type-id='type-id-431' filepath='./Include/cpython/pyerrors.h' line='15' column='1' id='type-id-430'/>
     <pointer-type-def type-id='type-id-430' size-in-bits='64' id='type-id-429'/>
-    <class-decl name='ast_state' size-in-bits='15104' is-struct='yes' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='13' column='1' id='type-id-49'>
+    <class-decl name='ast_state' size-in-bits='15168' is-struct='yes' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='13' column='1' id='type-id-49'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='initialized' type-id='type-id-8' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='14' column='1'/>
       </data-member>
+      <data-member access='public' layout-offset-in-bits='32'>
+        <var-decl name='recursion_depth' type-id='type-id-8' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='15' column='1'/>
+      </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='AST_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='15' column='1'/>
+        <var-decl name='recursion_limit' type-id='type-id-8' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='16' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='Add_singleton' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='16' column='1'/>
+        <var-decl name='AST_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='17' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='Add_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='17' column='1'/>
+        <var-decl name='Add_singleton' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='18' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='And_singleton' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='18' column='1'/>
+        <var-decl name='Add_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='19' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='And_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='19' column='1'/>
+        <var-decl name='And_singleton' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='20' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
-        <var-decl name='AnnAssign_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='20' column='1'/>
+        <var-decl name='And_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='21' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
-        <var-decl name='Assert_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='21' column='1'/>
+        <var-decl name='AnnAssign_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='22' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='512'>
-        <var-decl name='Assign_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='22' column='1'/>
+        <var-decl name='Assert_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='23' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='576'>
-        <var-decl name='AsyncFor_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='23' column='1'/>
+        <var-decl name='Assign_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='24' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='640'>
-        <var-decl name='AsyncFunctionDef_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='24' column='1'/>
+        <var-decl name='AsyncFor_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='25' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='704'>
-        <var-decl name='AsyncWith_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='25' column='1'/>
+        <var-decl name='AsyncFunctionDef_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='26' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='768'>
-        <var-decl name='Attribute_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='26' column='1'/>
+        <var-decl name='AsyncWith_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='27' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='832'>
-        <var-decl name='AugAssign_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='27' column='1'/>
+        <var-decl name='Attribute_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='28' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='896'>
-        <var-decl name='Await_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='28' column='1'/>
+        <var-decl name='AugAssign_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='29' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='960'>
-        <var-decl name='BinOp_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='29' column='1'/>
+        <var-decl name='Await_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='30' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1024'>
-        <var-decl name='BitAnd_singleton' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='30' column='1'/>
+        <var-decl name='BinOp_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='31' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1088'>
-        <var-decl name='BitAnd_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='31' column='1'/>
+        <var-decl name='BitAnd_singleton' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='32' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1152'>
-        <var-decl name='BitOr_singleton' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='32' column='1'/>
+        <var-decl name='BitAnd_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='33' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1216'>
-        <var-decl name='BitOr_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='33' column='1'/>
+        <var-decl name='BitOr_singleton' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='34' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1280'>
-        <var-decl name='BitXor_singleton' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='34' column='1'/>
+        <var-decl name='BitOr_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='35' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1344'>
-        <var-decl name='BitXor_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='35' column='1'/>
+        <var-decl name='BitXor_singleton' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='36' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1408'>
-        <var-decl name='BoolOp_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='36' column='1'/>
+        <var-decl name='BitXor_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='37' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1472'>
-        <var-decl name='Break_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='37' column='1'/>
+        <var-decl name='BoolOp_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='38' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1536'>
-        <var-decl name='Call_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='38' column='1'/>
+        <var-decl name='Break_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='39' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1600'>
-        <var-decl name='ClassDef_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='39' column='1'/>
+        <var-decl name='Call_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='40' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1664'>
-        <var-decl name='Compare_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='40' column='1'/>
+        <var-decl name='ClassDef_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='41' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1728'>
-        <var-decl name='Constant_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='41' column='1'/>
+        <var-decl name='Compare_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='42' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1792'>
-        <var-decl name='Continue_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='42' column='1'/>
+        <var-decl name='Constant_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='43' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1856'>
-        <var-decl name='Del_singleton' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='43' column='1'/>
+        <var-decl name='Continue_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='44' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1920'>
-        <var-decl name='Del_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='44' column='1'/>
+        <var-decl name='Del_singleton' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='45' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1984'>
-        <var-decl name='Delete_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='45' column='1'/>
+        <var-decl name='Del_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='46' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2048'>
-        <var-decl name='DictComp_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='46' column='1'/>
+        <var-decl name='Delete_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='47' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2112'>
-        <var-decl name='Dict_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='47' column='1'/>
+        <var-decl name='DictComp_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='48' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2176'>
-        <var-decl name='Div_singleton' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='48' column='1'/>
+        <var-decl name='Dict_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='49' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2240'>
-        <var-decl name='Div_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='49' column='1'/>
+        <var-decl name='Div_singleton' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='50' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2304'>
-        <var-decl name='Eq_singleton' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='50' column='1'/>
+        <var-decl name='Div_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='51' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2368'>
-        <var-decl name='Eq_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='51' column='1'/>
+        <var-decl name='Eq_singleton' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='52' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2432'>
-        <var-decl name='ExceptHandler_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='52' column='1'/>
+        <var-decl name='Eq_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='53' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2496'>
-        <var-decl name='Expr_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='53' column='1'/>
+        <var-decl name='ExceptHandler_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='54' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2560'>
-        <var-decl name='Expression_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='54' column='1'/>
+        <var-decl name='Expr_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='55' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2624'>
-        <var-decl name='FloorDiv_singleton' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='55' column='1'/>
+        <var-decl name='Expression_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='56' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2688'>
-        <var-decl name='FloorDiv_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='56' column='1'/>
+        <var-decl name='FloorDiv_singleton' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='57' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2752'>
-        <var-decl name='For_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='57' column='1'/>
+        <var-decl name='FloorDiv_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='58' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2816'>
-        <var-decl name='FormattedValue_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='58' column='1'/>
+        <var-decl name='For_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='59' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2880'>
-        <var-decl name='FunctionDef_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='59' column='1'/>
+        <var-decl name='FormattedValue_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='60' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2944'>
-        <var-decl name='FunctionType_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='60' column='1'/>
+        <var-decl name='FunctionDef_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='61' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3008'>
-        <var-decl name='GeneratorExp_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='61' column='1'/>
+        <var-decl name='FunctionType_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='62' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3072'>
-        <var-decl name='Global_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='62' column='1'/>
+        <var-decl name='GeneratorExp_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='63' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3136'>
-        <var-decl name='GtE_singleton' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='63' column='1'/>
+        <var-decl name='Global_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='64' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3200'>
-        <var-decl name='GtE_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='64' column='1'/>
+        <var-decl name='GtE_singleton' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='65' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3264'>
-        <var-decl name='Gt_singleton' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='65' column='1'/>
+        <var-decl name='GtE_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='66' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3328'>
-        <var-decl name='Gt_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='66' column='1'/>
+        <var-decl name='Gt_singleton' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='67' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3392'>
-        <var-decl name='IfExp_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='67' column='1'/>
+        <var-decl name='Gt_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='68' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3456'>
-        <var-decl name='If_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='68' column='1'/>
+        <var-decl name='IfExp_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='69' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3520'>
-        <var-decl name='ImportFrom_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='69' column='1'/>
+        <var-decl name='If_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='70' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3584'>
-        <var-decl name='Import_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='70' column='1'/>
+        <var-decl name='ImportFrom_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='71' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3648'>
-        <var-decl name='In_singleton' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='71' column='1'/>
+        <var-decl name='Import_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='72' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3712'>
-        <var-decl name='In_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='72' column='1'/>
+        <var-decl name='In_singleton' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='73' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3776'>
-        <var-decl name='Interactive_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='73' column='1'/>
+        <var-decl name='In_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='74' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3840'>
-        <var-decl name='Invert_singleton' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='74' column='1'/>
+        <var-decl name='Interactive_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='75' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3904'>
-        <var-decl name='Invert_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='75' column='1'/>
+        <var-decl name='Invert_singleton' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='76' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3968'>
-        <var-decl name='IsNot_singleton' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='76' column='1'/>
+        <var-decl name='Invert_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='77' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4032'>
-        <var-decl name='IsNot_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='77' column='1'/>
+        <var-decl name='IsNot_singleton' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='78' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4096'>
-        <var-decl name='Is_singleton' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='78' column='1'/>
+        <var-decl name='IsNot_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='79' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4160'>
-        <var-decl name='Is_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='79' column='1'/>
+        <var-decl name='Is_singleton' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='80' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4224'>
-        <var-decl name='JoinedStr_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='80' column='1'/>
+        <var-decl name='Is_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='81' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4288'>
-        <var-decl name='LShift_singleton' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='81' column='1'/>
+        <var-decl name='JoinedStr_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='82' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4352'>
-        <var-decl name='LShift_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='82' column='1'/>
+        <var-decl name='LShift_singleton' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='83' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4416'>
-        <var-decl name='Lambda_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='83' column='1'/>
+        <var-decl name='LShift_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='84' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4480'>
-        <var-decl name='ListComp_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='84' column='1'/>
+        <var-decl name='Lambda_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='85' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4544'>
-        <var-decl name='List_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='85' column='1'/>
+        <var-decl name='ListComp_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='86' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4608'>
-        <var-decl name='Load_singleton' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='86' column='1'/>
+        <var-decl name='List_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='87' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4672'>
-        <var-decl name='Load_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='87' column='1'/>
+        <var-decl name='Load_singleton' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='88' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4736'>
-        <var-decl name='LtE_singleton' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='88' column='1'/>
+        <var-decl name='Load_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='89' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4800'>
-        <var-decl name='LtE_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='89' column='1'/>
+        <var-decl name='LtE_singleton' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='90' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4864'>
-        <var-decl name='Lt_singleton' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='90' column='1'/>
+        <var-decl name='LtE_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='91' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4928'>
-        <var-decl name='Lt_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='91' column='1'/>
+        <var-decl name='Lt_singleton' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='92' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4992'>
-        <var-decl name='MatMult_singleton' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='92' column='1'/>
+        <var-decl name='Lt_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='93' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5056'>
-        <var-decl name='MatMult_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='93' column='1'/>
+        <var-decl name='MatMult_singleton' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='94' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5120'>
-        <var-decl name='MatchAs_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='94' column='1'/>
+        <var-decl name='MatMult_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='95' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5184'>
-        <var-decl name='MatchClass_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='95' column='1'/>
+        <var-decl name='MatchAs_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='96' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5248'>
-        <var-decl name='MatchMapping_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='96' column='1'/>
+        <var-decl name='MatchClass_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='97' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5312'>
-        <var-decl name='MatchOr_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='97' column='1'/>
+        <var-decl name='MatchMapping_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='98' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5376'>
-        <var-decl name='MatchSequence_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='98' column='1'/>
+        <var-decl name='MatchOr_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='99' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5440'>
-        <var-decl name='MatchSingleton_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='99' column='1'/>
+        <var-decl name='MatchSequence_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='100' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5504'>
-        <var-decl name='MatchStar_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='100' column='1'/>
+        <var-decl name='MatchSingleton_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='101' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5568'>
-        <var-decl name='MatchValue_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='101' column='1'/>
+        <var-decl name='MatchStar_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='102' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5632'>
-        <var-decl name='Match_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='102' column='1'/>
+        <var-decl name='MatchValue_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='103' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5696'>
-        <var-decl name='Mod_singleton' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='103' column='1'/>
+        <var-decl name='Match_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='104' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5760'>
-        <var-decl name='Mod_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='104' column='1'/>
+        <var-decl name='Mod_singleton' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='105' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5824'>
-        <var-decl name='Module_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='105' column='1'/>
+        <var-decl name='Mod_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='106' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5888'>
-        <var-decl name='Mult_singleton' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='106' column='1'/>
+        <var-decl name='Module_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='107' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5952'>
-        <var-decl name='Mult_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='107' column='1'/>
+        <var-decl name='Mult_singleton' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='108' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='6016'>
-        <var-decl name='Name_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='108' column='1'/>
+        <var-decl name='Mult_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='109' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='6080'>
-        <var-decl name='NamedExpr_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='109' column='1'/>
+        <var-decl name='Name_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='110' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='6144'>
-        <var-decl name='Nonlocal_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='110' column='1'/>
+        <var-decl name='NamedExpr_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='111' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='6208'>
-        <var-decl name='NotEq_singleton' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='111' column='1'/>
+        <var-decl name='Nonlocal_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='112' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='6272'>
-        <var-decl name='NotEq_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='112' column='1'/>
+        <var-decl name='NotEq_singleton' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='113' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='6336'>
-        <var-decl name='NotIn_singleton' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='113' column='1'/>
+        <var-decl name='NotEq_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='114' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='6400'>
-        <var-decl name='NotIn_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='114' column='1'/>
+        <var-decl name='NotIn_singleton' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='115' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='6464'>
-        <var-decl name='Not_singleton' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='115' column='1'/>
+        <var-decl name='NotIn_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='116' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='6528'>
-        <var-decl name='Not_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='116' column='1'/>
+        <var-decl name='Not_singleton' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='117' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='6592'>
-        <var-decl name='Or_singleton' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='117' column='1'/>
+        <var-decl name='Not_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='118' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='6656'>
-        <var-decl name='Or_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='118' column='1'/>
+        <var-decl name='Or_singleton' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='119' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='6720'>
-        <var-decl name='Pass_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='119' column='1'/>
+        <var-decl name='Or_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='120' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='6784'>
-        <var-decl name='Pow_singleton' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='120' column='1'/>
+        <var-decl name='Pass_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='121' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='6848'>
-        <var-decl name='Pow_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='121' column='1'/>
+        <var-decl name='Pow_singleton' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='122' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='6912'>
-        <var-decl name='RShift_singleton' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='122' column='1'/>
+        <var-decl name='Pow_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='123' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='6976'>
-        <var-decl name='RShift_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='123' column='1'/>
+        <var-decl name='RShift_singleton' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='124' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='7040'>
-        <var-decl name='Raise_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='124' column='1'/>
+        <var-decl name='RShift_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='125' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='7104'>
-        <var-decl name='Return_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='125' column='1'/>
+        <var-decl name='Raise_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='126' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='7168'>
-        <var-decl name='SetComp_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='126' column='1'/>
+        <var-decl name='Return_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='127' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='7232'>
-        <var-decl name='Set_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='127' column='1'/>
+        <var-decl name='SetComp_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='128' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='7296'>
-        <var-decl name='Slice_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='128' column='1'/>
+        <var-decl name='Set_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='129' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='7360'>
-        <var-decl name='Starred_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='129' column='1'/>
+        <var-decl name='Slice_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='130' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='7424'>
-        <var-decl name='Store_singleton' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='130' column='1'/>
+        <var-decl name='Starred_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='131' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='7488'>
-        <var-decl name='Store_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='131' column='1'/>
+        <var-decl name='Store_singleton' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='132' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='7552'>
-        <var-decl name='Sub_singleton' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='132' column='1'/>
+        <var-decl name='Store_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='133' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='7616'>
-        <var-decl name='Sub_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='133' column='1'/>
+        <var-decl name='Sub_singleton' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='134' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='7680'>
-        <var-decl name='Subscript_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='134' column='1'/>
+        <var-decl name='Sub_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='135' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='7744'>
-        <var-decl name='TryStar_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='135' column='1'/>
+        <var-decl name='Subscript_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='136' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='7808'>
-        <var-decl name='Try_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='136' column='1'/>
+        <var-decl name='TryStar_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='137' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='7872'>
-        <var-decl name='Tuple_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='137' column='1'/>
+        <var-decl name='Try_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='138' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='7936'>
-        <var-decl name='TypeIgnore_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='138' column='1'/>
+        <var-decl name='Tuple_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='139' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='8000'>
-        <var-decl name='UAdd_singleton' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='139' column='1'/>
+        <var-decl name='TypeIgnore_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='140' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='8064'>
-        <var-decl name='UAdd_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='140' column='1'/>
+        <var-decl name='UAdd_singleton' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='141' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='8128'>
-        <var-decl name='USub_singleton' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='141' column='1'/>
+        <var-decl name='UAdd_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='142' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='8192'>
-        <var-decl name='USub_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='142' column='1'/>
+        <var-decl name='USub_singleton' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='143' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='8256'>
-        <var-decl name='UnaryOp_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='143' column='1'/>
+        <var-decl name='USub_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='144' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='8320'>
-        <var-decl name='While_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='144' column='1'/>
+        <var-decl name='UnaryOp_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='145' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='8384'>
-        <var-decl name='With_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='145' column='1'/>
+        <var-decl name='While_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='146' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='8448'>
-        <var-decl name='YieldFrom_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='146' column='1'/>
+        <var-decl name='With_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='147' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='8512'>
-        <var-decl name='Yield_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='147' column='1'/>
+        <var-decl name='YieldFrom_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='148' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='8576'>
-        <var-decl name='__dict__' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='148' column='1'/>
+        <var-decl name='Yield_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='149' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='8640'>
-        <var-decl name='__doc__' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='149' column='1'/>
+        <var-decl name='__dict__' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='150' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='8704'>
-        <var-decl name='__match_args__' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='150' column='1'/>
+        <var-decl name='__doc__' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='151' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='8768'>
-        <var-decl name='__module__' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='151' column='1'/>
+        <var-decl name='__match_args__' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='152' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='8832'>
-        <var-decl name='_attributes' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='152' column='1'/>
+        <var-decl name='__module__' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='153' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='8896'>
-        <var-decl name='_fields' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='153' column='1'/>
+        <var-decl name='_attributes' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='154' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='8960'>
-        <var-decl name='alias_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='154' column='1'/>
+        <var-decl name='_fields' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='155' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='9024'>
-        <var-decl name='annotation' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='155' column='1'/>
+        <var-decl name='alias_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='156' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='9088'>
-        <var-decl name='arg' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='156' column='1'/>
+        <var-decl name='annotation' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='157' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='9152'>
-        <var-decl name='arg_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='157' column='1'/>
+        <var-decl name='arg' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='158' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='9216'>
-        <var-decl name='args' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='158' column='1'/>
+        <var-decl name='arg_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='159' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='9280'>
-        <var-decl name='argtypes' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='159' column='1'/>
+        <var-decl name='args' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='160' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='9344'>
-        <var-decl name='arguments_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='160' column='1'/>
+        <var-decl name='argtypes' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='161' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='9408'>
-        <var-decl name='asname' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='161' column='1'/>
+        <var-decl name='arguments_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='162' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='9472'>
-        <var-decl name='ast' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='162' column='1'/>
+        <var-decl name='asname' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='163' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='9536'>
-        <var-decl name='attr' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='163' column='1'/>
+        <var-decl name='ast' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='164' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='9600'>
-        <var-decl name='bases' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='164' column='1'/>
+        <var-decl name='attr' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='165' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='9664'>
-        <var-decl name='body' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='165' column='1'/>
+        <var-decl name='bases' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='166' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='9728'>
-        <var-decl name='boolop_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='166' column='1'/>
+        <var-decl name='body' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='167' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='9792'>
-        <var-decl name='cases' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='167' column='1'/>
+        <var-decl name='boolop_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='168' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='9856'>
-        <var-decl name='cause' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='168' column='1'/>
+        <var-decl name='cases' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='169' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='9920'>
-        <var-decl name='cls' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='169' column='1'/>
+        <var-decl name='cause' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='170' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='9984'>
-        <var-decl name='cmpop_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='170' column='1'/>
+        <var-decl name='cls' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='171' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10048'>
-        <var-decl name='col_offset' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='171' column='1'/>
+        <var-decl name='cmpop_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='172' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10112'>
-        <var-decl name='comparators' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='172' column='1'/>
+        <var-decl name='col_offset' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='173' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10176'>
-        <var-decl name='comprehension_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='173' column='1'/>
+        <var-decl name='comparators' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='174' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10240'>
-        <var-decl name='context_expr' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='174' column='1'/>
+        <var-decl name='comprehension_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='175' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10304'>
-        <var-decl name='conversion' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='175' column='1'/>
+        <var-decl name='context_expr' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='176' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10368'>
-        <var-decl name='ctx' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='176' column='1'/>
+        <var-decl name='conversion' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='177' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10432'>
-        <var-decl name='decorator_list' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='177' column='1'/>
+        <var-decl name='ctx' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='178' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10496'>
-        <var-decl name='defaults' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='178' column='1'/>
+        <var-decl name='decorator_list' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='179' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10560'>
-        <var-decl name='elt' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='179' column='1'/>
+        <var-decl name='defaults' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='180' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10624'>
-        <var-decl name='elts' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='180' column='1'/>
+        <var-decl name='elt' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='181' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10688'>
-        <var-decl name='end_col_offset' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='181' column='1'/>
+        <var-decl name='elts' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='182' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10752'>
-        <var-decl name='end_lineno' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='182' column='1'/>
+        <var-decl name='end_col_offset' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='183' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10816'>
-        <var-decl name='exc' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='183' column='1'/>
+        <var-decl name='end_lineno' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='184' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10880'>
-        <var-decl name='excepthandler_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='184' column='1'/>
+        <var-decl name='exc' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='185' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10944'>
-        <var-decl name='expr_context_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='185' column='1'/>
+        <var-decl name='excepthandler_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='186' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='11008'>
-        <var-decl name='expr_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='186' column='1'/>
+        <var-decl name='expr_context_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='187' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='11072'>
-        <var-decl name='finalbody' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='187' column='1'/>
+        <var-decl name='expr_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='188' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='11136'>
-        <var-decl name='format_spec' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='188' column='1'/>
+        <var-decl name='finalbody' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='189' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='11200'>
-        <var-decl name='func' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='189' column='1'/>
+        <var-decl name='format_spec' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='190' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='11264'>
-        <var-decl name='generators' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='190' column='1'/>
+        <var-decl name='func' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='191' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='11328'>
-        <var-decl name='guard' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='191' column='1'/>
+        <var-decl name='generators' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='192' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='11392'>
-        <var-decl name='handlers' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='192' column='1'/>
+        <var-decl name='guard' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='193' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='11456'>
-        <var-decl name='id' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='193' column='1'/>
+        <var-decl name='handlers' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='194' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='11520'>
-        <var-decl name='ifs' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='194' column='1'/>
+        <var-decl name='id' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='195' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='11584'>
-        <var-decl name='is_async' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='195' column='1'/>
+        <var-decl name='ifs' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='196' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='11648'>
-        <var-decl name='items' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='196' column='1'/>
+        <var-decl name='is_async' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='197' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='11712'>
-        <var-decl name='iter' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='197' column='1'/>
+        <var-decl name='items' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='198' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='11776'>
-        <var-decl name='key' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='198' column='1'/>
+        <var-decl name='iter' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='199' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='11840'>
-        <var-decl name='keys' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='199' column='1'/>
+        <var-decl name='key' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='200' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='11904'>
-        <var-decl name='keyword_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='200' column='1'/>
+        <var-decl name='keys' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='201' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='11968'>
-        <var-decl name='keywords' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='201' column='1'/>
+        <var-decl name='keyword_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='202' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='12032'>
-        <var-decl name='kind' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='202' column='1'/>
+        <var-decl name='keywords' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='203' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='12096'>
-        <var-decl name='kw_defaults' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='203' column='1'/>
+        <var-decl name='kind' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='204' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='12160'>
-        <var-decl name='kwarg' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='204' column='1'/>
+        <var-decl name='kw_defaults' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='205' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='12224'>
-        <var-decl name='kwd_attrs' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='205' column='1'/>
+        <var-decl name='kwarg' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='206' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='12288'>
-        <var-decl name='kwd_patterns' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='206' column='1'/>
+        <var-decl name='kwd_attrs' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='207' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='12352'>
-        <var-decl name='kwonlyargs' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='207' column='1'/>
+        <var-decl name='kwd_patterns' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='208' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='12416'>
-        <var-decl name='left' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='208' column='1'/>
+        <var-decl name='kwonlyargs' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='209' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='12480'>
-        <var-decl name='level' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='209' column='1'/>
+        <var-decl name='left' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='210' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='12544'>
-        <var-decl name='lineno' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='210' column='1'/>
+        <var-decl name='level' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='211' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='12608'>
-        <var-decl name='lower' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='211' column='1'/>
+        <var-decl name='lineno' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='212' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='12672'>
-        <var-decl name='match_case_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='212' column='1'/>
+        <var-decl name='lower' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='213' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='12736'>
-        <var-decl name='mod_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='213' column='1'/>
+        <var-decl name='match_case_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='214' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='12800'>
-        <var-decl name='module' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='214' column='1'/>
+        <var-decl name='mod_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='215' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='12864'>
-        <var-decl name='msg' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='215' column='1'/>
+        <var-decl name='module' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='216' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='12928'>
-        <var-decl name='name' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='216' column='1'/>
+        <var-decl name='msg' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='217' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='12992'>
-        <var-decl name='names' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='217' column='1'/>
+        <var-decl name='name' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='218' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='13056'>
-        <var-decl name='op' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='218' column='1'/>
+        <var-decl name='names' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='219' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='13120'>
-        <var-decl name='operand' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='219' column='1'/>
+        <var-decl name='op' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='220' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='13184'>
-        <var-decl name='operator_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='220' column='1'/>
+        <var-decl name='operand' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='221' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='13248'>
-        <var-decl name='ops' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='221' column='1'/>
+        <var-decl name='operator_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='222' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='13312'>
-        <var-decl name='optional_vars' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='222' column='1'/>
+        <var-decl name='ops' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='223' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='13376'>
-        <var-decl name='orelse' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='223' column='1'/>
+        <var-decl name='optional_vars' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='224' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='13440'>
-        <var-decl name='pattern' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='224' column='1'/>
+        <var-decl name='orelse' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='225' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='13504'>
-        <var-decl name='pattern_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='225' column='1'/>
+        <var-decl name='pattern' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='226' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='13568'>
-        <var-decl name='patterns' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='226' column='1'/>
+        <var-decl name='pattern_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='227' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='13632'>
-        <var-decl name='posonlyargs' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='227' column='1'/>
+        <var-decl name='patterns' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='228' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='13696'>
-        <var-decl name='rest' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='228' column='1'/>
+        <var-decl name='posonlyargs' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='229' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='13760'>
-        <var-decl name='returns' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='229' column='1'/>
+        <var-decl name='rest' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='230' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='13824'>
-        <var-decl name='right' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='230' column='1'/>
+        <var-decl name='returns' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='231' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='13888'>
-        <var-decl name='simple' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='231' column='1'/>
+        <var-decl name='right' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='232' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='13952'>
-        <var-decl name='slice' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='232' column='1'/>
+        <var-decl name='simple' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='233' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='14016'>
-        <var-decl name='step' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='233' column='1'/>
+        <var-decl name='slice' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='234' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='14080'>
-        <var-decl name='stmt_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='234' column='1'/>
+        <var-decl name='step' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='235' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='14144'>
-        <var-decl name='subject' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='235' column='1'/>
+        <var-decl name='stmt_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='236' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='14208'>
-        <var-decl name='tag' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='236' column='1'/>
+        <var-decl name='subject' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='237' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='14272'>
-        <var-decl name='target' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='237' column='1'/>
+        <var-decl name='tag' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='238' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='14336'>
-        <var-decl name='targets' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='238' column='1'/>
+        <var-decl name='target' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='239' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='14400'>
-        <var-decl name='test' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='239' column='1'/>
+        <var-decl name='targets' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='240' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='14464'>
-        <var-decl name='type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='240' column='1'/>
+        <var-decl name='test' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='241' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='14528'>
-        <var-decl name='type_comment' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='241' column='1'/>
+        <var-decl name='type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='242' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='14592'>
-        <var-decl name='type_ignore_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='242' column='1'/>
+        <var-decl name='type_comment' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='243' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='14656'>
-        <var-decl name='type_ignores' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='243' column='1'/>
+        <var-decl name='type_ignore_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='244' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='14720'>
-        <var-decl name='unaryop_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='244' column='1'/>
+        <var-decl name='type_ignores' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='245' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='14784'>
-        <var-decl name='upper' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='245' column='1'/>
+        <var-decl name='unaryop_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='246' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='14848'>
-        <var-decl name='value' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='246' column='1'/>
+        <var-decl name='upper' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='247' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='14912'>
-        <var-decl name='values' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='247' column='1'/>
+        <var-decl name='value' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='248' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='14976'>
-        <var-decl name='vararg' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='248' column='1'/>
+        <var-decl name='values' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='249' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='15040'>
-        <var-decl name='withitem_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='249' column='1'/>
+        <var-decl name='vararg' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='250' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='15104'>
+        <var-decl name='withitem_type' type-id='type-id-14' visibility='default' filepath='./Include/internal/pycore_ast_state.h' line='251' column='1'/>
       </data-member>
     </class-decl>
     <class-decl name='type_cache' size-in-bits='786432' is-struct='yes' visibility='default' filepath='./Include/internal/pycore_typeobject.h' line='33' column='1' id='type-id-50'>
@@ -6868,8 +6874,8 @@
     <var-decl name='PyBool_Type' type-id='type-id-112' mangled-name='PyBool_Type' visibility='default' filepath='./Include/boolobject.h' line='10' column='1' elf-symbol-id='PyBool_Type'/>
     <var-decl name='_Py_FalseStruct' type-id='type-id-259' mangled-name='_Py_FalseStruct' visibility='default' filepath='./Include/boolobject.h' line='18' column='1' elf-symbol-id='_Py_FalseStruct'/>
     <var-decl name='_Py_TrueStruct' type-id='type-id-259' mangled-name='_Py_TrueStruct' visibility='default' filepath='./Include/boolobject.h' line='19' column='1' elf-symbol-id='_Py_TrueStruct'/>
-    <function-decl name='PyBool_FromLong' mangled-name='PyBool_FromLong' filepath='Objects/boolobject.c' line='17' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyBool_FromLong'>
-      <parameter type-id='type-id-53' name='ok' filepath='Objects/boolobject.c' line='17' column='1'/>
+    <function-decl name='PyBool_FromLong' mangled-name='PyBool_FromLong' filepath='Objects/boolobject.c' line='18' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyBool_FromLong'>
+      <parameter type-id='type-id-53' name='ok' filepath='Objects/boolobject.c' line='18' column='1'/>
       <return type-id='type-id-14'/>
     </function-decl>
   </abi-instr>
@@ -7479,30 +7485,30 @@
       <return type-id='type-id-8'/>
     </function-decl>
     <pointer-type-def type-id='type-id-8' size-in-bits='64' id='type-id-501'/>
-    <function-decl name='PyCode_Addr2Location' mangled-name='PyCode_Addr2Location' filepath='Objects/codeobject.c' line='966' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyCode_Addr2Location'>
-      <parameter type-id='type-id-444' name='co' filepath='Objects/codeobject.c' line='966' column='1'/>
-      <parameter type-id='type-id-8' name='addrq' filepath='Objects/codeobject.c' line='966' column='1'/>
-      <parameter type-id='type-id-501' name='start_line' filepath='Objects/codeobject.c' line='967' column='1'/>
-      <parameter type-id='type-id-501' name='start_column' filepath='Objects/codeobject.c' line='967' column='1'/>
-      <parameter type-id='type-id-501' name='end_line' filepath='Objects/codeobject.c' line='968' column='1'/>
-      <parameter type-id='type-id-501' name='end_column' filepath='Objects/codeobject.c' line='968' column='1'/>
+    <function-decl name='PyCode_Addr2Location' mangled-name='PyCode_Addr2Location' filepath='Objects/codeobject.c' line='965' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyCode_Addr2Location'>
+      <parameter type-id='type-id-444' name='co' filepath='Objects/codeobject.c' line='965' column='1'/>
+      <parameter type-id='type-id-8' name='addrq' filepath='Objects/codeobject.c' line='965' column='1'/>
+      <parameter type-id='type-id-501' name='start_line' filepath='Objects/codeobject.c' line='966' column='1'/>
+      <parameter type-id='type-id-501' name='start_column' filepath='Objects/codeobject.c' line='966' column='1'/>
+      <parameter type-id='type-id-501' name='end_line' filepath='Objects/codeobject.c' line='967' column='1'/>
+      <parameter type-id='type-id-501' name='end_column' filepath='Objects/codeobject.c' line='967' column='1'/>
       <return type-id='type-id-8'/>
     </function-decl>
     <pointer-type-def type-id='type-id-445' size-in-bits='64' id='type-id-502'/>
-    <function-decl name='_PyCode_CheckLineNumber' mangled-name='_PyCode_CheckLineNumber' filepath='Objects/codeobject.c' line='789' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyCode_CheckLineNumber'>
-      <parameter type-id='type-id-8' name='lasti' filepath='Objects/codeobject.c' line='789' column='1'/>
-      <parameter type-id='type-id-502' name='bounds' filepath='Objects/codeobject.c' line='789' column='1'/>
+    <function-decl name='_PyCode_CheckLineNumber' mangled-name='_PyCode_CheckLineNumber' filepath='Objects/codeobject.c' line='788' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyCode_CheckLineNumber'>
+      <parameter type-id='type-id-8' name='lasti' filepath='Objects/codeobject.c' line='788' column='1'/>
+      <parameter type-id='type-id-502' name='bounds' filepath='Objects/codeobject.c' line='788' column='1'/>
       <return type-id='type-id-8'/>
     </function-decl>
-    <function-decl name='PyCode_Addr2Line' mangled-name='PyCode_Addr2Line' filepath='Objects/codeobject.c' line='751' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyCode_Addr2Line'>
-      <parameter type-id='type-id-444' name='co' filepath='Objects/codeobject.c' line='751' column='1'/>
-      <parameter type-id='type-id-8' name='addrq' filepath='Objects/codeobject.c' line='751' column='1'/>
+    <function-decl name='PyCode_Addr2Line' mangled-name='PyCode_Addr2Line' filepath='Objects/codeobject.c' line='750' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyCode_Addr2Line'>
+      <parameter type-id='type-id-444' name='co' filepath='Objects/codeobject.c' line='750' column='1'/>
+      <parameter type-id='type-id-8' name='addrq' filepath='Objects/codeobject.c' line='750' column='1'/>
       <return type-id='type-id-8'/>
     </function-decl>
-    <function-decl name='PyCode_NewEmpty' mangled-name='PyCode_NewEmpty' filepath='Objects/codeobject.c' line='647' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyCode_NewEmpty'>
-      <parameter type-id='type-id-3' name='filename' filepath='Objects/codeobject.c' line='647' column='1'/>
-      <parameter type-id='type-id-3' name='funcname' filepath='Objects/codeobject.c' line='647' column='1'/>
-      <parameter type-id='type-id-8' name='firstlineno' filepath='Objects/codeobject.c' line='647' column='1'/>
+    <function-decl name='PyCode_NewEmpty' mangled-name='PyCode_NewEmpty' filepath='Objects/codeobject.c' line='646' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyCode_NewEmpty'>
+      <parameter type-id='type-id-3' name='filename' filepath='Objects/codeobject.c' line='646' column='1'/>
+      <parameter type-id='type-id-3' name='funcname' filepath='Objects/codeobject.c' line='646' column='1'/>
+      <parameter type-id='type-id-8' name='firstlineno' filepath='Objects/codeobject.c' line='646' column='1'/>
       <return type-id='type-id-444'/>
     </function-decl>
     <function-decl name='PyCode_New' mangled-name='PyCode_New' filepath='Objects/codeobject.c' line='622' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyCode_New'>
@@ -7988,7 +7994,7 @@
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='Objects/genericaliasobject.c' comp-dir-path='/src' language='LANG_C99'>
     <var-decl name='Py_GenericAliasType' type-id='type-id-112' mangled-name='Py_GenericAliasType' visibility='default' filepath='./Include/genericaliasobject.h' line='9' column='1' elf-symbol-id='Py_GenericAliasType'/>
-    <function-decl name='Py_GenericAlias' mangled-name='Py_GenericAlias' filepath='Objects/genericaliasobject.c' line='942' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='Py_GenericAlias'>
+    <function-decl name='Py_GenericAlias' mangled-name='Py_GenericAlias' filepath='Objects/genericaliasobject.c' line='946' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='Py_GenericAlias'>
       <parameter type-id='type-id-14' name='callable' filepath='Objects/call.c' line='438' column='1'/>
       <parameter type-id='type-id-14' name='args' filepath='Objects/call.c' line='438' column='1'/>
       <return type-id='type-id-14'/>
@@ -8286,60 +8292,60 @@
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='Objects/frameobject.c' comp-dir-path='/src' language='LANG_C99'>
     <var-decl name='PyFrame_Type' type-id='type-id-112' mangled-name='PyFrame_Type' visibility='default' filepath='./Include/cpython/pyframe.h' line='5' column='1' elf-symbol-id='PyFrame_Type'/>
-    <function-decl name='PyFrame_GetGenerator' mangled-name='PyFrame_GetGenerator' filepath='Objects/frameobject.c' line='1172' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyFrame_GetGenerator'>
-      <parameter type-id='type-id-438' name='frame' filepath='Objects/frameobject.c' line='1172' column='1'/>
+    <function-decl name='PyFrame_GetGenerator' mangled-name='PyFrame_GetGenerator' filepath='Objects/frameobject.c' line='1207' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyFrame_GetGenerator'>
+      <parameter type-id='type-id-438' name='frame' filepath='Objects/frameobject.c' line='1207' column='1'/>
       <return type-id='type-id-14'/>
     </function-decl>
-    <function-decl name='PyFrame_GetLasti' mangled-name='PyFrame_GetLasti' filepath='Objects/frameobject.c' line='1162' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyFrame_GetLasti'>
-      <parameter type-id='type-id-438' name='frame' filepath='Objects/frameobject.c' line='1162' column='1'/>
+    <function-decl name='PyFrame_GetLasti' mangled-name='PyFrame_GetLasti' filepath='Objects/frameobject.c' line='1197' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyFrame_GetLasti'>
+      <parameter type-id='type-id-438' name='frame' filepath='Objects/frameobject.c' line='1197' column='1'/>
       <return type-id='type-id-8'/>
     </function-decl>
-    <function-decl name='PyFrame_GetBuiltins' mangled-name='PyFrame_GetBuiltins' filepath='Objects/frameobject.c' line='1156' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyFrame_GetBuiltins'>
+    <function-decl name='PyFrame_GetBuiltins' mangled-name='PyFrame_GetBuiltins' filepath='Objects/frameobject.c' line='1191' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyFrame_GetBuiltins'>
       <parameter type-id='type-id-438' name='f' filepath='Objects/genobject.c' line='1009' column='1'/>
       <return type-id='type-id-14'/>
     </function-decl>
-    <function-decl name='PyFrame_GetGlobals' mangled-name='PyFrame_GetGlobals' filepath='Objects/frameobject.c' line='1150' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyFrame_GetGlobals'>
+    <function-decl name='PyFrame_GetGlobals' mangled-name='PyFrame_GetGlobals' filepath='Objects/frameobject.c' line='1185' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyFrame_GetGlobals'>
       <parameter type-id='type-id-438' name='f' filepath='Objects/genobject.c' line='1009' column='1'/>
       <return type-id='type-id-14'/>
     </function-decl>
-    <function-decl name='PyFrame_GetLocals' mangled-name='PyFrame_GetLocals' filepath='Objects/frameobject.c' line='1144' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyFrame_GetLocals'>
+    <function-decl name='PyFrame_GetLocals' mangled-name='PyFrame_GetLocals' filepath='Objects/frameobject.c' line='1179' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyFrame_GetLocals'>
       <parameter type-id='type-id-438' name='f' filepath='Objects/genobject.c' line='1009' column='1'/>
       <return type-id='type-id-14'/>
     </function-decl>
-    <function-decl name='PyFrame_GetBack' mangled-name='PyFrame_GetBack' filepath='Objects/frameobject.c' line='1132' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyFrame_GetBack'>
-      <parameter type-id='type-id-438' name='frame' filepath='Objects/frameobject.c' line='1132' column='1'/>
+    <function-decl name='PyFrame_GetBack' mangled-name='PyFrame_GetBack' filepath='Objects/frameobject.c' line='1161' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyFrame_GetBack'>
+      <parameter type-id='type-id-438' name='frame' filepath='Objects/frameobject.c' line='1161' column='1'/>
       <return type-id='type-id-438'/>
     </function-decl>
-    <function-decl name='PyFrame_GetCode' mangled-name='PyFrame_GetCode' filepath='Objects/frameobject.c' line='1121' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyFrame_GetCode'>
-      <parameter type-id='type-id-438' name='frame' filepath='Objects/frameobject.c' line='1121' column='1'/>
+    <function-decl name='PyFrame_GetCode' mangled-name='PyFrame_GetCode' filepath='Objects/frameobject.c' line='1150' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyFrame_GetCode'>
+      <parameter type-id='type-id-438' name='frame' filepath='Objects/frameobject.c' line='1150' column='1'/>
       <return type-id='type-id-444'/>
     </function-decl>
-    <function-decl name='_PyFrame_IsEntryFrame' mangled-name='_PyFrame_IsEntryFrame' filepath='Objects/frameobject.c' line='1113' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyFrame_IsEntryFrame'>
-      <parameter type-id='type-id-438' name='frame' filepath='Objects/frameobject.c' line='1113' column='1'/>
+    <function-decl name='_PyFrame_IsEntryFrame' mangled-name='_PyFrame_IsEntryFrame' filepath='Objects/frameobject.c' line='1142' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyFrame_IsEntryFrame'>
+      <parameter type-id='type-id-438' name='frame' filepath='Objects/frameobject.c' line='1142' column='1'/>
       <return type-id='type-id-8'/>
     </function-decl>
-    <function-decl name='PyFrame_LocalsToFast' mangled-name='PyFrame_LocalsToFast' filepath='Objects/frameobject.c' line='1104' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyFrame_LocalsToFast'>
-      <parameter type-id='type-id-438' name='f' filepath='Objects/frameobject.c' line='1104' column='1'/>
-      <parameter type-id='type-id-8' name='clear' filepath='Objects/frameobject.c' line='1104' column='1'/>
+    <function-decl name='PyFrame_LocalsToFast' mangled-name='PyFrame_LocalsToFast' filepath='Objects/frameobject.c' line='1133' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyFrame_LocalsToFast'>
+      <parameter type-id='type-id-438' name='f' filepath='Objects/frameobject.c' line='1133' column='1'/>
+      <parameter type-id='type-id-8' name='clear' filepath='Objects/frameobject.c' line='1133' column='1'/>
       <return type-id='type-id-70'/>
     </function-decl>
-    <function-decl name='PyFrame_FastToLocals' mangled-name='PyFrame_FastToLocals' filepath='Objects/frameobject.c' line='1025' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyFrame_FastToLocals'>
-      <parameter type-id='type-id-438' name='f' filepath='Objects/frameobject.c' line='1025' column='1'/>
+    <function-decl name='PyFrame_FastToLocals' mangled-name='PyFrame_FastToLocals' filepath='Objects/frameobject.c' line='1054' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyFrame_FastToLocals'>
+      <parameter type-id='type-id-438' name='f' filepath='Objects/frameobject.c' line='1054' column='1'/>
       <return type-id='type-id-70'/>
     </function-decl>
-    <function-decl name='PyFrame_FastToLocalsWithError' mangled-name='PyFrame_FastToLocalsWithError' filepath='Objects/frameobject.c' line='1011' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyFrame_FastToLocalsWithError'>
-      <parameter type-id='type-id-438' name='frame' filepath='Objects/frameobject.c' line='1162' column='1'/>
+    <function-decl name='PyFrame_FastToLocalsWithError' mangled-name='PyFrame_FastToLocalsWithError' filepath='Objects/frameobject.c' line='1040' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyFrame_FastToLocalsWithError'>
+      <parameter type-id='type-id-438' name='frame' filepath='Objects/frameobject.c' line='1197' column='1'/>
       <return type-id='type-id-8'/>
     </function-decl>
-    <function-decl name='PyFrame_New' mangled-name='PyFrame_New' filepath='Objects/frameobject.c' line='858' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyFrame_New'>
-      <parameter type-id='type-id-10' name='tstate' filepath='Objects/frameobject.c' line='858' column='1'/>
-      <parameter type-id='type-id-444' name='code' filepath='Objects/frameobject.c' line='858' column='1'/>
-      <parameter type-id='type-id-14' name='globals' filepath='Objects/frameobject.c' line='859' column='1'/>
-      <parameter type-id='type-id-14' name='locals' filepath='Objects/frameobject.c' line='859' column='1'/>
+    <function-decl name='PyFrame_New' mangled-name='PyFrame_New' filepath='Objects/frameobject.c' line='887' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyFrame_New'>
+      <parameter type-id='type-id-10' name='tstate' filepath='Objects/frameobject.c' line='887' column='1'/>
+      <parameter type-id='type-id-444' name='code' filepath='Objects/frameobject.c' line='887' column='1'/>
+      <parameter type-id='type-id-14' name='globals' filepath='Objects/frameobject.c' line='888' column='1'/>
+      <parameter type-id='type-id-14' name='locals' filepath='Objects/frameobject.c' line='888' column='1'/>
       <return type-id='type-id-438'/>
     </function-decl>
     <function-decl name='PyFrame_GetLineNumber' mangled-name='PyFrame_GetLineNumber' filepath='Objects/frameobject.c' line='36' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyFrame_GetLineNumber'>
-      <parameter type-id='type-id-438' name='frame' filepath='Objects/frameobject.c' line='1113' column='1'/>
+      <parameter type-id='type-id-438' name='frame' filepath='Objects/frameobject.c' line='1142' column='1'/>
       <return type-id='type-id-8'/>
     </function-decl>
   </abi-instr>
@@ -11160,7 +11166,7 @@
     </function-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='Python/Python-ast.c' comp-dir-path='/src' language='LANG_C99'>
-    <function-decl name='PyInit__ast' mangled-name='PyInit__ast' filepath='Python/Python-ast.c' line='12225' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyInit__ast'>
+    <function-decl name='PyInit__ast' mangled-name='PyInit__ast' filepath='Python/Python-ast.c' line='12305' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyInit__ast'>
       <return type-id='type-id-14'/>
     </function-decl>
   </abi-instr>
@@ -11175,32 +11181,32 @@
     <var-decl name='PyZip_Type' type-id='type-id-112' mangled-name='PyZip_Type' visibility='default' filepath='./Include/bltinmodule.h' line='9' column='1' elf-symbol-id='PyZip_Type'/>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='Python/ceval.c' comp-dir-path='/src' language='LANG_C99'>
-    <function-decl name='Py_LeaveRecursiveCall' mangled-name='Py_LeaveRecursiveCall' filepath='Python/ceval.c' line='7908' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='Py_LeaveRecursiveCall'>
+    <function-decl name='Py_LeaveRecursiveCall' mangled-name='Py_LeaveRecursiveCall' filepath='Python/ceval.c' line='7954' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='Py_LeaveRecursiveCall'>
       <return type-id='type-id-70'/>
     </function-decl>
-    <function-decl name='Py_EnterRecursiveCall' mangled-name='Py_EnterRecursiveCall' filepath='Python/ceval.c' line='7901' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='Py_EnterRecursiveCall'>
-      <parameter type-id='type-id-3' name='where' filepath='Python/ceval.c' line='7901' column='1'/>
+    <function-decl name='Py_EnterRecursiveCall' mangled-name='Py_EnterRecursiveCall' filepath='Python/ceval.c' line='7947' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='Py_EnterRecursiveCall'>
+      <parameter type-id='type-id-3' name='where' filepath='Python/ceval.c' line='7947' column='1'/>
       <return type-id='type-id-8'/>
     </function-decl>
-    <function-decl name='_PyEval_RequestCodeExtraIndex' mangled-name='_PyEval_RequestCodeExtraIndex' filepath='Python/ceval.c' line='7820' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyEval_RequestCodeExtraIndex'>
-      <parameter type-id='type-id-104' name='free' filepath='Python/ceval.c' line='7820' column='1'/>
+    <function-decl name='_PyEval_RequestCodeExtraIndex' mangled-name='_PyEval_RequestCodeExtraIndex' filepath='Python/ceval.c' line='7866' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyEval_RequestCodeExtraIndex'>
+      <parameter type-id='type-id-104' name='free' filepath='Python/ceval.c' line='7866' column='1'/>
       <return type-id='type-id-36'/>
     </function-decl>
-    <function-decl name='_PyEval_SliceIndexNotNone' mangled-name='_PyEval_SliceIndexNotNone' filepath='Python/ceval.c' line='7340' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyEval_SliceIndexNotNone'>
+    <function-decl name='_PyEval_SliceIndexNotNone' mangled-name='_PyEval_SliceIndexNotNone' filepath='Python/ceval.c' line='7386' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyEval_SliceIndexNotNone'>
       <parameter type-id='type-id-14' name='exc' filepath='Objects/exceptions.c' line='2704' column='1'/>
       <parameter type-id='type-id-168' name='end' filepath='Objects/exceptions.c' line='2704' column='1'/>
       <return type-id='type-id-8'/>
     </function-decl>
-    <function-decl name='_PyEval_SliceIndex' mangled-name='_PyEval_SliceIndex' filepath='Python/ceval.c' line='7318' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyEval_SliceIndex'>
-      <parameter type-id='type-id-14' name='v' filepath='Python/ceval.c' line='7318' column='1'/>
-      <parameter type-id='type-id-168' name='pi' filepath='Python/ceval.c' line='7318' column='1'/>
+    <function-decl name='_PyEval_SliceIndex' mangled-name='_PyEval_SliceIndex' filepath='Python/ceval.c' line='7364' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyEval_SliceIndex'>
+      <parameter type-id='type-id-14' name='v' filepath='Python/ceval.c' line='7364' column='1'/>
+      <parameter type-id='type-id-168' name='pi' filepath='Python/ceval.c' line='7364' column='1'/>
       <return type-id='type-id-8'/>
     </function-decl>
-    <function-decl name='PyEval_GetFuncDesc' mangled-name='PyEval_GetFuncDesc' filepath='Python/ceval.c' line='7191' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyEval_GetFuncDesc'>
+    <function-decl name='PyEval_GetFuncDesc' mangled-name='PyEval_GetFuncDesc' filepath='Python/ceval.c' line='7237' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyEval_GetFuncDesc'>
       <parameter type-id='type-id-14' name='ob' filepath='Objects/exceptions.c' line='421' column='1'/>
       <return type-id='type-id-3'/>
     </function-decl>
-    <function-decl name='PyEval_GetFuncName' mangled-name='PyEval_GetFuncName' filepath='Python/ceval.c' line='7178' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyEval_GetFuncName'>
+    <function-decl name='PyEval_GetFuncName' mangled-name='PyEval_GetFuncName' filepath='Python/ceval.c' line='7224' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyEval_GetFuncName'>
       <parameter type-id='type-id-14' name='ob' filepath='Objects/exceptions.c' line='421' column='1'/>
       <return type-id='type-id-3'/>
     </function-decl>
@@ -11214,33 +11220,33 @@
     </class-decl>
     <typedef-decl name='PyCompilerFlags' type-id='type-id-592' filepath='./Include/cpython/compile.h' line='29' column='1' id='type-id-591'/>
     <pointer-type-def type-id='type-id-591' size-in-bits='64' id='type-id-593'/>
-    <function-decl name='PyEval_MergeCompilerFlags' mangled-name='PyEval_MergeCompilerFlags' filepath='Python/ceval.c' line='7159' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyEval_MergeCompilerFlags'>
-      <parameter type-id='type-id-593' name='cf' filepath='Python/ceval.c' line='7159' column='1'/>
+    <function-decl name='PyEval_MergeCompilerFlags' mangled-name='PyEval_MergeCompilerFlags' filepath='Python/ceval.c' line='7205' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyEval_MergeCompilerFlags'>
+      <parameter type-id='type-id-593' name='cf' filepath='Python/ceval.c' line='7205' column='1'/>
       <return type-id='type-id-8'/>
     </function-decl>
-    <function-decl name='PyEval_GetGlobals' mangled-name='PyEval_GetGlobals' filepath='Python/ceval.c' line='7148' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyEval_GetGlobals'>
+    <function-decl name='PyEval_GetGlobals' mangled-name='PyEval_GetGlobals' filepath='Python/ceval.c' line='7194' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyEval_GetGlobals'>
       <return type-id='type-id-14'/>
     </function-decl>
-    <function-decl name='PyEval_GetLocals' mangled-name='PyEval_GetLocals' filepath='Python/ceval.c' line='7129' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyEval_GetLocals'>
+    <function-decl name='PyEval_GetLocals' mangled-name='PyEval_GetLocals' filepath='Python/ceval.c' line='7175' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyEval_GetLocals'>
       <return type-id='type-id-14'/>
     </function-decl>
-    <function-decl name='_PyEval_GetBuiltinId' mangled-name='_PyEval_GetBuiltinId' filepath='Python/ceval.c' line='7123' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyEval_GetBuiltinId'>
-      <parameter type-id='type-id-499' name='name' filepath='Python/ceval.c' line='7123' column='1'/>
+    <function-decl name='_PyEval_GetBuiltinId' mangled-name='_PyEval_GetBuiltinId' filepath='Python/ceval.c' line='7169' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyEval_GetBuiltinId'>
+      <parameter type-id='type-id-499' name='name' filepath='Python/ceval.c' line='7169' column='1'/>
       <return type-id='type-id-14'/>
     </function-decl>
-    <function-decl name='_PyEval_GetBuiltin' mangled-name='_PyEval_GetBuiltin' filepath='Python/ceval.c' line='7109' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyEval_GetBuiltin'>
+    <function-decl name='_PyEval_GetBuiltin' mangled-name='_PyEval_GetBuiltin' filepath='Python/ceval.c' line='7155' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyEval_GetBuiltin'>
       <parameter type-id='type-id-14' name='v' filepath='Objects/abstract.c' line='2122' column='1'/>
       <return type-id='type-id-14'/>
     </function-decl>
-    <function-decl name='PyEval_GetBuiltins' mangled-name='PyEval_GetBuiltins' filepath='Python/ceval.c' line='7101' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyEval_GetBuiltins'>
+    <function-decl name='PyEval_GetBuiltins' mangled-name='PyEval_GetBuiltins' filepath='Python/ceval.c' line='7147' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyEval_GetBuiltins'>
       <return type-id='type-id-14'/>
     </function-decl>
-    <function-decl name='PyEval_GetFrame' mangled-name='PyEval_GetFrame' filepath='Python/ceval.c' line='7077' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyEval_GetFrame'>
+    <function-decl name='PyEval_GetFrame' mangled-name='PyEval_GetFrame' filepath='Python/ceval.c' line='7123' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyEval_GetFrame'>
       <return type-id='type-id-438'/>
     </function-decl>
-    <function-decl name='PyEval_SetTrace' mangled-name='PyEval_SetTrace' filepath='Python/ceval.c' line='6997' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyEval_SetTrace'>
-      <parameter type-id='type-id-13' name='func' filepath='Python/ceval.c' line='6997' column='1'/>
-      <parameter type-id='type-id-14' name='arg' filepath='Python/ceval.c' line='6997' column='1'/>
+    <function-decl name='PyEval_SetTrace' mangled-name='PyEval_SetTrace' filepath='Python/ceval.c' line='7043' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyEval_SetTrace'>
+      <parameter type-id='type-id-13' name='func' filepath='Python/ceval.c' line='7043' column='1'/>
+      <parameter type-id='type-id-14' name='arg' filepath='Python/ceval.c' line='7043' column='1'/>
       <return type-id='type-id-70'/>
     </function-decl>
     <class-decl name='_ts' size-in-bits='2880' is-struct='yes' visibility='default' filepath='./Include/cpython/pystate.h' line='82' column='1' id='type-id-594'>
@@ -11366,51 +11372,51 @@
       </data-member>
     </class-decl>
     <pointer-type-def type-id='type-id-24' size-in-bits='64' id='type-id-595'/>
-    <function-decl name='_PyEval_SetTrace' mangled-name='_PyEval_SetTrace' filepath='Python/ceval.c' line='6965' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyEval_SetTrace'>
-      <parameter type-id='type-id-10' name='tstate' filepath='Python/ceval.c' line='6965' column='1'/>
-      <parameter type-id='type-id-13' name='func' filepath='Python/ceval.c' line='6965' column='1'/>
-      <parameter type-id='type-id-14' name='arg' filepath='Python/ceval.c' line='6965' column='1'/>
+    <function-decl name='_PyEval_SetTrace' mangled-name='_PyEval_SetTrace' filepath='Python/ceval.c' line='7000' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyEval_SetTrace'>
+      <parameter type-id='type-id-10' name='tstate' filepath='Python/ceval.c' line='7000' column='1'/>
+      <parameter type-id='type-id-13' name='func' filepath='Python/ceval.c' line='7000' column='1'/>
+      <parameter type-id='type-id-14' name='arg' filepath='Python/ceval.c' line='7000' column='1'/>
       <return type-id='type-id-8'/>
     </function-decl>
-    <function-decl name='PyEval_SetProfile' mangled-name='PyEval_SetProfile' filepath='Python/ceval.c' line='6955' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyEval_SetProfile'>
-      <parameter type-id='type-id-13' name='func' filepath='Python/ceval.c' line='6997' column='1'/>
-      <parameter type-id='type-id-14' name='arg' filepath='Python/ceval.c' line='6997' column='1'/>
+    <function-decl name='PyEval_SetProfile' mangled-name='PyEval_SetProfile' filepath='Python/ceval.c' line='6990' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyEval_SetProfile'>
+      <parameter type-id='type-id-13' name='func' filepath='Python/ceval.c' line='7043' column='1'/>
+      <parameter type-id='type-id-14' name='arg' filepath='Python/ceval.c' line='7043' column='1'/>
       <return type-id='type-id-70'/>
     </function-decl>
-    <function-decl name='_PyEval_SetProfile' mangled-name='_PyEval_SetProfile' filepath='Python/ceval.c' line='6924' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyEval_SetProfile'>
-      <parameter type-id='type-id-10' name='tstate' filepath='Python/ceval.c' line='6965' column='1'/>
-      <parameter type-id='type-id-13' name='func' filepath='Python/ceval.c' line='6965' column='1'/>
-      <parameter type-id='type-id-14' name='arg' filepath='Python/ceval.c' line='6965' column='1'/>
+    <function-decl name='_PyEval_SetProfile' mangled-name='_PyEval_SetProfile' filepath='Python/ceval.c' line='6948' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyEval_SetProfile'>
+      <parameter type-id='type-id-10' name='tstate' filepath='Python/ceval.c' line='7000' column='1'/>
+      <parameter type-id='type-id-13' name='func' filepath='Python/ceval.c' line='7000' column='1'/>
+      <parameter type-id='type-id-14' name='arg' filepath='Python/ceval.c' line='7000' column='1'/>
       <return type-id='type-id-8'/>
     </function-decl>
-    <function-decl name='PyThreadState_LeaveTracing' mangled-name='PyThreadState_LeaveTracing' filepath='Python/ceval.c' line='6828' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyThreadState_LeaveTracing'>
+    <function-decl name='PyThreadState_LeaveTracing' mangled-name='PyThreadState_LeaveTracing' filepath='Python/ceval.c' line='6852' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyThreadState_LeaveTracing'>
       <parameter type-id='type-id-10' name='tstate' filepath='Objects/object.c' line='2291' column='1'/>
       <return type-id='type-id-70'/>
     </function-decl>
-    <function-decl name='PyThreadState_EnterTracing' mangled-name='PyThreadState_EnterTracing' filepath='Python/ceval.c' line='6822' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyThreadState_EnterTracing'>
+    <function-decl name='PyThreadState_EnterTracing' mangled-name='PyThreadState_EnterTracing' filepath='Python/ceval.c' line='6846' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyThreadState_EnterTracing'>
       <parameter type-id='type-id-10' name='tstate' filepath='Objects/object.c' line='2291' column='1'/>
       <return type-id='type-id-70'/>
     </function-decl>
-    <function-decl name='PyEval_EvalCodeEx' mangled-name='PyEval_EvalCodeEx' filepath='Python/ceval.c' line='6425' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyEval_EvalCodeEx'>
-      <parameter type-id='type-id-14' name='_co' filepath='Python/ceval.c' line='6425' column='1'/>
-      <parameter type-id='type-id-14' name='globals' filepath='Python/ceval.c' line='6425' column='1'/>
-      <parameter type-id='type-id-14' name='locals' filepath='Python/ceval.c' line='6425' column='1'/>
-      <parameter type-id='type-id-200' name='args' filepath='Python/ceval.c' line='6426' column='1'/>
-      <parameter type-id='type-id-8' name='argcount' filepath='Python/ceval.c' line='6426' column='1'/>
-      <parameter type-id='type-id-200' name='kws' filepath='Python/ceval.c' line='6427' column='1'/>
-      <parameter type-id='type-id-8' name='kwcount' filepath='Python/ceval.c' line='6427' column='1'/>
-      <parameter type-id='type-id-200' name='defs' filepath='Python/ceval.c' line='6428' column='1'/>
-      <parameter type-id='type-id-8' name='defcount' filepath='Python/ceval.c' line='6428' column='1'/>
-      <parameter type-id='type-id-14' name='kwdefs' filepath='Python/ceval.c' line='6429' column='1'/>
-      <parameter type-id='type-id-14' name='closure' filepath='Python/ceval.c' line='6429' column='1'/>
+    <function-decl name='PyEval_EvalCodeEx' mangled-name='PyEval_EvalCodeEx' filepath='Python/ceval.c' line='6449' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyEval_EvalCodeEx'>
+      <parameter type-id='type-id-14' name='_co' filepath='Python/ceval.c' line='6449' column='1'/>
+      <parameter type-id='type-id-14' name='globals' filepath='Python/ceval.c' line='6449' column='1'/>
+      <parameter type-id='type-id-14' name='locals' filepath='Python/ceval.c' line='6449' column='1'/>
+      <parameter type-id='type-id-200' name='args' filepath='Python/ceval.c' line='6450' column='1'/>
+      <parameter type-id='type-id-8' name='argcount' filepath='Python/ceval.c' line='6450' column='1'/>
+      <parameter type-id='type-id-200' name='kws' filepath='Python/ceval.c' line='6451' column='1'/>
+      <parameter type-id='type-id-8' name='kwcount' filepath='Python/ceval.c' line='6451' column='1'/>
+      <parameter type-id='type-id-200' name='defs' filepath='Python/ceval.c' line='6452' column='1'/>
+      <parameter type-id='type-id-8' name='defcount' filepath='Python/ceval.c' line='6452' column='1'/>
+      <parameter type-id='type-id-14' name='kwdefs' filepath='Python/ceval.c' line='6453' column='1'/>
+      <parameter type-id='type-id-14' name='closure' filepath='Python/ceval.c' line='6453' column='1'/>
       <return type-id='type-id-14'/>
     </function-decl>
     <typedef-decl name='_PyInterpreterFrame' type-id='type-id-375' filepath='./Include/internal/pycore_frame.h' line='67' column='1' id='type-id-596'/>
     <pointer-type-def type-id='type-id-596' size-in-bits='64' id='type-id-597'/>
-    <function-decl name='_PyEval_EvalFrameDefault' mangled-name='_PyEval_EvalFrameDefault' filepath='Python/ceval.c' line='1643' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyEval_EvalFrameDefault'>
-      <parameter type-id='type-id-10' name='tstate' filepath='Python/ceval.c' line='1643' column='1'/>
-      <parameter type-id='type-id-597' name='frame' filepath='Python/ceval.c' line='1643' column='1'/>
-      <parameter type-id='type-id-8' name='throwflag' filepath='Python/ceval.c' line='1643' column='1'/>
+    <function-decl name='_PyEval_EvalFrameDefault' mangled-name='_PyEval_EvalFrameDefault' filepath='Python/ceval.c' line='1647' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyEval_EvalFrameDefault'>
+      <parameter type-id='type-id-10' name='tstate' filepath='Python/ceval.c' line='1647' column='1'/>
+      <parameter type-id='type-id-597' name='frame' filepath='Python/ceval.c' line='1647' column='1'/>
+      <parameter type-id='type-id-8' name='throwflag' filepath='Python/ceval.c' line='1647' column='1'/>
       <return type-id='type-id-14'/>
     </function-decl>
     <function-decl name='PyEval_EvalFrameEx' mangled-name='PyEval_EvalFrameEx' filepath='Python/ceval.c' line='1171' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyEval_EvalFrameEx'>
@@ -11419,7 +11425,7 @@
       <return type-id='type-id-14'/>
     </function-decl>
     <function-decl name='PyEval_EvalFrame' mangled-name='PyEval_EvalFrame' filepath='Python/ceval.c' line='1163' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyEval_EvalFrame'>
-      <parameter type-id='type-id-438' name='frame' filepath='Objects/frameobject.c' line='1172' column='1'/>
+      <parameter type-id='type-id-438' name='frame' filepath='Objects/frameobject.c' line='1207' column='1'/>
       <return type-id='type-id-14'/>
     </function-decl>
     <function-decl name='PyEval_EvalCode' mangled-name='PyEval_EvalCode' filepath='Python/ceval.c' line='1130' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyEval_EvalCode'>
@@ -11631,12 +11637,11 @@
     <qualified-type-def type-id='type-id-598' const='yes' id='type-id-599'/>
     <var-decl name='_PyOpcode_Caches' type-id='type-id-599' visibility='default' filepath='./Include/internal/pycore_opcode.h' line='15' column='1'/>
     <var-decl name='_PyOpcode_Deopt' type-id='type-id-599' visibility='default' filepath='./Include/internal/pycore_opcode.h' line='17' column='1'/>
-    <var-decl name='_PyOpcode_Original' type-id='type-id-599' visibility='default' filepath='./Include/internal/pycore_opcode.h' line='19' column='1'/>
-    <function-decl name='PyCode_Optimize' mangled-name='PyCode_Optimize' filepath='Python/compile.c' line='9363' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyCode_Optimize'>
-      <parameter type-id='type-id-14' name='code' filepath='Python/compile.c' line='9363' column='1'/>
-      <parameter type-id='type-id-14' name='_unused_consts' filepath='Python/compile.c' line='9363' column='1'/>
-      <parameter type-id='type-id-14' name='_unused_names' filepath='Python/compile.c' line='9364' column='1'/>
-      <parameter type-id='type-id-14' name='_unused_lnotab_obj' filepath='Python/compile.c' line='9364' column='1'/>
+    <function-decl name='PyCode_Optimize' mangled-name='PyCode_Optimize' filepath='Python/compile.c' line='9389' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyCode_Optimize'>
+      <parameter type-id='type-id-14' name='code' filepath='Python/compile.c' line='9389' column='1'/>
+      <parameter type-id='type-id-14' name='_unused_consts' filepath='Python/compile.c' line='9389' column='1'/>
+      <parameter type-id='type-id-14' name='_unused_names' filepath='Python/compile.c' line='9390' column='1'/>
+      <parameter type-id='type-id-14' name='_unused_lnotab_obj' filepath='Python/compile.c' line='9390' column='1'/>
       <return type-id='type-id-14'/>
     </function-decl>
     <function-decl name='PyCompile_OpcodeStackEffect' mangled-name='PyCompile_OpcodeStackEffect' filepath='Python/compile.c' line='1206' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyCompile_OpcodeStackEffect'>
@@ -13284,43 +13289,43 @@
     </function-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='Python/getargs.c' comp-dir-path='/src' language='LANG_C99'>
-    <function-decl name='_PyArg_NoKwnames' mangled-name='_PyArg_NoKwnames' filepath='Python/getargs.c' line='2923' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyArg_NoKwnames'>
-      <parameter type-id='type-id-3' name='funcname' filepath='Python/getargs.c' line='2923' column='1'/>
-      <parameter type-id='type-id-14' name='kwnames' filepath='Python/getargs.c' line='2923' column='1'/>
+    <function-decl name='_PyArg_NoKwnames' mangled-name='_PyArg_NoKwnames' filepath='Python/getargs.c' line='2921' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyArg_NoKwnames'>
+      <parameter type-id='type-id-3' name='funcname' filepath='Python/getargs.c' line='2921' column='1'/>
+      <parameter type-id='type-id-14' name='kwnames' filepath='Python/getargs.c' line='2921' column='1'/>
       <return type-id='type-id-8'/>
     </function-decl>
-    <function-decl name='_PyArg_NoPositional' mangled-name='_PyArg_NoPositional' filepath='Python/getargs.c' line='2906' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyArg_NoPositional'>
-      <parameter type-id='type-id-3' name='funcname' filepath='Python/getargs.c' line='2923' column='1'/>
-      <parameter type-id='type-id-14' name='kwnames' filepath='Python/getargs.c' line='2923' column='1'/>
+    <function-decl name='_PyArg_NoPositional' mangled-name='_PyArg_NoPositional' filepath='Python/getargs.c' line='2904' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyArg_NoPositional'>
+      <parameter type-id='type-id-3' name='funcname' filepath='Python/getargs.c' line='2921' column='1'/>
+      <parameter type-id='type-id-14' name='kwnames' filepath='Python/getargs.c' line='2921' column='1'/>
       <return type-id='type-id-8'/>
     </function-decl>
-    <function-decl name='_PyArg_NoKeywords' mangled-name='_PyArg_NoKeywords' filepath='Python/getargs.c' line='2887' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyArg_NoKeywords'>
-      <parameter type-id='type-id-3' name='funcname' filepath='Python/getargs.c' line='2923' column='1'/>
-      <parameter type-id='type-id-14' name='kwnames' filepath='Python/getargs.c' line='2923' column='1'/>
+    <function-decl name='_PyArg_NoKeywords' mangled-name='_PyArg_NoKeywords' filepath='Python/getargs.c' line='2885' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyArg_NoKeywords'>
+      <parameter type-id='type-id-3' name='funcname' filepath='Python/getargs.c' line='2921' column='1'/>
+      <parameter type-id='type-id-14' name='kwnames' filepath='Python/getargs.c' line='2921' column='1'/>
       <return type-id='type-id-8'/>
     </function-decl>
-    <function-decl name='_PyArg_UnpackStack' mangled-name='_PyArg_UnpackStack' filepath='Python/getargs.c' line='2860' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyArg_UnpackStack'>
-      <parameter type-id='type-id-200' name='args' filepath='Python/getargs.c' line='2860' column='1'/>
-      <parameter type-id='type-id-36' name='nargs' filepath='Python/getargs.c' line='2860' column='1'/>
-      <parameter type-id='type-id-3' name='name' filepath='Python/getargs.c' line='2860' column='1'/>
-      <parameter type-id='type-id-36' name='min' filepath='Python/getargs.c' line='2861' column='1'/>
-      <parameter type-id='type-id-36' name='max' filepath='Python/getargs.c' line='2861' column='1'/>
+    <function-decl name='_PyArg_UnpackStack' mangled-name='_PyArg_UnpackStack' filepath='Python/getargs.c' line='2858' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyArg_UnpackStack'>
+      <parameter type-id='type-id-200' name='args' filepath='Python/getargs.c' line='2858' column='1'/>
+      <parameter type-id='type-id-36' name='nargs' filepath='Python/getargs.c' line='2858' column='1'/>
+      <parameter type-id='type-id-3' name='name' filepath='Python/getargs.c' line='2858' column='1'/>
+      <parameter type-id='type-id-36' name='min' filepath='Python/getargs.c' line='2859' column='1'/>
+      <parameter type-id='type-id-36' name='max' filepath='Python/getargs.c' line='2859' column='1'/>
       <parameter is-variadic='yes'/>
       <return type-id='type-id-8'/>
     </function-decl>
-    <function-decl name='PyArg_UnpackTuple' mangled-name='PyArg_UnpackTuple' filepath='Python/getargs.c' line='2834' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyArg_UnpackTuple'>
-      <parameter type-id='type-id-14' name='args' filepath='Python/getargs.c' line='2834' column='1'/>
-      <parameter type-id='type-id-3' name='name' filepath='Python/getargs.c' line='2834' column='1'/>
-      <parameter type-id='type-id-36' name='min' filepath='Python/getargs.c' line='2834' column='1'/>
-      <parameter type-id='type-id-36' name='max' filepath='Python/getargs.c' line='2834' column='1'/>
+    <function-decl name='PyArg_UnpackTuple' mangled-name='PyArg_UnpackTuple' filepath='Python/getargs.c' line='2832' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyArg_UnpackTuple'>
+      <parameter type-id='type-id-14' name='args' filepath='Python/getargs.c' line='2832' column='1'/>
+      <parameter type-id='type-id-3' name='name' filepath='Python/getargs.c' line='2832' column='1'/>
+      <parameter type-id='type-id-36' name='min' filepath='Python/getargs.c' line='2832' column='1'/>
+      <parameter type-id='type-id-36' name='max' filepath='Python/getargs.c' line='2832' column='1'/>
       <parameter is-variadic='yes'/>
       <return type-id='type-id-8'/>
     </function-decl>
-    <function-decl name='_PyArg_CheckPositional' mangled-name='_PyArg_CheckPositional' filepath='Python/getargs.c' line='2772' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyArg_CheckPositional'>
-      <parameter type-id='type-id-3' name='name' filepath='Python/getargs.c' line='2772' column='1'/>
-      <parameter type-id='type-id-36' name='nargs' filepath='Python/getargs.c' line='2772' column='1'/>
-      <parameter type-id='type-id-36' name='min' filepath='Python/getargs.c' line='2773' column='1'/>
-      <parameter type-id='type-id-36' name='max' filepath='Python/getargs.c' line='2773' column='1'/>
+    <function-decl name='_PyArg_CheckPositional' mangled-name='_PyArg_CheckPositional' filepath='Python/getargs.c' line='2770' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyArg_CheckPositional'>
+      <parameter type-id='type-id-3' name='name' filepath='Python/getargs.c' line='2770' column='1'/>
+      <parameter type-id='type-id-36' name='nargs' filepath='Python/getargs.c' line='2770' column='1'/>
+      <parameter type-id='type-id-36' name='min' filepath='Python/getargs.c' line='2771' column='1'/>
+      <parameter type-id='type-id-36' name='max' filepath='Python/getargs.c' line='2771' column='1'/>
       <return type-id='type-id-8'/>
     </function-decl>
     <class-decl name='_PyArg_Parser' size-in-bits='512' is-struct='yes' visibility='default' filepath='./Include/cpython/modsupport.h' line='51' column='1' id='type-id-766'>
@@ -13607,7 +13612,7 @@
         <var-decl name='value' type-id='type-id-18' visibility='default' filepath='./Include/internal/pycore_hashtable.h' line='34' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='Py_uhash_t' type-id='type-id-54' filepath='./Include/pyport.h' line='196' column='1' id='type-id-785'/>
+    <typedef-decl name='Py_uhash_t' type-id='type-id-54' filepath='./Include/pyport.h' line='148' column='1' id='type-id-785'/>
     <typedef-decl name='_Py_hashtable_entry_t' type-id='type-id-784' filepath='./Include/internal/pycore_hashtable.h' line='35' column='1' id='type-id-783'/>
     <pointer-type-def type-id='type-id-783' size-in-bits='64' id='type-id-786'/>
     <typedef-decl name='_Py_hashtable_t' type-id='type-id-770' filepath='./Include/internal/pycore_hashtable.h' line='42' column='1' id='type-id-787'/>
@@ -13894,7 +13899,7 @@
     <var-decl name='Py_UnbufferedStdioFlag' type-id='type-id-8' mangled-name='Py_UnbufferedStdioFlag' visibility='default' filepath='./Include/cpython/pydebug.h' line='20' column='1' elf-symbol-id='Py_UnbufferedStdioFlag'/>
     <var-decl name='Py_HashRandomizationFlag' type-id='type-id-8' mangled-name='Py_HashRandomizationFlag' visibility='default' filepath='./Include/cpython/pydebug.h' line='21' column='1' elf-symbol-id='Py_HashRandomizationFlag'/>
     <var-decl name='Py_IsolatedFlag' type-id='type-id-8' mangled-name='Py_IsolatedFlag' visibility='default' filepath='./Include/cpython/pydebug.h' line='22' column='1' elf-symbol-id='Py_IsolatedFlag'/>
-    <function-decl name='_Py_GetConfigsAsDict' mangled-name='_Py_GetConfigsAsDict' filepath='Python/initconfig.c' line='2964' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Py_GetConfigsAsDict'>
+    <function-decl name='_Py_GetConfigsAsDict' mangled-name='_Py_GetConfigsAsDict' filepath='Python/initconfig.c' line='2967' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Py_GetConfigsAsDict'>
       <return type-id='type-id-14'/>
     </function-decl>
     <class-decl name='__anonymous_struct__' size-in-bits='256' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-806' visibility='default' filepath='./Include/cpython/initconfig.h' line='10' column='1' id='type-id-807'>
@@ -13919,30 +13924,30 @@
     </enum-decl>
     <typedef-decl name='PyStatus' type-id='type-id-807' filepath='./Include/cpython/initconfig.h' line='19' column='1' id='type-id-806'/>
     <pointer-type-def type-id='type-id-34' size-in-bits='64' id='type-id-809'/>
-    <function-decl name='PyConfig_Read' mangled-name='PyConfig_Read' filepath='Python/initconfig.c' line='2957' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyConfig_Read'>
-      <parameter type-id='type-id-809' name='config' filepath='Python/initconfig.c' line='2957' column='1'/>
+    <function-decl name='PyConfig_Read' mangled-name='PyConfig_Read' filepath='Python/initconfig.c' line='2960' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyConfig_Read'>
+      <parameter type-id='type-id-809' name='config' filepath='Python/initconfig.c' line='2960' column='1'/>
       <return type-id='type-id-806'/>
     </function-decl>
     <pointer-type-def type-id='type-id-372' size-in-bits='64' id='type-id-810'/>
-    <function-decl name='PyConfig_SetWideStringList' mangled-name='PyConfig_SetWideStringList' filepath='Python/initconfig.c' line='2873' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyConfig_SetWideStringList'>
-      <parameter type-id='type-id-809' name='config' filepath='Python/initconfig.c' line='2873' column='1'/>
-      <parameter type-id='type-id-810' name='list' filepath='Python/initconfig.c' line='2873' column='1'/>
-      <parameter type-id='type-id-36' name='length' filepath='Python/initconfig.c' line='2874' column='1'/>
-      <parameter type-id='type-id-374' name='items' filepath='Python/initconfig.c' line='2874' column='1'/>
+    <function-decl name='PyConfig_SetWideStringList' mangled-name='PyConfig_SetWideStringList' filepath='Python/initconfig.c' line='2876' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyConfig_SetWideStringList'>
+      <parameter type-id='type-id-809' name='config' filepath='Python/initconfig.c' line='2876' column='1'/>
+      <parameter type-id='type-id-810' name='list' filepath='Python/initconfig.c' line='2876' column='1'/>
+      <parameter type-id='type-id-36' name='length' filepath='Python/initconfig.c' line='2877' column='1'/>
+      <parameter type-id='type-id-374' name='items' filepath='Python/initconfig.c' line='2877' column='1'/>
       <return type-id='type-id-806'/>
     </function-decl>
     <qualified-type-def type-id='type-id-281' const='yes' id='type-id-811'/>
     <pointer-type-def type-id='type-id-811' size-in-bits='64' id='type-id-812'/>
-    <function-decl name='PyConfig_SetArgv' mangled-name='PyConfig_SetArgv' filepath='Python/initconfig.c' line='2861' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyConfig_SetArgv'>
-      <parameter type-id='type-id-809' name='config' filepath='Python/initconfig.c' line='2861' column='1'/>
-      <parameter type-id='type-id-36' name='argc' filepath='Python/initconfig.c' line='2861' column='1'/>
-      <parameter type-id='type-id-812' name='argv' filepath='Python/initconfig.c' line='2861' column='1'/>
+    <function-decl name='PyConfig_SetArgv' mangled-name='PyConfig_SetArgv' filepath='Python/initconfig.c' line='2864' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyConfig_SetArgv'>
+      <parameter type-id='type-id-809' name='config' filepath='Python/initconfig.c' line='2864' column='1'/>
+      <parameter type-id='type-id-36' name='argc' filepath='Python/initconfig.c' line='2864' column='1'/>
+      <parameter type-id='type-id-812' name='argv' filepath='Python/initconfig.c' line='2864' column='1'/>
       <return type-id='type-id-806'/>
     </function-decl>
-    <function-decl name='PyConfig_SetBytesArgv' mangled-name='PyConfig_SetBytesArgv' filepath='Python/initconfig.c' line='2849' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyConfig_SetBytesArgv'>
-      <parameter type-id='type-id-809' name='config' filepath='Python/initconfig.c' line='2849' column='1'/>
-      <parameter type-id='type-id-36' name='argc' filepath='Python/initconfig.c' line='2849' column='1'/>
-      <parameter type-id='type-id-477' name='argv' filepath='Python/initconfig.c' line='2849' column='1'/>
+    <function-decl name='PyConfig_SetBytesArgv' mangled-name='PyConfig_SetBytesArgv' filepath='Python/initconfig.c' line='2852' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyConfig_SetBytesArgv'>
+      <parameter type-id='type-id-809' name='config' filepath='Python/initconfig.c' line='2852' column='1'/>
+      <parameter type-id='type-id-36' name='argc' filepath='Python/initconfig.c' line='2852' column='1'/>
+      <parameter type-id='type-id-477' name='argv' filepath='Python/initconfig.c' line='2852' column='1'/>
       <return type-id='type-id-806'/>
     </function-decl>
     <function-decl name='_PyConfig_FromDict' mangled-name='_PyConfig_FromDict' filepath='Python/initconfig.c' line='1270' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyConfig_FromDict'>
@@ -14922,7 +14927,7 @@
       <return type-id='type-id-14'/>
     </function-decl>
     <function-decl name='PyRun_SimpleString' mangled-name='PyRun_SimpleString' filepath='Python/pythonrun.c' line='1976' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyRun_SimpleString'>
-      <parameter type-id='type-id-3' name='where' filepath='Python/ceval.c' line='7901' column='1'/>
+      <parameter type-id='type-id-3' name='where' filepath='Python/ceval.c' line='7947' column='1'/>
       <return type-id='type-id-8'/>
     </function-decl>
     <function-decl name='PyRun_String' mangled-name='PyRun_String' filepath='Python/pythonrun.c' line='1969' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyRun_String'>
@@ -15562,60 +15567,60 @@
     </function-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='./Python/sysmodule.c' comp-dir-path='/src' language='LANG_C99'>
-    <function-decl name='PySys_FormatStderr' mangled-name='PySys_FormatStderr' filepath='./Python/sysmodule.c' line='3452' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PySys_FormatStderr'>
-      <parameter type-id='type-id-3' name='format' filepath='./Python/sysmodule.c' line='3452' column='1'/>
+    <function-decl name='PySys_FormatStderr' mangled-name='PySys_FormatStderr' filepath='./Python/sysmodule.c' line='3462' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PySys_FormatStderr'>
+      <parameter type-id='type-id-3' name='format' filepath='./Python/sysmodule.c' line='3462' column='1'/>
       <parameter is-variadic='yes'/>
       <return type-id='type-id-70'/>
     </function-decl>
-    <function-decl name='PySys_FormatStdout' mangled-name='PySys_FormatStdout' filepath='./Python/sysmodule.c' line='3442' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PySys_FormatStdout'>
-      <parameter type-id='type-id-3' name='format' filepath='./Python/sysmodule.c' line='3452' column='1'/>
+    <function-decl name='PySys_FormatStdout' mangled-name='PySys_FormatStdout' filepath='./Python/sysmodule.c' line='3452' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PySys_FormatStdout'>
+      <parameter type-id='type-id-3' name='format' filepath='./Python/sysmodule.c' line='3462' column='1'/>
       <parameter is-variadic='yes'/>
       <return type-id='type-id-70'/>
     </function-decl>
-    <function-decl name='PySys_WriteStderr' mangled-name='PySys_WriteStderr' filepath='./Python/sysmodule.c' line='3409' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PySys_WriteStderr'>
-      <parameter type-id='type-id-3' name='format' filepath='./Python/sysmodule.c' line='3452' column='1'/>
+    <function-decl name='PySys_WriteStderr' mangled-name='PySys_WriteStderr' filepath='./Python/sysmodule.c' line='3419' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PySys_WriteStderr'>
+      <parameter type-id='type-id-3' name='format' filepath='./Python/sysmodule.c' line='3462' column='1'/>
       <parameter is-variadic='yes'/>
       <return type-id='type-id-70'/>
     </function-decl>
-    <function-decl name='PySys_WriteStdout' mangled-name='PySys_WriteStdout' filepath='./Python/sysmodule.c' line='3399' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PySys_WriteStdout'>
-      <parameter type-id='type-id-3' name='format' filepath='./Python/sysmodule.c' line='3452' column='1'/>
+    <function-decl name='PySys_WriteStdout' mangled-name='PySys_WriteStdout' filepath='./Python/sysmodule.c' line='3409' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PySys_WriteStdout'>
+      <parameter type-id='type-id-3' name='format' filepath='./Python/sysmodule.c' line='3462' column='1'/>
       <parameter is-variadic='yes'/>
       <return type-id='type-id-70'/>
     </function-decl>
-    <function-decl name='PySys_SetArgv' mangled-name='PySys_SetArgv' filepath='./Python/sysmodule.c' line='3303' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PySys_SetArgv'>
-      <parameter type-id='type-id-8' name='argc' filepath='./Python/sysmodule.c' line='3303' column='1'/>
-      <parameter type-id='type-id-374' name='argv' filepath='./Python/sysmodule.c' line='3303' column='1'/>
+    <function-decl name='PySys_SetArgv' mangled-name='PySys_SetArgv' filepath='./Python/sysmodule.c' line='3313' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PySys_SetArgv'>
+      <parameter type-id='type-id-8' name='argc' filepath='./Python/sysmodule.c' line='3313' column='1'/>
+      <parameter type-id='type-id-374' name='argv' filepath='./Python/sysmodule.c' line='3313' column='1'/>
       <return type-id='type-id-70'/>
     </function-decl>
-    <function-decl name='PySys_SetArgvEx' mangled-name='PySys_SetArgvEx' filepath='./Python/sysmodule.c' line='3259' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PySys_SetArgvEx'>
-      <parameter type-id='type-id-8' name='argc' filepath='./Python/sysmodule.c' line='3259' column='1'/>
-      <parameter type-id='type-id-374' name='argv' filepath='./Python/sysmodule.c' line='3259' column='1'/>
-      <parameter type-id='type-id-8' name='updatepath' filepath='./Python/sysmodule.c' line='3259' column='1'/>
+    <function-decl name='PySys_SetArgvEx' mangled-name='PySys_SetArgvEx' filepath='./Python/sysmodule.c' line='3269' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PySys_SetArgvEx'>
+      <parameter type-id='type-id-8' name='argc' filepath='./Python/sysmodule.c' line='3269' column='1'/>
+      <parameter type-id='type-id-374' name='argv' filepath='./Python/sysmodule.c' line='3269' column='1'/>
+      <parameter type-id='type-id-8' name='updatepath' filepath='./Python/sysmodule.c' line='3269' column='1'/>
       <return type-id='type-id-70'/>
     </function-decl>
-    <function-decl name='PySys_SetPath' mangled-name='PySys_SetPath' filepath='./Python/sysmodule.c' line='3227' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PySys_SetPath'>
+    <function-decl name='PySys_SetPath' mangled-name='PySys_SetPath' filepath='./Python/sysmodule.c' line='3237' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PySys_SetPath'>
       <parameter type-id='type-id-545' name='program_full_path' filepath='Python/pathconfig.c' line='297' column='1'/>
       <return type-id='type-id-70'/>
     </function-decl>
-    <function-decl name='PySys_GetXOptions' mangled-name='PySys_GetXOptions' filepath='./Python/sysmodule.c' line='2351' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PySys_GetXOptions'>
+    <function-decl name='PySys_GetXOptions' mangled-name='PySys_GetXOptions' filepath='./Python/sysmodule.c' line='2361' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PySys_GetXOptions'>
       <return type-id='type-id-14'/>
     </function-decl>
-    <function-decl name='PySys_AddXOption' mangled-name='PySys_AddXOption' filepath='./Python/sysmodule.c' line='2337' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PySys_AddXOption'>
-      <parameter type-id='type-id-545' name='s' filepath='./Python/sysmodule.c' line='2337' column='1'/>
+    <function-decl name='PySys_AddXOption' mangled-name='PySys_AddXOption' filepath='./Python/sysmodule.c' line='2347' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PySys_AddXOption'>
+      <parameter type-id='type-id-545' name='s' filepath='./Python/sysmodule.c' line='2347' column='1'/>
       <return type-id='type-id-70'/>
     </function-decl>
-    <function-decl name='PySys_HasWarnOptions' mangled-name='PySys_HasWarnOptions' filepath='./Python/sysmodule.c' line='2263' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PySys_HasWarnOptions'>
+    <function-decl name='PySys_HasWarnOptions' mangled-name='PySys_HasWarnOptions' filepath='./Python/sysmodule.c' line='2273' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PySys_HasWarnOptions'>
       <return type-id='type-id-8'/>
     </function-decl>
-    <function-decl name='PySys_AddWarnOption' mangled-name='PySys_AddWarnOption' filepath='./Python/sysmodule.c' line='2244' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PySys_AddWarnOption'>
+    <function-decl name='PySys_AddWarnOption' mangled-name='PySys_AddWarnOption' filepath='./Python/sysmodule.c' line='2254' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PySys_AddWarnOption'>
       <parameter type-id='type-id-545' name='path' filepath='Python/pathconfig.c' line='215' column='1'/>
       <return type-id='type-id-70'/>
     </function-decl>
-    <function-decl name='PySys_AddWarnOptionUnicode' mangled-name='PySys_AddWarnOptionUnicode' filepath='./Python/sysmodule.c' line='2232' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PySys_AddWarnOptionUnicode'>
+    <function-decl name='PySys_AddWarnOptionUnicode' mangled-name='PySys_AddWarnOptionUnicode' filepath='./Python/sysmodule.c' line='2242' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PySys_AddWarnOptionUnicode'>
       <parameter type-id='type-id-14' name='m' filepath='Objects/moduleobject.c' line='578' column='1'/>
       <return type-id='type-id-70'/>
     </function-decl>
-    <function-decl name='PySys_ResetWarnOptions' mangled-name='PySys_ResetWarnOptions' filepath='./Python/sysmodule.c' line='2204' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PySys_ResetWarnOptions'>
+    <function-decl name='PySys_ResetWarnOptions' mangled-name='PySys_ResetWarnOptions' filepath='./Python/sysmodule.c' line='2214' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PySys_ResetWarnOptions'>
       <return type-id='type-id-70'/>
     </function-decl>
     <function-decl name='_PySys_GetSizeOf' mangled-name='_PySys_GetSizeOf' filepath='./Python/sysmodule.c' line='1624' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PySys_GetSizeOf'>
@@ -15765,45 +15770,45 @@
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='Python/traceback.c' comp-dir-path='/src' language='LANG_C99'>
     <var-decl name='PyTraceBack_Type' type-id='type-id-112' mangled-name='PyTraceBack_Type' visibility='default' filepath='./Include/traceback.h' line='13' column='1' elf-symbol-id='PyTraceBack_Type'/>
-    <function-decl name='_Py_DumpTracebackThreads' mangled-name='_Py_DumpTracebackThreads' filepath='Python/traceback.c' line='1273' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Py_DumpTracebackThreads'>
-      <parameter type-id='type-id-8' name='fd' filepath='Python/traceback.c' line='1273' column='1'/>
-      <parameter type-id='type-id-11' name='interp' filepath='Python/traceback.c' line='1273' column='1'/>
-      <parameter type-id='type-id-10' name='current_tstate' filepath='Python/traceback.c' line='1274' column='1'/>
+    <function-decl name='_Py_DumpTracebackThreads' mangled-name='_Py_DumpTracebackThreads' filepath='Python/traceback.c' line='1283' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Py_DumpTracebackThreads'>
+      <parameter type-id='type-id-8' name='fd' filepath='Python/traceback.c' line='1283' column='1'/>
+      <parameter type-id='type-id-11' name='interp' filepath='Python/traceback.c' line='1283' column='1'/>
+      <parameter type-id='type-id-10' name='current_tstate' filepath='Python/traceback.c' line='1284' column='1'/>
       <return type-id='type-id-3'/>
     </function-decl>
-    <function-decl name='_Py_DumpTraceback' mangled-name='_Py_DumpTraceback' filepath='Python/traceback.c' line='1243' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Py_DumpTraceback'>
-      <parameter type-id='type-id-8' name='fd' filepath='Python/traceback.c' line='1243' column='1'/>
-      <parameter type-id='type-id-10' name='tstate' filepath='Python/traceback.c' line='1243' column='1'/>
+    <function-decl name='_Py_DumpTraceback' mangled-name='_Py_DumpTraceback' filepath='Python/traceback.c' line='1253' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Py_DumpTraceback'>
+      <parameter type-id='type-id-8' name='fd' filepath='Python/traceback.c' line='1253' column='1'/>
+      <parameter type-id='type-id-10' name='tstate' filepath='Python/traceback.c' line='1253' column='1'/>
       <return type-id='type-id-70'/>
     </function-decl>
-    <function-decl name='_Py_DumpASCII' mangled-name='_Py_DumpASCII' filepath='Python/traceback.c' line='1074' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Py_DumpASCII'>
-      <parameter type-id='type-id-8' name='fd' filepath='Python/traceback.c' line='1074' column='1'/>
-      <parameter type-id='type-id-14' name='text' filepath='Python/traceback.c' line='1074' column='1'/>
+    <function-decl name='_Py_DumpASCII' mangled-name='_Py_DumpASCII' filepath='Python/traceback.c' line='1084' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Py_DumpASCII'>
+      <parameter type-id='type-id-8' name='fd' filepath='Python/traceback.c' line='1084' column='1'/>
+      <parameter type-id='type-id-14' name='text' filepath='Python/traceback.c' line='1084' column='1'/>
       <return type-id='type-id-70'/>
     </function-decl>
-    <function-decl name='_Py_DumpHexadecimal' mangled-name='_Py_DumpHexadecimal' filepath='Python/traceback.c' line='1051' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Py_DumpHexadecimal'>
-      <parameter type-id='type-id-8' name='fd' filepath='Python/traceback.c' line='1051' column='1'/>
-      <parameter type-id='type-id-358' name='value' filepath='Python/traceback.c' line='1051' column='1'/>
-      <parameter type-id='type-id-36' name='width' filepath='Python/traceback.c' line='1051' column='1'/>
+    <function-decl name='_Py_DumpHexadecimal' mangled-name='_Py_DumpHexadecimal' filepath='Python/traceback.c' line='1061' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Py_DumpHexadecimal'>
+      <parameter type-id='type-id-8' name='fd' filepath='Python/traceback.c' line='1061' column='1'/>
+      <parameter type-id='type-id-358' name='value' filepath='Python/traceback.c' line='1061' column='1'/>
+      <parameter type-id='type-id-36' name='width' filepath='Python/traceback.c' line='1061' column='1'/>
       <return type-id='type-id-70'/>
     </function-decl>
-    <function-decl name='_Py_DumpDecimal' mangled-name='_Py_DumpDecimal' filepath='Python/traceback.c' line='1027' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Py_DumpDecimal'>
-      <parameter type-id='type-id-8' name='fd' filepath='Python/traceback.c' line='1027' column='1'/>
-      <parameter type-id='type-id-54' name='value' filepath='Python/traceback.c' line='1027' column='1'/>
+    <function-decl name='_Py_DumpDecimal' mangled-name='_Py_DumpDecimal' filepath='Python/traceback.c' line='1037' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Py_DumpDecimal'>
+      <parameter type-id='type-id-8' name='fd' filepath='Python/traceback.c' line='1037' column='1'/>
+      <parameter type-id='type-id-54' name='value' filepath='Python/traceback.c' line='1037' column='1'/>
       <return type-id='type-id-70'/>
     </function-decl>
-    <function-decl name='PyTraceBack_Print' mangled-name='PyTraceBack_Print' filepath='Python/traceback.c' line='1011' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyTraceBack_Print'>
+    <function-decl name='PyTraceBack_Print' mangled-name='PyTraceBack_Print' filepath='Python/traceback.c' line='1021' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='PyTraceBack_Print'>
       <parameter type-id='type-id-14' name='op' filepath='Objects/dictobject.c' line='3691' column='1'/>
       <parameter type-id='type-id-14' name='key' filepath='Objects/dictobject.c' line='3691' column='1'/>
       <return type-id='type-id-8'/>
     </function-decl>
-    <function-decl name='_PyTraceBack_Print_Indented' mangled-name='_PyTraceBack_Print_Indented' filepath='Python/traceback.c' line='971' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyTraceBack_Print_Indented'>
-      <parameter type-id='type-id-14' name='v' filepath='Python/traceback.c' line='971' column='1'/>
-      <parameter type-id='type-id-8' name='indent' filepath='Python/traceback.c' line='971' column='1'/>
-      <parameter type-id='type-id-3' name='margin' filepath='Python/traceback.c' line='971' column='1'/>
-      <parameter type-id='type-id-3' name='header_margin' filepath='Python/traceback.c' line='972' column='1'/>
-      <parameter type-id='type-id-3' name='header' filepath='Python/traceback.c' line='972' column='1'/>
-      <parameter type-id='type-id-14' name='f' filepath='Python/traceback.c' line='972' column='1'/>
+    <function-decl name='_PyTraceBack_Print_Indented' mangled-name='_PyTraceBack_Print_Indented' filepath='Python/traceback.c' line='981' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_PyTraceBack_Print_Indented'>
+      <parameter type-id='type-id-14' name='v' filepath='Python/traceback.c' line='981' column='1'/>
+      <parameter type-id='type-id-8' name='indent' filepath='Python/traceback.c' line='981' column='1'/>
+      <parameter type-id='type-id-3' name='margin' filepath='Python/traceback.c' line='981' column='1'/>
+      <parameter type-id='type-id-3' name='header_margin' filepath='Python/traceback.c' line='982' column='1'/>
+      <parameter type-id='type-id-3' name='header' filepath='Python/traceback.c' line='982' column='1'/>
+      <parameter type-id='type-id-14' name='f' filepath='Python/traceback.c' line='982' column='1'/>
       <return type-id='type-id-8'/>
     </function-decl>
     <function-decl name='_Py_DisplaySourceLine' mangled-name='_Py_DisplaySourceLine' filepath='Python/traceback.c' line='578' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Py_DisplaySourceLine'>
diff --git a/Include/internal/pycore_ast_state.h b/Include/internal/pycore_ast_state.h
index da78bba3b69bd..f15b4905eed14 100644
--- a/Include/internal/pycore_ast_state.h
+++ b/Include/internal/pycore_ast_state.h
@@ -12,6 +12,8 @@ extern "C" {
 
 struct ast_state {
     int initialized;
+    int recursion_depth;
+    int recursion_limit;
     PyObject *AST_type;
     PyObject *Add_singleton;
     PyObject *Add_type;
diff --git a/Lib/test/test_ast.py b/Lib/test/test_ast.py
index 480089aa8af44..9734218c21be3 100644
--- a/Lib/test/test_ast.py
+++ b/Lib/test/test_ast.py
@@ -793,6 +793,27 @@ def next(self):
                     return self
         enum._test_simple_enum(_Precedence, ast._Precedence)
 
+    @support.cpython_only
+    def test_ast_recursion_limit(self):
+        fail_depth = sys.getrecursionlimit() * 3
+        crash_depth = sys.getrecursionlimit() * 300
+        success_depth = int(fail_depth * 0.75)
+
+        def check_limit(prefix, repeated):
+            expect_ok = prefix + repeated * success_depth
+            ast.parse(expect_ok)
+            for depth in (fail_depth, crash_depth):
+                broken = prefix + repeated * depth
+                details = "Compiling ({!r} + {!r} * {})".format(
+                            prefix, repeated, depth)
+                with self.assertRaises(RecursionError, msg=details):
+                    ast.parse(broken)
+
+        check_limit("a", "()")
+        check_limit("a", ".b")
+        check_limit("a", "[0]")
+        check_limit("a", "*a")
+
 
 class ASTHelpers_Test(unittest.TestCase):
     maxDiff = None
diff --git a/Misc/NEWS.d/next/Core and Builtins/2022-07-24-00-27-47.gh-issue-95185.ghYTZx.rst b/Misc/NEWS.d/next/Core and Builtins/2022-07-24-00-27-47.gh-issue-95185.ghYTZx.rst
new file mode 100644
index 0000000000000..de156bab2f51f
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2022-07-24-00-27-47.gh-issue-95185.ghYTZx.rst	
@@ -0,0 +1,3 @@
+Prevented crashes in the AST constructor when compiling some absurdly long
+expressions like ``"+0"*1000000``. :exc:`RecursionError` is now raised
+instead. Patch by Pablo Galindo
diff --git a/Parser/asdl_c.py b/Parser/asdl_c.py
index 1101a3593dfe2..ec8b53350b3ef 100755
--- a/Parser/asdl_c.py
+++ b/Parser/asdl_c.py
@@ -1113,6 +1113,8 @@ def visitModule(self, mod):
         for dfn in mod.dfns:
             self.visit(dfn)
         self.file.write(textwrap.dedent('''
+                state->recursion_depth = 0;
+                state->recursion_limit = 0;
                 state->initialized = 1;
                 return 1;
             }
@@ -1260,8 +1262,14 @@ def func_begin(self, name):
         self.emit('if (!o) {', 1)
         self.emit("Py_RETURN_NONE;", 2)
         self.emit("}", 1)
+        self.emit("if (++state->recursion_depth > state->recursion_limit) {", 1)
+        self.emit("PyErr_SetString(PyExc_RecursionError,", 2)
+        self.emit('"maximum recursion depth exceeded during ast construction");', 3)
+        self.emit("return 0;", 2)
+        self.emit("}", 1)
 
     def func_end(self):
+        self.emit("state->recursion_depth--;", 1)
         self.emit("return result;", 1)
         self.emit("failed:", 0)
         self.emit("Py_XDECREF(value);", 1)
@@ -1372,7 +1380,32 @@ class PartingShots(StaticVisitor):
     if (state == NULL) {
         return NULL;
     }
-    return ast2obj_mod(state, t);
+
+    int recursion_limit = Py_GetRecursionLimit();
+    int starting_recursion_depth;
+    /* Be careful here to prevent overflow. */
+    int COMPILER_STACK_FRAME_SCALE = 3;
+    PyThreadState *tstate = _PyThreadState_GET();
+    if (!tstate) {
+        return 0;
+    }
+    state->recursion_limit = (recursion_limit < INT_MAX / COMPILER_STACK_FRAME_SCALE) ?
+        recursion_limit * COMPILER_STACK_FRAME_SCALE : recursion_limit;
+    int recursion_depth = tstate->recursion_limit - tstate->recursion_remaining;
+    starting_recursion_depth = (recursion_depth < INT_MAX / COMPILER_STACK_FRAME_SCALE) ?
+        recursion_depth * COMPILER_STACK_FRAME_SCALE : recursion_depth;
+    state->recursion_depth = starting_recursion_depth;
+
+    PyObject *result = ast2obj_mod(state, t);
+
+    /* Check that the recursion depth counting balanced correctly */
+    if (result && state->recursion_depth != starting_recursion_depth) {
+        PyErr_Format(PyExc_SystemError,
+            "AST constructor recursion depth mismatch (before=%d, after=%d)",
+            starting_recursion_depth, state->recursion_depth);
+        return 0;
+    }
+    return result;
 }
 
 /* mode is 0 for "exec", 1 for "eval" and 2 for "single" input */
@@ -1438,6 +1471,8 @@ def visit(self, object):
 def generate_ast_state(module_state, f):
     f.write('struct ast_state {\n')
     f.write('    int initialized;\n')
+    f.write('    int recursion_depth;\n')
+    f.write('    int recursion_limit;\n')
     for s in module_state:
         f.write('    PyObject *' + s + ';\n')
     f.write('};')
diff --git a/Python/Python-ast.c b/Python/Python-ast.c
index e52a72d43bcbd..f485af675ccff 100644
--- a/Python/Python-ast.c
+++ b/Python/Python-ast.c
@@ -1851,6 +1851,8 @@ init_types(struct ast_state *state)
         "TypeIgnore(int lineno, string tag)");
     if (!state->TypeIgnore_type) return 0;
 
+    state->recursion_depth = 0;
+    state->recursion_limit = 0;
     state->initialized = 1;
     return 1;
 }
@@ -3610,6 +3612,11 @@ ast2obj_mod(struct ast_state *state, void* _o)
     if (!o) {
         Py_RETURN_NONE;
     }
+    if (++state->recursion_depth > state->recursion_limit) {
+        PyErr_SetString(PyExc_RecursionError,
+            "maximum recursion depth exceeded during ast construction");
+        return 0;
+    }
     switch (o->kind) {
     case Module_kind:
         tp = (PyTypeObject *)state->Module_type;
@@ -3665,6 +3672,7 @@ ast2obj_mod(struct ast_state *state, void* _o)
         Py_DECREF(value);
         break;
     }
+    state->recursion_depth--;
     return result;
 failed:
     Py_XDECREF(value);
@@ -3681,6 +3689,11 @@ ast2obj_stmt(struct ast_state *state, void* _o)
     if (!o) {
         Py_RETURN_NONE;
     }
+    if (++state->recursion_depth > state->recursion_limit) {
+        PyErr_SetString(PyExc_RecursionError,
+            "maximum recursion depth exceeded during ast construction");
+        return 0;
+    }
     switch (o->kind) {
     case FunctionDef_kind:
         tp = (PyTypeObject *)state->FunctionDef_type;
@@ -4224,6 +4237,7 @@ ast2obj_stmt(struct ast_state *state, void* _o)
     if (PyObject_SetAttr(result, state->end_col_offset, value) < 0)
         goto failed;
     Py_DECREF(value);
+    state->recursion_depth--;
     return result;
 failed:
     Py_XDECREF(value);
@@ -4240,6 +4254,11 @@ ast2obj_expr(struct ast_state *state, void* _o)
     if (!o) {
         Py_RETURN_NONE;
     }
+    if (++state->recursion_depth > state->recursion_limit) {
+        PyErr_SetString(PyExc_RecursionError,
+            "maximum recursion depth exceeded during ast construction");
+        return 0;
+    }
     switch (o->kind) {
     case BoolOp_kind:
         tp = (PyTypeObject *)state->BoolOp_type;
@@ -4701,6 +4720,7 @@ ast2obj_expr(struct ast_state *state, void* _o)
     if (PyObject_SetAttr(result, state->end_col_offset, value) < 0)
         goto failed;
     Py_DECREF(value);
+    state->recursion_depth--;
     return result;
 failed:
     Py_XDECREF(value);
@@ -4843,6 +4863,11 @@ ast2obj_comprehension(struct ast_state *state, void* _o)
     if (!o) {
         Py_RETURN_NONE;
     }
+    if (++state->recursion_depth > state->recursion_limit) {
+        PyErr_SetString(PyExc_RecursionError,
+            "maximum recursion depth exceeded during ast construction");
+        return 0;
+    }
     tp = (PyTypeObject *)state->comprehension_type;
     result = PyType_GenericNew(tp, NULL, NULL);
     if (!result) return NULL;
@@ -4866,6 +4891,7 @@ ast2obj_comprehension(struct ast_state *state, void* _o)
     if (PyObject_SetAttr(result, state->is_async, value) == -1)
         goto failed;
     Py_DECREF(value);
+    state->recursion_depth--;
     return result;
 failed:
     Py_XDECREF(value);
@@ -4882,6 +4908,11 @@ ast2obj_excepthandler(struct ast_state *state, void* _o)
     if (!o) {
         Py_RETURN_NONE;
     }
+    if (++state->recursion_depth > state->recursion_limit) {
+        PyErr_SetString(PyExc_RecursionError,
+            "maximum recursion depth exceeded during ast construction");
+        return 0;
+    }
     switch (o->kind) {
     case ExceptHandler_kind:
         tp = (PyTypeObject *)state->ExceptHandler_type;
@@ -4925,6 +4956,7 @@ ast2obj_excepthandler(struct ast_state *state, void* _o)
     if (PyObject_SetAttr(result, state->end_col_offset, value) < 0)
         goto failed;
     Py_DECREF(value);
+    state->recursion_depth--;
     return result;
 failed:
     Py_XDECREF(value);
@@ -4941,6 +4973,11 @@ ast2obj_arguments(struct ast_state *state, void* _o)
     if (!o) {
         Py_RETURN_NONE;
     }
+    if (++state->recursion_depth > state->recursion_limit) {
+        PyErr_SetString(PyExc_RecursionError,
+            "maximum recursion depth exceeded during ast construction");
+        return 0;
+    }
     tp = (PyTypeObject *)state->arguments_type;
     result = PyType_GenericNew(tp, NULL, NULL);
     if (!result) return NULL;
@@ -4979,6 +5016,7 @@ ast2obj_arguments(struct ast_state *state, void* _o)
     if (PyObject_SetAttr(result, state->defaults, value) == -1)
         goto failed;
     Py_DECREF(value);
+    state->recursion_depth--;
     return result;
 failed:
     Py_XDECREF(value);
@@ -4995,6 +5033,11 @@ ast2obj_arg(struct ast_state *state, void* _o)
     if (!o) {
         Py_RETURN_NONE;
     }
+    if (++state->recursion_depth > state->recursion_limit) {
+        PyErr_SetString(PyExc_RecursionError,
+            "maximum recursion depth exceeded during ast construction");
+        return 0;
+    }
     tp = (PyTypeObject *)state->arg_type;
     result = PyType_GenericNew(tp, NULL, NULL);
     if (!result) return NULL;
@@ -5033,6 +5076,7 @@ ast2obj_arg(struct ast_state *state, void* _o)
     if (PyObject_SetAttr(result, state->end_col_offset, value) < 0)
         goto failed;
     Py_DECREF(value);
+    state->recursion_depth--;
     return result;
 failed:
     Py_XDECREF(value);
@@ -5049,6 +5093,11 @@ ast2obj_keyword(struct ast_state *state, void* _o)
     if (!o) {
         Py_RETURN_NONE;
     }
+    if (++state->recursion_depth > state->recursion_limit) {
+        PyErr_SetString(PyExc_RecursionError,
+            "maximum recursion depth exceeded during ast construction");
+        return 0;
+    }
     tp = (PyTypeObject *)state->keyword_type;
     result = PyType_GenericNew(tp, NULL, NULL);
     if (!result) return NULL;
@@ -5082,6 +5131,7 @@ ast2obj_keyword(struct ast_state *state, void* _o)
     if (PyObject_SetAttr(result, state->end_col_offset, value) < 0)
         goto failed;
     Py_DECREF(value);
+    state->recursion_depth--;
     return result;
 failed:
     Py_XDECREF(value);
@@ -5098,6 +5148,11 @@ ast2obj_alias(struct ast_state *state, void* _o)
     if (!o) {
         Py_RETURN_NONE;
     }
+    if (++state->recursion_depth > state->recursion_limit) {
+        PyErr_SetString(PyExc_RecursionError,
+            "maximum recursion depth exceeded during ast construction");
+        return 0;
+    }
     tp = (PyTypeObject *)state->alias_type;
     result = PyType_GenericNew(tp, NULL, NULL);
     if (!result) return NULL;
@@ -5131,6 +5186,7 @@ ast2obj_alias(struct ast_state *state, void* _o)
     if (PyObject_SetAttr(result, state->end_col_offset, value) < 0)
         goto failed;
     Py_DECREF(value);
+    state->recursion_depth--;
     return result;
 failed:
     Py_XDECREF(value);
@@ -5147,6 +5203,11 @@ ast2obj_withitem(struct ast_state *state, void* _o)
     if (!o) {
         Py_RETURN_NONE;
     }
+    if (++state->recursion_depth > state->recursion_limit) {
+        PyErr_SetString(PyExc_RecursionError,
+            "maximum recursion depth exceeded during ast construction");
+        return 0;
+    }
     tp = (PyTypeObject *)state->withitem_type;
     result = PyType_GenericNew(tp, NULL, NULL);
     if (!result) return NULL;
@@ -5160,6 +5221,7 @@ ast2obj_withitem(struct ast_state *state, void* _o)
     if (PyObject_SetAttr(result, state->optional_vars, value) == -1)
         goto failed;
     Py_DECREF(value);
+    state->recursion_depth--;
     return result;
 failed:
     Py_XDECREF(value);
@@ -5176,6 +5238,11 @@ ast2obj_match_case(struct ast_state *state, void* _o)
     if (!o) {
         Py_RETURN_NONE;
     }
+    if (++state->recursion_depth > state->recursion_limit) {
+        PyErr_SetString(PyExc_RecursionError,
+            "maximum recursion depth exceeded during ast construction");
+        return 0;
+    }
     tp = (PyTypeObject *)state->match_case_type;
     result = PyType_GenericNew(tp, NULL, NULL);
     if (!result) return NULL;
@@ -5194,6 +5261,7 @@ ast2obj_match_case(struct ast_state *state, void* _o)
     if (PyObject_SetAttr(result, state->body, value) == -1)
         goto failed;
     Py_DECREF(value);
+    state->recursion_depth--;
     return result;
 failed:
     Py_XDECREF(value);
@@ -5210,6 +5278,11 @@ ast2obj_pattern(struct ast_state *state, void* _o)
     if (!o) {
         Py_RETURN_NONE;
     }
+    if (++state->recursion_depth > state->recursion_limit) {
+        PyErr_SetString(PyExc_RecursionError,
+            "maximum recursion depth exceeded during ast construction");
+        return 0;
+    }
     switch (o->kind) {
     case MatchValue_kind:
         tp = (PyTypeObject *)state->MatchValue_type;
@@ -5349,6 +5422,7 @@ ast2obj_pattern(struct ast_state *state, void* _o)
     if (PyObject_SetAttr(result, state->end_col_offset, value) < 0)
         goto failed;
     Py_DECREF(value);
+    state->recursion_depth--;
     return result;
 failed:
     Py_XDECREF(value);
@@ -5365,6 +5439,11 @@ ast2obj_type_ignore(struct ast_state *state, void* _o)
     if (!o) {
         Py_RETURN_NONE;
     }
+    if (++state->recursion_depth > state->recursion_limit) {
+        PyErr_SetString(PyExc_RecursionError,
+            "maximum recursion depth exceeded during ast construction");
+        return 0;
+    }
     switch (o->kind) {
     case TypeIgnore_kind:
         tp = (PyTypeObject *)state->TypeIgnore_type;
@@ -5382,6 +5461,7 @@ ast2obj_type_ignore(struct ast_state *state, void* _o)
         Py_DECREF(value);
         break;
     }
+    state->recursion_depth--;
     return result;
 failed:
     Py_XDECREF(value);
@@ -12234,7 +12314,32 @@ PyObject* PyAST_mod2obj(mod_ty t)
     if (state == NULL) {
         return NULL;
     }
-    return ast2obj_mod(state, t);
+
+    int recursion_limit = Py_GetRecursionLimit();
+    int starting_recursion_depth;
+    /* Be careful here to prevent overflow. */
+    int COMPILER_STACK_FRAME_SCALE = 3;
+    PyThreadState *tstate = _PyThreadState_GET();
+    if (!tstate) {
+        return 0;
+    }
+    state->recursion_limit = (recursion_limit < INT_MAX / COMPILER_STACK_FRAME_SCALE) ?
+        recursion_limit * COMPILER_STACK_FRAME_SCALE : recursion_limit;
+    int recursion_depth = tstate->recursion_limit - tstate->recursion_remaining;
+    starting_recursion_depth = (recursion_depth < INT_MAX / COMPILER_STACK_FRAME_SCALE) ?
+        recursion_depth * COMPILER_STACK_FRAME_SCALE : recursion_depth;
+    state->recursion_depth = starting_recursion_depth;
+
+    PyObject *result = ast2obj_mod(state, t);
+
+    /* Check that the recursion depth counting balanced correctly */
+    if (result && state->recursion_depth != starting_recursion_depth) {
+        PyErr_Format(PyExc_SystemError,
+            "AST constructor recursion depth mismatch (before=%d, after=%d)",
+            starting_recursion_depth, state->recursion_depth);
+        return 0;
+    }
+    return result;
 }
 
 /* mode is 0 for "exec", 1 for "eval" and 2 for "single" input */


From webhook-mailer at python.org  Tue Jul 26 06:20:38 2022
From: webhook-mailer at python.org (ambv)
Date: Tue, 26 Jul 2022 10:20:38 -0000
Subject: [Python-checkins] gh-91810: Fix regression with writing an XML
 declaration with encoding='unicode' (GH-93426) (GH-93793)
Message-ID: <mailman.263.1658830840.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/6fe7e0264f8cf3649520df11bbc1b5b4dc7a6f39
commit: 6fe7e0264f8cf3649520df11bbc1b5b4dc7a6f39
branch: 3.11
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: ambv <lukasz at langa.pl>
date: 2022-07-26T12:20:33+02:00
summary:

gh-91810: Fix regression with writing an XML declaration with encoding='unicode' (GH-93426) (GH-93793)

Suppress writing an XML declaration in open files in ElementTree.write()
with encoding='unicode' and xml_declaration=None.

If file patch is passed to ElementTree.write() with encoding='unicode',
always open a new file in UTF-8.
(cherry picked from commit d7db9dc3cc5b44d0b4ce000571fecf58089a01ec)

Co-authored-by: Serhiy Storchaka <storchaka at gmail.com>

files:
A Misc/NEWS.d/next/Library/2022-06-02-08-40-58.gh-issue-91810.Gtk44w.rst
M Lib/test/test_xml_etree.py
M Lib/xml/etree/ElementTree.py

diff --git a/Lib/test/test_xml_etree.py b/Lib/test/test_xml_etree.py
index aea77b192c100..afa4641e6906b 100644
--- a/Lib/test/test_xml_etree.py
+++ b/Lib/test/test_xml_etree.py
@@ -3739,13 +3739,7 @@ def test_write_to_filename_as_unicode(self):
         tree = ET.ElementTree(ET.XML('''<site>\xf8</site>'''))
         tree.write(TESTFN, encoding='unicode')
         with open(TESTFN, 'rb') as f:
-            data = f.read()
-            expected = "<site>\xf8</site>".encode(encoding, 'xmlcharrefreplace')
-            if encoding.lower() in ('utf-8', 'ascii'):
-                self.assertEqual(data, expected)
-            else:
-                self.assertIn(b"<?xml version='1.0' encoding=", data)
-                self.assertIn(expected, data)
+            self.assertEqual(f.read(), b"<site>\xc3\xb8</site>")
 
     def test_write_to_text_file(self):
         self.addCleanup(os_helper.unlink, TESTFN)
@@ -3760,17 +3754,13 @@ def test_write_to_text_file(self):
             tree.write(f, encoding='unicode')
             self.assertFalse(f.closed)
         with open(TESTFN, 'rb') as f:
-            self.assertEqual(f.read(),  convlinesep(
-                             b'''<?xml version='1.0' encoding='ascii'?>\n'''
-                             b'''<site>&#248;</site>'''))
+            self.assertEqual(f.read(),  b'''<site>&#248;</site>''')
 
         with open(TESTFN, 'w', encoding='ISO-8859-1') as f:
             tree.write(f, encoding='unicode')
             self.assertFalse(f.closed)
         with open(TESTFN, 'rb') as f:
-            self.assertEqual(f.read(),  convlinesep(
-                             b'''<?xml version='1.0' encoding='ISO-8859-1'?>\n'''
-                             b'''<site>\xf8</site>'''))
+            self.assertEqual(f.read(), b'''<site>\xf8</site>''')
 
     def test_write_to_binary_file(self):
         self.addCleanup(os_helper.unlink, TESTFN)
diff --git a/Lib/xml/etree/ElementTree.py b/Lib/xml/etree/ElementTree.py
index a5cc65e789c00..1dc80351bf7dd 100644
--- a/Lib/xml/etree/ElementTree.py
+++ b/Lib/xml/etree/ElementTree.py
@@ -731,6 +731,7 @@ def write(self, file_or_filename,
         with _get_writer(file_or_filename, encoding) as (write, declared_encoding):
             if method == "xml" and (xml_declaration or
                     (xml_declaration is None and
+                     encoding.lower() != "unicode" and
                      declared_encoding.lower() not in ("utf-8", "us-ascii"))):
                 write("<?xml version='1.0' encoding='%s'?>\n" % (
                     declared_encoding,))
@@ -757,13 +758,10 @@ def _get_writer(file_or_filename, encoding):
     except AttributeError:
         # file_or_filename is a file name
         if encoding.lower() == "unicode":
-            file = open(file_or_filename, "w",
-                        errors="xmlcharrefreplace")
-        else:
-            file = open(file_or_filename, "w", encoding=encoding,
-                        errors="xmlcharrefreplace")
-        with file:
-            yield file.write, file.encoding
+            encoding="utf-8"
+        with open(file_or_filename, "w", encoding=encoding,
+                  errors="xmlcharrefreplace") as file:
+            yield file.write, encoding
     else:
         # file_or_filename is a file-like object
         # encoding determines if it is a text or binary writer
diff --git a/Misc/NEWS.d/next/Library/2022-06-02-08-40-58.gh-issue-91810.Gtk44w.rst b/Misc/NEWS.d/next/Library/2022-06-02-08-40-58.gh-issue-91810.Gtk44w.rst
new file mode 100644
index 0000000000000..e40005886afc3
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2022-06-02-08-40-58.gh-issue-91810.Gtk44w.rst
@@ -0,0 +1,2 @@
+Suppress writing an XML declaration in open files in ``ElementTree.write()``
+with ``encoding='unicode'`` and ``xml_declaration=None``.


From webhook-mailer at python.org  Tue Jul 26 06:20:56 2022
From: webhook-mailer at python.org (ambv)
Date: Tue, 26 Jul 2022 10:20:56 -0000
Subject: [Python-checkins] gh-93351: Add news entry and what's new entry for
 changes in gh-93351 (GH-95175) (GH-95177)
Message-ID: <mailman.264.1658830856.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/5e971e816d8ee1fd911ab38be261425669ec21ce
commit: 5e971e816d8ee1fd911ab38be261425669ec21ce
branch: 3.11
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: ambv <lukasz at langa.pl>
date: 2022-07-26T12:20:51+02:00
summary:

gh-93351: Add news entry and what's new entry for changes in gh-93351 (GH-95175) (GH-95177)

(cherry picked from commit 9762572d0aa3569ba82eeceb708ddea9f12918fd)

Co-authored-by: Pablo Galindo Salgado <Pablogsal at gmail.com>

files:
A Misc/NEWS.d/next/Core and Builtins/2022-07-23-19-16-25.gh-issue-93351.0Jyvu-.rst

diff --git a/Misc/NEWS.d/next/Core and Builtins/2022-07-23-19-16-25.gh-issue-93351.0Jyvu-.rst b/Misc/NEWS.d/next/Core and Builtins/2022-07-23-19-16-25.gh-issue-93351.0Jyvu-.rst
new file mode 100644
index 0000000000000..97cf8055ac54b
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2022-07-23-19-16-25.gh-issue-93351.0Jyvu-.rst	
@@ -0,0 +1,3 @@
+:class:`ast.AST` node positions are now validated when provided to
+:func:`compile` and other related functions. If invalid positions are
+detected, a :exc:`ValueError` will be raised.


From webhook-mailer at python.org  Tue Jul 26 06:21:57 2022
From: webhook-mailer at python.org (ambv)
Date: Tue, 26 Jul 2022 10:21:57 -0000
Subject: [Python-checkins] gh-95041: Fix several minor issues in
 syslog.openlog() (GH-95058) (GH-95261)
Message-ID: <mailman.265.1658830918.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/820904eab21d6adb4380ef27859dad22188805be
commit: 820904eab21d6adb4380ef27859dad22188805be
branch: 3.11
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: ambv <lukasz at langa.pl>
date: 2022-07-26T12:21:48+02:00
summary:

gh-95041: Fix several minor issues in syslog.openlog() (GH-95058) (GH-95261)

* syslog_get_argv() swallows exceptions, but not in all cases.
* if ident is non UTF-8 encodable, syslog.openlog() fails after setting the
  global reference to ident. Now the C string saved internally in the previous
  call to openlog() points to the freed memory.
* PySys_Audit() can crash if ident is NULL.
* There may be a race condition with syslog.syslog(), because the global
  reference to ident is decrefed before setting the new value.
* Possible use of freed memory if syslog.openlog() is called while
  the GIL is released in syslog.syslog().
(cherry picked from commit 68c555a50a2b74731b0db0f4dcbf51b2c11d4853)

Co-authored-by: Serhiy Storchaka <storchaka at gmail.com>

files:
M Modules/syslogmodule.c

diff --git a/Modules/syslogmodule.c b/Modules/syslogmodule.c
index 2655a0c94bbd9..27b176aeb6dba 100644
--- a/Modules/syslogmodule.c
+++ b/Modules/syslogmodule.c
@@ -87,6 +87,10 @@ syslog_get_argv(void)
     }
 
     scriptobj = PyList_GetItem(argv, 0);
+    if (scriptobj == NULL) {
+        PyErr_Clear();
+        return NULL;
+    }
     if (!PyUnicode_Check(scriptobj)) {
         return(NULL);
     }
@@ -96,16 +100,16 @@ syslog_get_argv(void)
     }
 
     slash = PyUnicode_FindChar(scriptobj, SEP, 0, scriptlen, -1);
-    if (slash == -2)
+    if (slash == -2) {
+        PyErr_Clear();
         return NULL;
+    }
     if (slash != -1) {
         return PyUnicode_Substring(scriptobj, slash + 1, scriptlen);
     } else {
         Py_INCREF(scriptobj);
         return(scriptobj);
     }
-
-    return(NULL);
 }
 
 
@@ -114,42 +118,41 @@ syslog_openlog(PyObject * self, PyObject * args, PyObject *kwds)
 {
     long logopt = 0;
     long facility = LOG_USER;
-    PyObject *new_S_ident_o = NULL;
+    PyObject *ident = NULL;
     static char *keywords[] = {"ident", "logoption", "facility", 0};
-    const char *ident = NULL;
+    const char *ident_str = NULL;
 
     if (!PyArg_ParseTupleAndKeywords(args, kwds,
-                          "|Ull:openlog", keywords, &new_S_ident_o, &logopt, &facility))
+                          "|Ull:openlog", keywords, &ident, &logopt, &facility))
         return NULL;
 
-    if (new_S_ident_o) {
-        Py_INCREF(new_S_ident_o);
+    if (ident) {
+        Py_INCREF(ident);
     }
-
-    /*  get sys.argv[0] or NULL if we can't for some reason  */
-    if (!new_S_ident_o) {
-        new_S_ident_o = syslog_get_argv();
+    else {
+        /* get sys.argv[0] or NULL if we can't for some reason  */
+        ident = syslog_get_argv();
     }
 
-    Py_XDECREF(S_ident_o);
-    S_ident_o = new_S_ident_o;
-
-    /* At this point, S_ident_o should be INCREF()ed.  openlog(3) does not
-     * make a copy, and syslog(3) later uses it.  We can't garbagecollect it
+    /* At this point, ident should be INCREF()ed.  openlog(3) does not
+     * make a copy, and syslog(3) later uses it.  We can't garbagecollect it.
      * If NULL, just let openlog figure it out (probably using C argv[0]).
      */
-    if (S_ident_o) {
-        ident = PyUnicode_AsUTF8(S_ident_o);
-        if (ident == NULL)
+    if (ident) {
+        ident_str = PyUnicode_AsUTF8(ident);
+        if (ident_str == NULL) {
+            Py_DECREF(ident);
             return NULL;
+        }
     }
-
-    if (PySys_Audit("syslog.openlog", "sll", ident, logopt, facility) < 0) {
+    if (PySys_Audit("syslog.openlog", "Oll", ident ? ident : Py_None, logopt, facility) < 0) {
+        Py_DECREF(ident);
         return NULL;
     }
 
-    openlog(ident, logopt, facility);
+    openlog(ident_str, logopt, facility);
     S_log_open = 1;
+    Py_XSETREF(S_ident_o, ident);
 
     Py_RETURN_NONE;
 }
@@ -193,9 +196,15 @@ syslog_syslog(PyObject * self, PyObject * args)
         }
     }
 
+    /* Incref ident, because it can be decrefed if syslog.openlog() is
+     * called when the GIL is released.
+     */
+    PyObject *ident = S_ident_o;
+    Py_XINCREF(ident);
     Py_BEGIN_ALLOW_THREADS;
     syslog(priority, "%s", message);
     Py_END_ALLOW_THREADS;
+    Py_XDECREF(ident);
     Py_RETURN_NONE;
 }
 
@@ -355,4 +364,4 @@ PyMODINIT_FUNC
 PyInit_syslog(void)
 {
     return PyModuleDef_Init(&syslogmodule);
-}
\ No newline at end of file
+}


From webhook-mailer at python.org  Tue Jul 26 07:34:26 2022
From: webhook-mailer at python.org (serhiy-storchaka)
Date: Tue, 26 Jul 2022 11:34:26 -0000
Subject: [Python-checkins] gh-95041: Fail syslog.syslog in case inner call
 to syslog.openlog fails (GH-95264)
Message-ID: <mailman.266.1658835267.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/b1f648efc56ff17e18ec2b7402d59a771b305004
commit: b1f648efc56ff17e18ec2b7402d59a771b305004
branch: main
author: Noam Cohen <noam at noam.me>
committer: serhiy-storchaka <storchaka at gmail.com>
date: 2022-07-26T14:34:15+03:00
summary:

gh-95041: Fail syslog.syslog in case inner call to syslog.openlog fails (GH-95264)

files:
M Modules/syslogmodule.c

diff --git a/Modules/syslogmodule.c b/Modules/syslogmodule.c
index 27b176aeb6dba..c409fe968f889 100644
--- a/Modules/syslogmodule.c
+++ b/Modules/syslogmodule.c
@@ -191,8 +191,14 @@ syslog_syslog(PyObject * self, PyObject * args)
          */
         if ((openargs = PyTuple_New(0))) {
             PyObject *openlog_ret = syslog_openlog(self, openargs, NULL);
-            Py_XDECREF(openlog_ret);
             Py_DECREF(openargs);
+            if (openlog_ret == NULL) {
+                return NULL;
+            }
+            Py_DECREF(openlog_ret);
+        }
+        else {
+            return NULL;
         }
     }
 


From webhook-mailer at python.org  Tue Jul 26 07:56:14 2022
From: webhook-mailer at python.org (miss-islington)
Date: Tue, 26 Jul 2022 11:56:14 -0000
Subject: [Python-checkins] gh-95041: Fail syslog.syslog in case inner call
 to syslog.openlog fails (GH-95264)
Message-ID: <mailman.267.1658836575.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/2f9e47c026795bb58401dfe28d66e83793592e57
commit: 2f9e47c026795bb58401dfe28d66e83793592e57
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-26T04:56:04-07:00
summary:

gh-95041: Fail syslog.syslog in case inner call to syslog.openlog fails (GH-95264)

(cherry picked from commit b1f648efc56ff17e18ec2b7402d59a771b305004)

Co-authored-by: Noam Cohen <noam at noam.me>

files:
M Modules/syslogmodule.c

diff --git a/Modules/syslogmodule.c b/Modules/syslogmodule.c
index 95e5effafd58f..729986a5549ef 100644
--- a/Modules/syslogmodule.c
+++ b/Modules/syslogmodule.c
@@ -191,8 +191,14 @@ syslog_syslog(PyObject * self, PyObject * args)
          */
         if ((openargs = PyTuple_New(0))) {
             PyObject *openlog_ret = syslog_openlog(self, openargs, NULL);
-            Py_XDECREF(openlog_ret);
             Py_DECREF(openargs);
+            if (openlog_ret == NULL) {
+                return NULL;
+            }
+            Py_DECREF(openlog_ret);
+        }
+        else {
+            return NULL;
         }
     }
 


From webhook-mailer at python.org  Tue Jul 26 09:34:52 2022
From: webhook-mailer at python.org (iritkatriel)
Date: Tue, 26 Jul 2022 13:34:52 -0000
Subject: [Python-checkins] gh-95259: add test for traceback with
 angle-bracketed filename (GH-95260)
Message-ID: <mailman.268.1658842493.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/8660604b3e10aedd84f5e2d4caf3c541646102eb
commit: 8660604b3e10aedd84f5e2d4caf3c541646102eb
branch: main
author: Irit Katriel <1055913+iritkatriel at users.noreply.github.com>
committer: iritkatriel <1055913+iritkatriel at users.noreply.github.com>
date: 2022-07-26T14:34:46+01:00
summary:

gh-95259: add test for traceback with angle-bracketed filename (GH-95260)

files:
M Lib/test/test_traceback.py

diff --git a/Lib/test/test_traceback.py b/Lib/test/test_traceback.py
index ef08b29c6d360..2089050cadfc2 100644
--- a/Lib/test/test_traceback.py
+++ b/Lib/test/test_traceback.py
@@ -1477,6 +1477,21 @@ def __str__(self):
                 exp = "%s: %s\n" % (str_name, str_value)
                 self.assertEqual(exp, err)
 
+    def test_exception_angle_bracketed_filename(self):
+        src = textwrap.dedent("""
+            try:
+                raise ValueError(42)
+            except Exception as e:
+                exc = e
+            """)
+
+        code = compile(src, "<does not exist>", "exec")
+        g, l = {}, {}
+        exec(code, g, l)
+        err = self.get_report(l['exc'])
+        exp = '  File "<does not exist>", line 3, in <module>\nValueError: 42\n'
+        self.assertIn(exp, err)
+
     def test_exception_modulename_not_unicode(self):
         class X(Exception):
             def __str__(self):


From webhook-mailer at python.org  Tue Jul 26 09:36:40 2022
From: webhook-mailer at python.org (iritkatriel)
Date: Tue, 26 Jul 2022 13:36:40 -0000
Subject: [Python-checkins] gh-93678: extract 'struct cfg_builder' from the
 compiler so that the CFG can be manipulated directly (GH-95107)
Message-ID: <mailman.269.1658842601.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/75c0c1b99312877bdd5b3583616f737d32869bac
commit: 75c0c1b99312877bdd5b3583616f737d32869bac
branch: main
author: Irit Katriel <1055913+iritkatriel at users.noreply.github.com>
committer: iritkatriel <1055913+iritkatriel at users.noreply.github.com>
date: 2022-07-26T14:36:30+01:00
summary:

gh-93678: extract 'struct cfg_builder' from the compiler so that the CFG can be manipulated directly (GH-95107)

files:
A Misc/NEWS.d/next/Core and Builtins/2022-07-26-09-31-12.gh-issue-93678.W8vvgT.rst
M Python/compile.c

diff --git a/Misc/NEWS.d/next/Core and Builtins/2022-07-26-09-31-12.gh-issue-93678.W8vvgT.rst b/Misc/NEWS.d/next/Core and Builtins/2022-07-26-09-31-12.gh-issue-93678.W8vvgT.rst
new file mode 100644
index 0000000000000..6ff816a172cc2
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2022-07-26-09-31-12.gh-issue-93678.W8vvgT.rst	
@@ -0,0 +1 @@
+Add cfg_builder struct and refactor the relevant code so that a cfg can be constructed without an instance of the compiler struct.
diff --git a/Python/compile.c b/Python/compile.c
index 94ce8669a1fd4..975efa7e23ecd 100644
--- a/Python/compile.c
+++ b/Python/compile.c
@@ -325,6 +325,17 @@ enum {
     COMPILER_SCOPE_COMPREHENSION,
 };
 
+typedef struct cfg_builder_ {
+    /* The entryblock, at which control flow begins. All blocks of the
+       CFG are reachable through the b_next links */
+    basicblock *cfg_entryblock;
+    /* Pointer to the most recently allocated block.  By following
+       b_list links, you can reach all allocated blocks. */
+    basicblock *block_list;
+    /* pointer to the block currently being constructed */
+    basicblock *curblock;
+} cfg_builder;
+
 /* The following items change on entry and exit of code blocks.
    They must be saved and restored when returning to a block.
 */
@@ -350,10 +361,8 @@ struct compiler_unit {
     Py_ssize_t u_argcount;        /* number of arguments for block */
     Py_ssize_t u_posonlyargcount;        /* number of positional only arguments for block */
     Py_ssize_t u_kwonlyargcount; /* number of keyword only arguments for block */
-    /* Pointer to the most recently allocated block.  By following b_list
-       members, you can reach all early allocated blocks. */
-    basicblock *u_blocks;
-    basicblock *u_curblock; /* pointer to current block */
+
+    cfg_builder u_cfg_builder;  /* The control flow graph */
 
     int u_nfblocks;
     struct fblockinfo u_fblock[CO_MAXBLOCKS];
@@ -390,6 +399,9 @@ struct compiler {
     PyArena *c_arena;            /* pointer to memory allocation arena */
 };
 
+#define CFG_BUILDER(c) (&((c)->u->u_cfg_builder))
+#define COMPILER_LOC(c) ((c)->u->u_loc)
+
 typedef struct {
     // A list of strings corresponding to name captures. It is used to track:
     // - Repeated name assignments in the same pattern.
@@ -417,12 +429,9 @@ typedef struct {
 
 static int basicblock_next_instr(basicblock *);
 
-static int compiler_enter_scope(struct compiler *, identifier, int, void *, int);
+static int cfg_builder_addop_i(cfg_builder *g, int opcode, Py_ssize_t oparg, struct location loc);
+
 static void compiler_free(struct compiler *);
-static basicblock *compiler_new_block(struct compiler *);
-static int compiler_addop(struct compiler *, int, bool);
-static int compiler_addop_i(struct compiler *, int, Py_ssize_t, bool);
-static int compiler_addop_j(struct compiler *, int, basicblock *, bool);
 static int compiler_error(struct compiler *, const char *, ...);
 static int compiler_warn(struct compiler *, const char *, ...);
 static int compiler_nameop(struct compiler *, identifier, expr_context_ty);
@@ -442,7 +451,6 @@ static int are_all_items_const(asdl_expr_seq *, Py_ssize_t, Py_ssize_t);
 static int compiler_with(struct compiler *, stmt_ty, int);
 static int compiler_async_with(struct compiler *, stmt_ty, int);
 static int compiler_async_for(struct compiler *, stmt_ty);
-static int validate_keywords(struct compiler *c, asdl_keyword_seq *keywords);
 static int compiler_call_simple_kw_helper(struct compiler *c,
                                           asdl_keyword_seq *keywords,
                                           Py_ssize_t nkwelts);
@@ -714,10 +722,9 @@ dictbytype(PyObject *src, int scope_type, int flag, Py_ssize_t offset)
 }
 
 static void
-compiler_unit_check(struct compiler_unit *u)
+cfg_builder_check(cfg_builder *g)
 {
-    basicblock *block;
-    for (block = u->u_blocks; block != NULL; block = block->b_list) {
+    for (basicblock *block = g->block_list; block != NULL; block = block->b_list) {
         assert(!_PyMem_IsPtrFreed(block));
         if (block->b_instr != NULL) {
             assert(block->b_ialloc > 0);
@@ -732,19 +739,24 @@ compiler_unit_check(struct compiler_unit *u)
 }
 
 static void
-compiler_unit_free(struct compiler_unit *u)
+cfg_builder_free(cfg_builder* g)
 {
-    basicblock *b, *next;
-
-    compiler_unit_check(u);
-    b = u->u_blocks;
+    cfg_builder_check(g);
+    basicblock *b = g->block_list;
     while (b != NULL) {
-        if (b->b_instr)
+        if (b->b_instr) {
             PyObject_Free((void *)b->b_instr);
-        next = b->b_list;
+        }
+        basicblock *next = b->b_list;
         PyObject_Free((void *)b);
         b = next;
     }
+}
+
+static void
+compiler_unit_free(struct compiler_unit *u)
+{
+    cfg_builder_free(&u->u_cfg_builder);
     Py_CLEAR(u->u_ste);
     Py_CLEAR(u->u_name);
     Py_CLEAR(u->u_qualname);
@@ -832,59 +844,48 @@ compiler_set_qualname(struct compiler *c)
    Returns NULL on error.
 */
 static basicblock *
-new_basicblock()
+cfg_builder_new_block(cfg_builder *g)
 {
     basicblock *b = (basicblock *)PyObject_Calloc(1, sizeof(basicblock));
     if (b == NULL) {
         PyErr_NoMemory();
         return NULL;
     }
+    /* Extend the singly linked list of blocks with new block. */
+    b->b_list = g->block_list;
+    g->block_list = b;
     return b;
 }
 
 static basicblock *
-compiler_new_block(struct compiler *c)
+cfg_builder_use_next_block(cfg_builder *g, basicblock *block)
 {
-    basicblock *b = new_basicblock();
-    if (b == NULL) {
-        return NULL;
-    }
-    /* Extend the singly linked list of blocks with new block. */
-    struct compiler_unit *u = c->u;
-    b->b_list = u->u_blocks;
-    u->u_blocks = b;
-    return b;
+    assert(block != NULL);
+    g->curblock->b_next = block;
+    g->curblock = block;
+    return block;
 }
 
 static basicblock *
-compiler_use_next_block(struct compiler *c, basicblock *block)
+compiler_new_block(struct compiler *c)
 {
-    assert(block != NULL);
-    c->u->u_curblock->b_next = block;
-    c->u->u_curblock = block;
-    return block;
+    return cfg_builder_new_block(CFG_BUILDER(c));
 }
 
 static basicblock *
-basicblock_new_b_list_successor(basicblock *prev)
+compiler_use_next_block(struct compiler *c, basicblock *block)
 {
-    basicblock *result = new_basicblock();
-    if (result == NULL) {
-        return NULL;
-    }
-    result->b_list = prev->b_list;
-    prev->b_list = result;
-    return result;
+    return cfg_builder_use_next_block(CFG_BUILDER(c), block);
 }
 
 static basicblock *
-copy_basicblock(basicblock *block)
+copy_basicblock(cfg_builder *g, basicblock *block)
 {
     /* Cannot copy a block if it has a fallthrough, since
      * a block can only have one fallthrough predecessor.
      */
     assert(BB_NO_FALLTHROUGH(block));
-    basicblock *result = basicblock_new_b_list_successor(block);
+    basicblock *result = cfg_builder_new_block(g);
     if (result == NULL) {
         return NULL;
     }
@@ -1247,28 +1248,13 @@ PyCompile_OpcodeStackEffect(int opcode, int oparg)
     return stack_effect(opcode, oparg, -1);
 }
 
-static int
-compiler_use_new_implicit_block_if_needed(struct compiler *c)
-{
-    basicblock *b = c->u->u_curblock;
-    struct instr *last = basicblock_last_instr(b);
-    if (last && IS_TERMINATOR_OPCODE(last->i_opcode)) {
-        basicblock *b = compiler_new_block(c);
-        if (b == NULL) {
-            return -1;
-        }
-        compiler_use_next_block(c, b);
-    }
-    return 0;
-}
-
 /* Add an opcode with no argument.
    Returns 0 on failure, 1 on success.
 */
 
 static int
 basicblock_addop(basicblock *b, int opcode, int oparg,
-                 basicblock *target, const struct location *loc)
+                 basicblock *target, struct location loc)
 {
     assert(IS_WITHIN_OPCODE_RANGE(opcode));
     assert(!IS_ASSEMBLER_OPCODE(opcode));
@@ -1287,25 +1273,35 @@ basicblock_addop(basicblock *b, int opcode, int oparg,
     i->i_opcode = opcode;
     i->i_oparg = oparg;
     i->i_target = target;
-    i->i_loc = loc ? *loc : NO_LOCATION;
+    i->i_loc = loc;
 
     return 1;
 }
 
 static int
-compiler_addop(struct compiler *c, int opcode, bool line)
+cfg_builder_addop(cfg_builder *g, int opcode, int oparg, basicblock *target,
+                  struct location loc)
 {
-    assert(!HAS_ARG(opcode));
-    if (compiler_use_new_implicit_block_if_needed(c) < 0) {
-        return -1;
+    struct instr *last = basicblock_last_instr(g->curblock);
+    if (last && IS_TERMINATOR_OPCODE(last->i_opcode)) {
+        basicblock *b = cfg_builder_new_block(g);
+        if (b == NULL) {
+            return -1;
+        }
+        cfg_builder_use_next_block(g, b);
     }
+    return basicblock_addop(g->curblock, opcode, oparg, target, loc);
+}
 
-    const struct location *loc = line ? &c->u->u_loc : NULL;
-    return basicblock_addop(c->u->u_curblock, opcode, 0, NULL, loc);
+static int
+cfg_builder_addop_noarg(cfg_builder *g, int opcode, struct location loc)
+{
+    assert(!HAS_ARG(opcode));
+    return cfg_builder_addop(g, opcode, 0, NULL, loc);
 }
 
 static Py_ssize_t
-compiler_add_o(PyObject *dict, PyObject *o)
+dict_add_o(PyObject *dict, PyObject *o)
 {
     PyObject *v;
     Py_ssize_t arg;
@@ -1450,7 +1446,7 @@ compiler_add_const(struct compiler *c, PyObject *o)
         return -1;
     }
 
-    Py_ssize_t arg = compiler_add_o(c->u->u_consts, key);
+    Py_ssize_t arg = dict_add_o(c->u->u_consts, key);
     Py_DECREF(key);
     return arg;
 }
@@ -1461,17 +1457,17 @@ compiler_addop_load_const(struct compiler *c, PyObject *o)
     Py_ssize_t arg = compiler_add_const(c, o);
     if (arg < 0)
         return 0;
-    return compiler_addop_i(c, LOAD_CONST, arg, true);
+    return cfg_builder_addop_i(CFG_BUILDER(c), LOAD_CONST, arg, COMPILER_LOC(c));
 }
 
 static int
 compiler_addop_o(struct compiler *c, int opcode, PyObject *dict,
                      PyObject *o)
 {
-    Py_ssize_t arg = compiler_add_o(dict, o);
+    Py_ssize_t arg = dict_add_o(dict, o);
     if (arg < 0)
         return 0;
-    return compiler_addop_i(c, opcode, arg, true);
+    return cfg_builder_addop_i(CFG_BUILDER(c), opcode, arg, COMPILER_LOC(c));
 }
 
 static int
@@ -1483,7 +1479,7 @@ compiler_addop_name(struct compiler *c, int opcode, PyObject *dict,
     PyObject *mangled = _Py_Mangle(c->u->u_private, o);
     if (!mangled)
         return 0;
-    arg = compiler_add_o(dict, mangled);
+    arg = dict_add_o(dict, mangled);
     Py_DECREF(mangled);
     if (arg < 0)
         return 0;
@@ -1495,18 +1491,15 @@ compiler_addop_name(struct compiler *c, int opcode, PyObject *dict,
         arg <<= 1;
         arg |= 1;
     }
-    return compiler_addop_i(c, opcode, arg, true);
+    return cfg_builder_addop_i(CFG_BUILDER(c), opcode, arg, COMPILER_LOC(c));
 }
 
 /* Add an opcode with an integer argument.
    Returns 0 on failure, 1 on success.
 */
 static int
-compiler_addop_i(struct compiler *c, int opcode, Py_ssize_t oparg, bool line)
+cfg_builder_addop_i(cfg_builder *g, int opcode, Py_ssize_t oparg, struct location loc)
 {
-    if (compiler_use_new_implicit_block_if_needed(c) < 0) {
-        return -1;
-    }
     /* oparg value is unsigned, but a signed C int is usually used to store
        it in the C code (like Python/ceval.c).
 
@@ -1516,35 +1509,30 @@ compiler_addop_i(struct compiler *c, int opcode, Py_ssize_t oparg, bool line)
        EXTENDED_ARG is used for 16, 24, and 32-bit arguments. */
 
     int oparg_ = Py_SAFE_DOWNCAST(oparg, Py_ssize_t, int);
-
-    const struct location *loc = line ? &c->u->u_loc : NULL;
-    return basicblock_addop(c->u->u_curblock, opcode, oparg_, NULL, loc);
+    return cfg_builder_addop(g, opcode, oparg_, NULL, loc);
 }
 
 static int
-compiler_addop_j(struct compiler *c, int opcode, basicblock *target, bool line)
+cfg_builder_addop_j(cfg_builder *g, int opcode, basicblock *target, struct location loc)
 {
-    if (compiler_use_new_implicit_block_if_needed(c) < 0) {
-        return -1;
-    }
-    const struct location *loc = line ? &c->u->u_loc : NULL;
     assert(target != NULL);
     assert(IS_JUMP_OPCODE(opcode) || IS_BLOCK_PUSH_OPCODE(opcode));
-    return basicblock_addop(c->u->u_curblock, opcode, 0, target, loc);
+    return cfg_builder_addop(g, opcode, 0, target, loc);
 }
 
+
 #define ADDOP(C, OP) { \
-    if (!compiler_addop((C), (OP), true)) \
+    if (!cfg_builder_addop_noarg(CFG_BUILDER(C), (OP), COMPILER_LOC(C))) \
         return 0; \
 }
 
 #define ADDOP_NOLINE(C, OP) { \
-    if (!compiler_addop((C), (OP), false)) \
+    if (!cfg_builder_addop_noarg(CFG_BUILDER(C), (OP), NO_LOCATION)) \
         return 0; \
 }
 
 #define ADDOP_IN_SCOPE(C, OP) { \
-    if (!compiler_addop((C), (OP), true)) { \
+    if (!cfg_builder_addop_noarg(CFG_BUILDER(C), (OP), COMPILER_LOC(C))) { \
         compiler_exit_scope(c); \
         return 0; \
     } \
@@ -1583,17 +1571,17 @@ compiler_addop_j(struct compiler *c, int opcode, basicblock *target, bool line)
 }
 
 #define ADDOP_I(C, OP, O) { \
-    if (!compiler_addop_i((C), (OP), (O), true)) \
+    if (!cfg_builder_addop_i(CFG_BUILDER(C), (OP), (O), COMPILER_LOC(C))) \
         return 0; \
 }
 
 #define ADDOP_I_NOLINE(C, OP, O) { \
-    if (!compiler_addop_i((C), (OP), (O), false)) \
+    if (!cfg_builder_addop_i(CFG_BUILDER(C), (OP), (O), NO_LOCATION)) \
         return 0; \
 }
 
 #define ADDOP_JUMP(C, OP, O) { \
-    if (!compiler_addop_j((C), (OP), (O), true)) \
+    if (!cfg_builder_addop_j(CFG_BUILDER(C), (OP), (O), COMPILER_LOC(C))) \
         return 0; \
 }
 
@@ -1601,7 +1589,7 @@ compiler_addop_j(struct compiler *c, int opcode, basicblock *target, bool line)
  * Used for artificial jumps that have no corresponding
  * token in the source code. */
 #define ADDOP_JUMP_NOLINE(C, OP, O) { \
-    if (!compiler_addop_j((C), (OP), (O), false)) \
+    if (!cfg_builder_addop_j(CFG_BUILDER(C), (OP), (O), NO_LOCATION)) \
         return 0; \
 }
 
@@ -1718,7 +1706,6 @@ compiler_enter_scope(struct compiler *c, identifier name,
         return 0;
     }
 
-    u->u_blocks = NULL;
     u->u_nfblocks = 0;
     u->u_firstlineno = lineno;
     u->u_loc = LOCATION(lineno, lineno, 0, 0);
@@ -1751,10 +1738,12 @@ compiler_enter_scope(struct compiler *c, identifier name,
 
     c->c_nestlevel++;
 
-    block = compiler_new_block(c);
+    cfg_builder *g = CFG_BUILDER(c);
+    g->block_list = NULL;
+    block = cfg_builder_new_block(g);
     if (block == NULL)
         return 0;
-    c->u->u_curblock = block;
+    g->curblock = g->cfg_entryblock = block;
 
     if (u->u_scope_type == COMPILER_SCOPE_MODULE) {
         c->u->u_loc.lineno = 0;
@@ -1791,7 +1780,7 @@ compiler_exit_scope(struct compiler *c)
             _PyErr_WriteUnraisableMsg("on removing the last compiler "
                                       "stack item", NULL);
         }
-        compiler_unit_check(c->u);
+        cfg_builder_check(CFG_BUILDER(c));
     }
     else {
         c->u = NULL;
@@ -4240,7 +4229,7 @@ compiler_nameop(struct compiler *c, identifier name, expr_context_ty ctx)
     }
 
     assert(op);
-    arg = compiler_add_o(dict, mangled);
+    arg = dict_add_o(dict, mangled);
     Py_DECREF(mangled);
     if (arg < 0) {
         return 0;
@@ -4248,7 +4237,7 @@ compiler_nameop(struct compiler *c, identifier name, expr_context_ty ctx)
     if (op == LOAD_GLOBAL) {
         arg <<= 1;
     }
-    return compiler_addop_i(c, op, arg, true);
+    return cfg_builder_addop_i(CFG_BUILDER(c), op, arg, COMPILER_LOC(c));
 }
 
 static int
@@ -6291,7 +6280,7 @@ emit_and_reset_fail_pop(struct compiler *c, pattern_context *pc)
     }
     while (--pc->fail_pop_size) {
         compiler_use_next_block(c, pc->fail_pop[pc->fail_pop_size]);
-        if (!compiler_addop(c, POP_TOP, true)) {
+        if (!cfg_builder_addop_noarg(CFG_BUILDER(c), POP_TOP, COMPILER_LOC(c))) {
             pc->fail_pop_size = 0;
             PyObject_Free(pc->fail_pop);
             pc->fail_pop = NULL;
@@ -6725,7 +6714,8 @@ compiler_pattern_or(struct compiler *c, pattern_ty p, pattern_context *pc)
         pc->fail_pop = NULL;
         pc->fail_pop_size = 0;
         pc->on_top = 0;
-        if (!compiler_addop_i(c, COPY, 1, true) || !compiler_pattern(c, alt, pc)) {
+        if (!cfg_builder_addop_i(CFG_BUILDER(c), COPY, 1, COMPILER_LOC(c)) ||
+            !compiler_pattern(c, alt, pc)) {
             goto error;
         }
         // Success!
@@ -6788,7 +6778,7 @@ compiler_pattern_or(struct compiler *c, pattern_ty p, pattern_context *pc)
             }
         }
         assert(control);
-        if (!compiler_addop_j(c, JUMP, end, true) ||
+        if (!cfg_builder_addop_j(CFG_BUILDER(c), JUMP, end, COMPILER_LOC(c)) ||
             !emit_and_reset_fail_pop(c, pc))
         {
             goto error;
@@ -6800,7 +6790,7 @@ compiler_pattern_or(struct compiler *c, pattern_ty p, pattern_context *pc)
     // Need to NULL this for the PyObject_Free call in the error block.
     old_pc.fail_pop = NULL;
     // No match. Pop the remaining copy of the subject and fail:
-    if (!compiler_addop(c, POP_TOP, true) || !jump_to_fail_pop(c, pc, JUMP)) {
+    if (!cfg_builder_addop_noarg(CFG_BUILDER(c), POP_TOP, COMPILER_LOC(c)) || !jump_to_fail_pop(c, pc, JUMP)) {
         goto error;
     }
     compiler_use_next_block(c, end);
@@ -7430,7 +7420,8 @@ mark_cold(basicblock *entryblock) {
 }
 
 static int
-push_cold_blocks_to_end(basicblock *entryblock, int code_flags) {
+push_cold_blocks_to_end(cfg_builder *g, int code_flags) {
+    basicblock *entryblock = g->cfg_entryblock;
     if (entryblock->b_next == NULL) {
         /* single basicblock, no need to reorder */
         return 0;
@@ -7443,11 +7434,11 @@ push_cold_blocks_to_end(basicblock *entryblock, int code_flags) {
     /* an explicit jump instead of fallthrough */
     for (basicblock *b = entryblock; b != NULL; b = b->b_next) {
         if (b->b_cold && BB_HAS_FALLTHROUGH(b) && b->b_next && b->b_next->b_warm) {
-            basicblock *explicit_jump = basicblock_new_b_list_successor(b);
+            basicblock *explicit_jump = cfg_builder_new_block(g);
             if (explicit_jump == NULL) {
                 return -1;
             }
-            basicblock_addop(explicit_jump, JUMP, 0, b->b_next, &NO_LOCATION);
+            basicblock_addop(explicit_jump, JUMP, 0, b->b_next, NO_LOCATION);
 
             explicit_jump->b_cold = 1;
             explicit_jump->b_next = b->b_next;
@@ -8024,7 +8015,7 @@ consts_dict_keys_inorder(PyObject *dict)
     while (PyDict_Next(dict, &pos, &k, &v)) {
         i = PyLong_AS_LONG(v);
         /* The keys of the dictionary can be tuples wrapping a constant.
-         * (see compiler_add_o and _PyCode_ConstantKey). In that case
+         * (see dict_add_o and _PyCode_ConstantKey). In that case
          * the object we want is always second. */
         if (PyTuple_CheckExact(k)) {
             k = PyTuple_GET_ITEM(k, 1);
@@ -8296,7 +8287,7 @@ trim_unused_consts(basicblock *entryblock, PyObject *consts);
 
 /* Duplicates exit BBs, so that line numbers can be propagated to them */
 static int
-duplicate_exits_without_lineno(basicblock *entryblock);
+duplicate_exits_without_lineno(cfg_builder *g);
 
 static int
 extend_block(basicblock *bb);
@@ -8547,7 +8538,7 @@ assemble(struct compiler *c, int addNone)
     }
 
     /* Make sure every block that falls off the end returns None. */
-    if (!basicblock_returns(c->u->u_curblock)) {
+    if (!basicblock_returns(CFG_BUILDER(c)->curblock)) {
         UNSET_LOC(c);
         if (addNone)
             ADDOP_LOAD_CONST(c, Py_None);
@@ -8569,17 +8560,18 @@ assemble(struct compiler *c, int addNone)
     }
 
     int nblocks = 0;
-    basicblock *entryblock = NULL;
-    for (basicblock *b = c->u->u_blocks; b != NULL; b = b->b_list) {
+    for (basicblock *b = CFG_BUILDER(c)->block_list; b != NULL; b = b->b_list) {
         nblocks++;
-        entryblock = b;
     }
-    assert(entryblock != NULL);
     if ((size_t)nblocks > SIZE_MAX / sizeof(basicblock *)) {
         PyErr_NoMemory();
         goto error;
     }
 
+    cfg_builder *g = CFG_BUILDER(c);
+    basicblock *entryblock = g->cfg_entryblock;
+    assert(entryblock != NULL);
+
     /* Set firstlineno if it wasn't explicitly set. */
     if (!c->u->u_firstlineno) {
         if (entryblock->b_instr && entryblock->b_instr->i_loc.lineno) {
@@ -8614,7 +8606,7 @@ assemble(struct compiler *c, int addNone)
     if (trim_unused_consts(entryblock, consts)) {
         goto error;
     }
-    if (duplicate_exits_without_lineno(entryblock)) {
+    if (duplicate_exits_without_lineno(g)) {
         return NULL;
     }
     propagate_line_numbers(entryblock);
@@ -8631,7 +8623,7 @@ assemble(struct compiler *c, int addNone)
     }
     convert_exception_handlers_to_nops(entryblock);
 
-    if (push_cold_blocks_to_end(entryblock, code_flags) < 0) {
+    if (push_cold_blocks_to_end(g, code_flags) < 0) {
         goto error;
     }
 
@@ -9550,15 +9542,16 @@ is_exit_without_lineno(basicblock *b) {
  * copy the line number from the sole predecessor block.
  */
 static int
-duplicate_exits_without_lineno(basicblock *entryblock)
+duplicate_exits_without_lineno(cfg_builder *g)
 {
     /* Copy all exit blocks without line number that are targets of a jump.
      */
+    basicblock *entryblock = g->cfg_entryblock;
     for (basicblock *b = entryblock; b != NULL; b = b->b_next) {
         if (b->b_iused > 0 && is_jump(&b->b_instr[b->b_iused-1])) {
             basicblock *target = b->b_instr[b->b_iused-1].i_target;
             if (is_exit_without_lineno(target) && target->b_predecessors > 1) {
-                basicblock *new_target = copy_basicblock(target);
+                basicblock *new_target = copy_basicblock(g, target);
                 if (new_target == NULL) {
                     return -1;
                 }


From webhook-mailer at python.org  Tue Jul 26 10:49:42 2022
From: webhook-mailer at python.org (ericvsmith)
Date: Tue, 26 Jul 2022 14:49:42 -0000
Subject: [Python-checkins] Fix minor docstring issues in `dataclasses.py`.
 (gh-93024)
Message-ID: <mailman.270.1658846983.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/b8c528694edb7a31020116956cc4daf07a5cd97f
commit: b8c528694edb7a31020116956cc4daf07a5cd97f
branch: main
author: Roman Novak <44512421+romanngg at users.noreply.github.com>
committer: ericvsmith <ericvsmith at users.noreply.github.com>
date: 2022-07-26T10:48:58-04:00
summary:

Fix minor docstring issues in `dataclasses.py`. (gh-93024)

Previously, when using `functools.wrap` around them (and inherit their docstrings), sphinx renders the docstrings badly and raises warnings about wrong indent.

files:
M Lib/dataclasses.py

diff --git a/Lib/dataclasses.py b/Lib/dataclasses.py
index 103ecbafb2e27..a567a33d646f4 100644
--- a/Lib/dataclasses.py
+++ b/Lib/dataclasses.py
@@ -1255,7 +1255,7 @@ def asdict(obj, *, dict_factory=dict):
     """Return the fields of a dataclass instance as a new dictionary mapping
     field names to field values.
 
-    Example usage:
+    Example usage::
 
       @dataclass
       class C:
@@ -1326,8 +1326,8 @@ class C:
           x: int
           y: int
 
-    c = C(1, 2)
-    assert astuple(c) == (1, 2)
+      c = C(1, 2)
+      assert astuple(c) == (1, 2)
 
     If given, 'tuple_factory' will be used instead of built-in tuple.
     The function applies recursively to field values that are
@@ -1376,11 +1376,11 @@ def make_dataclass(cls_name, fields, *, bases=(), namespace=None, init=True,
     The dataclass name will be 'cls_name'.  'fields' is an iterable
     of either (name), (name, type) or (name, type, Field) objects. If type is
     omitted, use the string 'typing.Any'.  Field objects are created by
-    the equivalent of calling 'field(name, type [, Field-info])'.
+    the equivalent of calling 'field(name, type [, Field-info])'.::
 
       C = make_dataclass('C', ['x', ('y', int), ('z', int, field(init=False))], bases=(Base,))
 
-    is equivalent to:
+    is equivalent to::
 
       @dataclass
       class C(Base):
@@ -1444,7 +1444,7 @@ def exec_body_callback(ns):
 def replace(obj, /, **changes):
     """Return a new object replacing specified fields with new values.
 
-    This is especially useful for frozen classes.  Example usage:
+    This is especially useful for frozen classes.  Example usage::
 
       @dataclass(frozen=True)
       class C:
@@ -1454,7 +1454,7 @@ class C:
       c = C(1, 2)
       c1 = replace(c, x=3)
       assert c1.x == 3 and c1.y == 2
-      """
+    """
 
     # We're going to mutate 'changes', but that's okay because it's a
     # new dict, even if called with 'replace(obj, **my_changes)'.


From webhook-mailer at python.org  Tue Jul 26 15:18:38 2022
From: webhook-mailer at python.org (erlend-aasland)
Date: Tue, 26 Jul 2022 19:18:38 -0000
Subject: [Python-checkins] gh-95291: Use import helper to improve sqlite3
 audit tests (#95292)
Message-ID: <mailman.271.1658863120.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/152eb90311fdf294510b5d077332580ba18c0ee4
commit: 152eb90311fdf294510b5d077332580ba18c0ee4
branch: main
author: Erlend Egeberg Aasland <erlend.aasland at protonmail.com>
committer: erlend-aasland <erlend.aasland at protonmail.com>
date: 2022-07-26T21:18:16+02:00
summary:

gh-95291: Use import helper to improve sqlite3 audit tests (#95292)

Now the tests are correctly reported as skipped if sqlite3 is not available.

files:
M Lib/test/test_audit.py

diff --git a/Lib/test/test_audit.py b/Lib/test/test_audit.py
index 6a025f39912e6..a7ff038c0936e 100644
--- a/Lib/test/test_audit.py
+++ b/Lib/test/test_audit.py
@@ -155,10 +155,7 @@ def test_http(self):
 
 
     def test_sqlite3(self):
-        try:
-            import sqlite3
-        except ImportError:
-            return
+        sqlite3 = import_helper.import_module("sqlite3")
         returncode, events, stderr = self.run_python("test_sqlite3")
         if returncode:
             self.fail(stderr)


From webhook-mailer at python.org  Tue Jul 26 15:39:09 2022
From: webhook-mailer at python.org (tiran)
Date: Tue, 26 Jul 2022 19:39:09 -0000
Subject: [Python-checkins] gh-94801: Fix regression in configure's CPPFLAGS
 handling (GH-95288)
Message-ID: <mailman.272.1658864351.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/9af7f87d763ed6e1c5f56ae40d8242ab22866b33
commit: 9af7f87d763ed6e1c5f56ae40d8242ab22866b33
branch: main
author: Christian Heimes <christian at python.org>
committer: tiran <christian at python.org>
date: 2022-07-26T21:39:04+02:00
summary:

gh-94801: Fix regression in configure's CPPFLAGS handling (GH-95288)

files:
A Misc/NEWS.d/next/Build/2022-07-26-18-13-34.gh-issue-94801.9fREfy.rst
M configure
M configure.ac

diff --git a/Misc/NEWS.d/next/Build/2022-07-26-18-13-34.gh-issue-94801.9fREfy.rst b/Misc/NEWS.d/next/Build/2022-07-26-18-13-34.gh-issue-94801.9fREfy.rst
new file mode 100644
index 0000000000000..a58be30e81b05
--- /dev/null
+++ b/Misc/NEWS.d/next/Build/2022-07-26-18-13-34.gh-issue-94801.9fREfy.rst
@@ -0,0 +1,2 @@
+Fix a regression in ``configure`` script that caused some header checks to
+ignore custom ``CPPFLAGS``. The regression was introduced in :gh:`94802`.
diff --git a/configure b/configure
index be045f2da3ceb..6190680d87493 100755
--- a/configure
+++ b/configure
@@ -11273,7 +11273,7 @@ save_LDFLAGS=$LDFLAGS
 save_LIBS=$LIBS
 
 
-        CPPFLAGS="$CFLAGS $LIBUUID_CFLAGS"
+        CPPFLAGS="$CPPFLAGS $LIBUUID_CFLAGS"
         LDFLAGS="$LDFLAGS $LIBUUID_LIBS"
         for ac_header in uuid/uuid.h
 do :
@@ -11402,7 +11402,7 @@ save_LDFLAGS=$LDFLAGS
 save_LIBS=$LIBS
 
 
-        CPPFLAGS="$CFLAGS $LIBUUID_CFLAGS"
+        CPPFLAGS="$CPPFLAGS $LIBUUID_CFLAGS"
         LDFLAGS="$LDFLAGS $LIBUUID_LIBS"
         for ac_header in uuid/uuid.h
 do :
@@ -12122,7 +12122,7 @@ save_LDFLAGS=$LDFLAGS
 save_LIBS=$LIBS
 
 
-      CPPFLAGS="$CFLAGS $LIBFFI_CFLAGS"
+      CPPFLAGS="$CPPFLAGS $LIBFFI_CFLAGS"
       LDFLAGS="$LDFLAGS $LIBFFI_LIBS"
       ac_fn_c_check_header_mongrel "$LINENO" "ffi.h" "ac_cv_header_ffi_h" "$ac_includes_default"
 if test "x$ac_cv_header_ffi_h" = xyes; then :
@@ -12195,7 +12195,7 @@ save_LDFLAGS=$LDFLAGS
 save_LIBS=$LIBS
 
 
-      CPPFLAGS="$CFLAGS $LIBFFI_CFLAGS"
+      CPPFLAGS="$CPPFLAGS $LIBFFI_CFLAGS"
       LDFLAGS="$LDFLAGS $LIBFFI_LIBS"
       ac_fn_c_check_header_mongrel "$LINENO" "ffi.h" "ac_cv_header_ffi_h" "$ac_includes_default"
 if test "x$ac_cv_header_ffi_h" = xyes; then :
@@ -12879,7 +12879,7 @@ save_LDFLAGS=$LDFLAGS
 save_LIBS=$LIBS
 
 
-    CPPFLAGS="$LIBNSL_CFLAGS $CFLAGS"
+    CPPFLAGS="$CPPFLAGS $LIBNSL_CFLAGS"
     for ac_header in rpc/rpc.h
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "rpc/rpc.h" "ac_cv_header_rpc_rpc_h" "$ac_includes_default"
@@ -13012,7 +13012,7 @@ save_LDFLAGS=$LDFLAGS
 save_LIBS=$LIBS
 
 
-  CPPFLAGS="$LIBSQLITE3_CFLAGS $CFLAGS"
+  CPPFLAGS="$CPPFLAGS $LIBSQLITE3_CFLAGS"
   LDFLAGS="$LIBSQLITE3_LIBS $LDFLAGS"
 
   ac_fn_c_check_header_mongrel "$LINENO" "sqlite3.h" "ac_cv_header_sqlite3_h" "$ac_includes_default"
@@ -13958,7 +13958,7 @@ save_LDFLAGS=$LDFLAGS
 save_LIBS=$LIBS
 
 
-  CPPFLAGS="$TCLTK_CFLAGS $CFLAGS"
+  CPPFLAGS="$CPPFLAGS $TCLTK_CFLAGS"
   LIBS="$TCLTK_LIBS $LDFLAGS"
 
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -14023,7 +14023,7 @@ save_LDFLAGS=$LDFLAGS
 save_LIBS=$LIBS
 
 
-  CPPFLAGS="$GDBM_CFLAGS $CFLAGS"
+  CPPFLAGS="$CPPFLAGS $GDBM_CFLAGS"
   LDFLAGS="$GDBM_LIBS $LDFLAGS"
   for ac_header in gdbm.h
 do :
@@ -16610,7 +16610,7 @@ save_LDFLAGS=$LDFLAGS
 save_LIBS=$LIBS
 
 
-    CPPFLAGS="$CFLAGS $ZLIB_CFLAGS"
+    CPPFLAGS="$CPPFLAGS $ZLIB_CFLAGS"
     LDFLAGS="$LDFLAGS $ZLIB_LIBS"
     for ac_header in zlib.h
 do :
@@ -16740,7 +16740,7 @@ save_LDFLAGS=$LDFLAGS
 save_LIBS=$LIBS
 
 
-    CPPFLAGS="$CFLAGS $ZLIB_CFLAGS"
+    CPPFLAGS="$CPPFLAGS $ZLIB_CFLAGS"
     LDFLAGS="$LDFLAGS $ZLIB_LIBS"
     for ac_header in zlib.h
 do :
@@ -16958,7 +16958,7 @@ save_LDFLAGS=$LDFLAGS
 save_LIBS=$LIBS
 
 
-    CPPFLAGS="$CFLAGS $BZIP2_CFLAGS"
+    CPPFLAGS="$CPPFLAGS $BZIP2_CFLAGS"
     LDFLAGS="$LDFLAGS $BZIP2_LIBS"
     for ac_header in bzlib.h
 do :
@@ -17041,7 +17041,7 @@ save_LDFLAGS=$LDFLAGS
 save_LIBS=$LIBS
 
 
-    CPPFLAGS="$CFLAGS $BZIP2_CFLAGS"
+    CPPFLAGS="$CPPFLAGS $BZIP2_CFLAGS"
     LDFLAGS="$LDFLAGS $BZIP2_LIBS"
     for ac_header in bzlib.h
 do :
@@ -17188,7 +17188,7 @@ save_LDFLAGS=$LDFLAGS
 save_LIBS=$LIBS
 
 
-    CPPFLAGS="$CFLAGS $LIBLZMA_CFLAGS"
+    CPPFLAGS="$CPPFLAGS $LIBLZMA_CFLAGS"
     LDFLAGS="$LDFLAGS $LIBLZMA_LIBS"
     for ac_header in lzma.h
 do :
@@ -17271,7 +17271,7 @@ save_LDFLAGS=$LDFLAGS
 save_LIBS=$LIBS
 
 
-    CPPFLAGS="$CFLAGS $LIBLZMA_CFLAGS"
+    CPPFLAGS="$CPPFLAGS $LIBLZMA_CFLAGS"
     LDFLAGS="$LDFLAGS $LIBLZMA_LIBS"
     for ac_header in lzma.h
 do :
@@ -18098,7 +18098,7 @@ save_LDFLAGS=$LDFLAGS
 save_LIBS=$LIBS
 
 
-  CPPFLAGS="$LIBCRYPT_CFLAGS $CFLAGS"
+  CPPFLAGS="$CPPFLAGS $LIBCRYPT_CFLAGS"
   LIBS="$LIBCRYPT_LIBS $LIBS"
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for crypt or crypt_r" >&5
 $as_echo_n "checking for crypt or crypt_r... " >&6; }
@@ -20687,7 +20687,7 @@ save_LDFLAGS=$LDFLAGS
 save_LIBS=$LIBS
 
 
-      CPPFLAGS="$CFLAGS $LIBREADLINE_CFLAGS"
+      CPPFLAGS="$CPPFLAGS $LIBREADLINE_CFLAGS"
       LDFLAGS="$LDFLAGS $LIBREADLINE_LIBS"
       for ac_header in readline/readline.h
 do :
@@ -20768,7 +20768,7 @@ save_LDFLAGS=$LDFLAGS
 save_LIBS=$LIBS
 
 
-      CPPFLAGS="$CFLAGS $LIBREADLINE_CFLAGS"
+      CPPFLAGS="$CPPFLAGS $LIBREADLINE_CFLAGS"
       LDFLAGS="$LDFLAGS $LIBREADLINE_LIBS"
       for ac_header in readline/readline.h
 do :
@@ -20921,7 +20921,7 @@ save_LDFLAGS=$LDFLAGS
 save_LIBS=$LIBS
 
 
-      CPPFLAGS="$CFLAGS $LIBEDIT_CFLAGS"
+      CPPFLAGS="$CPPFLAGS $LIBEDIT_CFLAGS"
       LDFLAGS="$LDFLAGS $LIBEDIT_LIBS"
       for ac_header in editline/readline.h
 do :
@@ -21004,7 +21004,7 @@ save_LDFLAGS=$LDFLAGS
 save_LIBS=$LIBS
 
 
-      CPPFLAGS="$CFLAGS $LIBEDIT_CFLAGS"
+      CPPFLAGS="$CPPFLAGS $LIBEDIT_CFLAGS"
       LDFLAGS="$LDFLAGS $LIBEDIT_LIBS"
       for ac_header in editline/readline.h
 do :
@@ -21113,7 +21113,7 @@ save_LDFLAGS=$LDFLAGS
 save_LIBS=$LIBS
 
 
-    CPPFLAGS="$READLINE_CFLAGS $CFLAGS"
+    CPPFLAGS="$CPPFLAGS $READLINE_CFLAGS"
     LIBS="$READLINE_LIBS $LIBS"
     LIBS_SAVE=$LIBS
 
diff --git a/configure.ac b/configure.ac
index a952324f4922c..2c1b2ddeaf47a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3394,7 +3394,7 @@ AS_VAR_IF([have_uuid], [missing], [
       AC_DEFINE([HAVE_UUID_GENERATE_TIME_SAFE], [1])
     ], [
       WITH_SAVE_ENV([
-        CPPFLAGS="$CFLAGS $LIBUUID_CFLAGS"
+        CPPFLAGS="$CPPFLAGS $LIBUUID_CFLAGS"
         LDFLAGS="$LDFLAGS $LIBUUID_LIBS"
         AC_CHECK_HEADERS([uuid/uuid.h], [
           PY_CHECK_LIB([uuid], [uuid_generate_time], [have_uuid=yes])
@@ -3625,7 +3625,7 @@ have_libffi=missing
 AS_VAR_IF([with_system_ffi], [yes], [
   PKG_CHECK_MODULES([LIBFFI], [libffi], [have_libffi=yes], [
     WITH_SAVE_ENV([
-      CPPFLAGS="$CFLAGS $LIBFFI_CFLAGS"
+      CPPFLAGS="$CPPFLAGS $LIBFFI_CFLAGS"
       LDFLAGS="$LDFLAGS $LIBFFI_LIBS"
       AC_CHECK_HEADER([ffi.h], [
         AC_CHECK_LIB([ffi], [ffi_call], [
@@ -3798,7 +3798,7 @@ PKG_CHECK_MODULES([LIBNSL], [libnsl], [have_nis=yes], [
 
 AS_VAR_IF([have_nis], [yes], [
   WITH_SAVE_ENV([
-    CPPFLAGS="$LIBNSL_CFLAGS $CFLAGS"
+    CPPFLAGS="$CPPFLAGS $LIBNSL_CFLAGS"
     AC_CHECK_HEADERS([rpc/rpc.h])
   ])
 ])
@@ -3831,7 +3831,7 @@ AC_DEFUN([PY_CHECK_SQLITE_FUNC], [
 WITH_SAVE_ENV([
 dnl bpo-45774/GH-29507: The CPP check in AC_CHECK_HEADER can fail on FreeBSD,
 dnl hence CPPFLAGS instead of CFLAGS.
-  CPPFLAGS="$LIBSQLITE3_CFLAGS $CFLAGS"
+  CPPFLAGS="$CPPFLAGS $LIBSQLITE3_CFLAGS"
   LDFLAGS="$LIBSQLITE3_LIBS $LDFLAGS"
 
   AC_CHECK_HEADER([sqlite3.h], [
@@ -3935,7 +3935,7 @@ AS_CASE([$ac_sys_system],
 )
 
 WITH_SAVE_ENV([
-  CPPFLAGS="$TCLTK_CFLAGS $CFLAGS"
+  CPPFLAGS="$CPPFLAGS $TCLTK_CFLAGS"
   LIBS="$TCLTK_LIBS $LDFLAGS"
 
   AC_LINK_IFELSE([
@@ -3977,7 +3977,7 @@ dnl NOTE: gdbm does not provide a pkgconf file.
 AC_ARG_VAR([GDBM_CFLAGS], [C compiler flags for gdbm])
 AC_ARG_VAR([GDBM_LIBS], [additional linker flags for gdbm])
 WITH_SAVE_ENV([
-  CPPFLAGS="$GDBM_CFLAGS $CFLAGS"
+  CPPFLAGS="$CPPFLAGS $GDBM_CFLAGS"
   LDFLAGS="$GDBM_LIBS $LDFLAGS"
   AC_CHECK_HEADERS([gdbm.h], [
     AC_CHECK_LIB([gdbm], [gdbm_open], [
@@ -4830,7 +4830,7 @@ PKG_CHECK_MODULES([ZLIB], [zlib >= 1.2.0], [
   AC_DEFINE([HAVE_ZLIB_COPY], [1])
 ], [
   WITH_SAVE_ENV([
-    CPPFLAGS="$CFLAGS $ZLIB_CFLAGS"
+    CPPFLAGS="$CPPFLAGS $ZLIB_CFLAGS"
     LDFLAGS="$LDFLAGS $ZLIB_LIBS"
     AC_CHECK_HEADERS([zlib.h], [
       PY_CHECK_LIB([z], [gzread], [have_zlib=yes], [have_zlib=no])
@@ -4854,7 +4854,7 @@ PY_CHECK_EMSCRIPTEN_PORT([BZIP2], [-sUSE_BZIP2])
 
 PKG_CHECK_MODULES([BZIP2], [bzip2], [have_bzip2=yes], [
   WITH_SAVE_ENV([
-    CPPFLAGS="$CFLAGS $BZIP2_CFLAGS"
+    CPPFLAGS="$CPPFLAGS $BZIP2_CFLAGS"
     LDFLAGS="$LDFLAGS $BZIP2_LIBS"
     AC_CHECK_HEADERS([bzlib.h], [
       AC_CHECK_LIB([bz2], [BZ2_bzCompress], [have_bzip2=yes], [have_bzip2=no])
@@ -4868,7 +4868,7 @@ PKG_CHECK_MODULES([BZIP2], [bzip2], [have_bzip2=yes], [
 
 PKG_CHECK_MODULES([LIBLZMA], [liblzma], [have_liblzma=yes], [
   WITH_SAVE_ENV([
-    CPPFLAGS="$CFLAGS $LIBLZMA_CFLAGS"
+    CPPFLAGS="$CPPFLAGS $LIBLZMA_CFLAGS"
     LDFLAGS="$LDFLAGS $LIBLZMA_LIBS"
     AC_CHECK_HEADERS([lzma.h], [
       AC_CHECK_LIB([lzma], [lzma_easy_encoder], [have_liblzma=yes], [have_liblzma=no])
@@ -4960,7 +4960,7 @@ PKG_CHECK_MODULES([LIBCRYPT], [libxcrypt >= 3.1.1], [
 ])
 
 WITH_SAVE_ENV([
-  CPPFLAGS="$LIBCRYPT_CFLAGS $CFLAGS"
+  CPPFLAGS="$CPPFLAGS $LIBCRYPT_CFLAGS"
   LIBS="$LIBCRYPT_LIBS $LIBS"
   AC_CACHE_CHECK([for crypt or crypt_r], [ac_cv_crypt_crypt], [
     AC_LINK_IFELSE([AC_LANG_PROGRAM([
@@ -5845,7 +5845,7 @@ AS_VAR_IF([with_readline], [readline], [
     READLINE_LIBS=$LIBREADLINE_LIBS
   ], [
     WITH_SAVE_ENV([
-      CPPFLAGS="$CFLAGS $LIBREADLINE_CFLAGS"
+      CPPFLAGS="$CPPFLAGS $LIBREADLINE_CFLAGS"
       LDFLAGS="$LDFLAGS $LIBREADLINE_LIBS"
       AC_CHECK_HEADERS([readline/readline.h], [
         AC_CHECK_LIB([readline], [readline], [
@@ -5866,7 +5866,7 @@ AS_VAR_IF([with_readline], [edit], [
     READLINE_LIBS=$LIBEDIT_LIBS
   ], [
     WITH_SAVE_ENV([
-      CPPFLAGS="$CFLAGS $LIBEDIT_CFLAGS"
+      CPPFLAGS="$CPPFLAGS $LIBEDIT_CFLAGS"
       LDFLAGS="$LDFLAGS $LIBEDIT_LIBS"
       AC_CHECK_HEADERS([editline/readline.h], [
         AC_CHECK_LIB([edit], [readline], [
@@ -5890,7 +5890,7 @@ AS_VAR_IF([with_readline], [no], [
   AC_MSG_RESULT([$with_readline (CFLAGS: $READLINE_CFLAGS, LIBS: $READLINE_LIBS)])
 
   WITH_SAVE_ENV([
-    CPPFLAGS="$READLINE_CFLAGS $CFLAGS"
+    CPPFLAGS="$CPPFLAGS $READLINE_CFLAGS"
     LIBS="$READLINE_LIBS $LIBS"
     LIBS_SAVE=$LIBS
 


From webhook-mailer at python.org  Tue Jul 26 15:41:03 2022
From: webhook-mailer at python.org (miss-islington)
Date: Tue, 26 Jul 2022 19:41:03 -0000
Subject: [Python-checkins] gh-95291: Use import helper to improve sqlite3
 audit tests (GH-95292)
Message-ID: <mailman.273.1658864464.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/f118661a18f9e0cc692bfec226f38c26f5fe0558
commit: f118661a18f9e0cc692bfec226f38c26f5fe0558
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-26T12:40:59-07:00
summary:

gh-95291: Use import helper to improve sqlite3 audit tests (GH-95292)


Now the tests are correctly reported as skipped if sqlite3 is not available.
(cherry picked from commit 152eb90311fdf294510b5d077332580ba18c0ee4)

Co-authored-by: Erlend Egeberg Aasland <erlend.aasland at protonmail.com>

files:
M Lib/test/test_audit.py

diff --git a/Lib/test/test_audit.py b/Lib/test/test_audit.py
index c5ce26323b5f9..04c9d6b85539a 100644
--- a/Lib/test/test_audit.py
+++ b/Lib/test/test_audit.py
@@ -152,10 +152,7 @@ def test_http(self):
 
 
     def test_sqlite3(self):
-        try:
-            import sqlite3
-        except ImportError:
-            return
+        sqlite3 = import_helper.import_module("sqlite3")
         returncode, events, stderr = self.run_python("test_sqlite3")
         if returncode:
             self.fail(stderr)


From webhook-mailer at python.org  Tue Jul 26 16:14:40 2022
From: webhook-mailer at python.org (tiran)
Date: Tue, 26 Jul 2022 20:14:40 -0000
Subject: [Python-checkins] gh-93678: Address stack exhaustion on WASI
 (GH-95296)
Message-ID: <mailman.274.1658866481.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/51c56f8d7242e98d5d6a3c7a7c51fe40f3da4512
commit: 51c56f8d7242e98d5d6a3c7a7c51fe40f3da4512
branch: main
author: Christian Heimes <christian at python.org>
committer: tiran <christian at python.org>
date: 2022-07-26T22:14:35+02:00
summary:

gh-93678: Address stack exhaustion on WASI (GH-95296)

files:
M Lib/test/test_compile.py
M Lib/test/test_dynamic.py

diff --git a/Lib/test/test_compile.py b/Lib/test/test_compile.py
index 11940bec492d8..e6194460b787d 100644
--- a/Lib/test/test_compile.py
+++ b/Lib/test/test_compile.py
@@ -108,6 +108,7 @@ def __getitem__(self, key):
         exec('z = a', g, d)
         self.assertEqual(d['z'], 12)
 
+    @unittest.skipIf(support.is_wasi, "exhausts limited stack on WASI")
     def test_extended_arg(self):
         # default: 1000 * 2.5 = 2500 repetitions
         repeat = int(sys.getrecursionlimit() * 2.5)
@@ -542,6 +543,7 @@ def test_yet_more_evil_still_undecodable(self):
         self.assertIn(b"Non-UTF-8", res.err)
 
     @support.cpython_only
+    @unittest.skipIf(support.is_wasi, "exhausts limited stack on WASI")
     def test_compiler_recursion_limit(self):
         # Expected limit is sys.getrecursionlimit() * the scaling factor
         # in symtable.c (currently 3)
diff --git a/Lib/test/test_dynamic.py b/Lib/test/test_dynamic.py
index 3e0fcf4d158f8..e896fc703c9a8 100644
--- a/Lib/test/test_dynamic.py
+++ b/Lib/test/test_dynamic.py
@@ -1,6 +1,7 @@
 # Test the most dynamic corner cases of Python's runtime semantics.
 
 import builtins
+import sys
 import unittest
 
 from test.support import swap_item, swap_attr
@@ -139,12 +140,14 @@ class MyGlobals(dict):
             def __missing__(self, key):
                 return int(key.removeprefix("_number_"))
 
-        code = "lambda: " + "+".join(f"_number_{i}" for i in range(1000))
-        sum_1000 = eval(code, MyGlobals())
-        expected = sum(range(1000))
+        # 1,000 on most systems
+        limit = sys.getrecursionlimit()
+        code = "lambda: " + "+".join(f"_number_{i}" for i in range(limit))
+        sum_func = eval(code, MyGlobals())
+        expected = sum(range(limit))
         # Warm up the the function for quickening (PEP 659)
         for _ in range(30):
-            self.assertEqual(sum_1000(), expected)
+            self.assertEqual(sum_func(), expected)
 
 if __name__ == "__main__":
     unittest.main()


From webhook-mailer at python.org  Tue Jul 26 16:24:48 2022
From: webhook-mailer at python.org (zooba)
Date: Tue, 26 Jul 2022 20:24:48 -0000
Subject: [Python-checkins] gh-95285: py.exe launcher fails with short argv0
 (GH-95295)
Message-ID: <mailman.275.1658867089.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/7ac5bb3e6a1cf780aea8164fdba09db993a21d6f
commit: 7ac5bb3e6a1cf780aea8164fdba09db993a21d6f
branch: main
author: Steve Dower <steve.dower at python.org>
committer: zooba <steve.dower at microsoft.com>
date: 2022-07-26T21:24:44+01:00
summary:

gh-95285: py.exe launcher fails with short argv0 (GH-95295)

files:
A Misc/NEWS.d/next/Windows/2022-07-26-20-33-12.gh-issue-95285.w6fa22.rst
M Lib/test/test_launcher.py
M PC/launcher2.c

diff --git a/Lib/test/test_launcher.py b/Lib/test/test_launcher.py
index 50a2e8c03d647..b4009a99a705a 100644
--- a/Lib/test/test_launcher.py
+++ b/Lib/test/test_launcher.py
@@ -149,7 +149,7 @@ class RunPyMixin:
     @classmethod
     def find_py(cls):
         py_exe = None
-        if sysconfig.is_python_build(True):
+        if sysconfig.is_python_build():
             py_exe = Path(sys.executable).parent / PY_EXE
         else:
             for p in os.getenv("PATH").split(";"):
@@ -187,7 +187,7 @@ def find_py(cls):
             )
         return py_exe
 
-    def run_py(self, args, env=None, allow_fail=False, expect_returncode=0):
+    def run_py(self, args, env=None, allow_fail=False, expect_returncode=0, argv=None):
         if not self.py_exe:
             self.py_exe = self.find_py()
 
@@ -198,9 +198,12 @@ def run_py(self, args, env=None, allow_fail=False, expect_returncode=0):
             "PYLAUNCHER_DEBUG": "1",
             "PYLAUNCHER_DRYRUN": "1",
         }
+        if not argv:
+            argv = [self.py_exe, *args]
         with subprocess.Popen(
-            [self.py_exe, *args],
+            argv,
             env=env,
+            executable=self.py_exe,
             stdin=subprocess.PIPE,
             stdout=subprocess.PIPE,
             stderr=subprocess.PIPE,
@@ -539,6 +542,15 @@ def test_py3_shebang_nl(self):
         self.assertEqual("3.100-arm64", data["SearchInfo.tag"])
         self.assertEqual(f"X.Y-arm64.exe -X fake_arg_for_test -prearg {script} -postarg", data["stdout"].strip())
 
+    def test_py_shebang_short_argv0(self):
+        with self.py_ini(TEST_PY_COMMANDS):
+            with self.script("#! /usr/bin/env python -prearg") as script:
+                # Override argv to only pass "py.exe" as the command
+                data = self.run_py([script, "-postarg"], argv=f'"py.exe" "{script}" -postarg')
+        self.assertEqual("PythonTestSuite", data["SearchInfo.company"])
+        self.assertEqual("3.100", data["SearchInfo.tag"])
+        self.assertEqual(f'X.Y.exe -prearg "{script}" -postarg', data["stdout"].strip())
+
     def test_install(self):
         data = self.run_py(["-V:3.10"], env={"PYLAUNCHER_ALWAYS_INSTALL": "1"}, expect_returncode=111)
         cmd = data["stdout"].strip()
diff --git a/Misc/NEWS.d/next/Windows/2022-07-26-20-33-12.gh-issue-95285.w6fa22.rst b/Misc/NEWS.d/next/Windows/2022-07-26-20-33-12.gh-issue-95285.w6fa22.rst
new file mode 100644
index 0000000000000..76b38e7803cca
--- /dev/null
+++ b/Misc/NEWS.d/next/Windows/2022-07-26-20-33-12.gh-issue-95285.w6fa22.rst
@@ -0,0 +1,2 @@
+Fix :ref:`launcher` handling of command lines where it is only passed a
+short executable name.
diff --git a/PC/launcher2.c b/PC/launcher2.c
index c8ed1b0f7c8a6..31b5617771e9b 100644
--- a/PC/launcher2.c
+++ b/PC/launcher2.c
@@ -580,6 +580,9 @@ parseCommandLine(SearchInfo *search)
             break;
         }
     }
+    if (tail == search->originalCmdLine && tail[0] == L'"') {
+        ++tail;
+    }
     // Without special cases, we can now fill in the search struct
     int tailLen = (int)(end ? (end - tail) : wcsnlen_s(tail, MAXLEN));
     search->executableLength = -1;


From webhook-mailer at python.org  Tue Jul 26 19:26:48 2022
From: webhook-mailer at python.org (ericsnowcurrently)
Date: Tue, 26 Jul 2022 23:26:48 -0000
Subject: [Python-checkins] gh-94673: Add Per-Interpreter Storage for Static
 Builtin Types (#95255)
Message-ID: <mailman.276.1658878009.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/47e75a0025529fa538bc24d55b27ae4823d3df9d
commit: 47e75a0025529fa538bc24d55b27ae4823d3df9d
branch: main
author: Eric Snow <ericsnowcurrently at gmail.com>
committer: ericsnowcurrently <ericsnowcurrently at gmail.com>
date: 2022-07-26T17:26:43-06:00
summary:

gh-94673: Add Per-Interpreter Storage for Static Builtin Types (#95255)

This is the last precursor to storing tp_subclasses (and tp_weaklist) on the interpreter state for static builtin types.

Here we add per-type storage on PyInterpreterState, but only for the static builtin types.  This involves the following:

* add PyInterpreterState.types
   * move PyInterpreterState.type_cache to it
   * add a "num_builtins_initialized" field
   * add a "builtins" field (a static array big enough for all the static builtin types)
* add _PyStaticType_GetState() to look up a static builtin type's state
* (temporarily) add PyTypeObject.tp_static_builtin_index (to hold the type's index into PyInterpreterState.types.builtins)

We will be eliminating tp_static_builtin_index in a later change.

files:
M Include/cpython/object.h
M Include/internal/pycore_interp.h
M Include/internal/pycore_typeobject.h
M Lib/test/test_sys.py
M Objects/typeobject.c

diff --git a/Include/cpython/object.h b/Include/cpython/object.h
index 614d6c18ee0b4..1ca1a576fb232 100644
--- a/Include/cpython/object.h
+++ b/Include/cpython/object.h
@@ -227,6 +227,7 @@ struct _typeobject {
 
     destructor tp_finalize;
     vectorcallfunc tp_vectorcall;
+    size_t tp_static_builtin_index;  /* 0 means "not initialized" */
 };
 
 /* This struct is used by the specializer
diff --git a/Include/internal/pycore_interp.h b/Include/internal/pycore_interp.h
index 6ce2945cd9fb7..d71386953a0dd 100644
--- a/Include/internal/pycore_interp.h
+++ b/Include/internal/pycore_interp.h
@@ -173,7 +173,7 @@ struct _is {
     struct _Py_exc_state exc_state;
 
     struct ast_state ast;
-    struct type_cache type_cache;
+    struct types_state types;
     struct callable_cache callable_cache;
 
     /* The following fields are here to avoid allocation during init.
diff --git a/Include/internal/pycore_typeobject.h b/Include/internal/pycore_typeobject.h
index 46f3bf78b133e..dc1c02ba41280 100644
--- a/Include/internal/pycore_typeobject.h
+++ b/Include/internal/pycore_typeobject.h
@@ -39,9 +39,25 @@ struct type_cache {
 #endif
 };
 
+/* For now we hard-code this to a value for which we are confident
+   all the static builtin types will fit (for all builds). */
+#define _Py_MAX_STATIC_BUILTIN_TYPES 200
+
+typedef struct {
+    PyTypeObject *type;
+} static_builtin_state;
+
+struct types_state {
+    struct type_cache type_cache;
+    size_t num_builtins_initialized;
+    static_builtin_state builtins[_Py_MAX_STATIC_BUILTIN_TYPES];
+};
+
+
 extern PyStatus _PyTypes_InitSlotDefs(void);
 
 extern int _PyStaticType_InitBuiltin(PyTypeObject *type);
+extern static_builtin_state * _PyStaticType_GetState(PyTypeObject *);
 extern void _PyStaticType_Dealloc(PyTypeObject *type);
 
 
diff --git a/Lib/test/test_sys.py b/Lib/test/test_sys.py
index 1dc10d8b0a39a..f629dd5f03472 100644
--- a/Lib/test/test_sys.py
+++ b/Lib/test/test_sys.py
@@ -1507,7 +1507,7 @@ def delx(self): del self.__x
         check((1,2,3), vsize('') + 3*self.P)
         # type
         # static type: PyTypeObject
-        fmt = 'P2nPI13Pl4Pn9Pn12PIP'
+        fmt = 'P2nPI13Pl4Pn9Pn12PIPI'
         s = vsize('2P' + fmt)
         check(int, s)
         # class
diff --git a/Objects/typeobject.c b/Objects/typeobject.c
index f9e6f6372ab4d..9eb2390118d09 100644
--- a/Objects/typeobject.c
+++ b/Objects/typeobject.c
@@ -67,6 +67,88 @@ slot_tp_setattro(PyObject *self, PyObject *name, PyObject *value);
 
 static inline PyTypeObject * subclass_from_ref(PyObject *ref);
 
+
+/* helpers for for static builtin types */
+
+static inline int
+static_builtin_index_is_set(PyTypeObject *self)
+{
+    return self->tp_static_builtin_index > 0;
+}
+
+static inline size_t
+static_builtin_index_get(PyTypeObject *self)
+{
+    assert(static_builtin_index_is_set(self));
+    /* We store a 1-based index so 0 can mean "not initialized". */
+    return self->tp_static_builtin_index - 1;
+}
+
+static inline void
+static_builtin_index_set(PyTypeObject *self, size_t index)
+{
+    assert(index < _Py_MAX_STATIC_BUILTIN_TYPES);
+    /* We store a 1-based index so 0 can mean "not initialized". */
+    self->tp_static_builtin_index = index + 1;
+}
+
+static inline void
+static_builtin_index_clear(PyTypeObject *self)
+{
+    self->tp_static_builtin_index = 0;
+}
+
+static inline static_builtin_state *
+static_builtin_state_get(PyInterpreterState *interp, PyTypeObject *self)
+{
+    return &(interp->types.builtins[static_builtin_index_get(self)]);
+}
+
+/* For static types we store some state in an array on each interpreter. */
+static_builtin_state *
+_PyStaticType_GetState(PyTypeObject *self)
+{
+    assert(self->tp_flags & _Py_TPFLAGS_STATIC_BUILTIN);
+    PyInterpreterState *interp = _PyInterpreterState_GET();
+    return static_builtin_state_get(interp, self);
+}
+
+static void
+static_builtin_state_init(PyTypeObject *self)
+{
+    /* Set the type's per-interpreter state. */
+    PyInterpreterState *interp = _PyInterpreterState_GET();
+
+    /* It should only be called once for each builtin type. */
+    assert(!static_builtin_index_is_set(self));
+
+    static_builtin_index_set(self, interp->types.num_builtins_initialized);
+    interp->types.num_builtins_initialized++;
+
+    static_builtin_state *state = static_builtin_state_get(interp, self);
+    state->type = self;
+}
+
+static void
+static_builtin_state_clear(PyTypeObject *self)
+{
+    /* Reset the type's per-interpreter state.
+       This basically undoes what static_builtin_state_init() did. */
+    PyInterpreterState *interp = _PyInterpreterState_GET();
+
+    static_builtin_state *state = static_builtin_state_get(interp, self);
+    state->type = NULL;
+    static_builtin_index_clear(self);
+
+    assert(interp->types.num_builtins_initialized > 0);
+    interp->types.num_builtins_initialized--;
+}
+
+// Also see _PyStaticType_InitBuiltin() and _PyStaticType_Dealloc().
+
+/* end static builtin helpers */
+
+
 /*
  * finds the beginning of the docstring's introspection signature.
  * if present, returns a pointer pointing to the first '('.
@@ -206,7 +288,7 @@ static struct type_cache*
 get_type_cache(void)
 {
     PyInterpreterState *interp = _PyInterpreterState_GET();
-    return &interp->type_cache;
+    return &interp->types.type_cache;
 }
 
 
@@ -225,7 +307,7 @@ type_cache_clear(struct type_cache *cache, PyObject *value)
 void
 _PyType_InitCache(PyInterpreterState *interp)
 {
-    struct type_cache *cache = &interp->type_cache;
+    struct type_cache *cache = &interp->types.type_cache;
     for (Py_ssize_t i = 0; i < (1 << MCACHE_SIZE_EXP); i++) {
         struct type_cache_entry *entry = &cache->hashtable[i];
         assert(entry->name == NULL);
@@ -242,7 +324,7 @@ _PyType_InitCache(PyInterpreterState *interp)
 static unsigned int
 _PyType_ClearCache(PyInterpreterState *interp)
 {
-    struct type_cache *cache = &interp->type_cache;
+    struct type_cache *cache = &interp->types.type_cache;
 #if MCACHE_STATS
     size_t total = cache->hits + cache->collisions + cache->misses;
     fprintf(stderr, "-- Method cache hits        = %zd (%d%%)\n",
@@ -274,11 +356,17 @@ PyType_ClearCache(void)
 void
 _PyTypes_Fini(PyInterpreterState *interp)
 {
-    struct type_cache *cache = &interp->type_cache;
+    struct type_cache *cache = &interp->types.type_cache;
     type_cache_clear(cache, NULL);
     if (_Py_IsMainInterpreter(interp)) {
         clear_slotdefs();
     }
+
+    assert(interp->types.num_builtins_initialized == 0);
+    // All the static builtin types should have been finalized already.
+    for (size_t i = 0; i < _Py_MAX_STATIC_BUILTIN_TYPES; i++) {
+        assert(interp->types.builtins[i].type == NULL);
+    }
 }
 
 
@@ -4247,6 +4335,8 @@ clear_static_tp_subclasses(PyTypeObject *type)
 void
 _PyStaticType_Dealloc(PyTypeObject *type)
 {
+    assert(!(type->tp_flags & Py_TPFLAGS_HEAPTYPE));
+
     type_dealloc_common(type);
 
     Py_CLEAR(type->tp_dict);
@@ -4261,6 +4351,11 @@ _PyStaticType_Dealloc(PyTypeObject *type)
     }
 
     type->tp_flags &= ~Py_TPFLAGS_READY;
+
+    if (type->tp_flags & _Py_TPFLAGS_STATIC_BUILTIN) {
+        static_builtin_state_clear(type);
+        /* We leave _Py_TPFLAGS_STATIC_BUILTIN set on tp_flags. */
+    }
 }
 
 
@@ -6679,7 +6774,13 @@ _PyStaticType_InitBuiltin(PyTypeObject *self)
 {
     self->tp_flags = self->tp_flags | _Py_TPFLAGS_STATIC_BUILTIN;
 
-    return PyType_Ready(self);
+    static_builtin_state_init(self);
+
+    int res = PyType_Ready(self);
+    if (res < 0) {
+        static_builtin_state_clear(self);
+    }
+    return res;
 }
 
 


From webhook-mailer at python.org  Wed Jul 27 01:43:46 2022
From: webhook-mailer at python.org (erlend-aasland)
Date: Wed, 27 Jul 2022 05:43:46 -0000
Subject: [Python-checkins] gh-94635: Add sqlite3 'Introduction' and
 'Tutorial' doc headings (#95269)
Message-ID: <mailman.277.1658900627.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/2e35a13e46663acf665da06267c54e66c7ecf18d
commit: 2e35a13e46663acf665da06267c54e66c7ecf18d
branch: main
author: Erlend Egeberg Aasland <erlend.aasland at protonmail.com>
committer: erlend-aasland <erlend.aasland at protonmail.com>
date: 2022-07-27T07:43:24+02:00
summary:

gh-94635: Add sqlite3 'Introduction' and 'Tutorial' doc headings (#95269)

files:
M Doc/library/sqlite3.rst

diff --git a/Doc/library/sqlite3.rst b/Doc/library/sqlite3.rst
index b75549448d403..b780605444a42 100644
--- a/Doc/library/sqlite3.rst
+++ b/Doc/library/sqlite3.rst
@@ -8,7 +8,11 @@
 
 **Source code:** :source:`Lib/sqlite3/`
 
---------------
+
+.. _sqlite3-intro:
+
+Introduction
+------------
 
 SQLite is a C library that provides a lightweight disk-based database that
 doesn't require a separate server process and allows accessing the database
@@ -21,6 +25,12 @@ The sqlite3 module was written by Gerhard H?ring.  It provides an SQL interface
 compliant with the DB-API 2.0 specification described by :pep:`249`, and
 requires SQLite 3.7.15 or newer.
 
+
+.. _sqlite3-tutorial:
+
+Tutorial
+--------
+
 To use the module, start by creating a :class:`Connection` object that
 represents the database.  Here the data will be stored in the
 :file:`example.db` file::


From webhook-mailer at python.org  Wed Jul 27 01:49:34 2022
From: webhook-mailer at python.org (miss-islington)
Date: Wed, 27 Jul 2022 05:49:34 -0000
Subject: [Python-checkins] gh-94635: Add sqlite3 'Introduction' and
 'Tutorial' doc headings (GH-95269)
Message-ID: <mailman.278.1658900975.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/321b8bbf0fdb30de107077f7604e5c33fe95db6c
commit: 321b8bbf0fdb30de107077f7604e5c33fe95db6c
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-26T22:49:29-07:00
summary:

gh-94635: Add sqlite3 'Introduction' and 'Tutorial' doc headings (GH-95269)

(cherry picked from commit 2e35a13e46663acf665da06267c54e66c7ecf18d)

Co-authored-by: Erlend Egeberg Aasland <erlend.aasland at protonmail.com>

files:
M Doc/library/sqlite3.rst

diff --git a/Doc/library/sqlite3.rst b/Doc/library/sqlite3.rst
index 2c7438afd828f..f8b800bfdc298 100644
--- a/Doc/library/sqlite3.rst
+++ b/Doc/library/sqlite3.rst
@@ -8,7 +8,11 @@
 
 **Source code:** :source:`Lib/sqlite3/`
 
---------------
+
+.. _sqlite3-intro:
+
+Introduction
+------------
 
 SQLite is a C library that provides a lightweight disk-based database that
 doesn't require a separate server process and allows accessing the database
@@ -21,6 +25,12 @@ The sqlite3 module was written by Gerhard H?ring.  It provides an SQL interface
 compliant with the DB-API 2.0 specification described by :pep:`249`, and
 requires SQLite 3.7.15 or newer.
 
+
+.. _sqlite3-tutorial:
+
+Tutorial
+--------
+
 To use the module, start by creating a :class:`Connection` object that
 represents the database.  Here the data will be stored in the
 :file:`example.db` file::


From webhook-mailer at python.org  Wed Jul 27 02:18:51 2022
From: webhook-mailer at python.org (tiran)
Date: Wed, 27 Jul 2022 06:18:51 -0000
Subject: [Python-checkins] gh-95085: Promote Emscripten and WASI to PEP 11
 tier 3 (GH-95086)
Message-ID: <mailman.279.1658902732.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/daa64d6a5900beea1f1973e5e01121967bc6fa6c
commit: daa64d6a5900beea1f1973e5e01121967bc6fa6c
branch: main
author: Christian Heimes <christian at python.org>
committer: tiran <christian at python.org>
date: 2022-07-27T08:18:34+02:00
summary:

gh-95085: Promote Emscripten and WASI to PEP 11 tier 3 (GH-95086)

files:
A Misc/NEWS.d/next/Build/2022-07-21-09-17-01.gh-issue-95085.E9x2S_.rst
M Doc/whatsnew/3.11.rst
M Tools/wasm/README.md
M configure
M configure.ac

diff --git a/Doc/whatsnew/3.11.rst b/Doc/whatsnew/3.11.rst
index b7ec8ad55471b..f458f8e6a40bf 100644
--- a/Doc/whatsnew/3.11.rst
+++ b/Doc/whatsnew/3.11.rst
@@ -1551,10 +1551,19 @@ Build Changes
      The :program:`configure` options ``--with-tcltk-includes`` and
      ``--with-tcltk-libs`` have been removed.
 
-* CPython now has experimental support for cross compiling to WebAssembly
-  platform ``wasm32-emscripten``. The effort is inspired by previous work
-  like Pyodide.
-  (Contributed by Christian Heimes and Ethan Smith in :issue:`40280`.)
+* CPython now has :pep:`11` tier 3 support for cross compiling to WebAssembly
+  platform ``wasm32-unknown-emscripten`` (Python in the browser). The effort
+  is inspired by previous work like `Pyodide <https://pyodide.org/>`_.
+  Emscripten provides a limited subset of POSIX APIs. Python standard
+  libraries features and modules related to networking, processes, threading,
+  signals, mmap, and users/groups are not available or don't work.
+  (Contributed by Christian Heimes and Ethan Smith in :gh:`84461`,
+  promoted in :gh:`95085`)
+
+* CPython now has :pep:`11` tier 3 support for cross compiling to WebAssembly
+  platform ``wasm32-unknown-wasi`` (WebAssembly System Interface). Like on
+  Emscripten, only a subset of Python's standard library is available on WASI.
+  (Contributed by Christian Heimes in :gh:`90473`, promoted in :gh:`95085`)
 
 * CPython will now use 30-bit digits by default for the Python :class:`int`
   implementation. Previously, the default was to use 30-bit digits on platforms
diff --git a/Misc/NEWS.d/next/Build/2022-07-21-09-17-01.gh-issue-95085.E9x2S_.rst b/Misc/NEWS.d/next/Build/2022-07-21-09-17-01.gh-issue-95085.E9x2S_.rst
new file mode 100644
index 0000000000000..02dbd2b8b3118
--- /dev/null
+++ b/Misc/NEWS.d/next/Build/2022-07-21-09-17-01.gh-issue-95085.E9x2S_.rst
@@ -0,0 +1,2 @@
+Platforms ``wasm32-unknown-emscripten`` and ``wasm32-unknown-wasi`` have
+been promoted to :pep:`11` tier 3 platform support.
diff --git a/Tools/wasm/README.md b/Tools/wasm/README.md
index c1daddda463bb..37bd395baff6d 100644
--- a/Tools/wasm/README.md
+++ b/Tools/wasm/README.md
@@ -167,7 +167,7 @@ functions.
 - Heap memory and stack size are limited. Recursion or extensive memory
   consumption can crash Python.
 - Most stdlib modules with a dependency on external libraries are missing,
-  e.g. ``ctypes``, ``readline``, ``sqlite3``, ``ssl``, and more.
+  e.g. ``ctypes``, ``readline``, ``ssl``, and more.
 - Shared extension modules are not implemented yet. All extension modules
   are statically linked into the main binary. The experimental configure
   option ``--enable-wasm-dynamic-linking`` enables dynamic extensions
diff --git a/configure b/configure
index 6190680d87493..77c4bdb1d392e 100755
--- a/configure
+++ b/configure
@@ -6342,7 +6342,11 @@ case $host/$ac_cv_cc_name in #(
     PY_SUPPORT_TIER=3 ;; #(
     s390x-*-linux-gnu/gcc) :
     PY_SUPPORT_TIER=3 ;; #(
-        x86_64-*-freebsd*/clang) :
+    wasm32-unknown-emscripten/clang) :
+    PY_SUPPORT_TIER=3 ;; #(
+    wasm32-unknown-wasi/clang) :
+    PY_SUPPORT_TIER=3 ;; #(
+    x86_64-*-freebsd*/clang) :
     PY_SUPPORT_TIER=3 ;; #(
   *) :
       PY_SUPPORT_TIER=0
diff --git a/configure.ac b/configure.ac
index 2c1b2ddeaf47a..78eebd57bd24d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1141,8 +1141,8 @@ AS_CASE([$host/$ac_cv_cc_name],
   [armv7l-*-linux-gnueabihf/gcc],    [PY_SUPPORT_TIER=3], dnl ARMv7 LE with hardware floats, any vendor, glibc, gcc
   [powerpc64le-*-linux-gnu/clang],   [PY_SUPPORT_TIER=3], dnl Linux on PPC64 little endian, glibc, clang
   [s390x-*-linux-gnu/gcc],           [PY_SUPPORT_TIER=3], dnl Linux on 64bit s390x (big endian), glibc, gcc
-  dnl [wasm32-unknown-emscripten/clang], [PY_SUPPORT_TIER=3], dnl WebAssembly Emscripten
-  dnl [wasm32-unknown-wasi/clang],       [PY_SUPPORT_TIER=3], dnl WebAssembly System Interface
+  [wasm32-unknown-emscripten/clang], [PY_SUPPORT_TIER=3], dnl WebAssembly Emscripten
+  [wasm32-unknown-wasi/clang],       [PY_SUPPORT_TIER=3], dnl WebAssembly System Interface
   [x86_64-*-freebsd*/clang],         [PY_SUPPORT_TIER=3], dnl FreeBSD on AMD64
   [PY_SUPPORT_TIER=0]
 )


From webhook-mailer at python.org  Wed Jul 27 02:19:41 2022
From: webhook-mailer at python.org (tiran)
Date: Wed, 27 Jul 2022 06:19:41 -0000
Subject: [Python-checkins] gh-95174: WASI: skip missing sockets functions
 (GH-95179)
Message-ID: <mailman.280.1658902783.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/8b24d60f1b7725d526ea5b5d3904b72e8b41ae0d
commit: 8b24d60f1b7725d526ea5b5d3904b72e8b41ae0d
branch: main
author: Christian Heimes <christian at python.org>
committer: tiran <christian at python.org>
date: 2022-07-27T08:19:23+02:00
summary:

gh-95174: WASI: skip missing sockets functions (GH-95179)

files:
A Misc/NEWS.d/next/Build/2022-07-23-21-39-09.gh-issue-95174.7cYMZR.rst
M Lib/test/test_socket.py
M Modules/addrinfo.h
M Modules/getaddrinfo.c
M Modules/getnameinfo.c
M Modules/socketmodule.c
M PC/pyconfig.h
M Tools/wasm/config.site-wasm32-wasi
M configure
M configure.ac
M pyconfig.h.in

diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py
index 8424693fc609a..f1b57fc407103 100644
--- a/Lib/test/test_socket.py
+++ b/Lib/test/test_socket.py
@@ -965,6 +965,19 @@ def testWindowsSpecificConstants(self):
         socket.IPPROTO_L2TP
         socket.IPPROTO_SCTP
 
+    @unittest.skipIf(support.is_wasi, "WASI is missing these methods")
+    def test_socket_methods(self):
+        # socket methods that depend on a configure HAVE_ check. They should
+        # be present on all platforms except WASI.
+        names = [
+            "_accept", "bind", "connect", "connect_ex", "getpeername",
+            "getsockname", "listen", "recvfrom", "recvfrom_into", "sendto",
+            "setsockopt", "shutdown"
+        ]
+        for name in names:
+            if not hasattr(socket.socket, name):
+                self.fail(f"socket method {name} is missing")
+
     @unittest.skipUnless(sys.platform == 'darwin', 'macOS specific test')
     @unittest.skipUnless(socket_helper.IPV6_ENABLED, 'IPv6 required for this test')
     def test3542SocketOptions(self):
diff --git a/Misc/NEWS.d/next/Build/2022-07-23-21-39-09.gh-issue-95174.7cYMZR.rst b/Misc/NEWS.d/next/Build/2022-07-23-21-39-09.gh-issue-95174.7cYMZR.rst
new file mode 100644
index 0000000000000..72ce183ac8329
--- /dev/null
+++ b/Misc/NEWS.d/next/Build/2022-07-23-21-39-09.gh-issue-95174.7cYMZR.rst
@@ -0,0 +1 @@
+Python now skips missing :mod:`socket` functions and methods on WASI. WASI can only create sockets from existing fd / accept and has no netdb.
diff --git a/Modules/addrinfo.h b/Modules/addrinfo.h
index c3c86248dd436..66e5a795f86f1 100644
--- a/Modules/addrinfo.h
+++ b/Modules/addrinfo.h
@@ -162,7 +162,9 @@ struct sockaddr_storage {
 #ifdef __cplusplus
 extern "C" {
 #endif
+#ifdef ENABLE_IPV6
 extern void freehostent(struct hostent *);
+#endif
 #ifdef __cplusplus
 }
 #endif
diff --git a/Modules/getaddrinfo.c b/Modules/getaddrinfo.c
index 5aaa6e7c8144f..0b4620ed683de 100644
--- a/Modules/getaddrinfo.c
+++ b/Modules/getaddrinfo.c
@@ -61,6 +61,9 @@
 # define FAITH
 #endif
 
+#ifdef HAVE_NETDB_H
+#define HAVE_GETADDRINFO 1
+
 #define SUCCESS 0
 #define GAI_ANY 0
 #define YES 1
@@ -636,3 +639,5 @@ get_addr(hostname, af, res, pai, port0)
     *res = NULL;
     return error;
 }
+
+#endif // HAVE_NETDB_H
diff --git a/Modules/getnameinfo.c b/Modules/getnameinfo.c
index db3e8eedd217c..335021f79bafe 100644
--- a/Modules/getnameinfo.c
+++ b/Modules/getnameinfo.c
@@ -48,6 +48,9 @@
 #include "addrinfo.h"
 #endif
 
+#ifdef HAVE_NETDB_H
+#define HAVE_GETNAMEINFO 1
+
 #define SUCCESS 0
 #define YES 1
 #define NO  0
@@ -211,3 +214,4 @@ getnameinfo(sa, salen, host, hostlen, serv, servlen, flags)
     }
     return SUCCESS;
 }
+#endif // HAVE_NETDB_H
diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
index 5641613452b3a..869bacde924d8 100644
--- a/Modules/socketmodule.c
+++ b/Modules/socketmodule.c
@@ -227,7 +227,7 @@ shutdown(how) -- shut down traffic in one or both directions\n\
 
 #define HAVE_INET_PTON
 #include <netdb.h>
-#endif
+#endif // __sgi
 
 /* Solaris fails to define this variable at all. */
 #if (defined(__sun) && defined(__SVR4)) && !defined(INET_ADDRSTRLEN)
@@ -256,7 +256,9 @@ shutdown(how) -- shut down traffic in one or both directions\n\
 #ifndef MS_WINDOWS
 
 /* Non-MS WINDOWS includes */
-# include <netdb.h>
+#ifdef HAVE_NETDB_H
+#  include <netdb.h>
+#endif
 # include <unistd.h>
 
 /* Headers needed for inet_ntoa() and inet_addr() */
@@ -439,10 +441,11 @@ remove_unusable_flags(PyObject *m)
 #define freeaddrinfo fake_freeaddrinfo
 #include "getaddrinfo.c"
 #endif
+
 #if !defined(HAVE_GETNAMEINFO)
 #define getnameinfo fake_getnameinfo
 #include "getnameinfo.c"
-#endif
+#endif // HAVE_GETNAMEINFO
 
 #ifdef MS_WINDOWS
 #define SOCKETCLOSE closesocket
@@ -623,6 +626,7 @@ set_error(void)
 }
 
 
+#if defined(HAVE_GETHOSTBYNAME_R) || defined (HAVE_GETHOSTBYNAME) || defined (HAVE_GETHOSTBYADDR)
 static PyObject *
 set_herror(int h_error)
 {
@@ -640,8 +644,10 @@ set_herror(int h_error)
 
     return NULL;
 }
+#endif
 
 
+#ifdef HAVE_GETADDRINFO
 static PyObject *
 set_gaierror(int error)
 {
@@ -665,6 +671,7 @@ set_gaierror(int error)
 
     return NULL;
 }
+#endif
 
 /* Function to perform the setting of socket blocking mode
    internally. block = (1 | 0). */
@@ -1046,6 +1053,7 @@ static PyThread_type_lock netdb_lock;
 #endif
 
 
+#ifdef HAVE_GETADDRINFO
 /* Convert a string specifying a host name or one of a few symbolic
    names to a numeric IP address.  This usually calls gethostbyname()
    to do the work; the names "" and "<broadcast>" are special.
@@ -1202,7 +1210,7 @@ setipaddr(const char *name, struct sockaddr *addr_ret, size_t addr_ret_size, int
         return -1;
     }
 }
-
+#endif // HAVE_GETADDRINFO
 
 /* Convert IPv4 sockaddr to a Python str. */
 
@@ -1626,6 +1634,7 @@ makesockaddr(SOCKET_T sockfd, struct sockaddr *addr, size_t addrlen, int proto)
     }
 }
 
+#if defined(HAVE_BIND) || defined(HAVE_CONNECTTO) || defined(CMSG_LEN)
 /* Helper for getsockaddrarg: bypass IDNA for ASCII-only host names
    (in particular, numeric IP addresses). */
 struct maybe_idna {
@@ -2490,6 +2499,7 @@ getsockaddrarg(PySocketSockObject *s, PyObject *args,
 
     }
 }
+#endif // defined(HAVE_BIND) || defined(HAVE_CONNECTTO) || defined(CMSG_LEN)
 
 
 /* Get the address length according to the socket object's address family.
@@ -2787,6 +2797,7 @@ struct sock_accept {
     SOCKET_T result;
 };
 
+#if defined(HAVE_ACCEPT) || defined(HAVE_ACCEPT4)
 #if defined(HAVE_ACCEPT4) && defined(SOCK_CLOEXEC)
 /* accept4() is available on Linux 2.6.28+ and glibc 2.10 */
 static int accept4_works = -1;
@@ -2900,6 +2911,8 @@ PyDoc_STRVAR(accept_doc,
 Wait for an incoming connection.  Return a new socket file descriptor\n\
 representing the connection, and the address of the client.\n\
 For IP sockets, the address info is a pair (hostaddr, port).");
+#endif // defined(HAVE_ACCEPT) || defined(HAVE_ACCEPT4)
+
 
 /* s.setblocking(flag) method.  Argument:
    False -- non-blocking mode; same as settimeout(0)
@@ -3064,6 +3077,7 @@ Returns the timeout in seconds (float) associated with socket\n\
 operations. A timeout of None indicates that timeouts on socket\n\
 operations are disabled.");
 
+#ifdef HAVE_SETSOCKOPT
 /* s.setsockopt() method.
    With an integer third argument, sets an integer optval with optlen=4.
    With None as third argument and an integer fourth argument, set
@@ -3153,7 +3167,7 @@ setsockopt(level, option, None, optlen: int)\n\
 Set a socket option.  See the Unix manual for level and option.\n\
 The value argument can either be an integer, a string buffer, or\n\
 None, optlen.");
-
+#endif
 
 /* s.getsockopt() method.
    With two arguments, retrieves an integer option.
@@ -3227,6 +3241,7 @@ If a nonzero buffersize argument is given, the return value is a\n\
 string of that length; otherwise it is an integer.");
 
 
+#ifdef HAVE_BIND
 /* s.bind(sockaddr) method */
 
 static PyObject *
@@ -3258,6 +3273,7 @@ PyDoc_STRVAR(bind_doc,
 Bind the socket to a local address.  For IP sockets, the address is a\n\
 pair (host, port); the host must refer to the local host. For raw packet\n\
 sockets the address is a tuple (ifname, proto [,pkttype [,hatype [,addr]]])");
+#endif
 
 
 /* s.close() method.
@@ -3310,6 +3326,7 @@ Close the socket object without closing the underlying file descriptor.\n\
 The object cannot be used after this call, but the file descriptor\n\
 can be reused for other purposes.  The file descriptor is returned.");
 
+#ifdef HAVE_CONNECT
 static int
 sock_connect_impl(PySocketSockObject *s, void* Py_UNUSED(data))
 {
@@ -3457,6 +3474,7 @@ PyDoc_STRVAR(connect_ex_doc,
 \n\
 This is like connect(address), but returns an error code (the errno value)\n\
 instead of raising an exception when an error occurs.");
+#endif // HAVE_CONNECT
 
 
 /* s.fileno() method */
@@ -3473,6 +3491,7 @@ PyDoc_STRVAR(fileno_doc,
 Return the integer file descriptor of the socket.");
 
 
+#ifdef HAVE_GETSOCKNAME
 /* s.getsockname() method */
 
 static PyObject *
@@ -3500,6 +3519,7 @@ PyDoc_STRVAR(getsockname_doc,
 Return the address of the local endpoint. The format depends on the\n\
 address family. For IPv4 sockets, the address info is a pair\n\
 (hostaddr, port).");
+#endif
 
 
 #ifdef HAVE_GETPEERNAME         /* Cray APP doesn't have this :-( */
@@ -3533,6 +3553,7 @@ info is a pair (hostaddr, port).");
 #endif /* HAVE_GETPEERNAME */
 
 
+#ifdef HAVE_LISTEN
 /* s.listen(n) method */
 
 static PyObject *
@@ -3565,6 +3586,7 @@ Enable a server to accept connections.  If backlog is specified, it must be\n\
 at least 0 (if it is lower, it is set to 0); it specifies the number of\n\
 unaccepted connections that the system will allow before refusing new\n\
 connections. If not specified, a default reasonable value is chosen.");
+#endif
 
 struct sock_recv {
     char *cbuf;
@@ -3741,6 +3763,7 @@ struct sock_recvfrom {
     Py_ssize_t result;
 };
 
+#ifdef HAVE_RECVFROM
 static int
 sock_recvfrom_impl(PySocketSockObject *s, void *data)
 {
@@ -3913,6 +3936,7 @@ PyDoc_STRVAR(recvfrom_into_doc,
 "recvfrom_into(buffer[, nbytes[, flags]]) -> (nbytes, address info)\n\
 \n\
 Like recv_into(buffer[, nbytes[, flags]]) but also return the sender's address info.");
+#endif
 
 /* The sendmsg() and recvmsg[_into]() methods require a working
    CMSG_LEN().  See the comment near get_CMSG_LEN(). */
@@ -4379,6 +4403,7 @@ until all data is sent.  If an error occurs, it's impossible\n\
 to tell how much data has been sent.");
 
 
+#ifdef HAVE_SENDTO
 struct sock_sendto {
     char *buf;
     Py_ssize_t len;
@@ -4471,6 +4496,7 @@ PyDoc_STRVAR(sendto_doc,
 \n\
 Like send(data, flags) but allows specifying the destination address.\n\
 For IP sockets, the address is a pair (hostaddr, port).");
+#endif
 
 
 /* The sendmsg() and recvmsg[_into]() methods require a working
@@ -5034,16 +5060,22 @@ socket.fromshare().");
 /* List of methods for socket objects */
 
 static PyMethodDef sock_methods[] = {
+#if defined(HAVE_ACCEPT) || defined(HAVE_ACCEPT4)
     {"_accept",           (PyCFunction)sock_accept, METH_NOARGS,
                       accept_doc},
+#endif
+#ifdef HAVE_BIND
     {"bind",              (PyCFunction)sock_bind, METH_O,
                       bind_doc},
+#endif
     {"close",             (PyCFunction)sock_close, METH_NOARGS,
                       sock_close_doc},
+#ifdef HAVE_CONNECT
     {"connect",           (PyCFunction)sock_connect, METH_O,
                       connect_doc},
     {"connect_ex",        (PyCFunction)sock_connect_ex, METH_O,
                       connect_ex_doc},
+#endif
     {"detach",            (PyCFunction)sock_detach, METH_NOARGS,
                       detach_doc},
     {"fileno",            (PyCFunction)sock_fileno, METH_NOARGS,
@@ -5052,8 +5084,10 @@ static PyMethodDef sock_methods[] = {
     {"getpeername",       (PyCFunction)sock_getpeername,
                       METH_NOARGS, getpeername_doc},
 #endif
+#ifdef HAVE_GETSOCKNAME
     {"getsockname",       (PyCFunction)sock_getsockname,
                       METH_NOARGS, getsockname_doc},
+#endif
     {"getsockopt",        (PyCFunction)sock_getsockopt, METH_VARARGS,
                       getsockopt_doc},
 #if defined(MS_WINDOWS) && defined(SIO_RCVALL)
@@ -5064,22 +5098,28 @@ static PyMethodDef sock_methods[] = {
     {"share",         (PyCFunction)sock_share, METH_VARARGS,
                       sock_share_doc},
 #endif
+#ifdef HAVE_LISTEN
     {"listen",            (PyCFunction)sock_listen, METH_VARARGS,
                       listen_doc},
+#endif
     {"recv",              (PyCFunction)sock_recv, METH_VARARGS,
                       recv_doc},
     {"recv_into",         _PyCFunction_CAST(sock_recv_into), METH_VARARGS | METH_KEYWORDS,
                       recv_into_doc},
+#ifdef HAVE_RECVFROM
     {"recvfrom",          (PyCFunction)sock_recvfrom, METH_VARARGS,
                       recvfrom_doc},
     {"recvfrom_into",  _PyCFunction_CAST(sock_recvfrom_into), METH_VARARGS | METH_KEYWORDS,
                       recvfrom_into_doc},
+#endif
     {"send",              (PyCFunction)sock_send, METH_VARARGS,
                       send_doc},
     {"sendall",           (PyCFunction)sock_sendall, METH_VARARGS,
                       sendall_doc},
+#ifdef HAVE_SENDTO
     {"sendto",            (PyCFunction)sock_sendto, METH_VARARGS,
                       sendto_doc},
+#endif
     {"setblocking",       (PyCFunction)sock_setblocking, METH_O,
                       setblocking_doc},
     {"getblocking",   (PyCFunction)sock_getblocking, METH_NOARGS,
@@ -5088,8 +5128,10 @@ static PyMethodDef sock_methods[] = {
                       settimeout_doc},
     {"gettimeout",    (PyCFunction)sock_gettimeout, METH_NOARGS,
                       gettimeout_doc},
+#ifdef HAVE_SETSOCKOPT
     {"setsockopt",        (PyCFunction)sock_setsockopt, METH_VARARGS,
                       setsockopt_doc},
+#endif
 #ifdef HAVE_SHUTDOWN
     {"shutdown",          (PyCFunction)sock_shutdown, METH_O,
                       shutdown_doc},
@@ -5225,6 +5267,16 @@ static int sock_cloexec_works = -1;
 
 /*ARGSUSED*/
 
+#ifndef HAVE_SOCKET
+#define socket stub_socket
+static int
+socket(int domain, int type, int protocol)
+{
+    errno = ENOTSUP;
+    return INVALID_SOCKET;
+}
+#endif
+
 /*[clinic input]
 _socket.socket.__init__ as sock_initobj
     family: int = -1
@@ -5311,6 +5363,7 @@ sock_initobj_impl(PySocketSockObject *self, int family, int type, int proto,
             socklen_t addrlen = sizeof(sock_addr_t);
 
             memset(&addrbuf, 0, addrlen);
+#ifdef HAVE_GETSOCKNAME
             if (getsockname(fd, SAS2SA(&addrbuf), &addrlen) == 0) {
                 if (family == -1) {
                     family = SAS2SA(&addrbuf)->sa_family;
@@ -5329,6 +5382,7 @@ sock_initobj_impl(PySocketSockObject *self, int family, int type, int proto,
                     return -1;
                 }
             }
+#endif // HAVE_GETSOCKNAME
 #ifdef SO_TYPE
             if (type == -1) {
                 int tmp;
@@ -5507,6 +5561,7 @@ static PyTypeObject sock_type = {
 };
 
 
+#ifdef HAVE_GETHOSTNAME
 /* Python interface to gethostname(). */
 
 /*ARGSUSED*/
@@ -5570,6 +5625,7 @@ PyDoc_STRVAR(gethostname_doc,
 "gethostname() -> string\n\
 \n\
 Return the current host name.");
+#endif
 
 #ifdef HAVE_SETHOSTNAME
 PyDoc_STRVAR(sethostname_doc,
@@ -5613,6 +5669,7 @@ extern int sethostname(const char *, size_t);
 }
 #endif
 
+#ifdef HAVE_GETADDRINFO
 /* Python interface to gethostbyname(name). */
 
 /*ARGSUSED*/
@@ -5640,8 +5697,10 @@ PyDoc_STRVAR(gethostbyname_doc,
 "gethostbyname(host) -> address\n\
 \n\
 Return the IP address (a string of the form '255.255.255.255') for a host.");
+#endif
 
 
+#if defined(HAVE_GETHOSTBYNAME_R) || defined (HAVE_GETHOSTBYNAME) || defined (HAVE_GETHOSTBYADDR)
 static PyObject*
 sock_decode_hostname(const char *name)
 {
@@ -5783,8 +5842,9 @@ gethost_common(struct hostent *h, struct sockaddr *addr, size_t alen, int af)
     Py_XDECREF(addr_list);
     return rtn_tuple;
 }
+#endif
 
-
+#if defined(HAVE_GETHOSTBYNAME_R) || defined (HAVE_GETHOSTBYNAME)
 /* Python interface to gethostbyname_ex(name). */
 
 /*ARGSUSED*/
@@ -5857,8 +5917,9 @@ PyDoc_STRVAR(ghbn_ex_doc,
 \n\
 Return the true host name, a list of aliases, and a list of IP addresses,\n\
 for a host.  The host argument is a string giving a host name or IP number.");
+#endif
 
-
+#if defined(HAVE_GETHOSTBYNAME_R) || defined (HAVE_GETHOSTBYADDR)
 /* Python interface to gethostbyaddr(IP). */
 
 /*ARGSUSED*/
@@ -5953,8 +6014,9 @@ PyDoc_STRVAR(gethostbyaddr_doc,
 \n\
 Return the true host name, a list of aliases, and a list of IP addresses,\n\
 for a host.  The host argument is a string giving a host name or IP number.");
+#endif
 
-
+#ifdef HAVE_GETSERVBYNAME
 /* Python interface to getservbyname(name).
    This only returns the port number, since the other info is already
    known or not useful (like the list of aliases). */
@@ -5988,8 +6050,9 @@ PyDoc_STRVAR(getservbyname_doc,
 Return a port number from a service name and protocol name.\n\
 The optional protocol name, if given, should be 'tcp' or 'udp',\n\
 otherwise any protocol will match.");
+#endif
 
-
+#ifdef HAVE_GETSERVBYPORT
 /* Python interface to getservbyport(port).
    This only returns the service name, since the other info is already
    known or not useful (like the list of aliases). */
@@ -6030,7 +6093,9 @@ PyDoc_STRVAR(getservbyport_doc,
 Return the service name from a port number and protocol name.\n\
 The optional protocol name, if given, should be 'tcp' or 'udp',\n\
 otherwise any protocol will match.");
+#endif
 
+#ifdef HAVE_GETPROTOBYNAME
 /* Python interface to getprotobyname(name).
    This only returns the protocol number, since the other info is
    already known or not useful (like the list of aliases). */
@@ -6057,6 +6122,7 @@ PyDoc_STRVAR(getprotobyname_doc,
 "getprotobyname(name) -> integer\n\
 \n\
 Return the protocol number for the named protocol.  (Rarely used.)");
+#endif
 
 static PyObject *
 socket_close(PyObject *self, PyObject *fdobj)
@@ -6426,6 +6492,7 @@ socket_inet_aton(PyObject *self, PyObject *args)
 #endif
 }
 
+#ifdef HAVE_INET_NTOA
 PyDoc_STRVAR(inet_ntoa_doc,
 "inet_ntoa(packed_ip) -> ip_address_string\n\
 \n\
@@ -6454,6 +6521,7 @@ socket_inet_ntoa(PyObject *self, PyObject *args)
     SUPPRESS_DEPRECATED_CALL
     return PyUnicode_FromString(inet_ntoa(packed_addr));
 }
+#endif // HAVE_INET_NTOA
 
 #ifdef HAVE_INET_PTON
 
@@ -6565,6 +6633,7 @@ socket_inet_ntop(PyObject *self, PyObject *args)
 
 #endif /* HAVE_INET_PTON */
 
+#ifdef HAVE_GETADDRINFO
 /* Python interface to getaddrinfo(host, port). */
 
 /*ARGSUSED*/
@@ -6692,7 +6761,9 @@ PyDoc_STRVAR(getaddrinfo_doc,
     -> list of (family, type, proto, canonname, sockaddr)\n\
 \n\
 Resolve host and port into addrinfo struct.");
+#endif // HAVE_GETADDRINFO
 
+#ifdef HAVE_GETNAMEINFO
 /* Python interface to getnameinfo(sa, flags). */
 
 /*ARGSUSED*/
@@ -6793,7 +6864,7 @@ PyDoc_STRVAR(getnameinfo_doc,
 "getnameinfo(sockaddr, flags) --> (host, port)\n\
 \n\
 Get host and port for a sockaddr.");
-
+#endif // HAVE_GETNAMEINFO
 
 /* Python API to getting and setting the default timeout value. */
 
@@ -7049,24 +7120,38 @@ range of values.");
 /* List of functions exported by this module. */
 
 static PyMethodDef socket_methods[] = {
+#ifdef HAVE_GETADDRINFO
     {"gethostbyname",           socket_gethostbyname,
      METH_VARARGS, gethostbyname_doc},
+#endif
+#if defined(HAVE_GETHOSTBYNAME_R) || defined (HAVE_GETHOSTBYNAME)
     {"gethostbyname_ex",        socket_gethostbyname_ex,
      METH_VARARGS, ghbn_ex_doc},
+#endif
+#if defined(HAVE_GETHOSTBYNAME_R) || defined (HAVE_GETHOSTBYADDR)
     {"gethostbyaddr",           socket_gethostbyaddr,
      METH_VARARGS, gethostbyaddr_doc},
+#endif
+#ifdef HAVE_GETHOSTNAME
     {"gethostname",             socket_gethostname,
      METH_NOARGS,  gethostname_doc},
+#endif
 #ifdef HAVE_SETHOSTNAME
     {"sethostname",             socket_sethostname,
      METH_VARARGS,  sethostname_doc},
 #endif
+#ifdef HAVE_GETSERVBYNAME
     {"getservbyname",           socket_getservbyname,
      METH_VARARGS, getservbyname_doc},
+#endif
+#ifdef HAVE_GETSERVBYPORT
     {"getservbyport",           socket_getservbyport,
      METH_VARARGS, getservbyport_doc},
+#endif
+#ifdef HAVE_GETPROTOBYNAME
     {"getprotobyname",          socket_getprotobyname,
      METH_VARARGS, getprotobyname_doc},
+#endif
     {"close",                   socket_close,
      METH_O, close_doc},
 #ifndef NO_DUP
@@ -7087,18 +7172,24 @@ static PyMethodDef socket_methods[] = {
      METH_O, htonl_doc},
     {"inet_aton",               socket_inet_aton,
      METH_VARARGS, inet_aton_doc},
+#ifdef HAVE_INET_NTOA
     {"inet_ntoa",               socket_inet_ntoa,
      METH_VARARGS, inet_ntoa_doc},
+#endif
 #ifdef HAVE_INET_PTON
     {"inet_pton",               socket_inet_pton,
      METH_VARARGS, inet_pton_doc},
     {"inet_ntop",               socket_inet_ntop,
      METH_VARARGS, inet_ntop_doc},
 #endif
+#ifdef HAVE_GETADDRINFO
     {"getaddrinfo",             _PyCFunction_CAST(socket_getaddrinfo),
      METH_VARARGS | METH_KEYWORDS, getaddrinfo_doc},
+#endif
+#ifdef HAVE_GETNAMEINFO
     {"getnameinfo",             socket_getnameinfo,
      METH_VARARGS, getnameinfo_doc},
+#endif
     {"getdefaulttimeout",       socket_getdefaulttimeout,
      METH_NOARGS, getdefaulttimeout_doc},
     {"setdefaulttimeout",       socket_setdefaulttimeout,
@@ -7628,7 +7719,9 @@ PyInit__socket(void)
     /* SOCK_RAW is marked as optional in the POSIX specification */
     PyModule_AddIntMacro(m, SOCK_RAW);
 #endif
+#ifdef SOCK_SEQPACKET
     PyModule_AddIntMacro(m, SOCK_SEQPACKET);
+#endif
 #if defined(SOCK_RDM)
     PyModule_AddIntMacro(m, SOCK_RDM);
 #endif
diff --git a/PC/pyconfig.h b/PC/pyconfig.h
index 1135a121fcfdd..1a33d4c5a1e4f 100644
--- a/PC/pyconfig.h
+++ b/PC/pyconfig.h
@@ -675,8 +675,25 @@ Py_NO_ENABLE_SHARED to find out.  Also support MS_NO_COREDLL for b/w compat */
 /* Define to 1 if you have the `erfc' function. */
 #define HAVE_ERFC 1
 
-/* Define if you have the 'inet_pton' function. */
+// netdb.h functions (provided by winsock.h)
+#define HAVE_GETHOSTNAME 1
+#define HAVE_GETHOSTBYADDR 1
+#define HAVE_GETHOSTBYNAME 1
+#define HAVE_GETPROTOBYNAME 1
+#define HAVE_GETSERVBYNAME 1
+#define HAVE_GETSERVBYPORT 1
+// sys/socket.h functions (provided by winsock.h)
 #define HAVE_INET_PTON 1
+#define HAVE_INET_NTOA 1
+#define HAVE_ACCEPT 1
+#define HAVE_BIND 1
+#define HAVE_CONNECT 1
+#define HAVE_GETSOCKNAME 1
+#define HAVE_LISTEN 1
+#define HAVE_RECVFROM 1
+#define HAVE_SENDTO 1
+#define HAVE_SETSOCKOPT 1
+#define HAVE_SOCKET 1
 
 /* Define to 1 if you have the `dup' function. */
 #define HAVE_DUP 1
diff --git a/Tools/wasm/config.site-wasm32-wasi b/Tools/wasm/config.site-wasm32-wasi
index f151b7bc5ab0c..237fa8b55624c 100644
--- a/Tools/wasm/config.site-wasm32-wasi
+++ b/Tools/wasm/config.site-wasm32-wasi
@@ -44,3 +44,7 @@ ac_cv_func_fchmod=no
 # Disable AF_UNIX and AF_PACKET support, see socketmodule.h.
 ac_cv_header_sys_un_h=no
 ac_cv_header_netpacket_packet_h=no
+
+# disable accept for WASM runtimes without sock_accept
+#ac_cv_func_accept=no
+#ac_cv_func_accept4=no
diff --git a/configure b/configure
index 77c4bdb1d392e..21f7f91d8b3c0 100755
--- a/configure
+++ b/configure
@@ -9058,7 +9058,7 @@ for ac_header in  \
   alloca.h asm/types.h bluetooth.h conio.h crypt.h direct.h dlfcn.h endian.h errno.h fcntl.h grp.h \
   ieeefp.h io.h langinfo.h libintl.h libutil.h linux/auxvec.h sys/auxv.h linux/fs.h linux/memfd.h \
   linux/random.h linux/soundcard.h \
-  linux/tipc.h linux/wait.h netinet/in.h netpacket/packet.h poll.h process.h pthread.h pty.h \
+  linux/tipc.h linux/wait.h netdb.h netinet/in.h netpacket/packet.h poll.h process.h pthread.h pty.h \
   sched.h setjmp.h shadow.h signal.h spawn.h stropts.h sys/audioio.h sys/bsdtty.h sys/devpoll.h \
   sys/endian.h sys/epoll.h sys/event.h sys/eventfd.h sys/file.h sys/ioctl.h sys/kern_control.h \
   sys/loadavg.h sys/lock.h sys/memfd.h sys/mkdev.h sys/mman.h sys/modem.h sys/param.h sys/poll.h \
@@ -14910,7 +14910,6 @@ done
 
 fi
 
-
 # Check for enable-ipv6
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if --enable-ipv6 is specified" >&5
@@ -15553,7 +15552,7 @@ for ac_func in  \
   faccessat fchmod fchmodat fchown fchownat fdopendir fdwalk fexecve \
   fork fork1 fpathconf fstatat ftime ftruncate futimens futimes futimesat \
   gai_strerror getegid getentropy geteuid getgid getgrgid getgrgid_r \
-  getgrnam_r getgrouplist getgroups getitimer getloadavg getlogin \
+  getgrnam_r getgrouplist getgroups gethostname getitimer getloadavg getlogin \
   getpeername getpgid getpid getppid getpriority _getpty \
   getpwent getpwnam_r getpwuid getpwuid_r getresgid getresuid getrusage getsid getspent \
   getspnam getuid getwd if_nameindex initgroups kill killpg lchown linkat \
@@ -17358,6 +17357,8 @@ fi
 
 
 
+
+
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for hstrerror" >&5
 $as_echo_n "checking for hstrerror... " >&6; }
 if ${ac_cv_func_hstrerror+:} false; then :
@@ -17394,6 +17395,188 @@ fi
 
 
 
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for getservbyname" >&5
+$as_echo_n "checking for getservbyname... " >&6; }
+if ${ac_cv_func_getservbyname+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <netdb.h>
+int
+main ()
+{
+void *x=getservbyname
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_func_getservbyname=yes
+else
+  ac_cv_func_getservbyname=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_getservbyname" >&5
+$as_echo "$ac_cv_func_getservbyname" >&6; }
+  if test "x$ac_cv_func_getservbyname" = xyes; then :
+
+$as_echo "#define HAVE_GETSERVBYNAME 1" >>confdefs.h
+
+fi
+
+
+
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for getservbyport" >&5
+$as_echo_n "checking for getservbyport... " >&6; }
+if ${ac_cv_func_getservbyport+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <netdb.h>
+int
+main ()
+{
+void *x=getservbyport
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_func_getservbyport=yes
+else
+  ac_cv_func_getservbyport=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_getservbyport" >&5
+$as_echo "$ac_cv_func_getservbyport" >&6; }
+  if test "x$ac_cv_func_getservbyport" = xyes; then :
+
+$as_echo "#define HAVE_GETSERVBYPORT 1" >>confdefs.h
+
+fi
+
+
+
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname" >&5
+$as_echo_n "checking for gethostbyname... " >&6; }
+if ${ac_cv_func_gethostbyname+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <netdb.h>
+int
+main ()
+{
+void *x=gethostbyname
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_func_gethostbyname=yes
+else
+  ac_cv_func_gethostbyname=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_gethostbyname" >&5
+$as_echo "$ac_cv_func_gethostbyname" >&6; }
+  if test "x$ac_cv_func_gethostbyname" = xyes; then :
+
+$as_echo "#define HAVE_GETHOSTBYNAME 1" >>confdefs.h
+
+fi
+
+
+
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyaddr" >&5
+$as_echo_n "checking for gethostbyaddr... " >&6; }
+if ${ac_cv_func_gethostbyaddr+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <netdb.h>
+int
+main ()
+{
+void *x=gethostbyaddr
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_func_gethostbyaddr=yes
+else
+  ac_cv_func_gethostbyaddr=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_gethostbyaddr" >&5
+$as_echo "$ac_cv_func_gethostbyaddr" >&6; }
+  if test "x$ac_cv_func_gethostbyaddr" = xyes; then :
+
+$as_echo "#define HAVE_GETHOSTBYADDR 1" >>confdefs.h
+
+fi
+
+
+
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for getprotobyname" >&5
+$as_echo_n "checking for getprotobyname... " >&6; }
+if ${ac_cv_func_getprotobyname+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <netdb.h>
+int
+main ()
+{
+void *x=getprotobyname
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_func_getprotobyname=yes
+else
+  ac_cv_func_getprotobyname=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_getprotobyname" >&5
+$as_echo "$ac_cv_func_getprotobyname" >&6; }
+  if test "x$ac_cv_func_getprotobyname" = xyes; then :
+
+$as_echo "#define HAVE_GETPROTOBYNAME 1" >>confdefs.h
+
+fi
+
+
+
+
+
+
+
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inet_aton" >&5
 $as_echo_n "checking for inet_aton... " >&6; }
@@ -17436,6 +17619,46 @@ fi
 
 
 
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inet_ntoa" >&5
+$as_echo_n "checking for inet_ntoa... " >&6; }
+if ${ac_cv_func_inet_ntoa+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+
+int
+main ()
+{
+void *x=inet_ntoa
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_func_inet_ntoa=yes
+else
+  ac_cv_func_inet_ntoa=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_inet_ntoa" >&5
+$as_echo "$ac_cv_func_inet_ntoa" >&6; }
+  if test "x$ac_cv_func_inet_ntoa" = xyes; then :
+
+$as_echo "#define HAVE_INET_NTOA 1" >>confdefs.h
+
+fi
+
+
+
+
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inet_pton" >&5
 $as_echo_n "checking for inet_pton... " >&6; }
@@ -17477,6 +17700,416 @@ fi
 
 
 
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for getpeername" >&5
+$as_echo_n "checking for getpeername... " >&6; }
+if ${ac_cv_func_getpeername+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+
+int
+main ()
+{
+void *x=getpeername
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_func_getpeername=yes
+else
+  ac_cv_func_getpeername=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_getpeername" >&5
+$as_echo "$ac_cv_func_getpeername" >&6; }
+  if test "x$ac_cv_func_getpeername" = xyes; then :
+
+$as_echo "#define HAVE_GETPEERNAME 1" >>confdefs.h
+
+fi
+
+
+
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for getsockname" >&5
+$as_echo_n "checking for getsockname... " >&6; }
+if ${ac_cv_func_getsockname+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+
+int
+main ()
+{
+void *x=getsockname
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_func_getsockname=yes
+else
+  ac_cv_func_getsockname=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_getsockname" >&5
+$as_echo "$ac_cv_func_getsockname" >&6; }
+  if test "x$ac_cv_func_getsockname" = xyes; then :
+
+$as_echo "#define HAVE_GETSOCKNAME 1" >>confdefs.h
+
+fi
+
+
+
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for accept" >&5
+$as_echo_n "checking for accept... " >&6; }
+if ${ac_cv_func_accept+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+
+int
+main ()
+{
+void *x=accept
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_func_accept=yes
+else
+  ac_cv_func_accept=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_accept" >&5
+$as_echo "$ac_cv_func_accept" >&6; }
+  if test "x$ac_cv_func_accept" = xyes; then :
+
+$as_echo "#define HAVE_ACCEPT 1" >>confdefs.h
+
+fi
+
+
+
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bind" >&5
+$as_echo_n "checking for bind... " >&6; }
+if ${ac_cv_func_bind+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+
+int
+main ()
+{
+void *x=bind
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_func_bind=yes
+else
+  ac_cv_func_bind=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_bind" >&5
+$as_echo "$ac_cv_func_bind" >&6; }
+  if test "x$ac_cv_func_bind" = xyes; then :
+
+$as_echo "#define HAVE_BIND 1" >>confdefs.h
+
+fi
+
+
+
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for connect" >&5
+$as_echo_n "checking for connect... " >&6; }
+if ${ac_cv_func_connect+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+
+int
+main ()
+{
+void *x=connect
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_func_connect=yes
+else
+  ac_cv_func_connect=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_connect" >&5
+$as_echo "$ac_cv_func_connect" >&6; }
+  if test "x$ac_cv_func_connect" = xyes; then :
+
+$as_echo "#define HAVE_CONNECT 1" >>confdefs.h
+
+fi
+
+
+
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for listen" >&5
+$as_echo_n "checking for listen... " >&6; }
+if ${ac_cv_func_listen+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+
+int
+main ()
+{
+void *x=listen
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_func_listen=yes
+else
+  ac_cv_func_listen=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_listen" >&5
+$as_echo "$ac_cv_func_listen" >&6; }
+  if test "x$ac_cv_func_listen" = xyes; then :
+
+$as_echo "#define HAVE_LISTEN 1" >>confdefs.h
+
+fi
+
+
+
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for recvfrom" >&5
+$as_echo_n "checking for recvfrom... " >&6; }
+if ${ac_cv_func_recvfrom+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+
+int
+main ()
+{
+void *x=recvfrom
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_func_recvfrom=yes
+else
+  ac_cv_func_recvfrom=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_recvfrom" >&5
+$as_echo "$ac_cv_func_recvfrom" >&6; }
+  if test "x$ac_cv_func_recvfrom" = xyes; then :
+
+$as_echo "#define HAVE_RECVFROM 1" >>confdefs.h
+
+fi
+
+
+
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sendto" >&5
+$as_echo_n "checking for sendto... " >&6; }
+if ${ac_cv_func_sendto+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+
+int
+main ()
+{
+void *x=sendto
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_func_sendto=yes
+else
+  ac_cv_func_sendto=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_sendto" >&5
+$as_echo "$ac_cv_func_sendto" >&6; }
+  if test "x$ac_cv_func_sendto" = xyes; then :
+
+$as_echo "#define HAVE_SENDTO 1" >>confdefs.h
+
+fi
+
+
+
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for setsockopt" >&5
+$as_echo_n "checking for setsockopt... " >&6; }
+if ${ac_cv_func_setsockopt+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+
+int
+main ()
+{
+void *x=setsockopt
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_func_setsockopt=yes
+else
+  ac_cv_func_setsockopt=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_setsockopt" >&5
+$as_echo "$ac_cv_func_setsockopt" >&6; }
+  if test "x$ac_cv_func_setsockopt" = xyes; then :
+
+$as_echo "#define HAVE_SETSOCKOPT 1" >>confdefs.h
+
+fi
+
+
+
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for socket" >&5
+$as_echo_n "checking for socket... " >&6; }
+if ${ac_cv_func_socket+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+
+int
+main ()
+{
+void *x=socket
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_func_socket=yes
+else
+  ac_cv_func_socket=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_socket" >&5
+$as_echo "$ac_cv_func_socket" >&6; }
+  if test "x$ac_cv_func_socket" = xyes; then :
+
+$as_echo "#define HAVE_SOCKET 1" >>confdefs.h
+
+fi
+
+
+
+
 # On some systems, setgroups is in unistd.h, on others, in grp.h
 
 
diff --git a/configure.ac b/configure.ac
index 78eebd57bd24d..6b36696f327d9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2643,7 +2643,7 @@ AC_CHECK_HEADERS([ \
   alloca.h asm/types.h bluetooth.h conio.h crypt.h direct.h dlfcn.h endian.h errno.h fcntl.h grp.h \
   ieeefp.h io.h langinfo.h libintl.h libutil.h linux/auxvec.h sys/auxv.h linux/fs.h linux/memfd.h \
   linux/random.h linux/soundcard.h \
-  linux/tipc.h linux/wait.h netinet/in.h netpacket/packet.h poll.h process.h pthread.h pty.h \
+  linux/tipc.h linux/wait.h netdb.h netinet/in.h netpacket/packet.h poll.h process.h pthread.h pty.h \
   sched.h setjmp.h shadow.h signal.h spawn.h stropts.h sys/audioio.h sys/bsdtty.h sys/devpoll.h \
   sys/endian.h sys/epoll.h sys/event.h sys/eventfd.h sys/file.h sys/ioctl.h sys/kern_control.h \
   sys/loadavg.h sys/lock.h sys/memfd.h sys/mkdev.h sys/mman.h sys/modem.h sys/param.h sys/poll.h \
@@ -4272,7 +4272,6 @@ if test "$posix_threads" = "yes"; then
       AC_CHECK_FUNCS(pthread_getcpuclockid)
 fi
 
-
 # Check for enable-ipv6
 AH_TEMPLATE(ENABLE_IPV6, [Define if --enable-ipv6 is specified])
 AC_MSG_CHECKING([if --enable-ipv6 is specified])
@@ -4657,7 +4656,7 @@ AC_CHECK_FUNCS([ \
   faccessat fchmod fchmodat fchown fchownat fdopendir fdwalk fexecve \
   fork fork1 fpathconf fstatat ftime ftruncate futimens futimes futimesat \
   gai_strerror getegid getentropy geteuid getgid getgrgid getgrgid_r \
-  getgrnam_r getgrouplist getgroups getitimer getloadavg getlogin \
+  getgrnam_r getgrouplist getgroups gethostname getitimer getloadavg getlogin \
   getpeername getpgid getpid getppid getpriority _getpty \
   getpwent getpwnam_r getpwuid getpwuid_r getresgid getresuid getrusage getsid getspent \
   getspnam getuid getwd if_nameindex initgroups kill killpg lchown linkat \
@@ -4880,21 +4879,39 @@ PKG_CHECK_MODULES([LIBLZMA], [liblzma], [have_liblzma=yes], [
   ])
 ])
 
-PY_CHECK_FUNC([hstrerror], [#include <netdb.h>])
+dnl PY_CHECK_NETDB_FUNC(FUNCTION)
+AC_DEFUN([PY_CHECK_NETDB_FUNC], [PY_CHECK_FUNC([$1], [#include <netdb.h>])])
 
-PY_CHECK_FUNC([inet_aton], [
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-])
+PY_CHECK_NETDB_FUNC([hstrerror])
+dnl not available in WASI yet
+PY_CHECK_NETDB_FUNC([getservbyname])
+PY_CHECK_NETDB_FUNC([getservbyport])
+PY_CHECK_NETDB_FUNC([gethostbyname])
+PY_CHECK_NETDB_FUNC([gethostbyaddr])
+PY_CHECK_NETDB_FUNC([getprotobyname])
 
-PY_CHECK_FUNC([inet_pton], [
+dnl PY_CHECK_SOCKET_FUNC(FUNCTION)
+AC_DEFUN([PY_CHECK_SOCKET_FUNC], [PY_CHECK_FUNC([$1], [
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
-])
+])])
+
+PY_CHECK_SOCKET_FUNC([inet_aton])
+PY_CHECK_SOCKET_FUNC([inet_ntoa])
+PY_CHECK_SOCKET_FUNC([inet_pton])
+dnl not available in WASI yet
+PY_CHECK_SOCKET_FUNC([getpeername])
+PY_CHECK_SOCKET_FUNC([getsockname])
+PY_CHECK_SOCKET_FUNC([accept])
+PY_CHECK_SOCKET_FUNC([bind])
+PY_CHECK_SOCKET_FUNC([connect])
+PY_CHECK_SOCKET_FUNC([listen])
+PY_CHECK_SOCKET_FUNC([recvfrom])
+PY_CHECK_SOCKET_FUNC([sendto])
+PY_CHECK_SOCKET_FUNC([setsockopt])
+PY_CHECK_SOCKET_FUNC([socket])
 
 # On some systems, setgroups is in unistd.h, on others, in grp.h
 PY_CHECK_FUNC([setgroups], [
diff --git a/pyconfig.h.in b/pyconfig.h.in
index 37f748393e739..91b249e6e1be4 100644
--- a/pyconfig.h.in
+++ b/pyconfig.h.in
@@ -51,6 +51,9 @@
 /* Define if getpgrp() must be called as getpgrp(0). */
 #undef GETPGRP_HAVE_ARG
 
+/* Define if you have the 'accept' function. */
+#undef HAVE_ACCEPT
+
 /* Define to 1 if you have the `accept4' function. */
 #undef HAVE_ACCEPT4
 
@@ -81,6 +84,9 @@
 /* Define to 1 if you have the `atanh' function. */
 #undef HAVE_ATANH
 
+/* Define if you have the 'bind' function. */
+#undef HAVE_BIND
+
 /* Define to 1 if you have the `bind_textdomain_codeset' function. */
 #undef HAVE_BIND_TEXTDOMAIN_CODESET
 
@@ -160,6 +166,9 @@
 /* Define to 1 if you have the <conio.h> header file. */
 #undef HAVE_CONIO_H
 
+/* Define if you have the 'connect' function. */
+#undef HAVE_CONNECT
+
 /* Define to 1 if you have the `copy_file_range' function. */
 #undef HAVE_COPY_FILE_RANGE
 
@@ -480,6 +489,9 @@
 /* Define to 1 if you have the `getgroups' function. */
 #undef HAVE_GETGROUPS
 
+/* Define if you have the 'gethostbyaddr' function. */
+#undef HAVE_GETHOSTBYADDR
+
 /* Define to 1 if you have the `gethostbyname' function. */
 #undef HAVE_GETHOSTBYNAME
 
@@ -495,6 +507,9 @@
 /* Define this if you have the 6-arg version of gethostbyname_r(). */
 #undef HAVE_GETHOSTBYNAME_R_6_ARG
 
+/* Define to 1 if you have the `gethostname' function. */
+#undef HAVE_GETHOSTNAME
+
 /* Define to 1 if you have the `getitimer' function. */
 #undef HAVE_GETITIMER
 
@@ -510,7 +525,7 @@
 /* Define if you have the 'getpagesize' function. */
 #undef HAVE_GETPAGESIZE
 
-/* Define to 1 if you have the `getpeername' function. */
+/* Define if you have the 'getpeername' function. */
 #undef HAVE_GETPEERNAME
 
 /* Define to 1 if you have the `getpgid' function. */
@@ -528,6 +543,9 @@
 /* Define to 1 if you have the `getpriority' function. */
 #undef HAVE_GETPRIORITY
 
+/* Define if you have the 'getprotobyname' function. */
+#undef HAVE_GETPROTOBYNAME
+
 /* Define to 1 if you have the `getpwent' function. */
 #undef HAVE_GETPWENT
 
@@ -555,9 +573,18 @@
 /* Define to 1 if you have the `getrusage' function. */
 #undef HAVE_GETRUSAGE
 
+/* Define if you have the 'getservbyname' function. */
+#undef HAVE_GETSERVBYNAME
+
+/* Define if you have the 'getservbyport' function. */
+#undef HAVE_GETSERVBYPORT
+
 /* Define to 1 if you have the `getsid' function. */
 #undef HAVE_GETSID
 
+/* Define if you have the 'getsockname' function. */
+#undef HAVE_GETSOCKNAME
+
 /* Define to 1 if you have the `getspent' function. */
 #undef HAVE_GETSPENT
 
@@ -592,6 +619,9 @@
 /* Define if you have the 'inet_aton' function. */
 #undef HAVE_INET_ATON
 
+/* Define if you have the 'inet_ntoa' function. */
+#undef HAVE_INET_NTOA
+
 /* Define if you have the 'inet_pton' function. */
 #undef HAVE_INET_PTON
 
@@ -718,6 +748,9 @@
 /* Define to 1 if you have the <linux/wait.h> header file. */
 #undef HAVE_LINUX_WAIT_H
 
+/* Define if you have the 'listen' function. */
+#undef HAVE_LISTEN
+
 /* Define to 1 if you have the `lockf' function. */
 #undef HAVE_LOCKF
 
@@ -802,6 +835,9 @@
 /* Define to 1 if you have the <netcan/can.h> header file. */
 #undef HAVE_NETCAN_CAN_H
 
+/* Define to 1 if you have the <netdb.h> header file. */
+#undef HAVE_NETDB_H
+
 /* Define to 1 if you have the <netinet/in.h> header file. */
 #undef HAVE_NETINET_IN_H
 
@@ -929,6 +965,9 @@
 /* Define to 1 if you have the `realpath' function. */
 #undef HAVE_REALPATH
 
+/* Define if you have the 'recvfrom' function. */
+#undef HAVE_RECVFROM
+
 /* Define to 1 if you have the `renameat' function. */
 #undef HAVE_RENAMEAT
 
@@ -998,6 +1037,9 @@
 /* Define to 1 if you have the `sendfile' function. */
 #undef HAVE_SENDFILE
 
+/* Define if you have the 'sendto' function. */
+#undef HAVE_SENDTO
+
 /* Define to 1 if you have the `setegid' function. */
 #undef HAVE_SETEGID
 
@@ -1046,6 +1088,9 @@
 /* Define to 1 if you have the `setsid' function. */
 #undef HAVE_SETSID
 
+/* Define if you have the 'setsockopt' function. */
+#undef HAVE_SETSOCKOPT
+
 /* Define to 1 if you have the `setuid' function. */
 #undef HAVE_SETUID
 
@@ -1109,6 +1154,9 @@
 /* struct sockaddr_storage (sys/socket.h) */
 #undef HAVE_SOCKADDR_STORAGE
 
+/* Define if you have the 'socket' function. */
+#undef HAVE_SOCKET
+
 /* Define if you have the 'socketpair' function. */
 #undef HAVE_SOCKETPAIR
 


From webhook-mailer at python.org  Wed Jul 27 03:20:08 2022
From: webhook-mailer at python.org (tiran)
Date: Wed, 27 Jul 2022 07:20:08 -0000
Subject: [Python-checkins] gh-95280: Fix test_get_ciphers on systems without
 RSA key exchange (GH-95282)
Message-ID: <mailman.281.1658906409.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/565403038b75eb64ea483b2757ba30769246d853
commit: 565403038b75eb64ea483b2757ba30769246d853
branch: main
author: Christian Heimes <christian at python.org>
committer: tiran <christian at python.org>
date: 2022-07-27T09:19:49+02:00
summary:

gh-95280: Fix test_get_ciphers on systems without RSA key exchange (GH-95282)

files:
A Misc/NEWS.d/next/Tests/2022-07-26-15-22-19.gh-issue-95280.h8HvbP.rst
M Lib/test/test_ssl.py

diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py
index 0d0d14ac00260..5007e08f321b5 100644
--- a/Lib/test/test_ssl.py
+++ b/Lib/test/test_ssl.py
@@ -938,8 +938,20 @@ def test_get_ciphers(self):
         ctx = ssl.SSLContext(ssl.PROTOCOL_TLS_CLIENT)
         ctx.set_ciphers('AESGCM')
         names = set(d['name'] for d in ctx.get_ciphers())
-        self.assertIn('AES256-GCM-SHA384', names)
-        self.assertIn('AES128-GCM-SHA256', names)
+        expected = {
+            'AES128-GCM-SHA256',
+            'ECDHE-ECDSA-AES128-GCM-SHA256',
+            'ECDHE-RSA-AES128-GCM-SHA256',
+            'DHE-RSA-AES128-GCM-SHA256',
+            'AES256-GCM-SHA384',
+            'ECDHE-ECDSA-AES256-GCM-SHA384',
+            'ECDHE-RSA-AES256-GCM-SHA384',
+            'DHE-RSA-AES256-GCM-SHA384',
+        }
+        intersection = names.intersection(expected)
+        self.assertGreaterEqual(
+            len(intersection), 2, f"\ngot: {sorted(names)}\nexpected: {sorted(expected)}"
+        )
 
     def test_options(self):
         ctx = ssl.SSLContext(ssl.PROTOCOL_TLS_CLIENT)
diff --git a/Misc/NEWS.d/next/Tests/2022-07-26-15-22-19.gh-issue-95280.h8HvbP.rst b/Misc/NEWS.d/next/Tests/2022-07-26-15-22-19.gh-issue-95280.h8HvbP.rst
new file mode 100644
index 0000000000000..523d9d5f2f8bf
--- /dev/null
+++ b/Misc/NEWS.d/next/Tests/2022-07-26-15-22-19.gh-issue-95280.h8HvbP.rst
@@ -0,0 +1,2 @@
+Fix problem with ``test_ssl`` ``test_get_ciphers`` on systems that require
+perfect forward secrecy (PFS) ciphers.


From webhook-mailer at python.org  Wed Jul 27 03:43:24 2022
From: webhook-mailer at python.org (miss-islington)
Date: Wed, 27 Jul 2022 07:43:24 -0000
Subject: [Python-checkins] gh-95280: Fix test_get_ciphers on systems without
 RSA key exchange (GH-95282)
Message-ID: <mailman.282.1658907804.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/b77c403ed56a0c69f17b6f8052a41a7a79af733d
commit: b77c403ed56a0c69f17b6f8052a41a7a79af733d
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-27T00:43:12-07:00
summary:

gh-95280: Fix test_get_ciphers on systems without RSA key exchange (GH-95282)

(cherry picked from commit 565403038b75eb64ea483b2757ba30769246d853)

Co-authored-by: Christian Heimes <christian at python.org>

files:
A Misc/NEWS.d/next/Tests/2022-07-26-15-22-19.gh-issue-95280.h8HvbP.rst
M Lib/test/test_ssl.py

diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py
index 9f364fa4bbb6d..f97227b11bcde 100644
--- a/Lib/test/test_ssl.py
+++ b/Lib/test/test_ssl.py
@@ -1177,8 +1177,20 @@ def test_get_ciphers(self):
         ctx = ssl.SSLContext(ssl.PROTOCOL_TLS_CLIENT)
         ctx.set_ciphers('AESGCM')
         names = set(d['name'] for d in ctx.get_ciphers())
-        self.assertIn('AES256-GCM-SHA384', names)
-        self.assertIn('AES128-GCM-SHA256', names)
+        expected = {
+            'AES128-GCM-SHA256',
+            'ECDHE-ECDSA-AES128-GCM-SHA256',
+            'ECDHE-RSA-AES128-GCM-SHA256',
+            'DHE-RSA-AES128-GCM-SHA256',
+            'AES256-GCM-SHA384',
+            'ECDHE-ECDSA-AES256-GCM-SHA384',
+            'ECDHE-RSA-AES256-GCM-SHA384',
+            'DHE-RSA-AES256-GCM-SHA384',
+        }
+        intersection = names.intersection(expected)
+        self.assertGreaterEqual(
+            len(intersection), 2, f"\ngot: {sorted(names)}\nexpected: {sorted(expected)}"
+        )
 
     def test_options(self):
         ctx = ssl.SSLContext(ssl.PROTOCOL_TLS_CLIENT)
diff --git a/Misc/NEWS.d/next/Tests/2022-07-26-15-22-19.gh-issue-95280.h8HvbP.rst b/Misc/NEWS.d/next/Tests/2022-07-26-15-22-19.gh-issue-95280.h8HvbP.rst
new file mode 100644
index 0000000000000..523d9d5f2f8bf
--- /dev/null
+++ b/Misc/NEWS.d/next/Tests/2022-07-26-15-22-19.gh-issue-95280.h8HvbP.rst
@@ -0,0 +1,2 @@
+Fix problem with ``test_ssl`` ``test_get_ciphers`` on systems that require
+perfect forward secrecy (PFS) ciphers.


From webhook-mailer at python.org  Wed Jul 27 04:05:56 2022
From: webhook-mailer at python.org (ambv)
Date: Wed, 27 Jul 2022 08:05:56 -0000
Subject: [Python-checkins] gh-94635: Add sqlite3 'Introduction' and
 'Tutorial' doc headings (GH-95269) (GH-95304)
Message-ID: <mailman.283.1658909157.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/0d812a58a79ea1520223e3539393d190503dedcf
commit: 0d812a58a79ea1520223e3539393d190503dedcf
branch: 3.11
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: ambv <lukasz at langa.pl>
date: 2022-07-27T10:05:50+02:00
summary:

gh-94635: Add sqlite3 'Introduction' and 'Tutorial' doc headings (GH-95269) (GH-95304)

(cherry picked from commit 2e35a13e46663acf665da06267c54e66c7ecf18d)

Co-authored-by: Erlend Egeberg Aasland <erlend.aasland at protonmail.com>

files:
M Doc/library/sqlite3.rst

diff --git a/Doc/library/sqlite3.rst b/Doc/library/sqlite3.rst
index 392487ee6f643..5969cbb3de714 100644
--- a/Doc/library/sqlite3.rst
+++ b/Doc/library/sqlite3.rst
@@ -8,7 +8,11 @@
 
 **Source code:** :source:`Lib/sqlite3/`
 
---------------
+
+.. _sqlite3-intro:
+
+Introduction
+------------
 
 SQLite is a C library that provides a lightweight disk-based database that
 doesn't require a separate server process and allows accessing the database
@@ -21,6 +25,12 @@ The sqlite3 module was written by Gerhard H?ring.  It provides an SQL interface
 compliant with the DB-API 2.0 specification described by :pep:`249`, and
 requires SQLite 3.7.15 or newer.
 
+
+.. _sqlite3-tutorial:
+
+Tutorial
+--------
+
 To use the module, start by creating a :class:`Connection` object that
 represents the database.  Here the data will be stored in the
 :file:`example.db` file::


From webhook-mailer at python.org  Wed Jul 27 04:07:11 2022
From: webhook-mailer at python.org (ambv)
Date: Wed, 27 Jul 2022 08:07:11 -0000
Subject: [Python-checkins] gh-95285: py.exe launcher fails with short argv0
 (GH-95295) (GH-95298)
Message-ID: <mailman.284.1658909232.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/7df3a1ce4bf820fb783cc87f2e8ab2abe5ef43fa
commit: 7df3a1ce4bf820fb783cc87f2e8ab2abe5ef43fa
branch: 3.11
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: ambv <lukasz at langa.pl>
date: 2022-07-27T10:06:59+02:00
summary:

gh-95285: py.exe launcher fails with short argv0 (GH-95295) (GH-95298)

(cherry picked from commit 7ac5bb3e6a1cf780aea8164fdba09db993a21d6f)

Co-authored-by: Steve Dower <steve.dower at python.org>

files:
A Misc/NEWS.d/next/Windows/2022-07-26-20-33-12.gh-issue-95285.w6fa22.rst
M Lib/test/test_launcher.py
M PC/launcher2.c

diff --git a/Lib/test/test_launcher.py b/Lib/test/test_launcher.py
index 201aba660abee..0b7cbaad3f582 100644
--- a/Lib/test/test_launcher.py
+++ b/Lib/test/test_launcher.py
@@ -150,7 +150,7 @@ class RunPyMixin:
     @classmethod
     def find_py(cls):
         py_exe = None
-        if sysconfig.is_python_build(True):
+        if sysconfig.is_python_build():
             py_exe = Path(sys.executable).parent / PY_EXE
         else:
             for p in os.getenv("PATH").split(";"):
@@ -188,7 +188,7 @@ def find_py(cls):
             )
         return py_exe
 
-    def run_py(self, args, env=None, allow_fail=False, expect_returncode=0):
+    def run_py(self, args, env=None, allow_fail=False, expect_returncode=0, argv=None):
         if not self.py_exe:
             self.py_exe = self.find_py()
 
@@ -199,9 +199,12 @@ def run_py(self, args, env=None, allow_fail=False, expect_returncode=0):
             "PYLAUNCHER_DEBUG": "1",
             "PYLAUNCHER_DRYRUN": "1",
         }
+        if not argv:
+            argv = [self.py_exe, *args]
         with subprocess.Popen(
-            [self.py_exe, *args],
+            argv,
             env=env,
+            executable=self.py_exe,
             stdin=subprocess.PIPE,
             stdout=subprocess.PIPE,
             stderr=subprocess.PIPE,
@@ -540,6 +543,15 @@ def test_py3_shebang_nl(self):
         self.assertEqual("3.100-arm64", data["SearchInfo.tag"])
         self.assertEqual(f"X.Y-arm64.exe -X fake_arg_for_test -prearg {script} -postarg", data["stdout"].strip())
 
+    def test_py_shebang_short_argv0(self):
+        with self.py_ini(TEST_PY_COMMANDS):
+            with self.script("#! /usr/bin/env python -prearg") as script:
+                # Override argv to only pass "py.exe" as the command
+                data = self.run_py([script, "-postarg"], argv=f'"py.exe" "{script}" -postarg')
+        self.assertEqual("PythonTestSuite", data["SearchInfo.company"])
+        self.assertEqual("3.100", data["SearchInfo.tag"])
+        self.assertEqual(f'X.Y.exe -prearg "{script}" -postarg', data["stdout"].strip())
+
     def test_install(self):
         data = self.run_py(["-V:3.10"], env={"PYLAUNCHER_ALWAYS_INSTALL": "1"}, expect_returncode=111)
         cmd = data["stdout"].strip()
diff --git a/Misc/NEWS.d/next/Windows/2022-07-26-20-33-12.gh-issue-95285.w6fa22.rst b/Misc/NEWS.d/next/Windows/2022-07-26-20-33-12.gh-issue-95285.w6fa22.rst
new file mode 100644
index 0000000000000..76b38e7803cca
--- /dev/null
+++ b/Misc/NEWS.d/next/Windows/2022-07-26-20-33-12.gh-issue-95285.w6fa22.rst
@@ -0,0 +1,2 @@
+Fix :ref:`launcher` handling of command lines where it is only passed a
+short executable name.
diff --git a/PC/launcher2.c b/PC/launcher2.c
index c8ed1b0f7c8a6..31b5617771e9b 100644
--- a/PC/launcher2.c
+++ b/PC/launcher2.c
@@ -580,6 +580,9 @@ parseCommandLine(SearchInfo *search)
             break;
         }
     }
+    if (tail == search->originalCmdLine && tail[0] == L'"') {
+        ++tail;
+    }
     // Without special cases, we can now fill in the search struct
     int tailLen = (int)(end ? (end - tail) : wcsnlen_s(tail, MAXLEN));
     search->executableLength = -1;


From webhook-mailer at python.org  Wed Jul 27 04:07:42 2022
From: webhook-mailer at python.org (ambv)
Date: Wed, 27 Jul 2022 08:07:42 -0000
Subject: [Python-checkins] gh-95291: Use import helper to improve sqlite3
 audit tests (GH-95292) (GH-95293)
Message-ID: <mailman.285.1658909262.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/c72940a60994d6c1b3ae90b6d050bd747b074dde
commit: c72940a60994d6c1b3ae90b6d050bd747b074dde
branch: 3.11
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: ambv <lukasz at langa.pl>
date: 2022-07-27T10:07:32+02:00
summary:

gh-95291: Use import helper to improve sqlite3 audit tests (GH-95292) (GH-95293)

Now the tests are correctly reported as skipped if sqlite3 is not available.
(cherry picked from commit 152eb90311fdf294510b5d077332580ba18c0ee4)

Co-authored-by: Erlend Egeberg Aasland <erlend.aasland at protonmail.com>

files:
M Lib/test/test_audit.py

diff --git a/Lib/test/test_audit.py b/Lib/test/test_audit.py
index 6a025f39912e6..a7ff038c0936e 100644
--- a/Lib/test/test_audit.py
+++ b/Lib/test/test_audit.py
@@ -155,10 +155,7 @@ def test_http(self):
 
 
     def test_sqlite3(self):
-        try:
-            import sqlite3
-        except ImportError:
-            return
+        sqlite3 = import_helper.import_module("sqlite3")
         returncode, events, stderr = self.run_python("test_sqlite3")
         if returncode:
             self.fail(stderr)


From webhook-mailer at python.org  Wed Jul 27 04:08:30 2022
From: webhook-mailer at python.org (ambv)
Date: Wed, 27 Jul 2022 08:08:30 -0000
Subject: [Python-checkins] Fix minor docstring issues in `dataclasses.py`.
 (gh-93024) (GH-95286)
Message-ID: <mailman.286.1658909311.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/f083adfdacfa90f90e1c1d8cb5ed0cb087f585c0
commit: f083adfdacfa90f90e1c1d8cb5ed0cb087f585c0
branch: 3.11
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: ambv <lukasz at langa.pl>
date: 2022-07-27T10:08:21+02:00
summary:

Fix minor docstring issues in `dataclasses.py`. (gh-93024) (GH-95286)

Previously, when using `functools.wrap` around them (and inherit their docstrings), sphinx renders the docstrings badly and raises warnings about wrong indent.
(cherry picked from commit b8c528694edb7a31020116956cc4daf07a5cd97f)

Co-authored-by: Roman Novak <44512421+romanngg at users.noreply.github.com>

files:
M Lib/dataclasses.py

diff --git a/Lib/dataclasses.py b/Lib/dataclasses.py
index 103ecbafb2e27..a567a33d646f4 100644
--- a/Lib/dataclasses.py
+++ b/Lib/dataclasses.py
@@ -1255,7 +1255,7 @@ def asdict(obj, *, dict_factory=dict):
     """Return the fields of a dataclass instance as a new dictionary mapping
     field names to field values.
 
-    Example usage:
+    Example usage::
 
       @dataclass
       class C:
@@ -1326,8 +1326,8 @@ class C:
           x: int
           y: int
 
-    c = C(1, 2)
-    assert astuple(c) == (1, 2)
+      c = C(1, 2)
+      assert astuple(c) == (1, 2)
 
     If given, 'tuple_factory' will be used instead of built-in tuple.
     The function applies recursively to field values that are
@@ -1376,11 +1376,11 @@ def make_dataclass(cls_name, fields, *, bases=(), namespace=None, init=True,
     The dataclass name will be 'cls_name'.  'fields' is an iterable
     of either (name), (name, type) or (name, type, Field) objects. If type is
     omitted, use the string 'typing.Any'.  Field objects are created by
-    the equivalent of calling 'field(name, type [, Field-info])'.
+    the equivalent of calling 'field(name, type [, Field-info])'.::
 
       C = make_dataclass('C', ['x', ('y', int), ('z', int, field(init=False))], bases=(Base,))
 
-    is equivalent to:
+    is equivalent to::
 
       @dataclass
       class C(Base):
@@ -1444,7 +1444,7 @@ def exec_body_callback(ns):
 def replace(obj, /, **changes):
     """Return a new object replacing specified fields with new values.
 
-    This is especially useful for frozen classes.  Example usage:
+    This is especially useful for frozen classes.  Example usage::
 
       @dataclass(frozen=True)
       class C:
@@ -1454,7 +1454,7 @@ class C:
       c = C(1, 2)
       c1 = replace(c, x=3)
       assert c1.x == 3 and c1.y == 2
-      """
+    """
 
     # We're going to mutate 'changes', but that's okay because it's a
     # new dict, even if called with 'replace(obj, **my_changes)'.


From webhook-mailer at python.org  Wed Jul 27 04:44:14 2022
From: webhook-mailer at python.org (corona10)
Date: Wed, 27 Jul 2022 08:44:14 -0000
Subject: [Python-checkins] gh-95005: Replace PyAccu with PyUnicodeWriter
 (gh-95006)
Message-ID: <mailman.287.1658911455.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/8c88e360e71c8fd456b261f5c5ccc2d8e4db63a0
commit: 8c88e360e71c8fd456b261f5c5ccc2d8e4db63a0
branch: main
author: Aivars Kalv?ns <aivars.kalvans at gmail.com>
committer: corona10 <donghee.na92 at gmail.com>
date: 2022-07-27T17:43:34+09:00
summary:

gh-95005: Replace PyAccu with PyUnicodeWriter (gh-95006)

files:
A Misc/NEWS.d/next/Library/2022-07-19-15-37-11.gh-issue-95005.iRmZ74.rst
D Include/internal/pycore_accu.h
D Objects/accu.c
M Makefile.pre.in
M Modules/_io/stringio.c
M Modules/_json.c
M PCbuild/_freeze_module.vcxproj
M PCbuild/_freeze_module.vcxproj.filters
M PCbuild/pythoncore.vcxproj
M PCbuild/pythoncore.vcxproj.filters

diff --git a/Include/internal/pycore_accu.h b/Include/internal/pycore_accu.h
deleted file mode 100644
index d346222e4dd0c..0000000000000
--- a/Include/internal/pycore_accu.h
+++ /dev/null
@@ -1,39 +0,0 @@
-#ifndef Py_LIMITED_API
-#ifndef Py_INTERNAL_ACCU_H
-#define Py_INTERNAL_ACCU_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*** This is a private API for use by the interpreter and the stdlib.
- *** Its definition may be changed or removed at any moment.
- ***/
-
-#ifndef Py_BUILD_CORE
-#  error "this header requires Py_BUILD_CORE define"
-#endif
-
-/*
- * A two-level accumulator of unicode objects that avoids both the overhead
- * of keeping a huge number of small separate objects, and the quadratic
- * behaviour of using a naive repeated concatenation scheme.
- */
-
-#undef small /* defined by some Windows headers */
-
-typedef struct {
-    PyObject *large;  /* A list of previously accumulated large strings */
-    PyObject *small;  /* Pending small strings */
-} _PyAccu;
-
-PyAPI_FUNC(int) _PyAccu_Init(_PyAccu *acc);
-PyAPI_FUNC(int) _PyAccu_Accumulate(_PyAccu *acc, PyObject *unicode);
-PyAPI_FUNC(PyObject *) _PyAccu_FinishAsList(_PyAccu *acc);
-PyAPI_FUNC(PyObject *) _PyAccu_Finish(_PyAccu *acc);
-PyAPI_FUNC(void) _PyAccu_Destroy(_PyAccu *acc);
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !Py_INTERNAL_ACCU_H */
-#endif /* !Py_LIMITED_API */
diff --git a/Makefile.pre.in b/Makefile.pre.in
index ab44f2158e92d..20e66b8034868 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -435,7 +435,6 @@ PYTHON_OBJS=	\
 # Objects
 OBJECT_OBJS=	\
 		Objects/abstract.o \
-		Objects/accu.o \
 		Objects/boolobject.o \
 		Objects/bytes_methods.o \
 		Objects/bytearrayobject.o \
@@ -1565,7 +1564,6 @@ PYTHON_HEADERS= \
 		$(srcdir)/Include/cpython/weakrefobject.h \
 		\
 		$(srcdir)/Include/internal/pycore_abstract.h \
-		$(srcdir)/Include/internal/pycore_accu.h \
 		$(srcdir)/Include/internal/pycore_asdl.h \
 		$(srcdir)/Include/internal/pycore_ast.h \
 		$(srcdir)/Include/internal/pycore_ast_state.h \
diff --git a/Misc/NEWS.d/next/Library/2022-07-19-15-37-11.gh-issue-95005.iRmZ74.rst b/Misc/NEWS.d/next/Library/2022-07-19-15-37-11.gh-issue-95005.iRmZ74.rst
new file mode 100644
index 0000000000000..787f3146ab777
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2022-07-19-15-37-11.gh-issue-95005.iRmZ74.rst
@@ -0,0 +1,2 @@
+Replace :c:expr:`_PyAccu` with :c:expr:`_PyUnicodeWriter` in JSON encoder
+and StringIO and remove the :c:expr:`_PyAccu` implementation.
diff --git a/Modules/_io/stringio.c b/Modules/_io/stringio.c
index 3fe02d35924f8..0f31c172499ac 100644
--- a/Modules/_io/stringio.c
+++ b/Modules/_io/stringio.c
@@ -1,7 +1,6 @@
 #define PY_SSIZE_T_CLEAN
 #include "Python.h"
 #include <stddef.h>               // offsetof()
-#include "pycore_accu.h"
 #include "pycore_object.h"
 #include "_iomodule.h"
 
@@ -27,12 +26,12 @@ typedef struct {
 
     /* The stringio object can be in two states: accumulating or realized.
        In accumulating state, the internal buffer contains nothing and
-       the contents are given by the embedded _PyAccu structure.
+       the contents are given by the embedded _PyUnicodeWriter structure.
        In realized state, the internal buffer is meaningful and the
-       _PyAccu is destroyed.
+       _PyUnicodeWriter is destroyed.
     */
     int state;
-    _PyAccu accu;
+    _PyUnicodeWriter writer;
 
     char ok; /* initialized? */
     char closed;
@@ -126,12 +125,14 @@ resize_buffer(stringio *self, size_t size)
 static PyObject *
 make_intermediate(stringio *self)
 {
-    PyObject *intermediate = _PyAccu_Finish(&self->accu);
+    PyObject *intermediate = _PyUnicodeWriter_Finish(&self->writer);
     self->state = STATE_REALIZED;
     if (intermediate == NULL)
         return NULL;
-    if (_PyAccu_Init(&self->accu) ||
-        _PyAccu_Accumulate(&self->accu, intermediate)) {
+
+    _PyUnicodeWriter_Init(&self->writer);
+    self->writer.overallocate = 1;
+    if (_PyUnicodeWriter_WriteStr(&self->writer, intermediate)) {
         Py_DECREF(intermediate);
         return NULL;
     }
@@ -150,7 +151,7 @@ realize(stringio *self)
     assert(self->state == STATE_ACCUMULATING);
     self->state = STATE_REALIZED;
 
-    intermediate = _PyAccu_Finish(&self->accu);
+    intermediate = _PyUnicodeWriter_Finish(&self->writer);
     if (intermediate == NULL)
         return -1;
 
@@ -218,7 +219,7 @@ write_str(stringio *self, PyObject *obj)
 
     if (self->state == STATE_ACCUMULATING) {
         if (self->string_size == self->pos) {
-            if (_PyAccu_Accumulate(&self->accu, decoded))
+            if (_PyUnicodeWriter_WriteStr(&self->writer, decoded))
                 goto fail;
             goto success;
         }
@@ -572,7 +573,7 @@ _io_StringIO_close_impl(stringio *self)
     /* Free up some memory */
     if (resize_buffer(self, 0) < 0)
         return NULL;
-    _PyAccu_Destroy(&self->accu);
+    _PyUnicodeWriter_Dealloc(&self->writer);
     Py_CLEAR(self->readnl);
     Py_CLEAR(self->writenl);
     Py_CLEAR(self->decoder);
@@ -602,7 +603,7 @@ stringio_dealloc(stringio *self)
         PyMem_Free(self->buf);
         self->buf = NULL;
     }
-    _PyAccu_Destroy(&self->accu);
+    _PyUnicodeWriter_Dealloc(&self->writer);
     Py_CLEAR(self->readnl);
     Py_CLEAR(self->writenl);
     Py_CLEAR(self->decoder);
@@ -687,7 +688,7 @@ _io_StringIO___init___impl(stringio *self, PyObject *value,
 
     self->ok = 0;
 
-    _PyAccu_Destroy(&self->accu);
+    _PyUnicodeWriter_Dealloc(&self->writer);
     Py_CLEAR(self->readnl);
     Py_CLEAR(self->writenl);
     Py_CLEAR(self->decoder);
@@ -742,8 +743,8 @@ _io_StringIO___init___impl(stringio *self, PyObject *value,
         /* Empty stringio object, we can start by accumulating */
         if (resize_buffer(self, 0) < 0)
             return -1;
-        if (_PyAccu_Init(&self->accu))
-            return -1;
+        _PyUnicodeWriter_Init(&self->writer);
+        self->writer.overallocate = 1;
         self->state = STATE_ACCUMULATING;
     }
     self->pos = 0;
diff --git a/Modules/_json.c b/Modules/_json.c
index 89f55047abe42..7ea84efdb911b 100644
--- a/Modules/_json.c
+++ b/Modules/_json.c
@@ -12,7 +12,6 @@
 #include "Python.h"
 #include "pycore_ceval.h"         // _Py_EnterRecursiveCall()
 #include "structmember.h"         // PyMemberDef
-#include "pycore_accu.h"
 
 
 typedef struct _PyScannerObject {
@@ -85,11 +84,11 @@ encoder_dealloc(PyObject *self);
 static int
 encoder_clear(PyEncoderObject *self);
 static int
-encoder_listencode_list(PyEncoderObject *s, _PyAccu *acc, PyObject *seq, Py_ssize_t indent_level);
+encoder_listencode_list(PyEncoderObject *s, _PyUnicodeWriter *writer, PyObject *seq, Py_ssize_t indent_level);
 static int
-encoder_listencode_obj(PyEncoderObject *s, _PyAccu *acc, PyObject *obj, Py_ssize_t indent_level);
+encoder_listencode_obj(PyEncoderObject *s, _PyUnicodeWriter *writer, PyObject *obj, Py_ssize_t indent_level);
 static int
-encoder_listencode_dict(PyEncoderObject *s, _PyAccu *acc, PyObject *dct, Py_ssize_t indent_level);
+encoder_listencode_dict(PyEncoderObject *s, _PyUnicodeWriter *writer, PyObject *dct, Py_ssize_t indent_level);
 static PyObject *
 _encoded_const(PyObject *obj);
 static void
@@ -1280,19 +1279,29 @@ encoder_call(PyEncoderObject *self, PyObject *args, PyObject *kwds)
 {
     /* Python callable interface to encode_listencode_obj */
     static char *kwlist[] = {"obj", "_current_indent_level", NULL};
-    PyObject *obj;
+    PyObject *obj, *result;
     Py_ssize_t indent_level;
-    _PyAccu acc;
+    _PyUnicodeWriter writer;
+
     if (!PyArg_ParseTupleAndKeywords(args, kwds, "On:_iterencode", kwlist,
         &obj, &indent_level))
         return NULL;
-    if (_PyAccu_Init(&acc))
+
+    _PyUnicodeWriter_Init(&writer);
+    writer.overallocate = 1;
+
+    if (encoder_listencode_obj(self, &writer, obj, indent_level)) {
+        _PyUnicodeWriter_Dealloc(&writer);
         return NULL;
-    if (encoder_listencode_obj(self, &acc, obj, indent_level)) {
-        _PyAccu_Destroy(&acc);
+    }
+
+    result = PyTuple_New(1);
+    if (result == NULL ||
+            PyTuple_SetItem(result, 0, _PyUnicodeWriter_Finish(&writer)) < 0) {
+        Py_XDECREF(result);
         return NULL;
     }
-    return _PyAccu_FinishAsList(&acc);
+    return result;
 }
 
 static PyObject *
@@ -1376,58 +1385,60 @@ encoder_encode_string(PyEncoderObject *s, PyObject *obj)
 }
 
 static int
-_steal_accumulate(_PyAccu *acc, PyObject *stolen)
+_steal_accumulate(_PyUnicodeWriter *writer, PyObject *stolen)
 {
     /* Append stolen and then decrement its reference count */
-    int rval = _PyAccu_Accumulate(acc, stolen);
+    int rval = _PyUnicodeWriter_WriteStr(writer, stolen);
     Py_DECREF(stolen);
     return rval;
 }
 
 static int
-encoder_listencode_obj(PyEncoderObject *s, _PyAccu *acc,
+encoder_listencode_obj(PyEncoderObject *s, _PyUnicodeWriter *writer,
                        PyObject *obj, Py_ssize_t indent_level)
 {
     /* Encode Python object obj to a JSON term */
     PyObject *newobj;
     int rv;
 
-    if (obj == Py_None || obj == Py_True || obj == Py_False) {
-        PyObject *cstr = _encoded_const(obj);
-        if (cstr == NULL)
-            return -1;
-        return _steal_accumulate(acc, cstr);
+    if (obj == Py_None) {
+      return _PyUnicodeWriter_WriteASCIIString(writer, "null", 4);
+    }
+    else if (obj == Py_True) {
+      return _PyUnicodeWriter_WriteASCIIString(writer, "true", 4);
+    }
+    else if (obj == Py_False) {
+      return _PyUnicodeWriter_WriteASCIIString(writer, "false", 5);
     }
-    else if (PyUnicode_Check(obj))
-    {
+    else if (PyUnicode_Check(obj)) {
         PyObject *encoded = encoder_encode_string(s, obj);
         if (encoded == NULL)
             return -1;
-        return _steal_accumulate(acc, encoded);
+        return _steal_accumulate(writer, encoded);
     }
     else if (PyLong_Check(obj)) {
         PyObject *encoded = PyLong_Type.tp_repr(obj);
         if (encoded == NULL)
             return -1;
-        return _steal_accumulate(acc, encoded);
+        return _steal_accumulate(writer, encoded);
     }
     else if (PyFloat_Check(obj)) {
         PyObject *encoded = encoder_encode_float(s, obj);
         if (encoded == NULL)
             return -1;
-        return _steal_accumulate(acc, encoded);
+        return _steal_accumulate(writer, encoded);
     }
     else if (PyList_Check(obj) || PyTuple_Check(obj)) {
         if (_Py_EnterRecursiveCall(" while encoding a JSON object"))
             return -1;
-        rv = encoder_listencode_list(s, acc, obj, indent_level);
+        rv = encoder_listencode_list(s, writer, obj, indent_level);
         _Py_LeaveRecursiveCall();
         return rv;
     }
     else if (PyDict_Check(obj)) {
         if (_Py_EnterRecursiveCall(" while encoding a JSON object"))
             return -1;
-        rv = encoder_listencode_dict(s, acc, obj, indent_level);
+        rv = encoder_listencode_dict(s, writer, obj, indent_level);
         _Py_LeaveRecursiveCall();
         return rv;
     }
@@ -1461,7 +1472,7 @@ encoder_listencode_obj(PyEncoderObject *s, _PyAccu *acc,
             Py_XDECREF(ident);
             return -1;
         }
-        rv = encoder_listencode_obj(s, acc, newobj, indent_level);
+        rv = encoder_listencode_obj(s, writer, newobj, indent_level);
         _Py_LeaveRecursiveCall();
 
         Py_DECREF(newobj);
@@ -1481,16 +1492,10 @@ encoder_listencode_obj(PyEncoderObject *s, _PyAccu *acc,
 }
 
 static int
-encoder_listencode_dict(PyEncoderObject *s, _PyAccu *acc,
+encoder_listencode_dict(PyEncoderObject *s, _PyUnicodeWriter *writer,
                         PyObject *dct, Py_ssize_t indent_level)
 {
     /* Encode Python dict dct a JSON term */
-    _Py_static_string(PyId_open_dict, "{");
-    _Py_static_string(PyId_close_dict, "}");
-    _Py_static_string(PyId_empty_dict, "{}");
-    PyObject *open_dict = _PyUnicode_FromId(&PyId_open_dict);    // borrowed ref
-    PyObject *close_dict = _PyUnicode_FromId(&PyId_close_dict);  // borrowed ref
-    PyObject *empty_dict = _PyUnicode_FromId(&PyId_empty_dict);  // borrowed ref
     PyObject *kstr = NULL;
     PyObject *ident = NULL;
     PyObject *it = NULL;
@@ -1498,11 +1503,8 @@ encoder_listencode_dict(PyEncoderObject *s, _PyAccu *acc,
     PyObject *item = NULL;
     Py_ssize_t idx;
 
-    if (open_dict == NULL || close_dict == NULL || empty_dict == NULL) {
-        return -1;
-    }
     if (PyDict_GET_SIZE(dct) == 0)  /* Fast path */
-        return _PyAccu_Accumulate(acc, empty_dict);
+        return _PyUnicodeWriter_WriteASCIIString(writer, "{}", 2);
 
     if (s->markers != Py_None) {
         int has_key;
@@ -1520,7 +1522,7 @@ encoder_listencode_dict(PyEncoderObject *s, _PyAccu *acc,
         }
     }
 
-    if (_PyAccu_Accumulate(acc, open_dict))
+    if (_PyUnicodeWriter_WriteChar(writer, '{'))
         goto bail;
 
     if (s->indent != Py_None) {
@@ -1586,7 +1588,7 @@ encoder_listencode_dict(PyEncoderObject *s, _PyAccu *acc,
         }
 
         if (idx) {
-            if (_PyAccu_Accumulate(acc, s->item_separator))
+            if (_PyUnicodeWriter_WriteStr(writer, s->item_separator))
                 goto bail;
         }
 
@@ -1594,16 +1596,16 @@ encoder_listencode_dict(PyEncoderObject *s, _PyAccu *acc,
         Py_CLEAR(kstr);
         if (encoded == NULL)
             goto bail;
-        if (_PyAccu_Accumulate(acc, encoded)) {
+        if (_PyUnicodeWriter_WriteStr(writer, encoded)) {
             Py_DECREF(encoded);
             goto bail;
         }
         Py_DECREF(encoded);
-        if (_PyAccu_Accumulate(acc, s->key_separator))
+        if (_PyUnicodeWriter_WriteStr(writer, s->key_separator))
             goto bail;
 
         value = PyTuple_GET_ITEM(item, 1);
-        if (encoder_listencode_obj(s, acc, value, indent_level))
+        if (encoder_listencode_obj(s, writer, value, indent_level))
             goto bail;
         idx += 1;
         Py_DECREF(item);
@@ -1623,7 +1625,7 @@ encoder_listencode_dict(PyEncoderObject *s, _PyAccu *acc,
 
         yield '\n' + (' ' * (_indent * _current_indent_level))
     }*/
-    if (_PyAccu_Accumulate(acc, close_dict))
+    if (_PyUnicodeWriter_WriteChar(writer, '}'))
         goto bail;
     return 0;
 
@@ -1637,30 +1639,20 @@ encoder_listencode_dict(PyEncoderObject *s, _PyAccu *acc,
 
 
 static int
-encoder_listencode_list(PyEncoderObject *s, _PyAccu *acc,
+encoder_listencode_list(PyEncoderObject *s, _PyUnicodeWriter *writer,
                         PyObject *seq, Py_ssize_t indent_level)
 {
-    /* Encode Python list seq to a JSON term */
-    _Py_static_string(PyId_open_array, "[");
-    _Py_static_string(PyId_close_array, "]");
-    _Py_static_string(PyId_empty_array, "[]");
-    PyObject *open_array = _PyUnicode_FromId(&PyId_open_array);   // borrowed ref
-    PyObject *close_array = _PyUnicode_FromId(&PyId_close_array); // borrowed ref
-    PyObject *empty_array = _PyUnicode_FromId(&PyId_empty_array); // borrowed ref
     PyObject *ident = NULL;
     PyObject *s_fast = NULL;
     Py_ssize_t i;
 
-    if (open_array == NULL || close_array == NULL || empty_array == NULL) {
-        return -1;
-    }
     ident = NULL;
     s_fast = PySequence_Fast(seq, "_iterencode_list needs a sequence");
     if (s_fast == NULL)
         return -1;
     if (PySequence_Fast_GET_SIZE(s_fast) == 0) {
         Py_DECREF(s_fast);
-        return _PyAccu_Accumulate(acc, empty_array);
+        return _PyUnicodeWriter_WriteASCIIString(writer, "[]", 2);
     }
 
     if (s->markers != Py_None) {
@@ -1679,7 +1671,7 @@ encoder_listencode_list(PyEncoderObject *s, _PyAccu *acc,
         }
     }
 
-    if (_PyAccu_Accumulate(acc, open_array))
+    if (_PyUnicodeWriter_WriteChar(writer, '['))
         goto bail;
     if (s->indent != Py_None) {
         /* TODO: DOES NOT RUN */
@@ -1693,10 +1685,10 @@ encoder_listencode_list(PyEncoderObject *s, _PyAccu *acc,
     for (i = 0; i < PySequence_Fast_GET_SIZE(s_fast); i++) {
         PyObject *obj = PySequence_Fast_GET_ITEM(s_fast, i);
         if (i) {
-            if (_PyAccu_Accumulate(acc, s->item_separator))
+            if (_PyUnicodeWriter_WriteStr(writer, s->item_separator))
                 goto bail;
         }
-        if (encoder_listencode_obj(s, acc, obj, indent_level))
+        if (encoder_listencode_obj(s, writer, obj, indent_level))
             goto bail;
     }
     if (ident != NULL) {
@@ -1711,7 +1703,7 @@ encoder_listencode_list(PyEncoderObject *s, _PyAccu *acc,
 
         yield '\n' + (' ' * (_indent * _current_indent_level))
     }*/
-    if (_PyAccu_Accumulate(acc, close_array))
+    if (_PyUnicodeWriter_WriteChar(writer, ']'))
         goto bail;
     Py_DECREF(s_fast);
     return 0;
diff --git a/Objects/accu.c b/Objects/accu.c
deleted file mode 100644
index c8b5d382e388b..0000000000000
--- a/Objects/accu.c
+++ /dev/null
@@ -1,115 +0,0 @@
-/* Accumulator struct implementation */
-
-#include "Python.h"
-#include "pycore_accu.h"
-
-static PyObject *
-join_list_unicode(PyObject *lst)
-{
-    /* return ''.join(lst) */
-    PyObject *sep, *ret;
-    sep = PyUnicode_FromStringAndSize("", 0);
-    ret = PyUnicode_Join(sep, lst);
-    Py_DECREF(sep);
-    return ret;
-}
-
-int
-_PyAccu_Init(_PyAccu *acc)
-{
-    /* Lazily allocated */
-    acc->large = NULL;
-    acc->small = PyList_New(0);
-    if (acc->small == NULL)
-        return -1;
-    return 0;
-}
-
-static int
-flush_accumulator(_PyAccu *acc)
-{
-    Py_ssize_t nsmall = PyList_GET_SIZE(acc->small);
-    if (nsmall) {
-        int ret;
-        PyObject *joined;
-        if (acc->large == NULL) {
-            acc->large = PyList_New(0);
-            if (acc->large == NULL)
-                return -1;
-        }
-        joined = join_list_unicode(acc->small);
-        if (joined == NULL)
-            return -1;
-        if (PyList_SetSlice(acc->small, 0, nsmall, NULL)) {
-            Py_DECREF(joined);
-            return -1;
-        }
-        ret = PyList_Append(acc->large, joined);
-        Py_DECREF(joined);
-        return ret;
-    }
-    return 0;
-}
-
-int
-_PyAccu_Accumulate(_PyAccu *acc, PyObject *unicode)
-{
-    Py_ssize_t nsmall;
-    assert(PyUnicode_Check(unicode));
-
-    if (PyList_Append(acc->small, unicode))
-        return -1;
-    nsmall = PyList_GET_SIZE(acc->small);
-    /* Each item in a list of unicode objects has an overhead (in 64-bit
-     * builds) of:
-     *   - 8 bytes for the list slot
-     *   - 56 bytes for the header of the unicode object
-     * that is, 64 bytes.  100000 such objects waste more than 6 MiB
-     * compared to a single concatenated string.
-     */
-    if (nsmall < 100000)
-        return 0;
-    return flush_accumulator(acc);
-}
-
-PyObject *
-_PyAccu_FinishAsList(_PyAccu *acc)
-{
-    int ret;
-    PyObject *res;
-
-    ret = flush_accumulator(acc);
-    Py_CLEAR(acc->small);
-    if (ret) {
-        Py_CLEAR(acc->large);
-        return NULL;
-    }
-    res = acc->large;
-    acc->large = NULL;
-    return res;
-}
-
-PyObject *
-_PyAccu_Finish(_PyAccu *acc)
-{
-    PyObject *list, *res;
-    if (acc->large == NULL) {
-        list = acc->small;
-        acc->small = NULL;
-    }
-    else {
-        list = _PyAccu_FinishAsList(acc);
-        if (!list)
-            return NULL;
-    }
-    res = join_list_unicode(list);
-    Py_DECREF(list);
-    return res;
-}
-
-void
-_PyAccu_Destroy(_PyAccu *acc)
-{
-    Py_CLEAR(acc->small);
-    Py_CLEAR(acc->large);
-}
diff --git a/PCbuild/_freeze_module.vcxproj b/PCbuild/_freeze_module.vcxproj
index 0a74f5850a1e8..5821c3d9e4d86 100644
--- a/PCbuild/_freeze_module.vcxproj
+++ b/PCbuild/_freeze_module.vcxproj
@@ -120,7 +120,6 @@
     <ClCompile Include="..\Modules\_io\textio.c" />
     <ClCompile Include="..\Modules\_io\winconsoleio.c" />
     <ClCompile Include="..\Objects\abstract.c" />
-    <ClCompile Include="..\Objects\accu.c" />
     <ClCompile Include="..\Objects\boolobject.c" />
     <ClCompile Include="..\Objects\bytearrayobject.c" />
     <ClCompile Include="..\Objects\bytes_methods.c" />
diff --git a/PCbuild/_freeze_module.vcxproj.filters b/PCbuild/_freeze_module.vcxproj.filters
index d107849c85621..b657f56e28f24 100644
--- a/PCbuild/_freeze_module.vcxproj.filters
+++ b/PCbuild/_freeze_module.vcxproj.filters
@@ -25,9 +25,6 @@
     <ClCompile Include="..\Objects\abstract.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\Objects\accu.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\Python\asdl.c">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -476,4 +473,4 @@
     </None>
     <!-- END frozen modules -->
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/PCbuild/pythoncore.vcxproj b/PCbuild/pythoncore.vcxproj
index b5b4fce142b1e..3ff4be5187248 100644
--- a/PCbuild/pythoncore.vcxproj
+++ b/PCbuild/pythoncore.vcxproj
@@ -193,7 +193,6 @@
     <ClInclude Include="..\Include\frameobject.h" />
     <ClInclude Include="..\Include\import.h" />
     <ClInclude Include="..\Include\internal\pycore_abstract.h" />
-    <ClInclude Include="..\Include\internal\pycore_accu.h" />
     <ClInclude Include="..\Include\internal\pycore_asdl.h" />
     <ClInclude Include="..\Include\internal\pycore_ast.h" />
     <ClInclude Include="..\Include\internal\pycore_ast_state.h" />
@@ -422,7 +421,6 @@
     <ClCompile Include="..\Modules\cjkcodecs\multibytecodec.c" />
     <ClCompile Include="..\Modules\_winapi.c" />
     <ClCompile Include="..\Objects\abstract.c" />
-    <ClCompile Include="..\Objects\accu.c" />
     <ClCompile Include="..\Objects\boolobject.c" />
     <ClCompile Include="..\Objects\bytearrayobject.c" />
     <ClCompile Include="..\Objects\bytes_methods.c" />
diff --git a/PCbuild/pythoncore.vcxproj.filters b/PCbuild/pythoncore.vcxproj.filters
index 774b4b5b2e2e4..64d248dfafd81 100644
--- a/PCbuild/pythoncore.vcxproj.filters
+++ b/PCbuild/pythoncore.vcxproj.filters
@@ -486,9 +486,6 @@
     <ClInclude Include="..\Include\internal\pycore_abstract.h">
       <Filter>Include\internal</Filter>
     </ClInclude>
-    <ClInclude Include="..\Include\internal\pycore_accu.h">
-      <Filter>Include\internal</Filter>
-    </ClInclude>
     <ClInclude Include="..\Include\internal\pycore_asdl.h">
       <Filter>Include\internal</Filter>
     </ClInclude>


From webhook-mailer at python.org  Wed Jul 27 04:55:04 2022
From: webhook-mailer at python.org (jaraco)
Date: Wed, 27 Jul 2022 08:55:04 -0000
Subject: [Python-checkins] gh-93963: Remove usage of deprecated interface
 from importlib.abc. (#95217)
Message-ID: <mailman.288.1658912105.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/78eb3f79eae772f7a5cdbb2cc02c12b05bd88305
commit: 78eb3f79eae772f7a5cdbb2cc02c12b05bd88305
branch: main
author: Jason R. Coombs <jaraco at jaraco.com>
committer: jaraco <jaraco at jaraco.com>
date: 2022-07-27T04:54:31-04:00
summary:

gh-93963: Remove usage of deprecated interface from importlib.abc. (#95217)

Co-authored-by: ?ukasz Langa <lukasz at langa.pl>

files:
A Misc/NEWS.d/next/Tests/2022-07-24-16-28-31.gh-issue-93963.UB9azu.rst
M Lib/test/test_importlib/resources/test_files.py
M Lib/test/test_importlib/resources/util.py

diff --git a/Lib/test/test_importlib/resources/test_files.py b/Lib/test/test_importlib/resources/test_files.py
index 4665ed7cc00dc..779e5a12b5d53 100644
--- a/Lib/test/test_importlib/resources/test_files.py
+++ b/Lib/test/test_importlib/resources/test_files.py
@@ -2,7 +2,7 @@
 import unittest
 
 from importlib import resources
-from importlib.abc import Traversable
+from importlib.resources.abc import Traversable
 from . import data01
 from . import util
 
diff --git a/Lib/test/test_importlib/resources/util.py b/Lib/test/test_importlib/resources/util.py
index f80c9cd01d66e..eb2291f15de12 100644
--- a/Lib/test/test_importlib/resources/util.py
+++ b/Lib/test/test_importlib/resources/util.py
@@ -7,7 +7,7 @@
 
 from . import data01
 from . import zipdata01
-from importlib.abc import ResourceReader
+from importlib.resources.abc import ResourceReader
 from test.support import import_helper
 
 
diff --git a/Misc/NEWS.d/next/Tests/2022-07-24-16-28-31.gh-issue-93963.UB9azu.rst b/Misc/NEWS.d/next/Tests/2022-07-24-16-28-31.gh-issue-93963.UB9azu.rst
new file mode 100644
index 0000000000000..89ce124c55f22
--- /dev/null
+++ b/Misc/NEWS.d/next/Tests/2022-07-24-16-28-31.gh-issue-93963.UB9azu.rst
@@ -0,0 +1 @@
+Updated tests to use preferred location for ``importlib.resources`` ABCs.


From webhook-mailer at python.org  Wed Jul 27 05:15:47 2022
From: webhook-mailer at python.org (tiran)
Date: Wed, 27 Jul 2022 09:15:47 -0000
Subject: [Python-checkins] [3.11] gh-95280: Fix test_get_ciphers on systems
 without RSA key exchange (GH-95282) (GH-95310)
Message-ID: <mailman.289.1658913348.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/131fc72700d4e2d1b946e650a7d310ea96d02d8c
commit: 131fc72700d4e2d1b946e650a7d310ea96d02d8c
branch: 3.11
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: tiran <christian at python.org>
date: 2022-07-27T11:15:29+02:00
summary:

[3.11] gh-95280: Fix test_get_ciphers on systems without RSA key exchange (GH-95282) (GH-95310)

Co-authored-by: Christian Heimes <christian at python.org>

files:
A Misc/NEWS.d/next/Tests/2022-07-26-15-22-19.gh-issue-95280.h8HvbP.rst
M Lib/test/test_ssl.py

diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py
index b26285755ced4..3b3b869bb53ac 100644
--- a/Lib/test/test_ssl.py
+++ b/Lib/test/test_ssl.py
@@ -1178,8 +1178,20 @@ def test_get_ciphers(self):
         ctx = ssl.SSLContext(ssl.PROTOCOL_TLS_CLIENT)
         ctx.set_ciphers('AESGCM')
         names = set(d['name'] for d in ctx.get_ciphers())
-        self.assertIn('AES256-GCM-SHA384', names)
-        self.assertIn('AES128-GCM-SHA256', names)
+        expected = {
+            'AES128-GCM-SHA256',
+            'ECDHE-ECDSA-AES128-GCM-SHA256',
+            'ECDHE-RSA-AES128-GCM-SHA256',
+            'DHE-RSA-AES128-GCM-SHA256',
+            'AES256-GCM-SHA384',
+            'ECDHE-ECDSA-AES256-GCM-SHA384',
+            'ECDHE-RSA-AES256-GCM-SHA384',
+            'DHE-RSA-AES256-GCM-SHA384',
+        }
+        intersection = names.intersection(expected)
+        self.assertGreaterEqual(
+            len(intersection), 2, f"\ngot: {sorted(names)}\nexpected: {sorted(expected)}"
+        )
 
     def test_options(self):
         ctx = ssl.SSLContext(ssl.PROTOCOL_TLS_CLIENT)
diff --git a/Misc/NEWS.d/next/Tests/2022-07-26-15-22-19.gh-issue-95280.h8HvbP.rst b/Misc/NEWS.d/next/Tests/2022-07-26-15-22-19.gh-issue-95280.h8HvbP.rst
new file mode 100644
index 0000000000000..523d9d5f2f8bf
--- /dev/null
+++ b/Misc/NEWS.d/next/Tests/2022-07-26-15-22-19.gh-issue-95280.h8HvbP.rst
@@ -0,0 +1,2 @@
+Fix problem with ``test_ssl`` ``test_get_ciphers`` on systems that require
+perfect forward secrecy (PFS) ciphers.


From webhook-mailer at python.org  Wed Jul 27 05:16:42 2022
From: webhook-mailer at python.org (tiran)
Date: Wed, 27 Jul 2022 09:16:42 -0000
Subject: [Python-checkins] [3.11] gh-95085: Promote Emscripten and WASI to
 PEP 11 tier 3 (GH-95086) (GH-95307)
Message-ID: <mailman.290.1658913403.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/202311c67a85888f51ee9ab2df2ac97decbacf56
commit: 202311c67a85888f51ee9ab2df2ac97decbacf56
branch: 3.11
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: tiran <christian at python.org>
date: 2022-07-27T11:16:38+02:00
summary:

[3.11] gh-95085: Promote Emscripten and WASI to PEP 11 tier 3 (GH-95086) (GH-95307)

Co-authored-by: Christian Heimes <christian at python.org>

files:
A Misc/NEWS.d/next/Build/2022-07-21-09-17-01.gh-issue-95085.E9x2S_.rst
M Doc/whatsnew/3.11.rst
M Tools/wasm/README.md
M configure
M configure.ac

diff --git a/Doc/whatsnew/3.11.rst b/Doc/whatsnew/3.11.rst
index ec634037743f5..f2b9287d004d5 100644
--- a/Doc/whatsnew/3.11.rst
+++ b/Doc/whatsnew/3.11.rst
@@ -1556,10 +1556,19 @@ Build Changes
      The :program:`configure` options ``--with-tcltk-includes`` and
      ``--with-tcltk-libs`` have been removed.
 
-* CPython now has experimental support for cross compiling to WebAssembly
-  platform ``wasm32-emscripten``. The effort is inspired by previous work
-  like Pyodide.
-  (Contributed by Christian Heimes and Ethan Smith in :issue:`40280`.)
+* CPython now has :pep:`11` tier 3 support for cross compiling to WebAssembly
+  platform ``wasm32-unknown-emscripten`` (Python in the browser). The effort
+  is inspired by previous work like `Pyodide <https://pyodide.org/>`_.
+  Emscripten provides a limited subset of POSIX APIs. Python standard
+  libraries features and modules related to networking, processes, threading,
+  signals, mmap, and users/groups are not available or don't work.
+  (Contributed by Christian Heimes and Ethan Smith in :gh:`84461`,
+  promoted in :gh:`95085`)
+
+* CPython now has :pep:`11` tier 3 support for cross compiling to WebAssembly
+  platform ``wasm32-unknown-wasi`` (WebAssembly System Interface). Like on
+  Emscripten, only a subset of Python's standard library is available on WASI.
+  (Contributed by Christian Heimes in :gh:`90473`, promoted in :gh:`95085`)
 
 * CPython will now use 30-bit digits by default for the Python :class:`int`
   implementation. Previously, the default was to use 30-bit digits on platforms
diff --git a/Misc/NEWS.d/next/Build/2022-07-21-09-17-01.gh-issue-95085.E9x2S_.rst b/Misc/NEWS.d/next/Build/2022-07-21-09-17-01.gh-issue-95085.E9x2S_.rst
new file mode 100644
index 0000000000000..02dbd2b8b3118
--- /dev/null
+++ b/Misc/NEWS.d/next/Build/2022-07-21-09-17-01.gh-issue-95085.E9x2S_.rst
@@ -0,0 +1,2 @@
+Platforms ``wasm32-unknown-emscripten`` and ``wasm32-unknown-wasi`` have
+been promoted to :pep:`11` tier 3 platform support.
diff --git a/Tools/wasm/README.md b/Tools/wasm/README.md
index c1daddda463bb..37bd395baff6d 100644
--- a/Tools/wasm/README.md
+++ b/Tools/wasm/README.md
@@ -167,7 +167,7 @@ functions.
 - Heap memory and stack size are limited. Recursion or extensive memory
   consumption can crash Python.
 - Most stdlib modules with a dependency on external libraries are missing,
-  e.g. ``ctypes``, ``readline``, ``sqlite3``, ``ssl``, and more.
+  e.g. ``ctypes``, ``readline``, ``ssl``, and more.
 - Shared extension modules are not implemented yet. All extension modules
   are statically linked into the main binary. The experimental configure
   option ``--enable-wasm-dynamic-linking`` enables dynamic extensions
diff --git a/configure b/configure
index 078bb5bef1350..378103a641a8c 100755
--- a/configure
+++ b/configure
@@ -6246,7 +6246,11 @@ case $host/$ac_cv_cc_name in #(
     PY_SUPPORT_TIER=3 ;; #(
     s390x-*-linux-gnu/gcc) :
     PY_SUPPORT_TIER=3 ;; #(
-        x86_64-*-freebsd*/clang) :
+    wasm32-unknown-emscripten/clang) :
+    PY_SUPPORT_TIER=3 ;; #(
+    wasm32-unknown-wasi/clang) :
+    PY_SUPPORT_TIER=3 ;; #(
+    x86_64-*-freebsd*/clang) :
     PY_SUPPORT_TIER=3 ;; #(
   *) :
       PY_SUPPORT_TIER=0
diff --git a/configure.ac b/configure.ac
index 09f3f902a6b58..7d8c670da947d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1126,8 +1126,8 @@ AS_CASE([$host/$ac_cv_cc_name],
   [armv7l-*-linux-gnueabihf/gcc],    [PY_SUPPORT_TIER=3], dnl ARMv7 LE with hardware floats, any vendor, glibc, gcc
   [powerpc64le-*-linux-gnu/clang],   [PY_SUPPORT_TIER=3], dnl Linux on PPC64 little endian, glibc, clang
   [s390x-*-linux-gnu/gcc],           [PY_SUPPORT_TIER=3], dnl Linux on 64bit s390x (big endian), glibc, gcc
-  dnl [wasm32-unknown-emscripten/clang], [PY_SUPPORT_TIER=3], dnl WebAssembly Emscripten
-  dnl [wasm32-unknown-wasi/clang],       [PY_SUPPORT_TIER=3], dnl WebAssembly System Interface
+  [wasm32-unknown-emscripten/clang], [PY_SUPPORT_TIER=3], dnl WebAssembly Emscripten
+  [wasm32-unknown-wasi/clang],       [PY_SUPPORT_TIER=3], dnl WebAssembly System Interface
   [x86_64-*-freebsd*/clang],         [PY_SUPPORT_TIER=3], dnl FreeBSD on AMD64
   [PY_SUPPORT_TIER=0]
 )


From webhook-mailer at python.org  Wed Jul 27 06:32:24 2022
From: webhook-mailer at python.org (miss-islington)
Date: Wed, 27 Jul 2022 10:32:24 -0000
Subject: [Python-checkins] gh-95041: Fail syslog.syslog in case inner call
 to syslog.openlog fails (GH-95264)
Message-ID: <mailman.291.1658917944.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/9640c4c88cb3b0dfef88d5a00daa3a02eff6347d
commit: 9640c4c88cb3b0dfef88d5a00daa3a02eff6347d
branch: 3.11
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-27T03:32:02-07:00
summary:

gh-95041: Fail syslog.syslog in case inner call to syslog.openlog fails (GH-95264)

(cherry picked from commit b1f648efc56ff17e18ec2b7402d59a771b305004)

Co-authored-by: Noam Cohen <noam at noam.me>

files:
M Modules/syslogmodule.c

diff --git a/Modules/syslogmodule.c b/Modules/syslogmodule.c
index 27b176aeb6dba..c409fe968f889 100644
--- a/Modules/syslogmodule.c
+++ b/Modules/syslogmodule.c
@@ -191,8 +191,14 @@ syslog_syslog(PyObject * self, PyObject * args)
          */
         if ((openargs = PyTuple_New(0))) {
             PyObject *openlog_ret = syslog_openlog(self, openargs, NULL);
-            Py_XDECREF(openlog_ret);
             Py_DECREF(openargs);
+            if (openlog_ret == NULL) {
+                return NULL;
+            }
+            Py_DECREF(openlog_ret);
+        }
+        else {
+            return NULL;
         }
     }
 


From webhook-mailer at python.org  Wed Jul 27 06:52:06 2022
From: webhook-mailer at python.org (ambv)
Date: Wed, 27 Jul 2022 10:52:06 -0000
Subject: [Python-checkins] [3.11] gh-94801: Fix regression in configure's
 CPPFLAGS handling (GH-95288) (GH-95297)
Message-ID: <mailman.292.1658919127.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/c72c1d65cbdd14c6984285100bb8f16b982b7b33
commit: c72c1d65cbdd14c6984285100bb8f16b982b7b33
branch: 3.11
author: Christian Heimes <christian at python.org>
committer: ambv <lukasz at langa.pl>
date: 2022-07-27T12:51:36+02:00
summary:

[3.11] gh-94801: Fix regression in configure's CPPFLAGS handling (GH-95288) (GH-95297)

(cherry picked from commit 9af7f87d763ed6e1c5f56ae40d8242ab22866b33)

Co-authored-by: Christian Heimes <christian at python.org>

files:
A Misc/NEWS.d/next/Build/2022-07-26-18-13-34.gh-issue-94801.9fREfy.rst
M configure
M configure.ac

diff --git a/Misc/NEWS.d/next/Build/2022-07-26-18-13-34.gh-issue-94801.9fREfy.rst b/Misc/NEWS.d/next/Build/2022-07-26-18-13-34.gh-issue-94801.9fREfy.rst
new file mode 100644
index 0000000000000..a58be30e81b05
--- /dev/null
+++ b/Misc/NEWS.d/next/Build/2022-07-26-18-13-34.gh-issue-94801.9fREfy.rst
@@ -0,0 +1,2 @@
+Fix a regression in ``configure`` script that caused some header checks to
+ignore custom ``CPPFLAGS``. The regression was introduced in :gh:`94802`.
diff --git a/configure b/configure
index 378103a641a8c..19316baa6ee12 100755
--- a/configure
+++ b/configure
@@ -11180,7 +11180,7 @@ save_LDFLAGS=$LDFLAGS
 save_LIBS=$LIBS
 
 
-        CPPFLAGS="$CFLAGS $LIBUUID_CFLAGS"
+        CPPFLAGS="$CPPFLAGS $LIBUUID_CFLAGS"
         LDFLAGS="$LDFLAGS $LIBUUID_LIBS"
         for ac_header in uuid/uuid.h
 do :
@@ -11309,7 +11309,7 @@ save_LDFLAGS=$LDFLAGS
 save_LIBS=$LIBS
 
 
-        CPPFLAGS="$CFLAGS $LIBUUID_CFLAGS"
+        CPPFLAGS="$CPPFLAGS $LIBUUID_CFLAGS"
         LDFLAGS="$LDFLAGS $LIBUUID_LIBS"
         for ac_header in uuid/uuid.h
 do :
@@ -12352,7 +12352,7 @@ save_LDFLAGS=$LDFLAGS
 save_LIBS=$LIBS
 
 
-    CPPFLAGS="$LIBNSL_CFLAGS $CFLAGS"
+    CPPFLAGS="$CPPFLAGS $LIBNSL_CFLAGS"
     for ac_header in rpc/rpc.h
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "rpc/rpc.h" "ac_cv_header_rpc_rpc_h" "$ac_includes_default"
@@ -12485,7 +12485,7 @@ save_LDFLAGS=$LDFLAGS
 save_LIBS=$LIBS
 
 
-  CPPFLAGS="$LIBSQLITE3_CFLAGS $CFLAGS"
+  CPPFLAGS="$CPPFLAGS $LIBSQLITE3_CFLAGS"
   LDFLAGS="$LIBSQLITE3_LIBS $LDFLAGS"
 
   ac_fn_c_check_header_mongrel "$LINENO" "sqlite3.h" "ac_cv_header_sqlite3_h" "$ac_includes_default"
@@ -13431,7 +13431,7 @@ save_LDFLAGS=$LDFLAGS
 save_LIBS=$LIBS
 
 
-  CPPFLAGS="$TCLTK_CFLAGS $CFLAGS"
+  CPPFLAGS="$CPPFLAGS $TCLTK_CFLAGS"
   LIBS="$TCLTK_LIBS $LDFLAGS"
 
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -13496,7 +13496,7 @@ save_LDFLAGS=$LDFLAGS
 save_LIBS=$LIBS
 
 
-  CPPFLAGS="$GDBM_CFLAGS $CFLAGS"
+  CPPFLAGS="$CPPFLAGS $GDBM_CFLAGS"
   LDFLAGS="$GDBM_LIBS $LDFLAGS"
   for ac_header in gdbm.h
 do :
@@ -16020,7 +16020,7 @@ save_LDFLAGS=$LDFLAGS
 save_LIBS=$LIBS
 
 
-    CPPFLAGS="$CFLAGS $ZLIB_CFLAGS"
+    CPPFLAGS="$CPPFLAGS $ZLIB_CFLAGS"
     LDFLAGS="$LDFLAGS $ZLIB_LIBS"
     for ac_header in zlib.h
 do :
@@ -16150,7 +16150,7 @@ save_LDFLAGS=$LDFLAGS
 save_LIBS=$LIBS
 
 
-    CPPFLAGS="$CFLAGS $ZLIB_CFLAGS"
+    CPPFLAGS="$CPPFLAGS $ZLIB_CFLAGS"
     LDFLAGS="$LDFLAGS $ZLIB_LIBS"
     for ac_header in zlib.h
 do :
@@ -16368,7 +16368,7 @@ save_LDFLAGS=$LDFLAGS
 save_LIBS=$LIBS
 
 
-    CPPFLAGS="$CFLAGS $BZIP2_CFLAGS"
+    CPPFLAGS="$CPPFLAGS $BZIP2_CFLAGS"
     LDFLAGS="$LDFLAGS $BZIP2_LIBS"
     for ac_header in bzlib.h
 do :
@@ -16451,7 +16451,7 @@ save_LDFLAGS=$LDFLAGS
 save_LIBS=$LIBS
 
 
-    CPPFLAGS="$CFLAGS $BZIP2_CFLAGS"
+    CPPFLAGS="$CPPFLAGS $BZIP2_CFLAGS"
     LDFLAGS="$LDFLAGS $BZIP2_LIBS"
     for ac_header in bzlib.h
 do :
@@ -16598,7 +16598,7 @@ save_LDFLAGS=$LDFLAGS
 save_LIBS=$LIBS
 
 
-    CPPFLAGS="$CFLAGS $LIBLZMA_CFLAGS"
+    CPPFLAGS="$CPPFLAGS $LIBLZMA_CFLAGS"
     LDFLAGS="$LDFLAGS $LIBLZMA_LIBS"
     for ac_header in lzma.h
 do :
@@ -16681,7 +16681,7 @@ save_LDFLAGS=$LDFLAGS
 save_LIBS=$LIBS
 
 
-    CPPFLAGS="$CFLAGS $LIBLZMA_CFLAGS"
+    CPPFLAGS="$CPPFLAGS $LIBLZMA_CFLAGS"
     LDFLAGS="$LDFLAGS $LIBLZMA_LIBS"
     for ac_header in lzma.h
 do :
@@ -17508,7 +17508,7 @@ save_LDFLAGS=$LDFLAGS
 save_LIBS=$LIBS
 
 
-  CPPFLAGS="$LIBCRYPT_CFLAGS $CFLAGS"
+  CPPFLAGS="$CPPFLAGS $LIBCRYPT_CFLAGS"
   LIBS="$LIBCRYPT_LIBS $LIBS"
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for crypt or crypt_r" >&5
 $as_echo_n "checking for crypt or crypt_r... " >&6; }
diff --git a/configure.ac b/configure.ac
index 7d8c670da947d..f1fa570556235 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3378,7 +3378,7 @@ AS_VAR_IF([have_uuid], [missing], [
       AC_DEFINE([HAVE_UUID_GENERATE_TIME_SAFE], [1])
     ], [
       WITH_SAVE_ENV([
-        CPPFLAGS="$CFLAGS $LIBUUID_CFLAGS"
+        CPPFLAGS="$CPPFLAGS $LIBUUID_CFLAGS"
         LDFLAGS="$LDFLAGS $LIBUUID_LIBS"
         AC_CHECK_HEADERS([uuid/uuid.h], [
           PY_CHECK_LIB([uuid], [uuid_generate_time], [have_uuid=yes])
@@ -3730,7 +3730,7 @@ PKG_CHECK_MODULES([LIBNSL], [libnsl], [have_nis=yes], [
 
 AS_VAR_IF([have_nis], [yes], [
   WITH_SAVE_ENV([
-    CPPFLAGS="$LIBNSL_CFLAGS $CFLAGS"
+    CPPFLAGS="$CPPFLAGS $LIBNSL_CFLAGS"
     AC_CHECK_HEADERS([rpc/rpc.h])
   ])
 ])
@@ -3763,7 +3763,7 @@ AC_DEFUN([PY_CHECK_SQLITE_FUNC], [
 WITH_SAVE_ENV([
 dnl bpo-45774/GH-29507: The CPP check in AC_CHECK_HEADER can fail on FreeBSD,
 dnl hence CPPFLAGS instead of CFLAGS.
-  CPPFLAGS="$LIBSQLITE3_CFLAGS $CFLAGS"
+  CPPFLAGS="$CPPFLAGS $LIBSQLITE3_CFLAGS"
   LDFLAGS="$LIBSQLITE3_LIBS $LDFLAGS"
 
   AC_CHECK_HEADER([sqlite3.h], [
@@ -3867,7 +3867,7 @@ AS_CASE([$ac_sys_system],
 )
 
 WITH_SAVE_ENV([
-  CPPFLAGS="$TCLTK_CFLAGS $CFLAGS"
+  CPPFLAGS="$CPPFLAGS $TCLTK_CFLAGS"
   LIBS="$TCLTK_LIBS $LDFLAGS"
 
   AC_LINK_IFELSE([
@@ -3909,7 +3909,7 @@ dnl NOTE: gdbm does not provide a pkgconf file.
 AC_ARG_VAR([GDBM_CFLAGS], [C compiler flags for gdbm])
 AC_ARG_VAR([GDBM_LIBS], [additional linker flags for gdbm])
 WITH_SAVE_ENV([
-  CPPFLAGS="$GDBM_CFLAGS $CFLAGS"
+  CPPFLAGS="$CPPFLAGS $GDBM_CFLAGS"
   LDFLAGS="$GDBM_LIBS $LDFLAGS"
   AC_CHECK_HEADERS([gdbm.h], [
     AC_CHECK_LIB([gdbm], [gdbm_open], [
@@ -4734,7 +4734,7 @@ PKG_CHECK_MODULES([ZLIB], [zlib >= 1.2.0], [
   AC_DEFINE([HAVE_ZLIB_COPY], [1])
 ], [
   WITH_SAVE_ENV([
-    CPPFLAGS="$CFLAGS $ZLIB_CFLAGS"
+    CPPFLAGS="$CPPFLAGS $ZLIB_CFLAGS"
     LDFLAGS="$LDFLAGS $ZLIB_LIBS"
     AC_CHECK_HEADERS([zlib.h], [
       PY_CHECK_LIB([z], [gzread], [have_zlib=yes], [have_zlib=no])
@@ -4758,7 +4758,7 @@ PY_CHECK_EMSCRIPTEN_PORT([BZIP2], [-sUSE_BZIP2])
 
 PKG_CHECK_MODULES([BZIP2], [bzip2], [have_bzip2=yes], [
   WITH_SAVE_ENV([
-    CPPFLAGS="$CFLAGS $BZIP2_CFLAGS"
+    CPPFLAGS="$CPPFLAGS $BZIP2_CFLAGS"
     LDFLAGS="$LDFLAGS $BZIP2_LIBS"
     AC_CHECK_HEADERS([bzlib.h], [
       AC_CHECK_LIB([bz2], [BZ2_bzCompress], [have_bzip2=yes], [have_bzip2=no])
@@ -4772,7 +4772,7 @@ PKG_CHECK_MODULES([BZIP2], [bzip2], [have_bzip2=yes], [
 
 PKG_CHECK_MODULES([LIBLZMA], [liblzma], [have_liblzma=yes], [
   WITH_SAVE_ENV([
-    CPPFLAGS="$CFLAGS $LIBLZMA_CFLAGS"
+    CPPFLAGS="$CPPFLAGS $LIBLZMA_CFLAGS"
     LDFLAGS="$LDFLAGS $LIBLZMA_LIBS"
     AC_CHECK_HEADERS([lzma.h], [
       AC_CHECK_LIB([lzma], [lzma_easy_encoder], [have_liblzma=yes], [have_liblzma=no])
@@ -4864,7 +4864,7 @@ PKG_CHECK_MODULES([LIBCRYPT], [libxcrypt >= 3.1.1], [
 ])
 
 WITH_SAVE_ENV([
-  CPPFLAGS="$LIBCRYPT_CFLAGS $CFLAGS"
+  CPPFLAGS="$CPPFLAGS $LIBCRYPT_CFLAGS"
   LIBS="$LIBCRYPT_LIBS $LIBS"
   AC_CACHE_CHECK([for crypt or crypt_r], [ac_cv_crypt_crypt], [
     AC_LINK_IFELSE([AC_LANG_PROGRAM([


From webhook-mailer at python.org  Wed Jul 27 08:03:57 2022
From: webhook-mailer at python.org (miss-islington)
Date: Wed, 27 Jul 2022 12:03:57 -0000
Subject: [Python-checkins] GH-95045: gc untrack _lsprof.Profiler before
 deallocating it (GH-95315)
Message-ID: <mailman.293.1658923438.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/deacf391d7a1b3ab49bffa16088b3500fdb4c435
commit: deacf391d7a1b3ab49bffa16088b3500fdb4c435
branch: main
author: Kumar Aditya <59607654+kumaraditya303 at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-27T05:03:50-07:00
summary:

GH-95045: gc untrack _lsprof.Profiler before deallocating it (GH-95315)



Automerge-Triggered-By: GH:pablogsal

files:
A Misc/NEWS.d/next/Library/2022-07-27-11-35-45.gh-issue-95045.iysT-Q.rst
M Modules/_lsprof.c

diff --git a/Misc/NEWS.d/next/Library/2022-07-27-11-35-45.gh-issue-95045.iysT-Q.rst b/Misc/NEWS.d/next/Library/2022-07-27-11-35-45.gh-issue-95045.iysT-Q.rst
new file mode 100644
index 0000000000000..d4ab325e03658
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2022-07-27-11-35-45.gh-issue-95045.iysT-Q.rst
@@ -0,0 +1 @@
+Fix GC crash when deallocating ``_lsprof.Profiler`` by untracking it before calling any callbacks. Patch by Kumar Aditya.
diff --git a/Modules/_lsprof.c b/Modules/_lsprof.c
index 0e8432fda01ec..a0e262bdac26c 100644
--- a/Modules/_lsprof.c
+++ b/Modules/_lsprof.c
@@ -747,6 +747,7 @@ profiler_traverse(ProfilerObject *op, visitproc visit, void *arg)
 static void
 profiler_dealloc(ProfilerObject *op)
 {
+    PyObject_GC_UnTrack(op);
     if (op->flags & POF_ENABLED) {
         PyThreadState *tstate = _PyThreadState_GET();
         if (_PyEval_SetProfile(tstate, NULL, NULL) < 0) {


From webhook-mailer at python.org  Wed Jul 27 08:28:33 2022
From: webhook-mailer at python.org (miss-islington)
Date: Wed, 27 Jul 2022 12:28:33 -0000
Subject: [Python-checkins] GH-95045: gc untrack _lsprof.Profiler before
 deallocating it (GH-95315)
Message-ID: <mailman.294.1658924915.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/657efca298bac3a4fcc66e917a464e4a6764f0d3
commit: 657efca298bac3a4fcc66e917a464e4a6764f0d3
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-27T05:28:26-07:00
summary:

GH-95045: gc untrack _lsprof.Profiler before deallocating it (GH-95315)


Automerge-Triggered-By: GH:pablogsal
(cherry picked from commit deacf391d7a1b3ab49bffa16088b3500fdb4c435)

Co-authored-by: Kumar Aditya <59607654+kumaraditya303 at users.noreply.github.com>

files:
A Misc/NEWS.d/next/Library/2022-07-27-11-35-45.gh-issue-95045.iysT-Q.rst
M Modules/_lsprof.c

diff --git a/Misc/NEWS.d/next/Library/2022-07-27-11-35-45.gh-issue-95045.iysT-Q.rst b/Misc/NEWS.d/next/Library/2022-07-27-11-35-45.gh-issue-95045.iysT-Q.rst
new file mode 100644
index 0000000000000..d4ab325e03658
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2022-07-27-11-35-45.gh-issue-95045.iysT-Q.rst
@@ -0,0 +1 @@
+Fix GC crash when deallocating ``_lsprof.Profiler`` by untracking it before calling any callbacks. Patch by Kumar Aditya.
diff --git a/Modules/_lsprof.c b/Modules/_lsprof.c
index 8d754aa7e3ca2..0a6b29a969b3f 100644
--- a/Modules/_lsprof.c
+++ b/Modules/_lsprof.c
@@ -741,6 +741,7 @@ profiler_traverse(ProfilerObject *op, visitproc visit, void *arg)
 static void
 profiler_dealloc(ProfilerObject *op)
 {
+    PyObject_GC_UnTrack(op);
     if (op->flags & POF_ENABLED) {
         PyThreadState *tstate = PyThreadState_GET();
         if (_PyEval_SetProfile(tstate, NULL, NULL) < 0) {


From webhook-mailer at python.org  Wed Jul 27 08:37:51 2022
From: webhook-mailer at python.org (miss-islington)
Date: Wed, 27 Jul 2022 12:37:51 -0000
Subject: [Python-checkins] GH-95045: gc untrack _lsprof.Profiler before
 deallocating it (GH-95315)
Message-ID: <mailman.295.1658925471.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/6b01fc7045dfeb27d146983e62759ce81ddf9e30
commit: 6b01fc7045dfeb27d146983e62759ce81ddf9e30
branch: 3.11
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-27T05:37:43-07:00
summary:

GH-95045: gc untrack _lsprof.Profiler before deallocating it (GH-95315)


Automerge-Triggered-By: GH:pablogsal
(cherry picked from commit deacf391d7a1b3ab49bffa16088b3500fdb4c435)

Co-authored-by: Kumar Aditya <59607654+kumaraditya303 at users.noreply.github.com>

files:
A Misc/NEWS.d/next/Library/2022-07-27-11-35-45.gh-issue-95045.iysT-Q.rst
M Modules/_lsprof.c

diff --git a/Misc/NEWS.d/next/Library/2022-07-27-11-35-45.gh-issue-95045.iysT-Q.rst b/Misc/NEWS.d/next/Library/2022-07-27-11-35-45.gh-issue-95045.iysT-Q.rst
new file mode 100644
index 0000000000000..d4ab325e03658
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2022-07-27-11-35-45.gh-issue-95045.iysT-Q.rst
@@ -0,0 +1 @@
+Fix GC crash when deallocating ``_lsprof.Profiler`` by untracking it before calling any callbacks. Patch by Kumar Aditya.
diff --git a/Modules/_lsprof.c b/Modules/_lsprof.c
index 0e8432fda01ec..a0e262bdac26c 100644
--- a/Modules/_lsprof.c
+++ b/Modules/_lsprof.c
@@ -747,6 +747,7 @@ profiler_traverse(ProfilerObject *op, visitproc visit, void *arg)
 static void
 profiler_dealloc(ProfilerObject *op)
 {
+    PyObject_GC_UnTrack(op);
     if (op->flags & POF_ENABLED) {
         PyThreadState *tstate = _PyThreadState_GET();
         if (_PyEval_SetProfile(tstate, NULL, NULL) < 0) {


From webhook-mailer at python.org  Wed Jul 27 08:46:31 2022
From: webhook-mailer at python.org (erlend-aasland)
Date: Wed, 27 Jul 2022 12:46:31 -0000
Subject: [Python-checkins] gh-94630: Fixup sqlite3 argument spec docs for
 connection execute* methods (#95319)
Message-ID: <mailman.296.1658925992.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/2b37395612ece0a8c37439801087ba9e2c56702f
commit: 2b37395612ece0a8c37439801087ba9e2c56702f
branch: main
author: Erlend Egeberg Aasland <erlend.aasland at protonmail.com>
committer: erlend-aasland <erlend.aasland at protonmail.com>
date: 2022-07-27T14:46:21+02:00
summary:

gh-94630: Fixup sqlite3 argument spec docs for connection execute* methods (#95319)

files:
M Doc/library/sqlite3.rst

diff --git a/Doc/library/sqlite3.rst b/Doc/library/sqlite3.rst
index b780605444a42..f71b49c938558 100644
--- a/Doc/library/sqlite3.rst
+++ b/Doc/library/sqlite3.rst
@@ -499,19 +499,19 @@ Connection Objects
       make sure to :meth:`commit` before closing
       to avoid losing pending changes.
 
-   .. method:: execute(sql[, parameters])
+   .. method:: execute(sql, parameters=(), /)
 
       Create a new :class:`Cursor` object and call
       :meth:`~Cursor.execute` on it with the given *sql* and *parameters*.
       Return the new cursor object.
 
-   .. method:: executemany(sql[, parameters])
+   .. method:: executemany(sql, parameters, /)
 
       Create a new :class:`Cursor` object and call
       :meth:`~Cursor.executemany` on it with the given *sql* and *parameters*.
       Return the new cursor object.
 
-   .. method:: executescript(sql_script)
+   .. method:: executescript(sql_script, /)
 
       Create a new :class:`Cursor` object and call
       :meth:`~Cursor.executescript` on it with the given *sql_script*.
@@ -981,11 +981,11 @@ Cursor Objects
       a transaction is implicitly opened before executing *sql*.
 
 
-   .. method:: executemany(sql, seq_of_parameters, /)
+   .. method:: executemany(sql, parameters, /)
 
       Execute :ref:`parameterized <sqlite3-placeholders>` SQL statement *sql*
       against all parameter sequences or mappings found in the sequence
-      *seq_of_parameters*.  It is also possible to use an
+      *parameters*.  It is also possible to use an
       :term:`iterator` yielding parameters instead of a sequence.
       Uses the same implicit transaction handling as :meth:`~Cursor.execute`.
 


From webhook-mailer at python.org  Wed Jul 27 08:54:27 2022
From: webhook-mailer at python.org (miss-islington)
Date: Wed, 27 Jul 2022 12:54:27 -0000
Subject: [Python-checkins] gh-94630: Fixup sqlite3 argument spec docs for
 connection execute* methods (GH-95319)
Message-ID: <mailman.297.1658926469.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/7e7a570818a41df6e97e25989d92449c7cc40aad
commit: 7e7a570818a41df6e97e25989d92449c7cc40aad
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-27T05:54:14-07:00
summary:

gh-94630: Fixup sqlite3 argument spec docs for connection execute* methods (GH-95319)

(cherry picked from commit 2b37395612ece0a8c37439801087ba9e2c56702f)

Co-authored-by: Erlend Egeberg Aasland <erlend.aasland at protonmail.com>

files:
M Doc/library/sqlite3.rst

diff --git a/Doc/library/sqlite3.rst b/Doc/library/sqlite3.rst
index f8b800bfdc298..7f1293af58a56 100644
--- a/Doc/library/sqlite3.rst
+++ b/Doc/library/sqlite3.rst
@@ -413,19 +413,19 @@ Connection Objects
       make sure to :meth:`commit` before closing
       to avoid losing pending changes.
 
-   .. method:: execute(sql[, parameters])
+   .. method:: execute(sql, parameters=(), /)
 
       Create a new :class:`Cursor` object and call
       :meth:`~Cursor.execute` on it with the given *sql* and *parameters*.
       Return the new cursor object.
 
-   .. method:: executemany(sql[, parameters])
+   .. method:: executemany(sql, parameters, /)
 
       Create a new :class:`Cursor` object and call
       :meth:`~Cursor.executemany` on it with the given *sql* and *parameters*.
       Return the new cursor object.
 
-   .. method:: executescript(sql_script)
+   .. method:: executescript(sql_script, /)
 
       Create a new :class:`Cursor` object and call
       :meth:`~Cursor.executescript` on it with the given *sql_script*.
@@ -774,11 +774,11 @@ Cursor Objects
       a transaction is implicitly opened before executing *sql*.
 
 
-   .. method:: executemany(sql, seq_of_parameters, /)
+   .. method:: executemany(sql, parameters, /)
 
       Execute :ref:`parameterized <sqlite3-placeholders>` SQL statement *sql*
       against all parameter sequences or mappings found in the sequence
-      *seq_of_parameters*.  It is also possible to use an
+      *parameters*.  It is also possible to use an
       :term:`iterator` yielding parameters instead of a sequence.
       Uses the same implicit transaction handling as :meth:`~Cursor.execute`.
 


From webhook-mailer at python.org  Wed Jul 27 08:56:12 2022
From: webhook-mailer at python.org (miss-islington)
Date: Wed, 27 Jul 2022 12:56:12 -0000
Subject: [Python-checkins] gh-94630: Fixup sqlite3 argument spec docs for
 connection execute* methods (GH-95319)
Message-ID: <mailman.298.1658926572.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/f28118211fd4883ae0e47492b2029bcc584572d5
commit: f28118211fd4883ae0e47492b2029bcc584572d5
branch: 3.11
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-27T05:56:07-07:00
summary:

gh-94630: Fixup sqlite3 argument spec docs for connection execute* methods (GH-95319)

(cherry picked from commit 2b37395612ece0a8c37439801087ba9e2c56702f)

Co-authored-by: Erlend Egeberg Aasland <erlend.aasland at protonmail.com>

files:
M Doc/library/sqlite3.rst

diff --git a/Doc/library/sqlite3.rst b/Doc/library/sqlite3.rst
index 5969cbb3de714..6f57b1dd185c0 100644
--- a/Doc/library/sqlite3.rst
+++ b/Doc/library/sqlite3.rst
@@ -489,19 +489,19 @@ Connection Objects
       make sure to :meth:`commit` before closing
       to avoid losing pending changes.
 
-   .. method:: execute(sql[, parameters])
+   .. method:: execute(sql, parameters=(), /)
 
       Create a new :class:`Cursor` object and call
       :meth:`~Cursor.execute` on it with the given *sql* and *parameters*.
       Return the new cursor object.
 
-   .. method:: executemany(sql[, parameters])
+   .. method:: executemany(sql, parameters, /)
 
       Create a new :class:`Cursor` object and call
       :meth:`~Cursor.executemany` on it with the given *sql* and *parameters*.
       Return the new cursor object.
 
-   .. method:: executescript(sql_script)
+   .. method:: executescript(sql_script, /)
 
       Create a new :class:`Cursor` object and call
       :meth:`~Cursor.executescript` on it with the given *sql_script*.
@@ -971,11 +971,11 @@ Cursor Objects
       a transaction is implicitly opened before executing *sql*.
 
 
-   .. method:: executemany(sql, seq_of_parameters, /)
+   .. method:: executemany(sql, parameters, /)
 
       Execute :ref:`parameterized <sqlite3-placeholders>` SQL statement *sql*
       against all parameter sequences or mappings found in the sequence
-      *seq_of_parameters*.  It is also possible to use an
+      *parameters*.  It is also possible to use an
       :term:`iterator` yielding parameters instead of a sequence.
       Uses the same implicit transaction handling as :meth:`~Cursor.execute`.
 


From webhook-mailer at python.org  Wed Jul 27 09:05:38 2022
From: webhook-mailer at python.org (miss-islington)
Date: Wed, 27 Jul 2022 13:05:38 -0000
Subject: [Python-checkins] GH-93899: fix checks for eventfd flags (GH-95170)
Message-ID: <mailman.299.1658927140.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/4dd099bafff14639ef5d2185965016d8f253353f
commit: 4dd099bafff14639ef5d2185965016d8f253353f
branch: main
author: Kumar Aditya <59607654+kumaraditya303 at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-27T06:05:29-07:00
summary:

GH-93899: fix checks for eventfd flags  (GH-95170)

files:
A Misc/NEWS.d/next/Library/2022-07-23-10-50-05.gh-issue-93899.VT34A5.rst
M Modules/clinic/posixmodule.c.h
M Modules/posixmodule.c

diff --git a/Misc/NEWS.d/next/Library/2022-07-23-10-50-05.gh-issue-93899.VT34A5.rst b/Misc/NEWS.d/next/Library/2022-07-23-10-50-05.gh-issue-93899.VT34A5.rst
new file mode 100644
index 0000000000000..e63475f8ba96f
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2022-07-23-10-50-05.gh-issue-93899.VT34A5.rst
@@ -0,0 +1 @@
+Fix check for existence of :data:`os.EFD_CLOEXEC`, :data:`os.EFD_NONBLOCK` and :data:`os.EFD_SEMAPHORE` flags on older kernel versions where these flags are not present. Patch by Kumar Aditya.
diff --git a/Modules/clinic/posixmodule.c.h b/Modules/clinic/posixmodule.c.h
index 3847349e5f6c3..ddd41cae3ec45 100644
--- a/Modules/clinic/posixmodule.c.h
+++ b/Modules/clinic/posixmodule.c.h
@@ -7873,7 +7873,7 @@ os_memfd_create(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObj
 
 #endif /* defined(HAVE_MEMFD_CREATE) */
 
-#if defined(HAVE_EVENTFD)
+#if (defined(HAVE_EVENTFD) && defined(EFD_CLOEXEC))
 
 PyDoc_STRVAR(os_eventfd__doc__,
 "eventfd($module, /, initval, flags=EFD_CLOEXEC)\n"
@@ -7919,9 +7919,9 @@ os_eventfd(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObject *
     return return_value;
 }
 
-#endif /* defined(HAVE_EVENTFD) */
+#endif /* (defined(HAVE_EVENTFD) && defined(EFD_CLOEXEC)) */
 
-#if defined(HAVE_EVENTFD)
+#if (defined(HAVE_EVENTFD) && defined(EFD_CLOEXEC))
 
 PyDoc_STRVAR(os_eventfd_read__doc__,
 "eventfd_read($module, /, fd)\n"
@@ -7957,9 +7957,9 @@ os_eventfd_read(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObj
     return return_value;
 }
 
-#endif /* defined(HAVE_EVENTFD) */
+#endif /* (defined(HAVE_EVENTFD) && defined(EFD_CLOEXEC)) */
 
-#if defined(HAVE_EVENTFD)
+#if (defined(HAVE_EVENTFD) && defined(EFD_CLOEXEC))
 
 PyDoc_STRVAR(os_eventfd_write__doc__,
 "eventfd_write($module, /, fd, value)\n"
@@ -7999,7 +7999,7 @@ os_eventfd_write(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyOb
     return return_value;
 }
 
-#endif /* defined(HAVE_EVENTFD) */
+#endif /* (defined(HAVE_EVENTFD) && defined(EFD_CLOEXEC)) */
 
 #if (defined(TERMSIZE_USE_CONIO) || defined(TERMSIZE_USE_IOCTL))
 
@@ -9360,4 +9360,4 @@ os_waitstatus_to_exitcode(PyObject *module, PyObject *const *args, Py_ssize_t na
 #ifndef OS_WAITSTATUS_TO_EXITCODE_METHODDEF
     #define OS_WAITSTATUS_TO_EXITCODE_METHODDEF
 #endif /* !defined(OS_WAITSTATUS_TO_EXITCODE_METHODDEF) */
-/*[clinic end generated code: output=9ff792e207a18392 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=c22a8b6de4a0ccb7 input=a9049054013a1b77]*/
diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
index 2e89e2fb1d66c..5855c422182e9 100644
--- a/Modules/posixmodule.c
+++ b/Modules/posixmodule.c
@@ -13107,7 +13107,7 @@ os_memfd_create_impl(PyObject *module, PyObject *name, unsigned int flags)
 }
 #endif
 
-#ifdef HAVE_EVENTFD
+#if defined(HAVE_EVENTFD) && defined(EFD_CLOEXEC)
 /*[clinic input]
 os.eventfd
 
@@ -13178,7 +13178,7 @@ os_eventfd_write_impl(PyObject *module, int fd, unsigned long long value)
     }
     Py_RETURN_NONE;
 }
-#endif  /* HAVE_EVENTFD */
+#endif  /* HAVE_EVENTFD && EFD_CLOEXEC */
 
 /* Terminal size querying */
 
@@ -15465,11 +15465,15 @@ all_ins(PyObject *m)
 #endif
 #endif /* HAVE_MEMFD_CREATE */
 
-#ifdef HAVE_EVENTFD
+#if defined(HAVE_EVENTFD) && defined(EFD_CLOEXEC)
     if (PyModule_AddIntMacro(m, EFD_CLOEXEC)) return -1;
+#ifdef EFD_NONBLOCK
     if (PyModule_AddIntMacro(m, EFD_NONBLOCK)) return -1;
+#endif
+#ifdef EFD_SEMAPHORE
     if (PyModule_AddIntMacro(m, EFD_SEMAPHORE)) return -1;
 #endif
+#endif  /* HAVE_EVENTFD && EFD_CLOEXEC */
 
 #if defined(__APPLE__)
     if (PyModule_AddIntConstant(m, "_COPYFILE_DATA", COPYFILE_DATA)) return -1;


From webhook-mailer at python.org  Wed Jul 27 09:24:18 2022
From: webhook-mailer at python.org (erlend-aasland)
Date: Wed, 27 Jul 2022 13:24:18 -0000
Subject: [Python-checkins] gh-95273: Normalise sqlite3 reference wording
 (#95274)
Message-ID: <mailman.300.1658928259.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/2361908a9d5553102f2b2294af44852a76d2ab03
commit: 2361908a9d5553102f2b2294af44852a76d2ab03
branch: main
author: Erlend Egeberg Aasland <erlend.aasland at innova.no>
committer: erlend-aasland <erlend.aasland at protonmail.com>
date: 2022-07-27T15:24:13+02:00
summary:

gh-95273: Normalise sqlite3 reference wording (#95274)

Co-authored-by: Alex Waygood <Alex.Waygood at Gmail.com>
Co-authored-by: CAM Gerlach <CAM.Gerlach at Gerlach.CAM>

files:
M Doc/library/sqlite3.rst

diff --git a/Doc/library/sqlite3.rst b/Doc/library/sqlite3.rst
index f71b49c938558..d493f5fd95631 100644
--- a/Doc/library/sqlite3.rst
+++ b/Doc/library/sqlite3.rst
@@ -149,8 +149,8 @@ Module functions and constants
 
 .. data:: version
 
-   The version number of this module, as a string. This is not the version of
-   the SQLite library.
+   Version number of this module as a :class:`string <str>`.
+   This is not the version of the SQLite library.
 
    .. deprecated-removed:: 3.12 3.14
       This constant used to reflect the version number of the ``pysqlite``
@@ -160,8 +160,8 @@ Module functions and constants
 
 .. data:: version_info
 
-   The version number of this module, as a tuple of integers. This is not the
-   version of the SQLite library.
+   Version number of this module as a :class:`tuple` of :class:`integers <int>`.
+   This is not the version of the SQLite library.
 
    .. deprecated-removed:: 3.12 3.14
       This constant used to reflect the version number of the ``pysqlite``
@@ -171,12 +171,13 @@ Module functions and constants
 
 .. data:: sqlite_version
 
-   The version number of the run-time SQLite library, as a string.
+   Version number of the runtime SQLite library as a :class:`string <str>`.
 
 
 .. data:: sqlite_version_info
 
-   The version number of the run-time SQLite library, as a tuple of integers.
+   Version number of the runtime SQLite library as a :class:`tuple` of
+   :class:`integers <int>`.
 
 
 .. data:: threadsafety
@@ -379,6 +380,7 @@ Module functions and constants
 
 .. function:: enable_callback_tracebacks(flag, /)
 
+   Enable or disable callback tracebacks.
    By default you will not get any tracebacks in user-defined functions,
    aggregates, converters, authorizer callbacks etc. If you want to debug them,
    you can call this function with *flag* set to :const:`True`. Afterwards, you
@@ -438,6 +440,7 @@ Connection Objects
 
    .. method:: cursor(factory=Cursor)
 
+      Create and return a :class:`Cursor` object.
       The cursor method accepts a single optional parameter *factory*. If
       supplied, this must be a callable returning an instance of :class:`Cursor`
       or its subclasses.
@@ -648,9 +651,9 @@ Connection Objects
 
    .. method:: interrupt()
 
-      You can call this method from a different thread to abort any queries that might
-      be executing on the connection. The query will then abort and the caller will
-      get an exception.
+      Call this method from a different thread to abort any queries that might
+      be executing on the connection.
+      Aborted queries will raise an exception.
 
 
    .. method:: set_authorizer(authorizer_callback)
@@ -755,10 +758,9 @@ Connection Objects
 
    .. attribute:: row_factory
 
-      You can change this attribute to a callable that accepts the cursor and the
-      original row as a tuple and will return the real result row.  This way, you can
-      implement more advanced ways of returning results, such  as returning an object
-      that can also access columns by name.
+      A callable that accepts two arguments,
+      a :class:`Cursor` object and the raw row results as a :class:`tuple`,
+      and returns a custom object representing an SQLite row.
 
       Example:
 
@@ -776,31 +778,28 @@ Connection Objects
 
    .. attribute:: text_factory
 
-      Using this attribute you can control what objects are returned for the ``TEXT``
-      data type. By default, this attribute is set to :class:`str` and the
-      :mod:`sqlite3` module will return :class:`str` objects for ``TEXT``.
-      If you want to return :class:`bytes` instead, you can set it to :class:`bytes`.
+      A callable that accepts a :class:`bytes` parameter and returns a text
+      representation of it.
+      The callable is invoked for SQLite values with the ``TEXT`` data type.
+      By default, this attribute is set to :class:`str`.
+      If you want to return ``bytes`` instead, set *text_factory* to ``bytes``.
 
-      You can also set it to any other callable that accepts a single bytestring
-      parameter and returns the resulting object.
-
-      See the following example code for illustration:
+      Example:
 
       .. literalinclude:: ../includes/sqlite3/text_factory.py
 
 
    .. attribute:: total_changes
 
-      Returns the total number of database rows that have been modified, inserted, or
+      Return the total number of database rows that have been modified, inserted, or
       deleted since the database connection was opened.
 
 
    .. method:: iterdump
 
-      Returns an iterator to dump the database in an SQL text format.  Useful when
-      saving an in-memory database for later restoration.  This function provides
-      the same capabilities as the :kbd:`.dump` command in the :program:`sqlite3`
-      shell.
+      Return an :term:`iterator` to dump the database as SQL source code.
+      Useful when saving an in-memory database for later restoration.
+      Similar to the ``.dump`` command in the :program:`sqlite3` shell.
 
       Example::
 
@@ -881,7 +880,7 @@ Connection Objects
 
    .. method:: getlimit(category, /)
 
-      Get a connection run-time limit. *category* is the limit category to be
+      Get a connection runtime limit. *category* is the limit category to be
       queried.
 
       Example, query the maximum length of an SQL statement::
@@ -896,7 +895,7 @@ Connection Objects
 
    .. method:: setlimit(category, limit, /)
 
-      Set a connection run-time limit. *category* is the limit category to be
+      Set a connection runtime limit. *category* is the limit category to be
       set. *limit* is the new limit. If the new limit is a negative number, the
       limit is unchanged.
 
@@ -915,7 +914,7 @@ Connection Objects
 
    .. method:: serialize(*, name="main")
 
-      This method serializes a database into a :class:`bytes` object.  For an
+      Serialize a database into a :class:`bytes` object.  For an
       ordinary on-disk database file, the serialization is just a copy of the
       disk file.  For an in-memory database or a "temp" database, the
       serialization is the same sequence of bytes which would be written to
@@ -934,6 +933,8 @@ Connection Objects
 
    .. method:: deserialize(data, /, *, name="main")
 
+      Deserialize a :meth:`serialized <serialize>` database into a
+      :class:`Connection`.
       This method causes the database connection to disconnect from database
       *name*, and reopen *name* as an in-memory database based on the
       serialization contained in *data*.  Deserialization will raise
@@ -1013,20 +1014,20 @@ Cursor Objects
 
    .. method:: fetchone()
 
-      Fetches the next row of a query result set, returning a single sequence,
-      or :const:`None` when no more data is available.
+      Fetch the next row of a query result set as a :class:`tuple`.
+      Return :const:`None` if no more data is available.
 
 
    .. method:: fetchmany(size=cursor.arraysize)
 
-      Fetches the next set of rows of a query result, returning a list.  An empty
-      list is returned when no more rows are available.
+      Fetch the next set of rows of a query result as a :class:`list`.
+      Return an empty list if no more rows are available.
 
       The number of rows to fetch per call is specified by the *size* parameter.
-      If it is not given, the cursor's arraysize determines the number of rows
-      to be fetched. The method should try to fetch as many rows as indicated by
-      the size parameter. If this is not possible due to the specified number of
-      rows not being available, fewer rows may be returned.
+      If *size* is not given, :attr:`arraysize` determines the number of rows
+      to be fetched.
+      If fewer than *size* rows are available,
+      as many rows as are available are returned.
 
       Note there are performance considerations involved with the *size* parameter.
       For optimal performance, it is usually best to use the arraysize attribute.
@@ -1035,9 +1036,10 @@ Cursor Objects
 
    .. method:: fetchall()
 
-      Fetches all (remaining) rows of a query result, returning a list.  Note that
-      the cursor's arraysize attribute can affect the performance of this operation.
-      An empty list is returned when no rows are available.
+      Fetch all (remaining) rows of a query result as a :class:`list`.
+      Return an empty list if no rows are available.
+      Note that the :attr:`arraysize` attribute can affect the performance of
+      this operation.
 
    .. method:: close()
 
@@ -1064,7 +1066,7 @@ Cursor Objects
 
    .. attribute:: lastrowid
 
-      This read-only attribute provides the row id of the last inserted row. It
+      Read-only attribute that provides the row id of the last inserted row. It
       is only updated after successful ``INSERT`` or ``REPLACE`` statements
       using the :meth:`execute` method.  For other statements, after
       :meth:`executemany` or :meth:`executescript`, or if the insertion failed,
@@ -1084,7 +1086,7 @@ Cursor Objects
 
    .. attribute:: description
 
-      This read-only attribute provides the column names of the last query. To
+      Read-only attribute that provides the column names of the last query. To
       remain compatible with the Python DB API, it returns a 7-tuple for each
       column where the last six items of each tuple are :const:`None`.
 
@@ -1092,8 +1094,8 @@ Cursor Objects
 
    .. attribute:: connection
 
-      This read-only attribute provides the SQLite database :class:`Connection`
-      used by the :class:`Cursor` object.  A :class:`Cursor` object created by
+      Read-only attribute that provides the SQLite database :class:`Connection`
+      belonging to the cursor.  A :class:`Cursor` object created by
       calling :meth:`con.cursor() <Connection.cursor>` will have a
       :attr:`connection` attribute that refers to *con*::
 
@@ -1121,7 +1123,8 @@ Row Objects
 
    .. method:: keys
 
-      This method returns a list of column names. Immediately after a query,
+      Return a :class:`list` of column names as :class:`strings <str>`.
+      Immediately after a query,
       it is the first member of each tuple in :attr:`Cursor.description`.
 
    .. versionchanged:: 3.5


From webhook-mailer at python.org  Wed Jul 27 09:30:45 2022
From: webhook-mailer at python.org (tiran)
Date: Wed, 27 Jul 2022 13:30:45 -0000
Subject: [Python-checkins] gh-95174: Move WASIX logic into wasi-env
 (GH-95320)
Message-ID: <mailman.301.1658928646.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/2833f3798dc3647e850b303a4d0fa00609a0ae9b
commit: 2833f3798dc3647e850b303a4d0fa00609a0ae9b
branch: main
author: Christian Heimes <christian at python.org>
committer: tiran <christian at python.org>
date: 2022-07-27T15:30:36+02:00
summary:

gh-95174: Move WASIX logic into wasi-env (GH-95320)

wasi-env now sets WASIX flags. This allows us to control all build
parameter for wasm32-wasi buildbot from CPython repository.

Also export and improve SYSROOT parameter.

files:
M Tools/wasm/README.md
M Tools/wasm/wasi-env

diff --git a/Tools/wasm/README.md b/Tools/wasm/README.md
index 37bd395baff6d..d08e807f565b2 100644
--- a/Tools/wasm/README.md
+++ b/Tools/wasm/README.md
@@ -234,15 +234,14 @@ compatibility stubs.
 
 The script ``wasi-env`` sets necessary compiler and linker flags as well as
 ``pkg-config`` overrides. The script assumes that WASI-SDK is installed in
-``/opt/wasi-sdk`` or ``$WASI_SDK_PATH``.
+``/opt/wasi-sdk`` or ``$WASI_SDK_PATH`` and WASIX is installed in
+``/opt/wasix`` or ``$WASIX_PATH``.
 
 ```shell
 mkdir -p builddir/wasi
 pushd builddir/wasi
 
 CONFIG_SITE=../../Tools/wasm/config.site-wasm32-wasi \
-  CFLAGS="-isystem /opt/wasix/include" \
-  LDFLAGS="-L/opt/wasix/lib -lwasix" \
   ../../Tools/wasm/wasi-env ../../configure -C \
     --host=wasm32-unknown-wasi \
     --build=$(../../config.guess) \
diff --git a/Tools/wasm/wasi-env b/Tools/wasm/wasi-env
index 600072b02fb8a..06c54e6823d41 100755
--- a/Tools/wasm/wasi-env
+++ b/Tools/wasm/wasi-env
@@ -30,17 +30,24 @@ if test -z "$1"; then
 fi
 
 WASI_SDK_PATH="${WASI_SDK_PATH:-/opt/wasi-sdk}"
+WASI_SYSROOT="${WASI_SDK_PATH}/share/wasi-sysroot"
+WASIX_PATH="${WASIX_PATH:-/opt/wasix}"
 
 if ! test -x "${WASI_SDK_PATH}/bin/clang"; then
     echo "Error: ${WASI_SDK_PATH}/bin/clang does not exist." >&2
     exit 2
 fi
 
+CC="${WASI_SDK_PATH}/bin/clang"
+CPP="${WASI_SDK_PATH}/bin/clang-cpp"
+CXX="${WASI_SDK_PATH}/bin/clang++"
+
 # --sysroot is required if WASI-SDK is not installed in /opt/wasi-sdk.
-WASI_SYSROOT="${WASI_SDK_PATH}/share/wasi-sysroot"
-CC="${WASI_SDK_PATH}/bin/clang --sysroot=${WASI_SYSROOT}"
-CPP="${WASI_SDK_PATH}/bin/clang-cpp --sysroot=${WASI_SYSROOT}"
-CXX="${WASI_SDK_PATH}/bin/clang++ --sysroot=${WASI_SYSROOT}"
+if test "${WASI_SDK_PATH}" != "/opt/wasi-sdk"; then
+    CC="${CC} --sysroot=${WASI_SYSROOT}"
+    CPP="${CPP} --sysroot=${WASI_SYSROOT}"
+    CXX="${CXX} --sysroot=${WASI_SYSROOT}"
+fi
 
 # use ccache if available
 if command -v ccache >/dev/null 2>&1; then
@@ -58,10 +65,17 @@ PKG_CONFIG_PATH=""
 PKG_CONFIG_LIBDIR="${WASI_SYSROOT}/lib/pkgconfig:${WASI_SYSROOT}/share/pkgconfig"
 PKG_CONFIG_SYSROOT_DIR="${WASI_SYSROOT}"
 
-PATH="${WASI_SDK_PATH}/bin:$PATH"
+# add WASIX (POSIX stubs for WASI) if WASIX is installed
+if test -f "${WASIX_PATH}/lib/libwasix.a"; then
+    CFLAGS="${CFLAGS} -isystem ${WASIX_PATH}/include"
+    LDFLAGS="${LDFLAGS} -L${WASIX_PATH}/lib -lwasix"
+fi
+
+PATH="${WASI_SDK_PATH}/bin:${PATH}"
 
-export WASI_SDK_PATH
+export WASI_SDK_PATH WASI_SYSROOT
 export CC CPP CXX LDSHARED AR RANLIB
+export CFLAGS LDFLAGS
 export PKG_CONFIG_PATH PKG_CONFIG_LIBDIR PKG_CONFIG_SYSROOT_DIR
 export PATH
 


From webhook-mailer at python.org  Wed Jul 27 09:33:06 2022
From: webhook-mailer at python.org (miss-islington)
Date: Wed, 27 Jul 2022 13:33:06 -0000
Subject: [Python-checkins] gh-95273: Normalise sqlite3 reference wording
 (GH-95274)
Message-ID: <mailman.302.1658928787.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/e14c4d5a2bd1e83bdc5749b90823551265d4de10
commit: e14c4d5a2bd1e83bdc5749b90823551265d4de10
branch: 3.11
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-27T06:33:01-07:00
summary:

gh-95273: Normalise sqlite3 reference wording (GH-95274)


Co-authored-by: Alex Waygood <Alex.Waygood at Gmail.com>
Co-authored-by: CAM Gerlach <CAM.Gerlach at Gerlach.CAM>
(cherry picked from commit 2361908a9d5553102f2b2294af44852a76d2ab03)

Co-authored-by: Erlend Egeberg Aasland <erlend.aasland at innova.no>

files:
M Doc/library/sqlite3.rst

diff --git a/Doc/library/sqlite3.rst b/Doc/library/sqlite3.rst
index 6f57b1dd185c0..7d2f3dff68194 100644
--- a/Doc/library/sqlite3.rst
+++ b/Doc/library/sqlite3.rst
@@ -149,24 +149,25 @@ Module functions and constants
 
 .. data:: version
 
-   The version number of this module, as a string. This is not the version of
-   the SQLite library.
+   Version number of this module as a :class:`string <str>`.
+   This is not the version of the SQLite library.
 
 
 .. data:: version_info
 
-   The version number of this module, as a tuple of integers. This is not the
-   version of the SQLite library.
+   Version number of this module as a :class:`tuple` of :class:`integers <int>`.
+   This is not the version of the SQLite library.
 
 
 .. data:: sqlite_version
 
-   The version number of the run-time SQLite library, as a string.
+   Version number of the runtime SQLite library as a :class:`string <str>`.
 
 
 .. data:: sqlite_version_info
 
-   The version number of the run-time SQLite library, as a tuple of integers.
+   Version number of the runtime SQLite library as a :class:`tuple` of
+   :class:`integers <int>`.
 
 
 .. data:: threadsafety
@@ -369,6 +370,7 @@ Module functions and constants
 
 .. function:: enable_callback_tracebacks(flag, /)
 
+   Enable or disable callback tracebacks.
    By default you will not get any tracebacks in user-defined functions,
    aggregates, converters, authorizer callbacks etc. If you want to debug them,
    you can call this function with *flag* set to :const:`True`. Afterwards, you
@@ -428,6 +430,7 @@ Connection Objects
 
    .. method:: cursor(factory=Cursor)
 
+      Create and return a :class:`Cursor` object.
       The cursor method accepts a single optional parameter *factory*. If
       supplied, this must be a callable returning an instance of :class:`Cursor`
       or its subclasses.
@@ -638,9 +641,9 @@ Connection Objects
 
    .. method:: interrupt()
 
-      You can call this method from a different thread to abort any queries that might
-      be executing on the connection. The query will then abort and the caller will
-      get an exception.
+      Call this method from a different thread to abort any queries that might
+      be executing on the connection.
+      Aborted queries will raise an exception.
 
 
    .. method:: set_authorizer(authorizer_callback)
@@ -745,10 +748,9 @@ Connection Objects
 
    .. attribute:: row_factory
 
-      You can change this attribute to a callable that accepts the cursor and the
-      original row as a tuple and will return the real result row.  This way, you can
-      implement more advanced ways of returning results, such  as returning an object
-      that can also access columns by name.
+      A callable that accepts two arguments,
+      a :class:`Cursor` object and the raw row results as a :class:`tuple`,
+      and returns a custom object representing an SQLite row.
 
       Example:
 
@@ -766,31 +768,28 @@ Connection Objects
 
    .. attribute:: text_factory
 
-      Using this attribute you can control what objects are returned for the ``TEXT``
-      data type. By default, this attribute is set to :class:`str` and the
-      :mod:`sqlite3` module will return :class:`str` objects for ``TEXT``.
-      If you want to return :class:`bytes` instead, you can set it to :class:`bytes`.
+      A callable that accepts a :class:`bytes` parameter and returns a text
+      representation of it.
+      The callable is invoked for SQLite values with the ``TEXT`` data type.
+      By default, this attribute is set to :class:`str`.
+      If you want to return ``bytes`` instead, set *text_factory* to ``bytes``.
 
-      You can also set it to any other callable that accepts a single bytestring
-      parameter and returns the resulting object.
-
-      See the following example code for illustration:
+      Example:
 
       .. literalinclude:: ../includes/sqlite3/text_factory.py
 
 
    .. attribute:: total_changes
 
-      Returns the total number of database rows that have been modified, inserted, or
+      Return the total number of database rows that have been modified, inserted, or
       deleted since the database connection was opened.
 
 
    .. method:: iterdump
 
-      Returns an iterator to dump the database in an SQL text format.  Useful when
-      saving an in-memory database for later restoration.  This function provides
-      the same capabilities as the :kbd:`.dump` command in the :program:`sqlite3`
-      shell.
+      Return an :term:`iterator` to dump the database as SQL source code.
+      Useful when saving an in-memory database for later restoration.
+      Similar to the ``.dump`` command in the :program:`sqlite3` shell.
 
       Example::
 
@@ -871,7 +870,7 @@ Connection Objects
 
    .. method:: getlimit(category, /)
 
-      Get a connection run-time limit. *category* is the limit category to be
+      Get a connection runtime limit. *category* is the limit category to be
       queried.
 
       Example, query the maximum length of an SQL statement::
@@ -886,7 +885,7 @@ Connection Objects
 
    .. method:: setlimit(category, limit, /)
 
-      Set a connection run-time limit. *category* is the limit category to be
+      Set a connection runtime limit. *category* is the limit category to be
       set. *limit* is the new limit. If the new limit is a negative number, the
       limit is unchanged.
 
@@ -905,7 +904,7 @@ Connection Objects
 
    .. method:: serialize(*, name="main")
 
-      This method serializes a database into a :class:`bytes` object.  For an
+      Serialize a database into a :class:`bytes` object.  For an
       ordinary on-disk database file, the serialization is just a copy of the
       disk file.  For an in-memory database or a "temp" database, the
       serialization is the same sequence of bytes which would be written to
@@ -924,6 +923,8 @@ Connection Objects
 
    .. method:: deserialize(data, /, *, name="main")
 
+      Deserialize a :meth:`serialized <serialize>` database into a
+      :class:`Connection`.
       This method causes the database connection to disconnect from database
       *name*, and reopen *name* as an in-memory database based on the
       serialization contained in *data*.  Deserialization will raise
@@ -1003,20 +1004,20 @@ Cursor Objects
 
    .. method:: fetchone()
 
-      Fetches the next row of a query result set, returning a single sequence,
-      or :const:`None` when no more data is available.
+      Fetch the next row of a query result set as a :class:`tuple`.
+      Return :const:`None` if no more data is available.
 
 
    .. method:: fetchmany(size=cursor.arraysize)
 
-      Fetches the next set of rows of a query result, returning a list.  An empty
-      list is returned when no more rows are available.
+      Fetch the next set of rows of a query result as a :class:`list`.
+      Return an empty list if no more rows are available.
 
       The number of rows to fetch per call is specified by the *size* parameter.
-      If it is not given, the cursor's arraysize determines the number of rows
-      to be fetched. The method should try to fetch as many rows as indicated by
-      the size parameter. If this is not possible due to the specified number of
-      rows not being available, fewer rows may be returned.
+      If *size* is not given, :attr:`arraysize` determines the number of rows
+      to be fetched.
+      If fewer than *size* rows are available,
+      as many rows as are available are returned.
 
       Note there are performance considerations involved with the *size* parameter.
       For optimal performance, it is usually best to use the arraysize attribute.
@@ -1025,9 +1026,10 @@ Cursor Objects
 
    .. method:: fetchall()
 
-      Fetches all (remaining) rows of a query result, returning a list.  Note that
-      the cursor's arraysize attribute can affect the performance of this operation.
-      An empty list is returned when no rows are available.
+      Fetch all (remaining) rows of a query result as a :class:`list`.
+      Return an empty list if no rows are available.
+      Note that the :attr:`arraysize` attribute can affect the performance of
+      this operation.
 
    .. method:: close()
 
@@ -1054,7 +1056,7 @@ Cursor Objects
 
    .. attribute:: lastrowid
 
-      This read-only attribute provides the row id of the last inserted row. It
+      Read-only attribute that provides the row id of the last inserted row. It
       is only updated after successful ``INSERT`` or ``REPLACE`` statements
       using the :meth:`execute` method.  For other statements, after
       :meth:`executemany` or :meth:`executescript`, or if the insertion failed,
@@ -1074,7 +1076,7 @@ Cursor Objects
 
    .. attribute:: description
 
-      This read-only attribute provides the column names of the last query. To
+      Read-only attribute that provides the column names of the last query. To
       remain compatible with the Python DB API, it returns a 7-tuple for each
       column where the last six items of each tuple are :const:`None`.
 
@@ -1082,8 +1084,8 @@ Cursor Objects
 
    .. attribute:: connection
 
-      This read-only attribute provides the SQLite database :class:`Connection`
-      used by the :class:`Cursor` object.  A :class:`Cursor` object created by
+      Read-only attribute that provides the SQLite database :class:`Connection`
+      belonging to the cursor.  A :class:`Cursor` object created by
       calling :meth:`con.cursor() <Connection.cursor>` will have a
       :attr:`connection` attribute that refers to *con*::
 
@@ -1111,7 +1113,8 @@ Row Objects
 
    .. method:: keys
 
-      This method returns a list of column names. Immediately after a query,
+      Return a :class:`list` of column names as :class:`strings <str>`.
+      Immediately after a query,
       it is the first member of each tuple in :attr:`Cursor.description`.
 
    .. versionchanged:: 3.5


From webhook-mailer at python.org  Wed Jul 27 09:43:29 2022
From: webhook-mailer at python.org (erlend-aasland)
Date: Wed, 27 Jul 2022 13:43:29 -0000
Subject: [Python-checkins] [3.10] gh-95273: Normalise sqlite3 reference
 wording (GH-95274) (#95330)
Message-ID: <mailman.303.1658929409.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/2ef7a72682dc5f2855d0174e696271de40b0f26d
commit: 2ef7a72682dc5f2855d0174e696271de40b0f26d
branch: 3.10
author: Erlend Egeberg Aasland <erlend.aasland at innova.no>
committer: erlend-aasland <erlend.aasland at protonmail.com>
date: 2022-07-27T15:42:59+02:00
summary:

[3.10] gh-95273: Normalise sqlite3 reference wording (GH-95274) (#95330)

Co-authored-by: Alex Waygood <Alex.Waygood at Gmail.com>
Co-authored-by: CAM Gerlach <CAM.Gerlach at Gerlach.CAM>.
(cherry picked from commit 2361908a9d5553102f2b2294af44852a76d2ab03)

Co-authored-by: Erlend Egeberg Aasland <erlend.aasland at innova.no>

files:
M Doc/library/sqlite3.rst

diff --git a/Doc/library/sqlite3.rst b/Doc/library/sqlite3.rst
index 7f1293af58a56..3ce598c6ff1af 100644
--- a/Doc/library/sqlite3.rst
+++ b/Doc/library/sqlite3.rst
@@ -149,24 +149,25 @@ Module functions and constants
 
 .. data:: version
 
-   The version number of this module, as a string. This is not the version of
-   the SQLite library.
+   Version number of this module as a :class:`string <str>`.
+   This is not the version of the SQLite library.
 
 
 .. data:: version_info
 
-   The version number of this module, as a tuple of integers. This is not the
-   version of the SQLite library.
+   Version number of this module as a :class:`tuple` of :class:`integers <int>`.
+   This is not the version of the SQLite library.
 
 
 .. data:: sqlite_version
 
-   The version number of the run-time SQLite library, as a string.
+   Version number of the runtime SQLite library as a :class:`string <str>`.
 
 
 .. data:: sqlite_version_info
 
-   The version number of the run-time SQLite library, as a tuple of integers.
+   Version number of the runtime SQLite library as a :class:`tuple` of
+   :class:`integers <int>`.
 
 
 .. data:: threadsafety
@@ -351,6 +352,7 @@ Module functions and constants
 
 .. function:: enable_callback_tracebacks(flag, /)
 
+   Enable or disable callback tracebacks.
    By default you will not get any tracebacks in user-defined functions,
    aggregates, converters, authorizer callbacks etc. If you want to debug them,
    you can call this function with *flag* set to ``True``. Afterwards, you will
@@ -392,6 +394,7 @@ Connection Objects
 
    .. method:: cursor(factory=Cursor)
 
+      Create and return a :class:`Cursor` object.
       The cursor method accepts a single optional parameter *factory*. If
       supplied, this must be a callable returning an instance of :class:`Cursor`
       or its subclasses.
@@ -518,9 +521,9 @@ Connection Objects
 
    .. method:: interrupt()
 
-      You can call this method from a different thread to abort any queries that might
-      be executing on the connection. The query will then abort and the caller will
-      get an exception.
+      Call this method from a different thread to abort any queries that might
+      be executing on the connection.
+      Aborted queries will raise an exception.
 
 
    .. method:: set_authorizer(authorizer_callback)
@@ -620,10 +623,9 @@ Connection Objects
 
    .. attribute:: row_factory
 
-      You can change this attribute to a callable that accepts the cursor and the
-      original row as a tuple and will return the real result row.  This way, you can
-      implement more advanced ways of returning results, such  as returning an object
-      that can also access columns by name.
+      A callable that accepts two arguments,
+      a :class:`Cursor` object and the raw row results as a :class:`tuple`,
+      and returns a custom object representing an SQLite row.
 
       Example:
 
@@ -641,31 +643,28 @@ Connection Objects
 
    .. attribute:: text_factory
 
-      Using this attribute you can control what objects are returned for the ``TEXT``
-      data type. By default, this attribute is set to :class:`str` and the
-      :mod:`sqlite3` module will return :class:`str` objects for ``TEXT``.
-      If you want to return :class:`bytes` instead, you can set it to :class:`bytes`.
+      A callable that accepts a :class:`bytes` parameter and returns a text
+      representation of it.
+      The callable is invoked for SQLite values with the ``TEXT`` data type.
+      By default, this attribute is set to :class:`str`.
+      If you want to return ``bytes`` instead, set *text_factory* to ``bytes``.
 
-      You can also set it to any other callable that accepts a single bytestring
-      parameter and returns the resulting object.
-
-      See the following example code for illustration:
+      Example:
 
       .. literalinclude:: ../includes/sqlite3/text_factory.py
 
 
    .. attribute:: total_changes
 
-      Returns the total number of database rows that have been modified, inserted, or
+      Return the total number of database rows that have been modified, inserted, or
       deleted since the database connection was opened.
 
 
    .. method:: iterdump
 
-      Returns an iterator to dump the database in an SQL text format.  Useful when
-      saving an in-memory database for later restoration.  This function provides
-      the same capabilities as the :kbd:`.dump` command in the :program:`sqlite3`
-      shell.
+      Return an :term:`iterator` to dump the database as SQL source code.
+      Useful when saving an in-memory database for later restoration.
+      Similar to the ``.dump`` command in the :program:`sqlite3` shell.
 
       Example::
 
@@ -806,20 +805,20 @@ Cursor Objects
 
    .. method:: fetchone()
 
-      Fetches the next row of a query result set, returning a single sequence,
-      or :const:`None` when no more data is available.
+      Fetch the next row of a query result set as a :class:`tuple`.
+      Return :const:`None` if no more data is available.
 
 
    .. method:: fetchmany(size=cursor.arraysize)
 
-      Fetches the next set of rows of a query result, returning a list.  An empty
-      list is returned when no more rows are available.
+      Fetch the next set of rows of a query result as a :class:`list`.
+      Return an empty list if no more rows are available.
 
       The number of rows to fetch per call is specified by the *size* parameter.
-      If it is not given, the cursor's arraysize determines the number of rows
-      to be fetched. The method should try to fetch as many rows as indicated by
-      the size parameter. If this is not possible due to the specified number of
-      rows not being available, fewer rows may be returned.
+      If *size* is not given, :attr:`arraysize` determines the number of rows
+      to be fetched.
+      If fewer than *size* rows are available,
+      as many rows as are available are returned.
 
       Note there are performance considerations involved with the *size* parameter.
       For optimal performance, it is usually best to use the arraysize attribute.
@@ -828,9 +827,10 @@ Cursor Objects
 
    .. method:: fetchall()
 
-      Fetches all (remaining) rows of a query result, returning a list.  Note that
-      the cursor's arraysize attribute can affect the performance of this operation.
-      An empty list is returned when no rows are available.
+      Fetch all (remaining) rows of a query result as a :class:`list`.
+      Return an empty list if no rows are available.
+      Note that the :attr:`arraysize` attribute can affect the performance of
+      this operation.
 
    .. method:: close()
 
@@ -857,7 +857,7 @@ Cursor Objects
 
    .. attribute:: lastrowid
 
-      This read-only attribute provides the row id of the last inserted row. It
+      Read-only attribute that provides the row id of the last inserted row. It
       is only updated after successful ``INSERT`` or ``REPLACE`` statements
       using the :meth:`execute` method.  For other statements, after
       :meth:`executemany` or :meth:`executescript`, or if the insertion failed,
@@ -877,7 +877,7 @@ Cursor Objects
 
    .. attribute:: description
 
-      This read-only attribute provides the column names of the last query. To
+      Read-only attribute that provides the column names of the last query. To
       remain compatible with the Python DB API, it returns a 7-tuple for each
       column where the last six items of each tuple are :const:`None`.
 
@@ -885,8 +885,8 @@ Cursor Objects
 
    .. attribute:: connection
 
-      This read-only attribute provides the SQLite database :class:`Connection`
-      used by the :class:`Cursor` object.  A :class:`Cursor` object created by
+      Read-only attribute that provides the SQLite database :class:`Connection`
+      belonging to the cursor.  A :class:`Cursor` object created by
       calling :meth:`con.cursor() <Connection.cursor>` will have a
       :attr:`connection` attribute that refers to *con*::
 
@@ -914,7 +914,8 @@ Row Objects
 
    .. method:: keys
 
-      This method returns a list of column names. Immediately after a query,
+      Return a :class:`list` of column names as :class:`strings <str>`.
+      Immediately after a query,
       it is the first member of each tuple in :attr:`Cursor.description`.
 
    .. versionchanged:: 3.5


From webhook-mailer at python.org  Wed Jul 27 10:11:14 2022
From: webhook-mailer at python.org (miss-islington)
Date: Wed, 27 Jul 2022 14:11:14 -0000
Subject: [Python-checkins] gh-95174: Move WASIX logic into wasi-env
 (GH-95320)
Message-ID: <mailman.304.1658931075.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/25086f1eed14b64b3681746569b535d70ff94b1c
commit: 25086f1eed14b64b3681746569b535d70ff94b1c
branch: 3.11
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-27T07:11:00-07:00
summary:

gh-95174: Move WASIX logic into wasi-env (GH-95320)


wasi-env now sets WASIX flags. This allows us to control all build
parameter for wasm32-wasi buildbot from CPython repository.

Also export and improve SYSROOT parameter.
(cherry picked from commit 2833f3798dc3647e850b303a4d0fa00609a0ae9b)

Co-authored-by: Christian Heimes <christian at python.org>

files:
M Tools/wasm/README.md
M Tools/wasm/wasi-env

diff --git a/Tools/wasm/README.md b/Tools/wasm/README.md
index 37bd395baff6d..d08e807f565b2 100644
--- a/Tools/wasm/README.md
+++ b/Tools/wasm/README.md
@@ -234,15 +234,14 @@ compatibility stubs.
 
 The script ``wasi-env`` sets necessary compiler and linker flags as well as
 ``pkg-config`` overrides. The script assumes that WASI-SDK is installed in
-``/opt/wasi-sdk`` or ``$WASI_SDK_PATH``.
+``/opt/wasi-sdk`` or ``$WASI_SDK_PATH`` and WASIX is installed in
+``/opt/wasix`` or ``$WASIX_PATH``.
 
 ```shell
 mkdir -p builddir/wasi
 pushd builddir/wasi
 
 CONFIG_SITE=../../Tools/wasm/config.site-wasm32-wasi \
-  CFLAGS="-isystem /opt/wasix/include" \
-  LDFLAGS="-L/opt/wasix/lib -lwasix" \
   ../../Tools/wasm/wasi-env ../../configure -C \
     --host=wasm32-unknown-wasi \
     --build=$(../../config.guess) \
diff --git a/Tools/wasm/wasi-env b/Tools/wasm/wasi-env
index 600072b02fb8a..06c54e6823d41 100755
--- a/Tools/wasm/wasi-env
+++ b/Tools/wasm/wasi-env
@@ -30,17 +30,24 @@ if test -z "$1"; then
 fi
 
 WASI_SDK_PATH="${WASI_SDK_PATH:-/opt/wasi-sdk}"
+WASI_SYSROOT="${WASI_SDK_PATH}/share/wasi-sysroot"
+WASIX_PATH="${WASIX_PATH:-/opt/wasix}"
 
 if ! test -x "${WASI_SDK_PATH}/bin/clang"; then
     echo "Error: ${WASI_SDK_PATH}/bin/clang does not exist." >&2
     exit 2
 fi
 
+CC="${WASI_SDK_PATH}/bin/clang"
+CPP="${WASI_SDK_PATH}/bin/clang-cpp"
+CXX="${WASI_SDK_PATH}/bin/clang++"
+
 # --sysroot is required if WASI-SDK is not installed in /opt/wasi-sdk.
-WASI_SYSROOT="${WASI_SDK_PATH}/share/wasi-sysroot"
-CC="${WASI_SDK_PATH}/bin/clang --sysroot=${WASI_SYSROOT}"
-CPP="${WASI_SDK_PATH}/bin/clang-cpp --sysroot=${WASI_SYSROOT}"
-CXX="${WASI_SDK_PATH}/bin/clang++ --sysroot=${WASI_SYSROOT}"
+if test "${WASI_SDK_PATH}" != "/opt/wasi-sdk"; then
+    CC="${CC} --sysroot=${WASI_SYSROOT}"
+    CPP="${CPP} --sysroot=${WASI_SYSROOT}"
+    CXX="${CXX} --sysroot=${WASI_SYSROOT}"
+fi
 
 # use ccache if available
 if command -v ccache >/dev/null 2>&1; then
@@ -58,10 +65,17 @@ PKG_CONFIG_PATH=""
 PKG_CONFIG_LIBDIR="${WASI_SYSROOT}/lib/pkgconfig:${WASI_SYSROOT}/share/pkgconfig"
 PKG_CONFIG_SYSROOT_DIR="${WASI_SYSROOT}"
 
-PATH="${WASI_SDK_PATH}/bin:$PATH"
+# add WASIX (POSIX stubs for WASI) if WASIX is installed
+if test -f "${WASIX_PATH}/lib/libwasix.a"; then
+    CFLAGS="${CFLAGS} -isystem ${WASIX_PATH}/include"
+    LDFLAGS="${LDFLAGS} -L${WASIX_PATH}/lib -lwasix"
+fi
+
+PATH="${WASI_SDK_PATH}/bin:${PATH}"
 
-export WASI_SDK_PATH
+export WASI_SDK_PATH WASI_SYSROOT
 export CC CPP CXX LDSHARED AR RANLIB
+export CFLAGS LDFLAGS
 export PKG_CONFIG_PATH PKG_CONFIG_LIBDIR PKG_CONFIG_SYSROOT_DIR
 export PATH
 


From webhook-mailer at python.org  Wed Jul 27 11:04:04 2022
From: webhook-mailer at python.org (pablogsal)
Date: Wed, 27 Jul 2022 15:04:04 -0000
Subject: [Python-checkins] gh-95324: Emit a warning if an object doesn't
 call PyObject_GC_UnTrack during deallocation in debug mode (#95325)
Message-ID: <mailman.305.1658934245.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/f40bc7fa49f8d137f9b38f7a14569e9a9bdbed07
commit: f40bc7fa49f8d137f9b38f7a14569e9a9bdbed07
branch: main
author: Pablo Galindo Salgado <Pablogsal at gmail.com>
committer: pablogsal <Pablogsal at gmail.com>
date: 2022-07-27T16:03:38+01:00
summary:

gh-95324: Emit a warning if an object doesn't call PyObject_GC_UnTrack during deallocation in debug mode (#95325)

files:
A Misc/NEWS.d/next/Core and Builtins/2022-07-27-14-05-07.gh-issue-95324.28Q5u7.rst
M Modules/_abc.c
M Modules/_ctypes/cfield.c
M Modules/_threadmodule.c
M Modules/gcmodule.c
M Modules/xxlimited.c
M Objects/exceptions.c
M Objects/weakrefobject.c

diff --git a/Misc/NEWS.d/next/Core and Builtins/2022-07-27-14-05-07.gh-issue-95324.28Q5u7.rst b/Misc/NEWS.d/next/Core and Builtins/2022-07-27-14-05-07.gh-issue-95324.28Q5u7.rst
new file mode 100644
index 0000000000000..250385270e948
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2022-07-27-14-05-07.gh-issue-95324.28Q5u7.rst	
@@ -0,0 +1,2 @@
+Emit a warning in debug mode if an object does not call
+:c:func:`PyObject_GC_UnTrack` before deallocation. Patch by Pablo Galindo.
diff --git a/Modules/_abc.c b/Modules/_abc.c
index 641d6198d1fec..b22daa81e3ae1 100644
--- a/Modules/_abc.c
+++ b/Modules/_abc.c
@@ -63,6 +63,7 @@ abc_data_clear(_abc_data *self)
 static void
 abc_data_dealloc(_abc_data *self)
 {
+    PyObject_GC_UnTrack(self);
     PyTypeObject *tp = Py_TYPE(self);
     (void)abc_data_clear(self);
     tp->tp_free(self);
diff --git a/Modules/_ctypes/cfield.c b/Modules/_ctypes/cfield.c
index c7234fbb18a0f..13ed8b7eda655 100644
--- a/Modules/_ctypes/cfield.c
+++ b/Modules/_ctypes/cfield.c
@@ -279,6 +279,7 @@ PyCField_clear(CFieldObject *self)
 static void
 PyCField_dealloc(PyObject *self)
 {
+    PyObject_GC_UnTrack(self);
     PyCField_clear((CFieldObject *)self);
     Py_TYPE(self)->tp_free((PyObject *)self);
 }
diff --git a/Modules/_threadmodule.c b/Modules/_threadmodule.c
index ace0282ea6fce..4ac90dc806893 100644
--- a/Modules/_threadmodule.c
+++ b/Modules/_threadmodule.c
@@ -57,6 +57,7 @@ lock_traverse(lockobject *self, visitproc visit, void *arg)
 static void
 lock_dealloc(lockobject *self)
 {
+    PyObject_GC_UnTrack(self);
     if (self->in_weakreflist != NULL) {
         PyObject_ClearWeakRefs((PyObject *) self);
     }
@@ -333,6 +334,7 @@ rlock_traverse(rlockobject *self, visitproc visit, void *arg)
 static void
 rlock_dealloc(rlockobject *self)
 {
+    PyObject_GC_UnTrack(self);
     if (self->in_weakreflist != NULL)
         PyObject_ClearWeakRefs((PyObject *) self);
     /* self->rlock_lock can be NULL if PyThread_allocate_lock() failed
diff --git a/Modules/gcmodule.c b/Modules/gcmodule.c
index 3bda6e4bb8c02..dcd46feff0cc4 100644
--- a/Modules/gcmodule.c
+++ b/Modules/gcmodule.c
@@ -2347,6 +2347,13 @@ PyObject_GC_Del(void *op)
     size_t presize = _PyType_PreHeaderSize(((PyObject *)op)->ob_type);
     PyGC_Head *g = AS_GC(op);
     if (_PyObject_GC_IS_TRACKED(op)) {
+#ifdef Py_DEBUG
+        if (PyErr_WarnExplicitFormat(PyExc_ResourceWarning, "gc", 0,
+                                     "gc", NULL, "Object of type %s is not untracked before destruction",
+                                     ((PyObject*)op)->ob_type->tp_name)) {
+            PyErr_WriteUnraisable(NULL);
+        }
+#endif
         gc_list_remove(g);
     }
     GCState *gcstate = get_gc_state();
diff --git a/Modules/xxlimited.c b/Modules/xxlimited.c
index 5177ecd6b515d..e234504e33194 100644
--- a/Modules/xxlimited.c
+++ b/Modules/xxlimited.c
@@ -138,6 +138,7 @@ Xxo_finalize(PyObject *self_obj)
 static void
 Xxo_dealloc(PyObject *self)
 {
+    PyObject_GC_UnTrack(self);
     Xxo_finalize(self);
     PyTypeObject *tp = Py_TYPE(self);
     freefunc free = PyType_GetSlot(tp, Py_tp_free);
diff --git a/Objects/exceptions.c b/Objects/exceptions.c
index e06a8f4173cf8..745b89078ffe1 100644
--- a/Objects/exceptions.c
+++ b/Objects/exceptions.c
@@ -3214,6 +3214,7 @@ MemoryError_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
     self = state->memerrors_freelist;
     self->args = PyTuple_New(0);
     /* This shouldn't happen since the empty tuple is persistent */
+
     if (self->args == NULL) {
         return NULL;
     }
@@ -3229,6 +3230,8 @@ MemoryError_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
 static void
 MemoryError_dealloc(PyBaseExceptionObject *self)
 {
+    _PyObject_GC_UNTRACK(self);
+
     BaseException_clear(self);
 
     /* If this is a subclass of MemoryError, we don't need to
@@ -3238,8 +3241,6 @@ MemoryError_dealloc(PyBaseExceptionObject *self)
         return;
     }
 
-    _PyObject_GC_UNTRACK(self);
-
     struct _Py_exc_state *state = get_exc_state();
     if (state->memerrors_numfree >= MEMERRORS_SAVE) {
         Py_TYPE(self)->tp_free((PyObject *)self);
diff --git a/Objects/weakrefobject.c b/Objects/weakrefobject.c
index 2b4361e63ca41..d26fc9e8d09d7 100644
--- a/Objects/weakrefobject.c
+++ b/Objects/weakrefobject.c
@@ -558,6 +558,7 @@ proxy_bool(PyWeakReference *proxy)
 static void
 proxy_dealloc(PyWeakReference *self)
 {
+    PyObject_GC_UnTrack(self);
     if (self->wr_callback != NULL)
         PyObject_GC_UnTrack((PyObject *)self);
     clear_weakref(self);


From webhook-mailer at python.org  Wed Jul 27 11:55:49 2022
From: webhook-mailer at python.org (pablogsal)
Date: Wed, 27 Jul 2022 15:55:49 -0000
Subject: [Python-checkins] [3.11] gh-95324: Emit a warning if an object
 doesn't call PyObject_GC_UnTrack during deallocation in debug mode
 (GH-95325) (#95336)
Message-ID: <mailman.306.1658937349.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/503a3a77c13489f909c1131d6408c2b6a0760a97
commit: 503a3a77c13489f909c1131d6408c2b6a0760a97
branch: 3.11
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: pablogsal <Pablogsal at gmail.com>
date: 2022-07-27T16:55:44+01:00
summary:

[3.11] gh-95324: Emit a warning if an object doesn't call PyObject_GC_UnTrack during deallocation in debug mode (GH-95325) (#95336)

Co-authored-by: Pablo Galindo Salgado <Pablogsal at gmail.com>

files:
A Misc/NEWS.d/next/Core and Builtins/2022-07-27-14-05-07.gh-issue-95324.28Q5u7.rst
M Modules/_abc.c
M Modules/_ctypes/cfield.c
M Modules/_threadmodule.c
M Modules/gcmodule.c
M Modules/xxlimited.c
M Objects/exceptions.c
M Objects/weakrefobject.c

diff --git a/Misc/NEWS.d/next/Core and Builtins/2022-07-27-14-05-07.gh-issue-95324.28Q5u7.rst b/Misc/NEWS.d/next/Core and Builtins/2022-07-27-14-05-07.gh-issue-95324.28Q5u7.rst
new file mode 100644
index 0000000000000..250385270e948
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2022-07-27-14-05-07.gh-issue-95324.28Q5u7.rst	
@@ -0,0 +1,2 @@
+Emit a warning in debug mode if an object does not call
+:c:func:`PyObject_GC_UnTrack` before deallocation. Patch by Pablo Galindo.
diff --git a/Modules/_abc.c b/Modules/_abc.c
index 641d6198d1fec..b22daa81e3ae1 100644
--- a/Modules/_abc.c
+++ b/Modules/_abc.c
@@ -63,6 +63,7 @@ abc_data_clear(_abc_data *self)
 static void
 abc_data_dealloc(_abc_data *self)
 {
+    PyObject_GC_UnTrack(self);
     PyTypeObject *tp = Py_TYPE(self);
     (void)abc_data_clear(self);
     tp->tp_free(self);
diff --git a/Modules/_ctypes/cfield.c b/Modules/_ctypes/cfield.c
index c7234fbb18a0f..13ed8b7eda655 100644
--- a/Modules/_ctypes/cfield.c
+++ b/Modules/_ctypes/cfield.c
@@ -279,6 +279,7 @@ PyCField_clear(CFieldObject *self)
 static void
 PyCField_dealloc(PyObject *self)
 {
+    PyObject_GC_UnTrack(self);
     PyCField_clear((CFieldObject *)self);
     Py_TYPE(self)->tp_free((PyObject *)self);
 }
diff --git a/Modules/_threadmodule.c b/Modules/_threadmodule.c
index ace0282ea6fce..4ac90dc806893 100644
--- a/Modules/_threadmodule.c
+++ b/Modules/_threadmodule.c
@@ -57,6 +57,7 @@ lock_traverse(lockobject *self, visitproc visit, void *arg)
 static void
 lock_dealloc(lockobject *self)
 {
+    PyObject_GC_UnTrack(self);
     if (self->in_weakreflist != NULL) {
         PyObject_ClearWeakRefs((PyObject *) self);
     }
@@ -333,6 +334,7 @@ rlock_traverse(rlockobject *self, visitproc visit, void *arg)
 static void
 rlock_dealloc(rlockobject *self)
 {
+    PyObject_GC_UnTrack(self);
     if (self->in_weakreflist != NULL)
         PyObject_ClearWeakRefs((PyObject *) self);
     /* self->rlock_lock can be NULL if PyThread_allocate_lock() failed
diff --git a/Modules/gcmodule.c b/Modules/gcmodule.c
index 3bda6e4bb8c02..dcd46feff0cc4 100644
--- a/Modules/gcmodule.c
+++ b/Modules/gcmodule.c
@@ -2347,6 +2347,13 @@ PyObject_GC_Del(void *op)
     size_t presize = _PyType_PreHeaderSize(((PyObject *)op)->ob_type);
     PyGC_Head *g = AS_GC(op);
     if (_PyObject_GC_IS_TRACKED(op)) {
+#ifdef Py_DEBUG
+        if (PyErr_WarnExplicitFormat(PyExc_ResourceWarning, "gc", 0,
+                                     "gc", NULL, "Object of type %s is not untracked before destruction",
+                                     ((PyObject*)op)->ob_type->tp_name)) {
+            PyErr_WriteUnraisable(NULL);
+        }
+#endif
         gc_list_remove(g);
     }
     GCState *gcstate = get_gc_state();
diff --git a/Modules/xxlimited.c b/Modules/xxlimited.c
index 5177ecd6b515d..e234504e33194 100644
--- a/Modules/xxlimited.c
+++ b/Modules/xxlimited.c
@@ -138,6 +138,7 @@ Xxo_finalize(PyObject *self_obj)
 static void
 Xxo_dealloc(PyObject *self)
 {
+    PyObject_GC_UnTrack(self);
     Xxo_finalize(self);
     PyTypeObject *tp = Py_TYPE(self);
     freefunc free = PyType_GetSlot(tp, Py_tp_free);
diff --git a/Objects/exceptions.c b/Objects/exceptions.c
index cf8258b0e244b..c6af82a466855 100644
--- a/Objects/exceptions.c
+++ b/Objects/exceptions.c
@@ -3222,6 +3222,7 @@ MemoryError_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
     self = state->memerrors_freelist;
     self->args = PyTuple_New(0);
     /* This shouldn't happen since the empty tuple is persistent */
+
     if (self->args == NULL) {
         return NULL;
     }
@@ -3237,6 +3238,8 @@ MemoryError_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
 static void
 MemoryError_dealloc(PyBaseExceptionObject *self)
 {
+    _PyObject_GC_UNTRACK(self);
+
     BaseException_clear(self);
 
     /* If this is a subclass of MemoryError, we don't need to
@@ -3246,8 +3249,6 @@ MemoryError_dealloc(PyBaseExceptionObject *self)
         return;
     }
 
-    _PyObject_GC_UNTRACK(self);
-
     struct _Py_exc_state *state = get_exc_state();
     if (state->memerrors_numfree >= MEMERRORS_SAVE) {
         Py_TYPE(self)->tp_free((PyObject *)self);
diff --git a/Objects/weakrefobject.c b/Objects/weakrefobject.c
index 2b4361e63ca41..d26fc9e8d09d7 100644
--- a/Objects/weakrefobject.c
+++ b/Objects/weakrefobject.c
@@ -558,6 +558,7 @@ proxy_bool(PyWeakReference *proxy)
 static void
 proxy_dealloc(PyWeakReference *self)
 {
+    PyObject_GC_UnTrack(self);
     if (self->wr_callback != NULL)
         PyObject_GC_UnTrack((PyObject *)self);
     clear_weakref(self);


From webhook-mailer at python.org  Wed Jul 27 14:14:48 2022
From: webhook-mailer at python.org (pfmoore)
Date: Wed, 27 Jul 2022 18:14:48 -0000
Subject: [Python-checkins] gh-95339: update bundled pip to 22.2.1 (gh-95340)
Message-ID: <mailman.307.1658945688.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/226d02bb109d08601fbccd645e9d67aee2e5bcdc
commit: 226d02bb109d08601fbccd645e9d67aee2e5bcdc
branch: main
author: St?phane Bidoul <stephane.bidoul at gmail.com>
committer: pfmoore <p.f.moore at gmail.com>
date: 2022-07-27T19:14:42+01:00
summary:

gh-95339: update bundled pip to 22.2.1 (gh-95340)

files:
A Lib/ensurepip/_bundled/pip-22.2.1-py3-none-any.whl
A Misc/NEWS.d/next/Library/2022-07-27-19-43-07.gh-issue-95339.NuVQ68.rst
D Lib/ensurepip/_bundled/pip-22.2-py3-none-any.whl
M Lib/ensurepip/__init__.py

diff --git a/Lib/ensurepip/__init__.py b/Lib/ensurepip/__init__.py
index d88387398e83a..885a1edf4b380 100644
--- a/Lib/ensurepip/__init__.py
+++ b/Lib/ensurepip/__init__.py
@@ -11,7 +11,7 @@
 __all__ = ["version", "bootstrap"]
 _PACKAGE_NAMES = ('setuptools', 'pip')
 _SETUPTOOLS_VERSION = "63.2.0"
-_PIP_VERSION = "22.2"
+_PIP_VERSION = "22.2.1"
 _PROJECTS = [
     ("setuptools", _SETUPTOOLS_VERSION, "py3"),
     ("pip", _PIP_VERSION, "py3"),
diff --git a/Lib/ensurepip/_bundled/pip-22.2-py3-none-any.whl b/Lib/ensurepip/_bundled/pip-22.2.1-py3-none-any.whl
similarity index 94%
rename from Lib/ensurepip/_bundled/pip-22.2-py3-none-any.whl
rename to Lib/ensurepip/_bundled/pip-22.2.1-py3-none-any.whl
index 9c43960aafd5e..4654c00136cd0 100644
Binary files a/Lib/ensurepip/_bundled/pip-22.2-py3-none-any.whl and b/Lib/ensurepip/_bundled/pip-22.2.1-py3-none-any.whl differ
diff --git a/Misc/NEWS.d/next/Library/2022-07-27-19-43-07.gh-issue-95339.NuVQ68.rst b/Misc/NEWS.d/next/Library/2022-07-27-19-43-07.gh-issue-95339.NuVQ68.rst
new file mode 100644
index 0000000000000..6674a4a269539
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2022-07-27-19-43-07.gh-issue-95339.NuVQ68.rst
@@ -0,0 +1 @@
+Update bundled pip to 22.2.1.


From webhook-mailer at python.org  Wed Jul 27 14:28:26 2022
From: webhook-mailer at python.org (tiran)
Date: Wed, 27 Jul 2022 18:28:26 -0000
Subject: [Python-checkins] gh-95174: Add pthread stubs for WASI (GH-95234)
Message-ID: <mailman.308.1658946508.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/0fe645d6fd22a6f57e777a29e65cf9a4ff9785ae
commit: 0fe645d6fd22a6f57e777a29e65cf9a4ff9785ae
branch: main
author: Christian Heimes <christian at python.org>
committer: tiran <christian at python.org>
date: 2022-07-27T20:28:06+02:00
summary:

gh-95174: Add pthread stubs for WASI (GH-95234)

Co-authored-by: Brett Cannon <brett at python.org>

files:
A Include/cpython/pthread_stubs.h
A Misc/NEWS.d/next/Build/2022-07-25-09-48-43.gh-issue-95145.ZNS3dj.rst
A Python/thread_pthread_stubs.h
M Doc/library/sys.rst
M Include/cpython/pythread.h
M Lib/test/pythoninfo.py
M Lib/test/test_sys.py
M Lib/test/test_threadsignals.py
M Makefile.pre.in
M Python/thread.c
M Python/thread_pthread.h
M Tools/wasm/README.md
M Tools/wasm/config.site-wasm32-wasi
M Tools/wasm/wasi-env
M configure
M configure.ac
M pyconfig.h.in

diff --git a/Doc/library/sys.rst b/Doc/library/sys.rst
index e10efb10ff5a8..62b3673c747f2 100644
--- a/Doc/library/sys.rst
+++ b/Doc/library/sys.rst
@@ -1658,6 +1658,8 @@ always available.
    |                  |                                                         |
    |                  |  * ``'nt'``: Windows threads                            |
    |                  |  * ``'pthread'``: POSIX threads                         |
+   |                  |  * ``'pthread-stubs'``: stub POSIX threads              |
+   |                  |    (on WebAssembly platforms without threading support) |
    |                  |  * ``'solaris'``: Solaris threads                       |
    +------------------+---------------------------------------------------------+
    | :const:`lock`    | Name of the lock implementation:                        |
diff --git a/Include/cpython/pthread_stubs.h b/Include/cpython/pthread_stubs.h
new file mode 100644
index 0000000000000..d95ee03d8308c
--- /dev/null
+++ b/Include/cpython/pthread_stubs.h
@@ -0,0 +1,88 @@
+#ifndef Py_CPYTHON_PTRHEAD_STUBS_H
+#define Py_CPYTHON_PTRHEAD_STUBS_H
+
+#if !defined(HAVE_PTHREAD_STUBS)
+#  error "this header file requires stubbed pthreads."
+#endif
+
+#ifndef _POSIX_THREADS
+#  define _POSIX_THREADS 1
+#endif
+
+/* Minimal pthread stubs for CPython.
+ *
+ * The stubs implement the minimum pthread API for CPython.
+ * - pthread_create() fails.
+ * - pthread_exit() calls exit(0).
+ * - pthread_key_*() functions implement minimal TSS without destructor.
+ * - all other functions do nothing and return 0.
+ */
+
+#ifdef __wasi__
+// WASI's bits/alltypes.h provides type definitions when __NEED_ is set.
+// The header file can be included multiple times.
+#  define __NEED_pthread_cond_t 1
+#  define __NEED_pthread_condattr_t 1
+#  define __NEED_pthread_mutex_t 1
+#  define __NEED_pthread_mutexattr_t 1
+#  define __NEED_pthread_key_t 1
+#  define __NEED_pthread_t 1
+#  define __NEED_pthread_attr_t 1
+#  include <bits/alltypes.h>
+#else
+typedef struct { void *__x; } pthread_cond_t;
+typedef struct { unsigned __attr; } pthread_condattr_t;
+typedef struct { void *__x; } pthread_mutex_t;
+typedef struct { unsigned __attr; } pthread_mutexattr_t;
+typedef unsigned pthread_key_t;
+typedef unsigned pthread_t;
+typedef struct { unsigned __attr; } pthread_attr_t;
+#endif
+
+// mutex
+PyAPI_FUNC(int) pthread_mutex_init(pthread_mutex_t *restrict mutex,
+                                   const pthread_mutexattr_t *restrict attr);
+PyAPI_FUNC(int) pthread_mutex_destroy(pthread_mutex_t *mutex);
+PyAPI_FUNC(int) pthread_mutex_trylock(pthread_mutex_t *mutex);
+PyAPI_FUNC(int) pthread_mutex_lock(pthread_mutex_t *mutex);
+PyAPI_FUNC(int) pthread_mutex_unlock(pthread_mutex_t *mutex);
+
+// condition
+PyAPI_FUNC(int) pthread_cond_init(pthread_cond_t *restrict cond,
+                                  const pthread_condattr_t *restrict attr);
+PyAPI_FUNC(int) pthread_cond_destroy(pthread_cond_t *cond);
+PyAPI_FUNC(int) pthread_cond_wait(pthread_cond_t *restrict cond,
+                                  pthread_mutex_t *restrict mutex);
+PyAPI_FUNC(int) pthread_cond_timedwait(pthread_cond_t *restrict cond,
+                                       pthread_mutex_t *restrict mutex,
+                                       const struct timespec *restrict abstime);
+PyAPI_FUNC(int) pthread_cond_signal(pthread_cond_t *cond);
+PyAPI_FUNC(int) pthread_condattr_init(pthread_condattr_t *attr);
+PyAPI_FUNC(int) pthread_condattr_setclock(
+    pthread_condattr_t *attr, clockid_t clock_id);
+
+// pthread
+PyAPI_FUNC(int) pthread_create(pthread_t *restrict thread,
+                               const pthread_attr_t *restrict attr,
+                               void *(*start_routine)(void *),
+                               void *restrict arg);
+PyAPI_FUNC(int) pthread_detach(pthread_t thread);
+PyAPI_FUNC(pthread_t) pthread_self(void);
+PyAPI_FUNC(int) pthread_exit(void *retval) __attribute__ ((__noreturn__));
+PyAPI_FUNC(int) pthread_attr_init(pthread_attr_t *attr);
+PyAPI_FUNC(int) pthread_attr_setstacksize(pthread_attr_t *attr, size_t stacksize);
+PyAPI_FUNC(int) pthread_attr_destroy(pthread_attr_t *attr);
+
+
+// pthread_key
+#ifndef PTHREAD_KEYS_MAX
+#  define PTHREAD_KEYS_MAX 128
+#endif
+
+PyAPI_FUNC(int) pthread_key_create(pthread_key_t *key,
+                                   void (*destr_function)(void *));
+PyAPI_FUNC(int) pthread_key_delete(pthread_key_t key);
+PyAPI_FUNC(void *) pthread_getspecific(pthread_key_t key);
+PyAPI_FUNC(int) pthread_setspecific(pthread_key_t key, const void *value);
+
+#endif // Py_CPYTHON_PTRHEAD_STUBS_H
diff --git a/Include/cpython/pythread.h b/Include/cpython/pythread.h
index 1fd86a6a90f9a..ce4ec8f65b15e 100644
--- a/Include/cpython/pythread.h
+++ b/Include/cpython/pythread.h
@@ -20,6 +20,9 @@ PyAPI_FUNC(int) _PyThread_at_fork_reinit(PyThread_type_lock *lock);
        but hardcode the unsigned long to avoid errors for include directive.
     */
 #   define NATIVE_TSS_KEY_T     unsigned long
+#elif defined(HAVE_PTHREAD_STUBS)
+#   include "cpython/pthread_stubs.h"
+#   define NATIVE_TSS_KEY_T     pthread_key_t
 #else
 #   error "Require native threads. See https://bugs.python.org/issue31370"
 #endif
diff --git a/Lib/test/pythoninfo.py b/Lib/test/pythoninfo.py
index 172c03f30231c..adc211b3e2169 100644
--- a/Lib/test/pythoninfo.py
+++ b/Lib/test/pythoninfo.py
@@ -588,8 +588,8 @@ def collect_socket(info_add):
 
     try:
         hostname = socket.gethostname()
-    except OSError:
-        # WASI SDK 15.0 does not have gethostname(2).
+    except (OSError, AttributeError):
+        # WASI SDK 16.0 does not have gethostname(2).
         if sys.platform != "wasi":
             raise
     else:
diff --git a/Lib/test/test_sys.py b/Lib/test/test_sys.py
index f629dd5f03472..c4798afc92016 100644
--- a/Lib/test/test_sys.py
+++ b/Lib/test/test_sys.py
@@ -626,7 +626,7 @@ def test_attributes(self):
     def test_thread_info(self):
         info = sys.thread_info
         self.assertEqual(len(info), 3)
-        self.assertIn(info.name, ('nt', 'pthread', 'solaris', None))
+        self.assertIn(info.name, ('nt', 'pthread', 'pthread-stubs', 'solaris', None))
         self.assertIn(info.lock, ('semaphore', 'mutex+cond', None))
 
     @unittest.skipUnless(support.is_emscripten, "only available on Emscripten")
diff --git a/Lib/test/test_threadsignals.py b/Lib/test/test_threadsignals.py
index e0ac18c946398..6a53d655015cd 100644
--- a/Lib/test/test_threadsignals.py
+++ b/Lib/test/test_threadsignals.py
@@ -36,7 +36,9 @@ def send_signals():
     os.kill(process_pid, signal.SIGUSR2)
     signalled_all.release()
 
+
 @threading_helper.requires_working_threading()
+ at unittest.skipUnless(hasattr(signal, "alarm"), "test requires signal.alarm")
 class ThreadSignals(unittest.TestCase):
 
     def test_signals(self):
diff --git a/Makefile.pre.in b/Makefile.pre.in
index 20e66b8034868..746ff4226e6c4 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -1544,6 +1544,7 @@ PYTHON_HEADERS= \
 		$(srcdir)/Include/cpython/objimpl.h \
 		$(srcdir)/Include/cpython/odictobject.h \
 		$(srcdir)/Include/cpython/picklebufobject.h \
+		$(srcdir)/Include/cpython/pthread_stubs.h \
 		$(srcdir)/Include/cpython/pyctype.h \
 		$(srcdir)/Include/cpython/pydebug.h \
 		$(srcdir)/Include/cpython/pyerrors.h \
diff --git a/Misc/NEWS.d/next/Build/2022-07-25-09-48-43.gh-issue-95145.ZNS3dj.rst b/Misc/NEWS.d/next/Build/2022-07-25-09-48-43.gh-issue-95145.ZNS3dj.rst
new file mode 100644
index 0000000000000..c751b5e3adc47
--- /dev/null
+++ b/Misc/NEWS.d/next/Build/2022-07-25-09-48-43.gh-issue-95145.ZNS3dj.rst
@@ -0,0 +1,2 @@
+wasm32-wasi builds no longer depend on WASIX's pthread stubs. Python now has
+its own stubbed pthread API.
diff --git a/Python/thread.c b/Python/thread.c
index d3211219dffe6..e206a69c0507d 100644
--- a/Python/thread.c
+++ b/Python/thread.c
@@ -55,8 +55,15 @@ PyThread_init_thread(void)
     PyThread__init_thread();
 }
 
-#if defined(_POSIX_THREADS)
-#   define PYTHREAD_NAME "pthread"
+#if defined(HAVE_PTHREAD_STUBS)
+#   define PYTHREAD_NAME "pthread-stubs"
+#   include "thread_pthread_stubs.h"
+#elif defined(_POSIX_THREADS)
+#   if defined(__EMSCRIPTEN__) || !defined(__EMSCRIPTEN_PTHREADS__)
+#     define PYTHREAD_NAME "pthread-stubs"
+#   else
+#     define PYTHREAD_NAME "pthread"
+#   endif
 #   include "thread_pthread.h"
 #elif defined(NT_THREADS)
 #   define PYTHREAD_NAME "nt"
@@ -171,7 +178,9 @@ PyThread_GetInfo(void)
     }
     PyStructSequence_SET_ITEM(threadinfo, pos++, value);
 
-#ifdef _POSIX_THREADS
+#ifdef HAVE_PTHREAD_STUBS
+    value = Py_NewRef(Py_None);
+#elif defined(_POSIX_THREADS)
 #ifdef USE_SEMAPHORES
     value = PyUnicode_FromString("semaphore");
 #else
@@ -182,8 +191,7 @@ PyThread_GetInfo(void)
         return NULL;
     }
 #else
-    Py_INCREF(Py_None);
-    value = Py_None;
+    value = Py_NewRef(Py_None);
 #endif
     PyStructSequence_SET_ITEM(threadinfo, pos++, value);
 
diff --git a/Python/thread_pthread.h b/Python/thread_pthread.h
index c310d72abd2d5..1c5b320813af8 100644
--- a/Python/thread_pthread.h
+++ b/Python/thread_pthread.h
@@ -7,7 +7,9 @@
 #if defined(__APPLE__) || defined(HAVE_PTHREAD_DESTRUCTOR)
 #define destructor xxdestructor
 #endif
-#include <pthread.h>
+#ifndef HAVE_PTHREAD_STUBS
+#  include <pthread.h>
+#endif
 #if defined(__APPLE__) || defined(HAVE_PTHREAD_DESTRUCTOR)
 #undef destructor
 #endif
diff --git a/Python/thread_pthread_stubs.h b/Python/thread_pthread_stubs.h
new file mode 100644
index 0000000000000..8b80c0f87e250
--- /dev/null
+++ b/Python/thread_pthread_stubs.h
@@ -0,0 +1,185 @@
+#include "cpython/pthread_stubs.h"
+
+// mutex
+int
+pthread_mutex_init(pthread_mutex_t *restrict mutex,
+                   const pthread_mutexattr_t *restrict attr)
+{
+    return 0;
+}
+
+int
+pthread_mutex_destroy(pthread_mutex_t *mutex)
+{
+    return 0;
+}
+
+int
+pthread_mutex_trylock(pthread_mutex_t *mutex)
+{
+    return 0;
+}
+
+int
+pthread_mutex_lock(pthread_mutex_t *mutex)
+{
+    return 0;
+}
+
+int
+pthread_mutex_unlock(pthread_mutex_t *mutex)
+{
+    return 0;
+}
+
+// condition
+int
+pthread_cond_init(pthread_cond_t *restrict cond,
+                  const pthread_condattr_t *restrict attr)
+{
+    return 0;
+}
+
+PyAPI_FUNC(int)pthread_cond_destroy(pthread_cond_t *cond)
+{
+    return 0;
+}
+
+int
+pthread_cond_wait(pthread_cond_t *restrict cond,
+                  pthread_mutex_t *restrict mutex)
+{
+    return 0;
+}
+
+int
+pthread_cond_timedwait(pthread_cond_t *restrict cond,
+                       pthread_mutex_t *restrict mutex,
+                       const struct timespec *restrict abstime)
+{
+    return 0;
+}
+
+int
+pthread_cond_signal(pthread_cond_t *cond)
+{
+    return 0;
+}
+
+int
+pthread_condattr_init(pthread_condattr_t *attr)
+{
+    return 0;
+}
+
+int
+pthread_condattr_setclock(pthread_condattr_t *attr, clockid_t clock_id)
+{
+    return 0;
+}
+
+// pthread
+int
+pthread_create(pthread_t *restrict thread,
+               const pthread_attr_t *restrict attr,
+               void *(*start_routine)(void *),
+               void *restrict arg)
+{
+    return EAGAIN;
+}
+
+int
+pthread_detach(pthread_t thread)
+{
+    return 0;
+}
+
+PyAPI_FUNC(pthread_t) pthread_self(void)
+{
+    return 0;
+}
+
+int
+pthread_exit(void *retval)
+{
+    exit(0);
+}
+
+int
+pthread_attr_init(pthread_attr_t *attr)
+{
+    return 0;
+}
+
+int
+pthread_attr_setstacksize(
+    pthread_attr_t *attr, size_t stacksize)
+{
+    return 0;
+}
+
+int
+pthread_attr_destroy(pthread_attr_t *attr)
+{
+    return 0;
+}
+
+// pthread_key
+typedef struct {
+    bool in_use;
+    void *value;
+} py_tls_entry;
+
+static py_tls_entry py_tls_entries[PTHREAD_KEYS_MAX] = {0};
+
+int
+pthread_key_create(pthread_key_t *key, void (*destr_function)(void *))
+{
+    if (!key) {
+        return EINVAL;
+    }
+    if (destr_function != NULL) {
+        Py_FatalError("pthread_key_create destructor is not supported");
+    }
+    for (pthread_key_t idx = 0; idx < PTHREAD_KEYS_MAX; idx++) {
+        if (!py_tls_entries[idx].in_use) {
+            py_tls_entries[idx].in_use = true;
+            *key = idx;
+            return 0;
+        }
+    }
+    return EAGAIN;
+}
+
+int
+pthread_key_delete(pthread_key_t key)
+{
+    if (key < 0 || key >= PTHREAD_KEYS_MAX || !py_tls_entries[key].in_use) {
+        return EINVAL;
+    }
+    py_tls_entries[key].in_use = false;
+    py_tls_entries[key].value = NULL;
+    return 0;
+}
+
+
+void *
+pthread_getspecific(pthread_key_t key) {
+    if (key < 0 || key >= PTHREAD_KEYS_MAX || !py_tls_entries[key].in_use) {
+        return NULL;
+    }
+    return py_tls_entries[key].value;
+}
+
+int
+pthread_setspecific(pthread_key_t key, const void *value)
+{
+    if (key < 0 || key >= PTHREAD_KEYS_MAX || !py_tls_entries[key].in_use) {
+        return EINVAL;
+    }
+    py_tls_entries[key].value = (void *)value;
+    return 0;
+}
+
+// let thread_pthread define the Python API
+#include "thread_pthread.h"
diff --git a/Tools/wasm/README.md b/Tools/wasm/README.md
index d08e807f565b2..6496a29e6ff80 100644
--- a/Tools/wasm/README.md
+++ b/Tools/wasm/README.md
@@ -226,16 +226,13 @@ AddType application/wasm wasm
 
 # WASI (wasm32-wasi)
 
-WASI builds require [WASI SDK](https://github.com/WebAssembly/wasi-sdk) 15.0+
-and currently [wasix](https://github.com/singlestore-labs/wasix) for POSIX
-compatibility stubs.
+WASI builds require [WASI SDK](https://github.com/WebAssembly/wasi-sdk) 16.0+.
 
 ## Cross-compile to wasm32-wasi
 
 The script ``wasi-env`` sets necessary compiler and linker flags as well as
 ``pkg-config`` overrides. The script assumes that WASI-SDK is installed in
-``/opt/wasi-sdk`` or ``$WASI_SDK_PATH`` and WASIX is installed in
-``/opt/wasix`` or ``$WASIX_PATH``.
+``/opt/wasi-sdk`` or ``$WASI_SDK_PATH``.
 
 ```shell
 mkdir -p builddir/wasi
@@ -434,21 +431,15 @@ rm -f wasi-sdk-${WASI_VERSION_FULL}-linux.tar.gz
 
 ### Install [wasmtime](https://github.com/bytecodealliance/wasmtime) WASI runtime
 
-**NOTE**: wasmtime 0.37 has a bug. Newer versions should be fine again.
+wasmtime 0.38 or newer is required.
 
 ```shell
 curl -sSf -L -o ~/install-wasmtime.sh https://wasmtime.dev/install.sh
 chmod +x ~/install-wasmtime.sh
-~/install-wasmtime.sh --version v0.36.0
+~/install-wasmtime.sh --version v0.38.0
 ln -srf -t /usr/local/bin/ ~/.wasmtime/bin/wasmtime
 ```
 
-### Install [WASIX](https://github.com/singlestore-labs/wasix)
-
-```shell
-git clone https://github.com/singlestore-labs/wasix.git ~/wasix
-make install -C ~/wasix
-```
 
 ### WASI debugging
 
diff --git a/Tools/wasm/config.site-wasm32-wasi b/Tools/wasm/config.site-wasm32-wasi
index 237fa8b55624c..893a0d132cda5 100644
--- a/Tools/wasm/config.site-wasm32-wasi
+++ b/Tools/wasm/config.site-wasm32-wasi
@@ -32,14 +32,6 @@ ac_cv_func_makedev=no
 # OSError: [Errno 28] Invalid argument: '.'
 ac_cv_func_fdopendir=no
 
-# WASIX stubs we don't want to use.
-ac_cv_func_kill=no
-
-# WASI SDK 15.0 does not have chmod.
-# Ignore WASIX stubs for now.
-ac_cv_func_chmod=no
-ac_cv_func_fchmod=no
-
 # WASI sockets are limited to operations on given socket fd and inet sockets.
 # Disable AF_UNIX and AF_PACKET support, see socketmodule.h.
 ac_cv_header_sys_un_h=no
diff --git a/Tools/wasm/wasi-env b/Tools/wasm/wasi-env
index 06c54e6823d41..6c2d56e0e5e32 100755
--- a/Tools/wasm/wasi-env
+++ b/Tools/wasm/wasi-env
@@ -31,7 +31,6 @@ fi
 
 WASI_SDK_PATH="${WASI_SDK_PATH:-/opt/wasi-sdk}"
 WASI_SYSROOT="${WASI_SDK_PATH}/share/wasi-sysroot"
-WASIX_PATH="${WASIX_PATH:-/opt/wasix}"
 
 if ! test -x "${WASI_SDK_PATH}/bin/clang"; then
     echo "Error: ${WASI_SDK_PATH}/bin/clang does not exist." >&2
@@ -65,12 +64,6 @@ PKG_CONFIG_PATH=""
 PKG_CONFIG_LIBDIR="${WASI_SYSROOT}/lib/pkgconfig:${WASI_SYSROOT}/share/pkgconfig"
 PKG_CONFIG_SYSROOT_DIR="${WASI_SYSROOT}"
 
-# add WASIX (POSIX stubs for WASI) if WASIX is installed
-if test -f "${WASIX_PATH}/lib/libwasix.a"; then
-    CFLAGS="${CFLAGS} -isystem ${WASIX_PATH}/include"
-    LDFLAGS="${LDFLAGS} -L${WASIX_PATH}/lib -lwasix"
-fi
-
 PATH="${WASI_SDK_PATH}/bin:${PATH}"
 
 export WASI_SDK_PATH WASI_SYSROOT
diff --git a/configure b/configure
index 21f7f91d8b3c0..5df9f83290da0 100755
--- a/configure
+++ b/configure
@@ -14748,11 +14748,16 @@ if test "x$ac_cv_lib_cma_pthread_create" = xyes; then :
 
 else
 
+    case $ac_sys_system in #(
+  WASI) :
+    posix_threads=stub ;; #(
+  *) :
     as_fn_error $? "could not find pthreads on your system" "$LINENO" 5
+     ;;
+esac
 
 fi
 
-
 fi
 
 fi
@@ -14908,6 +14913,14 @@ _ACEOF
 fi
 done
 
+fi
+
+if test "x$posix_threads" = xstub; then :
+
+
+$as_echo "#define HAVE_PTHREAD_STUBS 1" >>confdefs.h
+
+
 fi
 
 # Check for enable-ipv6
diff --git a/configure.ac b/configure.ac
index 6b36696f327d9..38880fcc8cc15 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4207,9 +4207,11 @@ pthread_create (NULL, NULL, start_routine, NULL)]])],[
     posix_threads=yes
     LIBS="$LIBS -lcma"
     ],[
-    AC_MSG_ERROR([could not find pthreads on your system])
-    ])
-    ])])])])])
+    AS_CASE([$ac_sys_system],
+      [WASI], [posix_threads=stub],
+      [AC_MSG_ERROR([could not find pthreads on your system])]
+    )
+    ])])])])])])
 
     AC_CHECK_LIB(mpc, usconfig, [
     LIBS="$LIBS -lmpc"
@@ -4272,6 +4274,10 @@ if test "$posix_threads" = "yes"; then
       AC_CHECK_FUNCS(pthread_getcpuclockid)
 fi
 
+AS_VAR_IF([posix_threads], [stub], [
+  AC_DEFINE([HAVE_PTHREAD_STUBS], [1], [Define if platform requires stubbed pthreads support])
+])
+
 # Check for enable-ipv6
 AH_TEMPLATE(ENABLE_IPV6, [Define if --enable-ipv6 is specified])
 AC_MSG_CHECKING([if --enable-ipv6 is specified])
diff --git a/pyconfig.h.in b/pyconfig.h.in
index 91b249e6e1be4..10e7ad12fa982 100644
--- a/pyconfig.h.in
+++ b/pyconfig.h.in
@@ -938,6 +938,9 @@
 /* Define to 1 if you have the `pthread_sigmask' function. */
 #undef HAVE_PTHREAD_SIGMASK
 
+/* Define if platform requires stubbed pthreads support */
+#undef HAVE_PTHREAD_STUBS
+
 /* Define to 1 if you have the <pty.h> header file. */
 #undef HAVE_PTY_H
 


From webhook-mailer at python.org  Wed Jul 27 15:11:34 2022
From: webhook-mailer at python.org (miss-islington)
Date: Wed, 27 Jul 2022 19:11:34 -0000
Subject: [Python-checkins] gh-95339: update bundled pip to 22.2.1 (gh-95340)
Message-ID: <mailman.309.1658949096.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/547f0bb82f6f96d2cd5ad5580d0508b1ac6e1957
commit: 547f0bb82f6f96d2cd5ad5580d0508b1ac6e1957
branch: 3.11
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-27T12:11:15-07:00
summary:

gh-95339: update bundled pip to 22.2.1 (gh-95340)

(cherry picked from commit 226d02bb109d08601fbccd645e9d67aee2e5bcdc)

Co-authored-by: St?phane Bidoul <stephane.bidoul at gmail.com>

files:
A Lib/ensurepip/_bundled/pip-22.2.1-py3-none-any.whl
A Misc/NEWS.d/next/Library/2022-07-27-19-43-07.gh-issue-95339.NuVQ68.rst
D Lib/ensurepip/_bundled/pip-22.2-py3-none-any.whl
M Lib/ensurepip/__init__.py

diff --git a/Lib/ensurepip/__init__.py b/Lib/ensurepip/__init__.py
index d88387398e83a..885a1edf4b380 100644
--- a/Lib/ensurepip/__init__.py
+++ b/Lib/ensurepip/__init__.py
@@ -11,7 +11,7 @@
 __all__ = ["version", "bootstrap"]
 _PACKAGE_NAMES = ('setuptools', 'pip')
 _SETUPTOOLS_VERSION = "63.2.0"
-_PIP_VERSION = "22.2"
+_PIP_VERSION = "22.2.1"
 _PROJECTS = [
     ("setuptools", _SETUPTOOLS_VERSION, "py3"),
     ("pip", _PIP_VERSION, "py3"),
diff --git a/Lib/ensurepip/_bundled/pip-22.2-py3-none-any.whl b/Lib/ensurepip/_bundled/pip-22.2.1-py3-none-any.whl
similarity index 94%
rename from Lib/ensurepip/_bundled/pip-22.2-py3-none-any.whl
rename to Lib/ensurepip/_bundled/pip-22.2.1-py3-none-any.whl
index 9c43960aafd5e..4654c00136cd0 100644
Binary files a/Lib/ensurepip/_bundled/pip-22.2-py3-none-any.whl and b/Lib/ensurepip/_bundled/pip-22.2.1-py3-none-any.whl differ
diff --git a/Misc/NEWS.d/next/Library/2022-07-27-19-43-07.gh-issue-95339.NuVQ68.rst b/Misc/NEWS.d/next/Library/2022-07-27-19-43-07.gh-issue-95339.NuVQ68.rst
new file mode 100644
index 0000000000000..6674a4a269539
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2022-07-27-19-43-07.gh-issue-95339.NuVQ68.rst
@@ -0,0 +1 @@
+Update bundled pip to 22.2.1.


From webhook-mailer at python.org  Wed Jul 27 15:11:35 2022
From: webhook-mailer at python.org (miss-islington)
Date: Wed, 27 Jul 2022 19:11:35 -0000
Subject: [Python-checkins] gh-95339: update bundled pip to 22.2.1 (gh-95340)
Message-ID: <mailman.310.1658949096.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/fb422147d39eba4b56b9bb9d9be73d07e748dda9
commit: fb422147d39eba4b56b9bb9d9be73d07e748dda9
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-27T12:11:30-07:00
summary:

gh-95339: update bundled pip to 22.2.1 (gh-95340)

(cherry picked from commit 226d02bb109d08601fbccd645e9d67aee2e5bcdc)

Co-authored-by: St?phane Bidoul <stephane.bidoul at gmail.com>

files:
A Lib/ensurepip/_bundled/pip-22.2.1-py3-none-any.whl
A Misc/NEWS.d/next/Library/2022-07-27-19-43-07.gh-issue-95339.NuVQ68.rst
D Lib/ensurepip/_bundled/pip-22.2-py3-none-any.whl
M Lib/ensurepip/__init__.py

diff --git a/Lib/ensurepip/__init__.py b/Lib/ensurepip/__init__.py
index 189cfb2425923..b6973dbad3f7b 100644
--- a/Lib/ensurepip/__init__.py
+++ b/Lib/ensurepip/__init__.py
@@ -12,7 +12,7 @@
 __all__ = ["version", "bootstrap"]
 _PACKAGE_NAMES = ('setuptools', 'pip')
 _SETUPTOOLS_VERSION = "63.2.0"
-_PIP_VERSION = "22.2"
+_PIP_VERSION = "22.2.1"
 _PROJECTS = [
     ("setuptools", _SETUPTOOLS_VERSION, "py3"),
     ("pip", _PIP_VERSION, "py3"),
diff --git a/Lib/ensurepip/_bundled/pip-22.2-py3-none-any.whl b/Lib/ensurepip/_bundled/pip-22.2.1-py3-none-any.whl
similarity index 94%
rename from Lib/ensurepip/_bundled/pip-22.2-py3-none-any.whl
rename to Lib/ensurepip/_bundled/pip-22.2.1-py3-none-any.whl
index 9c43960aafd5e..4654c00136cd0 100644
Binary files a/Lib/ensurepip/_bundled/pip-22.2-py3-none-any.whl and b/Lib/ensurepip/_bundled/pip-22.2.1-py3-none-any.whl differ
diff --git a/Misc/NEWS.d/next/Library/2022-07-27-19-43-07.gh-issue-95339.NuVQ68.rst b/Misc/NEWS.d/next/Library/2022-07-27-19-43-07.gh-issue-95339.NuVQ68.rst
new file mode 100644
index 0000000000000..6674a4a269539
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2022-07-27-19-43-07.gh-issue-95339.NuVQ68.rst
@@ -0,0 +1 @@
+Update bundled pip to 22.2.1.


From webhook-mailer at python.org  Wed Jul 27 17:43:14 2022
From: webhook-mailer at python.org (ambv)
Date: Wed, 27 Jul 2022 21:43:14 -0000
Subject: [Python-checkins] [3.9] gh-94208: Add more TLS version/protocol
 checks for FreeBSD (GH-94347) (GH-95312)
Message-ID: <mailman.311.1658958195.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/017080f0fac63f386811cc24d56d618a655e3d02
commit: 017080f0fac63f386811cc24d56d618a655e3d02
branch: 3.9
author: ?ukasz Langa <lukasz at langa.pl>
committer: ambv <lukasz at langa.pl>
date: 2022-07-27T23:43:02+02:00
summary:

[3.9] gh-94208: Add more TLS version/protocol checks for FreeBSD (GH-94347) (GH-95312)

Three test cases were failing on FreeBSD with latest OpenSSL.
(cherry picked from commit 1bc86c26253befa006c0f52eebb6ed633c7d1e5c)

Co-authored-by: Christian Heimes <christian at python.org>

files:
A Misc/NEWS.d/next/Tests/2022-06-27-21-27-20.gh-issue-94208.VR6HX-.rst
M Lib/test/test_ssl.py

diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py
index b5eb40f869709..1f8c30c51aa87 100644
--- a/Lib/test/test_ssl.py
+++ b/Lib/test/test_ssl.py
@@ -4,7 +4,7 @@
 import unittest
 import unittest.mock
 from test import support
-from test.support import socket_helper
+from test.support import socket_helper, warnings_helper
 import socket
 import select
 import time
@@ -1129,8 +1129,12 @@ class ContextTests(unittest.TestCase):
 
     def test_constructor(self):
         for protocol in PROTOCOLS:
-            ssl.SSLContext(protocol)
-        ctx = ssl.SSLContext()
+            if has_tls_protocol(protocol):
+                with warnings_helper.check_warnings():
+                    ctx = ssl.SSLContext(protocol)
+                self.assertEqual(ctx.protocol, protocol)
+        with warnings_helper.check_warnings():
+            ctx = ssl.SSLContext()
         self.assertEqual(ctx.protocol, ssl.PROTOCOL_TLS)
         self.assertRaises(ValueError, ssl.SSLContext, -1)
         self.assertRaises(ValueError, ssl.SSLContext, 42)
@@ -1281,7 +1285,7 @@ def test_min_max_version(self):
         ctx.maximum_version = ssl.TLSVersion.MINIMUM_SUPPORTED
         self.assertIn(
             ctx.maximum_version,
-            {ssl.TLSVersion.TLSv1, ssl.TLSVersion.SSLv3}
+            {ssl.TLSVersion.TLSv1, ssl.TLSVersion.TLSv1_1, ssl.TLSVersion.SSLv3}
         )
 
         ctx.minimum_version = ssl.TLSVersion.MAXIMUM_SUPPORTED
@@ -1293,19 +1297,19 @@ def test_min_max_version(self):
         with self.assertRaises(ValueError):
             ctx.minimum_version = 42
 
-        ctx = ssl.SSLContext(ssl.PROTOCOL_TLSv1_1)
-
-        self.assertIn(
-            ctx.minimum_version, minimum_range
-        )
-        self.assertEqual(
-            ctx.maximum_version, ssl.TLSVersion.MAXIMUM_SUPPORTED
-        )
-        with self.assertRaises(ValueError):
-            ctx.minimum_version = ssl.TLSVersion.MINIMUM_SUPPORTED
-        with self.assertRaises(ValueError):
-            ctx.maximum_version = ssl.TLSVersion.TLSv1
+        if has_tls_protocol(ssl.PROTOCOL_TLSv1_1):
+            ctx = ssl.SSLContext(ssl.PROTOCOL_TLSv1_1)
 
+            self.assertIn(
+                ctx.minimum_version, minimum_range
+            )
+            self.assertEqual(
+                ctx.maximum_version, ssl.TLSVersion.MAXIMUM_SUPPORTED
+            )
+            with self.assertRaises(ValueError):
+                ctx.minimum_version = ssl.TLSVersion.MINIMUM_SUPPORTED
+            with self.assertRaises(ValueError):
+                ctx.maximum_version = ssl.TLSVersion.TLSv1
 
     @unittest.skipUnless(have_verify_flags(),
                          "verify_flags need OpenSSL > 0.9.8")
@@ -1692,10 +1696,12 @@ def test__create_stdlib_context(self):
         self.assertFalse(ctx.check_hostname)
         self._assert_context_options(ctx)
 
-        ctx = ssl._create_stdlib_context(ssl.PROTOCOL_TLSv1)
-        self.assertEqual(ctx.protocol, ssl.PROTOCOL_TLSv1)
-        self.assertEqual(ctx.verify_mode, ssl.CERT_NONE)
-        self._assert_context_options(ctx)
+        if has_tls_protocol(ssl.PROTOCOL_TLSv1):
+            with warnings_helper.check_warnings():
+                ctx = ssl._create_stdlib_context(ssl.PROTOCOL_TLSv1)
+            self.assertEqual(ctx.protocol, ssl.PROTOCOL_TLSv1)
+            self.assertEqual(ctx.verify_mode, ssl.CERT_NONE)
+            self._assert_context_options(ctx)
 
         ctx = ssl._create_stdlib_context(ssl.PROTOCOL_TLSv1,
                                          cert_reqs=ssl.CERT_REQUIRED,
@@ -3411,10 +3417,12 @@ def test_protocol_tlsv1_2(self):
                            client_options=ssl.OP_NO_TLSv1_2)
 
         try_protocol_combo(ssl.PROTOCOL_TLS, ssl.PROTOCOL_TLSv1_2, 'TLSv1.2')
-        try_protocol_combo(ssl.PROTOCOL_TLSv1_2, ssl.PROTOCOL_TLSv1, False)
-        try_protocol_combo(ssl.PROTOCOL_TLSv1, ssl.PROTOCOL_TLSv1_2, False)
-        try_protocol_combo(ssl.PROTOCOL_TLSv1_2, ssl.PROTOCOL_TLSv1_1, False)
-        try_protocol_combo(ssl.PROTOCOL_TLSv1_1, ssl.PROTOCOL_TLSv1_2, False)
+        if has_tls_protocol(ssl.PROTOCOL_TLSv1):
+            try_protocol_combo(ssl.PROTOCOL_TLSv1_2, ssl.PROTOCOL_TLSv1, False)
+            try_protocol_combo(ssl.PROTOCOL_TLSv1, ssl.PROTOCOL_TLSv1_2, False)
+        if has_tls_protocol(ssl.PROTOCOL_TLSv1_1):
+            try_protocol_combo(ssl.PROTOCOL_TLSv1_2, ssl.PROTOCOL_TLSv1_1, False)
+            try_protocol_combo(ssl.PROTOCOL_TLSv1_1, ssl.PROTOCOL_TLSv1_2, False)
 
     def test_starttls(self):
         """Switching from clear text to encrypted and back again."""
diff --git a/Misc/NEWS.d/next/Tests/2022-06-27-21-27-20.gh-issue-94208.VR6HX-.rst b/Misc/NEWS.d/next/Tests/2022-06-27-21-27-20.gh-issue-94208.VR6HX-.rst
new file mode 100644
index 0000000000000..d0f970ad286b1
--- /dev/null
+++ b/Misc/NEWS.d/next/Tests/2022-06-27-21-27-20.gh-issue-94208.VR6HX-.rst
@@ -0,0 +1,2 @@
+``test_ssl`` is now checking for supported TLS version and protocols in more
+tests.


From webhook-mailer at python.org  Wed Jul 27 17:43:33 2022
From: webhook-mailer at python.org (ambv)
Date: Wed, 27 Jul 2022 21:43:33 -0000
Subject: [Python-checkins] [3.8] gh-94208: Add more TLS version/protocol
 checks for FreeBSD (GH-94347) (GH-95313)
Message-ID: <mailman.312.1658958214.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/48b323ed847ce0cb1a13e31d93781ca48e71f1ae
commit: 48b323ed847ce0cb1a13e31d93781ca48e71f1ae
branch: 3.8
author: ?ukasz Langa <lukasz at langa.pl>
committer: ambv <lukasz at langa.pl>
date: 2022-07-27T23:43:29+02:00
summary:

[3.8] gh-94208: Add more TLS version/protocol checks for FreeBSD (GH-94347) (GH-95313)

Three test cases were failing on FreeBSD with latest OpenSSL.
(cherry picked from commit 1bc86c26253befa006c0f52eebb6ed633c7d1e5c)

Co-authored-by: Christian Heimes <christian at python.org>

files:
A Misc/NEWS.d/next/Tests/2022-06-27-21-27-20.gh-issue-94208.VR6HX-.rst
M Lib/test/test_ssl.py

diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py
index 3e5f1ade0e6b7..71cfdcdf8a1c9 100644
--- a/Lib/test/test_ssl.py
+++ b/Lib/test/test_ssl.py
@@ -1127,8 +1127,12 @@ class ContextTests(unittest.TestCase):
 
     def test_constructor(self):
         for protocol in PROTOCOLS:
-            ssl.SSLContext(protocol)
-        ctx = ssl.SSLContext()
+            if has_tls_protocol(protocol):
+                with support.check_warnings():
+                    ctx = ssl.SSLContext(protocol)
+                self.assertEqual(ctx.protocol, protocol)
+        with support.check_warnings():
+            ctx = ssl.SSLContext()
         self.assertEqual(ctx.protocol, ssl.PROTOCOL_TLS)
         self.assertRaises(ValueError, ssl.SSLContext, -1)
         self.assertRaises(ValueError, ssl.SSLContext, 42)
@@ -1279,7 +1283,7 @@ def test_min_max_version(self):
         ctx.maximum_version = ssl.TLSVersion.MINIMUM_SUPPORTED
         self.assertIn(
             ctx.maximum_version,
-            {ssl.TLSVersion.TLSv1, ssl.TLSVersion.SSLv3}
+            {ssl.TLSVersion.TLSv1, ssl.TLSVersion.TLSv1_1, ssl.TLSVersion.SSLv3}
         )
 
         ctx.minimum_version = ssl.TLSVersion.MAXIMUM_SUPPORTED
@@ -1291,19 +1295,19 @@ def test_min_max_version(self):
         with self.assertRaises(ValueError):
             ctx.minimum_version = 42
 
-        ctx = ssl.SSLContext(ssl.PROTOCOL_TLSv1_1)
-
-        self.assertIn(
-            ctx.minimum_version, minimum_range
-        )
-        self.assertEqual(
-            ctx.maximum_version, ssl.TLSVersion.MAXIMUM_SUPPORTED
-        )
-        with self.assertRaises(ValueError):
-            ctx.minimum_version = ssl.TLSVersion.MINIMUM_SUPPORTED
-        with self.assertRaises(ValueError):
-            ctx.maximum_version = ssl.TLSVersion.TLSv1
+        if has_tls_protocol(ssl.PROTOCOL_TLSv1_1):
+            ctx = ssl.SSLContext(ssl.PROTOCOL_TLSv1_1)
 
+            self.assertIn(
+                ctx.minimum_version, minimum_range
+            )
+            self.assertEqual(
+                ctx.maximum_version, ssl.TLSVersion.MAXIMUM_SUPPORTED
+            )
+            with self.assertRaises(ValueError):
+                ctx.minimum_version = ssl.TLSVersion.MINIMUM_SUPPORTED
+            with self.assertRaises(ValueError):
+                ctx.maximum_version = ssl.TLSVersion.TLSv1
 
     @unittest.skipUnless(have_verify_flags(),
                          "verify_flags need OpenSSL > 0.9.8")
@@ -1689,10 +1693,12 @@ def test__create_stdlib_context(self):
         self.assertFalse(ctx.check_hostname)
         self._assert_context_options(ctx)
 
-        ctx = ssl._create_stdlib_context(ssl.PROTOCOL_TLSv1)
-        self.assertEqual(ctx.protocol, ssl.PROTOCOL_TLSv1)
-        self.assertEqual(ctx.verify_mode, ssl.CERT_NONE)
-        self._assert_context_options(ctx)
+        if has_tls_protocol(ssl.PROTOCOL_TLSv1):
+            with support.check_warnings():
+                ctx = ssl._create_stdlib_context(ssl.PROTOCOL_TLSv1)
+            self.assertEqual(ctx.protocol, ssl.PROTOCOL_TLSv1)
+            self.assertEqual(ctx.verify_mode, ssl.CERT_NONE)
+            self._assert_context_options(ctx)
 
         ctx = ssl._create_stdlib_context(ssl.PROTOCOL_TLSv1,
                                          cert_reqs=ssl.CERT_REQUIRED,
@@ -3406,10 +3412,12 @@ def test_protocol_tlsv1_2(self):
                            client_options=ssl.OP_NO_TLSv1_2)
 
         try_protocol_combo(ssl.PROTOCOL_TLS, ssl.PROTOCOL_TLSv1_2, 'TLSv1.2')
-        try_protocol_combo(ssl.PROTOCOL_TLSv1_2, ssl.PROTOCOL_TLSv1, False)
-        try_protocol_combo(ssl.PROTOCOL_TLSv1, ssl.PROTOCOL_TLSv1_2, False)
-        try_protocol_combo(ssl.PROTOCOL_TLSv1_2, ssl.PROTOCOL_TLSv1_1, False)
-        try_protocol_combo(ssl.PROTOCOL_TLSv1_1, ssl.PROTOCOL_TLSv1_2, False)
+        if has_tls_protocol(ssl.PROTOCOL_TLSv1):
+            try_protocol_combo(ssl.PROTOCOL_TLSv1_2, ssl.PROTOCOL_TLSv1, False)
+            try_protocol_combo(ssl.PROTOCOL_TLSv1, ssl.PROTOCOL_TLSv1_2, False)
+        if has_tls_protocol(ssl.PROTOCOL_TLSv1_1):
+            try_protocol_combo(ssl.PROTOCOL_TLSv1_2, ssl.PROTOCOL_TLSv1_1, False)
+            try_protocol_combo(ssl.PROTOCOL_TLSv1_1, ssl.PROTOCOL_TLSv1_2, False)
 
     def test_starttls(self):
         """Switching from clear text to encrypted and back again."""
diff --git a/Misc/NEWS.d/next/Tests/2022-06-27-21-27-20.gh-issue-94208.VR6HX-.rst b/Misc/NEWS.d/next/Tests/2022-06-27-21-27-20.gh-issue-94208.VR6HX-.rst
new file mode 100644
index 0000000000000..d0f970ad286b1
--- /dev/null
+++ b/Misc/NEWS.d/next/Tests/2022-06-27-21-27-20.gh-issue-94208.VR6HX-.rst
@@ -0,0 +1,2 @@
+``test_ssl`` is now checking for supported TLS version and protocols in more
+tests.


From webhook-mailer at python.org  Wed Jul 27 17:45:10 2022
From: webhook-mailer at python.org (ambv)
Date: Wed, 27 Jul 2022 21:45:10 -0000
Subject: [Python-checkins] [3.7] gh-94208: Add more TLS version/protocol
 checks for FreeBSD (GH-94347) (GH-95314)
Message-ID: <mailman.313.1658958311.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/c19983125a42a4b4958b11a26ab5e03752c956fc
commit: c19983125a42a4b4958b11a26ab5e03752c956fc
branch: 3.7
author: ?ukasz Langa <lukasz at langa.pl>
committer: ambv <lukasz at langa.pl>
date: 2022-07-27T23:45:05+02:00
summary:

[3.7] gh-94208: Add more TLS version/protocol checks for FreeBSD (GH-94347) (GH-95314)

Three test cases were failing on FreeBSD with latest OpenSSL.
(cherry picked from commit 1bc86c26253befa006c0f52eebb6ed633c7d1e5c)

Co-authored-by: Christian Heimes <christian at python.org>

files:
A Misc/NEWS.d/next/Tests/2022-06-27-21-27-20.gh-issue-94208.VR6HX-.rst
M Lib/test/test_ssl.py

diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py
index f691b2820a46d..1418a84d1d1c1 100644
--- a/Lib/test/test_ssl.py
+++ b/Lib/test/test_ssl.py
@@ -1131,8 +1131,12 @@ class ContextTests(unittest.TestCase):
     @skip_if_broken_ubuntu_ssl
     def test_constructor(self):
         for protocol in PROTOCOLS:
-            ssl.SSLContext(protocol)
-        ctx = ssl.SSLContext()
+            if has_tls_protocol(protocol):
+                with support.check_warnings():
+                    ctx = ssl.SSLContext(protocol)
+                self.assertEqual(ctx.protocol, protocol)
+        with support.check_warnings():
+            ctx = ssl.SSLContext()
         self.assertEqual(ctx.protocol, ssl.PROTOCOL_TLS)
         self.assertRaises(ValueError, ssl.SSLContext, -1)
         self.assertRaises(ValueError, ssl.SSLContext, 42)
@@ -1284,7 +1288,7 @@ def test_min_max_version(self):
         ctx.maximum_version = ssl.TLSVersion.MINIMUM_SUPPORTED
         self.assertIn(
             ctx.maximum_version,
-            {ssl.TLSVersion.TLSv1, ssl.TLSVersion.SSLv3}
+            {ssl.TLSVersion.TLSv1, ssl.TLSVersion.TLSv1_1, ssl.TLSVersion.SSLv3}
         )
 
         ctx.minimum_version = ssl.TLSVersion.MAXIMUM_SUPPORTED
@@ -1296,19 +1300,19 @@ def test_min_max_version(self):
         with self.assertRaises(ValueError):
             ctx.minimum_version = 42
 
-        ctx = ssl.SSLContext(ssl.PROTOCOL_TLSv1_1)
-
-        self.assertIn(
-            ctx.minimum_version, minimum_range
-        )
-        self.assertEqual(
-            ctx.maximum_version, ssl.TLSVersion.MAXIMUM_SUPPORTED
-        )
-        with self.assertRaises(ValueError):
-            ctx.minimum_version = ssl.TLSVersion.MINIMUM_SUPPORTED
-        with self.assertRaises(ValueError):
-            ctx.maximum_version = ssl.TLSVersion.TLSv1
+        if has_tls_protocol(ssl.PROTOCOL_TLSv1_1):
+            ctx = ssl.SSLContext(ssl.PROTOCOL_TLSv1_1)
 
+            self.assertIn(
+                ctx.minimum_version, minimum_range
+            )
+            self.assertEqual(
+                ctx.maximum_version, ssl.TLSVersion.MAXIMUM_SUPPORTED
+            )
+            with self.assertRaises(ValueError):
+                ctx.minimum_version = ssl.TLSVersion.MINIMUM_SUPPORTED
+            with self.assertRaises(ValueError):
+                ctx.maximum_version = ssl.TLSVersion.TLSv1
 
     @unittest.skipUnless(have_verify_flags(),
                          "verify_flags need OpenSSL > 0.9.8")
@@ -1690,10 +1694,12 @@ def test__create_stdlib_context(self):
         self.assertFalse(ctx.check_hostname)
         self._assert_context_options(ctx)
 
-        ctx = ssl._create_stdlib_context(ssl.PROTOCOL_TLSv1)
-        self.assertEqual(ctx.protocol, ssl.PROTOCOL_TLSv1)
-        self.assertEqual(ctx.verify_mode, ssl.CERT_NONE)
-        self._assert_context_options(ctx)
+        if has_tls_protocol(ssl.PROTOCOL_TLSv1):
+            with support.check_warnings():
+                ctx = ssl._create_stdlib_context(ssl.PROTOCOL_TLSv1)
+            self.assertEqual(ctx.protocol, ssl.PROTOCOL_TLSv1)
+            self.assertEqual(ctx.verify_mode, ssl.CERT_NONE)
+            self._assert_context_options(ctx)
 
         ctx = ssl._create_stdlib_context(ssl.PROTOCOL_TLSv1,
                                          cert_reqs=ssl.CERT_REQUIRED,
@@ -3363,10 +3369,12 @@ def test_protocol_tlsv1_2(self):
                            client_options=ssl.OP_NO_TLSv1_2)
 
         try_protocol_combo(ssl.PROTOCOL_TLS, ssl.PROTOCOL_TLSv1_2, 'TLSv1.2')
-        try_protocol_combo(ssl.PROTOCOL_TLSv1_2, ssl.PROTOCOL_TLSv1, False)
-        try_protocol_combo(ssl.PROTOCOL_TLSv1, ssl.PROTOCOL_TLSv1_2, False)
-        try_protocol_combo(ssl.PROTOCOL_TLSv1_2, ssl.PROTOCOL_TLSv1_1, False)
-        try_protocol_combo(ssl.PROTOCOL_TLSv1_1, ssl.PROTOCOL_TLSv1_2, False)
+        if has_tls_protocol(ssl.PROTOCOL_TLSv1):
+            try_protocol_combo(ssl.PROTOCOL_TLSv1_2, ssl.PROTOCOL_TLSv1, False)
+            try_protocol_combo(ssl.PROTOCOL_TLSv1, ssl.PROTOCOL_TLSv1_2, False)
+        if has_tls_protocol(ssl.PROTOCOL_TLSv1_1):
+            try_protocol_combo(ssl.PROTOCOL_TLSv1_2, ssl.PROTOCOL_TLSv1_1, False)
+            try_protocol_combo(ssl.PROTOCOL_TLSv1_1, ssl.PROTOCOL_TLSv1_2, False)
 
     def test_starttls(self):
         """Switching from clear text to encrypted and back again."""
diff --git a/Misc/NEWS.d/next/Tests/2022-06-27-21-27-20.gh-issue-94208.VR6HX-.rst b/Misc/NEWS.d/next/Tests/2022-06-27-21-27-20.gh-issue-94208.VR6HX-.rst
new file mode 100644
index 0000000000000..d0f970ad286b1
--- /dev/null
+++ b/Misc/NEWS.d/next/Tests/2022-06-27-21-27-20.gh-issue-94208.VR6HX-.rst
@@ -0,0 +1,2 @@
+``test_ssl`` is now checking for supported TLS version and protocols in more
+tests.


From webhook-mailer at python.org  Thu Jul 28 00:40:45 2022
From: webhook-mailer at python.org (serhiy-storchaka)
Date: Thu, 28 Jul 2022 04:40:45 -0000
Subject: [Python-checkins] gh-94938: Fix errror detection of unexpected
 keyword arguments (GH-94999)
Message-ID: <mailman.314.1658983245.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/ebad53a4dc1bb591820724a22cef9b8459185b5f
commit: ebad53a4dc1bb591820724a22cef9b8459185b5f
branch: main
author: Serhiy Storchaka <storchaka at gmail.com>
committer: serhiy-storchaka <storchaka at gmail.com>
date: 2022-07-28T07:40:36+03:00
summary:

gh-94938: Fix errror detection of unexpected keyword arguments (GH-94999)

When keyword argument name is an instance of a str subclass with
overloaded methods __eq__ and __hash__, the former code could not find
the name of an extraneous keyword argument to report an error, and
_PyArg_UnpackKeywords() returned success without setting the
corresponding cell in the linearized arguments array. But since the number
of expected initialized cells is determined as the total number of passed
arguments, this lead to reading NULL as a keyword parameter value, that
caused SystemError or crash or other undesired behavior.

files:
A Misc/NEWS.d/next/Core and Builtins/2022-07-19-09-41-55.gh-issue-94938.xYBlM7.rst
M Lib/test/test_call.py
M Lib/test/test_getargs2.py
M Python/getargs.c

diff --git a/Lib/test/test_call.py b/Lib/test/test_call.py
index 07355e8fa0616..a2eec419ab5b4 100644
--- a/Lib/test/test_call.py
+++ b/Lib/test/test_call.py
@@ -11,6 +11,19 @@
 import contextlib
 
 
+class BadStr(str):
+    def __eq__(self, other):
+        return True
+    def __hash__(self):
+        # Guaranteed different hash
+        return str.__hash__(self) ^ 3
+
+    def __eq__(self, other):
+        return False
+    def __hash__(self):
+        return str.__hash__(self)
+
+
 class FunctionCalls(unittest.TestCase):
 
     def test_kwargs_order(self):
@@ -145,6 +158,18 @@ def test_varargs17_kw(self):
         self.assertRaisesRegex(TypeError, msg,
                                print, 0, sep=1, end=2, file=3, flush=4, foo=5)
 
+    def test_varargs18_kw(self):
+        # _PyArg_UnpackKeywordsWithVararg()
+        msg = r"invalid keyword argument for print\(\)$"
+        with self.assertRaisesRegex(TypeError, msg):
+            print(0, 1, **{BadStr('foo'): ','})
+
+    def test_varargs19_kw(self):
+        # _PyArg_UnpackKeywords()
+        msg = r"invalid keyword argument for round\(\)$"
+        with self.assertRaisesRegex(TypeError, msg):
+            round(1.75, **{BadStr('foo'): 1})
+
     def test_oldargs0_1(self):
         msg = r"keys\(\) takes no arguments \(1 given\)"
         self.assertRaisesRegex(TypeError, msg, {}.keys, 0)
diff --git a/Lib/test/test_getargs2.py b/Lib/test/test_getargs2.py
index 899e5463315e1..1d5c7fbaa1510 100644
--- a/Lib/test/test_getargs2.py
+++ b/Lib/test/test_getargs2.py
@@ -746,6 +746,33 @@ def test_surrogate_keyword(self):
             "'\udc80' is an invalid keyword argument for this function"):
             getargs_keyword_only(1, 2, **{'\uDC80': 10})
 
+    def test_weird_str_subclass(self):
+        class BadStr(str):
+            def __eq__(self, other):
+                return True
+            def __hash__(self):
+                # Guaranteed different hash
+                return str.__hash__(self) ^ 3
+        with self.assertRaisesRegex(TypeError,
+            "invalid keyword argument for this function"):
+            getargs_keyword_only(1, 2, **{BadStr("keyword_only"): 3})
+        with self.assertRaisesRegex(TypeError,
+            "invalid keyword argument for this function"):
+            getargs_keyword_only(1, 2, **{BadStr("monster"): 666})
+
+    def test_weird_str_subclass2(self):
+        class BadStr(str):
+            def __eq__(self, other):
+                return False
+            def __hash__(self):
+                return str.__hash__(self)
+        with self.assertRaisesRegex(TypeError,
+            "invalid keyword argument for this function"):
+            getargs_keyword_only(1, 2, **{BadStr("keyword_only"): 3})
+        with self.assertRaisesRegex(TypeError,
+            "invalid keyword argument for this function"):
+            getargs_keyword_only(1, 2, **{BadStr("monster"): 666})
+
 
 class PositionalOnlyAndKeywords_TestCase(unittest.TestCase):
     from _testcapi import getargs_positional_only_and_keywords as getargs
diff --git a/Misc/NEWS.d/next/Core and Builtins/2022-07-19-09-41-55.gh-issue-94938.xYBlM7.rst b/Misc/NEWS.d/next/Core and Builtins/2022-07-19-09-41-55.gh-issue-94938.xYBlM7.rst
new file mode 100644
index 0000000000000..cc4feae685f23
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2022-07-19-09-41-55.gh-issue-94938.xYBlM7.rst	
@@ -0,0 +1,3 @@
+Fix error detection in some builtin functions when keyword argument name is
+an instance of a str subclass with overloaded ``__eq__`` and ``__hash__``.
+Previously it could cause SystemError or other undesired behavior.
diff --git a/Python/getargs.c b/Python/getargs.c
index 41881162ff2fb..2efd330ea62d1 100644
--- a/Python/getargs.c
+++ b/Python/getargs.c
@@ -1502,6 +1502,50 @@ _PyArg_VaParseTupleAndKeywordsFast_SizeT(PyObject *args, PyObject *keywords,
     return retval;
 }
 
+static void
+error_unexpected_keyword_arg(PyObject *kwargs, PyObject *kwnames, PyObject *kwtuple, const char *fname)
+{
+    /* make sure there are no extraneous keyword arguments */
+    Py_ssize_t j = 0;
+    while (1) {
+        PyObject *keyword;
+        if (kwargs != NULL) {
+            if (!PyDict_Next(kwargs, &j, &keyword, NULL))
+                break;
+        }
+        else {
+            if (j >= PyTuple_GET_SIZE(kwnames))
+                break;
+            keyword = PyTuple_GET_ITEM(kwnames, j);
+            j++;
+        }
+        if (!PyUnicode_Check(keyword)) {
+            PyErr_SetString(PyExc_TypeError,
+                            "keywords must be strings");
+            return;
+        }
+
+        int match = PySequence_Contains(kwtuple, keyword);
+        if (match <= 0) {
+            if (!match) {
+                PyErr_Format(PyExc_TypeError,
+                             "'%S' is an invalid keyword "
+                             "argument for %.200s%s",
+                             keyword,
+                             (fname == NULL) ? "this function" : fname,
+                             (fname == NULL) ? "" : "()");
+            }
+            return;
+        }
+    }
+    /* Something wrong happened. There are extraneous keyword arguments,
+     * but we don't know what. And we don't bother. */
+    PyErr_Format(PyExc_TypeError,
+                 "invalid keyword argument for %.200s%s",
+                 (fname == NULL) ? "this function" : fname,
+                 (fname == NULL) ? "" : "()");
+}
+
 int
 PyArg_ValidateKeywordArguments(PyObject *kwargs)
 {
@@ -1790,6 +1834,13 @@ vgetargskeywords(PyObject *args, PyObject *kwargs, const char *format,
                 return cleanreturn(0, &freelist);
             }
         }
+        /* Something wrong happened. There are extraneous keyword arguments,
+         * but we don't know what. And we don't bother. */
+        PyErr_Format(PyExc_TypeError,
+                     "invalid keyword argument for %.200s%s",
+                     (fname == NULL) ? "this function" : fname,
+                     (fname == NULL) ? "" : "()");
+        return cleanreturn(0, &freelist);
     }
 
     return cleanreturn(1, &freelist);
@@ -2132,7 +2183,6 @@ vgetargskeywordsfast_impl(PyObject *const *args, Py_ssize_t nargs,
     assert(IS_END_OF_FORMAT(*format) || (*format == '|') || (*format == '$'));
 
     if (nkwargs > 0) {
-        Py_ssize_t j;
         /* make sure there are no arguments given by name and position */
         for (i = pos; i < nargs; i++) {
             keyword = PyTuple_GET_ITEM(kwtuple, i - pos);
@@ -2156,34 +2206,9 @@ vgetargskeywordsfast_impl(PyObject *const *args, Py_ssize_t nargs,
                 return cleanreturn(0, &freelist);
             }
         }
-        /* make sure there are no extraneous keyword arguments */
-        j = 0;
-        while (1) {
-            int match;
-            if (kwargs != NULL) {
-                if (!PyDict_Next(kwargs, &j, &keyword, NULL))
-                    break;
-            }
-            else {
-                if (j >= PyTuple_GET_SIZE(kwnames))
-                    break;
-                keyword = PyTuple_GET_ITEM(kwnames, j);
-                j++;
-            }
 
-            match = PySequence_Contains(kwtuple, keyword);
-            if (match <= 0) {
-                if (!match) {
-                    PyErr_Format(PyExc_TypeError,
-                                 "'%S' is an invalid keyword "
-                                 "argument for %.200s%s",
-                                 keyword,
-                                 (parser->fname == NULL) ? "this function" : parser->fname,
-                                 (parser->fname == NULL) ? "" : "()");
-                }
-                return cleanreturn(0, &freelist);
-            }
-        }
+        error_unexpected_keyword_arg(kwargs, kwnames, kwtuple, parser->fname);
+        return cleanreturn(0, &freelist);
     }
 
     return cleanreturn(1, &freelist);
@@ -2357,7 +2382,6 @@ _PyArg_UnpackKeywords(PyObject *const *args, Py_ssize_t nargs,
     }
 
     if (nkwargs > 0) {
-        Py_ssize_t j;
         /* make sure there are no arguments given by name and position */
         for (i = posonly; i < nargs; i++) {
             keyword = PyTuple_GET_ITEM(kwtuple, i - posonly);
@@ -2381,34 +2405,9 @@ _PyArg_UnpackKeywords(PyObject *const *args, Py_ssize_t nargs,
                 return NULL;
             }
         }
-        /* make sure there are no extraneous keyword arguments */
-        j = 0;
-        while (1) {
-            int match;
-            if (kwargs != NULL) {
-                if (!PyDict_Next(kwargs, &j, &keyword, NULL))
-                    break;
-            }
-            else {
-                if (j >= PyTuple_GET_SIZE(kwnames))
-                    break;
-                keyword = PyTuple_GET_ITEM(kwnames, j);
-                j++;
-            }
 
-            match = PySequence_Contains(kwtuple, keyword);
-            if (match <= 0) {
-                if (!match) {
-                    PyErr_Format(PyExc_TypeError,
-                                 "'%S' is an invalid keyword "
-                                 "argument for %.200s%s",
-                                 keyword,
-                                 (parser->fname == NULL) ? "this function" : parser->fname,
-                                 (parser->fname == NULL) ? "" : "()");
-                }
-                return NULL;
-            }
-        }
+        error_unexpected_keyword_arg(kwargs, kwnames, kwtuple, parser->fname);
+        return NULL;
     }
 
     return buf;
@@ -2537,35 +2536,8 @@ _PyArg_UnpackKeywordsWithVararg(PyObject *const *args, Py_ssize_t nargs,
     }
 
     if (nkwargs > 0) {
-        Py_ssize_t j;
-        /* make sure there are no extraneous keyword arguments */
-        j = 0;
-        while (1) {
-            int match;
-            if (kwargs != NULL) {
-                if (!PyDict_Next(kwargs, &j, &keyword, NULL))
-                    break;
-            }
-            else {
-                if (j >= PyTuple_GET_SIZE(kwnames))
-                    break;
-                keyword = PyTuple_GET_ITEM(kwnames, j);
-                j++;
-            }
-
-            match = PySequence_Contains(kwtuple, keyword);
-            if (match <= 0) {
-                if (!match) {
-                    PyErr_Format(PyExc_TypeError,
-                                 "'%S' is an invalid keyword "
-                                 "argument for %.200s%s",
-                                 keyword,
-                                 (parser->fname == NULL) ? "this function" : parser->fname,
-                                 (parser->fname == NULL) ? "" : "()");
-                }
-                goto exit;
-            }
-        }
+        error_unexpected_keyword_arg(kwargs, kwnames, kwtuple, parser->fname);
+        goto exit;
     }
 
     return buf;


From webhook-mailer at python.org  Thu Jul 28 01:38:45 2022
From: webhook-mailer at python.org (erlend-aasland)
Date: Thu, 28 Jul 2022 05:38:45 -0000
Subject: [Python-checkins] Docs: Fix refs & tweak wording in sqlite3 'Using
 shortcut methods'
Message-ID: <mailman.315.1658986727.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/ea269b9a380a52828d4e401fa695737bcd699398
commit: ea269b9a380a52828d4e401fa695737bcd699398
branch: main
author: Erlend Egeberg Aasland <erlend.aasland at protonmail.com>
committer: erlend-aasland <erlend.aasland at protonmail.com>
date: 2022-07-28T07:38:36+02:00
summary:

Docs: Fix refs & tweak wording in sqlite3 'Using shortcut methods'

Co-authored-by: CAM Gerlach <CAM.Gerlach at Gerlach.CAM>

files:
M Doc/library/sqlite3.rst

diff --git a/Doc/library/sqlite3.rst b/Doc/library/sqlite3.rst
index d493f5fd95631..545f6790afb3a 100644
--- a/Doc/library/sqlite3.rst
+++ b/Doc/library/sqlite3.rst
@@ -1621,8 +1621,9 @@ Using :mod:`sqlite3` efficiently
 Using shortcut methods
 ^^^^^^^^^^^^^^^^^^^^^^
 
-Using the nonstandard :meth:`execute`, :meth:`executemany` and
-:meth:`executescript` methods of the :class:`Connection` object, your code can
+Using the :meth:`~Connection.execute`,
+:meth:`~Connection.executemany`, and :meth:`~Connection.executescript`
+methods of the :class:`Connection` class, your code can
 be written more concisely because you don't have to create the (often
 superfluous) :class:`Cursor` objects explicitly. Instead, the :class:`Cursor`
 objects are created implicitly and these shortcut methods return the cursor


From webhook-mailer at python.org  Thu Jul 28 02:52:02 2022
From: webhook-mailer at python.org (serhiy-storchaka)
Date: Thu, 28 Jul 2022 06:52:02 -0000
Subject: [Python-checkins] [3.11] gh-94938: Fix errror detection of
 unexpected keyword arguments (GH-94999) (GH-95353)
Message-ID: <mailman.316.1658991122.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/33efd7f7a3e3af172c93675d13d71916a3614b86
commit: 33efd7f7a3e3af172c93675d13d71916a3614b86
branch: 3.11
author: Serhiy Storchaka <storchaka at gmail.com>
committer: serhiy-storchaka <storchaka at gmail.com>
date: 2022-07-28T09:51:45+03:00
summary:

[3.11] gh-94938: Fix errror detection of unexpected keyword arguments (GH-94999) (GH-95353)

When keyword argument name is an instance of a str subclass with
overloaded methods __eq__ and __hash__, the former code could not find
the name of an extraneous keyword argument to report an error, and
_PyArg_UnpackKeywords() returned success without setting the
corresponding cell in the linearized arguments array. But since the number
of expected initialized cells is determined as the total number of passed
arguments, this lead to reading NULL as a keyword parameter value, that
caused SystemError or crash or other undesired behavior.
(cherry picked from commit ebad53a4dc1bb591820724a22cef9b8459185b5f)

Co-authored-by: Serhiy Storchaka <storchaka at gmail.com>

files:
A Misc/NEWS.d/next/Core and Builtins/2022-07-19-09-41-55.gh-issue-94938.xYBlM7.rst
M Lib/test/test_call.py
M Lib/test/test_getargs2.py
M Python/getargs.c

diff --git a/Lib/test/test_call.py b/Lib/test/test_call.py
index 07355e8fa0616..a2eec419ab5b4 100644
--- a/Lib/test/test_call.py
+++ b/Lib/test/test_call.py
@@ -11,6 +11,19 @@
 import contextlib
 
 
+class BadStr(str):
+    def __eq__(self, other):
+        return True
+    def __hash__(self):
+        # Guaranteed different hash
+        return str.__hash__(self) ^ 3
+
+    def __eq__(self, other):
+        return False
+    def __hash__(self):
+        return str.__hash__(self)
+
+
 class FunctionCalls(unittest.TestCase):
 
     def test_kwargs_order(self):
@@ -145,6 +158,18 @@ def test_varargs17_kw(self):
         self.assertRaisesRegex(TypeError, msg,
                                print, 0, sep=1, end=2, file=3, flush=4, foo=5)
 
+    def test_varargs18_kw(self):
+        # _PyArg_UnpackKeywordsWithVararg()
+        msg = r"invalid keyword argument for print\(\)$"
+        with self.assertRaisesRegex(TypeError, msg):
+            print(0, 1, **{BadStr('foo'): ','})
+
+    def test_varargs19_kw(self):
+        # _PyArg_UnpackKeywords()
+        msg = r"invalid keyword argument for round\(\)$"
+        with self.assertRaisesRegex(TypeError, msg):
+            round(1.75, **{BadStr('foo'): 1})
+
     def test_oldargs0_1(self):
         msg = r"keys\(\) takes no arguments \(1 given\)"
         self.assertRaisesRegex(TypeError, msg, {}.keys, 0)
diff --git a/Lib/test/test_getargs2.py b/Lib/test/test_getargs2.py
index fd1952c5845db..72b6d64a49863 100644
--- a/Lib/test/test_getargs2.py
+++ b/Lib/test/test_getargs2.py
@@ -747,6 +747,33 @@ def test_surrogate_keyword(self):
             "'\udc80' is an invalid keyword argument for this function"):
             getargs_keyword_only(1, 2, **{'\uDC80': 10})
 
+    def test_weird_str_subclass(self):
+        class BadStr(str):
+            def __eq__(self, other):
+                return True
+            def __hash__(self):
+                # Guaranteed different hash
+                return str.__hash__(self) ^ 3
+        with self.assertRaisesRegex(TypeError,
+            "invalid keyword argument for this function"):
+            getargs_keyword_only(1, 2, **{BadStr("keyword_only"): 3})
+        with self.assertRaisesRegex(TypeError,
+            "invalid keyword argument for this function"):
+            getargs_keyword_only(1, 2, **{BadStr("monster"): 666})
+
+    def test_weird_str_subclass2(self):
+        class BadStr(str):
+            def __eq__(self, other):
+                return False
+            def __hash__(self):
+                return str.__hash__(self)
+        with self.assertRaisesRegex(TypeError,
+            "invalid keyword argument for this function"):
+            getargs_keyword_only(1, 2, **{BadStr("keyword_only"): 3})
+        with self.assertRaisesRegex(TypeError,
+            "invalid keyword argument for this function"):
+            getargs_keyword_only(1, 2, **{BadStr("monster"): 666})
+
 
 class PositionalOnlyAndKeywords_TestCase(unittest.TestCase):
     from _testcapi import getargs_positional_only_and_keywords as getargs
diff --git a/Misc/NEWS.d/next/Core and Builtins/2022-07-19-09-41-55.gh-issue-94938.xYBlM7.rst b/Misc/NEWS.d/next/Core and Builtins/2022-07-19-09-41-55.gh-issue-94938.xYBlM7.rst
new file mode 100644
index 0000000000000..cc4feae685f23
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2022-07-19-09-41-55.gh-issue-94938.xYBlM7.rst	
@@ -0,0 +1,3 @@
+Fix error detection in some builtin functions when keyword argument name is
+an instance of a str subclass with overloaded ``__eq__`` and ``__hash__``.
+Previously it could cause SystemError or other undesired behavior.
diff --git a/Python/getargs.c b/Python/getargs.c
index 4b5fd1c93bdb5..c3e3cf155b870 100644
--- a/Python/getargs.c
+++ b/Python/getargs.c
@@ -1554,6 +1554,50 @@ _PyArg_VaParseTupleAndKeywordsFast_SizeT(PyObject *args, PyObject *keywords,
     return retval;
 }
 
+static void
+error_unexpected_keyword_arg(PyObject *kwargs, PyObject *kwnames, PyObject *kwtuple, const char *fname)
+{
+    /* make sure there are no extraneous keyword arguments */
+    Py_ssize_t j = 0;
+    while (1) {
+        PyObject *keyword;
+        if (kwargs != NULL) {
+            if (!PyDict_Next(kwargs, &j, &keyword, NULL))
+                break;
+        }
+        else {
+            if (j >= PyTuple_GET_SIZE(kwnames))
+                break;
+            keyword = PyTuple_GET_ITEM(kwnames, j);
+            j++;
+        }
+        if (!PyUnicode_Check(keyword)) {
+            PyErr_SetString(PyExc_TypeError,
+                            "keywords must be strings");
+            return;
+        }
+
+        int match = PySequence_Contains(kwtuple, keyword);
+        if (match <= 0) {
+            if (!match) {
+                PyErr_Format(PyExc_TypeError,
+                             "'%S' is an invalid keyword "
+                             "argument for %.200s%s",
+                             keyword,
+                             (fname == NULL) ? "this function" : fname,
+                             (fname == NULL) ? "" : "()");
+            }
+            return;
+        }
+    }
+    /* Something wrong happened. There are extraneous keyword arguments,
+     * but we don't know what. And we don't bother. */
+    PyErr_Format(PyExc_TypeError,
+                 "invalid keyword argument for %.200s%s",
+                 (fname == NULL) ? "this function" : fname,
+                 (fname == NULL) ? "" : "()");
+}
+
 int
 PyArg_ValidateKeywordArguments(PyObject *kwargs)
 {
@@ -1842,6 +1886,13 @@ vgetargskeywords(PyObject *args, PyObject *kwargs, const char *format,
                 return cleanreturn(0, &freelist);
             }
         }
+        /* Something wrong happened. There are extraneous keyword arguments,
+         * but we don't know what. And we don't bother. */
+        PyErr_Format(PyExc_TypeError,
+                     "invalid keyword argument for %.200s%s",
+                     (fname == NULL) ? "this function" : fname,
+                     (fname == NULL) ? "" : "()");
+        return cleanreturn(0, &freelist);
     }
 
     return cleanreturn(1, &freelist);
@@ -2184,7 +2235,6 @@ vgetargskeywordsfast_impl(PyObject *const *args, Py_ssize_t nargs,
     assert(IS_END_OF_FORMAT(*format) || (*format == '|') || (*format == '$'));
 
     if (nkwargs > 0) {
-        Py_ssize_t j;
         /* make sure there are no arguments given by name and position */
         for (i = pos; i < nargs; i++) {
             keyword = PyTuple_GET_ITEM(kwtuple, i - pos);
@@ -2208,34 +2258,9 @@ vgetargskeywordsfast_impl(PyObject *const *args, Py_ssize_t nargs,
                 return cleanreturn(0, &freelist);
             }
         }
-        /* make sure there are no extraneous keyword arguments */
-        j = 0;
-        while (1) {
-            int match;
-            if (kwargs != NULL) {
-                if (!PyDict_Next(kwargs, &j, &keyword, NULL))
-                    break;
-            }
-            else {
-                if (j >= PyTuple_GET_SIZE(kwnames))
-                    break;
-                keyword = PyTuple_GET_ITEM(kwnames, j);
-                j++;
-            }
 
-            match = PySequence_Contains(kwtuple, keyword);
-            if (match <= 0) {
-                if (!match) {
-                    PyErr_Format(PyExc_TypeError,
-                                 "'%S' is an invalid keyword "
-                                 "argument for %.200s%s",
-                                 keyword,
-                                 (parser->fname == NULL) ? "this function" : parser->fname,
-                                 (parser->fname == NULL) ? "" : "()");
-                }
-                return cleanreturn(0, &freelist);
-            }
-        }
+        error_unexpected_keyword_arg(kwargs, kwnames, kwtuple, parser->fname);
+        return cleanreturn(0, &freelist);
     }
 
     return cleanreturn(1, &freelist);
@@ -2409,7 +2434,6 @@ _PyArg_UnpackKeywords(PyObject *const *args, Py_ssize_t nargs,
     }
 
     if (nkwargs > 0) {
-        Py_ssize_t j;
         /* make sure there are no arguments given by name and position */
         for (i = posonly; i < nargs; i++) {
             keyword = PyTuple_GET_ITEM(kwtuple, i - posonly);
@@ -2433,34 +2457,9 @@ _PyArg_UnpackKeywords(PyObject *const *args, Py_ssize_t nargs,
                 return NULL;
             }
         }
-        /* make sure there are no extraneous keyword arguments */
-        j = 0;
-        while (1) {
-            int match;
-            if (kwargs != NULL) {
-                if (!PyDict_Next(kwargs, &j, &keyword, NULL))
-                    break;
-            }
-            else {
-                if (j >= PyTuple_GET_SIZE(kwnames))
-                    break;
-                keyword = PyTuple_GET_ITEM(kwnames, j);
-                j++;
-            }
 
-            match = PySequence_Contains(kwtuple, keyword);
-            if (match <= 0) {
-                if (!match) {
-                    PyErr_Format(PyExc_TypeError,
-                                 "'%S' is an invalid keyword "
-                                 "argument for %.200s%s",
-                                 keyword,
-                                 (parser->fname == NULL) ? "this function" : parser->fname,
-                                 (parser->fname == NULL) ? "" : "()");
-                }
-                return NULL;
-            }
-        }
+        error_unexpected_keyword_arg(kwargs, kwnames, kwtuple, parser->fname);
+        return NULL;
     }
 
     return buf;
@@ -2589,35 +2588,8 @@ _PyArg_UnpackKeywordsWithVararg(PyObject *const *args, Py_ssize_t nargs,
     }
 
     if (nkwargs > 0) {
-        Py_ssize_t j;
-        /* make sure there are no extraneous keyword arguments */
-        j = 0;
-        while (1) {
-            int match;
-            if (kwargs != NULL) {
-                if (!PyDict_Next(kwargs, &j, &keyword, NULL))
-                    break;
-            }
-            else {
-                if (j >= PyTuple_GET_SIZE(kwnames))
-                    break;
-                keyword = PyTuple_GET_ITEM(kwnames, j);
-                j++;
-            }
-
-            match = PySequence_Contains(kwtuple, keyword);
-            if (match <= 0) {
-                if (!match) {
-                    PyErr_Format(PyExc_TypeError,
-                                 "'%S' is an invalid keyword "
-                                 "argument for %.200s%s",
-                                 keyword,
-                                 (parser->fname == NULL) ? "this function" : parser->fname,
-                                 (parser->fname == NULL) ? "" : "()");
-                }
-                goto exit;
-            }
-        }
+        error_unexpected_keyword_arg(kwargs, kwnames, kwtuple, parser->fname);
+        goto exit;
     }
 
     return buf;


From webhook-mailer at python.org  Thu Jul 28 02:52:05 2022
From: webhook-mailer at python.org (serhiy-storchaka)
Date: Thu, 28 Jul 2022 06:52:05 -0000
Subject: [Python-checkins] [3.10] gh-94938: Fix errror detection of
 unexpected keyword arguments (GH-94999) (GH-95354)
Message-ID: <mailman.317.1658991125.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/563f0584c9aa80457f3478c2470b603721479eb0
commit: 563f0584c9aa80457f3478c2470b603721479eb0
branch: 3.10
author: Serhiy Storchaka <storchaka at gmail.com>
committer: serhiy-storchaka <storchaka at gmail.com>
date: 2022-07-28T09:52:00+03:00
summary:

[3.10] gh-94938: Fix errror detection of unexpected keyword arguments (GH-94999) (GH-95354)

When keyword argument name is an instance of a str subclass with
overloaded methods __eq__ and __hash__, the former code could not find
the name of an extraneous keyword argument to report an error, and
_PyArg_UnpackKeywords() returned success without setting the
corresponding cell in the linearized arguments array. But since the number
of expected initialized cells is determined as the total number of passed
arguments, this lead to reading NULL as a keyword parameter value, that
caused SystemError or crash or other undesired behavior..
(cherry picked from commit ebad53a4dc1bb591820724a22cef9b8459185b5f)

Co-authored-by: Serhiy Storchaka <storchaka at gmail.com>

files:
A Misc/NEWS.d/next/Core and Builtins/2022-07-19-09-41-55.gh-issue-94938.xYBlM7.rst
M Lib/test/test_call.py
M Lib/test/test_getargs2.py
M Python/getargs.c

diff --git a/Lib/test/test_call.py b/Lib/test/test_call.py
index 3f459222748b3..91ef9c94695c1 100644
--- a/Lib/test/test_call.py
+++ b/Lib/test/test_call.py
@@ -11,6 +11,19 @@
 import contextlib
 
 
+class BadStr(str):
+    def __eq__(self, other):
+        return True
+    def __hash__(self):
+        # Guaranteed different hash
+        return str.__hash__(self) ^ 3
+
+    def __eq__(self, other):
+        return False
+    def __hash__(self):
+        return str.__hash__(self)
+
+
 class FunctionCalls(unittest.TestCase):
 
     def test_kwargs_order(self):
@@ -133,6 +146,18 @@ def test_varargs17_kw(self):
         self.assertRaisesRegex(TypeError, msg,
                                print, 0, sep=1, end=2, file=3, flush=4, foo=5)
 
+    def test_varargs18_kw(self):
+        # _PyArg_UnpackKeywordsWithVararg()
+        msg = r"invalid keyword argument for print\(\)$"
+        with self.assertRaisesRegex(TypeError, msg):
+            print(0, 1, **{BadStr('foo'): ','})
+
+    def test_varargs19_kw(self):
+        # _PyArg_UnpackKeywords()
+        msg = r"invalid keyword argument for round\(\)$"
+        with self.assertRaisesRegex(TypeError, msg):
+            round(1.75, **{BadStr('foo'): 1})
+
     def test_oldargs0_1(self):
         msg = r"keys\(\) takes no arguments \(1 given\)"
         self.assertRaisesRegex(TypeError, msg, {}.keys, 0)
diff --git a/Lib/test/test_getargs2.py b/Lib/test/test_getargs2.py
index fd1952c5845db..72b6d64a49863 100644
--- a/Lib/test/test_getargs2.py
+++ b/Lib/test/test_getargs2.py
@@ -747,6 +747,33 @@ def test_surrogate_keyword(self):
             "'\udc80' is an invalid keyword argument for this function"):
             getargs_keyword_only(1, 2, **{'\uDC80': 10})
 
+    def test_weird_str_subclass(self):
+        class BadStr(str):
+            def __eq__(self, other):
+                return True
+            def __hash__(self):
+                # Guaranteed different hash
+                return str.__hash__(self) ^ 3
+        with self.assertRaisesRegex(TypeError,
+            "invalid keyword argument for this function"):
+            getargs_keyword_only(1, 2, **{BadStr("keyword_only"): 3})
+        with self.assertRaisesRegex(TypeError,
+            "invalid keyword argument for this function"):
+            getargs_keyword_only(1, 2, **{BadStr("monster"): 666})
+
+    def test_weird_str_subclass2(self):
+        class BadStr(str):
+            def __eq__(self, other):
+                return False
+            def __hash__(self):
+                return str.__hash__(self)
+        with self.assertRaisesRegex(TypeError,
+            "invalid keyword argument for this function"):
+            getargs_keyword_only(1, 2, **{BadStr("keyword_only"): 3})
+        with self.assertRaisesRegex(TypeError,
+            "invalid keyword argument for this function"):
+            getargs_keyword_only(1, 2, **{BadStr("monster"): 666})
+
 
 class PositionalOnlyAndKeywords_TestCase(unittest.TestCase):
     from _testcapi import getargs_positional_only_and_keywords as getargs
diff --git a/Misc/NEWS.d/next/Core and Builtins/2022-07-19-09-41-55.gh-issue-94938.xYBlM7.rst b/Misc/NEWS.d/next/Core and Builtins/2022-07-19-09-41-55.gh-issue-94938.xYBlM7.rst
new file mode 100644
index 0000000000000..cc4feae685f23
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2022-07-19-09-41-55.gh-issue-94938.xYBlM7.rst	
@@ -0,0 +1,3 @@
+Fix error detection in some builtin functions when keyword argument name is
+an instance of a str subclass with overloaded ``__eq__`` and ``__hash__``.
+Previously it could cause SystemError or other undesired behavior.
diff --git a/Python/getargs.c b/Python/getargs.c
index d92ea2d8e6b46..fd49ee0f05d4f 100644
--- a/Python/getargs.c
+++ b/Python/getargs.c
@@ -1553,6 +1553,50 @@ _PyArg_VaParseTupleAndKeywordsFast_SizeT(PyObject *args, PyObject *keywords,
     return retval;
 }
 
+static void
+error_unexpected_keyword_arg(PyObject *kwargs, PyObject *kwnames, PyObject *kwtuple, const char *fname)
+{
+    /* make sure there are no extraneous keyword arguments */
+    Py_ssize_t j = 0;
+    while (1) {
+        PyObject *keyword;
+        if (kwargs != NULL) {
+            if (!PyDict_Next(kwargs, &j, &keyword, NULL))
+                break;
+        }
+        else {
+            if (j >= PyTuple_GET_SIZE(kwnames))
+                break;
+            keyword = PyTuple_GET_ITEM(kwnames, j);
+            j++;
+        }
+        if (!PyUnicode_Check(keyword)) {
+            PyErr_SetString(PyExc_TypeError,
+                            "keywords must be strings");
+            return;
+        }
+
+        int match = PySequence_Contains(kwtuple, keyword);
+        if (match <= 0) {
+            if (!match) {
+                PyErr_Format(PyExc_TypeError,
+                             "'%S' is an invalid keyword "
+                             "argument for %.200s%s",
+                             keyword,
+                             (fname == NULL) ? "this function" : fname,
+                             (fname == NULL) ? "" : "()");
+            }
+            return;
+        }
+    }
+    /* Something wrong happened. There are extraneous keyword arguments,
+     * but we don't know what. And we don't bother. */
+    PyErr_Format(PyExc_TypeError,
+                 "invalid keyword argument for %.200s%s",
+                 (fname == NULL) ? "this function" : fname,
+                 (fname == NULL) ? "" : "()");
+}
+
 int
 PyArg_ValidateKeywordArguments(PyObject *kwargs)
 {
@@ -1841,6 +1885,13 @@ vgetargskeywords(PyObject *args, PyObject *kwargs, const char *format,
                 return cleanreturn(0, &freelist);
             }
         }
+        /* Something wrong happened. There are extraneous keyword arguments,
+         * but we don't know what. And we don't bother. */
+        PyErr_Format(PyExc_TypeError,
+                     "invalid keyword argument for %.200s%s",
+                     (fname == NULL) ? "this function" : fname,
+                     (fname == NULL) ? "" : "()");
+        return cleanreturn(0, &freelist);
     }
 
     return cleanreturn(1, &freelist);
@@ -2183,7 +2234,6 @@ vgetargskeywordsfast_impl(PyObject *const *args, Py_ssize_t nargs,
     assert(IS_END_OF_FORMAT(*format) || (*format == '|') || (*format == '$'));
 
     if (nkwargs > 0) {
-        Py_ssize_t j;
         /* make sure there are no arguments given by name and position */
         for (i = pos; i < nargs; i++) {
             keyword = PyTuple_GET_ITEM(kwtuple, i - pos);
@@ -2207,34 +2257,9 @@ vgetargskeywordsfast_impl(PyObject *const *args, Py_ssize_t nargs,
                 return cleanreturn(0, &freelist);
             }
         }
-        /* make sure there are no extraneous keyword arguments */
-        j = 0;
-        while (1) {
-            int match;
-            if (kwargs != NULL) {
-                if (!PyDict_Next(kwargs, &j, &keyword, NULL))
-                    break;
-            }
-            else {
-                if (j >= PyTuple_GET_SIZE(kwnames))
-                    break;
-                keyword = PyTuple_GET_ITEM(kwnames, j);
-                j++;
-            }
 
-            match = PySequence_Contains(kwtuple, keyword);
-            if (match <= 0) {
-                if (!match) {
-                    PyErr_Format(PyExc_TypeError,
-                                 "'%S' is an invalid keyword "
-                                 "argument for %.200s%s",
-                                 keyword,
-                                 (parser->fname == NULL) ? "this function" : parser->fname,
-                                 (parser->fname == NULL) ? "" : "()");
-                }
-                return cleanreturn(0, &freelist);
-            }
-        }
+        error_unexpected_keyword_arg(kwargs, kwnames, kwtuple, parser->fname);
+        return cleanreturn(0, &freelist);
     }
 
     return cleanreturn(1, &freelist);
@@ -2408,7 +2433,6 @@ _PyArg_UnpackKeywords(PyObject *const *args, Py_ssize_t nargs,
     }
 
     if (nkwargs > 0) {
-        Py_ssize_t j;
         /* make sure there are no arguments given by name and position */
         for (i = posonly; i < nargs; i++) {
             keyword = PyTuple_GET_ITEM(kwtuple, i - posonly);
@@ -2432,34 +2456,9 @@ _PyArg_UnpackKeywords(PyObject *const *args, Py_ssize_t nargs,
                 return NULL;
             }
         }
-        /* make sure there are no extraneous keyword arguments */
-        j = 0;
-        while (1) {
-            int match;
-            if (kwargs != NULL) {
-                if (!PyDict_Next(kwargs, &j, &keyword, NULL))
-                    break;
-            }
-            else {
-                if (j >= PyTuple_GET_SIZE(kwnames))
-                    break;
-                keyword = PyTuple_GET_ITEM(kwnames, j);
-                j++;
-            }
 
-            match = PySequence_Contains(kwtuple, keyword);
-            if (match <= 0) {
-                if (!match) {
-                    PyErr_Format(PyExc_TypeError,
-                                 "'%S' is an invalid keyword "
-                                 "argument for %.200s%s",
-                                 keyword,
-                                 (parser->fname == NULL) ? "this function" : parser->fname,
-                                 (parser->fname == NULL) ? "" : "()");
-                }
-                return NULL;
-            }
-        }
+        error_unexpected_keyword_arg(kwargs, kwnames, kwtuple, parser->fname);
+        return NULL;
     }
 
     return buf;


From webhook-mailer at python.org  Thu Jul 28 05:17:59 2022
From: webhook-mailer at python.org (markshannon)
Date: Thu, 28 Jul 2022 09:17:59 -0000
Subject: [Python-checkins] GH-90081: Run python tracers at full speed
 (GH-95328)
Message-ID: <mailman.318.1658999880.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/b8b2990fb3218cffedfe7bc92e9e7ae2275b3c98
commit: b8b2990fb3218cffedfe7bc92e9e7ae2275b3c98
branch: main
author: Mark Shannon <mark at hotpy.org>
committer: markshannon <mark at hotpy.org>
date: 2022-07-28T10:17:22+01:00
summary:

GH-90081: Run python tracers at full speed (GH-95328)

files:
A Misc/NEWS.d/next/Core and Builtins/2022-07-27-14-21-57.gh-issue-90081.HVAS5x.rst
M Include/internal/pycore_pystate.h
M Python/ceval.c

diff --git a/Include/internal/pycore_pystate.h b/Include/internal/pycore_pystate.h
index b4a39b62b76a1..51d119c23e731 100644
--- a/Include/internal/pycore_pystate.h
+++ b/Include/internal/pycore_pystate.h
@@ -131,8 +131,9 @@ PyAPI_FUNC(void) _PyThreadState_DeleteExcept(
 static inline void
 _PyThreadState_UpdateTracingState(PyThreadState *tstate)
 {
-    int use_tracing = (tstate->c_tracefunc != NULL
-                       || tstate->c_profilefunc != NULL);
+    bool use_tracing =
+        (tstate->tracing == 0) &&
+        (tstate->c_tracefunc != NULL || tstate->c_profilefunc != NULL);
     tstate->cframe->use_tracing = (use_tracing ? 255 : 0);
 }
 
diff --git a/Misc/NEWS.d/next/Core and Builtins/2022-07-27-14-21-57.gh-issue-90081.HVAS5x.rst b/Misc/NEWS.d/next/Core and Builtins/2022-07-27-14-21-57.gh-issue-90081.HVAS5x.rst
new file mode 100644
index 0000000000000..a3be34c175af6
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2022-07-27-14-21-57.gh-issue-90081.HVAS5x.rst	
@@ -0,0 +1,2 @@
+Run Python code in tracer/profiler function at full speed. Fixes slowdown in
+earlier versions of 3.11.
diff --git a/Python/ceval.c b/Python/ceval.c
index 3a9b0e569f02a..7ad26a70dd18c 100644
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -5631,7 +5631,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, _PyInterpreterFrame *frame, int
             assert(oparg);
             oparg <<= 8;
             oparg |= _Py_OPARG(*next_instr);
-            // We might be tracing. To avoid breaking tracing guarantees in 
+            // We might be tracing. To avoid breaking tracing guarantees in
             // quickened instructions, always deoptimize the next opcode:
             opcode = _PyOpcode_Deopt[_Py_OPCODE(*next_instr)];
             PRE_DISPATCH_GOTO();
@@ -5661,9 +5661,9 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, _PyInterpreterFrame *frame, int
         case DO_TRACING:
 #endif
     {
-        if (tstate->tracing == 0 &&
-            INSTR_OFFSET() >= frame->f_code->_co_firsttraceable
-        ) {
+        assert(cframe.use_tracing);
+        assert(tstate->tracing == 0);
+        if (INSTR_OFFSET() >= frame->f_code->_co_firsttraceable) {
             int instr_prev = _PyInterpreterFrame_LASTI(frame);
             frame->prev_instr = next_instr;
             TRACING_NEXTOPARG();
@@ -6875,12 +6875,15 @@ void
 PyThreadState_EnterTracing(PyThreadState *tstate)
 {
     tstate->tracing++;
+    tstate->cframe->use_tracing = 0;
 }
 
 void
 PyThreadState_LeaveTracing(PyThreadState *tstate)
 {
+    assert(tstate->tracing > 0 && tstate->cframe->use_tracing == 0);
     tstate->tracing--;
+    _PyThreadState_UpdateTracingState(tstate);
 }
 
 static int


From webhook-mailer at python.org  Thu Jul 28 05:20:20 2022
From: webhook-mailer at python.org (ambv)
Date: Thu, 28 Jul 2022 09:20:20 -0000
Subject: [Python-checkins] gh-95166: cancel map waited on future on timeout
 (GH-95169)
Message-ID: <mailman.319.1659000022.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/e16d4ed59072839b49bda4b447f260201aae7e39
commit: e16d4ed59072839b49bda4b447f260201aae7e39
branch: main
author: Thomas Grainger <tagrain at gmail.com>
committer: ambv <lukasz at langa.pl>
date: 2022-07-28T11:20:10+02:00
summary:

gh-95166: cancel map waited on future on timeout (GH-95169)

Co-authored-by: Kumar Aditya <59607654+kumaraditya303 at users.noreply.github.com>

files:
A Misc/NEWS.d/next/Library/2022-07-23-10-42-05.gh-issue-95166.xw6p3C.rst
M Lib/concurrent/futures/_base.py
M Lib/test/test_concurrent_futures.py

diff --git a/Lib/concurrent/futures/_base.py b/Lib/concurrent/futures/_base.py
index d7e7e41967cc2..6742a07753c92 100644
--- a/Lib/concurrent/futures/_base.py
+++ b/Lib/concurrent/futures/_base.py
@@ -310,6 +310,18 @@ def wait(fs, timeout=None, return_when=ALL_COMPLETED):
     done.update(waiter.finished_futures)
     return DoneAndNotDoneFutures(done, fs - done)
 
+
+def _result_or_cancel(fut, timeout=None):
+    try:
+        try:
+            return fut.result(timeout)
+        finally:
+            fut.cancel()
+    finally:
+        # Break a reference cycle with the exception in self._exception
+        del fut
+
+
 class Future(object):
     """Represents the result of an asynchronous computation."""
 
@@ -604,9 +616,9 @@ def result_iterator():
                 while fs:
                     # Careful not to keep a reference to the popped future
                     if timeout is None:
-                        yield fs.pop().result()
+                        yield _result_or_cancel(fs.pop())
                     else:
-                        yield fs.pop().result(end_time - time.monotonic())
+                        yield _result_or_cancel(fs.pop(), end_time - time.monotonic())
             finally:
                 for future in fs:
                     future.cancel()
diff --git a/Lib/test/test_concurrent_futures.py b/Lib/test/test_concurrent_futures.py
index e294bd3a0957c..fe9fdc4f44d37 100644
--- a/Lib/test/test_concurrent_futures.py
+++ b/Lib/test/test_concurrent_futures.py
@@ -932,6 +932,33 @@ def submit(pool):
                 with futures.ProcessPoolExecutor(1, mp_context=mp.get_context('fork')) as workers:
                     workers.submit(tuple)
 
+    def test_executor_map_current_future_cancel(self):
+        stop_event = threading.Event()
+        log = []
+
+        def log_n_wait(ident):
+            log.append(f"{ident=} started")
+            try:
+                stop_event.wait()
+            finally:
+                log.append(f"{ident=} stopped")
+
+        with self.executor_type(max_workers=1) as pool:
+            # submit work to saturate the pool
+            fut = pool.submit(log_n_wait, ident="first")
+            try:
+                with contextlib.closing(
+                    pool.map(log_n_wait, ["second", "third"], timeout=0)
+                ) as gen:
+                    with self.assertRaises(TimeoutError):
+                        next(gen)
+            finally:
+                stop_event.set()
+            fut.result()
+        # ident='second' is cancelled as a result of raising a TimeoutError
+        # ident='third' is cancelled because it remained in the collection of futures
+        self.assertListEqual(log, ["ident='first' started", "ident='first' stopped"])
+
 
 class ProcessPoolExecutorTest(ExecutorTest):
 
diff --git a/Misc/NEWS.d/next/Library/2022-07-23-10-42-05.gh-issue-95166.xw6p3C.rst b/Misc/NEWS.d/next/Library/2022-07-23-10-42-05.gh-issue-95166.xw6p3C.rst
new file mode 100644
index 0000000000000..34b017078436d
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2022-07-23-10-42-05.gh-issue-95166.xw6p3C.rst
@@ -0,0 +1 @@
+Fix :meth:`concurrent.futures.Executor.map` to cancel the currently waiting on future on an error - e.g. TimeoutError or KeyboardInterrupt.


From webhook-mailer at python.org  Thu Jul 28 06:00:49 2022
From: webhook-mailer at python.org (miss-islington)
Date: Thu, 28 Jul 2022 10:00:49 -0000
Subject: [Python-checkins] gh-95355: Check tokens[0] after allocating memory
 (GH-95356)
Message-ID: <mailman.320.1659002450.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/b946f529efb4a623ac4ad968d8091edb81ebdcdb
commit: b946f529efb4a623ac4ad968d8091edb81ebdcdb
branch: main
author: Honglin Zhu <zhuhonglin.zhl at alibaba-inc.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-28T03:00:34-07:00
summary:

gh-95355: Check tokens[0] after allocating memory (GH-95356)



#95355

Automerge-Triggered-By: GH:pablogsal

files:
A Misc/NEWS.d/next/Core and Builtins/2022-07-28-08-33-31.gh-issue-95355.yN4XVk.rst
M Parser/pegen.c

diff --git a/Misc/NEWS.d/next/Core and Builtins/2022-07-28-08-33-31.gh-issue-95355.yN4XVk.rst b/Misc/NEWS.d/next/Core and Builtins/2022-07-28-08-33-31.gh-issue-95355.yN4XVk.rst
new file mode 100644
index 0000000000000..6a289991e0d60
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2022-07-28-08-33-31.gh-issue-95355.yN4XVk.rst	
@@ -0,0 +1 @@
+``_PyPegen_Parser_New`` now properly detects token memory allocation errors. Patch by Honglin Zhu.
diff --git a/Parser/pegen.c b/Parser/pegen.c
index dbf105aedcf42..31e3ec05a1053 100644
--- a/Parser/pegen.c
+++ b/Parser/pegen.c
@@ -738,7 +738,7 @@ _PyPegen_Parser_New(struct tok_state *tok, int start_rule, int flags,
         return (Parser *) PyErr_NoMemory();
     }
     p->tokens[0] = PyMem_Calloc(1, sizeof(Token));
-    if (!p->tokens) {
+    if (!p->tokens[0]) {
         PyMem_Free(p->tokens);
         PyMem_Free(p);
         return (Parser *) PyErr_NoMemory();


From webhook-mailer at python.org  Thu Jul 28 06:24:41 2022
From: webhook-mailer at python.org (erlend-aasland)
Date: Thu, 28 Jul 2022 10:24:41 -0000
Subject: [Python-checkins] [3.11] GH-93899: fix checks for eventfd flags
 (GH-95170). (#95342)
Message-ID: <mailman.321.1659003882.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/7813d976aeaabea0a232f3c782e4fc25fe93a27d
commit: 7813d976aeaabea0a232f3c782e4fc25fe93a27d
branch: 3.11
author: Kumar Aditya <59607654+kumaraditya303 at users.noreply.github.com>
committer: erlend-aasland <erlend.aasland at protonmail.com>
date: 2022-07-28T12:24:36+02:00
summary:

[3.11] GH-93899: fix checks for eventfd flags  (GH-95170). (#95342)

(cherry picked from commit 4dd099bafff14639ef5d2185965016d8f253353f)

Co-authored-by: Kumar Aditya <59607654+kumaraditya303 at users.noreply.github.com>

files:
A Misc/NEWS.d/next/Library/2022-07-23-10-50-05.gh-issue-93899.VT34A5.rst
M Modules/clinic/posixmodule.c.h
M Modules/posixmodule.c

diff --git a/Misc/NEWS.d/next/Library/2022-07-23-10-50-05.gh-issue-93899.VT34A5.rst b/Misc/NEWS.d/next/Library/2022-07-23-10-50-05.gh-issue-93899.VT34A5.rst
new file mode 100644
index 0000000000000..e63475f8ba96f
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2022-07-23-10-50-05.gh-issue-93899.VT34A5.rst
@@ -0,0 +1 @@
+Fix check for existence of :data:`os.EFD_CLOEXEC`, :data:`os.EFD_NONBLOCK` and :data:`os.EFD_SEMAPHORE` flags on older kernel versions where these flags are not present. Patch by Kumar Aditya.
diff --git a/Modules/clinic/posixmodule.c.h b/Modules/clinic/posixmodule.c.h
index d62b09ed7406e..aaf3bf33b5352 100644
--- a/Modules/clinic/posixmodule.c.h
+++ b/Modules/clinic/posixmodule.c.h
@@ -7887,7 +7887,7 @@ os_memfd_create(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObj
 
 #endif /* defined(HAVE_MEMFD_CREATE) */
 
-#if defined(HAVE_EVENTFD)
+#if (defined(HAVE_EVENTFD) && defined(EFD_CLOEXEC))
 
 PyDoc_STRVAR(os_eventfd__doc__,
 "eventfd($module, /, initval, flags=EFD_CLOEXEC)\n"
@@ -7933,9 +7933,9 @@ os_eventfd(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObject *
     return return_value;
 }
 
-#endif /* defined(HAVE_EVENTFD) */
+#endif /* (defined(HAVE_EVENTFD) && defined(EFD_CLOEXEC)) */
 
-#if defined(HAVE_EVENTFD)
+#if (defined(HAVE_EVENTFD) && defined(EFD_CLOEXEC))
 
 PyDoc_STRVAR(os_eventfd_read__doc__,
 "eventfd_read($module, /, fd)\n"
@@ -7971,9 +7971,9 @@ os_eventfd_read(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObj
     return return_value;
 }
 
-#endif /* defined(HAVE_EVENTFD) */
+#endif /* (defined(HAVE_EVENTFD) && defined(EFD_CLOEXEC)) */
 
-#if defined(HAVE_EVENTFD)
+#if (defined(HAVE_EVENTFD) && defined(EFD_CLOEXEC))
 
 PyDoc_STRVAR(os_eventfd_write__doc__,
 "eventfd_write($module, /, fd, value)\n"
@@ -8013,7 +8013,7 @@ os_eventfd_write(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyOb
     return return_value;
 }
 
-#endif /* defined(HAVE_EVENTFD) */
+#endif /* (defined(HAVE_EVENTFD) && defined(EFD_CLOEXEC)) */
 
 #if (defined(TERMSIZE_USE_CONIO) || defined(TERMSIZE_USE_IOCTL))
 
@@ -9370,4 +9370,4 @@ os_waitstatus_to_exitcode(PyObject *module, PyObject *const *args, Py_ssize_t na
 #ifndef OS_WAITSTATUS_TO_EXITCODE_METHODDEF
     #define OS_WAITSTATUS_TO_EXITCODE_METHODDEF
 #endif /* !defined(OS_WAITSTATUS_TO_EXITCODE_METHODDEF) */
-/*[clinic end generated code: output=6150bcc25f5e4bc7 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=2a53748bcf001a3f input=a9049054013a1b77]*/
diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
index d7cac2b67ffdf..f97013fa7a9d0 100644
--- a/Modules/posixmodule.c
+++ b/Modules/posixmodule.c
@@ -13134,7 +13134,7 @@ os_memfd_create_impl(PyObject *module, PyObject *name, unsigned int flags)
 }
 #endif
 
-#ifdef HAVE_EVENTFD
+#if defined(HAVE_EVENTFD) && defined(EFD_CLOEXEC)
 /*[clinic input]
 os.eventfd
 
@@ -13205,7 +13205,7 @@ os_eventfd_write_impl(PyObject *module, int fd, unsigned long long value)
     }
     Py_RETURN_NONE;
 }
-#endif  /* HAVE_EVENTFD */
+#endif  /* HAVE_EVENTFD && EFD_CLOEXEC */
 
 /* Terminal size querying */
 
@@ -15505,11 +15505,15 @@ all_ins(PyObject *m)
 #endif
 #endif /* HAVE_MEMFD_CREATE */
 
-#ifdef HAVE_EVENTFD
+#if defined(HAVE_EVENTFD) && defined(EFD_CLOEXEC)
     if (PyModule_AddIntMacro(m, EFD_CLOEXEC)) return -1;
+#ifdef EFD_NONBLOCK
     if (PyModule_AddIntMacro(m, EFD_NONBLOCK)) return -1;
+#endif
+#ifdef EFD_SEMAPHORE
     if (PyModule_AddIntMacro(m, EFD_SEMAPHORE)) return -1;
 #endif
+#endif  /* HAVE_EVENTFD && EFD_CLOEXEC */
 
 #if defined(__APPLE__)
     if (PyModule_AddIntConstant(m, "_COPYFILE_DATA", COPYFILE_DATA)) return -1;


From webhook-mailer at python.org  Thu Jul 28 06:24:52 2022
From: webhook-mailer at python.org (erlend-aasland)
Date: Thu, 28 Jul 2022 10:24:52 -0000
Subject: [Python-checkins] [3.10] GH-93899: fix checks for eventfd flags
 (GH-95170). (#95345)
Message-ID: <mailman.322.1659003893.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/4ad222991fcd532b26c0f47a62f4cb751c7dc777
commit: 4ad222991fcd532b26c0f47a62f4cb751c7dc777
branch: 3.10
author: Kumar Aditya <59607654+kumaraditya303 at users.noreply.github.com>
committer: erlend-aasland <erlend.aasland at protonmail.com>
date: 2022-07-28T12:24:47+02:00
summary:

[3.10] GH-93899: fix checks for eventfd flags  (GH-95170). (#95345)

(cherry picked from commit 4dd099bafff14639ef5d2185965016d8f253353f)

Co-authored-by: Kumar Aditya <59607654+kumaraditya303 at users.noreply.github.com>

files:
A Misc/NEWS.d/next/Library/2022-07-23-10-50-05.gh-issue-93899.VT34A5.rst
M Modules/clinic/posixmodule.c.h
M Modules/posixmodule.c

diff --git a/Misc/NEWS.d/next/Library/2022-07-23-10-50-05.gh-issue-93899.VT34A5.rst b/Misc/NEWS.d/next/Library/2022-07-23-10-50-05.gh-issue-93899.VT34A5.rst
new file mode 100644
index 0000000000000..e63475f8ba96f
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2022-07-23-10-50-05.gh-issue-93899.VT34A5.rst
@@ -0,0 +1 @@
+Fix check for existence of :data:`os.EFD_CLOEXEC`, :data:`os.EFD_NONBLOCK` and :data:`os.EFD_SEMAPHORE` flags on older kernel versions where these flags are not present. Patch by Kumar Aditya.
diff --git a/Modules/clinic/posixmodule.c.h b/Modules/clinic/posixmodule.c.h
index 742acb8e6c07e..a3d06328c903a 100644
--- a/Modules/clinic/posixmodule.c.h
+++ b/Modules/clinic/posixmodule.c.h
@@ -7816,7 +7816,7 @@ os_memfd_create(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObj
 
 #endif /* defined(HAVE_MEMFD_CREATE) */
 
-#if defined(HAVE_EVENTFD)
+#if (defined(HAVE_EVENTFD) && defined(EFD_CLOEXEC))
 
 PyDoc_STRVAR(os_eventfd__doc__,
 "eventfd($module, /, initval, flags=EFD_CLOEXEC)\n"
@@ -7862,9 +7862,9 @@ os_eventfd(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObject *
     return return_value;
 }
 
-#endif /* defined(HAVE_EVENTFD) */
+#endif /* (defined(HAVE_EVENTFD) && defined(EFD_CLOEXEC)) */
 
-#if defined(HAVE_EVENTFD)
+#if (defined(HAVE_EVENTFD) && defined(EFD_CLOEXEC))
 
 PyDoc_STRVAR(os_eventfd_read__doc__,
 "eventfd_read($module, /, fd)\n"
@@ -7900,9 +7900,9 @@ os_eventfd_read(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObj
     return return_value;
 }
 
-#endif /* defined(HAVE_EVENTFD) */
+#endif /* (defined(HAVE_EVENTFD) && defined(EFD_CLOEXEC)) */
 
-#if defined(HAVE_EVENTFD)
+#if (defined(HAVE_EVENTFD) && defined(EFD_CLOEXEC))
 
 PyDoc_STRVAR(os_eventfd_write__doc__,
 "eventfd_write($module, /, fd, value)\n"
@@ -7942,7 +7942,7 @@ os_eventfd_write(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyOb
     return return_value;
 }
 
-#endif /* defined(HAVE_EVENTFD) */
+#endif /* (defined(HAVE_EVENTFD) && defined(EFD_CLOEXEC)) */
 
 #if (defined(TERMSIZE_USE_CONIO) || defined(TERMSIZE_USE_IOCTL))
 
@@ -9291,4 +9291,4 @@ os_waitstatus_to_exitcode(PyObject *module, PyObject *const *args, Py_ssize_t na
 #ifndef OS_WAITSTATUS_TO_EXITCODE_METHODDEF
     #define OS_WAITSTATUS_TO_EXITCODE_METHODDEF
 #endif /* !defined(OS_WAITSTATUS_TO_EXITCODE_METHODDEF) */
-/*[clinic end generated code: output=debefcf43738ec66 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=73be33fa0000a6d1 input=a9049054013a1b77]*/
diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
index 26c8e7bc2804d..3d74b22f7288a 100644
--- a/Modules/posixmodule.c
+++ b/Modules/posixmodule.c
@@ -13044,7 +13044,7 @@ os_memfd_create_impl(PyObject *module, PyObject *name, unsigned int flags)
 }
 #endif
 
-#ifdef HAVE_EVENTFD
+#if defined(HAVE_EVENTFD) && defined(EFD_CLOEXEC)
 /*[clinic input]
 os.eventfd
 
@@ -13115,7 +13115,7 @@ os_eventfd_write_impl(PyObject *module, int fd, unsigned long long value)
     }
     Py_RETURN_NONE;
 }
-#endif  /* HAVE_EVENTFD */
+#endif  /* HAVE_EVENTFD && EFD_CLOEXEC */
 
 /* Terminal size querying */
 
@@ -15401,11 +15401,15 @@ all_ins(PyObject *m)
 #endif
 #endif /* HAVE_MEMFD_CREATE */
 
-#ifdef HAVE_EVENTFD
+#if defined(HAVE_EVENTFD) && defined(EFD_CLOEXEC)
     if (PyModule_AddIntMacro(m, EFD_CLOEXEC)) return -1;
+#ifdef EFD_NONBLOCK
     if (PyModule_AddIntMacro(m, EFD_NONBLOCK)) return -1;
+#endif
+#ifdef EFD_SEMAPHORE
     if (PyModule_AddIntMacro(m, EFD_SEMAPHORE)) return -1;
 #endif
+#endif  /* HAVE_EVENTFD && EFD_CLOEXEC */
 
 #if defined(__APPLE__)
     if (PyModule_AddIntConstant(m, "_COPYFILE_DATA", COPYFILE_DATA)) return -1;


From webhook-mailer at python.org  Thu Jul 28 06:30:03 2022
From: webhook-mailer at python.org (miss-islington)
Date: Thu, 28 Jul 2022 10:30:03 -0000
Subject: [Python-checkins] gh-95355: Check tokens[0] after allocating memory
 (GH-95356)
Message-ID: <mailman.323.1659004204.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/d3cc99bdce269ff8836bee9fc6f6c275b42a5152
commit: d3cc99bdce269ff8836bee9fc6f6c275b42a5152
branch: 3.11
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-28T03:29:50-07:00
summary:

gh-95355: Check tokens[0] after allocating memory (GH-95356)


GH-95355

Automerge-Triggered-By: GH:pablogsal
(cherry picked from commit b946f529efb4a623ac4ad968d8091edb81ebdcdb)

Co-authored-by: Honglin Zhu <zhuhonglin.zhl at alibaba-inc.com>

files:
A Misc/NEWS.d/next/Core and Builtins/2022-07-28-08-33-31.gh-issue-95355.yN4XVk.rst
M Parser/pegen.c

diff --git a/Misc/NEWS.d/next/Core and Builtins/2022-07-28-08-33-31.gh-issue-95355.yN4XVk.rst b/Misc/NEWS.d/next/Core and Builtins/2022-07-28-08-33-31.gh-issue-95355.yN4XVk.rst
new file mode 100644
index 0000000000000..6a289991e0d60
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2022-07-28-08-33-31.gh-issue-95355.yN4XVk.rst	
@@ -0,0 +1 @@
+``_PyPegen_Parser_New`` now properly detects token memory allocation errors. Patch by Honglin Zhu.
diff --git a/Parser/pegen.c b/Parser/pegen.c
index 143461d44a1a4..e093de3817e27 100644
--- a/Parser/pegen.c
+++ b/Parser/pegen.c
@@ -744,7 +744,7 @@ _PyPegen_Parser_New(struct tok_state *tok, int start_rule, int flags,
         return (Parser *) PyErr_NoMemory();
     }
     p->tokens[0] = PyMem_Calloc(1, sizeof(Token));
-    if (!p->tokens) {
+    if (!p->tokens[0]) {
         PyMem_Free(p->tokens);
         PyMem_Free(p);
         return (Parser *) PyErr_NoMemory();


From webhook-mailer at python.org  Thu Jul 28 06:32:28 2022
From: webhook-mailer at python.org (erlend-aasland)
Date: Thu, 28 Jul 2022 10:32:28 -0000
Subject: [Python-checkins] Docs: Fix refs & tweak wording in sqlite3 'Using
 shortcut methods' (#95358)
Message-ID: <mailman.324.1659004349.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/dcb6fa8099ce1879b064b00f80f38cfbdee3a0de
commit: dcb6fa8099ce1879b064b00f80f38cfbdee3a0de
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: erlend-aasland <erlend.aasland at protonmail.com>
date: 2022-07-28T12:32:20+02:00
summary:

Docs: Fix refs & tweak wording in sqlite3 'Using shortcut methods' (#95358)

Co-authored-by: CAM Gerlach <CAM.Gerlach at Gerlach.CAM>
(cherry picked from commit ea269b9a380a52828d4e401fa695737bcd699398)

Co-authored-by: Erlend Egeberg Aasland <erlend.aasland at protonmail.com>

files:
M Doc/library/sqlite3.rst

diff --git a/Doc/library/sqlite3.rst b/Doc/library/sqlite3.rst
index 3ce598c6ff1af..87c648ddda18a 100644
--- a/Doc/library/sqlite3.rst
+++ b/Doc/library/sqlite3.rst
@@ -1336,8 +1336,9 @@ Using :mod:`sqlite3` efficiently
 Using shortcut methods
 ^^^^^^^^^^^^^^^^^^^^^^
 
-Using the nonstandard :meth:`execute`, :meth:`executemany` and
-:meth:`executescript` methods of the :class:`Connection` object, your code can
+Using the :meth:`~Connection.execute`,
+:meth:`~Connection.executemany`, and :meth:`~Connection.executescript`
+methods of the :class:`Connection` class, your code can
 be written more concisely because you don't have to create the (often
 superfluous) :class:`Cursor` objects explicitly. Instead, the :class:`Cursor`
 objects are created implicitly and these shortcut methods return the cursor


From webhook-mailer at python.org  Thu Jul 28 06:33:01 2022
From: webhook-mailer at python.org (erlend-aasland)
Date: Thu, 28 Jul 2022 10:33:01 -0000
Subject: [Python-checkins] Docs: Fix refs & tweak wording in sqlite3 'Using
 shortcut methods' (#95357)
Message-ID: <mailman.325.1659004381.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/123079241db8c15af6bf206e2f390ed6a9736231
commit: 123079241db8c15af6bf206e2f390ed6a9736231
branch: 3.11
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: erlend-aasland <erlend.aasland at protonmail.com>
date: 2022-07-28T12:32:56+02:00
summary:

Docs: Fix refs & tweak wording in sqlite3 'Using shortcut methods' (#95357)

Co-authored-by: CAM Gerlach <CAM.Gerlach at Gerlach.CAM>
(cherry picked from commit ea269b9a380a52828d4e401fa695737bcd699398)

Co-authored-by: Erlend Egeberg Aasland <erlend.aasland at protonmail.com>

files:
M Doc/library/sqlite3.rst

diff --git a/Doc/library/sqlite3.rst b/Doc/library/sqlite3.rst
index 7d2f3dff68194..633b78453feb9 100644
--- a/Doc/library/sqlite3.rst
+++ b/Doc/library/sqlite3.rst
@@ -1604,8 +1604,9 @@ Using :mod:`sqlite3` efficiently
 Using shortcut methods
 ^^^^^^^^^^^^^^^^^^^^^^
 
-Using the nonstandard :meth:`execute`, :meth:`executemany` and
-:meth:`executescript` methods of the :class:`Connection` object, your code can
+Using the :meth:`~Connection.execute`,
+:meth:`~Connection.executemany`, and :meth:`~Connection.executescript`
+methods of the :class:`Connection` class, your code can
 be written more concisely because you don't have to create the (often
 superfluous) :class:`Cursor` objects explicitly. Instead, the :class:`Cursor`
 objects are created implicitly and these shortcut methods return the cursor


From webhook-mailer at python.org  Thu Jul 28 06:38:51 2022
From: webhook-mailer at python.org (iritkatriel)
Date: Thu, 28 Jul 2022 10:38:51 -0000
Subject: [Python-checkins] gh-95369: add missing decref in error case of
 exception group's split (GH-95370)
Message-ID: <mailman.326.1659004732.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/bceb197947bbaebb11e01195bdce4f240fdf9332
commit: bceb197947bbaebb11e01195bdce4f240fdf9332
branch: main
author: Irit Katriel <1055913+iritkatriel at users.noreply.github.com>
committer: iritkatriel <1055913+iritkatriel at users.noreply.github.com>
date: 2022-07-28T11:38:46+01:00
summary:

gh-95369: add missing decref in error case of exception group's split (GH-95370)

files:
M Objects/exceptions.c

diff --git a/Objects/exceptions.c b/Objects/exceptions.c
index 745b89078ffe1..c56886870d3c8 100644
--- a/Objects/exceptions.c
+++ b/Objects/exceptions.c
@@ -1106,6 +1106,7 @@ exceptiongroup_split_recursive(PyObject *exc,
             assert(PyList_CheckExact(match_list));
             if (PyList_Append(match_list, rec_result.match) < 0) {
                 Py_DECREF(rec_result.match);
+                Py_XDECREF(rec_result.rest);
                 goto done;
             }
             Py_DECREF(rec_result.match);


From webhook-mailer at python.org  Thu Jul 28 06:45:05 2022
From: webhook-mailer at python.org (miss-islington)
Date: Thu, 28 Jul 2022 10:45:05 -0000
Subject: [Python-checkins] gh-95355: Check tokens[0] after allocating memory
 (GH-95356)
Message-ID: <mailman.327.1659005107.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/4513e4aba8c38d6a6b51060e6697b8e4ce60c8c3
commit: 4513e4aba8c38d6a6b51060e6697b8e4ce60c8c3
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-28T03:45:01-07:00
summary:

gh-95355: Check tokens[0] after allocating memory (GH-95356)


GH-95355

Automerge-Triggered-By: GH:pablogsal
(cherry picked from commit b946f529efb4a623ac4ad968d8091edb81ebdcdb)

Co-authored-by: Honglin Zhu <zhuhonglin.zhl at alibaba-inc.com>

files:
A Misc/NEWS.d/next/Core and Builtins/2022-07-28-08-33-31.gh-issue-95355.yN4XVk.rst
M Parser/pegen.c

diff --git a/Misc/NEWS.d/next/Core and Builtins/2022-07-28-08-33-31.gh-issue-95355.yN4XVk.rst b/Misc/NEWS.d/next/Core and Builtins/2022-07-28-08-33-31.gh-issue-95355.yN4XVk.rst
new file mode 100644
index 0000000000000..6a289991e0d60
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2022-07-28-08-33-31.gh-issue-95355.yN4XVk.rst	
@@ -0,0 +1 @@
+``_PyPegen_Parser_New`` now properly detects token memory allocation errors. Patch by Honglin Zhu.
diff --git a/Parser/pegen.c b/Parser/pegen.c
index 414059d12363c..016f070c47450 100644
--- a/Parser/pegen.c
+++ b/Parser/pegen.c
@@ -1234,7 +1234,7 @@ _PyPegen_Parser_New(struct tok_state *tok, int start_rule, int flags,
         return (Parser *) PyErr_NoMemory();
     }
     p->tokens[0] = PyMem_Calloc(1, sizeof(Token));
-    if (!p->tokens) {
+    if (!p->tokens[0]) {
         PyMem_Free(p->tokens);
         PyMem_Free(p);
         return (Parser *) PyErr_NoMemory();


From webhook-mailer at python.org  Thu Jul 28 06:56:26 2022
From: webhook-mailer at python.org (ambv)
Date: Thu, 28 Jul 2022 10:56:26 -0000
Subject: [Python-checkins] gh-95166: cancel map waited on future on timeout
 (GH-95169) (GH-95364)
Message-ID: <mailman.328.1659005787.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/763801aae2eca326e7828fcd274acde6165a4a4b
commit: 763801aae2eca326e7828fcd274acde6165a4a4b
branch: 3.11
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: ambv <lukasz at langa.pl>
date: 2022-07-28T12:56:21+02:00
summary:

gh-95166: cancel map waited on future on timeout (GH-95169) (GH-95364)

Co-authored-by: Kumar Aditya <59607654+kumaraditya303 at users.noreply.github.com>
(cherry picked from commit e16d4ed59072839b49bda4b447f260201aae7e39)

Co-authored-by: Thomas Grainger <tagrain at gmail.com>

files:
A Misc/NEWS.d/next/Library/2022-07-23-10-42-05.gh-issue-95166.xw6p3C.rst
M Lib/concurrent/futures/_base.py
M Lib/test/test_concurrent_futures.py

diff --git a/Lib/concurrent/futures/_base.py b/Lib/concurrent/futures/_base.py
index d7e7e41967cc2..6742a07753c92 100644
--- a/Lib/concurrent/futures/_base.py
+++ b/Lib/concurrent/futures/_base.py
@@ -310,6 +310,18 @@ def wait(fs, timeout=None, return_when=ALL_COMPLETED):
     done.update(waiter.finished_futures)
     return DoneAndNotDoneFutures(done, fs - done)
 
+
+def _result_or_cancel(fut, timeout=None):
+    try:
+        try:
+            return fut.result(timeout)
+        finally:
+            fut.cancel()
+    finally:
+        # Break a reference cycle with the exception in self._exception
+        del fut
+
+
 class Future(object):
     """Represents the result of an asynchronous computation."""
 
@@ -604,9 +616,9 @@ def result_iterator():
                 while fs:
                     # Careful not to keep a reference to the popped future
                     if timeout is None:
-                        yield fs.pop().result()
+                        yield _result_or_cancel(fs.pop())
                     else:
-                        yield fs.pop().result(end_time - time.monotonic())
+                        yield _result_or_cancel(fs.pop(), end_time - time.monotonic())
             finally:
                 for future in fs:
                     future.cancel()
diff --git a/Lib/test/test_concurrent_futures.py b/Lib/test/test_concurrent_futures.py
index f0473495fdc65..02c2fa06fad4e 100644
--- a/Lib/test/test_concurrent_futures.py
+++ b/Lib/test/test_concurrent_futures.py
@@ -931,6 +931,33 @@ def submit(pool):
                 with futures.ProcessPoolExecutor(1, mp_context=mp.get_context('fork')) as workers:
                     workers.submit(tuple)
 
+    def test_executor_map_current_future_cancel(self):
+        stop_event = threading.Event()
+        log = []
+
+        def log_n_wait(ident):
+            log.append(f"{ident=} started")
+            try:
+                stop_event.wait()
+            finally:
+                log.append(f"{ident=} stopped")
+
+        with self.executor_type(max_workers=1) as pool:
+            # submit work to saturate the pool
+            fut = pool.submit(log_n_wait, ident="first")
+            try:
+                with contextlib.closing(
+                    pool.map(log_n_wait, ["second", "third"], timeout=0)
+                ) as gen:
+                    with self.assertRaises(TimeoutError):
+                        next(gen)
+            finally:
+                stop_event.set()
+            fut.result()
+        # ident='second' is cancelled as a result of raising a TimeoutError
+        # ident='third' is cancelled because it remained in the collection of futures
+        self.assertListEqual(log, ["ident='first' started", "ident='first' stopped"])
+
 
 class ProcessPoolExecutorTest(ExecutorTest):
 
diff --git a/Misc/NEWS.d/next/Library/2022-07-23-10-42-05.gh-issue-95166.xw6p3C.rst b/Misc/NEWS.d/next/Library/2022-07-23-10-42-05.gh-issue-95166.xw6p3C.rst
new file mode 100644
index 0000000000000..34b017078436d
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2022-07-23-10-42-05.gh-issue-95166.xw6p3C.rst
@@ -0,0 +1 @@
+Fix :meth:`concurrent.futures.Executor.map` to cancel the currently waiting on future on an error - e.g. TimeoutError or KeyboardInterrupt.


From webhook-mailer at python.org  Thu Jul 28 07:28:52 2022
From: webhook-mailer at python.org (miss-islington)
Date: Thu, 28 Jul 2022 11:28:52 -0000
Subject: [Python-checkins] gh-95369: add missing decref in error case of
 exception group's split (GH-95370)
Message-ID: <mailman.329.1659007732.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/6934726d222222e2429b763396b266674d906e98
commit: 6934726d222222e2429b763396b266674d906e98
branch: 3.11
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-28T04:28:46-07:00
summary:

gh-95369: add missing decref in error case of exception group's split (GH-95370)

(cherry picked from commit bceb197947bbaebb11e01195bdce4f240fdf9332)

Co-authored-by: Irit Katriel <1055913+iritkatriel at users.noreply.github.com>

files:
M Objects/exceptions.c

diff --git a/Objects/exceptions.c b/Objects/exceptions.c
index c6af82a466855..3c4df2facfe2e 100644
--- a/Objects/exceptions.c
+++ b/Objects/exceptions.c
@@ -1114,6 +1114,7 @@ exceptiongroup_split_recursive(PyObject *exc,
             assert(PyList_CheckExact(match_list));
             if (PyList_Append(match_list, rec_result.match) < 0) {
                 Py_DECREF(rec_result.match);
+                Py_XDECREF(rec_result.rest);
                 goto done;
             }
             Py_DECREF(rec_result.match);


From webhook-mailer at python.org  Thu Jul 28 11:48:11 2022
From: webhook-mailer at python.org (gvanrossum)
Date: Thu, 28 Jul 2022 15:48:11 -0000
Subject: [Python-checkins] GH-95097: fix `asyncio.run` for tasks without
 `uncancel` method (#95211)
Message-ID: <mailman.330.1659023291.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/54f48844d18bc6fb98849f15a2fc08f92ad240ea
commit: 54f48844d18bc6fb98849f15a2fc08f92ad240ea
branch: main
author: Kumar Aditya <59607654+kumaraditya303 at users.noreply.github.com>
committer: gvanrossum <gvanrossum at gmail.com>
date: 2022-07-28T08:47:54-07:00
summary:

GH-95097: fix `asyncio.run` for tasks without `uncancel` method (#95211)

Co-authored-by: Thomas Grainger <tagrain at gmail.com>

files:
A Misc/NEWS.d/next/Library/2022-07-24-18-00-42.gh-issue-95097.lu5qNf.rst
M Lib/asyncio/runners.py
M Lib/test/test_asyncio/test_runners.py

diff --git a/Lib/asyncio/runners.py b/Lib/asyncio/runners.py
index 7489a50f8e48d..a8b74d532fcd3 100644
--- a/Lib/asyncio/runners.py
+++ b/Lib/asyncio/runners.py
@@ -118,10 +118,11 @@ def run(self, coro, *, context=None):
                 events.set_event_loop(self._loop)
             return self._loop.run_until_complete(task)
         except exceptions.CancelledError:
-            if self._interrupt_count > 0 and task.uncancel() == 0:
-                raise KeyboardInterrupt()
-            else:
-                raise  # CancelledError
+            if self._interrupt_count > 0:
+                uncancel = getattr(task, "uncancel", None)
+                if uncancel is not None and uncancel() == 0:
+                    raise KeyboardInterrupt()
+            raise  # CancelledError
         finally:
             if (sigint_handler is not None
                 and signal.getsignal(signal.SIGINT) is sigint_handler
diff --git a/Lib/test/test_asyncio/test_runners.py b/Lib/test/test_asyncio/test_runners.py
index 1f6a4983690cd..d61d073a36749 100644
--- a/Lib/test/test_asyncio/test_runners.py
+++ b/Lib/test/test_asyncio/test_runners.py
@@ -5,10 +5,9 @@
 import signal
 import threading
 import unittest
-
+from test.test_asyncio import utils as test_utils
 from unittest import mock
 from unittest.mock import patch
-from test.test_asyncio import utils as test_utils
 
 
 def tearDownModule():
@@ -210,6 +209,54 @@ async def main():
         asyncio.run(main())
         self.assertTrue(policy.set_event_loop.called)
 
+    def test_asyncio_run_without_uncancel(self):
+        # See https://github.com/python/cpython/issues/95097
+        class Task:
+            def __init__(self, loop, coro, **kwargs):
+                self._task = asyncio.Task(coro, loop=loop, **kwargs)
+
+            def cancel(self, *args, **kwargs):
+                return self._task.cancel(*args, **kwargs)
+
+            def add_done_callback(self, *args, **kwargs):
+                return self._task.add_done_callback(*args, **kwargs)
+
+            def remove_done_callback(self, *args, **kwargs):
+                return self._task.remove_done_callback(*args, **kwargs)
+
+            @property
+            def _asyncio_future_blocking(self):
+                return self._task._asyncio_future_blocking
+
+            def result(self, *args, **kwargs):
+                return self._task.result(*args, **kwargs)
+
+            def done(self, *args, **kwargs):
+                return self._task.done(*args, **kwargs)
+
+            def cancelled(self, *args, **kwargs):
+                return self._task.cancelled(*args, **kwargs)
+
+            def exception(self, *args, **kwargs):
+                return self._task.exception(*args, **kwargs)
+
+            def get_loop(self, *args, **kwargs):
+                return self._task.get_loop(*args, **kwargs)
+
+
+        async def main():
+            interrupt_self()
+            await asyncio.Event().wait()
+
+        def new_event_loop():
+            loop = self.new_loop()
+            loop.set_task_factory(Task)
+            return loop
+
+        asyncio.set_event_loop_policy(TestPolicy(new_event_loop))
+        with self.assertRaises(asyncio.CancelledError):
+            asyncio.run(main())
+
 
 class RunnerTests(BaseTest):
 
diff --git a/Misc/NEWS.d/next/Library/2022-07-24-18-00-42.gh-issue-95097.lu5qNf.rst b/Misc/NEWS.d/next/Library/2022-07-24-18-00-42.gh-issue-95097.lu5qNf.rst
new file mode 100644
index 0000000000000..2840f057a9c1d
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2022-07-24-18-00-42.gh-issue-95097.lu5qNf.rst
@@ -0,0 +1 @@
+Fix :func:`asyncio.run` for :class:`asyncio.Task` implementations without :meth:`~asyncio.Task.uncancel` method. Patch by Kumar Aditya.


From webhook-mailer at python.org  Thu Jul 28 12:22:43 2022
From: webhook-mailer at python.org (Fidget-Spinner)
Date: Thu, 28 Jul 2022 16:22:43 -0000
Subject: [Python-checkins] Update link to faster cpython benchmarks
 (GH-95391)
Message-ID: <mailman.331.1659025364.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/a1daf6e5ccd78e43ba1eb6fa8d0347e939ce8243
commit: a1daf6e5ccd78e43ba1eb6fa8d0347e939ce8243
branch: main
author: Ken Jin <28750310+Fidget-Spinner at users.noreply.github.com>
committer: Fidget-Spinner <28750310+Fidget-Spinner at users.noreply.github.com>
date: 2022-07-29T00:22:24+08:00
summary:

Update link to faster cpython benchmarks (GH-95391)

files:
M Doc/whatsnew/3.11.rst

diff --git a/Doc/whatsnew/3.11.rst b/Doc/whatsnew/3.11.rst
index f458f8e6a40bf..1b3a685dbacb9 100644
--- a/Doc/whatsnew/3.11.rst
+++ b/Doc/whatsnew/3.11.rst
@@ -900,7 +900,7 @@ Optimizations
 Faster CPython
 ==============
 
-CPython 3.11 is on average `25% faster <https://github.com/faster-cpython/ideas/blob/main/main-vs-310.rst>`_
+CPython 3.11 is on average `25% faster <https://github.com/faster-cpython/ideas#published-results>`_
 than CPython 3.10 when measured with the
 `pyperformance <https://github.com/python/pyperformance>`_ benchmark suite,
 and compiled with GCC on Ubuntu Linux. Depending on your workload, the speedup


From webhook-mailer at python.org  Thu Jul 28 12:31:36 2022
From: webhook-mailer at python.org (miss-islington)
Date: Thu, 28 Jul 2022 16:31:36 -0000
Subject: [Python-checkins] [3.11] Update link to faster cpython benchmarks
 (GH-95391) (GH-95392)
Message-ID: <mailman.332.1659025898.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/9626dea86f500aa7bc4bbe7920842f979feee527
commit: 9626dea86f500aa7bc4bbe7920842f979feee527
branch: 3.11
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-28T09:31:31-07:00
summary:

[3.11] Update link to faster cpython benchmarks (GH-95391) (GH-95392)



(cherry picked from commit a1daf6e5ccd78e43ba1eb6fa8d0347e939ce8243)


Co-authored-by: Ken Jin <28750310+Fidget-Spinner at users.noreply.github.com>

Automerge-Triggered-By: GH:Fidget-Spinner

files:
M Doc/whatsnew/3.11.rst

diff --git a/Doc/whatsnew/3.11.rst b/Doc/whatsnew/3.11.rst
index f2b9287d004d5..7b01fe2d96339 100644
--- a/Doc/whatsnew/3.11.rst
+++ b/Doc/whatsnew/3.11.rst
@@ -900,7 +900,7 @@ Optimizations
 Faster CPython
 ==============
 
-CPython 3.11 is on average `25% faster <https://github.com/faster-cpython/ideas/blob/main/main-vs-310.rst>`_
+CPython 3.11 is on average `25% faster <https://github.com/faster-cpython/ideas#published-results>`_
 than CPython 3.10 when measured with the
 `pyperformance <https://github.com/python/pyperformance>`_ benchmark suite,
 and compiled with GCC on Ubuntu Linux. Depending on your workload, the speedup


From webhook-mailer at python.org  Thu Jul 28 15:30:24 2022
From: webhook-mailer at python.org (ned-deily)
Date: Thu, 28 Jul 2022 19:30:24 -0000
Subject: [Python-checkins] [3.8] gh-90359: Update documentation to follow
 PEP 495. (gh-94800). (GH-94834)
Message-ID: <mailman.333.1659036624.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/4f100fe9f1c691145e3fa959ef324646e303cdf3
commit: 4f100fe9f1c691145e3fa959ef324646e303cdf3
branch: 3.8
author: Dong-hee Na <donghee.na at python.org>
committer: ned-deily <nad at python.org>
date: 2022-07-28T15:30:13-04:00
summary:

[3.8] gh-90359: Update documentation to follow PEP 495. (gh-94800). (GH-94834)

(cherry picked from commit 07374cce52abb7fd39729dc1b646ca3029b64c64)

Co-authored-by: Dong-hee Na <donghee.na at python.org>

files:
M Doc/c-api/datetime.rst

diff --git a/Doc/c-api/datetime.rst b/Doc/c-api/datetime.rst
index bd4f1ff446bcf..84e05ea631ead 100644
--- a/Doc/c-api/datetime.rst
+++ b/Doc/c-api/datetime.rst
@@ -186,6 +186,13 @@ must not be ``NULL``, and the type is not checked:
    Return the microsecond, as an int from 0 through 999999.
 
 
+.. c:function:: int PyDateTime_DATE_GET_FOLD(PyDateTime_DateTime *o)
+
+   Return the fold, as an int from 0 through 1.
+
+   .. versionadded:: 3.6
+
+
 Macros to extract fields from time objects.  The argument must be an instance of
 :c:data:`PyDateTime_Time`, including subclasses. The argument must not be ``NULL``,
 and the type is not checked:
@@ -210,6 +217,13 @@ and the type is not checked:
    Return the microsecond, as an int from 0 through 999999.
 
 
+.. c:function:: int PyDateTime_TIME_GET_FOLD(PyDateTime_Time *o)
+
+   Return the fold, as an int from 0 through 1.
+
+   .. versionadded:: 3.6
+
+
 Macros to extract fields from time delta objects.  The argument must be an
 instance of :c:data:`PyDateTime_Delta`, including subclasses. The argument must
 not be ``NULL``, and the type is not checked:


From webhook-mailer at python.org  Thu Jul 28 15:31:27 2022
From: webhook-mailer at python.org (ned-deily)
Date: Thu, 28 Jul 2022 19:31:27 -0000
Subject: [Python-checkins] [3.9] gh-90359: Update documentation to follow
 PEP 495. (gh-94800). (gh-94835)
Message-ID: <mailman.334.1659036689.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/7b8776511a79c0cb3ec21bbe41d45139e6e75603
commit: 7b8776511a79c0cb3ec21bbe41d45139e6e75603
branch: 3.9
author: Dong-hee Na <donghee.na at python.org>
committer: ned-deily <nad at python.org>
date: 2022-07-28T15:31:17-04:00
summary:

[3.9] gh-90359: Update documentation to follow PEP 495. (gh-94800). (gh-94835)

(cherry picked from commit 07374cce52abb7fd39729dc1b646ca3029b64c64)

Co-authored-by: Dong-hee Na <donghee.na at python.org>

files:
M Doc/c-api/datetime.rst

diff --git a/Doc/c-api/datetime.rst b/Doc/c-api/datetime.rst
index 66f148df28680..ad6ae65335a16 100644
--- a/Doc/c-api/datetime.rst
+++ b/Doc/c-api/datetime.rst
@@ -191,6 +191,13 @@ must not be ``NULL``, and the type is not checked:
    Return the microsecond, as an int from 0 through 999999.
 
 
+.. c:function:: int PyDateTime_DATE_GET_FOLD(PyDateTime_DateTime *o)
+
+   Return the fold, as an int from 0 through 1.
+
+   .. versionadded:: 3.6
+
+
 Macros to extract fields from time objects.  The argument must be an instance of
 :c:data:`PyDateTime_Time`, including subclasses. The argument must not be ``NULL``,
 and the type is not checked:
@@ -215,6 +222,13 @@ and the type is not checked:
    Return the microsecond, as an int from 0 through 999999.
 
 
+.. c:function:: int PyDateTime_TIME_GET_FOLD(PyDateTime_Time *o)
+
+   Return the fold, as an int from 0 through 1.
+
+   .. versionadded:: 3.6
+
+
 Macros to extract fields from time delta objects.  The argument must be an
 instance of :c:data:`PyDateTime_Delta`, including subclasses. The argument must
 not be ``NULL``, and the type is not checked:


From webhook-mailer at python.org  Thu Jul 28 16:11:37 2022
From: webhook-mailer at python.org (zooba)
Date: Thu, 28 Jul 2022 20:11:37 -0000
Subject: [Python-checkins] gh-95359: Fix py.exe launcher handling of
 per-user py.ini and command names (GH-95399)
Message-ID: <mailman.335.1659039098.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/38bb2068fe1f51a74b36c46e820abc5f6422cded
commit: 38bb2068fe1f51a74b36c46e820abc5f6422cded
branch: main
author: Steve Dower <steve.dower at python.org>
committer: zooba <steve.dower at microsoft.com>
date: 2022-07-28T21:11:17+01:00
summary:

gh-95359: Fix py.exe launcher handling of per-user py.ini and command names (GH-95399)

files:
A Misc/NEWS.d/next/Windows/2022-07-28-20-21-38.gh-issue-95359.ywMrgu.rst
M Lib/test/test_launcher.py
M PC/launcher2.c

diff --git a/Lib/test/test_launcher.py b/Lib/test/test_launcher.py
index b4009a99a705a..c8ea4f62170ea 100644
--- a/Lib/test/test_launcher.py
+++ b/Lib/test/test_launcher.py
@@ -69,7 +69,7 @@
 
 TEST_PY_COMMANDS = "\n".join([
     "[defaults]",
-    *[f"{k.lower()}={v}" for k, v in TEST_PY_ENV.items()]
+    *[f"{k[3:].lower()}={v}" for k, v in TEST_PY_ENV.items()]
 ])
 
 
diff --git a/Misc/NEWS.d/next/Windows/2022-07-28-20-21-38.gh-issue-95359.ywMrgu.rst b/Misc/NEWS.d/next/Windows/2022-07-28-20-21-38.gh-issue-95359.ywMrgu.rst
new file mode 100644
index 0000000000000..513a2be28a9c2
--- /dev/null
+++ b/Misc/NEWS.d/next/Windows/2022-07-28-20-21-38.gh-issue-95359.ywMrgu.rst
@@ -0,0 +1,3 @@
+Fix :ref:`launcher` handling of :file:`py.ini` commands (it was incorrectly
+expecting a ``py_`` prefix on keys) and crashes when reading per-user
+configuration file.
diff --git a/PC/launcher2.c b/PC/launcher2.c
index 31b5617771e9b..033218ee2f408 100644
--- a/PC/launcher2.c
+++ b/PC/launcher2.c
@@ -761,7 +761,7 @@ _readIni(const wchar_t *section, const wchar_t *settingName, wchar_t *buffer, in
         n = GetPrivateProfileStringW(section, settingName, NULL, buffer, bufferLength, iniPath);
         if (n) {
             debug(L"# Found %s in %s\n", settingName, iniPath);
-            return true;
+            return n;
         } else if (GetLastError() == ERROR_FILE_NOT_FOUND) {
             debug(L"# Did not find file %s\n", iniPath);
         } else {
@@ -946,13 +946,17 @@ checkDefaults(SearchInfo *search)
 
     // If tag is only a major version number, expand it from the environment
     // or an ini file
-    const wchar_t *settingName = NULL;
+    const wchar_t *iniSettingName = NULL;
+    const wchar_t *envSettingName = NULL;
     if (!search->tag || !search->tagLength) {
-        settingName = L"py_python";
+        iniSettingName = L"python";
+        envSettingName = L"py_python";
     } else if (0 == wcsncmp(search->tag, L"3", search->tagLength)) {
-        settingName = L"py_python3";
+        iniSettingName = L"python3";
+        envSettingName = L"py_python3";
     } else if (0 == wcsncmp(search->tag, L"2", search->tagLength)) {
-        settingName = L"py_python2";
+        iniSettingName = L"python2";
+        envSettingName = L"py_python2";
     } else {
         debug(L"# Cannot select defaults for tag '%.*s'\n", search->tagLength, search->tag);
         return 0;
@@ -960,11 +964,11 @@ checkDefaults(SearchInfo *search)
 
     // First, try to read an environment variable
     wchar_t buffer[MAXLEN];
-    int n = GetEnvironmentVariableW(settingName, buffer, MAXLEN);
+    int n = GetEnvironmentVariableW(envSettingName, buffer, MAXLEN);
 
     // If none found, check in our two .ini files instead
     if (!n) {
-        n = _readIni(L"defaults", settingName, buffer, MAXLEN);
+        n = _readIni(L"defaults", iniSettingName, buffer, MAXLEN);
     }
 
     if (n) {


From webhook-mailer at python.org  Thu Jul 28 16:52:24 2022
From: webhook-mailer at python.org (miss-islington)
Date: Thu, 28 Jul 2022 20:52:24 -0000
Subject: [Python-checkins] gh-95359: Fix py.exe launcher handling of
 per-user py.ini and command names (GH-95399)
Message-ID: <mailman.336.1659041545.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/1368a1f724ebcab803644adbf764d8d30b18cfd0
commit: 1368a1f724ebcab803644adbf764d8d30b18cfd0
branch: 3.11
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-28T13:52:13-07:00
summary:

gh-95359: Fix py.exe launcher handling of per-user py.ini and command names (GH-95399)

(cherry picked from commit 38bb2068fe1f51a74b36c46e820abc5f6422cded)

Co-authored-by: Steve Dower <steve.dower at python.org>

files:
A Misc/NEWS.d/next/Windows/2022-07-28-20-21-38.gh-issue-95359.ywMrgu.rst
M Lib/test/test_launcher.py
M PC/launcher2.c

diff --git a/Lib/test/test_launcher.py b/Lib/test/test_launcher.py
index 0b7cbaad3f582..e47078dc9f7bd 100644
--- a/Lib/test/test_launcher.py
+++ b/Lib/test/test_launcher.py
@@ -70,7 +70,7 @@
 
 TEST_PY_COMMANDS = "\n".join([
     "[defaults]",
-    *[f"{k.lower()}={v}" for k, v in TEST_PY_ENV.items()]
+    *[f"{k[3:].lower()}={v}" for k, v in TEST_PY_ENV.items()]
 ])
 
 
diff --git a/Misc/NEWS.d/next/Windows/2022-07-28-20-21-38.gh-issue-95359.ywMrgu.rst b/Misc/NEWS.d/next/Windows/2022-07-28-20-21-38.gh-issue-95359.ywMrgu.rst
new file mode 100644
index 0000000000000..513a2be28a9c2
--- /dev/null
+++ b/Misc/NEWS.d/next/Windows/2022-07-28-20-21-38.gh-issue-95359.ywMrgu.rst
@@ -0,0 +1,3 @@
+Fix :ref:`launcher` handling of :file:`py.ini` commands (it was incorrectly
+expecting a ``py_`` prefix on keys) and crashes when reading per-user
+configuration file.
diff --git a/PC/launcher2.c b/PC/launcher2.c
index 31b5617771e9b..033218ee2f408 100644
--- a/PC/launcher2.c
+++ b/PC/launcher2.c
@@ -761,7 +761,7 @@ _readIni(const wchar_t *section, const wchar_t *settingName, wchar_t *buffer, in
         n = GetPrivateProfileStringW(section, settingName, NULL, buffer, bufferLength, iniPath);
         if (n) {
             debug(L"# Found %s in %s\n", settingName, iniPath);
-            return true;
+            return n;
         } else if (GetLastError() == ERROR_FILE_NOT_FOUND) {
             debug(L"# Did not find file %s\n", iniPath);
         } else {
@@ -946,13 +946,17 @@ checkDefaults(SearchInfo *search)
 
     // If tag is only a major version number, expand it from the environment
     // or an ini file
-    const wchar_t *settingName = NULL;
+    const wchar_t *iniSettingName = NULL;
+    const wchar_t *envSettingName = NULL;
     if (!search->tag || !search->tagLength) {
-        settingName = L"py_python";
+        iniSettingName = L"python";
+        envSettingName = L"py_python";
     } else if (0 == wcsncmp(search->tag, L"3", search->tagLength)) {
-        settingName = L"py_python3";
+        iniSettingName = L"python3";
+        envSettingName = L"py_python3";
     } else if (0 == wcsncmp(search->tag, L"2", search->tagLength)) {
-        settingName = L"py_python2";
+        iniSettingName = L"python2";
+        envSettingName = L"py_python2";
     } else {
         debug(L"# Cannot select defaults for tag '%.*s'\n", search->tagLength, search->tag);
         return 0;
@@ -960,11 +964,11 @@ checkDefaults(SearchInfo *search)
 
     // First, try to read an environment variable
     wchar_t buffer[MAXLEN];
-    int n = GetEnvironmentVariableW(settingName, buffer, MAXLEN);
+    int n = GetEnvironmentVariableW(envSettingName, buffer, MAXLEN);
 
     // If none found, check in our two .ini files instead
     if (!n) {
-        n = _readIni(L"defaults", settingName, buffer, MAXLEN);
+        n = _readIni(L"defaults", iniSettingName, buffer, MAXLEN);
     }
 
     if (n) {


From webhook-mailer at python.org  Thu Jul 28 18:10:19 2022
From: webhook-mailer at python.org (zooba)
Date: Thu, 28 Jul 2022 22:10:19 -0000
Subject: [Python-checkins] gh-94512: Fix forced arg format in AC-processed
 overlapped (GH-94516)
Message-ID: <mailman.337.1659046220.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/26d4af0ba538ea58d7a7fdbcc4471d9b32689b28
commit: 26d4af0ba538ea58d7a7fdbcc4471d9b32689b28
branch: main
author: Oleg Iarygin <oleg at arhadthedev.net>
committer: zooba <steve.dower at microsoft.com>
date: 2022-07-28T23:09:46+01:00
summary:

gh-94512: Fix forced arg format in AC-processed overlapped (GH-94516)

files:
M Modules/clinic/overlapped.c.h
M Modules/overlapped.c

diff --git a/Modules/clinic/overlapped.c.h b/Modules/clinic/overlapped.c.h
index cac44d0a5764c..721b38c75ceef 100644
--- a/Modules/clinic/overlapped.c.h
+++ b/Modules/clinic/overlapped.c.h
@@ -26,8 +26,22 @@ _overlapped_CreateIoCompletionPort(PyObject *module, PyObject *const *args, Py_s
     ULONG_PTR CompletionKey;
     DWORD NumberOfConcurrentThreads;
 
-    if (!_PyArg_ParseStack(args, nargs, ""F_HANDLE""F_HANDLE""F_ULONG_PTR"k:CreateIoCompletionPort",
-        &FileHandle, &ExistingCompletionPort, &CompletionKey, &NumberOfConcurrentThreads)) {
+    if (!_PyArg_CheckPositional("CreateIoCompletionPort", nargs, 4, 4)) {
+        goto exit;
+    }
+    FileHandle = PyLong_AsVoidPtr(args[0]);
+    if (!FileHandle && PyErr_Occurred()) {
+        goto exit;
+    }
+    ExistingCompletionPort = PyLong_AsVoidPtr(args[1]);
+    if (!ExistingCompletionPort && PyErr_Occurred()) {
+        goto exit;
+    }
+    CompletionKey = PyLong_AsVoidPtr(args[2]);
+    if (!CompletionKey && PyErr_Occurred()) {
+        goto exit;
+    }
+    if (!_PyLong_UnsignedLong_Converter(args[3], &NumberOfConcurrentThreads)) {
         goto exit;
     }
     return_value = _overlapped_CreateIoCompletionPort_impl(module, FileHandle, ExistingCompletionPort, CompletionKey, NumberOfConcurrentThreads);
@@ -59,8 +73,14 @@ _overlapped_GetQueuedCompletionStatus(PyObject *module, PyObject *const *args, P
     HANDLE CompletionPort;
     DWORD Milliseconds;
 
-    if (!_PyArg_ParseStack(args, nargs, ""F_HANDLE"k:GetQueuedCompletionStatus",
-        &CompletionPort, &Milliseconds)) {
+    if (!_PyArg_CheckPositional("GetQueuedCompletionStatus", nargs, 2, 2)) {
+        goto exit;
+    }
+    CompletionPort = PyLong_AsVoidPtr(args[0]);
+    if (!CompletionPort && PyErr_Occurred()) {
+        goto exit;
+    }
+    if (!_PyLong_UnsignedLong_Converter(args[1], &Milliseconds)) {
         goto exit;
     }
     return_value = _overlapped_GetQueuedCompletionStatus_impl(module, CompletionPort, Milliseconds);
@@ -94,8 +114,22 @@ _overlapped_PostQueuedCompletionStatus(PyObject *module, PyObject *const *args,
     ULONG_PTR CompletionKey;
     OVERLAPPED *Overlapped;
 
-    if (!_PyArg_ParseStack(args, nargs, ""F_HANDLE"k"F_ULONG_PTR""F_POINTER":PostQueuedCompletionStatus",
-        &CompletionPort, &NumberOfBytes, &CompletionKey, &Overlapped)) {
+    if (!_PyArg_CheckPositional("PostQueuedCompletionStatus", nargs, 4, 4)) {
+        goto exit;
+    }
+    CompletionPort = PyLong_AsVoidPtr(args[0]);
+    if (!CompletionPort && PyErr_Occurred()) {
+        goto exit;
+    }
+    if (!_PyLong_UnsignedLong_Converter(args[1], &NumberOfBytes)) {
+        goto exit;
+    }
+    CompletionKey = PyLong_AsVoidPtr(args[2]);
+    if (!CompletionKey && PyErr_Occurred()) {
+        goto exit;
+    }
+    Overlapped = PyLong_AsVoidPtr(args[3]);
+    if (!Overlapped && PyErr_Occurred()) {
         goto exit;
     }
     return_value = _overlapped_PostQueuedCompletionStatus_impl(module, CompletionPort, NumberOfBytes, CompletionKey, Overlapped);
@@ -129,8 +163,22 @@ _overlapped_RegisterWaitWithQueue(PyObject *module, PyObject *const *args, Py_ss
     OVERLAPPED *Overlapped;
     DWORD Milliseconds;
 
-    if (!_PyArg_ParseStack(args, nargs, ""F_HANDLE""F_HANDLE""F_POINTER"k:RegisterWaitWithQueue",
-        &Object, &CompletionPort, &Overlapped, &Milliseconds)) {
+    if (!_PyArg_CheckPositional("RegisterWaitWithQueue", nargs, 4, 4)) {
+        goto exit;
+    }
+    Object = PyLong_AsVoidPtr(args[0]);
+    if (!Object && PyErr_Occurred()) {
+        goto exit;
+    }
+    CompletionPort = PyLong_AsVoidPtr(args[1]);
+    if (!CompletionPort && PyErr_Occurred()) {
+        goto exit;
+    }
+    Overlapped = PyLong_AsVoidPtr(args[2]);
+    if (!Overlapped && PyErr_Occurred()) {
+        goto exit;
+    }
+    if (!_PyLong_UnsignedLong_Converter(args[3], &Milliseconds)) {
         goto exit;
     }
     return_value = _overlapped_RegisterWaitWithQueue_impl(module, Object, CompletionPort, Overlapped, Milliseconds);
@@ -157,7 +205,8 @@ _overlapped_UnregisterWait(PyObject *module, PyObject *arg)
     PyObject *return_value = NULL;
     HANDLE WaitHandle;
 
-    if (!PyArg_Parse(arg, ""F_HANDLE":UnregisterWait", &WaitHandle)) {
+    WaitHandle = PyLong_AsVoidPtr(arg);
+    if (!WaitHandle && PyErr_Occurred()) {
         goto exit;
     }
     return_value = _overlapped_UnregisterWait_impl(module, WaitHandle);
@@ -186,8 +235,15 @@ _overlapped_UnregisterWaitEx(PyObject *module, PyObject *const *args, Py_ssize_t
     HANDLE WaitHandle;
     HANDLE Event;
 
-    if (!_PyArg_ParseStack(args, nargs, ""F_HANDLE""F_HANDLE":UnregisterWaitEx",
-        &WaitHandle, &Event)) {
+    if (!_PyArg_CheckPositional("UnregisterWaitEx", nargs, 2, 2)) {
+        goto exit;
+    }
+    WaitHandle = PyLong_AsVoidPtr(args[0]);
+    if (!WaitHandle && PyErr_Occurred()) {
+        goto exit;
+    }
+    Event = PyLong_AsVoidPtr(args[1]);
+    if (!Event && PyErr_Occurred()) {
         goto exit;
     }
     return_value = _overlapped_UnregisterWaitEx_impl(module, WaitHandle, Event);
@@ -222,8 +278,29 @@ _overlapped_CreateEvent(PyObject *module, PyObject *const *args, Py_ssize_t narg
     BOOL InitialState;
     const Py_UNICODE *Name;
 
-    if (!_PyArg_ParseStack(args, nargs, "OiiO&:CreateEvent",
-        &EventAttributes, &ManualReset, &InitialState, _PyUnicode_WideCharString_Opt_Converter, &Name)) {
+    if (!_PyArg_CheckPositional("CreateEvent", nargs, 4, 4)) {
+        goto exit;
+    }
+    EventAttributes = args[0];
+    ManualReset = _PyLong_AsInt(args[1]);
+    if (ManualReset == -1 && PyErr_Occurred()) {
+        goto exit;
+    }
+    InitialState = _PyLong_AsInt(args[2]);
+    if (InitialState == -1 && PyErr_Occurred()) {
+        goto exit;
+    }
+    if (args[3] == Py_None) {
+        Name = NULL;
+    }
+    else if (PyUnicode_Check(args[3])) {
+        Name = PyUnicode_AsWideCharString(args[3], NULL);
+        if (Name == NULL) {
+            goto exit;
+        }
+    }
+    else {
+        _PyArg_BadArgument("CreateEvent", "argument 4", "str or None", args[3]);
         goto exit;
     }
     return_value = _overlapped_CreateEvent_impl(module, EventAttributes, ManualReset, InitialState, Name);
@@ -253,7 +330,8 @@ _overlapped_SetEvent(PyObject *module, PyObject *arg)
     PyObject *return_value = NULL;
     HANDLE Handle;
 
-    if (!PyArg_Parse(arg, ""F_HANDLE":SetEvent", &Handle)) {
+    Handle = PyLong_AsVoidPtr(arg);
+    if (!Handle && PyErr_Occurred()) {
         goto exit;
     }
     return_value = _overlapped_SetEvent_impl(module, Handle);
@@ -280,7 +358,8 @@ _overlapped_ResetEvent(PyObject *module, PyObject *arg)
     PyObject *return_value = NULL;
     HANDLE Handle;
 
-    if (!PyArg_Parse(arg, ""F_HANDLE":ResetEvent", &Handle)) {
+    Handle = PyLong_AsVoidPtr(arg);
+    if (!Handle && PyErr_Occurred()) {
         goto exit;
     }
     return_value = _overlapped_ResetEvent_impl(module, Handle);
@@ -310,8 +389,15 @@ _overlapped_BindLocal(PyObject *module, PyObject *const *args, Py_ssize_t nargs)
     HANDLE Socket;
     int Family;
 
-    if (!_PyArg_ParseStack(args, nargs, ""F_HANDLE"i:BindLocal",
-        &Socket, &Family)) {
+    if (!_PyArg_CheckPositional("BindLocal", nargs, 2, 2)) {
+        goto exit;
+    }
+    Socket = PyLong_AsVoidPtr(args[0]);
+    if (!Socket && PyErr_Occurred()) {
+        goto exit;
+    }
+    Family = _PyLong_AsInt(args[1]);
+    if (Family == -1 && PyErr_Occurred()) {
         goto exit;
     }
     return_value = _overlapped_BindLocal_impl(module, Socket, Family);
@@ -338,7 +424,7 @@ _overlapped_FormatMessage(PyObject *module, PyObject *arg)
     PyObject *return_value = NULL;
     DWORD code;
 
-    if (!PyArg_Parse(arg, "k:FormatMessage", &code)) {
+    if (!_PyLong_UnsignedLong_Converter(arg, &code)) {
         goto exit;
     }
     return_value = _overlapped_FormatMessage_impl(module, code);
@@ -361,13 +447,25 @@ _overlapped_Overlapped(PyTypeObject *type, PyObject *args, PyObject *kwargs)
 {
     PyObject *return_value = NULL;
     static const char * const _keywords[] = {"event", NULL};
-    static _PyArg_Parser _parser = {"|"F_HANDLE":Overlapped", _keywords, 0};
+    static _PyArg_Parser _parser = {NULL, _keywords, "Overlapped", 0};
+    PyObject *argsbuf[1];
+    PyObject * const *fastargs;
+    Py_ssize_t nargs = PyTuple_GET_SIZE(args);
+    Py_ssize_t noptargs = nargs + (kwargs ? PyDict_GET_SIZE(kwargs) : 0) - 0;
     HANDLE event = INVALID_HANDLE_VALUE;
 
-    if (!_PyArg_ParseTupleAndKeywordsFast(args, kwargs, &_parser,
-        &event)) {
+    fastargs = _PyArg_UnpackKeywords(_PyTuple_CAST(args)->ob_item, nargs, kwargs, NULL, &_parser, 0, 1, 0, argsbuf);
+    if (!fastargs) {
+        goto exit;
+    }
+    if (!noptargs) {
+        goto skip_optional_pos;
+    }
+    event = PyLong_AsVoidPtr(fastargs[0]);
+    if (!event && PyErr_Occurred()) {
         goto exit;
     }
+skip_optional_pos:
     return_value = _overlapped_Overlapped_impl(type, event);
 
 exit:
@@ -413,10 +511,17 @@ _overlapped_Overlapped_getresult(OverlappedObject *self, PyObject *const *args,
     PyObject *return_value = NULL;
     BOOL wait = FALSE;
 
-    if (!_PyArg_ParseStack(args, nargs, "|i:getresult",
-        &wait)) {
+    if (!_PyArg_CheckPositional("getresult", nargs, 0, 1)) {
+        goto exit;
+    }
+    if (nargs < 1) {
+        goto skip_optional;
+    }
+    wait = _PyLong_AsInt(args[0]);
+    if (wait == -1 && PyErr_Occurred()) {
         goto exit;
     }
+skip_optional:
     return_value = _overlapped_Overlapped_getresult_impl(self, wait);
 
 exit:
@@ -443,8 +548,14 @@ _overlapped_Overlapped_ReadFile(OverlappedObject *self, PyObject *const *args, P
     HANDLE handle;
     DWORD size;
 
-    if (!_PyArg_ParseStack(args, nargs, ""F_HANDLE"k:ReadFile",
-        &handle, &size)) {
+    if (!_PyArg_CheckPositional("ReadFile", nargs, 2, 2)) {
+        goto exit;
+    }
+    handle = PyLong_AsVoidPtr(args[0]);
+    if (!handle && PyErr_Occurred()) {
+        goto exit;
+    }
+    if (!_PyLong_UnsignedLong_Converter(args[1], &size)) {
         goto exit;
     }
     return_value = _overlapped_Overlapped_ReadFile_impl(self, handle, size);
@@ -473,8 +584,18 @@ _overlapped_Overlapped_ReadFileInto(OverlappedObject *self, PyObject *const *arg
     HANDLE handle;
     Py_buffer bufobj = {NULL, NULL};
 
-    if (!_PyArg_ParseStack(args, nargs, ""F_HANDLE"y*:ReadFileInto",
-        &handle, &bufobj)) {
+    if (!_PyArg_CheckPositional("ReadFileInto", nargs, 2, 2)) {
+        goto exit;
+    }
+    handle = PyLong_AsVoidPtr(args[0]);
+    if (!handle && PyErr_Occurred()) {
+        goto exit;
+    }
+    if (PyObject_GetBuffer(args[1], &bufobj, PyBUF_SIMPLE) != 0) {
+        goto exit;
+    }
+    if (!PyBuffer_IsContiguous(&bufobj, 'C')) {
+        _PyArg_BadArgument("ReadFileInto", "argument 2", "contiguous buffer", args[1]);
         goto exit;
     }
     return_value = _overlapped_Overlapped_ReadFileInto_impl(self, handle, &bufobj);
@@ -509,10 +630,23 @@ _overlapped_Overlapped_WSARecv(OverlappedObject *self, PyObject *const *args, Py
     DWORD size;
     DWORD flags = 0;
 
-    if (!_PyArg_ParseStack(args, nargs, ""F_HANDLE"k|k:WSARecv",
-        &handle, &size, &flags)) {
+    if (!_PyArg_CheckPositional("WSARecv", nargs, 2, 3)) {
+        goto exit;
+    }
+    handle = PyLong_AsVoidPtr(args[0]);
+    if (!handle && PyErr_Occurred()) {
+        goto exit;
+    }
+    if (!_PyLong_UnsignedLong_Converter(args[1], &size)) {
         goto exit;
     }
+    if (nargs < 3) {
+        goto skip_optional;
+    }
+    if (!_PyLong_UnsignedLong_Converter(args[2], &flags)) {
+        goto exit;
+    }
+skip_optional:
     return_value = _overlapped_Overlapped_WSARecv_impl(self, handle, size, flags);
 
 exit:
@@ -541,8 +675,21 @@ _overlapped_Overlapped_WSARecvInto(OverlappedObject *self, PyObject *const *args
     Py_buffer bufobj = {NULL, NULL};
     DWORD flags;
 
-    if (!_PyArg_ParseStack(args, nargs, ""F_HANDLE"y*k:WSARecvInto",
-        &handle, &bufobj, &flags)) {
+    if (!_PyArg_CheckPositional("WSARecvInto", nargs, 3, 3)) {
+        goto exit;
+    }
+    handle = PyLong_AsVoidPtr(args[0]);
+    if (!handle && PyErr_Occurred()) {
+        goto exit;
+    }
+    if (PyObject_GetBuffer(args[1], &bufobj, PyBUF_SIMPLE) != 0) {
+        goto exit;
+    }
+    if (!PyBuffer_IsContiguous(&bufobj, 'C')) {
+        _PyArg_BadArgument("WSARecvInto", "argument 2", "contiguous buffer", args[1]);
+        goto exit;
+    }
+    if (!_PyLong_UnsignedLong_Converter(args[2], &flags)) {
         goto exit;
     }
     return_value = _overlapped_Overlapped_WSARecvInto_impl(self, handle, &bufobj, flags);
@@ -576,8 +723,18 @@ _overlapped_Overlapped_WriteFile(OverlappedObject *self, PyObject *const *args,
     HANDLE handle;
     Py_buffer bufobj = {NULL, NULL};
 
-    if (!_PyArg_ParseStack(args, nargs, ""F_HANDLE"y*:WriteFile",
-        &handle, &bufobj)) {
+    if (!_PyArg_CheckPositional("WriteFile", nargs, 2, 2)) {
+        goto exit;
+    }
+    handle = PyLong_AsVoidPtr(args[0]);
+    if (!handle && PyErr_Occurred()) {
+        goto exit;
+    }
+    if (PyObject_GetBuffer(args[1], &bufobj, PyBUF_SIMPLE) != 0) {
+        goto exit;
+    }
+    if (!PyBuffer_IsContiguous(&bufobj, 'C')) {
+        _PyArg_BadArgument("WriteFile", "argument 2", "contiguous buffer", args[1]);
         goto exit;
     }
     return_value = _overlapped_Overlapped_WriteFile_impl(self, handle, &bufobj);
@@ -612,8 +769,21 @@ _overlapped_Overlapped_WSASend(OverlappedObject *self, PyObject *const *args, Py
     Py_buffer bufobj = {NULL, NULL};
     DWORD flags;
 
-    if (!_PyArg_ParseStack(args, nargs, ""F_HANDLE"y*k:WSASend",
-        &handle, &bufobj, &flags)) {
+    if (!_PyArg_CheckPositional("WSASend", nargs, 3, 3)) {
+        goto exit;
+    }
+    handle = PyLong_AsVoidPtr(args[0]);
+    if (!handle && PyErr_Occurred()) {
+        goto exit;
+    }
+    if (PyObject_GetBuffer(args[1], &bufobj, PyBUF_SIMPLE) != 0) {
+        goto exit;
+    }
+    if (!PyBuffer_IsContiguous(&bufobj, 'C')) {
+        _PyArg_BadArgument("WSASend", "argument 2", "contiguous buffer", args[1]);
+        goto exit;
+    }
+    if (!_PyLong_UnsignedLong_Converter(args[2], &flags)) {
         goto exit;
     }
     return_value = _overlapped_Overlapped_WSASend_impl(self, handle, &bufobj, flags);
@@ -648,8 +818,15 @@ _overlapped_Overlapped_AcceptEx(OverlappedObject *self, PyObject *const *args, P
     HANDLE ListenSocket;
     HANDLE AcceptSocket;
 
-    if (!_PyArg_ParseStack(args, nargs, ""F_HANDLE""F_HANDLE":AcceptEx",
-        &ListenSocket, &AcceptSocket)) {
+    if (!_PyArg_CheckPositional("AcceptEx", nargs, 2, 2)) {
+        goto exit;
+    }
+    ListenSocket = PyLong_AsVoidPtr(args[0]);
+    if (!ListenSocket && PyErr_Occurred()) {
+        goto exit;
+    }
+    AcceptSocket = PyLong_AsVoidPtr(args[1]);
+    if (!AcceptSocket && PyErr_Occurred()) {
         goto exit;
     }
     return_value = _overlapped_Overlapped_AcceptEx_impl(self, ListenSocket, AcceptSocket);
@@ -681,10 +858,18 @@ _overlapped_Overlapped_ConnectEx(OverlappedObject *self, PyObject *const *args,
     HANDLE ConnectSocket;
     PyObject *AddressObj;
 
-    if (!_PyArg_ParseStack(args, nargs, ""F_HANDLE"O!:ConnectEx",
-        &ConnectSocket, &PyTuple_Type, &AddressObj)) {
+    if (!_PyArg_CheckPositional("ConnectEx", nargs, 2, 2)) {
+        goto exit;
+    }
+    ConnectSocket = PyLong_AsVoidPtr(args[0]);
+    if (!ConnectSocket && PyErr_Occurred()) {
         goto exit;
     }
+    if (!PyTuple_Check(args[1])) {
+        _PyArg_BadArgument("ConnectEx", "argument 2", "tuple", args[1]);
+        goto exit;
+    }
+    AddressObj = args[1];
     return_value = _overlapped_Overlapped_ConnectEx_impl(self, ConnectSocket, AddressObj);
 
 exit:
@@ -710,8 +895,14 @@ _overlapped_Overlapped_DisconnectEx(OverlappedObject *self, PyObject *const *arg
     HANDLE Socket;
     DWORD flags;
 
-    if (!_PyArg_ParseStack(args, nargs, ""F_HANDLE"k:DisconnectEx",
-        &Socket, &flags)) {
+    if (!_PyArg_CheckPositional("DisconnectEx", nargs, 2, 2)) {
+        goto exit;
+    }
+    Socket = PyLong_AsVoidPtr(args[0]);
+    if (!Socket && PyErr_Occurred()) {
+        goto exit;
+    }
+    if (!_PyLong_UnsignedLong_Converter(args[1], &flags)) {
         goto exit;
     }
     return_value = _overlapped_Overlapped_DisconnectEx_impl(self, Socket, flags);
@@ -749,8 +940,30 @@ _overlapped_Overlapped_TransmitFile(OverlappedObject *self, PyObject *const *arg
     DWORD count_per_send;
     DWORD flags;
 
-    if (!_PyArg_ParseStack(args, nargs, ""F_HANDLE""F_HANDLE"kkkkk:TransmitFile",
-        &Socket, &File, &offset, &offset_high, &count_to_write, &count_per_send, &flags)) {
+    if (!_PyArg_CheckPositional("TransmitFile", nargs, 7, 7)) {
+        goto exit;
+    }
+    Socket = PyLong_AsVoidPtr(args[0]);
+    if (!Socket && PyErr_Occurred()) {
+        goto exit;
+    }
+    File = PyLong_AsVoidPtr(args[1]);
+    if (!File && PyErr_Occurred()) {
+        goto exit;
+    }
+    if (!_PyLong_UnsignedLong_Converter(args[2], &offset)) {
+        goto exit;
+    }
+    if (!_PyLong_UnsignedLong_Converter(args[3], &offset_high)) {
+        goto exit;
+    }
+    if (!_PyLong_UnsignedLong_Converter(args[4], &count_to_write)) {
+        goto exit;
+    }
+    if (!_PyLong_UnsignedLong_Converter(args[5], &count_per_send)) {
+        goto exit;
+    }
+    if (!_PyLong_UnsignedLong_Converter(args[6], &flags)) {
         goto exit;
     }
     return_value = _overlapped_Overlapped_TransmitFile_impl(self, Socket, File, offset, offset_high, count_to_write, count_per_send, flags);
@@ -778,7 +991,8 @@ _overlapped_Overlapped_ConnectNamedPipe(OverlappedObject *self, PyObject *arg)
     PyObject *return_value = NULL;
     HANDLE Pipe;
 
-    if (!PyArg_Parse(arg, ""F_HANDLE":ConnectNamedPipe", &Pipe)) {
+    Pipe = PyLong_AsVoidPtr(arg);
+    if (!Pipe && PyErr_Occurred()) {
         goto exit;
     }
     return_value = _overlapped_Overlapped_ConnectNamedPipe_impl(self, Pipe);
@@ -843,10 +1057,14 @@ _overlapped_WSAConnect(PyObject *module, PyObject *const *args, Py_ssize_t nargs
     HANDLE ConnectSocket;
     PyObject *AddressObj;
 
-    if (!_PyArg_ParseStack(args, nargs, ""F_HANDLE"O:WSAConnect",
-        &ConnectSocket, &AddressObj)) {
+    if (!_PyArg_CheckPositional("WSAConnect", nargs, 2, 2)) {
+        goto exit;
+    }
+    ConnectSocket = PyLong_AsVoidPtr(args[0]);
+    if (!ConnectSocket && PyErr_Occurred()) {
         goto exit;
     }
+    AddressObj = args[1];
     return_value = _overlapped_WSAConnect_impl(module, ConnectSocket, AddressObj);
 
 exit:
@@ -876,10 +1094,24 @@ _overlapped_Overlapped_WSASendTo(OverlappedObject *self, PyObject *const *args,
     DWORD flags;
     PyObject *AddressObj;
 
-    if (!_PyArg_ParseStack(args, nargs, ""F_HANDLE"y*kO:WSASendTo",
-        &handle, &bufobj, &flags, &AddressObj)) {
+    if (!_PyArg_CheckPositional("WSASendTo", nargs, 4, 4)) {
         goto exit;
     }
+    handle = PyLong_AsVoidPtr(args[0]);
+    if (!handle && PyErr_Occurred()) {
+        goto exit;
+    }
+    if (PyObject_GetBuffer(args[1], &bufobj, PyBUF_SIMPLE) != 0) {
+        goto exit;
+    }
+    if (!PyBuffer_IsContiguous(&bufobj, 'C')) {
+        _PyArg_BadArgument("WSASendTo", "argument 2", "contiguous buffer", args[1]);
+        goto exit;
+    }
+    if (!_PyLong_UnsignedLong_Converter(args[2], &flags)) {
+        goto exit;
+    }
+    AddressObj = args[3];
     return_value = _overlapped_Overlapped_WSASendTo_impl(self, handle, &bufobj, flags, AddressObj);
 
 exit:
@@ -913,10 +1145,23 @@ _overlapped_Overlapped_WSARecvFrom(OverlappedObject *self, PyObject *const *args
     DWORD size;
     DWORD flags = 0;
 
-    if (!_PyArg_ParseStack(args, nargs, ""F_HANDLE"k|k:WSARecvFrom",
-        &handle, &size, &flags)) {
+    if (!_PyArg_CheckPositional("WSARecvFrom", nargs, 2, 3)) {
         goto exit;
     }
+    handle = PyLong_AsVoidPtr(args[0]);
+    if (!handle && PyErr_Occurred()) {
+        goto exit;
+    }
+    if (!_PyLong_UnsignedLong_Converter(args[1], &size)) {
+        goto exit;
+    }
+    if (nargs < 3) {
+        goto skip_optional;
+    }
+    if (!_PyLong_UnsignedLong_Converter(args[2], &flags)) {
+        goto exit;
+    }
+skip_optional:
     return_value = _overlapped_Overlapped_WSARecvFrom_impl(self, handle, size, flags);
 
 exit:
@@ -946,10 +1191,30 @@ _overlapped_Overlapped_WSARecvFromInto(OverlappedObject *self, PyObject *const *
     DWORD size;
     DWORD flags = 0;
 
-    if (!_PyArg_ParseStack(args, nargs, ""F_HANDLE"y*k|k:WSARecvFromInto",
-        &handle, &bufobj, &size, &flags)) {
+    if (!_PyArg_CheckPositional("WSARecvFromInto", nargs, 3, 4)) {
+        goto exit;
+    }
+    handle = PyLong_AsVoidPtr(args[0]);
+    if (!handle && PyErr_Occurred()) {
+        goto exit;
+    }
+    if (PyObject_GetBuffer(args[1], &bufobj, PyBUF_SIMPLE) != 0) {
+        goto exit;
+    }
+    if (!PyBuffer_IsContiguous(&bufobj, 'C')) {
+        _PyArg_BadArgument("WSARecvFromInto", "argument 2", "contiguous buffer", args[1]);
+        goto exit;
+    }
+    if (!_PyLong_UnsignedLong_Converter(args[2], &size)) {
+        goto exit;
+    }
+    if (nargs < 4) {
+        goto skip_optional;
+    }
+    if (!_PyLong_UnsignedLong_Converter(args[3], &flags)) {
         goto exit;
     }
+skip_optional:
     return_value = _overlapped_Overlapped_WSARecvFromInto_impl(self, handle, &bufobj, size, flags);
 
 exit:
@@ -960,4 +1225,4 @@ _overlapped_Overlapped_WSARecvFromInto(OverlappedObject *self, PyObject *const *
 
     return return_value;
 }
-/*[clinic end generated code: output=9078d9f9984864a2 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=d90cda84e49a7c23 input=a9049054013a1b77]*/
diff --git a/Modules/overlapped.c b/Modules/overlapped.c
index 19d25a53af7bb..0cec9eedc87f0 100644
--- a/Modules/overlapped.c
+++ b/Modules/overlapped.c
@@ -32,27 +32,33 @@
 #define T_HANDLE T_POINTER
 
 /*[python input]
-class OVERLAPPED_converter(CConverter):
-    type = 'OVERLAPPED *'
+class pointer_converter(CConverter):
     format_unit = '"F_POINTER"'
 
-class HANDLE_converter(CConverter):
+    def parse_arg(self, argname, displayname):
+        return """
+            {paramname} = PyLong_AsVoidPtr({argname});
+            if (!{paramname} && PyErr_Occurred()) {{{{
+                goto exit;
+            }}}}
+            """.format(argname=argname, paramname=self.parser_name)
+
+class OVERLAPPED_converter(pointer_converter):
+    type = 'OVERLAPPED *'
+
+class HANDLE_converter(pointer_converter):
     type = 'HANDLE'
-    format_unit = '"F_HANDLE"'
 
-class ULONG_PTR_converter(CConverter):
+class ULONG_PTR_converter(pointer_converter):
     type = 'ULONG_PTR'
-    format_unit = '"F_ULONG_PTR"'
 
-class DWORD_converter(CConverter):
+class DWORD_converter(unsigned_long_converter):
     type = 'DWORD'
-    format_unit = 'k'
 
-class BOOL_converter(CConverter):
+class BOOL_converter(int_converter):
     type = 'BOOL'
-    format_unit = 'i'
 [python start generated code]*/
-/*[python end generated code: output=da39a3ee5e6b4b0d input=83bb8c2c2514f2a8]*/
+/*[python end generated code: output=da39a3ee5e6b4b0d input=a19133a9e14fae9c]*/
 
 /*[clinic input]
 module _overlapped


From webhook-mailer at python.org  Thu Jul 28 18:12:37 2022
From: webhook-mailer at python.org (zooba)
Date: Thu, 28 Jul 2022 22:12:37 -0000
Subject: [Python-checkins] gh-59200: Clarify `PyLong_FromString`
 documentation (GH-94363)
Message-ID: <mailman.338.1659046358.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/03da5d0f5b8c954d9b4d2ad837518dd605e60355
commit: 03da5d0f5b8c954d9b4d2ad837518dd605e60355
branch: main
author: JustAnotherArchivist <JustAnotherArchivist at users.noreply.github.com>
committer: zooba <steve.dower at microsoft.com>
date: 2022-07-28T23:12:27+01:00
summary:

gh-59200: Clarify `PyLong_FromString` documentation (GH-94363)

files:
M Doc/c-api/long.rst

diff --git a/Doc/c-api/long.rst b/Doc/c-api/long.rst
index 620344e71373b..56a7c069de908 100644
--- a/Doc/c-api/long.rst
+++ b/Doc/c-api/long.rst
@@ -84,14 +84,15 @@ distinguished from a number.  Use :c:func:`PyErr_Occurred` to disambiguate.
 .. c:function:: PyObject* PyLong_FromString(const char *str, char **pend, int base)
 
    Return a new :c:type:`PyLongObject` based on the string value in *str*, which
-   is interpreted according to the radix in *base*.  If *pend* is non-``NULL``,
-   *\*pend* will point to the first character in *str* which follows the
-   representation of the number.  If *base* is ``0``, *str* is interpreted using
-   the :ref:`integers` definition; in this case, leading zeros in a
-   non-zero decimal number raises a :exc:`ValueError`. If *base* is not ``0``,
-   it must be between ``2`` and ``36``, inclusive.  Leading spaces and single
-   underscores after a base specifier and between digits are ignored.  If there
-   are no digits, :exc:`ValueError` will be raised.
+   is interpreted according to the radix in *base*, or ``NULL`` on failure.  If
+   *pend* is non-``NULL``, *\*pend* will point to the end of *str* on success or
+   to the first character that could not be processed on error.  If *base* is ``0``,
+   *str* is interpreted using the :ref:`integers` definition; in this case, leading
+   zeros in a non-zero decimal number raises a :exc:`ValueError`.  If *base* is not
+   ``0``, it must be between ``2`` and ``36``, inclusive.  Leading and trailing
+   whitespace and single underscores after a base specifier and between digits are
+   ignored.  If there are no digits or *str* is not NULL-terminated following the
+   digits and trailing whitespace, :exc:`ValueError` will be raised.
 
 
 .. c:function:: PyObject* PyLong_FromUnicodeObject(PyObject *u, int base)


From webhook-mailer at python.org  Thu Jul 28 18:32:42 2022
From: webhook-mailer at python.org (zooba)
Date: Thu, 28 Jul 2022 22:32:42 -0000
Subject: [Python-checkins] Fix Unicode doc and replace use of macro with
 PyMem_New function (GH-94088)
Message-ID: <mailman.339.1659047563.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/70068b933689ffc25397970553ae3bef559173fb
commit: 70068b933689ffc25397970553ae3bef559173fb
branch: main
author: Pamela Fox <pamela.fox at gmail.com>
committer: zooba <steve.dower at microsoft.com>
date: 2022-07-28T23:32:16+01:00
summary:

Fix Unicode doc and replace use of macro with PyMem_New function (GH-94088)

files:
M Doc/c-api/unicode.rst
M Objects/unicodeobject.c

diff --git a/Doc/c-api/unicode.rst b/Doc/c-api/unicode.rst
index 5d420bfa93cb2..339ee35c7aa47 100644
--- a/Doc/c-api/unicode.rst
+++ b/Doc/c-api/unicode.rst
@@ -819,7 +819,7 @@ wchar_t Support
    most C functions. If *size* is ``NULL`` and the :c:type:`wchar_t*` string
    contains null characters a :exc:`ValueError` is raised.
 
-   Returns a buffer allocated by :c:func:`PyMem_Alloc` (use
+   Returns a buffer allocated by :c:func:`PyMem_New` (use
    :c:func:`PyMem_Free` to free it) on success. On error, returns ``NULL``
    and *\*size* is undefined. Raises a :exc:`MemoryError` if memory allocation
    is failed.
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
index 7e3caf1af14c5..ad16ada16fe3b 100644
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -2843,7 +2843,7 @@ PyUnicode_AsWideCharString(PyObject *unicode,
     }
 
     buflen = unicode_get_widechar_size(unicode);
-    buffer = (wchar_t *) PyMem_NEW(wchar_t, (buflen + 1));
+    buffer = (wchar_t *) PyMem_New(wchar_t, (buflen + 1));
     if (buffer == NULL) {
         PyErr_NoMemory();
         return NULL;


From webhook-mailer at python.org  Thu Jul 28 18:39:18 2022
From: webhook-mailer at python.org (zooba)
Date: Thu, 28 Jul 2022 22:39:18 -0000
Subject: [Python-checkins] gh-86128: Add warning to ThreadPoolExecutor docs
 about atexit behaviour (GH-94008)
Message-ID: <mailman.340.1659047959.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/7df2f4d78714707cfb30d83ca99ce84ef9934892
commit: 7df2f4d78714707cfb30d83ca99ce84ef9934892
branch: main
author: [object Object] <lucas.wiman at gmail.com>
committer: zooba <steve.dower at microsoft.com>
date: 2022-07-28T23:38:56+01:00
summary:

gh-86128: Add warning to ThreadPoolExecutor docs about atexit behaviour (GH-94008)

files:
A Misc/NEWS.d/next/Documentation/2022-06-19-18-18-22.gh-issue-86128.39DDTD.rst
M Doc/library/concurrent.futures.rst

diff --git a/Doc/library/concurrent.futures.rst b/Doc/library/concurrent.futures.rst
index 8efbf0a3d5955..db5971e4d60fc 100644
--- a/Doc/library/concurrent.futures.rst
+++ b/Doc/library/concurrent.futures.rst
@@ -149,6 +149,13 @@ And::
    An :class:`Executor` subclass that uses a pool of at most *max_workers*
    threads to execute calls asynchronously.
 
+   All threads enqueued to ``ThreadPoolExecutor`` will be joined before the
+   interpreter can exit. Note that the exit handler which does this is
+   executed *before* any exit handlers added using `atexit`. This means
+   exceptions in the main thread must be caught and handled in order to
+   signal threads to exit gracefully. For this reason, it is recommended
+   that ``ThreadPoolExecutor`` not be used for long-running tasks.
+
    *initializer* is an optional callable that is called at the start of
    each worker thread; *initargs* is a tuple of arguments passed to the
    initializer.  Should *initializer* raise an exception, all currently
diff --git a/Misc/NEWS.d/next/Documentation/2022-06-19-18-18-22.gh-issue-86128.39DDTD.rst b/Misc/NEWS.d/next/Documentation/2022-06-19-18-18-22.gh-issue-86128.39DDTD.rst
new file mode 100644
index 0000000000000..bab006856deea
--- /dev/null
+++ b/Misc/NEWS.d/next/Documentation/2022-06-19-18-18-22.gh-issue-86128.39DDTD.rst
@@ -0,0 +1 @@
+Document a limitation in ThreadPoolExecutor where its exit handler is executed before any handlers in atexit.


From webhook-mailer at python.org  Thu Jul 28 18:43:12 2022
From: webhook-mailer at python.org (zooba)
Date: Thu, 28 Jul 2022 22:43:12 -0000
Subject: [Python-checkins] Fix misused variable that was preventing
 permutations of classes from being tested (GH-93935)
Message-ID: <mailman.341.1659048193.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/390847922c8f93db6f639d6e0ab3e53aefa60c76
commit: 390847922c8f93db6f639d6e0ab3e53aefa60c76
branch: main
author: Jingxuan He <LostBenjamin at users.noreply.github.com>
committer: zooba <steve.dower at microsoft.com>
date: 2022-07-28T23:42:51+01:00
summary:

Fix misused variable that was preventing permutations of classes from being tested (GH-93935)

files:
M Lib/test/test_functools.py

diff --git a/Lib/test/test_functools.py b/Lib/test/test_functools.py
index 767d2a9c1aea9..a4b098a2a5b8e 100644
--- a/Lib/test/test_functools.py
+++ b/Lib/test/test_functools.py
@@ -2003,7 +2003,7 @@ class D(collections.defaultdict):
         c.MutableSequence.register(D)
         bases = [c.MutableSequence, c.MutableMapping]
         for haystack in permutations(bases):
-            m = mro(D, bases)
+            m = mro(D, haystack)
             self.assertEqual(m, [D, c.MutableSequence, c.Sequence, c.Reversible,
                                  collections.defaultdict, dict, c.MutableMapping, c.Mapping,
                                  c.Collection, c.Sized, c.Iterable, c.Container,


From webhook-mailer at python.org  Thu Jul 28 18:46:55 2022
From: webhook-mailer at python.org (miss-islington)
Date: Thu, 28 Jul 2022 22:46:55 -0000
Subject: [Python-checkins] gh-86128: Add warning to ThreadPoolExecutor docs
 about atexit behaviour (GH-94008)
Message-ID: <mailman.342.1659048416.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/b50f58ecb4a15a004c83074276f079c982574732
commit: b50f58ecb4a15a004c83074276f079c982574732
branch: 3.11
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-28T15:46:45-07:00
summary:

gh-86128: Add warning to ThreadPoolExecutor docs about atexit behaviour (GH-94008)

(cherry picked from commit 7df2f4d78714707cfb30d83ca99ce84ef9934892)

Co-authored-by: [object Object] <lucas.wiman at gmail.com>

files:
A Misc/NEWS.d/next/Documentation/2022-06-19-18-18-22.gh-issue-86128.39DDTD.rst
M Doc/library/concurrent.futures.rst

diff --git a/Doc/library/concurrent.futures.rst b/Doc/library/concurrent.futures.rst
index 8efbf0a3d5955..db5971e4d60fc 100644
--- a/Doc/library/concurrent.futures.rst
+++ b/Doc/library/concurrent.futures.rst
@@ -149,6 +149,13 @@ And::
    An :class:`Executor` subclass that uses a pool of at most *max_workers*
    threads to execute calls asynchronously.
 
+   All threads enqueued to ``ThreadPoolExecutor`` will be joined before the
+   interpreter can exit. Note that the exit handler which does this is
+   executed *before* any exit handlers added using `atexit`. This means
+   exceptions in the main thread must be caught and handled in order to
+   signal threads to exit gracefully. For this reason, it is recommended
+   that ``ThreadPoolExecutor`` not be used for long-running tasks.
+
    *initializer* is an optional callable that is called at the start of
    each worker thread; *initargs* is a tuple of arguments passed to the
    initializer.  Should *initializer* raise an exception, all currently
diff --git a/Misc/NEWS.d/next/Documentation/2022-06-19-18-18-22.gh-issue-86128.39DDTD.rst b/Misc/NEWS.d/next/Documentation/2022-06-19-18-18-22.gh-issue-86128.39DDTD.rst
new file mode 100644
index 0000000000000..bab006856deea
--- /dev/null
+++ b/Misc/NEWS.d/next/Documentation/2022-06-19-18-18-22.gh-issue-86128.39DDTD.rst
@@ -0,0 +1 @@
+Document a limitation in ThreadPoolExecutor where its exit handler is executed before any handlers in atexit.


From webhook-mailer at python.org  Thu Jul 28 18:48:30 2022
From: webhook-mailer at python.org (miss-islington)
Date: Thu, 28 Jul 2022 22:48:30 -0000
Subject: [Python-checkins] gh-86128: Add warning to ThreadPoolExecutor docs
 about atexit behaviour (GH-94008)
Message-ID: <mailman.343.1659048511.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/196523f32b78d49e37ffc98385364f82ac8a87b4
commit: 196523f32b78d49e37ffc98385364f82ac8a87b4
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-28T15:48:19-07:00
summary:

gh-86128: Add warning to ThreadPoolExecutor docs about atexit behaviour (GH-94008)

(cherry picked from commit 7df2f4d78714707cfb30d83ca99ce84ef9934892)

Co-authored-by: [object Object] <lucas.wiman at gmail.com>

files:
A Misc/NEWS.d/next/Documentation/2022-06-19-18-18-22.gh-issue-86128.39DDTD.rst
M Doc/library/concurrent.futures.rst

diff --git a/Doc/library/concurrent.futures.rst b/Doc/library/concurrent.futures.rst
index 70a17a23119c1..8c43590ce2b1d 100644
--- a/Doc/library/concurrent.futures.rst
+++ b/Doc/library/concurrent.futures.rst
@@ -149,6 +149,13 @@ And::
    An :class:`Executor` subclass that uses a pool of at most *max_workers*
    threads to execute calls asynchronously.
 
+   All threads enqueued to ``ThreadPoolExecutor`` will be joined before the
+   interpreter can exit. Note that the exit handler which does this is
+   executed *before* any exit handlers added using `atexit`. This means
+   exceptions in the main thread must be caught and handled in order to
+   signal threads to exit gracefully. For this reason, it is recommended
+   that ``ThreadPoolExecutor`` not be used for long-running tasks.
+
    *initializer* is an optional callable that is called at the start of
    each worker thread; *initargs* is a tuple of arguments passed to the
    initializer.  Should *initializer* raise an exception, all currently
diff --git a/Misc/NEWS.d/next/Documentation/2022-06-19-18-18-22.gh-issue-86128.39DDTD.rst b/Misc/NEWS.d/next/Documentation/2022-06-19-18-18-22.gh-issue-86128.39DDTD.rst
new file mode 100644
index 0000000000000..bab006856deea
--- /dev/null
+++ b/Misc/NEWS.d/next/Documentation/2022-06-19-18-18-22.gh-issue-86128.39DDTD.rst
@@ -0,0 +1 @@
+Document a limitation in ThreadPoolExecutor where its exit handler is executed before any handlers in atexit.


From webhook-mailer at python.org  Thu Jul 28 18:48:43 2022
From: webhook-mailer at python.org (zooba)
Date: Thu, 28 Jul 2022 22:48:43 -0000
Subject: [Python-checkins] gh-43414: os.get_terminal_size() now uses the
 actual file descriptor on Windows instead of mapping to standard handles
 (#93203)
Message-ID: <mailman.344.1659048525.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/edb72047f35d6da48c59bcfe0c655939a88ea0a6
commit: edb72047f35d6da48c59bcfe0c655939a88ea0a6
branch: main
author: Raghunandan Bhat <33787364+raghunandanbhat at users.noreply.github.com>
committer: zooba <steve.dower at microsoft.com>
date: 2022-07-28T23:48:33+01:00
summary:

gh-43414: os.get_terminal_size() now uses the actual file descriptor on Windows instead of mapping to standard handles (#93203)

files:
A Misc/NEWS.d/next/Windows/2022-05-28-19-36-13.gh-issue-43414.NGMJ3g.rst
M Lib/test/test_os.py
M Modules/posixmodule.c

diff --git a/Lib/test/test_os.py b/Lib/test/test_os.py
index 9970b234b4831..2dafb78ebe0ec 100644
--- a/Lib/test/test_os.py
+++ b/Lib/test/test_os.py
@@ -3665,6 +3665,19 @@ def test_stty_match(self):
             raise
         self.assertEqual(expected, actual)
 
+    @unittest.skipUnless(sys.platform == 'win32', 'Windows specific test')
+    def test_windows_fd(self):
+        """Check if get_terminal_size() returns a meaningful value in Windows"""
+        try:
+            conout = open('conout$', 'w')
+        except OSError:
+            self.skipTest('failed to open conout$')
+        with conout:
+            size = os.get_terminal_size(conout.fileno())
+
+        self.assertGreaterEqual(size.columns, 0)
+        self.assertGreaterEqual(size.lines, 0)
+
 
 @unittest.skipUnless(hasattr(os, 'memfd_create'), 'requires os.memfd_create')
 @support.requires_linux_version(3, 17)
diff --git a/Misc/NEWS.d/next/Windows/2022-05-28-19-36-13.gh-issue-43414.NGMJ3g.rst b/Misc/NEWS.d/next/Windows/2022-05-28-19-36-13.gh-issue-43414.NGMJ3g.rst
new file mode 100644
index 0000000000000..553e8762d5d1e
--- /dev/null
+++ b/Misc/NEWS.d/next/Windows/2022-05-28-19-36-13.gh-issue-43414.NGMJ3g.rst
@@ -0,0 +1,2 @@
+:func:`os.get_terminal_size` now attempts to read the size from any provided
+handle, rather than only supporting file descriptors 0, 1 and 2.
diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
index 5855c422182e9..d45fa231ae5e2 100644
--- a/Modules/posixmodule.c
+++ b/Modules/posixmodule.c
@@ -13247,24 +13247,11 @@ os_get_terminal_size_impl(PyObject *module, int fd)
 
 #ifdef TERMSIZE_USE_CONIO
     {
-        DWORD nhandle;
         HANDLE handle;
         CONSOLE_SCREEN_BUFFER_INFO csbi;
-        switch (fd) {
-        case 0: nhandle = STD_INPUT_HANDLE;
-            break;
-        case 1: nhandle = STD_OUTPUT_HANDLE;
-            break;
-        case 2: nhandle = STD_ERROR_HANDLE;
-            break;
-        default:
-            return PyErr_Format(PyExc_ValueError, "bad file descriptor");
-        }
-        handle = GetStdHandle(nhandle);
-        if (handle == NULL)
-            return PyErr_Format(PyExc_OSError, "handle cannot be retrieved");
+        handle = _Py_get_osfhandle(fd);
         if (handle == INVALID_HANDLE_VALUE)
-            return PyErr_SetFromWindowsErr(0);
+            return NULL;
 
         if (!GetConsoleScreenBufferInfo(handle, &csbi))
             return PyErr_SetFromWindowsErr(0);


From webhook-mailer at python.org  Thu Jul 28 19:04:49 2022
From: webhook-mailer at python.org (terryjreedy)
Date: Thu, 28 Jul 2022 23:04:49 -0000
Subject: [Python-checkins] gh-89610: Add .pyi as a recognised extension for
 IDLE on macOS (#95393)
Message-ID: <mailman.345.1659049490.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/06fc249135e5b98a74fc0213e157e80412354659
commit: 06fc249135e5b98a74fc0213e157e80412354659
branch: main
author: Erlend Egeberg Aasland <erlend.aasland at protonmail.com>
committer: terryjreedy <tjreedy at udel.edu>
date: 2022-07-28T19:04:26-04:00
summary:

gh-89610: Add .pyi as a recognised extension for IDLE on macOS (#95393)

This allows opening stub files by double clicking on them in the Finder.

Co-authored-by: Terry Jan Reedy <tjreedy at udel.edu>

files:
A Misc/NEWS.d/next/IDLE/2022-07-28-18-56-57.gh-issue-89610.hcosiM.rst
M Lib/idlelib/NEWS.txt
M Mac/IDLE/IDLE.app/Contents/Info.plist

diff --git a/Lib/idlelib/NEWS.txt b/Lib/idlelib/NEWS.txt
index 05308a0b114af..ffb090aa45a46 100644
--- a/Lib/idlelib/NEWS.txt
+++ b/Lib/idlelib/NEWS.txt
@@ -3,6 +3,8 @@ What's New in IDLE 3.11.0
 Released on 2022-10-03
 =========================
 
+gh-89610: Add .pyi as a recognized extension for IDLE on macOS.  This allows
+opening stub files by double clicking on them in the Finder.
 
 bpo-28950: Apply IDLE syntax highlighting to `.pyi` files.  Add util.py
 for common components.  Patch by Alex Waygood and Terry Jan Reedy.
diff --git a/Mac/IDLE/IDLE.app/Contents/Info.plist b/Mac/IDLE/IDLE.app/Contents/Info.plist
index d197c77ed4b1a..799a164cbdf2e 100644
--- a/Mac/IDLE/IDLE.app/Contents/Info.plist
+++ b/Mac/IDLE/IDLE.app/Contents/Info.plist
@@ -10,6 +10,7 @@
 			<key>CFBundleTypeExtensions</key>
 			<array>
 				<string>py</string>
+				<string>pyi</string>
 				<string>pyw</string>
 			</array>
 			<key>CFBundleTypeIconFile</key>
diff --git a/Misc/NEWS.d/next/IDLE/2022-07-28-18-56-57.gh-issue-89610.hcosiM.rst b/Misc/NEWS.d/next/IDLE/2022-07-28-18-56-57.gh-issue-89610.hcosiM.rst
new file mode 100644
index 0000000000000..0d283711e3e86
--- /dev/null
+++ b/Misc/NEWS.d/next/IDLE/2022-07-28-18-56-57.gh-issue-89610.hcosiM.rst
@@ -0,0 +1,2 @@
+Add .pyi as a recognized extension for IDLE on macOS.    This allows opening
+stub files by double clicking on them in the Finder.


From webhook-mailer at python.org  Thu Jul 28 19:29:20 2022
From: webhook-mailer at python.org (miss-islington)
Date: Thu, 28 Jul 2022 23:29:20 -0000
Subject: [Python-checkins] gh-89610: Add .pyi as a recognised extension for
 IDLE on macOS (GH-95393)
Message-ID: <mailman.346.1659050961.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/309c8f316d1d3db920d5082afdd8b531c8754d1c
commit: 309c8f316d1d3db920d5082afdd8b531c8754d1c
branch: 3.11
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-28T16:28:50-07:00
summary:

gh-89610: Add .pyi as a recognised extension for IDLE on macOS (GH-95393)


This allows opening stub files by double clicking on them in the Finder.

Co-authored-by: Terry Jan Reedy <tjreedy at udel.edu>
(cherry picked from commit 06fc249135e5b98a74fc0213e157e80412354659)

Co-authored-by: Erlend Egeberg Aasland <erlend.aasland at protonmail.com>

files:
A Misc/NEWS.d/next/IDLE/2022-07-28-18-56-57.gh-issue-89610.hcosiM.rst
M Lib/idlelib/NEWS.txt
M Mac/IDLE/IDLE.app/Contents/Info.plist

diff --git a/Lib/idlelib/NEWS.txt b/Lib/idlelib/NEWS.txt
index 05308a0b114af..ffb090aa45a46 100644
--- a/Lib/idlelib/NEWS.txt
+++ b/Lib/idlelib/NEWS.txt
@@ -3,6 +3,8 @@ What's New in IDLE 3.11.0
 Released on 2022-10-03
 =========================
 
+gh-89610: Add .pyi as a recognized extension for IDLE on macOS.  This allows
+opening stub files by double clicking on them in the Finder.
 
 bpo-28950: Apply IDLE syntax highlighting to `.pyi` files.  Add util.py
 for common components.  Patch by Alex Waygood and Terry Jan Reedy.
diff --git a/Mac/IDLE/IDLE.app/Contents/Info.plist b/Mac/IDLE/IDLE.app/Contents/Info.plist
index d197c77ed4b1a..799a164cbdf2e 100644
--- a/Mac/IDLE/IDLE.app/Contents/Info.plist
+++ b/Mac/IDLE/IDLE.app/Contents/Info.plist
@@ -10,6 +10,7 @@
 			<key>CFBundleTypeExtensions</key>
 			<array>
 				<string>py</string>
+				<string>pyi</string>
 				<string>pyw</string>
 			</array>
 			<key>CFBundleTypeIconFile</key>
diff --git a/Misc/NEWS.d/next/IDLE/2022-07-28-18-56-57.gh-issue-89610.hcosiM.rst b/Misc/NEWS.d/next/IDLE/2022-07-28-18-56-57.gh-issue-89610.hcosiM.rst
new file mode 100644
index 0000000000000..0d283711e3e86
--- /dev/null
+++ b/Misc/NEWS.d/next/IDLE/2022-07-28-18-56-57.gh-issue-89610.hcosiM.rst
@@ -0,0 +1,2 @@
+Add .pyi as a recognized extension for IDLE on macOS.    This allows opening
+stub files by double clicking on them in the Finder.


From webhook-mailer at python.org  Thu Jul 28 19:39:14 2022
From: webhook-mailer at python.org (miss-islington)
Date: Thu, 28 Jul 2022 23:39:14 -0000
Subject: [Python-checkins] gh-89610: Add .pyi as a recognised extension for
 IDLE on macOS (GH-95393)
Message-ID: <mailman.347.1659051555.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/b9b70dd4de9ff7b3685892f7d36ca44cb54e3861
commit: b9b70dd4de9ff7b3685892f7d36ca44cb54e3861
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-28T16:39:02-07:00
summary:

gh-89610: Add .pyi as a recognised extension for IDLE on macOS (GH-95393)


This allows opening stub files by double clicking on them in the Finder.

Co-authored-by: Terry Jan Reedy <tjreedy at udel.edu>
(cherry picked from commit 06fc249135e5b98a74fc0213e157e80412354659)

Co-authored-by: Erlend Egeberg Aasland <erlend.aasland at protonmail.com>

files:
A Misc/NEWS.d/next/IDLE/2022-07-28-18-56-57.gh-issue-89610.hcosiM.rst
M Lib/idlelib/NEWS.txt
M Mac/IDLE/IDLE.app/Contents/Info.plist

diff --git a/Lib/idlelib/NEWS.txt b/Lib/idlelib/NEWS.txt
index dcfb1209ac736..39e76f95226a6 100644
--- a/Lib/idlelib/NEWS.txt
+++ b/Lib/idlelib/NEWS.txt
@@ -3,6 +3,8 @@ after 3.10.0 until 3.10.10?
 Released 2023-04-03?
 =========================
 
+gh-89610: Add .pyi as a recognized extension for IDLE on macOS.  This allows
+opening stub files by double clicking on them in the Finder.
 
 bpo-28950: Apply IDLE syntax highlighting to `.pyi` files.  Add util.py
 for common components.  Patch by Alex Waygood and Terry Jan Reedy.
diff --git a/Mac/IDLE/IDLE.app/Contents/Info.plist b/Mac/IDLE/IDLE.app/Contents/Info.plist
index d197c77ed4b1a..799a164cbdf2e 100644
--- a/Mac/IDLE/IDLE.app/Contents/Info.plist
+++ b/Mac/IDLE/IDLE.app/Contents/Info.plist
@@ -10,6 +10,7 @@
 			<key>CFBundleTypeExtensions</key>
 			<array>
 				<string>py</string>
+				<string>pyi</string>
 				<string>pyw</string>
 			</array>
 			<key>CFBundleTypeIconFile</key>
diff --git a/Misc/NEWS.d/next/IDLE/2022-07-28-18-56-57.gh-issue-89610.hcosiM.rst b/Misc/NEWS.d/next/IDLE/2022-07-28-18-56-57.gh-issue-89610.hcosiM.rst
new file mode 100644
index 0000000000000..0d283711e3e86
--- /dev/null
+++ b/Misc/NEWS.d/next/IDLE/2022-07-28-18-56-57.gh-issue-89610.hcosiM.rst
@@ -0,0 +1,2 @@
+Add .pyi as a recognized extension for IDLE on macOS.    This allows opening
+stub files by double clicking on them in the Finder.


From webhook-mailer at python.org  Thu Jul 28 20:09:57 2022
From: webhook-mailer at python.org (ericvsmith)
Date: Fri, 29 Jul 2022 00:09:57 -0000
Subject: [Python-checkins] Improve documentation for adding datetime and
 timedelta (gh-95403)
Message-ID: <mailman.348.1659053398.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/6e44bf9558dbcaffd78b7c4fc7f6b474388b4a9a
commit: 6e44bf9558dbcaffd78b7c4fc7f6b474388b4a9a
branch: main
author: BenjaminHelyer <91896754+BenjaminHelyer at users.noreply.github.com>
committer: ericvsmith <ericvsmith at users.noreply.github.com>
date: 2022-07-28T20:09:51-04:00
summary:

Improve documentation for adding datetime and timedelta (gh-95403)

files:
M Doc/library/datetime.rst

diff --git a/Doc/library/datetime.rst b/Doc/library/datetime.rst
index 710f83c72e285..0f042374b6472 100644
--- a/Doc/library/datetime.rst
+++ b/Doc/library/datetime.rst
@@ -589,8 +589,8 @@ Supported operations:
 +-------------------------------+----------------------------------------------+
 | Operation                     | Result                                       |
 +===============================+==============================================+
-| ``date2 = date1 + timedelta`` | *date2* is ``timedelta.days`` days removed   |
-|                               | from *date1*. (1)                            |
+| ``date2 = date1 + timedelta`` | *date2* will be ``timedelta.days`` days      |
+|                               | after *date1*. (1)                           |
 +-------------------------------+----------------------------------------------+
 | ``date2 = date1 - timedelta`` | Computes *date2* such that ``date2 +         |
 |                               | timedelta == date1``. (2)                    |


From webhook-mailer at python.org  Thu Jul 28 20:14:10 2022
From: webhook-mailer at python.org (ericvsmith)
Date: Fri, 29 Jul 2022 00:14:10 -0000
Subject: [Python-checkins] Improve documentation for adding datetime and
 timedelta (gh-95403) (gh-95408)
Message-ID: <mailman.349.1659053651.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/3e9a496b6b54fe241a1783140e383d38ad3eb59c
commit: 3e9a496b6b54fe241a1783140e383d38ad3eb59c
branch: 3.11
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: ericvsmith <ericvsmith at users.noreply.github.com>
date: 2022-07-28T20:14:05-04:00
summary:

Improve documentation for adding datetime and timedelta (gh-95403) (gh-95408)

(cherry picked from commit 6e44bf9558dbcaffd78b7c4fc7f6b474388b4a9a)

Co-authored-by: BenjaminHelyer <91896754+BenjaminHelyer at users.noreply.github.com>

Co-authored-by: BenjaminHelyer <91896754+BenjaminHelyer at users.noreply.github.com>

files:
M Doc/library/datetime.rst

diff --git a/Doc/library/datetime.rst b/Doc/library/datetime.rst
index ef1535c84bd5a..b4580d1879c01 100644
--- a/Doc/library/datetime.rst
+++ b/Doc/library/datetime.rst
@@ -589,8 +589,8 @@ Supported operations:
 +-------------------------------+----------------------------------------------+
 | Operation                     | Result                                       |
 +===============================+==============================================+
-| ``date2 = date1 + timedelta`` | *date2* is ``timedelta.days`` days removed   |
-|                               | from *date1*. (1)                            |
+| ``date2 = date1 + timedelta`` | *date2* will be ``timedelta.days`` days      |
+|                               | after *date1*. (1)                           |
 +-------------------------------+----------------------------------------------+
 | ``date2 = date1 - timedelta`` | Computes *date2* such that ``date2 +         |
 |                               | timedelta == date1``. (2)                    |


From webhook-mailer at python.org  Thu Jul 28 20:15:31 2022
From: webhook-mailer at python.org (ericvsmith)
Date: Fri, 29 Jul 2022 00:15:31 -0000
Subject: [Python-checkins] Improve documentation for adding datetime and
 timedelta (gh-95403) (gh-95409)
Message-ID: <mailman.350.1659053732.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/5632c98f4aa2590405e2e452a5ac7e7bfa74705b
commit: 5632c98f4aa2590405e2e452a5ac7e7bfa74705b
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: ericvsmith <ericvsmith at users.noreply.github.com>
date: 2022-07-28T20:15:24-04:00
summary:

Improve documentation for adding datetime and timedelta (gh-95403) (gh-95409)

(cherry picked from commit 6e44bf9558dbcaffd78b7c4fc7f6b474388b4a9a)

Co-authored-by: BenjaminHelyer <91896754+BenjaminHelyer at users.noreply.github.com>

Co-authored-by: BenjaminHelyer <91896754+BenjaminHelyer at users.noreply.github.com>

files:
M Doc/library/datetime.rst

diff --git a/Doc/library/datetime.rst b/Doc/library/datetime.rst
index 44f9de2307d16..2f51dc3523a19 100644
--- a/Doc/library/datetime.rst
+++ b/Doc/library/datetime.rst
@@ -581,8 +581,8 @@ Supported operations:
 +-------------------------------+----------------------------------------------+
 | Operation                     | Result                                       |
 +===============================+==============================================+
-| ``date2 = date1 + timedelta`` | *date2* is ``timedelta.days`` days removed   |
-|                               | from *date1*. (1)                            |
+| ``date2 = date1 + timedelta`` | *date2* will be ``timedelta.days`` days      |
+|                               | after *date1*. (1)                           |
 +-------------------------------+----------------------------------------------+
 | ``date2 = date1 - timedelta`` | Computes *date2* such that ``date2 +         |
 |                               | timedelta == date1``. (2)                    |


From webhook-mailer at python.org  Thu Jul 28 21:24:17 2022
From: webhook-mailer at python.org (ericsnowcurrently)
Date: Fri, 29 Jul 2022 01:24:17 -0000
Subject: [Python-checkins] gh-94673: Add Per-Interpreter tp_weaklist for
 Static Builtin Types (#95302)
Message-ID: <mailman.351.1659057857.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/3e7cad3bca64ab213c66e2bd41c9d1cf1d057526
commit: 3e7cad3bca64ab213c66e2bd41c9d1cf1d057526
branch: main
author: Eric Snow <ericsnowcurrently at gmail.com>
committer: ericsnowcurrently <ericsnowcurrently at gmail.com>
date: 2022-07-28T19:23:47-06:00
summary:

gh-94673: Add Per-Interpreter tp_weaklist for Static Builtin Types (#95302)

* Store tp_weaklist on the interpreter state for static builtin types.

* Factor out _PyStaticType_GET_WEAKREFS_LISTPTR().

* Add _PyStaticType_ClearWeakRefs().

* Add a comment about how _PyStaticType_ClearWeakRefs() loops.

* Document the change.

* Update Doc/whatsnew/3.12.rst

* Fix a typo.

files:
M Doc/c-api/typeobj.rst
M Doc/whatsnew/3.12.rst
M Include/cpython/object.h
M Include/internal/pycore_object.h
M Include/internal/pycore_typeobject.h
M Objects/typeobject.c
M Objects/weakrefobject.c

diff --git a/Doc/c-api/typeobj.rst b/Doc/c-api/typeobj.rst
index a331e9c188509..7514801f2d4d5 100644
--- a/Doc/c-api/typeobj.rst
+++ b/Doc/c-api/typeobj.rst
@@ -1942,6 +1942,13 @@ and :c:type:`PyType_Type` effectively act as defaults.)
    Weak reference list head, for weak references to this type object.  Not
    inherited.  Internal use only.
 
+   .. versionchanged:: 3.12
+
+      Internals detail: For the static builtin types this is always ``NULL``,
+      even if weakrefs are added.  Instead, the weakrefs for each are stored
+      on ``PyInterpreterState``.  Use the public C-API or the internal
+      ``_PyObject_GET_WEAKREFS_LISTPTR()`` macro to avoid the distinction.
+
    **Inheritance:**
 
    This field is not inherited.
diff --git a/Doc/whatsnew/3.12.rst b/Doc/whatsnew/3.12.rst
index 03020559362b1..0c53bc0c1111d 100644
--- a/Doc/whatsnew/3.12.rst
+++ b/Doc/whatsnew/3.12.rst
@@ -413,6 +413,13 @@ Porting to Python 3.12
   ``Py_UNICODE*`` based format (e.g. ``u``, ``Z``) anymore. Please migrate
   to other formats for Unicode like ``s``, ``z``, ``es``, and ``U``.
 
+* ``tp_weaklist`` for all static builtin types is always ``NULL``.
+  This is an internal-only field on ``PyTypeObject``
+  but we're pointing out the change in case someone happens to be
+  accessing the field directly anyway.  To avoid breakage, consider
+  using the existing public C-API instead, or, if necessary, the
+  (internal-only) ``_PyObject_GET_WEAKREFS_LISTPTR()`` macro.
+
 Deprecated
 ----------
 
diff --git a/Include/cpython/object.h b/Include/cpython/object.h
index 1ca1a576fb232..026803320a11b 100644
--- a/Include/cpython/object.h
+++ b/Include/cpython/object.h
@@ -219,7 +219,7 @@ struct _typeobject {
     PyObject *tp_mro; /* method resolution order */
     PyObject *tp_cache;
     PyObject *tp_subclasses;
-    PyObject *tp_weaklist;
+    PyObject *tp_weaklist; /* not used for static builtin types */
     destructor tp_del;
 
     /* Type attribute cache version tag. Added in version 2.6 */
diff --git a/Include/internal/pycore_object.h b/Include/internal/pycore_object.h
index c7490799d816a..9f061d8b08772 100644
--- a/Include/internal/pycore_object.h
+++ b/Include/internal/pycore_object.h
@@ -220,6 +220,12 @@ extern void _Py_PrintReferenceAddresses(FILE *);
 static inline PyObject **
 _PyObject_GET_WEAKREFS_LISTPTR(PyObject *op)
 {
+    if (PyType_Check(op) &&
+            ((PyTypeObject *)op)->tp_flags & _Py_TPFLAGS_STATIC_BUILTIN) {
+        static_builtin_state *state = _PyStaticType_GetState(
+                                                        (PyTypeObject *)op);
+        return _PyStaticType_GET_WEAKREFS_LISTPTR(state);
+    }
     Py_ssize_t offset = Py_TYPE(op)->tp_weaklistoffset;
     return (PyObject **)((char *)op + offset);
 }
diff --git a/Include/internal/pycore_typeobject.h b/Include/internal/pycore_typeobject.h
index dc1c02ba41280..4f9d6b1c4d4ba 100644
--- a/Include/internal/pycore_typeobject.h
+++ b/Include/internal/pycore_typeobject.h
@@ -45,8 +45,20 @@ struct type_cache {
 
 typedef struct {
     PyTypeObject *type;
+    /* We never clean up weakrefs for static builtin types since
+       they will effectively never get triggered.  However, there
+       are also some diagnostic uses for the list of weakrefs,
+       so we still keep it. */
+    PyObject *tp_weaklist;
 } static_builtin_state;
 
+static inline PyObject **
+_PyStaticType_GET_WEAKREFS_LISTPTR(static_builtin_state *state)
+{
+    assert(state != NULL);
+    return &state->tp_weaklist;
+}
+
 struct types_state {
     struct type_cache type_cache;
     size_t num_builtins_initialized;
@@ -58,6 +70,7 @@ extern PyStatus _PyTypes_InitSlotDefs(void);
 
 extern int _PyStaticType_InitBuiltin(PyTypeObject *type);
 extern static_builtin_state * _PyStaticType_GetState(PyTypeObject *);
+extern void _PyStaticType_ClearWeakRefs(PyTypeObject *type);
 extern void _PyStaticType_Dealloc(PyTypeObject *type);
 
 
diff --git a/Objects/typeobject.c b/Objects/typeobject.c
index 9eb2390118d09..e4adf1c4e12f8 100644
--- a/Objects/typeobject.c
+++ b/Objects/typeobject.c
@@ -127,6 +127,8 @@ static_builtin_state_init(PyTypeObject *self)
 
     static_builtin_state *state = static_builtin_state_get(interp, self);
     state->type = self;
+    /* state->tp_weaklist is left NULL until insert_head() or insert_after()
+       (in weakrefobject.c) sets it. */
 }
 
 static void
@@ -138,6 +140,7 @@ static_builtin_state_clear(PyTypeObject *self)
 
     static_builtin_state *state = static_builtin_state_get(interp, self);
     state->type = NULL;
+    assert(state->tp_weaklist == NULL);  // It was already cleared out.
     static_builtin_index_clear(self);
 
     assert(interp->types.num_builtins_initialized > 0);
@@ -502,6 +505,8 @@ static PyMemberDef type_members[] = {
     {"__basicsize__", T_PYSSIZET, offsetof(PyTypeObject,tp_basicsize),READONLY},
     {"__itemsize__", T_PYSSIZET, offsetof(PyTypeObject, tp_itemsize), READONLY},
     {"__flags__", T_ULONG, offsetof(PyTypeObject, tp_flags), READONLY},
+    /* Note that this value is misleading for static builtin types,
+       since the memory at this offset will always be NULL. */
     {"__weakrefoffset__", T_PYSSIZET,
      offsetof(PyTypeObject, tp_weaklistoffset), READONLY},
     {"__base__", T_OBJECT, offsetof(PyTypeObject, tp_base), READONLY},
@@ -4353,6 +4358,7 @@ _PyStaticType_Dealloc(PyTypeObject *type)
     type->tp_flags &= ~Py_TPFLAGS_READY;
 
     if (type->tp_flags & _Py_TPFLAGS_STATIC_BUILTIN) {
+        _PyStaticType_ClearWeakRefs(type);
         static_builtin_state_clear(type);
         /* We leave _Py_TPFLAGS_STATIC_BUILTIN set on tp_flags. */
     }
diff --git a/Objects/weakrefobject.c b/Objects/weakrefobject.c
index d26fc9e8d09d7..cf89a9231d204 100644
--- a/Objects/weakrefobject.c
+++ b/Objects/weakrefobject.c
@@ -1019,3 +1019,22 @@ PyObject_ClearWeakRefs(PyObject *object)
         PyErr_Restore(err_type, err_value, err_tb);
     }
 }
+
+/* This function is called by _PyStaticType_Dealloc() to clear weak references.
+ *
+ * This is called at the end of runtime finalization, so we can just
+ * wipe out the type's weaklist.  We don't bother with callbacks
+ * or anything else.
+ */
+void
+_PyStaticType_ClearWeakRefs(PyTypeObject *type)
+{
+    static_builtin_state *state = _PyStaticType_GetState(type);
+    PyObject **list = _PyStaticType_GET_WEAKREFS_LISTPTR(state);
+    while (*list != NULL) {
+        /* Note that clear_weakref() pops the first ref off the type's
+           weaklist before clearing its wr_object and wr_callback.
+           That is how we're able to loop over the list. */
+        clear_weakref((PyWeakReference *)*list);
+    }
+}


From webhook-mailer at python.org  Fri Jul 29 03:40:50 2022
From: webhook-mailer at python.org (erlend-aasland)
Date: Fri, 29 Jul 2022 07:40:50 -0000
Subject: [Python-checkins] gh-95273: Condense sqlite3 executescript example
 (#95383)
Message-ID: <mailman.352.1659080452.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/e9c8de669d40d993489981be2973d1ea5bd10d0c
commit: e9c8de669d40d993489981be2973d1ea5bd10d0c
branch: main
author: Erlend Egeberg Aasland <erlend.aasland at innova.no>
committer: erlend-aasland <erlend.aasland at protonmail.com>
date: 2022-07-29T09:40:44+02:00
summary:

gh-95273: Condense sqlite3 executescript example (#95383)

files:
D Doc/includes/sqlite3/executescript.py
M Doc/library/sqlite3.rst

diff --git a/Doc/includes/sqlite3/executescript.py b/Doc/includes/sqlite3/executescript.py
deleted file mode 100644
index aea8943fbee59..0000000000000
--- a/Doc/includes/sqlite3/executescript.py
+++ /dev/null
@@ -1,25 +0,0 @@
-import sqlite3
-
-con = sqlite3.connect(":memory:")
-cur = con.cursor()
-cur.executescript("""
-    create table person(
-        firstname,
-        lastname,
-        age
-    );
-
-    create table book(
-        title,
-        author,
-        published
-    );
-
-    insert into book(title, author, published)
-    values (
-        'Dirk Gently''s Holistic Detective Agency',
-        'Douglas Adams',
-        1987
-    );
-    """)
-con.close()
diff --git a/Doc/library/sqlite3.rst b/Doc/library/sqlite3.rst
index 545f6790afb3a..1d4454007cf5d 100644
--- a/Doc/library/sqlite3.rst
+++ b/Doc/library/sqlite3.rst
@@ -1007,9 +1007,16 @@ Cursor Objects
 
       *sql_script* must be a :class:`string <str>`.
 
-      Example:
+      Example::
 
-      .. literalinclude:: ../includes/sqlite3/executescript.py
+         # cur is an sqlite3.Cursor object
+         cur.executescript("""
+             begin;
+             create table person(firstname, lastname, age);
+             create table book(title, author, published);
+             create table publisher(name, address);
+             commit;
+         """)
 
 
    .. method:: fetchone()


From webhook-mailer at python.org  Fri Jul 29 03:42:26 2022
From: webhook-mailer at python.org (erlend-aasland)
Date: Fri, 29 Jul 2022 07:42:26 -0000
Subject: [Python-checkins] gh-95273: Move sqlite3 executemany examples from
 reference to tutorial (#95351)
Message-ID: <mailman.353.1659080547.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/f0bf7956e60b452208f279146f928d71eb0aa11b
commit: f0bf7956e60b452208f279146f928d71eb0aa11b
branch: main
author: Erlend Egeberg Aasland <erlend.aasland at innova.no>
committer: erlend-aasland <erlend.aasland at protonmail.com>
date: 2022-07-29T09:42:22+02:00
summary:

gh-95273: Move sqlite3 executemany examples from reference to tutorial (#95351)

files:
D Doc/includes/sqlite3/executemany_1.py
D Doc/includes/sqlite3/executemany_2.py
M Doc/library/sqlite3.rst

diff --git a/Doc/includes/sqlite3/executemany_1.py b/Doc/includes/sqlite3/executemany_1.py
deleted file mode 100644
index edf6f8b7ebe61..0000000000000
--- a/Doc/includes/sqlite3/executemany_1.py
+++ /dev/null
@@ -1,26 +0,0 @@
-import sqlite3
-
-class IterChars:
-    def __init__(self):
-        self.count = ord('a')
-
-    def __iter__(self):
-        return self
-
-    def __next__(self):
-        if self.count > ord('z'):
-            raise StopIteration
-        self.count += 1
-        return (chr(self.count - 1),) # this is a 1-tuple
-
-con = sqlite3.connect(":memory:")
-cur = con.cursor()
-cur.execute("create table characters(c)")
-
-theIter = IterChars()
-cur.executemany("insert into characters(c) values (?)", theIter)
-
-cur.execute("select c from characters")
-print(cur.fetchall())
-
-con.close()
diff --git a/Doc/includes/sqlite3/executemany_2.py b/Doc/includes/sqlite3/executemany_2.py
deleted file mode 100644
index 02a594c861e15..0000000000000
--- a/Doc/includes/sqlite3/executemany_2.py
+++ /dev/null
@@ -1,17 +0,0 @@
-import sqlite3
-import string
-
-def char_generator():
-    for c in string.ascii_lowercase:
-        yield (c,)
-
-con = sqlite3.connect(":memory:")
-cur = con.cursor()
-cur.execute("create table characters(c)")
-
-cur.executemany("insert into characters(c) values (?)", char_generator())
-
-cur.execute("select c from characters")
-print(cur.fetchall())
-
-con.close()
diff --git a/Doc/library/sqlite3.rst b/Doc/library/sqlite3.rst
index 1d4454007cf5d..067f210448bad 100644
--- a/Doc/library/sqlite3.rst
+++ b/Doc/library/sqlite3.rst
@@ -67,15 +67,28 @@ after restarting the Python interpreter::
    con = sqlite3.connect('example.db')
    cur = con.cursor()
 
-To retrieve data after executing a SELECT statement, either treat the cursor as
-an :term:`iterator`, call the cursor's :meth:`~Cursor.fetchone` method to
-retrieve a single matching row, or call :meth:`~Cursor.fetchall` to get a list
-of the matching rows.
+At this point, our database only contains one row::
 
-This example uses the iterator form::
+   >>> res = cur.execute('SELECT count(rowid) FROM stocks')
+   >>> print(res.fetchone())
+   (1,)
+
+The result is a one-item :class:`tuple`:
+one row, with one column.
+Now, let us insert three more rows of data,
+using :meth:`~Cursor.executemany`::
+
+   >>> data = [
+       ('2006-03-28', 'BUY', 'IBM', 1000, 45.0),
+       ('2006-04-05', 'BUY', 'MSFT', 1000, 72.0),
+       ('2006-04-06', 'SELL', 'IBM', 500, 53.0),
+   ]
+   >>> cur.executemany('INSERT INTO stocks VALUES(?, ?, ?, ?)', data)
+
+Then, retrieve the data by iterating over the result of a ``SELECT`` statement::
 
    >>> for row in cur.execute('SELECT * FROM stocks ORDER BY price'):
-           print(row)
+   ...     print(row)
 
    ('2006-01-05', 'BUY', 'RHAT', 100, 35.14)
    ('2006-03-28', 'BUY', 'IBM', 1000, 45.0)
@@ -990,12 +1003,14 @@ Cursor Objects
       :term:`iterator` yielding parameters instead of a sequence.
       Uses the same implicit transaction handling as :meth:`~Cursor.execute`.
 
-      .. literalinclude:: ../includes/sqlite3/executemany_1.py
-
-      Here's a shorter example using a :term:`generator`:
-
-      .. literalinclude:: ../includes/sqlite3/executemany_2.py
+      Example::
 
+          data = [
+              ("row1",),
+              ("row2",),
+          ]
+          # cur is an sqlite3.Cursor object
+          cur.executemany("insert into t values(?)", data)
 
    .. method:: executescript(sql_script, /)
 


From webhook-mailer at python.org  Fri Jul 29 03:49:02 2022
From: webhook-mailer at python.org (miss-islington)
Date: Fri, 29 Jul 2022 07:49:02 -0000
Subject: [Python-checkins] gh-95273: Condense sqlite3 executescript example
 (GH-95383)
Message-ID: <mailman.354.1659080943.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/6eae15abb6983f644728e86141e6486c85fe8850
commit: 6eae15abb6983f644728e86141e6486c85fe8850
branch: 3.11
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-29T00:48:47-07:00
summary:

gh-95273: Condense sqlite3 executescript example (GH-95383)

(cherry picked from commit e9c8de669d40d993489981be2973d1ea5bd10d0c)

Co-authored-by: Erlend Egeberg Aasland <erlend.aasland at innova.no>

files:
D Doc/includes/sqlite3/executescript.py
M Doc/library/sqlite3.rst

diff --git a/Doc/includes/sqlite3/executescript.py b/Doc/includes/sqlite3/executescript.py
deleted file mode 100644
index aea8943fbee59..0000000000000
--- a/Doc/includes/sqlite3/executescript.py
+++ /dev/null
@@ -1,25 +0,0 @@
-import sqlite3
-
-con = sqlite3.connect(":memory:")
-cur = con.cursor()
-cur.executescript("""
-    create table person(
-        firstname,
-        lastname,
-        age
-    );
-
-    create table book(
-        title,
-        author,
-        published
-    );
-
-    insert into book(title, author, published)
-    values (
-        'Dirk Gently''s Holistic Detective Agency',
-        'Douglas Adams',
-        1987
-    );
-    """)
-con.close()
diff --git a/Doc/library/sqlite3.rst b/Doc/library/sqlite3.rst
index 633b78453feb9..e6b0714f27055 100644
--- a/Doc/library/sqlite3.rst
+++ b/Doc/library/sqlite3.rst
@@ -997,9 +997,16 @@ Cursor Objects
 
       *sql_script* must be a :class:`string <str>`.
 
-      Example:
+      Example::
 
-      .. literalinclude:: ../includes/sqlite3/executescript.py
+         # cur is an sqlite3.Cursor object
+         cur.executescript("""
+             begin;
+             create table person(firstname, lastname, age);
+             create table book(title, author, published);
+             create table publisher(name, address);
+             commit;
+         """)
 
 
    .. method:: fetchone()


From webhook-mailer at python.org  Fri Jul 29 03:49:02 2022
From: webhook-mailer at python.org (miss-islington)
Date: Fri, 29 Jul 2022 07:49:02 -0000
Subject: [Python-checkins] gh-95273: Move sqlite3 executemany examples from
 reference to tutorial (GH-95351)
Message-ID: <mailman.355.1659080943.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/f59a5c53631d64cd45e98907c00ffd226675c864
commit: f59a5c53631d64cd45e98907c00ffd226675c864
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-29T00:48:55-07:00
summary:

gh-95273: Move sqlite3 executemany examples from reference to tutorial (GH-95351)

(cherry picked from commit f0bf7956e60b452208f279146f928d71eb0aa11b)

Co-authored-by: Erlend Egeberg Aasland <erlend.aasland at innova.no>

files:
D Doc/includes/sqlite3/executemany_1.py
D Doc/includes/sqlite3/executemany_2.py
M Doc/library/sqlite3.rst

diff --git a/Doc/includes/sqlite3/executemany_1.py b/Doc/includes/sqlite3/executemany_1.py
deleted file mode 100644
index edf6f8b7ebe61..0000000000000
--- a/Doc/includes/sqlite3/executemany_1.py
+++ /dev/null
@@ -1,26 +0,0 @@
-import sqlite3
-
-class IterChars:
-    def __init__(self):
-        self.count = ord('a')
-
-    def __iter__(self):
-        return self
-
-    def __next__(self):
-        if self.count > ord('z'):
-            raise StopIteration
-        self.count += 1
-        return (chr(self.count - 1),) # this is a 1-tuple
-
-con = sqlite3.connect(":memory:")
-cur = con.cursor()
-cur.execute("create table characters(c)")
-
-theIter = IterChars()
-cur.executemany("insert into characters(c) values (?)", theIter)
-
-cur.execute("select c from characters")
-print(cur.fetchall())
-
-con.close()
diff --git a/Doc/includes/sqlite3/executemany_2.py b/Doc/includes/sqlite3/executemany_2.py
deleted file mode 100644
index 02a594c861e15..0000000000000
--- a/Doc/includes/sqlite3/executemany_2.py
+++ /dev/null
@@ -1,17 +0,0 @@
-import sqlite3
-import string
-
-def char_generator():
-    for c in string.ascii_lowercase:
-        yield (c,)
-
-con = sqlite3.connect(":memory:")
-cur = con.cursor()
-cur.execute("create table characters(c)")
-
-cur.executemany("insert into characters(c) values (?)", char_generator())
-
-cur.execute("select c from characters")
-print(cur.fetchall())
-
-con.close()
diff --git a/Doc/library/sqlite3.rst b/Doc/library/sqlite3.rst
index 87c648ddda18a..35dbb722b24dd 100644
--- a/Doc/library/sqlite3.rst
+++ b/Doc/library/sqlite3.rst
@@ -67,15 +67,28 @@ after restarting the Python interpreter::
    con = sqlite3.connect('example.db')
    cur = con.cursor()
 
-To retrieve data after executing a SELECT statement, either treat the cursor as
-an :term:`iterator`, call the cursor's :meth:`~Cursor.fetchone` method to
-retrieve a single matching row, or call :meth:`~Cursor.fetchall` to get a list
-of the matching rows.
+At this point, our database only contains one row::
 
-This example uses the iterator form::
+   >>> res = cur.execute('SELECT count(rowid) FROM stocks')
+   >>> print(res.fetchone())
+   (1,)
+
+The result is a one-item :class:`tuple`:
+one row, with one column.
+Now, let us insert three more rows of data,
+using :meth:`~Cursor.executemany`::
+
+   >>> data = [
+       ('2006-03-28', 'BUY', 'IBM', 1000, 45.0),
+       ('2006-04-05', 'BUY', 'MSFT', 1000, 72.0),
+       ('2006-04-06', 'SELL', 'IBM', 500, 53.0),
+   ]
+   >>> cur.executemany('INSERT INTO stocks VALUES(?, ?, ?, ?)', data)
+
+Then, retrieve the data by iterating over the result of a ``SELECT`` statement::
 
    >>> for row in cur.execute('SELECT * FROM stocks ORDER BY price'):
-           print(row)
+   ...     print(row)
 
    ('2006-01-05', 'BUY', 'RHAT', 100, 35.14)
    ('2006-03-28', 'BUY', 'IBM', 1000, 45.0)
@@ -781,12 +794,14 @@ Cursor Objects
       :term:`iterator` yielding parameters instead of a sequence.
       Uses the same implicit transaction handling as :meth:`~Cursor.execute`.
 
-      .. literalinclude:: ../includes/sqlite3/executemany_1.py
-
-      Here's a shorter example using a :term:`generator`:
-
-      .. literalinclude:: ../includes/sqlite3/executemany_2.py
+      Example::
 
+          data = [
+              ("row1",),
+              ("row2",),
+          ]
+          # cur is an sqlite3.Cursor object
+          cur.executemany("insert into t values(?)", data)
 
    .. method:: executescript(sql_script, /)
 


From webhook-mailer at python.org  Fri Jul 29 03:51:25 2022
From: webhook-mailer at python.org (miss-islington)
Date: Fri, 29 Jul 2022 07:51:25 -0000
Subject: [Python-checkins] gh-95273: Move sqlite3 executemany examples from
 reference to tutorial (GH-95351)
Message-ID: <mailman.356.1659081086.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/f06f3656c5e98843d4666d22df0b2c5dd62c87ae
commit: f06f3656c5e98843d4666d22df0b2c5dd62c87ae
branch: 3.11
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-29T00:51:20-07:00
summary:

gh-95273: Move sqlite3 executemany examples from reference to tutorial (GH-95351)

(cherry picked from commit f0bf7956e60b452208f279146f928d71eb0aa11b)

Co-authored-by: Erlend Egeberg Aasland <erlend.aasland at innova.no>

files:
D Doc/includes/sqlite3/executemany_1.py
D Doc/includes/sqlite3/executemany_2.py
M Doc/library/sqlite3.rst

diff --git a/Doc/includes/sqlite3/executemany_1.py b/Doc/includes/sqlite3/executemany_1.py
deleted file mode 100644
index edf6f8b7ebe61..0000000000000
--- a/Doc/includes/sqlite3/executemany_1.py
+++ /dev/null
@@ -1,26 +0,0 @@
-import sqlite3
-
-class IterChars:
-    def __init__(self):
-        self.count = ord('a')
-
-    def __iter__(self):
-        return self
-
-    def __next__(self):
-        if self.count > ord('z'):
-            raise StopIteration
-        self.count += 1
-        return (chr(self.count - 1),) # this is a 1-tuple
-
-con = sqlite3.connect(":memory:")
-cur = con.cursor()
-cur.execute("create table characters(c)")
-
-theIter = IterChars()
-cur.executemany("insert into characters(c) values (?)", theIter)
-
-cur.execute("select c from characters")
-print(cur.fetchall())
-
-con.close()
diff --git a/Doc/includes/sqlite3/executemany_2.py b/Doc/includes/sqlite3/executemany_2.py
deleted file mode 100644
index 02a594c861e15..0000000000000
--- a/Doc/includes/sqlite3/executemany_2.py
+++ /dev/null
@@ -1,17 +0,0 @@
-import sqlite3
-import string
-
-def char_generator():
-    for c in string.ascii_lowercase:
-        yield (c,)
-
-con = sqlite3.connect(":memory:")
-cur = con.cursor()
-cur.execute("create table characters(c)")
-
-cur.executemany("insert into characters(c) values (?)", char_generator())
-
-cur.execute("select c from characters")
-print(cur.fetchall())
-
-con.close()
diff --git a/Doc/library/sqlite3.rst b/Doc/library/sqlite3.rst
index e6b0714f27055..d8ecc24d034b5 100644
--- a/Doc/library/sqlite3.rst
+++ b/Doc/library/sqlite3.rst
@@ -67,15 +67,28 @@ after restarting the Python interpreter::
    con = sqlite3.connect('example.db')
    cur = con.cursor()
 
-To retrieve data after executing a SELECT statement, either treat the cursor as
-an :term:`iterator`, call the cursor's :meth:`~Cursor.fetchone` method to
-retrieve a single matching row, or call :meth:`~Cursor.fetchall` to get a list
-of the matching rows.
+At this point, our database only contains one row::
 
-This example uses the iterator form::
+   >>> res = cur.execute('SELECT count(rowid) FROM stocks')
+   >>> print(res.fetchone())
+   (1,)
+
+The result is a one-item :class:`tuple`:
+one row, with one column.
+Now, let us insert three more rows of data,
+using :meth:`~Cursor.executemany`::
+
+   >>> data = [
+       ('2006-03-28', 'BUY', 'IBM', 1000, 45.0),
+       ('2006-04-05', 'BUY', 'MSFT', 1000, 72.0),
+       ('2006-04-06', 'SELL', 'IBM', 500, 53.0),
+   ]
+   >>> cur.executemany('INSERT INTO stocks VALUES(?, ?, ?, ?)', data)
+
+Then, retrieve the data by iterating over the result of a ``SELECT`` statement::
 
    >>> for row in cur.execute('SELECT * FROM stocks ORDER BY price'):
-           print(row)
+   ...     print(row)
 
    ('2006-01-05', 'BUY', 'RHAT', 100, 35.14)
    ('2006-03-28', 'BUY', 'IBM', 1000, 45.0)
@@ -980,12 +993,14 @@ Cursor Objects
       :term:`iterator` yielding parameters instead of a sequence.
       Uses the same implicit transaction handling as :meth:`~Cursor.execute`.
 
-      .. literalinclude:: ../includes/sqlite3/executemany_1.py
-
-      Here's a shorter example using a :term:`generator`:
-
-      .. literalinclude:: ../includes/sqlite3/executemany_2.py
+      Example::
 
+          data = [
+              ("row1",),
+              ("row2",),
+          ]
+          # cur is an sqlite3.Cursor object
+          cur.executemany("insert into t values(?)", data)
 
    .. method:: executescript(sql_script, /)
 


From webhook-mailer at python.org  Fri Jul 29 04:44:02 2022
From: webhook-mailer at python.org (pablogsal)
Date: Fri, 29 Jul 2022 08:44:02 -0000
Subject: [Python-checkins] GH-90081: Run python tracers at full speed
 (GH-95328) (#95363)
Message-ID: <mailman.357.1659084242.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/00566a8124e16b8f9403395b42a722edef2b0583
commit: 00566a8124e16b8f9403395b42a722edef2b0583
branch: 3.11
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: pablogsal <Pablogsal at gmail.com>
date: 2022-07-29T09:43:52+01:00
summary:

GH-90081: Run python tracers at full speed (GH-95328) (#95363)

(cherry picked from commit b8b2990fb3218cffedfe7bc92e9e7ae2275b3c98)

Co-authored-by: Mark Shannon <mark at hotpy.org>

Co-authored-by: Mark Shannon <mark at hotpy.org>

files:
A Misc/NEWS.d/next/Core and Builtins/2022-07-27-14-21-57.gh-issue-90081.HVAS5x.rst
M Include/internal/pycore_pystate.h
M Python/ceval.c

diff --git a/Include/internal/pycore_pystate.h b/Include/internal/pycore_pystate.h
index e2d7c5bee28b9..cb8f115768a35 100644
--- a/Include/internal/pycore_pystate.h
+++ b/Include/internal/pycore_pystate.h
@@ -131,8 +131,9 @@ PyAPI_FUNC(void) _PyThreadState_DeleteExcept(
 static inline void
 _PyThreadState_UpdateTracingState(PyThreadState *tstate)
 {
-    int use_tracing = (tstate->c_tracefunc != NULL
-                       || tstate->c_profilefunc != NULL);
+    bool use_tracing =
+        (tstate->tracing == 0) &&
+        (tstate->c_tracefunc != NULL || tstate->c_profilefunc != NULL);
     tstate->cframe->use_tracing = (use_tracing ? 255 : 0);
 }
 
diff --git a/Misc/NEWS.d/next/Core and Builtins/2022-07-27-14-21-57.gh-issue-90081.HVAS5x.rst b/Misc/NEWS.d/next/Core and Builtins/2022-07-27-14-21-57.gh-issue-90081.HVAS5x.rst
new file mode 100644
index 0000000000000..a3be34c175af6
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2022-07-27-14-21-57.gh-issue-90081.HVAS5x.rst	
@@ -0,0 +1,2 @@
+Run Python code in tracer/profiler function at full speed. Fixes slowdown in
+earlier versions of 3.11.
diff --git a/Python/ceval.c b/Python/ceval.c
index 31cdb554279e3..23733b63f3c76 100644
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -5590,7 +5590,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, _PyInterpreterFrame *frame, int
             assert(oparg);
             oparg <<= 8;
             oparg |= _Py_OPARG(*next_instr);
-            // We might be tracing. To avoid breaking tracing guarantees in 
+            // We might be tracing. To avoid breaking tracing guarantees in
             // quickened instructions, always deoptimize the next opcode:
             opcode = _PyOpcode_Deopt[_Py_OPCODE(*next_instr)];
             PRE_DISPATCH_GOTO();
@@ -5620,9 +5620,9 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, _PyInterpreterFrame *frame, int
         case DO_TRACING:
 #endif
     {
-        if (tstate->tracing == 0 &&
-            INSTR_OFFSET() >= frame->f_code->_co_firsttraceable
-        ) {
+        assert(cframe.use_tracing);
+        assert(tstate->tracing == 0);
+        if (INSTR_OFFSET() >= frame->f_code->_co_firsttraceable) {
             int instr_prev = _PyInterpreterFrame_LASTI(frame);
             frame->prev_instr = next_instr;
             TRACING_NEXTOPARG();
@@ -6832,12 +6832,15 @@ void
 PyThreadState_EnterTracing(PyThreadState *tstate)
 {
     tstate->tracing++;
+    tstate->cframe->use_tracing = 0;
 }
 
 void
 PyThreadState_LeaveTracing(PyThreadState *tstate)
 {
+    assert(tstate->tracing > 0 && tstate->cframe->use_tracing == 0);
     tstate->tracing--;
+    _PyThreadState_UpdateTracingState(tstate);
 }
 
 static int


From webhook-mailer at python.org  Fri Jul 29 04:44:35 2022
From: webhook-mailer at python.org (erlend-aasland)
Date: Fri, 29 Jul 2022 08:44:35 -0000
Subject: [Python-checkins] gh-95273: Condense sqlite3 executescript example
 (GH-95383) (#95419)
Message-ID: <mailman.358.1659084277.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/2278dc74423565b3b9cc5c89804b5c7c947f2243
commit: 2278dc74423565b3b9cc5c89804b5c7c947f2243
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: erlend-aasland <erlend.aasland at protonmail.com>
date: 2022-07-29T10:44:29+02:00
summary:

gh-95273: Condense sqlite3 executescript example (GH-95383) (#95419)

(cherry picked from commit e9c8de669d40d993489981be2973d1ea5bd10d0c)

Co-authored-by: Erlend Egeberg Aasland <erlend.aasland at innova.no>

files:
D Doc/includes/sqlite3/executescript.py
M Doc/library/sqlite3.rst

diff --git a/Doc/includes/sqlite3/executescript.py b/Doc/includes/sqlite3/executescript.py
deleted file mode 100644
index aea8943fbee59..0000000000000
--- a/Doc/includes/sqlite3/executescript.py
+++ /dev/null
@@ -1,25 +0,0 @@
-import sqlite3
-
-con = sqlite3.connect(":memory:")
-cur = con.cursor()
-cur.executescript("""
-    create table person(
-        firstname,
-        lastname,
-        age
-    );
-
-    create table book(
-        title,
-        author,
-        published
-    );
-
-    insert into book(title, author, published)
-    values (
-        'Dirk Gently''s Holistic Detective Agency',
-        'Douglas Adams',
-        1987
-    );
-    """)
-con.close()
diff --git a/Doc/library/sqlite3.rst b/Doc/library/sqlite3.rst
index 35dbb722b24dd..2b07b7cc36a9c 100644
--- a/Doc/library/sqlite3.rst
+++ b/Doc/library/sqlite3.rst
@@ -813,9 +813,16 @@ Cursor Objects
 
       *sql_script* must be a :class:`string <str>`.
 
-      Example:
+      Example::
 
-      .. literalinclude:: ../includes/sqlite3/executescript.py
+         # cur is an sqlite3.Cursor object
+         cur.executescript("""
+             begin;
+             create table person(firstname, lastname, age);
+             create table book(title, author, published);
+             create table publisher(name, address);
+             commit;
+         """)
 
 
    .. method:: fetchone()


From webhook-mailer at python.org  Fri Jul 29 05:53:35 2022
From: webhook-mailer at python.org (erlend-aasland)
Date: Fri, 29 Jul 2022 09:53:35 -0000
Subject: [Python-checkins] gh-95273: Improve sqlite3 class descriptions
 (#95379)
Message-ID: <mailman.359.1659088415.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/e003b64f40fa28954ec967024fa811adff6cffe7
commit: e003b64f40fa28954ec967024fa811adff6cffe7
branch: main
author: Erlend Egeberg Aasland <erlend.aasland at innova.no>
committer: erlend-aasland <erlend.aasland at protonmail.com>
date: 2022-07-29T11:53:23+02:00
summary:

gh-95273: Improve sqlite3 class descriptions (#95379)

Co-authored-by: CAM Gerlach <CAM.Gerlach at Gerlach.CAM>

files:
M Doc/library/sqlite3.rst

diff --git a/Doc/library/sqlite3.rst b/Doc/library/sqlite3.rst
index 067f210448bad..6a430f00aea4d 100644
--- a/Doc/library/sqlite3.rst
+++ b/Doc/library/sqlite3.rst
@@ -426,6 +426,16 @@ Connection Objects
 
 .. class:: Connection
 
+   Each open SQLite database is represented by a ``Connection`` object,
+   which is created using :func:`sqlite3.connect`.
+   Their main purpose is creating :class:`Cursor` objects,
+   and :ref:`sqlite3-controlling-transactions`.
+
+   .. seealso::
+
+      * :ref:`sqlite3-connection-shortcuts`
+      * :ref:`sqlite3-connection-context-manager`
+
    An SQLite database connection has the following attributes and methods:
 
    .. attribute:: isolation_level
@@ -970,6 +980,22 @@ Connection Objects
 Cursor Objects
 --------------
 
+   A ``Cursor`` object represents a `database cursor`_
+   which is used to execute SQL statements,
+   and manage the context of a fetch operation.
+   Cursors are created using :meth:`Connection.cursor`,
+   or by using any of the :ref:`connection shortcut methods
+   <sqlite3-connection-shortcuts>`.
+
+   Cursor objects are :term:`iterators <iterator>`,
+   meaning that if you :meth:`~Cursor.execute` a ``SELECT`` query,
+   you can simply iterate over the cursor to fetch the resulting rows::
+
+      for row in cur.execute("select * from data"):
+          print(row)
+
+   .. _database cursor: https://en.wikipedia.org/wiki/Cursor_(databases)
+
 .. class:: Cursor
 
    A :class:`Cursor` instance has the following attributes and methods.
@@ -1135,13 +1161,11 @@ Row Objects
 
    A :class:`Row` instance serves as a highly optimized
    :attr:`~Connection.row_factory` for :class:`Connection` objects.
-   It tries to mimic a tuple in most of its features.
+   It tries to mimic a :class:`tuple` in most of its features,
+   and supports iteration, :func:`repr`, equality testing, :func:`len`,
+   and :term:`mapping` access by column name and index.
 
-   It supports mapping access by column name and index, iteration,
-   representation, equality testing and :func:`len`.
-
-   If two :class:`Row` objects have exactly the same columns and their
-   members are equal, they compare equal.
+   Two row objects compare equal if have equal columns and equal members.
 
    .. method:: keys
 
@@ -1640,8 +1664,10 @@ Using :mod:`sqlite3` efficiently
 --------------------------------
 
 
-Using shortcut methods
-^^^^^^^^^^^^^^^^^^^^^^
+.. _sqlite3-connection-shortcuts:
+
+Using connection shortcut methods
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 Using the :meth:`~Connection.execute`,
 :meth:`~Connection.executemany`, and :meth:`~Connection.executescript`


From webhook-mailer at python.org  Fri Jul 29 06:00:35 2022
From: webhook-mailer at python.org (miss-islington)
Date: Fri, 29 Jul 2022 10:00:35 -0000
Subject: [Python-checkins] gh-95273: Improve sqlite3 class descriptions
 (GH-95379)
Message-ID: <mailman.360.1659088836.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/a41b51d2ea1926b60ea10d533dda54a5af7936ba
commit: a41b51d2ea1926b60ea10d533dda54a5af7936ba
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-29T03:00:29-07:00
summary:

gh-95273: Improve sqlite3 class descriptions (GH-95379)


Co-authored-by: CAM Gerlach <CAM.Gerlach at Gerlach.CAM>
(cherry picked from commit e003b64f40fa28954ec967024fa811adff6cffe7)

Co-authored-by: Erlend Egeberg Aasland <erlend.aasland at innova.no>

files:
M Doc/library/sqlite3.rst

diff --git a/Doc/library/sqlite3.rst b/Doc/library/sqlite3.rst
index 2b07b7cc36a9c..32a5cfe2fb10d 100644
--- a/Doc/library/sqlite3.rst
+++ b/Doc/library/sqlite3.rst
@@ -380,6 +380,16 @@ Connection Objects
 
 .. class:: Connection
 
+   Each open SQLite database is represented by a ``Connection`` object,
+   which is created using :func:`sqlite3.connect`.
+   Their main purpose is creating :class:`Cursor` objects,
+   and :ref:`sqlite3-controlling-transactions`.
+
+   .. seealso::
+
+      * :ref:`sqlite3-connection-shortcuts`
+      * :ref:`sqlite3-connection-context-manager`
+
    An SQLite database connection has the following attributes and methods:
 
    .. attribute:: isolation_level
@@ -761,6 +771,22 @@ Connection Objects
 Cursor Objects
 --------------
 
+   A ``Cursor`` object represents a `database cursor`_
+   which is used to execute SQL statements,
+   and manage the context of a fetch operation.
+   Cursors are created using :meth:`Connection.cursor`,
+   or by using any of the :ref:`connection shortcut methods
+   <sqlite3-connection-shortcuts>`.
+
+   Cursor objects are :term:`iterators <iterator>`,
+   meaning that if you :meth:`~Cursor.execute` a ``SELECT`` query,
+   you can simply iterate over the cursor to fetch the resulting rows::
+
+      for row in cur.execute("select * from data"):
+          print(row)
+
+   .. _database cursor: https://en.wikipedia.org/wiki/Cursor_(databases)
+
 .. class:: Cursor
 
    A :class:`Cursor` instance has the following attributes and methods.
@@ -926,13 +952,11 @@ Row Objects
 
    A :class:`Row` instance serves as a highly optimized
    :attr:`~Connection.row_factory` for :class:`Connection` objects.
-   It tries to mimic a tuple in most of its features.
+   It tries to mimic a :class:`tuple` in most of its features,
+   and supports iteration, :func:`repr`, equality testing, :func:`len`,
+   and :term:`mapping` access by column name and index.
 
-   It supports mapping access by column name and index, iteration,
-   representation, equality testing and :func:`len`.
-
-   If two :class:`Row` objects have exactly the same columns and their
-   members are equal, they compare equal.
+   Two row objects compare equal if have equal columns and equal members.
 
    .. method:: keys
 
@@ -1355,8 +1379,10 @@ Using :mod:`sqlite3` efficiently
 --------------------------------
 
 
-Using shortcut methods
-^^^^^^^^^^^^^^^^^^^^^^
+.. _sqlite3-connection-shortcuts:
+
+Using connection shortcut methods
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 Using the :meth:`~Connection.execute`,
 :meth:`~Connection.executemany`, and :meth:`~Connection.executescript`


From webhook-mailer at python.org  Fri Jul 29 06:02:21 2022
From: webhook-mailer at python.org (miss-islington)
Date: Fri, 29 Jul 2022 10:02:21 -0000
Subject: [Python-checkins] gh-95273: Improve sqlite3 class descriptions
 (GH-95379)
Message-ID: <mailman.361.1659088943.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/c26470f0cc900dccf2a7ce4a915fc36596cdf289
commit: c26470f0cc900dccf2a7ce4a915fc36596cdf289
branch: 3.11
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-29T03:02:16-07:00
summary:

gh-95273: Improve sqlite3 class descriptions (GH-95379)


Co-authored-by: CAM Gerlach <CAM.Gerlach at Gerlach.CAM>
(cherry picked from commit e003b64f40fa28954ec967024fa811adff6cffe7)

Co-authored-by: Erlend Egeberg Aasland <erlend.aasland at innova.no>

files:
M Doc/library/sqlite3.rst

diff --git a/Doc/library/sqlite3.rst b/Doc/library/sqlite3.rst
index d8ecc24d034b5..720330fe3f1eb 100644
--- a/Doc/library/sqlite3.rst
+++ b/Doc/library/sqlite3.rst
@@ -416,6 +416,16 @@ Connection Objects
 
 .. class:: Connection
 
+   Each open SQLite database is represented by a ``Connection`` object,
+   which is created using :func:`sqlite3.connect`.
+   Their main purpose is creating :class:`Cursor` objects,
+   and :ref:`sqlite3-controlling-transactions`.
+
+   .. seealso::
+
+      * :ref:`sqlite3-connection-shortcuts`
+      * :ref:`sqlite3-connection-context-manager`
+
    An SQLite database connection has the following attributes and methods:
 
    .. attribute:: isolation_level
@@ -960,6 +970,22 @@ Connection Objects
 Cursor Objects
 --------------
 
+   A ``Cursor`` object represents a `database cursor`_
+   which is used to execute SQL statements,
+   and manage the context of a fetch operation.
+   Cursors are created using :meth:`Connection.cursor`,
+   or by using any of the :ref:`connection shortcut methods
+   <sqlite3-connection-shortcuts>`.
+
+   Cursor objects are :term:`iterators <iterator>`,
+   meaning that if you :meth:`~Cursor.execute` a ``SELECT`` query,
+   you can simply iterate over the cursor to fetch the resulting rows::
+
+      for row in cur.execute("select * from data"):
+          print(row)
+
+   .. _database cursor: https://en.wikipedia.org/wiki/Cursor_(databases)
+
 .. class:: Cursor
 
    A :class:`Cursor` instance has the following attributes and methods.
@@ -1125,13 +1151,11 @@ Row Objects
 
    A :class:`Row` instance serves as a highly optimized
    :attr:`~Connection.row_factory` for :class:`Connection` objects.
-   It tries to mimic a tuple in most of its features.
+   It tries to mimic a :class:`tuple` in most of its features,
+   and supports iteration, :func:`repr`, equality testing, :func:`len`,
+   and :term:`mapping` access by column name and index.
 
-   It supports mapping access by column name and index, iteration,
-   representation, equality testing and :func:`len`.
-
-   If two :class:`Row` objects have exactly the same columns and their
-   members are equal, they compare equal.
+   Two row objects compare equal if have equal columns and equal members.
 
    .. method:: keys
 
@@ -1623,8 +1647,10 @@ Using :mod:`sqlite3` efficiently
 --------------------------------
 
 
-Using shortcut methods
-^^^^^^^^^^^^^^^^^^^^^^
+.. _sqlite3-connection-shortcuts:
+
+Using connection shortcut methods
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 Using the :meth:`~Connection.execute`,
 :meth:`~Connection.executemany`, and :meth:`~Connection.executescript`


From webhook-mailer at python.org  Fri Jul 29 07:48:52 2022
From: webhook-mailer at python.org (zooba)
Date: Fri, 29 Jul 2022 11:48:52 -0000
Subject: [Python-checkins] gh-94512: Fix forced arg format in AC-processed
 resource (GH-94515)
Message-ID: <mailman.362.1659095333.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/a739ee412cb2342554a70f30faaa3b7752bbd0a4
commit: a739ee412cb2342554a70f30faaa3b7752bbd0a4
branch: main
author: Oleg Iarygin <oleg at arhadthedev.net>
committer: zooba <steve.dower at microsoft.com>
date: 2022-07-29T12:48:11+01:00
summary:

gh-94512: Fix forced arg format in AC-processed resource (GH-94515)

files:
M Modules/clinic/resource.c.h
M Modules/resource.c

diff --git a/Modules/clinic/resource.c.h b/Modules/clinic/resource.c.h
index c591823ed7170..f95321176a73a 100644
--- a/Modules/clinic/resource.c.h
+++ b/Modules/clinic/resource.c.h
@@ -95,41 +95,42 @@ resource_setrlimit(PyObject *module, PyObject *const *args, Py_ssize_t nargs)
 #if defined(HAVE_PRLIMIT)
 
 PyDoc_STRVAR(resource_prlimit__doc__,
-"prlimit(pid, resource, [limits])");
+"prlimit($module, pid, resource, limits=None, /)\n"
+"--\n"
+"\n");
 
 #define RESOURCE_PRLIMIT_METHODDEF    \
-    {"prlimit", (PyCFunction)resource_prlimit, METH_VARARGS, resource_prlimit__doc__},
+    {"prlimit", _PyCFunction_CAST(resource_prlimit), METH_FASTCALL, resource_prlimit__doc__},
 
 static PyObject *
 resource_prlimit_impl(PyObject *module, pid_t pid, int resource,
-                      int group_right_1, PyObject *limits);
+                      PyObject *limits);
 
 static PyObject *
-resource_prlimit(PyObject *module, PyObject *args)
+resource_prlimit(PyObject *module, PyObject *const *args, Py_ssize_t nargs)
 {
     PyObject *return_value = NULL;
     pid_t pid;
     int resource;
-    int group_right_1 = 0;
-    PyObject *limits = NULL;
-
-    switch (PyTuple_GET_SIZE(args)) {
-        case 2:
-            if (!PyArg_ParseTuple(args, "" _Py_PARSE_PID "i:prlimit", &pid, &resource)) {
-                goto exit;
-            }
-            break;
-        case 3:
-            if (!PyArg_ParseTuple(args, "" _Py_PARSE_PID "iO:prlimit", &pid, &resource, &limits)) {
-                goto exit;
-            }
-            group_right_1 = 1;
-            break;
-        default:
-            PyErr_SetString(PyExc_TypeError, "resource.prlimit requires 2 to 3 arguments");
-            goto exit;
+    PyObject *limits = Py_None;
+
+    if (!_PyArg_CheckPositional("prlimit", nargs, 2, 3)) {
+        goto exit;
+    }
+    pid = PyLong_AsPid(args[0]);
+    if (pid == -1 && PyErr_Occurred()) {
+        goto exit;
+    }
+    resource = _PyLong_AsInt(args[1]);
+    if (resource == -1 && PyErr_Occurred()) {
+        goto exit;
+    }
+    if (nargs < 3) {
+        goto skip_optional;
     }
-    return_value = resource_prlimit_impl(module, pid, resource, group_right_1, limits);
+    limits = args[2];
+skip_optional:
+    return_value = resource_prlimit_impl(module, pid, resource, limits);
 
 exit:
     return return_value;
@@ -171,4 +172,4 @@ resource_getpagesize(PyObject *module, PyObject *Py_UNUSED(ignored))
 #ifndef RESOURCE_PRLIMIT_METHODDEF
     #define RESOURCE_PRLIMIT_METHODDEF
 #endif /* !defined(RESOURCE_PRLIMIT_METHODDEF) */
-/*[clinic end generated code: output=7c57d4f3688d3f07 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=13441806729c6eaa input=a9049054013a1b77]*/
diff --git a/Modules/resource.c b/Modules/resource.c
index d8bba2e39847a..a97fb870062b8 100644
--- a/Modules/resource.c
+++ b/Modules/resource.c
@@ -24,8 +24,16 @@ module resource
 class pid_t_converter(CConverter):
     type = 'pid_t'
     format_unit = '" _Py_PARSE_PID "'
+
+    def parse_arg(self, argname, displayname):
+        return """
+            {paramname} = PyLong_AsPid({argname});
+            if ({paramname} == -1 && PyErr_Occurred()) {{{{
+                goto exit;
+            }}}}
+            """.format(argname=argname, paramname=self.parser_name)
 [python start generated code]*/
-/*[python end generated code: output=da39a3ee5e6b4b0d input=0c1d19f640d57e48]*/
+/*[python end generated code: output=da39a3ee5e6b4b0d input=5af1c116d56cbb5a]*/
 
 #include "clinic/resource.c.h"
 
@@ -268,17 +276,15 @@ resource.prlimit
 
     pid: pid_t
     resource: int
-    [
-    limits: object
-    ]
+    limits: object = None
     /
 
 [clinic start generated code]*/
 
 static PyObject *
 resource_prlimit_impl(PyObject *module, pid_t pid, int resource,
-                      int group_right_1, PyObject *limits)
-/*[clinic end generated code: output=ee976b393187a7a3 input=b77743bdccc83564]*/
+                      PyObject *limits)
+/*[clinic end generated code: output=6ebc49ff8c3a816e input=54bb69c9585e33bf]*/
 {
     struct rlimit old_limit, new_limit;
     int retval;
@@ -294,7 +300,7 @@ resource_prlimit_impl(PyObject *module, pid_t pid, int resource,
         return NULL;
     }
 
-    if (group_right_1) {
+    if (limits != Py_None) {
         if (py2rlimit(limits, &new_limit) < 0) {
             return NULL;
         }


From webhook-mailer at python.org  Fri Jul 29 08:31:45 2022
From: webhook-mailer at python.org (erlend-aasland)
Date: Fri, 29 Jul 2022 12:31:45 -0000
Subject: [Python-checkins] gh-95432: Fixup sqlite3 tutorial example (#95431)
Message-ID: <mailman.363.1659097906.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/2fbee85931296bbeddae6358583e400ce5321f89
commit: 2fbee85931296bbeddae6358583e400ce5321f89
branch: main
author: Erlend Egeberg Aasland <erlend.aasland at protonmail.com>
committer: erlend-aasland <erlend.aasland at protonmail.com>
date: 2022-07-29T14:31:41+02:00
summary:

gh-95432: Fixup sqlite3 tutorial example (#95431)

- the insert statement should have five placeholders, not four
- missing ... in the multiline row list

files:
M Doc/library/sqlite3.rst

diff --git a/Doc/library/sqlite3.rst b/Doc/library/sqlite3.rst
index 6a430f00aea4d..3df41b5419495 100644
--- a/Doc/library/sqlite3.rst
+++ b/Doc/library/sqlite3.rst
@@ -79,11 +79,11 @@ Now, let us insert three more rows of data,
 using :meth:`~Cursor.executemany`::
 
    >>> data = [
-       ('2006-03-28', 'BUY', 'IBM', 1000, 45.0),
-       ('2006-04-05', 'BUY', 'MSFT', 1000, 72.0),
-       ('2006-04-06', 'SELL', 'IBM', 500, 53.0),
-   ]
-   >>> cur.executemany('INSERT INTO stocks VALUES(?, ?, ?, ?)', data)
+   ...    ('2006-03-28', 'BUY', 'IBM', 1000, 45.0),
+   ...    ('2006-04-05', 'BUY', 'MSFT', 1000, 72.0),
+   ...    ('2006-04-06', 'SELL', 'IBM', 500, 53.0),
+   ... ]
+   >>> cur.executemany('INSERT INTO stocks VALUES(?, ?, ?, ?, ?)', data)
 
 Then, retrieve the data by iterating over the result of a ``SELECT`` statement::
 


From webhook-mailer at python.org  Fri Jul 29 08:37:02 2022
From: webhook-mailer at python.org (ambv)
Date: Fri, 29 Jul 2022 12:37:02 -0000
Subject: [Python-checkins] [3.10] gh-95166: cancel map waited on future on
 timeout (GH-95169) (GH-95375)
Message-ID: <mailman.364.1659098223.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/18418858b2cfca221613af1c58bf657f8bfb6d6c
commit: 18418858b2cfca221613af1c58bf657f8bfb6d6c
branch: 3.10
author: ?ukasz Langa <lukasz at langa.pl>
committer: ambv <lukasz at langa.pl>
date: 2022-07-29T14:36:58+02:00
summary:

[3.10] gh-95166: cancel map waited on future on timeout (GH-95169) (GH-95375)

Co-authored-by: Thomas Grainger <tagrain at gmail.com>
Co-authored-by: Kumar Aditya <59607654+kumaraditya303 at users.noreply.github.com>

files:
A Misc/NEWS.d/next/Library/2022-07-23-10-42-05.gh-issue-95166.xw6p3C.rst
M Lib/concurrent/futures/_base.py
M Lib/test/test_concurrent_futures.py

diff --git a/Lib/concurrent/futures/_base.py b/Lib/concurrent/futures/_base.py
index cf119ac6437aa..a329e74d11fdf 100644
--- a/Lib/concurrent/futures/_base.py
+++ b/Lib/concurrent/futures/_base.py
@@ -312,6 +312,18 @@ def wait(fs, timeout=None, return_when=ALL_COMPLETED):
     done.update(waiter.finished_futures)
     return DoneAndNotDoneFutures(done, fs - done)
 
+
+def _result_or_cancel(fut, timeout=None):
+    try:
+        try:
+            return fut.result(timeout)
+        finally:
+            fut.cancel()
+    finally:
+        # Break a reference cycle with the exception in self._exception
+        del fut
+
+
 class Future(object):
     """Represents the result of an asynchronous computation."""
 
@@ -606,9 +618,9 @@ def result_iterator():
                 while fs:
                     # Careful not to keep a reference to the popped future
                     if timeout is None:
-                        yield fs.pop().result()
+                        yield _result_or_cancel(fs.pop())
                     else:
-                        yield fs.pop().result(end_time - time.monotonic())
+                        yield _result_or_cancel(fs.pop(), end_time - time.monotonic())
             finally:
                 for future in fs:
                     future.cancel()
diff --git a/Lib/test/test_concurrent_futures.py b/Lib/test/test_concurrent_futures.py
index e5eed9958111b..e174d5464d2b0 100644
--- a/Lib/test/test_concurrent_futures.py
+++ b/Lib/test/test_concurrent_futures.py
@@ -932,6 +932,33 @@ def submit(pool):
                 with futures.ProcessPoolExecutor(1, mp_context=mp.get_context('fork')) as workers:
                     workers.submit(tuple)
 
+    def test_executor_map_current_future_cancel(self):
+        stop_event = threading.Event()
+        log = []
+
+        def log_n_wait(ident):
+            log.append(f"{ident=} started")
+            try:
+                stop_event.wait()
+            finally:
+                log.append(f"{ident=} stopped")
+
+        with self.executor_type(max_workers=1) as pool:
+            # submit work to saturate the pool
+            fut = pool.submit(log_n_wait, ident="first")
+            try:
+                with contextlib.closing(
+                    pool.map(log_n_wait, ["second", "third"], timeout=0)
+                ) as gen:
+                    with self.assertRaises(futures.TimeoutError):
+                        next(gen)
+            finally:
+                stop_event.set()
+            fut.result()
+        # ident='second' is cancelled as a result of raising a TimeoutError
+        # ident='third' is cancelled because it remained in the collection of futures
+        self.assertListEqual(log, ["ident='first' started", "ident='first' stopped"])
+
 
 class ProcessPoolExecutorTest(ExecutorTest):
 
diff --git a/Misc/NEWS.d/next/Library/2022-07-23-10-42-05.gh-issue-95166.xw6p3C.rst b/Misc/NEWS.d/next/Library/2022-07-23-10-42-05.gh-issue-95166.xw6p3C.rst
new file mode 100644
index 0000000000000..34b017078436d
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2022-07-23-10-42-05.gh-issue-95166.xw6p3C.rst
@@ -0,0 +1 @@
+Fix :meth:`concurrent.futures.Executor.map` to cancel the currently waiting on future on an error - e.g. TimeoutError or KeyboardInterrupt.


From webhook-mailer at python.org  Fri Jul 29 08:38:06 2022
From: webhook-mailer at python.org (ambv)
Date: Fri, 29 Jul 2022 12:38:06 -0000
Subject: [Python-checkins] GH-95097: fix `asyncio.run` for tasks without
 `uncancel` method (GH-95211) (GH-95387)
Message-ID: <mailman.365.1659098288.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/efeda8b4a1fd8f1c510311c40e46d5fad65512a0
commit: efeda8b4a1fd8f1c510311c40e46d5fad65512a0
branch: 3.11
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: ambv <lukasz at langa.pl>
date: 2022-07-29T14:38:02+02:00
summary:

GH-95097: fix `asyncio.run` for tasks without `uncancel` method (GH-95211) (GH-95387)

(cherry picked from commit 54f48844d18bc6fb98849f15a2fc08f92ad240ea)

Co-authored-by: Kumar Aditya <59607654+kumaraditya303 at users.noreply.github.com>
Co-authored-by: Thomas Grainger <tagrain at gmail.com>

files:
A Misc/NEWS.d/next/Library/2022-07-24-18-00-42.gh-issue-95097.lu5qNf.rst
M Lib/asyncio/runners.py
M Lib/test/test_asyncio/test_runners.py

diff --git a/Lib/asyncio/runners.py b/Lib/asyncio/runners.py
index c58b52ed862e8..a19a7f99af064 100644
--- a/Lib/asyncio/runners.py
+++ b/Lib/asyncio/runners.py
@@ -119,10 +119,11 @@ def run(self, coro, *, context=None):
                 events.set_event_loop(self._loop)
             return self._loop.run_until_complete(task)
         except exceptions.CancelledError:
-            if self._interrupt_count > 0 and task.uncancel() == 0:
-                raise KeyboardInterrupt()
-            else:
-                raise  # CancelledError
+            if self._interrupt_count > 0:
+                uncancel = getattr(task, "uncancel", None)
+                if uncancel is not None and uncancel() == 0:
+                    raise KeyboardInterrupt()
+            raise  # CancelledError
         finally:
             if (sigint_handler is not None
                 and signal.getsignal(signal.SIGINT) is sigint_handler
diff --git a/Lib/test/test_asyncio/test_runners.py b/Lib/test/test_asyncio/test_runners.py
index a27942c4f53eb..5e1db2357e75f 100644
--- a/Lib/test/test_asyncio/test_runners.py
+++ b/Lib/test/test_asyncio/test_runners.py
@@ -6,10 +6,9 @@
 import signal
 import threading
 import unittest
-
+from test.test_asyncio import utils as test_utils
 from unittest import mock
 from unittest.mock import patch
-from test.test_asyncio import utils as test_utils
 
 
 def tearDownModule():
@@ -211,6 +210,54 @@ async def main():
         asyncio.run(main())
         self.assertTrue(policy.set_event_loop.called)
 
+    def test_asyncio_run_without_uncancel(self):
+        # See https://github.com/python/cpython/issues/95097
+        class Task:
+            def __init__(self, loop, coro, **kwargs):
+                self._task = asyncio.Task(coro, loop=loop, **kwargs)
+
+            def cancel(self, *args, **kwargs):
+                return self._task.cancel(*args, **kwargs)
+
+            def add_done_callback(self, *args, **kwargs):
+                return self._task.add_done_callback(*args, **kwargs)
+
+            def remove_done_callback(self, *args, **kwargs):
+                return self._task.remove_done_callback(*args, **kwargs)
+
+            @property
+            def _asyncio_future_blocking(self):
+                return self._task._asyncio_future_blocking
+
+            def result(self, *args, **kwargs):
+                return self._task.result(*args, **kwargs)
+
+            def done(self, *args, **kwargs):
+                return self._task.done(*args, **kwargs)
+
+            def cancelled(self, *args, **kwargs):
+                return self._task.cancelled(*args, **kwargs)
+
+            def exception(self, *args, **kwargs):
+                return self._task.exception(*args, **kwargs)
+
+            def get_loop(self, *args, **kwargs):
+                return self._task.get_loop(*args, **kwargs)
+
+
+        async def main():
+            interrupt_self()
+            await asyncio.Event().wait()
+
+        def new_event_loop():
+            loop = self.new_loop()
+            loop.set_task_factory(Task)
+            return loop
+
+        asyncio.set_event_loop_policy(TestPolicy(new_event_loop))
+        with self.assertRaises(asyncio.CancelledError):
+            asyncio.run(main())
+
 
 class RunnerTests(BaseTest):
 
diff --git a/Misc/NEWS.d/next/Library/2022-07-24-18-00-42.gh-issue-95097.lu5qNf.rst b/Misc/NEWS.d/next/Library/2022-07-24-18-00-42.gh-issue-95097.lu5qNf.rst
new file mode 100644
index 0000000000000..2840f057a9c1d
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2022-07-24-18-00-42.gh-issue-95097.lu5qNf.rst
@@ -0,0 +1 @@
+Fix :func:`asyncio.run` for :class:`asyncio.Task` implementations without :meth:`~asyncio.Task.uncancel` method. Patch by Kumar Aditya.


From webhook-mailer at python.org  Fri Jul 29 08:38:13 2022
From: webhook-mailer at python.org (miss-islington)
Date: Fri, 29 Jul 2022 12:38:13 -0000
Subject: [Python-checkins] gh-95432: Fixup sqlite3 tutorial example
 (GH-95431)
Message-ID: <mailman.366.1659098293.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/3417ce3489d68f4bc6d85b3fc280523eb90eab62
commit: 3417ce3489d68f4bc6d85b3fc280523eb90eab62
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-29T05:38:08-07:00
summary:

gh-95432: Fixup sqlite3 tutorial example (GH-95431)


- the insert statement should have five placeholders, not four
- missing ... in the multiline row list
(cherry picked from commit 2fbee85931296bbeddae6358583e400ce5321f89)

Co-authored-by: Erlend Egeberg Aasland <erlend.aasland at protonmail.com>

files:
M Doc/library/sqlite3.rst

diff --git a/Doc/library/sqlite3.rst b/Doc/library/sqlite3.rst
index 32a5cfe2fb10d..061207b59249b 100644
--- a/Doc/library/sqlite3.rst
+++ b/Doc/library/sqlite3.rst
@@ -79,11 +79,11 @@ Now, let us insert three more rows of data,
 using :meth:`~Cursor.executemany`::
 
    >>> data = [
-       ('2006-03-28', 'BUY', 'IBM', 1000, 45.0),
-       ('2006-04-05', 'BUY', 'MSFT', 1000, 72.0),
-       ('2006-04-06', 'SELL', 'IBM', 500, 53.0),
-   ]
-   >>> cur.executemany('INSERT INTO stocks VALUES(?, ?, ?, ?)', data)
+   ...    ('2006-03-28', 'BUY', 'IBM', 1000, 45.0),
+   ...    ('2006-04-05', 'BUY', 'MSFT', 1000, 72.0),
+   ...    ('2006-04-06', 'SELL', 'IBM', 500, 53.0),
+   ... ]
+   >>> cur.executemany('INSERT INTO stocks VALUES(?, ?, ?, ?, ?)', data)
 
 Then, retrieve the data by iterating over the result of a ``SELECT`` statement::
 


From webhook-mailer at python.org  Fri Jul 29 08:41:51 2022
From: webhook-mailer at python.org (miss-islington)
Date: Fri, 29 Jul 2022 12:41:51 -0000
Subject: [Python-checkins] gh-95432: Fixup sqlite3 tutorial example
 (GH-95431)
Message-ID: <mailman.367.1659098512.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/30ca6914c7b44b3909270542ad244517c4a9fd1e
commit: 30ca6914c7b44b3909270542ad244517c4a9fd1e
branch: 3.11
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-29T05:41:46-07:00
summary:

gh-95432: Fixup sqlite3 tutorial example (GH-95431)


- the insert statement should have five placeholders, not four
- missing ... in the multiline row list
(cherry picked from commit 2fbee85931296bbeddae6358583e400ce5321f89)

Co-authored-by: Erlend Egeberg Aasland <erlend.aasland at protonmail.com>

files:
M Doc/library/sqlite3.rst

diff --git a/Doc/library/sqlite3.rst b/Doc/library/sqlite3.rst
index 720330fe3f1eb..5e7f103c3f994 100644
--- a/Doc/library/sqlite3.rst
+++ b/Doc/library/sqlite3.rst
@@ -79,11 +79,11 @@ Now, let us insert three more rows of data,
 using :meth:`~Cursor.executemany`::
 
    >>> data = [
-       ('2006-03-28', 'BUY', 'IBM', 1000, 45.0),
-       ('2006-04-05', 'BUY', 'MSFT', 1000, 72.0),
-       ('2006-04-06', 'SELL', 'IBM', 500, 53.0),
-   ]
-   >>> cur.executemany('INSERT INTO stocks VALUES(?, ?, ?, ?)', data)
+   ...    ('2006-03-28', 'BUY', 'IBM', 1000, 45.0),
+   ...    ('2006-04-05', 'BUY', 'MSFT', 1000, 72.0),
+   ...    ('2006-04-06', 'SELL', 'IBM', 500, 53.0),
+   ... ]
+   >>> cur.executemany('INSERT INTO stocks VALUES(?, ?, ?, ?, ?)', data)
 
 Then, retrieve the data by iterating over the result of a ``SELECT`` statement::
 


From webhook-mailer at python.org  Fri Jul 29 10:42:19 2022
From: webhook-mailer at python.org (tiran)
Date: Fri, 29 Jul 2022 14:42:19 -0000
Subject: [Python-checkins] gh-95415: Make availability directive consistent
 (GH-95416)
Message-ID: <mailman.368.1659105740.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/f81a6c5fc7b13bd2076bdb1481c6085e0ed67184
commit: f81a6c5fc7b13bd2076bdb1481c6085e0ed67184
branch: main
author: Christian Heimes <christian at python.org>
committer: tiran <christian at python.org>
date: 2022-07-29T16:42:09+02:00
summary:

gh-95415: Make availability directive consistent (GH-95416)

files:
A Misc/NEWS.d/next/Documentation/2022-07-29-09-04-02.gh-issue-95415.LKTyw6.rst
M Doc/library/_thread.rst
M Doc/library/codecs.rst
M Doc/library/crypt.rst
M Doc/library/intro.rst
M Doc/library/os.rst
M Doc/library/pipes.rst
M Doc/library/resource.rst
M Doc/library/signal.rst
M Doc/library/socket.rst
M Doc/library/ssl.rst
M Doc/library/subprocess.rst
M Doc/library/sys.rst
M Doc/library/threading.rst
M Doc/library/time.rst
M Doc/tools/extensions/pyspecific.py
M Doc/using/cmdline.rst

diff --git a/Doc/library/_thread.rst b/Doc/library/_thread.rst
index 75b3834b9a339..d61ce9039349d 100644
--- a/Doc/library/_thread.rst
+++ b/Doc/library/_thread.rst
@@ -140,7 +140,9 @@ This module defines the following constants and functions:
    information (4 KiB pages are common; using multiples of 4096 for the stack size is
    the suggested approach in the absence of more specific information).
 
-   .. availability:: Windows, systems with POSIX threads.
+   .. availability:: Windows, pthreads.
+
+      Unix platforms with POSIX threads support.
 
 
 .. data:: TIMEOUT_MAX
diff --git a/Doc/library/codecs.rst b/Doc/library/codecs.rst
index d131408175fd1..4a665f2254f8a 100644
--- a/Doc/library/codecs.rst
+++ b/Doc/library/codecs.rst
@@ -1530,7 +1530,7 @@ functions can be used directly if desired.
 
 This module implements the ANSI codepage (CP_ACP).
 
-.. availability:: Windows only.
+.. availability:: Windows.
 
 .. versionchanged:: 3.3
    Support any error handler.
diff --git a/Doc/library/crypt.rst b/Doc/library/crypt.rst
index efba4236bcbcc..f585bbcbc18b8 100644
--- a/Doc/library/crypt.rst
+++ b/Doc/library/crypt.rst
@@ -36,7 +36,7 @@ the :manpage:`crypt(3)` routine in the running system.  Therefore, any
 extensions available on the current implementation will also  be available on
 this module.
 
-.. availability:: Unix. Not available on VxWorks.
+.. availability:: Unix, not VxWorks.
 
 Hashing Methods
 ---------------
diff --git a/Doc/library/intro.rst b/Doc/library/intro.rst
index 5bb33b9c10cc0..120b174dc3b1e 100644
--- a/Doc/library/intro.rst
+++ b/Doc/library/intro.rst
@@ -60,3 +60,7 @@ Notes on availability
 * If not separately noted, all functions that claim "Availability: Unix" are
   supported on macOS, which builds on a Unix core.
 
+* If an availability note contains both a minimum Kernel version and a minimum
+  libc version, then both conditions must hold. For example a feature with note
+  *Availability: Linux >= 3.17 with glibc >= 2.27* requires both Linux 3.17 or
+  newer and glibc 2.27 or newer.
diff --git a/Doc/library/os.rst b/Doc/library/os.rst
index 4639a8b4afe59..d3500d5a1b329 100644
--- a/Doc/library/os.rst
+++ b/Doc/library/os.rst
@@ -301,7 +301,7 @@ process and user.
    and ``'surrogateescape'`` error handler. Use :func:`os.getenvb` if you
    would like to use a different encoding.
 
-   .. availability:: most flavors of Unix, Windows.
+   .. availability:: Unix, Windows.
 
 
 .. function:: getenvb(key, default=None)
@@ -316,7 +316,7 @@ process and user.
    :func:`getenvb` is only available if :data:`supports_bytes_environ`
    is ``True``.
 
-   .. availability:: most flavors of Unix.
+   .. availability:: Unix.
 
    .. versionadded:: 3.2
 
@@ -706,7 +706,7 @@ process and user.
    :func:`socket.gethostname`  or even
    ``socket.gethostbyaddr(socket.gethostname())``.
 
-   .. availability:: recent flavors of Unix.
+   .. availability:: Unix.
 
    .. versionchanged:: 3.3
       Return type changed from a tuple to a tuple-like object
@@ -824,7 +824,7 @@ as internal buffering of data.
       It will always copy no bytes and return 0 as if the file was empty
       because of a known Linux kernel issue.
 
-   .. availability:: Linux kernel >= 4.5 or glibc >= 2.27.
+   .. availability:: Linux >= 4.5 with glibc >= 2.27.
 
    .. versionadded:: 3.8
 
@@ -1164,7 +1164,7 @@ or `the MSDN <https://msdn.microsoft.com/en-us/library/z0kc8e3z.aspx>`_ on Windo
    descriptors are :ref:`non-inheritable <fd_inheritance>`. For a (slightly) more
    portable approach, use the :mod:`pty` module.
 
-   .. availability:: some flavors of Unix.
+   .. availability:: Unix.
 
    .. versionchanged:: 3.4
       The new file descriptors are now non-inheritable.
@@ -1190,7 +1190,7 @@ or `the MSDN <https://msdn.microsoft.com/en-us/library/z0kc8e3z.aspx>`_ on Windo
    Return a pair of file descriptors ``(r, w)`` usable for reading and writing,
    respectively.
 
-   .. availability:: some flavors of Unix.
+   .. availability:: Unix.
 
    .. versionadded:: 3.3
 
@@ -1269,9 +1269,9 @@ or `the MSDN <https://msdn.microsoft.com/en-us/library/z0kc8e3z.aspx>`_ on Windo
 
    Combine the functionality of :func:`os.readv` and :func:`os.pread`.
 
-   .. availability:: Linux 2.6.30 and newer, FreeBSD 6.0 and newer,
-      OpenBSD 2.7 and newer, AIX 7.1 and newer. Using flags requires
-      Linux 4.6 or newer.
+   .. availability:: Linux >= 2.6.30, FreeBSD >= 6.0, OpenBSD >= 2.7, AIX >= 7.1.
+
+      Using flags requires Linux >= 4.6.
 
    .. versionadded:: 3.7
 
@@ -1286,7 +1286,7 @@ or `the MSDN <https://msdn.microsoft.com/en-us/library/z0kc8e3z.aspx>`_ on Windo
    If no bytes were read, it will return ``-1`` and set errno to
    :data:`errno.EAGAIN`.
 
-   .. availability:: Linux 4.14 and newer.
+   .. availability:: Linux >= 4.14.
 
    .. versionadded:: 3.7
 
@@ -1300,7 +1300,7 @@ or `the MSDN <https://msdn.microsoft.com/en-us/library/z0kc8e3z.aspx>`_ on Windo
    Currently, on Linux, this feature is usable only on a file descriptor opened
    using the :data:`O_DIRECT` flag.
 
-   .. availability:: Linux 4.6 and newer.
+   .. availability:: Linux >= 4.6.
 
    .. versionadded:: 3.7
 
@@ -1339,9 +1339,9 @@ or `the MSDN <https://msdn.microsoft.com/en-us/library/z0kc8e3z.aspx>`_ on Windo
 
    Combine the functionality of :func:`os.writev` and :func:`os.pwrite`.
 
-   .. availability:: Linux 2.6.30 and newer, FreeBSD 6.0 and newer,
-      OpenBSD 2.7 and newer, AIX 7.1 and newer. Using flags requires
-      Linux 4.7 or newer.
+   .. availability:: Linux >= 2.6.30, FreeBSD >= 6.0, OpenBSD >= 2.7, AIX >= 7.1.
+
+      Using flags requires Linux >= 4.6.
 
    .. versionadded:: 3.7
 
@@ -1351,7 +1351,7 @@ or `the MSDN <https://msdn.microsoft.com/en-us/library/z0kc8e3z.aspx>`_ on Windo
    Provide a per-write equivalent of the :data:`O_DSYNC` :func:`os.open` flag.
    This flag effect applies only to the data range written by the system call.
 
-   .. availability:: Linux 4.7 and newer.
+   .. availability:: Linux >= 4.7.
 
    .. versionadded:: 3.7
 
@@ -1361,7 +1361,7 @@ or `the MSDN <https://msdn.microsoft.com/en-us/library/z0kc8e3z.aspx>`_ on Windo
    Provide a per-write equivalent of the :data:`O_SYNC` :func:`os.open` flag.
    This flag effect applies only to the data range written by the system call.
 
-   .. availability:: Linux 4.7 and newer.
+   .. availability:: Linux >= 4.7.
 
    .. versionadded:: 3.7
 
@@ -1375,7 +1375,7 @@ or `the MSDN <https://msdn.microsoft.com/en-us/library/z0kc8e3z.aspx>`_ on Windo
    appended to the end of the file. However, if the *offset* argument is
    ``-1``, the current file *offset* is updated.
 
-   .. availability:: Linux 4.16 and newer.
+   .. availability:: Linux >= 4.16.
 
    .. versionadded:: 3.10
 
@@ -1495,7 +1495,7 @@ or `the MSDN <https://msdn.microsoft.com/en-us/library/z0kc8e3z.aspx>`_ on Windo
    make sense to block because there are no writers connected to the write end
    of the pipe.
 
-   .. availability:: Linux kernel >= 2.6.17 and glibc >= 2.5
+   .. availability:: Linux >= 2.6.17 with glibc >= 2.5
 
    .. versionadded:: 3.10
 
@@ -3334,7 +3334,7 @@ features:
    the file descriptor, and as such multiple files can have the same name
    without any side effects.
 
-   .. availability:: Linux 3.17 or newer with glibc 2.27 or newer.
+   .. availability:: Linux >= 3.17 with glibc >= 2.27.
 
    .. versionadded:: 3.8
 
@@ -3359,8 +3359,9 @@ features:
 
    These flags can be passed to :func:`memfd_create`.
 
-   .. availability:: Linux 3.17 or newer with glibc 2.27 or newer.  The
-      ``MFD_HUGE*`` flags are only available since Linux 4.14.
+   .. availability:: Linux >= 3.17 with glibc >= 2.27
+
+      The ``MFD_HUGE*`` flags are only available since Linux 4.14.
 
    .. versionadded:: 3.8
 
@@ -3412,7 +3413,7 @@ features:
        finally:
            os.close(fd)
 
-   .. availability:: Linux 2.6.27 or newer with glibc 2.8 or newer.
+   .. availability:: Linux >= 2.6.27 with glibc >= 2.8
 
    .. versionadded:: 3.10
 
@@ -3421,7 +3422,7 @@ features:
    Read value from an :func:`eventfd` file descriptor and return a 64 bit
    unsigned int. The function does not verify that *fd* is an :func:`eventfd`.
 
-   .. availability:: See :func:`eventfd`
+   .. availability:: Linux >= 2.6.27
 
    .. versionadded:: 3.10
 
@@ -3430,7 +3431,7 @@ features:
    Add value to an :func:`eventfd` file descriptor. *value* must be a 64 bit
    unsigned int. The function does not verify that *fd* is an :func:`eventfd`.
 
-   .. availability:: See :func:`eventfd`
+   .. availability:: Linux >= 2.6.27
 
    .. versionadded:: 3.10
 
@@ -3438,7 +3439,7 @@ features:
 
    Set close-on-exec flag for new :func:`eventfd` file descriptor.
 
-   .. availability:: See :func:`eventfd`
+   .. availability:: Linux >= 2.6.27
 
    .. versionadded:: 3.10
 
@@ -3447,7 +3448,7 @@ features:
    Set :const:`O_NONBLOCK` status flag for new :func:`eventfd` file
    descriptor.
 
-   .. availability:: See :func:`eventfd`
+   .. availability:: Linux >= 2.6.27
 
    .. versionadded:: 3.10
 
@@ -3456,7 +3457,7 @@ features:
    Provide semaphore-like semantics for reads from a :func:`eventfd` file
    descriptor. On read the internal counter is decremented by one.
 
-   .. availability:: Linux 2.6.30 or newer with glibc 2.8 or newer.
+   .. availability:: Linux >= 2.6.30
 
    .. versionadded:: 3.10
 
@@ -3861,7 +3862,7 @@ written in Python, such as a mail server's external command delivery program.
       Calling ``forkpty()`` in a subinterpreter is no longer supported
       (:exc:`RuntimeError` is raised).
 
-   .. availability:: some flavors of Unix.
+   .. availability:: Unix.
 
 
 .. function:: kill(pid, sig)
@@ -3917,7 +3918,7 @@ written in Python, such as a mail server's external command delivery program.
 
    See the :manpage:`pidfd_open(2)` man page for more details.
 
-   .. availability:: Linux 5.3+
+   .. availability:: Linux >= 5.3
    .. versionadded:: 3.9
 
    .. data:: PIDFD_NONBLOCK
@@ -3927,7 +3928,7 @@ written in Python, such as a mail server's external command delivery program.
       then an attempt to wait on the file descriptor using :manpage:`waitid(2)`
       will immediately return the error :data:`~errno.EAGAIN` rather than blocking.
 
-   .. availability:: Linux 5.10+
+   .. availability:: Linux >= 5.10
    .. versionadded:: 3.12
 
 
@@ -4077,7 +4078,9 @@ written in Python, such as a mail server's external command delivery program.
 
    .. versionadded:: 3.8
 
-   .. availability:: See :func:`posix_spawn` documentation.
+   .. availability:: POSIX
+
+      See :func:`posix_spawn` documentation.
 
 
 .. function:: register_at_fork(*, before=None, after_in_parent=None, \
@@ -4177,7 +4180,9 @@ written in Python, such as a mail server's external command delivery program.
 
    .. audit-event:: os.spawn mode,path,args,env os.spawnl
 
-   .. availability:: Unix, Windows.  :func:`spawnlp`, :func:`spawnlpe`, :func:`spawnvp`
+   .. availability:: Unix, Windows.
+
+      :func:`spawnlp`, :func:`spawnlpe`, :func:`spawnvp`
       and :func:`spawnvpe` are not available on Windows.  :func:`spawnle` and
       :func:`spawnve` are not thread-safe on Windows; we advise you to use the
       :mod:`subprocess` module instead.
@@ -4381,7 +4386,7 @@ written in Python, such as a mail server's external command delivery program.
    This is a Linux-specific *idtype* that indicates that *id* is a file
    descriptor that refers to a process.
 
-   .. availability:: Linux 5.4+
+   .. availability:: Linux >= 5.4
 
    .. versionadded:: 3.9
 
@@ -4523,7 +4528,9 @@ written in Python, such as a mail server's external command delivery program.
    This option causes child processes to be reported if they have been continued
    from a job control stop since their status was last reported.
 
-   .. availability:: some Unix systems.
+   .. availability:: Unix.
+
+      Some Unix systems.
 
 
 .. data:: WUNTRACED
@@ -4929,7 +4936,7 @@ Random numbers
    See also the `Linux getrandom() manual page
    <http://man7.org/linux/man-pages/man2/getrandom.2.html>`_.
 
-   .. availability:: Linux 3.17 and newer.
+   .. availability:: Linux >= 3.17.
 
    .. versionadded:: 3.6
 
diff --git a/Doc/library/pipes.rst b/Doc/library/pipes.rst
index 245dd0d252088..471ae0dbc9768 100644
--- a/Doc/library/pipes.rst
+++ b/Doc/library/pipes.rst
@@ -23,7 +23,7 @@ The :mod:`pipes` module defines a class to abstract the concept of a *pipeline*
 Because the module uses :program:`/bin/sh` command lines, a POSIX or compatible
 shell for :func:`os.system` and :func:`os.popen` is required.
 
-.. availability:: Unix. Not available on VxWorks.
+.. availability:: Unix, not VxWorks.
 
 The :mod:`pipes` module defines the following class:
 
diff --git a/Doc/library/resource.rst b/Doc/library/resource.rst
index 67e9b44fe48c4..7c9c5a0819b0a 100644
--- a/Doc/library/resource.rst
+++ b/Doc/library/resource.rst
@@ -99,7 +99,7 @@ this module for those platforms.
 
    .. audit-event:: resource.prlimit pid,resource,limits resource.prlimit
 
-   .. availability:: Linux 2.6.36 or later with glibc 2.13 or later.
+   .. availability:: Linux >= 2.6.36 with glibc >= 2.13.
 
    .. versionadded:: 3.4
 
@@ -185,7 +185,7 @@ platform.
 
    The number of bytes that can be allocated for POSIX message queues.
 
-   .. availability:: Linux 2.6.8 or later.
+   .. availability:: Linux >= 2.6.8.
 
    .. versionadded:: 3.4
 
@@ -194,7 +194,7 @@ platform.
 
    The ceiling for the process's nice level (calculated as 20 - rlim_cur).
 
-   .. availability:: Linux 2.6.12 or later.
+   .. availability:: Linux >= 2.6.12.
 
    .. versionadded:: 3.4
 
@@ -203,7 +203,7 @@ platform.
 
    The ceiling of the real-time priority.
 
-   .. availability:: Linux 2.6.12 or later.
+   .. availability:: Linux >= 2.6.12.
 
    .. versionadded:: 3.4
 
@@ -213,7 +213,7 @@ platform.
    The time limit (in microseconds) on CPU time that a process can spend
    under real-time scheduling without making a blocking syscall.
 
-   .. availability:: Linux 2.6.25 or later.
+   .. availability:: Linux >= 2.6.25.
 
    .. versionadded:: 3.4
 
@@ -222,7 +222,7 @@ platform.
 
    The number of signals which the process may queue.
 
-   .. availability:: Linux 2.6.8 or later.
+   .. availability:: Linux >= 2.6.8.
 
    .. versionadded:: 3.4
 
@@ -232,7 +232,7 @@ platform.
    This limits the amount of network memory, and hence the amount of mbufs,
    that this user may hold at any time.
 
-   .. availability:: FreeBSD 9 or later.
+   .. availability:: FreeBSD.
 
    .. versionadded:: 3.4
 
@@ -245,7 +245,7 @@ platform.
    `tuning(7) <https://www.freebsd.org/cgi/man.cgi?query=tuning&sektion=7>`__
    for a complete description of this sysctl.
 
-   .. availability:: FreeBSD 9 or later.
+   .. availability:: FreeBSD.
 
    .. versionadded:: 3.4
 
@@ -253,7 +253,7 @@ platform.
 
    The maximum number of pseudo-terminals created by this user id.
 
-   .. availability:: FreeBSD 9 or later.
+   .. availability:: FreeBSD.
 
    .. versionadded:: 3.4
 
@@ -261,7 +261,7 @@ platform.
 
    The maximum number of kqueues this user id is allowed to create.
 
-   .. availability:: FreeBSD 11 or later.
+   .. availability:: FreeBSD >= 11.
 
    .. versionadded:: 3.10
 
diff --git a/Doc/library/signal.rst b/Doc/library/signal.rst
index d850639d242ab..72b8f03fc16df 100644
--- a/Doc/library/signal.rst
+++ b/Doc/library/signal.rst
@@ -95,8 +95,10 @@ The signal module defines three enums:
 
    :class:`enum.IntEnum` collection the constants :const:`SIG_BLOCK`, :const:`SIG_UNBLOCK` and :const:`SIG_SETMASK`.
 
-   Availability: Unix. See the man page :manpage:`sigprocmask(2)` and
-   :manpage:`pthread_sigmask(3)` for further information.
+   .. availability:: Unix.
+
+      See the man page :manpage:`sigprocmask(2)` and
+      :manpage:`pthread_sigmask(3)` for further information.
 
    .. versionadded:: 3.5
 
@@ -205,7 +207,9 @@ The variables defined in the :mod:`signal` module are:
     Stack fault on coprocessor. The Linux kernel does not raise this signal: it
     can only be raised in user space.
 
-   .. availability:: Linux, on architectures where the signal is available. See
+   .. availability:: Linux.
+
+      On architectures where the signal is available. See
       the man page :manpage:`signal(7)` for further information.
 
    .. versionadded:: 3.11
@@ -337,8 +341,9 @@ The :mod:`signal` module defines the following functions:
    delivered. If *time* is zero, no alarm is scheduled, and any scheduled alarm is
    canceled.  If the return value is zero, no alarm is currently scheduled.
 
-   .. availability:: Unix.  See the man page :manpage:`alarm(2)` for further
-      information.
+   .. availability:: Unix.
+
+      See the man page :manpage:`alarm(2)` for further information.
 
 
 .. function:: getsignal(signalnum)
@@ -375,8 +380,9 @@ The :mod:`signal` module defines the following functions:
    Cause the process to sleep until a signal is received; the appropriate handler
    will then be called.  Returns nothing.
 
-   .. availability:: Unix.  See the man page :manpage:`signal(2)` for further
-      information.
+   .. availability:: Unix.
+
+      See the man page :manpage:`signal(2)` for further information.
 
    See also :func:`sigwait`, :func:`sigwaitinfo`, :func:`sigtimedwait` and
    :func:`sigpending`.
@@ -398,7 +404,7 @@ The :mod:`signal` module defines the following functions:
 
    See the :manpage:`pidfd_send_signal(2)` man page for more information.
 
-   .. availability:: Linux 5.1+
+   .. availability:: Linux >= 5.1
    .. versionadded:: 3.9
 
 
@@ -421,8 +427,9 @@ The :mod:`signal` module defines the following functions:
 
    .. audit-event:: signal.pthread_kill thread_id,signalnum signal.pthread_kill
 
-   .. availability:: Unix.  See the man page :manpage:`pthread_kill(3)` for further
-      information.
+   .. availability:: Unix.
+
+      See the man page :manpage:`pthread_kill(3)` for further  information.
 
    See also :func:`os.kill`.
 
@@ -454,7 +461,9 @@ The :mod:`signal` module defines the following functions:
 
    :data:`SIGKILL` and :data:`SIGSTOP` cannot be blocked.
 
-   .. availability:: Unix.  See the man page :manpage:`sigprocmask(2)` and
+   .. availability:: Unix.
+
+      See the man page :manpage:`sigprocmask(2)` and
       :manpage:`pthread_sigmask(3)` for further information.
 
    See also :func:`pause`, :func:`sigpending` and :func:`sigwait`.
@@ -542,8 +551,9 @@ The :mod:`signal` module defines the following functions:
    calls will be restarted when interrupted by signal *signalnum*, otherwise
    system calls will be interrupted.  Returns nothing.
 
-   .. availability:: Unix.  See the man page :manpage:`siginterrupt(3)`
-      for further information.
+   .. availability:: Unix.
+
+      See the man page :manpage:`siginterrupt(3)` for further information.
 
    Note that installing a signal handler with :func:`signal` will reset the
    restart behaviour to interruptible by implicitly calling
@@ -583,8 +593,9 @@ The :mod:`signal` module defines the following functions:
    thread (i.e., the signals which have been raised while blocked).  Return the
    set of the pending signals.
 
-   .. availability:: Unix.  See the man page :manpage:`sigpending(2)` for further
-      information.
+   .. availability:: Unix.
+
+      See the man page :manpage:`sigpending(2)` for further information.
 
    See also :func:`pause`, :func:`pthread_sigmask` and :func:`sigwait`.
 
@@ -597,8 +608,9 @@ The :mod:`signal` module defines the following functions:
    signals specified in the signal set *sigset*.  The function accepts the signal
    (removes it from the pending list of signals), and returns the signal number.
 
-   .. availability:: Unix.  See the man page :manpage:`sigwait(3)` for further
-      information.
+   .. availability:: Unix.
+
+      See the man page :manpage:`sigwait(3)` for further information.
 
    See also :func:`pause`, :func:`pthread_sigmask`, :func:`sigpending`,
    :func:`sigwaitinfo` and :func:`sigtimedwait`.
@@ -622,8 +634,9 @@ The :mod:`signal` module defines the following functions:
    :attr:`si_errno`, :attr:`si_pid`, :attr:`si_uid`, :attr:`si_status`,
    :attr:`si_band`.
 
-   .. availability:: Unix.  See the man page :manpage:`sigwaitinfo(2)` for further
-      information.
+   .. availability:: Unix.
+
+      See the man page :manpage:`sigwaitinfo(2)` for further information.
 
    See also :func:`pause`, :func:`sigwait` and :func:`sigtimedwait`.
 
@@ -641,8 +654,9 @@ The :mod:`signal` module defines the following functions:
    specifying a timeout. If *timeout* is specified as :const:`0`, a poll is
    performed. Returns :const:`None` if a timeout occurs.
 
-   .. availability:: Unix.  See the man page :manpage:`sigtimedwait(2)` for further
-      information.
+   .. availability:: Unix.
+
+      See the man page :manpage:`sigtimedwait(2)` for further information.
 
    See also :func:`pause`, :func:`sigwait` and :func:`sigwaitinfo`.
 
diff --git a/Doc/library/socket.rst b/Doc/library/socket.rst
index 84b6d797ddc01..8eb254ce898e1 100644
--- a/Doc/library/socket.rst
+++ b/Doc/library/socket.rst
@@ -165,7 +165,9 @@ created.  Socket addresses are represented as follows:
 
   - *feat* and *mask* are unsigned 32bit integers.
 
-  .. availability:: Linux 2.6.38, some algorithm types require more recent Kernels.
+  .. availability:: Linux >= 2.6.38.
+
+     Some algorithm types require more recent Kernels.
 
   .. versionadded:: 3.6
 
@@ -173,7 +175,9 @@ created.  Socket addresses are represented as follows:
   their hosts. The sockets are represented as a ``(CID, port)`` tuple
   where the context ID or CID and port are integers.
 
-  .. availability:: Linux >= 4.8 QEMU >= 2.8 ESX >= 4.0 ESX Workstation >= 6.5.
+  .. availability:: Linux >= 3.9
+
+     See :manpage:`vsock(7)`
 
   .. versionadded:: 3.7
 
@@ -221,7 +225,7 @@ created.  Socket addresses are represented as follows:
   ``socket(AF_INET, SOCK_DGRAM, IPPROTO_UDPLITE)`` for IPv4 or
   ``socket(AF_INET6, SOCK_DGRAM, IPPROTO_UDPLITE)`` for IPv6.
 
-  .. availability:: Linux >= 2.6.20, FreeBSD >= 10.1-RELEASE
+  .. availability:: Linux >= 2.6.20, FreeBSD >= 10.1
 
   .. versionadded:: 3.9
 
@@ -1080,7 +1084,7 @@ The :mod:`socket` module also offers various network-related services:
    both the value of *address_family* and the underlying implementation of
    :c:func:`inet_pton`.
 
-   .. availability:: Unix (maybe not all platforms), Windows.
+   .. availability:: Unix, Windows.
 
    .. versionchanged:: 3.4
       Windows support added
@@ -1100,7 +1104,7 @@ The :mod:`socket` module also offers various network-related services:
    length for the specified address family, :exc:`ValueError` will be raised.
    :exc:`OSError` is raised for errors from the call to :func:`inet_ntop`.
 
-   .. availability:: Unix (maybe not all platforms), Windows.
+   .. availability:: Unix, Windows.
 
    .. versionchanged:: 3.4
       Windows support added
@@ -1126,7 +1130,9 @@ The :mod:`socket` module also offers various network-related services:
    buffer.  Raises :exc:`OverflowError` if *length* is outside the
    permissible range of values.
 
-   .. availability:: most Unix platforms, possibly others.
+   .. availability:: Unix.
+
+      Most Unix platforms.
 
    .. versionadded:: 3.3
 
@@ -1147,7 +1153,9 @@ The :mod:`socket` module also offers various network-related services:
    amount of ancillary data that can be received, since additional
    data may be able to fit into the padding area.
 
-   .. availability:: most Unix platforms, possibly others.
+   .. availability:: Unix.
+
+      most Unix platforms.
 
    .. versionadded:: 3.3
 
@@ -1246,7 +1254,10 @@ The :mod:`socket` module also offers various network-related services:
    The *fds* parameter is a sequence of file descriptors.
    Consult :meth:`sendmsg` for the documentation of these parameters.
 
-   .. availability:: Unix supporting :meth:`~socket.sendmsg` and :const:`SCM_RIGHTS` mechanism.
+   .. availability:: Unix.
+
+      Unix platforms supporting :meth:`~socket.sendmsg`
+      and :const:`SCM_RIGHTS` mechanism.
 
    .. versionadded:: 3.9
 
@@ -1257,7 +1268,10 @@ The :mod:`socket` module also offers various network-related services:
    Return ``(msg, list(fds), flags, addr)``.
    Consult :meth:`recvmsg` for the documentation of these parameters.
 
-   .. availability:: Unix supporting :meth:`~socket.recvmsg` and :const:`SCM_RIGHTS` mechanism.
+   .. availability:: Unix.
+
+      Unix platforms supporting :meth:`~socket.sendmsg`
+      and :const:`SCM_RIGHTS` mechanism.
 
    .. versionadded:: 3.9
 
@@ -1592,7 +1606,9 @@ to sockets.
                   fds.frombytes(cmsg_data[:len(cmsg_data) - (len(cmsg_data) % fds.itemsize)])
           return msg, list(fds)
 
-   .. availability:: most Unix platforms, possibly others.
+   .. availability:: Unix.
+
+      Most Unix platforms.
 
    .. versionadded:: 3.3
 
@@ -1634,7 +1650,9 @@ to sockets.
       >>> [b1, b2, b3]
       [bytearray(b'Mary'), bytearray(b'01 had a 9'), bytearray(b'little lamb---')]
 
-   .. availability:: most Unix platforms, possibly others.
+   .. availability:: Unix.
+
+      Most Unix platforms.
 
    .. versionadded:: 3.3
 
@@ -1740,7 +1758,9 @@ to sockets.
       def send_fds(sock, msg, fds):
           return sock.sendmsg([msg], [(socket.SOL_SOCKET, socket.SCM_RIGHTS, array.array("i", fds))])
 
-   .. availability:: most Unix platforms, possibly others.
+   .. availability:: Unix.
+
+      Most Unix platforms.
 
    .. audit-event:: socket.sendmsg self,address socket.socket.sendmsg
 
diff --git a/Doc/library/ssl.rst b/Doc/library/ssl.rst
index 19225c85ff762..e6e9a08e0a719 100644
--- a/Doc/library/ssl.rst
+++ b/Doc/library/ssl.rst
@@ -410,9 +410,6 @@ Certificate handling
    * :attr:`openssl_capath_env` - OpenSSL's environment key that points to a capath,
    * :attr:`openssl_capath` - hard coded path to a capath directory
 
-   .. availability:: LibreSSL ignores the environment vars
-     :attr:`openssl_cafile_env` and :attr:`openssl_capath_env`.
-
    .. versionadded:: 3.4
 
 .. function:: enum_certificates(store_name)
diff --git a/Doc/library/subprocess.rst b/Doc/library/subprocess.rst
index 0a996feb22cef..fae81f8ac28ff 100644
--- a/Doc/library/subprocess.rst
+++ b/Doc/library/subprocess.rst
@@ -1473,7 +1473,7 @@ handling consistency are valid for these functions.
       >>> subprocess.getstatusoutput('/bin/kill $$')
       (-15, '')
 
-   .. availability:: POSIX & Windows.
+   .. availability:: Unix, Windows.
 
    .. versionchanged:: 3.3.4
       Windows support was added.
@@ -1495,7 +1495,7 @@ handling consistency are valid for these functions.
       >>> subprocess.getoutput('ls /bin/ls')
       '/bin/ls'
 
-   .. availability:: POSIX & Windows.
+   .. availability:: Unix, Windows.
 
    .. versionchanged:: 3.3.4
       Windows support added
diff --git a/Doc/library/sys.rst b/Doc/library/sys.rst
index 62b3673c747f2..e7ad6a6c67bd1 100644
--- a/Doc/library/sys.rst
+++ b/Doc/library/sys.rst
@@ -338,7 +338,7 @@ always available.
    |                             | memory support.                              |
    +-----------------------------+----------------------------------------------+
 
-   .. availability:: WebAssembly Emscripten platform (*wasm32-emscripten*).
+   .. availability:: Emscripten.
 
    .. versionadded:: 3.11
 
diff --git a/Doc/library/threading.rst b/Doc/library/threading.rst
index 58e4ad786fe17..8e69c2c404f63 100644
--- a/Doc/library/threading.rst
+++ b/Doc/library/threading.rst
@@ -192,7 +192,9 @@ This module defines the following functions:
    information (4 KiB pages are common; using multiples of 4096 for the stack size is
    the suggested approach in the absence of more specific information).
 
-   .. availability:: Windows, systems with POSIX threads.
+   .. availability:: Windows, pthreads.
+
+      Unix platforms with POSIX threads support.
 
 
 This module also defines the following constant:
@@ -429,7 +431,7 @@ since it is impossible to detect the termination of alien threads.
          system-wide) from the time the thread is created until the thread
          has been terminated.
 
-      .. availability:: Requires :func:`get_native_id` function.
+      .. availability:: Windows, FreeBSD, Linux, macOS, OpenBSD, NetBSD, AIX, DragonFlyBSD.
 
       .. versionadded:: 3.8
 
diff --git a/Doc/library/time.rst b/Doc/library/time.rst
index be17fa68eb7b5..9f23a6fc7d534 100644
--- a/Doc/library/time.rst
+++ b/Doc/library/time.rst
@@ -144,8 +144,10 @@ Functions
       Passing an invalid or expired *thread_id* may result in
       undefined behavior, such as segmentation fault.
 
-   .. availability:: Unix (see the man page for :manpage:`pthread_getcpuclockid(3)` for
-      further information).
+   .. availability:: Unix
+
+      See the man page for :manpage:`pthread_getcpuclockid(3)` for
+      further information.
 
    .. versionadded:: 3.7
 
@@ -651,8 +653,9 @@ Functions
    Use :func:`thread_time_ns` to avoid the precision loss caused by the
    :class:`float` type.
 
-   .. availability::  Windows, Linux, Unix systems supporting
-      ``CLOCK_THREAD_CPUTIME_ID``.
+   .. availability::  Linux, Unix, Windows.
+
+      Unix systems supporting ``CLOCK_THREAD_CPUTIME_ID``.
 
    .. versionadded:: 3.7
 
@@ -770,7 +773,7 @@ These constants are used as parameters for :func:`clock_getres` and
    have  discontinuities if the time is changed using ``settimeofday()`` or
    similar.
 
-   .. availability:: Linux 2.6.39 or later.
+   .. availability:: Linux >= 2.6.39.
 
    .. versionadded:: 3.7
 
@@ -801,7 +804,7 @@ These constants are used as parameters for :func:`clock_getres` and
    Similar to :data:`CLOCK_MONOTONIC`, but provides access to a raw
    hardware-based time that is not subject to NTP adjustments.
 
-   .. availability:: Linux 2.6.28 and newer, macOS 10.12 and newer.
+   .. availability:: Linux >= 2.6.28, macOS >= 10.12.
 
    .. versionadded:: 3.3
 
@@ -819,7 +822,7 @@ These constants are used as parameters for :func:`clock_getres` and
 
    High-resolution per-process timer from the CPU.
 
-   .. availability:: FreeBSD, NetBSD 7 or later, OpenBSD.
+   .. availability:: FreeBSD, NetBSD >= 7, OpenBSD.
 
    .. versionadded:: 3.7
 
@@ -849,7 +852,7 @@ These constants are used as parameters for :func:`clock_getres` and
    suspended, providing accurate uptime measurement, both absolute and
    interval.
 
-   .. availability:: FreeBSD, OpenBSD 5.5 or later.
+   .. availability:: FreeBSD, OpenBSD >= 5.5.
 
    .. versionadded:: 3.7
 
@@ -860,7 +863,7 @@ These constants are used as parameters for :func:`clock_getres` and
    point, unaffected by frequency or time adjustments and not incremented while
    the system is asleep.
 
-   .. availability:: macOS 10.12 and newer.
+   .. availability:: macOS >= 10.12.
 
    .. versionadded:: 3.8
 
diff --git a/Doc/tools/extensions/pyspecific.py b/Doc/tools/extensions/pyspecific.py
index 8ac0028cc4f41..20c372e249569 100644
--- a/Doc/tools/extensions/pyspecific.py
+++ b/Doc/tools/extensions/pyspecific.py
@@ -134,11 +134,22 @@ def run(self):
 
 class Availability(Directive):
 
-    has_content = False
+    has_content = True
     required_arguments = 1
     optional_arguments = 0
     final_argument_whitespace = True
 
+    # known platform, libc, and threading implementations
+    known_platforms = frozenset({
+        "AIX", "Android", "BSD", "DragonFlyBSD", "Emscripten", "FreeBSD",
+        "Linux", "NetBSD", "OpenBSD", "POSIX", "Solaris", "Unix", "VxWorks",
+         "WASI", "Windows", "macOS",
+         # libc
+         "BSD libc", "glibc", "musl",
+         # POSIX platforms with pthreads
+         "pthreads",
+    })
+
     def run(self):
         availability_ref = ':ref:`Availability <availability>`: '
         pnode = nodes.paragraph(availability_ref + self.arguments[0],
@@ -147,8 +158,53 @@ def run(self):
         pnode.extend(n + m)
         n, m = self.state.inline_text(self.arguments[0], self.lineno)
         pnode.extend(n + m)
+        if self.content:
+            content = " " + " ".join(self.content)
+            n, m = self.state.inline_text(content, self.content_offset)
+            pnode.extend(n + m)
+
+        self.parse_platforms()
+
         return [pnode]
 
+    def parse_platforms(self):
+        """Parse platform information from arguments
+
+        Arguments is a comma-separated string of platforms. A platform may
+        be prefixed with "not " to indicate that a feature is not available.
+
+        Example::
+
+           .. availability:: Windows, Linux >= 4.2, not Emscripten, not WASI
+
+        Arguments like "Linux >= 3.17 with glibc >= 2.27" are currently not
+        parsed into separate tokens.
+        """
+        platforms = {}
+        for arg in self.arguments[0].rstrip(".").split(","):
+            arg = arg.strip()
+            platform, _, version = arg.partition(" >= ")
+            if platform.startswith("not "):
+                version = False
+                platform = platform[4:]
+            elif not version:
+                version = True
+            platforms[platform] = version
+
+        unknown = set(platforms).difference(self.known_platforms)
+        if unknown:
+            cls = type(self)
+            logger = logging.getLogger(cls.__qualname__)
+            logger.warn(
+                f"Unknown platform(s) or syntax '{' '.join(sorted(unknown))}' "
+                f"in '.. availability:: {self.arguments[0]}', see "
+                f"{__file__}:{cls.__qualname__}.known_platforms for a set "
+                "known platforms."
+            )
+
+        return platforms
+
+
 
 # Support for documenting audit event
 
diff --git a/Doc/using/cmdline.rst b/Doc/using/cmdline.rst
index bc92e0e44b9b2..2d376ec7b40fd 100644
--- a/Doc/using/cmdline.rst
+++ b/Doc/using/cmdline.rst
@@ -981,7 +981,7 @@ conflict.
    order to force the interpreter to use ``ASCII`` instead of ``UTF-8`` for
    system interfaces.
 
-   .. availability:: \*nix.
+   .. availability:: Unix.
 
    .. versionadded:: 3.7
       See :pep:`538` for more details.
diff --git a/Misc/NEWS.d/next/Documentation/2022-07-29-09-04-02.gh-issue-95415.LKTyw6.rst b/Misc/NEWS.d/next/Documentation/2022-07-29-09-04-02.gh-issue-95415.LKTyw6.rst
new file mode 100644
index 0000000000000..ece36bc4d1ced
--- /dev/null
+++ b/Misc/NEWS.d/next/Documentation/2022-07-29-09-04-02.gh-issue-95415.LKTyw6.rst
@@ -0,0 +1,2 @@
+Use consistent syntax for platform availability. The directive now supports
+a content body and emits a warning when it encounters an unknown platform.


From webhook-mailer at python.org  Fri Jul 29 11:20:16 2022
From: webhook-mailer at python.org (ambv)
Date: Fri, 29 Jul 2022 15:20:16 -0000
Subject: [Python-checkins] gh-95280: Fix test_get_ciphers on systems without
 RSA key exchange (GH-95282) (GH-95323)
Message-ID: <mailman.369.1659108017.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/03dc951316e9d9461475b06ff20016d6855ff85d
commit: 03dc951316e9d9461475b06ff20016d6855ff85d
branch: 3.9
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: ambv <lukasz at langa.pl>
date: 2022-07-29T17:20:06+02:00
summary:

gh-95280: Fix test_get_ciphers on systems without RSA key exchange (GH-95282) (GH-95323)

(cherry picked from commit 565403038b75eb64ea483b2757ba30769246d853)

Co-authored-by: Christian Heimes <christian at python.org>

files:
A Misc/NEWS.d/next/Tests/2022-07-26-15-22-19.gh-issue-95280.h8HvbP.rst
M Lib/test/test_ssl.py

diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py
index 1f8c30c51aa87..6faa2ee0bbe6b 100644
--- a/Lib/test/test_ssl.py
+++ b/Lib/test/test_ssl.py
@@ -1169,8 +1169,20 @@ def test_get_ciphers(self):
         ctx = ssl.SSLContext(ssl.PROTOCOL_TLS_CLIENT)
         ctx.set_ciphers('AESGCM')
         names = set(d['name'] for d in ctx.get_ciphers())
-        self.assertIn('AES256-GCM-SHA384', names)
-        self.assertIn('AES128-GCM-SHA256', names)
+        expected = {
+            'AES128-GCM-SHA256',
+            'ECDHE-ECDSA-AES128-GCM-SHA256',
+            'ECDHE-RSA-AES128-GCM-SHA256',
+            'DHE-RSA-AES128-GCM-SHA256',
+            'AES256-GCM-SHA384',
+            'ECDHE-ECDSA-AES256-GCM-SHA384',
+            'ECDHE-RSA-AES256-GCM-SHA384',
+            'DHE-RSA-AES256-GCM-SHA384',
+        }
+        intersection = names.intersection(expected)
+        self.assertGreaterEqual(
+            len(intersection), 2, f"\ngot: {sorted(names)}\nexpected: {sorted(expected)}"
+        )
 
     def test_options(self):
         ctx = ssl.SSLContext(ssl.PROTOCOL_TLS_CLIENT)
diff --git a/Misc/NEWS.d/next/Tests/2022-07-26-15-22-19.gh-issue-95280.h8HvbP.rst b/Misc/NEWS.d/next/Tests/2022-07-26-15-22-19.gh-issue-95280.h8HvbP.rst
new file mode 100644
index 0000000000000..523d9d5f2f8bf
--- /dev/null
+++ b/Misc/NEWS.d/next/Tests/2022-07-26-15-22-19.gh-issue-95280.h8HvbP.rst
@@ -0,0 +1,2 @@
+Fix problem with ``test_ssl`` ``test_get_ciphers`` on systems that require
+perfect forward secrecy (PFS) ciphers.


From webhook-mailer at python.org  Fri Jul 29 12:25:01 2022
From: webhook-mailer at python.org (zooba)
Date: Fri, 29 Jul 2022 16:25:01 -0000
Subject: [Python-checkins] gh-94302: Clarify use of the 'open' operation in
 os.startfile (GH-95441)
Message-ID: <mailman.370.1659111902.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/e3bae80e70fce83f1fca70738e68177127831324
commit: e3bae80e70fce83f1fca70738e68177127831324
branch: main
author: Steve Dower <steve.dower at python.org>
committer: zooba <steve.dower at microsoft.com>
date: 2022-07-29T17:24:56+01:00
summary:

gh-94302: Clarify use of the 'open' operation in os.startfile (GH-95441)

files:
M Doc/library/os.rst

diff --git a/Doc/library/os.rst b/Doc/library/os.rst
index d3500d5a1b329..9567dab81ff5e 100644
--- a/Doc/library/os.rst
+++ b/Doc/library/os.rst
@@ -4229,13 +4229,13 @@ written in Python, such as a mail server's external command delivery program.
 
    Start a file with its associated application.
 
-   When *operation* is not specified or ``'open'``, this acts like double-clicking
+   When *operation* is not specified, this acts like double-clicking
    the file in Windows Explorer, or giving the file name as an argument to the
    :program:`start` command from the interactive command shell: the file is opened
    with whatever application (if any) its extension is associated.
 
    When another *operation* is given, it must be a "command verb" that specifies
-   what should be done with the file. Common verbs documented by Microsoft are
+   what should be done with the file. Common verbs documented by Microsoft are ``'open'``,
    ``'print'`` and  ``'edit'`` (to be used on files) as well as ``'explore'`` and
    ``'find'`` (to be used on directories).
 


From webhook-mailer at python.org  Fri Jul 29 15:27:24 2022
From: webhook-mailer at python.org (erlend-aasland)
Date: Fri, 29 Jul 2022 19:27:24 -0000
Subject: [Python-checkins] gh-95273: Relocate sqlite3 enable load extension
 note (#95430)
Message-ID: <mailman.371.1659122845.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/d92b19e1b500247f9a62b12b9da889b99fe333f6
commit: d92b19e1b500247f9a62b12b9da889b99fe333f6
branch: main
author: Erlend Egeberg Aasland <erlend.aasland at protonmail.com>
committer: erlend-aasland <erlend.aasland at protonmail.com>
date: 2022-07-29T21:27:15+02:00
summary:

gh-95273: Relocate sqlite3 enable load extension note (#95430)

files:
M Doc/library/sqlite3.rst

diff --git a/Doc/library/sqlite3.rst b/Doc/library/sqlite3.rst
index 3df41b5419495..6625511c783c3 100644
--- a/Doc/library/sqlite3.rst
+++ b/Doc/library/sqlite3.rst
@@ -753,7 +753,14 @@ Connection Objects
       aggregates or whole new virtual table implementations.  One well-known
       extension is the fulltext-search extension distributed with SQLite.
 
-      Loadable extensions are disabled by default. See [#f1]_.
+      .. note::
+
+         The ``sqlite3`` module is not built with loadable extension support by
+         default, because some platforms (notably macOS) have SQLite
+         libraries which are compiled without this feature.
+         To get loadable extension support,
+         you must pass the :option:`--enable-loadable-sqlite-extensions` option
+         to :program:`configure`.
 
       .. audit-event:: sqlite3.enable_load_extension connection,enabled sqlite3.Connection.enable_load_extension
 
@@ -770,8 +777,6 @@ Connection Objects
       Enable extension loading with :meth:`enable_load_extension` before
       calling this method.
 
-      Loadable extensions are disabled by default. See [#f1]_.
-
       .. audit-event:: sqlite3.load_extension connection,path sqlite3.Connection.load_extension
 
       .. versionadded:: 3.2
@@ -1716,12 +1721,3 @@ the context manager is a no-op.
    nor closes the connection.
 
 .. literalinclude:: ../includes/sqlite3/ctx_manager.py
-
-
-.. rubric:: Footnotes
-
-.. [#f1] The sqlite3 module is not built with loadable extension support by
-   default, because some platforms (notably macOS) have SQLite
-   libraries which are compiled without this feature. To get loadable
-   extension support, you must pass the
-   :option:`--enable-loadable-sqlite-extensions` option to configure.


From webhook-mailer at python.org  Fri Jul 29 15:37:03 2022
From: webhook-mailer at python.org (miss-islington)
Date: Fri, 29 Jul 2022 19:37:03 -0000
Subject: [Python-checkins] gh-95273: Relocate sqlite3 enable load extension
 note (GH-95430)
Message-ID: <mailman.372.1659123423.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/f14ced6062ecdd3c654f3c558f79e1edf4f10cc8
commit: f14ced6062ecdd3c654f3c558f79e1edf4f10cc8
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-29T12:36:58-07:00
summary:

gh-95273: Relocate sqlite3 enable load extension note (GH-95430)

(cherry picked from commit d92b19e1b500247f9a62b12b9da889b99fe333f6)

Co-authored-by: Erlend Egeberg Aasland <erlend.aasland at protonmail.com>

files:
M Doc/library/sqlite3.rst

diff --git a/Doc/library/sqlite3.rst b/Doc/library/sqlite3.rst
index 061207b59249b..e68aa4055680e 100644
--- a/Doc/library/sqlite3.rst
+++ b/Doc/library/sqlite3.rst
@@ -618,7 +618,14 @@ Connection Objects
       aggregates or whole new virtual table implementations.  One well-known
       extension is the fulltext-search extension distributed with SQLite.
 
-      Loadable extensions are disabled by default. See [#f1]_.
+      .. note::
+
+         The ``sqlite3`` module is not built with loadable extension support by
+         default, because some platforms (notably macOS) have SQLite
+         libraries which are compiled without this feature.
+         To get loadable extension support,
+         you must pass the :option:`--enable-loadable-sqlite-extensions` option
+         to :program:`configure`.
 
       .. audit-event:: sqlite3.enable_load_extension connection,enabled sqlite3.Connection.enable_load_extension
 
@@ -635,8 +642,6 @@ Connection Objects
       Enable extension loading with :meth:`enable_load_extension` before
       calling this method.
 
-      Loadable extensions are disabled by default. See [#f1]_.
-
       .. audit-event:: sqlite3.load_extension connection,path sqlite3.Connection.load_extension
 
       .. versionadded:: 3.2
@@ -1431,12 +1436,3 @@ the context manager is a no-op.
    nor closes the connection.
 
 .. literalinclude:: ../includes/sqlite3/ctx_manager.py
-
-
-.. rubric:: Footnotes
-
-.. [#f1] The sqlite3 module is not built with loadable extension support by
-   default, because some platforms (notably macOS) have SQLite
-   libraries which are compiled without this feature. To get loadable
-   extension support, you must pass the
-   :option:`--enable-loadable-sqlite-extensions` option to configure.


From webhook-mailer at python.org  Fri Jul 29 15:38:17 2022
From: webhook-mailer at python.org (miss-islington)
Date: Fri, 29 Jul 2022 19:38:17 -0000
Subject: [Python-checkins] gh-95273: Relocate sqlite3 enable load extension
 note (GH-95430)
Message-ID: <mailman.373.1659123498.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/1187efeebb00ecc862616c8afede6a302973712e
commit: 1187efeebb00ecc862616c8afede6a302973712e
branch: 3.11
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-29T12:38:12-07:00
summary:

gh-95273: Relocate sqlite3 enable load extension note (GH-95430)

(cherry picked from commit d92b19e1b500247f9a62b12b9da889b99fe333f6)

Co-authored-by: Erlend Egeberg Aasland <erlend.aasland at protonmail.com>

files:
M Doc/library/sqlite3.rst

diff --git a/Doc/library/sqlite3.rst b/Doc/library/sqlite3.rst
index 5e7f103c3f994..9437bafa5a281 100644
--- a/Doc/library/sqlite3.rst
+++ b/Doc/library/sqlite3.rst
@@ -743,7 +743,14 @@ Connection Objects
       aggregates or whole new virtual table implementations.  One well-known
       extension is the fulltext-search extension distributed with SQLite.
 
-      Loadable extensions are disabled by default. See [#f1]_.
+      .. note::
+
+         The ``sqlite3`` module is not built with loadable extension support by
+         default, because some platforms (notably macOS) have SQLite
+         libraries which are compiled without this feature.
+         To get loadable extension support,
+         you must pass the :option:`--enable-loadable-sqlite-extensions` option
+         to :program:`configure`.
 
       .. audit-event:: sqlite3.enable_load_extension connection,enabled sqlite3.Connection.enable_load_extension
 
@@ -760,8 +767,6 @@ Connection Objects
       Enable extension loading with :meth:`enable_load_extension` before
       calling this method.
 
-      Loadable extensions are disabled by default. See [#f1]_.
-
       .. audit-event:: sqlite3.load_extension connection,path sqlite3.Connection.load_extension
 
       .. versionadded:: 3.2
@@ -1699,12 +1704,3 @@ the context manager is a no-op.
    nor closes the connection.
 
 .. literalinclude:: ../includes/sqlite3/ctx_manager.py
-
-
-.. rubric:: Footnotes
-
-.. [#f1] The sqlite3 module is not built with loadable extension support by
-   default, because some platforms (notably macOS) have SQLite
-   libraries which are compiled without this feature. To get loadable
-   extension support, you must pass the
-   :option:`--enable-loadable-sqlite-extensions` option to configure.


From webhook-mailer at python.org  Sat Jul 30 00:42:22 2022
From: webhook-mailer at python.org (terryjreedy)
Date: Sat, 30 Jul 2022 04:42:22 -0000
Subject: [Python-checkins] gh-95411: IDLE - Enable using the module browser
 with .pyw files (#95397)
Message-ID: <mailman.374.1659156144.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/7e19e417b5df765dabab8d6550ec0e9d897c573e
commit: 7e19e417b5df765dabab8d6550ec0e9d897c573e
branch: main
author: Erlend Egeberg Aasland <erlend.aasland at protonmail.com>
committer: terryjreedy <tjreedy at udel.edu>
date: 2022-07-30T00:42:13-04:00
summary:

gh-95411: IDLE - Enable using the module browser with .pyw files (#95397)


Co-authored-by: Terry Jan Reedy <tjreedy at udel.edu>

files:
A Misc/NEWS.d/next/IDLE/2022-07-29-11-08-52.gh-issue-95411.dazlqH.rst
M Lib/idlelib/NEWS.txt
M Lib/idlelib/browser.py
M Lib/idlelib/idle_test/test_browser.py

diff --git a/Lib/idlelib/NEWS.txt b/Lib/idlelib/NEWS.txt
index ffb090aa45a46..85116b5b6b931 100644
--- a/Lib/idlelib/NEWS.txt
+++ b/Lib/idlelib/NEWS.txt
@@ -3,6 +3,8 @@ What's New in IDLE 3.11.0
 Released on 2022-10-03
 =========================
 
+gh-95411: Enable using IDLE's module browser with .pyw files.
+
 gh-89610: Add .pyi as a recognized extension for IDLE on macOS.  This allows
 opening stub files by double clicking on them in the Finder.
 
diff --git a/Lib/idlelib/browser.py b/Lib/idlelib/browser.py
index 4da2d4071ac19..4fe64dced60ac 100644
--- a/Lib/idlelib/browser.py
+++ b/Lib/idlelib/browser.py
@@ -6,7 +6,6 @@
     (or recheck on window popup)
 - add popup menu with more options (e.g. doc strings, base classes, imports)
 - add base classes to class browser tree
-- finish removing limitation to x.py files (ModuleBrowserTreeItem)
 """
 
 import os
@@ -16,12 +15,22 @@
 from idlelib.config import idleConf
 from idlelib import pyshell
 from idlelib.tree import TreeNode, TreeItem, ScrolledCanvas
+from idlelib.util import py_extensions
 from idlelib.window import ListedToplevel
 
 
 file_open = None  # Method...Item and Class...Item use this.
 # Normally pyshell.flist.open, but there is no pyshell.flist for htest.
 
+# The browser depends on pyclbr and importlib which do not support .pyi files.
+browseable_extension_blocklist = ('.pyi',)
+
+
+def is_browseable_extension(path):
+    _, ext = os.path.splitext(path)
+    ext = os.path.normcase(ext)
+    return ext in py_extensions and ext not in browseable_extension_blocklist
+
 
 def transform_children(child_dict, modname=None):
     """Transform a child dictionary to an ordered sequence of objects.
@@ -76,8 +85,8 @@ def __init__(self, master, path, *, _htest=False, _utest=False):
 
         Instance variables:
             name: Module name.
-            file: Full path and module with .py extension.  Used in
-                creating ModuleBrowserTreeItem as the rootnode for
+            file: Full path and module with supported extension.
+                Used in creating ModuleBrowserTreeItem as the rootnode for
                 the tree and subsequently in the children.
         """
         self.master = master
@@ -161,22 +170,22 @@ def GetSubList(self):
 
     def OnDoubleClick(self):
         "Open a module in an editor window when double clicked."
-        if os.path.normcase(self.file[-3:]) != ".py":
+        if not is_browseable_extension(self.file):
             return
         if not os.path.exists(self.file):
             return
         file_open(self.file)
 
     def IsExpandable(self):
-        "Return True if Python (.py) file."
-        return os.path.normcase(self.file[-3:]) == ".py"
+        "Return True if Python file."
+        return is_browseable_extension(self.file)
 
     def listchildren(self):
         "Return sequenced classes and functions in the module."
-        dir, base = os.path.split(self.file)
-        name, ext = os.path.splitext(base)
-        if os.path.normcase(ext) != ".py":
+        if not is_browseable_extension(self.file):
             return []
+        dir, base = os.path.split(self.file)
+        name, _ = os.path.splitext(base)
         try:
             tree = pyclbr.readmodule_ex(name, [dir] + sys.path)
         except ImportError:
diff --git a/Lib/idlelib/idle_test/test_browser.py b/Lib/idlelib/idle_test/test_browser.py
index 03a50f22ca1e8..343d50a6e37bd 100644
--- a/Lib/idlelib/idle_test/test_browser.py
+++ b/Lib/idlelib/idle_test/test_browser.py
@@ -5,6 +5,7 @@
 import unittest
 from unittest import mock
 from idlelib.idle_test.mock_idle import Func
+from idlelib.util import py_extensions
 
 from collections import deque
 import os.path
@@ -57,6 +58,15 @@ def test_close(self):
         self.assertTrue(mb.node.destroy.called)
         del mb.top.destroy, mb.node.destroy
 
+    def test_is_browseable_extension(self):
+        path = "/path/to/file"
+        for ext in py_extensions:
+            with self.subTest(ext=ext):
+                filename = f'{path}{ext}'
+                actual = browser.is_browseable_extension(filename)
+                expected = ext not in browser.browseable_extension_blocklist
+                self.assertEqual(actual, expected)
+
 
 # Nested tree same as in test_pyclbr.py except for supers on C0. C1.
 mb = pyclbr
diff --git a/Misc/NEWS.d/next/IDLE/2022-07-29-11-08-52.gh-issue-95411.dazlqH.rst b/Misc/NEWS.d/next/IDLE/2022-07-29-11-08-52.gh-issue-95411.dazlqH.rst
new file mode 100644
index 0000000000000..94ca8b2c2ea95
--- /dev/null
+++ b/Misc/NEWS.d/next/IDLE/2022-07-29-11-08-52.gh-issue-95411.dazlqH.rst
@@ -0,0 +1 @@
+Enable using IDLE's module browser with .pyw files.


From webhook-mailer at python.org  Sat Jul 30 01:05:57 2022
From: webhook-mailer at python.org (miss-islington)
Date: Sat, 30 Jul 2022 05:05:57 -0000
Subject: [Python-checkins] gh-95411: IDLE - Enable using the module browser
 with .pyw files (GH-95397)
Message-ID: <mailman.375.1659157558.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/fa7904cb5232c67bb6dce04bfb7ab5ee0bd98134
commit: fa7904cb5232c67bb6dce04bfb7ab5ee0bd98134
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-29T22:05:48-07:00
summary:

gh-95411: IDLE - Enable using the module browser with .pyw files (GH-95397)


Co-authored-by: Terry Jan Reedy <tjreedy at udel.edu>
(cherry picked from commit 7e19e417b5df765dabab8d6550ec0e9d897c573e)

Co-authored-by: Erlend Egeberg Aasland <erlend.aasland at protonmail.com>

files:
A Misc/NEWS.d/next/IDLE/2022-07-29-11-08-52.gh-issue-95411.dazlqH.rst
M Lib/idlelib/NEWS.txt
M Lib/idlelib/browser.py
M Lib/idlelib/idle_test/test_browser.py

diff --git a/Lib/idlelib/NEWS.txt b/Lib/idlelib/NEWS.txt
index 39e76f95226a6..6d7355355982d 100644
--- a/Lib/idlelib/NEWS.txt
+++ b/Lib/idlelib/NEWS.txt
@@ -3,6 +3,8 @@ after 3.10.0 until 3.10.10?
 Released 2023-04-03?
 =========================
 
+gh-95411: Enable using IDLE's module browser with .pyw files.
+
 gh-89610: Add .pyi as a recognized extension for IDLE on macOS.  This allows
 opening stub files by double clicking on them in the Finder.
 
diff --git a/Lib/idlelib/browser.py b/Lib/idlelib/browser.py
index 3c3a53a6599a7..10d9a7261113e 100644
--- a/Lib/idlelib/browser.py
+++ b/Lib/idlelib/browser.py
@@ -6,7 +6,6 @@
     (or recheck on window popup)
 - add popup menu with more options (e.g. doc strings, base classes, imports)
 - add base classes to class browser tree
-- finish removing limitation to x.py files (ModuleBrowserTreeItem)
 """
 
 import os
@@ -16,12 +15,22 @@
 from idlelib.config import idleConf
 from idlelib import pyshell
 from idlelib.tree import TreeNode, TreeItem, ScrolledCanvas
+from idlelib.util import py_extensions
 from idlelib.window import ListedToplevel
 
 
 file_open = None  # Method...Item and Class...Item use this.
 # Normally pyshell.flist.open, but there is no pyshell.flist for htest.
 
+# The browser depends on pyclbr and importlib which do not support .pyi files.
+browseable_extension_blocklist = ('.pyi',)
+
+
+def is_browseable_extension(path):
+    _, ext = os.path.splitext(path)
+    ext = os.path.normcase(ext)
+    return ext in py_extensions and ext not in browseable_extension_blocklist
+
 
 def transform_children(child_dict, modname=None):
     """Transform a child dictionary to an ordered sequence of objects.
@@ -76,8 +85,8 @@ def __init__(self, master, path, *, _htest=False, _utest=False):
 
         Instance variables:
             name: Module name.
-            file: Full path and module with .py extension.  Used in
-                creating ModuleBrowserTreeItem as the rootnode for
+            file: Full path and module with supported extension.
+                Used in creating ModuleBrowserTreeItem as the rootnode for
                 the tree and subsequently in the children.
         """
         self.master = master
@@ -161,22 +170,22 @@ def GetSubList(self):
 
     def OnDoubleClick(self):
         "Open a module in an editor window when double clicked."
-        if os.path.normcase(self.file[-3:]) != ".py":
+        if not is_browseable_extension(self.file):
             return
         if not os.path.exists(self.file):
             return
         file_open(self.file)
 
     def IsExpandable(self):
-        "Return True if Python (.py) file."
-        return os.path.normcase(self.file[-3:]) == ".py"
+        "Return True if Python file."
+        return is_browseable_extension(self.file)
 
     def listchildren(self):
         "Return sequenced classes and functions in the module."
-        dir, base = os.path.split(self.file)
-        name, ext = os.path.splitext(base)
-        if os.path.normcase(ext) != ".py":
+        if not is_browseable_extension(self.file):
             return []
+        dir, base = os.path.split(self.file)
+        name, _ = os.path.splitext(base)
         try:
             tree = pyclbr.readmodule_ex(name, [dir] + sys.path)
         except ImportError:
diff --git a/Lib/idlelib/idle_test/test_browser.py b/Lib/idlelib/idle_test/test_browser.py
index 03a50f22ca1e8..343d50a6e37bd 100644
--- a/Lib/idlelib/idle_test/test_browser.py
+++ b/Lib/idlelib/idle_test/test_browser.py
@@ -5,6 +5,7 @@
 import unittest
 from unittest import mock
 from idlelib.idle_test.mock_idle import Func
+from idlelib.util import py_extensions
 
 from collections import deque
 import os.path
@@ -57,6 +58,15 @@ def test_close(self):
         self.assertTrue(mb.node.destroy.called)
         del mb.top.destroy, mb.node.destroy
 
+    def test_is_browseable_extension(self):
+        path = "/path/to/file"
+        for ext in py_extensions:
+            with self.subTest(ext=ext):
+                filename = f'{path}{ext}'
+                actual = browser.is_browseable_extension(filename)
+                expected = ext not in browser.browseable_extension_blocklist
+                self.assertEqual(actual, expected)
+
 
 # Nested tree same as in test_pyclbr.py except for supers on C0. C1.
 mb = pyclbr
diff --git a/Misc/NEWS.d/next/IDLE/2022-07-29-11-08-52.gh-issue-95411.dazlqH.rst b/Misc/NEWS.d/next/IDLE/2022-07-29-11-08-52.gh-issue-95411.dazlqH.rst
new file mode 100644
index 0000000000000..94ca8b2c2ea95
--- /dev/null
+++ b/Misc/NEWS.d/next/IDLE/2022-07-29-11-08-52.gh-issue-95411.dazlqH.rst
@@ -0,0 +1 @@
+Enable using IDLE's module browser with .pyw files.


From webhook-mailer at python.org  Sat Jul 30 01:09:39 2022
From: webhook-mailer at python.org (miss-islington)
Date: Sat, 30 Jul 2022 05:09:39 -0000
Subject: [Python-checkins] gh-95411: IDLE - Enable using the module browser
 with .pyw files (GH-95397)
Message-ID: <mailman.376.1659157780.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/a459ee9543243299386f594fc10bb0b206ec5530
commit: a459ee9543243299386f594fc10bb0b206ec5530
branch: 3.11
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-29T22:09:32-07:00
summary:

gh-95411: IDLE - Enable using the module browser with .pyw files (GH-95397)


Co-authored-by: Terry Jan Reedy <tjreedy at udel.edu>
(cherry picked from commit 7e19e417b5df765dabab8d6550ec0e9d897c573e)

Co-authored-by: Erlend Egeberg Aasland <erlend.aasland at protonmail.com>

files:
A Misc/NEWS.d/next/IDLE/2022-07-29-11-08-52.gh-issue-95411.dazlqH.rst
M Lib/idlelib/NEWS.txt
M Lib/idlelib/browser.py
M Lib/idlelib/idle_test/test_browser.py

diff --git a/Lib/idlelib/NEWS.txt b/Lib/idlelib/NEWS.txt
index ffb090aa45a46..85116b5b6b931 100644
--- a/Lib/idlelib/NEWS.txt
+++ b/Lib/idlelib/NEWS.txt
@@ -3,6 +3,8 @@ What's New in IDLE 3.11.0
 Released on 2022-10-03
 =========================
 
+gh-95411: Enable using IDLE's module browser with .pyw files.
+
 gh-89610: Add .pyi as a recognized extension for IDLE on macOS.  This allows
 opening stub files by double clicking on them in the Finder.
 
diff --git a/Lib/idlelib/browser.py b/Lib/idlelib/browser.py
index 3c3a53a6599a7..10d9a7261113e 100644
--- a/Lib/idlelib/browser.py
+++ b/Lib/idlelib/browser.py
@@ -6,7 +6,6 @@
     (or recheck on window popup)
 - add popup menu with more options (e.g. doc strings, base classes, imports)
 - add base classes to class browser tree
-- finish removing limitation to x.py files (ModuleBrowserTreeItem)
 """
 
 import os
@@ -16,12 +15,22 @@
 from idlelib.config import idleConf
 from idlelib import pyshell
 from idlelib.tree import TreeNode, TreeItem, ScrolledCanvas
+from idlelib.util import py_extensions
 from idlelib.window import ListedToplevel
 
 
 file_open = None  # Method...Item and Class...Item use this.
 # Normally pyshell.flist.open, but there is no pyshell.flist for htest.
 
+# The browser depends on pyclbr and importlib which do not support .pyi files.
+browseable_extension_blocklist = ('.pyi',)
+
+
+def is_browseable_extension(path):
+    _, ext = os.path.splitext(path)
+    ext = os.path.normcase(ext)
+    return ext in py_extensions and ext not in browseable_extension_blocklist
+
 
 def transform_children(child_dict, modname=None):
     """Transform a child dictionary to an ordered sequence of objects.
@@ -76,8 +85,8 @@ def __init__(self, master, path, *, _htest=False, _utest=False):
 
         Instance variables:
             name: Module name.
-            file: Full path and module with .py extension.  Used in
-                creating ModuleBrowserTreeItem as the rootnode for
+            file: Full path and module with supported extension.
+                Used in creating ModuleBrowserTreeItem as the rootnode for
                 the tree and subsequently in the children.
         """
         self.master = master
@@ -161,22 +170,22 @@ def GetSubList(self):
 
     def OnDoubleClick(self):
         "Open a module in an editor window when double clicked."
-        if os.path.normcase(self.file[-3:]) != ".py":
+        if not is_browseable_extension(self.file):
             return
         if not os.path.exists(self.file):
             return
         file_open(self.file)
 
     def IsExpandable(self):
-        "Return True if Python (.py) file."
-        return os.path.normcase(self.file[-3:]) == ".py"
+        "Return True if Python file."
+        return is_browseable_extension(self.file)
 
     def listchildren(self):
         "Return sequenced classes and functions in the module."
-        dir, base = os.path.split(self.file)
-        name, ext = os.path.splitext(base)
-        if os.path.normcase(ext) != ".py":
+        if not is_browseable_extension(self.file):
             return []
+        dir, base = os.path.split(self.file)
+        name, _ = os.path.splitext(base)
         try:
             tree = pyclbr.readmodule_ex(name, [dir] + sys.path)
         except ImportError:
diff --git a/Lib/idlelib/idle_test/test_browser.py b/Lib/idlelib/idle_test/test_browser.py
index 03a50f22ca1e8..343d50a6e37bd 100644
--- a/Lib/idlelib/idle_test/test_browser.py
+++ b/Lib/idlelib/idle_test/test_browser.py
@@ -5,6 +5,7 @@
 import unittest
 from unittest import mock
 from idlelib.idle_test.mock_idle import Func
+from idlelib.util import py_extensions
 
 from collections import deque
 import os.path
@@ -57,6 +58,15 @@ def test_close(self):
         self.assertTrue(mb.node.destroy.called)
         del mb.top.destroy, mb.node.destroy
 
+    def test_is_browseable_extension(self):
+        path = "/path/to/file"
+        for ext in py_extensions:
+            with self.subTest(ext=ext):
+                filename = f'{path}{ext}'
+                actual = browser.is_browseable_extension(filename)
+                expected = ext not in browser.browseable_extension_blocklist
+                self.assertEqual(actual, expected)
+
 
 # Nested tree same as in test_pyclbr.py except for supers on C0. C1.
 mb = pyclbr
diff --git a/Misc/NEWS.d/next/IDLE/2022-07-29-11-08-52.gh-issue-95411.dazlqH.rst b/Misc/NEWS.d/next/IDLE/2022-07-29-11-08-52.gh-issue-95411.dazlqH.rst
new file mode 100644
index 0000000000000..94ca8b2c2ea95
--- /dev/null
+++ b/Misc/NEWS.d/next/IDLE/2022-07-29-11-08-52.gh-issue-95411.dazlqH.rst
@@ -0,0 +1 @@
+Enable using IDLE's module browser with .pyw files.


From webhook-mailer at python.org  Sat Jul 30 02:16:56 2022
From: webhook-mailer at python.org (serhiy-storchaka)
Date: Sat, 30 Jul 2022 06:16:56 -0000
Subject: [Python-checkins] gh-94938: Fix test (GH-95396)
Message-ID: <mailman.377.1659161817.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/0956b6d9c44f66cc152c6afe22a3793e5b157cfd
commit: 0956b6d9c44f66cc152c6afe22a3793e5b157cfd
branch: main
author: Serhiy Storchaka <storchaka at gmail.com>
committer: serhiy-storchaka <storchaka at gmail.com>
date: 2022-07-30T09:16:22+03:00
summary:

gh-94938: Fix test (GH-95396)

files:
M Lib/test/test_call.py

diff --git a/Lib/test/test_call.py b/Lib/test/test_call.py
index a2eec419ab5b4..4c971bc5ed058 100644
--- a/Lib/test/test_call.py
+++ b/Lib/test/test_call.py
@@ -18,11 +18,6 @@ def __hash__(self):
         # Guaranteed different hash
         return str.__hash__(self) ^ 3
 
-    def __eq__(self, other):
-        return False
-    def __hash__(self):
-        return str.__hash__(self)
-
 
 class FunctionCalls(unittest.TestCase):
 


From webhook-mailer at python.org  Sat Jul 30 02:38:59 2022
From: webhook-mailer at python.org (miss-islington)
Date: Sat, 30 Jul 2022 06:38:59 -0000
Subject: [Python-checkins] gh-94938: Fix test (GH-95396)
Message-ID: <mailman.378.1659163140.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/0579a187df9ca5d1bd928eec710c29aa40acd826
commit: 0579a187df9ca5d1bd928eec710c29aa40acd826
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-29T23:38:28-07:00
summary:

gh-94938: Fix test (GH-95396)

(cherry picked from commit 0956b6d9c44f66cc152c6afe22a3793e5b157cfd)

Co-authored-by: Serhiy Storchaka <storchaka at gmail.com>

files:
M Lib/test/test_call.py

diff --git a/Lib/test/test_call.py b/Lib/test/test_call.py
index 91ef9c94695c1..eee269093b278 100644
--- a/Lib/test/test_call.py
+++ b/Lib/test/test_call.py
@@ -18,11 +18,6 @@ def __hash__(self):
         # Guaranteed different hash
         return str.__hash__(self) ^ 3
 
-    def __eq__(self, other):
-        return False
-    def __hash__(self):
-        return str.__hash__(self)
-
 
 class FunctionCalls(unittest.TestCase):
 


From webhook-mailer at python.org  Sat Jul 30 02:40:03 2022
From: webhook-mailer at python.org (miss-islington)
Date: Sat, 30 Jul 2022 06:40:03 -0000
Subject: [Python-checkins] gh-94938: Fix test (GH-95396)
Message-ID: <mailman.379.1659163204.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/bd6452a3a83ace4d1dfe663af812483fb60ebcd0
commit: bd6452a3a83ace4d1dfe663af812483fb60ebcd0
branch: 3.11
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-29T23:39:54-07:00
summary:

gh-94938: Fix test (GH-95396)

(cherry picked from commit 0956b6d9c44f66cc152c6afe22a3793e5b157cfd)

Co-authored-by: Serhiy Storchaka <storchaka at gmail.com>

files:
M Lib/test/test_call.py

diff --git a/Lib/test/test_call.py b/Lib/test/test_call.py
index a2eec419ab5b4..4c971bc5ed058 100644
--- a/Lib/test/test_call.py
+++ b/Lib/test/test_call.py
@@ -18,11 +18,6 @@ def __hash__(self):
         # Guaranteed different hash
         return str.__hash__(self) ^ 3
 
-    def __eq__(self, other):
-        return False
-    def __hash__(self):
-        return str.__hash__(self)
-
 
 class FunctionCalls(unittest.TestCase):
 


From webhook-mailer at python.org  Sat Jul 30 03:42:50 2022
From: webhook-mailer at python.org (rhettinger)
Date: Sat, 30 Jul 2022 07:42:50 -0000
Subject: [Python-checkins] gh-95454: Replace truthy/falsy with true/false
 (GH-95456)
Message-ID: <mailman.380.1659166971.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/cd26595232ac1b5061460d5949d5204c90287c1c
commit: cd26595232ac1b5061460d5949d5204c90287c1c
branch: main
author: Robert O'Shea <PurityLake at users.noreply.github.com>
committer: rhettinger <rhettinger at users.noreply.github.com>
date: 2022-07-30T00:42:21-07:00
summary:

gh-95454: Replace truthy/falsy with true/false (GH-95456)

files:
A Misc/NEWS.d/next/Documentation/2022-07-30-00-23-11.gh-issue-95454.we7AFm.rst
M Doc/library/logging.rst
M Lib/logging/__init__.py
M Lib/test/test_unittest/test_result.py
M Misc/NEWS.d/3.5.1rc1.rst
M Misc/NEWS.d/3.5.3rc1.rst
M Misc/NEWS.d/3.6.0b2.rst
M Misc/NEWS.d/3.7.0a1.rst

diff --git a/Doc/library/logging.rst b/Doc/library/logging.rst
index 9bfed4352a195..8ec1eda32b153 100644
--- a/Doc/library/logging.rst
+++ b/Doc/library/logging.rst
@@ -672,7 +672,7 @@ empty string, all events are passed.
 
    .. method:: filter(record)
 
-      Is the specified record to be logged? Returns falsy for no, truthy for
+      Is the specified record to be logged? Returns false for no, true for
       yes. Filters can either modify log records in-place or return a completely
       different record instance which will replace the original
       log record in any future processing of the event.
diff --git a/Lib/logging/__init__.py b/Lib/logging/__init__.py
index 88953fefb7447..dc28702f50048 100644
--- a/Lib/logging/__init__.py
+++ b/Lib/logging/__init__.py
@@ -833,17 +833,17 @@ def filter(self, record):
         Determine if a record is loggable by consulting all the filters.
 
         The default is to allow the record to be logged; any filter can veto
-        this by returning a falsy value.
+        this by returning a false value.
         If a filter attached to a handler returns a log record instance,
         then that instance is used in place of the original log record in
         any further processing of the event by that handler.
-        If a filter returns any other truthy value, the original log record
+        If a filter returns any other true value, the original log record
         is used in any further processing of the event by that handler.
 
-        If none of the filters return falsy values, this method returns
+        If none of the filters return false values, this method returns
         a log record.
-        If any of the filters return a falsy value, this method returns
-        a falsy value.
+        If any of the filters return a false value, this method returns
+        a false value.
 
         .. versionchanged:: 3.2
 
@@ -1017,7 +1017,7 @@ def handle(self, record):
         the I/O thread lock.
 
         Returns an instance of the log record that was emitted
-        if it passed all filters, otherwise a falsy value is returned.
+        if it passed all filters, otherwise a false value is returned.
         """
         rv = self.filter(record)
         if isinstance(rv, LogRecord):
diff --git a/Lib/test/test_unittest/test_result.py b/Lib/test/test_unittest/test_result.py
index eeb15992fd109..e71d114751d94 100644
--- a/Lib/test/test_unittest/test_result.py
+++ b/Lib/test/test_unittest/test_result.py
@@ -449,8 +449,8 @@ def testGetSubTestDescriptionWithoutDocstringAndParams(self):
                     '(' + __name__ + '.Test_TextTestResult.testGetSubTestDescriptionWithoutDocstringAndParams) '
                     '(<subtest>)')
 
-    def testGetSubTestDescriptionForFalsyValues(self):
-        expected = 'testGetSubTestDescriptionForFalsyValues (%s.Test_TextTestResult.testGetSubTestDescriptionForFalsyValues) [%s]'
+    def testGetSubTestDescriptionForFalseValues(self):
+        expected = 'testGetSubTestDescriptionForFalseValues (%s.Test_TextTestResult.testGetSubTestDescriptionForFalseValues) [%s]'
         result = unittest.TextTestResult(None, True, 1)
         for arg in [0, None, []]:
             with self.subTest(arg):
diff --git a/Misc/NEWS.d/3.5.1rc1.rst b/Misc/NEWS.d/3.5.1rc1.rst
index d06817ccb950e..dc247ce2096a7 100644
--- a/Misc/NEWS.d/3.5.1rc1.rst
+++ b/Misc/NEWS.d/3.5.1rc1.rst
@@ -900,7 +900,7 @@ Kurenkov.
 .. nonce: QhQ9RD
 .. section: Library
 
-Fixed functools.singledispatch on classes with falsy metaclasses.  Patch by
+Fixed functools.singledispatch on classes with false metaclasses.  Patch by
 Ethan Furman.
 
 ..
diff --git a/Misc/NEWS.d/3.5.3rc1.rst b/Misc/NEWS.d/3.5.3rc1.rst
index 2307fccbf6f92..bf4ef9302c9d1 100644
--- a/Misc/NEWS.d/3.5.3rc1.rst
+++ b/Misc/NEWS.d/3.5.3rc1.rst
@@ -832,7 +832,7 @@ In the traceback module, restore the formatting of exception messages like
 .. nonce: 3UhyPo
 .. section: Library
 
-Allow falsy values to be used for msg parameter of subTest().
+Allow false values to be used for msg parameter of subTest().
 
 ..
 
diff --git a/Misc/NEWS.d/3.6.0b2.rst b/Misc/NEWS.d/3.6.0b2.rst
index 627465e887bc1..9413c6e01917d 100644
--- a/Misc/NEWS.d/3.6.0b2.rst
+++ b/Misc/NEWS.d/3.6.0b2.rst
@@ -460,7 +460,7 @@ In the traceback module, restore the formatting of exception messages like
 .. nonce: 3UhyPo
 .. section: Library
 
-Allow falsy values to be used for msg parameter of subTest().
+Allow false values to be used for msg parameter of subTest().
 
 ..
 
diff --git a/Misc/NEWS.d/3.7.0a1.rst b/Misc/NEWS.d/3.7.0a1.rst
index e99c45ec7fdaa..9bada1b76be7a 100644
--- a/Misc/NEWS.d/3.7.0a1.rst
+++ b/Misc/NEWS.d/3.7.0a1.rst
@@ -4453,7 +4453,7 @@ In the traceback module, restore the formatting of exception messages like
 .. nonce: 3UhyPo
 .. section: Library
 
-Allow falsy values to be used for msg parameter of subTest().
+Allow false values to be used for msg parameter of subTest().
 
 ..
 
diff --git a/Misc/NEWS.d/next/Documentation/2022-07-30-00-23-11.gh-issue-95454.we7AFm.rst b/Misc/NEWS.d/next/Documentation/2022-07-30-00-23-11.gh-issue-95454.we7AFm.rst
new file mode 100644
index 0000000000000..6440c23fd5000
--- /dev/null
+++ b/Misc/NEWS.d/next/Documentation/2022-07-30-00-23-11.gh-issue-95454.we7AFm.rst
@@ -0,0 +1,2 @@
+Replaced incorrectly written true/false values
+in documentiation. Patch by Robert O'Shea


From webhook-mailer at python.org  Sat Jul 30 15:57:42 2022
From: webhook-mailer at python.org (terryjreedy)
Date: Sat, 30 Jul 2022 19:57:42 -0000
Subject: [Python-checkins] gh-90654: IDLE - Insert blank line in NEWS.txt
 (#95478)
Message-ID: <mailman.381.1659211063.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/9ec6abf6dc6ab622efda83a28d83d25ba129bbe2
commit: 9ec6abf6dc6ab622efda83a28d83d25ba129bbe2
branch: main
author: Terry Jan Reedy <tjreedy at udel.edu>
committer: terryjreedy <tjreedy at udel.edu>
date: 2022-07-30T15:57:37-04:00
summary:

gh-90654: IDLE - Insert blank line in NEWS.txt (#95478)

Needed for backports.

files:
M Lib/idlelib/NEWS.txt

diff --git a/Lib/idlelib/NEWS.txt b/Lib/idlelib/NEWS.txt
index 85116b5b6b931..1d3110413bb36 100644
--- a/Lib/idlelib/NEWS.txt
+++ b/Lib/idlelib/NEWS.txt
@@ -3,6 +3,7 @@ What's New in IDLE 3.11.0
 Released on 2022-10-03
 =========================
 
+
 gh-95411: Enable using IDLE's module browser with .pyw files.
 
 gh-89610: Add .pyi as a recognized extension for IDLE on macOS.  This allows


From webhook-mailer at python.org  Sat Jul 30 15:59:44 2022
From: webhook-mailer at python.org (terryjreedy)
Date: Sat, 30 Jul 2022 19:59:44 -0000
Subject: [Python-checkins] [3.10] gh-90654: IDLE - Insert blank line in
 NEWS.txt (#95479)
Message-ID: <mailman.382.1659211185.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/bfed0ae8c021a1649962647e2412db35cdcc418f
commit: bfed0ae8c021a1649962647e2412db35cdcc418f
branch: 3.10
author: Terry Jan Reedy <tjreedy at udel.edu>
committer: terryjreedy <tjreedy at udel.edu>
date: 2022-07-30T15:59:39-04:00
summary:

[3.10] gh-90654: IDLE - Insert blank line in NEWS.txt (#95479)

Needed for backports.

Cherrypicked from 9ec6abf6dc6ab622efda83a28d83d25ba129bbe2

files:
M Lib/idlelib/NEWS.txt

diff --git a/Lib/idlelib/NEWS.txt b/Lib/idlelib/NEWS.txt
index 6d7355355982d..7ec675a9dc45e 100644
--- a/Lib/idlelib/NEWS.txt
+++ b/Lib/idlelib/NEWS.txt
@@ -3,6 +3,7 @@ after 3.10.0 until 3.10.10?
 Released 2023-04-03?
 =========================
 
+
 gh-95411: Enable using IDLE's module browser with .pyw files.
 
 gh-89610: Add .pyi as a recognized extension for IDLE on macOS.  This allows


From webhook-mailer at python.org  Sat Jul 30 16:24:19 2022
From: webhook-mailer at python.org (miss-islington)
Date: Sat, 30 Jul 2022 20:24:19 -0000
Subject: [Python-checkins] gh-90654: IDLE - Insert blank line in NEWS.txt
 (GH-95478)
Message-ID: <mailman.383.1659212660.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/cfef4df7cebeaabc9962c55492603293862f51e2
commit: cfef4df7cebeaabc9962c55492603293862f51e2
branch: 3.11
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-30T13:24:13-07:00
summary:

gh-90654: IDLE - Insert blank line in NEWS.txt (GH-95478)


Needed for backports.
(cherry picked from commit 9ec6abf6dc6ab622efda83a28d83d25ba129bbe2)

Co-authored-by: Terry Jan Reedy <tjreedy at udel.edu>

files:
M Lib/idlelib/NEWS.txt

diff --git a/Lib/idlelib/NEWS.txt b/Lib/idlelib/NEWS.txt
index 85116b5b6b931..1d3110413bb36 100644
--- a/Lib/idlelib/NEWS.txt
+++ b/Lib/idlelib/NEWS.txt
@@ -3,6 +3,7 @@ What's New in IDLE 3.11.0
 Released on 2022-10-03
 =========================
 
+
 gh-95411: Enable using IDLE's module browser with .pyw files.
 
 gh-89610: Add .pyi as a recognized extension for IDLE on macOS.  This allows


From webhook-mailer at python.org  Sat Jul 30 18:21:26 2022
From: webhook-mailer at python.org (zware)
Date: Sat, 30 Jul 2022 22:21:26 -0000
Subject: [Python-checkins] Doctest cleanups (GH-95436)
Message-ID: <mailman.384.1659219687.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/82814624bf4049e4692a85d7973e62e469e6e5f5
commit: 82814624bf4049e4692a85d7973e62e469e6e5f5
branch: main
author: Zachary Ware <zach at python.org>
committer: zware <zachary.ware at gmail.com>
date: 2022-07-30T17:21:08-05:00
summary:

Doctest cleanups (GH-95436)

* GHA: Don't hide doctest output

* Enable doctests in math.rst

* Squash warnings in nntplib.rst doctests

* Squash warning in turtle.rst doctest

* Squash warnings in whatsnew/3.2.rst doctests

* Treat warnings as errors in Doc/ doctests

files:
M .github/workflows/doc.yml
M Doc/conf.py
M Doc/library/math.rst
M Doc/library/nntplib.rst
M Doc/library/turtle.rst
M Doc/whatsnew/3.2.rst

diff --git a/.github/workflows/doc.yml b/.github/workflows/doc.yml
index e06f21671b5a5..d95d089ed6675 100644
--- a/.github/workflows/doc.yml
+++ b/.github/workflows/doc.yml
@@ -78,4 +78,4 @@ jobs:
       run: make -C Doc/ PYTHON=../python venv
     # Use "xvfb-run" since some doctest tests open GUI windows
     - name: 'Run documentation doctest'
-      run: xvfb-run make -C Doc/ PYTHON=../python SPHINXOPTS="-q" SPHINXERRORHANDLING="-W --keep-going" doctest
+      run: xvfb-run make -C Doc/ PYTHON=../python SPHINXERRORHANDLING="-W --keep-going" doctest
diff --git a/Doc/conf.py b/Doc/conf.py
index 0c7deb59d130d..bf0af6a663c8b 100644
--- a/Doc/conf.py
+++ b/Doc/conf.py
@@ -22,6 +22,11 @@
     import _tkinter
 except ImportError:
     _tkinter = None
+# Treat warnings as errors, done here to prevent warnings in Sphinx code from
+# causing spurious test failures.
+import warnings
+warnings.simplefilter('error')
+del warnings
 '''
 
 manpages_url = 'https://manpages.debian.org/{path}'
diff --git a/Doc/library/math.rst b/Doc/library/math.rst
index 6d9a992f73131..e338959ffbe4b 100644
--- a/Doc/library/math.rst
+++ b/Doc/library/math.rst
@@ -108,7 +108,7 @@ Number-theoretic and representation functions
 .. function:: fsum(iterable)
 
    Return an accurate floating point sum of values in the iterable.  Avoids
-   loss of precision by tracking multiple intermediate partial sums::
+   loss of precision by tracking multiple intermediate partial sums:
 
         >>> sum([.1, .1, .1, .1, .1, .1, .1, .1, .1, .1])
         0.9999999999999999
@@ -371,7 +371,7 @@ Power and logarithmic functions
    logarithms.  For small floats *x*, the subtraction in ``exp(x) - 1``
    can result in a `significant loss of precision
    <https://en.wikipedia.org/wiki/Loss_of_significance>`_\; the :func:`expm1`
-   function provides a way to compute this quantity to full precision::
+   function provides a way to compute this quantity to full precision:
 
       >>> from math import exp, expm1
       >>> exp(1e-5) - 1  # gives result accurate to 11 places
@@ -654,7 +654,7 @@ Constants
    not considered to equal to any other numeric value, including themselves. To check
    whether a number is a NaN, use the :func:`isnan` function to test
    for NaNs instead of ``is`` or ``==``.
-   Example::
+   Example:
 
       >>> import math
       >>> math.nan == math.nan
diff --git a/Doc/library/nntplib.rst b/Doc/library/nntplib.rst
index 2a996e451bf7c..5aad44d929e87 100644
--- a/Doc/library/nntplib.rst
+++ b/Doc/library/nntplib.rst
@@ -14,6 +14,23 @@
 .. deprecated:: 3.11
    The :mod:`nntplib` module is deprecated (see :pep:`594` for details).
 
+.. testsetup::
+
+   import warnings
+   with warnings.catch_warnings():
+       warnings.simplefilter('ignore', category=DeprecationWarning)
+       import nntplib
+
+.. testcleanup::
+
+   try:
+       s.quit()
+   except NameError:
+       pass
+   import sys
+   # Force a warning if any other file imports nntplib
+   sys.modules.pop('nntplib')
+
 --------------
 
 This module defines the class :class:`NNTP` which implements the client side of
diff --git a/Doc/library/turtle.rst b/Doc/library/turtle.rst
index 17bf8829a9fed..5add61c759ea8 100644
--- a/Doc/library/turtle.rst
+++ b/Doc/library/turtle.rst
@@ -1279,7 +1279,7 @@ Appearance
    (direction of movement).
 
    .. doctest::
-      :skipif: _tkinter is None
+      :skipif: _tkinter is None or 'always; deprecated method'
 
       >>> turtle.reset()
       >>> turtle.shape("circle")
diff --git a/Doc/whatsnew/3.2.rst b/Doc/whatsnew/3.2.rst
index 31f2ea85ffd23..c7b42ef0ed739 100644
--- a/Doc/whatsnew/3.2.rst
+++ b/Doc/whatsnew/3.2.rst
@@ -322,7 +322,7 @@ aspects that are visible to the programmer:
 * The tag that is unique to each interpreter is accessible from the :mod:`imp`
   module:
 
-   >>> import imp
+   >>> import imp # doctest: +SKIP
    >>> imp.get_tag() # doctest: +SKIP
    'cpython-32'
 
@@ -330,7 +330,7 @@ aspects that are visible to the programmer:
   be smarter.  It is no longer sufficient to simply strip the "c" from a ".pyc"
   filename.  Instead, use the new functions in the :mod:`imp` module:
 
-  >>> imp.source_from_cache('c:/py32/lib/__pycache__/collections.cpython-32.pyc')
+  >>> imp.source_from_cache('c:/py32/lib/__pycache__/collections.cpython-32.pyc') # doctest: +SKIP
   'c:/py32/lib/collections.py'
   >>> imp.cache_from_source('c:/py32/lib/collections.py') # doctest: +SKIP
   'c:/py32/lib/__pycache__/collections.cpython-32.pyc'


From webhook-mailer at python.org  Sat Jul 30 19:24:19 2022
From: webhook-mailer at python.org (erlend-aasland)
Date: Sat, 30 Jul 2022 23:24:19 -0000
Subject: [Python-checkins] gh-94635: Add Reference, How-to,
 and Concepts headings to sqlite3 docs (#94636)
Message-ID: <mailman.385.1659223461.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/6c439b978bf55b29f21c595e9375202d63c8208d
commit: 6c439b978bf55b29f21c595e9375202d63c8208d
branch: main
author: Erlend Egeberg Aasland <erlend.aasland at protonmail.com>
committer: erlend-aasland <erlend.aasland at protonmail.com>
date: 2022-07-31T01:24:15+02:00
summary:

gh-94635: Add Reference, How-to, and Concepts headings to sqlite3 docs (#94636)

Co-authored-by: CAM Gerlach <CAM.Gerlach at Gerlach.CAM>

files:
M Doc/library/sqlite3.rst

diff --git a/Doc/library/sqlite3.rst b/Doc/library/sqlite3.rst
index 6625511c783c3..a0b5c73d7a4ad 100644
--- a/Doc/library/sqlite3.rst
+++ b/Doc/library/sqlite3.rst
@@ -25,6 +25,15 @@ The sqlite3 module was written by Gerhard H?ring.  It provides an SQL interface
 compliant with the DB-API 2.0 specification described by :pep:`249`, and
 requires SQLite 3.7.15 or newer.
 
+This document includes four main sections:
+
+* :ref:`sqlite3-tutorial` teaches how to use the sqlite3 module.
+* :ref:`sqlite3-reference` describes the classes and functions this module
+  defines.
+* :ref:`sqlite3-howtos` details how to handle specific tasks.
+* :ref:`sqlite3-explanation` provides in-depth background on
+  transaction control.
+
 
 .. _sqlite3-tutorial:
 
@@ -136,10 +145,15 @@ both styles:
       PEP written by Marc-Andr? Lemburg.
 
 
+.. _sqlite3-reference:
+
+Reference
+---------
+
 .. _sqlite3-module-contents:
 
 Module functions and constants
-------------------------------
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 
 .. data:: apilevel
@@ -421,8 +435,8 @@ Module functions and constants
 
 .. _sqlite3-connection-objects:
 
-Connection Objects
-------------------
+Connection objects
+^^^^^^^^^^^^^^^^^^
 
 .. class:: Connection
 
@@ -982,8 +996,8 @@ Connection Objects
 
 .. _sqlite3-cursor-objects:
 
-Cursor Objects
---------------
+Cursor objects
+^^^^^^^^^^^^^^
 
    A ``Cursor`` object represents a `database cursor`_
    which is used to execute SQL statements,
@@ -1159,8 +1173,8 @@ Cursor Objects
 
 .. _sqlite3-row-objects:
 
-Row Objects
------------
+Row objects
+^^^^^^^^^^^
 
 .. class:: Row
 
@@ -1224,8 +1238,8 @@ Now we plug :class:`Row` in::
 
 .. _sqlite3-blob-objects:
 
-Blob Objects
-------------
+Blob objects
+^^^^^^^^^^^^
 
 .. versionadded:: 3.11
 
@@ -1276,8 +1290,8 @@ Blob Objects
       end).
 
 
-PrepareProtocol Objects
------------------------
+PrepareProtocol objects
+^^^^^^^^^^^^^^^^^^^^^^^
 
 .. class:: PrepareProtocol
 
@@ -1289,7 +1303,7 @@ PrepareProtocol Objects
 .. _sqlite3-exceptions:
 
 Exceptions
-----------
+^^^^^^^^^^
 
 The exception hierarchy is defined by the DB-API 2.0 (:pep:`249`).
 
@@ -1379,11 +1393,7 @@ The exception hierarchy is defined by the DB-API 2.0 (:pep:`249`).
 .. _sqlite3-types:
 
 SQLite and Python types
------------------------
-
-
-Introduction
-^^^^^^^^^^^^
+^^^^^^^^^^^^^^^^^^^^^^^
 
 SQLite natively supports the following types: ``NULL``, ``INTEGER``,
 ``REAL``, ``TEXT``, ``BLOB``.
@@ -1423,10 +1433,18 @@ This is how SQLite types are converted to Python types by default:
 +-------------+----------------------------------------------+
 
 The type system of the :mod:`sqlite3` module is extensible in two ways: you can
-store additional Python types in an SQLite database via object adaptation, and
-you can let the :mod:`sqlite3` module convert SQLite types to different Python
-types via converters.
+store additional Python types in an SQLite database via
+:ref:`object adapters <sqlite3-adapters>`,
+and you can let the ``sqlite3`` module convert SQLite types to
+Python types via :ref:`converters <sqlite3-converters>`.
+
+
+.. _sqlite3-howtos:
 
+How-to guides
+-------------
+
+.. _sqlite3-adapters:
 
 Using adapters to store custom Python types in SQLite databases
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -1549,7 +1567,7 @@ The deprecated default adapters and converters consist of:
 
 .. _sqlite3-adapter-converter-recipes:
 
-Adapter and Converter Recipes
+Adapter and converter recipes
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 This section shows recipes for common adapters and converters.
@@ -1592,83 +1610,6 @@ This section shows recipes for common adapters and converters.
    sqlite3.register_converter("timestamp", convert_timestamp)
 
 
-.. _sqlite3-controlling-transactions:
-
-Controlling Transactions
-------------------------
-
-The ``sqlite3`` module does not adhere to the transaction handling recommended
-by :pep:`249`.
-
-If the connection attribute :attr:`~Connection.isolation_level`
-is not :const:`None`,
-new transactions are implicitly opened before
-:meth:`~Cursor.execute` and :meth:`~Cursor.executemany` executes
-``INSERT``, ``UPDATE``, ``DELETE``, or ``REPLACE`` statements.
-Use the :meth:`~Connection.commit` and :meth:`~Connection.rollback` methods
-to respectively commit and roll back pending transactions.
-You can choose the underlying `SQLite transaction behaviour`_ ?
-that is, whether and what type of ``BEGIN`` statements ``sqlite3``
-implicitly executes ?
-via the :attr:`~Connection.isolation_level` attribute.
-
-If :attr:`~Connection.isolation_level` is set to :const:`None`,
-no transactions are implicitly opened at all.
-This leaves the underlying SQLite library in `autocommit mode`_,
-but also allows the user to perform their own transaction handling
-using explicit SQL statements.
-The underlying SQLite library autocommit mode can be queried using the
-:attr:`~Connection.in_transaction` attribute.
-
-The :meth:`~Cursor.executescript` method implicitly commits
-any pending transaction before execution of the given SQL script,
-regardless of the value of :attr:`~Connection.isolation_level`.
-
-.. versionchanged:: 3.6
-   :mod:`sqlite3` used to implicitly commit an open transaction before DDL
-   statements.  This is no longer the case.
-
-.. _autocommit mode:
-   https://www.sqlite.org/lang_transaction.html#implicit_versus_explicit_transactions
-
-.. _SQLite transaction behaviour:
-   https://www.sqlite.org/lang_transaction.html#deferred_immediate_and_exclusive_transactions
-
-
-.. _sqlite3-uri-tricks:
-
-SQLite URI tricks
------------------
-
-Some useful URI tricks include:
-
-* Open a database in read-only mode::
-
-    con = sqlite3.connect("file:template.db?mode=ro", uri=True)
-
-* Do not implicitly create a new database file if it does not already exist;
-  will raise :exc:`~sqlite3.OperationalError` if unable to create a new file::
-
-    con = sqlite3.connect("file:nosuchdb.db?mode=rw", uri=True)
-
-* Create a shared named in-memory database::
-
-    con1 = sqlite3.connect("file:mem1?mode=memory&cache=shared", uri=True)
-    con2 = sqlite3.connect("file:mem1?mode=memory&cache=shared", uri=True)
-    con1.execute("create table t(t)")
-    con1.execute("insert into t values(28)")
-    con1.commit()
-    rows = con2.execute("select * from t").fetchall()
-
-More information about this feature, including a list of parameters,
-can be found in the `SQLite URI documentation`_.
-
-.. _SQLite URI documentation: https://www.sqlite.org/uri.html
-
-Using :mod:`sqlite3` efficiently
---------------------------------
-
-
 .. _sqlite3-connection-shortcuts:
 
 Using connection shortcut methods
@@ -1686,6 +1627,8 @@ directly using only a single call on the :class:`Connection` object.
 .. literalinclude:: ../includes/sqlite3/shortcut_methods.py
 
 
+.. _sqlite3-columns-by-name:
+
 Accessing columns by name instead of by index
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
@@ -1721,3 +1664,82 @@ the context manager is a no-op.
    nor closes the connection.
 
 .. literalinclude:: ../includes/sqlite3/ctx_manager.py
+
+
+.. _sqlite3-uri-tricks:
+
+Working with SQLite URIs
+^^^^^^^^^^^^^^^^^^^^^^^^
+
+Some useful URI tricks include:
+
+* Open a database in read-only mode::
+
+    con = sqlite3.connect("file:template.db?mode=ro", uri=True)
+
+* Do not implicitly create a new database file if it does not already exist;
+  will raise :exc:`~sqlite3.OperationalError` if unable to create a new file::
+
+    con = sqlite3.connect("file:nosuchdb.db?mode=rw", uri=True)
+
+* Create a shared named in-memory database::
+
+    con1 = sqlite3.connect("file:mem1?mode=memory&cache=shared", uri=True)
+    con2 = sqlite3.connect("file:mem1?mode=memory&cache=shared", uri=True)
+    con1.execute("create table t(t)")
+    con1.execute("insert into t values(28)")
+    con1.commit()
+    rows = con2.execute("select * from t").fetchall()
+
+More information about this feature, including a list of parameters,
+can be found in the `SQLite URI documentation`_.
+
+.. _SQLite URI documentation: https://www.sqlite.org/uri.html
+
+
+.. _sqlite3-explanation:
+
+Explanation
+-----------
+
+.. _sqlite3-controlling-transactions:
+
+Transaction control
+^^^^^^^^^^^^^^^^^^^
+
+The ``sqlite3`` module does not adhere to the transaction handling recommended
+by :pep:`249`.
+
+If the connection attribute :attr:`~Connection.isolation_level`
+is not :const:`None`,
+new transactions are implicitly opened before
+:meth:`~Cursor.execute` and :meth:`~Cursor.executemany` executes
+``INSERT``, ``UPDATE``, ``DELETE``, or ``REPLACE`` statements.
+Use the :meth:`~Connection.commit` and :meth:`~Connection.rollback` methods
+to respectively commit and roll back pending transactions.
+You can choose the underlying `SQLite transaction behaviour`_ ?
+that is, whether and what type of ``BEGIN`` statements ``sqlite3``
+implicitly executes ?
+via the :attr:`~Connection.isolation_level` attribute.
+
+If :attr:`~Connection.isolation_level` is set to :const:`None`,
+no transactions are implicitly opened at all.
+This leaves the underlying SQLite library in `autocommit mode`_,
+but also allows the user to perform their own transaction handling
+using explicit SQL statements.
+The underlying SQLite library autocommit mode can be queried using the
+:attr:`~Connection.in_transaction` attribute.
+
+The :meth:`~Cursor.executescript` method implicitly commits
+any pending transaction before execution of the given SQL script,
+regardless of the value of :attr:`~Connection.isolation_level`.
+
+.. versionchanged:: 3.6
+   :mod:`sqlite3` used to implicitly commit an open transaction before DDL
+   statements.  This is no longer the case.
+
+.. _autocommit mode:
+   https://www.sqlite.org/lang_transaction.html#implicit_versus_explicit_transactions
+
+.. _SQLite transaction behaviour:
+   https://www.sqlite.org/lang_transaction.html#deferred_immediate_and_exclusive_transactions


From webhook-mailer at python.org  Sat Jul 30 21:09:28 2022
From: webhook-mailer at python.org (terryjreedy)
Date: Sun, 31 Jul 2022 01:09:28 -0000
Subject: [Python-checkins] gh-95471: IDLE - Tweak Edit menu (#95481)
Message-ID: <mailman.386.1659229769.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/53357b3ee53d767c2da5cd77f9c47117903e9a44
commit: 53357b3ee53d767c2da5cd77f9c47117903e9a44
branch: main
author: Terry Jan Reedy <tjreedy at udel.edu>
committer: terryjreedy <tjreedy at udel.edu>
date: 2022-07-30T21:09:07-04:00
summary:

gh-95471: IDLE - Tweak Edit menu (#95481)

Move `Select All` above  `Cut` as it is used with `Cut` and `Copy` but not `Paste`.  Add a separator between `Replace` and `Go to Line` to separate items that belong to the 'Edit-find' (above) and 'Edit-show' (below) IDLE github project topics.

files:
A Misc/NEWS.d/next/IDLE/2022-07-30-15-10-39.gh-issue-95471.z3scVG.rst
M Lib/idlelib/NEWS.txt
M Lib/idlelib/mainmenu.py

diff --git a/Lib/idlelib/NEWS.txt b/Lib/idlelib/NEWS.txt
index 1d3110413bb36..dc506dccfe99a 100644
--- a/Lib/idlelib/NEWS.txt
+++ b/Lib/idlelib/NEWS.txt
@@ -4,6 +4,10 @@ Released on 2022-10-03
 =========================
 
 
+gh-95471: Tweak Edit menu. Move 'Select All' above 'Cut' as it is used
+with 'Cut' and 'Copy' but not 'Paste'.  Add a separator between 'Replace'
+and 'Go to Line' to help IDLE issue triagers.
+
 gh-95411: Enable using IDLE's module browser with .pyw files.
 
 gh-89610: Add .pyi as a recognized extension for IDLE on macOS.  This allows
diff --git a/Lib/idlelib/mainmenu.py b/Lib/idlelib/mainmenu.py
index a1b169176cba9..429c8660ce0da 100644
--- a/Lib/idlelib/mainmenu.py
+++ b/Lib/idlelib/mainmenu.py
@@ -42,16 +42,17 @@
    ('_Undo', '<<undo>>'),
    ('_Redo', '<<redo>>'),
    None,
+   ('Select _All', '<<select-all>>'),
    ('Cu_t', '<<cut>>'),
    ('_Copy', '<<copy>>'),
    ('_Paste', '<<paste>>'),
-   ('Select _All', '<<select-all>>'),
    None,
    ('_Find...', '<<find>>'),
    ('Find A_gain', '<<find-again>>'),
    ('Find _Selection', '<<find-selection>>'),
    ('Find in Files...', '<<find-in-files>>'),
    ('R_eplace...', '<<replace>>'),
+   None,
    ('Go to _Line', '<<goto-line>>'),
    ('S_how Completions', '<<force-open-completions>>'),
    ('E_xpand Word', '<<expand-word>>'),
diff --git a/Misc/NEWS.d/next/IDLE/2022-07-30-15-10-39.gh-issue-95471.z3scVG.rst b/Misc/NEWS.d/next/IDLE/2022-07-30-15-10-39.gh-issue-95471.z3scVG.rst
new file mode 100644
index 0000000000000..73a9d8058965c
--- /dev/null
+++ b/Misc/NEWS.d/next/IDLE/2022-07-30-15-10-39.gh-issue-95471.z3scVG.rst
@@ -0,0 +1 @@
+In the Edit menu, move ``Select All`` and add a new separator.


From webhook-mailer at python.org  Sat Jul 30 21:32:57 2022
From: webhook-mailer at python.org (miss-islington)
Date: Sun, 31 Jul 2022 01:32:57 -0000
Subject: [Python-checkins] gh-95471: IDLE - Tweak Edit menu (GH-95481)
Message-ID: <mailman.387.1659231179.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/356ed4c8ce6061640a1d8b1707dc57241b81856d
commit: 356ed4c8ce6061640a1d8b1707dc57241b81856d
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-30T18:32:47-07:00
summary:

gh-95471: IDLE - Tweak Edit menu (GH-95481)


Move `Select All` above  `Cut` as it is used with `Cut` and `Copy` but not `Paste`.  Add a separator between `Replace` and `Go to Line` to separate items that belong to the 'Edit-find' (above) and 'Edit-show' (below) IDLE github project topics.
(cherry picked from commit 53357b3ee53d767c2da5cd77f9c47117903e9a44)

Co-authored-by: Terry Jan Reedy <tjreedy at udel.edu>

files:
A Misc/NEWS.d/next/IDLE/2022-07-30-15-10-39.gh-issue-95471.z3scVG.rst
M Lib/idlelib/NEWS.txt
M Lib/idlelib/mainmenu.py

diff --git a/Lib/idlelib/NEWS.txt b/Lib/idlelib/NEWS.txt
index 7ec675a9dc45e..3adf982579521 100644
--- a/Lib/idlelib/NEWS.txt
+++ b/Lib/idlelib/NEWS.txt
@@ -4,6 +4,10 @@ Released 2023-04-03?
 =========================
 
 
+gh-95471: Tweak Edit menu. Move 'Select All' above 'Cut' as it is used
+with 'Cut' and 'Copy' but not 'Paste'.  Add a separator between 'Replace'
+and 'Go to Line' to help IDLE issue triagers.
+
 gh-95411: Enable using IDLE's module browser with .pyw files.
 
 gh-89610: Add .pyi as a recognized extension for IDLE on macOS.  This allows
diff --git a/Lib/idlelib/mainmenu.py b/Lib/idlelib/mainmenu.py
index a1b169176cba9..429c8660ce0da 100644
--- a/Lib/idlelib/mainmenu.py
+++ b/Lib/idlelib/mainmenu.py
@@ -42,16 +42,17 @@
    ('_Undo', '<<undo>>'),
    ('_Redo', '<<redo>>'),
    None,
+   ('Select _All', '<<select-all>>'),
    ('Cu_t', '<<cut>>'),
    ('_Copy', '<<copy>>'),
    ('_Paste', '<<paste>>'),
-   ('Select _All', '<<select-all>>'),
    None,
    ('_Find...', '<<find>>'),
    ('Find A_gain', '<<find-again>>'),
    ('Find _Selection', '<<find-selection>>'),
    ('Find in Files...', '<<find-in-files>>'),
    ('R_eplace...', '<<replace>>'),
+   None,
    ('Go to _Line', '<<goto-line>>'),
    ('S_how Completions', '<<force-open-completions>>'),
    ('E_xpand Word', '<<expand-word>>'),
diff --git a/Misc/NEWS.d/next/IDLE/2022-07-30-15-10-39.gh-issue-95471.z3scVG.rst b/Misc/NEWS.d/next/IDLE/2022-07-30-15-10-39.gh-issue-95471.z3scVG.rst
new file mode 100644
index 0000000000000..73a9d8058965c
--- /dev/null
+++ b/Misc/NEWS.d/next/IDLE/2022-07-30-15-10-39.gh-issue-95471.z3scVG.rst
@@ -0,0 +1 @@
+In the Edit menu, move ``Select All`` and add a new separator.


From webhook-mailer at python.org  Sat Jul 30 21:34:08 2022
From: webhook-mailer at python.org (miss-islington)
Date: Sun, 31 Jul 2022 01:34:08 -0000
Subject: [Python-checkins] gh-95471: IDLE - Tweak Edit menu (GH-95481)
Message-ID: <mailman.388.1659231248.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/3ca00169391a00d652abe31cbb15e8a684ceb3a6
commit: 3ca00169391a00d652abe31cbb15e8a684ceb3a6
branch: 3.11
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-30T18:34:04-07:00
summary:

gh-95471: IDLE - Tweak Edit menu (GH-95481)


Move `Select All` above  `Cut` as it is used with `Cut` and `Copy` but not `Paste`.  Add a separator between `Replace` and `Go to Line` to separate items that belong to the 'Edit-find' (above) and 'Edit-show' (below) IDLE github project topics.
(cherry picked from commit 53357b3ee53d767c2da5cd77f9c47117903e9a44)

Co-authored-by: Terry Jan Reedy <tjreedy at udel.edu>

files:
A Misc/NEWS.d/next/IDLE/2022-07-30-15-10-39.gh-issue-95471.z3scVG.rst
M Lib/idlelib/NEWS.txt
M Lib/idlelib/mainmenu.py

diff --git a/Lib/idlelib/NEWS.txt b/Lib/idlelib/NEWS.txt
index 1d3110413bb36..dc506dccfe99a 100644
--- a/Lib/idlelib/NEWS.txt
+++ b/Lib/idlelib/NEWS.txt
@@ -4,6 +4,10 @@ Released on 2022-10-03
 =========================
 
 
+gh-95471: Tweak Edit menu. Move 'Select All' above 'Cut' as it is used
+with 'Cut' and 'Copy' but not 'Paste'.  Add a separator between 'Replace'
+and 'Go to Line' to help IDLE issue triagers.
+
 gh-95411: Enable using IDLE's module browser with .pyw files.
 
 gh-89610: Add .pyi as a recognized extension for IDLE on macOS.  This allows
diff --git a/Lib/idlelib/mainmenu.py b/Lib/idlelib/mainmenu.py
index a1b169176cba9..429c8660ce0da 100644
--- a/Lib/idlelib/mainmenu.py
+++ b/Lib/idlelib/mainmenu.py
@@ -42,16 +42,17 @@
    ('_Undo', '<<undo>>'),
    ('_Redo', '<<redo>>'),
    None,
+   ('Select _All', '<<select-all>>'),
    ('Cu_t', '<<cut>>'),
    ('_Copy', '<<copy>>'),
    ('_Paste', '<<paste>>'),
-   ('Select _All', '<<select-all>>'),
    None,
    ('_Find...', '<<find>>'),
    ('Find A_gain', '<<find-again>>'),
    ('Find _Selection', '<<find-selection>>'),
    ('Find in Files...', '<<find-in-files>>'),
    ('R_eplace...', '<<replace>>'),
+   None,
    ('Go to _Line', '<<goto-line>>'),
    ('S_how Completions', '<<force-open-completions>>'),
    ('E_xpand Word', '<<expand-word>>'),
diff --git a/Misc/NEWS.d/next/IDLE/2022-07-30-15-10-39.gh-issue-95471.z3scVG.rst b/Misc/NEWS.d/next/IDLE/2022-07-30-15-10-39.gh-issue-95471.z3scVG.rst
new file mode 100644
index 0000000000000..73a9d8058965c
--- /dev/null
+++ b/Misc/NEWS.d/next/IDLE/2022-07-30-15-10-39.gh-issue-95471.z3scVG.rst
@@ -0,0 +1 @@
+In the Edit menu, move ``Select All`` and add a new separator.


From webhook-mailer at python.org  Sat Jul 30 23:15:02 2022
From: webhook-mailer at python.org (corona10)
Date: Sun, 31 Jul 2022 03:15:02 -0000
Subject: [Python-checkins] gh-91146: Reduce allocation size of list from
 str.split()/rsplit() (gh-95473)
Message-ID: <mailman.389.1659237303.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/50b2261bdac98303087287b24eef96abd45a82f9
commit: 50b2261bdac98303087287b24eef96abd45a82f9
branch: main
author: Dong-hee Na <donghee.na at python.org>
committer: corona10 <donghee.na92 at gmail.com>
date: 2022-07-31T12:14:53+09:00
summary:

gh-91146: Reduce allocation size of list from str.split()/rsplit() (gh-95473)

files:
A Misc/NEWS.d/next/Core and Builtins/2022-07-31-03-22-58.gh-issue-91146.Y2Hziy.rst
M Objects/unicodeobject.c

diff --git a/Misc/NEWS.d/next/Core and Builtins/2022-07-31-03-22-58.gh-issue-91146.Y2Hziy.rst b/Misc/NEWS.d/next/Core and Builtins/2022-07-31-03-22-58.gh-issue-91146.Y2Hziy.rst
new file mode 100644
index 0000000000000..52568dbedd130
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2022-07-31-03-22-58.gh-issue-91146.Y2Hziy.rst	
@@ -0,0 +1,2 @@
+Reduce allocation size of :class:`list` from :meth:`str.split`
+and :meth:`str.rsplit`. Patch by Dong-hee Na.
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
index ad16ada16fe3b..355d74fe3bbda 100644
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -9696,40 +9696,40 @@ split(PyObject *self,
     const void *buf1, *buf2;
     Py_ssize_t len1, len2;
     PyObject* out;
-
-    if (maxcount < 0)
-        maxcount = PY_SSIZE_T_MAX;
+    len1 = PyUnicode_GET_LENGTH(self);
+    kind1 = PyUnicode_KIND(self);
+    if (maxcount < 0) {
+        maxcount = len1;
+    }
 
     if (substring == NULL)
-        switch (PyUnicode_KIND(self)) {
+        switch (kind1) {
         case PyUnicode_1BYTE_KIND:
             if (PyUnicode_IS_ASCII(self))
                 return asciilib_split_whitespace(
                     self,  PyUnicode_1BYTE_DATA(self),
-                    PyUnicode_GET_LENGTH(self), maxcount
+                    len1, maxcount
                     );
             else
                 return ucs1lib_split_whitespace(
                     self,  PyUnicode_1BYTE_DATA(self),
-                    PyUnicode_GET_LENGTH(self), maxcount
+                    len1, maxcount
                     );
         case PyUnicode_2BYTE_KIND:
             return ucs2lib_split_whitespace(
                 self,  PyUnicode_2BYTE_DATA(self),
-                PyUnicode_GET_LENGTH(self), maxcount
+                len1, maxcount
                 );
         case PyUnicode_4BYTE_KIND:
             return ucs4lib_split_whitespace(
                 self,  PyUnicode_4BYTE_DATA(self),
-                PyUnicode_GET_LENGTH(self), maxcount
+                len1, maxcount
                 );
         default:
             Py_UNREACHABLE();
         }
 
-    kind1 = PyUnicode_KIND(self);
     kind2 = PyUnicode_KIND(substring);
-    len1 = PyUnicode_GET_LENGTH(self);
     len2 = PyUnicode_GET_LENGTH(substring);
     if (kind1 < kind2 || len1 < len2) {
         out = PyList_New(1);
@@ -9783,39 +9783,40 @@ rsplit(PyObject *self,
     Py_ssize_t len1, len2;
     PyObject* out;
 
-    if (maxcount < 0)
-        maxcount = PY_SSIZE_T_MAX;
+    len1 = PyUnicode_GET_LENGTH(self);
+    kind1 = PyUnicode_KIND(self);
+    if (maxcount < 0) {
+        maxcount = len1;
+    }
 
     if (substring == NULL)
-        switch (PyUnicode_KIND(self)) {
+        switch (kind1) {
         case PyUnicode_1BYTE_KIND:
             if (PyUnicode_IS_ASCII(self))
                 return asciilib_rsplit_whitespace(
                     self,  PyUnicode_1BYTE_DATA(self),
-                    PyUnicode_GET_LENGTH(self), maxcount
+                    len1, maxcount
                     );
             else
                 return ucs1lib_rsplit_whitespace(
                     self,  PyUnicode_1BYTE_DATA(self),
-                    PyUnicode_GET_LENGTH(self), maxcount
+                    len1, maxcount
                     );
         case PyUnicode_2BYTE_KIND:
             return ucs2lib_rsplit_whitespace(
                 self,  PyUnicode_2BYTE_DATA(self),
-                PyUnicode_GET_LENGTH(self), maxcount
+                len1, maxcount
                 );
         case PyUnicode_4BYTE_KIND:
             return ucs4lib_rsplit_whitespace(
                 self,  PyUnicode_4BYTE_DATA(self),
-                PyUnicode_GET_LENGTH(self), maxcount
+                len1, maxcount
                 );
         default:
             Py_UNREACHABLE();
         }
 
-    kind1 = PyUnicode_KIND(self);
     kind2 = PyUnicode_KIND(substring);
-    len1 = PyUnicode_GET_LENGTH(self);
     len2 = PyUnicode_GET_LENGTH(substring);
     if (kind1 < kind2 || len1 < len2) {
         out = PyList_New(1);


From webhook-mailer at python.org  Sun Jul 31 02:48:29 2022
From: webhook-mailer at python.org (erlend-aasland)
Date: Sun, 31 Jul 2022 06:48:29 -0000
Subject: [Python-checkins] [3.11] gh-94635: Add Reference, How-to,
 and Explanation headings to sqlite3 docs (GH-94636) (#95482)
Message-ID: <mailman.390.1659250111.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/c7ac8b65884a79e6a976811bca10527613b1396a
commit: c7ac8b65884a79e6a976811bca10527613b1396a
branch: 3.11
author: Erlend Egeberg Aasland <erlend.aasland at protonmail.com>
committer: erlend-aasland <erlend.aasland at protonmail.com>
date: 2022-07-31T08:48:13+02:00
summary:

[3.11] gh-94635: Add Reference, How-to, and Explanation headings to sqlite3 docs (GH-94636) (#95482)

Co-authored-by: CAM Gerlach <CAM.Gerlach at Gerlach.CAM>.
(cherry picked from commit 6c439b978bf55b29f21c595e9375202d63c8208d)

Co-authored-by: Erlend Egeberg Aasland <erlend.aasland at protonmail.com>

* Fix refs

files:
M Doc/library/sqlite3.rst

diff --git a/Doc/library/sqlite3.rst b/Doc/library/sqlite3.rst
index 9437bafa5a281..332e3b0b79a1e 100644
--- a/Doc/library/sqlite3.rst
+++ b/Doc/library/sqlite3.rst
@@ -25,6 +25,15 @@ The sqlite3 module was written by Gerhard H?ring.  It provides an SQL interface
 compliant with the DB-API 2.0 specification described by :pep:`249`, and
 requires SQLite 3.7.15 or newer.
 
+This document includes four main sections:
+
+* :ref:`sqlite3-tutorial` teaches how to use the sqlite3 module.
+* :ref:`sqlite3-reference` describes the classes and functions this module
+  defines.
+* :ref:`sqlite3-howtos` details how to handle specific tasks.
+* :ref:`sqlite3-explanation` provides in-depth background on
+  transaction control.
+
 
 .. _sqlite3-tutorial:
 
@@ -136,10 +145,15 @@ both styles:
       PEP written by Marc-Andr? Lemburg.
 
 
+.. _sqlite3-reference:
+
+Reference
+---------
+
 .. _sqlite3-module-contents:
 
 Module functions and constants
-------------------------------
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 
 .. data:: apilevel
@@ -411,8 +425,8 @@ Module functions and constants
 
 .. _sqlite3-connection-objects:
 
-Connection Objects
-------------------
+Connection objects
+^^^^^^^^^^^^^^^^^^
 
 .. class:: Connection
 
@@ -972,8 +986,8 @@ Connection Objects
 
 .. _sqlite3-cursor-objects:
 
-Cursor Objects
---------------
+Cursor objects
+^^^^^^^^^^^^^^
 
    A ``Cursor`` object represents a `database cursor`_
    which is used to execute SQL statements,
@@ -1149,8 +1163,8 @@ Cursor Objects
 
 .. _sqlite3-row-objects:
 
-Row Objects
------------
+Row objects
+^^^^^^^^^^^
 
 .. class:: Row
 
@@ -1212,8 +1226,10 @@ Now we plug :class:`Row` in::
    35.14
 
 
-Blob Objects
-------------
+.. _sqlite3-blob-objects:
+
+Blob objects
+^^^^^^^^^^^^
 
 .. versionadded:: 3.11
 
@@ -1264,8 +1280,8 @@ Blob Objects
       end).
 
 
-PrepareProtocol Objects
------------------------
+PrepareProtocol objects
+^^^^^^^^^^^^^^^^^^^^^^^
 
 .. class:: PrepareProtocol
 
@@ -1277,7 +1293,7 @@ PrepareProtocol Objects
 .. _sqlite3-exceptions:
 
 Exceptions
-----------
+^^^^^^^^^^
 
 The exception hierarchy is defined by the DB-API 2.0 (:pep:`249`).
 
@@ -1364,16 +1380,10 @@ The exception hierarchy is defined by the DB-API 2.0 (:pep:`249`).
    ``NotSupportedError`` is a subclass of :exc:`DatabaseError`.
 
 
-.. _sqlite3-blob-objects:
-
 .. _sqlite3-types:
 
 SQLite and Python types
------------------------
-
-
-Introduction
-^^^^^^^^^^^^
+^^^^^^^^^^^^^^^^^^^^^^^
 
 SQLite natively supports the following types: ``NULL``, ``INTEGER``,
 ``REAL``, ``TEXT``, ``BLOB``.
@@ -1413,10 +1423,18 @@ This is how SQLite types are converted to Python types by default:
 +-------------+----------------------------------------------+
 
 The type system of the :mod:`sqlite3` module is extensible in two ways: you can
-store additional Python types in an SQLite database via object adaptation, and
-you can let the :mod:`sqlite3` module convert SQLite types to different Python
-types via converters.
+store additional Python types in an SQLite database via
+:ref:`object adapters <sqlite3-adapters>`,
+and you can let the ``sqlite3`` module convert SQLite types to
+Python types via :ref:`converters <sqlite3-converters>`.
+
 
+.. _sqlite3-howtos:
+
+How-to guides
+-------------
+
+.. _sqlite3-adapters:
 
 Using adapters to store custom Python types in SQLite databases
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -1460,6 +1478,8 @@ This function can then be registered using :func:`register_adapter`.
 .. literalinclude:: ../includes/sqlite3/adapter_point_2.py
 
 
+.. _sqlite3-converters:
+
 Converting SQLite values to custom Python types
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
@@ -1532,7 +1552,7 @@ timestamp converter.
 
 .. _sqlite3-adapter-converter-recipes:
 
-Adapter and Converter Recipes
+Adapter and converter recipes
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 This section shows recipes for common adapters and converters.
@@ -1575,83 +1595,6 @@ This section shows recipes for common adapters and converters.
    sqlite3.register_converter("timestamp", convert_timestamp)
 
 
-.. _sqlite3-controlling-transactions:
-
-Controlling Transactions
-------------------------
-
-The ``sqlite3`` module does not adhere to the transaction handling recommended
-by :pep:`249`.
-
-If the connection attribute :attr:`~Connection.isolation_level`
-is not :const:`None`,
-new transactions are implicitly opened before
-:meth:`~Cursor.execute` and :meth:`~Cursor.executemany` executes
-``INSERT``, ``UPDATE``, ``DELETE``, or ``REPLACE`` statements.
-Use the :meth:`~Connection.commit` and :meth:`~Connection.rollback` methods
-to respectively commit and roll back pending transactions.
-You can choose the underlying `SQLite transaction behaviour`_ ?
-that is, whether and what type of ``BEGIN`` statements ``sqlite3``
-implicitly executes ?
-via the :attr:`~Connection.isolation_level` attribute.
-
-If :attr:`~Connection.isolation_level` is set to :const:`None`,
-no transactions are implicitly opened at all.
-This leaves the underlying SQLite library in `autocommit mode`_,
-but also allows the user to perform their own transaction handling
-using explicit SQL statements.
-The underlying SQLite library autocommit mode can be queried using the
-:attr:`~Connection.in_transaction` attribute.
-
-The :meth:`~Cursor.executescript` method implicitly commits
-any pending transaction before execution of the given SQL script,
-regardless of the value of :attr:`~Connection.isolation_level`.
-
-.. versionchanged:: 3.6
-   :mod:`sqlite3` used to implicitly commit an open transaction before DDL
-   statements.  This is no longer the case.
-
-.. _autocommit mode:
-   https://www.sqlite.org/lang_transaction.html#implicit_versus_explicit_transactions
-
-.. _SQLite transaction behaviour:
-   https://www.sqlite.org/lang_transaction.html#deferred_immediate_and_exclusive_transactions
-
-
-.. _sqlite3-uri-tricks:
-
-SQLite URI tricks
------------------
-
-Some useful URI tricks include:
-
-* Open a database in read-only mode::
-
-    con = sqlite3.connect("file:template.db?mode=ro", uri=True)
-
-* Do not implicitly create a new database file if it does not already exist;
-  will raise :exc:`~sqlite3.OperationalError` if unable to create a new file::
-
-    con = sqlite3.connect("file:nosuchdb.db?mode=rw", uri=True)
-
-* Create a shared named in-memory database::
-
-    con1 = sqlite3.connect("file:mem1?mode=memory&cache=shared", uri=True)
-    con2 = sqlite3.connect("file:mem1?mode=memory&cache=shared", uri=True)
-    con1.execute("create table t(t)")
-    con1.execute("insert into t values(28)")
-    con1.commit()
-    rows = con2.execute("select * from t").fetchall()
-
-More information about this feature, including a list of parameters,
-can be found in the `SQLite URI documentation`_.
-
-.. _SQLite URI documentation: https://www.sqlite.org/uri.html
-
-Using :mod:`sqlite3` efficiently
---------------------------------
-
-
 .. _sqlite3-connection-shortcuts:
 
 Using connection shortcut methods
@@ -1669,6 +1612,8 @@ directly using only a single call on the :class:`Connection` object.
 .. literalinclude:: ../includes/sqlite3/shortcut_methods.py
 
 
+.. _sqlite3-columns-by-name:
+
 Accessing columns by name instead of by index
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
@@ -1704,3 +1649,82 @@ the context manager is a no-op.
    nor closes the connection.
 
 .. literalinclude:: ../includes/sqlite3/ctx_manager.py
+
+
+.. _sqlite3-uri-tricks:
+
+Working with SQLite URIs
+^^^^^^^^^^^^^^^^^^^^^^^^
+
+Some useful URI tricks include:
+
+* Open a database in read-only mode::
+
+    con = sqlite3.connect("file:template.db?mode=ro", uri=True)
+
+* Do not implicitly create a new database file if it does not already exist;
+  will raise :exc:`~sqlite3.OperationalError` if unable to create a new file::
+
+    con = sqlite3.connect("file:nosuchdb.db?mode=rw", uri=True)
+
+* Create a shared named in-memory database::
+
+    con1 = sqlite3.connect("file:mem1?mode=memory&cache=shared", uri=True)
+    con2 = sqlite3.connect("file:mem1?mode=memory&cache=shared", uri=True)
+    con1.execute("create table t(t)")
+    con1.execute("insert into t values(28)")
+    con1.commit()
+    rows = con2.execute("select * from t").fetchall()
+
+More information about this feature, including a list of parameters,
+can be found in the `SQLite URI documentation`_.
+
+.. _SQLite URI documentation: https://www.sqlite.org/uri.html
+
+
+.. _sqlite3-explanation:
+
+Explanation
+-----------
+
+.. _sqlite3-controlling-transactions:
+
+Transaction control
+^^^^^^^^^^^^^^^^^^^
+
+The ``sqlite3`` module does not adhere to the transaction handling recommended
+by :pep:`249`.
+
+If the connection attribute :attr:`~Connection.isolation_level`
+is not :const:`None`,
+new transactions are implicitly opened before
+:meth:`~Cursor.execute` and :meth:`~Cursor.executemany` executes
+``INSERT``, ``UPDATE``, ``DELETE``, or ``REPLACE`` statements.
+Use the :meth:`~Connection.commit` and :meth:`~Connection.rollback` methods
+to respectively commit and roll back pending transactions.
+You can choose the underlying `SQLite transaction behaviour`_ ?
+that is, whether and what type of ``BEGIN`` statements ``sqlite3``
+implicitly executes ?
+via the :attr:`~Connection.isolation_level` attribute.
+
+If :attr:`~Connection.isolation_level` is set to :const:`None`,
+no transactions are implicitly opened at all.
+This leaves the underlying SQLite library in `autocommit mode`_,
+but also allows the user to perform their own transaction handling
+using explicit SQL statements.
+The underlying SQLite library autocommit mode can be queried using the
+:attr:`~Connection.in_transaction` attribute.
+
+The :meth:`~Cursor.executescript` method implicitly commits
+any pending transaction before execution of the given SQL script,
+regardless of the value of :attr:`~Connection.isolation_level`.
+
+.. versionchanged:: 3.6
+   :mod:`sqlite3` used to implicitly commit an open transaction before DDL
+   statements.  This is no longer the case.
+
+.. _autocommit mode:
+   https://www.sqlite.org/lang_transaction.html#implicit_versus_explicit_transactions
+
+.. _SQLite transaction behaviour:
+   https://www.sqlite.org/lang_transaction.html#deferred_immediate_and_exclusive_transactions


From webhook-mailer at python.org  Sun Jul 31 02:48:30 2022
From: webhook-mailer at python.org (erlend-aasland)
Date: Sun, 31 Jul 2022 06:48:30 -0000
Subject: [Python-checkins] [3.10] gh-94635: Add Reference, How-to,
 and Explanation headings to sqlite3 docs (GH-94636) (#95483)
Message-ID: <mailman.391.1659250111.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/6765a784a7d3f0b96410baeb34ccd350474bf051
commit: 6765a784a7d3f0b96410baeb34ccd350474bf051
branch: 3.10
author: Erlend Egeberg Aasland <erlend.aasland at protonmail.com>
committer: erlend-aasland <erlend.aasland at protonmail.com>
date: 2022-07-31T08:47:53+02:00
summary:

[3.10] gh-94635: Add Reference, How-to, and Explanation headings to sqlite3 docs (GH-94636) (#95483)

Co-authored-by: CAM Gerlach <CAM.Gerlach at Gerlach.CAM>.
(cherry picked from commit 6c439b978bf55b29f21c595e9375202d63c8208d)

Co-authored-by: Erlend Egeberg Aasland <erlend.aasland at protonmail.com>

* Fix refs

files:
M Doc/library/sqlite3.rst

diff --git a/Doc/library/sqlite3.rst b/Doc/library/sqlite3.rst
index e68aa4055680e..2b08040a00e64 100644
--- a/Doc/library/sqlite3.rst
+++ b/Doc/library/sqlite3.rst
@@ -25,6 +25,15 @@ The sqlite3 module was written by Gerhard H?ring.  It provides an SQL interface
 compliant with the DB-API 2.0 specification described by :pep:`249`, and
 requires SQLite 3.7.15 or newer.
 
+This document includes four main sections:
+
+* :ref:`sqlite3-tutorial` teaches how to use the sqlite3 module.
+* :ref:`sqlite3-reference` describes the classes and functions this module
+  defines.
+* :ref:`sqlite3-howtos` details how to handle specific tasks.
+* :ref:`sqlite3-explanation` provides in-depth background on
+  transaction control.
+
 
 .. _sqlite3-tutorial:
 
@@ -136,10 +145,15 @@ both styles:
       PEP written by Marc-Andr? Lemburg.
 
 
+.. _sqlite3-reference:
+
+Reference
+---------
+
 .. _sqlite3-module-contents:
 
 Module functions and constants
-------------------------------
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 
 .. data:: apilevel
@@ -375,8 +389,8 @@ Module functions and constants
 
 .. _sqlite3-connection-objects:
 
-Connection Objects
-------------------
+Connection objects
+^^^^^^^^^^^^^^^^^^
 
 .. class:: Connection
 
@@ -773,8 +787,8 @@ Connection Objects
 
 .. _sqlite3-cursor-objects:
 
-Cursor Objects
---------------
+Cursor objects
+^^^^^^^^^^^^^^
 
    A ``Cursor`` object represents a `database cursor`_
    which is used to execute SQL statements,
@@ -950,8 +964,8 @@ Cursor Objects
 
 .. _sqlite3-row-objects:
 
-Row Objects
------------
+Row objects
+^^^^^^^^^^^
 
 .. class:: Row
 
@@ -1013,8 +1027,8 @@ Now we plug :class:`Row` in::
    35.14
 
 
-PrepareProtocol Objects
------------------------
+PrepareProtocol objects
+^^^^^^^^^^^^^^^^^^^^^^^
 
 .. class:: PrepareProtocol
 
@@ -1026,7 +1040,7 @@ PrepareProtocol Objects
 .. _sqlite3-exceptions:
 
 Exceptions
-----------
+^^^^^^^^^^
 
 The exception hierarchy is defined by the DB-API 2.0 (:pep:`249`).
 
@@ -1101,11 +1115,7 @@ The exception hierarchy is defined by the DB-API 2.0 (:pep:`249`).
 .. _sqlite3-types:
 
 SQLite and Python types
------------------------
-
-
-Introduction
-^^^^^^^^^^^^
+^^^^^^^^^^^^^^^^^^^^^^^
 
 SQLite natively supports the following types: ``NULL``, ``INTEGER``,
 ``REAL``, ``TEXT``, ``BLOB``.
@@ -1145,10 +1155,18 @@ This is how SQLite types are converted to Python types by default:
 +-------------+----------------------------------------------+
 
 The type system of the :mod:`sqlite3` module is extensible in two ways: you can
-store additional Python types in an SQLite database via object adaptation, and
-you can let the :mod:`sqlite3` module convert SQLite types to different Python
-types via converters.
+store additional Python types in an SQLite database via
+:ref:`object adapters <sqlite3-adapters>`,
+and you can let the ``sqlite3`` module convert SQLite types to
+Python types via :ref:`converters <sqlite3-converters>`.
+
+
+.. _sqlite3-howtos:
 
+How-to guides
+-------------
+
+.. _sqlite3-adapters:
 
 Using adapters to store custom Python types in SQLite databases
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -1192,6 +1210,8 @@ This function can then be registered using :func:`register_adapter`.
 .. literalinclude:: ../includes/sqlite3/adapter_point_2.py
 
 
+.. _sqlite3-converters:
+
 Converting SQLite values to custom Python types
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
@@ -1264,7 +1284,7 @@ timestamp converter.
 
 .. _sqlite3-adapter-converter-recipes:
 
-Adapter and Converter Recipes
+Adapter and converter recipes
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 This section shows recipes for common adapters and converters.
@@ -1307,83 +1327,6 @@ This section shows recipes for common adapters and converters.
    sqlite3.register_converter("timestamp", convert_timestamp)
 
 
-.. _sqlite3-controlling-transactions:
-
-Controlling Transactions
-------------------------
-
-The ``sqlite3`` module does not adhere to the transaction handling recommended
-by :pep:`249`.
-
-If the connection attribute :attr:`~Connection.isolation_level`
-is not :const:`None`,
-new transactions are implicitly opened before
-:meth:`~Cursor.execute` and :meth:`~Cursor.executemany` executes
-``INSERT``, ``UPDATE``, ``DELETE``, or ``REPLACE`` statements.
-Use the :meth:`~Connection.commit` and :meth:`~Connection.rollback` methods
-to respectively commit and roll back pending transactions.
-You can choose the underlying `SQLite transaction behaviour`_ ?
-that is, whether and what type of ``BEGIN`` statements ``sqlite3``
-implicitly executes ?
-via the :attr:`~Connection.isolation_level` attribute.
-
-If :attr:`~Connection.isolation_level` is set to :const:`None`,
-no transactions are implicitly opened at all.
-This leaves the underlying SQLite library in `autocommit mode`_,
-but also allows the user to perform their own transaction handling
-using explicit SQL statements.
-The underlying SQLite library autocommit mode can be queried using the
-:attr:`~Connection.in_transaction` attribute.
-
-The :meth:`~Cursor.executescript` method implicitly commits
-any pending transaction before execution of the given SQL script,
-regardless of the value of :attr:`~Connection.isolation_level`.
-
-.. versionchanged:: 3.6
-   :mod:`sqlite3` used to implicitly commit an open transaction before DDL
-   statements.  This is no longer the case.
-
-.. _autocommit mode:
-   https://www.sqlite.org/lang_transaction.html#implicit_versus_explicit_transactions
-
-.. _SQLite transaction behaviour:
-   https://www.sqlite.org/lang_transaction.html#deferred_immediate_and_exclusive_transactions
-
-
-.. _sqlite3-uri-tricks:
-
-SQLite URI tricks
------------------
-
-Some useful URI tricks include:
-
-* Open a database in read-only mode::
-
-    con = sqlite3.connect("file:template.db?mode=ro", uri=True)
-
-* Do not implicitly create a new database file if it does not already exist;
-  will raise :exc:`~sqlite3.OperationalError` if unable to create a new file::
-
-    con = sqlite3.connect("file:nosuchdb.db?mode=rw", uri=True)
-
-* Create a shared named in-memory database::
-
-    con1 = sqlite3.connect("file:mem1?mode=memory&cache=shared", uri=True)
-    con2 = sqlite3.connect("file:mem1?mode=memory&cache=shared", uri=True)
-    con1.execute("create table t(t)")
-    con1.execute("insert into t values(28)")
-    con1.commit()
-    rows = con2.execute("select * from t").fetchall()
-
-More information about this feature, including a list of parameters,
-can be found in the `SQLite URI documentation`_.
-
-.. _SQLite URI documentation: https://www.sqlite.org/uri.html
-
-Using :mod:`sqlite3` efficiently
---------------------------------
-
-
 .. _sqlite3-connection-shortcuts:
 
 Using connection shortcut methods
@@ -1401,6 +1344,8 @@ directly using only a single call on the :class:`Connection` object.
 .. literalinclude:: ../includes/sqlite3/shortcut_methods.py
 
 
+.. _sqlite3-columns-by-name:
+
 Accessing columns by name instead of by index
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
@@ -1436,3 +1381,82 @@ the context manager is a no-op.
    nor closes the connection.
 
 .. literalinclude:: ../includes/sqlite3/ctx_manager.py
+
+
+.. _sqlite3-uri-tricks:
+
+Working with SQLite URIs
+^^^^^^^^^^^^^^^^^^^^^^^^
+
+Some useful URI tricks include:
+
+* Open a database in read-only mode::
+
+    con = sqlite3.connect("file:template.db?mode=ro", uri=True)
+
+* Do not implicitly create a new database file if it does not already exist;
+  will raise :exc:`~sqlite3.OperationalError` if unable to create a new file::
+
+    con = sqlite3.connect("file:nosuchdb.db?mode=rw", uri=True)
+
+* Create a shared named in-memory database::
+
+    con1 = sqlite3.connect("file:mem1?mode=memory&cache=shared", uri=True)
+    con2 = sqlite3.connect("file:mem1?mode=memory&cache=shared", uri=True)
+    con1.execute("create table t(t)")
+    con1.execute("insert into t values(28)")
+    con1.commit()
+    rows = con2.execute("select * from t").fetchall()
+
+More information about this feature, including a list of parameters,
+can be found in the `SQLite URI documentation`_.
+
+.. _SQLite URI documentation: https://www.sqlite.org/uri.html
+
+
+.. _sqlite3-explanation:
+
+Explanation
+-----------
+
+.. _sqlite3-controlling-transactions:
+
+Transaction control
+^^^^^^^^^^^^^^^^^^^
+
+The ``sqlite3`` module does not adhere to the transaction handling recommended
+by :pep:`249`.
+
+If the connection attribute :attr:`~Connection.isolation_level`
+is not :const:`None`,
+new transactions are implicitly opened before
+:meth:`~Cursor.execute` and :meth:`~Cursor.executemany` executes
+``INSERT``, ``UPDATE``, ``DELETE``, or ``REPLACE`` statements.
+Use the :meth:`~Connection.commit` and :meth:`~Connection.rollback` methods
+to respectively commit and roll back pending transactions.
+You can choose the underlying `SQLite transaction behaviour`_ ?
+that is, whether and what type of ``BEGIN`` statements ``sqlite3``
+implicitly executes ?
+via the :attr:`~Connection.isolation_level` attribute.
+
+If :attr:`~Connection.isolation_level` is set to :const:`None`,
+no transactions are implicitly opened at all.
+This leaves the underlying SQLite library in `autocommit mode`_,
+but also allows the user to perform their own transaction handling
+using explicit SQL statements.
+The underlying SQLite library autocommit mode can be queried using the
+:attr:`~Connection.in_transaction` attribute.
+
+The :meth:`~Cursor.executescript` method implicitly commits
+any pending transaction before execution of the given SQL script,
+regardless of the value of :attr:`~Connection.isolation_level`.
+
+.. versionchanged:: 3.6
+   :mod:`sqlite3` used to implicitly commit an open transaction before DDL
+   statements.  This is no longer the case.
+
+.. _autocommit mode:
+   https://www.sqlite.org/lang_transaction.html#implicit_versus_explicit_transactions
+
+.. _SQLite transaction behaviour:
+   https://www.sqlite.org/lang_transaction.html#deferred_immediate_and_exclusive_transactions


From webhook-mailer at python.org  Sun Jul 31 04:19:29 2022
From: webhook-mailer at python.org (serhiy-storchaka)
Date: Sun, 31 Jul 2022 08:19:29 -0000
Subject: [Python-checkins] [3.10] bpo-46053: Fix OSS audio support on NetBSD
 (GH-30065). (GH-95477)
Message-ID: <mailman.392.1659255569.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/ae2496245774fd196948f61a064dd2c5410ed34f
commit: ae2496245774fd196948f61a064dd2c5410ed34f
branch: 3.10
author: Thomas Klausner <tk at giga.or.at>
committer: serhiy-storchaka <storchaka at gmail.com>
date: 2022-07-31T11:19:09+03:00
summary:

[3.10] bpo-46053: Fix OSS audio support on NetBSD (GH-30065). (GH-95477)

(cherry picked from commit 2e7e3c4c109928870c1e33d8af36b78e92895594)

Co-authored-by: Thomas Klausner <tk at giga.or.at>

files:
A Misc/NEWS.d/next/Library/2022-02-06-12-59-32.bpo-46053.sHFo3S.rst
M Modules/ossaudiodev.c
M setup.py

diff --git a/Misc/NEWS.d/next/Library/2022-02-06-12-59-32.bpo-46053.sHFo3S.rst b/Misc/NEWS.d/next/Library/2022-02-06-12-59-32.bpo-46053.sHFo3S.rst
new file mode 100644
index 0000000000000..ce375885792e8
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2022-02-06-12-59-32.bpo-46053.sHFo3S.rst
@@ -0,0 +1 @@
+Fix OSS audio support on NetBSD.
diff --git a/Modules/ossaudiodev.c b/Modules/ossaudiodev.c
index b22bd42dcaa6f..74960c0ad2478 100644
--- a/Modules/ossaudiodev.c
+++ b/Modules/ossaudiodev.c
@@ -1212,16 +1212,36 @@ PyInit_ossaudiodev(void)
 
     /* Expose all the ioctl numbers for masochists who like to do this
        stuff directly. */
+#ifdef SNDCTL_COPR_HALT
     _EXPORT_INT(m, SNDCTL_COPR_HALT);
+#endif
+#ifdef SNDCTL_COPR_LOAD
     _EXPORT_INT(m, SNDCTL_COPR_LOAD);
+#endif
+#ifdef SNDCTL_COPR_RCODE
     _EXPORT_INT(m, SNDCTL_COPR_RCODE);
+#endif
+#ifdef SNDCTL_COPR_RCVMSG
     _EXPORT_INT(m, SNDCTL_COPR_RCVMSG);
+#endif
+#ifdef SNDCTL_COPR_RDATA
     _EXPORT_INT(m, SNDCTL_COPR_RDATA);
+#endif
+#ifdef SNDCTL_COPR_RESET
     _EXPORT_INT(m, SNDCTL_COPR_RESET);
+#endif
+#ifdef SNDCTL_COPR_RUN
     _EXPORT_INT(m, SNDCTL_COPR_RUN);
+#endif
+#ifdef SNDCTL_COPR_SENDMSG
     _EXPORT_INT(m, SNDCTL_COPR_SENDMSG);
+#endif
+#ifdef SNDCTL_COPR_WCODE
     _EXPORT_INT(m, SNDCTL_COPR_WCODE);
+#endif
+#ifdef SNDCTL_COPR_WDATA
     _EXPORT_INT(m, SNDCTL_COPR_WDATA);
+#endif
 #ifdef SNDCTL_DSP_BIND_CHANNEL
     _EXPORT_INT(m, SNDCTL_DSP_BIND_CHANNEL);
 #endif
@@ -1268,46 +1288,104 @@ PyInit_ossaudiodev(void)
     _EXPORT_INT(m, SNDCTL_DSP_STEREO);
     _EXPORT_INT(m, SNDCTL_DSP_SUBDIVIDE);
     _EXPORT_INT(m, SNDCTL_DSP_SYNC);
+#ifdef SNDCTL_FM_4OP_ENABLE
     _EXPORT_INT(m, SNDCTL_FM_4OP_ENABLE);
+#endif
+#ifdef SNDCTL_FM_LOAD_INSTR
     _EXPORT_INT(m, SNDCTL_FM_LOAD_INSTR);
+#endif
+#ifdef SNDCTL_MIDI_INFO
     _EXPORT_INT(m, SNDCTL_MIDI_INFO);
+#endif
+#ifdef SNDCTL_MIDI_MPUCMD
     _EXPORT_INT(m, SNDCTL_MIDI_MPUCMD);
+#endif
+#ifdef SNDCTL_MIDI_MPUMODE
     _EXPORT_INT(m, SNDCTL_MIDI_MPUMODE);
+#endif
+#ifdef SNDCTL_MIDI_PRETIME
     _EXPORT_INT(m, SNDCTL_MIDI_PRETIME);
+#endif
+#ifdef SNDCTL_SEQ_CTRLRATE
     _EXPORT_INT(m, SNDCTL_SEQ_CTRLRATE);
+#endif
+#ifdef SNDCTL_SEQ_GETINCOUNT
     _EXPORT_INT(m, SNDCTL_SEQ_GETINCOUNT);
+#endif
+#ifdef SNDCTL_SEQ_GETOUTCOUNT
     _EXPORT_INT(m, SNDCTL_SEQ_GETOUTCOUNT);
+#endif
 #ifdef SNDCTL_SEQ_GETTIME
     _EXPORT_INT(m, SNDCTL_SEQ_GETTIME);
 #endif
+#ifdef SNDCTL_SEQ_NRMIDIS
     _EXPORT_INT(m, SNDCTL_SEQ_NRMIDIS);
+#endif
+#ifdef SNDCTL_SEQ_NRSYNTHS
     _EXPORT_INT(m, SNDCTL_SEQ_NRSYNTHS);
+#endif
+#ifdef SNDCTL_SEQ_OUTOFBAND
     _EXPORT_INT(m, SNDCTL_SEQ_OUTOFBAND);
+#endif
+#ifdef SNDCTL_SEQ_PANIC
     _EXPORT_INT(m, SNDCTL_SEQ_PANIC);
+#endif
+#ifdef SNDCTL_SEQ_PERCMODE
     _EXPORT_INT(m, SNDCTL_SEQ_PERCMODE);
+#endif
+#ifdef SNDCTL_SEQ_RESET
     _EXPORT_INT(m, SNDCTL_SEQ_RESET);
+#endif
+#ifdef SNDCTL_SEQ_RESETSAMPLES
     _EXPORT_INT(m, SNDCTL_SEQ_RESETSAMPLES);
+#endif
+#ifdef SNDCTL_SEQ_SYNC
     _EXPORT_INT(m, SNDCTL_SEQ_SYNC);
+#endif
+#ifdef SNDCTL_SEQ_TESTMIDI
     _EXPORT_INT(m, SNDCTL_SEQ_TESTMIDI);
+#endif
+#ifdef SNDCTL_SEQ_THRESHOLD
     _EXPORT_INT(m, SNDCTL_SEQ_THRESHOLD);
+#endif
 #ifdef SNDCTL_SYNTH_CONTROL
     _EXPORT_INT(m, SNDCTL_SYNTH_CONTROL);
 #endif
 #ifdef SNDCTL_SYNTH_ID
     _EXPORT_INT(m, SNDCTL_SYNTH_ID);
 #endif
+#ifdef SNDCTL_SYNTH_INFO
     _EXPORT_INT(m, SNDCTL_SYNTH_INFO);
+#endif
+#ifdef SNDCTL_SYNTH_MEMAVL
     _EXPORT_INT(m, SNDCTL_SYNTH_MEMAVL);
+#endif
 #ifdef SNDCTL_SYNTH_REMOVESAMPLE
     _EXPORT_INT(m, SNDCTL_SYNTH_REMOVESAMPLE);
 #endif
+#ifdef SNDCTL_TMR_CONTINUE
     _EXPORT_INT(m, SNDCTL_TMR_CONTINUE);
+#endif
+#ifdef SNDCTL_TMR_METRONOME
     _EXPORT_INT(m, SNDCTL_TMR_METRONOME);
+#endif
+#ifdef SNDCTL_TMR_SELECT
     _EXPORT_INT(m, SNDCTL_TMR_SELECT);
+#endif
+#ifdef SNDCTL_TMR_SOURCE
     _EXPORT_INT(m, SNDCTL_TMR_SOURCE);
+#endif
+#ifdef SNDCTL_TMR_START
     _EXPORT_INT(m, SNDCTL_TMR_START);
+#endif
+#ifdef SNDCTL_TMR_STOP
     _EXPORT_INT(m, SNDCTL_TMR_STOP);
+#endif
+#ifdef SNDCTL_TMR_TEMPO
     _EXPORT_INT(m, SNDCTL_TMR_TEMPO);
+#endif
+#ifdef SNDCTL_TMR_TIMEBASE
     _EXPORT_INT(m, SNDCTL_TMR_TIMEBASE);
+#endif
     return m;
 }
diff --git a/setup.py b/setup.py
index 4894adfc8215c..85a2b26357db4 100644
--- a/setup.py
+++ b/setup.py
@@ -1663,6 +1663,9 @@ def detect_platform_specific_exts(self):
         # Platform-specific libraries
         if HOST_PLATFORM.startswith(('linux', 'freebsd', 'gnukfreebsd')):
             self.add(Extension('ossaudiodev', ['ossaudiodev.c']))
+        elif HOST_PLATFORM.startswith(('netbsd')):
+            self.add(Extension('ossaudiodev', ['ossaudiodev.c'],
+                               libraries=["ossaudio"]))
         elif not AIX:
             self.missing.append('ossaudiodev')
 


From webhook-mailer at python.org  Sun Jul 31 11:34:29 2022
From: webhook-mailer at python.org (pablogsal)
Date: Sun, 31 Jul 2022 15:34:29 -0000
Subject: [Python-checkins] bpo-45445: Revert "bpo-45445: Fail if an invalid
 X-option is provided in the command line (GH-28823)" (#94745)
Message-ID: <mailman.393.1659281670.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/aa37ffda29ac48fb2df5a7029ba2e626ecc45850
commit: aa37ffda29ac48fb2df5a7029ba2e626ecc45850
branch: main
author: Pablo Galindo Salgado <Pablogsal at gmail.com>
committer: pablogsal <Pablogsal at gmail.com>
date: 2022-07-31T16:33:56+01:00
summary:

bpo-45445: Revert "bpo-45445: Fail if an invalid X-option is provided in the command line (GH-28823)" (#94745)

files:
M Doc/library/sys.rst
M Lib/test/test_audit.py
M Lib/test/test_cmd_line.py
M Lib/test/test_embed.py
M Programs/_testembed.c
M Python/initconfig.c

diff --git a/Doc/library/sys.rst b/Doc/library/sys.rst
index e7ad6a6c67bd1..632ce627d86f9 100644
--- a/Doc/library/sys.rst
+++ b/Doc/library/sys.rst
@@ -1780,13 +1780,13 @@ always available.
 
    .. code-block:: shell-session
 
-      $ ./python -Xpycache_prefix=some_path -Xdev
+      $ ./python -Xa=b -Xc
       Python 3.2a3+ (py3k, Oct 16 2010, 20:14:50)
       [GCC 4.4.3] on linux2
       Type "help", "copyright", "credits" or "license" for more information.
       >>> import sys
       >>> sys._xoptions
-      {'pycache_prefix': 'some_path', 'dev': True}
+      {'a': 'b', 'c': True}
 
    .. impl-detail::
 
diff --git a/Lib/test/test_audit.py b/Lib/test/test_audit.py
index a7ff038c0936e..18426f27a2e32 100644
--- a/Lib/test/test_audit.py
+++ b/Lib/test/test_audit.py
@@ -20,7 +20,7 @@ class AuditTest(unittest.TestCase):
     @support.requires_subprocess()
     def do_test(self, *args):
         with subprocess.Popen(
-            [sys.executable, "-Xutf8", AUDIT_TESTS_PY, *args],
+            [sys.executable, "-X utf8", AUDIT_TESTS_PY, *args],
             encoding="utf-8",
             stdout=subprocess.PIPE,
             stderr=subprocess.PIPE,
@@ -35,7 +35,7 @@ def do_test(self, *args):
     def run_python(self, *args):
         events = []
         with subprocess.Popen(
-            [sys.executable, "-Xutf8", AUDIT_TESTS_PY, *args],
+            [sys.executable, "-X utf8", AUDIT_TESTS_PY, *args],
             encoding="utf-8",
             stdout=subprocess.PIPE,
             stderr=subprocess.PIPE,
diff --git a/Lib/test/test_cmd_line.py b/Lib/test/test_cmd_line.py
index bc52bbdb0f94d..64469763957a5 100644
--- a/Lib/test/test_cmd_line.py
+++ b/Lib/test/test_cmd_line.py
@@ -105,17 +105,8 @@ def get_xoptions(*args):
         opts = get_xoptions()
         self.assertEqual(opts, {})
 
-        opts = get_xoptions('-Xno_debug_ranges', '-Xdev=1234')
-        self.assertEqual(opts, {'no_debug_ranges': True, 'dev': '1234'})
-
-    @unittest.skipIf(interpreter_requires_environment(),
-                     'Cannot run -E tests when PYTHON env vars are required.')
-    def test_unknown_xoptions(self):
-        rc, out, err = assert_python_failure('-X', 'blech')
-        self.assertIn(b'Unknown value for option -X', err)
-        msg = b'Fatal Python error: Unknown value for option -X (see --help-xoptions)'
-        self.assertEqual(err.splitlines().count(msg), 1)
-        self.assertEqual(b'', out)
+        opts = get_xoptions('-Xa', '-Xb=c,d=e')
+        self.assertEqual(opts, {'a': True, 'b': 'c,d=e'})
 
     def test_showrefcount(self):
         def run_python(*args):
diff --git a/Lib/test/test_embed.py b/Lib/test/test_embed.py
index c7e5663566b06..c546bb08e297c 100644
--- a/Lib/test/test_embed.py
+++ b/Lib/test/test_embed.py
@@ -283,7 +283,7 @@ def test_pre_initialization_sys_options(self):
                         "test_pre_initialization_sys_options", env=env)
         expected_output = (
             "sys.warnoptions: ['once', 'module', 'default']\n"
-            "sys._xoptions: {'dev': '2', 'utf8': '1'}\n"
+            "sys._xoptions: {'not_an_option': '1', 'also_not_an_option': '2'}\n"
             "warnings.filters[:3]: ['default', 'module', 'once']\n"
         )
         self.assertIn(expected_output, out)
@@ -841,14 +841,15 @@ def test_init_from_config(self):
             'argv': ['-c', 'arg2'],
             'orig_argv': ['python3',
                           '-W', 'cmdline_warnoption',
-                          '-X', 'dev',
+                          '-X', 'cmdline_xoption',
                           '-c', 'pass',
                           'arg2'],
             'parse_argv': 2,
             'xoptions': [
-                'dev=3',
-                'utf8',
-                'dev',
+                'config_xoption1=3',
+                'config_xoption2=',
+                'config_xoption3',
+                'cmdline_xoption',
             ],
             'warnoptions': [
                 'cmdline_warnoption',
@@ -1076,8 +1077,9 @@ def test_init_sys_add(self):
         config = {
             'faulthandler': 1,
             'xoptions': [
-                'dev',
-                'utf8',
+                'config_xoption',
+                'cmdline_xoption',
+                'sysadd_xoption',
                 'faulthandler',
             ],
             'warnoptions': [
@@ -1087,12 +1089,9 @@ def test_init_sys_add(self):
             ],
             'orig_argv': ['python3',
                           '-W', 'ignore:::cmdline_warnoption',
-                          '-X', 'utf8'],
+                          '-X', 'cmdline_xoption'],
         }
-        preconfig = {'utf8_mode': 1}
-        self.check_all_configs("test_init_sys_add", config,
-                               expected_preconfig=preconfig,
-                               api=API_PYTHON)
+        self.check_all_configs("test_init_sys_add", config, api=API_PYTHON)
 
     def test_init_run_main(self):
         code = ('import _testinternalcapi, json; '
diff --git a/Programs/_testembed.c b/Programs/_testembed.c
index 6b43d53403014..f84445690eb8f 100644
--- a/Programs/_testembed.c
+++ b/Programs/_testembed.c
@@ -279,7 +279,7 @@ static int test_pre_initialization_sys_options(void)
      * relying on the caller to keep the passed in strings alive.
      */
     const wchar_t *static_warnoption = L"once";
-    const wchar_t *static_xoption = L"utf8=1";
+    const wchar_t *static_xoption = L"also_not_an_option=2";
     size_t warnoption_len = wcslen(static_warnoption);
     size_t xoption_len = wcslen(static_xoption);
     wchar_t *dynamic_once_warnoption = \
@@ -298,7 +298,7 @@ static int test_pre_initialization_sys_options(void)
     PySys_AddWarnOption(L"module");
     PySys_AddWarnOption(L"default");
     _Py_EMBED_PREINIT_CHECK("Checking PySys_AddXOption\n");
-    PySys_AddXOption(L"dev=2");
+    PySys_AddXOption(L"not_an_option=1");
     PySys_AddXOption(dynamic_xoption);
 
     /* Delete the dynamic options early */
@@ -591,7 +591,7 @@ static int test_init_from_config(void)
         L"-W",
         L"cmdline_warnoption",
         L"-X",
-        L"dev",
+        L"cmdline_xoption",
         L"-c",
         L"pass",
         L"arg2",
@@ -599,9 +599,10 @@ static int test_init_from_config(void)
     config_set_argv(&config, Py_ARRAY_LENGTH(argv), argv);
     config.parse_argv = 1;
 
-    wchar_t* xoptions[2] = {
-        L"dev=3",
-        L"utf8",
+    wchar_t* xoptions[3] = {
+        L"config_xoption1=3",
+        L"config_xoption2=",
+        L"config_xoption3",
     };
     config_set_wide_string_list(&config, &config.xoptions,
                                 Py_ARRAY_LENGTH(xoptions), xoptions);
@@ -1425,6 +1426,7 @@ static int test_init_read_set(void)
 
 static int test_init_sys_add(void)
 {
+    PySys_AddXOption(L"sysadd_xoption");
     PySys_AddXOption(L"faulthandler");
     PySys_AddWarnOption(L"ignore:::sysadd_warnoption");
 
@@ -1436,14 +1438,14 @@ static int test_init_sys_add(void)
         L"-W",
         L"ignore:::cmdline_warnoption",
         L"-X",
-        L"utf8",
+        L"cmdline_xoption",
     };
     config_set_argv(&config, Py_ARRAY_LENGTH(argv), argv);
     config.parse_argv = 1;
 
     PyStatus status;
     status = PyWideStringList_Append(&config.xoptions,
-                                     L"dev");
+                                     L"config_xoption");
     if (PyStatus_Exception(status)) {
         goto fail;
     }
diff --git a/Python/initconfig.c b/Python/initconfig.c
index d29c69345a2bb..70f0363297f3e 100644
--- a/Python/initconfig.c
+++ b/Python/initconfig.c
@@ -2061,49 +2061,6 @@ _PyConfig_InitImportConfig(PyConfig *config)
     return config_init_import(config, 1);
 }
 
-// List of known xoptions to validate against the provided ones. Note that all
-// options are listed, even if they are only available if a specific macro is
-// set, like -X showrefcount which requires a debug build. In this case unknown
-// options are silently ignored.
-const wchar_t* known_xoptions[] = {
-    L"faulthandler",
-    L"showrefcount",
-    L"tracemalloc",
-    L"importtime",
-    L"dev",
-    L"utf8",
-    L"pycache_prefix",
-    L"warn_default_encoding",
-    L"no_debug_ranges",
-    L"frozen_modules",
-    NULL,
-};
-
-static const wchar_t*
-_Py_check_xoptions(const PyWideStringList *xoptions, const wchar_t **names)
-{
-    for (Py_ssize_t i=0; i < xoptions->length; i++) {
-        const wchar_t *option = xoptions->items[i];
-        size_t len;
-        wchar_t *sep = wcschr(option, L'=');
-        if (sep != NULL) {
-            len = (sep - option);
-        }
-        else {
-            len = wcslen(option);
-        }
-        int found = 0;
-        for (const wchar_t** name = names; *name != NULL; name++) {
-            if (wcsncmp(option, *name, len) == 0 && (*name)[len] == L'\0') {
-                found = 1;
-            }
-        }
-        if (found == 0) {
-            return option;
-        }
-    }
-    return NULL;
-}
 
 static PyStatus
 config_read(PyConfig *config, int compute_path_config)
@@ -2119,11 +2076,6 @@ config_read(PyConfig *config, int compute_path_config)
     }
 
     /* -X options */
-    const wchar_t* option = _Py_check_xoptions(&config->xoptions, known_xoptions);
-    if (option != NULL) {
-        return PyStatus_Error("Unknown value for option -X (see --help-xoptions)");
-    }
-
     if (config_get_xoption(config, L"showrefcount")) {
         config->show_ref_count = 1;
     }


From webhook-mailer at python.org  Sun Jul 31 11:39:46 2022
From: webhook-mailer at python.org (pablogsal)
Date: Sun, 31 Jul 2022 15:39:46 -0000
Subject: [Python-checkins] [3.11] gh-95174: Handle missing dup() and
 constants in WASI (GH-95229) (GH-95272)
Message-ID: <mailman.394.1659281987.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/db13c0c1b8bc8c15d920a94ca008aabea4037697
commit: db13c0c1b8bc8c15d920a94ca008aabea4037697
branch: 3.11
author: Christian Heimes <christian at python.org>
committer: pablogsal <Pablogsal at gmail.com>
date: 2022-07-31T16:39:41+01:00
summary:

[3.11] gh-95174: Handle missing dup() and constants in WASI (GH-95229) (GH-95272)

Co-authored-by: Christian Heimes <christian at python.org>

files:
A Misc/NEWS.d/next/Build/2022-07-25-08-59-35.gh-issue-95174.g8woUW.rst
M Modules/clinic/posixmodule.c.h
M Modules/errnomodule.c
M Modules/posixmodule.c
M Modules/selectmodule.c
M Modules/socketmodule.c
M PC/pyconfig.h
M Python/dup2.c
M Python/fileutils.c
M configure
M configure.ac
M pyconfig.h.in

diff --git a/Misc/NEWS.d/next/Build/2022-07-25-08-59-35.gh-issue-95174.g8woUW.rst b/Misc/NEWS.d/next/Build/2022-07-25-08-59-35.gh-issue-95174.g8woUW.rst
new file mode 100644
index 0000000000000..05f29955072c5
--- /dev/null
+++ b/Misc/NEWS.d/next/Build/2022-07-25-08-59-35.gh-issue-95174.g8woUW.rst
@@ -0,0 +1,2 @@
+Python now detects missing ``dup`` function in WASI and works around some
+missing :mod:`errno`, :mod:`select`, and :mod:`socket` constants.
diff --git a/Modules/clinic/posixmodule.c.h b/Modules/clinic/posixmodule.c.h
index aaf3bf33b5352..ca2699b4e366a 100644
--- a/Modules/clinic/posixmodule.c.h
+++ b/Modules/clinic/posixmodule.c.h
@@ -4691,6 +4691,8 @@ os_dup(PyObject *module, PyObject *arg)
     return return_value;
 }
 
+#if ((defined(HAVE_DUP3) || defined(F_DUPFD) || defined(MS_WINDOWS)))
+
 PyDoc_STRVAR(os_dup2__doc__,
 "dup2($module, /, fd, fd2, inheritable=True)\n"
 "--\n"
@@ -4746,6 +4748,8 @@ os_dup2(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObject *kwn
     return return_value;
 }
 
+#endif /* ((defined(HAVE_DUP3) || defined(F_DUPFD) || defined(MS_WINDOWS))) */
+
 #if defined(HAVE_LOCKF)
 
 PyDoc_STRVAR(os_lockf__doc__,
@@ -9123,6 +9127,10 @@ os_waitstatus_to_exitcode(PyObject *module, PyObject *const *args, Py_ssize_t na
     #define OS_TCSETPGRP_METHODDEF
 #endif /* !defined(OS_TCSETPGRP_METHODDEF) */
 
+#ifndef OS_DUP2_METHODDEF
+    #define OS_DUP2_METHODDEF
+#endif /* !defined(OS_DUP2_METHODDEF) */
+
 #ifndef OS_LOCKF_METHODDEF
     #define OS_LOCKF_METHODDEF
 #endif /* !defined(OS_LOCKF_METHODDEF) */
@@ -9370,4 +9378,4 @@ os_waitstatus_to_exitcode(PyObject *module, PyObject *const *args, Py_ssize_t na
 #ifndef OS_WAITSTATUS_TO_EXITCODE_METHODDEF
     #define OS_WAITSTATUS_TO_EXITCODE_METHODDEF
 #endif /* !defined(OS_WAITSTATUS_TO_EXITCODE_METHODDEF) */
-/*[clinic end generated code: output=2a53748bcf001a3f input=a9049054013a1b77]*/
+/*[clinic end generated code: output=3032d9c5c3aaa165 input=a9049054013a1b77]*/
diff --git a/Modules/errnomodule.c b/Modules/errnomodule.c
index bf6766e02349c..0516e7367050c 100644
--- a/Modules/errnomodule.c
+++ b/Modules/errnomodule.c
@@ -280,6 +280,10 @@ errno_exec(PyObject *module)
 #ifdef ENOANO
     add_errcode("ENOANO", ENOANO, "No anode");
 #endif
+#if defined(__wasi__) && !defined(ESHUTDOWN)
+    // WASI SDK 16 does not have ESHUTDOWN, shutdown results in EPIPE.
+    #define ESHUTDOWN EPIPE
+#endif
 #ifdef ESHUTDOWN
     add_errcode("ESHUTDOWN", ESHUTDOWN, "Cannot send after transport endpoint shutdown");
 #else
diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
index f97013fa7a9d0..378032501f9e8 100644
--- a/Modules/posixmodule.c
+++ b/Modules/posixmodule.c
@@ -9346,7 +9346,9 @@ os_dup_impl(PyObject *module, int fd)
     return _Py_dup(fd);
 }
 
-
+// dup2() is either provided by libc or dup2.c with AC_REPLACE_FUNCS().
+// dup2.c provides working dup2() if and only if F_DUPFD is available.
+#if (defined(HAVE_DUP3) || defined(F_DUPFD) || defined(MS_WINDOWS))
 /*[clinic input]
 os.dup2 -> int
     fd: int
@@ -9446,6 +9448,7 @@ os_dup2_impl(PyObject *module, int fd, int fd2, int inheritable)
 
     return res;
 }
+#endif
 
 
 #ifdef HAVE_LOCKF
diff --git a/Modules/selectmodule.c b/Modules/selectmodule.c
index 5c36eaaedeb70..4eea928a2683a 100644
--- a/Modules/selectmodule.c
+++ b/Modules/selectmodule.c
@@ -63,6 +63,11 @@ extern void bzero(void *, int);
 #  define SOCKET int
 #endif
 
+// WASI SDK 16 does not have POLLPRIO, define as no-op
+#if defined(__wasi__) && !defined(POLLPRI)
+#  define POLLPRI 0
+#endif
+
 typedef struct {
     PyObject *close;
     PyTypeObject *poll_Type;
diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
index 4e936e29a7cd9..7240739c7b3ba 100644
--- a/Modules/socketmodule.c
+++ b/Modules/socketmodule.c
@@ -7650,6 +7650,10 @@ PyInit__socket(void)
     PyModule_AddIntMacro(m, MSG_EOR);
 #endif
 #ifdef  MSG_TRUNC
+    // workaround for https://github.com/WebAssembly/wasi-libc/issues/305
+    #if defined(__wasi__) && !defined(__WASI_RIFLAGS_RECV_DATA_TRUNCATED)
+    #  define __WASI_RIFLAGS_RECV_DATA_TRUNCATED 2
+    #endif
     PyModule_AddIntMacro(m, MSG_TRUNC);
 #endif
 #ifdef  MSG_CTRUNC
diff --git a/PC/pyconfig.h b/PC/pyconfig.h
index f71d5fe00d575..f1673a168ffb3 100644
--- a/PC/pyconfig.h
+++ b/PC/pyconfig.h
@@ -681,6 +681,9 @@ Py_NO_ENABLE_SHARED to find out.  Also support MS_NO_COREDLL for b/w compat */
 /* Define if you have the 'inet_pton' function. */
 #define HAVE_INET_PTON 1
 
+/* Define to 1 if you have the `dup' function. */
+#define HAVE_DUP 1
+
 /* framework name */
 #define _PYTHONFRAMEWORK ""
 
diff --git a/Python/dup2.c b/Python/dup2.c
index 7c6bbfce11dbf..a1df049209916 100644
--- a/Python/dup2.c
+++ b/Python/dup2.c
@@ -11,6 +11,7 @@
  * Return fd2 if all went well; return BADEXIT otherwise.
  */
 
+#include <errno.h>
 #include <fcntl.h>
 #include <unistd.h>
 
@@ -20,12 +21,17 @@ int
 dup2(int fd1, int fd2)
 {
     if (fd1 != fd2) {
+#ifdef F_DUPFD
         if (fcntl(fd1, F_GETFL) < 0)
             return BADEXIT;
         if (fcntl(fd2, F_GETFL) >= 0)
             close(fd2);
         if (fcntl(fd1, F_DUPFD, fd2) < 0)
             return BADEXIT;
+#else
+        errno = ENOTSUP;
+        return BADEXIT;
+#endif
     }
     return fd2;
 }
diff --git a/Python/fileutils.c b/Python/fileutils.c
index 4f7f8944a72da..27924261f4396 100644
--- a/Python/fileutils.c
+++ b/Python/fileutils.c
@@ -2379,7 +2379,7 @@ _Py_dup(int fd)
         return -1;
     }
 
-#else
+#elif HAVE_DUP
     Py_BEGIN_ALLOW_THREADS
     _Py_BEGIN_SUPPRESS_IPH
     fd = dup(fd);
@@ -2396,6 +2396,10 @@ _Py_dup(int fd)
         _Py_END_SUPPRESS_IPH
         return -1;
     }
+#else
+    errno = ENOTSUP;
+    PyErr_SetFromErrno(PyExc_OSError);
+    return -1;
 #endif
     return fd;
 }
diff --git a/configure b/configure
index 19316baa6ee12..39f7cd8eaec0a 100755
--- a/configure
+++ b/configure
@@ -14953,7 +14953,7 @@ fi
 # checks for library functions
 for ac_func in  \
   accept4 alarm bind_textdomain_codeset chmod chown clock close_range confstr \
-  copy_file_range ctermid dup3 execv explicit_bzero explicit_memset \
+  copy_file_range ctermid dup dup3 execv explicit_bzero explicit_memset \
   faccessat fchmod fchmodat fchown fchownat fdopendir fdwalk fexecve \
   fork fork1 fpathconf fstatat ftime ftruncate futimens futimes futimesat \
   gai_strerror getegid getentropy geteuid getgid getgrgid getgrgid_r \
diff --git a/configure.ac b/configure.ac
index f1fa570556235..60daab58d24b8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4537,7 +4537,7 @@ fi
 # checks for library functions
 AC_CHECK_FUNCS([ \
   accept4 alarm bind_textdomain_codeset chmod chown clock close_range confstr \
-  copy_file_range ctermid dup3 execv explicit_bzero explicit_memset \
+  copy_file_range ctermid dup dup3 execv explicit_bzero explicit_memset \
   faccessat fchmod fchmodat fchown fchownat fdopendir fdwalk fexecve \
   fork fork1 fpathconf fstatat ftime ftruncate futimens futimes futimesat \
   gai_strerror getegid getentropy geteuid getgid getgrgid getgrgid_r \
diff --git a/pyconfig.h.in b/pyconfig.h.in
index 01928cbb33ad5..4aaa32c8b4336 100644
--- a/pyconfig.h.in
+++ b/pyconfig.h.in
@@ -278,6 +278,9 @@
 /* Define to 1 if you have the `dlopen' function. */
 #undef HAVE_DLOPEN
 
+/* Define to 1 if you have the `dup' function. */
+#undef HAVE_DUP
+
 /* Define to 1 if you have the `dup2' function. */
 #undef HAVE_DUP2
 


From webhook-mailer at python.org  Sun Jul 31 11:58:07 2022
From: webhook-mailer at python.org (miss-islington)
Date: Sun, 31 Jul 2022 15:58:07 -0000
Subject: [Python-checkins] bpo-45445: Revert "bpo-45445: Fail if an invalid
 X-option is provided in the command line (GH-28823)" (GH-94745)
Message-ID: <mailman.395.1659283088.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/147a9a8be79fb5666e264175e3047d6d67b50254
commit: 147a9a8be79fb5666e264175e3047d6d67b50254
branch: 3.11
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-31T08:58:02-07:00
summary:

bpo-45445: Revert "bpo-45445: Fail if an invalid X-option is provided in the command line (GH-28823)" (GH-94745)

(cherry picked from commit aa37ffda29ac48fb2df5a7029ba2e626ecc45850)

Co-authored-by: Pablo Galindo Salgado <Pablogsal at gmail.com>

files:
M Doc/library/sys.rst
M Lib/test/test_audit.py
M Lib/test/test_cmd_line.py
M Lib/test/test_embed.py
M Programs/_testembed.c
M Python/initconfig.c

diff --git a/Doc/library/sys.rst b/Doc/library/sys.rst
index e10efb10ff5a8..1ac529ada1ce8 100644
--- a/Doc/library/sys.rst
+++ b/Doc/library/sys.rst
@@ -1778,13 +1778,13 @@ always available.
 
    .. code-block:: shell-session
 
-      $ ./python -Xpycache_prefix=some_path -Xdev
+      $ ./python -Xa=b -Xc
       Python 3.2a3+ (py3k, Oct 16 2010, 20:14:50)
       [GCC 4.4.3] on linux2
       Type "help", "copyright", "credits" or "license" for more information.
       >>> import sys
       >>> sys._xoptions
-      {'pycache_prefix': 'some_path', 'dev': True}
+      {'a': 'b', 'c': True}
 
    .. impl-detail::
 
diff --git a/Lib/test/test_audit.py b/Lib/test/test_audit.py
index a7ff038c0936e..18426f27a2e32 100644
--- a/Lib/test/test_audit.py
+++ b/Lib/test/test_audit.py
@@ -20,7 +20,7 @@ class AuditTest(unittest.TestCase):
     @support.requires_subprocess()
     def do_test(self, *args):
         with subprocess.Popen(
-            [sys.executable, "-Xutf8", AUDIT_TESTS_PY, *args],
+            [sys.executable, "-X utf8", AUDIT_TESTS_PY, *args],
             encoding="utf-8",
             stdout=subprocess.PIPE,
             stderr=subprocess.PIPE,
@@ -35,7 +35,7 @@ def do_test(self, *args):
     def run_python(self, *args):
         events = []
         with subprocess.Popen(
-            [sys.executable, "-Xutf8", AUDIT_TESTS_PY, *args],
+            [sys.executable, "-X utf8", AUDIT_TESTS_PY, *args],
             encoding="utf-8",
             stdout=subprocess.PIPE,
             stderr=subprocess.PIPE,
diff --git a/Lib/test/test_cmd_line.py b/Lib/test/test_cmd_line.py
index 83a357fe6b37d..037606d755f90 100644
--- a/Lib/test/test_cmd_line.py
+++ b/Lib/test/test_cmd_line.py
@@ -108,17 +108,8 @@ def get_xoptions(*args):
         opts = get_xoptions()
         self.assertEqual(opts, {})
 
-        opts = get_xoptions('-Xno_debug_ranges', '-Xdev=1234')
-        self.assertEqual(opts, {'no_debug_ranges': True, 'dev': '1234'})
-
-    @unittest.skipIf(interpreter_requires_environment(),
-                     'Cannot run -E tests when PYTHON env vars are required.')
-    def test_unknown_xoptions(self):
-        rc, out, err = assert_python_failure('-X', 'blech')
-        self.assertIn(b'Unknown value for option -X', err)
-        msg = b'Fatal Python error: Unknown value for option -X (see --help-xoptions)'
-        self.assertEqual(err.splitlines().count(msg), 1)
-        self.assertEqual(b'', out)
+        opts = get_xoptions('-Xa', '-Xb=c,d=e')
+        self.assertEqual(opts, {'a': True, 'b': 'c,d=e'})
 
     def test_showrefcount(self):
         def run_python(*args):
diff --git a/Lib/test/test_embed.py b/Lib/test/test_embed.py
index de3354b6b5950..90022db0c51c3 100644
--- a/Lib/test/test_embed.py
+++ b/Lib/test/test_embed.py
@@ -284,7 +284,7 @@ def test_pre_initialization_sys_options(self):
                         "test_pre_initialization_sys_options", env=env)
         expected_output = (
             "sys.warnoptions: ['once', 'module', 'default']\n"
-            "sys._xoptions: {'dev': '2', 'utf8': '1'}\n"
+            "sys._xoptions: {'not_an_option': '1', 'also_not_an_option': '2'}\n"
             "warnings.filters[:3]: ['default', 'module', 'once']\n"
         )
         self.assertIn(expected_output, out)
@@ -842,14 +842,15 @@ def test_init_from_config(self):
             'argv': ['-c', 'arg2'],
             'orig_argv': ['python3',
                           '-W', 'cmdline_warnoption',
-                          '-X', 'dev',
+                          '-X', 'cmdline_xoption',
                           '-c', 'pass',
                           'arg2'],
             'parse_argv': 2,
             'xoptions': [
-                'dev=3',
-                'utf8',
-                'dev',
+                'config_xoption1=3',
+                'config_xoption2=',
+                'config_xoption3',
+                'cmdline_xoption',
             ],
             'warnoptions': [
                 'cmdline_warnoption',
@@ -1077,8 +1078,9 @@ def test_init_sys_add(self):
         config = {
             'faulthandler': 1,
             'xoptions': [
-                'dev',
-                'utf8',
+                'config_xoption',
+                'cmdline_xoption',
+                'sysadd_xoption',
                 'faulthandler',
             ],
             'warnoptions': [
@@ -1088,12 +1090,9 @@ def test_init_sys_add(self):
             ],
             'orig_argv': ['python3',
                           '-W', 'ignore:::cmdline_warnoption',
-                          '-X', 'utf8'],
+                          '-X', 'cmdline_xoption'],
         }
-        preconfig = {'utf8_mode': 1}
-        self.check_all_configs("test_init_sys_add", config,
-                               expected_preconfig=preconfig,
-                               api=API_PYTHON)
+        self.check_all_configs("test_init_sys_add", config, api=API_PYTHON)
 
     def test_init_run_main(self):
         code = ('import _testinternalcapi, json; '
diff --git a/Programs/_testembed.c b/Programs/_testembed.c
index 6b43d53403014..f84445690eb8f 100644
--- a/Programs/_testembed.c
+++ b/Programs/_testembed.c
@@ -279,7 +279,7 @@ static int test_pre_initialization_sys_options(void)
      * relying on the caller to keep the passed in strings alive.
      */
     const wchar_t *static_warnoption = L"once";
-    const wchar_t *static_xoption = L"utf8=1";
+    const wchar_t *static_xoption = L"also_not_an_option=2";
     size_t warnoption_len = wcslen(static_warnoption);
     size_t xoption_len = wcslen(static_xoption);
     wchar_t *dynamic_once_warnoption = \
@@ -298,7 +298,7 @@ static int test_pre_initialization_sys_options(void)
     PySys_AddWarnOption(L"module");
     PySys_AddWarnOption(L"default");
     _Py_EMBED_PREINIT_CHECK("Checking PySys_AddXOption\n");
-    PySys_AddXOption(L"dev=2");
+    PySys_AddXOption(L"not_an_option=1");
     PySys_AddXOption(dynamic_xoption);
 
     /* Delete the dynamic options early */
@@ -591,7 +591,7 @@ static int test_init_from_config(void)
         L"-W",
         L"cmdline_warnoption",
         L"-X",
-        L"dev",
+        L"cmdline_xoption",
         L"-c",
         L"pass",
         L"arg2",
@@ -599,9 +599,10 @@ static int test_init_from_config(void)
     config_set_argv(&config, Py_ARRAY_LENGTH(argv), argv);
     config.parse_argv = 1;
 
-    wchar_t* xoptions[2] = {
-        L"dev=3",
-        L"utf8",
+    wchar_t* xoptions[3] = {
+        L"config_xoption1=3",
+        L"config_xoption2=",
+        L"config_xoption3",
     };
     config_set_wide_string_list(&config, &config.xoptions,
                                 Py_ARRAY_LENGTH(xoptions), xoptions);
@@ -1425,6 +1426,7 @@ static int test_init_read_set(void)
 
 static int test_init_sys_add(void)
 {
+    PySys_AddXOption(L"sysadd_xoption");
     PySys_AddXOption(L"faulthandler");
     PySys_AddWarnOption(L"ignore:::sysadd_warnoption");
 
@@ -1436,14 +1438,14 @@ static int test_init_sys_add(void)
         L"-W",
         L"ignore:::cmdline_warnoption",
         L"-X",
-        L"utf8",
+        L"cmdline_xoption",
     };
     config_set_argv(&config, Py_ARRAY_LENGTH(argv), argv);
     config.parse_argv = 1;
 
     PyStatus status;
     status = PyWideStringList_Append(&config.xoptions,
-                                     L"dev");
+                                     L"config_xoption");
     if (PyStatus_Exception(status)) {
         goto fail;
     }
diff --git a/Python/initconfig.c b/Python/initconfig.c
index d31385039932b..3980b2140a0af 100644
--- a/Python/initconfig.c
+++ b/Python/initconfig.c
@@ -2046,49 +2046,6 @@ _PyConfig_InitImportConfig(PyConfig *config)
     return config_init_import(config, 1);
 }
 
-// List of known xoptions to validate against the provided ones. Note that all
-// options are listed, even if they are only available if a specific macro is
-// set, like -X showrefcount which requires a debug build. In this case unknown
-// options are silently ignored.
-const wchar_t* known_xoptions[] = {
-    L"faulthandler",
-    L"showrefcount",
-    L"tracemalloc",
-    L"importtime",
-    L"dev",
-    L"utf8",
-    L"pycache_prefix",
-    L"warn_default_encoding",
-    L"no_debug_ranges",
-    L"frozen_modules",
-    NULL,
-};
-
-static const wchar_t*
-_Py_check_xoptions(const PyWideStringList *xoptions, const wchar_t **names)
-{
-    for (Py_ssize_t i=0; i < xoptions->length; i++) {
-        const wchar_t *option = xoptions->items[i];
-        size_t len;
-        wchar_t *sep = wcschr(option, L'=');
-        if (sep != NULL) {
-            len = (sep - option);
-        }
-        else {
-            len = wcslen(option);
-        }
-        int found = 0;
-        for (const wchar_t** name = names; *name != NULL; name++) {
-            if (wcsncmp(option, *name, len) == 0 && (*name)[len] == L'\0') {
-                found = 1;
-            }
-        }
-        if (found == 0) {
-            return option;
-        }
-    }
-    return NULL;
-}
 
 static PyStatus
 config_read(PyConfig *config, int compute_path_config)
@@ -2104,11 +2061,6 @@ config_read(PyConfig *config, int compute_path_config)
     }
 
     /* -X options */
-    const wchar_t* option = _Py_check_xoptions(&config->xoptions, known_xoptions);
-    if (option != NULL) {
-        return PyStatus_Error("Unknown value for option -X (see --help-xoptions)");
-    }
-
     if (config_get_xoption(config, L"showrefcount")) {
         config->show_ref_count = 1;
     }


From webhook-mailer at python.org  Sun Jul 31 12:19:41 2022
From: webhook-mailer at python.org (tiran)
Date: Sun, 31 Jul 2022 16:19:41 -0000
Subject: [Python-checkins] [3.11] gh-95174: WASI: skip missing sockets
 functions (GH-95179) (GH-95308)
Message-ID: <mailman.396.1659284382.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/06b5f78d64763dfd05aa0cc8b3419de9e9c2ab50
commit: 06b5f78d64763dfd05aa0cc8b3419de9e9c2ab50
branch: 3.11
author: Christian Heimes <christian at python.org>
committer: tiran <christian at python.org>
date: 2022-07-31T18:19:32+02:00
summary:

[3.11] gh-95174: WASI: skip missing sockets functions (GH-95179) (GH-95308)

Co-authored-by: Christian Heimes <christian at python.org>
Co-authored-by: Pablo Galindo Salgado <Pablogsal at gmail.com>

files:
A Misc/NEWS.d/next/Build/2022-07-23-21-39-09.gh-issue-95174.7cYMZR.rst
M Lib/test/test_socket.py
M Modules/addrinfo.h
M Modules/getaddrinfo.c
M Modules/getnameinfo.c
M Modules/socketmodule.c
M PC/pyconfig.h
M Tools/wasm/config.site-wasm32-wasi
M configure
M configure.ac
M pyconfig.h.in

diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py
index a2938cd834ac1..72e3394df2d64 100644
--- a/Lib/test/test_socket.py
+++ b/Lib/test/test_socket.py
@@ -956,6 +956,19 @@ def testWindowsSpecificConstants(self):
         socket.IPPROTO_L2TP
         socket.IPPROTO_SCTP
 
+    @unittest.skipIf(support.is_wasi, "WASI is missing these methods")
+    def test_socket_methods(self):
+        # socket methods that depend on a configure HAVE_ check. They should
+        # be present on all platforms except WASI.
+        names = [
+            "_accept", "bind", "connect", "connect_ex", "getpeername",
+            "getsockname", "listen", "recvfrom", "recvfrom_into", "sendto",
+            "setsockopt", "shutdown"
+        ]
+        for name in names:
+            if not hasattr(socket.socket, name):
+                self.fail(f"socket method {name} is missing")
+
     @unittest.skipUnless(sys.platform == 'darwin', 'macOS specific test')
     @unittest.skipUnless(socket_helper.IPV6_ENABLED, 'IPv6 required for this test')
     def test3542SocketOptions(self):
diff --git a/Misc/NEWS.d/next/Build/2022-07-23-21-39-09.gh-issue-95174.7cYMZR.rst b/Misc/NEWS.d/next/Build/2022-07-23-21-39-09.gh-issue-95174.7cYMZR.rst
new file mode 100644
index 0000000000000..72ce183ac8329
--- /dev/null
+++ b/Misc/NEWS.d/next/Build/2022-07-23-21-39-09.gh-issue-95174.7cYMZR.rst
@@ -0,0 +1 @@
+Python now skips missing :mod:`socket` functions and methods on WASI. WASI can only create sockets from existing fd / accept and has no netdb.
diff --git a/Modules/addrinfo.h b/Modules/addrinfo.h
index c3c86248dd436..66e5a795f86f1 100644
--- a/Modules/addrinfo.h
+++ b/Modules/addrinfo.h
@@ -162,7 +162,9 @@ struct sockaddr_storage {
 #ifdef __cplusplus
 extern "C" {
 #endif
+#ifdef ENABLE_IPV6
 extern void freehostent(struct hostent *);
+#endif
 #ifdef __cplusplus
 }
 #endif
diff --git a/Modules/getaddrinfo.c b/Modules/getaddrinfo.c
index 5aaa6e7c8144f..0b4620ed683de 100644
--- a/Modules/getaddrinfo.c
+++ b/Modules/getaddrinfo.c
@@ -61,6 +61,9 @@
 # define FAITH
 #endif
 
+#ifdef HAVE_NETDB_H
+#define HAVE_GETADDRINFO 1
+
 #define SUCCESS 0
 #define GAI_ANY 0
 #define YES 1
@@ -636,3 +639,5 @@ get_addr(hostname, af, res, pai, port0)
     *res = NULL;
     return error;
 }
+
+#endif // HAVE_NETDB_H
diff --git a/Modules/getnameinfo.c b/Modules/getnameinfo.c
index db3e8eedd217c..335021f79bafe 100644
--- a/Modules/getnameinfo.c
+++ b/Modules/getnameinfo.c
@@ -48,6 +48,9 @@
 #include "addrinfo.h"
 #endif
 
+#ifdef HAVE_NETDB_H
+#define HAVE_GETNAMEINFO 1
+
 #define SUCCESS 0
 #define YES 1
 #define NO  0
@@ -211,3 +214,4 @@ getnameinfo(sa, salen, host, hostlen, serv, servlen, flags)
     }
     return SUCCESS;
 }
+#endif // HAVE_NETDB_H
diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
index 7240739c7b3ba..14af496a45f47 100644
--- a/Modules/socketmodule.c
+++ b/Modules/socketmodule.c
@@ -227,7 +227,7 @@ shutdown(how) -- shut down traffic in one or both directions\n\
 
 #define HAVE_INET_PTON
 #include <netdb.h>
-#endif
+#endif // __sgi
 
 /* Solaris fails to define this variable at all. */
 #if (defined(__sun) && defined(__SVR4)) && !defined(INET_ADDRSTRLEN)
@@ -256,7 +256,9 @@ shutdown(how) -- shut down traffic in one or both directions\n\
 #ifndef MS_WINDOWS
 
 /* Non-MS WINDOWS includes */
-# include <netdb.h>
+#ifdef HAVE_NETDB_H
+#  include <netdb.h>
+#endif
 # include <unistd.h>
 
 /* Headers needed for inet_ntoa() and inet_addr() */
@@ -436,10 +438,11 @@ remove_unusable_flags(PyObject *m)
 #define freeaddrinfo fake_freeaddrinfo
 #include "getaddrinfo.c"
 #endif
+
 #if !defined(HAVE_GETNAMEINFO)
 #define getnameinfo fake_getnameinfo
 #include "getnameinfo.c"
-#endif
+#endif // HAVE_GETNAMEINFO
 
 #ifdef MS_WINDOWS
 #define SOCKETCLOSE closesocket
@@ -620,6 +623,7 @@ set_error(void)
 }
 
 
+#if defined(HAVE_GETHOSTBYNAME_R) || defined (HAVE_GETHOSTBYNAME) || defined (HAVE_GETHOSTBYADDR)
 static PyObject *
 set_herror(int h_error)
 {
@@ -637,8 +641,10 @@ set_herror(int h_error)
 
     return NULL;
 }
+#endif
 
 
+#ifdef HAVE_GETADDRINFO
 static PyObject *
 set_gaierror(int error)
 {
@@ -662,6 +668,7 @@ set_gaierror(int error)
 
     return NULL;
 }
+#endif
 
 /* Function to perform the setting of socket blocking mode
    internally. block = (1 | 0). */
@@ -1043,6 +1050,7 @@ static PyThread_type_lock netdb_lock;
 #endif
 
 
+#ifdef HAVE_GETADDRINFO
 /* Convert a string specifying a host name or one of a few symbolic
    names to a numeric IP address.  This usually calls gethostbyname()
    to do the work; the names "" and "<broadcast>" are special.
@@ -1199,7 +1207,7 @@ setipaddr(const char *name, struct sockaddr *addr_ret, size_t addr_ret_size, int
         return -1;
     }
 }
-
+#endif // HAVE_GETADDRINFO
 
 /* Convert IPv4 sockaddr to a Python str. */
 
@@ -1594,6 +1602,7 @@ makesockaddr(SOCKET_T sockfd, struct sockaddr *addr, size_t addrlen, int proto)
     }
 }
 
+#if defined(HAVE_BIND) || defined(HAVE_CONNECTTO) || defined(CMSG_LEN)
 /* Helper for getsockaddrarg: bypass IDNA for ASCII-only host names
    (in particular, numeric IP addresses). */
 struct maybe_idna {
@@ -2388,6 +2397,7 @@ getsockaddrarg(PySocketSockObject *s, PyObject *args,
 
     }
 }
+#endif // defined(HAVE_BIND) || defined(HAVE_CONNECTTO) || defined(CMSG_LEN)
 
 
 /* Get the address length according to the socket object's address family.
@@ -2678,6 +2688,7 @@ struct sock_accept {
     SOCKET_T result;
 };
 
+#if defined(HAVE_ACCEPT) || defined(HAVE_ACCEPT4)
 #if defined(HAVE_ACCEPT4) && defined(SOCK_CLOEXEC)
 /* accept4() is available on Linux 2.6.28+ and glibc 2.10 */
 static int accept4_works = -1;
@@ -2791,6 +2802,8 @@ PyDoc_STRVAR(accept_doc,
 Wait for an incoming connection.  Return a new socket file descriptor\n\
 representing the connection, and the address of the client.\n\
 For IP sockets, the address info is a pair (hostaddr, port).");
+#endif // defined(HAVE_ACCEPT) || defined(HAVE_ACCEPT4)
+
 
 /* s.setblocking(flag) method.  Argument:
    False -- non-blocking mode; same as settimeout(0)
@@ -2955,6 +2968,7 @@ Returns the timeout in seconds (float) associated with socket\n\
 operations. A timeout of None indicates that timeouts on socket\n\
 operations are disabled.");
 
+#ifdef HAVE_SETSOCKOPT
 /* s.setsockopt() method.
    With an integer third argument, sets an integer optval with optlen=4.
    With None as third argument and an integer fourth argument, set
@@ -3044,7 +3058,7 @@ setsockopt(level, option, None, optlen: int)\n\
 Set a socket option.  See the Unix manual for level and option.\n\
 The value argument can either be an integer, a string buffer, or\n\
 None, optlen.");
-
+#endif
 
 /* s.getsockopt() method.
    With two arguments, retrieves an integer option.
@@ -3118,6 +3132,7 @@ If a nonzero buffersize argument is given, the return value is a\n\
 string of that length; otherwise it is an integer.");
 
 
+#ifdef HAVE_BIND
 /* s.bind(sockaddr) method */
 
 static PyObject *
@@ -3149,6 +3164,7 @@ PyDoc_STRVAR(bind_doc,
 Bind the socket to a local address.  For IP sockets, the address is a\n\
 pair (host, port); the host must refer to the local host. For raw packet\n\
 sockets the address is a tuple (ifname, proto [,pkttype [,hatype [,addr]]])");
+#endif
 
 
 /* s.close() method.
@@ -3201,6 +3217,7 @@ Close the socket object without closing the underlying file descriptor.\n\
 The object cannot be used after this call, but the file descriptor\n\
 can be reused for other purposes.  The file descriptor is returned.");
 
+#ifdef HAVE_CONNECT
 static int
 sock_connect_impl(PySocketSockObject *s, void* Py_UNUSED(data))
 {
@@ -3348,6 +3365,7 @@ PyDoc_STRVAR(connect_ex_doc,
 \n\
 This is like connect(address), but returns an error code (the errno value)\n\
 instead of raising an exception when an error occurs.");
+#endif // HAVE_CONNECT
 
 
 /* s.fileno() method */
@@ -3364,6 +3382,7 @@ PyDoc_STRVAR(fileno_doc,
 Return the integer file descriptor of the socket.");
 
 
+#ifdef HAVE_GETSOCKNAME
 /* s.getsockname() method */
 
 static PyObject *
@@ -3391,6 +3410,7 @@ PyDoc_STRVAR(getsockname_doc,
 Return the address of the local endpoint. The format depends on the\n\
 address family. For IPv4 sockets, the address info is a pair\n\
 (hostaddr, port).");
+#endif
 
 
 #ifdef HAVE_GETPEERNAME         /* Cray APP doesn't have this :-( */
@@ -3424,6 +3444,7 @@ info is a pair (hostaddr, port).");
 #endif /* HAVE_GETPEERNAME */
 
 
+#ifdef HAVE_LISTEN
 /* s.listen(n) method */
 
 static PyObject *
@@ -3456,6 +3477,7 @@ Enable a server to accept connections.  If backlog is specified, it must be\n\
 at least 0 (if it is lower, it is set to 0); it specifies the number of\n\
 unaccepted connections that the system will allow before refusing new\n\
 connections. If not specified, a default reasonable value is chosen.");
+#endif
 
 struct sock_recv {
     char *cbuf;
@@ -3632,6 +3654,7 @@ struct sock_recvfrom {
     Py_ssize_t result;
 };
 
+#ifdef HAVE_RECVFROM
 static int
 sock_recvfrom_impl(PySocketSockObject *s, void *data)
 {
@@ -3804,6 +3827,7 @@ PyDoc_STRVAR(recvfrom_into_doc,
 "recvfrom_into(buffer[, nbytes[, flags]]) -> (nbytes, address info)\n\
 \n\
 Like recv_into(buffer[, nbytes[, flags]]) but also return the sender's address info.");
+#endif
 
 /* The sendmsg() and recvmsg[_into]() methods require a working
    CMSG_LEN().  See the comment near get_CMSG_LEN(). */
@@ -4270,6 +4294,7 @@ until all data is sent.  If an error occurs, it's impossible\n\
 to tell how much data has been sent.");
 
 
+#ifdef HAVE_SENDTO
 struct sock_sendto {
     char *buf;
     Py_ssize_t len;
@@ -4362,6 +4387,7 @@ PyDoc_STRVAR(sendto_doc,
 \n\
 Like send(data, flags) but allows specifying the destination address.\n\
 For IP sockets, the address is a pair (hostaddr, port).");
+#endif
 
 
 /* The sendmsg() and recvmsg[_into]() methods require a working
@@ -4925,16 +4951,22 @@ socket.fromshare().");
 /* List of methods for socket objects */
 
 static PyMethodDef sock_methods[] = {
+#if defined(HAVE_ACCEPT) || defined(HAVE_ACCEPT4)
     {"_accept",           (PyCFunction)sock_accept, METH_NOARGS,
                       accept_doc},
+#endif
+#ifdef HAVE_BIND
     {"bind",              (PyCFunction)sock_bind, METH_O,
                       bind_doc},
+#endif
     {"close",             (PyCFunction)sock_close, METH_NOARGS,
                       sock_close_doc},
+#ifdef HAVE_CONNECT
     {"connect",           (PyCFunction)sock_connect, METH_O,
                       connect_doc},
     {"connect_ex",        (PyCFunction)sock_connect_ex, METH_O,
                       connect_ex_doc},
+#endif
     {"detach",            (PyCFunction)sock_detach, METH_NOARGS,
                       detach_doc},
     {"fileno",            (PyCFunction)sock_fileno, METH_NOARGS,
@@ -4943,8 +4975,10 @@ static PyMethodDef sock_methods[] = {
     {"getpeername",       (PyCFunction)sock_getpeername,
                       METH_NOARGS, getpeername_doc},
 #endif
+#ifdef HAVE_GETSOCKNAME
     {"getsockname",       (PyCFunction)sock_getsockname,
                       METH_NOARGS, getsockname_doc},
+#endif
     {"getsockopt",        (PyCFunction)sock_getsockopt, METH_VARARGS,
                       getsockopt_doc},
 #if defined(MS_WINDOWS) && defined(SIO_RCVALL)
@@ -4955,22 +4989,28 @@ static PyMethodDef sock_methods[] = {
     {"share",         (PyCFunction)sock_share, METH_VARARGS,
                       sock_share_doc},
 #endif
+#ifdef HAVE_LISTEN
     {"listen",            (PyCFunction)sock_listen, METH_VARARGS,
                       listen_doc},
+#endif
     {"recv",              (PyCFunction)sock_recv, METH_VARARGS,
                       recv_doc},
     {"recv_into",         _PyCFunction_CAST(sock_recv_into), METH_VARARGS | METH_KEYWORDS,
                       recv_into_doc},
+#ifdef HAVE_RECVFROM
     {"recvfrom",          (PyCFunction)sock_recvfrom, METH_VARARGS,
                       recvfrom_doc},
     {"recvfrom_into",  _PyCFunction_CAST(sock_recvfrom_into), METH_VARARGS | METH_KEYWORDS,
                       recvfrom_into_doc},
+#endif
     {"send",              (PyCFunction)sock_send, METH_VARARGS,
                       send_doc},
     {"sendall",           (PyCFunction)sock_sendall, METH_VARARGS,
                       sendall_doc},
+#ifdef HAVE_SENDTO
     {"sendto",            (PyCFunction)sock_sendto, METH_VARARGS,
                       sendto_doc},
+#endif
     {"setblocking",       (PyCFunction)sock_setblocking, METH_O,
                       setblocking_doc},
     {"getblocking",   (PyCFunction)sock_getblocking, METH_NOARGS,
@@ -4979,8 +5019,10 @@ static PyMethodDef sock_methods[] = {
                       settimeout_doc},
     {"gettimeout",    (PyCFunction)sock_gettimeout, METH_NOARGS,
                       gettimeout_doc},
+#ifdef HAVE_SETSOCKOPT
     {"setsockopt",        (PyCFunction)sock_setsockopt, METH_VARARGS,
                       setsockopt_doc},
+#endif
 #ifdef HAVE_SHUTDOWN
     {"shutdown",          (PyCFunction)sock_shutdown, METH_O,
                       shutdown_doc},
@@ -5116,6 +5158,16 @@ static int sock_cloexec_works = -1;
 
 /*ARGSUSED*/
 
+#ifndef HAVE_SOCKET
+#define socket stub_socket
+static int
+socket(int domain, int type, int protocol)
+{
+    errno = ENOTSUP;
+    return INVALID_SOCKET;
+}
+#endif
+
 /*[clinic input]
 _socket.socket.__init__ as sock_initobj
     family: int = -1
@@ -5202,6 +5254,7 @@ sock_initobj_impl(PySocketSockObject *self, int family, int type, int proto,
             socklen_t addrlen = sizeof(sock_addr_t);
 
             memset(&addrbuf, 0, addrlen);
+#ifdef HAVE_GETSOCKNAME
             if (getsockname(fd, SAS2SA(&addrbuf), &addrlen) == 0) {
                 if (family == -1) {
                     family = SAS2SA(&addrbuf)->sa_family;
@@ -5220,6 +5273,7 @@ sock_initobj_impl(PySocketSockObject *self, int family, int type, int proto,
                     return -1;
                 }
             }
+#endif // HAVE_GETSOCKNAME
 #ifdef SO_TYPE
             if (type == -1) {
                 int tmp;
@@ -5398,6 +5452,7 @@ static PyTypeObject sock_type = {
 };
 
 
+#ifdef HAVE_GETHOSTNAME
 /* Python interface to gethostname(). */
 
 /*ARGSUSED*/
@@ -5461,6 +5516,7 @@ PyDoc_STRVAR(gethostname_doc,
 "gethostname() -> string\n\
 \n\
 Return the current host name.");
+#endif
 
 #ifdef HAVE_SETHOSTNAME
 PyDoc_STRVAR(sethostname_doc,
@@ -5504,6 +5560,7 @@ extern int sethostname(const char *, size_t);
 }
 #endif
 
+#ifdef HAVE_GETADDRINFO
 /* Python interface to gethostbyname(name). */
 
 /*ARGSUSED*/
@@ -5531,8 +5588,10 @@ PyDoc_STRVAR(gethostbyname_doc,
 "gethostbyname(host) -> address\n\
 \n\
 Return the IP address (a string of the form '255.255.255.255') for a host.");
+#endif
 
 
+#if defined(HAVE_GETHOSTBYNAME_R) || defined (HAVE_GETHOSTBYNAME) || defined (HAVE_GETHOSTBYADDR)
 static PyObject*
 sock_decode_hostname(const char *name)
 {
@@ -5674,8 +5733,9 @@ gethost_common(struct hostent *h, struct sockaddr *addr, size_t alen, int af)
     Py_XDECREF(addr_list);
     return rtn_tuple;
 }
+#endif
 
-
+#if defined(HAVE_GETHOSTBYNAME_R) || defined (HAVE_GETHOSTBYNAME)
 /* Python interface to gethostbyname_ex(name). */
 
 /*ARGSUSED*/
@@ -5748,8 +5808,9 @@ PyDoc_STRVAR(ghbn_ex_doc,
 \n\
 Return the true host name, a list of aliases, and a list of IP addresses,\n\
 for a host.  The host argument is a string giving a host name or IP number.");
+#endif
 
-
+#if defined(HAVE_GETHOSTBYNAME_R) || defined (HAVE_GETHOSTBYADDR)
 /* Python interface to gethostbyaddr(IP). */
 
 /*ARGSUSED*/
@@ -5844,8 +5905,9 @@ PyDoc_STRVAR(gethostbyaddr_doc,
 \n\
 Return the true host name, a list of aliases, and a list of IP addresses,\n\
 for a host.  The host argument is a string giving a host name or IP number.");
+#endif
 
-
+#ifdef HAVE_GETSERVBYNAME
 /* Python interface to getservbyname(name).
    This only returns the port number, since the other info is already
    known or not useful (like the list of aliases). */
@@ -5879,8 +5941,9 @@ PyDoc_STRVAR(getservbyname_doc,
 Return a port number from a service name and protocol name.\n\
 The optional protocol name, if given, should be 'tcp' or 'udp',\n\
 otherwise any protocol will match.");
+#endif
 
-
+#ifdef HAVE_GETSERVBYPORT
 /* Python interface to getservbyport(port).
    This only returns the service name, since the other info is already
    known or not useful (like the list of aliases). */
@@ -5921,7 +5984,9 @@ PyDoc_STRVAR(getservbyport_doc,
 Return the service name from a port number and protocol name.\n\
 The optional protocol name, if given, should be 'tcp' or 'udp',\n\
 otherwise any protocol will match.");
+#endif
 
+#ifdef HAVE_GETPROTOBYNAME
 /* Python interface to getprotobyname(name).
    This only returns the protocol number, since the other info is
    already known or not useful (like the list of aliases). */
@@ -5948,6 +6013,7 @@ PyDoc_STRVAR(getprotobyname_doc,
 "getprotobyname(name) -> integer\n\
 \n\
 Return the protocol number for the named protocol.  (Rarely used.)");
+#endif
 
 static PyObject *
 socket_close(PyObject *self, PyObject *fdobj)
@@ -6317,6 +6383,7 @@ socket_inet_aton(PyObject *self, PyObject *args)
 #endif
 }
 
+#ifdef HAVE_INET_NTOA
 PyDoc_STRVAR(inet_ntoa_doc,
 "inet_ntoa(packed_ip) -> ip_address_string\n\
 \n\
@@ -6345,6 +6412,7 @@ socket_inet_ntoa(PyObject *self, PyObject *args)
     SUPPRESS_DEPRECATED_CALL
     return PyUnicode_FromString(inet_ntoa(packed_addr));
 }
+#endif // HAVE_INET_NTOA
 
 #ifdef HAVE_INET_PTON
 
@@ -6456,6 +6524,7 @@ socket_inet_ntop(PyObject *self, PyObject *args)
 
 #endif /* HAVE_INET_PTON */
 
+#ifdef HAVE_GETADDRINFO
 /* Python interface to getaddrinfo(host, port). */
 
 /*ARGSUSED*/
@@ -6583,7 +6652,9 @@ PyDoc_STRVAR(getaddrinfo_doc,
     -> list of (family, type, proto, canonname, sockaddr)\n\
 \n\
 Resolve host and port into addrinfo struct.");
+#endif // HAVE_GETADDRINFO
 
+#ifdef HAVE_GETNAMEINFO
 /* Python interface to getnameinfo(sa, flags). */
 
 /*ARGSUSED*/
@@ -6684,7 +6755,7 @@ PyDoc_STRVAR(getnameinfo_doc,
 "getnameinfo(sockaddr, flags) --> (host, port)\n\
 \n\
 Get host and port for a sockaddr.");
-
+#endif // HAVE_GETNAMEINFO
 
 /* Python API to getting and setting the default timeout value. */
 
@@ -6940,24 +7011,38 @@ range of values.");
 /* List of functions exported by this module. */
 
 static PyMethodDef socket_methods[] = {
+#ifdef HAVE_GETADDRINFO
     {"gethostbyname",           socket_gethostbyname,
      METH_VARARGS, gethostbyname_doc},
+#endif
+#if defined(HAVE_GETHOSTBYNAME_R) || defined (HAVE_GETHOSTBYNAME)
     {"gethostbyname_ex",        socket_gethostbyname_ex,
      METH_VARARGS, ghbn_ex_doc},
+#endif
+#if defined(HAVE_GETHOSTBYNAME_R) || defined (HAVE_GETHOSTBYADDR)
     {"gethostbyaddr",           socket_gethostbyaddr,
      METH_VARARGS, gethostbyaddr_doc},
+#endif
+#ifdef HAVE_GETHOSTNAME
     {"gethostname",             socket_gethostname,
      METH_NOARGS,  gethostname_doc},
+#endif
 #ifdef HAVE_SETHOSTNAME
     {"sethostname",             socket_sethostname,
      METH_VARARGS,  sethostname_doc},
 #endif
+#ifdef HAVE_GETSERVBYNAME
     {"getservbyname",           socket_getservbyname,
      METH_VARARGS, getservbyname_doc},
+#endif
+#ifdef HAVE_GETSERVBYPORT
     {"getservbyport",           socket_getservbyport,
      METH_VARARGS, getservbyport_doc},
+#endif
+#ifdef HAVE_GETPROTOBYNAME
     {"getprotobyname",          socket_getprotobyname,
      METH_VARARGS, getprotobyname_doc},
+#endif
     {"close",                   socket_close,
      METH_O, close_doc},
 #ifndef NO_DUP
@@ -6978,18 +7063,24 @@ static PyMethodDef socket_methods[] = {
      METH_O, htonl_doc},
     {"inet_aton",               socket_inet_aton,
      METH_VARARGS, inet_aton_doc},
+#ifdef HAVE_INET_NTOA
     {"inet_ntoa",               socket_inet_ntoa,
      METH_VARARGS, inet_ntoa_doc},
+#endif
 #ifdef HAVE_INET_PTON
     {"inet_pton",               socket_inet_pton,
      METH_VARARGS, inet_pton_doc},
     {"inet_ntop",               socket_inet_ntop,
      METH_VARARGS, inet_ntop_doc},
 #endif
+#ifdef HAVE_GETADDRINFO
     {"getaddrinfo",             _PyCFunction_CAST(socket_getaddrinfo),
      METH_VARARGS | METH_KEYWORDS, getaddrinfo_doc},
+#endif
+#ifdef HAVE_GETNAMEINFO
     {"getnameinfo",             socket_getnameinfo,
      METH_VARARGS, getnameinfo_doc},
+#endif
     {"getdefaulttimeout",       socket_getdefaulttimeout,
      METH_NOARGS, getdefaulttimeout_doc},
     {"setdefaulttimeout",       socket_setdefaulttimeout,
@@ -7498,7 +7589,9 @@ PyInit__socket(void)
     /* SOCK_RAW is marked as optional in the POSIX specification */
     PyModule_AddIntMacro(m, SOCK_RAW);
 #endif
+#ifdef SOCK_SEQPACKET
     PyModule_AddIntMacro(m, SOCK_SEQPACKET);
+#endif
 #if defined(SOCK_RDM)
     PyModule_AddIntMacro(m, SOCK_RDM);
 #endif
diff --git a/PC/pyconfig.h b/PC/pyconfig.h
index f1673a168ffb3..959b851ddcc97 100644
--- a/PC/pyconfig.h
+++ b/PC/pyconfig.h
@@ -678,8 +678,25 @@ Py_NO_ENABLE_SHARED to find out.  Also support MS_NO_COREDLL for b/w compat */
 /* Define to 1 if you have the `erfc' function. */
 #define HAVE_ERFC 1
 
-/* Define if you have the 'inet_pton' function. */
+// netdb.h functions (provided by winsock.h)
+#define HAVE_GETHOSTNAME 1
+#define HAVE_GETHOSTBYADDR 1
+#define HAVE_GETHOSTBYNAME 1
+#define HAVE_GETPROTOBYNAME 1
+#define HAVE_GETSERVBYNAME 1
+#define HAVE_GETSERVBYPORT 1
+// sys/socket.h functions (provided by winsock.h)
 #define HAVE_INET_PTON 1
+#define HAVE_INET_NTOA 1
+#define HAVE_ACCEPT 1
+#define HAVE_BIND 1
+#define HAVE_CONNECT 1
+#define HAVE_GETSOCKNAME 1
+#define HAVE_LISTEN 1
+#define HAVE_RECVFROM 1
+#define HAVE_SENDTO 1
+#define HAVE_SETSOCKOPT 1
+#define HAVE_SOCKET 1
 
 /* Define to 1 if you have the `dup' function. */
 #define HAVE_DUP 1
diff --git a/Tools/wasm/config.site-wasm32-wasi b/Tools/wasm/config.site-wasm32-wasi
index f151b7bc5ab0c..237fa8b55624c 100644
--- a/Tools/wasm/config.site-wasm32-wasi
+++ b/Tools/wasm/config.site-wasm32-wasi
@@ -44,3 +44,7 @@ ac_cv_func_fchmod=no
 # Disable AF_UNIX and AF_PACKET support, see socketmodule.h.
 ac_cv_header_sys_un_h=no
 ac_cv_header_netpacket_packet_h=no
+
+# disable accept for WASM runtimes without sock_accept
+#ac_cv_func_accept=no
+#ac_cv_func_accept4=no
diff --git a/configure b/configure
index 39f7cd8eaec0a..66915270750b2 100755
--- a/configure
+++ b/configure
@@ -8960,8 +8960,9 @@ $as_echo "#define STDC_HEADERS 1" >>confdefs.h
 # checks for header files
 for ac_header in  \
   alloca.h asm/types.h bluetooth.h conio.h crypt.h direct.h dlfcn.h endian.h errno.h fcntl.h grp.h \
-  ieeefp.h io.h langinfo.h libintl.h libutil.h linux/auxvec.h sys/auxv.h linux/memfd.h linux/random.h linux/soundcard.h \
-  linux/tipc.h linux/wait.h netinet/in.h netpacket/packet.h poll.h process.h pthread.h pty.h \
+  ieeefp.h io.h langinfo.h libintl.h libutil.h linux/auxvec.h sys/auxv.h linux/memfd.h \
+  linux/random.h linux/soundcard.h \
+  linux/tipc.h linux/wait.h netdb.h netinet/in.h netpacket/packet.h poll.h process.h pthread.h pty.h \
   sched.h setjmp.h shadow.h signal.h spawn.h stropts.h sys/audioio.h sys/bsdtty.h sys/devpoll.h \
   sys/endian.h sys/epoll.h sys/event.h sys/eventfd.h sys/file.h sys/ioctl.h sys/kern_control.h \
   sys/loadavg.h sys/lock.h sys/memfd.h sys/mkdev.h sys/mman.h sys/modem.h sys/param.h sys/poll.h \
@@ -14314,7 +14315,6 @@ done
 
 fi
 
-
 # Check for enable-ipv6
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if --enable-ipv6 is specified" >&5
@@ -14957,7 +14957,7 @@ for ac_func in  \
   faccessat fchmod fchmodat fchown fchownat fdopendir fdwalk fexecve \
   fork fork1 fpathconf fstatat ftime ftruncate futimens futimes futimesat \
   gai_strerror getegid getentropy geteuid getgid getgrgid getgrgid_r \
-  getgrnam_r getgrouplist getgroups getitimer getloadavg getlogin \
+  getgrnam_r getgrouplist getgroups gethostname getitimer getloadavg getlogin \
   getpeername getpgid getpid getppid getpriority _getpty \
   getpwent getpwnam_r getpwuid getpwuid_r getresgid getresuid getrusage getsid getspent \
   getspnam getuid getwd if_nameindex initgroups kill killpg lchown linkat \
@@ -16764,6 +16764,8 @@ fi
 
 
 
+
+
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for hstrerror" >&5
 $as_echo_n "checking for hstrerror... " >&6; }
 if ${ac_cv_func_hstrerror+:} false; then :
@@ -16800,6 +16802,188 @@ fi
 
 
 
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for getservbyname" >&5
+$as_echo_n "checking for getservbyname... " >&6; }
+if ${ac_cv_func_getservbyname+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <netdb.h>
+int
+main ()
+{
+void *x=getservbyname
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_func_getservbyname=yes
+else
+  ac_cv_func_getservbyname=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_getservbyname" >&5
+$as_echo "$ac_cv_func_getservbyname" >&6; }
+  if test "x$ac_cv_func_getservbyname" = xyes; then :
+
+$as_echo "#define HAVE_GETSERVBYNAME 1" >>confdefs.h
+
+fi
+
+
+
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for getservbyport" >&5
+$as_echo_n "checking for getservbyport... " >&6; }
+if ${ac_cv_func_getservbyport+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <netdb.h>
+int
+main ()
+{
+void *x=getservbyport
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_func_getservbyport=yes
+else
+  ac_cv_func_getservbyport=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_getservbyport" >&5
+$as_echo "$ac_cv_func_getservbyport" >&6; }
+  if test "x$ac_cv_func_getservbyport" = xyes; then :
+
+$as_echo "#define HAVE_GETSERVBYPORT 1" >>confdefs.h
+
+fi
+
+
+
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname" >&5
+$as_echo_n "checking for gethostbyname... " >&6; }
+if ${ac_cv_func_gethostbyname+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <netdb.h>
+int
+main ()
+{
+void *x=gethostbyname
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_func_gethostbyname=yes
+else
+  ac_cv_func_gethostbyname=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_gethostbyname" >&5
+$as_echo "$ac_cv_func_gethostbyname" >&6; }
+  if test "x$ac_cv_func_gethostbyname" = xyes; then :
+
+$as_echo "#define HAVE_GETHOSTBYNAME 1" >>confdefs.h
+
+fi
+
+
+
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyaddr" >&5
+$as_echo_n "checking for gethostbyaddr... " >&6; }
+if ${ac_cv_func_gethostbyaddr+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <netdb.h>
+int
+main ()
+{
+void *x=gethostbyaddr
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_func_gethostbyaddr=yes
+else
+  ac_cv_func_gethostbyaddr=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_gethostbyaddr" >&5
+$as_echo "$ac_cv_func_gethostbyaddr" >&6; }
+  if test "x$ac_cv_func_gethostbyaddr" = xyes; then :
+
+$as_echo "#define HAVE_GETHOSTBYADDR 1" >>confdefs.h
+
+fi
+
+
+
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for getprotobyname" >&5
+$as_echo_n "checking for getprotobyname... " >&6; }
+if ${ac_cv_func_getprotobyname+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <netdb.h>
+int
+main ()
+{
+void *x=getprotobyname
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_func_getprotobyname=yes
+else
+  ac_cv_func_getprotobyname=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_getprotobyname" >&5
+$as_echo "$ac_cv_func_getprotobyname" >&6; }
+  if test "x$ac_cv_func_getprotobyname" = xyes; then :
+
+$as_echo "#define HAVE_GETPROTOBYNAME 1" >>confdefs.h
+
+fi
+
+
+
+
+
+
+
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inet_aton" >&5
 $as_echo_n "checking for inet_aton... " >&6; }
@@ -16842,6 +17026,46 @@ fi
 
 
 
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inet_ntoa" >&5
+$as_echo_n "checking for inet_ntoa... " >&6; }
+if ${ac_cv_func_inet_ntoa+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+
+int
+main ()
+{
+void *x=inet_ntoa
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_func_inet_ntoa=yes
+else
+  ac_cv_func_inet_ntoa=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_inet_ntoa" >&5
+$as_echo "$ac_cv_func_inet_ntoa" >&6; }
+  if test "x$ac_cv_func_inet_ntoa" = xyes; then :
+
+$as_echo "#define HAVE_INET_NTOA 1" >>confdefs.h
+
+fi
+
+
+
+
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inet_pton" >&5
 $as_echo_n "checking for inet_pton... " >&6; }
@@ -16883,6 +17107,416 @@ fi
 
 
 
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for getpeername" >&5
+$as_echo_n "checking for getpeername... " >&6; }
+if ${ac_cv_func_getpeername+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+
+int
+main ()
+{
+void *x=getpeername
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_func_getpeername=yes
+else
+  ac_cv_func_getpeername=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_getpeername" >&5
+$as_echo "$ac_cv_func_getpeername" >&6; }
+  if test "x$ac_cv_func_getpeername" = xyes; then :
+
+$as_echo "#define HAVE_GETPEERNAME 1" >>confdefs.h
+
+fi
+
+
+
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for getsockname" >&5
+$as_echo_n "checking for getsockname... " >&6; }
+if ${ac_cv_func_getsockname+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+
+int
+main ()
+{
+void *x=getsockname
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_func_getsockname=yes
+else
+  ac_cv_func_getsockname=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_getsockname" >&5
+$as_echo "$ac_cv_func_getsockname" >&6; }
+  if test "x$ac_cv_func_getsockname" = xyes; then :
+
+$as_echo "#define HAVE_GETSOCKNAME 1" >>confdefs.h
+
+fi
+
+
+
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for accept" >&5
+$as_echo_n "checking for accept... " >&6; }
+if ${ac_cv_func_accept+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+
+int
+main ()
+{
+void *x=accept
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_func_accept=yes
+else
+  ac_cv_func_accept=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_accept" >&5
+$as_echo "$ac_cv_func_accept" >&6; }
+  if test "x$ac_cv_func_accept" = xyes; then :
+
+$as_echo "#define HAVE_ACCEPT 1" >>confdefs.h
+
+fi
+
+
+
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bind" >&5
+$as_echo_n "checking for bind... " >&6; }
+if ${ac_cv_func_bind+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+
+int
+main ()
+{
+void *x=bind
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_func_bind=yes
+else
+  ac_cv_func_bind=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_bind" >&5
+$as_echo "$ac_cv_func_bind" >&6; }
+  if test "x$ac_cv_func_bind" = xyes; then :
+
+$as_echo "#define HAVE_BIND 1" >>confdefs.h
+
+fi
+
+
+
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for connect" >&5
+$as_echo_n "checking for connect... " >&6; }
+if ${ac_cv_func_connect+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+
+int
+main ()
+{
+void *x=connect
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_func_connect=yes
+else
+  ac_cv_func_connect=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_connect" >&5
+$as_echo "$ac_cv_func_connect" >&6; }
+  if test "x$ac_cv_func_connect" = xyes; then :
+
+$as_echo "#define HAVE_CONNECT 1" >>confdefs.h
+
+fi
+
+
+
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for listen" >&5
+$as_echo_n "checking for listen... " >&6; }
+if ${ac_cv_func_listen+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+
+int
+main ()
+{
+void *x=listen
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_func_listen=yes
+else
+  ac_cv_func_listen=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_listen" >&5
+$as_echo "$ac_cv_func_listen" >&6; }
+  if test "x$ac_cv_func_listen" = xyes; then :
+
+$as_echo "#define HAVE_LISTEN 1" >>confdefs.h
+
+fi
+
+
+
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for recvfrom" >&5
+$as_echo_n "checking for recvfrom... " >&6; }
+if ${ac_cv_func_recvfrom+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+
+int
+main ()
+{
+void *x=recvfrom
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_func_recvfrom=yes
+else
+  ac_cv_func_recvfrom=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_recvfrom" >&5
+$as_echo "$ac_cv_func_recvfrom" >&6; }
+  if test "x$ac_cv_func_recvfrom" = xyes; then :
+
+$as_echo "#define HAVE_RECVFROM 1" >>confdefs.h
+
+fi
+
+
+
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sendto" >&5
+$as_echo_n "checking for sendto... " >&6; }
+if ${ac_cv_func_sendto+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+
+int
+main ()
+{
+void *x=sendto
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_func_sendto=yes
+else
+  ac_cv_func_sendto=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_sendto" >&5
+$as_echo "$ac_cv_func_sendto" >&6; }
+  if test "x$ac_cv_func_sendto" = xyes; then :
+
+$as_echo "#define HAVE_SENDTO 1" >>confdefs.h
+
+fi
+
+
+
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for setsockopt" >&5
+$as_echo_n "checking for setsockopt... " >&6; }
+if ${ac_cv_func_setsockopt+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+
+int
+main ()
+{
+void *x=setsockopt
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_func_setsockopt=yes
+else
+  ac_cv_func_setsockopt=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_setsockopt" >&5
+$as_echo "$ac_cv_func_setsockopt" >&6; }
+  if test "x$ac_cv_func_setsockopt" = xyes; then :
+
+$as_echo "#define HAVE_SETSOCKOPT 1" >>confdefs.h
+
+fi
+
+
+
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for socket" >&5
+$as_echo_n "checking for socket... " >&6; }
+if ${ac_cv_func_socket+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+
+int
+main ()
+{
+void *x=socket
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_func_socket=yes
+else
+  ac_cv_func_socket=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_socket" >&5
+$as_echo "$ac_cv_func_socket" >&6; }
+  if test "x$ac_cv_func_socket" = xyes; then :
+
+$as_echo "#define HAVE_SOCKET 1" >>confdefs.h
+
+fi
+
+
+
+
 # On some systems, setgroups is in unistd.h, on others, in grp.h
 
 
diff --git a/configure.ac b/configure.ac
index 60daab58d24b8..443637962def9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2626,8 +2626,9 @@ AC_DEFINE(STDC_HEADERS, 1, [Define to 1 if you have the ANSI C header files.])
 # checks for header files
 AC_CHECK_HEADERS([ \
   alloca.h asm/types.h bluetooth.h conio.h crypt.h direct.h dlfcn.h endian.h errno.h fcntl.h grp.h \
-  ieeefp.h io.h langinfo.h libintl.h libutil.h linux/auxvec.h sys/auxv.h linux/memfd.h linux/random.h linux/soundcard.h \
-  linux/tipc.h linux/wait.h netinet/in.h netpacket/packet.h poll.h process.h pthread.h pty.h \
+  ieeefp.h io.h langinfo.h libintl.h libutil.h linux/auxvec.h sys/auxv.h linux/memfd.h \
+  linux/random.h linux/soundcard.h \
+  linux/tipc.h linux/wait.h netdb.h netinet/in.h netpacket/packet.h poll.h process.h pthread.h pty.h \
   sched.h setjmp.h shadow.h signal.h spawn.h stropts.h sys/audioio.h sys/bsdtty.h sys/devpoll.h \
   sys/endian.h sys/epoll.h sys/event.h sys/eventfd.h sys/file.h sys/ioctl.h sys/kern_control.h \
   sys/loadavg.h sys/lock.h sys/memfd.h sys/mkdev.h sys/mman.h sys/modem.h sys/param.h sys/poll.h \
@@ -4156,7 +4157,6 @@ if test "$posix_threads" = "yes"; then
       AC_CHECK_FUNCS(pthread_getcpuclockid)
 fi
 
-
 # Check for enable-ipv6
 AH_TEMPLATE(ENABLE_IPV6, [Define if --enable-ipv6 is specified])
 AC_MSG_CHECKING([if --enable-ipv6 is specified])
@@ -4541,7 +4541,7 @@ AC_CHECK_FUNCS([ \
   faccessat fchmod fchmodat fchown fchownat fdopendir fdwalk fexecve \
   fork fork1 fpathconf fstatat ftime ftruncate futimens futimes futimesat \
   gai_strerror getegid getentropy geteuid getgid getgrgid getgrgid_r \
-  getgrnam_r getgrouplist getgroups getitimer getloadavg getlogin \
+  getgrnam_r getgrouplist getgroups gethostname getitimer getloadavg getlogin \
   getpeername getpgid getpid getppid getpriority _getpty \
   getpwent getpwnam_r getpwuid getpwuid_r getresgid getresuid getrusage getsid getspent \
   getspnam getuid getwd if_nameindex initgroups kill killpg lchown linkat \
@@ -4784,21 +4784,39 @@ PKG_CHECK_MODULES([LIBLZMA], [liblzma], [have_liblzma=yes], [
   ])
 ])
 
-PY_CHECK_FUNC([hstrerror], [#include <netdb.h>])
+dnl PY_CHECK_NETDB_FUNC(FUNCTION)
+AC_DEFUN([PY_CHECK_NETDB_FUNC], [PY_CHECK_FUNC([$1], [#include <netdb.h>])])
 
-PY_CHECK_FUNC([inet_aton], [
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-])
+PY_CHECK_NETDB_FUNC([hstrerror])
+dnl not available in WASI yet
+PY_CHECK_NETDB_FUNC([getservbyname])
+PY_CHECK_NETDB_FUNC([getservbyport])
+PY_CHECK_NETDB_FUNC([gethostbyname])
+PY_CHECK_NETDB_FUNC([gethostbyaddr])
+PY_CHECK_NETDB_FUNC([getprotobyname])
 
-PY_CHECK_FUNC([inet_pton], [
+dnl PY_CHECK_SOCKET_FUNC(FUNCTION)
+AC_DEFUN([PY_CHECK_SOCKET_FUNC], [PY_CHECK_FUNC([$1], [
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
-])
+])])
+
+PY_CHECK_SOCKET_FUNC([inet_aton])
+PY_CHECK_SOCKET_FUNC([inet_ntoa])
+PY_CHECK_SOCKET_FUNC([inet_pton])
+dnl not available in WASI yet
+PY_CHECK_SOCKET_FUNC([getpeername])
+PY_CHECK_SOCKET_FUNC([getsockname])
+PY_CHECK_SOCKET_FUNC([accept])
+PY_CHECK_SOCKET_FUNC([bind])
+PY_CHECK_SOCKET_FUNC([connect])
+PY_CHECK_SOCKET_FUNC([listen])
+PY_CHECK_SOCKET_FUNC([recvfrom])
+PY_CHECK_SOCKET_FUNC([sendto])
+PY_CHECK_SOCKET_FUNC([setsockopt])
+PY_CHECK_SOCKET_FUNC([socket])
 
 # On some systems, setgroups is in unistd.h, on others, in grp.h
 PY_CHECK_FUNC([setgroups], [
diff --git a/pyconfig.h.in b/pyconfig.h.in
index 4aaa32c8b4336..dcbe703e77aec 100644
--- a/pyconfig.h.in
+++ b/pyconfig.h.in
@@ -51,6 +51,9 @@
 /* Define if getpgrp() must be called as getpgrp(0). */
 #undef GETPGRP_HAVE_ARG
 
+/* Define if you have the 'accept' function. */
+#undef HAVE_ACCEPT
+
 /* Define to 1 if you have the `accept4' function. */
 #undef HAVE_ACCEPT4
 
@@ -81,6 +84,9 @@
 /* Define to 1 if you have the `atanh' function. */
 #undef HAVE_ATANH
 
+/* Define if you have the 'bind' function. */
+#undef HAVE_BIND
+
 /* Define to 1 if you have the `bind_textdomain_codeset' function. */
 #undef HAVE_BIND_TEXTDOMAIN_CODESET
 
@@ -160,6 +166,9 @@
 /* Define to 1 if you have the <conio.h> header file. */
 #undef HAVE_CONIO_H
 
+/* Define if you have the 'connect' function. */
+#undef HAVE_CONNECT
+
 /* Define to 1 if you have the `copy_file_range' function. */
 #undef HAVE_COPY_FILE_RANGE
 
@@ -468,6 +477,9 @@
 /* Define to 1 if you have the `getgroups' function. */
 #undef HAVE_GETGROUPS
 
+/* Define if you have the 'gethostbyaddr' function. */
+#undef HAVE_GETHOSTBYADDR
+
 /* Define to 1 if you have the `gethostbyname' function. */
 #undef HAVE_GETHOSTBYNAME
 
@@ -483,6 +495,9 @@
 /* Define this if you have the 6-arg version of gethostbyname_r(). */
 #undef HAVE_GETHOSTBYNAME_R_6_ARG
 
+/* Define to 1 if you have the `gethostname' function. */
+#undef HAVE_GETHOSTNAME
+
 /* Define to 1 if you have the `getitimer' function. */
 #undef HAVE_GETITIMER
 
@@ -498,7 +513,7 @@
 /* Define if you have the 'getpagesize' function. */
 #undef HAVE_GETPAGESIZE
 
-/* Define to 1 if you have the `getpeername' function. */
+/* Define if you have the 'getpeername' function. */
 #undef HAVE_GETPEERNAME
 
 /* Define to 1 if you have the `getpgid' function. */
@@ -516,6 +531,9 @@
 /* Define to 1 if you have the `getpriority' function. */
 #undef HAVE_GETPRIORITY
 
+/* Define if you have the 'getprotobyname' function. */
+#undef HAVE_GETPROTOBYNAME
+
 /* Define to 1 if you have the `getpwent' function. */
 #undef HAVE_GETPWENT
 
@@ -543,9 +561,18 @@
 /* Define to 1 if you have the `getrusage' function. */
 #undef HAVE_GETRUSAGE
 
+/* Define if you have the 'getservbyname' function. */
+#undef HAVE_GETSERVBYNAME
+
+/* Define if you have the 'getservbyport' function. */
+#undef HAVE_GETSERVBYPORT
+
 /* Define to 1 if you have the `getsid' function. */
 #undef HAVE_GETSID
 
+/* Define if you have the 'getsockname' function. */
+#undef HAVE_GETSOCKNAME
+
 /* Define to 1 if you have the `getspent' function. */
 #undef HAVE_GETSPENT
 
@@ -580,6 +607,9 @@
 /* Define if you have the 'inet_aton' function. */
 #undef HAVE_INET_ATON
 
+/* Define if you have the 'inet_ntoa' function. */
+#undef HAVE_INET_NTOA
+
 /* Define if you have the 'inet_pton' function. */
 #undef HAVE_INET_PTON
 
@@ -712,6 +742,9 @@
 /* Define to 1 if you have the <linux/wait.h> header file. */
 #undef HAVE_LINUX_WAIT_H
 
+/* Define if you have the 'listen' function. */
+#undef HAVE_LISTEN
+
 /* Define to 1 if you have the `lockf' function. */
 #undef HAVE_LOCKF
 
@@ -793,6 +826,9 @@
 /* Define to 1 if you have the <netcan/can.h> header file. */
 #undef HAVE_NETCAN_CAN_H
 
+/* Define to 1 if you have the <netdb.h> header file. */
+#undef HAVE_NETDB_H
+
 /* Define to 1 if you have the <netinet/in.h> header file. */
 #undef HAVE_NETINET_IN_H
 
@@ -914,6 +950,9 @@
 /* Define to 1 if you have the `realpath' function. */
 #undef HAVE_REALPATH
 
+/* Define if you have the 'recvfrom' function. */
+#undef HAVE_RECVFROM
+
 /* Define to 1 if you have the `renameat' function. */
 #undef HAVE_RENAMEAT
 
@@ -983,6 +1022,9 @@
 /* Define to 1 if you have the `sendfile' function. */
 #undef HAVE_SENDFILE
 
+/* Define if you have the 'sendto' function. */
+#undef HAVE_SENDTO
+
 /* Define to 1 if you have the `setegid' function. */
 #undef HAVE_SETEGID
 
@@ -1031,6 +1073,9 @@
 /* Define to 1 if you have the `setsid' function. */
 #undef HAVE_SETSID
 
+/* Define if you have the 'setsockopt' function. */
+#undef HAVE_SETSOCKOPT
+
 /* Define to 1 if you have the `setuid' function. */
 #undef HAVE_SETUID
 
@@ -1094,6 +1139,9 @@
 /* struct sockaddr_storage (sys/socket.h) */
 #undef HAVE_SOCKADDR_STORAGE
 
+/* Define if you have the 'socket' function. */
+#undef HAVE_SOCKET
+
 /* Define if you have the 'socketpair' function. */
 #undef HAVE_SOCKETPAIR
 


From webhook-mailer at python.org  Sun Jul 31 16:47:40 2022
From: webhook-mailer at python.org (terryjreedy)
Date: Sun, 31 Jul 2022 20:47:40 -0000
Subject: [Python-checkins] IDLE: Fix docs URL in the About window (#28417)
Message-ID: <mailman.397.1659300461.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/0f17a754d925345d67beff18897d86780436c506
commit: 0f17a754d925345d67beff18897d86780436c506
branch: main
author: Serhiy Storchaka <storchaka at gmail.com>
committer: terryjreedy <tjreedy at udel.edu>
date: 2022-07-31T16:47:28-04:00
summary:

IDLE: Fix docs URL in the About window (#28417)

files:
M Lib/idlelib/help_about.py

diff --git a/Lib/idlelib/help_about.py b/Lib/idlelib/help_about.py
index 9cb3ba78c50eb..a0085a40b980e 100644
--- a/Lib/idlelib/help_about.py
+++ b/Lib/idlelib/help_about.py
@@ -91,8 +91,9 @@ def create_widgets(self):
         email = Label(frame_background, text='email:  idle-dev at python.org',
                       justify=LEFT, fg=self.fg, bg=self.bg)
         email.grid(row=6, column=0, columnspan=2, sticky=W, padx=10, pady=0)
-        docs = Label(frame_background, text="https://docs.python.org/"
-                     f"{version[:version.rindex('.')]}/library/idle.html",
+        docs_url = ("https://docs.python.org/%d.%d/library/idle.html" %
+                    sys.version_info[:2])
+        docs = Label(frame_background, text=docs_url,
                      justify=LEFT, fg=self.fg, bg=self.bg)
         docs.grid(row=7, column=0, columnspan=2, sticky=W, padx=10, pady=0)
         docs.bind("<Button-1>", lambda event: webbrowser.open(docs['text']))


From webhook-mailer at python.org  Sun Jul 31 17:09:20 2022
From: webhook-mailer at python.org (miss-islington)
Date: Sun, 31 Jul 2022 21:09:20 -0000
Subject: [Python-checkins] IDLE: Fix docs URL in the About window (GH-28417)
Message-ID: <mailman.398.1659301761.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/03fed0ade40af6877ed0d8289c05c46e985b66ec
commit: 03fed0ade40af6877ed0d8289c05c46e985b66ec
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-31T14:09:11-07:00
summary:

IDLE: Fix docs URL in the About window (GH-28417)

(cherry picked from commit 0f17a754d925345d67beff18897d86780436c506)

Co-authored-by: Serhiy Storchaka <storchaka at gmail.com>

files:
M Lib/idlelib/help_about.py

diff --git a/Lib/idlelib/help_about.py b/Lib/idlelib/help_about.py
index c59f494599806..710f2ac71074b 100644
--- a/Lib/idlelib/help_about.py
+++ b/Lib/idlelib/help_about.py
@@ -91,8 +91,9 @@ def create_widgets(self):
         email = Label(frame_background, text='email:  idle-dev at python.org',
                       justify=LEFT, fg=self.fg, bg=self.bg)
         email.grid(row=6, column=0, columnspan=2, sticky=W, padx=10, pady=0)
-        docs = Label(frame_background, text="https://docs.python.org/"
-                     f"{version[:version.rindex('.')]}/library/idle.html",
+        docs_url = ("https://docs.python.org/%d.%d/library/idle.html" %
+                    sys.version_info[:2])
+        docs = Label(frame_background, text=docs_url,
                      justify=LEFT, fg=self.fg, bg=self.bg)
         docs.grid(row=7, column=0, columnspan=2, sticky=W, padx=10, pady=0)
         docs.bind("<Button-1>", lambda event: webbrowser.open(docs['text']))


From webhook-mailer at python.org  Sun Jul 31 17:11:42 2022
From: webhook-mailer at python.org (miss-islington)
Date: Sun, 31 Jul 2022 21:11:42 -0000
Subject: [Python-checkins] IDLE: Fix docs URL in the About window (GH-28417)
Message-ID: <mailman.399.1659301903.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/ab444b7fc632d9ed25210aff6c45776c8c5f3554
commit: ab444b7fc632d9ed25210aff6c45776c8c5f3554
branch: 3.11
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-31T14:11:35-07:00
summary:

IDLE: Fix docs URL in the About window (GH-28417)

(cherry picked from commit 0f17a754d925345d67beff18897d86780436c506)

Co-authored-by: Serhiy Storchaka <storchaka at gmail.com>

files:
M Lib/idlelib/help_about.py

diff --git a/Lib/idlelib/help_about.py b/Lib/idlelib/help_about.py
index 9cb3ba78c50eb..a0085a40b980e 100644
--- a/Lib/idlelib/help_about.py
+++ b/Lib/idlelib/help_about.py
@@ -91,8 +91,9 @@ def create_widgets(self):
         email = Label(frame_background, text='email:  idle-dev at python.org',
                       justify=LEFT, fg=self.fg, bg=self.bg)
         email.grid(row=6, column=0, columnspan=2, sticky=W, padx=10, pady=0)
-        docs = Label(frame_background, text="https://docs.python.org/"
-                     f"{version[:version.rindex('.')]}/library/idle.html",
+        docs_url = ("https://docs.python.org/%d.%d/library/idle.html" %
+                    sys.version_info[:2])
+        docs = Label(frame_background, text=docs_url,
                      justify=LEFT, fg=self.fg, bg=self.bg)
         docs.grid(row=7, column=0, columnspan=2, sticky=W, padx=10, pady=0)
         docs.bind("<Button-1>", lambda event: webbrowser.open(docs['text']))


From webhook-mailer at python.org  Sun Jul 31 22:42:22 2022
From: webhook-mailer at python.org (Fidget-Spinner)
Date: Mon, 01 Aug 2022 02:42:22 -0000
Subject: [Python-checkins] bpo-42037: Corrected request dependencies in
 CookieJar functions (GH-23112)
Message-ID: <mailman.400.1659321743.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/d29e279de38e7bc3b7deda573ba23d65831d9351
commit: d29e279de38e7bc3b7deda573ba23d65831d9351
branch: main
author: markus-sus <73822103+markus-sus at users.noreply.github.com>
committer: Fidget-Spinner <28750310+Fidget-Spinner at users.noreply.github.com>
date: 2022-08-01T10:42:13+08:00
summary:

bpo-42037: Corrected request dependencies in CookieJar functions (GH-23112)

files:
M Doc/library/http.cookiejar.rst

diff --git a/Doc/library/http.cookiejar.rst b/Doc/library/http.cookiejar.rst
index 51a8c53152b01..53b3087a4b999 100644
--- a/Doc/library/http.cookiejar.rst
+++ b/Doc/library/http.cookiejar.rst
@@ -160,11 +160,10 @@ contained :class:`Cookie` objects.
    respectively), the :mailheader:`Cookie2` header is also added when appropriate.
 
    The *request* object (usually a :class:`urllib.request.Request` instance)
-   must support the methods :meth:`get_full_url`, :meth:`get_host`,
-   :meth:`get_type`, :meth:`unverifiable`, :meth:`has_header`,
+   must support the methods :meth:`get_full_url`, :meth:`has_header`,
    :meth:`get_header`, :meth:`header_items`, :meth:`add_unredirected_header`
-   and :attr:`origin_req_host` attribute as documented by
-   :mod:`urllib.request`.
+   and the attributes :attr:`host`, :attr:`!type`, :attr:`unverifiable`
+   and :attr:`origin_req_host` as documented by :mod:`urllib.request`.
 
    .. versionchanged:: 3.3
 
@@ -186,11 +185,11 @@ contained :class:`Cookie` objects.
    method, which returns an :class:`email.message.Message` instance.
 
    The *request* object (usually a :class:`urllib.request.Request` instance)
-   must support the methods :meth:`get_full_url`, :meth:`get_host`,
-   :meth:`unverifiable`, and :attr:`origin_req_host` attribute, as documented
-   by :mod:`urllib.request`.  The request is used to set default values for
-   cookie-attributes as well as for checking that the cookie is allowed to be
-   set.
+   must support the method :meth:`get_full_url` and the attributes
+   :attr:`host`, :attr:`unverifiable` and :attr:`origin_req_host`,
+   as documented by :mod:`urllib.request`.  The request is used to set
+   default values for cookie-attributes as well as for checking that the
+   cookie is allowed to be set.
 
    .. versionchanged:: 3.3
 


From webhook-mailer at python.org  Sun Jul 31 22:49:52 2022
From: webhook-mailer at python.org (miss-islington)
Date: Mon, 01 Aug 2022 02:49:52 -0000
Subject: [Python-checkins] bpo-42037: Corrected request dependencies in
 CookieJar functions (GH-23112)
Message-ID: <mailman.401.1659322193.3313.python-checkins@python.org>

https://github.com/python/cpython/commit/a4cda28f7b83c25ed412f8ce2a502fd54d7b4c5a
commit: a4cda28f7b83c25ed412f8ce2a502fd54d7b4c5a
branch: 3.11
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-07-31T19:49:47-07:00
summary:

bpo-42037: Corrected request dependencies in CookieJar functions (GH-23112)

(cherry picked from commit d29e279de38e7bc3b7deda573ba23d65831d9351)

Co-authored-by: markus-sus <73822103+markus-sus at users.noreply.github.com>

files:
M Doc/library/http.cookiejar.rst

diff --git a/Doc/library/http.cookiejar.rst b/Doc/library/http.cookiejar.rst
index 51a8c53152b01..53b3087a4b999 100644
--- a/Doc/library/http.cookiejar.rst
+++ b/Doc/library/http.cookiejar.rst
@@ -160,11 +160,10 @@ contained :class:`Cookie` objects.
    respectively), the :mailheader:`Cookie2` header is also added when appropriate.
 
    The *request* object (usually a :class:`urllib.request.Request` instance)
-   must support the methods :meth:`get_full_url`, :meth:`get_host`,
-   :meth:`get_type`, :meth:`unverifiable`, :meth:`has_header`,
+   must support the methods :meth:`get_full_url`, :meth:`has_header`,
    :meth:`get_header`, :meth:`header_items`, :meth:`add_unredirected_header`
-   and :attr:`origin_req_host` attribute as documented by
-   :mod:`urllib.request`.
+   and the attributes :attr:`host`, :attr:`!type`, :attr:`unverifiable`
+   and :attr:`origin_req_host` as documented by :mod:`urllib.request`.
 
    .. versionchanged:: 3.3
 
@@ -186,11 +185,11 @@ contained :class:`Cookie` objects.
    method, which returns an :class:`email.message.Message` instance.
 
    The *request* object (usually a :class:`urllib.request.Request` instance)
-   must support the methods :meth:`get_full_url`, :meth:`get_host`,
-   :meth:`unverifiable`, and :attr:`origin_req_host` attribute, as documented
-   by :mod:`urllib.request`.  The request is used to set default values for
-   cookie-attributes as well as for checking that the cookie is allowed to be
-   set.
+   must support the method :meth:`get_full_url` and the attributes
+   :attr:`host`, :attr:`unverifiable` and :attr:`origin_req_host`,
+   as documented by :mod:`urllib.request`.  The request is used to set
+   default values for cookie-attributes as well as for checking that the
+   cookie is allowed to be set.
 
    .. versionchanged:: 3.3