From webhook-mailer at python.org  Mon Jul  1 02:04:26 2019
From: webhook-mailer at python.org (Miss Islington (bot))
Date: Mon, 01 Jul 2019 06:04:26 -0000
Subject: [Python-checkins] bpo-36168: Lowercase the word "subsequent" in
 get_value doc (GH-14485)
Message-ID: <mailman.159.1561961067.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/12b436e3b079fb3e3a7197c089df90a77e3bdd77
commit: 12b436e3b079fb3e3a7197c089df90a77e3bdd77
branch: master
author: Krishna Oza <krishoza15sep at gmail.com>
committer: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
date: 2019-06-30T23:04:20-07:00
summary:

bpo-36168: Lowercase the word "subsequent" in get_value doc (GH-14485)



Subsequent -> subsequent

https://bugs.python.org/issue36168

files:
M Doc/library/string.rst

diff --git a/Doc/library/string.rst b/Doc/library/string.rst
index 288dde6b3fe4..af8b9b358cc3 100644
--- a/Doc/library/string.rst
+++ b/Doc/library/string.rst
@@ -146,7 +146,7 @@ implementation as the built-in :meth:`~str.format` method.
       keyword arguments.
 
       For compound field names, these functions are only called for the first
-      component of the field name; Subsequent components are handled through
+      component of the field name; subsequent components are handled through
       normal attribute and indexing operations.
 
       So for example, the field expression '0.name' would cause


From webhook-mailer at python.org  Mon Jul  1 02:29:22 2019
From: webhook-mailer at python.org (Miss Islington (bot))
Date: Mon, 01 Jul 2019 06:29:22 -0000
Subject: [Python-checkins] bpo-37428: Don't set PHA verify flag on client
 side (GH-14421)
Message-ID: <mailman.160.1561962563.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/f0f5930ac88482ef896283db5be9b8d508d077db
commit: f0f5930ac88482ef896283db5be9b8d508d077db
branch: master
author: Christian Heimes <christian at python.org>
committer: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
date: 2019-06-30T23:29:17-07:00
summary:

bpo-37428: Don't set PHA verify flag on client side (GH-14421)



SSLContext.post_handshake_auth = True no longer sets
SSL_VERIFY_POST_HANDSHAKE verify flag for client connections. Although the
option is documented as ignored for clients, OpenSSL implicitly enables cert
chain validation when the flag is set.

Signed-off-by: Christian Heimes <christian at python.org>



https://bugs.python.org/issue37428

files:
A Misc/NEWS.d/next/Library/2019-06-27-13-27-02.bpo-37428._wcwUd.rst
M Lib/test/test_ssl.py
M Modules/_ssl.c

diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py
index 064f0e8d4de6..d83ee2cc974d 100644
--- a/Lib/test/test_ssl.py
+++ b/Lib/test/test_ssl.py
@@ -4434,6 +4434,37 @@ def test_pha_not_tls13(self):
                 s.write(b'PHA')
                 self.assertIn(b'WRONG_SSL_VERSION', s.recv(1024))
 
+    def test_bpo37428_pha_cert_none(self):
+        # verify that post_handshake_auth does not implicitly enable cert
+        # validation.
+        hostname = SIGNED_CERTFILE_HOSTNAME
+        client_context = ssl.SSLContext(ssl.PROTOCOL_TLS_CLIENT)
+        client_context.post_handshake_auth = True
+        client_context.load_cert_chain(SIGNED_CERTFILE)
+        # no cert validation and CA on client side
+        client_context.check_hostname = False
+        client_context.verify_mode = ssl.CERT_NONE
+
+        server_context = ssl.SSLContext(ssl.PROTOCOL_TLS_SERVER)
+        server_context.load_cert_chain(SIGNED_CERTFILE)
+        server_context.load_verify_locations(SIGNING_CA)
+        server_context.post_handshake_auth = True
+        server_context.verify_mode = ssl.CERT_REQUIRED
+
+        server = ThreadedEchoServer(context=server_context, chatty=False)
+        with server:
+            with client_context.wrap_socket(socket.socket(),
+                                            server_hostname=hostname) as s:
+                s.connect((HOST, server.port))
+                s.write(b'HASCERT')
+                self.assertEqual(s.recv(1024), b'FALSE\n')
+                s.write(b'PHA')
+                self.assertEqual(s.recv(1024), b'OK\n')
+                s.write(b'HASCERT')
+                self.assertEqual(s.recv(1024), b'TRUE\n')
+                # server cert has not been validated
+                self.assertEqual(s.getpeercert(), {})
+
 
 HAS_KEYLOG = hasattr(ssl.SSLContext, 'keylog_filename')
 requires_keylog = unittest.skipUnless(
diff --git a/Misc/NEWS.d/next/Library/2019-06-27-13-27-02.bpo-37428._wcwUd.rst b/Misc/NEWS.d/next/Library/2019-06-27-13-27-02.bpo-37428._wcwUd.rst
new file mode 100644
index 000000000000..2cdce6b24dc6
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2019-06-27-13-27-02.bpo-37428._wcwUd.rst
@@ -0,0 +1,4 @@
+SSLContext.post_handshake_auth = True no longer sets
+SSL_VERIFY_POST_HANDSHAKE verify flag for client connections. Although the
+option is documented as ignored for clients, OpenSSL implicitly enables cert
+chain validation when the flag is set.
diff --git a/Modules/_ssl.c b/Modules/_ssl.c
index 2331c58ad77d..3351af6cdefd 100644
--- a/Modules/_ssl.c
+++ b/Modules/_ssl.c
@@ -963,6 +963,26 @@ newPySSLSocket(PySSLContext *sslctx, PySocketSockObject *sock,
     SSL_set_mode(self->ssl,
                  SSL_MODE_ACCEPT_MOVING_WRITE_BUFFER | SSL_MODE_AUTO_RETRY);
 
+#ifdef TLS1_3_VERSION
+    if (sslctx->post_handshake_auth == 1) {
+        if (socket_type == PY_SSL_SERVER) {
+            /* bpo-37428: OpenSSL does not ignore SSL_VERIFY_POST_HANDSHAKE.
+             * Set SSL_VERIFY_POST_HANDSHAKE flag only for server sockets and
+             * only in combination with SSL_VERIFY_PEER flag. */
+            int mode = SSL_get_verify_mode(self->ssl);
+            if (mode & SSL_VERIFY_PEER) {
+                int (*verify_cb)(int, X509_STORE_CTX *) = NULL;
+                verify_cb = SSL_get_verify_callback(self->ssl);
+                mode |= SSL_VERIFY_POST_HANDSHAKE;
+                SSL_set_verify(self->ssl, mode, verify_cb);
+            }
+        } else {
+            /* client socket */
+            SSL_set_post_handshake_auth(self->ssl, 1);
+        }
+    }
+#endif
+
     if (server_hostname != NULL) {
         if (_ssl_configure_hostname(self, server_hostname) < 0) {
             Py_DECREF(self);
@@ -2986,10 +3006,10 @@ _set_verify_mode(PySSLContext *self, enum py_ssl_cert_requirements n)
                         "invalid value for verify_mode");
         return -1;
     }
-#ifdef TLS1_3_VERSION
-    if (self->post_handshake_auth)
-        mode |= SSL_VERIFY_POST_HANDSHAKE;
-#endif
+
+    /* bpo-37428: newPySSLSocket() sets SSL_VERIFY_POST_HANDSHAKE flag for
+     * server sockets and SSL_set_post_handshake_auth() for client. */
+
     /* keep current verify cb */
     verify_cb = SSL_CTX_get_verify_callback(self->ctx);
     SSL_CTX_set_verify(self->ctx, mode, verify_cb);
@@ -3735,8 +3755,6 @@ get_post_handshake_auth(PySSLContext *self, void *c) {
 #if TLS1_3_VERSION
 static int
 set_post_handshake_auth(PySSLContext *self, PyObject *arg, void *c) {
-    int (*verify_cb)(int, X509_STORE_CTX *) = NULL;
-    int mode = SSL_CTX_get_verify_mode(self->ctx);
     if (arg == NULL) {
         PyErr_SetString(PyExc_AttributeError, "cannot delete attribute");
         return -1;
@@ -3748,17 +3766,8 @@ set_post_handshake_auth(PySSLContext *self, PyObject *arg, void *c) {
     }
     self->post_handshake_auth = pha;
 
-    /* client-side socket setting, ignored by server-side */
-    SSL_CTX_set_post_handshake_auth(self->ctx, pha);
-
-    /* server-side socket setting, ignored by client-side */
-    verify_cb = SSL_CTX_get_verify_callback(self->ctx);
-    if (pha) {
-        mode |= SSL_VERIFY_POST_HANDSHAKE;
-    } else {
-        mode ^= SSL_VERIFY_POST_HANDSHAKE;
-    }
-    SSL_CTX_set_verify(self->ctx, mode, verify_cb);
+    /* bpo-37428: newPySSLSocket() sets SSL_VERIFY_POST_HANDSHAKE flag for
+     * server sockets and SSL_set_post_handshake_auth() for client. */
 
     return 0;
 }


From webhook-mailer at python.org  Mon Jul  1 02:32:28 2019
From: webhook-mailer at python.org (Miss Islington (bot))
Date: Mon, 01 Jul 2019 06:32:28 -0000
Subject: [Python-checkins] bpo-37440: Enable TLS 1.3 post-handshake auth in
 http.client (GH-14448)
Message-ID: <mailman.161.1561962749.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/d1bd6e79da1ee56dc1b902d804216ffd267399db
commit: d1bd6e79da1ee56dc1b902d804216ffd267399db
branch: master
author: Christian Heimes <christian at python.org>
committer: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
date: 2019-06-30T23:32:24-07:00
summary:

bpo-37440: Enable TLS 1.3 post-handshake auth in http.client (GH-14448)



Post-handshake authentication is required for conditional client cert authentication with TLS 1.3.


https://bugs.python.org/issue37440

files:
A Misc/NEWS.d/next/Library/2019-06-28-16-40-17.bpo-37440.t3wX-N.rst
M Doc/library/http.client.rst
M Lib/http/client.py
M Lib/test/test_httplib.py

diff --git a/Doc/library/http.client.rst b/Doc/library/http.client.rst
index beaa720d732b..4e761cd39a01 100644
--- a/Doc/library/http.client.rst
+++ b/Doc/library/http.client.rst
@@ -94,6 +94,11 @@ The module provides the following classes:
       :func:`ssl._create_unverified_context` can be passed to the *context*
       parameter.
 
+   .. versionchanged:: 3.8
+      This class now enables TLS 1.3
+      :attr:`ssl.SSLContext.post_handshake_auth` for the default *context* or
+      when *cert_file* is passed with a custom *context*.
+
    .. deprecated:: 3.6
 
        *key_file* and *cert_file* are deprecated in favor of *context*.
diff --git a/Lib/http/client.py b/Lib/http/client.py
index 82908ebe3afd..f61267e108a5 100644
--- a/Lib/http/client.py
+++ b/Lib/http/client.py
@@ -1358,6 +1358,9 @@ def __init__(self, host, port=None, key_file=None, cert_file=None,
             self.cert_file = cert_file
             if context is None:
                 context = ssl._create_default_https_context()
+                # enable PHA for TLS 1.3 connections if available
+                if context.post_handshake_auth is not None:
+                    context.post_handshake_auth = True
             will_verify = context.verify_mode != ssl.CERT_NONE
             if check_hostname is None:
                 check_hostname = context.check_hostname
@@ -1366,6 +1369,10 @@ def __init__(self, host, port=None, key_file=None, cert_file=None,
                                  "either CERT_OPTIONAL or CERT_REQUIRED")
             if key_file or cert_file:
                 context.load_cert_chain(cert_file, key_file)
+                # cert and key file means the user wants to authenticate.
+                # enable TLS 1.3 PHA implicitly even for custom contexts.
+                if context.post_handshake_auth is not None:
+                    context.post_handshake_auth = True
             self._context = context
             if check_hostname is not None:
                 self._context.check_hostname = check_hostname
diff --git a/Lib/test/test_httplib.py b/Lib/test/test_httplib.py
index 968cbd86a1e4..9148169cc7c2 100644
--- a/Lib/test/test_httplib.py
+++ b/Lib/test/test_httplib.py
@@ -1745,6 +1745,24 @@ def test_host_port(self):
             self.assertEqual(h, c.host)
             self.assertEqual(p, c.port)
 
+    def test_tls13_pha(self):
+        import ssl
+        if not ssl.HAS_TLSv1_3:
+            self.skipTest('TLS 1.3 support required')
+        # just check status of PHA flag
+        h = client.HTTPSConnection('localhost', 443)
+        self.assertTrue(h._context.post_handshake_auth)
+
+        context = ssl.SSLContext(ssl.PROTOCOL_TLS_CLIENT)
+        self.assertFalse(context.post_handshake_auth)
+        h = client.HTTPSConnection('localhost', 443, context=context)
+        self.assertIs(h._context, context)
+        self.assertFalse(h._context.post_handshake_auth)
+
+        h = client.HTTPSConnection('localhost', 443, context=context,
+                                   cert_file=CERT_localhost)
+        self.assertTrue(h._context.post_handshake_auth)
+
 
 class RequestBodyTest(TestCase):
     """Test cases where a request includes a message body."""
diff --git a/Misc/NEWS.d/next/Library/2019-06-28-16-40-17.bpo-37440.t3wX-N.rst b/Misc/NEWS.d/next/Library/2019-06-28-16-40-17.bpo-37440.t3wX-N.rst
new file mode 100644
index 000000000000..b336e061e15e
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2019-06-28-16-40-17.bpo-37440.t3wX-N.rst
@@ -0,0 +1,2 @@
+http.client now enables TLS 1.3 post-handshake authentication for default
+context or if a cert_file is passed to HTTPSConnection.


From webhook-mailer at python.org  Mon Jul  1 02:51:44 2019
From: webhook-mailer at python.org (Miss Islington (bot))
Date: Mon, 01 Jul 2019 06:51:44 -0000
Subject: [Python-checkins] [3.7] bpo-37428: Don't set PHA verify flag on
 client side (GH-14421) (GH-14493)
Message-ID: <mailman.162.1561963905.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/cf7617460a920dd75ced017792045d3ae77648ad
commit: cf7617460a920dd75ced017792045d3ae77648ad
branch: 3.7
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: GitHub <noreply at github.com>
date: 2019-06-30T23:51:40-07:00
summary:

[3.7] bpo-37428: Don't set PHA verify flag on client side (GH-14421) (GH-14493)



SSLContext.post_handshake_auth = True no longer sets
SSL_VERIFY_POST_HANDSHAKE verify flag for client connections. Although the
option is documented as ignored for clients, OpenSSL implicitly enables cert
chain validation when the flag is set.

Signed-off-by: Christian Heimes <christian at python.org>



https://bugs.python.org/issue37428
(cherry picked from commit f0f5930ac88482ef896283db5be9b8d508d077db)


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


https://bugs.python.org/issue37428

files:
A Misc/NEWS.d/next/Library/2019-06-27-13-27-02.bpo-37428._wcwUd.rst
M Lib/test/test_ssl.py
M Modules/_ssl.c

diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py
index 73b6bdf01e7f..86f790b4a22e 100644
--- a/Lib/test/test_ssl.py
+++ b/Lib/test/test_ssl.py
@@ -4437,6 +4437,37 @@ def test_pha_not_tls13(self):
                 s.write(b'PHA')
                 self.assertIn(b'WRONG_SSL_VERSION', s.recv(1024))
 
+    def test_bpo37428_pha_cert_none(self):
+        # verify that post_handshake_auth does not implicitly enable cert
+        # validation.
+        hostname = SIGNED_CERTFILE_HOSTNAME
+        client_context = ssl.SSLContext(ssl.PROTOCOL_TLS_CLIENT)
+        client_context.post_handshake_auth = True
+        client_context.load_cert_chain(SIGNED_CERTFILE)
+        # no cert validation and CA on client side
+        client_context.check_hostname = False
+        client_context.verify_mode = ssl.CERT_NONE
+
+        server_context = ssl.SSLContext(ssl.PROTOCOL_TLS_SERVER)
+        server_context.load_cert_chain(SIGNED_CERTFILE)
+        server_context.load_verify_locations(SIGNING_CA)
+        server_context.post_handshake_auth = True
+        server_context.verify_mode = ssl.CERT_REQUIRED
+
+        server = ThreadedEchoServer(context=server_context, chatty=False)
+        with server:
+            with client_context.wrap_socket(socket.socket(),
+                                            server_hostname=hostname) as s:
+                s.connect((HOST, server.port))
+                s.write(b'HASCERT')
+                self.assertEqual(s.recv(1024), b'FALSE\n')
+                s.write(b'PHA')
+                self.assertEqual(s.recv(1024), b'OK\n')
+                s.write(b'HASCERT')
+                self.assertEqual(s.recv(1024), b'TRUE\n')
+                # server cert has not been validated
+                self.assertEqual(s.getpeercert(), {})
+
 
 def test_main(verbose=False):
     if support.verbose:
diff --git a/Misc/NEWS.d/next/Library/2019-06-27-13-27-02.bpo-37428._wcwUd.rst b/Misc/NEWS.d/next/Library/2019-06-27-13-27-02.bpo-37428._wcwUd.rst
new file mode 100644
index 000000000000..2cdce6b24dc6
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2019-06-27-13-27-02.bpo-37428._wcwUd.rst
@@ -0,0 +1,4 @@
+SSLContext.post_handshake_auth = True no longer sets
+SSL_VERIFY_POST_HANDSHAKE verify flag for client connections. Although the
+option is documented as ignored for clients, OpenSSL implicitly enables cert
+chain validation when the flag is set.
diff --git a/Modules/_ssl.c b/Modules/_ssl.c
index 30c91f59310f..e8955eedfa53 100644
--- a/Modules/_ssl.c
+++ b/Modules/_ssl.c
@@ -931,6 +931,26 @@ newPySSLSocket(PySSLContext *sslctx, PySocketSockObject *sock,
     SSL_set_mode(self->ssl,
                  SSL_MODE_ACCEPT_MOVING_WRITE_BUFFER | SSL_MODE_AUTO_RETRY);
 
+#ifdef TLS1_3_VERSION
+    if (sslctx->post_handshake_auth == 1) {
+        if (socket_type == PY_SSL_SERVER) {
+            /* bpo-37428: OpenSSL does not ignore SSL_VERIFY_POST_HANDSHAKE.
+             * Set SSL_VERIFY_POST_HANDSHAKE flag only for server sockets and
+             * only in combination with SSL_VERIFY_PEER flag. */
+            int mode = SSL_get_verify_mode(self->ssl);
+            if (mode & SSL_VERIFY_PEER) {
+                int (*verify_cb)(int, X509_STORE_CTX *) = NULL;
+                verify_cb = SSL_get_verify_callback(self->ssl);
+                mode |= SSL_VERIFY_POST_HANDSHAKE;
+                SSL_set_verify(self->ssl, mode, verify_cb);
+            }
+        } else {
+            /* client socket */
+            SSL_set_post_handshake_auth(self->ssl, 1);
+        }
+    }
+#endif
+
     if (server_hostname != NULL) {
         if (_ssl_configure_hostname(self, server_hostname) < 0) {
             Py_DECREF(self);
@@ -2928,10 +2948,10 @@ _set_verify_mode(PySSLContext *self, enum py_ssl_cert_requirements n)
                         "invalid value for verify_mode");
         return -1;
     }
-#ifdef TLS1_3_VERSION
-    if (self->post_handshake_auth)
-        mode |= SSL_VERIFY_POST_HANDSHAKE;
-#endif
+
+    /* bpo-37428: newPySSLSocket() sets SSL_VERIFY_POST_HANDSHAKE flag for
+     * server sockets and SSL_set_post_handshake_auth() for client. */
+
     /* keep current verify cb */
     verify_cb = SSL_CTX_get_verify_callback(self->ctx);
     SSL_CTX_set_verify(self->ctx, mode, verify_cb);
@@ -3628,8 +3648,6 @@ get_post_handshake_auth(PySSLContext *self, void *c) {
 #if TLS1_3_VERSION
 static int
 set_post_handshake_auth(PySSLContext *self, PyObject *arg, void *c) {
-    int (*verify_cb)(int, X509_STORE_CTX *) = NULL;
-    int mode = SSL_CTX_get_verify_mode(self->ctx);
     if (arg == NULL) {
         PyErr_SetString(PyExc_AttributeError, "cannot delete attribute");
         return -1;
@@ -3641,17 +3659,8 @@ set_post_handshake_auth(PySSLContext *self, PyObject *arg, void *c) {
     }
     self->post_handshake_auth = pha;
 
-    /* client-side socket setting, ignored by server-side */
-    SSL_CTX_set_post_handshake_auth(self->ctx, pha);
-
-    /* server-side socket setting, ignored by client-side */
-    verify_cb = SSL_CTX_get_verify_callback(self->ctx);
-    if (pha) {
-        mode |= SSL_VERIFY_POST_HANDSHAKE;
-    } else {
-        mode ^= SSL_VERIFY_POST_HANDSHAKE;
-    }
-    SSL_CTX_set_verify(self->ctx, mode, verify_cb);
+    /* bpo-37428: newPySSLSocket() sets SSL_VERIFY_POST_HANDSHAKE flag for
+     * server sockets and SSL_set_post_handshake_auth() for client. */
 
     return 0;
 }


From webhook-mailer at python.org  Mon Jul  1 03:07:50 2019
From: webhook-mailer at python.org (Miss Islington (bot))
Date: Mon, 01 Jul 2019 07:07:50 -0000
Subject: [Python-checkins] [3.8] bpo-37440: Enable TLS 1.3 post-handshake
 auth in http.client (GH-14448) (GH-14495)
Message-ID: <mailman.163.1561964871.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/ee72dda9616258b57c19eb5af00f3e80a3fb8e22
commit: ee72dda9616258b57c19eb5af00f3e80a3fb8e22
branch: 3.8
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: GitHub <noreply at github.com>
date: 2019-07-01T00:07:44-07:00
summary:

[3.8] bpo-37440: Enable TLS 1.3 post-handshake auth in http.client (GH-14448) (GH-14495)



Post-handshake authentication is required for conditional client cert authentication with TLS 1.3.


https://bugs.python.org/issue37440
(cherry picked from commit d1bd6e79da1ee56dc1b902d804216ffd267399db)


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


https://bugs.python.org/issue37440

files:
A Misc/NEWS.d/next/Library/2019-06-28-16-40-17.bpo-37440.t3wX-N.rst
M Doc/library/http.client.rst
M Lib/http/client.py
M Lib/test/test_httplib.py

diff --git a/Doc/library/http.client.rst b/Doc/library/http.client.rst
index beaa720d732b..4e761cd39a01 100644
--- a/Doc/library/http.client.rst
+++ b/Doc/library/http.client.rst
@@ -94,6 +94,11 @@ The module provides the following classes:
       :func:`ssl._create_unverified_context` can be passed to the *context*
       parameter.
 
+   .. versionchanged:: 3.8
+      This class now enables TLS 1.3
+      :attr:`ssl.SSLContext.post_handshake_auth` for the default *context* or
+      when *cert_file* is passed with a custom *context*.
+
    .. deprecated:: 3.6
 
        *key_file* and *cert_file* are deprecated in favor of *context*.
diff --git a/Lib/http/client.py b/Lib/http/client.py
index 82908ebe3afd..f61267e108a5 100644
--- a/Lib/http/client.py
+++ b/Lib/http/client.py
@@ -1358,6 +1358,9 @@ def __init__(self, host, port=None, key_file=None, cert_file=None,
             self.cert_file = cert_file
             if context is None:
                 context = ssl._create_default_https_context()
+                # enable PHA for TLS 1.3 connections if available
+                if context.post_handshake_auth is not None:
+                    context.post_handshake_auth = True
             will_verify = context.verify_mode != ssl.CERT_NONE
             if check_hostname is None:
                 check_hostname = context.check_hostname
@@ -1366,6 +1369,10 @@ def __init__(self, host, port=None, key_file=None, cert_file=None,
                                  "either CERT_OPTIONAL or CERT_REQUIRED")
             if key_file or cert_file:
                 context.load_cert_chain(cert_file, key_file)
+                # cert and key file means the user wants to authenticate.
+                # enable TLS 1.3 PHA implicitly even for custom contexts.
+                if context.post_handshake_auth is not None:
+                    context.post_handshake_auth = True
             self._context = context
             if check_hostname is not None:
                 self._context.check_hostname = check_hostname
diff --git a/Lib/test/test_httplib.py b/Lib/test/test_httplib.py
index 968cbd86a1e4..9148169cc7c2 100644
--- a/Lib/test/test_httplib.py
+++ b/Lib/test/test_httplib.py
@@ -1745,6 +1745,24 @@ def test_host_port(self):
             self.assertEqual(h, c.host)
             self.assertEqual(p, c.port)
 
+    def test_tls13_pha(self):
+        import ssl
+        if not ssl.HAS_TLSv1_3:
+            self.skipTest('TLS 1.3 support required')
+        # just check status of PHA flag
+        h = client.HTTPSConnection('localhost', 443)
+        self.assertTrue(h._context.post_handshake_auth)
+
+        context = ssl.SSLContext(ssl.PROTOCOL_TLS_CLIENT)
+        self.assertFalse(context.post_handshake_auth)
+        h = client.HTTPSConnection('localhost', 443, context=context)
+        self.assertIs(h._context, context)
+        self.assertFalse(h._context.post_handshake_auth)
+
+        h = client.HTTPSConnection('localhost', 443, context=context,
+                                   cert_file=CERT_localhost)
+        self.assertTrue(h._context.post_handshake_auth)
+
 
 class RequestBodyTest(TestCase):
     """Test cases where a request includes a message body."""
diff --git a/Misc/NEWS.d/next/Library/2019-06-28-16-40-17.bpo-37440.t3wX-N.rst b/Misc/NEWS.d/next/Library/2019-06-28-16-40-17.bpo-37440.t3wX-N.rst
new file mode 100644
index 000000000000..b336e061e15e
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2019-06-28-16-40-17.bpo-37440.t3wX-N.rst
@@ -0,0 +1,2 @@
+http.client now enables TLS 1.3 post-handshake authentication for default
+context or if a cert_file is passed to HTTPSConnection.


From webhook-mailer at python.org  Mon Jul  1 03:07:56 2019
From: webhook-mailer at python.org (Miss Islington (bot))
Date: Mon, 01 Jul 2019 07:07:56 -0000
Subject: [Python-checkins] [3.7] bpo-37440: Enable TLS 1.3 post-handshake
 auth in http.client (GH-14448) (GH-14496)
Message-ID: <mailman.164.1561964877.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/6be91102f75aa4b4b8c1e55960aa22008ff9e319
commit: 6be91102f75aa4b4b8c1e55960aa22008ff9e319
branch: 3.7
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: GitHub <noreply at github.com>
date: 2019-07-01T00:07:52-07:00
summary:

[3.7] bpo-37440: Enable TLS 1.3 post-handshake auth in http.client (GH-14448) (GH-14496)



Post-handshake authentication is required for conditional client cert authentication with TLS 1.3.


https://bugs.python.org/issue37440
(cherry picked from commit d1bd6e79da1ee56dc1b902d804216ffd267399db)


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


https://bugs.python.org/issue37440

files:
A Misc/NEWS.d/next/Library/2019-06-28-16-40-17.bpo-37440.t3wX-N.rst
M Doc/library/http.client.rst
M Lib/http/client.py
M Lib/test/test_httplib.py

diff --git a/Doc/library/http.client.rst b/Doc/library/http.client.rst
index 3408c103e2f3..3ebeb10aee9a 100644
--- a/Doc/library/http.client.rst
+++ b/Doc/library/http.client.rst
@@ -94,6 +94,11 @@ The module provides the following classes:
       :func:`ssl._create_unverified_context` can be passed to the *context*
       parameter.
 
+   .. versionchanged:: 3.7.4
+      This class now enables TLS 1.3
+      :attr:`ssl.SSLContext.post_handshake_auth` for the default *context* or
+      when *cert_file* is passed with a custom *context*.
+
    .. deprecated:: 3.6
 
        *key_file* and *cert_file* are deprecated in favor of *context*.
diff --git a/Lib/http/client.py b/Lib/http/client.py
index 2afd452fe30f..dd23edcd597c 100644
--- a/Lib/http/client.py
+++ b/Lib/http/client.py
@@ -1381,6 +1381,9 @@ def __init__(self, host, port=None, key_file=None, cert_file=None,
             self.cert_file = cert_file
             if context is None:
                 context = ssl._create_default_https_context()
+                # enable PHA for TLS 1.3 connections if available
+                if context.post_handshake_auth is not None:
+                    context.post_handshake_auth = True
             will_verify = context.verify_mode != ssl.CERT_NONE
             if check_hostname is None:
                 check_hostname = context.check_hostname
@@ -1389,6 +1392,10 @@ def __init__(self, host, port=None, key_file=None, cert_file=None,
                                  "either CERT_OPTIONAL or CERT_REQUIRED")
             if key_file or cert_file:
                 context.load_cert_chain(cert_file, key_file)
+                # cert and key file means the user wants to authenticate.
+                # enable TLS 1.3 PHA implicitly even for custom contexts.
+                if context.post_handshake_auth is not None:
+                    context.post_handshake_auth = True
             self._context = context
             if check_hostname is not None:
                 self._context.check_hostname = check_hostname
diff --git a/Lib/test/test_httplib.py b/Lib/test/test_httplib.py
index 49263a8a3a0d..c4246671586f 100644
--- a/Lib/test/test_httplib.py
+++ b/Lib/test/test_httplib.py
@@ -1748,6 +1748,24 @@ def test_host_port(self):
             self.assertEqual(h, c.host)
             self.assertEqual(p, c.port)
 
+    def test_tls13_pha(self):
+        import ssl
+        if not ssl.HAS_TLSv1_3:
+            self.skipTest('TLS 1.3 support required')
+        # just check status of PHA flag
+        h = client.HTTPSConnection('localhost', 443)
+        self.assertTrue(h._context.post_handshake_auth)
+
+        context = ssl.SSLContext(ssl.PROTOCOL_TLS_CLIENT)
+        self.assertFalse(context.post_handshake_auth)
+        h = client.HTTPSConnection('localhost', 443, context=context)
+        self.assertIs(h._context, context)
+        self.assertFalse(h._context.post_handshake_auth)
+
+        h = client.HTTPSConnection('localhost', 443, context=context,
+                                   cert_file=CERT_localhost)
+        self.assertTrue(h._context.post_handshake_auth)
+
 
 class RequestBodyTest(TestCase):
     """Test cases where a request includes a message body."""
diff --git a/Misc/NEWS.d/next/Library/2019-06-28-16-40-17.bpo-37440.t3wX-N.rst b/Misc/NEWS.d/next/Library/2019-06-28-16-40-17.bpo-37440.t3wX-N.rst
new file mode 100644
index 000000000000..b336e061e15e
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2019-06-28-16-40-17.bpo-37440.t3wX-N.rst
@@ -0,0 +1,2 @@
+http.client now enables TLS 1.3 post-handshake authentication for default
+context or if a cert_file is passed to HTTPSConnection.


From webhook-mailer at python.org  Mon Jul  1 03:25:54 2019
From: webhook-mailer at python.org (Christian Heimes)
Date: Mon, 01 Jul 2019 07:25:54 -0000
Subject: [Python-checkins] [3.8] bpo-37428: Don't set PHA verify flag on
 client side (GH-14494)
Message-ID: <mailman.165.1561965955.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/f22c4cf11d10f52faa86e0b308dd28f11819efd8
commit: f22c4cf11d10f52faa86e0b308dd28f11819efd8
branch: 3.8
author: Christian Heimes <christian at python.org>
committer: GitHub <noreply at github.com>
date: 2019-07-01T09:25:48+02:00
summary:

[3.8] bpo-37428: Don't set PHA verify flag on client side (GH-14494)

SSLContext.post_handshake_auth = True no longer sets
SSL_VERIFY_POST_HANDSHAKE verify flag for client connections. Although the
option is documented as ignored for clients, OpenSSL implicitly enables cert
chain validation when the flag is set.

Signed-off-by: Christian Heimes <christian at python.org>

https://bugs.python.org/issue37428
(cherry picked from commit f0f5930ac88482ef896283db5be9b8d508d077db)

files:
A Misc/NEWS.d/next/Library/2019-06-27-13-27-02.bpo-37428._wcwUd.rst
M Lib/test/test_ssl.py
M Modules/_ssl.c

diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py
index 38fdf3f375cc..66369fe60dfe 100644
--- a/Lib/test/test_ssl.py
+++ b/Lib/test/test_ssl.py
@@ -4428,6 +4428,37 @@ def test_pha_not_tls13(self):
                 s.write(b'PHA')
                 self.assertIn(b'WRONG_SSL_VERSION', s.recv(1024))
 
+    def test_bpo37428_pha_cert_none(self):
+        # verify that post_handshake_auth does not implicitly enable cert
+        # validation.
+        hostname = SIGNED_CERTFILE_HOSTNAME
+        client_context = ssl.SSLContext(ssl.PROTOCOL_TLS_CLIENT)
+        client_context.post_handshake_auth = True
+        client_context.load_cert_chain(SIGNED_CERTFILE)
+        # no cert validation and CA on client side
+        client_context.check_hostname = False
+        client_context.verify_mode = ssl.CERT_NONE
+
+        server_context = ssl.SSLContext(ssl.PROTOCOL_TLS_SERVER)
+        server_context.load_cert_chain(SIGNED_CERTFILE)
+        server_context.load_verify_locations(SIGNING_CA)
+        server_context.post_handshake_auth = True
+        server_context.verify_mode = ssl.CERT_REQUIRED
+
+        server = ThreadedEchoServer(context=server_context, chatty=False)
+        with server:
+            with client_context.wrap_socket(socket.socket(),
+                                            server_hostname=hostname) as s:
+                s.connect((HOST, server.port))
+                s.write(b'HASCERT')
+                self.assertEqual(s.recv(1024), b'FALSE\n')
+                s.write(b'PHA')
+                self.assertEqual(s.recv(1024), b'OK\n')
+                s.write(b'HASCERT')
+                self.assertEqual(s.recv(1024), b'TRUE\n')
+                # server cert has not been validated
+                self.assertEqual(s.getpeercert(), {})
+
 
 HAS_KEYLOG = hasattr(ssl.SSLContext, 'keylog_filename')
 requires_keylog = unittest.skipUnless(
diff --git a/Misc/NEWS.d/next/Library/2019-06-27-13-27-02.bpo-37428._wcwUd.rst b/Misc/NEWS.d/next/Library/2019-06-27-13-27-02.bpo-37428._wcwUd.rst
new file mode 100644
index 000000000000..2cdce6b24dc6
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2019-06-27-13-27-02.bpo-37428._wcwUd.rst
@@ -0,0 +1,4 @@
+SSLContext.post_handshake_auth = True no longer sets
+SSL_VERIFY_POST_HANDSHAKE verify flag for client connections. Although the
+option is documented as ignored for clients, OpenSSL implicitly enables cert
+chain validation when the flag is set.
diff --git a/Modules/_ssl.c b/Modules/_ssl.c
index 2331c58ad77d..3351af6cdefd 100644
--- a/Modules/_ssl.c
+++ b/Modules/_ssl.c
@@ -963,6 +963,26 @@ newPySSLSocket(PySSLContext *sslctx, PySocketSockObject *sock,
     SSL_set_mode(self->ssl,
                  SSL_MODE_ACCEPT_MOVING_WRITE_BUFFER | SSL_MODE_AUTO_RETRY);
 
+#ifdef TLS1_3_VERSION
+    if (sslctx->post_handshake_auth == 1) {
+        if (socket_type == PY_SSL_SERVER) {
+            /* bpo-37428: OpenSSL does not ignore SSL_VERIFY_POST_HANDSHAKE.
+             * Set SSL_VERIFY_POST_HANDSHAKE flag only for server sockets and
+             * only in combination with SSL_VERIFY_PEER flag. */
+            int mode = SSL_get_verify_mode(self->ssl);
+            if (mode & SSL_VERIFY_PEER) {
+                int (*verify_cb)(int, X509_STORE_CTX *) = NULL;
+                verify_cb = SSL_get_verify_callback(self->ssl);
+                mode |= SSL_VERIFY_POST_HANDSHAKE;
+                SSL_set_verify(self->ssl, mode, verify_cb);
+            }
+        } else {
+            /* client socket */
+            SSL_set_post_handshake_auth(self->ssl, 1);
+        }
+    }
+#endif
+
     if (server_hostname != NULL) {
         if (_ssl_configure_hostname(self, server_hostname) < 0) {
             Py_DECREF(self);
@@ -2986,10 +3006,10 @@ _set_verify_mode(PySSLContext *self, enum py_ssl_cert_requirements n)
                         "invalid value for verify_mode");
         return -1;
     }
-#ifdef TLS1_3_VERSION
-    if (self->post_handshake_auth)
-        mode |= SSL_VERIFY_POST_HANDSHAKE;
-#endif
+
+    /* bpo-37428: newPySSLSocket() sets SSL_VERIFY_POST_HANDSHAKE flag for
+     * server sockets and SSL_set_post_handshake_auth() for client. */
+
     /* keep current verify cb */
     verify_cb = SSL_CTX_get_verify_callback(self->ctx);
     SSL_CTX_set_verify(self->ctx, mode, verify_cb);
@@ -3735,8 +3755,6 @@ get_post_handshake_auth(PySSLContext *self, void *c) {
 #if TLS1_3_VERSION
 static int
 set_post_handshake_auth(PySSLContext *self, PyObject *arg, void *c) {
-    int (*verify_cb)(int, X509_STORE_CTX *) = NULL;
-    int mode = SSL_CTX_get_verify_mode(self->ctx);
     if (arg == NULL) {
         PyErr_SetString(PyExc_AttributeError, "cannot delete attribute");
         return -1;
@@ -3748,17 +3766,8 @@ set_post_handshake_auth(PySSLContext *self, PyObject *arg, void *c) {
     }
     self->post_handshake_auth = pha;
 
-    /* client-side socket setting, ignored by server-side */
-    SSL_CTX_set_post_handshake_auth(self->ctx, pha);
-
-    /* server-side socket setting, ignored by client-side */
-    verify_cb = SSL_CTX_get_verify_callback(self->ctx);
-    if (pha) {
-        mode |= SSL_VERIFY_POST_HANDSHAKE;
-    } else {
-        mode ^= SSL_VERIFY_POST_HANDSHAKE;
-    }
-    SSL_CTX_set_verify(self->ctx, mode, verify_cb);
+    /* bpo-37428: newPySSLSocket() sets SSL_VERIFY_POST_HANDSHAKE flag for
+     * server sockets and SSL_set_post_handshake_auth() for client. */
 
     return 0;
 }


From webhook-mailer at python.org  Mon Jul  1 05:53:48 2019
From: webhook-mailer at python.org (Ned Deily)
Date: Mon, 01 Jul 2019 09:53:48 -0000
Subject: [Python-checkins] Minor updates to the macOS installer screens for
 3.8.0b2 (GH-14501)
Message-ID: <mailman.166.1561974829.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/fc1fbe6099e826e8304eadf781af7c10d739fc40
commit: fc1fbe6099e826e8304eadf781af7c10d739fc40
branch: master
author: Ned Deily <nad at python.org>
committer: GitHub <noreply at github.com>
date: 2019-07-01T05:53:42-04:00
summary:

Minor updates to the macOS installer screens for 3.8.0b2 (GH-14501)

files:
M Mac/BuildScript/resources/ReadMe.rtf
M Mac/BuildScript/resources/Welcome.rtf

diff --git a/Mac/BuildScript/resources/ReadMe.rtf b/Mac/BuildScript/resources/ReadMe.rtf
index ab7aeff5376c..ec83750c6e69 100644
--- a/Mac/BuildScript/resources/ReadMe.rtf
+++ b/Mac/BuildScript/resources/ReadMe.rtf
@@ -1,4 +1,4 @@
-{\rtf1\ansi\ansicpg1252\cocoartf1671\cocoasubrtf200
+{\rtf1\ansi\ansicpg1252\cocoartf1671\cocoasubrtf500
 {\fonttbl\f0\fswiss\fcharset0 Helvetica;\f1\fswiss\fcharset0 Helvetica-Bold;\f2\fswiss\fcharset0 Helvetica-Oblique;
 \f3\fmodern\fcharset0 CourierNewPSMT;}
 {\colortbl;\red255\green255\blue255;}
@@ -8,12 +8,18 @@
 
 \f0\fs24 \cf0 This package will install Python $FULL_VERSION for macOS $MACOSX_DEPLOYMENT_TARGET for the following architecture(s): $ARCHITECTURES.\
 \
+\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\partightenfactor0
+
+\f1\b \cf0 NOTE: 
+\f0\b0 This is a beta test preview of Python 3.8.0, the next feature release of Python 3.8.  It is not intended for production use.\
+\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural\partightenfactor0
+\cf0 \
 \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural\partightenfactor0
 
 \f1\b \cf0 \ul \ulc0 Certificate verification and OpenSSL\
 
 \f0\b0 \ulnone \
-This package includes its own private copy of OpenSSL 1.1.0.   The trust certificates in system and user keychains managed by the 
+This package includes its own private copy of OpenSSL 1.1.1.   The trust certificates in system and user keychains managed by the 
 \f2\i Keychain Access 
 \f0\i0 application and the 
 \f2\i security
diff --git a/Mac/BuildScript/resources/Welcome.rtf b/Mac/BuildScript/resources/Welcome.rtf
index df5d20da9ebb..053084d0425b 100644
--- a/Mac/BuildScript/resources/Welcome.rtf
+++ b/Mac/BuildScript/resources/Welcome.rtf
@@ -1,5 +1,6 @@
-{\rtf1\ansi\ansicpg1252\cocoartf1671\cocoasubrtf200
-\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;\f1\fswiss\fcharset0 Helvetica-Bold;}
+{\rtf1\ansi\ansicpg1252\cocoartf1671\cocoasubrtf500
+\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;\f1\fswiss\fcharset0 Helvetica-Bold;\f2\fmodern\fcharset0 CourierNewPSMT;
+}
 {\colortbl;\red255\green255\blue255;}
 {\*\expandedcolortbl;;}
 \paperw11905\paperh16837\margl1440\margr1440\vieww12200\viewh10880\viewkind0
@@ -17,7 +18,11 @@
 \f1\b IDLE
 \f0\b0 .\
 \
+At the end of this install, click on 
+\f2 Install Certificates
+\f0  for SSL root certificates\
+\
 
 \f1\b NOTE: 
-\f0\b0 This is an alpha test preview of Python 3.8.0, the next feature release of Python 3.8.  It is not intended for production use.\
+\f0\b0 This is a beta test preview of Python 3.8.0, the next feature release of Python 3.8.  It is not intended for production use.\
 }
\ No newline at end of file


From webhook-mailer at python.org  Mon Jul  1 06:35:11 2019
From: webhook-mailer at python.org (Petr Viktorin)
Date: Mon, 01 Jul 2019 10:35:11 -0000
Subject: [Python-checkins] bpo-37221: Add PyCode_NewWithPosOnlyArgs to be
 used internally and set PyCode_New as a compatibility wrapper (GH-13959)
Message-ID: <mailman.167.1561977312.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/4a2edc34a405150d0b23ecfdcb401e7cf59f4650
commit: 4a2edc34a405150d0b23ecfdcb401e7cf59f4650
branch: master
author: Pablo Galindo <Pablogsal at gmail.com>
committer: Petr Viktorin <pviktori at redhat.com>
date: 2019-07-01T12:35:05+02:00
summary:

bpo-37221: Add PyCode_NewWithPosOnlyArgs to be used internally and set PyCode_New as a compatibility wrapper (GH-13959)

Add PyCode_NewEx to be used internally and set PyCode_New as a compatibility wrapper

files:
A Misc/NEWS.d/next/C API/2019-06-11-02-50-38.bpo-37221.4tClQT.rst
M Doc/c-api/code.rst
M Doc/data/refcounts.dat
M Doc/whatsnew/3.8.rst
M Include/code.h
M Objects/codeobject.c
M Python/compile.c
M Python/marshal.c

diff --git a/Doc/c-api/code.rst b/Doc/c-api/code.rst
index 7353df56e7d3..3c4f66923da5 100644
--- a/Doc/c-api/code.rst
+++ b/Doc/c-api/code.rst
@@ -33,20 +33,21 @@ bound into a function.
 
    Return the number of free variables in *co*.
 
-.. c:function:: PyCodeObject* PyCode_New(int argcount, int posonlyargcount, int kwonlyargcount, int nlocals, int stacksize, int flags, PyObject *code, PyObject *consts, PyObject *names, PyObject *varnames, PyObject *freevars, PyObject *cellvars, PyObject *filename, PyObject *name, int firstlineno, PyObject *lnotab)
+.. c:function:: PyCodeObject* PyCode_New(int argcount, int kwonlyargcount, int nlocals, int stacksize, int flags, PyObject *code, PyObject *consts, PyObject *names, PyObject *varnames, PyObject *freevars, PyObject *cellvars, PyObject *filename, PyObject *name, int firstlineno, PyObject *lnotab)
 
-   Return a new code object.  If you need a dummy code object to
-   create a frame, use :c:func:`PyCode_NewEmpty` instead.  Calling
-   :c:func:`PyCode_New` directly can bind you to a precise Python
-   version since the definition of the bytecode changes often.
-
-   .. versionchanged:: 3.8
-      An extra parameter is required (*posonlyargcount*) to support :PEP:`570`.
-      The first parameter (*argcount*) now represents the total number of positional arguments,
-      including positional-only.
+   Return a new code object.  If you need a dummy code object to create a frame,
+   use :c:func:`PyCode_NewEmpty` instead.  Calling :c:func:`PyCode_New` directly
+   can bind you to a precise Python version since the definition of the bytecode
+   changes often.
 
    .. audit-event:: code.__new__ code,filename,name,argcount,posonlyargcount,kwonlyargcount,nlocals,stacksize,flags c.PyCode_New
 
+.. c:function:: PyCodeObject* PyCode_NewWithPosOnlyArgs(int argcount, int posonlyargcount, int kwonlyargcount, int nlocals, int stacksize, int flags, PyObject *code, PyObject *consts, PyObject *names, PyObject *varnames, PyObject *freevars, PyObject *cellvars, PyObject *filename, PyObject *name, int firstlineno, PyObject *lnotab)
+
+   Similar to :c:func:`PyCode_New`, but with an extra "posonlyargcount" for positonal-only arguments.
+
+   .. versionadded:: 3.8
+
 .. c:function:: PyCodeObject* PyCode_NewEmpty(const char *filename, const char *funcname, int firstlineno)
 
    Return a new empty code object with the specified filename,
diff --git a/Doc/data/refcounts.dat b/Doc/data/refcounts.dat
index aca57a1dae9d..fda347eab102 100644
--- a/Doc/data/refcounts.dat
+++ b/Doc/data/refcounts.dat
@@ -234,9 +234,26 @@ PyCode_Check:PyObject*:co:0:
 PyCode_GetNumFree:int:::
 PyCode_GetNumFree:PyCodeObject*:co:0:
 
+PyCode_NewWithPosOnlyArgs:PyCodeObject*::+1:
+PyCode_NewWithPosOnlyArgs:int:argcount::
+PyCode_NewWithPosOnlyArgs:int:posonlyargcount::
+PyCode_NewWithPosOnlyArgs:int:kwonlyargcount::
+PyCode_NewWithPosOnlyArgs:int:nlocals::
+PyCode_NewWithPosOnlyArgs:int:stacksize::
+PyCode_NewWithPosOnlyArgs:int:flags::
+PyCode_NewWithPosOnlyArgs:PyObject*:code:0:
+PyCode_NewWithPosOnlyArgs:PyObject*:consts:0:
+PyCode_NewWithPosOnlyArgs:PyObject*:names:0:
+PyCode_NewWithPosOnlyArgs:PyObject*:varnames:0:
+PyCode_NewWithPosOnlyArgs:PyObject*:freevars:0:
+PyCode_NewWithPosOnlyArgs:PyObject*:cellvars:0:
+PyCode_NewWithPosOnlyArgs:PyObject*:filename:0:
+PyCode_NewWithPosOnlyArgs:PyObject*:name:0:
+PyCode_NewWithPosOnlyArgs:int:firstlineno::
+PyCode_NewWithPosOnlyArgs:PyObject*:lnotab:0:
+
 PyCode_New:PyCodeObject*::+1:
 PyCode_New:int:argcount::
-PyCode_New:int:posonlyargcount::
 PyCode_New:int:kwonlyargcount::
 PyCode_New:int:nlocals::
 PyCode_New:int:stacksize::
diff --git a/Doc/whatsnew/3.8.rst b/Doc/whatsnew/3.8.rst
index 46e531f58995..5aab191f1a48 100644
--- a/Doc/whatsnew/3.8.rst
+++ b/Doc/whatsnew/3.8.rst
@@ -1045,6 +1045,11 @@ Build and C API Changes
   allocation or deallocation may need to be adjusted.
   (Contributed by Eddie Elizondo in :issue:`35810`.)
 
+* The new function :c:func:`PyCode_NewWithPosOnlyArgs` allows to create
+  code objects like :c:func:`PyCode_New`, but with an extra *posonlyargcount*
+  parameter for indicating the number of positional-only arguments.
+  (Contributed by Pablo Galindo in :issue:`37221`.)
+
 
 Deprecated
 ==========
diff --git a/Include/code.h b/Include/code.h
index b79d977394e0..3afddd20c80d 100644
--- a/Include/code.h
+++ b/Include/code.h
@@ -120,6 +120,11 @@ PyAPI_DATA(PyTypeObject) PyCode_Type;
 
 /* Public interface */
 PyAPI_FUNC(PyCodeObject *) PyCode_New(
+        int, int, int, int, int, PyObject *, PyObject *,
+        PyObject *, PyObject *, PyObject *, PyObject *,
+        PyObject *, PyObject *, int, PyObject *);
+
+PyAPI_FUNC(PyCodeObject *) PyCode_NewWithPosOnlyArgs(
         int, int, int, int, int, int, PyObject *, PyObject *,
         PyObject *, PyObject *, PyObject *, PyObject *,
         PyObject *, PyObject *, int, PyObject *);
diff --git a/Misc/NEWS.d/next/C API/2019-06-11-02-50-38.bpo-37221.4tClQT.rst b/Misc/NEWS.d/next/C API/2019-06-11-02-50-38.bpo-37221.4tClQT.rst
new file mode 100644
index 000000000000..0ea8b9b86788
--- /dev/null
+++ b/Misc/NEWS.d/next/C API/2019-06-11-02-50-38.bpo-37221.4tClQT.rst	
@@ -0,0 +1,3 @@
+The new function :c:func:`PyCode_NewWithPosOnlyArgs` allows to create
+code objects like :c:func:`PyCode_New`, but with an extra *posonlyargcount*
+parameter for indicating the number of positonal-only arguments.
diff --git a/Objects/codeobject.c b/Objects/codeobject.c
index 1333cc833e1e..39bf6fc6f228 100644
--- a/Objects/codeobject.c
+++ b/Objects/codeobject.c
@@ -102,14 +102,13 @@ intern_string_constants(PyObject *tuple)
     return modified;
 }
 
-
 PyCodeObject *
-PyCode_New(int argcount, int posonlyargcount, int kwonlyargcount,
-           int nlocals, int stacksize, int flags,
-           PyObject *code, PyObject *consts, PyObject *names,
-           PyObject *varnames, PyObject *freevars, PyObject *cellvars,
-           PyObject *filename, PyObject *name, int firstlineno,
-           PyObject *lnotab)
+PyCode_NewWithPosOnlyArgs(int argcount, int posonlyargcount, int kwonlyargcount,
+                          int nlocals, int stacksize, int flags,
+                          PyObject *code, PyObject *consts, PyObject *names,
+                          PyObject *varnames, PyObject *freevars, PyObject *cellvars,
+                          PyObject *filename, PyObject *name, int firstlineno,
+                          PyObject *lnotab)
 {
     PyCodeObject *co;
     Py_ssize_t *cell2arg = NULL;
@@ -243,6 +242,20 @@ PyCode_New(int argcount, int posonlyargcount, int kwonlyargcount,
     return co;
 }
 
+PyCodeObject *
+PyCode_New(int argcount, int kwonlyargcount,
+           int nlocals, int stacksize, int flags,
+           PyObject *code, PyObject *consts, PyObject *names,
+           PyObject *varnames, PyObject *freevars, PyObject *cellvars,
+           PyObject *filename, PyObject *name, int firstlineno,
+           PyObject *lnotab)
+{
+    return PyCode_NewWithPosOnlyArgs(argcount, 0, kwonlyargcount, nlocals,
+                                     stacksize, flags, code, consts, names,
+                                     varnames, freevars, cellvars, filename,
+                                     name, firstlineno, lnotab);
+}
+
 int
 _PyCode_InitOpcache(PyCodeObject *co)
 {
@@ -311,7 +324,8 @@ PyCode_NewEmpty(const char *filename, const char *funcname, int firstlineno)
     if (filename_ob == NULL)
         goto failed;
 
-    result = PyCode_New(0,                      /* argcount */
+    result = PyCode_NewWithPosOnlyArgs(
+                0,                    /* argcount */
                 0,                              /* posonlyargcount */
                 0,                              /* kwonlyargcount */
                 0,                              /* nlocals */
@@ -492,12 +506,14 @@ code_new(PyTypeObject *type, PyObject *args, PyObject *kw)
     if (ourcellvars == NULL)
         goto cleanup;
 
-    co = (PyObject *)PyCode_New(argcount, posonlyargcount, kwonlyargcount,
-                                nlocals, stacksize, flags,
-                                code, consts, ournames, ourvarnames,
-                                ourfreevars, ourcellvars, filename,
-                                name, firstlineno, lnotab);
-  cleanup:
+    co = (PyObject *)PyCode_NewWithPosOnlyArgs(argcount, posonlyargcount,
+                                               kwonlyargcount,
+                                               nlocals, stacksize, flags,
+                                               code, consts, ournames,
+                                               ourvarnames, ourfreevars,
+                                               ourcellvars, filename,
+                                               name, firstlineno, lnotab);
+  cleanup: 
     Py_XDECREF(ournames);
     Py_XDECREF(ourvarnames);
     Py_XDECREF(ourfreevars);
@@ -625,7 +641,7 @@ code_replace_impl(PyCodeObject *self, int co_argcount,
 
 #undef CHECK_INT_ARG
 
-    return (PyObject *)PyCode_New(
+    return (PyObject *)PyCode_NewWithPosOnlyArgs(
         co_argcount, co_posonlyargcount, co_kwonlyargcount, co_nlocals,
         co_stacksize, co_flags, (PyObject*)co_code, co_consts, co_names,
         co_varnames, co_freevars, co_cellvars, co_filename, co_name,
diff --git a/Python/compile.c b/Python/compile.c
index 7bdf406079d3..9cce8aeb4e1f 100644
--- a/Python/compile.c
+++ b/Python/compile.c
@@ -5813,13 +5813,11 @@ makecode(struct compiler *c, struct assembler *a)
     if (maxdepth < 0) {
         goto error;
     }
-    co = PyCode_New(posonlyargcount+posorkeywordargcount, posonlyargcount,
-                    kwonlyargcount, nlocals_int, maxdepth, flags,
-                    bytecode, consts, names, varnames,
-                    freevars, cellvars,
-                    c->c_filename, c->u->u_name,
-                    c->u->u_firstlineno,
-                    a->a_lnotab);
+    co = PyCode_NewWithPosOnlyArgs(posonlyargcount+posorkeywordargcount,
+                                   posonlyargcount, kwonlyargcount, nlocals_int, 
+                                   maxdepth, flags, bytecode, consts, names,
+                                   varnames, freevars, cellvars, c->c_filename,
+                                   c->u->u_name, c->u->u_firstlineno, a->a_lnotab);
  error:
     Py_XDECREF(consts);
     Py_XDECREF(names);
diff --git a/Python/marshal.c b/Python/marshal.c
index caaddfe9e44e..b2daff2c8a3b 100644
--- a/Python/marshal.c
+++ b/Python/marshal.c
@@ -1396,7 +1396,7 @@ r_object(RFILE *p)
             if (lnotab == NULL)
                 goto code_error;
 
-            v = (PyObject *) PyCode_New(
+            v = (PyObject *) PyCode_NewWithPosOnlyArgs(
                             argcount, posonlyargcount, kwonlyargcount,
                             nlocals, stacksize, flags,
                             code, consts, names, varnames,


From webhook-mailer at python.org  Mon Jul  1 07:41:25 2019
From: webhook-mailer at python.org (Vinay Sajip)
Date: Mon, 01 Jul 2019 11:41:25 -0000
Subject: [Python-checkins] bpo-32934: Clarified meaning of 'capacity' for
 BufferingHandler and MemoryHandler. (GH-14498)
Message-ID: <mailman.168.1561981286.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/84de34e39eb9e49b2ae691c6f67df8d7da3561de
commit: 84de34e39eb9e49b2ae691c6f67df8d7da3561de
branch: master
author: Vinay Sajip <vinay_sajip at yahoo.co.uk>
committer: GitHub <noreply at github.com>
date: 2019-07-01T12:41:21+01:00
summary:

bpo-32934: Clarified meaning of 'capacity' for BufferingHandler and MemoryHandler. (GH-14498)

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 71f9fc920fdf..87ac79ef8072 100644
--- a/Doc/howto/logging-cookbook.rst
+++ b/Doc/howto/logging-cookbook.rst
@@ -2266,9 +2266,9 @@ The script just arranges to decorate ``foo`` with a decorator which will do the
 conditional logging that's required. The decorator takes a logger as a parameter
 and attaches a memory handler for the duration of the call to the decorated
 function. The decorator can be additionally parameterised using a target handler,
-a level at which flushing should occur, and a capacity for the buffer. These
-default to a :class:`~logging.StreamHandler` which writes to ``sys.stderr``,
-``logging.ERROR`` and ``100`` respectively.
+a level at which flushing should occur, and a capacity for the buffer (number of
+records buffered). These default to a :class:`~logging.StreamHandler` which
+writes to ``sys.stderr``, ``logging.ERROR`` and ``100`` respectively.
 
 Here's the script::
 
diff --git a/Doc/library/logging.handlers.rst b/Doc/library/logging.handlers.rst
index 703d66d7ff6a..df5bfefaa275 100644
--- a/Doc/library/logging.handlers.rst
+++ b/Doc/library/logging.handlers.rst
@@ -861,7 +861,8 @@ should, then :meth:`flush` is expected to do the flushing.
 
 .. class:: BufferingHandler(capacity)
 
-   Initializes the handler with a buffer of the specified capacity.
+   Initializes the handler with a buffer of the specified capacity. Here,
+   *capacity* means the number of logging records buffered.
 
 
    .. method:: emit(record)
@@ -885,12 +886,13 @@ should, then :meth:`flush` is expected to do the flushing.
 .. class:: MemoryHandler(capacity, flushLevel=ERROR, target=None, flushOnClose=True)
 
    Returns a new instance of the :class:`MemoryHandler` class. The instance is
-   initialized with a buffer size of *capacity*. If *flushLevel* is not specified,
-   :const:`ERROR` is used. If no *target* is specified, the target will need to be
-   set using :meth:`setTarget` before this handler does anything useful. If
-   *flushOnClose* is specified as ``False``, then the buffer is *not* flushed when
-   the handler is closed. If not specified or specified as ``True``, the previous
-   behaviour of flushing the buffer will occur when the handler is closed.
+   initialized with a buffer size of *capacity* (number of records buffered).
+   If *flushLevel* is not specified, :const:`ERROR` is used. If no *target* is
+   specified, the target will need to be set using :meth:`setTarget` before this
+   handler does anything useful. If *flushOnClose* is specified as ``False``,
+   then the buffer is *not* flushed when the handler is closed. If not specified
+   or specified as ``True``, the previous behaviour of flushing the buffer will
+   occur when the handler is closed.
 
    .. versionchanged:: 3.6
       The *flushOnClose* parameter was added.


From webhook-mailer at python.org  Mon Jul  1 08:12:03 2019
From: webhook-mailer at python.org (Vinay Sajip)
Date: Mon, 01 Jul 2019 12:12:03 -0000
Subject: [Python-checkins] bpo-32934: Clarified meaning of 'capacity' for
 BufferingHandler and MemoryHandler. (GH-14498) (GH-14508)
Message-ID: <mailman.169.1561983123.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/471d785dc759eb2e9c06f077f323cf136d32506b
commit: 471d785dc759eb2e9c06f077f323cf136d32506b
branch: 3.7
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: Vinay Sajip <vinay_sajip at yahoo.co.uk>
date: 2019-07-01T13:11:37+01:00
summary:

bpo-32934: Clarified meaning of 'capacity' for BufferingHandler and MemoryHandler. (GH-14498) (GH-14508)

(cherry picked from commit 84de34e39eb9e49b2ae691c6f67df8d7da3561de)

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 e391506ce2e4..105ae5ed25a0 100644
--- a/Doc/howto/logging-cookbook.rst
+++ b/Doc/howto/logging-cookbook.rst
@@ -2267,9 +2267,9 @@ The script just arranges to decorate ``foo`` with a decorator which will do the
 conditional logging that's required. The decorator takes a logger as a parameter
 and attaches a memory handler for the duration of the call to the decorated
 function. The decorator can be additionally parameterised using a target handler,
-a level at which flushing should occur, and a capacity for the buffer. These
-default to a :class:`~logging.StreamHandler` which writes to ``sys.stderr``,
-``logging.ERROR`` and ``100`` respectively.
+a level at which flushing should occur, and a capacity for the buffer (number of
+records buffered). These default to a :class:`~logging.StreamHandler` which
+writes to ``sys.stderr``, ``logging.ERROR`` and ``100`` respectively.
 
 Here's the script::
 
diff --git a/Doc/library/logging.handlers.rst b/Doc/library/logging.handlers.rst
index b48d50f9e9e5..b2ebafa83b2e 100644
--- a/Doc/library/logging.handlers.rst
+++ b/Doc/library/logging.handlers.rst
@@ -840,7 +840,8 @@ should, then :meth:`flush` is expected to do the flushing.
 
 .. class:: BufferingHandler(capacity)
 
-   Initializes the handler with a buffer of the specified capacity.
+   Initializes the handler with a buffer of the specified capacity. Here,
+   *capacity* means the number of logging records buffered.
 
 
    .. method:: emit(record)
@@ -864,12 +865,13 @@ should, then :meth:`flush` is expected to do the flushing.
 .. class:: MemoryHandler(capacity, flushLevel=ERROR, target=None, flushOnClose=True)
 
    Returns a new instance of the :class:`MemoryHandler` class. The instance is
-   initialized with a buffer size of *capacity*. If *flushLevel* is not specified,
-   :const:`ERROR` is used. If no *target* is specified, the target will need to be
-   set using :meth:`setTarget` before this handler does anything useful. If
-   *flushOnClose* is specified as ``False``, then the buffer is *not* flushed when
-   the handler is closed. If not specified or specified as ``True``, the previous
-   behaviour of flushing the buffer will occur when the handler is closed.
+   initialized with a buffer size of *capacity* (number of records buffered).
+   If *flushLevel* is not specified, :const:`ERROR` is used. If no *target* is
+   specified, the target will need to be set using :meth:`setTarget` before this
+   handler does anything useful. If *flushOnClose* is specified as ``False``,
+   then the buffer is *not* flushed when the handler is closed. If not specified
+   or specified as ``True``, the previous behaviour of flushing the buffer will
+   occur when the handler is closed.
 
    .. versionchanged:: 3.6
       The *flushOnClose* parameter was added.


From webhook-mailer at python.org  Mon Jul  1 08:12:14 2019
From: webhook-mailer at python.org (Vinay Sajip)
Date: Mon, 01 Jul 2019 12:12:14 -0000
Subject: [Python-checkins] bpo-32934: Clarified meaning of 'capacity' for
 BufferingHandler and MemoryHandler. (GH-14498) (GH-14507)
Message-ID: <mailman.170.1561983135.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/3db5c5c7630af92336a8c0a269e05607cd68f9e7
commit: 3db5c5c7630af92336a8c0a269e05607cd68f9e7
branch: 3.8
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: Vinay Sajip <vinay_sajip at yahoo.co.uk>
date: 2019-07-01T13:12:08+01:00
summary:

bpo-32934: Clarified meaning of 'capacity' for BufferingHandler and MemoryHandler. (GH-14498) (GH-14507)

(cherry picked from commit 84de34e39eb9e49b2ae691c6f67df8d7da3561de)

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 71f9fc920fdf..87ac79ef8072 100644
--- a/Doc/howto/logging-cookbook.rst
+++ b/Doc/howto/logging-cookbook.rst
@@ -2266,9 +2266,9 @@ The script just arranges to decorate ``foo`` with a decorator which will do the
 conditional logging that's required. The decorator takes a logger as a parameter
 and attaches a memory handler for the duration of the call to the decorated
 function. The decorator can be additionally parameterised using a target handler,
-a level at which flushing should occur, and a capacity for the buffer. These
-default to a :class:`~logging.StreamHandler` which writes to ``sys.stderr``,
-``logging.ERROR`` and ``100`` respectively.
+a level at which flushing should occur, and a capacity for the buffer (number of
+records buffered). These default to a :class:`~logging.StreamHandler` which
+writes to ``sys.stderr``, ``logging.ERROR`` and ``100`` respectively.
 
 Here's the script::
 
diff --git a/Doc/library/logging.handlers.rst b/Doc/library/logging.handlers.rst
index b48d50f9e9e5..b2ebafa83b2e 100644
--- a/Doc/library/logging.handlers.rst
+++ b/Doc/library/logging.handlers.rst
@@ -840,7 +840,8 @@ should, then :meth:`flush` is expected to do the flushing.
 
 .. class:: BufferingHandler(capacity)
 
-   Initializes the handler with a buffer of the specified capacity.
+   Initializes the handler with a buffer of the specified capacity. Here,
+   *capacity* means the number of logging records buffered.
 
 
    .. method:: emit(record)
@@ -864,12 +865,13 @@ should, then :meth:`flush` is expected to do the flushing.
 .. class:: MemoryHandler(capacity, flushLevel=ERROR, target=None, flushOnClose=True)
 
    Returns a new instance of the :class:`MemoryHandler` class. The instance is
-   initialized with a buffer size of *capacity*. If *flushLevel* is not specified,
-   :const:`ERROR` is used. If no *target* is specified, the target will need to be
-   set using :meth:`setTarget` before this handler does anything useful. If
-   *flushOnClose* is specified as ``False``, then the buffer is *not* flushed when
-   the handler is closed. If not specified or specified as ``True``, the previous
-   behaviour of flushing the buffer will occur when the handler is closed.
+   initialized with a buffer size of *capacity* (number of records buffered).
+   If *flushLevel* is not specified, :const:`ERROR` is used. If no *target* is
+   specified, the target will need to be set using :meth:`setTarget` before this
+   handler does anything useful. If *flushOnClose* is specified as ``False``,
+   then the buffer is *not* flushed when the handler is closed. If not specified
+   or specified as ``True``, the previous behaviour of flushing the buffer will
+   occur when the handler is closed.
 
    .. versionchanged:: 3.6
       The *flushOnClose* parameter was added.


From webhook-mailer at python.org  Mon Jul  1 08:12:44 2019
From: webhook-mailer at python.org (Victor Stinner)
Date: Mon, 01 Jul 2019 12:12:44 -0000
Subject: [Python-checkins] bpo-10945: Drop support for bdist_wininst on
 non-Windows systems (GH-14506)
Message-ID: <mailman.171.1561983165.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/72cd653c4ed7a4f8f8fb06ac364b08a97085a2b5
commit: 72cd653c4ed7a4f8f8fb06ac364b08a97085a2b5
branch: master
author: Miro Hron?ok <miro at hroncok.cz>
committer: Victor Stinner <vstinner at redhat.com>
date: 2019-07-01T14:12:40+02:00
summary:

bpo-10945: Drop support for bdist_wininst on non-Windows systems (GH-14506)

bdist_wininst depends on MBCS codec, unavailable on non-Windows,
and bdist_wininst have not worked since at least Python 3.2, possibly
never on Python 3.

Here we document that bdist_wininst is only supported on Windows,
and we mark it unsupported otherwise to skip tests.

Distributors of Python 3 can now safely drop the bdist_wininst .exe files
without the need to skip bdist_wininst related tests.

files:
A Misc/NEWS.d/next/Windows/2019-07-01-12-38-48.bpo-10945.s0YBHG.rst
M Doc/distutils/builtdist.rst
M Lib/distutils/command/bdist_wininst.py

diff --git a/Doc/distutils/builtdist.rst b/Doc/distutils/builtdist.rst
index f44d0d039f45..8c65d9d59118 100644
--- a/Doc/distutils/builtdist.rst
+++ b/Doc/distutils/builtdist.rst
@@ -315,8 +315,8 @@ or the :command:`bdist` command with the :option:`!--formats` option::
 
 If you have a pure module distribution (only containing pure Python modules and
 packages), the resulting installer will be version independent and have a name
-like :file:`foo-1.0.win32.exe`.  These installers can even be created on Unix
-platforms or Mac OS X.
+like :file:`foo-1.0.win32.exe`. Note that creating ``wininst`` binary
+distributions in only supported on Windows systems.
 
 If you have a non-pure distribution, the extensions can only be created on a
 Windows platform, and will be Python version dependent. The installer filename
diff --git a/Lib/distutils/command/bdist_wininst.py b/Lib/distutils/command/bdist_wininst.py
index 3a616883bee5..acaa184b5f71 100644
--- a/Lib/distutils/command/bdist_wininst.py
+++ b/Lib/distutils/command/bdist_wininst.py
@@ -55,6 +55,9 @@ class bdist_wininst(Command):
     boolean_options = ['keep-temp', 'no-target-compile', 'no-target-optimize',
                        'skip-build']
 
+    # bpo-10945: bdist_wininst requires mbcs encoding only available on Windows
+    _unsupported = (sys.platform != "win32")
+
     def initialize_options(self):
         self.bdist_dir = None
         self.plat_name = None
diff --git a/Misc/NEWS.d/next/Windows/2019-07-01-12-38-48.bpo-10945.s0YBHG.rst b/Misc/NEWS.d/next/Windows/2019-07-01-12-38-48.bpo-10945.s0YBHG.rst
new file mode 100644
index 000000000000..d39576545efa
--- /dev/null
+++ b/Misc/NEWS.d/next/Windows/2019-07-01-12-38-48.bpo-10945.s0YBHG.rst
@@ -0,0 +1,2 @@
+Officially drop support for creating bdist_wininst installers on non-Windows
+systems.


From webhook-mailer at python.org  Mon Jul  1 08:42:16 2019
From: webhook-mailer at python.org (Miss Islington (bot))
Date: Mon, 01 Jul 2019 12:42:16 -0000
Subject: [Python-checkins] bpo-10945: Drop support for bdist_wininst on
 non-Windows systems (GH-14506)
Message-ID: <mailman.172.1561984937.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/45c10da40912e04c0d0de02af4b23438ed0de49b
commit: 45c10da40912e04c0d0de02af4b23438ed0de49b
branch: 3.7
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: GitHub <noreply at github.com>
date: 2019-07-01T05:42:08-07:00
summary:

bpo-10945: Drop support for bdist_wininst on non-Windows systems (GH-14506)


bdist_wininst depends on MBCS codec, unavailable on non-Windows,
and bdist_wininst have not worked since at least Python 3.2, possibly
never on Python 3.

Here we document that bdist_wininst is only supported on Windows,
and we mark it unsupported otherwise to skip tests.

Distributors of Python 3 can now safely drop the bdist_wininst .exe files
without the need to skip bdist_wininst related tests.
(cherry picked from commit 72cd653c4ed7a4f8f8fb06ac364b08a97085a2b5)

Co-authored-by: Miro Hron?ok <miro at hroncok.cz>

files:
A Misc/NEWS.d/next/Windows/2019-07-01-12-38-48.bpo-10945.s0YBHG.rst
M Doc/distutils/builtdist.rst
M Lib/distutils/command/bdist_wininst.py

diff --git a/Doc/distutils/builtdist.rst b/Doc/distutils/builtdist.rst
index f1f347126160..0a83f8bd6599 100644
--- a/Doc/distutils/builtdist.rst
+++ b/Doc/distutils/builtdist.rst
@@ -313,8 +313,8 @@ or the :command:`bdist` command with the :option:`!--formats` option::
 
 If you have a pure module distribution (only containing pure Python modules and
 packages), the resulting installer will be version independent and have a name
-like :file:`foo-1.0.win32.exe`.  These installers can even be created on Unix
-platforms or Mac OS X.
+like :file:`foo-1.0.win32.exe`. Note that creating ``wininst`` binary
+distributions in only supported on Windows systems.
 
 If you have a non-pure distribution, the extensions can only be created on a
 Windows platform, and will be Python version dependent. The installer filename
diff --git a/Lib/distutils/command/bdist_wininst.py b/Lib/distutils/command/bdist_wininst.py
index fde56754e891..15434c3a9898 100644
--- a/Lib/distutils/command/bdist_wininst.py
+++ b/Lib/distutils/command/bdist_wininst.py
@@ -55,6 +55,9 @@ class bdist_wininst(Command):
     boolean_options = ['keep-temp', 'no-target-compile', 'no-target-optimize',
                        'skip-build']
 
+    # bpo-10945: bdist_wininst requires mbcs encoding only available on Windows
+    _unsupported = (sys.platform != "win32")
+
     def initialize_options(self):
         self.bdist_dir = None
         self.plat_name = None
diff --git a/Misc/NEWS.d/next/Windows/2019-07-01-12-38-48.bpo-10945.s0YBHG.rst b/Misc/NEWS.d/next/Windows/2019-07-01-12-38-48.bpo-10945.s0YBHG.rst
new file mode 100644
index 000000000000..d39576545efa
--- /dev/null
+++ b/Misc/NEWS.d/next/Windows/2019-07-01-12-38-48.bpo-10945.s0YBHG.rst
@@ -0,0 +1,2 @@
+Officially drop support for creating bdist_wininst installers on non-Windows
+systems.


From webhook-mailer at python.org  Mon Jul  1 08:54:26 2019
From: webhook-mailer at python.org (Miss Islington (bot))
Date: Mon, 01 Jul 2019 12:54:26 -0000
Subject: [Python-checkins] bpo-10945: Drop support for bdist_wininst on
 non-Windows systems (GH-14506)
Message-ID: <mailman.173.1561985666.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/be5bb52f5f2d4da4b9d6f42399f7275ab47910f3
commit: be5bb52f5f2d4da4b9d6f42399f7275ab47910f3
branch: 3.8
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: GitHub <noreply at github.com>
date: 2019-07-01T05:54:19-07:00
summary:

bpo-10945: Drop support for bdist_wininst on non-Windows systems (GH-14506)


bdist_wininst depends on MBCS codec, unavailable on non-Windows,
and bdist_wininst have not worked since at least Python 3.2, possibly
never on Python 3.

Here we document that bdist_wininst is only supported on Windows,
and we mark it unsupported otherwise to skip tests.

Distributors of Python 3 can now safely drop the bdist_wininst .exe files
without the need to skip bdist_wininst related tests.
(cherry picked from commit 72cd653c4ed7a4f8f8fb06ac364b08a97085a2b5)

Co-authored-by: Miro Hron?ok <miro at hroncok.cz>

files:
A Misc/NEWS.d/next/Windows/2019-07-01-12-38-48.bpo-10945.s0YBHG.rst
M Doc/distutils/builtdist.rst
M Lib/distutils/command/bdist_wininst.py

diff --git a/Doc/distutils/builtdist.rst b/Doc/distutils/builtdist.rst
index f44d0d039f45..8c65d9d59118 100644
--- a/Doc/distutils/builtdist.rst
+++ b/Doc/distutils/builtdist.rst
@@ -315,8 +315,8 @@ or the :command:`bdist` command with the :option:`!--formats` option::
 
 If you have a pure module distribution (only containing pure Python modules and
 packages), the resulting installer will be version independent and have a name
-like :file:`foo-1.0.win32.exe`.  These installers can even be created on Unix
-platforms or Mac OS X.
+like :file:`foo-1.0.win32.exe`. Note that creating ``wininst`` binary
+distributions in only supported on Windows systems.
 
 If you have a non-pure distribution, the extensions can only be created on a
 Windows platform, and will be Python version dependent. The installer filename
diff --git a/Lib/distutils/command/bdist_wininst.py b/Lib/distutils/command/bdist_wininst.py
index 3a616883bee5..acaa184b5f71 100644
--- a/Lib/distutils/command/bdist_wininst.py
+++ b/Lib/distutils/command/bdist_wininst.py
@@ -55,6 +55,9 @@ class bdist_wininst(Command):
     boolean_options = ['keep-temp', 'no-target-compile', 'no-target-optimize',
                        'skip-build']
 
+    # bpo-10945: bdist_wininst requires mbcs encoding only available on Windows
+    _unsupported = (sys.platform != "win32")
+
     def initialize_options(self):
         self.bdist_dir = None
         self.plat_name = None
diff --git a/Misc/NEWS.d/next/Windows/2019-07-01-12-38-48.bpo-10945.s0YBHG.rst b/Misc/NEWS.d/next/Windows/2019-07-01-12-38-48.bpo-10945.s0YBHG.rst
new file mode 100644
index 000000000000..d39576545efa
--- /dev/null
+++ b/Misc/NEWS.d/next/Windows/2019-07-01-12-38-48.bpo-10945.s0YBHG.rst
@@ -0,0 +1,2 @@
+Officially drop support for creating bdist_wininst installers on non-Windows
+systems.


From webhook-mailer at python.org  Mon Jul  1 09:52:01 2019
From: webhook-mailer at python.org (Antoine Pitrou)
Date: Mon, 01 Jul 2019 13:52:01 -0000
Subject: [Python-checkins] bpo-37209: Add pickle entry for 3.8 whatsnew
 (GH-14503)
Message-ID: <mailman.174.1561989121.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/ec6c1bd0491590f3c0e2908a7b2dfb91b6acdae9
commit: ec6c1bd0491590f3c0e2908a7b2dfb91b6acdae9
branch: master
author: Pierre Glaser <pierreglaser at msn.com>
committer: Antoine Pitrou <antoine at python.org>
date: 2019-07-01T15:51:57+02:00
summary:

bpo-37209: Add pickle entry for 3.8 whatsnew (GH-14503)

files:
M Doc/whatsnew/3.8.rst

diff --git a/Doc/whatsnew/3.8.rst b/Doc/whatsnew/3.8.rst
index 5aab191f1a48..61e1d3da989d 100644
--- a/Doc/whatsnew/3.8.rst
+++ b/Doc/whatsnew/3.8.rst
@@ -625,6 +625,20 @@ to a path.
 (Contributed by Joannah Nanjekye in :issue:`26978`)
 
 
+pickle
+------
+
+Reduction methods can now include a 6th item in the tuple they return. This
+item should specify a custom state-setting method that's called instead of the
+regular ``__setstate__`` method.
+(Contributed by Pierre Glaser and Olivier Grisel in :issue:`35900`)
+
+:mod:`pickle` extensions subclassing the C-optimized :class:`~pickle.Pickler`
+can now override the pickling logic of functions and classes by defining the
+special :meth:`~pickle.Pickler.reducer_override` method.
+(Contributed by Pierre Glaser and Olivier Grisel in :issue:`35900`)
+
+
 plistlib
 --------
 


From webhook-mailer at python.org  Mon Jul  1 10:05:10 2019
From: webhook-mailer at python.org (Antoine Pitrou)
Date: Mon, 01 Jul 2019 14:05:10 -0000
Subject: [Python-checkins] bpo-37209: Add pickle entry for 3.8 whatsnew
 (GH-14503) (GH-14512)
Message-ID: <mailman.175.1561989911.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/e224d2865aa0f021b25d68de9a6c2be617341f4c
commit: e224d2865aa0f021b25d68de9a6c2be617341f4c
branch: 3.8
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: Antoine Pitrou <antoine at python.org>
date: 2019-07-01T16:05:02+02:00
summary:

bpo-37209: Add pickle entry for 3.8 whatsnew (GH-14503) (GH-14512)

(cherry picked from commit ec6c1bd0491590f3c0e2908a7b2dfb91b6acdae9)

Co-authored-by: Pierre Glaser <pierreglaser at msn.com>

files:
M Doc/whatsnew/3.8.rst

diff --git a/Doc/whatsnew/3.8.rst b/Doc/whatsnew/3.8.rst
index f423765c8917..1f5694caf9a4 100644
--- a/Doc/whatsnew/3.8.rst
+++ b/Doc/whatsnew/3.8.rst
@@ -622,6 +622,20 @@ to a path.
 (Contributed by Joannah Nanjekye in :issue:`26978`)
 
 
+pickle
+------
+
+Reduction methods can now include a 6th item in the tuple they return. This
+item should specify a custom state-setting method that's called instead of the
+regular ``__setstate__`` method.
+(Contributed by Pierre Glaser and Olivier Grisel in :issue:`35900`)
+
+:mod:`pickle` extensions subclassing the C-optimized :class:`~pickle.Pickler`
+can now override the pickling logic of functions and classes by defining the
+special :meth:`~pickle.Pickler.reducer_override` method.
+(Contributed by Pierre Glaser and Olivier Grisel in :issue:`35900`)
+
+
 plistlib
 --------
 


From webhook-mailer at python.org  Mon Jul  1 10:51:26 2019
From: webhook-mailer at python.org (Victor Stinner)
Date: Mon, 01 Jul 2019 14:51:26 -0000
Subject: [Python-checkins] bpo-37467: Fix PyErr_Display() for bytes filename
 (GH-14504)
Message-ID: <mailman.176.1561992686.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/f9b7457bd7f438263e0d2dd1f70589ad56a2585e
commit: f9b7457bd7f438263e0d2dd1f70589ad56a2585e
branch: master
author: Victor Stinner <vstinner at redhat.com>
committer: GitHub <noreply at github.com>
date: 2019-07-01T16:51:18+02:00
summary:

bpo-37467: Fix PyErr_Display() for bytes filename (GH-14504)

Fix sys.excepthook() and PyErr_Display() if a filename is a bytes
string. For example, for a SyntaxError exception where the filename
attribute is a bytes string.

Cleanup also test_sys:

* Sort imports.
* Rename numruns global var to INTERN_NUMRUNS.
* Add DisplayHookTest and ExceptHookTest test case classes.
* Don't save/restore sys.stdout and sys.displayhook using
  setUp()/tearDown(): do it in each test method.
* Test error case (call hook with no argument) after the success case.

files:
A Misc/NEWS.d/next/Core and Builtins/2019-07-01-12-22-44.bpo-37467.u-XyEu.rst
M Lib/test/test_sys.py
M Python/pythonrun.c

diff --git a/Lib/test/test_sys.py b/Lib/test/test_sys.py
index c223f92ba6bb..8852aaef9437 100644
--- a/Lib/test/test_sys.py
+++ b/Lib/test/test_sys.py
@@ -1,81 +1,104 @@
-import unittest, test.support
+from test import support
 from test.support.script_helper import assert_python_ok, assert_python_failure
-import sys, io, os
+import builtins
+import codecs
+import gc
+import io
+import locale
+import operator
+import os
 import struct
 import subprocess
+import sys
+import sysconfig
+import test.support
 import textwrap
+import unittest
 import warnings
-import operator
-import codecs
-import gc
-import sysconfig
-import locale
+
 
 # count the number of test runs, used to create unique
 # strings to intern in test_intern()
-numruns = 0
+INTERN_NUMRUNS = 0
 
 
-class SysModuleTest(unittest.TestCase):
+class DisplayHookTest(unittest.TestCase):
 
-    def setUp(self):
-        self.orig_stdout = sys.stdout
-        self.orig_stderr = sys.stderr
-        self.orig_displayhook = sys.displayhook
+    def test_original_displayhook(self):
+        dh = sys.__displayhook__
 
-    def tearDown(self):
-        sys.stdout = self.orig_stdout
-        sys.stderr = self.orig_stderr
-        sys.displayhook = self.orig_displayhook
-        test.support.reap_children()
+        with support.captured_stdout() as out:
+            dh(42)
 
-    def test_original_displayhook(self):
-        import builtins
-        out = io.StringIO()
-        sys.stdout = out
+        self.assertEqual(out.getvalue(), "42\n")
+        self.assertEqual(builtins._, 42)
 
-        dh = sys.__displayhook__
+        del builtins._
 
-        self.assertRaises(TypeError, dh)
-        if hasattr(builtins, "_"):
-            del builtins._
+        with support.captured_stdout() as out:
+            dh(None)
 
-        dh(None)
         self.assertEqual(out.getvalue(), "")
         self.assertTrue(not hasattr(builtins, "_"))
-        dh(42)
-        self.assertEqual(out.getvalue(), "42\n")
-        self.assertEqual(builtins._, 42)
 
-        del sys.stdout
-        self.assertRaises(RuntimeError, dh, 42)
+        # sys.displayhook() requires arguments
+        self.assertRaises(TypeError, dh)
+
+        stdout = sys.stdout
+        try:
+            del sys.stdout
+            self.assertRaises(RuntimeError, dh, 42)
+        finally:
+            sys.stdout = stdout
 
     def test_lost_displayhook(self):
-        del sys.displayhook
-        code = compile("42", "<string>", "single")
-        self.assertRaises(RuntimeError, eval, code)
+        displayhook = sys.displayhook
+        try:
+            del sys.displayhook
+            code = compile("42", "<string>", "single")
+            self.assertRaises(RuntimeError, eval, code)
+        finally:
+            sys.displayhook = displayhook
 
     def test_custom_displayhook(self):
         def baddisplayhook(obj):
             raise ValueError
-        sys.displayhook = baddisplayhook
-        code = compile("42", "<string>", "single")
-        self.assertRaises(ValueError, eval, code)
 
-    def test_original_excepthook(self):
-        err = io.StringIO()
-        sys.stderr = err
+        with support.swap_attr(sys, 'displayhook', baddisplayhook):
+            code = compile("42", "<string>", "single")
+            self.assertRaises(ValueError, eval, code)
 
-        eh = sys.__excepthook__
 
-        self.assertRaises(TypeError, eh)
+class ExceptHookTest(unittest.TestCase):
+
+    def test_original_excepthook(self):
         try:
             raise ValueError(42)
         except ValueError as exc:
-            eh(*sys.exc_info())
+            with support.captured_stderr() as err:
+                sys.__excepthook__(*sys.exc_info())
 
         self.assertTrue(err.getvalue().endswith("ValueError: 42\n"))
 
+        self.assertRaises(TypeError, sys.__excepthook__)
+
+    def test_excepthook_bytes_filename(self):
+        # bpo-37467: sys.excepthook() must not crash if a filename
+        # is a bytes string
+        with warnings.catch_warnings():
+            warnings.simplefilter('ignore', BytesWarning)
+
+            try:
+                raise SyntaxError("msg", (b"bytes_filename", 123, 0, "text"))
+            except SyntaxError as exc:
+                with support.captured_stderr() as err:
+                    sys.__excepthook__(*sys.exc_info())
+
+        err = err.getvalue()
+        self.assertIn("""  File "b'bytes_filename'", line 123\n""", err)
+        self.assertIn("""    text\n""", err)
+        self.assertTrue(err.endswith("SyntaxError: msg\n"))
+
     def test_excepthook(self):
         with test.support.captured_output("stderr") as stderr:
             sys.excepthook(1, '1', 1)
@@ -85,6 +108,12 @@ def test_excepthook(self):
     # FIXME: testing the code for a lost or replaced excepthook in
     # Python/pythonrun.c::PyErr_PrintEx() is tricky.
 
+
+class SysModuleTest(unittest.TestCase):
+
+    def tearDown(self):
+        test.support.reap_children()
+
     def test_exit(self):
         # call with two arguments
         self.assertRaises(TypeError, sys.exit, 42, 42)
@@ -492,10 +521,10 @@ def test_43581(self):
         self.assertEqual(sys.__stdout__.encoding, sys.__stderr__.encoding)
 
     def test_intern(self):
-        global numruns
-        numruns += 1
+        global INTERN_NUMRUNS
+        INTERN_NUMRUNS += 1
         self.assertRaises(TypeError, sys.intern)
-        s = "never interned before" + str(numruns)
+        s = "never interned before" + str(INTERN_NUMRUNS)
         self.assertTrue(sys.intern(s) is s)
         s2 = s.swapcase().swapcase()
         self.assertTrue(sys.intern(s2) is s)
diff --git a/Misc/NEWS.d/next/Core and Builtins/2019-07-01-12-22-44.bpo-37467.u-XyEu.rst b/Misc/NEWS.d/next/Core and Builtins/2019-07-01-12-22-44.bpo-37467.u-XyEu.rst
new file mode 100644
index 000000000000..5e809646b4b8
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2019-07-01-12-22-44.bpo-37467.u-XyEu.rst	
@@ -0,0 +1,3 @@
+Fix :func:`sys.excepthook` and :c:func:`PyErr_Display` if a filename is a
+bytes string. For example, for a SyntaxError exception where the filename
+attribute is a bytes string.
diff --git a/Python/pythonrun.c b/Python/pythonrun.c
index 8f3ee19279d9..f1d946a0b0f8 100644
--- a/Python/pythonrun.c
+++ b/Python/pythonrun.c
@@ -797,7 +797,7 @@ print_exception(PyObject *f, PyObject *value)
             Py_DECREF(value);
             value = message;
 
-            line = PyUnicode_FromFormat("  File \"%U\", line %d\n",
+            line = PyUnicode_FromFormat("  File \"%S\", line %d\n",
                                           filename, lineno);
             Py_DECREF(filename);
             if (line != NULL) {


From webhook-mailer at python.org  Mon Jul  1 11:11:21 2019
From: webhook-mailer at python.org (Miss Islington (bot))
Date: Mon, 01 Jul 2019 15:11:21 -0000
Subject: [Python-checkins] bpo-37467: Fix PyErr_Display() for bytes filename
 (GH-14504)
Message-ID: <mailman.177.1561993882.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/2683ded568b24fff1139edd9127a349f432292a6
commit: 2683ded568b24fff1139edd9127a349f432292a6
branch: 3.8
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: GitHub <noreply at github.com>
date: 2019-07-01T08:11:15-07:00
summary:

bpo-37467: Fix PyErr_Display() for bytes filename (GH-14504)


Fix sys.excepthook() and PyErr_Display() if a filename is a bytes
string. For example, for a SyntaxError exception where the filename
attribute is a bytes string.

Cleanup also test_sys:

* Sort imports.
* Rename numruns global var to INTERN_NUMRUNS.
* Add DisplayHookTest and ExceptHookTest test case classes.
* Don't save/restore sys.stdout and sys.displayhook using
  setUp()/tearDown(): do it in each test method.
* Test error case (call hook with no argument) after the success case.
(cherry picked from commit f9b7457bd7f438263e0d2dd1f70589ad56a2585e)

Co-authored-by: Victor Stinner <vstinner at redhat.com>

files:
A Misc/NEWS.d/next/Core and Builtins/2019-07-01-12-22-44.bpo-37467.u-XyEu.rst
M Lib/test/test_sys.py
M Python/pythonrun.c

diff --git a/Lib/test/test_sys.py b/Lib/test/test_sys.py
index a7df7a2fc8c9..96db7de4938f 100644
--- a/Lib/test/test_sys.py
+++ b/Lib/test/test_sys.py
@@ -1,81 +1,104 @@
-import unittest, test.support
+from test import support
 from test.support.script_helper import assert_python_ok, assert_python_failure
-import sys, io, os
+import builtins
+import codecs
+import gc
+import io
+import locale
+import operator
+import os
 import struct
 import subprocess
+import sys
+import sysconfig
+import test.support
 import textwrap
+import unittest
 import warnings
-import operator
-import codecs
-import gc
-import sysconfig
-import locale
+
 
 # count the number of test runs, used to create unique
 # strings to intern in test_intern()
-numruns = 0
+INTERN_NUMRUNS = 0
 
 
-class SysModuleTest(unittest.TestCase):
+class DisplayHookTest(unittest.TestCase):
 
-    def setUp(self):
-        self.orig_stdout = sys.stdout
-        self.orig_stderr = sys.stderr
-        self.orig_displayhook = sys.displayhook
+    def test_original_displayhook(self):
+        dh = sys.__displayhook__
 
-    def tearDown(self):
-        sys.stdout = self.orig_stdout
-        sys.stderr = self.orig_stderr
-        sys.displayhook = self.orig_displayhook
-        test.support.reap_children()
+        with support.captured_stdout() as out:
+            dh(42)
 
-    def test_original_displayhook(self):
-        import builtins
-        out = io.StringIO()
-        sys.stdout = out
+        self.assertEqual(out.getvalue(), "42\n")
+        self.assertEqual(builtins._, 42)
 
-        dh = sys.__displayhook__
+        del builtins._
 
-        self.assertRaises(TypeError, dh)
-        if hasattr(builtins, "_"):
-            del builtins._
+        with support.captured_stdout() as out:
+            dh(None)
 
-        dh(None)
         self.assertEqual(out.getvalue(), "")
         self.assertTrue(not hasattr(builtins, "_"))
-        dh(42)
-        self.assertEqual(out.getvalue(), "42\n")
-        self.assertEqual(builtins._, 42)
 
-        del sys.stdout
-        self.assertRaises(RuntimeError, dh, 42)
+        # sys.displayhook() requires arguments
+        self.assertRaises(TypeError, dh)
+
+        stdout = sys.stdout
+        try:
+            del sys.stdout
+            self.assertRaises(RuntimeError, dh, 42)
+        finally:
+            sys.stdout = stdout
 
     def test_lost_displayhook(self):
-        del sys.displayhook
-        code = compile("42", "<string>", "single")
-        self.assertRaises(RuntimeError, eval, code)
+        displayhook = sys.displayhook
+        try:
+            del sys.displayhook
+            code = compile("42", "<string>", "single")
+            self.assertRaises(RuntimeError, eval, code)
+        finally:
+            sys.displayhook = displayhook
 
     def test_custom_displayhook(self):
         def baddisplayhook(obj):
             raise ValueError
-        sys.displayhook = baddisplayhook
-        code = compile("42", "<string>", "single")
-        self.assertRaises(ValueError, eval, code)
 
-    def test_original_excepthook(self):
-        err = io.StringIO()
-        sys.stderr = err
+        with support.swap_attr(sys, 'displayhook', baddisplayhook):
+            code = compile("42", "<string>", "single")
+            self.assertRaises(ValueError, eval, code)
+
 
-        eh = sys.__excepthook__
+class ExceptHookTest(unittest.TestCase):
 
-        self.assertRaises(TypeError, eh)
+    def test_original_excepthook(self):
         try:
             raise ValueError(42)
         except ValueError as exc:
-            eh(*sys.exc_info())
+            with support.captured_stderr() as err:
+                sys.__excepthook__(*sys.exc_info())
 
         self.assertTrue(err.getvalue().endswith("ValueError: 42\n"))
 
+        self.assertRaises(TypeError, sys.__excepthook__)
+
+    def test_excepthook_bytes_filename(self):
+        # bpo-37467: sys.excepthook() must not crash if a filename
+        # is a bytes string
+        with warnings.catch_warnings():
+            warnings.simplefilter('ignore', BytesWarning)
+
+            try:
+                raise SyntaxError("msg", (b"bytes_filename", 123, 0, "text"))
+            except SyntaxError as exc:
+                with support.captured_stderr() as err:
+                    sys.__excepthook__(*sys.exc_info())
+
+        err = err.getvalue()
+        self.assertIn("""  File "b'bytes_filename'", line 123\n""", err)
+        self.assertIn("""    text\n""", err)
+        self.assertTrue(err.endswith("SyntaxError: msg\n"))
+
     def test_excepthook(self):
         with test.support.captured_output("stderr") as stderr:
             sys.excepthook(1, '1', 1)
@@ -85,6 +108,12 @@ def test_excepthook(self):
     # FIXME: testing the code for a lost or replaced excepthook in
     # Python/pythonrun.c::PyErr_PrintEx() is tricky.
 
+
+class SysModuleTest(unittest.TestCase):
+
+    def tearDown(self):
+        test.support.reap_children()
+
     def test_exit(self):
         # call with two arguments
         self.assertRaises(TypeError, sys.exit, 42, 42)
@@ -501,10 +530,10 @@ def test_43581(self):
         self.assertEqual(sys.__stdout__.encoding, sys.__stderr__.encoding)
 
     def test_intern(self):
-        global numruns
-        numruns += 1
+        global INTERN_NUMRUNS
+        INTERN_NUMRUNS += 1
         self.assertRaises(TypeError, sys.intern)
-        s = "never interned before" + str(numruns)
+        s = "never interned before" + str(INTERN_NUMRUNS)
         self.assertTrue(sys.intern(s) is s)
         s2 = s.swapcase().swapcase()
         self.assertTrue(sys.intern(s2) is s)
diff --git a/Misc/NEWS.d/next/Core and Builtins/2019-07-01-12-22-44.bpo-37467.u-XyEu.rst b/Misc/NEWS.d/next/Core and Builtins/2019-07-01-12-22-44.bpo-37467.u-XyEu.rst
new file mode 100644
index 000000000000..5e809646b4b8
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2019-07-01-12-22-44.bpo-37467.u-XyEu.rst	
@@ -0,0 +1,3 @@
+Fix :func:`sys.excepthook` and :c:func:`PyErr_Display` if a filename is a
+bytes string. For example, for a SyntaxError exception where the filename
+attribute is a bytes string.
diff --git a/Python/pythonrun.c b/Python/pythonrun.c
index 8f3ee19279d9..f1d946a0b0f8 100644
--- a/Python/pythonrun.c
+++ b/Python/pythonrun.c
@@ -797,7 +797,7 @@ print_exception(PyObject *f, PyObject *value)
             Py_DECREF(value);
             value = message;
 
-            line = PyUnicode_FromFormat("  File \"%U\", line %d\n",
+            line = PyUnicode_FromFormat("  File \"%S\", line %d\n",
                                           filename, lineno);
             Py_DECREF(filename);
             if (line != NULL) {


From webhook-mailer at python.org  Mon Jul  1 11:41:50 2019
From: webhook-mailer at python.org (Victor Stinner)
Date: Mon, 01 Jul 2019 15:41:50 -0000
Subject: [Python-checkins] bpo-37467: Fix PyErr_Display() for bytes filename
 (GH-14504) (GH-14515)
Message-ID: <mailman.178.1561995711.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/8cbffc4d96d1da0fbc38da6f34f2da30c5ffd601
commit: 8cbffc4d96d1da0fbc38da6f34f2da30c5ffd601
branch: 3.7
author: Victor Stinner <vstinner at redhat.com>
committer: GitHub <noreply at github.com>
date: 2019-07-01T17:41:38+02:00
summary:

bpo-37467: Fix PyErr_Display() for bytes filename (GH-14504) (GH-14515)

Fix sys.excepthook() and PyErr_Display() if a filename is a bytes
string. For example, for a SyntaxError exception where the filename
attribute is a bytes string.

Cleanup also test_sys:

* Sort imports.
* Rename numruns global var to INTERN_NUMRUNS.
* Add DisplayHookTest and ExceptHookTest test case classes.
* Don't save/restore sys.stdout and sys.displayhook using
  setUp()/tearDown(): do it in each test method.
* Test error case (call hook with no argument) after the success case.

(cherry picked from commit f9b7457bd7f438263e0d2dd1f70589ad56a2585e)

files:
A Misc/NEWS.d/next/Core and Builtins/2019-07-01-12-22-44.bpo-37467.u-XyEu.rst
M Lib/test/test_sys.py
M Python/pythonrun.c

diff --git a/Lib/test/test_sys.py b/Lib/test/test_sys.py
index ef3fee13b961..84927a393f17 100644
--- a/Lib/test/test_sys.py
+++ b/Lib/test/test_sys.py
@@ -1,82 +1,103 @@
-import unittest, test.support
+from test import support
 from test.support.script_helper import assert_python_ok, assert_python_failure
-import sys, io, os
+import builtins
+import codecs
+import gc
+import locale
+import operator
+import os
 import struct
 import subprocess
+import sys
+import sysconfig
+import test.support
 import textwrap
+import unittest
 import warnings
-import operator
-import codecs
-import gc
-import sysconfig
-import locale
-import threading
+
 
 # count the number of test runs, used to create unique
 # strings to intern in test_intern()
-numruns = 0
+INTERN_NUMRUNS = 0
 
 
-class SysModuleTest(unittest.TestCase):
+class DisplayHookTest(unittest.TestCase):
 
-    def setUp(self):
-        self.orig_stdout = sys.stdout
-        self.orig_stderr = sys.stderr
-        self.orig_displayhook = sys.displayhook
+    def test_original_displayhook(self):
+        dh = sys.__displayhook__
 
-    def tearDown(self):
-        sys.stdout = self.orig_stdout
-        sys.stderr = self.orig_stderr
-        sys.displayhook = self.orig_displayhook
-        test.support.reap_children()
+        with support.captured_stdout() as out:
+            dh(42)
 
-    def test_original_displayhook(self):
-        import builtins
-        out = io.StringIO()
-        sys.stdout = out
+        self.assertEqual(out.getvalue(), "42\n")
+        self.assertEqual(builtins._, 42)
 
-        dh = sys.__displayhook__
+        del builtins._
 
-        self.assertRaises(TypeError, dh)
-        if hasattr(builtins, "_"):
-            del builtins._
+        with support.captured_stdout() as out:
+            dh(None)
 
-        dh(None)
         self.assertEqual(out.getvalue(), "")
         self.assertTrue(not hasattr(builtins, "_"))
-        dh(42)
-        self.assertEqual(out.getvalue(), "42\n")
-        self.assertEqual(builtins._, 42)
 
-        del sys.stdout
-        self.assertRaises(RuntimeError, dh, 42)
+        # sys.displayhook() requires arguments
+        self.assertRaises(TypeError, dh)
+
+        stdout = sys.stdout
+        try:
+            del sys.stdout
+            self.assertRaises(RuntimeError, dh, 42)
+        finally:
+            sys.stdout = stdout
 
     def test_lost_displayhook(self):
-        del sys.displayhook
-        code = compile("42", "<string>", "single")
-        self.assertRaises(RuntimeError, eval, code)
+        displayhook = sys.displayhook
+        try:
+            del sys.displayhook
+            code = compile("42", "<string>", "single")
+            self.assertRaises(RuntimeError, eval, code)
+        finally:
+            sys.displayhook = displayhook
 
     def test_custom_displayhook(self):
         def baddisplayhook(obj):
             raise ValueError
-        sys.displayhook = baddisplayhook
-        code = compile("42", "<string>", "single")
-        self.assertRaises(ValueError, eval, code)
 
-    def test_original_excepthook(self):
-        err = io.StringIO()
-        sys.stderr = err
+        with support.swap_attr(sys, 'displayhook', baddisplayhook):
+            code = compile("42", "<string>", "single")
+            self.assertRaises(ValueError, eval, code)
+
 
-        eh = sys.__excepthook__
+class ExceptHookTest(unittest.TestCase):
 
-        self.assertRaises(TypeError, eh)
+    def test_original_excepthook(self):
         try:
             raise ValueError(42)
         except ValueError as exc:
-            eh(*sys.exc_info())
+            with support.captured_stderr() as err:
+                sys.__excepthook__(*sys.exc_info())
 
         self.assertTrue(err.getvalue().endswith("ValueError: 42\n"))
 
+        self.assertRaises(TypeError, sys.__excepthook__)
+
+    def test_excepthook_bytes_filename(self):
+        # bpo-37467: sys.excepthook() must not crash if a filename
+        # is a bytes string
+        with warnings.catch_warnings():
+            warnings.simplefilter('ignore', BytesWarning)
+
+            try:
+                raise SyntaxError("msg", (b"bytes_filename", 123, 0, "text"))
+            except SyntaxError as exc:
+                with support.captured_stderr() as err:
+                    sys.__excepthook__(*sys.exc_info())
+
+        err = err.getvalue()
+        self.assertIn("""  File "b'bytes_filename'", line 123\n""", err)
+        self.assertIn("""    text\n""", err)
+        self.assertTrue(err.endswith("SyntaxError: msg\n"))
+
     def test_excepthook(self):
         with test.support.captured_output("stderr") as stderr:
             sys.excepthook(1, '1', 1)
@@ -86,6 +107,12 @@ def test_excepthook(self):
     # FIXME: testing the code for a lost or replaced excepthook in
     # Python/pythonrun.c::PyErr_PrintEx() is tricky.
 
+
+class SysModuleTest(unittest.TestCase):
+
+    def tearDown(self):
+        test.support.reap_children()
+
     def test_exit(self):
         # call with two arguments
         self.assertRaises(TypeError, sys.exit, 42, 42)
@@ -502,10 +529,10 @@ def test_43581(self):
         self.assertEqual(sys.__stdout__.encoding, sys.__stderr__.encoding)
 
     def test_intern(self):
-        global numruns
-        numruns += 1
+        global INTERN_NUMRUNS
+        INTERN_NUMRUNS += 1
         self.assertRaises(TypeError, sys.intern)
-        s = "never interned before" + str(numruns)
+        s = "never interned before" + str(INTERN_NUMRUNS)
         self.assertTrue(sys.intern(s) is s)
         s2 = s.swapcase().swapcase()
         self.assertTrue(sys.intern(s2) is s)
diff --git a/Misc/NEWS.d/next/Core and Builtins/2019-07-01-12-22-44.bpo-37467.u-XyEu.rst b/Misc/NEWS.d/next/Core and Builtins/2019-07-01-12-22-44.bpo-37467.u-XyEu.rst
new file mode 100644
index 000000000000..5e809646b4b8
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2019-07-01-12-22-44.bpo-37467.u-XyEu.rst	
@@ -0,0 +1,3 @@
+Fix :func:`sys.excepthook` and :c:func:`PyErr_Display` if a filename is a
+bytes string. For example, for a SyntaxError exception where the filename
+attribute is a bytes string.
diff --git a/Python/pythonrun.c b/Python/pythonrun.c
index c4ec5ac66c47..4c974cef39c7 100644
--- a/Python/pythonrun.c
+++ b/Python/pythonrun.c
@@ -750,7 +750,7 @@ print_exception(PyObject *f, PyObject *value)
             Py_DECREF(value);
             value = message;
 
-            line = PyUnicode_FromFormat("  File \"%U\", line %d\n",
+            line = PyUnicode_FromFormat("  File \"%S\", line %d\n",
                                           filename, lineno);
             Py_DECREF(filename);
             if (line != NULL) {


From webhook-mailer at python.org  Mon Jul  1 12:28:29 2019
From: webhook-mailer at python.org (Victor Stinner)
Date: Mon, 01 Jul 2019 16:28:29 -0000
Subject: [Python-checkins] Remove unused imports in tests (GH-14518)
Message-ID: <mailman.179.1561998510.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/8f4ef3b019ce380022018587571b0f970e668de3
commit: 8f4ef3b019ce380022018587571b0f970e668de3
branch: master
author: Victor Stinner <vstinner at redhat.com>
committer: GitHub <noreply at github.com>
date: 2019-07-01T18:28:25+02:00
summary:

Remove unused imports in tests (GH-14518)

files:
M Lib/test/libregrtest/main.py
M Lib/test/support/__init__.py
M Lib/test/test__xxsubinterpreters.py
M Lib/test/test_argparse.py
M Lib/test/test_asynchat.py
M Lib/test/test_asyncio/test_events.py
M Lib/test/test_asyncio/test_pep492.py
M Lib/test/test_asyncio/test_proactor_events.py
M Lib/test/test_asyncio/test_server.py
M Lib/test/test_asyncio/test_sslproto.py
M Lib/test/test_asyncio/test_unix_events.py
M Lib/test/test_asyncio/test_windows_events.py
M Lib/test/test_audit.py
M Lib/test/test_c_locale_coercion.py
M Lib/test/test_capi.py
M Lib/test/test_cgi.py
M Lib/test/test_cmath.py
M Lib/test/test_cmd_line.py
M Lib/test/test_codeccallbacks.py
M Lib/test/test_codecs.py
M Lib/test/test_collections.py
M Lib/test/test_cprofile.py
M Lib/test/test_docxmlrpc.py
M Lib/test/test_email/test_policy.py
M Lib/test/test_embed.py
M Lib/test/test_exceptions.py
M Lib/test/test_faulthandler.py
M Lib/test/test_fork1.py
M Lib/test/test_generators.py
M Lib/test/test_gettext.py
M Lib/test/test_imaplib.py
M Lib/test/test_import/__init__.py
M Lib/test/test_importlib/test_util.py
M Lib/test/test_locale.py
M Lib/test/test_math.py
M Lib/test/test_os.py
M Lib/test/test_peepholer.py
M Lib/test/test_picklebuffer.py
M Lib/test/test_platform.py
M Lib/test/test_posixpath.py
M Lib/test/test_pyclbr.py
M Lib/test/test_pydoc.py
M Lib/test/test_runpy.py
M Lib/test/test_signal.py
M Lib/test/test_smtplib.py
M Lib/test/test_ssl.py
M Lib/test/test_string_literals.py
M Lib/test/test_subprocess.py
M Lib/test/test_sys.py
M Lib/test/test_tabnanny.py
M Lib/test/test_threaded_import.py
M Lib/test/test_threadedtempfile.py
M Lib/test/test_zipfile.py

diff --git a/Lib/test/libregrtest/main.py b/Lib/test/libregrtest/main.py
index 1dfbe47a2fab..e2274254fdb8 100644
--- a/Lib/test/libregrtest/main.py
+++ b/Lib/test/libregrtest/main.py
@@ -587,7 +587,6 @@ def create_temp_dir(self):
 
     def cleanup(self):
         import glob
-        import shutil
 
         path = os.path.join(self.tmp_dir, 'test_python_*')
         print("Cleanup %s directory" % self.tmp_dir)
diff --git a/Lib/test/support/__init__.py b/Lib/test/support/__init__.py
index a65de4a5abe8..611c1cc9776d 100644
--- a/Lib/test/support/__init__.py
+++ b/Lib/test/support/__init__.py
@@ -6,7 +6,6 @@
 import asyncio.events
 import collections.abc
 import contextlib
-import datetime
 import errno
 import faulthandler
 import fnmatch
@@ -15,7 +14,6 @@
 import glob
 import importlib
 import importlib.util
-import io
 import logging.handlers
 import nntplib
 import os
diff --git a/Lib/test/test__xxsubinterpreters.py b/Lib/test/test__xxsubinterpreters.py
index 1eece9659249..78b2030a1f6d 100644
--- a/Lib/test/test__xxsubinterpreters.py
+++ b/Lib/test/test__xxsubinterpreters.py
@@ -4,7 +4,7 @@
 import os
 import pickle
 import sys
-from textwrap import dedent, indent
+from textwrap import dedent
 import threading
 import time
 import unittest
diff --git a/Lib/test/test_argparse.py b/Lib/test/test_argparse.py
index bcf2cc9b26a3..9079d4bc7aa7 100644
--- a/Lib/test/test_argparse.py
+++ b/Lib/test/test_argparse.py
@@ -1,6 +1,5 @@
 # Author: Steven J. Bethard <steven.bethard at gmail.com>.
 
-import codecs
 import inspect
 import os
 import shutil
diff --git a/Lib/test/test_asynchat.py b/Lib/test/test_asynchat.py
index 1d147c741961..14c0ec43d422 100644
--- a/Lib/test/test_asynchat.py
+++ b/Lib/test/test_asynchat.py
@@ -7,7 +7,6 @@
 import errno
 import socket
 import sys
-import _thread as thread
 import threading
 import time
 import unittest
diff --git a/Lib/test/test_asyncio/test_events.py b/Lib/test/test_asyncio/test_events.py
index 045654e87a85..e5ad72fe5ba8 100644
--- a/Lib/test/test_asyncio/test_events.py
+++ b/Lib/test/test_asyncio/test_events.py
@@ -26,8 +26,6 @@
     import tty
 
 import asyncio
-from asyncio import base_events
-from asyncio import constants
 from asyncio import coroutines
 from asyncio import events
 from asyncio import proactor_events
diff --git a/Lib/test/test_asyncio/test_pep492.py b/Lib/test/test_asyncio/test_pep492.py
index 11c0ce495d52..a5cf37ded7c9 100644
--- a/Lib/test/test_asyncio/test_pep492.py
+++ b/Lib/test/test_asyncio/test_pep492.py
@@ -4,7 +4,6 @@
 import types
 import unittest
 
-from test import support
 from unittest import mock
 
 import asyncio
diff --git a/Lib/test/test_asyncio/test_proactor_events.py b/Lib/test/test_asyncio/test_proactor_events.py
index 2e9995d32807..b2fd60683c57 100644
--- a/Lib/test/test_asyncio/test_proactor_events.py
+++ b/Lib/test/test_asyncio/test_proactor_events.py
@@ -4,11 +4,9 @@
 import socket
 import unittest
 import sys
-from collections import deque
 from unittest import mock
 
 import asyncio
-from asyncio import events
 from asyncio.proactor_events import BaseProactorEventLoop
 from asyncio.proactor_events import _ProactorSocketTransport
 from asyncio.proactor_events import _ProactorWritePipeTransport
diff --git a/Lib/test/test_asyncio/test_server.py b/Lib/test/test_asyncio/test_server.py
index 0e38e6c8ecd4..d47ccc027677 100644
--- a/Lib/test/test_asyncio/test_server.py
+++ b/Lib/test/test_asyncio/test_server.py
@@ -1,5 +1,4 @@
 import asyncio
-import socket
 import time
 import threading
 import unittest
diff --git a/Lib/test/test_asyncio/test_sslproto.py b/Lib/test/test_asyncio/test_sslproto.py
index 1c2285063ef6..9457bc982b06 100644
--- a/Lib/test/test_asyncio/test_sslproto.py
+++ b/Lib/test/test_asyncio/test_sslproto.py
@@ -15,7 +15,6 @@
 from asyncio import log
 from asyncio import protocols
 from asyncio import sslproto
-from asyncio import tasks
 from test.test_asyncio import utils as test_utils
 from test.test_asyncio import functional as func_tests
 
diff --git a/Lib/test/test_asyncio/test_unix_events.py b/Lib/test/test_asyncio/test_unix_events.py
index 462a8b3c7859..1daa870a7b27 100644
--- a/Lib/test/test_asyncio/test_unix_events.py
+++ b/Lib/test/test_asyncio/test_unix_events.py
@@ -22,8 +22,6 @@
 
 import asyncio
 from asyncio import log
-from asyncio import base_events
-from asyncio import events
 from asyncio import unix_events
 from test.test_asyncio import utils as test_utils
 
diff --git a/Lib/test/test_asyncio/test_windows_events.py b/Lib/test/test_asyncio/test_windows_events.py
index 1e1c01d713b5..64543268b1ef 100644
--- a/Lib/test/test_asyncio/test_windows_events.py
+++ b/Lib/test/test_asyncio/test_windows_events.py
@@ -2,7 +2,6 @@
 import signal
 import socket
 import sys
-import subprocess
 import time
 import threading
 import unittest
@@ -12,14 +11,12 @@
     raise unittest.SkipTest('Windows only')
 
 import _overlapped
-import _testcapi
 import _winapi
 
 import asyncio
 from asyncio import windows_events
 from asyncio.streams import _StreamProtocol
 from test.test_asyncio import utils as test_utils
-from test.support.script_helper import spawn_python
 
 
 def tearDownModule():
diff --git a/Lib/test/test_audit.py b/Lib/test/test_audit.py
index 2fc41bddcb8a..41f9fae10223 100644
--- a/Lib/test/test_audit.py
+++ b/Lib/test/test_audit.py
@@ -1,7 +1,6 @@
 """Tests for sys.audit and sys.addaudithook
 """
 
-import os
 import subprocess
 import sys
 import unittest
diff --git a/Lib/test/test_c_locale_coercion.py b/Lib/test/test_c_locale_coercion.py
index 35272b5c15ac..8149e2b98bb3 100644
--- a/Lib/test/test_c_locale_coercion.py
+++ b/Lib/test/test_c_locale_coercion.py
@@ -2,7 +2,6 @@
 
 import locale
 import os
-import shutil
 import subprocess
 import sys
 import sysconfig
@@ -10,10 +9,8 @@
 from collections import namedtuple
 
 from test import support
-from test.support.script_helper import (
-    run_python_until_end,
-    interpreter_requires_environment,
-)
+from test.support.script_helper import run_python_until_end
+
 
 # Set the list of ways we expect to be able to ask for the "C" locale
 EXPECTED_C_LOCALE_EQUIVALENTS = ["C", "invalid.ascii"]
diff --git a/Lib/test/test_capi.py b/Lib/test/test_capi.py
index 45fabd599159..7b35ba60b53a 100644
--- a/Lib/test/test_capi.py
+++ b/Lib/test/test_capi.py
@@ -8,7 +8,6 @@
 import re
 import subprocess
 import sys
-import sysconfig
 import textwrap
 import threading
 import time
diff --git a/Lib/test/test_cgi.py b/Lib/test/test_cgi.py
index b86638e1c283..092255598259 100644
--- a/Lib/test/test_cgi.py
+++ b/Lib/test/test_cgi.py
@@ -1,4 +1,3 @@
-from test.support import check_warnings
 import cgi
 import os
 import sys
diff --git a/Lib/test/test_cmath.py b/Lib/test/test_cmath.py
index a00185f43dbf..668f27c8a082 100644
--- a/Lib/test/test_cmath.py
+++ b/Lib/test/test_cmath.py
@@ -6,7 +6,7 @@
 from cmath import phase, polar, rect, pi
 import platform
 import sys
-import sysconfig
+
 
 INF = float('inf')
 NAN = float('nan')
diff --git a/Lib/test/test_cmd_line.py b/Lib/test/test_cmd_line.py
index f7925eb795c7..497bfa9eb89d 100644
--- a/Lib/test/test_cmd_line.py
+++ b/Lib/test/test_cmd_line.py
@@ -5,7 +5,6 @@
 import os
 import subprocess
 import sys
-import sysconfig
 import tempfile
 import unittest
 from test import support
diff --git a/Lib/test/test_codeccallbacks.py b/Lib/test/test_codeccallbacks.py
index 585992be1f0b..243f002c4eca 100644
--- a/Lib/test/test_codeccallbacks.py
+++ b/Lib/test/test_codeccallbacks.py
@@ -1,10 +1,10 @@
 import codecs
 import html.entities
 import sys
-import test.support
 import unicodedata
 import unittest
 
+
 class PosReturn:
     # this can be used for configurable callbacks
 
diff --git a/Lib/test/test_codecs.py b/Lib/test/test_codecs.py
index 4317dfceb039..b187ca650dc6 100644
--- a/Lib/test/test_codecs.py
+++ b/Lib/test/test_codecs.py
@@ -29,7 +29,7 @@ def check(input, expect):
 
 # On small versions of Windows like Windows IoT or Windows Nano Server not all codepages are present
 def is_code_page_present(cp):
-    from ctypes import POINTER, WINFUNCTYPE, windll, WinError, Structure, WinDLL
+    from ctypes import POINTER, WINFUNCTYPE, WinDLL
     from ctypes.wintypes import BOOL, UINT, BYTE, WCHAR, UINT, DWORD
 
     MAX_LEADBYTES = 12  # 5 ranges, 2 bytes ea., 0 term.
diff --git a/Lib/test/test_collections.py b/Lib/test/test_collections.py
index e2d04d5b4761..e532be6eeaf0 100644
--- a/Lib/test/test_collections.py
+++ b/Lib/test/test_collections.py
@@ -13,7 +13,7 @@
 import types
 import unittest
 
-from collections import namedtuple, Counter, OrderedDict, _count_elements, _tuplegetter
+from collections import namedtuple, Counter, OrderedDict, _count_elements
 from collections import UserDict, UserString, UserList
 from collections import ChainMap
 from collections import deque
diff --git a/Lib/test/test_cprofile.py b/Lib/test/test_cprofile.py
index 5c70037f39a2..4ec769885292 100644
--- a/Lib/test/test_cprofile.py
+++ b/Lib/test/test_cprofile.py
@@ -6,7 +6,7 @@
 # rip off all interesting stuff from test_profile
 import cProfile
 from test.test_profile import ProfileTest, regenerate_expected_output
-from test.support.script_helper import assert_python_failure, assert_python_ok
+from test.support.script_helper import assert_python_failure
 from test import support
 
 
diff --git a/Lib/test/test_docxmlrpc.py b/Lib/test/test_docxmlrpc.py
index f077f05f5b4f..116e626740df 100644
--- a/Lib/test/test_docxmlrpc.py
+++ b/Lib/test/test_docxmlrpc.py
@@ -2,7 +2,6 @@
 import http.client
 import sys
 import threading
-from test import support
 import unittest
 
 def make_request_and_skipIf(condition, reason):
diff --git a/Lib/test/test_email/test_policy.py b/Lib/test/test_email/test_policy.py
index 0aea934df434..1e39aa062c0a 100644
--- a/Lib/test/test_email/test_policy.py
+++ b/Lib/test/test_email/test_policy.py
@@ -1,5 +1,4 @@
 import io
-import sys
 import types
 import textwrap
 import unittest
diff --git a/Lib/test/test_embed.py b/Lib/test/test_embed.py
index 9c78aa059fc3..e1cf4be50668 100644
--- a/Lib/test/test_embed.py
+++ b/Lib/test/test_embed.py
@@ -5,7 +5,6 @@
 from collections import namedtuple
 import json
 import os
-import platform
 import re
 import subprocess
 import sys
diff --git a/Lib/test/test_exceptions.py b/Lib/test/test_exceptions.py
index d7e11d2d30a8..10c1e076464e 100644
--- a/Lib/test/test_exceptions.py
+++ b/Lib/test/test_exceptions.py
@@ -9,7 +9,7 @@
 import errno
 
 from test.support import (TESTFN, captured_stderr, check_impl_detail,
-                          check_warnings, cpython_only, gc_collect, run_unittest,
+                          check_warnings, cpython_only, gc_collect,
                           no_tracing, unlink, import_module, script_helper,
                           SuppressCrashReport)
 from test import support
diff --git a/Lib/test/test_faulthandler.py b/Lib/test/test_faulthandler.py
index f0be91844ffa..1cf20db1c7ff 100644
--- a/Lib/test/test_faulthandler.py
+++ b/Lib/test/test_faulthandler.py
@@ -9,7 +9,6 @@
 from test import support
 from test.support import script_helper, is_android
 import tempfile
-import threading
 import unittest
 from textwrap import dedent
 
diff --git a/Lib/test/test_fork1.py b/Lib/test/test_fork1.py
index 9ca9724c4c91..2ab856ff5690 100644
--- a/Lib/test/test_fork1.py
+++ b/Lib/test/test_fork1.py
@@ -10,8 +10,7 @@
 import unittest
 
 from test.fork_wait import ForkWait
-from test.support import (reap_children, get_attribute,
-                          import_module, verbose)
+from test.support import reap_children, get_attribute, verbose
 
 
 # Skip test if fork does not exist.
diff --git a/Lib/test/test_generators.py b/Lib/test/test_generators.py
index a34e4ec2eda7..f8d86da5e2f5 100644
--- a/Lib/test/test_generators.py
+++ b/Lib/test/test_generators.py
@@ -3,7 +3,6 @@
 import pickle
 import sys
 import unittest
-import warnings
 import weakref
 import inspect
 
diff --git a/Lib/test/test_gettext.py b/Lib/test/test_gettext.py
index 9d1a96b8b0d1..baf300b05724 100644
--- a/Lib/test/test_gettext.py
+++ b/Lib/test/test_gettext.py
@@ -2,7 +2,6 @@
 import base64
 import contextlib
 import gettext
-import locale
 import unittest
 
 from test import support
diff --git a/Lib/test/test_imaplib.py b/Lib/test/test_imaplib.py
index 9305e47ee993..8ab532af3f0d 100644
--- a/Lib/test/test_imaplib.py
+++ b/Lib/test/test_imaplib.py
@@ -1,7 +1,6 @@
 from test import support
 
 from contextlib import contextmanager
-import errno
 import imaplib
 import os.path
 import socketserver
diff --git a/Lib/test/test_import/__init__.py b/Lib/test/test_import/__init__.py
index 84cd0da94b36..50406d9aa1d9 100644
--- a/Lib/test/test_import/__init__.py
+++ b/Lib/test/test_import/__init__.py
@@ -5,7 +5,6 @@
 import builtins
 import marshal
 import os
-import platform
 import py_compile
 import random
 import shutil
@@ -23,9 +22,9 @@
 
 import test.support
 from test.support import (
-    EnvironmentVarGuard, TESTFN, check_warnings, forget, is_jython,
-    make_legacy_pyc, rmtree, run_unittest, swap_attr, swap_item, temp_umask,
-    unlink, unload, create_empty_file, cpython_only, TESTFN_UNENCODABLE,
+    TESTFN, forget, is_jython,
+    make_legacy_pyc, rmtree, swap_attr, swap_item, temp_umask,
+    unlink, unload, cpython_only, TESTFN_UNENCODABLE,
     temp_dir, DirsOnSysPath)
 from test.support import script_helper
 from test.test_importlib.util import uncache
diff --git a/Lib/test/test_importlib/test_util.py b/Lib/test/test_importlib/test_util.py
index db0899aff6b9..0350a5a5cc05 100644
--- a/Lib/test/test_importlib/test_util.py
+++ b/Lib/test/test_importlib/test_util.py
@@ -4,7 +4,6 @@
 machinery = util.import_importlib('importlib.machinery')
 importlib_util = util.import_importlib('importlib.util')
 
-import contextlib
 import importlib.util
 import os
 import pathlib
diff --git a/Lib/test/test_locale.py b/Lib/test/test_locale.py
index e2c2178ae6cc..792a15c50f92 100644
--- a/Lib/test/test_locale.py
+++ b/Lib/test/test_locale.py
@@ -3,7 +3,7 @@
 import locale
 import sys
 import codecs
-import warnings
+
 
 class BaseLocalizedTest(unittest.TestCase):
     #
diff --git a/Lib/test/test_math.py b/Lib/test/test_math.py
index 362d09370d45..393cdaff1818 100644
--- a/Lib/test/test_math.py
+++ b/Lib/test/test_math.py
@@ -12,7 +12,7 @@
 import random
 import struct
 import sys
-import sysconfig
+
 
 eps = 1E-05
 NAN = float('nan')
diff --git a/Lib/test/test_os.py b/Lib/test/test_os.py
index 784000a2eb36..b2cd4cca5f21 100644
--- a/Lib/test/test_os.py
+++ b/Lib/test/test_os.py
@@ -9,7 +9,6 @@
 import decimal
 import errno
 import fractions
-import getpass
 import itertools
 import locale
 import mmap
diff --git a/Lib/test/test_peepholer.py b/Lib/test/test_peepholer.py
index b5f85bd55973..c90a53210a93 100644
--- a/Lib/test/test_peepholer.py
+++ b/Lib/test/test_peepholer.py
@@ -1,10 +1,9 @@
 import dis
 import unittest
-import types
-import textwrap
 
 from test.bytecode_helper import BytecodeTestCase
 
+
 def count_instr_recursively(f, opname):
     count = 0
     for instr in dis.get_instructions(f):
diff --git a/Lib/test/test_picklebuffer.py b/Lib/test/test_picklebuffer.py
index 7e72157fd022..97981c882e82 100644
--- a/Lib/test/test_picklebuffer.py
+++ b/Lib/test/test_picklebuffer.py
@@ -5,7 +5,6 @@
 
 import gc
 from pickle import PickleBuffer
-import sys
 import weakref
 import unittest
 
diff --git a/Lib/test/test_platform.py b/Lib/test/test_platform.py
index 8b64923e174c..3084663a8fad 100644
--- a/Lib/test/test_platform.py
+++ b/Lib/test/test_platform.py
@@ -2,13 +2,12 @@
 import platform
 import subprocess
 import sys
-import sysconfig
-import tempfile
 import unittest
 from unittest import mock
 
 from test import support
 
+
 class PlatformTest(unittest.TestCase):
     def clear_caches(self):
         platform._platform_cache.clear()
diff --git a/Lib/test/test_posixpath.py b/Lib/test/test_posixpath.py
index 983e2dd6ff27..4d3d8976d604 100644
--- a/Lib/test/test_posixpath.py
+++ b/Lib/test/test_posixpath.py
@@ -1,7 +1,6 @@
 import os
 import posixpath
 import unittest
-import warnings
 from posixpath import realpath, abspath, dirname, basename
 from test import support, test_genericpath
 from test.support import FakePath
@@ -12,6 +11,7 @@
 except ImportError:
     posix = None
 
+
 # An absolute path to a temporary filename for testing. We can't rely on TESTFN
 # being an absolute path, so we need this.
 
diff --git a/Lib/test/test_pyclbr.py b/Lib/test/test_pyclbr.py
index 531304021312..4385271cd0f2 100644
--- a/Lib/test/test_pyclbr.py
+++ b/Lib/test/test_pyclbr.py
@@ -3,15 +3,13 @@
    Nick Mathewson
 '''
 
-import os
 import sys
 from textwrap import dedent
 from types import FunctionType, MethodType, BuiltinFunctionType
 import pyclbr
 from unittest import TestCase, main as unittest_main
-from test import support
 from test.test_importlib import util as test_importlib_util
-from functools import partial
+
 
 StaticMethodType = type(staticmethod(lambda: None))
 ClassMethodType = type(classmethod(lambda c: None))
diff --git a/Lib/test/test_pydoc.py b/Lib/test/test_pydoc.py
index 6efdeb047c21..c80477c50f09 100644
--- a/Lib/test/test_pydoc.py
+++ b/Lib/test/test_pydoc.py
@@ -21,7 +21,6 @@
 import xml.etree
 import xml.etree.ElementTree
 import textwrap
-import threading
 from io import StringIO
 from collections import namedtuple
 from test.support.script_helper import assert_python_ok
diff --git a/Lib/test/test_runpy.py b/Lib/test/test_runpy.py
index 800b483b7e15..f00308611163 100644
--- a/Lib/test/test_runpy.py
+++ b/Lib/test/test_runpy.py
@@ -11,8 +11,7 @@
 from test.support import (
     forget, make_legacy_pyc, unload, verbose, no_tracing,
     create_empty_file, temp_dir)
-from test.support.script_helper import (
-    make_pkg, make_script, make_zip_pkg, make_zip_script)
+from test.support.script_helper import make_script, make_zip_script
 
 
 import runpy
diff --git a/Lib/test/test_signal.py b/Lib/test/test_signal.py
index 063b35ca230f..d41e94b07f43 100644
--- a/Lib/test/test_signal.py
+++ b/Lib/test/test_signal.py
@@ -6,7 +6,6 @@
 import statistics
 import subprocess
 import sys
-import threading
 import time
 import unittest
 from test import support
diff --git a/Lib/test/test_smtplib.py b/Lib/test/test_smtplib.py
index fdcf6f219256..f1332e9ef782 100644
--- a/Lib/test/test_smtplib.py
+++ b/Lib/test/test_smtplib.py
@@ -19,7 +19,7 @@
 
 import unittest
 from test import support, mock_socket
-from test.support import HOST, HOSTv4, HOSTv6
+from test.support import HOST
 from test.support import threading_setup, threading_cleanup, join_thread
 from unittest.mock import Mock
 
diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py
index d83ee2cc974d..ef1723903a15 100644
--- a/Lib/test/test_ssl.py
+++ b/Lib/test/test_ssl.py
@@ -26,7 +26,7 @@
 
 ssl = support.import_module("ssl")
 
-from ssl import TLSVersion, _TLSContentType, _TLSMessageType, _TLSAlertType
+from ssl import TLSVersion, _TLSContentType, _TLSMessageType
 
 Py_DEBUG = hasattr(sys, 'gettotalrefcount')
 Py_DEBUG_WIN32 = Py_DEBUG and sys.platform == 'win32'
@@ -4601,7 +4601,6 @@ def msg_cb(conn, direction, version, content_type, msg_type, data):
 
 def test_main(verbose=False):
     if support.verbose:
-        import warnings
         plats = {
             'Mac': platform.mac_ver,
             'Windows': platform.win32_ver,
diff --git a/Lib/test/test_string_literals.py b/Lib/test/test_string_literals.py
index 048f40d90a4b..5961d591c448 100644
--- a/Lib/test/test_string_literals.py
+++ b/Lib/test/test_string_literals.py
@@ -31,7 +31,6 @@
 import sys
 import shutil
 import tempfile
-import warnings
 import unittest
 
 
diff --git a/Lib/test/test_subprocess.py b/Lib/test/test_subprocess.py
index 6b8acb258ee3..e58d0925df3b 100644
--- a/Lib/test/test_subprocess.py
+++ b/Lib/test/test_subprocess.py
@@ -3,7 +3,6 @@
 from test import support
 import subprocess
 import sys
-import platform
 import signal
 import io
 import itertools
@@ -20,18 +19,12 @@
 import textwrap
 from test.support import FakePath
 
-try:
-    import ctypes
-except ImportError:
-    ctypes = None
-else:
-    import ctypes.util
-
 try:
     import _testcapi
 except ImportError:
     _testcapi = None
 
+
 if support.PGO:
     raise unittest.SkipTest("test is not helpful for PGO")
 
diff --git a/Lib/test/test_sys.py b/Lib/test/test_sys.py
index 8852aaef9437..9961dee754c6 100644
--- a/Lib/test/test_sys.py
+++ b/Lib/test/test_sys.py
@@ -3,7 +3,6 @@
 import builtins
 import codecs
 import gc
-import io
 import locale
 import operator
 import os
diff --git a/Lib/test/test_tabnanny.py b/Lib/test/test_tabnanny.py
index 81549d14ae2b..95840d6ac0c5 100644
--- a/Lib/test/test_tabnanny.py
+++ b/Lib/test/test_tabnanny.py
@@ -7,7 +7,6 @@
 from unittest import mock
 import errno
 import os
-import sys
 import tabnanny
 import tokenize
 import tempfile
diff --git a/Lib/test/test_threaded_import.py b/Lib/test/test_threaded_import.py
index 035344be4b89..8607f363db21 100644
--- a/Lib/test/test_threaded_import.py
+++ b/Lib/test/test_threaded_import.py
@@ -15,7 +15,7 @@
 import unittest
 from unittest import mock
 from test.support import (
-    verbose, import_module, run_unittest, TESTFN, reap_threads,
+    verbose, run_unittest, TESTFN, reap_threads,
     forget, unlink, rmtree, start_threads)
 
 def task(N, done, done_tasks, errors):
diff --git a/Lib/test/test_threadedtempfile.py b/Lib/test/test_threadedtempfile.py
index f3d4ba36377d..e1d7a10179cc 100644
--- a/Lib/test/test_threadedtempfile.py
+++ b/Lib/test/test_threadedtempfile.py
@@ -13,19 +13,22 @@
 provoking a 2.0 failure under Linux.
 """
 
-NUM_THREADS = 20
-FILES_PER_THREAD = 50
-
 import tempfile
 
-from test.support import start_threads, import_module
+from test.support import start_threads
 import unittest
 import io
 import threading
 from traceback import print_exc
 
+
+NUM_THREADS = 20
+FILES_PER_THREAD = 50
+
+
 startEvent = threading.Event()
 
+
 class TempFileGreedy(threading.Thread):
     error_count = 0
     ok_count = 0
diff --git a/Lib/test/test_zipfile.py b/Lib/test/test_zipfile.py
index bf5bb4d0f13e..19b550f80187 100644
--- a/Lib/test/test_zipfile.py
+++ b/Lib/test/test_zipfile.py
@@ -4,9 +4,7 @@
 import os
 import pathlib
 import posixpath
-import shutil
 import struct
-import tempfile
 import time
 import unittest
 import zipfile


From webhook-mailer at python.org  Mon Jul  1 12:30:52 2019
From: webhook-mailer at python.org (Miss Islington (bot))
Date: Mon, 01 Jul 2019 16:30:52 -0000
Subject: [Python-checkins] bpo-36168: Lowercase the word "subsequent" in
 get_value doc (GH-14485)
Message-ID: <mailman.180.1561998653.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/59ec9ee4d7f3c2444efb989e96f5124e1c246de5
commit: 59ec9ee4d7f3c2444efb989e96f5124e1c246de5
branch: 3.8
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: GitHub <noreply at github.com>
date: 2019-07-01T09:30:48-07:00
summary:

bpo-36168: Lowercase the word "subsequent" in get_value doc (GH-14485)


Subsequent -> subsequent

https://bugs.python.org/issue36168
(cherry picked from commit 12b436e3b079fb3e3a7197c089df90a77e3bdd77)

Co-authored-by: Krishna Oza <krishoza15sep at gmail.com>

files:
M Doc/library/string.rst

diff --git a/Doc/library/string.rst b/Doc/library/string.rst
index 288dde6b3fe4..af8b9b358cc3 100644
--- a/Doc/library/string.rst
+++ b/Doc/library/string.rst
@@ -146,7 +146,7 @@ implementation as the built-in :meth:`~str.format` method.
       keyword arguments.
 
       For compound field names, these functions are only called for the first
-      component of the field name; Subsequent components are handled through
+      component of the field name; subsequent components are handled through
       normal attribute and indexing operations.
 
       So for example, the field expression '0.name' would cause


From webhook-mailer at python.org  Mon Jul  1 12:35:13 2019
From: webhook-mailer at python.org (Victor Stinner)
Date: Mon, 01 Jul 2019 16:35:13 -0000
Subject: [Python-checkins] bpo-37472: Remove Lib/test/outstanding_bugs.py
 (GH-14516)
Message-ID: <mailman.181.1561998914.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/e21b45a8e71d06a6a03f99261cab33e72b896bb9
commit: e21b45a8e71d06a6a03f99261cab33e72b896bb9
branch: master
author: Victor Stinner <vstinner at redhat.com>
committer: GitHub <noreply at github.com>
date: 2019-07-01T18:35:07+02:00
summary:

bpo-37472: Remove Lib/test/outstanding_bugs.py (GH-14516)

files:
A Misc/NEWS.d/next/Tests/2019-07-01-17-19-47.bpo-37472.WzkEAx.rst
D Lib/test/outstanding_bugs.py
M PCbuild/lib.pyproj

diff --git a/Lib/test/outstanding_bugs.py b/Lib/test/outstanding_bugs.py
deleted file mode 100644
index 7e527a670643..000000000000
--- a/Lib/test/outstanding_bugs.py
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-# This file is for everybody to add tests for bugs that aren't
-# fixed yet. Please add a test case and appropriate bug description.
-#
-# When you fix one of the bugs, please move the test to the correct
-# test_ module.
-#
-
-import unittest
-from test import support
-
-#
-# No test cases for outstanding bugs at the moment.
-#
-
-
-if __name__ == "__main__":
-    unittest.main()
diff --git a/Misc/NEWS.d/next/Tests/2019-07-01-17-19-47.bpo-37472.WzkEAx.rst b/Misc/NEWS.d/next/Tests/2019-07-01-17-19-47.bpo-37472.WzkEAx.rst
new file mode 100644
index 000000000000..f62b5d54867f
--- /dev/null
+++ b/Misc/NEWS.d/next/Tests/2019-07-01-17-19-47.bpo-37472.WzkEAx.rst
@@ -0,0 +1 @@
+Remove ``Lib/test/outstanding_bugs.py``.
diff --git a/PCbuild/lib.pyproj b/PCbuild/lib.pyproj
index 683335e04489..0ddeef3eaa3b 100644
--- a/PCbuild/lib.pyproj
+++ b/PCbuild/lib.pyproj
@@ -830,7 +830,6 @@
     <Compile Include="test\mp_fork_bomb.py" />
     <Compile Include="test\mp_preload.py" />
     <Compile Include="test\multibytecodec_support.py" />
-    <Compile Include="test\outstanding_bugs.py" />
     <Compile Include="test\pickletester.py" />
     <Compile Include="test\profilee.py" />
     <Compile Include="test\pyclbr_input.py" />


From webhook-mailer at python.org  Mon Jul  1 13:01:57 2019
From: webhook-mailer at python.org (Victor Stinner)
Date: Mon, 01 Jul 2019 17:01:57 -0000
Subject: [Python-checkins] Remove unused imports in tests (GH-14518)
 (GH-14520)
Message-ID: <mailman.182.1562000519.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/466e18e8c2738b06a24915cb186d954821d0414f
commit: 466e18e8c2738b06a24915cb186d954821d0414f
branch: 3.8
author: Victor Stinner <vstinner at redhat.com>
committer: GitHub <noreply at github.com>
date: 2019-07-01T19:01:52+02:00
summary:

Remove unused imports in tests (GH-14518) (GH-14520)

(cherry picked from commit 8f4ef3b019ce380022018587571b0f970e668de3)

files:
M Lib/test/libregrtest/main.py
M Lib/test/support/__init__.py
M Lib/test/test__xxsubinterpreters.py
M Lib/test/test_argparse.py
M Lib/test/test_asynchat.py
M Lib/test/test_asyncio/test_events.py
M Lib/test/test_asyncio/test_pep492.py
M Lib/test/test_asyncio/test_proactor_events.py
M Lib/test/test_asyncio/test_server.py
M Lib/test/test_asyncio/test_sslproto.py
M Lib/test/test_asyncio/test_unix_events.py
M Lib/test/test_asyncio/test_windows_events.py
M Lib/test/test_audit.py
M Lib/test/test_c_locale_coercion.py
M Lib/test/test_capi.py
M Lib/test/test_cgi.py
M Lib/test/test_cmath.py
M Lib/test/test_cmd_line.py
M Lib/test/test_codeccallbacks.py
M Lib/test/test_codecs.py
M Lib/test/test_collections.py
M Lib/test/test_cprofile.py
M Lib/test/test_docxmlrpc.py
M Lib/test/test_email/test_policy.py
M Lib/test/test_embed.py
M Lib/test/test_exceptions.py
M Lib/test/test_faulthandler.py
M Lib/test/test_fork1.py
M Lib/test/test_generators.py
M Lib/test/test_gettext.py
M Lib/test/test_imaplib.py
M Lib/test/test_import/__init__.py
M Lib/test/test_importlib/test_util.py
M Lib/test/test_locale.py
M Lib/test/test_math.py
M Lib/test/test_os.py
M Lib/test/test_peepholer.py
M Lib/test/test_picklebuffer.py
M Lib/test/test_platform.py
M Lib/test/test_posixpath.py
M Lib/test/test_pyclbr.py
M Lib/test/test_pydoc.py
M Lib/test/test_runpy.py
M Lib/test/test_signal.py
M Lib/test/test_smtplib.py
M Lib/test/test_ssl.py
M Lib/test/test_string_literals.py
M Lib/test/test_subprocess.py
M Lib/test/test_sys.py
M Lib/test/test_tabnanny.py
M Lib/test/test_threaded_import.py
M Lib/test/test_threadedtempfile.py
M Lib/test/test_zipfile.py

diff --git a/Lib/test/libregrtest/main.py b/Lib/test/libregrtest/main.py
index 1dfbe47a2fab..e2274254fdb8 100644
--- a/Lib/test/libregrtest/main.py
+++ b/Lib/test/libregrtest/main.py
@@ -587,7 +587,6 @@ def create_temp_dir(self):
 
     def cleanup(self):
         import glob
-        import shutil
 
         path = os.path.join(self.tmp_dir, 'test_python_*')
         print("Cleanup %s directory" % self.tmp_dir)
diff --git a/Lib/test/support/__init__.py b/Lib/test/support/__init__.py
index 31b0dc8fc2ca..1c91fc434eec 100644
--- a/Lib/test/support/__init__.py
+++ b/Lib/test/support/__init__.py
@@ -6,7 +6,6 @@
 import asyncio.events
 import collections.abc
 import contextlib
-import datetime
 import errno
 import faulthandler
 import fnmatch
@@ -15,7 +14,6 @@
 import glob
 import importlib
 import importlib.util
-import io
 import logging.handlers
 import nntplib
 import os
diff --git a/Lib/test/test__xxsubinterpreters.py b/Lib/test/test__xxsubinterpreters.py
index 1eece9659249..78b2030a1f6d 100644
--- a/Lib/test/test__xxsubinterpreters.py
+++ b/Lib/test/test__xxsubinterpreters.py
@@ -4,7 +4,7 @@
 import os
 import pickle
 import sys
-from textwrap import dedent, indent
+from textwrap import dedent
 import threading
 import time
 import unittest
diff --git a/Lib/test/test_argparse.py b/Lib/test/test_argparse.py
index bcf2cc9b26a3..9079d4bc7aa7 100644
--- a/Lib/test/test_argparse.py
+++ b/Lib/test/test_argparse.py
@@ -1,6 +1,5 @@
 # Author: Steven J. Bethard <steven.bethard at gmail.com>.
 
-import codecs
 import inspect
 import os
 import shutil
diff --git a/Lib/test/test_asynchat.py b/Lib/test/test_asynchat.py
index 1d147c741961..14c0ec43d422 100644
--- a/Lib/test/test_asynchat.py
+++ b/Lib/test/test_asynchat.py
@@ -7,7 +7,6 @@
 import errno
 import socket
 import sys
-import _thread as thread
 import threading
 import time
 import unittest
diff --git a/Lib/test/test_asyncio/test_events.py b/Lib/test/test_asyncio/test_events.py
index 045654e87a85..e5ad72fe5ba8 100644
--- a/Lib/test/test_asyncio/test_events.py
+++ b/Lib/test/test_asyncio/test_events.py
@@ -26,8 +26,6 @@
     import tty
 
 import asyncio
-from asyncio import base_events
-from asyncio import constants
 from asyncio import coroutines
 from asyncio import events
 from asyncio import proactor_events
diff --git a/Lib/test/test_asyncio/test_pep492.py b/Lib/test/test_asyncio/test_pep492.py
index 11c0ce495d52..a5cf37ded7c9 100644
--- a/Lib/test/test_asyncio/test_pep492.py
+++ b/Lib/test/test_asyncio/test_pep492.py
@@ -4,7 +4,6 @@
 import types
 import unittest
 
-from test import support
 from unittest import mock
 
 import asyncio
diff --git a/Lib/test/test_asyncio/test_proactor_events.py b/Lib/test/test_asyncio/test_proactor_events.py
index 2e9995d32807..b2fd60683c57 100644
--- a/Lib/test/test_asyncio/test_proactor_events.py
+++ b/Lib/test/test_asyncio/test_proactor_events.py
@@ -4,11 +4,9 @@
 import socket
 import unittest
 import sys
-from collections import deque
 from unittest import mock
 
 import asyncio
-from asyncio import events
 from asyncio.proactor_events import BaseProactorEventLoop
 from asyncio.proactor_events import _ProactorSocketTransport
 from asyncio.proactor_events import _ProactorWritePipeTransport
diff --git a/Lib/test/test_asyncio/test_server.py b/Lib/test/test_asyncio/test_server.py
index 0e38e6c8ecd4..d47ccc027677 100644
--- a/Lib/test/test_asyncio/test_server.py
+++ b/Lib/test/test_asyncio/test_server.py
@@ -1,5 +1,4 @@
 import asyncio
-import socket
 import time
 import threading
 import unittest
diff --git a/Lib/test/test_asyncio/test_sslproto.py b/Lib/test/test_asyncio/test_sslproto.py
index 1c2285063ef6..9457bc982b06 100644
--- a/Lib/test/test_asyncio/test_sslproto.py
+++ b/Lib/test/test_asyncio/test_sslproto.py
@@ -15,7 +15,6 @@
 from asyncio import log
 from asyncio import protocols
 from asyncio import sslproto
-from asyncio import tasks
 from test.test_asyncio import utils as test_utils
 from test.test_asyncio import functional as func_tests
 
diff --git a/Lib/test/test_asyncio/test_unix_events.py b/Lib/test/test_asyncio/test_unix_events.py
index 462a8b3c7859..1daa870a7b27 100644
--- a/Lib/test/test_asyncio/test_unix_events.py
+++ b/Lib/test/test_asyncio/test_unix_events.py
@@ -22,8 +22,6 @@
 
 import asyncio
 from asyncio import log
-from asyncio import base_events
-from asyncio import events
 from asyncio import unix_events
 from test.test_asyncio import utils as test_utils
 
diff --git a/Lib/test/test_asyncio/test_windows_events.py b/Lib/test/test_asyncio/test_windows_events.py
index 1e1c01d713b5..64543268b1ef 100644
--- a/Lib/test/test_asyncio/test_windows_events.py
+++ b/Lib/test/test_asyncio/test_windows_events.py
@@ -2,7 +2,6 @@
 import signal
 import socket
 import sys
-import subprocess
 import time
 import threading
 import unittest
@@ -12,14 +11,12 @@
     raise unittest.SkipTest('Windows only')
 
 import _overlapped
-import _testcapi
 import _winapi
 
 import asyncio
 from asyncio import windows_events
 from asyncio.streams import _StreamProtocol
 from test.test_asyncio import utils as test_utils
-from test.support.script_helper import spawn_python
 
 
 def tearDownModule():
diff --git a/Lib/test/test_audit.py b/Lib/test/test_audit.py
index 2fc41bddcb8a..41f9fae10223 100644
--- a/Lib/test/test_audit.py
+++ b/Lib/test/test_audit.py
@@ -1,7 +1,6 @@
 """Tests for sys.audit and sys.addaudithook
 """
 
-import os
 import subprocess
 import sys
 import unittest
diff --git a/Lib/test/test_c_locale_coercion.py b/Lib/test/test_c_locale_coercion.py
index 35272b5c15ac..8149e2b98bb3 100644
--- a/Lib/test/test_c_locale_coercion.py
+++ b/Lib/test/test_c_locale_coercion.py
@@ -2,7 +2,6 @@
 
 import locale
 import os
-import shutil
 import subprocess
 import sys
 import sysconfig
@@ -10,10 +9,8 @@
 from collections import namedtuple
 
 from test import support
-from test.support.script_helper import (
-    run_python_until_end,
-    interpreter_requires_environment,
-)
+from test.support.script_helper import run_python_until_end
+
 
 # Set the list of ways we expect to be able to ask for the "C" locale
 EXPECTED_C_LOCALE_EQUIVALENTS = ["C", "invalid.ascii"]
diff --git a/Lib/test/test_capi.py b/Lib/test/test_capi.py
index 45fabd599159..7b35ba60b53a 100644
--- a/Lib/test/test_capi.py
+++ b/Lib/test/test_capi.py
@@ -8,7 +8,6 @@
 import re
 import subprocess
 import sys
-import sysconfig
 import textwrap
 import threading
 import time
diff --git a/Lib/test/test_cgi.py b/Lib/test/test_cgi.py
index b86638e1c283..092255598259 100644
--- a/Lib/test/test_cgi.py
+++ b/Lib/test/test_cgi.py
@@ -1,4 +1,3 @@
-from test.support import check_warnings
 import cgi
 import os
 import sys
diff --git a/Lib/test/test_cmath.py b/Lib/test/test_cmath.py
index a00185f43dbf..668f27c8a082 100644
--- a/Lib/test/test_cmath.py
+++ b/Lib/test/test_cmath.py
@@ -6,7 +6,7 @@
 from cmath import phase, polar, rect, pi
 import platform
 import sys
-import sysconfig
+
 
 INF = float('inf')
 NAN = float('nan')
diff --git a/Lib/test/test_cmd_line.py b/Lib/test/test_cmd_line.py
index f7925eb795c7..497bfa9eb89d 100644
--- a/Lib/test/test_cmd_line.py
+++ b/Lib/test/test_cmd_line.py
@@ -5,7 +5,6 @@
 import os
 import subprocess
 import sys
-import sysconfig
 import tempfile
 import unittest
 from test import support
diff --git a/Lib/test/test_codeccallbacks.py b/Lib/test/test_codeccallbacks.py
index 585992be1f0b..243f002c4eca 100644
--- a/Lib/test/test_codeccallbacks.py
+++ b/Lib/test/test_codeccallbacks.py
@@ -1,10 +1,10 @@
 import codecs
 import html.entities
 import sys
-import test.support
 import unicodedata
 import unittest
 
+
 class PosReturn:
     # this can be used for configurable callbacks
 
diff --git a/Lib/test/test_codecs.py b/Lib/test/test_codecs.py
index 4317dfceb039..b187ca650dc6 100644
--- a/Lib/test/test_codecs.py
+++ b/Lib/test/test_codecs.py
@@ -29,7 +29,7 @@ def check(input, expect):
 
 # On small versions of Windows like Windows IoT or Windows Nano Server not all codepages are present
 def is_code_page_present(cp):
-    from ctypes import POINTER, WINFUNCTYPE, windll, WinError, Structure, WinDLL
+    from ctypes import POINTER, WINFUNCTYPE, WinDLL
     from ctypes.wintypes import BOOL, UINT, BYTE, WCHAR, UINT, DWORD
 
     MAX_LEADBYTES = 12  # 5 ranges, 2 bytes ea., 0 term.
diff --git a/Lib/test/test_collections.py b/Lib/test/test_collections.py
index e2d04d5b4761..e532be6eeaf0 100644
--- a/Lib/test/test_collections.py
+++ b/Lib/test/test_collections.py
@@ -13,7 +13,7 @@
 import types
 import unittest
 
-from collections import namedtuple, Counter, OrderedDict, _count_elements, _tuplegetter
+from collections import namedtuple, Counter, OrderedDict, _count_elements
 from collections import UserDict, UserString, UserList
 from collections import ChainMap
 from collections import deque
diff --git a/Lib/test/test_cprofile.py b/Lib/test/test_cprofile.py
index 5c70037f39a2..4ec769885292 100644
--- a/Lib/test/test_cprofile.py
+++ b/Lib/test/test_cprofile.py
@@ -6,7 +6,7 @@
 # rip off all interesting stuff from test_profile
 import cProfile
 from test.test_profile import ProfileTest, regenerate_expected_output
-from test.support.script_helper import assert_python_failure, assert_python_ok
+from test.support.script_helper import assert_python_failure
 from test import support
 
 
diff --git a/Lib/test/test_docxmlrpc.py b/Lib/test/test_docxmlrpc.py
index f077f05f5b4f..116e626740df 100644
--- a/Lib/test/test_docxmlrpc.py
+++ b/Lib/test/test_docxmlrpc.py
@@ -2,7 +2,6 @@
 import http.client
 import sys
 import threading
-from test import support
 import unittest
 
 def make_request_and_skipIf(condition, reason):
diff --git a/Lib/test/test_email/test_policy.py b/Lib/test/test_email/test_policy.py
index 0aea934df434..1e39aa062c0a 100644
--- a/Lib/test/test_email/test_policy.py
+++ b/Lib/test/test_email/test_policy.py
@@ -1,5 +1,4 @@
 import io
-import sys
 import types
 import textwrap
 import unittest
diff --git a/Lib/test/test_embed.py b/Lib/test/test_embed.py
index 5a90b9f6f247..ed1100cfabc5 100644
--- a/Lib/test/test_embed.py
+++ b/Lib/test/test_embed.py
@@ -5,7 +5,6 @@
 from collections import namedtuple
 import json
 import os
-import platform
 import re
 import subprocess
 import sys
diff --git a/Lib/test/test_exceptions.py b/Lib/test/test_exceptions.py
index d7e11d2d30a8..10c1e076464e 100644
--- a/Lib/test/test_exceptions.py
+++ b/Lib/test/test_exceptions.py
@@ -9,7 +9,7 @@
 import errno
 
 from test.support import (TESTFN, captured_stderr, check_impl_detail,
-                          check_warnings, cpython_only, gc_collect, run_unittest,
+                          check_warnings, cpython_only, gc_collect,
                           no_tracing, unlink, import_module, script_helper,
                           SuppressCrashReport)
 from test import support
diff --git a/Lib/test/test_faulthandler.py b/Lib/test/test_faulthandler.py
index f0be91844ffa..1cf20db1c7ff 100644
--- a/Lib/test/test_faulthandler.py
+++ b/Lib/test/test_faulthandler.py
@@ -9,7 +9,6 @@
 from test import support
 from test.support import script_helper, is_android
 import tempfile
-import threading
 import unittest
 from textwrap import dedent
 
diff --git a/Lib/test/test_fork1.py b/Lib/test/test_fork1.py
index 9ca9724c4c91..2ab856ff5690 100644
--- a/Lib/test/test_fork1.py
+++ b/Lib/test/test_fork1.py
@@ -10,8 +10,7 @@
 import unittest
 
 from test.fork_wait import ForkWait
-from test.support import (reap_children, get_attribute,
-                          import_module, verbose)
+from test.support import reap_children, get_attribute, verbose
 
 
 # Skip test if fork does not exist.
diff --git a/Lib/test/test_generators.py b/Lib/test/test_generators.py
index a34e4ec2eda7..f8d86da5e2f5 100644
--- a/Lib/test/test_generators.py
+++ b/Lib/test/test_generators.py
@@ -3,7 +3,6 @@
 import pickle
 import sys
 import unittest
-import warnings
 import weakref
 import inspect
 
diff --git a/Lib/test/test_gettext.py b/Lib/test/test_gettext.py
index 9d1a96b8b0d1..baf300b05724 100644
--- a/Lib/test/test_gettext.py
+++ b/Lib/test/test_gettext.py
@@ -2,7 +2,6 @@
 import base64
 import contextlib
 import gettext
-import locale
 import unittest
 
 from test import support
diff --git a/Lib/test/test_imaplib.py b/Lib/test/test_imaplib.py
index 9305e47ee993..8ab532af3f0d 100644
--- a/Lib/test/test_imaplib.py
+++ b/Lib/test/test_imaplib.py
@@ -1,7 +1,6 @@
 from test import support
 
 from contextlib import contextmanager
-import errno
 import imaplib
 import os.path
 import socketserver
diff --git a/Lib/test/test_import/__init__.py b/Lib/test/test_import/__init__.py
index 84cd0da94b36..50406d9aa1d9 100644
--- a/Lib/test/test_import/__init__.py
+++ b/Lib/test/test_import/__init__.py
@@ -5,7 +5,6 @@
 import builtins
 import marshal
 import os
-import platform
 import py_compile
 import random
 import shutil
@@ -23,9 +22,9 @@
 
 import test.support
 from test.support import (
-    EnvironmentVarGuard, TESTFN, check_warnings, forget, is_jython,
-    make_legacy_pyc, rmtree, run_unittest, swap_attr, swap_item, temp_umask,
-    unlink, unload, create_empty_file, cpython_only, TESTFN_UNENCODABLE,
+    TESTFN, forget, is_jython,
+    make_legacy_pyc, rmtree, swap_attr, swap_item, temp_umask,
+    unlink, unload, cpython_only, TESTFN_UNENCODABLE,
     temp_dir, DirsOnSysPath)
 from test.support import script_helper
 from test.test_importlib.util import uncache
diff --git a/Lib/test/test_importlib/test_util.py b/Lib/test/test_importlib/test_util.py
index db0899aff6b9..0350a5a5cc05 100644
--- a/Lib/test/test_importlib/test_util.py
+++ b/Lib/test/test_importlib/test_util.py
@@ -4,7 +4,6 @@
 machinery = util.import_importlib('importlib.machinery')
 importlib_util = util.import_importlib('importlib.util')
 
-import contextlib
 import importlib.util
 import os
 import pathlib
diff --git a/Lib/test/test_locale.py b/Lib/test/test_locale.py
index e2c2178ae6cc..792a15c50f92 100644
--- a/Lib/test/test_locale.py
+++ b/Lib/test/test_locale.py
@@ -3,7 +3,7 @@
 import locale
 import sys
 import codecs
-import warnings
+
 
 class BaseLocalizedTest(unittest.TestCase):
     #
diff --git a/Lib/test/test_math.py b/Lib/test/test_math.py
index b7dac5eeef63..96af655061f6 100644
--- a/Lib/test/test_math.py
+++ b/Lib/test/test_math.py
@@ -12,7 +12,7 @@
 import random
 import struct
 import sys
-import sysconfig
+
 
 eps = 1E-05
 NAN = float('nan')
diff --git a/Lib/test/test_os.py b/Lib/test/test_os.py
index 784000a2eb36..b2cd4cca5f21 100644
--- a/Lib/test/test_os.py
+++ b/Lib/test/test_os.py
@@ -9,7 +9,6 @@
 import decimal
 import errno
 import fractions
-import getpass
 import itertools
 import locale
 import mmap
diff --git a/Lib/test/test_peepholer.py b/Lib/test/test_peepholer.py
index 5d00240e2595..9c206d1d09c0 100644
--- a/Lib/test/test_peepholer.py
+++ b/Lib/test/test_peepholer.py
@@ -1,10 +1,9 @@
 import dis
 import unittest
-import types
-import textwrap
 
 from test.bytecode_helper import BytecodeTestCase
 
+
 def count_instr_recursively(f, opname):
     count = 0
     for instr in dis.get_instructions(f):
diff --git a/Lib/test/test_picklebuffer.py b/Lib/test/test_picklebuffer.py
index 7e72157fd022..97981c882e82 100644
--- a/Lib/test/test_picklebuffer.py
+++ b/Lib/test/test_picklebuffer.py
@@ -5,7 +5,6 @@
 
 import gc
 from pickle import PickleBuffer
-import sys
 import weakref
 import unittest
 
diff --git a/Lib/test/test_platform.py b/Lib/test/test_platform.py
index 8b64923e174c..3084663a8fad 100644
--- a/Lib/test/test_platform.py
+++ b/Lib/test/test_platform.py
@@ -2,13 +2,12 @@
 import platform
 import subprocess
 import sys
-import sysconfig
-import tempfile
 import unittest
 from unittest import mock
 
 from test import support
 
+
 class PlatformTest(unittest.TestCase):
     def clear_caches(self):
         platform._platform_cache.clear()
diff --git a/Lib/test/test_posixpath.py b/Lib/test/test_posixpath.py
index 983e2dd6ff27..4d3d8976d604 100644
--- a/Lib/test/test_posixpath.py
+++ b/Lib/test/test_posixpath.py
@@ -1,7 +1,6 @@
 import os
 import posixpath
 import unittest
-import warnings
 from posixpath import realpath, abspath, dirname, basename
 from test import support, test_genericpath
 from test.support import FakePath
@@ -12,6 +11,7 @@
 except ImportError:
     posix = None
 
+
 # An absolute path to a temporary filename for testing. We can't rely on TESTFN
 # being an absolute path, so we need this.
 
diff --git a/Lib/test/test_pyclbr.py b/Lib/test/test_pyclbr.py
index 0b3934f6226e..fafe17ce5f1b 100644
--- a/Lib/test/test_pyclbr.py
+++ b/Lib/test/test_pyclbr.py
@@ -3,15 +3,13 @@
    Nick Mathewson
 '''
 
-import os
 import sys
 from textwrap import dedent
 from types import FunctionType, MethodType, BuiltinFunctionType
 import pyclbr
 from unittest import TestCase, main as unittest_main
-from test import support
 from test.test_importlib import util as test_importlib_util
-from functools import partial
+
 
 StaticMethodType = type(staticmethod(lambda: None))
 ClassMethodType = type(classmethod(lambda c: None))
diff --git a/Lib/test/test_pydoc.py b/Lib/test/test_pydoc.py
index 6efdeb047c21..c80477c50f09 100644
--- a/Lib/test/test_pydoc.py
+++ b/Lib/test/test_pydoc.py
@@ -21,7 +21,6 @@
 import xml.etree
 import xml.etree.ElementTree
 import textwrap
-import threading
 from io import StringIO
 from collections import namedtuple
 from test.support.script_helper import assert_python_ok
diff --git a/Lib/test/test_runpy.py b/Lib/test/test_runpy.py
index 800b483b7e15..f00308611163 100644
--- a/Lib/test/test_runpy.py
+++ b/Lib/test/test_runpy.py
@@ -11,8 +11,7 @@
 from test.support import (
     forget, make_legacy_pyc, unload, verbose, no_tracing,
     create_empty_file, temp_dir)
-from test.support.script_helper import (
-    make_pkg, make_script, make_zip_pkg, make_zip_script)
+from test.support.script_helper import make_script, make_zip_script
 
 
 import runpy
diff --git a/Lib/test/test_signal.py b/Lib/test/test_signal.py
index 063b35ca230f..d41e94b07f43 100644
--- a/Lib/test/test_signal.py
+++ b/Lib/test/test_signal.py
@@ -6,7 +6,6 @@
 import statistics
 import subprocess
 import sys
-import threading
 import time
 import unittest
 from test import support
diff --git a/Lib/test/test_smtplib.py b/Lib/test/test_smtplib.py
index fdcf6f219256..f1332e9ef782 100644
--- a/Lib/test/test_smtplib.py
+++ b/Lib/test/test_smtplib.py
@@ -19,7 +19,7 @@
 
 import unittest
 from test import support, mock_socket
-from test.support import HOST, HOSTv4, HOSTv6
+from test.support import HOST
 from test.support import threading_setup, threading_cleanup, join_thread
 from unittest.mock import Mock
 
diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py
index 66369fe60dfe..1898990fb796 100644
--- a/Lib/test/test_ssl.py
+++ b/Lib/test/test_ssl.py
@@ -26,7 +26,7 @@
 
 ssl = support.import_module("ssl")
 
-from ssl import TLSVersion, _TLSContentType, _TLSMessageType, _TLSAlertType
+from ssl import TLSVersion, _TLSContentType, _TLSMessageType
 
 PROTOCOLS = sorted(ssl._PROTOCOL_NAMES)
 HOST = support.HOST
@@ -4592,7 +4592,6 @@ def msg_cb(conn, direction, version, content_type, msg_type, data):
 
 def test_main(verbose=False):
     if support.verbose:
-        import warnings
         plats = {
             'Mac': platform.mac_ver,
             'Windows': platform.win32_ver,
diff --git a/Lib/test/test_string_literals.py b/Lib/test/test_string_literals.py
index 048f40d90a4b..5961d591c448 100644
--- a/Lib/test/test_string_literals.py
+++ b/Lib/test/test_string_literals.py
@@ -31,7 +31,6 @@
 import sys
 import shutil
 import tempfile
-import warnings
 import unittest
 
 
diff --git a/Lib/test/test_subprocess.py b/Lib/test/test_subprocess.py
index 97d21904b9ce..9bfc21123cc0 100644
--- a/Lib/test/test_subprocess.py
+++ b/Lib/test/test_subprocess.py
@@ -3,7 +3,6 @@
 from test import support
 import subprocess
 import sys
-import platform
 import signal
 import io
 import itertools
@@ -20,18 +19,12 @@
 import textwrap
 from test.support import FakePath
 
-try:
-    import ctypes
-except ImportError:
-    ctypes = None
-else:
-    import ctypes.util
-
 try:
     import _testcapi
 except ImportError:
     _testcapi = None
 
+
 if support.PGO:
     raise unittest.SkipTest("test is not helpful for PGO")
 
diff --git a/Lib/test/test_sys.py b/Lib/test/test_sys.py
index 96db7de4938f..af0e54bd0e23 100644
--- a/Lib/test/test_sys.py
+++ b/Lib/test/test_sys.py
@@ -3,7 +3,6 @@
 import builtins
 import codecs
 import gc
-import io
 import locale
 import operator
 import os
diff --git a/Lib/test/test_tabnanny.py b/Lib/test/test_tabnanny.py
index 81549d14ae2b..95840d6ac0c5 100644
--- a/Lib/test/test_tabnanny.py
+++ b/Lib/test/test_tabnanny.py
@@ -7,7 +7,6 @@
 from unittest import mock
 import errno
 import os
-import sys
 import tabnanny
 import tokenize
 import tempfile
diff --git a/Lib/test/test_threaded_import.py b/Lib/test/test_threaded_import.py
index 035344be4b89..8607f363db21 100644
--- a/Lib/test/test_threaded_import.py
+++ b/Lib/test/test_threaded_import.py
@@ -15,7 +15,7 @@
 import unittest
 from unittest import mock
 from test.support import (
-    verbose, import_module, run_unittest, TESTFN, reap_threads,
+    verbose, run_unittest, TESTFN, reap_threads,
     forget, unlink, rmtree, start_threads)
 
 def task(N, done, done_tasks, errors):
diff --git a/Lib/test/test_threadedtempfile.py b/Lib/test/test_threadedtempfile.py
index f3d4ba36377d..e1d7a10179cc 100644
--- a/Lib/test/test_threadedtempfile.py
+++ b/Lib/test/test_threadedtempfile.py
@@ -13,19 +13,22 @@
 provoking a 2.0 failure under Linux.
 """
 
-NUM_THREADS = 20
-FILES_PER_THREAD = 50
-
 import tempfile
 
-from test.support import start_threads, import_module
+from test.support import start_threads
 import unittest
 import io
 import threading
 from traceback import print_exc
 
+
+NUM_THREADS = 20
+FILES_PER_THREAD = 50
+
+
 startEvent = threading.Event()
 
+
 class TempFileGreedy(threading.Thread):
     error_count = 0
     ok_count = 0
diff --git a/Lib/test/test_zipfile.py b/Lib/test/test_zipfile.py
index bf5bb4d0f13e..19b550f80187 100644
--- a/Lib/test/test_zipfile.py
+++ b/Lib/test/test_zipfile.py
@@ -4,9 +4,7 @@
 import os
 import pathlib
 import posixpath
-import shutil
 import struct
-import tempfile
 import time
 import unittest
 import zipfile


From webhook-mailer at python.org  Mon Jul  1 13:13:54 2019
From: webhook-mailer at python.org (Victor Stinner)
Date: Mon, 01 Jul 2019 17:13:54 -0000
Subject: [Python-checkins] bpo-36763: Add PyConfig_SetWideStringList()
 (GH-14444)
Message-ID: <mailman.183.1562001236.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/36242fd871d0f0977e720d4fae5700774bd8c09a
commit: 36242fd871d0f0977e720d4fae5700774bd8c09a
branch: master
author: Victor Stinner <vstinner at redhat.com>
committer: GitHub <noreply at github.com>
date: 2019-07-01T19:13:50+02:00
summary:

bpo-36763: Add PyConfig_SetWideStringList() (GH-14444)

files:
A Misc/NEWS.d/next/C API/2019-06-28-15-49-16.bpo-36763.zrmgki.rst
M Doc/c-api/init_config.rst
M Include/cpython/initconfig.h
M Python/initconfig.c

diff --git a/Doc/c-api/init_config.rst b/Doc/c-api/init_config.rst
index 0d94e6b8f27b..d2c1f9a2f3e3 100644
--- a/Doc/c-api/init_config.rst
+++ b/Doc/c-api/init_config.rst
@@ -25,6 +25,7 @@ Functions:
 * :c:func:`PyConfig_SetBytesArgv`
 * :c:func:`PyConfig_SetBytesString`
 * :c:func:`PyConfig_SetString`
+* :c:func:`PyConfig_SetWideStringList`
 * :c:func:`PyPreConfig_InitIsolatedConfig`
 * :c:func:`PyPreConfig_InitPythonConfig`
 * :c:func:`PyStatus_Error`
@@ -368,6 +369,12 @@ PyConfig
 
       Preinitialize Python if needed.
 
+   .. c:function:: PyStatus PyConfig_SetWideStringList(PyConfig *config, PyWideStringList *list, Py_ssize_t length, wchar_t **items)
+
+      Set the list of wide strings *list* to *length* and *items*.
+
+      Preinitialize Python if needed.
+
    .. c:function:: PyStatus PyConfig_Read(PyConfig *config)
 
       Read all Python configuration.
diff --git a/Include/cpython/initconfig.h b/Include/cpython/initconfig.h
index 297fbf70792f..bd07a4829b47 100644
--- a/Include/cpython/initconfig.h
+++ b/Include/cpython/initconfig.h
@@ -422,6 +422,9 @@ PyAPI_FUNC(PyStatus) PyConfig_SetBytesArgv(
 PyAPI_FUNC(PyStatus) PyConfig_SetArgv(PyConfig *config,
     Py_ssize_t argc,
     wchar_t * const *argv);
+PyAPI_FUNC(PyStatus) PyConfig_SetWideStringList(PyConfig *config,
+    PyWideStringList *list,
+    Py_ssize_t length, wchar_t **items);
 
 #ifdef __cplusplus
 }
diff --git a/Misc/NEWS.d/next/C API/2019-06-28-15-49-16.bpo-36763.zrmgki.rst b/Misc/NEWS.d/next/C API/2019-06-28-15-49-16.bpo-36763.zrmgki.rst
new file mode 100644
index 000000000000..095d58116385
--- /dev/null
+++ b/Misc/NEWS.d/next/C API/2019-06-28-15-49-16.bpo-36763.zrmgki.rst	
@@ -0,0 +1 @@
+Add :func:`PyConfig_SetWideStringList` function.
diff --git a/Python/initconfig.c b/Python/initconfig.c
index 786f6945c171..c44ae6bdfacc 100644
--- a/Python/initconfig.c
+++ b/Python/initconfig.c
@@ -732,7 +732,7 @@ _PyConfig_Copy(PyConfig *config, const PyConfig *config2)
     } while (0)
 #define COPY_WSTRLIST(LIST) \
     do { \
-        if (_PyWideStringList_Copy(&config->LIST, &config2->LIST) < 0 ) { \
+        if (_PyWideStringList_Copy(&config->LIST, &config2->LIST) < 0) { \
             return _PyStatus_NO_MEMORY(); \
         } \
     } while (0)
@@ -2324,6 +2324,23 @@ PyConfig_SetArgv(PyConfig *config, Py_ssize_t argc, wchar_t * const *argv)
 }
 
 
+PyStatus
+PyConfig_SetWideStringList(PyConfig *config, PyWideStringList *list,
+                           Py_ssize_t length, wchar_t **items)
+{
+    PyStatus status = _Py_PreInitializeFromConfig(config, NULL);
+    if (_PyStatus_EXCEPTION(status)) {
+        return status;
+    }
+
+    PyWideStringList list2 = {.length = length, .items = items};
+    if (_PyWideStringList_Copy(list, &list2) < 0) {
+        return _PyStatus_NO_MEMORY();
+    }
+    return _PyStatus_OK();
+}
+
+
 /* Read the configuration into PyConfig from:
 
    * Command line arguments


From webhook-mailer at python.org  Mon Jul  1 13:40:03 2019
From: webhook-mailer at python.org (Miss Islington (bot))
Date: Mon, 01 Jul 2019 17:40:03 -0000
Subject: [Python-checkins] bpo-36763: Add PyConfig_SetWideStringList()
 (GH-14444)
Message-ID: <mailman.184.1562002803.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/96f581cf9d2f1d7888d2fd9bb89f19f10c0477bf
commit: 96f581cf9d2f1d7888d2fd9bb89f19f10c0477bf
branch: 3.8
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: GitHub <noreply at github.com>
date: 2019-07-01T10:39:58-07:00
summary:

bpo-36763: Add PyConfig_SetWideStringList() (GH-14444)

(cherry picked from commit 36242fd871d0f0977e720d4fae5700774bd8c09a)

Co-authored-by: Victor Stinner <vstinner at redhat.com>

files:
A Misc/NEWS.d/next/C API/2019-06-28-15-49-16.bpo-36763.zrmgki.rst
M Doc/c-api/init_config.rst
M Include/cpython/initconfig.h
M Python/initconfig.c

diff --git a/Doc/c-api/init_config.rst b/Doc/c-api/init_config.rst
index 0d94e6b8f27b..d2c1f9a2f3e3 100644
--- a/Doc/c-api/init_config.rst
+++ b/Doc/c-api/init_config.rst
@@ -25,6 +25,7 @@ Functions:
 * :c:func:`PyConfig_SetBytesArgv`
 * :c:func:`PyConfig_SetBytesString`
 * :c:func:`PyConfig_SetString`
+* :c:func:`PyConfig_SetWideStringList`
 * :c:func:`PyPreConfig_InitIsolatedConfig`
 * :c:func:`PyPreConfig_InitPythonConfig`
 * :c:func:`PyStatus_Error`
@@ -368,6 +369,12 @@ PyConfig
 
       Preinitialize Python if needed.
 
+   .. c:function:: PyStatus PyConfig_SetWideStringList(PyConfig *config, PyWideStringList *list, Py_ssize_t length, wchar_t **items)
+
+      Set the list of wide strings *list* to *length* and *items*.
+
+      Preinitialize Python if needed.
+
    .. c:function:: PyStatus PyConfig_Read(PyConfig *config)
 
       Read all Python configuration.
diff --git a/Include/cpython/initconfig.h b/Include/cpython/initconfig.h
index 297fbf70792f..bd07a4829b47 100644
--- a/Include/cpython/initconfig.h
+++ b/Include/cpython/initconfig.h
@@ -422,6 +422,9 @@ PyAPI_FUNC(PyStatus) PyConfig_SetBytesArgv(
 PyAPI_FUNC(PyStatus) PyConfig_SetArgv(PyConfig *config,
     Py_ssize_t argc,
     wchar_t * const *argv);
+PyAPI_FUNC(PyStatus) PyConfig_SetWideStringList(PyConfig *config,
+    PyWideStringList *list,
+    Py_ssize_t length, wchar_t **items);
 
 #ifdef __cplusplus
 }
diff --git a/Misc/NEWS.d/next/C API/2019-06-28-15-49-16.bpo-36763.zrmgki.rst b/Misc/NEWS.d/next/C API/2019-06-28-15-49-16.bpo-36763.zrmgki.rst
new file mode 100644
index 000000000000..095d58116385
--- /dev/null
+++ b/Misc/NEWS.d/next/C API/2019-06-28-15-49-16.bpo-36763.zrmgki.rst	
@@ -0,0 +1 @@
+Add :func:`PyConfig_SetWideStringList` function.
diff --git a/Python/initconfig.c b/Python/initconfig.c
index e791a0d6a09e..1c7078a6b570 100644
--- a/Python/initconfig.c
+++ b/Python/initconfig.c
@@ -732,7 +732,7 @@ _PyConfig_Copy(PyConfig *config, const PyConfig *config2)
     } while (0)
 #define COPY_WSTRLIST(LIST) \
     do { \
-        if (_PyWideStringList_Copy(&config->LIST, &config2->LIST) < 0 ) { \
+        if (_PyWideStringList_Copy(&config->LIST, &config2->LIST) < 0) { \
             return _PyStatus_NO_MEMORY(); \
         } \
     } while (0)
@@ -2277,6 +2277,23 @@ PyConfig_SetArgv(PyConfig *config, Py_ssize_t argc, wchar_t * const *argv)
 }
 
 
+PyStatus
+PyConfig_SetWideStringList(PyConfig *config, PyWideStringList *list,
+                           Py_ssize_t length, wchar_t **items)
+{
+    PyStatus status = _Py_PreInitializeFromConfig(config, NULL);
+    if (_PyStatus_EXCEPTION(status)) {
+        return status;
+    }
+
+    PyWideStringList list2 = {.length = length, .items = items};
+    if (_PyWideStringList_Copy(list, &list2) < 0) {
+        return _PyStatus_NO_MEMORY();
+    }
+    return _PyStatus_OK();
+}
+
+
 /* Read the configuration into PyConfig from:
 
    * Command line arguments


From webhook-mailer at python.org  Mon Jul  1 13:45:11 2019
From: webhook-mailer at python.org (Vinay Sajip)
Date: Mon, 01 Jul 2019 17:45:11 -0000
Subject: [Python-checkins] bpo-37469: Document usability of SimpleQueue with
 QueueHandler and QueueListener. (GH-14521)
Message-ID: <mailman.185.1562003111.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/e6b64b756f940147728ea7808fb686ffcae89176
commit: e6b64b756f940147728ea7808fb686ffcae89176
branch: master
author: Vinay Sajip <vinay_sajip at yahoo.co.uk>
committer: GitHub <noreply at github.com>
date: 2019-07-01T18:45:07+01:00
summary:

bpo-37469: Document usability of SimpleQueue with QueueHandler and QueueListener. (GH-14521)

files:
M Doc/library/logging.handlers.rst

diff --git a/Doc/library/logging.handlers.rst b/Doc/library/logging.handlers.rst
index df5bfefaa275..592d7e5daf93 100644
--- a/Doc/library/logging.handlers.rst
+++ b/Doc/library/logging.handlers.rst
@@ -992,9 +992,11 @@ possible, while any potentially slow operations (such as sending an email via
 .. class:: QueueHandler(queue)
 
    Returns a new instance of the :class:`QueueHandler` class. The instance is
-   initialized with the queue to send messages to. The queue can be any
-   queue-like object; it's used as-is by the :meth:`enqueue` method, which needs
-   to know how to send messages to it.
+   initialized with the queue to send messages to. The *queue* can be any
+   queue-like object; it's used as-is by the :meth:`enqueue` method, which
+   needs to know how to send messages to it. The queue is not *required* to
+   have the task tracking API, which means that you can use
+   :class:`~queue.SimpleQueue` instances for *queue*.
 
 
    .. method:: emit(record)
@@ -1050,11 +1052,14 @@ possible, while any potentially slow operations (such as sending an email via
    initialized with the queue to send messages to and a list of handlers which
    will handle entries placed on the queue. The queue can be any queue-like
    object; it's passed as-is to the :meth:`dequeue` method, which needs
-   to know how to get messages from it. 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 versions - to always pass each message to each
-   handler.
+   to know how to get messages from it. The queue is not *required* to have the
+   task tracking API (though it's used if available), which means that you can
+   use :class:`~queue.SimpleQueue` instances for *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
+   versions - to always pass each message to each handler.
 
    .. versionchanged:: 3.5
       The ``respect_handler_levels`` argument was added.


From webhook-mailer at python.org  Mon Jul  1 13:52:52 2019
From: webhook-mailer at python.org (Victor Stinner)
Date: Mon, 01 Jul 2019 17:52:52 -0000
Subject: [Python-checkins] bpo-36763: Use PyConfig_Clear() (GH-14445)
Message-ID: <mailman.186.1562003573.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/67310023f299b5a2fad71fca449b46d280036690
commit: 67310023f299b5a2fad71fca449b46d280036690
branch: master
author: Victor Stinner <vstinner at redhat.com>
committer: GitHub <noreply at github.com>
date: 2019-07-01T19:52:45+02:00
summary:

bpo-36763: Use PyConfig_Clear() (GH-14445)

Stop using "static PyConfig", PyConfig must now always use
dynamically allocated strings: use PyConfig_SetString(),
PyConfig_SetArgv() and PyConfig_Clear().

files:
M Lib/test/test_embed.py
M Modules/main.c
M Programs/_freeze_importlib.c
M Programs/_testembed.c

diff --git a/Lib/test/test_embed.py b/Lib/test/test_embed.py
index e1cf4be50668..b2cd55016e46 100644
--- a/Lib/test/test_embed.py
+++ b/Lib/test/test_embed.py
@@ -695,10 +695,19 @@ def test_init_from_config(self):
 
             'pycache_prefix': 'conf_pycache_prefix',
             'program_name': './conf_program_name',
-            'argv': ['-c', 'arg2'],
+            'argv': ['-c', 'arg2', ],
             'parse_argv': 1,
-            'xoptions': ['xoption1=3', 'xoption2=', 'xoption3'],
-            'warnoptions': ['error::ResourceWarning', 'default::BytesWarning'],
+            'xoptions': [
+                'config_xoption1=3',
+                'config_xoption2=',
+                'config_xoption3',
+                'cmdline_xoption',
+            ],
+            'warnoptions': [
+                'config_warnoption',
+                'cmdline_warnoption',
+                'default::BytesWarning',
+            ],
             'run_command': 'pass\n',
 
             'site_import': 0,
diff --git a/Modules/main.c b/Modules/main.c
index 853afedd7b90..b126f4554d41 100644
--- a/Modules/main.c
+++ b/Modules/main.c
@@ -62,7 +62,7 @@ pymain_init(const _PyArgv *args)
     PyConfig config;
     status = PyConfig_InitPythonConfig(&config);
     if (_PyStatus_EXCEPTION(status)) {
-        return status;
+        goto done;
     }
 
     /* pass NULL as the config: config is read from command line arguments,
@@ -74,14 +74,18 @@ pymain_init(const _PyArgv *args)
         status = PyConfig_SetArgv(&config, args->argc, args->wchar_argv);
     }
     if (_PyStatus_EXCEPTION(status)) {
-        return status;
+        goto done;
     }
 
     status = Py_InitializeFromConfig(&config);
     if (_PyStatus_EXCEPTION(status)) {
-        return status;
+        goto done;
     }
-    return _PyStatus_OK();
+    status = _PyStatus_OK();
+
+done:
+    PyConfig_Clear(&config);
+    return status;
 }
 
 
diff --git a/Programs/_freeze_importlib.c b/Programs/_freeze_importlib.c
index 13375b0a3819..74735f279c58 100644
--- a/Programs/_freeze_importlib.c
+++ b/Programs/_freeze_importlib.c
@@ -88,7 +88,7 @@ main(int argc, char *argv[])
     config.site_import = 0;
 
     status = PyConfig_SetString(&config, &config.program_name,
-                                  L"./_freeze_importlib");
+                                L"./_freeze_importlib");
     if (PyStatus_Exception(status)) {
         PyConfig_Clear(&config);
         Py_ExitStatusException(status);
diff --git a/Programs/_testembed.c b/Programs/_testembed.c
index 9633f4610b54..856144b85e17 100644
--- a/Programs/_testembed.c
+++ b/Programs/_testembed.c
@@ -329,6 +329,56 @@ static int test_init_initialize_config(void)
 }
 
 
+static void config_set_string(PyConfig *config, wchar_t **config_str, const wchar_t *str)
+{
+    PyStatus status = PyConfig_SetString(config, config_str, str);
+    if (PyStatus_Exception(status)) {
+        PyConfig_Clear(config);
+        Py_ExitStatusException(status);
+    }
+}
+
+
+static void config_set_argv(PyConfig *config, Py_ssize_t argc, wchar_t * const *argv)
+{
+    PyStatus status = PyConfig_SetArgv(config, argc, argv);
+    if (PyStatus_Exception(status)) {
+        PyConfig_Clear(config);
+        Py_ExitStatusException(status);
+    }
+}
+
+
+static void
+config_set_wide_string_list(PyConfig *config, PyWideStringList *list,
+                            Py_ssize_t length, wchar_t **items)
+{
+    PyStatus status = PyConfig_SetWideStringList(config, list, length, items);
+    if (PyStatus_Exception(status)) {
+        PyConfig_Clear(config);
+        Py_ExitStatusException(status);
+    }
+}
+
+
+static void config_set_program_name(PyConfig *config)
+{
+    /* Use path starting with "./" avoids a search along the PATH */
+    const wchar_t *program_name = L"./_testembed";
+    config_set_string(config, &config->program_name, program_name);
+}
+
+
+static void init_from_config_clear(PyConfig *config)
+{
+    PyStatus status = Py_InitializeFromConfig(config);
+    PyConfig_Clear(config);
+    if (PyStatus_Exception(status)) {
+        Py_ExitStatusException(status);
+    }
+}
+
+
 static int check_init_compat_config(int preinit)
 {
     PyStatus status;
@@ -345,12 +395,8 @@ static int check_init_compat_config(int preinit)
 
     PyConfig config;
     _PyConfig_InitCompatConfig(&config);
-    config.program_name = L"./_testembed";
-
-    status = Py_InitializeFromConfig(&config);
-    if (PyStatus_Exception(status)) {
-        Py_ExitStatusException(status);
-    }
+    config_set_program_name(&config);
+    init_from_config_clear(&config);
 
     dump_config();
     Py_Finalize();
@@ -438,7 +484,6 @@ static int test_init_from_config(void)
         Py_ExitStatusException(status);
     }
 
-    /* Test Py_InitializeFromConfig() */
     PyConfig config;
     _PyConfig_InitCompatConfig(&config);
     config.install_signal_handlers = 0;
@@ -468,34 +513,37 @@ static int test_init_from_config(void)
     config.malloc_stats = 1;
 
     putenv("PYTHONPYCACHEPREFIX=env_pycache_prefix");
-    config.pycache_prefix = L"conf_pycache_prefix";
+    config_set_string(&config, &config.pycache_prefix, L"conf_pycache_prefix");
 
     Py_SetProgramName(L"./globalvar");
-    config.program_name = L"./conf_program_name";
+    config_set_string(&config, &config.program_name, L"./conf_program_name");
 
-    static wchar_t* argv[] = {
+    wchar_t* argv[] = {
         L"python3",
+        L"-W",
+        L"cmdline_warnoption",
+        L"-X",
+        L"cmdline_xoption",
         L"-c",
         L"pass",
         L"arg2",
     };
-    config.argv.length = Py_ARRAY_LENGTH(argv);
-    config.argv.items = argv;
+    config_set_argv(&config, Py_ARRAY_LENGTH(argv), argv);
     config.parse_argv = 1;
 
-    static wchar_t* xoptions[3] = {
-        L"xoption1=3",
-        L"xoption2=",
-        L"xoption3",
+    wchar_t* xoptions[3] = {
+        L"config_xoption1=3",
+        L"config_xoption2=",
+        L"config_xoption3",
     };
-    config.xoptions.length = Py_ARRAY_LENGTH(xoptions);
-    config.xoptions.items = xoptions;
+    config_set_wide_string_list(&config, &config.xoptions,
+                                Py_ARRAY_LENGTH(xoptions), xoptions);
 
-    static wchar_t* warnoptions[1] = {
-        L"error::ResourceWarning",
+    wchar_t* warnoptions[1] = {
+        L"config_warnoption",
     };
-    config.warnoptions.length = Py_ARRAY_LENGTH(warnoptions);
-    config.warnoptions.items = warnoptions;
+    config_set_wide_string_list(&config, &config.warnoptions,
+                                Py_ARRAY_LENGTH(warnoptions), warnoptions);
 
     /* FIXME: test pythonpath_env */
     /* FIXME: test home */
@@ -544,22 +592,20 @@ static int test_init_from_config(void)
        Force it to 0 through the config. */
     config.legacy_windows_stdio = 0;
 #endif
-    config.stdio_encoding = L"iso8859-1";
-    config.stdio_errors = L"replace";
+    config_set_string(&config, &config.stdio_encoding, L"iso8859-1");
+    config_set_string(&config, &config.stdio_errors, L"replace");
 
     putenv("PYTHONNOUSERSITE=");
     Py_NoUserSiteDirectory = 0;
     config.user_site_directory = 0;
 
-    config.check_hash_pycs_mode = L"always";
+    config_set_string(&config, &config.check_hash_pycs_mode, L"always");
 
     Py_FrozenFlag = 0;
     config.pathconfig_warnings = 0;
 
-    status = Py_InitializeFromConfig(&config);
-    if (PyStatus_Exception(status)) {
-        Py_ExitStatusException(status);
-    }
+    init_from_config_clear(&config);
+
     dump_config();
     Py_Finalize();
     return 0;
@@ -576,7 +622,9 @@ static int check_init_parse_argv(int parse_argv)
         Py_ExitStatusException(status);
     }
 
-    static wchar_t* argv[] = {
+    config.parse_argv = parse_argv;
+
+    wchar_t* argv[] = {
         L"./argv0",
         L"-E",
         L"-c",
@@ -585,15 +633,9 @@ static int check_init_parse_argv(int parse_argv)
         L"-v",
         L"arg3",
     };
+    config_set_argv(&config, Py_ARRAY_LENGTH(argv), argv);
+    init_from_config_clear(&config);
 
-    config.argv.length = Py_ARRAY_LENGTH(argv);
-    config.argv.items = argv;
-    config.parse_argv = parse_argv;
-
-    status = Py_InitializeFromConfig(&config);
-    if (PyStatus_Exception(status)) {
-        Py_ExitStatusException(status);
-    }
     dump_config();
     Py_Finalize();
     return 0;
@@ -664,12 +706,10 @@ static int test_init_python_env(void)
     if (PyStatus_Exception(status)) {
         Py_ExitStatusException(status);
     }
-    config.program_name = L"./_testembed";
 
-    status = Py_InitializeFromConfig(&config);
-    if (PyStatus_Exception(status)) {
-        Py_ExitStatusException(status);
-    }
+    config_set_program_name(&config);
+    init_from_config_clear(&config);
+
     dump_config();
     Py_Finalize();
     return 0;
@@ -723,14 +763,10 @@ static int test_init_isolated_flag(void)
     Py_IsolatedFlag = 0;
     config.isolated = 1;
 
-    /* Use path starting with "./" avoids a search along the PATH */
-    config.program_name = L"./_testembed";
-
+    config_set_program_name(&config);
     set_all_env_vars();
-    status = Py_InitializeFromConfig(&config);
-    if (PyStatus_Exception(status)) {
-        Py_ExitStatusException(status);
-    }
+    init_from_config_clear(&config);
+
     dump_config();
     Py_Finalize();
     return 0;
@@ -753,13 +789,10 @@ static int test_preinit_isolated1(void)
 
     PyConfig config;
     _PyConfig_InitCompatConfig(&config);
-    config.program_name = L"./_testembed";
-
+    config_set_program_name(&config);
     set_all_env_vars();
-    status = Py_InitializeFromConfig(&config);
-    if (PyStatus_Exception(status)) {
-        Py_ExitStatusException(status);
-    }
+    init_from_config_clear(&config);
+
     dump_config();
     Py_Finalize();
     return 0;
@@ -787,14 +820,10 @@ static int test_preinit_isolated2(void)
     Py_IsolatedFlag = 0;
     config.isolated = 1;
 
-    /* Use path starting with "./" avoids a search along the PATH */
-    config.program_name = L"./_testembed";
-
+    config_set_program_name(&config);
     set_all_env_vars();
-    status = Py_InitializeFromConfig(&config);
-    if (PyStatus_Exception(status)) {
-        Py_ExitStatusException(status);
-    }
+    init_from_config_clear(&config);
+
     dump_config();
     Py_Finalize();
     return 0;
@@ -819,44 +848,28 @@ static int test_preinit_dont_parse_argv(void)
                        L"script.py"};
     status = Py_PreInitializeFromArgs(&preconfig, Py_ARRAY_LENGTH(argv), argv);
     if (PyStatus_Exception(status)) {
-        goto failed;
+        Py_ExitStatusException(status);
     }
 
     PyConfig config;
 
     status = PyConfig_InitIsolatedConfig(&config);
     if (PyStatus_Exception(status)) {
-        goto failed;
+        PyConfig_Clear(&config);
+        Py_ExitStatusException(status);
     }
 
     config.isolated = 0;
 
     /* Pre-initialize implicitly using argv: make sure that -X dev
        is used to configure the allocation in preinitialization */
-    status = PyConfig_SetArgv(&config, Py_ARRAY_LENGTH(argv), argv);
-    if (PyStatus_Exception(status)) {
-        goto failed;
-    }
-
-    status = PyConfig_SetString(&config, &config.program_name,
-                                  L"./_testembed");
-    if (PyStatus_Exception(status)) {
-        goto failed;
-    }
-
-    status = Py_InitializeFromConfig(&config);
-    if (PyStatus_Exception(status)) {
-        goto failed;
-    }
-    PyConfig_Clear(&config);
+    config_set_argv(&config, Py_ARRAY_LENGTH(argv), argv);
+    config_set_program_name(&config);
+    init_from_config_clear(&config);
 
     dump_config();
     Py_Finalize();
     return 0;
-
-failed:
-    PyConfig_Clear(&config);
-    Py_ExitStatusException(status);
 }
 
 
@@ -867,36 +880,20 @@ static int test_preinit_parse_argv(void)
 
     status = PyConfig_InitPythonConfig(&config);
     if (PyStatus_Exception(status)) {
-        goto failed;
+        PyConfig_Clear(&config);
+        Py_ExitStatusException(status);
     }
 
     /* Pre-initialize implicitly using argv: make sure that -X dev
        is used to configure the allocation in preinitialization */
     wchar_t *argv[] = {L"python3", L"-X", L"dev", L"script.py"};
-    status = PyConfig_SetArgv(&config, Py_ARRAY_LENGTH(argv), argv);
-    if (PyStatus_Exception(status)) {
-        goto failed;
-    }
-
-    status = PyConfig_SetString(&config, &config.program_name,
-                                  L"./_testembed");
-    if (PyStatus_Exception(status)) {
-        goto failed;
-    }
-
-    status = Py_InitializeFromConfig(&config);
-    if (PyStatus_Exception(status)) {
-        goto failed;
-    }
-    PyConfig_Clear(&config);
+    config_set_argv(&config, Py_ARRAY_LENGTH(argv), argv);
+    config_set_program_name(&config);
+    init_from_config_clear(&config);
 
     dump_config();
     Py_Finalize();
     return 0;
-
-failed:
-    PyConfig_Clear(&config);
-    Py_ExitStatusException(status);
 }
 
 
@@ -955,13 +952,8 @@ static int check_preinit_isolated_config(int preinit)
         PyConfig_Clear(&config);
         Py_ExitStatusException(status);
     }
-    config.program_name = L"./_testembed";
-
-    status = Py_InitializeFromConfig(&config);
-    if (PyStatus_Exception(status)) {
-        PyConfig_Clear(&config);
-        Py_ExitStatusException(status);
-    }
+    config_set_program_name(&config);
+    init_from_config_clear(&config);
 
     rt_preconfig = &_PyRuntime.preconfig;
     assert(rt_preconfig->isolated == 1);
@@ -1017,12 +1009,9 @@ static int check_init_python_config(int preinit)
     if (PyStatus_Exception(status)) {
         Py_ExitStatusException(status);
     }
-    config.program_name = L"./_testembed";
+    config_set_program_name(&config);
+    init_from_config_clear(&config);
 
-    status = Py_InitializeFromConfig(&config);
-    if (PyStatus_Exception(status)) {
-        Py_ExitStatusException(status);
-    }
     dump_config();
     Py_Finalize();
     return 0;
@@ -1061,11 +1050,8 @@ static int test_init_dont_configure_locale(void)
     if (PyStatus_Exception(status)) {
         Py_ExitStatusException(status);
     }
-    config.program_name = L"./_testembed";
-    status = Py_InitializeFromConfig(&config);
-    if (PyStatus_Exception(status)) {
-        Py_ExitStatusException(status);
-    }
+    config_set_program_name(&config);
+    init_from_config_clear(&config);
 
     dump_config();
     Py_Finalize();
@@ -1084,11 +1070,9 @@ static int test_init_dev_mode(void)
     putenv("PYTHONFAULTHANDLER=");
     putenv("PYTHONMALLOC=");
     config.dev_mode = 1;
-    config.program_name = L"./_testembed";
-    status = Py_InitializeFromConfig(&config);
-    if (PyStatus_Exception(status)) {
-        Py_ExitStatusException(status);
-    }
+    config_set_program_name(&config);
+    init_from_config_clear(&config);
+
     dump_config();
     Py_Finalize();
     return 0;
@@ -1278,16 +1262,9 @@ static int test_init_read_set(void)
     }
 
     /* override executable computed by PyConfig_Read() */
-    status = PyConfig_SetString(&config, &config.executable, L"my_executable");
-    if (PyStatus_Exception(status)) {
-        goto fail;
-    }
+    config_set_string(&config, &config.executable, L"my_executable");
+    init_from_config_clear(&config);
 
-    status = Py_InitializeFromConfig(&config);
-    PyConfig_Clear(&config);
-    if (PyStatus_Exception(status)) {
-        goto fail;
-    }
     dump_config();
     Py_Finalize();
     return 0;
@@ -1297,19 +1274,18 @@ static int test_init_read_set(void)
 }
 
 
-wchar_t *init_main_argv[] = {
-    L"python3", L"-c",
-    (L"import _testinternalcapi, json; "
-     L"print(json.dumps(_testinternalcapi.get_configs()))"),
-    L"arg2"};
-
-
 static void configure_init_main(PyConfig *config)
 {
-    config->argv.length = Py_ARRAY_LENGTH(init_main_argv);
-    config->argv.items = init_main_argv;
+    wchar_t* argv[] = {
+        L"python3", L"-c",
+        (L"import _testinternalcapi, json; "
+         L"print(json.dumps(_testinternalcapi.get_configs()))"),
+        L"arg2"};
+
     config->parse_argv = 1;
-    config->program_name = L"./python3";
+
+    config_set_argv(config, Py_ARRAY_LENGTH(argv), argv);
+    config_set_string(config, &config->program_name, L"./python3");
 }
 
 
@@ -1322,11 +1298,7 @@ static int test_init_run_main(void)
         Py_ExitStatusException(status);
     }
     configure_init_main(&config);
-
-    status = Py_InitializeFromConfig(&config);
-    if (PyStatus_Exception(status)) {
-        Py_ExitStatusException(status);
-    }
+    init_from_config_clear(&config);
 
     return Py_RunMain();
 }
@@ -1343,11 +1315,7 @@ static int test_init_main(void)
     }
     configure_init_main(&config);
     config._init_main = 0;
-
-    status = Py_InitializeFromConfig(&config);
-    if (PyStatus_Exception(status)) {
-        Py_ExitStatusException(status);
-    }
+    init_from_config_clear(&config);
 
     /* sys.stdout don't exist yet: it is created by _Py_InitializeMain() */
     int res = PyRun_SimpleString(
@@ -1374,35 +1342,19 @@ static int test_run_main(void)
 
     status = PyConfig_InitPythonConfig(&config);
     if (PyStatus_Exception(status)) {
-        goto failed;
+        PyConfig_Clear(&config);
+        Py_ExitStatusException(status);
     }
 
     wchar_t *argv[] = {L"python3", L"-c",
                        (L"import sys; "
                         L"print(f'Py_RunMain(): sys.argv={sys.argv}')"),
                        L"arg2"};
-    status = PyConfig_SetArgv(&config, Py_ARRAY_LENGTH(argv), argv);
-    if (PyStatus_Exception(status)) {
-        goto failed;
-    }
-
-    status = PyConfig_SetString(&config, &config.program_name,
-                                  L"./python3");
-    if (PyStatus_Exception(status)) {
-        goto failed;
-    }
-
-    status = Py_InitializeFromConfig(&config);
-    if (PyStatus_Exception(status)) {
-        goto failed;
-    }
-    PyConfig_Clear(&config);
+    config_set_argv(&config, Py_ARRAY_LENGTH(argv), argv);
+    config_set_string(&config, &config.program_name, L"./python3");
+    init_from_config_clear(&config);
 
     return Py_RunMain();
-
-failed:
-    PyConfig_Clear(&config);
-    Py_ExitStatusException(status);
 }
 
 


From webhook-mailer at python.org  Mon Jul  1 14:02:43 2019
From: webhook-mailer at python.org (Victor Stinner)
Date: Mon, 01 Jul 2019 18:02:43 -0000
Subject: [Python-checkins] Remove unused imports in tests (GH-14518)
 (GH-14522)
Message-ID: <mailman.187.1562004164.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/e34b5f4d6483187969d5149c801d056b72ef2ddb
commit: e34b5f4d6483187969d5149c801d056b72ef2ddb
branch: 3.7
author: Victor Stinner <vstinner at redhat.com>
committer: GitHub <noreply at github.com>
date: 2019-07-01T20:02:39+02:00
summary:

Remove unused imports in tests (GH-14518) (GH-14522)

(cherry picked from commit 8f4ef3b019ce380022018587571b0f970e668de3)

files:
M Lib/test/libregrtest/main.py
M Lib/test/support/__init__.py
M Lib/test/test_aifc.py
M Lib/test/test_argparse.py
M Lib/test/test_asynchat.py
M Lib/test/test_asyncio/test_pep492.py
M Lib/test/test_asyncio/test_sslproto.py
M Lib/test/test_asyncio/test_unix_events.py
M Lib/test/test_c_locale_coercion.py
M Lib/test/test_capi.py
M Lib/test/test_cmd_line.py
M Lib/test/test_collections.py
M Lib/test/test_contextlib.py
M Lib/test/test_coroutines.py
M Lib/test/test_docxmlrpc.py
M Lib/test/test_email/test_policy.py
M Lib/test/test_exceptions.py
M Lib/test/test_faulthandler.py
M Lib/test/test_fork1.py
M Lib/test/test_frozen.py
M Lib/test/test_gdb.py
M Lib/test/test_generators.py
M Lib/test/test_gettext.py
M Lib/test/test_grammar.py
M Lib/test/test_imaplib.py
M Lib/test/test_import/__init__.py
M Lib/test/test_importlib/test_locks.py
M Lib/test/test_locale.py
M Lib/test/test_netrc.py
M Lib/test/test_os.py
M Lib/test/test_posixpath.py
M Lib/test/test_pyclbr.py
M Lib/test/test_pydoc.py
M Lib/test/test_queue.py
M Lib/test/test_resource.py
M Lib/test/test_runpy.py
M Lib/test/test_sax.py
M Lib/test/test_signal.py
M Lib/test/test_smtplib.py
M Lib/test/test_subprocess.py
M Lib/test/test_thread.py
M Lib/test/test_threaded_import.py
M Lib/test/test_threadedtempfile.py
M Lib/test/test_time.py
M Lib/test/test_tokenize.py
M Lib/test/test_traceback.py
M Lib/test/test_utf8_mode.py
M Lib/test/test_venv.py

diff --git a/Lib/test/libregrtest/main.py b/Lib/test/libregrtest/main.py
index 1dfbe47a2fab..e2274254fdb8 100644
--- a/Lib/test/libregrtest/main.py
+++ b/Lib/test/libregrtest/main.py
@@ -587,7 +587,6 @@ def create_temp_dir(self):
 
     def cleanup(self):
         import glob
-        import shutil
 
         path = os.path.join(self.tmp_dir, 'test_python_*')
         print("Cleanup %s directory" % self.tmp_dir)
diff --git a/Lib/test/support/__init__.py b/Lib/test/support/__init__.py
index 87bfa9f54627..6d10e8b576e4 100644
--- a/Lib/test/support/__init__.py
+++ b/Lib/test/support/__init__.py
@@ -5,7 +5,6 @@
 
 import collections.abc
 import contextlib
-import datetime
 import errno
 import faulthandler
 import fnmatch
@@ -13,7 +12,6 @@
 import gc
 import importlib
 import importlib.util
-import io
 import logging.handlers
 import nntplib
 import os
diff --git a/Lib/test/test_aifc.py b/Lib/test/test_aifc.py
index ff52f5b6feb8..e82cfc1a4690 100644
--- a/Lib/test/test_aifc.py
+++ b/Lib/test/test_aifc.py
@@ -7,7 +7,6 @@
 import sys
 import struct
 import aifc
-import warnings
 
 
 class AifcTest(audiotests.AudioWriteTests,
diff --git a/Lib/test/test_argparse.py b/Lib/test/test_argparse.py
index 51f0effaf2ff..0c342e2e4e0d 100644
--- a/Lib/test/test_argparse.py
+++ b/Lib/test/test_argparse.py
@@ -1,6 +1,5 @@
 # Author: Steven J. Bethard <steven.bethard at gmail.com>.
 
-import codecs
 import inspect
 import os
 import shutil
diff --git a/Lib/test/test_asynchat.py b/Lib/test/test_asynchat.py
index 1d147c741961..14c0ec43d422 100644
--- a/Lib/test/test_asynchat.py
+++ b/Lib/test/test_asynchat.py
@@ -7,7 +7,6 @@
 import errno
 import socket
 import sys
-import _thread as thread
 import threading
 import time
 import unittest
diff --git a/Lib/test/test_asyncio/test_pep492.py b/Lib/test/test_asyncio/test_pep492.py
index f2d588f54445..ac3ae6811fb5 100644
--- a/Lib/test/test_asyncio/test_pep492.py
+++ b/Lib/test/test_asyncio/test_pep492.py
@@ -4,7 +4,6 @@
 import types
 import unittest
 
-from test import support
 from unittest import mock
 
 import asyncio
diff --git a/Lib/test/test_asyncio/test_sslproto.py b/Lib/test/test_asyncio/test_sslproto.py
index 866ef81fb2ee..3b9c12f24ed3 100644
--- a/Lib/test/test_asyncio/test_sslproto.py
+++ b/Lib/test/test_asyncio/test_sslproto.py
@@ -15,7 +15,6 @@
 from asyncio import log
 from asyncio import protocols
 from asyncio import sslproto
-from asyncio import tasks
 from test.test_asyncio import utils as test_utils
 from test.test_asyncio import functional as func_tests
 
diff --git a/Lib/test/test_asyncio/test_unix_events.py b/Lib/test/test_asyncio/test_unix_events.py
index ec171fa83da3..51d474cf152c 100644
--- a/Lib/test/test_asyncio/test_unix_events.py
+++ b/Lib/test/test_asyncio/test_unix_events.py
@@ -22,7 +22,6 @@
 
 import asyncio
 from asyncio import log
-from asyncio import base_events
 from asyncio import events
 from asyncio import unix_events
 from test.test_asyncio import utils as test_utils
diff --git a/Lib/test/test_c_locale_coercion.py b/Lib/test/test_c_locale_coercion.py
index 134f07a17ec1..f2351fa5a2ea 100644
--- a/Lib/test/test_c_locale_coercion.py
+++ b/Lib/test/test_c_locale_coercion.py
@@ -2,7 +2,6 @@
 
 import locale
 import os
-import shutil
 import subprocess
 import sys
 import sysconfig
@@ -10,10 +9,8 @@
 from collections import namedtuple
 
 import test.support
-from test.support.script_helper import (
-    run_python_until_end,
-    interpreter_requires_environment,
-)
+from test.support.script_helper import run_python_until_end
+
 
 # Set the list of ways we expect to be able to ask for the "C" locale
 EXPECTED_C_LOCALE_EQUIVALENTS = ["C", "invalid.ascii"]
diff --git a/Lib/test/test_capi.py b/Lib/test/test_capi.py
index d94ee0227c87..6eb3bd967b86 100644
--- a/Lib/test/test_capi.py
+++ b/Lib/test/test_capi.py
@@ -8,7 +8,6 @@
 import re
 import subprocess
 import sys
-import sysconfig
 import textwrap
 import threading
 import time
diff --git a/Lib/test/test_cmd_line.py b/Lib/test/test_cmd_line.py
index 95cdc8db7efb..f90bfb067483 100644
--- a/Lib/test/test_cmd_line.py
+++ b/Lib/test/test_cmd_line.py
@@ -5,7 +5,6 @@
 import os
 import subprocess
 import sys
-import sysconfig
 import tempfile
 import unittest
 from test import support
diff --git a/Lib/test/test_collections.py b/Lib/test/test_collections.py
index 16735b815e53..1aca9facda69 100644
--- a/Lib/test/test_collections.py
+++ b/Lib/test/test_collections.py
@@ -3,11 +3,9 @@
 import collections
 import copy
 import doctest
-import keyword
 import operator
 import pickle
 from random import choice, randrange
-import re
 import string
 import sys
 from test import support
diff --git a/Lib/test/test_contextlib.py b/Lib/test/test_contextlib.py
index 30c2e27b3c7e..ced2290288db 100644
--- a/Lib/test/test_contextlib.py
+++ b/Lib/test/test_contextlib.py
@@ -1,6 +1,5 @@
 """Unit tests for contextlib.py, and other context managers."""
 
-import asyncio
 import io
 import sys
 import tempfile
diff --git a/Lib/test/test_coroutines.py b/Lib/test/test_coroutines.py
index ac24f3976738..f32320956bcc 100644
--- a/Lib/test/test_coroutines.py
+++ b/Lib/test/test_coroutines.py
@@ -2,7 +2,6 @@
 import copy
 import inspect
 import pickle
-import re
 import sys
 import types
 import unittest
diff --git a/Lib/test/test_docxmlrpc.py b/Lib/test/test_docxmlrpc.py
index f077f05f5b4f..116e626740df 100644
--- a/Lib/test/test_docxmlrpc.py
+++ b/Lib/test/test_docxmlrpc.py
@@ -2,7 +2,6 @@
 import http.client
 import sys
 import threading
-from test import support
 import unittest
 
 def make_request_and_skipIf(condition, reason):
diff --git a/Lib/test/test_email/test_policy.py b/Lib/test/test_email/test_policy.py
index 0aea934df434..1e39aa062c0a 100644
--- a/Lib/test/test_email/test_policy.py
+++ b/Lib/test/test_email/test_policy.py
@@ -1,5 +1,4 @@
 import io
-import sys
 import types
 import textwrap
 import unittest
diff --git a/Lib/test/test_exceptions.py b/Lib/test/test_exceptions.py
index 9d10df5f9425..0196c4d0005b 100644
--- a/Lib/test/test_exceptions.py
+++ b/Lib/test/test_exceptions.py
@@ -9,7 +9,7 @@
 import errno
 
 from test.support import (TESTFN, captured_stderr, check_impl_detail,
-                          check_warnings, cpython_only, gc_collect, run_unittest,
+                          check_warnings, cpython_only, gc_collect,
                           no_tracing, unlink, import_module, script_helper,
                           SuppressCrashReport)
 class NaiveException(Exception):
diff --git a/Lib/test/test_faulthandler.py b/Lib/test/test_faulthandler.py
index 700b7ad6b885..5283596cebe4 100644
--- a/Lib/test/test_faulthandler.py
+++ b/Lib/test/test_faulthandler.py
@@ -9,7 +9,6 @@
 from test import support
 from test.support import script_helper, is_android
 import tempfile
-import threading
 import unittest
 from textwrap import dedent
 
diff --git a/Lib/test/test_fork1.py b/Lib/test/test_fork1.py
index 9ca9724c4c91..2ab856ff5690 100644
--- a/Lib/test/test_fork1.py
+++ b/Lib/test/test_fork1.py
@@ -10,8 +10,7 @@
 import unittest
 
 from test.fork_wait import ForkWait
-from test.support import (reap_children, get_attribute,
-                          import_module, verbose)
+from test.support import reap_children, get_attribute, verbose
 
 
 # Skip test if fork does not exist.
diff --git a/Lib/test/test_frozen.py b/Lib/test/test_frozen.py
index a7c748422b1d..142f17d518e7 100644
--- a/Lib/test/test_frozen.py
+++ b/Lib/test/test_frozen.py
@@ -13,7 +13,6 @@
 import sys
 import unittest
 from test.support import captured_stdout
-from importlib import util
 
 
 class TestFrozen(unittest.TestCase):
diff --git a/Lib/test/test_gdb.py b/Lib/test/test_gdb.py
index 7758e1fcd86c..b78c0845b1df 100644
--- a/Lib/test/test_gdb.py
+++ b/Lib/test/test_gdb.py
@@ -3,7 +3,6 @@
 # The code for testing gdb was adapted from similar work in Unladen Swallow's
 # Lib/test/test_jit_gdb.py
 
-import locale
 import os
 import platform
 import re
diff --git a/Lib/test/test_generators.py b/Lib/test/test_generators.py
index 7a21cb7e954a..c45086562d36 100644
--- a/Lib/test/test_generators.py
+++ b/Lib/test/test_generators.py
@@ -3,7 +3,6 @@
 import pickle
 import sys
 import unittest
-import warnings
 import weakref
 import inspect
 
diff --git a/Lib/test/test_gettext.py b/Lib/test/test_gettext.py
index b5ed05eab7bb..fac38000e635 100644
--- a/Lib/test/test_gettext.py
+++ b/Lib/test/test_gettext.py
@@ -1,7 +1,6 @@
 import os
 import base64
 import gettext
-import locale
 import unittest
 
 from test import support
diff --git a/Lib/test/test_grammar.py b/Lib/test/test_grammar.py
index 88c22b89d444..241ac853d73c 100644
--- a/Lib/test/test_grammar.py
+++ b/Lib/test/test_grammar.py
@@ -4,7 +4,6 @@
 from test.support import check_syntax_error
 import inspect
 import unittest
-import sys
 # testing import *
 from sys import *
 
@@ -12,7 +11,6 @@
 # with import machinery
 import test.ann_module as ann_module
 import typing
-from collections import ChainMap
 from test import ann_module2
 import test
 
diff --git a/Lib/test/test_imaplib.py b/Lib/test/test_imaplib.py
index 9305e47ee993..8ab532af3f0d 100644
--- a/Lib/test/test_imaplib.py
+++ b/Lib/test/test_imaplib.py
@@ -1,7 +1,6 @@
 from test import support
 
 from contextlib import contextmanager
-import errno
 import imaplib
 import os.path
 import socketserver
diff --git a/Lib/test/test_import/__init__.py b/Lib/test/test_import/__init__.py
index 1fc4de11e178..4c4f0d9efc03 100644
--- a/Lib/test/test_import/__init__.py
+++ b/Lib/test/test_import/__init__.py
@@ -5,7 +5,6 @@
 import builtins
 import marshal
 import os
-import platform
 import py_compile
 import random
 import stat
@@ -20,9 +19,9 @@
 
 import test.support
 from test.support import (
-    EnvironmentVarGuard, TESTFN, check_warnings, forget, is_jython,
-    make_legacy_pyc, rmtree, run_unittest, swap_attr, swap_item, temp_umask,
-    unlink, unload, create_empty_file, cpython_only, TESTFN_UNENCODABLE,
+    TESTFN, forget, is_jython,
+    make_legacy_pyc, rmtree, swap_attr, swap_item, temp_umask,
+    unlink, unload, cpython_only, TESTFN_UNENCODABLE,
     temp_dir, DirsOnSysPath)
 from test.support import script_helper
 from test.test_importlib.util import uncache
diff --git a/Lib/test/test_importlib/test_locks.py b/Lib/test/test_importlib/test_locks.py
index d86172ab5837..21794d911ef6 100644
--- a/Lib/test/test_importlib/test_locks.py
+++ b/Lib/test/test_importlib/test_locks.py
@@ -4,7 +4,6 @@
 
 import sys
 import threading
-import unittest
 import weakref
 
 from test import support
diff --git a/Lib/test/test_locale.py b/Lib/test/test_locale.py
index e2c2178ae6cc..792a15c50f92 100644
--- a/Lib/test/test_locale.py
+++ b/Lib/test/test_locale.py
@@ -3,7 +3,7 @@
 import locale
 import sys
 import codecs
-import warnings
+
 
 class BaseLocalizedTest(unittest.TestCase):
     #
diff --git a/Lib/test/test_netrc.py b/Lib/test/test_netrc.py
index f59e5371acad..ae53988c45a6 100644
--- a/Lib/test/test_netrc.py
+++ b/Lib/test/test_netrc.py
@@ -1,5 +1,4 @@
 import netrc, os, unittest, sys, tempfile, textwrap
-from unittest import mock
 from test import support
 
 
diff --git a/Lib/test/test_os.py b/Lib/test/test_os.py
index 8032da053067..1ec9a6a95091 100644
--- a/Lib/test/test_os.py
+++ b/Lib/test/test_os.py
@@ -9,7 +9,6 @@
 import decimal
 import errno
 import fractions
-import getpass
 import itertools
 import locale
 import mmap
diff --git a/Lib/test/test_posixpath.py b/Lib/test/test_posixpath.py
index e73b31cb648b..6bca89003a97 100644
--- a/Lib/test/test_posixpath.py
+++ b/Lib/test/test_posixpath.py
@@ -1,7 +1,6 @@
 import os
 import posixpath
 import unittest
-import warnings
 from posixpath import realpath, abspath, dirname, basename
 from test import support, test_genericpath
 from test.support import FakePath
@@ -12,6 +11,7 @@
 except ImportError:
     posix = None
 
+
 # An absolute path to a temporary filename for testing. We can't rely on TESTFN
 # being an absolute path, so we need this.
 
diff --git a/Lib/test/test_pyclbr.py b/Lib/test/test_pyclbr.py
index eaab591f74ef..0489b41d7c7b 100644
--- a/Lib/test/test_pyclbr.py
+++ b/Lib/test/test_pyclbr.py
@@ -3,14 +3,11 @@
    Nick Mathewson
 '''
 
-import os
 import sys
 from textwrap import dedent
 from types import FunctionType, MethodType, BuiltinFunctionType
 import pyclbr
 from unittest import TestCase, main as unittest_main
-from test import support
-from functools import partial
 
 StaticMethodType = type(staticmethod(lambda: None))
 ClassMethodType = type(classmethod(lambda c: None))
diff --git a/Lib/test/test_pydoc.py b/Lib/test/test_pydoc.py
index 198cea93eb52..8e30b4c8f675 100644
--- a/Lib/test/test_pydoc.py
+++ b/Lib/test/test_pydoc.py
@@ -21,7 +21,6 @@
 import xml.etree
 import xml.etree.ElementTree
 import textwrap
-import threading
 from io import StringIO
 from collections import namedtuple
 from test.support.script_helper import assert_python_ok
diff --git a/Lib/test/test_queue.py b/Lib/test/test_queue.py
index 1a8d5f8856c5..c8528f97741d 100644
--- a/Lib/test/test_queue.py
+++ b/Lib/test/test_queue.py
@@ -1,10 +1,8 @@
 # Some simple queue module tests, plus some failure conditions
 # to ensure the Queue locks remain stable.
-import collections
 import itertools
 import queue
 import random
-import sys
 import threading
 import time
 import unittest
diff --git a/Lib/test/test_resource.py b/Lib/test/test_resource.py
index b07eb73b2aeb..62c7963fe699 100644
--- a/Lib/test/test_resource.py
+++ b/Lib/test/test_resource.py
@@ -1,6 +1,5 @@
 import contextlib
 import sys
-import os
 import unittest
 from test import support
 import time
diff --git a/Lib/test/test_runpy.py b/Lib/test/test_runpy.py
index 02b4d62567e5..0da6f3a60430 100644
--- a/Lib/test/test_runpy.py
+++ b/Lib/test/test_runpy.py
@@ -11,8 +11,7 @@
 from test.support import (
     forget, make_legacy_pyc, unload, verbose, no_tracing,
     create_empty_file, temp_dir)
-from test.support.script_helper import (
-    make_pkg, make_script, make_zip_pkg, make_zip_script)
+from test.support.script_helper import make_script, make_zip_script
 
 
 import runpy
diff --git a/Lib/test/test_sax.py b/Lib/test/test_sax.py
index 3044960a0ed1..251a03a54ddc 100644
--- a/Lib/test/test_sax.py
+++ b/Lib/test/test_sax.py
@@ -17,7 +17,6 @@
 from xml.sax.xmlreader import InputSource, AttributesImpl, AttributesNSImpl
 from io import BytesIO, StringIO
 import codecs
-import gc
 import os.path
 import shutil
 from urllib.error import URLError
diff --git a/Lib/test/test_signal.py b/Lib/test/test_signal.py
index 406684bdbec7..c3f5b148448c 100644
--- a/Lib/test/test_signal.py
+++ b/Lib/test/test_signal.py
@@ -5,7 +5,6 @@
 import statistics
 import subprocess
 import sys
-import threading
 import time
 import unittest
 from test import support
diff --git a/Lib/test/test_smtplib.py b/Lib/test/test_smtplib.py
index b4149d3ef007..4add8fcabfd1 100644
--- a/Lib/test/test_smtplib.py
+++ b/Lib/test/test_smtplib.py
@@ -19,7 +19,7 @@
 
 import unittest
 from test import support, mock_socket
-from test.support import HOST, HOSTv4, HOSTv6
+from test.support import HOST
 from unittest.mock import Mock
 
 
diff --git a/Lib/test/test_subprocess.py b/Lib/test/test_subprocess.py
index 8419061b2a90..36cf22a9f898 100644
--- a/Lib/test/test_subprocess.py
+++ b/Lib/test/test_subprocess.py
@@ -3,7 +3,6 @@
 from test import support
 import subprocess
 import sys
-import platform
 import signal
 import io
 import itertools
@@ -20,18 +19,12 @@
 import textwrap
 from test.support import FakePath
 
-try:
-    import ctypes
-except ImportError:
-    ctypes = None
-else:
-    import ctypes.util
-
 try:
     import _testcapi
 except ImportError:
     _testcapi = None
 
+
 if support.PGO:
     raise unittest.SkipTest("test is not helpful for PGO")
 
diff --git a/Lib/test/test_thread.py b/Lib/test/test_thread.py
index 64ffe4605298..f4eb830cf6d7 100644
--- a/Lib/test/test_thread.py
+++ b/Lib/test/test_thread.py
@@ -4,7 +4,6 @@
 from test import support
 import _thread as thread
 import time
-import sys
 import weakref
 
 from test import lock_tests
diff --git a/Lib/test/test_threaded_import.py b/Lib/test/test_threaded_import.py
index 035344be4b89..8607f363db21 100644
--- a/Lib/test/test_threaded_import.py
+++ b/Lib/test/test_threaded_import.py
@@ -15,7 +15,7 @@
 import unittest
 from unittest import mock
 from test.support import (
-    verbose, import_module, run_unittest, TESTFN, reap_threads,
+    verbose, run_unittest, TESTFN, reap_threads,
     forget, unlink, rmtree, start_threads)
 
 def task(N, done, done_tasks, errors):
diff --git a/Lib/test/test_threadedtempfile.py b/Lib/test/test_threadedtempfile.py
index f3d4ba36377d..e1d7a10179cc 100644
--- a/Lib/test/test_threadedtempfile.py
+++ b/Lib/test/test_threadedtempfile.py
@@ -13,19 +13,22 @@
 provoking a 2.0 failure under Linux.
 """
 
-NUM_THREADS = 20
-FILES_PER_THREAD = 50
-
 import tempfile
 
-from test.support import start_threads, import_module
+from test.support import start_threads
 import unittest
 import io
 import threading
 from traceback import print_exc
 
+
+NUM_THREADS = 20
+FILES_PER_THREAD = 50
+
+
 startEvent = threading.Event()
 
+
 class TempFileGreedy(threading.Thread):
     error_count = 0
     ok_count = 0
diff --git a/Lib/test/test_time.py b/Lib/test/test_time.py
index 4e31abf4ec8e..35952799ba6d 100644
--- a/Lib/test/test_time.py
+++ b/Lib/test/test_time.py
@@ -9,7 +9,6 @@
 import time
 import threading
 import unittest
-import warnings
 try:
     import _testcapi
 except ImportError:
diff --git a/Lib/test/test_tokenize.py b/Lib/test/test_tokenize.py
index d596f7db61ab..7457a7ed0434 100644
--- a/Lib/test/test_tokenize.py
+++ b/Lib/test/test_tokenize.py
@@ -1,7 +1,7 @@
 from test import support
 from tokenize import (tokenize, _tokenize, untokenize, NUMBER, NAME, OP,
                      STRING, ENDMARKER, ENCODING, tok_name, detect_encoding,
-                     open as tokenize_open, Untokenizer, generate_tokens,
+                     open as tokenize_open, Untokenizer,
                      NEWLINE)
 from io import BytesIO
 import unittest
diff --git a/Lib/test/test_traceback.py b/Lib/test/test_traceback.py
index 8a3aa8a8648f..8749d095ddee 100644
--- a/Lib/test/test_traceback.py
+++ b/Lib/test/test_traceback.py
@@ -110,7 +110,7 @@ def test_encoded_file(self):
         # Test that tracebacks are correctly printed for encoded source files:
         # - correct line number (Issue2384)
         # - respect file encoding (Issue3975)
-        import tempfile, sys, subprocess, os
+        import sys, subprocess
 
         # The spawned subprocess has its stdout redirected to a PIPE, and its
         # encoding may be different from the current interpreter, on Windows
diff --git a/Lib/test/test_utf8_mode.py b/Lib/test/test_utf8_mode.py
index 06fe1979ddcc..a7d1dc940ad6 100644
--- a/Lib/test/test_utf8_mode.py
+++ b/Lib/test/test_utf8_mode.py
@@ -3,7 +3,6 @@
 """
 
 import locale
-import os
 import sys
 import textwrap
 import unittest
diff --git a/Lib/test/test_venv.py b/Lib/test/test_venv.py
index 67f9f46e65e0..3821d9accfdf 100644
--- a/Lib/test/test_venv.py
+++ b/Lib/test/test_venv.py
@@ -15,7 +15,6 @@
 import tempfile
 from test.support import (captured_stdout, captured_stderr, requires_zlib,
                           can_symlink, EnvironmentVarGuard, rmtree)
-import threading
 import unittest
 import venv
 


From webhook-mailer at python.org  Mon Jul  1 14:28:59 2019
From: webhook-mailer at python.org (Miss Islington (bot))
Date: Mon, 01 Jul 2019 18:28:59 -0000
Subject: [Python-checkins] bpo-36763: Use PyConfig_Clear() (GH-14445)
Message-ID: <mailman.188.1562005740.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/4c227e6a56a9704fe5b4e4509071796f3359f4bb
commit: 4c227e6a56a9704fe5b4e4509071796f3359f4bb
branch: 3.8
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: GitHub <noreply at github.com>
date: 2019-07-01T11:28:55-07:00
summary:

bpo-36763: Use PyConfig_Clear() (GH-14445)


Stop using "static PyConfig", PyConfig must now always use
dynamically allocated strings: use PyConfig_SetString(),
PyConfig_SetArgv() and PyConfig_Clear().
(cherry picked from commit 67310023f299b5a2fad71fca449b46d280036690)

Co-authored-by: Victor Stinner <vstinner at redhat.com>

files:
M Lib/test/test_embed.py
M Modules/main.c
M Programs/_freeze_importlib.c
M Programs/_testembed.c

diff --git a/Lib/test/test_embed.py b/Lib/test/test_embed.py
index ed1100cfabc5..e31d66d78c85 100644
--- a/Lib/test/test_embed.py
+++ b/Lib/test/test_embed.py
@@ -695,10 +695,19 @@ def test_init_from_config(self):
 
             'pycache_prefix': 'conf_pycache_prefix',
             'program_name': './conf_program_name',
-            'argv': ['-c', 'arg2'],
+            'argv': ['-c', 'arg2', ],
             'parse_argv': 1,
-            'xoptions': ['xoption1=3', 'xoption2=', 'xoption3'],
-            'warnoptions': ['error::ResourceWarning', 'default::BytesWarning'],
+            'xoptions': [
+                'config_xoption1=3',
+                'config_xoption2=',
+                'config_xoption3',
+                'cmdline_xoption',
+            ],
+            'warnoptions': [
+                'config_warnoption',
+                'cmdline_warnoption',
+                'default::BytesWarning',
+            ],
             'run_command': 'pass\n',
 
             'site_import': 0,
diff --git a/Modules/main.c b/Modules/main.c
index 853afedd7b90..b126f4554d41 100644
--- a/Modules/main.c
+++ b/Modules/main.c
@@ -62,7 +62,7 @@ pymain_init(const _PyArgv *args)
     PyConfig config;
     status = PyConfig_InitPythonConfig(&config);
     if (_PyStatus_EXCEPTION(status)) {
-        return status;
+        goto done;
     }
 
     /* pass NULL as the config: config is read from command line arguments,
@@ -74,14 +74,18 @@ pymain_init(const _PyArgv *args)
         status = PyConfig_SetArgv(&config, args->argc, args->wchar_argv);
     }
     if (_PyStatus_EXCEPTION(status)) {
-        return status;
+        goto done;
     }
 
     status = Py_InitializeFromConfig(&config);
     if (_PyStatus_EXCEPTION(status)) {
-        return status;
+        goto done;
     }
-    return _PyStatus_OK();
+    status = _PyStatus_OK();
+
+done:
+    PyConfig_Clear(&config);
+    return status;
 }
 
 
diff --git a/Programs/_freeze_importlib.c b/Programs/_freeze_importlib.c
index 13375b0a3819..74735f279c58 100644
--- a/Programs/_freeze_importlib.c
+++ b/Programs/_freeze_importlib.c
@@ -88,7 +88,7 @@ main(int argc, char *argv[])
     config.site_import = 0;
 
     status = PyConfig_SetString(&config, &config.program_name,
-                                  L"./_freeze_importlib");
+                                L"./_freeze_importlib");
     if (PyStatus_Exception(status)) {
         PyConfig_Clear(&config);
         Py_ExitStatusException(status);
diff --git a/Programs/_testembed.c b/Programs/_testembed.c
index 9633f4610b54..856144b85e17 100644
--- a/Programs/_testembed.c
+++ b/Programs/_testembed.c
@@ -329,6 +329,56 @@ static int test_init_initialize_config(void)
 }
 
 
+static void config_set_string(PyConfig *config, wchar_t **config_str, const wchar_t *str)
+{
+    PyStatus status = PyConfig_SetString(config, config_str, str);
+    if (PyStatus_Exception(status)) {
+        PyConfig_Clear(config);
+        Py_ExitStatusException(status);
+    }
+}
+
+
+static void config_set_argv(PyConfig *config, Py_ssize_t argc, wchar_t * const *argv)
+{
+    PyStatus status = PyConfig_SetArgv(config, argc, argv);
+    if (PyStatus_Exception(status)) {
+        PyConfig_Clear(config);
+        Py_ExitStatusException(status);
+    }
+}
+
+
+static void
+config_set_wide_string_list(PyConfig *config, PyWideStringList *list,
+                            Py_ssize_t length, wchar_t **items)
+{
+    PyStatus status = PyConfig_SetWideStringList(config, list, length, items);
+    if (PyStatus_Exception(status)) {
+        PyConfig_Clear(config);
+        Py_ExitStatusException(status);
+    }
+}
+
+
+static void config_set_program_name(PyConfig *config)
+{
+    /* Use path starting with "./" avoids a search along the PATH */
+    const wchar_t *program_name = L"./_testembed";
+    config_set_string(config, &config->program_name, program_name);
+}
+
+
+static void init_from_config_clear(PyConfig *config)
+{
+    PyStatus status = Py_InitializeFromConfig(config);
+    PyConfig_Clear(config);
+    if (PyStatus_Exception(status)) {
+        Py_ExitStatusException(status);
+    }
+}
+
+
 static int check_init_compat_config(int preinit)
 {
     PyStatus status;
@@ -345,12 +395,8 @@ static int check_init_compat_config(int preinit)
 
     PyConfig config;
     _PyConfig_InitCompatConfig(&config);
-    config.program_name = L"./_testembed";
-
-    status = Py_InitializeFromConfig(&config);
-    if (PyStatus_Exception(status)) {
-        Py_ExitStatusException(status);
-    }
+    config_set_program_name(&config);
+    init_from_config_clear(&config);
 
     dump_config();
     Py_Finalize();
@@ -438,7 +484,6 @@ static int test_init_from_config(void)
         Py_ExitStatusException(status);
     }
 
-    /* Test Py_InitializeFromConfig() */
     PyConfig config;
     _PyConfig_InitCompatConfig(&config);
     config.install_signal_handlers = 0;
@@ -468,34 +513,37 @@ static int test_init_from_config(void)
     config.malloc_stats = 1;
 
     putenv("PYTHONPYCACHEPREFIX=env_pycache_prefix");
-    config.pycache_prefix = L"conf_pycache_prefix";
+    config_set_string(&config, &config.pycache_prefix, L"conf_pycache_prefix");
 
     Py_SetProgramName(L"./globalvar");
-    config.program_name = L"./conf_program_name";
+    config_set_string(&config, &config.program_name, L"./conf_program_name");
 
-    static wchar_t* argv[] = {
+    wchar_t* argv[] = {
         L"python3",
+        L"-W",
+        L"cmdline_warnoption",
+        L"-X",
+        L"cmdline_xoption",
         L"-c",
         L"pass",
         L"arg2",
     };
-    config.argv.length = Py_ARRAY_LENGTH(argv);
-    config.argv.items = argv;
+    config_set_argv(&config, Py_ARRAY_LENGTH(argv), argv);
     config.parse_argv = 1;
 
-    static wchar_t* xoptions[3] = {
-        L"xoption1=3",
-        L"xoption2=",
-        L"xoption3",
+    wchar_t* xoptions[3] = {
+        L"config_xoption1=3",
+        L"config_xoption2=",
+        L"config_xoption3",
     };
-    config.xoptions.length = Py_ARRAY_LENGTH(xoptions);
-    config.xoptions.items = xoptions;
+    config_set_wide_string_list(&config, &config.xoptions,
+                                Py_ARRAY_LENGTH(xoptions), xoptions);
 
-    static wchar_t* warnoptions[1] = {
-        L"error::ResourceWarning",
+    wchar_t* warnoptions[1] = {
+        L"config_warnoption",
     };
-    config.warnoptions.length = Py_ARRAY_LENGTH(warnoptions);
-    config.warnoptions.items = warnoptions;
+    config_set_wide_string_list(&config, &config.warnoptions,
+                                Py_ARRAY_LENGTH(warnoptions), warnoptions);
 
     /* FIXME: test pythonpath_env */
     /* FIXME: test home */
@@ -544,22 +592,20 @@ static int test_init_from_config(void)
        Force it to 0 through the config. */
     config.legacy_windows_stdio = 0;
 #endif
-    config.stdio_encoding = L"iso8859-1";
-    config.stdio_errors = L"replace";
+    config_set_string(&config, &config.stdio_encoding, L"iso8859-1");
+    config_set_string(&config, &config.stdio_errors, L"replace");
 
     putenv("PYTHONNOUSERSITE=");
     Py_NoUserSiteDirectory = 0;
     config.user_site_directory = 0;
 
-    config.check_hash_pycs_mode = L"always";
+    config_set_string(&config, &config.check_hash_pycs_mode, L"always");
 
     Py_FrozenFlag = 0;
     config.pathconfig_warnings = 0;
 
-    status = Py_InitializeFromConfig(&config);
-    if (PyStatus_Exception(status)) {
-        Py_ExitStatusException(status);
-    }
+    init_from_config_clear(&config);
+
     dump_config();
     Py_Finalize();
     return 0;
@@ -576,7 +622,9 @@ static int check_init_parse_argv(int parse_argv)
         Py_ExitStatusException(status);
     }
 
-    static wchar_t* argv[] = {
+    config.parse_argv = parse_argv;
+
+    wchar_t* argv[] = {
         L"./argv0",
         L"-E",
         L"-c",
@@ -585,15 +633,9 @@ static int check_init_parse_argv(int parse_argv)
         L"-v",
         L"arg3",
     };
+    config_set_argv(&config, Py_ARRAY_LENGTH(argv), argv);
+    init_from_config_clear(&config);
 
-    config.argv.length = Py_ARRAY_LENGTH(argv);
-    config.argv.items = argv;
-    config.parse_argv = parse_argv;
-
-    status = Py_InitializeFromConfig(&config);
-    if (PyStatus_Exception(status)) {
-        Py_ExitStatusException(status);
-    }
     dump_config();
     Py_Finalize();
     return 0;
@@ -664,12 +706,10 @@ static int test_init_python_env(void)
     if (PyStatus_Exception(status)) {
         Py_ExitStatusException(status);
     }
-    config.program_name = L"./_testembed";
 
-    status = Py_InitializeFromConfig(&config);
-    if (PyStatus_Exception(status)) {
-        Py_ExitStatusException(status);
-    }
+    config_set_program_name(&config);
+    init_from_config_clear(&config);
+
     dump_config();
     Py_Finalize();
     return 0;
@@ -723,14 +763,10 @@ static int test_init_isolated_flag(void)
     Py_IsolatedFlag = 0;
     config.isolated = 1;
 
-    /* Use path starting with "./" avoids a search along the PATH */
-    config.program_name = L"./_testembed";
-
+    config_set_program_name(&config);
     set_all_env_vars();
-    status = Py_InitializeFromConfig(&config);
-    if (PyStatus_Exception(status)) {
-        Py_ExitStatusException(status);
-    }
+    init_from_config_clear(&config);
+
     dump_config();
     Py_Finalize();
     return 0;
@@ -753,13 +789,10 @@ static int test_preinit_isolated1(void)
 
     PyConfig config;
     _PyConfig_InitCompatConfig(&config);
-    config.program_name = L"./_testembed";
-
+    config_set_program_name(&config);
     set_all_env_vars();
-    status = Py_InitializeFromConfig(&config);
-    if (PyStatus_Exception(status)) {
-        Py_ExitStatusException(status);
-    }
+    init_from_config_clear(&config);
+
     dump_config();
     Py_Finalize();
     return 0;
@@ -787,14 +820,10 @@ static int test_preinit_isolated2(void)
     Py_IsolatedFlag = 0;
     config.isolated = 1;
 
-    /* Use path starting with "./" avoids a search along the PATH */
-    config.program_name = L"./_testembed";
-
+    config_set_program_name(&config);
     set_all_env_vars();
-    status = Py_InitializeFromConfig(&config);
-    if (PyStatus_Exception(status)) {
-        Py_ExitStatusException(status);
-    }
+    init_from_config_clear(&config);
+
     dump_config();
     Py_Finalize();
     return 0;
@@ -819,44 +848,28 @@ static int test_preinit_dont_parse_argv(void)
                        L"script.py"};
     status = Py_PreInitializeFromArgs(&preconfig, Py_ARRAY_LENGTH(argv), argv);
     if (PyStatus_Exception(status)) {
-        goto failed;
+        Py_ExitStatusException(status);
     }
 
     PyConfig config;
 
     status = PyConfig_InitIsolatedConfig(&config);
     if (PyStatus_Exception(status)) {
-        goto failed;
+        PyConfig_Clear(&config);
+        Py_ExitStatusException(status);
     }
 
     config.isolated = 0;
 
     /* Pre-initialize implicitly using argv: make sure that -X dev
        is used to configure the allocation in preinitialization */
-    status = PyConfig_SetArgv(&config, Py_ARRAY_LENGTH(argv), argv);
-    if (PyStatus_Exception(status)) {
-        goto failed;
-    }
-
-    status = PyConfig_SetString(&config, &config.program_name,
-                                  L"./_testembed");
-    if (PyStatus_Exception(status)) {
-        goto failed;
-    }
-
-    status = Py_InitializeFromConfig(&config);
-    if (PyStatus_Exception(status)) {
-        goto failed;
-    }
-    PyConfig_Clear(&config);
+    config_set_argv(&config, Py_ARRAY_LENGTH(argv), argv);
+    config_set_program_name(&config);
+    init_from_config_clear(&config);
 
     dump_config();
     Py_Finalize();
     return 0;
-
-failed:
-    PyConfig_Clear(&config);
-    Py_ExitStatusException(status);
 }
 
 
@@ -867,36 +880,20 @@ static int test_preinit_parse_argv(void)
 
     status = PyConfig_InitPythonConfig(&config);
     if (PyStatus_Exception(status)) {
-        goto failed;
+        PyConfig_Clear(&config);
+        Py_ExitStatusException(status);
     }
 
     /* Pre-initialize implicitly using argv: make sure that -X dev
        is used to configure the allocation in preinitialization */
     wchar_t *argv[] = {L"python3", L"-X", L"dev", L"script.py"};
-    status = PyConfig_SetArgv(&config, Py_ARRAY_LENGTH(argv), argv);
-    if (PyStatus_Exception(status)) {
-        goto failed;
-    }
-
-    status = PyConfig_SetString(&config, &config.program_name,
-                                  L"./_testembed");
-    if (PyStatus_Exception(status)) {
-        goto failed;
-    }
-
-    status = Py_InitializeFromConfig(&config);
-    if (PyStatus_Exception(status)) {
-        goto failed;
-    }
-    PyConfig_Clear(&config);
+    config_set_argv(&config, Py_ARRAY_LENGTH(argv), argv);
+    config_set_program_name(&config);
+    init_from_config_clear(&config);
 
     dump_config();
     Py_Finalize();
     return 0;
-
-failed:
-    PyConfig_Clear(&config);
-    Py_ExitStatusException(status);
 }
 
 
@@ -955,13 +952,8 @@ static int check_preinit_isolated_config(int preinit)
         PyConfig_Clear(&config);
         Py_ExitStatusException(status);
     }
-    config.program_name = L"./_testembed";
-
-    status = Py_InitializeFromConfig(&config);
-    if (PyStatus_Exception(status)) {
-        PyConfig_Clear(&config);
-        Py_ExitStatusException(status);
-    }
+    config_set_program_name(&config);
+    init_from_config_clear(&config);
 
     rt_preconfig = &_PyRuntime.preconfig;
     assert(rt_preconfig->isolated == 1);
@@ -1017,12 +1009,9 @@ static int check_init_python_config(int preinit)
     if (PyStatus_Exception(status)) {
         Py_ExitStatusException(status);
     }
-    config.program_name = L"./_testembed";
+    config_set_program_name(&config);
+    init_from_config_clear(&config);
 
-    status = Py_InitializeFromConfig(&config);
-    if (PyStatus_Exception(status)) {
-        Py_ExitStatusException(status);
-    }
     dump_config();
     Py_Finalize();
     return 0;
@@ -1061,11 +1050,8 @@ static int test_init_dont_configure_locale(void)
     if (PyStatus_Exception(status)) {
         Py_ExitStatusException(status);
     }
-    config.program_name = L"./_testembed";
-    status = Py_InitializeFromConfig(&config);
-    if (PyStatus_Exception(status)) {
-        Py_ExitStatusException(status);
-    }
+    config_set_program_name(&config);
+    init_from_config_clear(&config);
 
     dump_config();
     Py_Finalize();
@@ -1084,11 +1070,9 @@ static int test_init_dev_mode(void)
     putenv("PYTHONFAULTHANDLER=");
     putenv("PYTHONMALLOC=");
     config.dev_mode = 1;
-    config.program_name = L"./_testembed";
-    status = Py_InitializeFromConfig(&config);
-    if (PyStatus_Exception(status)) {
-        Py_ExitStatusException(status);
-    }
+    config_set_program_name(&config);
+    init_from_config_clear(&config);
+
     dump_config();
     Py_Finalize();
     return 0;
@@ -1278,16 +1262,9 @@ static int test_init_read_set(void)
     }
 
     /* override executable computed by PyConfig_Read() */
-    status = PyConfig_SetString(&config, &config.executable, L"my_executable");
-    if (PyStatus_Exception(status)) {
-        goto fail;
-    }
+    config_set_string(&config, &config.executable, L"my_executable");
+    init_from_config_clear(&config);
 
-    status = Py_InitializeFromConfig(&config);
-    PyConfig_Clear(&config);
-    if (PyStatus_Exception(status)) {
-        goto fail;
-    }
     dump_config();
     Py_Finalize();
     return 0;
@@ -1297,19 +1274,18 @@ static int test_init_read_set(void)
 }
 
 
-wchar_t *init_main_argv[] = {
-    L"python3", L"-c",
-    (L"import _testinternalcapi, json; "
-     L"print(json.dumps(_testinternalcapi.get_configs()))"),
-    L"arg2"};
-
-
 static void configure_init_main(PyConfig *config)
 {
-    config->argv.length = Py_ARRAY_LENGTH(init_main_argv);
-    config->argv.items = init_main_argv;
+    wchar_t* argv[] = {
+        L"python3", L"-c",
+        (L"import _testinternalcapi, json; "
+         L"print(json.dumps(_testinternalcapi.get_configs()))"),
+        L"arg2"};
+
     config->parse_argv = 1;
-    config->program_name = L"./python3";
+
+    config_set_argv(config, Py_ARRAY_LENGTH(argv), argv);
+    config_set_string(config, &config->program_name, L"./python3");
 }
 
 
@@ -1322,11 +1298,7 @@ static int test_init_run_main(void)
         Py_ExitStatusException(status);
     }
     configure_init_main(&config);
-
-    status = Py_InitializeFromConfig(&config);
-    if (PyStatus_Exception(status)) {
-        Py_ExitStatusException(status);
-    }
+    init_from_config_clear(&config);
 
     return Py_RunMain();
 }
@@ -1343,11 +1315,7 @@ static int test_init_main(void)
     }
     configure_init_main(&config);
     config._init_main = 0;
-
-    status = Py_InitializeFromConfig(&config);
-    if (PyStatus_Exception(status)) {
-        Py_ExitStatusException(status);
-    }
+    init_from_config_clear(&config);
 
     /* sys.stdout don't exist yet: it is created by _Py_InitializeMain() */
     int res = PyRun_SimpleString(
@@ -1374,35 +1342,19 @@ static int test_run_main(void)
 
     status = PyConfig_InitPythonConfig(&config);
     if (PyStatus_Exception(status)) {
-        goto failed;
+        PyConfig_Clear(&config);
+        Py_ExitStatusException(status);
     }
 
     wchar_t *argv[] = {L"python3", L"-c",
                        (L"import sys; "
                         L"print(f'Py_RunMain(): sys.argv={sys.argv}')"),
                        L"arg2"};
-    status = PyConfig_SetArgv(&config, Py_ARRAY_LENGTH(argv), argv);
-    if (PyStatus_Exception(status)) {
-        goto failed;
-    }
-
-    status = PyConfig_SetString(&config, &config.program_name,
-                                  L"./python3");
-    if (PyStatus_Exception(status)) {
-        goto failed;
-    }
-
-    status = Py_InitializeFromConfig(&config);
-    if (PyStatus_Exception(status)) {
-        goto failed;
-    }
-    PyConfig_Clear(&config);
+    config_set_argv(&config, Py_ARRAY_LENGTH(argv), argv);
+    config_set_string(&config, &config.program_name, L"./python3");
+    init_from_config_clear(&config);
 
     return Py_RunMain();
-
-failed:
-    PyConfig_Clear(&config);
-    Py_ExitStatusException(status);
 }
 
 


From webhook-mailer at python.org  Mon Jul  1 14:53:02 2019
From: webhook-mailer at python.org (Vinay Sajip)
Date: Mon, 01 Jul 2019 18:53:02 -0000
Subject: [Python-checkins] bpo-37469: Document usability of SimpleQueue with
 QueueHandler and QueueListener. (GH-14521) (GH-14526)
Message-ID: <mailman.189.1562007183.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/b0ab95bbe792b38e952688f8fa1657a78b35410e
commit: b0ab95bbe792b38e952688f8fa1657a78b35410e
branch: 3.7
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: Vinay Sajip <vinay_sajip at yahoo.co.uk>
date: 2019-07-01T19:52:57+01:00
summary:

bpo-37469: Document usability of SimpleQueue with QueueHandler and QueueListener. (GH-14521) (GH-14526)

(cherry picked from commit e6b64b756f940147728ea7808fb686ffcae89176)

files:
M Doc/library/logging.handlers.rst

diff --git a/Doc/library/logging.handlers.rst b/Doc/library/logging.handlers.rst
index b2ebafa83b2e..d5944ec87d2d 100644
--- a/Doc/library/logging.handlers.rst
+++ b/Doc/library/logging.handlers.rst
@@ -971,9 +971,11 @@ possible, while any potentially slow operations (such as sending an email via
 .. class:: QueueHandler(queue)
 
    Returns a new instance of the :class:`QueueHandler` class. The instance is
-   initialized with the queue to send messages to. The queue can be any
-   queue-like object; it's used as-is by the :meth:`enqueue` method, which needs
-   to know how to send messages to it.
+   initialized with the queue to send messages to. The *queue* can be any
+   queue-like object; it's used as-is by the :meth:`enqueue` method, which
+   needs to know how to send messages to it. The queue is not *required* to
+   have the task tracking API, which means that you can use
+   :class:`~queue.SimpleQueue` instances for *queue*.
 
 
    .. method:: emit(record)
@@ -1029,11 +1031,14 @@ possible, while any potentially slow operations (such as sending an email via
    initialized with the queue to send messages to and a list of handlers which
    will handle entries placed on the queue. The queue can be any queue-like
    object; it's passed as-is to the :meth:`dequeue` method, which needs
-   to know how to get messages from it. 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 versions - to always pass each message to each
-   handler.
+   to know how to get messages from it. The queue is not *required* to have the
+   task tracking API (though it's used if available), which means that you can
+   use :class:`~queue.SimpleQueue` instances for *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
+   versions - to always pass each message to each handler.
 
    .. versionchanged:: 3.5
       The ``respect_handler_levels`` argument was added.


From webhook-mailer at python.org  Mon Jul  1 14:53:32 2019
From: webhook-mailer at python.org (Vinay Sajip)
Date: Mon, 01 Jul 2019 18:53:32 -0000
Subject: [Python-checkins] bpo-37469: Document usability of SimpleQueue with
 QueueHandler and QueueListener. (GH-14521) (GH-14525)
Message-ID: <mailman.190.1562007212.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/6cde61369e8174c493ca240cb52ebc9c2a2fe667
commit: 6cde61369e8174c493ca240cb52ebc9c2a2fe667
branch: 3.8
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: Vinay Sajip <vinay_sajip at yahoo.co.uk>
date: 2019-07-01T19:53:28+01:00
summary:

bpo-37469: Document usability of SimpleQueue with QueueHandler and QueueListener. (GH-14521) (GH-14525)

(cherry picked from commit e6b64b756f940147728ea7808fb686ffcae89176)

files:
M Doc/library/logging.handlers.rst

diff --git a/Doc/library/logging.handlers.rst b/Doc/library/logging.handlers.rst
index b2ebafa83b2e..d5944ec87d2d 100644
--- a/Doc/library/logging.handlers.rst
+++ b/Doc/library/logging.handlers.rst
@@ -971,9 +971,11 @@ possible, while any potentially slow operations (such as sending an email via
 .. class:: QueueHandler(queue)
 
    Returns a new instance of the :class:`QueueHandler` class. The instance is
-   initialized with the queue to send messages to. The queue can be any
-   queue-like object; it's used as-is by the :meth:`enqueue` method, which needs
-   to know how to send messages to it.
+   initialized with the queue to send messages to. The *queue* can be any
+   queue-like object; it's used as-is by the :meth:`enqueue` method, which
+   needs to know how to send messages to it. The queue is not *required* to
+   have the task tracking API, which means that you can use
+   :class:`~queue.SimpleQueue` instances for *queue*.
 
 
    .. method:: emit(record)
@@ -1029,11 +1031,14 @@ possible, while any potentially slow operations (such as sending an email via
    initialized with the queue to send messages to and a list of handlers which
    will handle entries placed on the queue. The queue can be any queue-like
    object; it's passed as-is to the :meth:`dequeue` method, which needs
-   to know how to get messages from it. 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 versions - to always pass each message to each
-   handler.
+   to know how to get messages from it. The queue is not *required* to have the
+   task tracking API (though it's used if available), which means that you can
+   use :class:`~queue.SimpleQueue` instances for *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
+   versions - to always pass each message to each handler.
 
    .. versionchanged:: 3.5
       The ``respect_handler_levels`` argument was added.


From webhook-mailer at python.org  Mon Jul  1 15:45:09 2019
From: webhook-mailer at python.org (Vinay Sajip)
Date: Mon, 01 Jul 2019 19:45:09 -0000
Subject: [Python-checkins] bpo-37470: Document more clearly the error
 handling for QueueHandler.emit(). (GH-14532)
Message-ID: <mailman.191.1562010310.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/0f4e8132820947d93eccf31b9e526b81c6ffa53d
commit: 0f4e8132820947d93eccf31b9e526b81c6ffa53d
branch: master
author: Vinay Sajip <vinay_sajip at yahoo.co.uk>
committer: GitHub <noreply at github.com>
date: 2019-07-01T20:45:01+01:00
summary:

bpo-37470: Document more clearly the error handling for QueueHandler.emit(). (GH-14532)

files:
M Doc/library/logging.handlers.rst

diff --git a/Doc/library/logging.handlers.rst b/Doc/library/logging.handlers.rst
index 592d7e5daf93..b7445a135b74 100644
--- a/Doc/library/logging.handlers.rst
+++ b/Doc/library/logging.handlers.rst
@@ -1001,7 +1001,12 @@ possible, while any potentially slow operations (such as sending an email via
 
    .. method:: emit(record)
 
-      Enqueues the result of preparing the LogRecord.
+      Enqueues the result of preparing the LogRecord. Should an exception
+      occur (e.g. because a bounded queue has filled up), the
+      :meth:`~logging.Handler.handleError` method is called to handle the
+      error. This can result in the record silently being dropped (if
+      :attr:`logging.raiseExceptions` is ``False``) or a message printed to
+      ``sys.stderr`` (if :attr:`logging.raiseExceptions` is ``True``).
 
    .. method:: prepare(record)
 


From webhook-mailer at python.org  Mon Jul  1 15:51:25 2019
From: webhook-mailer at python.org (Vinay Sajip)
Date: Mon, 01 Jul 2019 19:51:25 -0000
Subject: [Python-checkins] bpo-37470: Document more clearly the error
 handling for QueueHandler.emit(). (GH-14532) (GH-14534)
Message-ID: <mailman.192.1562010685.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/844a9d64a4f640d1b20dc6ea54ab375680332d93
commit: 844a9d64a4f640d1b20dc6ea54ab375680332d93
branch: 3.7
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: Vinay Sajip <vinay_sajip at yahoo.co.uk>
date: 2019-07-01T20:51:20+01:00
summary:

bpo-37470: Document more clearly the error handling for QueueHandler.emit(). (GH-14532) (GH-14534)

(cherry picked from commit 0f4e8132820947d93eccf31b9e526b81c6ffa53d)

files:
M Doc/library/logging.handlers.rst

diff --git a/Doc/library/logging.handlers.rst b/Doc/library/logging.handlers.rst
index d5944ec87d2d..32919c1a2e29 100644
--- a/Doc/library/logging.handlers.rst
+++ b/Doc/library/logging.handlers.rst
@@ -980,7 +980,12 @@ possible, while any potentially slow operations (such as sending an email via
 
    .. method:: emit(record)
 
-      Enqueues the result of preparing the LogRecord.
+      Enqueues the result of preparing the LogRecord. Should an exception
+      occur (e.g. because a bounded queue has filled up), the
+      :meth:`~logging.Handler.handleError` method is called to handle the
+      error. This can result in the record silently being dropped (if
+      :attr:`logging.raiseExceptions` is ``False``) or a message printed to
+      ``sys.stderr`` (if :attr:`logging.raiseExceptions` is ``True``).
 
    .. method:: prepare(record)
 


From webhook-mailer at python.org  Mon Jul  1 15:53:43 2019
From: webhook-mailer at python.org (Vinay Sajip)
Date: Mon, 01 Jul 2019 19:53:43 -0000
Subject: [Python-checkins] bpo-37470: Document more clearly the error
 handling for QueueHandler.emit(). (GH-14532) (GH-14533)
Message-ID: <mailman.193.1562010824.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/91f9f098fcdb023dbb89d06c8833e89a11cbae4c
commit: 91f9f098fcdb023dbb89d06c8833e89a11cbae4c
branch: 3.8
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: Vinay Sajip <vinay_sajip at yahoo.co.uk>
date: 2019-07-01T20:53:39+01:00
summary:

bpo-37470: Document more clearly the error handling for QueueHandler.emit(). (GH-14532) (GH-14533)

(cherry picked from commit 0f4e8132820947d93eccf31b9e526b81c6ffa53d)

files:
M Doc/library/logging.handlers.rst

diff --git a/Doc/library/logging.handlers.rst b/Doc/library/logging.handlers.rst
index d5944ec87d2d..32919c1a2e29 100644
--- a/Doc/library/logging.handlers.rst
+++ b/Doc/library/logging.handlers.rst
@@ -980,7 +980,12 @@ possible, while any potentially slow operations (such as sending an email via
 
    .. method:: emit(record)
 
-      Enqueues the result of preparing the LogRecord.
+      Enqueues the result of preparing the LogRecord. Should an exception
+      occur (e.g. because a bounded queue has filled up), the
+      :meth:`~logging.Handler.handleError` method is called to handle the
+      error. This can result in the record silently being dropped (if
+      :attr:`logging.raiseExceptions` is ``False``) or a message printed to
+      ``sys.stderr`` (if :attr:`logging.raiseExceptions` is ``True``).
 
    .. method:: prepare(record)
 


From webhook-mailer at python.org  Mon Jul  1 19:03:59 2019
From: webhook-mailer at python.org (Steve Dower)
Date: Mon, 01 Jul 2019 23:03:59 -0000
Subject: [Python-checkins] bpo-37363: Add audit events on startup for the
 run commands (GH-14524)
Message-ID: <mailman.194.1562022240.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/e226e83d36dfc7220d836fb7a249ce18e70cb4a6
commit: e226e83d36dfc7220d836fb7a249ce18e70cb4a6
branch: master
author: Steve Dower <steve.dower at python.org>
committer: GitHub <noreply at github.com>
date: 2019-07-01T16:03:53-07:00
summary:

bpo-37363: Add audit events on startup for the run commands (GH-14524)

files:
A Misc/NEWS.d/next/Security/2019-07-01-10-31-14.bpo-37363.fSjatj.rst
M Doc/library/sys.rst
M Doc/tools/extensions/pyspecific.py
M Doc/using/cmdline.rst
M Lib/test/test_embed.py
M Modules/main.c
M Programs/_testembed.c

diff --git a/Doc/library/sys.rst b/Doc/library/sys.rst
index 131aea0def62..acd54421a370 100644
--- a/Doc/library/sys.rst
+++ b/Doc/library/sys.rst
@@ -905,6 +905,12 @@ always available.
    read, so that you can set this hook there.  The :mod:`site` module
    :ref:`sets this <rlcompleter-config>`.
 
+   .. audit-event:: cpython.run_interactivehook hook sys.__interactivehook__
+
+      Raises an :ref:`auditing event <auditing>`
+      ``cpython.run_interactivehook`` with the hook object as the argument when
+      the hook is called on startup.
+
    .. versionadded:: 3.4
 
 
diff --git a/Doc/tools/extensions/pyspecific.py b/Doc/tools/extensions/pyspecific.py
index a6f39b02b5f8..8839033b983c 100644
--- a/Doc/tools/extensions/pyspecific.py
+++ b/Doc/tools/extensions/pyspecific.py
@@ -199,13 +199,18 @@ def run(self):
                     .format(name, info['args'], new_info['args'])
                 )
 
-        if len(self.arguments) >= 3 and self.arguments[2]:
-            target = self.arguments[2]
-            ids = []
-        else:
-            target = "audit_event_{}_{}".format(name, len(info['source']))
-            target = re.sub(r'\W', '_', label)
-            ids = [target]
+        ids = []
+        try:
+            target = self.arguments[2].strip("\"'")
+        except (IndexError, TypeError):
+            target = None
+        if not target:
+            target = "audit_event_{}_{}".format(
+                re.sub(r'\W', '_', name),
+                len(info['source']),
+            )
+            ids.append(target)
+
         info['source'].append((env.docname, target))
 
         pnode = nodes.paragraph(text, classes=["audit-hook"], ids=ids)
@@ -560,7 +565,8 @@ def process_audit_events(app, doctree, fromdocname):
         row += nodes.entry('', node)
 
         node = nodes.paragraph()
-        for i, (doc, label) in enumerate(audit_event['source'], start=1):
+        backlinks = enumerate(sorted(set(audit_event['source'])), start=1)
+        for i, (doc, label) in backlinks:
             if isinstance(label, str):
                 ref = nodes.reference("", nodes.Text("[{}]".format(i)), internal=True)
                 ref['refuri'] = "{}#{}".format(
diff --git a/Doc/using/cmdline.rst b/Doc/using/cmdline.rst
index e11fe31c2fbb..22f42d966a55 100644
--- a/Doc/using/cmdline.rst
+++ b/Doc/using/cmdline.rst
@@ -70,6 +70,7 @@ source.
    :data:`sys.path` (allowing modules in that directory to be imported as top
    level modules).
 
+   .. audit-event:: cpython.run_command command cmdoption-c
 
 .. cmdoption:: -m <module-name>
 
@@ -106,13 +107,14 @@ source.
        python -mtimeit -s 'setup here' 'benchmarked code here'
        python -mtimeit -h # for details
 
+   .. audit-event:: cpython.run_module module-name cmdoption-m
+
    .. seealso::
       :func:`runpy.run_module`
          Equivalent functionality directly available to Python code
 
       :pep:`338` -- Executing modules as scripts
 
-
    .. versionchanged:: 3.1
       Supply the package name to run a ``__main__`` submodule.
 
@@ -129,6 +131,7 @@ source.
    ``"-"`` and the current directory will be added to the start of
    :data:`sys.path`.
 
+   .. audit-event:: cpython.run_stdin "" ""
 
 .. describe:: <script>
 
@@ -148,6 +151,8 @@ source.
    added to the start of :data:`sys.path` and the ``__main__.py`` file in
    that location is executed as the :mod:`__main__` module.
 
+   .. audit-event:: cpython.run_file filename
+
    .. seealso::
       :func:`runpy.run_path`
          Equivalent functionality directly available to Python code
@@ -540,6 +545,11 @@ conflict.
    the interactive session.  You can also change the prompts :data:`sys.ps1` and
    :data:`sys.ps2` and the hook :data:`sys.__interactivehook__` in this file.
 
+   .. audit-event:: cpython.run_startup filename PYTHONSTARTUP
+
+      Raises an :ref:`auditing event <auditing>` ``cpython.run_startup`` with
+      the filename as the argument when called on startup.
+
 
 .. envvar:: PYTHONOPTIMIZE
 
diff --git a/Lib/test/test_embed.py b/Lib/test/test_embed.py
index b2cd55016e46..37f542b29540 100644
--- a/Lib/test/test_embed.py
+++ b/Lib/test/test_embed.py
@@ -57,7 +57,8 @@ def setUp(self):
     def tearDown(self):
         os.chdir(self.oldcwd)
 
-    def run_embedded_interpreter(self, *args, env=None):
+    def run_embedded_interpreter(self, *args, env=None,
+                                 timeout=None, returncode=0, input=None):
         """Runs a test in the embedded interpreter"""
         cmd = [self.test_exe]
         cmd.extend(args)
@@ -73,18 +74,18 @@ def run_embedded_interpreter(self, *args, env=None):
                              universal_newlines=True,
                              env=env)
         try:
-            (out, err) = p.communicate()
+            (out, err) = p.communicate(input=input, timeout=timeout)
         except:
             p.terminate()
             p.wait()
             raise
-        if p.returncode != 0 and support.verbose:
+        if p.returncode != returncode and support.verbose:
             print(f"--- {cmd} failed ---")
             print(f"stdout:\n{out}")
             print(f"stderr:\n{err}")
             print(f"------")
 
-        self.assertEqual(p.returncode, 0,
+        self.assertEqual(p.returncode, returncode,
                          "bad returncode %d, stderr is %r" %
                          (p.returncode, err))
         return out, err
@@ -955,6 +956,37 @@ def test_audit(self):
     def test_audit_subinterpreter(self):
         self.run_embedded_interpreter("test_audit_subinterpreter")
 
+    def test_audit_run_command(self):
+        self.run_embedded_interpreter("test_audit_run_command", timeout=3, returncode=1)
+
+    def test_audit_run_file(self):
+        self.run_embedded_interpreter("test_audit_run_file", timeout=3, returncode=1)
+
+    def test_audit_run_interactivehook(self):
+        startup = os.path.join(self.oldcwd, support.TESTFN) + ".py"
+        with open(startup, "w", encoding="utf-8") as f:
+            print("import sys", file=f)
+            print("sys.__interactivehook__ = lambda: None", file=f)
+        try:
+            env = {**remove_python_envvars(), "PYTHONSTARTUP": startup}
+            self.run_embedded_interpreter("test_audit_run_interactivehook", timeout=5,
+                                          returncode=10, env=env)
+        finally:
+            os.unlink(startup)
+
+    def test_audit_run_startup(self):
+        startup = os.path.join(self.oldcwd, support.TESTFN) + ".py"
+        with open(startup, "w", encoding="utf-8") as f:
+            print("pass", file=f)
+        try:
+            env = {**remove_python_envvars(), "PYTHONSTARTUP": startup}
+            self.run_embedded_interpreter("test_audit_run_startup", timeout=5,
+                                          returncode=10, env=env)
+        finally:
+            os.unlink(startup)
+
+    def test_audit_run_stdin(self):
+        self.run_embedded_interpreter("test_audit_run_stdin", timeout=3, returncode=1)
 
 if __name__ == "__main__":
     unittest.main()
diff --git a/Misc/NEWS.d/next/Security/2019-07-01-10-31-14.bpo-37363.fSjatj.rst b/Misc/NEWS.d/next/Security/2019-07-01-10-31-14.bpo-37363.fSjatj.rst
new file mode 100644
index 000000000000..a8bde90db496
--- /dev/null
+++ b/Misc/NEWS.d/next/Security/2019-07-01-10-31-14.bpo-37363.fSjatj.rst
@@ -0,0 +1,2 @@
+Adds audit events for the range of supported run commands (see
+:ref:`using-on-general`).
diff --git a/Modules/main.c b/Modules/main.c
index b126f4554d41..b8a1c9b79ce3 100644
--- a/Modules/main.c
+++ b/Modules/main.c
@@ -247,6 +247,10 @@ pymain_run_command(wchar_t *command, PyCompilerFlags *cf)
         goto error;
     }
 
+    if (PySys_Audit("cpython.run_command", "O", unicode) < 0) {
+        return pymain_exit_err_print();
+    }
+
     bytes = PyUnicode_AsUTF8String(unicode);
     Py_DECREF(unicode);
     if (bytes == NULL) {
@@ -267,6 +271,9 @@ static int
 pymain_run_module(const wchar_t *modname, int set_argv0)
 {
     PyObject *module, *runpy, *runmodule, *runargs, *result;
+    if (PySys_Audit("cpython.run_module", "u", modname) < 0) {
+        return pymain_exit_err_print();
+    }
     runpy = PyImport_ImportModule("runpy");
     if (runpy == NULL) {
         fprintf(stderr, "Could not import runpy module\n");
@@ -311,6 +318,9 @@ static int
 pymain_run_file(PyConfig *config, PyCompilerFlags *cf)
 {
     const wchar_t *filename = config->run_filename;
+    if (PySys_Audit("cpython.run_file", "u", filename) < 0) {
+        return pymain_exit_err_print();
+    }
     FILE *fp = _Py_wfopen(filename, L"rb");
     if (fp == NULL) {
         char *cfilename_buffer;
@@ -383,6 +393,9 @@ pymain_run_startup(PyConfig *config, PyCompilerFlags *cf, int *exitcode)
     if (startup == NULL) {
         return 0;
     }
+    if (PySys_Audit("cpython.run_startup", "s", startup) < 0) {
+        return pymain_err_print(exitcode);
+    }
 
     FILE *fp = _Py_fopen(startup, "r");
     if (fp == NULL) {
@@ -420,6 +433,10 @@ pymain_run_interactive_hook(int *exitcode)
         return 0;
     }
 
+    if (PySys_Audit("cpython.run_interactivehook", "O", hook) < 0) {
+        goto error;
+    }
+
     result = _PyObject_CallNoArg(hook);
     Py_DECREF(hook);
     if (result == NULL) {
@@ -457,6 +474,10 @@ pymain_run_stdin(PyConfig *config, PyCompilerFlags *cf)
         return pymain_exit_err_print();
     }
 
+    if (PySys_Audit("cpython.run_stdin", NULL) < 0) {
+        return pymain_exit_err_print();
+    }
+
     int run = PyRun_AnyFileExFlags(stdin, "<stdin>", 0, cf);
     return (run != 0);
 }
diff --git a/Programs/_testembed.c b/Programs/_testembed.c
index 856144b85e17..3d27ed2a4003 100644
--- a/Programs/_testembed.c
+++ b/Programs/_testembed.c
@@ -1235,6 +1235,101 @@ static int test_audit_subinterpreter(void)
     }
 }
 
+typedef struct {
+    const char* expected;
+    int exit;
+} AuditRunCommandTest;
+
+static int _audit_hook_run(const char *eventName, PyObject *args, void *userData)
+{
+    AuditRunCommandTest *test = (AuditRunCommandTest*)userData;
+    if (strcmp(eventName, test->expected)) {
+        return 0;
+    }
+
+    if (test->exit) {
+        PyObject *msg = PyUnicode_FromFormat("detected %s(%R)", eventName, args);
+        if (msg) {
+            printf("%s\n", PyUnicode_AsUTF8(msg));
+            Py_DECREF(msg);
+        }
+        exit(test->exit);
+    }
+
+    PyErr_Format(PyExc_RuntimeError, "detected %s(%R)", eventName, args);
+    return -1;
+}
+
+static int test_audit_run_command(void)
+{
+    AuditRunCommandTest test = {"cpython.run_command"};
+    wchar_t *argv[] = {L"./_testembed", L"-c", L"pass"};
+
+    Py_IgnoreEnvironmentFlag = 0;
+    PySys_AddAuditHook(_audit_hook_run, (void*)&test);
+
+    return Py_Main(Py_ARRAY_LENGTH(argv), argv);
+}
+
+static int test_audit_run_file(void)
+{
+    AuditRunCommandTest test = {"cpython.run_file"};
+    wchar_t *argv[] = {L"./_testembed", L"filename.py"};
+
+    Py_IgnoreEnvironmentFlag = 0;
+    PySys_AddAuditHook(_audit_hook_run, (void*)&test);
+
+    return Py_Main(Py_ARRAY_LENGTH(argv), argv);
+}
+
+static int run_audit_run_test(int argc, wchar_t **argv, void *test)
+{
+    PyStatus status;
+    PyConfig config;
+    status = PyConfig_InitPythonConfig(&config);
+    if (PyStatus_Exception(status)) {
+        Py_ExitStatusException(status);
+    }
+    config.argv.length = argc;
+    config.argv.items = argv;
+    config.parse_argv = 1;
+    config.program_name = argv[0];
+    config.interactive = 1;
+    config.isolated = 0;
+    config.use_environment = 1;
+    config.quiet = 1;
+
+    PySys_AddAuditHook(_audit_hook_run, test);
+
+    status = Py_InitializeFromConfig(&config);
+    if (PyStatus_Exception(status)) {
+        Py_ExitStatusException(status);
+    }
+
+    return Py_RunMain();
+}
+
+static int test_audit_run_interactivehook(void)
+{
+    AuditRunCommandTest test = {"cpython.run_interactivehook", 10};
+    wchar_t *argv[] = {L"./_testembed"};
+    return run_audit_run_test(Py_ARRAY_LENGTH(argv), argv, &test);
+}
+
+static int test_audit_run_startup(void)
+{
+    AuditRunCommandTest test = {"cpython.run_startup", 10};
+    wchar_t *argv[] = {L"./_testembed"};
+    return run_audit_run_test(Py_ARRAY_LENGTH(argv), argv, &test);
+}
+
+static int test_audit_run_stdin(void)
+{
+    AuditRunCommandTest test = {"cpython.run_stdin"};
+    wchar_t *argv[] = {L"./_testembed"};
+    return run_audit_run_test(Py_ARRAY_LENGTH(argv), argv, &test);
+}
+
 static int test_init_read_set(void)
 {
     PyStatus status;
@@ -1413,6 +1508,11 @@ static struct TestCase TestCases[] = {
     {"test_open_code_hook", test_open_code_hook},
     {"test_audit", test_audit},
     {"test_audit_subinterpreter", test_audit_subinterpreter},
+    {"test_audit_run_command", test_audit_run_command},
+    {"test_audit_run_file", test_audit_run_file},
+    {"test_audit_run_interactivehook", test_audit_run_interactivehook},
+    {"test_audit_run_startup", test_audit_run_startup},
+    {"test_audit_run_stdin", test_audit_run_stdin},
     {NULL, NULL}
 };
 


From webhook-mailer at python.org  Mon Jul  1 19:15:13 2019
From: webhook-mailer at python.org (Ned Deily)
Date: Mon, 01 Jul 2019 23:15:13 -0000
Subject: [Python-checkins] bpo-19960: Fix building of zlib on macOS without
 installed headers (GH-14257)
Message-ID: <mailman.195.1562022914.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/da7f6dbbf52fe7074360a9eae918806da60139c5
commit: da7f6dbbf52fe7074360a9eae918806da60139c5
branch: 2.7
author: Ned Deily <nad at python.org>
committer: GitHub <noreply at github.com>
date: 2019-07-01T19:15:09-04:00
summary:

bpo-19960: Fix building of zlib on macOS without installed headers (GH-14257)

When building 2.7 on macOS without system header files installed in
``/usr/include``, a few extension modules dependent on system-supplied
third-party libraries were not being built, most notably zlib.
This situation arose in the past when building without the Command
Line Tools and the option to install header files in the traditional
system locations (like /usr/include).  As of macOS 10.14, the
header files are only available in an SDK so the problem addressed
here affects most 2.7 builds.

files:
A Misc/NEWS.d/next/macOS/2019-06-20-01-16-16.bpo-19960.LpLUPF.rst
M setup.py

diff --git a/Misc/NEWS.d/next/macOS/2019-06-20-01-16-16.bpo-19960.LpLUPF.rst b/Misc/NEWS.d/next/macOS/2019-06-20-01-16-16.bpo-19960.LpLUPF.rst
new file mode 100644
index 000000000000..b15c6d61fa0a
--- /dev/null
+++ b/Misc/NEWS.d/next/macOS/2019-06-20-01-16-16.bpo-19960.LpLUPF.rst
@@ -0,0 +1,4 @@
+When building 2.7 on macOS without system header files installed in
+``/usr/include``, a few extension modules dependent on system-supplied
+third-party libraries were not being built, most notably zlib.
+
diff --git a/setup.py b/setup.py
index cb47a2339cb2..f764223d0627 100644
--- a/setup.py
+++ b/setup.py
@@ -39,8 +39,15 @@ def add_dir_to_list(dirlist, dir):
     """Add the directory 'dir' to the list 'dirlist' (at the front) if
     1) 'dir' is not already in 'dirlist'
     2) 'dir' actually exists, and is a directory."""
-    if dir is not None and os.path.isdir(dir) and dir not in dirlist:
-        dirlist.insert(0, dir)
+    if dir is not None and dir not in dirlist:
+        if host_platform == 'darwin' and is_macosx_sdk_path(dir):
+            # If in a macOS SDK path, check relative to the SDK root
+            dir_exists = os.path.isdir(
+                os.path.join(macosx_sdk_root(), dir[1:]))
+        else:
+            dir_exists = os.path.isdir(dir)
+        if dir_exists:
+            dirlist.insert(0, dir)
 
 MACOS_SDK_ROOT = None
 


From webhook-mailer at python.org  Mon Jul  1 19:22:33 2019
From: webhook-mailer at python.org (Miss Islington (bot))
Date: Mon, 01 Jul 2019 23:22:33 -0000
Subject: [Python-checkins] bpo-37363: Add audit events on startup for the
 run commands (GH-14524)
Message-ID: <mailman.196.1562023353.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/746992c1ae4c632220563d3fe54123498f93db1d
commit: 746992c1ae4c632220563d3fe54123498f93db1d
branch: 3.8
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: GitHub <noreply at github.com>
date: 2019-07-01T16:22:29-07:00
summary:

bpo-37363: Add audit events on startup for the run commands (GH-14524)

(cherry picked from commit e226e83d36dfc7220d836fb7a249ce18e70cb4a6)

Co-authored-by: Steve Dower <steve.dower at python.org>

files:
A Misc/NEWS.d/next/Security/2019-07-01-10-31-14.bpo-37363.fSjatj.rst
M Doc/library/sys.rst
M Doc/tools/extensions/pyspecific.py
M Doc/using/cmdline.rst
M Lib/test/test_embed.py
M Modules/main.c
M Programs/_testembed.c

diff --git a/Doc/library/sys.rst b/Doc/library/sys.rst
index 0b53ee00c992..a33e796cf753 100644
--- a/Doc/library/sys.rst
+++ b/Doc/library/sys.rst
@@ -913,6 +913,12 @@ always available.
    read, so that you can set this hook there.  The :mod:`site` module
    :ref:`sets this <rlcompleter-config>`.
 
+   .. audit-event:: cpython.run_interactivehook hook sys.__interactivehook__
+
+      Raises an :ref:`auditing event <auditing>`
+      ``cpython.run_interactivehook`` with the hook object as the argument when
+      the hook is called on startup.
+
    .. versionadded:: 3.4
 
 
diff --git a/Doc/tools/extensions/pyspecific.py b/Doc/tools/extensions/pyspecific.py
index 9b38f8a68990..28b8bda31146 100644
--- a/Doc/tools/extensions/pyspecific.py
+++ b/Doc/tools/extensions/pyspecific.py
@@ -199,13 +199,18 @@ def run(self):
                     .format(name, info['args'], new_info['args'])
                 )
 
-        if len(self.arguments) >= 3 and self.arguments[2]:
-            target = self.arguments[2]
-            ids = []
-        else:
-            target = "audit_event_{}_{}".format(name, len(info['source']))
-            target = re.sub(r'\W', '_', label)
-            ids = [target]
+        ids = []
+        try:
+            target = self.arguments[2].strip("\"'")
+        except (IndexError, TypeError):
+            target = None
+        if not target:
+            target = "audit_event_{}_{}".format(
+                re.sub(r'\W', '_', name),
+                len(info['source']),
+            )
+            ids.append(target)
+
         info['source'].append((env.docname, target))
 
         pnode = nodes.paragraph(text, classes=["audit-hook"], ids=ids)
@@ -560,7 +565,8 @@ def process_audit_events(app, doctree, fromdocname):
         row += nodes.entry('', node)
 
         node = nodes.paragraph()
-        for i, (doc, label) in enumerate(audit_event['source'], start=1):
+        backlinks = enumerate(sorted(set(audit_event['source'])), start=1)
+        for i, (doc, label) in backlinks:
             if isinstance(label, str):
                 ref = nodes.reference("", nodes.Text("[{}]".format(i)), internal=True)
                 ref['refuri'] = "{}#{}".format(
diff --git a/Doc/using/cmdline.rst b/Doc/using/cmdline.rst
index 87af7e8be133..6bc440f2fa8c 100644
--- a/Doc/using/cmdline.rst
+++ b/Doc/using/cmdline.rst
@@ -70,6 +70,7 @@ source.
    :data:`sys.path` (allowing modules in that directory to be imported as top
    level modules).
 
+   .. audit-event:: cpython.run_command command cmdoption-c
 
 .. cmdoption:: -m <module-name>
 
@@ -106,13 +107,14 @@ source.
        python -mtimeit -s 'setup here' 'benchmarked code here'
        python -mtimeit -h # for details
 
+   .. audit-event:: cpython.run_module module-name cmdoption-m
+
    .. seealso::
       :func:`runpy.run_module`
          Equivalent functionality directly available to Python code
 
       :pep:`338` -- Executing modules as scripts
 
-
    .. versionchanged:: 3.1
       Supply the package name to run a ``__main__`` submodule.
 
@@ -129,6 +131,7 @@ source.
    ``"-"`` and the current directory will be added to the start of
    :data:`sys.path`.
 
+   .. audit-event:: cpython.run_stdin "" ""
 
 .. describe:: <script>
 
@@ -148,6 +151,8 @@ source.
    added to the start of :data:`sys.path` and the ``__main__.py`` file in
    that location is executed as the :mod:`__main__` module.
 
+   .. audit-event:: cpython.run_file filename
+
    .. seealso::
       :func:`runpy.run_path`
          Equivalent functionality directly available to Python code
@@ -533,6 +538,11 @@ conflict.
    the interactive session.  You can also change the prompts :data:`sys.ps1` and
    :data:`sys.ps2` and the hook :data:`sys.__interactivehook__` in this file.
 
+   .. audit-event:: cpython.run_startup filename PYTHONSTARTUP
+
+      Raises an :ref:`auditing event <auditing>` ``cpython.run_startup`` with
+      the filename as the argument when called on startup.
+
 
 .. envvar:: PYTHONOPTIMIZE
 
diff --git a/Lib/test/test_embed.py b/Lib/test/test_embed.py
index e31d66d78c85..f3696c31b603 100644
--- a/Lib/test/test_embed.py
+++ b/Lib/test/test_embed.py
@@ -57,7 +57,8 @@ def setUp(self):
     def tearDown(self):
         os.chdir(self.oldcwd)
 
-    def run_embedded_interpreter(self, *args, env=None):
+    def run_embedded_interpreter(self, *args, env=None,
+                                 timeout=None, returncode=0, input=None):
         """Runs a test in the embedded interpreter"""
         cmd = [self.test_exe]
         cmd.extend(args)
@@ -73,18 +74,18 @@ def run_embedded_interpreter(self, *args, env=None):
                              universal_newlines=True,
                              env=env)
         try:
-            (out, err) = p.communicate()
+            (out, err) = p.communicate(input=input, timeout=timeout)
         except:
             p.terminate()
             p.wait()
             raise
-        if p.returncode != 0 and support.verbose:
+        if p.returncode != returncode and support.verbose:
             print(f"--- {cmd} failed ---")
             print(f"stdout:\n{out}")
             print(f"stderr:\n{err}")
             print(f"------")
 
-        self.assertEqual(p.returncode, 0,
+        self.assertEqual(p.returncode, returncode,
                          "bad returncode %d, stderr is %r" %
                          (p.returncode, err))
         return out, err
@@ -954,6 +955,37 @@ def test_audit(self):
     def test_audit_subinterpreter(self):
         self.run_embedded_interpreter("test_audit_subinterpreter")
 
+    def test_audit_run_command(self):
+        self.run_embedded_interpreter("test_audit_run_command", timeout=3, returncode=1)
+
+    def test_audit_run_file(self):
+        self.run_embedded_interpreter("test_audit_run_file", timeout=3, returncode=1)
+
+    def test_audit_run_interactivehook(self):
+        startup = os.path.join(self.oldcwd, support.TESTFN) + ".py"
+        with open(startup, "w", encoding="utf-8") as f:
+            print("import sys", file=f)
+            print("sys.__interactivehook__ = lambda: None", file=f)
+        try:
+            env = {**remove_python_envvars(), "PYTHONSTARTUP": startup}
+            self.run_embedded_interpreter("test_audit_run_interactivehook", timeout=5,
+                                          returncode=10, env=env)
+        finally:
+            os.unlink(startup)
+
+    def test_audit_run_startup(self):
+        startup = os.path.join(self.oldcwd, support.TESTFN) + ".py"
+        with open(startup, "w", encoding="utf-8") as f:
+            print("pass", file=f)
+        try:
+            env = {**remove_python_envvars(), "PYTHONSTARTUP": startup}
+            self.run_embedded_interpreter("test_audit_run_startup", timeout=5,
+                                          returncode=10, env=env)
+        finally:
+            os.unlink(startup)
+
+    def test_audit_run_stdin(self):
+        self.run_embedded_interpreter("test_audit_run_stdin", timeout=3, returncode=1)
 
 if __name__ == "__main__":
     unittest.main()
diff --git a/Misc/NEWS.d/next/Security/2019-07-01-10-31-14.bpo-37363.fSjatj.rst b/Misc/NEWS.d/next/Security/2019-07-01-10-31-14.bpo-37363.fSjatj.rst
new file mode 100644
index 000000000000..a8bde90db496
--- /dev/null
+++ b/Misc/NEWS.d/next/Security/2019-07-01-10-31-14.bpo-37363.fSjatj.rst
@@ -0,0 +1,2 @@
+Adds audit events for the range of supported run commands (see
+:ref:`using-on-general`).
diff --git a/Modules/main.c b/Modules/main.c
index b126f4554d41..b8a1c9b79ce3 100644
--- a/Modules/main.c
+++ b/Modules/main.c
@@ -247,6 +247,10 @@ pymain_run_command(wchar_t *command, PyCompilerFlags *cf)
         goto error;
     }
 
+    if (PySys_Audit("cpython.run_command", "O", unicode) < 0) {
+        return pymain_exit_err_print();
+    }
+
     bytes = PyUnicode_AsUTF8String(unicode);
     Py_DECREF(unicode);
     if (bytes == NULL) {
@@ -267,6 +271,9 @@ static int
 pymain_run_module(const wchar_t *modname, int set_argv0)
 {
     PyObject *module, *runpy, *runmodule, *runargs, *result;
+    if (PySys_Audit("cpython.run_module", "u", modname) < 0) {
+        return pymain_exit_err_print();
+    }
     runpy = PyImport_ImportModule("runpy");
     if (runpy == NULL) {
         fprintf(stderr, "Could not import runpy module\n");
@@ -311,6 +318,9 @@ static int
 pymain_run_file(PyConfig *config, PyCompilerFlags *cf)
 {
     const wchar_t *filename = config->run_filename;
+    if (PySys_Audit("cpython.run_file", "u", filename) < 0) {
+        return pymain_exit_err_print();
+    }
     FILE *fp = _Py_wfopen(filename, L"rb");
     if (fp == NULL) {
         char *cfilename_buffer;
@@ -383,6 +393,9 @@ pymain_run_startup(PyConfig *config, PyCompilerFlags *cf, int *exitcode)
     if (startup == NULL) {
         return 0;
     }
+    if (PySys_Audit("cpython.run_startup", "s", startup) < 0) {
+        return pymain_err_print(exitcode);
+    }
 
     FILE *fp = _Py_fopen(startup, "r");
     if (fp == NULL) {
@@ -420,6 +433,10 @@ pymain_run_interactive_hook(int *exitcode)
         return 0;
     }
 
+    if (PySys_Audit("cpython.run_interactivehook", "O", hook) < 0) {
+        goto error;
+    }
+
     result = _PyObject_CallNoArg(hook);
     Py_DECREF(hook);
     if (result == NULL) {
@@ -457,6 +474,10 @@ pymain_run_stdin(PyConfig *config, PyCompilerFlags *cf)
         return pymain_exit_err_print();
     }
 
+    if (PySys_Audit("cpython.run_stdin", NULL) < 0) {
+        return pymain_exit_err_print();
+    }
+
     int run = PyRun_AnyFileExFlags(stdin, "<stdin>", 0, cf);
     return (run != 0);
 }
diff --git a/Programs/_testembed.c b/Programs/_testembed.c
index 856144b85e17..3d27ed2a4003 100644
--- a/Programs/_testembed.c
+++ b/Programs/_testembed.c
@@ -1235,6 +1235,101 @@ static int test_audit_subinterpreter(void)
     }
 }
 
+typedef struct {
+    const char* expected;
+    int exit;
+} AuditRunCommandTest;
+
+static int _audit_hook_run(const char *eventName, PyObject *args, void *userData)
+{
+    AuditRunCommandTest *test = (AuditRunCommandTest*)userData;
+    if (strcmp(eventName, test->expected)) {
+        return 0;
+    }
+
+    if (test->exit) {
+        PyObject *msg = PyUnicode_FromFormat("detected %s(%R)", eventName, args);
+        if (msg) {
+            printf("%s\n", PyUnicode_AsUTF8(msg));
+            Py_DECREF(msg);
+        }
+        exit(test->exit);
+    }
+
+    PyErr_Format(PyExc_RuntimeError, "detected %s(%R)", eventName, args);
+    return -1;
+}
+
+static int test_audit_run_command(void)
+{
+    AuditRunCommandTest test = {"cpython.run_command"};
+    wchar_t *argv[] = {L"./_testembed", L"-c", L"pass"};
+
+    Py_IgnoreEnvironmentFlag = 0;
+    PySys_AddAuditHook(_audit_hook_run, (void*)&test);
+
+    return Py_Main(Py_ARRAY_LENGTH(argv), argv);
+}
+
+static int test_audit_run_file(void)
+{
+    AuditRunCommandTest test = {"cpython.run_file"};
+    wchar_t *argv[] = {L"./_testembed", L"filename.py"};
+
+    Py_IgnoreEnvironmentFlag = 0;
+    PySys_AddAuditHook(_audit_hook_run, (void*)&test);
+
+    return Py_Main(Py_ARRAY_LENGTH(argv), argv);
+}
+
+static int run_audit_run_test(int argc, wchar_t **argv, void *test)
+{
+    PyStatus status;
+    PyConfig config;
+    status = PyConfig_InitPythonConfig(&config);
+    if (PyStatus_Exception(status)) {
+        Py_ExitStatusException(status);
+    }
+    config.argv.length = argc;
+    config.argv.items = argv;
+    config.parse_argv = 1;
+    config.program_name = argv[0];
+    config.interactive = 1;
+    config.isolated = 0;
+    config.use_environment = 1;
+    config.quiet = 1;
+
+    PySys_AddAuditHook(_audit_hook_run, test);
+
+    status = Py_InitializeFromConfig(&config);
+    if (PyStatus_Exception(status)) {
+        Py_ExitStatusException(status);
+    }
+
+    return Py_RunMain();
+}
+
+static int test_audit_run_interactivehook(void)
+{
+    AuditRunCommandTest test = {"cpython.run_interactivehook", 10};
+    wchar_t *argv[] = {L"./_testembed"};
+    return run_audit_run_test(Py_ARRAY_LENGTH(argv), argv, &test);
+}
+
+static int test_audit_run_startup(void)
+{
+    AuditRunCommandTest test = {"cpython.run_startup", 10};
+    wchar_t *argv[] = {L"./_testembed"};
+    return run_audit_run_test(Py_ARRAY_LENGTH(argv), argv, &test);
+}
+
+static int test_audit_run_stdin(void)
+{
+    AuditRunCommandTest test = {"cpython.run_stdin"};
+    wchar_t *argv[] = {L"./_testembed"};
+    return run_audit_run_test(Py_ARRAY_LENGTH(argv), argv, &test);
+}
+
 static int test_init_read_set(void)
 {
     PyStatus status;
@@ -1413,6 +1508,11 @@ static struct TestCase TestCases[] = {
     {"test_open_code_hook", test_open_code_hook},
     {"test_audit", test_audit},
     {"test_audit_subinterpreter", test_audit_subinterpreter},
+    {"test_audit_run_command", test_audit_run_command},
+    {"test_audit_run_file", test_audit_run_file},
+    {"test_audit_run_interactivehook", test_audit_run_interactivehook},
+    {"test_audit_run_startup", test_audit_run_startup},
+    {"test_audit_run_stdin", test_audit_run_stdin},
     {NULL, NULL}
 };
 


From webhook-mailer at python.org  Tue Jul  2 01:07:49 2019
From: webhook-mailer at python.org (Benjamin Peterson)
Date: Tue, 02 Jul 2019 05:07:49 -0000
Subject: [Python-checkins] Put pyexpatns.h include back. bpo-37437 (GH-14539)
Message-ID: <mailman.197.1562044070.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/2cd07920bb7d2d319999394092190f37935dc421
commit: 2cd07920bb7d2d319999394092190f37935dc421
branch: master
author: Benjamin Peterson <benjamin at python.org>
committer: GitHub <noreply at github.com>
date: 2019-07-01T22:07:44-07:00
summary:

Put pyexpatns.h include back. bpo-37437 (GH-14539)

files:
M Modules/expat/expat_external.h

diff --git a/Modules/expat/expat_external.h b/Modules/expat/expat_external.h
index 875225d77e50..fc63c2228d3e 100644
--- a/Modules/expat/expat_external.h
+++ b/Modules/expat/expat_external.h
@@ -81,6 +81,10 @@
 # endif
 #endif  /* not defined XMLCALL */
 
+/* Namespace external symbols to allow multiple libexpat version to
+   co-exist. */
+#include "pyexpatns.h"
+
 
 #if !defined(XML_STATIC) && !defined(XMLIMPORT)
 # ifndef XML_BUILDING_EXPAT


From webhook-mailer at python.org  Tue Jul  2 01:26:44 2019
From: webhook-mailer at python.org (Miss Islington (bot))
Date: Tue, 02 Jul 2019 05:26:44 -0000
Subject: [Python-checkins] Put pyexpatns.h include back. bpo-37437 (GH-14539)
Message-ID: <mailman.198.1562045205.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/9bd5479f8aba2687f4b8de735b1de50ef1405f19
commit: 9bd5479f8aba2687f4b8de735b1de50ef1405f19
branch: 3.8
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: GitHub <noreply at github.com>
date: 2019-07-01T22:26:40-07:00
summary:

Put pyexpatns.h include back. bpo-37437 (GH-14539)

(cherry picked from commit 2cd07920bb7d2d319999394092190f37935dc421)

Co-authored-by: Benjamin Peterson <benjamin at python.org>

files:
M Modules/expat/expat_external.h

diff --git a/Modules/expat/expat_external.h b/Modules/expat/expat_external.h
index 875225d77e50..fc63c2228d3e 100644
--- a/Modules/expat/expat_external.h
+++ b/Modules/expat/expat_external.h
@@ -81,6 +81,10 @@
 # endif
 #endif  /* not defined XMLCALL */
 
+/* Namespace external symbols to allow multiple libexpat version to
+   co-exist. */
+#include "pyexpatns.h"
+
 
 #if !defined(XML_STATIC) && !defined(XMLIMPORT)
 # ifndef XML_BUILDING_EXPAT


From webhook-mailer at python.org  Tue Jul  2 01:29:09 2019
From: webhook-mailer at python.org (Miss Islington (bot))
Date: Tue, 02 Jul 2019 05:29:09 -0000
Subject: [Python-checkins] Put pyexpatns.h include back. bpo-37437 (GH-14539)
Message-ID: <mailman.199.1562045350.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/f3130fab9c5cbc7125695dbd66cdc2fd76e20093
commit: f3130fab9c5cbc7125695dbd66cdc2fd76e20093
branch: 3.7
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: GitHub <noreply at github.com>
date: 2019-07-01T22:29:05-07:00
summary:

Put pyexpatns.h include back. bpo-37437 (GH-14539)

(cherry picked from commit 2cd07920bb7d2d319999394092190f37935dc421)

Co-authored-by: Benjamin Peterson <benjamin at python.org>

files:
M Modules/expat/expat_external.h

diff --git a/Modules/expat/expat_external.h b/Modules/expat/expat_external.h
index 875225d77e50..fc63c2228d3e 100644
--- a/Modules/expat/expat_external.h
+++ b/Modules/expat/expat_external.h
@@ -81,6 +81,10 @@
 # endif
 #endif  /* not defined XMLCALL */
 
+/* Namespace external symbols to allow multiple libexpat version to
+   co-exist. */
+#include "pyexpatns.h"
+
 
 #if !defined(XML_STATIC) && !defined(XMLIMPORT)
 # ifndef XML_BUILDING_EXPAT


From webhook-mailer at python.org  Tue Jul  2 01:38:36 2019
From: webhook-mailer at python.org (Miss Islington (bot))
Date: Tue, 02 Jul 2019 05:38:36 -0000
Subject: [Python-checkins] Put pyexpatns.h include back. bpo-37437 (GH-14539)
Message-ID: <mailman.200.1562045917.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/03b01280825871f6a5bb165fe25d412e33751d45
commit: 03b01280825871f6a5bb165fe25d412e33751d45
branch: 2.7
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: GitHub <noreply at github.com>
date: 2019-07-01T22:38:31-07:00
summary:

Put pyexpatns.h include back. bpo-37437 (GH-14539)

(cherry picked from commit 2cd07920bb7d2d319999394092190f37935dc421)

Co-authored-by: Benjamin Peterson <benjamin at python.org>

files:
M Modules/expat/expat_external.h

diff --git a/Modules/expat/expat_external.h b/Modules/expat/expat_external.h
index 875225d77e50..fc63c2228d3e 100644
--- a/Modules/expat/expat_external.h
+++ b/Modules/expat/expat_external.h
@@ -81,6 +81,10 @@
 # endif
 #endif  /* not defined XMLCALL */
 
+/* Namespace external symbols to allow multiple libexpat version to
+   co-exist. */
+#include "pyexpatns.h"
+
 
 #if !defined(XML_STATIC) && !defined(XMLIMPORT)
 # ifndef XML_BUILDING_EXPAT


From webhook-mailer at python.org  Tue Jul  2 01:48:20 2019
From: webhook-mailer at python.org (Benjamin Peterson)
Date: Tue, 02 Jul 2019 05:48:20 -0000
Subject: [Python-checkins] Put pyexpatns.h include back. bpo-37437 (GH-14542)
Message-ID: <mailman.201.1562046501.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/29d6905826d4417426e70f6209ca5e0db7921685
commit: 29d6905826d4417426e70f6209ca5e0db7921685
branch: 3.6
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: Benjamin Peterson <benjamin at python.org>
date: 2019-07-01T22:48:16-07:00
summary:

Put pyexpatns.h include back. bpo-37437 (GH-14542)

(cherry picked from commit 2cd07920bb7d2d319999394092190f37935dc421)

Co-authored-by: Benjamin Peterson <benjamin at python.org>

files:
M Modules/expat/expat_external.h

diff --git a/Modules/expat/expat_external.h b/Modules/expat/expat_external.h
index 875225d77e50..fc63c2228d3e 100644
--- a/Modules/expat/expat_external.h
+++ b/Modules/expat/expat_external.h
@@ -81,6 +81,10 @@
 # endif
 #endif  /* not defined XMLCALL */
 
+/* Namespace external symbols to allow multiple libexpat version to
+   co-exist. */
+#include "pyexpatns.h"
+
 
 #if !defined(XML_STATIC) && !defined(XMLIMPORT)
 # ifndef XML_BUILDING_EXPAT


From webhook-mailer at python.org  Tue Jul  2 03:12:37 2019
From: webhook-mailer at python.org (Ned Deily)
Date: Tue, 02 Jul 2019 07:12:37 -0000
Subject: [Python-checkins] bpo-34602: Avoid failures setting macOS stack
 resource limit (GH-14546)
Message-ID: <mailman.202.1562051558.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/5bbbc733e6cc0804f19b071944af8d4719e26ae6
commit: 5bbbc733e6cc0804f19b071944af8d4719e26ae6
branch: master
author: Ned Deily <nad at python.org>
committer: GitHub <noreply at github.com>
date: 2019-07-02T03:12:18-04:00
summary:

bpo-34602: Avoid failures setting macOS stack resource limit (GH-14546)

Under some conditions the earlier fix for bpo-18075, "Infinite recursion
tests triggering a segfault on Mac OS X", now causes failures on macOS
when attempting to change stack limit with resource.setrlimit
resource.RLIMIT_STACK, like regrtest does when running the test suite.
The reverted change had specified a non-default stack size when linking
the python executable on macOS.  As of macOS 10.14.4, the previous
code causes a hard failure when running tests, although similar
failures had been seen under some conditions under some earlier
systems.  Reverting the change to the interpreter stack size at link
time helped for release builds but caused some tests to fail when
built --with-pydebug.  Try the opposite approach: continue to build
the interpreter with an increased stack size on macOS and remove
the failing setrlimit call in regrtest initialization.  This will
definitely avoid the resource.RLIMIT_STACK error and should have
no, or fewer, side effects.

files:
A Misc/NEWS.d/next/macOS/2019-07-02-01-06-47.bpo-34602.10d4wl.rst
M Lib/test/libregrtest/setup.py
M configure
M configure.ac

diff --git a/Lib/test/libregrtest/setup.py b/Lib/test/libregrtest/setup.py
index 36676bfa617b..5254e7fc6fe0 100644
--- a/Lib/test/libregrtest/setup.py
+++ b/Lib/test/libregrtest/setup.py
@@ -60,22 +60,6 @@ def setup_tests(ns):
         if getattr(module, '__file__', None):
             module.__file__ = os.path.abspath(module.__file__)
 
-    # MacOSX (a.k.a. Darwin) has a default stack size that is too small
-    # for deeply recursive regular expressions.  We see this as crashes in
-    # the Python test suite when running test_re.py and test_sre.py.  The
-    # fix is to set the stack limit to 2048.
-    # This approach may also be useful for other Unixy platforms that
-    # suffer from small default stack limits.
-    if sys.platform == 'darwin':
-        try:
-            import resource
-        except ImportError:
-            pass
-        else:
-            soft, hard = resource.getrlimit(resource.RLIMIT_STACK)
-            newsoft = min(hard, max(soft, 1024*2048))
-            resource.setrlimit(resource.RLIMIT_STACK, (newsoft, hard))
-
     if ns.huntrleaks:
         unittest.BaseTestSuite._cleanup = False
 
diff --git a/Misc/NEWS.d/next/macOS/2019-07-02-01-06-47.bpo-34602.10d4wl.rst b/Misc/NEWS.d/next/macOS/2019-07-02-01-06-47.bpo-34602.10d4wl.rst
new file mode 100644
index 000000000000..c50ac638df57
--- /dev/null
+++ b/Misc/NEWS.d/next/macOS/2019-07-02-01-06-47.bpo-34602.10d4wl.rst
@@ -0,0 +1,4 @@
+Avoid test suite failures on macOS by no longer calling resource.setrlimit
+to increase the process stack size limit at runtime.  The runtime change is
+no longer needed since the interpreter is being built with a larger default
+stack size.
diff --git a/configure b/configure
index 4b98fc6914e2..2c49d853a384 100755
--- a/configure
+++ b/configure
@@ -9524,6 +9524,12 @@ then
 	# -u libsys_s pulls in all symbols in libsys
 	Darwin/*)
 		LINKFORSHARED="$extra_undefs -framework CoreFoundation"
+
+		# Issue #18075: the default maximum stack size (8MBytes) is too
+		# small for the default recursion limit. Increase the stack size
+		# to ensure that tests don't crash
+		LINKFORSHARED="-Wl,-stack_size,1000000 $LINKFORSHARED"
+
 		if test "$enable_framework"
 		then
 			LINKFORSHARED="$LINKFORSHARED "'$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
diff --git a/configure.ac b/configure.ac
index e82ed1964729..cc31df866d52 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2682,6 +2682,12 @@ then
 	# -u libsys_s pulls in all symbols in libsys
 	Darwin/*)
 		LINKFORSHARED="$extra_undefs -framework CoreFoundation"
+
+		# Issue #18075: the default maximum stack size (8MBytes) is too
+		# small for the default recursion limit. Increase the stack size
+		# to ensure that tests don't crash
+		LINKFORSHARED="-Wl,-stack_size,1000000 $LINKFORSHARED"
+
 		if test "$enable_framework"
 		then
 			LINKFORSHARED="$LINKFORSHARED "'$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'


From webhook-mailer at python.org  Tue Jul  2 03:31:13 2019
From: webhook-mailer at python.org (Miss Islington (bot))
Date: Tue, 02 Jul 2019 07:31:13 -0000
Subject: [Python-checkins] bpo-34602: Avoid failures setting macOS stack
 resource limit (GH-14546)
Message-ID: <mailman.203.1562052674.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/bd92b94da93198c8385c06ca908407f172c7e8b2
commit: bd92b94da93198c8385c06ca908407f172c7e8b2
branch: 3.8
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: GitHub <noreply at github.com>
date: 2019-07-02T00:31:07-07:00
summary:

bpo-34602: Avoid failures setting macOS stack resource limit (GH-14546)


Under some conditions the earlier fix for bpo-18075, "Infinite recursion
tests triggering a segfault on Mac OS X", now causes failures on macOS
when attempting to change stack limit with resource.setrlimit
resource.RLIMIT_STACK, like regrtest does when running the test suite.
The reverted change had specified a non-default stack size when linking
the python executable on macOS.  As of macOS 10.14.4, the previous
code causes a hard failure when running tests, although similar
failures had been seen under some conditions under some earlier
systems.  Reverting the change to the interpreter stack size at link
time helped for release builds but caused some tests to fail when
built --with-pydebug.  Try the opposite approach: continue to build
the interpreter with an increased stack size on macOS and remove
the failing setrlimit call in regrtest initialization.  This will
definitely avoid the resource.RLIMIT_STACK error and should have
no, or fewer, side effects.
(cherry picked from commit 5bbbc733e6cc0804f19b071944af8d4719e26ae6)

Co-authored-by: Ned Deily <nad at python.org>

files:
A Misc/NEWS.d/next/macOS/2019-07-02-01-06-47.bpo-34602.10d4wl.rst
M Lib/test/libregrtest/setup.py
M configure
M configure.ac

diff --git a/Lib/test/libregrtest/setup.py b/Lib/test/libregrtest/setup.py
index fb5ac350cd08..1e0eac3b0fbb 100644
--- a/Lib/test/libregrtest/setup.py
+++ b/Lib/test/libregrtest/setup.py
@@ -58,22 +58,6 @@ def setup_tests(ns):
         if getattr(module, '__file__', None):
             module.__file__ = os.path.abspath(module.__file__)
 
-    # MacOSX (a.k.a. Darwin) has a default stack size that is too small
-    # for deeply recursive regular expressions.  We see this as crashes in
-    # the Python test suite when running test_re.py and test_sre.py.  The
-    # fix is to set the stack limit to 2048.
-    # This approach may also be useful for other Unixy platforms that
-    # suffer from small default stack limits.
-    if sys.platform == 'darwin':
-        try:
-            import resource
-        except ImportError:
-            pass
-        else:
-            soft, hard = resource.getrlimit(resource.RLIMIT_STACK)
-            newsoft = min(hard, max(soft, 1024*2048))
-            resource.setrlimit(resource.RLIMIT_STACK, (newsoft, hard))
-
     if ns.huntrleaks:
         unittest.BaseTestSuite._cleanup = False
 
diff --git a/Misc/NEWS.d/next/macOS/2019-07-02-01-06-47.bpo-34602.10d4wl.rst b/Misc/NEWS.d/next/macOS/2019-07-02-01-06-47.bpo-34602.10d4wl.rst
new file mode 100644
index 000000000000..c50ac638df57
--- /dev/null
+++ b/Misc/NEWS.d/next/macOS/2019-07-02-01-06-47.bpo-34602.10d4wl.rst
@@ -0,0 +1,4 @@
+Avoid test suite failures on macOS by no longer calling resource.setrlimit
+to increase the process stack size limit at runtime.  The runtime change is
+no longer needed since the interpreter is being built with a larger default
+stack size.
diff --git a/configure b/configure
index b606fc808c17..6e7f277bace9 100755
--- a/configure
+++ b/configure
@@ -9524,6 +9524,12 @@ then
 	# -u libsys_s pulls in all symbols in libsys
 	Darwin/*)
 		LINKFORSHARED="$extra_undefs -framework CoreFoundation"
+
+		# Issue #18075: the default maximum stack size (8MBytes) is too
+		# small for the default recursion limit. Increase the stack size
+		# to ensure that tests don't crash
+		LINKFORSHARED="-Wl,-stack_size,1000000 $LINKFORSHARED"
+
 		if test "$enable_framework"
 		then
 			LINKFORSHARED="$LINKFORSHARED "'$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
diff --git a/configure.ac b/configure.ac
index 3d589ac25891..324ce0bd99a9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2682,6 +2682,12 @@ then
 	# -u libsys_s pulls in all symbols in libsys
 	Darwin/*)
 		LINKFORSHARED="$extra_undefs -framework CoreFoundation"
+
+		# Issue #18075: the default maximum stack size (8MBytes) is too
+		# small for the default recursion limit. Increase the stack size
+		# to ensure that tests don't crash
+		LINKFORSHARED="-Wl,-stack_size,1000000 $LINKFORSHARED"
+
 		if test "$enable_framework"
 		then
 			LINKFORSHARED="$LINKFORSHARED "'$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'


From webhook-mailer at python.org  Tue Jul  2 03:38:42 2019
From: webhook-mailer at python.org (Miss Islington (bot))
Date: Tue, 02 Jul 2019 07:38:42 -0000
Subject: [Python-checkins] bpo-34602: Avoid failures setting macOS stack
 resource limit (GH-14546)
Message-ID: <mailman.204.1562053124.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/bf82cd3124df94935c6e3190c7c40b76918d2174
commit: bf82cd3124df94935c6e3190c7c40b76918d2174
branch: 3.7
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: GitHub <noreply at github.com>
date: 2019-07-02T00:38:36-07:00
summary:

bpo-34602: Avoid failures setting macOS stack resource limit (GH-14546)


Under some conditions the earlier fix for bpo-18075, "Infinite recursion
tests triggering a segfault on Mac OS X", now causes failures on macOS
when attempting to change stack limit with resource.setrlimit
resource.RLIMIT_STACK, like regrtest does when running the test suite.
The reverted change had specified a non-default stack size when linking
the python executable on macOS.  As of macOS 10.14.4, the previous
code causes a hard failure when running tests, although similar
failures had been seen under some conditions under some earlier
systems.  Reverting the change to the interpreter stack size at link
time helped for release builds but caused some tests to fail when
built --with-pydebug.  Try the opposite approach: continue to build
the interpreter with an increased stack size on macOS and remove
the failing setrlimit call in regrtest initialization.  This will
definitely avoid the resource.RLIMIT_STACK error and should have
no, or fewer, side effects.
(cherry picked from commit 5bbbc733e6cc0804f19b071944af8d4719e26ae6)

Co-authored-by: Ned Deily <nad at python.org>

files:
A Misc/NEWS.d/next/macOS/2019-07-02-01-06-47.bpo-34602.10d4wl.rst
M Lib/test/libregrtest/setup.py
M configure
M configure.ac

diff --git a/Lib/test/libregrtest/setup.py b/Lib/test/libregrtest/setup.py
index 9a6585af9d0d..4362e92fbda9 100644
--- a/Lib/test/libregrtest/setup.py
+++ b/Lib/test/libregrtest/setup.py
@@ -58,22 +58,6 @@ def setup_tests(ns):
         if getattr(module, '__file__', None):
             module.__file__ = os.path.abspath(module.__file__)
 
-    # MacOSX (a.k.a. Darwin) has a default stack size that is too small
-    # for deeply recursive regular expressions.  We see this as crashes in
-    # the Python test suite when running test_re.py and test_sre.py.  The
-    # fix is to set the stack limit to 2048.
-    # This approach may also be useful for other Unixy platforms that
-    # suffer from small default stack limits.
-    if sys.platform == 'darwin':
-        try:
-            import resource
-        except ImportError:
-            pass
-        else:
-            soft, hard = resource.getrlimit(resource.RLIMIT_STACK)
-            newsoft = min(hard, max(soft, 1024*2048))
-            resource.setrlimit(resource.RLIMIT_STACK, (newsoft, hard))
-
     if ns.huntrleaks:
         unittest.BaseTestSuite._cleanup = False
 
diff --git a/Misc/NEWS.d/next/macOS/2019-07-02-01-06-47.bpo-34602.10d4wl.rst b/Misc/NEWS.d/next/macOS/2019-07-02-01-06-47.bpo-34602.10d4wl.rst
new file mode 100644
index 000000000000..c50ac638df57
--- /dev/null
+++ b/Misc/NEWS.d/next/macOS/2019-07-02-01-06-47.bpo-34602.10d4wl.rst
@@ -0,0 +1,4 @@
+Avoid test suite failures on macOS by no longer calling resource.setrlimit
+to increase the process stack size limit at runtime.  The runtime change is
+no longer needed since the interpreter is being built with a larger default
+stack size.
diff --git a/configure b/configure
index bc6894ec6fce..2db11e6e8667 100755
--- a/configure
+++ b/configure
@@ -9541,6 +9541,12 @@ then
 	# -u libsys_s pulls in all symbols in libsys
 	Darwin/*)
 		LINKFORSHARED="$extra_undefs -framework CoreFoundation"
+
+		# Issue #18075: the default maximum stack size (8MBytes) is too
+		# small for the default recursion limit. Increase the stack size
+		# to ensure that tests don't crash
+		LINKFORSHARED="-Wl,-stack_size,1000000 $LINKFORSHARED"
+
 		if test "$enable_framework"
 		then
 			LINKFORSHARED="$LINKFORSHARED "'$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
diff --git a/configure.ac b/configure.ac
index 97745aa11240..e5fb7e7b0b13 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2708,6 +2708,12 @@ then
 	# -u libsys_s pulls in all symbols in libsys
 	Darwin/*)
 		LINKFORSHARED="$extra_undefs -framework CoreFoundation"
+
+		# Issue #18075: the default maximum stack size (8MBytes) is too
+		# small for the default recursion limit. Increase the stack size
+		# to ensure that tests don't crash
+		LINKFORSHARED="-Wl,-stack_size,1000000 $LINKFORSHARED"
+
 		if test "$enable_framework"
 		then
 			LINKFORSHARED="$LINKFORSHARED "'$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'


From webhook-mailer at python.org  Tue Jul  2 03:49:03 2019
From: webhook-mailer at python.org (Ned Deily)
Date: Tue, 02 Jul 2019 07:49:03 -0000
Subject: [Python-checkins] bpo-34602: Avoid failures setting macOS stack
 resource limit (GH-14546) (GH-14549)
Message-ID: <mailman.205.1562053744.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/782854f90ad5f73f787f68693d535f2b05514e13
commit: 782854f90ad5f73f787f68693d535f2b05514e13
branch: 3.6
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: Ned Deily <nad at python.org>
date: 2019-07-02T03:48:59-04:00
summary:

bpo-34602: Avoid failures setting macOS stack resource limit (GH-14546) (GH-14549)

Under some conditions the earlier fix for bpo-18075, "Infinite recursion
tests triggering a segfault on Mac OS X", now causes failures on macOS
when attempting to change stack limit with resource.setrlimit
resource.RLIMIT_STACK, like regrtest does when running the test suite.
The reverted change had specified a non-default stack size when linking
the python executable on macOS.  As of macOS 10.14.4, the previous
code causes a hard failure when running tests, although similar
failures had been seen under some conditions under some earlier
systems.  Reverting the change to the interpreter stack size at link
time helped for release builds but caused some tests to fail when
built --with-pydebug.  Try the opposite approach: continue to build
the interpreter with an increased stack size on macOS and remove
the failing setrlimit call in regrtest initialization.  This will
definitely avoid the resource.RLIMIT_STACK error and should have
no, or fewer, side effects.
(cherry picked from commit 5bbbc733e6cc0804f19b071944af8d4719e26ae6)

Co-authored-by: Ned Deily <nad at python.org>

files:
A Misc/NEWS.d/next/macOS/2019-07-02-01-06-47.bpo-34602.10d4wl.rst
M Lib/test/libregrtest/setup.py
M configure
M configure.ac

diff --git a/Lib/test/libregrtest/setup.py b/Lib/test/libregrtest/setup.py
index 910aca1b1a6c..432cbca33cec 100644
--- a/Lib/test/libregrtest/setup.py
+++ b/Lib/test/libregrtest/setup.py
@@ -60,22 +60,6 @@ def setup_tests(ns):
         if getattr(module, '__file__', None):
             module.__file__ = os.path.abspath(module.__file__)
 
-    # MacOSX (a.k.a. Darwin) has a default stack size that is too small
-    # for deeply recursive regular expressions.  We see this as crashes in
-    # the Python test suite when running test_re.py and test_sre.py.  The
-    # fix is to set the stack limit to 2048.
-    # This approach may also be useful for other Unixy platforms that
-    # suffer from small default stack limits.
-    if sys.platform == 'darwin':
-        try:
-            import resource
-        except ImportError:
-            pass
-        else:
-            soft, hard = resource.getrlimit(resource.RLIMIT_STACK)
-            newsoft = min(hard, max(soft, 1024*2048))
-            resource.setrlimit(resource.RLIMIT_STACK, (newsoft, hard))
-
     if ns.huntrleaks:
         unittest.BaseTestSuite._cleanup = False
 
diff --git a/Misc/NEWS.d/next/macOS/2019-07-02-01-06-47.bpo-34602.10d4wl.rst b/Misc/NEWS.d/next/macOS/2019-07-02-01-06-47.bpo-34602.10d4wl.rst
new file mode 100644
index 000000000000..c50ac638df57
--- /dev/null
+++ b/Misc/NEWS.d/next/macOS/2019-07-02-01-06-47.bpo-34602.10d4wl.rst
@@ -0,0 +1,4 @@
+Avoid test suite failures on macOS by no longer calling resource.setrlimit
+to increase the process stack size limit at runtime.  The runtime change is
+no longer needed since the interpreter is being built with a larger default
+stack size.
diff --git a/configure b/configure
index 634e18af4ee5..e39c16eee2b9 100755
--- a/configure
+++ b/configure
@@ -9504,6 +9504,12 @@ then
 	# -u libsys_s pulls in all symbols in libsys
 	Darwin/*)
 		LINKFORSHARED="$extra_undefs -framework CoreFoundation"
+
+		# Issue #18075: the default maximum stack size (8MBytes) is too
+		# small for the default recursion limit. Increase the stack size
+		# to ensure that tests don't crash
+		LINKFORSHARED="-Wl,-stack_size,1000000 $LINKFORSHARED"
+
 		if test "$enable_framework"
 		then
 			LINKFORSHARED="$LINKFORSHARED "'$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
diff --git a/configure.ac b/configure.ac
index 8bbfc1ecbad8..cf280506bd01 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2697,6 +2697,12 @@ then
 	# -u libsys_s pulls in all symbols in libsys
 	Darwin/*)
 		LINKFORSHARED="$extra_undefs -framework CoreFoundation"
+
+		# Issue #18075: the default maximum stack size (8MBytes) is too
+		# small for the default recursion limit. Increase the stack size
+		# to ensure that tests don't crash
+		LINKFORSHARED="-Wl,-stack_size,1000000 $LINKFORSHARED"
+
 		if test "$enable_framework"
 		then
 			LINKFORSHARED="$LINKFORSHARED "'$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'


From webhook-mailer at python.org  Tue Jul  2 05:49:57 2019
From: webhook-mailer at python.org (Inada Naoki)
Date: Tue, 02 Jul 2019 09:49:57 -0000
Subject: [Python-checkins] bpo-36904: Optimize _PyStack_UnpackDict (GH-14517)
Message-ID: <mailman.206.1562060999.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/d4efd917ac24940063a1ce80073fe3570c5f07f8
commit: d4efd917ac24940063a1ce80073fe3570c5f07f8
branch: master
author: Jeroen Demeyer <J.Demeyer at UGent.be>
committer: Inada Naoki <songofacandy at gmail.com>
date: 2019-07-02T18:49:40+09:00
summary:

bpo-36904: Optimize _PyStack_UnpackDict (GH-14517)

files:
M Include/cpython/abstract.h
M Objects/call.c

diff --git a/Include/cpython/abstract.h b/Include/cpython/abstract.h
index b4288e714c70..69ed9435c654 100644
--- a/Include/cpython/abstract.h
+++ b/Include/cpython/abstract.h
@@ -26,24 +26,6 @@ PyAPI_FUNC(PyObject *) _PyStack_AsDict(
     PyObject *const *values,
     PyObject *kwnames);
 
-/* Convert (args, nargs, kwargs: dict) into a (stack, nargs, kwnames: tuple).
-
-   Return 0 on success, raise an exception and return -1 on error.
-
-   Write the new stack into *p_stack. If *p_stack is differen than args, it
-   must be released by PyMem_Free().
-
-   The stack uses borrowed references.
-
-   The type of keyword keys is not checked, these checks should be done
-   later (ex: _PyArg_ParseStackAndKeywords). */
-PyAPI_FUNC(int) _PyStack_UnpackDict(
-    PyObject *const *args,
-    Py_ssize_t nargs,
-    PyObject *kwargs,
-    PyObject *const **p_stack,
-    PyObject **p_kwnames);
-
 /* Suggested size (number of positional arguments) for arrays of PyObject*
    allocated on a C stack to avoid allocating memory on the heap memory. Such
    array is used to pass positional arguments to call functions of the
diff --git a/Objects/call.c b/Objects/call.c
index 2b52bdf6abd4..8e0d271ab78a 100644
--- a/Objects/call.c
+++ b/Objects/call.c
@@ -8,6 +8,14 @@
 static PyObject *
 cfunction_call_varargs(PyObject *func, PyObject *args, PyObject *kwargs);
 
+static PyObject *const *
+_PyStack_UnpackDict(PyObject *const *args, Py_ssize_t nargs, PyObject *kwargs,
+                    PyObject **p_kwnames);
+
+static void
+_PyStack_UnpackDict_Free(PyObject *const *stack, Py_ssize_t nargs,
+                         PyObject *kwnames);
+
 
 static PyObject *
 null_error(void)
@@ -100,24 +108,19 @@ _PyObject_FastCallDict(PyObject *callable, PyObject *const *args,
     }
 
     PyObject *res;
-    if (kwargs == NULL) {
+    if (kwargs == NULL || PyDict_GET_SIZE(kwargs) == 0) {
         res = func(callable, args, nargsf, NULL);
     }
     else {
         PyObject *kwnames;
         PyObject *const *newargs;
-        if (_PyStack_UnpackDict(args, nargs, kwargs, &newargs, &kwnames) < 0) {
+        newargs = _PyStack_UnpackDict(args, nargs, kwargs, &kwnames);
+        if (newargs == NULL) {
             return NULL;
         }
-        res = func(callable, newargs, nargs, kwnames);
-        if (kwnames != NULL) {
-            Py_ssize_t i, n = PyTuple_GET_SIZE(kwnames) + nargs;
-            for (i = 0; i < n; i++) {
-                Py_DECREF(newargs[i]);
-            }
-            PyMem_Free((PyObject **)newargs);
-            Py_DECREF(kwnames);
-        }
+        res = func(callable, newargs,
+                   nargs | PY_VECTORCALL_ARGUMENTS_OFFSET, kwnames);
+        _PyStack_UnpackDict_Free(newargs, nargs, kwnames);
     }
     return _Py_CheckFunctionResult(callable, res, NULL);
 }
@@ -196,24 +199,23 @@ PyVectorcall_Call(PyObject *callable, PyObject *tuple, PyObject *kwargs)
         return NULL;
     }
 
+    Py_ssize_t nargs = PyTuple_GET_SIZE(tuple);
+
+    /* Fast path for no keywords */
+    if (kwargs == NULL || PyDict_GET_SIZE(kwargs) == 0) {
+        return func(callable, _PyTuple_ITEMS(tuple), nargs, NULL);
+    }
+
     /* Convert arguments & call */
     PyObject *const *args;
-    Py_ssize_t nargs = PyTuple_GET_SIZE(tuple);
     PyObject *kwnames;
-    if (_PyStack_UnpackDict(_PyTuple_ITEMS(tuple), nargs,
-        kwargs, &args, &kwnames) < 0) {
+    args = _PyStack_UnpackDict(_PyTuple_ITEMS(tuple), nargs, kwargs, &kwnames);
+    if (args == NULL) {
         return NULL;
     }
-    PyObject *result = func(callable, args, nargs, kwnames);
-    if (kwnames != NULL) {
-        Py_ssize_t i, n = PyTuple_GET_SIZE(kwnames) + nargs;
-        for (i = 0; i < n; i++) {
-            Py_DECREF(args[i]);
-        }
-        PyMem_Free((PyObject **)args);
-        Py_DECREF(kwnames);
-    }
-
+    PyObject *result = func(callable, args,
+                            nargs | PY_VECTORCALL_ARGUMENTS_OFFSET, kwnames);
+    _PyStack_UnpackDict_Free(args, nargs, kwnames);
     return result;
 }
 
@@ -455,23 +457,22 @@ _PyMethodDef_RawFastCallDict(PyMethodDef *method, PyObject *self,
 
     case METH_FASTCALL | METH_KEYWORDS:
     {
-        PyObject *const *stack;
-        PyObject *kwnames;
         _PyCFunctionFastWithKeywords fastmeth = (_PyCFunctionFastWithKeywords)(void(*)(void))meth;
 
-        if (_PyStack_UnpackDict(args, nargs, kwargs, &stack, &kwnames) < 0) {
-            goto exit;
+        /* Fast path for no keywords */
+        if (kwargs == NULL || PyDict_GET_SIZE(kwargs) == 0) {
+            result = (*fastmeth) (self, args, nargs, NULL);
+            break;
         }
 
-        result = (*fastmeth) (self, stack, nargs, kwnames);
-        if (kwnames != NULL) {
-            Py_ssize_t i, n = nargs + PyTuple_GET_SIZE(kwnames);
-            for (i = 0; i < n; i++) {
-                Py_DECREF(stack[i]);
-            }
-            PyMem_Free((PyObject **)stack);
-            Py_DECREF(kwnames);
+        PyObject *const *stack;
+        PyObject *kwnames;
+        stack = _PyStack_UnpackDict(args, nargs, kwargs, &kwnames);
+        if (stack == NULL) {
+            goto exit;
         }
+        result = (*fastmeth) (self, stack, nargs, kwnames);
+        _PyStack_UnpackDict_Free(stack, nargs, kwnames);
         break;
     }
 
@@ -1206,53 +1207,63 @@ _PyStack_AsDict(PyObject *const *values, PyObject *kwnames)
 }
 
 
-int
-_PyStack_UnpackDict(PyObject *const *args, Py_ssize_t nargs, PyObject *kwargs,
-                    PyObject *const **p_stack, PyObject **p_kwnames)
-{
-    PyObject **stack, **kwstack;
-    Py_ssize_t nkwargs;
-    Py_ssize_t pos, i;
-    PyObject *key, *value;
-    PyObject *kwnames;
+/* Convert (args, nargs, kwargs: dict) into a (stack, nargs, kwnames: tuple).
 
-    assert(nargs >= 0);
-    assert(kwargs == NULL || PyDict_CheckExact(kwargs));
+   Allocate a new argument vector and keyword names tuple. Return the argument
+   vector; return NULL with exception set on error. Return the keyword names
+   tuple in *p_kwnames.
 
-    if (kwargs == NULL || (nkwargs = PyDict_GET_SIZE(kwargs)) == 0) {
-        *p_stack = args;
-        *p_kwnames = NULL;
-        return 0;
-    }
+   The newly allocated argument vector supports PY_VECTORCALL_ARGUMENTS_OFFSET.
+
+   When done, you must call _PyStack_UnpackDict_Free(stack, nargs, kwnames)
 
-    if ((size_t)nargs > PY_SSIZE_T_MAX / sizeof(stack[0]) - (size_t)nkwargs) {
+   The type of keyword keys is not checked, these checks should be done
+   later (ex: _PyArg_ParseStackAndKeywords). */
+static PyObject *const *
+_PyStack_UnpackDict(PyObject *const *args, Py_ssize_t nargs, PyObject *kwargs,
+                    PyObject **p_kwnames)
+{
+    assert(nargs >= 0);
+    assert(kwargs != NULL);
+    assert(PyDict_Check(kwargs));
+
+    Py_ssize_t nkwargs = PyDict_GET_SIZE(kwargs);
+    /* Check for overflow in the PyMem_Malloc() call below. The subtraction
+     * in this check cannot overflow: both maxnargs and nkwargs are
+     * non-negative signed integers, so their difference fits in the type. */
+    Py_ssize_t maxnargs = PY_SSIZE_T_MAX / sizeof(args[0]) - 1;
+    if (nargs > maxnargs - nkwargs) {
         PyErr_NoMemory();
-        return -1;
+        return NULL;
     }
 
-    stack = PyMem_Malloc((nargs + nkwargs) * sizeof(stack[0]));
+    /* Add 1 to support PY_VECTORCALL_ARGUMENTS_OFFSET */
+    PyObject **stack = PyMem_Malloc((1 + nargs + nkwargs) * sizeof(args[0]));
     if (stack == NULL) {
         PyErr_NoMemory();
-        return -1;
+        return NULL;
     }
 
-    kwnames = PyTuple_New(nkwargs);
+    PyObject *kwnames = PyTuple_New(nkwargs);
     if (kwnames == NULL) {
         PyMem_Free(stack);
-        return -1;
+        return NULL;
     }
 
+    stack++;  /* For PY_VECTORCALL_ARGUMENTS_OFFSET */
+
     /* Copy positional arguments */
-    for (i = 0; i < nargs; i++) {
+    for (Py_ssize_t i = 0; i < nargs; i++) {
         Py_INCREF(args[i]);
         stack[i] = args[i];
     }
 
-    kwstack = stack + nargs;
-    pos = i = 0;
+    PyObject **kwstack = stack + nargs;
     /* This loop doesn't support lookup function mutating the dictionary
        to change its size. It's a deliberate choice for speed, this function is
        called in the performance critical hot code. */
+    Py_ssize_t pos = 0, i = 0;
+    PyObject *key, *value;
     while (PyDict_Next(kwargs, &pos, &key, &value)) {
         Py_INCREF(key);
         Py_INCREF(value);
@@ -1261,7 +1272,18 @@ _PyStack_UnpackDict(PyObject *const *args, Py_ssize_t nargs, PyObject *kwargs,
         i++;
     }
 
-    *p_stack = stack;
     *p_kwnames = kwnames;
-    return 0;
+    return stack;
+}
+
+static void
+_PyStack_UnpackDict_Free(PyObject *const *stack, Py_ssize_t nargs,
+                         PyObject *kwnames)
+{
+    Py_ssize_t n = PyTuple_GET_SIZE(kwnames) + nargs;
+    for (Py_ssize_t i = 0; i < n; i++) {
+        Py_DECREF(stack[i]);
+    }
+    PyMem_Free((PyObject **)stack - 1);
+    Py_DECREF(kwnames);
 }


From webhook-mailer at python.org  Tue Jul  2 06:46:05 2019
From: webhook-mailer at python.org (Victor Stinner)
Date: Tue, 02 Jul 2019 10:46:05 -0000
Subject: [Python-checkins] bpo-37335: Fix test_c_locale_coercion to handle
 any ASCII alias (GH-14449)
Message-ID: <mailman.207.1562064367.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/c53173aa00689aa1be17ce5406289718f6b30532
commit: c53173aa00689aa1be17ce5406289718f6b30532
branch: 3.7
author: Jakub Kul?k <Kulikjak at gmail.com>
committer: Victor Stinner <vstinner at redhat.com>
date: 2019-07-02T12:46:00+02:00
summary:

bpo-37335: Fix test_c_locale_coercion to handle any ASCII alias (GH-14449)

Fix unexpected ASCII aliases in locale coercion tests: normalize encoding
names with codecs.lookup(encoding).name.

files:
A Misc/NEWS.d/next/Tests/2019-06-28-16-54-46.bpo-37335.LLzOx8.rst
M Lib/test/test_c_locale_coercion.py

diff --git a/Lib/test/test_c_locale_coercion.py b/Lib/test/test_c_locale_coercion.py
index f2351fa5a2ea..94391c87995a 100644
--- a/Lib/test/test_c_locale_coercion.py
+++ b/Lib/test/test_c_locale_coercion.py
@@ -97,11 +97,11 @@ def _set_locale_in_subprocess(locale_name):
 class EncodingDetails(_EncodingDetails):
     # XXX (ncoghlan): Using JSON for child state reporting may be less fragile
     CHILD_PROCESS_SCRIPT = ";".join([
-        "import sys, os",
-        "print(sys.getfilesystemencoding())",
-        "print(sys.stdin.encoding + ':' + sys.stdin.errors)",
-        "print(sys.stdout.encoding + ':' + sys.stdout.errors)",
-        "print(sys.stderr.encoding + ':' + sys.stderr.errors)",
+        "import sys, os, codecs",
+        "print(codecs.lookup(sys.getfilesystemencoding()).name)",
+        "print(codecs.lookup(sys.stdin.encoding).name + ':' + sys.stdin.errors)",
+        "print(codecs.lookup(sys.stdout.encoding).name + ':' + sys.stdout.errors)",
+        "print(codecs.lookup(sys.stderr.encoding).name + ':' + sys.stderr.errors)",
         "print(os.environ.get('LANG', 'not set'))",
         "print(os.environ.get('LC_CTYPE', 'not set'))",
         "print(os.environ.get('LC_ALL', 'not set'))",
@@ -116,28 +116,15 @@ def get_expected_details(cls, coercion_expected, fs_encoding, stream_encoding, e
         stream_info = 2*[_stream.format("surrogateescape")]
         # stderr should always use backslashreplace
         stream_info.append(_stream.format("backslashreplace"))
-        expected_lang = env_vars.get("LANG", "not set").lower()
+        expected_lang = env_vars.get("LANG", "not set")
         if coercion_expected:
-            expected_lc_ctype = CLI_COERCION_TARGET.lower()
+            expected_lc_ctype = CLI_COERCION_TARGET
         else:
-            expected_lc_ctype = env_vars.get("LC_CTYPE", "not set").lower()
-        expected_lc_all = env_vars.get("LC_ALL", "not set").lower()
+            expected_lc_ctype = env_vars.get("LC_CTYPE", "not set")
+        expected_lc_all = env_vars.get("LC_ALL", "not set")
         env_info = expected_lang, expected_lc_ctype, expected_lc_all
         return dict(cls(fs_encoding, *stream_info, *env_info)._asdict())
 
-    @staticmethod
-    def _handle_output_variations(data):
-        """Adjust the output to handle platform specific idiosyncrasies
-
-        * Some platforms report ASCII as ANSI_X3.4-1968
-        * Some platforms report ASCII as US-ASCII
-        * Some platforms report UTF-8 instead of utf-8
-        """
-        data = data.replace(b"ANSI_X3.4-1968", b"ascii")
-        data = data.replace(b"US-ASCII", b"ascii")
-        data = data.lower()
-        return data
-
     @classmethod
     def get_child_details(cls, env_vars):
         """Retrieves fsencoding and standard stream details from a child process
@@ -157,8 +144,7 @@ def get_child_details(cls, env_vars):
         if not result.rc == 0:
             result.fail(py_cmd)
         # All subprocess outputs in this test case should be pure ASCII
-        adjusted_output = cls._handle_output_variations(result.out)
-        stdout_lines = adjusted_output.decode("ascii").splitlines()
+        stdout_lines = result.out.decode("ascii").splitlines()
         child_encoding_details = dict(cls(*stdout_lines)._asdict())
         stderr_lines = result.err.decode("ascii").rstrip().splitlines()
         return child_encoding_details, stderr_lines
diff --git a/Misc/NEWS.d/next/Tests/2019-06-28-16-54-46.bpo-37335.LLzOx8.rst b/Misc/NEWS.d/next/Tests/2019-06-28-16-54-46.bpo-37335.LLzOx8.rst
new file mode 100644
index 000000000000..71fad15dd8e8
--- /dev/null
+++ b/Misc/NEWS.d/next/Tests/2019-06-28-16-54-46.bpo-37335.LLzOx8.rst
@@ -0,0 +1,2 @@
+Improve locale coercion tests by using codec lookup instead of more fragile
+replace().


From webhook-mailer at python.org  Tue Jul  2 06:48:32 2019
From: webhook-mailer at python.org (Victor Stinner)
Date: Tue, 02 Jul 2019 10:48:32 -0000
Subject: [Python-checkins] bpo-37335,
 test_c_locale_coercion: Remove unnecessary code (GH-14447)
Message-ID: <mailman.208.1562064514.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/61bf97e91620e020939d57a36918ab22579920ff
commit: 61bf97e91620e020939d57a36918ab22579920ff
branch: master
author: Jakub Kul?k <Kulikjak at gmail.com>
committer: Victor Stinner <vstinner at redhat.com>
date: 2019-07-02T12:48:28+02:00
summary:

bpo-37335, test_c_locale_coercion: Remove unnecessary code (GH-14447)

Python initialization now ensures that sys stream encoding
names are always normalized by codecs.lookup(encoding).name.
Simplify test_c_locale_coercion: it doesn't have to normalize
encoding names anymore.

files:
A Misc/NEWS.d/next/Tests/2019-06-28-16-37-52.bpo-37335.o5S2hY.rst
M Lib/test/test_c_locale_coercion.py

diff --git a/Lib/test/test_c_locale_coercion.py b/Lib/test/test_c_locale_coercion.py
index 8149e2b98bb3..fb599b0fcb7a 100644
--- a/Lib/test/test_c_locale_coercion.py
+++ b/Lib/test/test_c_locale_coercion.py
@@ -116,28 +116,15 @@ def get_expected_details(cls, coercion_expected, fs_encoding, stream_encoding, e
         stream_info = 2*[_stream.format("surrogateescape")]
         # stderr should always use backslashreplace
         stream_info.append(_stream.format("backslashreplace"))
-        expected_lang = env_vars.get("LANG", "not set").lower()
+        expected_lang = env_vars.get("LANG", "not set")
         if coercion_expected:
-            expected_lc_ctype = CLI_COERCION_TARGET.lower()
+            expected_lc_ctype = CLI_COERCION_TARGET
         else:
-            expected_lc_ctype = env_vars.get("LC_CTYPE", "not set").lower()
-        expected_lc_all = env_vars.get("LC_ALL", "not set").lower()
+            expected_lc_ctype = env_vars.get("LC_CTYPE", "not set")
+        expected_lc_all = env_vars.get("LC_ALL", "not set")
         env_info = expected_lang, expected_lc_ctype, expected_lc_all
         return dict(cls(fs_encoding, *stream_info, *env_info)._asdict())
 
-    @staticmethod
-    def _handle_output_variations(data):
-        """Adjust the output to handle platform specific idiosyncrasies
-
-        * Some platforms report ASCII as ANSI_X3.4-1968
-        * Some platforms report ASCII as US-ASCII
-        * Some platforms report UTF-8 instead of utf-8
-        """
-        data = data.replace(b"ANSI_X3.4-1968", b"ascii")
-        data = data.replace(b"US-ASCII", b"ascii")
-        data = data.lower()
-        return data
-
     @classmethod
     def get_child_details(cls, env_vars):
         """Retrieves fsencoding and standard stream details from a child process
@@ -157,8 +144,7 @@ def get_child_details(cls, env_vars):
         if not result.rc == 0:
             result.fail(py_cmd)
         # All subprocess outputs in this test case should be pure ASCII
-        adjusted_output = cls._handle_output_variations(result.out)
-        stdout_lines = adjusted_output.decode("ascii").splitlines()
+        stdout_lines = result.out.decode("ascii").splitlines()
         child_encoding_details = dict(cls(*stdout_lines)._asdict())
         stderr_lines = result.err.decode("ascii").rstrip().splitlines()
         return child_encoding_details, stderr_lines
diff --git a/Misc/NEWS.d/next/Tests/2019-06-28-16-37-52.bpo-37335.o5S2hY.rst b/Misc/NEWS.d/next/Tests/2019-06-28-16-37-52.bpo-37335.o5S2hY.rst
new file mode 100644
index 000000000000..cb884d926590
--- /dev/null
+++ b/Misc/NEWS.d/next/Tests/2019-06-28-16-37-52.bpo-37335.o5S2hY.rst
@@ -0,0 +1 @@
+Remove no longer necessary code from c locale coercion tests


From webhook-mailer at python.org  Tue Jul  2 07:18:44 2019
From: webhook-mailer at python.org (Miss Islington (bot))
Date: Tue, 02 Jul 2019 11:18:44 -0000
Subject: [Python-checkins] bpo-37335,
 test_c_locale_coercion: Remove unnecessary code (GH-14447)
Message-ID: <mailman.209.1562066325.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/518dc94e423398f7b0b5fd7bd5b84f138618e68e
commit: 518dc94e423398f7b0b5fd7bd5b84f138618e68e
branch: 3.8
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: GitHub <noreply at github.com>
date: 2019-07-02T04:18:40-07:00
summary:

bpo-37335, test_c_locale_coercion: Remove unnecessary code (GH-14447)


Python initialization now ensures that sys stream encoding
names are always normalized by codecs.lookup(encoding).name.
Simplify test_c_locale_coercion: it doesn't have to normalize
encoding names anymore.
(cherry picked from commit 61bf97e91620e020939d57a36918ab22579920ff)

Co-authored-by: Jakub Kul?k <Kulikjak at gmail.com>

files:
A Misc/NEWS.d/next/Tests/2019-06-28-16-37-52.bpo-37335.o5S2hY.rst
M Lib/test/test_c_locale_coercion.py

diff --git a/Lib/test/test_c_locale_coercion.py b/Lib/test/test_c_locale_coercion.py
index 8149e2b98bb3..fb599b0fcb7a 100644
--- a/Lib/test/test_c_locale_coercion.py
+++ b/Lib/test/test_c_locale_coercion.py
@@ -116,28 +116,15 @@ def get_expected_details(cls, coercion_expected, fs_encoding, stream_encoding, e
         stream_info = 2*[_stream.format("surrogateescape")]
         # stderr should always use backslashreplace
         stream_info.append(_stream.format("backslashreplace"))
-        expected_lang = env_vars.get("LANG", "not set").lower()
+        expected_lang = env_vars.get("LANG", "not set")
         if coercion_expected:
-            expected_lc_ctype = CLI_COERCION_TARGET.lower()
+            expected_lc_ctype = CLI_COERCION_TARGET
         else:
-            expected_lc_ctype = env_vars.get("LC_CTYPE", "not set").lower()
-        expected_lc_all = env_vars.get("LC_ALL", "not set").lower()
+            expected_lc_ctype = env_vars.get("LC_CTYPE", "not set")
+        expected_lc_all = env_vars.get("LC_ALL", "not set")
         env_info = expected_lang, expected_lc_ctype, expected_lc_all
         return dict(cls(fs_encoding, *stream_info, *env_info)._asdict())
 
-    @staticmethod
-    def _handle_output_variations(data):
-        """Adjust the output to handle platform specific idiosyncrasies
-
-        * Some platforms report ASCII as ANSI_X3.4-1968
-        * Some platforms report ASCII as US-ASCII
-        * Some platforms report UTF-8 instead of utf-8
-        """
-        data = data.replace(b"ANSI_X3.4-1968", b"ascii")
-        data = data.replace(b"US-ASCII", b"ascii")
-        data = data.lower()
-        return data
-
     @classmethod
     def get_child_details(cls, env_vars):
         """Retrieves fsencoding and standard stream details from a child process
@@ -157,8 +144,7 @@ def get_child_details(cls, env_vars):
         if not result.rc == 0:
             result.fail(py_cmd)
         # All subprocess outputs in this test case should be pure ASCII
-        adjusted_output = cls._handle_output_variations(result.out)
-        stdout_lines = adjusted_output.decode("ascii").splitlines()
+        stdout_lines = result.out.decode("ascii").splitlines()
         child_encoding_details = dict(cls(*stdout_lines)._asdict())
         stderr_lines = result.err.decode("ascii").rstrip().splitlines()
         return child_encoding_details, stderr_lines
diff --git a/Misc/NEWS.d/next/Tests/2019-06-28-16-37-52.bpo-37335.o5S2hY.rst b/Misc/NEWS.d/next/Tests/2019-06-28-16-37-52.bpo-37335.o5S2hY.rst
new file mode 100644
index 000000000000..cb884d926590
--- /dev/null
+++ b/Misc/NEWS.d/next/Tests/2019-06-28-16-37-52.bpo-37335.o5S2hY.rst
@@ -0,0 +1 @@
+Remove no longer necessary code from c locale coercion tests


From webhook-mailer at python.org  Tue Jul  2 07:32:36 2019
From: webhook-mailer at python.org (Victor Stinner)
Date: Tue, 02 Jul 2019 11:32:36 -0000
Subject: [Python-checkins] bpo-37421: multiprocessing tests call
 _run_finalizers() (GH-14527)
Message-ID: <mailman.210.1562067157.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/039fb49c185570ab7b02f13fbdc51c859cfd831e
commit: 039fb49c185570ab7b02f13fbdc51c859cfd831e
branch: master
author: Victor Stinner <vstinner at redhat.com>
committer: GitHub <noreply at github.com>
date: 2019-07-02T13:32:32+02:00
summary:

bpo-37421: multiprocessing tests call _run_finalizers() (GH-14527)

multiprocessing tests now call explicitly _run_finalizers() to remove
immediately temporary directories created by
multiprocessing.util.get_temp_dir().

files:
A Misc/NEWS.d/next/Tests/2019-07-01-19-57-26.bpo-37421.NFH1f0.rst
M Lib/test/_test_multiprocessing.py

diff --git a/Lib/test/_test_multiprocessing.py b/Lib/test/_test_multiprocessing.py
index eef262d723da..af5b91d17e75 100644
--- a/Lib/test/_test_multiprocessing.py
+++ b/Lib/test/_test_multiprocessing.py
@@ -5651,6 +5651,9 @@ def tearDownModule():
         if need_sleep:
             time.sleep(0.5)
         multiprocessing.process._cleanup()
+        # bpo-37421: Explicitly call _run_finalizers() to remove immediately
+        # temporary directories created by multiprocessing.util.get_temp_dir().
+        multiprocessing.util._run_finalizers()
         test.support.gc_collect()
 
     remote_globs['setUpModule'] = setUpModule
diff --git a/Misc/NEWS.d/next/Tests/2019-07-01-19-57-26.bpo-37421.NFH1f0.rst b/Misc/NEWS.d/next/Tests/2019-07-01-19-57-26.bpo-37421.NFH1f0.rst
new file mode 100644
index 000000000000..c379b504ba8a
--- /dev/null
+++ b/Misc/NEWS.d/next/Tests/2019-07-01-19-57-26.bpo-37421.NFH1f0.rst
@@ -0,0 +1,2 @@
+multiprocessing tests now explicitly call ``_run_finalizers()`` to
+immediately remove temporary directories created by tests.


From webhook-mailer at python.org  Tue Jul  2 07:58:18 2019
From: webhook-mailer at python.org (Miss Islington (bot))
Date: Tue, 02 Jul 2019 11:58:18 -0000
Subject: [Python-checkins] bpo-37421: multiprocessing tests call
 _run_finalizers() (GH-14527)
Message-ID: <mailman.211.1562068699.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/632cb36084dc9d13f1cdb31a0e7e3ba80745a51a
commit: 632cb36084dc9d13f1cdb31a0e7e3ba80745a51a
branch: 3.8
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: GitHub <noreply at github.com>
date: 2019-07-02T04:58:05-07:00
summary:

bpo-37421: multiprocessing tests call _run_finalizers() (GH-14527)


multiprocessing tests now call explicitly _run_finalizers() to remove
immediately temporary directories created by
multiprocessing.util.get_temp_dir().
(cherry picked from commit 039fb49c185570ab7b02f13fbdc51c859cfd831e)

Co-authored-by: Victor Stinner <vstinner at redhat.com>

files:
A Misc/NEWS.d/next/Tests/2019-07-01-19-57-26.bpo-37421.NFH1f0.rst
M Lib/test/_test_multiprocessing.py

diff --git a/Lib/test/_test_multiprocessing.py b/Lib/test/_test_multiprocessing.py
index eef262d723da..af5b91d17e75 100644
--- a/Lib/test/_test_multiprocessing.py
+++ b/Lib/test/_test_multiprocessing.py
@@ -5651,6 +5651,9 @@ def tearDownModule():
         if need_sleep:
             time.sleep(0.5)
         multiprocessing.process._cleanup()
+        # bpo-37421: Explicitly call _run_finalizers() to remove immediately
+        # temporary directories created by multiprocessing.util.get_temp_dir().
+        multiprocessing.util._run_finalizers()
         test.support.gc_collect()
 
     remote_globs['setUpModule'] = setUpModule
diff --git a/Misc/NEWS.d/next/Tests/2019-07-01-19-57-26.bpo-37421.NFH1f0.rst b/Misc/NEWS.d/next/Tests/2019-07-01-19-57-26.bpo-37421.NFH1f0.rst
new file mode 100644
index 000000000000..c379b504ba8a
--- /dev/null
+++ b/Misc/NEWS.d/next/Tests/2019-07-01-19-57-26.bpo-37421.NFH1f0.rst
@@ -0,0 +1,2 @@
+multiprocessing tests now explicitly call ``_run_finalizers()`` to
+immediately remove temporary directories created by tests.


From webhook-mailer at python.org  Tue Jul  2 08:42:45 2019
From: webhook-mailer at python.org (Victor Stinner)
Date: Tue, 02 Jul 2019 12:42:45 -0000
Subject: [Python-checkins] Revert "Remove unused imports in tests (GH-14518)
 (GH-14522)" (GH-14555)
Message-ID: <mailman.212.1562071366.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/19b8d903b0dd43dc405c4d6e1c61c3429020545e
commit: 19b8d903b0dd43dc405c4d6e1c61c3429020545e
branch: 3.7
author: Victor Stinner <vstinner at redhat.com>
committer: GitHub <noreply at github.com>
date: 2019-07-02T14:42:39+02:00
summary:

Revert "Remove unused imports in tests (GH-14518) (GH-14522)" (GH-14555)

This reverts commit e34b5f4d6483187969d5149c801d056b72ef2ddb.

files:
M Lib/test/libregrtest/main.py
M Lib/test/support/__init__.py
M Lib/test/test_aifc.py
M Lib/test/test_argparse.py
M Lib/test/test_asynchat.py
M Lib/test/test_asyncio/test_pep492.py
M Lib/test/test_asyncio/test_sslproto.py
M Lib/test/test_asyncio/test_unix_events.py
M Lib/test/test_c_locale_coercion.py
M Lib/test/test_capi.py
M Lib/test/test_cmd_line.py
M Lib/test/test_collections.py
M Lib/test/test_contextlib.py
M Lib/test/test_coroutines.py
M Lib/test/test_docxmlrpc.py
M Lib/test/test_email/test_policy.py
M Lib/test/test_exceptions.py
M Lib/test/test_faulthandler.py
M Lib/test/test_fork1.py
M Lib/test/test_frozen.py
M Lib/test/test_gdb.py
M Lib/test/test_generators.py
M Lib/test/test_gettext.py
M Lib/test/test_grammar.py
M Lib/test/test_imaplib.py
M Lib/test/test_import/__init__.py
M Lib/test/test_importlib/test_locks.py
M Lib/test/test_locale.py
M Lib/test/test_netrc.py
M Lib/test/test_os.py
M Lib/test/test_posixpath.py
M Lib/test/test_pyclbr.py
M Lib/test/test_pydoc.py
M Lib/test/test_queue.py
M Lib/test/test_resource.py
M Lib/test/test_runpy.py
M Lib/test/test_sax.py
M Lib/test/test_signal.py
M Lib/test/test_smtplib.py
M Lib/test/test_subprocess.py
M Lib/test/test_thread.py
M Lib/test/test_threaded_import.py
M Lib/test/test_threadedtempfile.py
M Lib/test/test_time.py
M Lib/test/test_tokenize.py
M Lib/test/test_traceback.py
M Lib/test/test_utf8_mode.py
M Lib/test/test_venv.py

diff --git a/Lib/test/libregrtest/main.py b/Lib/test/libregrtest/main.py
index e2274254fdb8..1dfbe47a2fab 100644
--- a/Lib/test/libregrtest/main.py
+++ b/Lib/test/libregrtest/main.py
@@ -587,6 +587,7 @@ def create_temp_dir(self):
 
     def cleanup(self):
         import glob
+        import shutil
 
         path = os.path.join(self.tmp_dir, 'test_python_*')
         print("Cleanup %s directory" % self.tmp_dir)
diff --git a/Lib/test/support/__init__.py b/Lib/test/support/__init__.py
index 6d10e8b576e4..87bfa9f54627 100644
--- a/Lib/test/support/__init__.py
+++ b/Lib/test/support/__init__.py
@@ -5,6 +5,7 @@
 
 import collections.abc
 import contextlib
+import datetime
 import errno
 import faulthandler
 import fnmatch
@@ -12,6 +13,7 @@
 import gc
 import importlib
 import importlib.util
+import io
 import logging.handlers
 import nntplib
 import os
diff --git a/Lib/test/test_aifc.py b/Lib/test/test_aifc.py
index e82cfc1a4690..ff52f5b6feb8 100644
--- a/Lib/test/test_aifc.py
+++ b/Lib/test/test_aifc.py
@@ -7,6 +7,7 @@
 import sys
 import struct
 import aifc
+import warnings
 
 
 class AifcTest(audiotests.AudioWriteTests,
diff --git a/Lib/test/test_argparse.py b/Lib/test/test_argparse.py
index 0c342e2e4e0d..51f0effaf2ff 100644
--- a/Lib/test/test_argparse.py
+++ b/Lib/test/test_argparse.py
@@ -1,5 +1,6 @@
 # Author: Steven J. Bethard <steven.bethard at gmail.com>.
 
+import codecs
 import inspect
 import os
 import shutil
diff --git a/Lib/test/test_asynchat.py b/Lib/test/test_asynchat.py
index 14c0ec43d422..1d147c741961 100644
--- a/Lib/test/test_asynchat.py
+++ b/Lib/test/test_asynchat.py
@@ -7,6 +7,7 @@
 import errno
 import socket
 import sys
+import _thread as thread
 import threading
 import time
 import unittest
diff --git a/Lib/test/test_asyncio/test_pep492.py b/Lib/test/test_asyncio/test_pep492.py
index ac3ae6811fb5..f2d588f54445 100644
--- a/Lib/test/test_asyncio/test_pep492.py
+++ b/Lib/test/test_asyncio/test_pep492.py
@@ -4,6 +4,7 @@
 import types
 import unittest
 
+from test import support
 from unittest import mock
 
 import asyncio
diff --git a/Lib/test/test_asyncio/test_sslproto.py b/Lib/test/test_asyncio/test_sslproto.py
index 3b9c12f24ed3..866ef81fb2ee 100644
--- a/Lib/test/test_asyncio/test_sslproto.py
+++ b/Lib/test/test_asyncio/test_sslproto.py
@@ -15,6 +15,7 @@
 from asyncio import log
 from asyncio import protocols
 from asyncio import sslproto
+from asyncio import tasks
 from test.test_asyncio import utils as test_utils
 from test.test_asyncio import functional as func_tests
 
diff --git a/Lib/test/test_asyncio/test_unix_events.py b/Lib/test/test_asyncio/test_unix_events.py
index 51d474cf152c..ec171fa83da3 100644
--- a/Lib/test/test_asyncio/test_unix_events.py
+++ b/Lib/test/test_asyncio/test_unix_events.py
@@ -22,6 +22,7 @@
 
 import asyncio
 from asyncio import log
+from asyncio import base_events
 from asyncio import events
 from asyncio import unix_events
 from test.test_asyncio import utils as test_utils
diff --git a/Lib/test/test_c_locale_coercion.py b/Lib/test/test_c_locale_coercion.py
index 94391c87995a..0355547436b2 100644
--- a/Lib/test/test_c_locale_coercion.py
+++ b/Lib/test/test_c_locale_coercion.py
@@ -2,6 +2,7 @@
 
 import locale
 import os
+import shutil
 import subprocess
 import sys
 import sysconfig
@@ -9,8 +10,10 @@
 from collections import namedtuple
 
 import test.support
-from test.support.script_helper import run_python_until_end
-
+from test.support.script_helper import (
+    run_python_until_end,
+    interpreter_requires_environment,
+)
 
 # Set the list of ways we expect to be able to ask for the "C" locale
 EXPECTED_C_LOCALE_EQUIVALENTS = ["C", "invalid.ascii"]
diff --git a/Lib/test/test_capi.py b/Lib/test/test_capi.py
index 6eb3bd967b86..d94ee0227c87 100644
--- a/Lib/test/test_capi.py
+++ b/Lib/test/test_capi.py
@@ -8,6 +8,7 @@
 import re
 import subprocess
 import sys
+import sysconfig
 import textwrap
 import threading
 import time
diff --git a/Lib/test/test_cmd_line.py b/Lib/test/test_cmd_line.py
index f90bfb067483..95cdc8db7efb 100644
--- a/Lib/test/test_cmd_line.py
+++ b/Lib/test/test_cmd_line.py
@@ -5,6 +5,7 @@
 import os
 import subprocess
 import sys
+import sysconfig
 import tempfile
 import unittest
 from test import support
diff --git a/Lib/test/test_collections.py b/Lib/test/test_collections.py
index 1aca9facda69..16735b815e53 100644
--- a/Lib/test/test_collections.py
+++ b/Lib/test/test_collections.py
@@ -3,9 +3,11 @@
 import collections
 import copy
 import doctest
+import keyword
 import operator
 import pickle
 from random import choice, randrange
+import re
 import string
 import sys
 from test import support
diff --git a/Lib/test/test_contextlib.py b/Lib/test/test_contextlib.py
index ced2290288db..30c2e27b3c7e 100644
--- a/Lib/test/test_contextlib.py
+++ b/Lib/test/test_contextlib.py
@@ -1,5 +1,6 @@
 """Unit tests for contextlib.py, and other context managers."""
 
+import asyncio
 import io
 import sys
 import tempfile
diff --git a/Lib/test/test_coroutines.py b/Lib/test/test_coroutines.py
index f32320956bcc..ac24f3976738 100644
--- a/Lib/test/test_coroutines.py
+++ b/Lib/test/test_coroutines.py
@@ -2,6 +2,7 @@
 import copy
 import inspect
 import pickle
+import re
 import sys
 import types
 import unittest
diff --git a/Lib/test/test_docxmlrpc.py b/Lib/test/test_docxmlrpc.py
index 116e626740df..f077f05f5b4f 100644
--- a/Lib/test/test_docxmlrpc.py
+++ b/Lib/test/test_docxmlrpc.py
@@ -2,6 +2,7 @@
 import http.client
 import sys
 import threading
+from test import support
 import unittest
 
 def make_request_and_skipIf(condition, reason):
diff --git a/Lib/test/test_email/test_policy.py b/Lib/test/test_email/test_policy.py
index 1e39aa062c0a..0aea934df434 100644
--- a/Lib/test/test_email/test_policy.py
+++ b/Lib/test/test_email/test_policy.py
@@ -1,4 +1,5 @@
 import io
+import sys
 import types
 import textwrap
 import unittest
diff --git a/Lib/test/test_exceptions.py b/Lib/test/test_exceptions.py
index 0196c4d0005b..9d10df5f9425 100644
--- a/Lib/test/test_exceptions.py
+++ b/Lib/test/test_exceptions.py
@@ -9,7 +9,7 @@
 import errno
 
 from test.support import (TESTFN, captured_stderr, check_impl_detail,
-                          check_warnings, cpython_only, gc_collect,
+                          check_warnings, cpython_only, gc_collect, run_unittest,
                           no_tracing, unlink, import_module, script_helper,
                           SuppressCrashReport)
 class NaiveException(Exception):
diff --git a/Lib/test/test_faulthandler.py b/Lib/test/test_faulthandler.py
index 5283596cebe4..700b7ad6b885 100644
--- a/Lib/test/test_faulthandler.py
+++ b/Lib/test/test_faulthandler.py
@@ -9,6 +9,7 @@
 from test import support
 from test.support import script_helper, is_android
 import tempfile
+import threading
 import unittest
 from textwrap import dedent
 
diff --git a/Lib/test/test_fork1.py b/Lib/test/test_fork1.py
index 2ab856ff5690..9ca9724c4c91 100644
--- a/Lib/test/test_fork1.py
+++ b/Lib/test/test_fork1.py
@@ -10,7 +10,8 @@
 import unittest
 
 from test.fork_wait import ForkWait
-from test.support import reap_children, get_attribute, verbose
+from test.support import (reap_children, get_attribute,
+                          import_module, verbose)
 
 
 # Skip test if fork does not exist.
diff --git a/Lib/test/test_frozen.py b/Lib/test/test_frozen.py
index 142f17d518e7..a7c748422b1d 100644
--- a/Lib/test/test_frozen.py
+++ b/Lib/test/test_frozen.py
@@ -13,6 +13,7 @@
 import sys
 import unittest
 from test.support import captured_stdout
+from importlib import util
 
 
 class TestFrozen(unittest.TestCase):
diff --git a/Lib/test/test_gdb.py b/Lib/test/test_gdb.py
index b78c0845b1df..7758e1fcd86c 100644
--- a/Lib/test/test_gdb.py
+++ b/Lib/test/test_gdb.py
@@ -3,6 +3,7 @@
 # The code for testing gdb was adapted from similar work in Unladen Swallow's
 # Lib/test/test_jit_gdb.py
 
+import locale
 import os
 import platform
 import re
diff --git a/Lib/test/test_generators.py b/Lib/test/test_generators.py
index c45086562d36..7a21cb7e954a 100644
--- a/Lib/test/test_generators.py
+++ b/Lib/test/test_generators.py
@@ -3,6 +3,7 @@
 import pickle
 import sys
 import unittest
+import warnings
 import weakref
 import inspect
 
diff --git a/Lib/test/test_gettext.py b/Lib/test/test_gettext.py
index fac38000e635..b5ed05eab7bb 100644
--- a/Lib/test/test_gettext.py
+++ b/Lib/test/test_gettext.py
@@ -1,6 +1,7 @@
 import os
 import base64
 import gettext
+import locale
 import unittest
 
 from test import support
diff --git a/Lib/test/test_grammar.py b/Lib/test/test_grammar.py
index 241ac853d73c..88c22b89d444 100644
--- a/Lib/test/test_grammar.py
+++ b/Lib/test/test_grammar.py
@@ -4,6 +4,7 @@
 from test.support import check_syntax_error
 import inspect
 import unittest
+import sys
 # testing import *
 from sys import *
 
@@ -11,6 +12,7 @@
 # with import machinery
 import test.ann_module as ann_module
 import typing
+from collections import ChainMap
 from test import ann_module2
 import test
 
diff --git a/Lib/test/test_imaplib.py b/Lib/test/test_imaplib.py
index 8ab532af3f0d..9305e47ee993 100644
--- a/Lib/test/test_imaplib.py
+++ b/Lib/test/test_imaplib.py
@@ -1,6 +1,7 @@
 from test import support
 
 from contextlib import contextmanager
+import errno
 import imaplib
 import os.path
 import socketserver
diff --git a/Lib/test/test_import/__init__.py b/Lib/test/test_import/__init__.py
index 4c4f0d9efc03..1fc4de11e178 100644
--- a/Lib/test/test_import/__init__.py
+++ b/Lib/test/test_import/__init__.py
@@ -5,6 +5,7 @@
 import builtins
 import marshal
 import os
+import platform
 import py_compile
 import random
 import stat
@@ -19,9 +20,9 @@
 
 import test.support
 from test.support import (
-    TESTFN, forget, is_jython,
-    make_legacy_pyc, rmtree, swap_attr, swap_item, temp_umask,
-    unlink, unload, cpython_only, TESTFN_UNENCODABLE,
+    EnvironmentVarGuard, TESTFN, check_warnings, forget, is_jython,
+    make_legacy_pyc, rmtree, run_unittest, swap_attr, swap_item, temp_umask,
+    unlink, unload, create_empty_file, cpython_only, TESTFN_UNENCODABLE,
     temp_dir, DirsOnSysPath)
 from test.support import script_helper
 from test.test_importlib.util import uncache
diff --git a/Lib/test/test_importlib/test_locks.py b/Lib/test/test_importlib/test_locks.py
index 21794d911ef6..d86172ab5837 100644
--- a/Lib/test/test_importlib/test_locks.py
+++ b/Lib/test/test_importlib/test_locks.py
@@ -4,6 +4,7 @@
 
 import sys
 import threading
+import unittest
 import weakref
 
 from test import support
diff --git a/Lib/test/test_locale.py b/Lib/test/test_locale.py
index 792a15c50f92..e2c2178ae6cc 100644
--- a/Lib/test/test_locale.py
+++ b/Lib/test/test_locale.py
@@ -3,7 +3,7 @@
 import locale
 import sys
 import codecs
-
+import warnings
 
 class BaseLocalizedTest(unittest.TestCase):
     #
diff --git a/Lib/test/test_netrc.py b/Lib/test/test_netrc.py
index ae53988c45a6..f59e5371acad 100644
--- a/Lib/test/test_netrc.py
+++ b/Lib/test/test_netrc.py
@@ -1,4 +1,5 @@
 import netrc, os, unittest, sys, tempfile, textwrap
+from unittest import mock
 from test import support
 
 
diff --git a/Lib/test/test_os.py b/Lib/test/test_os.py
index 1ec9a6a95091..8032da053067 100644
--- a/Lib/test/test_os.py
+++ b/Lib/test/test_os.py
@@ -9,6 +9,7 @@
 import decimal
 import errno
 import fractions
+import getpass
 import itertools
 import locale
 import mmap
diff --git a/Lib/test/test_posixpath.py b/Lib/test/test_posixpath.py
index 6bca89003a97..e73b31cb648b 100644
--- a/Lib/test/test_posixpath.py
+++ b/Lib/test/test_posixpath.py
@@ -1,6 +1,7 @@
 import os
 import posixpath
 import unittest
+import warnings
 from posixpath import realpath, abspath, dirname, basename
 from test import support, test_genericpath
 from test.support import FakePath
@@ -11,7 +12,6 @@
 except ImportError:
     posix = None
 
-
 # An absolute path to a temporary filename for testing. We can't rely on TESTFN
 # being an absolute path, so we need this.
 
diff --git a/Lib/test/test_pyclbr.py b/Lib/test/test_pyclbr.py
index 0489b41d7c7b..eaab591f74ef 100644
--- a/Lib/test/test_pyclbr.py
+++ b/Lib/test/test_pyclbr.py
@@ -3,11 +3,14 @@
    Nick Mathewson
 '''
 
+import os
 import sys
 from textwrap import dedent
 from types import FunctionType, MethodType, BuiltinFunctionType
 import pyclbr
 from unittest import TestCase, main as unittest_main
+from test import support
+from functools import partial
 
 StaticMethodType = type(staticmethod(lambda: None))
 ClassMethodType = type(classmethod(lambda c: None))
diff --git a/Lib/test/test_pydoc.py b/Lib/test/test_pydoc.py
index 8e30b4c8f675..198cea93eb52 100644
--- a/Lib/test/test_pydoc.py
+++ b/Lib/test/test_pydoc.py
@@ -21,6 +21,7 @@
 import xml.etree
 import xml.etree.ElementTree
 import textwrap
+import threading
 from io import StringIO
 from collections import namedtuple
 from test.support.script_helper import assert_python_ok
diff --git a/Lib/test/test_queue.py b/Lib/test/test_queue.py
index c8528f97741d..1a8d5f8856c5 100644
--- a/Lib/test/test_queue.py
+++ b/Lib/test/test_queue.py
@@ -1,8 +1,10 @@
 # Some simple queue module tests, plus some failure conditions
 # to ensure the Queue locks remain stable.
+import collections
 import itertools
 import queue
 import random
+import sys
 import threading
 import time
 import unittest
diff --git a/Lib/test/test_resource.py b/Lib/test/test_resource.py
index 62c7963fe699..b07eb73b2aeb 100644
--- a/Lib/test/test_resource.py
+++ b/Lib/test/test_resource.py
@@ -1,5 +1,6 @@
 import contextlib
 import sys
+import os
 import unittest
 from test import support
 import time
diff --git a/Lib/test/test_runpy.py b/Lib/test/test_runpy.py
index 0da6f3a60430..02b4d62567e5 100644
--- a/Lib/test/test_runpy.py
+++ b/Lib/test/test_runpy.py
@@ -11,7 +11,8 @@
 from test.support import (
     forget, make_legacy_pyc, unload, verbose, no_tracing,
     create_empty_file, temp_dir)
-from test.support.script_helper import make_script, make_zip_script
+from test.support.script_helper import (
+    make_pkg, make_script, make_zip_pkg, make_zip_script)
 
 
 import runpy
diff --git a/Lib/test/test_sax.py b/Lib/test/test_sax.py
index 251a03a54ddc..3044960a0ed1 100644
--- a/Lib/test/test_sax.py
+++ b/Lib/test/test_sax.py
@@ -17,6 +17,7 @@
 from xml.sax.xmlreader import InputSource, AttributesImpl, AttributesNSImpl
 from io import BytesIO, StringIO
 import codecs
+import gc
 import os.path
 import shutil
 from urllib.error import URLError
diff --git a/Lib/test/test_signal.py b/Lib/test/test_signal.py
index c3f5b148448c..406684bdbec7 100644
--- a/Lib/test/test_signal.py
+++ b/Lib/test/test_signal.py
@@ -5,6 +5,7 @@
 import statistics
 import subprocess
 import sys
+import threading
 import time
 import unittest
 from test import support
diff --git a/Lib/test/test_smtplib.py b/Lib/test/test_smtplib.py
index 4add8fcabfd1..b4149d3ef007 100644
--- a/Lib/test/test_smtplib.py
+++ b/Lib/test/test_smtplib.py
@@ -19,7 +19,7 @@
 
 import unittest
 from test import support, mock_socket
-from test.support import HOST
+from test.support import HOST, HOSTv4, HOSTv6
 from unittest.mock import Mock
 
 
diff --git a/Lib/test/test_subprocess.py b/Lib/test/test_subprocess.py
index 36cf22a9f898..8419061b2a90 100644
--- a/Lib/test/test_subprocess.py
+++ b/Lib/test/test_subprocess.py
@@ -3,6 +3,7 @@
 from test import support
 import subprocess
 import sys
+import platform
 import signal
 import io
 import itertools
@@ -19,12 +20,18 @@
 import textwrap
 from test.support import FakePath
 
+try:
+    import ctypes
+except ImportError:
+    ctypes = None
+else:
+    import ctypes.util
+
 try:
     import _testcapi
 except ImportError:
     _testcapi = None
 
-
 if support.PGO:
     raise unittest.SkipTest("test is not helpful for PGO")
 
diff --git a/Lib/test/test_thread.py b/Lib/test/test_thread.py
index f4eb830cf6d7..64ffe4605298 100644
--- a/Lib/test/test_thread.py
+++ b/Lib/test/test_thread.py
@@ -4,6 +4,7 @@
 from test import support
 import _thread as thread
 import time
+import sys
 import weakref
 
 from test import lock_tests
diff --git a/Lib/test/test_threaded_import.py b/Lib/test/test_threaded_import.py
index 8607f363db21..035344be4b89 100644
--- a/Lib/test/test_threaded_import.py
+++ b/Lib/test/test_threaded_import.py
@@ -15,7 +15,7 @@
 import unittest
 from unittest import mock
 from test.support import (
-    verbose, run_unittest, TESTFN, reap_threads,
+    verbose, import_module, run_unittest, TESTFN, reap_threads,
     forget, unlink, rmtree, start_threads)
 
 def task(N, done, done_tasks, errors):
diff --git a/Lib/test/test_threadedtempfile.py b/Lib/test/test_threadedtempfile.py
index e1d7a10179cc..f3d4ba36377d 100644
--- a/Lib/test/test_threadedtempfile.py
+++ b/Lib/test/test_threadedtempfile.py
@@ -13,22 +13,19 @@
 provoking a 2.0 failure under Linux.
 """
 
+NUM_THREADS = 20
+FILES_PER_THREAD = 50
+
 import tempfile
 
-from test.support import start_threads
+from test.support import start_threads, import_module
 import unittest
 import io
 import threading
 from traceback import print_exc
 
-
-NUM_THREADS = 20
-FILES_PER_THREAD = 50
-
-
 startEvent = threading.Event()
 
-
 class TempFileGreedy(threading.Thread):
     error_count = 0
     ok_count = 0
diff --git a/Lib/test/test_time.py b/Lib/test/test_time.py
index 35952799ba6d..4e31abf4ec8e 100644
--- a/Lib/test/test_time.py
+++ b/Lib/test/test_time.py
@@ -9,6 +9,7 @@
 import time
 import threading
 import unittest
+import warnings
 try:
     import _testcapi
 except ImportError:
diff --git a/Lib/test/test_tokenize.py b/Lib/test/test_tokenize.py
index 7457a7ed0434..d596f7db61ab 100644
--- a/Lib/test/test_tokenize.py
+++ b/Lib/test/test_tokenize.py
@@ -1,7 +1,7 @@
 from test import support
 from tokenize import (tokenize, _tokenize, untokenize, NUMBER, NAME, OP,
                      STRING, ENDMARKER, ENCODING, tok_name, detect_encoding,
-                     open as tokenize_open, Untokenizer,
+                     open as tokenize_open, Untokenizer, generate_tokens,
                      NEWLINE)
 from io import BytesIO
 import unittest
diff --git a/Lib/test/test_traceback.py b/Lib/test/test_traceback.py
index 8749d095ddee..8a3aa8a8648f 100644
--- a/Lib/test/test_traceback.py
+++ b/Lib/test/test_traceback.py
@@ -110,7 +110,7 @@ def test_encoded_file(self):
         # Test that tracebacks are correctly printed for encoded source files:
         # - correct line number (Issue2384)
         # - respect file encoding (Issue3975)
-        import sys, subprocess
+        import tempfile, sys, subprocess, os
 
         # The spawned subprocess has its stdout redirected to a PIPE, and its
         # encoding may be different from the current interpreter, on Windows
diff --git a/Lib/test/test_utf8_mode.py b/Lib/test/test_utf8_mode.py
index a7d1dc940ad6..06fe1979ddcc 100644
--- a/Lib/test/test_utf8_mode.py
+++ b/Lib/test/test_utf8_mode.py
@@ -3,6 +3,7 @@
 """
 
 import locale
+import os
 import sys
 import textwrap
 import unittest
diff --git a/Lib/test/test_venv.py b/Lib/test/test_venv.py
index 3821d9accfdf..67f9f46e65e0 100644
--- a/Lib/test/test_venv.py
+++ b/Lib/test/test_venv.py
@@ -15,6 +15,7 @@
 import tempfile
 from test.support import (captured_stdout, captured_stderr, requires_zlib,
                           can_symlink, EnvironmentVarGuard, rmtree)
+import threading
 import unittest
 import venv
 


From webhook-mailer at python.org  Tue Jul  2 08:50:23 2019
From: webhook-mailer at python.org (Victor Stinner)
Date: Tue, 02 Jul 2019 12:50:23 -0000
Subject: [Python-checkins] bpo-37421: urllib.request tests call urlcleanup()
 (GH-14529)
Message-ID: <mailman.213.1562071824.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/7cb9204ee1cf204f6f507d99a60f7c5bb359eebb
commit: 7cb9204ee1cf204f6f507d99a60f7c5bb359eebb
branch: master
author: Victor Stinner <vstinner at redhat.com>
committer: GitHub <noreply at github.com>
date: 2019-07-02T14:50:19+02:00
summary:

bpo-37421: urllib.request tests call urlcleanup() (GH-14529)

urllib.request tests now call urlcleanup() to remove temporary files
created by urlretrieve() tests and to clear the _opener global
variable set by urlopen() and functions calling indirectly urlopen().

regrtest now checks if urllib.request._url_tempfiles and
urllib.request._opener are changed by tests.

files:
A Misc/NEWS.d/next/Tests/2019-07-01-19-56-17.bpo-37421.bOe350.rst
M Lib/test/libregrtest/save_env.py
M Lib/test/test_robotparser.py
M Lib/test/test_sax.py
M Lib/test/test_urllib.py
M Lib/test/test_urllib2.py
M Lib/test/test_urllib2_localnet.py
M Lib/test/test_urllib2net.py
M Lib/test/test_urllibnet.py

diff --git a/Lib/test/libregrtest/save_env.py b/Lib/test/libregrtest/save_env.py
index 31931f2192f9..e7c27a698b06 100644
--- a/Lib/test/libregrtest/save_env.py
+++ b/Lib/test/libregrtest/save_env.py
@@ -7,6 +7,7 @@
 import sys
 import sysconfig
 import threading
+import urllib.request
 import warnings
 from test import support
 from test.libregrtest.utils import print_warning
@@ -68,8 +69,20 @@ def __init__(self, testname, verbose=0, quiet=False, *, pgo=False):
                  'files', 'locale', 'warnings.showwarning',
                  'shutil_archive_formats', 'shutil_unpack_formats',
                  'asyncio.events._event_loop_policy',
+                 'urllib.requests._url_tempfiles', 'urllib.requests._opener',
                 )
 
+    def get_urllib_requests__url_tempfiles(self):
+        return list(urllib.request._url_tempfiles)
+    def restore_urllib_requests__url_tempfiles(self, tempfiles):
+        for filename in tempfiles:
+            support.unlink(filename)
+
+    def get_urllib_requests__opener(self):
+        return urllib.request._opener
+    def restore_urllib_requests__opener(self, opener):
+        urllib.request._opener = opener
+
     def get_asyncio_events__event_loop_policy(self):
         return support.maybe_get_event_loop_policy()
     def restore_asyncio_events__event_loop_policy(self, policy):
diff --git a/Lib/test/test_robotparser.py b/Lib/test/test_robotparser.py
index 77cd7c4d29df..f28d8be5f3c4 100644
--- a/Lib/test/test_robotparser.py
+++ b/Lib/test/test_robotparser.py
@@ -309,6 +309,9 @@ def log_message(self, format, *args):
 class PasswordProtectedSiteTestCase(unittest.TestCase):
 
     def setUp(self):
+        # clear _opener global variable
+        self.addCleanup(urllib.request.urlcleanup)
+
         self.server = HTTPServer((support.HOST, 0), RobotHandler)
 
         self.t = threading.Thread(
diff --git a/Lib/test/test_sax.py b/Lib/test/test_sax.py
index da4eb1da3c6a..ce3a422b502a 100644
--- a/Lib/test/test_sax.py
+++ b/Lib/test/test_sax.py
@@ -20,6 +20,7 @@
 import os.path
 import shutil
 from urllib.error import URLError
+import urllib.request
 from test import support
 from test.support import findfile, run_unittest, FakePath, TESTFN
 
@@ -979,6 +980,9 @@ def test_expat_dtdhandler(self):
         self.assertEqual(handler._entities, [("img", None, "expat.gif", "GIF")])
 
     def test_expat_external_dtd_enabled(self):
+        # clear _opener global variable
+        self.addCleanup(urllib.request.urlcleanup)
+
         parser = create_parser()
         parser.setFeature(feature_external_ges, True)
         resolver = self.TestEntityRecorder()
diff --git a/Lib/test/test_urllib.py b/Lib/test/test_urllib.py
index 801f0fd647f4..8895421f97fc 100644
--- a/Lib/test/test_urllib.py
+++ b/Lib/test/test_urllib.py
@@ -545,6 +545,9 @@ class urlopen_DataTests(unittest.TestCase):
     """Test urlopen() opening a data URL."""
 
     def setUp(self):
+        # clear _opener global variable
+        self.addCleanup(urllib.request.urlcleanup)
+
         # text containing URL special- and unicode-characters
         self.text = "test data URLs :;,%=& \u00f6 \u00c4 "
         # 2x1 pixel RGB PNG image with one black and one white pixel
@@ -619,6 +622,9 @@ class urlretrieve_FileTests(unittest.TestCase):
     """Test urllib.urlretrieve() on local files"""
 
     def setUp(self):
+        # clear _opener global variable
+        self.addCleanup(urllib.request.urlcleanup)
+
         # Create a list of temporary files. Each item in the list is a file
         # name (absolute path or relative to the current working directory).
         # All files in this list will be deleted in the tearDown method. Note,
@@ -759,6 +765,8 @@ class urlretrieve_HttpTests(unittest.TestCase, FakeHTTPMixin):
     """Test urllib.urlretrieve() using fake http connections"""
 
     def test_short_content_raises_ContentTooShortError(self):
+        self.addCleanup(urllib.request.urlcleanup)
+
         self.fakehttp(b'''HTTP/1.1 200 OK
 Date: Wed, 02 Jan 2008 03:03:54 GMT
 Server: Apache/1.3.33 (Debian GNU/Linux) mod_ssl/2.8.22 OpenSSL/0.9.7e
@@ -780,6 +788,8 @@ def _reporthook(par1, par2, par3):
                 self.unfakehttp()
 
     def test_short_content_raises_ContentTooShortError_without_reporthook(self):
+        self.addCleanup(urllib.request.urlcleanup)
+
         self.fakehttp(b'''HTTP/1.1 200 OK
 Date: Wed, 02 Jan 2008 03:03:54 GMT
 Server: Apache/1.3.33 (Debian GNU/Linux) mod_ssl/2.8.22 OpenSSL/0.9.7e
diff --git a/Lib/test/test_urllib2.py b/Lib/test/test_urllib2.py
index c6d275e16b09..debb3c2400a8 100644
--- a/Lib/test/test_urllib2.py
+++ b/Lib/test/test_urllib2.py
@@ -47,6 +47,9 @@ def test___all__(self):
     def test_trivial(self):
         # A couple trivial tests
 
+        # clear _opener global variable
+        self.addCleanup(urllib.request.urlcleanup)
+
         self.assertRaises(ValueError, urllib.request.urlopen, 'bogus url')
 
         # XXX Name hacking to get this to work on Windows.
@@ -1290,6 +1293,10 @@ def test_redirect_fragment(self):
 
     def test_redirect_no_path(self):
         # Issue 14132: Relative redirect strips original path
+
+        # clear _opener global variable
+        self.addCleanup(urllib.request.urlcleanup)
+
         real_class = http.client.HTTPConnection
         response1 = b"HTTP/1.1 302 Found\r\nLocation: ?query\r\n\r\n"
         http.client.HTTPConnection = test_urllib.fakehttp(response1)
diff --git a/Lib/test/test_urllib2_localnet.py b/Lib/test/test_urllib2_localnet.py
index 591b48d6d4d7..6b9b130fb6e9 100644
--- a/Lib/test/test_urllib2_localnet.py
+++ b/Lib/test/test_urllib2_localnet.py
@@ -447,6 +447,9 @@ class TestUrlopen(unittest.TestCase):
     def setUp(self):
         super(TestUrlopen, self).setUp()
 
+        # clear _opener global variable
+        self.addCleanup(urllib.request.urlcleanup)
+
         # Ignore proxies for localhost tests.
         def restore_environ(old_environ):
             os.environ.clear()
diff --git a/Lib/test/test_urllib2net.py b/Lib/test/test_urllib2net.py
index 0f43d71ea67b..040a2ce276db 100644
--- a/Lib/test/test_urllib2net.py
+++ b/Lib/test/test_urllib2net.py
@@ -82,6 +82,9 @@ class AuthTests(unittest.TestCase):
 class CloseSocketTest(unittest.TestCase):
 
     def test_close(self):
+        # clear _opener global variable
+        self.addCleanup(urllib.request.urlcleanup)
+
         # calling .close() on urllib2's response objects should close the
         # underlying socket
         url = support.TEST_HTTP_URL
@@ -257,6 +260,10 @@ def _extra_handlers(self):
 
 
 class TimeoutTest(unittest.TestCase):
+    def setUp(self):
+        # clear _opener global variable
+        self.addCleanup(urllib.request.urlcleanup)
+
     def test_http_basic(self):
         self.assertIsNone(socket.getdefaulttimeout())
         url = support.TEST_HTTP_URL
diff --git a/Lib/test/test_urllibnet.py b/Lib/test/test_urllibnet.py
index d394ceddd080..848ab84bc408 100644
--- a/Lib/test/test_urllibnet.py
+++ b/Lib/test/test_urllibnet.py
@@ -25,6 +25,9 @@ def tearDown(self):
         socket.setdefaulttimeout(None)
 
     def testURLread(self):
+        # clear _opener global variable
+        self.addCleanup(urllib.request.urlcleanup)
+
         domain = urllib.parse.urlparse(support.TEST_HTTP_URL).netloc
         with support.transient_internet(domain):
             f = urllib.request.urlopen(support.TEST_HTTP_URL)
@@ -48,6 +51,10 @@ class urlopenNetworkTests(unittest.TestCase):
 
     url = 'http://www.pythontest.net/'
 
+    def setUp(self):
+        # clear _opener global variable
+        self.addCleanup(urllib.request.urlcleanup)
+
     @contextlib.contextmanager
     def urlopen(self, *args, **kwargs):
         resource = args[0]
@@ -144,6 +151,10 @@ def test_bad_address(self):
 class urlretrieveNetworkTests(unittest.TestCase):
     """Tests urllib.request.urlretrieve using the network."""
 
+    def setUp(self):
+        # remove temporary files created by urlretrieve()
+        self.addCleanup(urllib.request.urlcleanup)
+
     @contextlib.contextmanager
     def urlretrieve(self, *args, **kwargs):
         resource = args[0]
diff --git a/Misc/NEWS.d/next/Tests/2019-07-01-19-56-17.bpo-37421.bOe350.rst b/Misc/NEWS.d/next/Tests/2019-07-01-19-56-17.bpo-37421.bOe350.rst
new file mode 100644
index 000000000000..c89134fdb7fa
--- /dev/null
+++ b/Misc/NEWS.d/next/Tests/2019-07-01-19-56-17.bpo-37421.bOe350.rst
@@ -0,0 +1,4 @@
+urllib.request tests now call :func:`~urllib.request.urlcleanup` to remove
+temporary files created by ``urlretrieve()`` tests and to clear the ``_opener``
+global variable set by ``urlopen()`` and functions calling indirectly
+``urlopen()``.


From webhook-mailer at python.org  Tue Jul  2 14:39:56 2019
From: webhook-mailer at python.org (Miss Islington (bot))
Date: Tue, 02 Jul 2019 18:39:56 -0000
Subject: [Python-checkins] bpo-37463: match_hostname requires quad-dotted
 IPv4 (GH-14499)
Message-ID: <mailman.214.1562092797.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/477b1b25768945621d466a8b3f0739297a842439
commit: 477b1b25768945621d466a8b3f0739297a842439
branch: master
author: Christian Heimes <christian at python.org>
committer: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
date: 2019-07-02T11:39:42-07:00
summary:

bpo-37463: match_hostname requires quad-dotted IPv4 (GH-14499)



ssl.match_hostname() no longer accepts IPv4 addresses with additional text
after the address and only quad-dotted notation without trailing
whitespaces. Some inet_aton() implementations ignore whitespace and all data
after whitespace, e.g. '127.0.0.1 whatever'.

Short notations like '127.1' for '127.0.0.1' were already filtered out.

The bug was initially found by Dominik Czarnota and reported by Paul Kehrer.

Signed-off-by: Christian Heimes <christian at python.org>



https://bugs.python.org/issue37463

files:
A Misc/NEWS.d/next/Security/2019-07-01-08-46-14.bpo-37463.1CHwjE.rst
M Lib/ssl.py
M Lib/test/test_ssl.py

diff --git a/Lib/ssl.py b/Lib/ssl.py
index 61bd775f759b..0726caee49aa 100644
--- a/Lib/ssl.py
+++ b/Lib/ssl.py
@@ -327,12 +327,22 @@ def _inet_paton(ipname):
     Supports IPv4 addresses on all platforms and IPv6 on platforms with IPv6
     support.
     """
-    # inet_aton() also accepts strings like '1'
-    if ipname.count('.') == 3:
-        try:
-            return _socket.inet_aton(ipname)
-        except OSError:
-            pass
+    # inet_aton() also accepts strings like '1', '127.1', some also trailing
+    # data like '127.0.0.1 whatever'.
+    try:
+        addr = _socket.inet_aton(ipname)
+    except OSError:
+        # not an IPv4 address
+        pass
+    else:
+        if _socket.inet_ntoa(addr) == ipname:
+            # only accept injective ipnames
+            return addr
+        else:
+            # refuse for short IPv4 notation and additional trailing data
+            raise ValueError(
+                "{!r} is not a quad-dotted IPv4 address.".format(ipname)
+            )
 
     try:
         return _socket.inet_pton(_socket.AF_INET6, ipname)
@@ -346,14 +356,15 @@ def _inet_paton(ipname):
     raise ValueError("{!r} is not an IPv4 address.".format(ipname))
 
 
-def _ipaddress_match(ipname, host_ip):
+def _ipaddress_match(cert_ipaddress, host_ip):
     """Exact matching of IP addresses.
 
     RFC 6125 explicitly doesn't define an algorithm for this
     (section 1.7.2 - "Out of Scope").
     """
-    # OpenSSL may add a trailing newline to a subjectAltName's IP address
-    ip = _inet_paton(ipname.rstrip())
+    # OpenSSL may add a trailing newline to a subjectAltName's IP address,
+    # commonly woth IPv6 addresses. Strip off trailing \n.
+    ip = _inet_paton(cert_ipaddress.rstrip())
     return ip == host_ip
 
 
diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py
index ef1723903a15..d2b9e2046d0e 100644
--- a/Lib/test/test_ssl.py
+++ b/Lib/test/test_ssl.py
@@ -669,9 +669,14 @@ def fail(cert, hostname):
         cert = {'subject': ((('commonName', 'example.com'),),),
                 'subjectAltName': (('DNS', 'example.com'),
                                    ('IP Address', '10.11.12.13'),
-                                   ('IP Address', '14.15.16.17'))}
+                                   ('IP Address', '14.15.16.17'),
+                                   ('IP Address', '127.0.0.1'))}
         ok(cert, '10.11.12.13')
         ok(cert, '14.15.16.17')
+        # socket.inet_ntoa(socket.inet_aton('127.1')) == '127.0.0.1'
+        fail(cert, '127.1')
+        fail(cert, '14.15.16.17 ')
+        fail(cert, '14.15.16.17 extra data')
         fail(cert, '14.15.16.18')
         fail(cert, 'example.net')
 
@@ -684,6 +689,8 @@ def fail(cert, hostname):
                         ('IP Address', '2003:0:0:0:0:0:0:BABA\n'))}
             ok(cert, '2001::cafe')
             ok(cert, '2003::baba')
+            fail(cert, '2003::baba ')
+            fail(cert, '2003::baba extra data')
             fail(cert, '2003::bebe')
             fail(cert, 'example.net')
 
diff --git a/Misc/NEWS.d/next/Security/2019-07-01-08-46-14.bpo-37463.1CHwjE.rst b/Misc/NEWS.d/next/Security/2019-07-01-08-46-14.bpo-37463.1CHwjE.rst
new file mode 100644
index 000000000000..4f4a62e78374
--- /dev/null
+++ b/Misc/NEWS.d/next/Security/2019-07-01-08-46-14.bpo-37463.1CHwjE.rst
@@ -0,0 +1,4 @@
+ssl.match_hostname() no longer accepts IPv4 addresses with additional text
+after the address and only quad-dotted notation without trailing
+whitespaces. Some inet_aton() implementations ignore whitespace and all data
+after whitespace, e.g. '127.0.0.1 whatever'.


From webhook-mailer at python.org  Tue Jul  2 17:06:38 2019
From: webhook-mailer at python.org (Miss Islington (bot))
Date: Tue, 02 Jul 2019 21:06:38 -0000
Subject: [Python-checkins] bpo-37463: match_hostname requires quad-dotted
 IPv4 (GH-14499)
Message-ID: <mailman.215.1562101599.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/3cba3d3c55f230a59174a0dfcafb1d4685269e60
commit: 3cba3d3c55f230a59174a0dfcafb1d4685269e60
branch: 3.8
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: GitHub <noreply at github.com>
date: 2019-07-02T14:06:18-07:00
summary:

bpo-37463: match_hostname requires quad-dotted IPv4 (GH-14499)


ssl.match_hostname() no longer accepts IPv4 addresses with additional text
after the address and only quad-dotted notation without trailing
whitespaces. Some inet_aton() implementations ignore whitespace and all data
after whitespace, e.g. '127.0.0.1 whatever'.

Short notations like '127.1' for '127.0.0.1' were already filtered out.

The bug was initially found by Dominik Czarnota and reported by Paul Kehrer.

Signed-off-by: Christian Heimes <christian at python.org>

https://bugs.python.org/issue37463
(cherry picked from commit 477b1b25768945621d466a8b3f0739297a842439)

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

files:
A Misc/NEWS.d/next/Security/2019-07-01-08-46-14.bpo-37463.1CHwjE.rst
M Lib/ssl.py
M Lib/test/test_ssl.py

diff --git a/Lib/ssl.py b/Lib/ssl.py
index 61bd775f759b..0726caee49aa 100644
--- a/Lib/ssl.py
+++ b/Lib/ssl.py
@@ -327,12 +327,22 @@ def _inet_paton(ipname):
     Supports IPv4 addresses on all platforms and IPv6 on platforms with IPv6
     support.
     """
-    # inet_aton() also accepts strings like '1'
-    if ipname.count('.') == 3:
-        try:
-            return _socket.inet_aton(ipname)
-        except OSError:
-            pass
+    # inet_aton() also accepts strings like '1', '127.1', some also trailing
+    # data like '127.0.0.1 whatever'.
+    try:
+        addr = _socket.inet_aton(ipname)
+    except OSError:
+        # not an IPv4 address
+        pass
+    else:
+        if _socket.inet_ntoa(addr) == ipname:
+            # only accept injective ipnames
+            return addr
+        else:
+            # refuse for short IPv4 notation and additional trailing data
+            raise ValueError(
+                "{!r} is not a quad-dotted IPv4 address.".format(ipname)
+            )
 
     try:
         return _socket.inet_pton(_socket.AF_INET6, ipname)
@@ -346,14 +356,15 @@ def _inet_paton(ipname):
     raise ValueError("{!r} is not an IPv4 address.".format(ipname))
 
 
-def _ipaddress_match(ipname, host_ip):
+def _ipaddress_match(cert_ipaddress, host_ip):
     """Exact matching of IP addresses.
 
     RFC 6125 explicitly doesn't define an algorithm for this
     (section 1.7.2 - "Out of Scope").
     """
-    # OpenSSL may add a trailing newline to a subjectAltName's IP address
-    ip = _inet_paton(ipname.rstrip())
+    # OpenSSL may add a trailing newline to a subjectAltName's IP address,
+    # commonly woth IPv6 addresses. Strip off trailing \n.
+    ip = _inet_paton(cert_ipaddress.rstrip())
     return ip == host_ip
 
 
diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py
index 1898990fb796..f1b7aa731e9a 100644
--- a/Lib/test/test_ssl.py
+++ b/Lib/test/test_ssl.py
@@ -666,9 +666,14 @@ def fail(cert, hostname):
         cert = {'subject': ((('commonName', 'example.com'),),),
                 'subjectAltName': (('DNS', 'example.com'),
                                    ('IP Address', '10.11.12.13'),
-                                   ('IP Address', '14.15.16.17'))}
+                                   ('IP Address', '14.15.16.17'),
+                                   ('IP Address', '127.0.0.1'))}
         ok(cert, '10.11.12.13')
         ok(cert, '14.15.16.17')
+        # socket.inet_ntoa(socket.inet_aton('127.1')) == '127.0.0.1'
+        fail(cert, '127.1')
+        fail(cert, '14.15.16.17 ')
+        fail(cert, '14.15.16.17 extra data')
         fail(cert, '14.15.16.18')
         fail(cert, 'example.net')
 
@@ -681,6 +686,8 @@ def fail(cert, hostname):
                         ('IP Address', '2003:0:0:0:0:0:0:BABA\n'))}
             ok(cert, '2001::cafe')
             ok(cert, '2003::baba')
+            fail(cert, '2003::baba ')
+            fail(cert, '2003::baba extra data')
             fail(cert, '2003::bebe')
             fail(cert, 'example.net')
 
diff --git a/Misc/NEWS.d/next/Security/2019-07-01-08-46-14.bpo-37463.1CHwjE.rst b/Misc/NEWS.d/next/Security/2019-07-01-08-46-14.bpo-37463.1CHwjE.rst
new file mode 100644
index 000000000000..4f4a62e78374
--- /dev/null
+++ b/Misc/NEWS.d/next/Security/2019-07-01-08-46-14.bpo-37463.1CHwjE.rst
@@ -0,0 +1,4 @@
+ssl.match_hostname() no longer accepts IPv4 addresses with additional text
+after the address and only quad-dotted notation without trailing
+whitespaces. Some inet_aton() implementations ignore whitespace and all data
+after whitespace, e.g. '127.0.0.1 whatever'.


From webhook-mailer at python.org  Tue Jul  2 17:22:56 2019
From: webhook-mailer at python.org (Miss Islington (bot))
Date: Tue, 02 Jul 2019 21:22:56 -0000
Subject: [Python-checkins] bpo-37463: match_hostname requires quad-dotted
 IPv4 (GH-14499)
Message-ID: <mailman.216.1562102578.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/024ea2170b7c1652a62cc7458e736c63d4970eb1
commit: 024ea2170b7c1652a62cc7458e736c63d4970eb1
branch: 3.7
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: GitHub <noreply at github.com>
date: 2019-07-02T14:22:53-07:00
summary:

bpo-37463: match_hostname requires quad-dotted IPv4 (GH-14499)


ssl.match_hostname() no longer accepts IPv4 addresses with additional text
after the address and only quad-dotted notation without trailing
whitespaces. Some inet_aton() implementations ignore whitespace and all data
after whitespace, e.g. '127.0.0.1 whatever'.

Short notations like '127.1' for '127.0.0.1' were already filtered out.

The bug was initially found by Dominik Czarnota and reported by Paul Kehrer.

Signed-off-by: Christian Heimes <christian at python.org>

https://bugs.python.org/issue37463
(cherry picked from commit 477b1b25768945621d466a8b3f0739297a842439)

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

files:
A Misc/NEWS.d/next/Security/2019-07-01-08-46-14.bpo-37463.1CHwjE.rst
M Lib/ssl.py
M Lib/test/test_ssl.py

diff --git a/Lib/ssl.py b/Lib/ssl.py
index b12f8a1be60c..b89c9ad34482 100644
--- a/Lib/ssl.py
+++ b/Lib/ssl.py
@@ -243,12 +243,22 @@ def _inet_paton(ipname):
     Supports IPv4 addresses on all platforms and IPv6 on platforms with IPv6
     support.
     """
-    # inet_aton() also accepts strings like '1'
-    if ipname.count('.') == 3:
-        try:
-            return _socket.inet_aton(ipname)
-        except OSError:
-            pass
+    # inet_aton() also accepts strings like '1', '127.1', some also trailing
+    # data like '127.0.0.1 whatever'.
+    try:
+        addr = _socket.inet_aton(ipname)
+    except OSError:
+        # not an IPv4 address
+        pass
+    else:
+        if _socket.inet_ntoa(addr) == ipname:
+            # only accept injective ipnames
+            return addr
+        else:
+            # refuse for short IPv4 notation and additional trailing data
+            raise ValueError(
+                "{!r} is not a quad-dotted IPv4 address.".format(ipname)
+            )
 
     try:
         return _socket.inet_pton(_socket.AF_INET6, ipname)
@@ -262,14 +272,15 @@ def _inet_paton(ipname):
     raise ValueError("{!r} is not an IPv4 address.".format(ipname))
 
 
-def _ipaddress_match(ipname, host_ip):
+def _ipaddress_match(cert_ipaddress, host_ip):
     """Exact matching of IP addresses.
 
     RFC 6125 explicitly doesn't define an algorithm for this
     (section 1.7.2 - "Out of Scope").
     """
-    # OpenSSL may add a trailing newline to a subjectAltName's IP address
-    ip = _inet_paton(ipname.rstrip())
+    # OpenSSL may add a trailing newline to a subjectAltName's IP address,
+    # commonly woth IPv6 addresses. Strip off trailing \n.
+    ip = _inet_paton(cert_ipaddress.rstrip())
     return ip == host_ip
 
 
diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py
index 86f790b4a22e..4a61711f0ee6 100644
--- a/Lib/test/test_ssl.py
+++ b/Lib/test/test_ssl.py
@@ -681,9 +681,14 @@ def fail(cert, hostname):
         cert = {'subject': ((('commonName', 'example.com'),),),
                 'subjectAltName': (('DNS', 'example.com'),
                                    ('IP Address', '10.11.12.13'),
-                                   ('IP Address', '14.15.16.17'))}
+                                   ('IP Address', '14.15.16.17'),
+                                   ('IP Address', '127.0.0.1'))}
         ok(cert, '10.11.12.13')
         ok(cert, '14.15.16.17')
+        # socket.inet_ntoa(socket.inet_aton('127.1')) == '127.0.0.1'
+        fail(cert, '127.1')
+        fail(cert, '14.15.16.17 ')
+        fail(cert, '14.15.16.17 extra data')
         fail(cert, '14.15.16.18')
         fail(cert, 'example.net')
 
@@ -696,6 +701,8 @@ def fail(cert, hostname):
                         ('IP Address', '2003:0:0:0:0:0:0:BABA\n'))}
             ok(cert, '2001::cafe')
             ok(cert, '2003::baba')
+            fail(cert, '2003::baba ')
+            fail(cert, '2003::baba extra data')
             fail(cert, '2003::bebe')
             fail(cert, 'example.net')
 
diff --git a/Misc/NEWS.d/next/Security/2019-07-01-08-46-14.bpo-37463.1CHwjE.rst b/Misc/NEWS.d/next/Security/2019-07-01-08-46-14.bpo-37463.1CHwjE.rst
new file mode 100644
index 000000000000..4f4a62e78374
--- /dev/null
+++ b/Misc/NEWS.d/next/Security/2019-07-01-08-46-14.bpo-37463.1CHwjE.rst
@@ -0,0 +1,4 @@
+ssl.match_hostname() no longer accepts IPv4 addresses with additional text
+after the address and only quad-dotted notation without trailing
+whitespaces. Some inet_aton() implementations ignore whitespace and all data
+after whitespace, e.g. '127.0.0.1 whatever'.


From webhook-mailer at python.org  Tue Jul  2 18:03:45 2019
From: webhook-mailer at python.org (Ned Deily)
Date: Tue, 02 Jul 2019 22:03:45 -0000
Subject: [Python-checkins] 3.6.9
Message-ID: <mailman.217.1562105026.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/201c8f79450628241574fba940e08107178dc3a5
commit: 201c8f79450628241574fba940e08107178dc3a5
branch: 3.6
author: Ned Deily <nad at python.org>
committer: Ned Deily <nad at python.org>
date: 2019-07-02T16:25:39-04:00
summary:

3.6.9

files:
A Misc/NEWS.d/3.6.9.rst
D Misc/NEWS.d/next/Library/2019-06-27-20-33-50.bpo-37437.du39_A.rst
D Misc/NEWS.d/next/macOS/2019-07-02-01-06-47.bpo-34602.10d4wl.rst
M Include/patchlevel.h
M README.rst

diff --git a/Include/patchlevel.h b/Include/patchlevel.h
index 3cb041517fe6..c4b607b91298 100644
--- a/Include/patchlevel.h
+++ b/Include/patchlevel.h
@@ -19,11 +19,11 @@
 #define PY_MAJOR_VERSION	3
 #define PY_MINOR_VERSION	6
 #define PY_MICRO_VERSION	9
-#define PY_RELEASE_LEVEL	PY_RELEASE_LEVEL_GAMMA
-#define PY_RELEASE_SERIAL	1
+#define PY_RELEASE_LEVEL	PY_RELEASE_LEVEL_FINAL
+#define PY_RELEASE_SERIAL	0
 
 /* Version as a string */
-#define PY_VERSION      	"3.6.9rc1+"
+#define PY_VERSION      	"3.6.9"
 /*--end constants--*/
 
 /* Version as a single 4-byte hex number, e.g. 0x010502B2 == 1.5.2b2.
diff --git a/Misc/NEWS.d/next/macOS/2019-07-02-01-06-47.bpo-34602.10d4wl.rst b/Misc/NEWS.d/3.6.9.rst
similarity index 50%
rename from Misc/NEWS.d/next/macOS/2019-07-02-01-06-47.bpo-34602.10d4wl.rst
rename to Misc/NEWS.d/3.6.9.rst
index c50ac638df57..c8d8e9133776 100644
--- a/Misc/NEWS.d/next/macOS/2019-07-02-01-06-47.bpo-34602.10d4wl.rst
+++ b/Misc/NEWS.d/3.6.9.rst
@@ -1,3 +1,18 @@
+.. bpo: 37437
+.. date: 2019-06-27-20-33-50
+.. nonce: du39_A
+.. release date: 2019-07-02
+.. section: Library
+
+Update vendorized expat version to 2.2.7.
+
+..
+
+.. bpo: 34602
+.. date: 2019-07-02-01-06-47
+.. nonce: 10d4wl
+.. section: macOS
+
 Avoid test suite failures on macOS by no longer calling resource.setrlimit
 to increase the process stack size limit at runtime.  The runtime change is
 no longer needed since the interpreter is being built with a larger default
diff --git a/Misc/NEWS.d/next/Library/2019-06-27-20-33-50.bpo-37437.du39_A.rst b/Misc/NEWS.d/next/Library/2019-06-27-20-33-50.bpo-37437.du39_A.rst
deleted file mode 100644
index 80719ee152d7..000000000000
--- a/Misc/NEWS.d/next/Library/2019-06-27-20-33-50.bpo-37437.du39_A.rst
+++ /dev/null
@@ -1 +0,0 @@
-Update vendorized expat version to 2.2.7.
diff --git a/README.rst b/README.rst
index 65e43296699c..f9ab63a0f371 100644
--- a/README.rst
+++ b/README.rst
@@ -1,5 +1,5 @@
-This is Python version 3.6.9 candidate 1+
-=========================================
+This is Python version 3.6.9
+============================
 
 .. image:: https://travis-ci.org/python/cpython.svg?branch=3.6
    :alt: CPython build status on Travis CI


From webhook-mailer at python.org  Tue Jul  2 18:34:03 2019
From: webhook-mailer at python.org (Ned Deily)
Date: Tue, 02 Jul 2019 22:34:03 -0000
Subject: [Python-checkins] bpo-37156: Fix libssl DLL tag in MSI sources
 (GH-14219)
Message-ID: <mailman.218.1562106843.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/9ad5e9edea08b0d377902d556624f03a2b8bb29b
commit: 9ad5e9edea08b0d377902d556624f03a2b8bb29b
branch: 3.7
author: Steve Dower <steve.dower at python.org>
committer: Ned Deily <nad at python.org>
date: 2019-07-01T22:17:29-04:00
summary:

bpo-37156: Fix libssl DLL tag in MSI sources (GH-14219)

files:
M Tools/msi/msi.props

diff --git a/Tools/msi/msi.props b/Tools/msi/msi.props
index 0fe822af9319..5da901c0215a 100644
--- a/Tools/msi/msi.props
+++ b/Tools/msi/msi.props
@@ -87,15 +87,16 @@
             PyArchExt=$(PyArchExt);
             PyTestExt=$(PyTestExt);
             OptionalFeatureName=$(OutputName);
+            ssltag=-1_1;
         </DefineConstants>
         <DefineConstants Condition="'$(CRTRedist)' != ''">
             $(DefineConstants);CRTRedist=$(CRTRedist);
         </DefineConstants>
         <DefineConstants Condition="$(Platform) != 'x64'">
-            $(DefineConstants);Suffix32=-32;ssltag=-1_1;
+            $(DefineConstants);Suffix32=-32;
         </DefineConstants>
         <DefineConstants Condition="$(Platform) == 'x64'">
-            $(DefineConstants);Suffix32=;ssltag=-1_1-x64;
+            $(DefineConstants);Suffix32=;
         </DefineConstants>
     </PropertyGroup>
 


From webhook-mailer at python.org  Tue Jul  2 21:56:24 2019
From: webhook-mailer at python.org (Xiang Zhang)
Date: Wed, 03 Jul 2019 01:56:24 -0000
Subject: [Python-checkins] bpo-37441: Fix wrong PyErr_SetImportErrorSubclass
 signature in doc (GH-14453)
Message-ID: <mailman.219.1562118985.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/aeecf380660ea459d85bb5f59d76bb54f757b5be
commit: aeecf380660ea459d85bb5f59d76bb54f757b5be
branch: master
author: Hai Shi <shihai1992 at gmail.com>
committer: Xiang Zhang <angwerzx at 126.com>
date: 2019-07-03T09:56:07+08:00
summary:

bpo-37441: Fix wrong PyErr_SetImportErrorSubclass signature in doc (GH-14453)

files:
M Doc/c-api/exceptions.rst

diff --git a/Doc/c-api/exceptions.rst b/Doc/c-api/exceptions.rst
index d3f6daa8347e..d8173935596b 100644
--- a/Doc/c-api/exceptions.rst
+++ b/Doc/c-api/exceptions.rst
@@ -320,7 +320,7 @@ an error value).
    :mod:`warnings` module and the :option:`-W` option in the command line
    documentation.  There is no C API for warning control.
 
-.. c:function:: PyObject* PyErr_SetImportErrorSubclass(PyObject *msg, PyObject *name, PyObject *path)
+.. c:function:: PyObject* PyErr_SetImportErrorSubclass(PyObject *exception, PyObject *msg, PyObject *name, PyObject *path)
 
    Much like :c:func:`PyErr_SetImportError` but this function allows for
    specifying a subclass of :exc:`ImportError` to raise.


From webhook-mailer at python.org  Tue Jul  2 22:03:02 2019
From: webhook-mailer at python.org (Miss Islington (bot))
Date: Wed, 03 Jul 2019 02:03:02 -0000
Subject: [Python-checkins] bpo-37441: Fix wrong PyErr_SetImportErrorSubclass
 signature in doc (GH-14453)
Message-ID: <mailman.220.1562119383.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/6323ac1dd49ddbd935ac3354cc5d792c743e7018
commit: 6323ac1dd49ddbd935ac3354cc5d792c743e7018
branch: 3.7
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: GitHub <noreply at github.com>
date: 2019-07-02T19:02:57-07:00
summary:

bpo-37441: Fix wrong PyErr_SetImportErrorSubclass signature in doc (GH-14453)

(cherry picked from commit aeecf380660ea459d85bb5f59d76bb54f757b5be)

Co-authored-by: Hai Shi <shihai1992 at gmail.com>

files:
M Doc/c-api/exceptions.rst

diff --git a/Doc/c-api/exceptions.rst b/Doc/c-api/exceptions.rst
index 13e00b544818..14ca2b409969 100644
--- a/Doc/c-api/exceptions.rst
+++ b/Doc/c-api/exceptions.rst
@@ -317,7 +317,7 @@ an error value).
    :mod:`warnings` module and the :option:`-W` option in the command line
    documentation.  There is no C API for warning control.
 
-.. c:function:: PyObject* PyErr_SetImportErrorSubclass(PyObject *msg, PyObject *name, PyObject *path)
+.. c:function:: PyObject* PyErr_SetImportErrorSubclass(PyObject *exception, PyObject *msg, PyObject *name, PyObject *path)
 
    Much like :c:func:`PyErr_SetImportError` but this function allows for
    specifying a subclass of :exc:`ImportError` to raise.


From webhook-mailer at python.org  Tue Jul  2 22:04:33 2019
From: webhook-mailer at python.org (Miss Islington (bot))
Date: Wed, 03 Jul 2019 02:04:33 -0000
Subject: [Python-checkins] bpo-37441: Fix wrong PyErr_SetImportErrorSubclass
 signature in doc (GH-14453)
Message-ID: <mailman.221.1562119475.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/b8e198a5d09ca876b87baaf6efd2b2e7c9e3a0b3
commit: b8e198a5d09ca876b87baaf6efd2b2e7c9e3a0b3
branch: 3.8
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: GitHub <noreply at github.com>
date: 2019-07-02T19:04:29-07:00
summary:

bpo-37441: Fix wrong PyErr_SetImportErrorSubclass signature in doc (GH-14453)

(cherry picked from commit aeecf380660ea459d85bb5f59d76bb54f757b5be)

Co-authored-by: Hai Shi <shihai1992 at gmail.com>

files:
M Doc/c-api/exceptions.rst

diff --git a/Doc/c-api/exceptions.rst b/Doc/c-api/exceptions.rst
index d3f6daa8347e..d8173935596b 100644
--- a/Doc/c-api/exceptions.rst
+++ b/Doc/c-api/exceptions.rst
@@ -320,7 +320,7 @@ an error value).
    :mod:`warnings` module and the :option:`-W` option in the command line
    documentation.  There is no C API for warning control.
 
-.. c:function:: PyObject* PyErr_SetImportErrorSubclass(PyObject *msg, PyObject *name, PyObject *path)
+.. c:function:: PyObject* PyErr_SetImportErrorSubclass(PyObject *exception, PyObject *msg, PyObject *name, PyObject *path)
 
    Much like :c:func:`PyErr_SetImportError` but this function allows for
    specifying a subclass of :exc:`ImportError` to raise.


From webhook-mailer at python.org  Tue Jul  2 22:36:07 2019
From: webhook-mailer at python.org (Mariatta)
Date: Wed, 03 Jul 2019 02:36:07 -0000
Subject: [Python-checkins] Fix typo in 3.9's Whats new. Pyton -> Python
 (GH-14567)
Message-ID: <mailman.222.1562121368.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/0f6f73ff3c2e46144884c4d418e67939a042aa23
commit: 0f6f73ff3c2e46144884c4d418e67939a042aa23
branch: master
author: ILJI CHOI <choiilji at gmail.com>
committer: Mariatta <Mariatta at users.noreply.github.com>
date: 2019-07-02T19:36:01-07:00
summary:

Fix typo in 3.9's Whats new. Pyton -> Python (GH-14567)

files:
M Doc/whatsnew/3.9.rst

diff --git a/Doc/whatsnew/3.9.rst b/Doc/whatsnew/3.9.rst
index 379a097ada15..43567b9b4cea 100644
--- a/Doc/whatsnew/3.9.rst
+++ b/Doc/whatsnew/3.9.rst
@@ -108,7 +108,7 @@ threading
 
 In a subinterpreter, spawning a daemon thread now raises an exception. Daemon
 threads were never supported in subinterpreters. Previously, the subinterpreter
-finalization crashed with a Pyton fatal error if a daemon thread was still
+finalization crashed with a Python fatal error if a daemon thread was still
 running.
 
 pprint


From webhook-mailer at python.org  Wed Jul  3 05:10:14 2019
From: webhook-mailer at python.org (Victor Stinner)
Date: Wed, 03 Jul 2019 09:10:14 -0000
Subject: [Python-checkins] bpo-37421: test_winconsoleio doesn't leak temp
 file anymore (GH-14562)
Message-ID: <mailman.223.1562145016.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/b71d8d67959f3b5efbdfe00066589ac0d8f98aad
commit: b71d8d67959f3b5efbdfe00066589ac0d8f98aad
branch: master
author: Victor Stinner <vstinner at redhat.com>
committer: GitHub <noreply at github.com>
date: 2019-07-03T11:09:56+02:00
summary:

bpo-37421: test_winconsoleio doesn't leak temp file anymore (GH-14562)

test_winconsoleio doesn't leak a temporary file anymore: use
tempfile.TemporaryFile() to remove it when the test completes.

files:
A Misc/NEWS.d/next/Tests/2019-07-02-23-20-35.bpo-37421.HCkKWz.rst
M Lib/test/test_winconsoleio.py

diff --git a/Lib/test/test_winconsoleio.py b/Lib/test/test_winconsoleio.py
index a78fa4d7d919..9a61e48881d9 100644
--- a/Lib/test/test_winconsoleio.py
+++ b/Lib/test/test_winconsoleio.py
@@ -25,14 +25,12 @@ def test_open_fd(self):
         self.assertRaisesRegex(ValueError,
             "negative file descriptor", ConIO, -1)
 
-        fd, _ = tempfile.mkstemp()
-        try:
+        with tempfile.TemporaryFile() as tmpfile:
+            fd = tmpfile.fileno()
             # Windows 10: "Cannot open non-console file"
             # Earlier: "Cannot open console output buffer for reading"
             self.assertRaisesRegex(ValueError,
                 "Cannot open (console|non-console file)", ConIO, fd)
-        finally:
-            os.close(fd)
 
         try:
             f = ConIO(0)
diff --git a/Misc/NEWS.d/next/Tests/2019-07-02-23-20-35.bpo-37421.HCkKWz.rst b/Misc/NEWS.d/next/Tests/2019-07-02-23-20-35.bpo-37421.HCkKWz.rst
new file mode 100644
index 000000000000..6671ffe922fd
--- /dev/null
+++ b/Misc/NEWS.d/next/Tests/2019-07-02-23-20-35.bpo-37421.HCkKWz.rst
@@ -0,0 +1,2 @@
+test_winconsoleio doesn't leak a temporary file anymore: use
+tempfile.TemporaryFile() to remove it when the test completes.


From webhook-mailer at python.org  Wed Jul  3 05:10:36 2019
From: webhook-mailer at python.org (Victor Stinner)
Date: Wed, 03 Jul 2019 09:10:36 -0000
Subject: [Python-checkins] bpo-37421: test_concurrent_futures cleans up
 multiprocessing (GH-14563)
Message-ID: <mailman.224.1562145037.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/684cb47fffb7af3ac50cb077f6d2a095c9ce20b4
commit: 684cb47fffb7af3ac50cb077f6d2a095c9ce20b4
branch: master
author: Victor Stinner <vstinner at redhat.com>
committer: GitHub <noreply at github.com>
date: 2019-07-03T11:10:30+02:00
summary:

bpo-37421: test_concurrent_futures cleans up multiprocessing (GH-14563)

test_concurrent_futures now cleans up multiprocessing to remove
immediately temporary directories created by
multiprocessing.util.get_temp_dir().

The test now uses setUpModule() and tearDownModule().

files:
A Misc/NEWS.d/next/Tests/2019-07-02-23-29-06.bpo-37421.WEfc5A.rst
M Lib/test/test_concurrent_futures.py

diff --git a/Lib/test/test_concurrent_futures.py b/Lib/test/test_concurrent_futures.py
index 2497c2b57275..c782d4c6e881 100644
--- a/Lib/test/test_concurrent_futures.py
+++ b/Lib/test/test_concurrent_futures.py
@@ -27,6 +27,9 @@
 from concurrent.futures.process import BrokenProcessPool
 from multiprocessing import get_context
 
+import multiprocessing.process
+import multiprocessing.util
+
 
 def create_future(state=PENDING, exception=None, result=None):
     f = Future()
@@ -1293,12 +1296,24 @@ def test_multiple_set_exception(self):
         self.assertEqual(f.exception(), e)
 
 
- at test.support.reap_threads
-def test_main():
-    try:
-        test.support.run_unittest(__name__)
-    finally:
-        test.support.reap_children()
+_threads_key = None
+
+def setUpModule():
+    global _threads_key
+    _threads_key = test.support.threading_setup()
+
+
+def tearDownModule():
+    test.support.threading_cleanup(*_threads_key)
+    test.support.reap_children()
+
+    # cleanup multiprocessing
+    multiprocessing.process._cleanup()
+    # bpo-37421: Explicitly call _run_finalizers() to remove immediately
+    # temporary directories created by multiprocessing.util.get_temp_dir().
+    multiprocessing.util._run_finalizers()
+    test.support.gc_collect()
+
 
 if __name__ == "__main__":
-    test_main()
+    unittest.main()
diff --git a/Misc/NEWS.d/next/Tests/2019-07-02-23-29-06.bpo-37421.WEfc5A.rst b/Misc/NEWS.d/next/Tests/2019-07-02-23-29-06.bpo-37421.WEfc5A.rst
new file mode 100644
index 000000000000..215a0a144459
--- /dev/null
+++ b/Misc/NEWS.d/next/Tests/2019-07-02-23-29-06.bpo-37421.WEfc5A.rst
@@ -0,0 +1,2 @@
+test_concurrent_futures now cleans up multiprocessing to remove immediately
+temporary directories created by multiprocessing.util.get_temp_dir().


From webhook-mailer at python.org  Wed Jul  3 05:12:32 2019
From: webhook-mailer at python.org (Victor Stinner)
Date: Wed, 03 Jul 2019 09:12:32 -0000
Subject: [Python-checkins] bpo-37421: Fix test_distutils.test_build_ext()
 (GH-14564)
Message-ID: <mailman.225.1562145153.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/74c9dd57771f4f061ee83b069c8e7b37de41246b
commit: 74c9dd57771f4f061ee83b069c8e7b37de41246b
branch: master
author: Victor Stinner <vstinner at redhat.com>
committer: GitHub <noreply at github.com>
date: 2019-07-03T11:12:27+02:00
summary:

bpo-37421: Fix test_distutils.test_build_ext() (GH-14564)

test_distutils.test_build_ext() is now able to remove the temporary
directory on Windows: don't import the newly built C extension ("xx")
in the current process, but test it in a separated process.

files:
A Misc/NEWS.d/next/Tests/2019-07-03-00-05-28.bpo-37421.ORGRSG.rst
M Lib/distutils/tests/support.py
M Lib/distutils/tests/test_build_ext.py

diff --git a/Lib/distutils/tests/support.py b/Lib/distutils/tests/support.py
index 7385c6bbf671..041309851d0f 100644
--- a/Lib/distutils/tests/support.py
+++ b/Lib/distutils/tests/support.py
@@ -6,6 +6,7 @@
 import unittest
 import sysconfig
 from copy import deepcopy
+import test.support
 
 from distutils import log
 from distutils.log import DEBUG, INFO, WARN, ERROR, FATAL
@@ -64,8 +65,8 @@ def tearDown(self):
         os.chdir(self.old_cwd)
         super().tearDown()
         while self.tempdirs:
-            d = self.tempdirs.pop()
-            shutil.rmtree(d, os.name in ('nt', 'cygwin'))
+            tmpdir = self.tempdirs.pop()
+            test.support.rmtree(tmpdir)
 
     def mkdtemp(self):
         """Create a temporary directory that will be cleaned up.
diff --git a/Lib/distutils/tests/test_build_ext.py b/Lib/distutils/tests/test_build_ext.py
index 88847f9e9aa7..52d36b2484f4 100644
--- a/Lib/distutils/tests/test_build_ext.py
+++ b/Lib/distutils/tests/test_build_ext.py
@@ -15,6 +15,7 @@
 
 import unittest
 from test import support
+from test.support.script_helper import assert_python_ok
 
 # http://bugs.python.org/issue4373
 # Don't load the xx module more than once.
@@ -26,11 +27,8 @@ class BuildExtTestCase(TempdirManager,
                        unittest.TestCase):
     def setUp(self):
         # Create a simple test environment
-        # Note that we're making changes to sys.path
         super(BuildExtTestCase, self).setUp()
         self.tmp_dir = self.mkdtemp()
-        self.sys_path = sys.path, sys.path[:]
-        sys.path.append(self.tmp_dir)
         import site
         self.old_user_base = site.USER_BASE
         site.USER_BASE = self.mkdtemp()
@@ -40,15 +38,11 @@ def setUp(self):
         # bpo-30132: On Windows, a .pdb file may be created in the current
         # working directory. Create a temporary working directory to cleanup
         # everything at the end of the test.
-        self.temp_cwd = support.temp_cwd()
-        self.temp_cwd.__enter__()
-        self.addCleanup(self.temp_cwd.__exit__, None, None, None)
+        change_cwd = support.change_cwd(self.tmp_dir)
+        change_cwd.__enter__()
+        self.addCleanup(change_cwd.__exit__, None, None, None)
 
     def tearDown(self):
-        # Get everything back to normal
-        support.unload('xx')
-        sys.path = self.sys_path[0]
-        sys.path[:] = self.sys_path[1]
         import site
         site.USER_BASE = self.old_user_base
         from distutils.command import build_ext
@@ -88,19 +82,34 @@ def test_build_ext(self):
         else:
             ALREADY_TESTED = type(self).__name__
 
-        import xx
+        code = textwrap.dedent(f"""
+            tmp_dir = {self.tmp_dir!r}
 
-        for attr in ('error', 'foo', 'new', 'roj'):
-            self.assertTrue(hasattr(xx, attr))
+            import sys
+            import unittest
+            from test import support
 
-        self.assertEqual(xx.foo(2, 5), 7)
-        self.assertEqual(xx.foo(13,15), 28)
-        self.assertEqual(xx.new().demo(), None)
-        if support.HAVE_DOCSTRINGS:
-            doc = 'This is a template module just for instruction.'
-            self.assertEqual(xx.__doc__, doc)
-        self.assertIsInstance(xx.Null(), xx.Null)
-        self.assertIsInstance(xx.Str(), xx.Str)
+            sys.path.insert(0, tmp_dir)
+            import xx
+
+            class Tests(unittest.TestCase):
+                def test_xx(self):
+                    for attr in ('error', 'foo', 'new', 'roj'):
+                        self.assertTrue(hasattr(xx, attr))
+
+                    self.assertEqual(xx.foo(2, 5), 7)
+                    self.assertEqual(xx.foo(13,15), 28)
+                    self.assertEqual(xx.new().demo(), None)
+                    if support.HAVE_DOCSTRINGS:
+                        doc = 'This is a template module just for instruction.'
+                        self.assertEqual(xx.__doc__, doc)
+                    self.assertIsInstance(xx.Null(), xx.Null)
+                    self.assertIsInstance(xx.Str(), xx.Str)
+
+
+            unittest.main()
+        """)
+        assert_python_ok('-c', code)
 
     def test_solaris_enable_shared(self):
         dist = Distribution({'name': 'xx'})
diff --git a/Misc/NEWS.d/next/Tests/2019-07-03-00-05-28.bpo-37421.ORGRSG.rst b/Misc/NEWS.d/next/Tests/2019-07-03-00-05-28.bpo-37421.ORGRSG.rst
new file mode 100644
index 000000000000..8610509e4b72
--- /dev/null
+++ b/Misc/NEWS.d/next/Tests/2019-07-03-00-05-28.bpo-37421.ORGRSG.rst
@@ -0,0 +1,3 @@
+test_distutils.test_build_ext() is now able to remove the temporary
+directory on Windows: don't import the newly built C extension ("xx") in the
+current process, but test it in a separated process.


From webhook-mailer at python.org  Wed Jul  3 05:31:44 2019
From: webhook-mailer at python.org (Miss Islington (bot))
Date: Wed, 03 Jul 2019 09:31:44 -0000
Subject: [Python-checkins] bpo-37421: test_winconsoleio doesn't leak temp
 file anymore (GH-14562)
Message-ID: <mailman.226.1562146305.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/a2a807f75dc162dfb45fb297aee4961de8008f84
commit: a2a807f75dc162dfb45fb297aee4961de8008f84
branch: 3.8
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: GitHub <noreply at github.com>
date: 2019-07-03T02:31:39-07:00
summary:

bpo-37421: test_winconsoleio doesn't leak temp file anymore (GH-14562)


test_winconsoleio doesn't leak a temporary file anymore: use
tempfile.TemporaryFile() to remove it when the test completes.
(cherry picked from commit b71d8d67959f3b5efbdfe00066589ac0d8f98aad)

Co-authored-by: Victor Stinner <vstinner at redhat.com>

files:
A Misc/NEWS.d/next/Tests/2019-07-02-23-20-35.bpo-37421.HCkKWz.rst
M Lib/test/test_winconsoleio.py

diff --git a/Lib/test/test_winconsoleio.py b/Lib/test/test_winconsoleio.py
index a78fa4d7d919..9a61e48881d9 100644
--- a/Lib/test/test_winconsoleio.py
+++ b/Lib/test/test_winconsoleio.py
@@ -25,14 +25,12 @@ def test_open_fd(self):
         self.assertRaisesRegex(ValueError,
             "negative file descriptor", ConIO, -1)
 
-        fd, _ = tempfile.mkstemp()
-        try:
+        with tempfile.TemporaryFile() as tmpfile:
+            fd = tmpfile.fileno()
             # Windows 10: "Cannot open non-console file"
             # Earlier: "Cannot open console output buffer for reading"
             self.assertRaisesRegex(ValueError,
                 "Cannot open (console|non-console file)", ConIO, fd)
-        finally:
-            os.close(fd)
 
         try:
             f = ConIO(0)
diff --git a/Misc/NEWS.d/next/Tests/2019-07-02-23-20-35.bpo-37421.HCkKWz.rst b/Misc/NEWS.d/next/Tests/2019-07-02-23-20-35.bpo-37421.HCkKWz.rst
new file mode 100644
index 000000000000..6671ffe922fd
--- /dev/null
+++ b/Misc/NEWS.d/next/Tests/2019-07-02-23-20-35.bpo-37421.HCkKWz.rst
@@ -0,0 +1,2 @@
+test_winconsoleio doesn't leak a temporary file anymore: use
+tempfile.TemporaryFile() to remove it when the test completes.


From webhook-mailer at python.org  Wed Jul  3 05:36:28 2019
From: webhook-mailer at python.org (Miss Islington (bot))
Date: Wed, 03 Jul 2019 09:36:28 -0000
Subject: [Python-checkins] bpo-37421: test_concurrent_futures cleans up
 multiprocessing (GH-14563)
Message-ID: <mailman.227.1562146589.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/79665c698fb8f97475e03c4231067db1ae47addb
commit: 79665c698fb8f97475e03c4231067db1ae47addb
branch: 3.8
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: GitHub <noreply at github.com>
date: 2019-07-03T02:36:13-07:00
summary:

bpo-37421: test_concurrent_futures cleans up multiprocessing (GH-14563)


test_concurrent_futures now cleans up multiprocessing to remove
immediately temporary directories created by
multiprocessing.util.get_temp_dir().

The test now uses setUpModule() and tearDownModule().
(cherry picked from commit 684cb47fffb7af3ac50cb077f6d2a095c9ce20b4)

Co-authored-by: Victor Stinner <vstinner at redhat.com>

files:
A Misc/NEWS.d/next/Tests/2019-07-02-23-29-06.bpo-37421.WEfc5A.rst
M Lib/test/test_concurrent_futures.py

diff --git a/Lib/test/test_concurrent_futures.py b/Lib/test/test_concurrent_futures.py
index b27ae7194822..fa298207f6c5 100644
--- a/Lib/test/test_concurrent_futures.py
+++ b/Lib/test/test_concurrent_futures.py
@@ -27,6 +27,9 @@
 from concurrent.futures.process import BrokenProcessPool
 from multiprocessing import get_context
 
+import multiprocessing.process
+import multiprocessing.util
+
 
 def create_future(state=PENDING, exception=None, result=None):
     f = Future()
@@ -1294,12 +1297,24 @@ def test_multiple_set_exception(self):
         self.assertEqual(f.exception(), e)
 
 
- at test.support.reap_threads
-def test_main():
-    try:
-        test.support.run_unittest(__name__)
-    finally:
-        test.support.reap_children()
+_threads_key = None
+
+def setUpModule():
+    global _threads_key
+    _threads_key = test.support.threading_setup()
+
+
+def tearDownModule():
+    test.support.threading_cleanup(*_threads_key)
+    test.support.reap_children()
+
+    # cleanup multiprocessing
+    multiprocessing.process._cleanup()
+    # bpo-37421: Explicitly call _run_finalizers() to remove immediately
+    # temporary directories created by multiprocessing.util.get_temp_dir().
+    multiprocessing.util._run_finalizers()
+    test.support.gc_collect()
+
 
 if __name__ == "__main__":
-    test_main()
+    unittest.main()
diff --git a/Misc/NEWS.d/next/Tests/2019-07-02-23-29-06.bpo-37421.WEfc5A.rst b/Misc/NEWS.d/next/Tests/2019-07-02-23-29-06.bpo-37421.WEfc5A.rst
new file mode 100644
index 000000000000..215a0a144459
--- /dev/null
+++ b/Misc/NEWS.d/next/Tests/2019-07-02-23-29-06.bpo-37421.WEfc5A.rst
@@ -0,0 +1,2 @@
+test_concurrent_futures now cleans up multiprocessing to remove immediately
+temporary directories created by multiprocessing.util.get_temp_dir().


From webhook-mailer at python.org  Wed Jul  3 05:48:21 2019
From: webhook-mailer at python.org (Miss Islington (bot))
Date: Wed, 03 Jul 2019 09:48:21 -0000
Subject: [Python-checkins] bpo-37421: Fix test_distutils.test_build_ext()
 (GH-14564)
Message-ID: <mailman.228.1562147302.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/0aefba7f99f0fd9bcb3328a5919e07f9e03676b0
commit: 0aefba7f99f0fd9bcb3328a5919e07f9e03676b0
branch: 3.8
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: GitHub <noreply at github.com>
date: 2019-07-03T02:48:14-07:00
summary:

bpo-37421: Fix test_distutils.test_build_ext() (GH-14564)


test_distutils.test_build_ext() is now able to remove the temporary
directory on Windows: don't import the newly built C extension ("xx")
in the current process, but test it in a separated process.
(cherry picked from commit 74c9dd57771f4f061ee83b069c8e7b37de41246b)

Co-authored-by: Victor Stinner <vstinner at redhat.com>

files:
A Misc/NEWS.d/next/Tests/2019-07-03-00-05-28.bpo-37421.ORGRSG.rst
M Lib/distutils/tests/support.py
M Lib/distutils/tests/test_build_ext.py

diff --git a/Lib/distutils/tests/support.py b/Lib/distutils/tests/support.py
index 7385c6bbf671..041309851d0f 100644
--- a/Lib/distutils/tests/support.py
+++ b/Lib/distutils/tests/support.py
@@ -6,6 +6,7 @@
 import unittest
 import sysconfig
 from copy import deepcopy
+import test.support
 
 from distutils import log
 from distutils.log import DEBUG, INFO, WARN, ERROR, FATAL
@@ -64,8 +65,8 @@ def tearDown(self):
         os.chdir(self.old_cwd)
         super().tearDown()
         while self.tempdirs:
-            d = self.tempdirs.pop()
-            shutil.rmtree(d, os.name in ('nt', 'cygwin'))
+            tmpdir = self.tempdirs.pop()
+            test.support.rmtree(tmpdir)
 
     def mkdtemp(self):
         """Create a temporary directory that will be cleaned up.
diff --git a/Lib/distutils/tests/test_build_ext.py b/Lib/distutils/tests/test_build_ext.py
index 88847f9e9aa7..52d36b2484f4 100644
--- a/Lib/distutils/tests/test_build_ext.py
+++ b/Lib/distutils/tests/test_build_ext.py
@@ -15,6 +15,7 @@
 
 import unittest
 from test import support
+from test.support.script_helper import assert_python_ok
 
 # http://bugs.python.org/issue4373
 # Don't load the xx module more than once.
@@ -26,11 +27,8 @@ class BuildExtTestCase(TempdirManager,
                        unittest.TestCase):
     def setUp(self):
         # Create a simple test environment
-        # Note that we're making changes to sys.path
         super(BuildExtTestCase, self).setUp()
         self.tmp_dir = self.mkdtemp()
-        self.sys_path = sys.path, sys.path[:]
-        sys.path.append(self.tmp_dir)
         import site
         self.old_user_base = site.USER_BASE
         site.USER_BASE = self.mkdtemp()
@@ -40,15 +38,11 @@ def setUp(self):
         # bpo-30132: On Windows, a .pdb file may be created in the current
         # working directory. Create a temporary working directory to cleanup
         # everything at the end of the test.
-        self.temp_cwd = support.temp_cwd()
-        self.temp_cwd.__enter__()
-        self.addCleanup(self.temp_cwd.__exit__, None, None, None)
+        change_cwd = support.change_cwd(self.tmp_dir)
+        change_cwd.__enter__()
+        self.addCleanup(change_cwd.__exit__, None, None, None)
 
     def tearDown(self):
-        # Get everything back to normal
-        support.unload('xx')
-        sys.path = self.sys_path[0]
-        sys.path[:] = self.sys_path[1]
         import site
         site.USER_BASE = self.old_user_base
         from distutils.command import build_ext
@@ -88,19 +82,34 @@ def test_build_ext(self):
         else:
             ALREADY_TESTED = type(self).__name__
 
-        import xx
+        code = textwrap.dedent(f"""
+            tmp_dir = {self.tmp_dir!r}
 
-        for attr in ('error', 'foo', 'new', 'roj'):
-            self.assertTrue(hasattr(xx, attr))
+            import sys
+            import unittest
+            from test import support
 
-        self.assertEqual(xx.foo(2, 5), 7)
-        self.assertEqual(xx.foo(13,15), 28)
-        self.assertEqual(xx.new().demo(), None)
-        if support.HAVE_DOCSTRINGS:
-            doc = 'This is a template module just for instruction.'
-            self.assertEqual(xx.__doc__, doc)
-        self.assertIsInstance(xx.Null(), xx.Null)
-        self.assertIsInstance(xx.Str(), xx.Str)
+            sys.path.insert(0, tmp_dir)
+            import xx
+
+            class Tests(unittest.TestCase):
+                def test_xx(self):
+                    for attr in ('error', 'foo', 'new', 'roj'):
+                        self.assertTrue(hasattr(xx, attr))
+
+                    self.assertEqual(xx.foo(2, 5), 7)
+                    self.assertEqual(xx.foo(13,15), 28)
+                    self.assertEqual(xx.new().demo(), None)
+                    if support.HAVE_DOCSTRINGS:
+                        doc = 'This is a template module just for instruction.'
+                        self.assertEqual(xx.__doc__, doc)
+                    self.assertIsInstance(xx.Null(), xx.Null)
+                    self.assertIsInstance(xx.Str(), xx.Str)
+
+
+            unittest.main()
+        """)
+        assert_python_ok('-c', code)
 
     def test_solaris_enable_shared(self):
         dist = Distribution({'name': 'xx'})
diff --git a/Misc/NEWS.d/next/Tests/2019-07-03-00-05-28.bpo-37421.ORGRSG.rst b/Misc/NEWS.d/next/Tests/2019-07-03-00-05-28.bpo-37421.ORGRSG.rst
new file mode 100644
index 000000000000..8610509e4b72
--- /dev/null
+++ b/Misc/NEWS.d/next/Tests/2019-07-03-00-05-28.bpo-37421.ORGRSG.rst
@@ -0,0 +1,3 @@
+test_distutils.test_build_ext() is now able to remove the temporary
+directory on Windows: don't import the newly built C extension ("xx") in the
+current process, but test it in a separated process.


From webhook-mailer at python.org  Wed Jul  3 06:52:28 2019
From: webhook-mailer at python.org (Inada Naoki)
Date: Wed, 03 Jul 2019 10:52:28 -0000
Subject: [Python-checkins] bpo-37484: use _PyObject_Vectorcall for __exit__
 (GH-14557)
Message-ID: <mailman.229.1562151149.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/469d1a70cecc918499c288fc0e5e3d79711bc5e5
commit: 469d1a70cecc918499c288fc0e5e3d79711bc5e5
branch: master
author: Jeroen Demeyer <J.Demeyer at UGent.be>
committer: Inada Naoki <songofacandy at gmail.com>
date: 2019-07-03T19:52:21+09:00
summary:

bpo-37484: use _PyObject_Vectorcall for __exit__ (GH-14557)

files:
M Python/ceval.c

diff --git a/Python/ceval.c b/Python/ceval.c
index 5d29d41cf80c..888749b699e9 100644
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -3314,7 +3314,6 @@ _PyEval_EvalFrameDefault(PyFrameObject *f, int throwflag)
 
                Finally we push the result of the call.
             */
-            PyObject *stack[3];
             PyObject *exit_func;
             PyObject *exc, *val, *tb, *res;
 
@@ -3351,10 +3350,9 @@ _PyEval_EvalFrameDefault(PyFrameObject *f, int throwflag)
                 block->b_level--;
             }
 
-            stack[0] = exc;
-            stack[1] = val;
-            stack[2] = tb;
-            res = _PyObject_FastCall(exit_func, stack, 3);
+            PyObject *stack[4] = {NULL, exc, val, tb};
+            res = _PyObject_Vectorcall(exit_func, stack + 1,
+                    3 | PY_VECTORCALL_ARGUMENTS_OFFSET, NULL);
             Py_DECREF(exit_func);
             if (res == NULL)
                 goto error;


From webhook-mailer at python.org  Wed Jul  3 06:54:04 2019
From: webhook-mailer at python.org (Inada Naoki)
Date: Wed, 03 Jul 2019 10:54:04 -0000
Subject: [Python-checkins] bpo-37233: optimize method_vectorcall in case of
 totalargs == 0 (GH-14550)
Message-ID: <mailman.230.1562151245.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/53c214344038341ce86fcf7efa12dc33be9d5b45
commit: 53c214344038341ce86fcf7efa12dc33be9d5b45
branch: master
author: Jeroen Demeyer <J.Demeyer at UGent.be>
committer: Inada Naoki <songofacandy at gmail.com>
date: 2019-07-03T19:53:59+09:00
summary:

bpo-37233: optimize method_vectorcall in case of totalargs == 0 (GH-14550)

files:
M Objects/classobject.c

diff --git a/Objects/classobject.c b/Objects/classobject.c
index 3062890f53e6..46525a737bc9 100644
--- a/Objects/classobject.c
+++ b/Objects/classobject.c
@@ -62,9 +62,13 @@ method_vectorcall(PyObject *method, PyObject *const *args,
     }
     else {
         Py_ssize_t nkwargs = (kwnames == NULL) ? 0 : PyTuple_GET_SIZE(kwnames);
-        PyObject **newargs;
         Py_ssize_t totalargs = nargs + nkwargs;
+        if (totalargs == 0) {
+            return _PyObject_Vectorcall(func, &self, 1, NULL);
+        }
+
         PyObject *newargs_stack[_PY_FASTCALL_SMALL_STACK];
+        PyObject **newargs;
         if (totalargs <= (Py_ssize_t)Py_ARRAY_LENGTH(newargs_stack) - 1) {
             newargs = newargs_stack;
         }
@@ -77,11 +81,11 @@ method_vectorcall(PyObject *method, PyObject *const *args,
         }
         /* use borrowed references */
         newargs[0] = self;
-        if (totalargs) { /* bpo-37138: if totalargs == 0, then args may be
-                          * NULL and calling memcpy() with a NULL pointer
-                          * is undefined behaviour. */
-            memcpy(newargs + 1, args, totalargs * sizeof(PyObject *));
-        }
+        /* bpo-37138: since totalargs > 0, it's impossible that args is NULL.
+         * We need this, since calling memcpy() with a NULL pointer is
+         * undefined behaviour. */
+        assert(args != NULL);
+        memcpy(newargs + 1, args, totalargs * sizeof(PyObject *));
         result = _PyObject_Vectorcall(func, newargs, nargs+1, kwnames);
         if (newargs != newargs_stack) {
             PyMem_Free(newargs);


From webhook-mailer at python.org  Wed Jul  3 08:46:15 2019
From: webhook-mailer at python.org (Inada Naoki)
Date: Wed, 03 Jul 2019 12:46:15 -0000
Subject: [Python-checkins] [3.8] bpo-37233: use _PY_FASTCALL_SMALL_STACK in
 method_vectorcall (GH-13974)
Message-ID: <mailman.231.1562157976.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/c7570d402e3ee8717615ffa020eb9e2215a77660
commit: c7570d402e3ee8717615ffa020eb9e2215a77660
branch: 3.8
author: Inada Naoki <songofacandy at gmail.com>
committer: GitHub <noreply at github.com>
date: 2019-07-03T21:46:07+09:00
summary:

[3.8] bpo-37233: use _PY_FASTCALL_SMALL_STACK in method_vectorcall (GH-13974)

(cherry picked from commit 988e6aa322fb61651812fa5a61ec73316c71b041)

Co-authored-by: Jeroen Demeyer <J.Demeyer at UGent.be>

files:
M Objects/classobject.c

diff --git a/Objects/classobject.c b/Objects/classobject.c
index 2415ed14cb15..efdb18ef86da 100644
--- a/Objects/classobject.c
+++ b/Objects/classobject.c
@@ -64,10 +64,16 @@ method_vectorcall(PyObject *method, PyObject *const *args,
         Py_ssize_t nkwargs = (kwnames == NULL) ? 0 : PyTuple_GET_SIZE(kwnames);
         PyObject **newargs;
         Py_ssize_t totalargs = nargs + nkwargs;
-        newargs = PyMem_Malloc((totalargs+1) * sizeof(PyObject *));
-        if (newargs == NULL) {
-            PyErr_NoMemory();
-            return NULL;
+        PyObject *newargs_stack[_PY_FASTCALL_SMALL_STACK];
+        if (totalargs <= (Py_ssize_t)Py_ARRAY_LENGTH(newargs_stack) - 1) {
+            newargs = newargs_stack;
+        }
+        else {
+            newargs = PyMem_Malloc((totalargs+1) * sizeof(PyObject *));
+            if (newargs == NULL) {
+                PyErr_NoMemory();
+                return NULL;
+            }
         }
         /* use borrowed references */
         newargs[0] = self;
@@ -77,7 +83,9 @@ method_vectorcall(PyObject *method, PyObject *const *args,
             memcpy(newargs + 1, args, totalargs * sizeof(PyObject *));
         }
         result = _PyObject_Vectorcall(func, newargs, nargs+1, kwnames);
-        PyMem_Free(newargs);
+        if (newargs != newargs_stack) {
+            PyMem_Free(newargs);
+        }
     }
     return result;
 }


From webhook-mailer at python.org  Wed Jul  3 09:06:41 2019
From: webhook-mailer at python.org (Miss Islington (bot))
Date: Wed, 03 Jul 2019 13:06:41 -0000
Subject: [Python-checkins] bpo-37233: optimize method_vectorcall in case of
 totalargs == 0 (GH-14550)
Message-ID: <mailman.232.1562159202.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/1099e343e88ddfb46b84ba4ffc6ecc449b7f7891
commit: 1099e343e88ddfb46b84ba4ffc6ecc449b7f7891
branch: 3.8
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: GitHub <noreply at github.com>
date: 2019-07-03T06:06:38-07:00
summary:

bpo-37233: optimize method_vectorcall in case of totalargs == 0 (GH-14550)

(cherry picked from commit 53c214344038341ce86fcf7efa12dc33be9d5b45)

Co-authored-by: Jeroen Demeyer <J.Demeyer at UGent.be>

files:
M Objects/classobject.c

diff --git a/Objects/classobject.c b/Objects/classobject.c
index efdb18ef86da..12bb836cb716 100644
--- a/Objects/classobject.c
+++ b/Objects/classobject.c
@@ -62,9 +62,13 @@ method_vectorcall(PyObject *method, PyObject *const *args,
     }
     else {
         Py_ssize_t nkwargs = (kwnames == NULL) ? 0 : PyTuple_GET_SIZE(kwnames);
-        PyObject **newargs;
         Py_ssize_t totalargs = nargs + nkwargs;
+        if (totalargs == 0) {
+            return _PyObject_Vectorcall(func, &self, 1, NULL);
+        }
+
         PyObject *newargs_stack[_PY_FASTCALL_SMALL_STACK];
+        PyObject **newargs;
         if (totalargs <= (Py_ssize_t)Py_ARRAY_LENGTH(newargs_stack) - 1) {
             newargs = newargs_stack;
         }
@@ -77,11 +81,11 @@ method_vectorcall(PyObject *method, PyObject *const *args,
         }
         /* use borrowed references */
         newargs[0] = self;
-        if (totalargs) { /* bpo-37138: if totalargs == 0, then args may be
-                          * NULL and calling memcpy() with a NULL pointer
-                          * is undefined behaviour. */
-            memcpy(newargs + 1, args, totalargs * sizeof(PyObject *));
-        }
+        /* bpo-37138: since totalargs > 0, it's impossible that args is NULL.
+         * We need this, since calling memcpy() with a NULL pointer is
+         * undefined behaviour. */
+        assert(args != NULL);
+        memcpy(newargs + 1, args, totalargs * sizeof(PyObject *));
         result = _PyObject_Vectorcall(func, newargs, nargs+1, kwnames);
         if (newargs != newargs_stack) {
             PyMem_Free(newargs);


From webhook-mailer at python.org  Wed Jul  3 14:22:55 2019
From: webhook-mailer at python.org (Miss Islington (bot))
Date: Wed, 03 Jul 2019 18:22:55 -0000
Subject: [Python-checkins] bpo-19696: Replace deprecated method in
 "test_import_pkg.py" (GH-14466)
Message-ID: <mailman.233.1562178177.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/56ec4f1fdedd5b38deb06d94d51dd1a540262e90
commit: 56ec4f1fdedd5b38deb06d94d51dd1a540262e90
branch: master
author: Kyle Stanley <aeros167 at gmail.com>
committer: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
date: 2019-07-03T11:22:40-07:00
summary:

bpo-19696: Replace deprecated method in "test_import_pkg.py" (GH-14466)



Replacing the deprecated method "random.choose" to "random.choice" was technically not part of the original issue. However, it was discussed in the talk page and involved one of the files being moved. I assumed this was too minor to justify the creation of a separate issue. 

Also, I added my name to the contributors list in Misc/ACKS. This will be my third PR to cpython, forgot to do it in the previous ones. 



https://bugs.python.org/issue19696

files:
A Misc/NEWS.d/next/Tests/2019-06-29-16-02-21.bpo-19696.05ijhN.rst
M Lib/test/test_importlib/test_pkg_import.py
M Misc/ACKS

diff --git a/Lib/test/test_importlib/test_pkg_import.py b/Lib/test/test_importlib/test_pkg_import.py
index 5d9a45111972..6181dcfab280 100644
--- a/Lib/test/test_importlib/test_pkg_import.py
+++ b/Lib/test/test_importlib/test_pkg_import.py
@@ -14,7 +14,7 @@ class TestImport(unittest.TestCase):
     def __init__(self, *args, **kw):
         self.package_name = 'PACKAGE_'
         while self.package_name in sys.modules:
-            self.package_name += random.choose(string.ascii_letters)
+            self.package_name += random.choice(string.ascii_letters)
         self.module_name = self.package_name + '.foo'
         unittest.TestCase.__init__(self, *args, **kw)
 
@@ -60,7 +60,7 @@ def test_package_import__semantics(self):
         # ...make up a variable name that isn't bound in __builtins__
         var = 'a'
         while var in dir(__builtins__):
-            var += random.choose(string.ascii_letters)
+            var += random.choice(string.ascii_letters)
 
         # ...make a module that just contains that
         self.rewrite_file(var)
diff --git a/Misc/ACKS b/Misc/ACKS
index df0810fff46c..a4d4372d3443 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -1572,6 +1572,7 @@ Tage Stabell-Kulo
 Quentin Stafford-Fraser
 Frank Stajano
 Joel Stanley
+Kyle Stanley
 Anthony Starks
 David Steele
 Oliver Steele
diff --git a/Misc/NEWS.d/next/Tests/2019-06-29-16-02-21.bpo-19696.05ijhN.rst b/Misc/NEWS.d/next/Tests/2019-06-29-16-02-21.bpo-19696.05ijhN.rst
new file mode 100644
index 000000000000..c029fb9f6fc1
--- /dev/null
+++ b/Misc/NEWS.d/next/Tests/2019-06-29-16-02-21.bpo-19696.05ijhN.rst
@@ -0,0 +1 @@
+Replace deprecated method "random.choose" with "random.choice" in "test_pkg_import.py".
\ No newline at end of file


From webhook-mailer at python.org  Wed Jul  3 18:40:10 2019
From: webhook-mailer at python.org (Ned Deily)
Date: Wed, 03 Jul 2019 22:40:10 -0000
Subject: [Python-checkins] Fix 3.6 documentation build for sphinx<1.6
 (GH-14576)
Message-ID: <mailman.234.1562193611.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/a6d97e200863e7e5fc60bbc8f121b86a2098ef2d
commit: a6d97e200863e7e5fc60bbc8f121b86a2098ef2d
branch: 3.6
author: Anthony Sottile <asottile at umich.edu>
committer: Ned Deily <nad at python.org>
date: 2019-07-03T18:39:48-04:00
summary:

Fix 3.6 documentation build for sphinx<1.6 (GH-14576)

files:
M Doc/tools/extensions/suspicious.py

diff --git a/Doc/tools/extensions/suspicious.py b/Doc/tools/extensions/suspicious.py
index 8d80f6759bff..dfcd0da9fdbd 100644
--- a/Doc/tools/extensions/suspicious.py
+++ b/Doc/tools/extensions/suspicious.py
@@ -50,6 +50,12 @@
 from sphinx.builders import Builder
 import sphinx.util
 
+try:  # sphinx>=1.6
+    from sphinx.util.logging import getLogger
+except ImportError:  # sphinx<1.6
+    from logging import getLogger
+
+
 detect_all = re.compile(r'''
     ::(?=[^=])|            # two :: (but NOT ::=)
     :[a-zA-Z][a-zA-Z0-9]+| # :foo
@@ -86,7 +92,7 @@ class CheckSuspiciousMarkupBuilder(Builder):
     Checks for possibly invalid markup that may leak into the output.
     """
     name = 'suspicious'
-    logger = sphinx.util.logging.getLogger("CheckSuspiciousMarkupBuilder")
+    logger = getLogger("CheckSuspiciousMarkupBuilder")
 
     def init(self):
         # create output file


From webhook-mailer at python.org  Wed Jul  3 20:58:58 2019
From: webhook-mailer at python.org (Barry Warsaw)
Date: Thu, 04 Jul 2019 00:58:58 -0000
Subject: [Python-checkins] bpo-37459: importlib docs improperly reference
 get_resource_loader() (#14568)
Message-ID: <mailman.235.1562201939.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/b607d992e76e485f20be3bfd6b311525123f936b
commit: b607d992e76e485f20be3bfd6b311525123f936b
branch: master
author: aldwinaldwin <aldwinaldwin at users.noreply.github.com>
committer: Barry Warsaw <barry at python.org>
date: 2019-07-03T17:58:45-07:00
summary:

bpo-37459: importlib docs improperly reference get_resource_loader() (#14568)

* bpo-37459: importlib docs improperly reference get_resource_loader()

files:
M Doc/library/importlib.rst

diff --git a/Doc/library/importlib.rst b/Doc/library/importlib.rst
index 23831c75842f..df184b33d0e7 100644
--- a/Doc/library/importlib.rst
+++ b/Doc/library/importlib.rst
@@ -500,7 +500,7 @@ ABC hierarchy::
     packages or a module).
 
     Loaders that wish to support resource reading are expected to
-    provide a method called ``get_resource_loader(fullname)`` which
+    provide a method called ``get_resource_reader(fullname)`` which
     returns an object implementing this ABC's interface. If the module
     specified by fullname is not a package, this method should return
     :const:`None`. An object compatible with this ABC should only be


From webhook-mailer at python.org  Wed Jul  3 21:27:43 2019
From: webhook-mailer at python.org (Barry Warsaw)
Date: Thu, 04 Jul 2019 01:27:43 -0000
Subject: [Python-checkins] bpo-37459: importlib docs improperly reference
 get_resource_loader() (GH-14568) (GH-14580)
Message-ID: <mailman.236.1562203665.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/070d3d928d20ccb4790dd077f3794af3c2932e5c
commit: 070d3d928d20ccb4790dd077f3794af3c2932e5c
branch: 3.8
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: Barry Warsaw <barry at python.org>
date: 2019-07-03T18:27:40-07:00
summary:

bpo-37459: importlib docs improperly reference get_resource_loader() (GH-14568) (GH-14580)

* bpo-37459: importlib docs improperly reference get_resource_loader()
(cherry picked from commit b607d992e76e485f20be3bfd6b311525123f936b)

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

files:
M Doc/library/importlib.rst

diff --git a/Doc/library/importlib.rst b/Doc/library/importlib.rst
index 23831c75842f..df184b33d0e7 100644
--- a/Doc/library/importlib.rst
+++ b/Doc/library/importlib.rst
@@ -500,7 +500,7 @@ ABC hierarchy::
     packages or a module).
 
     Loaders that wish to support resource reading are expected to
-    provide a method called ``get_resource_loader(fullname)`` which
+    provide a method called ``get_resource_reader(fullname)`` which
     returns an object implementing this ABC's interface. If the module
     specified by fullname is not a package, this method should return
     :const:`None`. An object compatible with this ABC should only be


From webhook-mailer at python.org  Wed Jul  3 21:28:03 2019
From: webhook-mailer at python.org (Barry Warsaw)
Date: Thu, 04 Jul 2019 01:28:03 -0000
Subject: [Python-checkins] bpo-37459: importlib docs improperly reference
 get_resource_loader() (GH-14568) (GH-14581)
Message-ID: <mailman.237.1562203684.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/d7d9c9f7c22113a405f1a340d050edfa2d024dff
commit: d7d9c9f7c22113a405f1a340d050edfa2d024dff
branch: 3.7
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: Barry Warsaw <barry at python.org>
date: 2019-07-03T18:27:59-07:00
summary:

bpo-37459: importlib docs improperly reference get_resource_loader() (GH-14568) (GH-14581)

* bpo-37459: importlib docs improperly reference get_resource_loader()
(cherry picked from commit b607d992e76e485f20be3bfd6b311525123f936b)

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

files:
M Doc/library/importlib.rst

diff --git a/Doc/library/importlib.rst b/Doc/library/importlib.rst
index 23831c75842f..df184b33d0e7 100644
--- a/Doc/library/importlib.rst
+++ b/Doc/library/importlib.rst
@@ -500,7 +500,7 @@ ABC hierarchy::
     packages or a module).
 
     Loaders that wish to support resource reading are expected to
-    provide a method called ``get_resource_loader(fullname)`` which
+    provide a method called ``get_resource_reader(fullname)`` which
     returns an object implementing this ABC's interface. If the module
     specified by fullname is not a package, this method should return
     :const:`None`. An object compatible with this ABC should only be


From webhook-mailer at python.org  Thu Jul  4 06:29:21 2019
From: webhook-mailer at python.org (Victor Stinner)
Date: Thu, 04 Jul 2019 10:29:21 -0000
Subject: [Python-checkins] bpo-37421: Fix multiprocessing get_temp_dir()
 finalizer (GH-14572)
Message-ID: <mailman.238.1562236162.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/9d40554e0da09a44a8547f3f3a2b9dedfeaf7928
commit: 9d40554e0da09a44a8547f3f3a2b9dedfeaf7928
branch: master
author: Victor Stinner <vstinner at redhat.com>
committer: GitHub <noreply at github.com>
date: 2019-07-04T12:28:55+02:00
summary:

bpo-37421: Fix multiprocessing get_temp_dir() finalizer (GH-14572)

Fix multiprocessing.util.get_temp_dir() finalizer: clear also the
'tempdir' configuration of the current process, so next call to
get_temp_dir() will create a new temporary directory, rather than
reusing the removed temporary directory.

files:
A Misc/NEWS.d/next/Library/2019-07-03-12-47-52.bpo-37421.gR5hC8.rst
M Lib/multiprocessing/util.py

diff --git a/Lib/multiprocessing/util.py b/Lib/multiprocessing/util.py
index 5674ad773f97..19380917b6f5 100644
--- a/Lib/multiprocessing/util.py
+++ b/Lib/multiprocessing/util.py
@@ -106,6 +106,15 @@ def log_to_stderr(level=None):
 # Function returning a temp directory which will be removed on exit
 #
 
+def _remove_temp_dir(rmtree, tempdir):
+    rmtree(tempdir)
+
+    current_process = process.current_process()
+    # current_process() can be None if the finalizer is called
+    # late during Python finalization
+    if current_process is not None:
+        current_process._config['tempdir'] = None
+
 def get_temp_dir():
     # get name of a temp directory which will be automatically cleaned up
     tempdir = process.current_process()._config.get('tempdir')
@@ -113,7 +122,10 @@ def get_temp_dir():
         import shutil, tempfile
         tempdir = tempfile.mkdtemp(prefix='pymp-')
         info('created temp directory %s', tempdir)
-        Finalize(None, shutil.rmtree, args=[tempdir], exitpriority=-100)
+        # keep a strong reference to shutil.rmtree(), since the finalizer
+        # can be called late during Python shutdown
+        Finalize(None, _remove_temp_dir, args=(shutil.rmtree, tempdir),
+                 exitpriority=-100)
         process.current_process()._config['tempdir'] = tempdir
     return tempdir
 
diff --git a/Misc/NEWS.d/next/Library/2019-07-03-12-47-52.bpo-37421.gR5hC8.rst b/Misc/NEWS.d/next/Library/2019-07-03-12-47-52.bpo-37421.gR5hC8.rst
new file mode 100644
index 000000000000..450d76f07289
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2019-07-03-12-47-52.bpo-37421.gR5hC8.rst
@@ -0,0 +1,4 @@
+Fix :func:`multiprocessing.util.get_temp_dir` finalizer: clear also the
+'tempdir' configuration of the current process, so next call to
+``get_temp_dir()`` will create a new temporary directory, rather than
+reusing the removed temporary directory.


From webhook-mailer at python.org  Thu Jul  4 06:32:00 2019
From: webhook-mailer at python.org (Inada Naoki)
Date: Thu, 04 Jul 2019 10:32:00 -0000
Subject: [Python-checkins] bpo-37483: add _PyObject_CallOneArg() function
 (#14558)
Message-ID: <mailman.239.1562236321.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/196a530e00d88a138973bf9182e013937e293f97
commit: 196a530e00d88a138973bf9182e013937e293f97
branch: master
author: Jeroen Demeyer <J.Demeyer at UGent.be>
committer: Inada Naoki <songofacandy at gmail.com>
date: 2019-07-04T19:31:34+09:00
summary:

bpo-37483: add _PyObject_CallOneArg() function (#14558)

files:
A Misc/NEWS.d/next/C API/2019-07-02-15-42-37.bpo-37483.vftT4f.rst
M Doc/c-api/object.rst
M Include/cpython/abstract.h
M Modules/_asynciomodule.c
M Modules/_collectionsmodule.c
M Modules/_csv.c
M Modules/_ctypes/callproc.c
M Modules/_elementtree.c
M Modules/_io/iobase.c
M Modules/_json.c
M Modules/_pickle.c
M Modules/_sqlite/cache.c
M Modules/_sqlite/connection.c
M Modules/_sqlite/cursor.c
M Modules/_sqlite/microprotocols.c
M Modules/_sre.c
M Modules/_struct.c
M Modules/_xxtestfuzz/fuzzer.c
M Modules/cjkcodecs/cjkcodecs.h
M Modules/cjkcodecs/multibytecodec.c
M Modules/gcmodule.c
M Modules/itertoolsmodule.c
M Modules/pyexpat.c
M Objects/abstract.c
M Objects/bytearrayobject.c
M Objects/bytesobject.c
M Objects/descrobject.c
M Objects/dictobject.c
M Objects/fileobject.c
M Objects/floatobject.c
M Objects/genobject.c
M Objects/listobject.c
M Objects/longobject.c
M Objects/memoryobject.c
M Objects/moduleobject.c
M Objects/typeobject.c
M Objects/unicodeobject.c
M Objects/weakrefobject.c
M Python/_warnings.c
M Python/bltinmodule.c
M Python/ceval.c
M Python/codecs.c
M Python/errors.c
M Python/import.c

diff --git a/Doc/c-api/object.rst b/Doc/c-api/object.rst
index a84235b7e32d..6d138558d60a 100644
--- a/Doc/c-api/object.rst
+++ b/Doc/c-api/object.rst
@@ -264,6 +264,17 @@ Object Protocol
    .. versionadded:: 3.9
 
 
+.. c:function:: PyObject* _PyObject_CallOneArg(PyObject *callable, PyObject *arg)
+
+   Call a callable Python object *callable* with exactly 1 positional argument
+   *arg* and no keyword arguments.
+
+   Return the result of the call on success, or raise an exception and return
+   *NULL* on failure.
+
+   .. versionadded:: 3.9
+
+
 .. c:function:: PyObject* PyObject_Call(PyObject *callable, PyObject *args, PyObject *kwargs)
 
    Call a callable Python object *callable*, with arguments given by the
diff --git a/Include/cpython/abstract.h b/Include/cpython/abstract.h
index 69ed9435c654..c9a8a0754588 100644
--- a/Include/cpython/abstract.h
+++ b/Include/cpython/abstract.h
@@ -62,6 +62,7 @@ PyVectorcall_NARGS(size_t n)
 static inline vectorcallfunc
 _PyVectorcall_Function(PyObject *callable)
 {
+    assert(callable != NULL);
     PyTypeObject *tp = Py_TYPE(callable);
     if (!PyType_HasFeature(tp, _Py_TPFLAGS_HAVE_VECTORCALL)) {
         return NULL;
@@ -134,6 +135,17 @@ _PyObject_CallNoArg(PyObject *func) {
     return _PyObject_Vectorcall(func, NULL, 0, NULL);
 }
 
+static inline PyObject *
+_PyObject_CallOneArg(PyObject *func, PyObject *arg)
+{
+    assert(arg != NULL);
+    PyObject *_args[2];
+    PyObject **args = _args + 1;  // For PY_VECTORCALL_ARGUMENTS_OFFSET
+    args[0] = arg;
+    return _PyObject_Vectorcall(func, args,
+                                1 | PY_VECTORCALL_ARGUMENTS_OFFSET, NULL);
+}
+
 PyAPI_FUNC(PyObject *) _PyObject_Call_Prepend(
     PyObject *callable,
     PyObject *obj,
diff --git a/Misc/NEWS.d/next/C API/2019-07-02-15-42-37.bpo-37483.vftT4f.rst b/Misc/NEWS.d/next/C API/2019-07-02-15-42-37.bpo-37483.vftT4f.rst
new file mode 100644
index 000000000000..e2b0201e4ae9
--- /dev/null
+++ b/Misc/NEWS.d/next/C API/2019-07-02-15-42-37.bpo-37483.vftT4f.rst	
@@ -0,0 +1,2 @@
+Add new function ``_PyObject_CallOneArg`` for calling an object with one
+positional argument.
diff --git a/Modules/_asynciomodule.c b/Modules/_asynciomodule.c
index 4caf3a466469..443acc5723c3 100644
--- a/Modules/_asynciomodule.c
+++ b/Modules/_asynciomodule.c
@@ -141,8 +141,7 @@ _is_coroutine(PyObject *coro)
        Do this check after 'future_init()'; in case we need to raise
        an error, __del__ needs a properly initialized object.
     */
-    PyObject *res = PyObject_CallFunctionObjArgs(
-        asyncio_iscoroutine_func, coro, NULL);
+    PyObject *res = _PyObject_CallOneArg(asyncio_iscoroutine_func, coro);
     if (res == NULL) {
         return -1;
     }
@@ -1286,8 +1285,7 @@ static PyObject *
 _asyncio_Future__repr_info_impl(FutureObj *self)
 /*[clinic end generated code: output=fa69e901bd176cfb input=f21504d8e2ae1ca2]*/
 {
-    return PyObject_CallFunctionObjArgs(
-        asyncio_future_repr_info_func, self, NULL);
+    return _PyObject_CallOneArg(asyncio_future_repr_info_func, (PyObject *)self);
 }
 
 static PyObject *
@@ -1364,7 +1362,7 @@ FutureObj_finalize(FutureObj *fut)
 
     func = _PyObject_GetAttrId(fut->fut_loop, &PyId_call_exception_handler);
     if (func != NULL) {
-        PyObject *res = PyObject_CallFunctionObjArgs(func, context, NULL);
+        PyObject *res = _PyObject_CallOneArg(func, context);
         if (res == NULL) {
             PyErr_WriteUnraisable(func);
         }
@@ -2104,13 +2102,13 @@ _asyncio_Task_current_task_impl(PyTypeObject *type, PyObject *loop)
             Py_DECREF(current_task_func);
             return NULL;
         }
-        ret = PyObject_CallFunctionObjArgs(current_task_func, loop, NULL);
+        ret = _PyObject_CallOneArg(current_task_func, loop);
         Py_DECREF(current_task_func);
         Py_DECREF(loop);
         return ret;
     }
     else {
-        ret = PyObject_CallFunctionObjArgs(current_task_func, loop, NULL);
+        ret = _PyObject_CallOneArg(current_task_func, loop);
         Py_DECREF(current_task_func);
         return ret;
     }
@@ -2146,7 +2144,7 @@ _asyncio_Task_all_tasks_impl(PyTypeObject *type, PyObject *loop)
         return NULL;
     }
 
-    res = PyObject_CallFunctionObjArgs(all_tasks_func, loop, NULL);
+    res = _PyObject_CallOneArg(all_tasks_func, loop);
     Py_DECREF(all_tasks_func);
     return res;
 }
@@ -2159,8 +2157,7 @@ static PyObject *
 _asyncio_Task__repr_info_impl(TaskObj *self)
 /*[clinic end generated code: output=6a490eb66d5ba34b input=3c6d051ed3ddec8b]*/
 {
-    return PyObject_CallFunctionObjArgs(
-        asyncio_task_repr_info_func, self, NULL);
+    return _PyObject_CallOneArg(asyncio_task_repr_info_func, (PyObject *)self);
 }
 
 /*[clinic input]
@@ -2411,7 +2408,7 @@ TaskObj_finalize(TaskObj *task)
 
     func = _PyObject_GetAttrId(task->task_loop, &PyId_call_exception_handler);
     if (func != NULL) {
-        PyObject *res = PyObject_CallFunctionObjArgs(func, context, NULL);
+        PyObject *res = _PyObject_CallOneArg(func, context);
         if (res == NULL) {
             PyErr_WriteUnraisable(func);
         }
@@ -2543,7 +2540,7 @@ task_set_error_soon(TaskObj *task, PyObject *et, const char *format, ...)
         return NULL;
     }
 
-    PyObject *e = PyObject_CallFunctionObjArgs(et, msg, NULL);
+    PyObject *e = _PyObject_CallOneArg(et, msg);
     Py_DECREF(msg);
     if (e == NULL) {
         return NULL;
diff --git a/Modules/_collectionsmodule.c b/Modules/_collectionsmodule.c
index 45169ecd11af..cc7d3cfd0748 100644
--- a/Modules/_collectionsmodule.c
+++ b/Modules/_collectionsmodule.c
@@ -512,8 +512,7 @@ deque_copy(PyObject *deque, PyObject *Py_UNUSED(ignored))
         return NULL;
     }
     if (old_deque->maxlen < 0)
-        result = PyObject_CallFunctionObjArgs((PyObject *)(Py_TYPE(deque)),
-                                              deque, NULL);
+        result = _PyObject_CallOneArg((PyObject *)(Py_TYPE(deque)), deque);
     else
         result = PyObject_CallFunction((PyObject *)(Py_TYPE(deque)), "Oi",
                                        deque, old_deque->maxlen, NULL);
diff --git a/Modules/_csv.c b/Modules/_csv.c
index 014cbb4e0231..9653ff92ee9a 100644
--- a/Modules/_csv.c
+++ b/Modules/_csv.c
@@ -1240,7 +1240,7 @@ csv_writerow(WriterObj *self, PyObject *seq)
     if (line == NULL) {
         return NULL;
     }
-    result = PyObject_CallFunctionObjArgs(self->write, line, NULL);
+    result = _PyObject_CallOneArg(self->write, line);
     Py_DECREF(line);
     return result;
 }
diff --git a/Modules/_ctypes/callproc.c b/Modules/_ctypes/callproc.c
index 67665246414e..973a654bf355 100644
--- a/Modules/_ctypes/callproc.c
+++ b/Modules/_ctypes/callproc.c
@@ -925,7 +925,7 @@ static PyObject *GetResult(PyObject *restype, void *result, PyObject *checker)
     if (!checker || !retval)
         return retval;
 
-    v = PyObject_CallFunctionObjArgs(checker, retval, NULL);
+    v = _PyObject_CallOneArg(checker, retval);
     if (v == NULL)
         _PyTraceback_Add("GetResult", "_ctypes/callproc.c", __LINE__-2);
     Py_DECREF(retval);
@@ -1118,7 +1118,7 @@ PyObject *_ctypes_callproc(PPROC pProc,
         if (argtypes && argtype_count > i) {
             PyObject *v;
             converter = PyTuple_GET_ITEM(argtypes, i);
-            v = PyObject_CallFunctionObjArgs(converter, arg, NULL);
+            v = _PyObject_CallOneArg(converter, arg);
             if (v == NULL) {
                 _ctypes_extend_error(PyExc_ArgError, "argument %zd: ", i+1);
                 goto cleanup;
@@ -1795,7 +1795,7 @@ pointer(PyObject *self, PyObject *arg)
 
     typ = PyDict_GetItemWithError(_ctypes_ptrtype_cache, (PyObject *)Py_TYPE(arg));
     if (typ) {
-        return PyObject_CallFunctionObjArgs(typ, arg, NULL);
+        return _PyObject_CallOneArg(typ, arg);
     }
     else if (PyErr_Occurred()) {
         return NULL;
@@ -1803,7 +1803,7 @@ pointer(PyObject *self, PyObject *arg)
     typ = POINTER(NULL, (PyObject *)Py_TYPE(arg));
     if (typ == NULL)
         return NULL;
-    result = PyObject_CallFunctionObjArgs(typ, arg, NULL);
+    result = _PyObject_CallOneArg(typ, arg);
     Py_DECREF(typ);
     return result;
 }
diff --git a/Modules/_elementtree.c b/Modules/_elementtree.c
index ee1b5e5882fa..b93ec3d12786 100644
--- a/Modules/_elementtree.c
+++ b/Modules/_elementtree.c
@@ -2696,7 +2696,7 @@ treebuilder_append_event(TreeBuilderObject *self, PyObject *action,
         PyObject *event = PyTuple_Pack(2, action, node);
         if (event == NULL)
             return -1;
-        res = _PyObject_FastCall(self->events_append, &event, 1);
+        res = _PyObject_CallOneArg(self->events_append, event);
         Py_DECREF(event);
         if (res == NULL)
             return -1;
@@ -2859,7 +2859,7 @@ treebuilder_handle_comment(TreeBuilderObject* self, PyObject* text)
     }
 
     if (self->comment_factory) {
-        comment = _PyObject_FastCall(self->comment_factory, &text, 1);
+        comment = _PyObject_CallOneArg(self->comment_factory, text);
         if (!comment)
             return NULL;
 
@@ -3197,7 +3197,7 @@ expat_set_error(enum XML_Error error_code, Py_ssize_t line, Py_ssize_t column,
     if (errmsg == NULL)
         return;
 
-    error = _PyObject_FastCall(st->parseerror_obj, &errmsg, 1);
+    error = _PyObject_CallOneArg(st->parseerror_obj, errmsg);
     Py_DECREF(errmsg);
     if (!error)
         return;
@@ -3260,7 +3260,7 @@ expat_default_handler(XMLParserObject* self, const XML_Char* data_in,
                 (TreeBuilderObject*) self->target, value
                 );
         else if (self->handle_data)
-            res = _PyObject_FastCall(self->handle_data, &value, 1);
+            res = _PyObject_CallOneArg(self->handle_data, value);
         else
             res = NULL;
         Py_XDECREF(res);
@@ -3371,7 +3371,7 @@ expat_data_handler(XMLParserObject* self, const XML_Char* data_in,
         /* shortcut */
         res = treebuilder_handle_data((TreeBuilderObject*) self->target, data);
     else if (self->handle_data)
-        res = _PyObject_FastCall(self->handle_data, &data, 1);
+        res = _PyObject_CallOneArg(self->handle_data, data);
     else
         res = NULL;
 
@@ -3398,7 +3398,7 @@ expat_end_handler(XMLParserObject* self, const XML_Char* tag_in)
     else if (self->handle_end) {
         tag = makeuniversal(self, tag_in);
         if (tag) {
-            res = _PyObject_FastCall(self->handle_end, &tag, 1);
+            res = _PyObject_CallOneArg(self->handle_end, tag);
             Py_DECREF(tag);
         }
     }
@@ -3485,7 +3485,7 @@ expat_end_ns_handler(XMLParserObject* self, const XML_Char* prefix_in)
         if (!prefix)
             return;
 
-        res = _PyObject_FastCall(self->handle_end_ns, &prefix, 1);
+        res = _PyObject_CallOneArg(self->handle_end_ns, prefix);
         Py_DECREF(prefix);
     }
 
@@ -3515,7 +3515,7 @@ expat_comment_handler(XMLParserObject* self, const XML_Char* comment_in)
         if (!comment)
             return;
 
-        res = _PyObject_FastCall(self->handle_comment, &comment, 1);
+        res = _PyObject_CallOneArg(self->handle_comment, comment);
     }
 
     Py_XDECREF(res);
diff --git a/Modules/_io/iobase.c b/Modules/_io/iobase.c
index fab450977ffa..82cc77676523 100644
--- a/Modules/_io/iobase.c
+++ b/Modules/_io/iobase.c
@@ -557,7 +557,7 @@ _io__IOBase_readline_impl(PyObject *self, Py_ssize_t limit)
         PyObject *b;
 
         if (peek != NULL) {
-            PyObject *readahead = PyObject_CallFunctionObjArgs(peek, _PyLong_One, NULL);
+            PyObject *readahead = _PyObject_CallOneArg(peek, _PyLong_One);
             if (readahead == NULL) {
                 /* NOTE: PyErr_SetFromErrno() calls PyErr_CheckSignals()
                    when EINTR occurs so we needn't do it ourselves. */
diff --git a/Modules/_json.c b/Modules/_json.c
index e3aa997598fc..38beb6f50d2e 100644
--- a/Modules/_json.c
+++ b/Modules/_json.c
@@ -818,14 +818,14 @@ _parse_object_unicode(PyScannerObject *s, PyObject *pystr, Py_ssize_t idx, Py_ss
     *next_idx_ptr = idx + 1;
 
     if (has_pairs_hook) {
-        val = PyObject_CallFunctionObjArgs(s->object_pairs_hook, rval, NULL);
+        val = _PyObject_CallOneArg(s->object_pairs_hook, rval);
         Py_DECREF(rval);
         return val;
     }
 
     /* if object_hook is not None: rval = object_hook(rval) */
     if (s->object_hook != Py_None) {
-        val = PyObject_CallFunctionObjArgs(s->object_hook, rval, NULL);
+        val = _PyObject_CallOneArg(s->object_hook, rval);
         Py_DECREF(rval);
         return val;
     }
@@ -931,7 +931,7 @@ _parse_constant(PyScannerObject *s, const char *constant, Py_ssize_t idx, Py_ssi
         return NULL;
 
     /* rval = parse_constant(constant) */
-    rval = PyObject_CallFunctionObjArgs(s->parse_constant, cstr, NULL);
+    rval = _PyObject_CallOneArg(s->parse_constant, cstr);
     idx += PyUnicode_GET_LENGTH(cstr);
     Py_DECREF(cstr);
     *next_idx_ptr = idx;
@@ -1030,7 +1030,7 @@ _match_number_unicode(PyScannerObject *s, PyObject *pystr, Py_ssize_t start, Py_
                                            idx - start);
         if (numstr == NULL)
             return NULL;
-        rval = PyObject_CallFunctionObjArgs(custom_func, numstr, NULL);
+        rval = _PyObject_CallOneArg(custom_func, numstr);
     }
     else {
         Py_ssize_t i, n;
@@ -1440,7 +1440,7 @@ encoder_encode_string(PyEncoderObject *s, PyObject *obj)
     if (s->fast_encode) {
         return s->fast_encode(NULL, obj);
     }
-    encoded = PyObject_CallFunctionObjArgs(s->encoder, obj, NULL);
+    encoded = _PyObject_CallOneArg(s->encoder, obj);
     if (encoded != NULL && !PyUnicode_Check(encoded)) {
         PyErr_Format(PyExc_TypeError,
                      "encoder() must return a string, not %.80s",
@@ -1526,7 +1526,7 @@ encoder_listencode_obj(PyEncoderObject *s, _PyAccu *acc,
                 return -1;
             }
         }
-        newobj = PyObject_CallFunctionObjArgs(s->defaultfn, obj, NULL);
+        newobj = _PyObject_CallOneArg(s->defaultfn, obj);
         if (newobj == NULL) {
             Py_XDECREF(ident);
             return -1;
diff --git a/Modules/_pickle.c b/Modules/_pickle.c
index 3adece0f0012..d6d1250d04f7 100644
--- a/Modules/_pickle.c
+++ b/Modules/_pickle.c
@@ -359,7 +359,7 @@ _Pickle_FastCall(PyObject *func, PyObject *obj)
 {
     PyObject *result;
 
-    result = PyObject_CallFunctionObjArgs(func, obj, NULL);
+    result = _PyObject_CallOneArg(func, obj);
     Py_DECREF(obj);
     return result;
 }
@@ -420,7 +420,7 @@ call_method(PyObject *func, PyObject *self, PyObject *obj)
         return PyObject_CallFunctionObjArgs(func, self, obj, NULL);
     }
     else {
-        return PyObject_CallFunctionObjArgs(func, obj, NULL);
+        return _PyObject_CallOneArg(func, obj);
     }
 }
 
@@ -2296,7 +2296,7 @@ _Pickler_write_bytes(PicklerObject *self,
                 return -1;
             }
         }
-        result = PyObject_CallFunctionObjArgs(self->write, payload, NULL);
+        result = _PyObject_CallOneArg(self->write, payload);
         Py_XDECREF(mem);
         if (result == NULL) {
             return -1;
@@ -2504,8 +2504,7 @@ save_picklebuffer(PicklerObject *self, PyObject *obj)
     }
     int in_band = 1;
     if (self->buffer_callback != NULL) {
-        PyObject *ret = PyObject_CallFunctionObjArgs(self->buffer_callback,
-                                                     obj, NULL);
+        PyObject *ret = _PyObject_CallOneArg(self->buffer_callback, obj);
         if (ret == NULL) {
             return -1;
         }
@@ -4322,8 +4321,7 @@ save(PicklerObject *self, PyObject *obj, int pers_save)
      * regular reduction mechanism.
      */
     if (self->reducer_override != NULL) {
-        reduce_value = PyObject_CallFunctionObjArgs(self->reducer_override,
-                                                    obj, NULL);
+        reduce_value = _PyObject_CallOneArg(self->reducer_override, obj);
         if (reduce_value == NULL) {
             goto error;
         }
diff --git a/Modules/_sqlite/cache.c b/Modules/_sqlite/cache.c
index 4d4180421871..7552d1b14539 100644
--- a/Modules/_sqlite/cache.c
+++ b/Modules/_sqlite/cache.c
@@ -112,9 +112,8 @@ void pysqlite_cache_dealloc(pysqlite_Cache* self)
     Py_TYPE(self)->tp_free((PyObject*)self);
 }
 
-PyObject* pysqlite_cache_get(pysqlite_Cache* self, PyObject* args)
+PyObject* pysqlite_cache_get(pysqlite_Cache* self, PyObject* key)
 {
-    PyObject* key = args;
     pysqlite_Node* node;
     pysqlite_Node* ptr;
     PyObject* data;
@@ -184,6 +183,9 @@ PyObject* pysqlite_cache_get(pysqlite_Cache* self, PyObject* args)
             }
         }
 
+        /* We cannot replace this by _PyObject_CallOneArg() since
+         * PyObject_CallFunction() has a special case when using a
+         * single tuple as argument. */
         data = PyObject_CallFunction(self->factory, "O", key);
 
         if (!data) {
diff --git a/Modules/_sqlite/connection.c b/Modules/_sqlite/connection.c
index 5ceeaf98ee80..08604b99a6ac 100644
--- a/Modules/_sqlite/connection.c
+++ b/Modules/_sqlite/connection.c
@@ -310,7 +310,7 @@ PyObject* pysqlite_connection_cursor(pysqlite_Connection* self, PyObject* args,
         factory = (PyObject*)&pysqlite_CursorType;
     }
 
-    cursor = PyObject_CallFunctionObjArgs(factory, (PyObject *)self, NULL);
+    cursor = _PyObject_CallOneArg(factory, (PyObject *)self);
     if (cursor == NULL)
         return NULL;
     if (!PyObject_TypeCheck(cursor, &pysqlite_CursorType)) {
@@ -970,7 +970,7 @@ static void _trace_callback(void* user_arg, const char* statement_string)
     py_statement = PyUnicode_DecodeUTF8(statement_string,
             strlen(statement_string), "replace");
     if (py_statement) {
-        ret = PyObject_CallFunctionObjArgs((PyObject*)user_arg, py_statement, NULL);
+        ret = _PyObject_CallOneArg((PyObject*)user_arg, py_statement);
         Py_DECREF(py_statement);
     }
 
@@ -1465,16 +1465,9 @@ pysqlite_connection_iterdump(pysqlite_Connection* self, PyObject* args)
         goto finally;
     }
 
-    args = PyTuple_New(1);
-    if (!args) {
-        goto finally;
-    }
-    Py_INCREF(self);
-    PyTuple_SetItem(args, 0, (PyObject*)self);
-    retval = PyObject_CallObject(pyfn_iterdump, args);
+    retval = _PyObject_CallOneArg(pyfn_iterdump, (PyObject *)self);
 
 finally:
-    Py_XDECREF(args);
     Py_XDECREF(module);
     return retval;
 }
diff --git a/Modules/_sqlite/cursor.c b/Modules/_sqlite/cursor.c
index 38d94b2fb590..e6fcac887fe3 100644
--- a/Modules/_sqlite/cursor.c
+++ b/Modules/_sqlite/cursor.c
@@ -266,7 +266,7 @@ _pysqlite_fetch_one_row(pysqlite_Cursor* self)
                 item = PyBytes_FromStringAndSize(val_str, nbytes);
                 if (!item)
                     goto error;
-                converted = PyObject_CallFunction(converter, "O", item);
+                converted = _PyObject_CallOneArg(converter, item);
                 Py_DECREF(item);
             }
         } else {
diff --git a/Modules/_sqlite/microprotocols.c b/Modules/_sqlite/microprotocols.c
index c23b09f56b5b..59a5e228454e 100644
--- a/Modules/_sqlite/microprotocols.c
+++ b/Modules/_sqlite/microprotocols.c
@@ -92,7 +92,7 @@ pysqlite_microprotocols_adapt(PyObject *obj, PyObject *proto, PyObject *alt)
     Py_DECREF(key);
     if (adapter) {
         Py_INCREF(adapter);
-        adapted = PyObject_CallFunctionObjArgs(adapter, obj, NULL);
+        adapted = _PyObject_CallOneArg(adapter, obj);
         Py_DECREF(adapter);
         return adapted;
     }
@@ -105,7 +105,7 @@ pysqlite_microprotocols_adapt(PyObject *obj, PyObject *proto, PyObject *alt)
         return NULL;
     }
     if (adapter) {
-        adapted = PyObject_CallFunctionObjArgs(adapter, obj, NULL);
+        adapted = _PyObject_CallOneArg(adapter, obj);
         Py_DECREF(adapter);
 
         if (adapted == Py_None) {
@@ -124,7 +124,7 @@ pysqlite_microprotocols_adapt(PyObject *obj, PyObject *proto, PyObject *alt)
         return NULL;
     }
     if (adapter) {
-        adapted = PyObject_CallFunctionObjArgs(adapter, proto, NULL);
+        adapted = _PyObject_CallOneArg(adapter, proto);
         Py_DECREF(adapter);
 
         if (adapted == Py_None) {
diff --git a/Modules/_sre.c b/Modules/_sre.c
index d4fe588cbe27..f4f9d01dfccf 100644
--- a/Modules/_sre.c
+++ b/Modules/_sre.c
@@ -1082,7 +1082,7 @@ pattern_subx(PatternObject* self, PyObject* ptemplate, PyObject* string,
             match = pattern_new_match(self, &state, 1);
             if (!match)
                 goto error;
-            item = PyObject_CallFunctionObjArgs(filter, match, NULL);
+            item = _PyObject_CallOneArg(filter, match);
             Py_DECREF(match);
             if (!item)
                 goto error;
diff --git a/Modules/_struct.c b/Modules/_struct.c
index 9281c6803f3a..d1c635a31600 100644
--- a/Modules/_struct.c
+++ b/Modules/_struct.c
@@ -2098,7 +2098,7 @@ cache_struct_converter(PyObject *fmt, PyStructObject **ptr)
         return 0;
     }
 
-    s_object = PyObject_CallFunctionObjArgs((PyObject *)(&PyStructType), fmt, NULL);
+    s_object = _PyObject_CallOneArg((PyObject *)(&PyStructType), fmt);
     if (s_object != NULL) {
         if (PyDict_GET_SIZE(cache) >= MAXCACHE)
             PyDict_Clear(cache);
diff --git a/Modules/_xxtestfuzz/fuzzer.c b/Modules/_xxtestfuzz/fuzzer.c
index 16104e492ab1..2446e712c81a 100644
--- a/Modules/_xxtestfuzz/fuzzer.c
+++ b/Modules/_xxtestfuzz/fuzzer.c
@@ -104,7 +104,7 @@ static int fuzz_json_loads(const char* data, size_t size) {
     if (input_bytes == NULL) {
         return 0;
     }
-    PyObject* parsed = PyObject_CallFunctionObjArgs(json_loads_method, input_bytes, NULL);
+    PyObject* parsed = _PyObject_CallOneArg(json_loads_method, input_bytes);
     if (parsed == NULL) {
         /* Ignore ValueError as the fuzzer will more than likely
            generate some invalid json and values */
@@ -263,7 +263,7 @@ static int fuzz_sre_match(const char* data, size_t size) {
     PyObject* pattern = compiled_patterns[idx];
     PyObject* match_callable = PyObject_GetAttrString(pattern, "match");
 
-    PyObject* matches = PyObject_CallFunctionObjArgs(match_callable, to_match, NULL);
+    PyObject* matches = _PyObject_CallOneArg(match_callable, to_match);
 
     Py_XDECREF(matches);
     Py_DECREF(match_callable);
diff --git a/Modules/cjkcodecs/cjkcodecs.h b/Modules/cjkcodecs/cjkcodecs.h
index b67f3482faf8..7ed836598b36 100644
--- a/Modules/cjkcodecs/cjkcodecs.h
+++ b/Modules/cjkcodecs/cjkcodecs.h
@@ -291,7 +291,7 @@ getcodec(PyObject *self, PyObject *encoding)
     if (codecobj == NULL)
         return NULL;
 
-    r = PyObject_CallFunctionObjArgs(cofunc, codecobj, NULL);
+    r = _PyObject_CallOneArg(cofunc, codecobj);
     Py_DECREF(codecobj);
 
     return r;
diff --git a/Modules/cjkcodecs/multibytecodec.c b/Modules/cjkcodecs/multibytecodec.c
index c01a0e5dfadf..052ed8878c1c 100644
--- a/Modules/cjkcodecs/multibytecodec.c
+++ b/Modules/cjkcodecs/multibytecodec.c
@@ -81,7 +81,7 @@ internal_error_callback(const char *errors)
 static PyObject *
 call_error_callback(PyObject *errors, PyObject *exc)
 {
-    PyObject *args, *cb, *r;
+    PyObject *cb, *r;
     const char *str;
 
     assert(PyUnicode_Check(errors));
@@ -92,17 +92,7 @@ call_error_callback(PyObject *errors, PyObject *exc)
     if (cb == NULL)
         return NULL;
 
-    args = PyTuple_New(1);
-    if (args == NULL) {
-        Py_DECREF(cb);
-        return NULL;
-    }
-
-    PyTuple_SET_ITEM(args, 0, exc);
-    Py_INCREF(exc);
-
-    r = PyObject_CallObject(cb, args);
-    Py_DECREF(args);
+    r = _PyObject_CallOneArg(cb, exc);
     Py_DECREF(cb);
     return r;
 }
diff --git a/Modules/gcmodule.c b/Modules/gcmodule.c
index 0cf00e839661..2ee765140b92 100644
--- a/Modules/gcmodule.c
+++ b/Modules/gcmodule.c
@@ -763,7 +763,7 @@ handle_weakrefs(PyGC_Head *unreachable, PyGC_Head *old)
         _PyObject_ASSERT(op, callback != NULL);
 
         /* copy-paste of weakrefobject.c's handle_callback() */
-        temp = PyObject_CallFunctionObjArgs(callback, wr, NULL);
+        temp = _PyObject_CallOneArg(callback, (PyObject *)wr);
         if (temp == NULL)
             PyErr_WriteUnraisable(callback);
         else
diff --git a/Modules/itertoolsmodule.c b/Modules/itertoolsmodule.c
index 00e3cbb31b53..781d0cca5419 100644
--- a/Modules/itertoolsmodule.c
+++ b/Modules/itertoolsmodule.c
@@ -134,7 +134,7 @@ groupby_step(groupbyobject *gbo)
         newkey = newvalue;
         Py_INCREF(newvalue);
     } else {
-        newkey = PyObject_CallFunctionObjArgs(gbo->keyfunc, newvalue, NULL);
+        newkey = _PyObject_CallOneArg(gbo->keyfunc, newvalue);
         if (newkey == NULL) {
             Py_DECREF(newvalue);
             return -1;
@@ -1210,7 +1210,7 @@ dropwhile_next(dropwhileobject *lz)
         if (lz->start == 1)
             return item;
 
-        good = PyObject_CallFunctionObjArgs(lz->func, item, NULL);
+        good = _PyObject_CallOneArg(lz->func, item);
         if (good == NULL) {
             Py_DECREF(item);
             return NULL;
@@ -1373,7 +1373,7 @@ takewhile_next(takewhileobject *lz)
     if (item == NULL)
         return NULL;
 
-    good = PyObject_CallFunctionObjArgs(lz->func, item, NULL);
+    good = _PyObject_CallOneArg(lz->func, item);
     if (good == NULL) {
         Py_DECREF(item);
         return NULL;
@@ -3906,7 +3906,7 @@ filterfalse_next(filterfalseobject *lz)
             ok = PyObject_IsTrue(item);
         } else {
             PyObject *good;
-            good = PyObject_CallFunctionObjArgs(lz->func, item, NULL);
+            good = _PyObject_CallOneArg(lz->func, item);
             if (good == NULL) {
                 Py_DECREF(item);
                 return NULL;
diff --git a/Modules/pyexpat.c b/Modules/pyexpat.c
index 45a1e684d19f..3d193e717c88 100644
--- a/Modules/pyexpat.c
+++ b/Modules/pyexpat.c
@@ -119,7 +119,7 @@ set_error(xmlparseobject *self, enum XML_Error code)
                                   XML_ErrorString(code), lineno, column);
     if (buffer == NULL)
         return NULL;
-    err = PyObject_CallFunctionObjArgs(ErrorObject, buffer, NULL);
+    err = _PyObject_CallOneArg(ErrorObject, buffer);
     Py_DECREF(buffer);
     if (  err != NULL
           && set_error_attr(err, "code", code)
diff --git a/Objects/abstract.c b/Objects/abstract.c
index 77d09143aa07..86178a74ea38 100644
--- a/Objects/abstract.c
+++ b/Objects/abstract.c
@@ -172,13 +172,13 @@ PyObject_GetItem(PyObject *o, PyObject *key)
     }
 
     if (PyType_Check(o)) {
-        PyObject *meth, *result, *stack[1] = {key};
+        PyObject *meth, *result;
         _Py_IDENTIFIER(__class_getitem__);
         if (_PyObject_LookupAttrId(o, &PyId___class_getitem__, &meth) < 0) {
             return NULL;
         }
         if (meth) {
-            result = _PyObject_FastCall(meth, stack, 1);
+            result = _PyObject_CallOneArg(meth, key);
             Py_DECREF(meth);
             return result;
         }
@@ -737,7 +737,7 @@ PyObject_Format(PyObject *obj, PyObject *format_spec)
     }
 
     /* And call it. */
-    result = PyObject_CallFunctionObjArgs(meth, format_spec, NULL);
+    result = _PyObject_CallOneArg(meth, format_spec);
     Py_DECREF(meth);
 
     if (result && !PyUnicode_Check(result)) {
@@ -2459,7 +2459,7 @@ PyObject_IsInstance(PyObject *inst, PyObject *cls)
             Py_DECREF(checker);
             return ok;
         }
-        res = PyObject_CallFunctionObjArgs(checker, inst, NULL);
+        res = _PyObject_CallOneArg(checker, inst);
         Py_LeaveRecursiveCall();
         Py_DECREF(checker);
         if (res != NULL) {
@@ -2533,7 +2533,7 @@ PyObject_IsSubclass(PyObject *derived, PyObject *cls)
             Py_DECREF(checker);
             return ok;
         }
-        res = PyObject_CallFunctionObjArgs(checker, derived, NULL);
+        res = _PyObject_CallOneArg(checker, derived);
         Py_LeaveRecursiveCall();
         Py_DECREF(checker);
         if (res != NULL) {
diff --git a/Objects/bytearrayobject.c b/Objects/bytearrayobject.c
index 1bb19a9271b6..9dd67127b614 100644
--- a/Objects/bytearrayobject.c
+++ b/Objects/bytearrayobject.c
@@ -89,8 +89,7 @@ _canresize(PyByteArrayObject *self)
 PyObject *
 PyByteArray_FromObject(PyObject *input)
 {
-    return PyObject_CallFunctionObjArgs((PyObject *)&PyByteArray_Type,
-                                        input, NULL);
+    return _PyObject_CallOneArg((PyObject *)&PyByteArray_Type, input);
 }
 
 static PyObject *
@@ -2018,8 +2017,7 @@ bytearray_fromhex_impl(PyTypeObject *type, PyObject *string)
 {
     PyObject *result = _PyBytes_FromHex(string, type == &PyByteArray_Type);
     if (type != &PyByteArray_Type && result != NULL) {
-        Py_SETREF(result, PyObject_CallFunctionObjArgs((PyObject *)type,
-                                                       result, NULL));
+        Py_SETREF(result, _PyObject_CallOneArg((PyObject *)type, result));
     }
     return result;
 }
diff --git a/Objects/bytesobject.c b/Objects/bytesobject.c
index 06c87b0c62d3..c4edcca4f761 100644
--- a/Objects/bytesobject.c
+++ b/Objects/bytesobject.c
@@ -2333,8 +2333,7 @@ bytes_fromhex_impl(PyTypeObject *type, PyObject *string)
 {
     PyObject *result = _PyBytes_FromHex(string, 0);
     if (type != &PyBytes_Type && result != NULL) {
-        Py_SETREF(result, PyObject_CallFunctionObjArgs((PyObject *)type,
-                                                       result, NULL));
+        Py_SETREF(result, _PyObject_CallOneArg((PyObject *)type, result));
     }
     return result;
 }
diff --git a/Objects/descrobject.c b/Objects/descrobject.c
index a0eb5057af04..4b985785f08f 100644
--- a/Objects/descrobject.c
+++ b/Objects/descrobject.c
@@ -1340,8 +1340,7 @@ property_descr_get(PyObject *self, PyObject *obj, PyObject *type)
         return NULL;
     }
 
-    PyObject *args[1] = {obj};
-    return _PyObject_FastCall(gs->prop_get, args, 1);
+    return _PyObject_CallOneArg(gs->prop_get, obj);
 }
 
 static int
@@ -1362,7 +1361,7 @@ property_descr_set(PyObject *self, PyObject *obj, PyObject *value)
         return -1;
     }
     if (value == NULL)
-        res = PyObject_CallFunctionObjArgs(func, obj, NULL);
+        res = _PyObject_CallOneArg(func, obj);
     else
         res = PyObject_CallFunctionObjArgs(func, obj, value, NULL);
     if (res == NULL)
diff --git a/Objects/dictobject.c b/Objects/dictobject.c
index 0cc144375006..422f4b0230ba 100644
--- a/Objects/dictobject.c
+++ b/Objects/dictobject.c
@@ -2113,8 +2113,7 @@ dict_subscript(PyDictObject *mp, PyObject *key)
             _Py_IDENTIFIER(__missing__);
             missing = _PyObject_LookupSpecial((PyObject *)mp, &PyId___missing__);
             if (missing != NULL) {
-                res = PyObject_CallFunctionObjArgs(missing,
-                                                   key, NULL);
+                res = _PyObject_CallOneArg(missing, key);
                 Py_DECREF(missing);
                 return res;
             }
diff --git a/Objects/fileobject.c b/Objects/fileobject.c
index 3791241e5c7c..a21e490817eb 100644
--- a/Objects/fileobject.c
+++ b/Objects/fileobject.c
@@ -136,7 +136,7 @@ PyFile_WriteObject(PyObject *v, PyObject *f, int flags)
         Py_DECREF(writer);
         return -1;
     }
-    result = PyObject_CallFunctionObjArgs(writer, value, NULL);
+    result = _PyObject_CallOneArg(writer, value);
     Py_DECREF(value);
     Py_DECREF(writer);
     if (result == NULL)
diff --git a/Objects/floatobject.c b/Objects/floatobject.c
index 15cbe5c9d8ba..689e92907d03 100644
--- a/Objects/floatobject.c
+++ b/Objects/floatobject.c
@@ -1501,7 +1501,7 @@ float_fromhex(PyTypeObject *type, PyObject *string)
         goto parse_error;
     result = PyFloat_FromDouble(negate ? -x : x);
     if (type != &PyFloat_Type && result != NULL) {
-        Py_SETREF(result, PyObject_CallFunctionObjArgs((PyObject *)type, result, NULL));
+        Py_SETREF(result, _PyObject_CallOneArg((PyObject *)type, result));
     }
     return result;
 
diff --git a/Objects/genobject.c b/Objects/genobject.c
index 2d9a2860a3d2..5d1f9c7dd13e 100644
--- a/Objects/genobject.c
+++ b/Objects/genobject.c
@@ -57,7 +57,7 @@ _PyGen_Finalize(PyObject *self)
             /* Save the current exception, if any. */
             PyErr_Fetch(&error_type, &error_value, &error_traceback);
 
-            res = PyObject_CallFunctionObjArgs(finalizer, self, NULL);
+            res = _PyObject_CallOneArg(finalizer, self);
 
             if (res == NULL) {
                 PyErr_WriteUnraisable(self);
@@ -562,7 +562,7 @@ _PyGen_SetStopIterationValue(PyObject *value)
         return 0;
     }
     /* Construct an exception instance manually with
-     * PyObject_CallFunctionObjArgs and pass it to PyErr_SetObject.
+     * _PyObject_CallOneArg and pass it to PyErr_SetObject.
      *
      * We do this to handle a situation when "value" is a tuple, in which
      * case PyErr_SetObject would set the value of StopIteration to
@@ -570,7 +570,7 @@ _PyGen_SetStopIterationValue(PyObject *value)
      *
      * (See PyErr_SetObject/_PyErr_CreateException code for details.)
      */
-    e = PyObject_CallFunctionObjArgs(PyExc_StopIteration, value, NULL);
+    e = _PyObject_CallOneArg(PyExc_StopIteration, value);
     if (e == NULL) {
         return -1;
     }
@@ -1279,7 +1279,7 @@ async_gen_init_hooks(PyAsyncGenObject *o)
         PyObject *res;
 
         Py_INCREF(firstiter);
-        res = PyObject_CallFunctionObjArgs(firstiter, o, NULL);
+        res = _PyObject_CallOneArg(firstiter, (PyObject *)o);
         Py_DECREF(firstiter);
         if (res == NULL) {
             return 1;
diff --git a/Objects/listobject.c b/Objects/listobject.c
index f8bf45e5f8cd..d012ab933a9e 100644
--- a/Objects/listobject.c
+++ b/Objects/listobject.c
@@ -2258,8 +2258,7 @@ list_sort_impl(PyListObject *self, PyObject *keyfunc, int reverse)
         }
 
         for (i = 0; i < saved_ob_size ; i++) {
-            keys[i] = PyObject_CallFunctionObjArgs(keyfunc, saved_ob_item[i],
-                                                   NULL);
+            keys[i] = _PyObject_CallOneArg(keyfunc, saved_ob_item[i]);
             if (keys[i] == NULL) {
                 for (i=i-1 ; i>=0 ; i--)
                     Py_DECREF(keys[i]);
diff --git a/Objects/longobject.c b/Objects/longobject.c
index 50ea2a4e54a4..3978f5c4a167 100644
--- a/Objects/longobject.c
+++ b/Objects/longobject.c
@@ -5611,8 +5611,7 @@ int_from_bytes_impl(PyTypeObject *type, PyObject *bytes_obj,
     Py_DECREF(bytes);
 
     if (long_obj != NULL && type != &PyLong_Type) {
-        Py_SETREF(long_obj, PyObject_CallFunctionObjArgs((PyObject *)type,
-                                                         long_obj, NULL));
+        Py_SETREF(long_obj, _PyObject_CallOneArg((PyObject *)type, long_obj));
     }
 
     return long_obj;
diff --git a/Objects/memoryobject.c b/Objects/memoryobject.c
index a873ac1ec1ea..66920eaf947a 100644
--- a/Objects/memoryobject.c
+++ b/Objects/memoryobject.c
@@ -1962,7 +1962,7 @@ struct_get_unpacker(const char *fmt, Py_ssize_t itemsize)
     if (format == NULL)
         goto error;
 
-    structobj = PyObject_CallFunctionObjArgs(Struct, format, NULL);
+    structobj = _PyObject_CallOneArg(Struct, format);
     if (structobj == NULL)
         goto error;
 
@@ -2001,7 +2001,7 @@ struct_unpack_single(const char *ptr, struct unpacker *x)
     PyObject *v;
 
     memcpy(x->item, ptr, x->itemsize);
-    v = PyObject_CallFunctionObjArgs(x->unpack_from, x->mview, NULL);
+    v = _PyObject_CallOneArg(x->unpack_from, x->mview);
     if (v == NULL)
         return NULL;
 
diff --git a/Objects/moduleobject.c b/Objects/moduleobject.c
index 85134c7a11c6..92f97e6dd485 100644
--- a/Objects/moduleobject.c
+++ b/Objects/moduleobject.c
@@ -736,8 +736,7 @@ module_getattro(PyModuleObject *m, PyObject *name)
         _Py_IDENTIFIER(__getattr__);
         getattr = _PyDict_GetItemId(m->md_dict, &PyId___getattr__);
         if (getattr) {
-            PyObject* stack[1] = {name};
-            return _PyObject_FastCall(getattr, stack, 1);
+            return _PyObject_CallOneArg(getattr, name);
         }
         _Py_IDENTIFIER(__name__);
         mod_name = _PyDict_GetItemId(m->md_dict, &PyId___name__);
diff --git a/Objects/typeobject.c b/Objects/typeobject.c
index f8143337840c..3b9a537936a3 100644
--- a/Objects/typeobject.c
+++ b/Objects/typeobject.c
@@ -1459,8 +1459,7 @@ static PyObject*
 call_unbound_noarg(int unbound, PyObject *func, PyObject *self)
 {
     if (unbound) {
-        PyObject *args[1] = {self};
-        return _PyObject_FastCall(func, args, 1);
+        return _PyObject_CallOneArg(func, self);
     }
     else {
         return _PyObject_CallNoArg(func);
@@ -6561,7 +6560,7 @@ call_attribute(PyObject *self, PyObject *attr, PyObject *name)
         else
             attr = descr;
     }
-    res = PyObject_CallFunctionObjArgs(attr, name, NULL);
+    res = _PyObject_CallOneArg(attr, name);
     Py_XDECREF(descr);
     return res;
 }
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
index 51d314b61a52..5545eae79505 100644
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -4248,7 +4248,7 @@ unicode_decode_call_errorhandler_wchar(
     if (*exceptionObject == NULL)
         goto onError;
 
-    restuple = PyObject_CallFunctionObjArgs(*errorHandler, *exceptionObject, NULL);
+    restuple = _PyObject_CallOneArg(*errorHandler, *exceptionObject);
     if (restuple == NULL)
         goto onError;
     if (!PyTuple_Check(restuple)) {
@@ -4352,7 +4352,7 @@ unicode_decode_call_errorhandler_writer(
     if (*exceptionObject == NULL)
         goto onError;
 
-    restuple = PyObject_CallFunctionObjArgs(*errorHandler, *exceptionObject, NULL);
+    restuple = _PyObject_CallOneArg(*errorHandler, *exceptionObject);
     if (restuple == NULL)
         goto onError;
     if (!PyTuple_Check(restuple)) {
@@ -6799,8 +6799,7 @@ unicode_encode_call_errorhandler(const char *errors,
     if (*exceptionObject == NULL)
         return NULL;
 
-    restuple = PyObject_CallFunctionObjArgs(
-        *errorHandler, *exceptionObject, NULL);
+    restuple = _PyObject_CallOneArg(*errorHandler, *exceptionObject);
     if (restuple == NULL)
         return NULL;
     if (!PyTuple_Check(restuple)) {
@@ -8778,8 +8777,7 @@ unicode_translate_call_errorhandler(const char *errors,
     if (*exceptionObject == NULL)
         return NULL;
 
-    restuple = PyObject_CallFunctionObjArgs(
-        *errorHandler, *exceptionObject, NULL);
+    restuple = _PyObject_CallOneArg(*errorHandler, *exceptionObject);
     if (restuple == NULL)
         return NULL;
     if (!PyTuple_Check(restuple)) {
diff --git a/Objects/weakrefobject.c b/Objects/weakrefobject.c
index 8b8e71031afa..ae3f6dca9eed 100644
--- a/Objects/weakrefobject.c
+++ b/Objects/weakrefobject.c
@@ -874,7 +874,7 @@ PyWeakref_GetObject(PyObject *ref)
 static void
 handle_callback(PyWeakReference *ref, PyObject *callback)
 {
-    PyObject *cbresult = PyObject_CallFunctionObjArgs(callback, ref, NULL);
+    PyObject *cbresult = _PyObject_CallOneArg(callback, (PyObject *)ref);
 
     if (cbresult == NULL)
         PyErr_WriteUnraisable(callback);
diff --git a/Python/_warnings.c b/Python/_warnings.c
index 0b192580e107..b1762e6bedaf 100644
--- a/Python/_warnings.c
+++ b/Python/_warnings.c
@@ -590,7 +590,7 @@ call_show_warning(PyObject *category, PyObject *text, PyObject *message,
     if (msg == NULL)
         goto error;
 
-    res = PyObject_CallFunctionObjArgs(show_fn, msg, NULL);
+    res = _PyObject_CallOneArg(show_fn, msg);
     Py_DECREF(show_fn);
     Py_DECREF(msg);
 
@@ -651,7 +651,7 @@ warn_explicit(PyObject *category, PyObject *message,
     }
     else {
         text = message;
-        message = PyObject_CallFunctionObjArgs(category, message, NULL);
+        message = _PyObject_CallOneArg(category, message);
         if (message == NULL)
             goto cleanup;
     }
@@ -996,7 +996,7 @@ get_source_line(PyObject *module_globals, int lineno)
         return NULL;
     }
     /* Call get_source() to get the source code. */
-    source = PyObject_CallFunctionObjArgs(get_source, module_name, NULL);
+    source = _PyObject_CallOneArg(get_source, module_name);
     Py_DECREF(get_source);
     Py_DECREF(module_name);
     if (!source) {
@@ -1283,7 +1283,7 @@ _PyErr_WarnUnawaitedCoroutine(PyObject *coro)
     int warned = 0;
     PyObject *fn = get_warnings_attr(&PyId__warn_unawaited_coroutine, 1);
     if (fn) {
-        PyObject *res = PyObject_CallFunctionObjArgs(fn, coro, NULL);
+        PyObject *res = _PyObject_CallOneArg(fn, coro);
         Py_DECREF(fn);
         if (res || PyErr_ExceptionMatches(PyExc_RuntimeWarning)) {
             warned = 1;
diff --git a/Python/bltinmodule.c b/Python/bltinmodule.c
index 90fbb44882b0..5de43636d96b 100644
--- a/Python/bltinmodule.c
+++ b/Python/bltinmodule.c
@@ -29,7 +29,6 @@ update_bases(PyObject *bases, PyObject *const *args, Py_ssize_t nargs)
 {
     Py_ssize_t i, j;
     PyObject *base, *meth, *new_base, *result, *new_bases = NULL;
-    PyObject *stack[1] = {bases};
     assert(PyTuple_Check(bases));
 
     for (i = 0; i < nargs; i++) {
@@ -55,7 +54,7 @@ update_bases(PyObject *bases, PyObject *const *args, Py_ssize_t nargs)
             }
             continue;
         }
-        new_base = _PyObject_FastCall(meth, stack, 1);
+        new_base = _PyObject_CallOneArg(meth, bases);
         Py_DECREF(meth);
         if (!new_base) {
             goto error;
@@ -574,7 +573,7 @@ filter_next(filterobject *lz)
             ok = PyObject_IsTrue(item);
         } else {
             PyObject *good;
-            good = PyObject_CallFunctionObjArgs(lz->func, item, NULL);
+            good = _PyObject_CallOneArg(lz->func, item);
             if (good == NULL) {
                 Py_DECREF(item);
                 return NULL;
@@ -1625,7 +1624,7 @@ min_max(PyObject *args, PyObject *kwds, int op)
     while (( item = PyIter_Next(it) )) {
         /* get the value from the key function */
         if (keyfunc != NULL) {
-            val = PyObject_CallFunctionObjArgs(keyfunc, item, NULL);
+            val = _PyObject_CallOneArg(keyfunc, item);
             if (val == NULL)
                 goto Fail_it_item;
         }
@@ -2178,7 +2177,7 @@ builtin_round_impl(PyObject *module, PyObject *number, PyObject *ndigits)
     if (ndigits == NULL || ndigits == Py_None)
         result = _PyObject_CallNoArg(round);
     else
-        result = PyObject_CallFunctionObjArgs(round, ndigits, NULL);
+        result = _PyObject_CallOneArg(round, ndigits);
     Py_DECREF(round);
     return result;
 }
diff --git a/Python/ceval.c b/Python/ceval.c
index 888749b699e9..b0fd6eec63a3 100644
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -1874,7 +1874,7 @@ _PyEval_EvalFrameDefault(PyFrameObject *f, int throwflag)
                 Py_DECREF(value);
                 goto error;
             }
-            res = PyObject_CallFunctionObjArgs(hook, value, NULL);
+            res = _PyObject_CallOneArg(hook, value);
             Py_DECREF(value);
             if (res == NULL)
                 goto error;
diff --git a/Python/codecs.c b/Python/codecs.c
index d4b34f8397f0..386576256f06 100644
--- a/Python/codecs.c
+++ b/Python/codecs.c
@@ -99,7 +99,7 @@ PyObject *normalizestring(const char *string)
 
 PyObject *_PyCodec_Lookup(const char *encoding)
 {
-    PyObject *result, *args = NULL, *v;
+    PyObject *result, *v;
     Py_ssize_t i, len;
 
     if (encoding == NULL) {
@@ -132,13 +132,6 @@ PyObject *_PyCodec_Lookup(const char *encoding)
     }
 
     /* Next, scan the search functions in order of registration */
-    args = PyTuple_New(1);
-    if (args == NULL) {
-        Py_DECREF(v);
-        return NULL;
-    }
-    PyTuple_SET_ITEM(args,0,v);
-
     len = PyList_Size(interp->codec_search_path);
     if (len < 0)
         goto onError;
@@ -155,7 +148,7 @@ PyObject *_PyCodec_Lookup(const char *encoding)
         func = PyList_GetItem(interp->codec_search_path, i);
         if (func == NULL)
             goto onError;
-        result = PyEval_CallObject(func, args);
+        result = _PyObject_CallOneArg(func, v);
         if (result == NULL)
             goto onError;
         if (result == Py_None) {
@@ -182,11 +175,9 @@ PyObject *_PyCodec_Lookup(const char *encoding)
         Py_DECREF(result);
         goto onError;
     }
-    Py_DECREF(args);
     return result;
 
  onError:
-    Py_XDECREF(args);
     return NULL;
 }
 
@@ -325,7 +316,7 @@ PyObject *codec_getstreamcodec(const char *encoding,
     if (errors != NULL)
         streamcodec = PyObject_CallFunction(codeccls, "Os", stream, errors);
     else
-        streamcodec = PyObject_CallFunctionObjArgs(codeccls, stream, NULL);
+        streamcodec = _PyObject_CallOneArg(codeccls, stream);
     Py_DECREF(codecs);
     return streamcodec;
 }
diff --git a/Python/errors.c b/Python/errors.c
index b3b9ac94cd14..a7d40c132d7b 100644
--- a/Python/errors.c
+++ b/Python/errors.c
@@ -93,7 +93,7 @@ _PyErr_CreateException(PyObject *exception, PyObject *value)
         return PyObject_Call(exception, value, NULL);
     }
     else {
-        return PyObject_CallFunctionObjArgs(exception, value, NULL);
+        return _PyObject_CallOneArg(exception, value);
     }
 }
 
@@ -1381,8 +1381,7 @@ _PyErr_WriteUnraisableMsg(const char *err_msg_str, PyObject *obj)
         hook_args = make_unraisable_hook_args(tstate, exc_type, exc_value,
                                               exc_tb, err_msg, obj);
         if (hook_args != NULL) {
-            PyObject *args[1] = {hook_args};
-            PyObject *res = _PyObject_FastCall(hook, args, 1);
+            PyObject *res = _PyObject_CallOneArg(hook, hook_args);
             Py_DECREF(hook_args);
             if (res != NULL) {
                 Py_DECREF(res);
diff --git a/Python/import.c b/Python/import.c
index 3937fbe37d94..76866ae645a7 100644
--- a/Python/import.c
+++ b/Python/import.c
@@ -1180,7 +1180,7 @@ get_path_importer(PyThreadState *tstate, PyObject *path_importer_cache,
         PyObject *hook = PyList_GetItem(path_hooks, j);
         if (hook == NULL)
             return NULL;
-        importer = PyObject_CallFunctionObjArgs(hook, p, NULL);
+        importer = _PyObject_CallOneArg(hook, p);
         if (importer != NULL)
             break;
 


From webhook-mailer at python.org  Thu Jul  4 06:35:53 2019
From: webhook-mailer at python.org (Inada Naoki)
Date: Thu, 04 Jul 2019 10:35:53 -0000
Subject: [Python-checkins] bpo-37493: use _PyObject_CallNoArg in more places
 (GH-14575)
Message-ID: <mailman.240.1562236553.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/7f41c8e0dd237d1f3f0a1d2ba2f3ee4e4bd400a7
commit: 7f41c8e0dd237d1f3f0a1d2ba2f3ee4e4bd400a7
branch: master
author: Jeroen Demeyer <J.Demeyer at UGent.be>
committer: Inada Naoki <songofacandy at gmail.com>
date: 2019-07-04T19:35:31+09:00
summary:

bpo-37493: use _PyObject_CallNoArg in more places (GH-14575)

files:
M Doc/extending/newtypes.rst
M Modules/_collectionsmodule.c
M Modules/_ctypes/_ctypes.c
M Modules/_ctypes/cfield.c
M Modules/_testcapimodule.c
M Modules/posixmodule.c

diff --git a/Doc/extending/newtypes.rst b/Doc/extending/newtypes.rst
index 308c06705e8d..7e0b18d6299f 100644
--- a/Doc/extending/newtypes.rst
+++ b/Doc/extending/newtypes.rst
@@ -104,7 +104,7 @@ done.  This can be done using the :c:func:`PyErr_Fetch` and
            /* This saves the current exception state */
            PyErr_Fetch(&err_type, &err_value, &err_traceback);
 
-           cbresult = PyObject_CallObject(self->my_callback, NULL);
+           cbresult = PyObject_CallNoArgs(self->my_callback);
            if (cbresult == NULL)
                PyErr_WriteUnraisable(self->my_callback);
            else
diff --git a/Modules/_collectionsmodule.c b/Modules/_collectionsmodule.c
index cc7d3cfd0748..7e9cf8a283a2 100644
--- a/Modules/_collectionsmodule.c
+++ b/Modules/_collectionsmodule.c
@@ -1976,7 +1976,7 @@ defdict_missing(defdictobject *dd, PyObject *key)
         Py_DECREF(tup);
         return NULL;
     }
-    value = PyEval_CallObject(factory, NULL);
+    value = _PyObject_CallNoArg(factory);
     if (value == NULL)
         return value;
     if (PyObject_SetItem((PyObject *)dd, key, value) < 0) {
diff --git a/Modules/_ctypes/_ctypes.c b/Modules/_ctypes/_ctypes.c
index 2201c4520ad0..c6ae487b4cf0 100644
--- a/Modules/_ctypes/_ctypes.c
+++ b/Modules/_ctypes/_ctypes.c
@@ -1001,8 +1001,8 @@ PyCPointerType_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
   stgdict items size, align, length contain info about pointers itself,
   stgdict->proto has info about the pointed to type!
 */
-    stgdict = (StgDictObject *)PyObject_CallObject(
-        (PyObject *)&PyCStgDict_Type, NULL);
+    stgdict = (StgDictObject *)_PyObject_CallNoArg(
+        (PyObject *)&PyCStgDict_Type);
     if (!stgdict)
         return NULL;
     stgdict->size = sizeof(void *);
@@ -1489,8 +1489,8 @@ PyCArrayType_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
         goto error;
     }
 
-    stgdict = (StgDictObject *)PyObject_CallObject(
-        (PyObject *)&PyCStgDict_Type, NULL);
+    stgdict = (StgDictObject *)_PyObject_CallNoArg(
+        (PyObject *)&PyCStgDict_Type);
     if (!stgdict)
         goto error;
 
@@ -1946,8 +1946,8 @@ static PyObject *CreateSwappedType(PyTypeObject *type, PyObject *args, PyObject
     if (result == NULL)
         return NULL;
 
-    stgdict = (StgDictObject *)PyObject_CallObject(
-        (PyObject *)&PyCStgDict_Type, NULL);
+    stgdict = (StgDictObject *)_PyObject_CallNoArg(
+        (PyObject *)&PyCStgDict_Type);
     if (!stgdict) {
         Py_DECREF(result);
         return NULL;
@@ -2060,8 +2060,8 @@ PyCSimpleType_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
         goto error;
     }
 
-    stgdict = (StgDictObject *)PyObject_CallObject(
-        (PyObject *)&PyCStgDict_Type, NULL);
+    stgdict = (StgDictObject *)_PyObject_CallNoArg(
+        (PyObject *)&PyCStgDict_Type);
     if (!stgdict)
         goto error;
 
@@ -2454,8 +2454,8 @@ PyCFuncPtrType_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
     PyTypeObject *result;
     StgDictObject *stgdict;
 
-    stgdict = (StgDictObject *)PyObject_CallObject(
-        (PyObject *)&PyCStgDict_Type, NULL);
+    stgdict = (StgDictObject *)_PyObject_CallNoArg(
+        (PyObject *)&PyCStgDict_Type);
     if (!stgdict)
         return NULL;
 
diff --git a/Modules/_ctypes/cfield.c b/Modules/_ctypes/cfield.c
index 95367d509376..e0a50fde6a07 100644
--- a/Modules/_ctypes/cfield.c
+++ b/Modules/_ctypes/cfield.c
@@ -60,8 +60,7 @@ PyCField_FromDesc(PyObject *desc, Py_ssize_t index,
 #define CONT_BITFIELD 2
 #define EXPAND_BITFIELD 3
 
-    self = (CFieldObject *)PyObject_CallObject((PyObject *)&PyCField_Type,
-                                               NULL);
+    self = (CFieldObject *)_PyObject_CallNoArg((PyObject *)&PyCField_Type);
     if (self == NULL)
         return NULL;
     dict = PyType_stgdict(desc);
diff --git a/Modules/_testcapimodule.c b/Modules/_testcapimodule.c
index 07aadea3e983..8f34e935353b 100644
--- a/Modules/_testcapimodule.c
+++ b/Modules/_testcapimodule.c
@@ -4907,7 +4907,7 @@ bad_get(PyObject *module, PyObject *const *args, Py_ssize_t nargs)
         return NULL;
     }
 
-    PyObject *res = PyObject_CallObject(cls, NULL);
+    PyObject *res = _PyObject_CallNoArg(cls);
     if (res == NULL) {
         return NULL;
     }
diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
index b848710281e8..777e933cab59 100644
--- a/Modules/posixmodule.c
+++ b/Modules/posixmodule.c
@@ -433,7 +433,7 @@ run_at_forkers(PyObject *lst, int reverse)
             for (i = 0; i < PyList_GET_SIZE(cpy); i++) {
                 PyObject *func, *res;
                 func = PyList_GET_ITEM(cpy, i);
-                res = PyObject_CallObject(func, NULL);
+                res = _PyObject_CallNoArg(func);
                 if (res == NULL)
                     PyErr_WriteUnraisable(func);
                 else


From webhook-mailer at python.org  Thu Jul  4 06:46:04 2019
From: webhook-mailer at python.org (Miss Islington (bot))
Date: Thu, 04 Jul 2019 10:46:04 -0000
Subject: [Python-checkins] bpo-37421: Fix multiprocessing get_temp_dir()
 finalizer (GH-14572)
Message-ID: <mailman.241.1562237166.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/2d438fc0b748b64d518ea8876af3f6963c6d7d60
commit: 2d438fc0b748b64d518ea8876af3f6963c6d7d60
branch: 3.7
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: GitHub <noreply at github.com>
date: 2019-07-04T03:45:58-07:00
summary:

bpo-37421: Fix multiprocessing get_temp_dir() finalizer (GH-14572)


Fix multiprocessing.util.get_temp_dir() finalizer: clear also the
'tempdir' configuration of the current process, so next call to
get_temp_dir() will create a new temporary directory, rather than
reusing the removed temporary directory.
(cherry picked from commit 9d40554e0da09a44a8547f3f3a2b9dedfeaf7928)

Co-authored-by: Victor Stinner <vstinner at redhat.com>

files:
A Misc/NEWS.d/next/Library/2019-07-03-12-47-52.bpo-37421.gR5hC8.rst
M Lib/multiprocessing/util.py

diff --git a/Lib/multiprocessing/util.py b/Lib/multiprocessing/util.py
index 0c4eb2473273..0f9eac7e9fb4 100644
--- a/Lib/multiprocessing/util.py
+++ b/Lib/multiprocessing/util.py
@@ -106,6 +106,15 @@ def log_to_stderr(level=None):
 # Function returning a temp directory which will be removed on exit
 #
 
+def _remove_temp_dir(rmtree, tempdir):
+    rmtree(tempdir)
+
+    current_process = process.current_process()
+    # current_process() can be None if the finalizer is called
+    # late during Python finalization
+    if current_process is not None:
+        current_process._config['tempdir'] = None
+
 def get_temp_dir():
     # get name of a temp directory which will be automatically cleaned up
     tempdir = process.current_process()._config.get('tempdir')
@@ -113,7 +122,10 @@ def get_temp_dir():
         import shutil, tempfile
         tempdir = tempfile.mkdtemp(prefix='pymp-')
         info('created temp directory %s', tempdir)
-        Finalize(None, shutil.rmtree, args=[tempdir], exitpriority=-100)
+        # keep a strong reference to shutil.rmtree(), since the finalizer
+        # can be called late during Python shutdown
+        Finalize(None, _remove_temp_dir, args=(shutil.rmtree, tempdir),
+                 exitpriority=-100)
         process.current_process()._config['tempdir'] = tempdir
     return tempdir
 
diff --git a/Misc/NEWS.d/next/Library/2019-07-03-12-47-52.bpo-37421.gR5hC8.rst b/Misc/NEWS.d/next/Library/2019-07-03-12-47-52.bpo-37421.gR5hC8.rst
new file mode 100644
index 000000000000..450d76f07289
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2019-07-03-12-47-52.bpo-37421.gR5hC8.rst
@@ -0,0 +1,4 @@
+Fix :func:`multiprocessing.util.get_temp_dir` finalizer: clear also the
+'tempdir' configuration of the current process, so next call to
+``get_temp_dir()`` will create a new temporary directory, rather than
+reusing the removed temporary directory.


From webhook-mailer at python.org  Thu Jul  4 07:34:40 2019
From: webhook-mailer at python.org (Miss Islington (bot))
Date: Thu, 04 Jul 2019 11:34:40 -0000
Subject: [Python-checkins] bpo-37421: Fix multiprocessing get_temp_dir()
 finalizer (GH-14572)
Message-ID: <mailman.242.1562240081.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/957656ee1d6fb42664274ef2f440a10d26870e2a
commit: 957656ee1d6fb42664274ef2f440a10d26870e2a
branch: 3.8
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: GitHub <noreply at github.com>
date: 2019-07-04T04:34:31-07:00
summary:

bpo-37421: Fix multiprocessing get_temp_dir() finalizer (GH-14572)


Fix multiprocessing.util.get_temp_dir() finalizer: clear also the
'tempdir' configuration of the current process, so next call to
get_temp_dir() will create a new temporary directory, rather than
reusing the removed temporary directory.
(cherry picked from commit 9d40554e0da09a44a8547f3f3a2b9dedfeaf7928)

Co-authored-by: Victor Stinner <vstinner at redhat.com>

files:
A Misc/NEWS.d/next/Library/2019-07-03-12-47-52.bpo-37421.gR5hC8.rst
M Lib/multiprocessing/util.py

diff --git a/Lib/multiprocessing/util.py b/Lib/multiprocessing/util.py
index 5674ad773f97..19380917b6f5 100644
--- a/Lib/multiprocessing/util.py
+++ b/Lib/multiprocessing/util.py
@@ -106,6 +106,15 @@ def log_to_stderr(level=None):
 # Function returning a temp directory which will be removed on exit
 #
 
+def _remove_temp_dir(rmtree, tempdir):
+    rmtree(tempdir)
+
+    current_process = process.current_process()
+    # current_process() can be None if the finalizer is called
+    # late during Python finalization
+    if current_process is not None:
+        current_process._config['tempdir'] = None
+
 def get_temp_dir():
     # get name of a temp directory which will be automatically cleaned up
     tempdir = process.current_process()._config.get('tempdir')
@@ -113,7 +122,10 @@ def get_temp_dir():
         import shutil, tempfile
         tempdir = tempfile.mkdtemp(prefix='pymp-')
         info('created temp directory %s', tempdir)
-        Finalize(None, shutil.rmtree, args=[tempdir], exitpriority=-100)
+        # keep a strong reference to shutil.rmtree(), since the finalizer
+        # can be called late during Python shutdown
+        Finalize(None, _remove_temp_dir, args=(shutil.rmtree, tempdir),
+                 exitpriority=-100)
         process.current_process()._config['tempdir'] = tempdir
     return tempdir
 
diff --git a/Misc/NEWS.d/next/Library/2019-07-03-12-47-52.bpo-37421.gR5hC8.rst b/Misc/NEWS.d/next/Library/2019-07-03-12-47-52.bpo-37421.gR5hC8.rst
new file mode 100644
index 000000000000..450d76f07289
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2019-07-03-12-47-52.bpo-37421.gR5hC8.rst
@@ -0,0 +1,4 @@
+Fix :func:`multiprocessing.util.get_temp_dir` finalizer: clear also the
+'tempdir' configuration of the current process, so next call to
+``get_temp_dir()`` will create a new temporary directory, rather than
+reusing the removed temporary directory.


From webhook-mailer at python.org  Thu Jul  4 11:47:33 2019
From: webhook-mailer at python.org (Miss Islington (bot))
Date: Thu, 04 Jul 2019 15:47:33 -0000
Subject: [Python-checkins] Minor updates to the macOS installer screens for
 3.8.0b2 (GH-14501)
Message-ID: <mailman.243.1562255254.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/19956d9d74acbe0c522e610900193cf2bc3c1c3e
commit: 19956d9d74acbe0c522e610900193cf2bc3c1c3e
branch: 3.8
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: GitHub <noreply at github.com>
date: 2019-07-04T08:47:25-07:00
summary:

Minor updates to the macOS installer screens for 3.8.0b2 (GH-14501)

(cherry picked from commit fc1fbe6099e826e8304eadf781af7c10d739fc40)

Co-authored-by: Ned Deily <nad at python.org>

files:
M Mac/BuildScript/resources/ReadMe.rtf
M Mac/BuildScript/resources/Welcome.rtf

diff --git a/Mac/BuildScript/resources/ReadMe.rtf b/Mac/BuildScript/resources/ReadMe.rtf
index ab7aeff5376c..ec83750c6e69 100644
--- a/Mac/BuildScript/resources/ReadMe.rtf
+++ b/Mac/BuildScript/resources/ReadMe.rtf
@@ -1,4 +1,4 @@
-{\rtf1\ansi\ansicpg1252\cocoartf1671\cocoasubrtf200
+{\rtf1\ansi\ansicpg1252\cocoartf1671\cocoasubrtf500
 {\fonttbl\f0\fswiss\fcharset0 Helvetica;\f1\fswiss\fcharset0 Helvetica-Bold;\f2\fswiss\fcharset0 Helvetica-Oblique;
 \f3\fmodern\fcharset0 CourierNewPSMT;}
 {\colortbl;\red255\green255\blue255;}
@@ -8,12 +8,18 @@
 
 \f0\fs24 \cf0 This package will install Python $FULL_VERSION for macOS $MACOSX_DEPLOYMENT_TARGET for the following architecture(s): $ARCHITECTURES.\
 \
+\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\partightenfactor0
+
+\f1\b \cf0 NOTE: 
+\f0\b0 This is a beta test preview of Python 3.8.0, the next feature release of Python 3.8.  It is not intended for production use.\
+\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural\partightenfactor0
+\cf0 \
 \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural\partightenfactor0
 
 \f1\b \cf0 \ul \ulc0 Certificate verification and OpenSSL\
 
 \f0\b0 \ulnone \
-This package includes its own private copy of OpenSSL 1.1.0.   The trust certificates in system and user keychains managed by the 
+This package includes its own private copy of OpenSSL 1.1.1.   The trust certificates in system and user keychains managed by the 
 \f2\i Keychain Access 
 \f0\i0 application and the 
 \f2\i security
diff --git a/Mac/BuildScript/resources/Welcome.rtf b/Mac/BuildScript/resources/Welcome.rtf
index df5d20da9ebb..053084d0425b 100644
--- a/Mac/BuildScript/resources/Welcome.rtf
+++ b/Mac/BuildScript/resources/Welcome.rtf
@@ -1,5 +1,6 @@
-{\rtf1\ansi\ansicpg1252\cocoartf1671\cocoasubrtf200
-\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;\f1\fswiss\fcharset0 Helvetica-Bold;}
+{\rtf1\ansi\ansicpg1252\cocoartf1671\cocoasubrtf500
+\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;\f1\fswiss\fcharset0 Helvetica-Bold;\f2\fmodern\fcharset0 CourierNewPSMT;
+}
 {\colortbl;\red255\green255\blue255;}
 {\*\expandedcolortbl;;}
 \paperw11905\paperh16837\margl1440\margr1440\vieww12200\viewh10880\viewkind0
@@ -17,7 +18,11 @@
 \f1\b IDLE
 \f0\b0 .\
 \
+At the end of this install, click on 
+\f2 Install Certificates
+\f0  for SSL root certificates\
+\
 
 \f1\b NOTE: 
-\f0\b0 This is an alpha test preview of Python 3.8.0, the next feature release of Python 3.8.  It is not intended for production use.\
+\f0\b0 This is a beta test preview of Python 3.8.0, the next feature release of Python 3.8.  It is not intended for production use.\
 }
\ No newline at end of file


From webhook-mailer at python.org  Thu Jul  4 12:30:43 2019
From: webhook-mailer at python.org (Victor Stinner)
Date: Thu, 04 Jul 2019 16:30:43 -0000
Subject: [Python-checkins] bpo-37266: Add bpo number to the What's New entry
 (GH614584)
Message-ID: <mailman.244.1562257844.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/b4e68960b90627422325fdb75f463df1e4153c6e
commit: b4e68960b90627422325fdb75f463df1e4153c6e
branch: master
author: Victor Stinner <vstinner at redhat.com>
committer: GitHub <noreply at github.com>
date: 2019-07-04T18:30:19+02:00
summary:

bpo-37266: Add bpo number to the What's New entry (GH614584)

To get more info about this change.

files:
M Doc/whatsnew/3.9.rst

diff --git a/Doc/whatsnew/3.9.rst b/Doc/whatsnew/3.9.rst
index 43567b9b4cea..85e254f061eb 100644
--- a/Doc/whatsnew/3.9.rst
+++ b/Doc/whatsnew/3.9.rst
@@ -110,6 +110,7 @@ In a subinterpreter, spawning a daemon thread now raises an exception. Daemon
 threads were never supported in subinterpreters. Previously, the subinterpreter
 finalization crashed with a Python fatal error if a daemon thread was still
 running.
+(Contributed by Victor Stinner in :issue:`37266`.)
 
 pprint
 ------


From webhook-mailer at python.org  Thu Jul  4 14:29:02 2019
From: webhook-mailer at python.org (Ethan Furman)
Date: Thu, 04 Jul 2019 18:29:02 -0000
Subject: [Python-checkins] bpo-37479: on Enum subclasses with mixins,
 __format__ uses overridden __str__ (GH-14545)
Message-ID: <mailman.245.1562264943.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/2f19e82fbe98ce86bcd98a176328af2808b678e8
commit: 2f19e82fbe98ce86bcd98a176328af2808b678e8
branch: master
author: thatneat <thatneat at users.noreply.github.com>
committer: Ethan Furman <ethan at stoneleaf.us>
date: 2019-07-04T11:28:37-07:00
summary:

bpo-37479: on Enum subclasses with mixins, __format__ uses overridden __str__ (GH-14545)

* bpo-37479: on Enum subclasses with mixins, __format__ uses overridden __str__

files:
A Misc/NEWS.d/next/Library/2019-07-02-12-43-57.bpo-37479.O53a5S.rst
M Doc/library/enum.rst
M Lib/enum.py
M Lib/test/test_enum.py
M Misc/ACKS

diff --git a/Doc/library/enum.rst b/Doc/library/enum.rst
index 19277d76995f..d7d319a95134 100644
--- a/Doc/library/enum.rst
+++ b/Doc/library/enum.rst
@@ -739,9 +739,11 @@ Some rules:
    :meth:`__str__` and :meth:`__repr__` respectively; other codes (such as
    `%i` or `%h` for IntEnum) treat the enum member as its mixed-in type.
 5. :ref:`Formatted string literals <f-strings>`, :meth:`str.format`,
-   and :func:`format` will use the mixed-in
-   type's :meth:`__format__`.  If the :class:`Enum` class's :func:`str` or
-   :func:`repr` is desired, use the `!s` or `!r` format codes.
+   and :func:`format` will use the mixed-in type's :meth:`__format__`
+   unless :meth:`__str__` or :meth:`__format__` is overridden in the subclass,
+   in which case the overridden methods or :class:`Enum` methods will be used.
+   Use the !s and !r format codes to force usage of the :class:`Enum` class's
+   :meth:`__str__` and :meth:`__repr__` methods.
 
 When to use :meth:`__new__` vs. :meth:`__init__`
 ------------------------------------------------
diff --git a/Lib/enum.py b/Lib/enum.py
index 403f747d22a4..69a7f49d8072 100644
--- a/Lib/enum.py
+++ b/Lib/enum.py
@@ -622,8 +622,9 @@ def __format__(self, format_spec):
         # we can get strange results with the Enum name showing up instead of
         # the value
 
-        # pure Enum branch
-        if self._member_type_ is object:
+        # pure Enum branch, or branch with __str__ explicitly overridden
+        str_overridden = type(self).__str__ != Enum.__str__
+        if self._member_type_ is object or str_overridden:
             cls = str
             val = str(self)
         # mix-in branch
diff --git a/Lib/test/test_enum.py b/Lib/test/test_enum.py
index 47081cf75ca0..fcfa7d923e75 100644
--- a/Lib/test/test_enum.py
+++ b/Lib/test/test_enum.py
@@ -445,12 +445,63 @@ def test_format_enum(self):
         self.assertEqual('{:<20}'.format(Season.SPRING),
                          '{:<20}'.format(str(Season.SPRING)))
 
-    def test_format_enum_custom(self):
+    def test_str_override_enum(self):
+        class EnumWithStrOverrides(Enum):
+            one = auto()
+            two = auto()
+
+            def __str__(self):
+                return 'Str!'
+        self.assertEqual(str(EnumWithStrOverrides.one), 'Str!')
+        self.assertEqual('{}'.format(EnumWithStrOverrides.one), 'Str!')
+
+    def test_format_override_enum(self):
+        class EnumWithFormatOverride(Enum):
+            one = 1.0
+            two = 2.0
+            def __format__(self, spec):
+                return 'Format!!'
+        self.assertEqual(str(EnumWithFormatOverride.one), 'EnumWithFormatOverride.one')
+        self.assertEqual('{}'.format(EnumWithFormatOverride.one), 'Format!!')
+
+    def test_str_and_format_override_enum(self):
+        class EnumWithStrFormatOverrides(Enum):
+            one = auto()
+            two = auto()
+            def __str__(self):
+                return 'Str!'
+            def __format__(self, spec):
+                return 'Format!'
+        self.assertEqual(str(EnumWithStrFormatOverrides.one), 'Str!')
+        self.assertEqual('{}'.format(EnumWithStrFormatOverrides.one), 'Format!')
+
+    def test_str_override_mixin(self):
+        class MixinEnumWithStrOverride(float, Enum):
+            one = 1.0
+            two = 2.0
+            def __str__(self):
+                return 'Overridden!'
+        self.assertEqual(str(MixinEnumWithStrOverride.one), 'Overridden!')
+        self.assertEqual('{}'.format(MixinEnumWithStrOverride.one), 'Overridden!')
+
+    def test_str_and_format_override_mixin(self):
+        class MixinWithStrFormatOverrides(float, Enum):
+            one = 1.0
+            two = 2.0
+            def __str__(self):
+                return 'Str!'
+            def __format__(self, spec):
+                return 'Format!'
+        self.assertEqual(str(MixinWithStrFormatOverrides.one), 'Str!')
+        self.assertEqual('{}'.format(MixinWithStrFormatOverrides.one), 'Format!')
+
+    def test_format_override_mixin(self):
         class TestFloat(float, Enum):
             one = 1.0
             two = 2.0
             def __format__(self, spec):
                 return 'TestFloat success!'
+        self.assertEqual(str(TestFloat.one), 'TestFloat.one')
         self.assertEqual('{}'.format(TestFloat.one), 'TestFloat success!')
 
     def assertFormatIsValue(self, spec, member):
diff --git a/Misc/ACKS b/Misc/ACKS
index a4d4372d3443..36fe727c8421 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -356,6 +356,7 @@ Tom Culliton
 Ra?l Cumplido
 Antonio Cuni
 Brian Curtin
+Jason Curtis
 Paul Dagnelie
 Lisandro Dalcin
 Darren Dale
diff --git a/Misc/NEWS.d/next/Library/2019-07-02-12-43-57.bpo-37479.O53a5S.rst b/Misc/NEWS.d/next/Library/2019-07-02-12-43-57.bpo-37479.O53a5S.rst
new file mode 100644
index 000000000000..cf23155c3395
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2019-07-02-12-43-57.bpo-37479.O53a5S.rst
@@ -0,0 +1,2 @@
+When `Enum.__str__` is overridden in a derived class, the override will be
+used by `Enum.__format__` regardless of whether mixin classes are present.
\ No newline at end of file


From webhook-mailer at python.org  Fri Jul  5 04:42:00 2019
From: webhook-mailer at python.org (Andrew Svetlov)
Date: Fri, 05 Jul 2019 08:42:00 -0000
Subject: [Python-checkins] Use OSError subclasses in os documentation
 (GH-14262)
Message-ID: <mailman.246.1562316120.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/a55f75a6e3e9cda5c7c30bd961386b1a8a2e9892
commit: a55f75a6e3e9cda5c7c30bd961386b1a8a2e9892
branch: master
author: Tim Hoffmann <2836374+timhoffm at users.noreply.github.com>
committer: Andrew Svetlov <andrew.svetlov at gmail.com>
date: 2019-07-05T11:41:35+03:00
summary:

Use OSError subclasses in os documentation (GH-14262)

files:
M Doc/library/os.rst

diff --git a/Doc/library/os.rst b/Doc/library/os.rst
index ee3c35c2a998..6e8df88cf052 100644
--- a/Doc/library/os.rst
+++ b/Doc/library/os.rst
@@ -36,9 +36,9 @@ Notes on the availability of these functions:
 
 .. note::
 
-   All functions in this module raise :exc:`OSError` in the case of invalid or
-   inaccessible file names and paths, or other arguments that have the correct
-   type, but are not accepted by the operating system.
+   All functions in this module raise :exc:`OSError` (or subclasses thereof) in
+   the case of invalid or inaccessible file names and paths, or other arguments
+   that have the correct type, but are not accepted by the operating system.
 
 .. exception:: error
 
@@ -1898,8 +1898,8 @@ features:
    directories you can set the umask before invoking :func:`makedirs`.  The
    file permission bits of existing parent directories are not changed.
 
-   If *exist_ok* is ``False`` (the default), an :exc:`OSError` is raised if the
-   target directory already exists.
+   If *exist_ok* is ``False`` (the default), an :exc:`FileExistsError` is
+   raised if the target directory already exists.
 
    .. note::
 
@@ -2052,8 +2052,8 @@ features:
 
 .. function:: remove(path, *, dir_fd=None)
 
-   Remove (delete) the file *path*.  If *path* is a directory, :exc:`OSError` is
-   raised.  Use :func:`rmdir` to remove directories.
+   Remove (delete) the file *path*.  If *path* is a directory, an
+   :exc:`IsADirectoryError` is raised.  Use :func:`rmdir` to remove directories.
 
    This function can support :ref:`paths relative to directory descriptors
    <dir_fd>`.
@@ -2090,13 +2090,19 @@ features:
 
 .. function:: rename(src, dst, *, src_dir_fd=None, dst_dir_fd=None)
 
-   Rename the file or directory *src* to *dst*.  If *dst* is a directory,
-   :exc:`OSError` will be raised.  On Unix, if *dst* exists and is a file, it will
-   be replaced silently if the user has permission.  The operation may fail on some
-   Unix flavors if *src* and *dst* are on different filesystems.  If successful,
-   the renaming will be an atomic operation (this is a POSIX requirement).  On
-   Windows, if *dst* already exists, :exc:`OSError` will be raised even if it is a
-   file.
+   Rename the file or directory *src* to *dst*. If *dst* exists, the operation
+   will fail with an :exc:`OSError` subclass in a number of cases:
+
+   On Windows, if *dst* exists a :exc:`FileExistsError` is always raised.
+
+   On Unix, if *src* is a file and *dst* is a directory or vice-versa, anq:q
+   :exc:`IsADirectoryError` or a :exc:`NotADirectoryError` will be raised
+   respectively.  If both are directories and *dst* is empty, *dst* will be
+   silently replaced.  If *dst* is a non-empty directory, an :exc:`OSError`
+   is raised. If both are files, *dst* it will be replaced silently if the user
+   has permission.  The operation may fail on some Unix flavors if *src* and
+   *dst* are on different filesystems.  If successful, the renaming will be an
+   atomic operation (this is a POSIX requirement).
 
    This function can support specifying *src_dir_fd* and/or *dst_dir_fd* to
    supply :ref:`paths relative to directory descriptors <dir_fd>`.
@@ -2145,9 +2151,10 @@ features:
 
 .. function:: rmdir(path, *, dir_fd=None)
 
-   Remove (delete) the directory *path*.  Only works when the directory is
-   empty, otherwise, :exc:`OSError` is raised.  In order to remove whole
-   directory trees, :func:`shutil.rmtree` can be used.
+   Remove (delete) the directory *path*.  If the directory does not exist or is
+   not empty, an :exc:`FileNotFoundError` or an :exc:`OSError` is raised
+   respectively.  In order to remove whole directory trees,
+   :func:`shutil.rmtree` can be used.
 
    This function can support :ref:`paths relative to directory descriptors
    <dir_fd>`.


From webhook-mailer at python.org  Fri Jul  5 04:44:18 2019
From: webhook-mailer at python.org (Victor Stinner)
Date: Fri, 05 Jul 2019 08:44:18 -0000
Subject: [Python-checkins] bpo-37481: Deprecate distutils bdist_wininst
 command (GH-14553)
Message-ID: <mailman.247.1562316260.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/1da4462765b084dfa8d869b6cb5855e8f6014a11
commit: 1da4462765b084dfa8d869b6cb5855e8f6014a11
branch: master
author: Victor Stinner <vstinner at redhat.com>
committer: GitHub <noreply at github.com>
date: 2019-07-05T10:44:12+02:00
summary:

bpo-37481: Deprecate distutils bdist_wininst command (GH-14553)

The distutils bdist_wininst command is now deprecated, use
bdist_wheel (wheel packages) instead.

files:
A Misc/NEWS.d/next/Library/2019-07-02-13-08-30.bpo-37481.hd5k09.rst
M Doc/distutils/apiref.rst
M Doc/distutils/builtdist.rst
M Doc/whatsnew/3.8.rst
M Lib/distutils/command/bdist_wininst.py
M Lib/distutils/tests/test_bdist_wininst.py

diff --git a/Doc/distutils/apiref.rst b/Doc/distutils/apiref.rst
index 2601d30f63eb..937f19f57be9 100644
--- a/Doc/distutils/apiref.rst
+++ b/Doc/distutils/apiref.rst
@@ -1863,6 +1863,9 @@ Subclasses of :class:`Command` must define the following methods.
 .. module:: distutils.command.bdist_wininst
    :synopsis: Build a Windows installer
 
+.. deprecated:: 3.8
+   Use bdist_wheel (wheel packages) instead.
+
 
 .. % todo
 
diff --git a/Doc/distutils/builtdist.rst b/Doc/distutils/builtdist.rst
index 8c65d9d59118..b814f2e9508c 100644
--- a/Doc/distutils/builtdist.rst
+++ b/Doc/distutils/builtdist.rst
@@ -146,6 +146,9 @@ generated by each, are:
 | :command:`bdist_msi`     | msi                                 |
 +--------------------------+-------------------------------------+
 
+.. note::
+   bdist_wininst is deprecated since Python 3.8.
+
 The following sections give details on the individual :command:`bdist_\*`
 commands.
 
@@ -298,6 +301,9 @@ file winds up deep in the "build tree," in a temporary directory created by
 Creating Windows Installers
 ===========================
 
+.. warning::
+   bdist_wininst is deprecated since Python 3.8.
+
 Executable installers are the natural format for binary distributions on
 Windows.  They display a nice graphical user interface, display some information
 about the module distribution to be installed taken from the metadata in the
@@ -459,3 +465,6 @@ Starting with Python 2.6, bdist_wininst supports a :option:`!--user-access-contr
 option.  The default is 'none' (meaning no UAC handling is done), and other
 valid values are 'auto' (meaning prompt for UAC elevation if Python was
 installed for all users) and 'force' (meaning always prompt for elevation).
+
+.. note::
+   bdist_wininst is deprecated since Python 3.8.
diff --git a/Doc/whatsnew/3.8.rst b/Doc/whatsnew/3.8.rst
index 61e1d3da989d..95f25cd1cc52 100644
--- a/Doc/whatsnew/3.8.rst
+++ b/Doc/whatsnew/3.8.rst
@@ -1068,6 +1068,10 @@ Build and C API Changes
 Deprecated
 ==========
 
+* The distutils ``bdist_wininst`` command is now deprecated, use
+  ``bdist_wheel`` (wheel packages) instead.
+  (Contributed by Victor Stinner in :issue:`37481`.)
+
 * Deprecated methods ``getchildren()`` and ``getiterator()`` in
   the :mod:`~xml.etree.ElementTree` module emit now a
   :exc:`DeprecationWarning` instead of :exc:`PendingDeprecationWarning`.
diff --git a/Lib/distutils/command/bdist_wininst.py b/Lib/distutils/command/bdist_wininst.py
index acaa184b5f71..b5ed6f041e19 100644
--- a/Lib/distutils/command/bdist_wininst.py
+++ b/Lib/distutils/command/bdist_wininst.py
@@ -3,7 +3,9 @@
 Implements the Distutils 'bdist_wininst' command: create a windows installer
 exe-program."""
 
-import sys, os
+import os
+import sys
+import warnings
 from distutils.core import Command
 from distutils.util import get_platform
 from distutils.dir_util import create_tree, remove_tree
@@ -58,6 +60,12 @@ class bdist_wininst(Command):
     # bpo-10945: bdist_wininst requires mbcs encoding only available on Windows
     _unsupported = (sys.platform != "win32")
 
+    def __init__(self, *args, **kw):
+        super().__init__(*args, **kw)
+        warnings.warn("bdist_wininst command is deprecated since Python 3.8, "
+                      "use bdist_wheel (wheel packages) instead",
+                      DeprecationWarning, 2)
+
     def initialize_options(self):
         self.bdist_dir = None
         self.plat_name = None
diff --git a/Lib/distutils/tests/test_bdist_wininst.py b/Lib/distutils/tests/test_bdist_wininst.py
index 163f1cc97bf9..5c3d025d3321 100644
--- a/Lib/distutils/tests/test_bdist_wininst.py
+++ b/Lib/distutils/tests/test_bdist_wininst.py
@@ -2,7 +2,7 @@
 import sys
 import platform
 import unittest
-from test.support import run_unittest
+from test.support import run_unittest, check_warnings
 
 from distutils.command.bdist_wininst import bdist_wininst
 from distutils.tests import support
@@ -21,7 +21,8 @@ def test_get_exe_bytes(self):
         # this test makes sure it works now for every platform
         # let's create a command
         pkg_pth, dist = self.create_dist()
-        cmd = bdist_wininst(dist)
+        with check_warnings(("", DeprecationWarning)):
+            cmd = bdist_wininst(dist)
         cmd.ensure_finalized()
 
         # let's run the code that finds the right wininst*.exe file
diff --git a/Misc/NEWS.d/next/Library/2019-07-02-13-08-30.bpo-37481.hd5k09.rst b/Misc/NEWS.d/next/Library/2019-07-02-13-08-30.bpo-37481.hd5k09.rst
new file mode 100644
index 000000000000..a3faecdd9151
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2019-07-02-13-08-30.bpo-37481.hd5k09.rst
@@ -0,0 +1,2 @@
+The distutils ``bdist_wininst`` command is deprecated in Python 3.8, use
+``bdist_wheel`` (wheel packages) instead.


From webhook-mailer at python.org  Fri Jul  5 04:47:46 2019
From: webhook-mailer at python.org (Miss Islington (bot))
Date: Fri, 05 Jul 2019 08:47:46 -0000
Subject: [Python-checkins] Use OSError subclasses in os documentation
 (GH-14262)
Message-ID: <mailman.248.1562316468.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/d5a72923c27e2c270de121f3d3a5116c305b6e00
commit: d5a72923c27e2c270de121f3d3a5116c305b6e00
branch: 3.7
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: GitHub <noreply at github.com>
date: 2019-07-05T01:47:42-07:00
summary:

Use OSError subclasses in os documentation (GH-14262)

(cherry picked from commit a55f75a6e3e9cda5c7c30bd961386b1a8a2e9892)

Co-authored-by: Tim Hoffmann <2836374+timhoffm at users.noreply.github.com>

files:
M Doc/library/os.rst

diff --git a/Doc/library/os.rst b/Doc/library/os.rst
index 9ed999eb458b..63d118d40f9a 100644
--- a/Doc/library/os.rst
+++ b/Doc/library/os.rst
@@ -35,9 +35,9 @@ Notes on the availability of these functions:
 
 .. note::
 
-   All functions in this module raise :exc:`OSError` in the case of invalid or
-   inaccessible file names and paths, or other arguments that have the correct
-   type, but are not accepted by the operating system.
+   All functions in this module raise :exc:`OSError` (or subclasses thereof) in
+   the case of invalid or inaccessible file names and paths, or other arguments
+   that have the correct type, but are not accepted by the operating system.
 
 .. exception:: error
 
@@ -1858,8 +1858,8 @@ features:
    directories you can set the umask before invoking :func:`makedirs`.  The
    file permission bits of existing parent directories are not changed.
 
-   If *exist_ok* is ``False`` (the default), an :exc:`OSError` is raised if the
-   target directory already exists.
+   If *exist_ok* is ``False`` (the default), an :exc:`FileExistsError` is
+   raised if the target directory already exists.
 
    .. note::
 
@@ -2010,8 +2010,8 @@ features:
 
 .. function:: remove(path, *, dir_fd=None)
 
-   Remove (delete) the file *path*.  If *path* is a directory, :exc:`OSError` is
-   raised.  Use :func:`rmdir` to remove directories.
+   Remove (delete) the file *path*.  If *path* is a directory, an
+   :exc:`IsADirectoryError` is raised.  Use :func:`rmdir` to remove directories.
 
    This function can support :ref:`paths relative to directory descriptors
    <dir_fd>`.
@@ -2048,13 +2048,19 @@ features:
 
 .. function:: rename(src, dst, *, src_dir_fd=None, dst_dir_fd=None)
 
-   Rename the file or directory *src* to *dst*.  If *dst* is a directory,
-   :exc:`OSError` will be raised.  On Unix, if *dst* exists and is a file, it will
-   be replaced silently if the user has permission.  The operation may fail on some
-   Unix flavors if *src* and *dst* are on different filesystems.  If successful,
-   the renaming will be an atomic operation (this is a POSIX requirement).  On
-   Windows, if *dst* already exists, :exc:`OSError` will be raised even if it is a
-   file.
+   Rename the file or directory *src* to *dst*. If *dst* exists, the operation
+   will fail with an :exc:`OSError` subclass in a number of cases:
+
+   On Windows, if *dst* exists a :exc:`FileExistsError` is always raised.
+
+   On Unix, if *src* is a file and *dst* is a directory or vice-versa, anq:q
+   :exc:`IsADirectoryError` or a :exc:`NotADirectoryError` will be raised
+   respectively.  If both are directories and *dst* is empty, *dst* will be
+   silently replaced.  If *dst* is a non-empty directory, an :exc:`OSError`
+   is raised. If both are files, *dst* it will be replaced silently if the user
+   has permission.  The operation may fail on some Unix flavors if *src* and
+   *dst* are on different filesystems.  If successful, the renaming will be an
+   atomic operation (this is a POSIX requirement).
 
    This function can support specifying *src_dir_fd* and/or *dst_dir_fd* to
    supply :ref:`paths relative to directory descriptors <dir_fd>`.
@@ -2103,9 +2109,10 @@ features:
 
 .. function:: rmdir(path, *, dir_fd=None)
 
-   Remove (delete) the directory *path*.  Only works when the directory is
-   empty, otherwise, :exc:`OSError` is raised.  In order to remove whole
-   directory trees, :func:`shutil.rmtree` can be used.
+   Remove (delete) the directory *path*.  If the directory does not exist or is
+   not empty, an :exc:`FileNotFoundError` or an :exc:`OSError` is raised
+   respectively.  In order to remove whole directory trees,
+   :func:`shutil.rmtree` can be used.
 
    This function can support :ref:`paths relative to directory descriptors
    <dir_fd>`.


From webhook-mailer at python.org  Fri Jul  5 04:48:25 2019
From: webhook-mailer at python.org (Miss Islington (bot))
Date: Fri, 05 Jul 2019 08:48:25 -0000
Subject: [Python-checkins] Use OSError subclasses in os documentation
 (GH-14262)
Message-ID: <mailman.249.1562316506.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/c3ef1a5244ff2a5d25b7186b96d027a446bf0452
commit: c3ef1a5244ff2a5d25b7186b96d027a446bf0452
branch: 3.8
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: GitHub <noreply at github.com>
date: 2019-07-05T01:48:21-07:00
summary:

Use OSError subclasses in os documentation (GH-14262)

(cherry picked from commit a55f75a6e3e9cda5c7c30bd961386b1a8a2e9892)

Co-authored-by: Tim Hoffmann <2836374+timhoffm at users.noreply.github.com>

files:
M Doc/library/os.rst

diff --git a/Doc/library/os.rst b/Doc/library/os.rst
index ee3c35c2a998..6e8df88cf052 100644
--- a/Doc/library/os.rst
+++ b/Doc/library/os.rst
@@ -36,9 +36,9 @@ Notes on the availability of these functions:
 
 .. note::
 
-   All functions in this module raise :exc:`OSError` in the case of invalid or
-   inaccessible file names and paths, or other arguments that have the correct
-   type, but are not accepted by the operating system.
+   All functions in this module raise :exc:`OSError` (or subclasses thereof) in
+   the case of invalid or inaccessible file names and paths, or other arguments
+   that have the correct type, but are not accepted by the operating system.
 
 .. exception:: error
 
@@ -1898,8 +1898,8 @@ features:
    directories you can set the umask before invoking :func:`makedirs`.  The
    file permission bits of existing parent directories are not changed.
 
-   If *exist_ok* is ``False`` (the default), an :exc:`OSError` is raised if the
-   target directory already exists.
+   If *exist_ok* is ``False`` (the default), an :exc:`FileExistsError` is
+   raised if the target directory already exists.
 
    .. note::
 
@@ -2052,8 +2052,8 @@ features:
 
 .. function:: remove(path, *, dir_fd=None)
 
-   Remove (delete) the file *path*.  If *path* is a directory, :exc:`OSError` is
-   raised.  Use :func:`rmdir` to remove directories.
+   Remove (delete) the file *path*.  If *path* is a directory, an
+   :exc:`IsADirectoryError` is raised.  Use :func:`rmdir` to remove directories.
 
    This function can support :ref:`paths relative to directory descriptors
    <dir_fd>`.
@@ -2090,13 +2090,19 @@ features:
 
 .. function:: rename(src, dst, *, src_dir_fd=None, dst_dir_fd=None)
 
-   Rename the file or directory *src* to *dst*.  If *dst* is a directory,
-   :exc:`OSError` will be raised.  On Unix, if *dst* exists and is a file, it will
-   be replaced silently if the user has permission.  The operation may fail on some
-   Unix flavors if *src* and *dst* are on different filesystems.  If successful,
-   the renaming will be an atomic operation (this is a POSIX requirement).  On
-   Windows, if *dst* already exists, :exc:`OSError` will be raised even if it is a
-   file.
+   Rename the file or directory *src* to *dst*. If *dst* exists, the operation
+   will fail with an :exc:`OSError` subclass in a number of cases:
+
+   On Windows, if *dst* exists a :exc:`FileExistsError` is always raised.
+
+   On Unix, if *src* is a file and *dst* is a directory or vice-versa, anq:q
+   :exc:`IsADirectoryError` or a :exc:`NotADirectoryError` will be raised
+   respectively.  If both are directories and *dst* is empty, *dst* will be
+   silently replaced.  If *dst* is a non-empty directory, an :exc:`OSError`
+   is raised. If both are files, *dst* it will be replaced silently if the user
+   has permission.  The operation may fail on some Unix flavors if *src* and
+   *dst* are on different filesystems.  If successful, the renaming will be an
+   atomic operation (this is a POSIX requirement).
 
    This function can support specifying *src_dir_fd* and/or *dst_dir_fd* to
    supply :ref:`paths relative to directory descriptors <dir_fd>`.
@@ -2145,9 +2151,10 @@ features:
 
 .. function:: rmdir(path, *, dir_fd=None)
 
-   Remove (delete) the directory *path*.  Only works when the directory is
-   empty, otherwise, :exc:`OSError` is raised.  In order to remove whole
-   directory trees, :func:`shutil.rmtree` can be used.
+   Remove (delete) the directory *path*.  If the directory does not exist or is
+   not empty, an :exc:`FileNotFoundError` or an :exc:`OSError` is raised
+   respectively.  In order to remove whole directory trees,
+   :func:`shutil.rmtree` can be used.
 
    This function can support :ref:`paths relative to directory descriptors
    <dir_fd>`.


From webhook-mailer at python.org  Fri Jul  5 05:03:32 2019
From: webhook-mailer at python.org (Miss Islington (bot))
Date: Fri, 05 Jul 2019 09:03:32 -0000
Subject: [Python-checkins] bpo-37481: Deprecate distutils bdist_wininst
 command (GH-14553)
Message-ID: <mailman.250.1562317413.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/b4cd6ba1a028c2624ac7bc93439b9d45f51cfeba
commit: b4cd6ba1a028c2624ac7bc93439b9d45f51cfeba
branch: 3.8
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: GitHub <noreply at github.com>
date: 2019-07-05T02:03:23-07:00
summary:

bpo-37481: Deprecate distutils bdist_wininst command (GH-14553)


The distutils bdist_wininst command is now deprecated, use
bdist_wheel (wheel packages) instead.
(cherry picked from commit 1da4462765b084dfa8d869b6cb5855e8f6014a11)

Co-authored-by: Victor Stinner <vstinner at redhat.com>

files:
A Misc/NEWS.d/next/Library/2019-07-02-13-08-30.bpo-37481.hd5k09.rst
M Doc/distutils/apiref.rst
M Doc/distutils/builtdist.rst
M Doc/whatsnew/3.8.rst
M Lib/distutils/command/bdist_wininst.py
M Lib/distutils/tests/test_bdist_wininst.py

diff --git a/Doc/distutils/apiref.rst b/Doc/distutils/apiref.rst
index 2601d30f63eb..937f19f57be9 100644
--- a/Doc/distutils/apiref.rst
+++ b/Doc/distutils/apiref.rst
@@ -1863,6 +1863,9 @@ Subclasses of :class:`Command` must define the following methods.
 .. module:: distutils.command.bdist_wininst
    :synopsis: Build a Windows installer
 
+.. deprecated:: 3.8
+   Use bdist_wheel (wheel packages) instead.
+
 
 .. % todo
 
diff --git a/Doc/distutils/builtdist.rst b/Doc/distutils/builtdist.rst
index 8c65d9d59118..b814f2e9508c 100644
--- a/Doc/distutils/builtdist.rst
+++ b/Doc/distutils/builtdist.rst
@@ -146,6 +146,9 @@ generated by each, are:
 | :command:`bdist_msi`     | msi                                 |
 +--------------------------+-------------------------------------+
 
+.. note::
+   bdist_wininst is deprecated since Python 3.8.
+
 The following sections give details on the individual :command:`bdist_\*`
 commands.
 
@@ -298,6 +301,9 @@ file winds up deep in the "build tree," in a temporary directory created by
 Creating Windows Installers
 ===========================
 
+.. warning::
+   bdist_wininst is deprecated since Python 3.8.
+
 Executable installers are the natural format for binary distributions on
 Windows.  They display a nice graphical user interface, display some information
 about the module distribution to be installed taken from the metadata in the
@@ -459,3 +465,6 @@ Starting with Python 2.6, bdist_wininst supports a :option:`!--user-access-contr
 option.  The default is 'none' (meaning no UAC handling is done), and other
 valid values are 'auto' (meaning prompt for UAC elevation if Python was
 installed for all users) and 'force' (meaning always prompt for elevation).
+
+.. note::
+   bdist_wininst is deprecated since Python 3.8.
diff --git a/Doc/whatsnew/3.8.rst b/Doc/whatsnew/3.8.rst
index 1f5694caf9a4..38413a38bb8d 100644
--- a/Doc/whatsnew/3.8.rst
+++ b/Doc/whatsnew/3.8.rst
@@ -1065,6 +1065,10 @@ Build and C API Changes
 Deprecated
 ==========
 
+* The distutils ``bdist_wininst`` command is now deprecated, use
+  ``bdist_wheel`` (wheel packages) instead.
+  (Contributed by Victor Stinner in :issue:`37481`.)
+
 * Deprecated methods ``getchildren()`` and ``getiterator()`` in
   the :mod:`~xml.etree.ElementTree` module emit now a
   :exc:`DeprecationWarning` instead of :exc:`PendingDeprecationWarning`.
diff --git a/Lib/distutils/command/bdist_wininst.py b/Lib/distutils/command/bdist_wininst.py
index acaa184b5f71..b5ed6f041e19 100644
--- a/Lib/distutils/command/bdist_wininst.py
+++ b/Lib/distutils/command/bdist_wininst.py
@@ -3,7 +3,9 @@
 Implements the Distutils 'bdist_wininst' command: create a windows installer
 exe-program."""
 
-import sys, os
+import os
+import sys
+import warnings
 from distutils.core import Command
 from distutils.util import get_platform
 from distutils.dir_util import create_tree, remove_tree
@@ -58,6 +60,12 @@ class bdist_wininst(Command):
     # bpo-10945: bdist_wininst requires mbcs encoding only available on Windows
     _unsupported = (sys.platform != "win32")
 
+    def __init__(self, *args, **kw):
+        super().__init__(*args, **kw)
+        warnings.warn("bdist_wininst command is deprecated since Python 3.8, "
+                      "use bdist_wheel (wheel packages) instead",
+                      DeprecationWarning, 2)
+
     def initialize_options(self):
         self.bdist_dir = None
         self.plat_name = None
diff --git a/Lib/distutils/tests/test_bdist_wininst.py b/Lib/distutils/tests/test_bdist_wininst.py
index 163f1cc97bf9..5c3d025d3321 100644
--- a/Lib/distutils/tests/test_bdist_wininst.py
+++ b/Lib/distutils/tests/test_bdist_wininst.py
@@ -2,7 +2,7 @@
 import sys
 import platform
 import unittest
-from test.support import run_unittest
+from test.support import run_unittest, check_warnings
 
 from distutils.command.bdist_wininst import bdist_wininst
 from distutils.tests import support
@@ -21,7 +21,8 @@ def test_get_exe_bytes(self):
         # this test makes sure it works now for every platform
         # let's create a command
         pkg_pth, dist = self.create_dist()
-        cmd = bdist_wininst(dist)
+        with check_warnings(("", DeprecationWarning)):
+            cmd = bdist_wininst(dist)
         cmd.ensure_finalized()
 
         # let's run the code that finds the right wininst*.exe file
diff --git a/Misc/NEWS.d/next/Library/2019-07-02-13-08-30.bpo-37481.hd5k09.rst b/Misc/NEWS.d/next/Library/2019-07-02-13-08-30.bpo-37481.hd5k09.rst
new file mode 100644
index 000000000000..a3faecdd9151
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2019-07-02-13-08-30.bpo-37481.hd5k09.rst
@@ -0,0 +1,2 @@
+The distutils ``bdist_wininst`` command is deprecated in Python 3.8, use
+``bdist_wheel`` (wheel packages) instead.


From webhook-mailer at python.org  Fri Jul  5 06:57:59 2019
From: webhook-mailer at python.org (Inada Naoki)
Date: Fri, 05 Jul 2019 10:57:59 -0000
Subject: [Python-checkins] bpo-37483: fix reference leak in _PyCodec_Lookup
 (GH-14600)
Message-ID: <mailman.251.1562324280.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/6e43d07324ca799118e805751a10a7eff71d5a04
commit: 6e43d07324ca799118e805751a10a7eff71d5a04
branch: master
author: Jeroen Demeyer <J.Demeyer at UGent.be>
committer: Inada Naoki <songofacandy at gmail.com>
date: 2019-07-05T19:57:32+09:00
summary:

bpo-37483: fix reference leak in _PyCodec_Lookup (GH-14600)

files:
M Python/codecs.c

diff --git a/Python/codecs.c b/Python/codecs.c
index 386576256f06..75b60ec6bd77 100644
--- a/Python/codecs.c
+++ b/Python/codecs.c
@@ -99,40 +99,38 @@ PyObject *normalizestring(const char *string)
 
 PyObject *_PyCodec_Lookup(const char *encoding)
 {
-    PyObject *result, *v;
-    Py_ssize_t i, len;
-
     if (encoding == NULL) {
         PyErr_BadArgument();
-        goto onError;
+        return NULL;
     }
 
     PyInterpreterState *interp = _PyInterpreterState_GET_UNSAFE();
-    if (interp->codec_search_path == NULL && _PyCodecRegistry_Init())
-        goto onError;
+    if (interp->codec_search_path == NULL && _PyCodecRegistry_Init()) {
+        return NULL;
+    }
 
     /* Convert the encoding to a normalized Python string: all
        characters are converted to lower case, spaces and hyphens are
        replaced with underscores. */
-    v = normalizestring(encoding);
-    if (v == NULL)
-        goto onError;
+    PyObject *v = normalizestring(encoding);
+    if (v == NULL) {
+        return NULL;
+    }
     PyUnicode_InternInPlace(&v);
 
     /* First, try to lookup the name in the registry dictionary */
-    result = PyDict_GetItemWithError(interp->codec_search_cache, v);
+    PyObject *result = PyDict_GetItemWithError(interp->codec_search_cache, v);
     if (result != NULL) {
         Py_INCREF(result);
         Py_DECREF(v);
         return result;
     }
     else if (PyErr_Occurred()) {
-        Py_DECREF(v);
-        return NULL;
+        goto onError;
     }
 
     /* Next, scan the search functions in order of registration */
-    len = PyList_Size(interp->codec_search_path);
+    const Py_ssize_t len = PyList_Size(interp->codec_search_path);
     if (len < 0)
         goto onError;
     if (len == 0) {
@@ -142,6 +140,7 @@ PyObject *_PyCodec_Lookup(const char *encoding)
         goto onError;
     }
 
+    Py_ssize_t i;
     for (i = 0; i < len; i++) {
         PyObject *func;
 
@@ -175,9 +174,11 @@ PyObject *_PyCodec_Lookup(const char *encoding)
         Py_DECREF(result);
         goto onError;
     }
+    Py_DECREF(v);
     return result;
 
  onError:
+    Py_DECREF(v);
     return NULL;
 }
 


From webhook-mailer at python.org  Fri Jul  5 08:48:48 2019
From: webhook-mailer at python.org (Petr Viktorin)
Date: Fri, 05 Jul 2019 12:48:48 -0000
Subject: [Python-checkins] bpo-36974: separate vectorcall functions for each
 calling convention (GH-13781)
Message-ID: <mailman.252.1562330928.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/0d722f3cd602e5f5492f9c65c8af57ea9d3743b6
commit: 0d722f3cd602e5f5492f9c65c8af57ea9d3743b6
branch: master
author: Jeroen Demeyer <J.Demeyer at UGent.be>
committer: Petr Viktorin <encukou at gmail.com>
date: 2019-07-05T14:48:24+02:00
summary:

bpo-36974: separate vectorcall functions for each calling convention (GH-13781)

files:
A Misc/NEWS.d/next/Core and Builtins/2019-06-11-12-59-38.bpo-36974.bVYmSA.rst
M Include/descrobject.h
M Include/methodobject.h
M Lib/test/test_call.py
M Lib/test/test_gdb.py
M Objects/call.c
M Objects/descrobject.c
M Objects/methodobject.c
M Python/ceval.c
M Tools/gdb/libpython.py

diff --git a/Include/descrobject.h b/Include/descrobject.h
index d7114852c1e2..ead269d1d2f7 100644
--- a/Include/descrobject.h
+++ b/Include/descrobject.h
@@ -91,9 +91,6 @@ PyAPI_FUNC(PyObject *) PyDescr_NewMember(PyTypeObject *,
 PyAPI_FUNC(PyObject *) PyDescr_NewGetSet(PyTypeObject *,
                                                struct PyGetSetDef *);
 #ifndef Py_LIMITED_API
-
-PyAPI_FUNC(PyObject *) _PyMethodDescr_Vectorcall(
-        PyObject *descrobj, PyObject *const *args, size_t nargsf, PyObject *kwnames);
 PyAPI_FUNC(PyObject *) PyDescr_NewWrapper(PyTypeObject *,
                                                 struct wrapperbase *, void *);
 #define PyDescr_IsData(d) (Py_TYPE(d)->tp_descr_set != NULL)
diff --git a/Include/methodobject.h b/Include/methodobject.h
index f4a6682830c3..b43847110e18 100644
--- a/Include/methodobject.h
+++ b/Include/methodobject.h
@@ -41,13 +41,6 @@ PyAPI_FUNC(int) PyCFunction_GetFlags(PyObject *);
 #endif
 PyAPI_FUNC(PyObject *) PyCFunction_Call(PyObject *, PyObject *, PyObject *);
 
-#ifndef Py_LIMITED_API
-PyAPI_FUNC(PyObject *) _PyCFunction_Vectorcall(PyObject *func,
-    PyObject *const *stack,
-    size_t nargsf,
-    PyObject *kwnames);
-#endif
-
 struct PyMethodDef {
     const char  *ml_name;   /* The name of the built-in function/method */
     PyCFunction ml_meth;    /* The C function that implements it */
diff --git a/Lib/test/test_call.py b/Lib/test/test_call.py
index b252ca1076ad..0bff7ded4670 100644
--- a/Lib/test/test_call.py
+++ b/Lib/test/test_call.py
@@ -586,6 +586,8 @@ def __call__(self, *args):
                 return super().__call__(*args)
 
         calls += [
+            (dict.update, ({},), {"key":True}, None),
+            ({}.update, ({},), {"key":True}, None),
             (MethodDescriptorHeap(), (0,), {}, True),
             (MethodDescriptorOverridden(), (0,), {}, 'new'),
             (MethodDescriptorSuper(), (0,), {}, True),
diff --git a/Lib/test/test_gdb.py b/Lib/test/test_gdb.py
index 1c5e18b678ca..e07d3273a455 100644
--- a/Lib/test/test_gdb.py
+++ b/Lib/test/test_gdb.py
@@ -850,10 +850,10 @@ def test_pycfunction(self):
         # called, so test a variety of calling conventions.
         for py_name, py_args, c_name, expected_frame_number in (
             ('gmtime', '', 'time_gmtime', 1),  # METH_VARARGS
-            ('len', '[]', 'builtin_len', 2),  # METH_O
-            ('locals', '', 'builtin_locals', 2),  # METH_NOARGS
-            ('iter', '[]', 'builtin_iter', 2),  # METH_FASTCALL
-            ('sorted', '[]', 'builtin_sorted', 2),  # METH_FASTCALL|METH_KEYWORDS
+            ('len', '[]', 'builtin_len', 1),  # METH_O
+            ('locals', '', 'builtin_locals', 1),  # METH_NOARGS
+            ('iter', '[]', 'builtin_iter', 1),  # METH_FASTCALL
+            ('sorted', '[]', 'builtin_sorted', 1),  # METH_FASTCALL|METH_KEYWORDS
         ):
             with self.subTest(c_name):
                 cmd = ('from time import gmtime\n'  # (not always needed)
diff --git a/Misc/NEWS.d/next/Core and Builtins/2019-06-11-12-59-38.bpo-36974.bVYmSA.rst b/Misc/NEWS.d/next/Core and Builtins/2019-06-11-12-59-38.bpo-36974.bVYmSA.rst
new file mode 100644
index 000000000000..6080ef361814
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2019-06-11-12-59-38.bpo-36974.bVYmSA.rst	
@@ -0,0 +1,2 @@
+Implemented separate vectorcall functions for every calling convention of
+builtin functions and methods. This improves performance for calls.
diff --git a/Objects/call.c b/Objects/call.c
index 8e0d271ab78a..861ab87a0745 100644
--- a/Objects/call.c
+++ b/Objects/call.c
@@ -216,7 +216,7 @@ PyVectorcall_Call(PyObject *callable, PyObject *tuple, PyObject *kwargs)
     PyObject *result = func(callable, args,
                             nargs | PY_VECTORCALL_ARGUMENTS_OFFSET, kwnames);
     _PyStack_UnpackDict_Free(args, nargs, kwnames);
-    return result;
+    return _Py_CheckFunctionResult(callable, result, NULL);
 }
 
 
@@ -625,26 +625,6 @@ _PyMethodDef_RawFastCallKeywords(PyMethodDef *method, PyObject *self,
     return result;
 }
 
-
-PyObject *
-_PyCFunction_Vectorcall(PyObject *func,
-                        PyObject *const *args, size_t nargsf,
-                        PyObject *kwnames)
-{
-    PyObject *result;
-
-    assert(func != NULL);
-    assert(PyCFunction_Check(func));
-    Py_ssize_t nargs = PyVectorcall_NARGS(nargsf);
-
-    result = _PyMethodDef_RawFastCallKeywords(((PyCFunctionObject*)func)->m_ml,
-                                              PyCFunction_GET_SELF(func),
-                                              args, nargs, kwnames);
-    result = _Py_CheckFunctionResult(func, result, NULL);
-    return result;
-}
-
-
 static PyObject *
 cfunction_call_varargs(PyObject *func, PyObject *args, PyObject *kwargs)
 {
diff --git a/Objects/descrobject.c b/Objects/descrobject.c
index 4b985785f08f..99855d8ae44c 100644
--- a/Objects/descrobject.c
+++ b/Objects/descrobject.c
@@ -226,80 +226,199 @@ getset_set(PyGetSetDescrObject *descr, PyObject *obj, PyObject *value)
     return -1;
 }
 
-static PyObject *
-methoddescr_call(PyMethodDescrObject *descr, PyObject *args, PyObject *kwargs)
-{
-    Py_ssize_t nargs;
-    PyObject *self, *result;
 
-    /* Make sure that the first argument is acceptable as 'self' */
-    assert(PyTuple_Check(args));
-    nargs = PyTuple_GET_SIZE(args);
+/* Vectorcall functions for each of the PyMethodDescr calling conventions.
+ *
+ * First, common helpers
+ */
+static const char *
+get_name(PyObject *func) {
+    assert(PyObject_TypeCheck(func, &PyMethodDescr_Type));
+    return ((PyMethodDescrObject *)func)->d_method->ml_name;
+}
+
+typedef void (*funcptr)(void);
+
+static inline int
+method_check_args(PyObject *func, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+{
+    assert(!PyErr_Occurred());
+    assert(PyObject_TypeCheck(func, &PyMethodDescr_Type));
     if (nargs < 1) {
         PyErr_Format(PyExc_TypeError,
-                     "descriptor '%V' of '%.100s' "
+                     "descriptor '%.200s' of '%.100s' "
                      "object needs an argument",
-                     descr_name((PyDescrObject *)descr), "?",
-                     PyDescr_TYPE(descr)->tp_name);
-        return NULL;
+                     get_name(func), PyDescr_TYPE(func)->tp_name);
+        return -1;
     }
-    self = PyTuple_GET_ITEM(args, 0);
+    PyObject *self = args[0];
     if (!_PyObject_RealIsSubclass((PyObject *)Py_TYPE(self),
-                                  (PyObject *)PyDescr_TYPE(descr))) {
+                                  (PyObject *)PyDescr_TYPE(func)))
+    {
         PyErr_Format(PyExc_TypeError,
-                     "descriptor '%V' for '%.100s' objects "
+                     "descriptor '%.200s' for '%.100s' objects "
                      "doesn't apply to a '%.100s' object",
-                     descr_name((PyDescrObject *)descr), "?",
-                     PyDescr_TYPE(descr)->tp_name,
-                     self->ob_type->tp_name);
+                     get_name(func), PyDescr_TYPE(func)->tp_name,
+                     Py_TYPE(self)->tp_name);
+        return -1;
+    }
+    if (kwnames && PyTuple_GET_SIZE(kwnames)) {
+        PyErr_Format(PyExc_TypeError,
+                     "%.200s() takes no keyword arguments", get_name(func));
+        return -1;
+    }
+    return 0;
+}
+
+static inline funcptr
+method_enter_call(PyObject *func)
+{
+    if (Py_EnterRecursiveCall(" while calling a Python object")) {
         return NULL;
     }
+    return (funcptr)((PyMethodDescrObject *)func)->d_method->ml_meth;
+}
 
-    result = _PyMethodDef_RawFastCallDict(descr->d_method, self,
-                                          &_PyTuple_ITEMS(args)[1], nargs - 1,
-                                          kwargs);
-    result = _Py_CheckFunctionResult((PyObject *)descr, result, NULL);
+/* Now the actual vectorcall functions */
+static PyObject *
+method_vectorcall_VARARGS(
+    PyObject *func, PyObject *const *args, size_t nargsf, PyObject *kwnames)
+{
+    Py_ssize_t nargs = PyVectorcall_NARGS(nargsf);
+    if (method_check_args(func, args, nargs, kwnames)) {
+        return NULL;
+    }
+    PyObject *argstuple = _PyTuple_FromArray(args+1, nargs-1);
+    if (argstuple == NULL) {
+        return NULL;
+    }
+    PyCFunction meth = (PyCFunction)method_enter_call(func);
+    if (meth == NULL) {
+        Py_DECREF(argstuple);
+        return NULL;
+    }
+    PyObject *result = meth(args[0], argstuple);
+    Py_DECREF(argstuple);
+    Py_LeaveRecursiveCall();
     return result;
 }
 
-// same to methoddescr_call(), but use FASTCALL convention.
-PyObject *
-_PyMethodDescr_Vectorcall(PyObject *descrobj,
-                          PyObject *const *args, size_t nargsf,
-                          PyObject *kwnames)
+static PyObject *
+method_vectorcall_VARARGS_KEYWORDS(
+    PyObject *func, PyObject *const *args, size_t nargsf, PyObject *kwnames)
 {
-    assert(Py_TYPE(descrobj) == &PyMethodDescr_Type);
-    PyMethodDescrObject *descr = (PyMethodDescrObject *)descrobj;
-    PyObject *self, *result;
+    Py_ssize_t nargs = PyVectorcall_NARGS(nargsf);
+    if (method_check_args(func, args, nargs, NULL)) {
+        return NULL;
+    }
+    PyObject *argstuple = _PyTuple_FromArray(args+1, nargs-1);
+    if (argstuple == NULL) {
+        return NULL;
+    }
+    PyObject *result = NULL;
+    /* Create a temporary dict for keyword arguments */
+    PyObject *kwdict = NULL;
+    if (kwnames != NULL && PyTuple_GET_SIZE(kwnames) > 0) {
+        kwdict = _PyStack_AsDict(args + nargs, kwnames);
+        if (kwdict == NULL) {
+            goto exit;
+        }
+    }
+    PyCFunctionWithKeywords meth = (PyCFunctionWithKeywords)
+                                   method_enter_call(func);
+    if (meth == NULL) {
+        goto exit;
+    }
+    result = meth(args[0], argstuple, kwdict);
+    Py_LeaveRecursiveCall();
+exit:
+    Py_DECREF(argstuple);
+    Py_XDECREF(kwdict);
+    return result;
+}
+
+static PyObject *
+method_vectorcall_FASTCALL(
+    PyObject *func, PyObject *const *args, size_t nargsf, PyObject *kwnames)
+{
+    Py_ssize_t nargs = PyVectorcall_NARGS(nargsf);
+    if (method_check_args(func, args, nargs, kwnames)) {
+        return NULL;
+    }
+    _PyCFunctionFast meth = (_PyCFunctionFast)
+                            method_enter_call(func);
+    if (meth == NULL) {
+        return NULL;
+    }
+    PyObject *result = meth(args[0], args+1, nargs-1);
+    Py_LeaveRecursiveCall();
+    return result;
+}
 
+static PyObject *
+method_vectorcall_FASTCALL_KEYWORDS(
+    PyObject *func, PyObject *const *args, size_t nargsf, PyObject *kwnames)
+{
     Py_ssize_t nargs = PyVectorcall_NARGS(nargsf);
-    /* Make sure that the first argument is acceptable as 'self' */
-    if (nargs < 1) {
-        PyErr_Format(PyExc_TypeError,
-                     "descriptor '%V' of '%.100s' "
-                     "object needs an argument",
-                     descr_name((PyDescrObject *)descr), "?",
-                     PyDescr_TYPE(descr)->tp_name);
+    if (method_check_args(func, args, nargs, NULL)) {
         return NULL;
     }
-    self = args[0];
-    if (!_PyObject_RealIsSubclass((PyObject *)Py_TYPE(self),
-                                  (PyObject *)PyDescr_TYPE(descr))) {
+    _PyCFunctionFastWithKeywords meth = (_PyCFunctionFastWithKeywords)
+                                        method_enter_call(func);
+    if (meth == NULL) {
+        return NULL;
+    }
+    PyObject *result = meth(args[0], args+1, nargs-1, kwnames);
+    Py_LeaveRecursiveCall();
+    return result;
+}
+
+static PyObject *
+method_vectorcall_NOARGS(
+    PyObject *func, PyObject *const *args, size_t nargsf, PyObject *kwnames)
+{
+    Py_ssize_t nargs = PyVectorcall_NARGS(nargsf);
+    if (method_check_args(func, args, nargs, kwnames)) {
+        return NULL;
+    }
+    if (nargs != 1) {
         PyErr_Format(PyExc_TypeError,
-                     "descriptor '%V' for '%.100s' objects "
-                     "doesn't apply to a '%.100s' object",
-                     descr_name((PyDescrObject *)descr), "?",
-                     PyDescr_TYPE(descr)->tp_name,
-                     self->ob_type->tp_name);
+            "%.200s() takes no arguments (%zd given)", get_name(func), nargs-1);
+        return NULL;
+    }
+    PyCFunction meth = (PyCFunction)method_enter_call(func);
+    if (meth == NULL) {
         return NULL;
     }
+    PyObject *result = meth(args[0], NULL);
+    Py_LeaveRecursiveCall();
+    return result;
+}
 
-    result = _PyMethodDef_RawFastCallKeywords(descr->d_method, self,
-                                              args+1, nargs-1, kwnames);
-    result = _Py_CheckFunctionResult((PyObject *)descr, result, NULL);
+static PyObject *
+method_vectorcall_O(
+    PyObject *func, PyObject *const *args, size_t nargsf, PyObject *kwnames)
+{
+    Py_ssize_t nargs = PyVectorcall_NARGS(nargsf);
+    if (method_check_args(func, args, nargs, kwnames)) {
+        return NULL;
+    }
+    if (nargs != 2) {
+        PyErr_Format(PyExc_TypeError,
+            "%.200s() takes exactly one argument (%zd given)",
+            get_name(func), nargs-1);
+        return NULL;
+    }
+    PyCFunction meth = (PyCFunction)method_enter_call(func);
+    if (meth == NULL) {
+        return NULL;
+    }
+    PyObject *result = meth(args[0], args[1]);
+    Py_LeaveRecursiveCall();
     return result;
 }
 
+
 /* Instances of classmethod_descriptor are unlikely to be called directly.
    For one, the analogous class "classmethod" (for Python classes) is not
    callable. Second, users are not likely to access a classmethod_descriptor
@@ -540,7 +659,7 @@ PyTypeObject PyMethodDescr_Type = {
     0,                                          /* tp_as_sequence */
     0,                                          /* tp_as_mapping */
     0,                                          /* tp_hash */
-    (ternaryfunc)methoddescr_call,              /* tp_call */
+    PyVectorcall_Call,                          /* tp_call */
     0,                                          /* tp_str */
     PyObject_GenericGetAttr,                    /* tp_getattro */
     0,                                          /* tp_setattro */
@@ -738,13 +857,40 @@ descr_new(PyTypeObject *descrtype, PyTypeObject *type, const char *name)
 PyObject *
 PyDescr_NewMethod(PyTypeObject *type, PyMethodDef *method)
 {
+    /* Figure out correct vectorcall function to use */
+    vectorcallfunc vectorcall;
+    switch (method->ml_flags & (METH_VARARGS | METH_FASTCALL | METH_NOARGS | METH_O | METH_KEYWORDS))
+    {
+        case METH_VARARGS:
+            vectorcall = method_vectorcall_VARARGS;
+            break;
+        case METH_VARARGS | METH_KEYWORDS:
+            vectorcall = method_vectorcall_VARARGS_KEYWORDS;
+            break;
+        case METH_FASTCALL:
+            vectorcall = method_vectorcall_FASTCALL;
+            break;
+        case METH_FASTCALL | METH_KEYWORDS:
+            vectorcall = method_vectorcall_FASTCALL_KEYWORDS;
+            break;
+        case METH_NOARGS:
+            vectorcall = method_vectorcall_NOARGS;
+            break;
+        case METH_O:
+            vectorcall = method_vectorcall_O;
+            break;
+        default:
+            PyErr_SetString(PyExc_SystemError, "bad call flags");
+            return NULL;
+    }
+
     PyMethodDescrObject *descr;
 
     descr = (PyMethodDescrObject *)descr_new(&PyMethodDescr_Type,
                                              type, method->ml_name);
     if (descr != NULL) {
         descr->d_method = method;
-        descr->vectorcall = _PyMethodDescr_Vectorcall;
+        descr->vectorcall = vectorcall;
     }
     return (PyObject *)descr;
 }
diff --git a/Objects/methodobject.c b/Objects/methodobject.c
index c3bc0184796e..3494f11d80fe 100644
--- a/Objects/methodobject.c
+++ b/Objects/methodobject.c
@@ -19,6 +19,17 @@ static int numfree = 0;
 /* undefine macro trampoline to PyCFunction_NewEx */
 #undef PyCFunction_New
 
+/* Forward declarations */
+static PyObject * cfunction_vectorcall_FASTCALL(
+    PyObject *func, PyObject *const *args, size_t nargsf, PyObject *kwnames);
+static PyObject * cfunction_vectorcall_FASTCALL_KEYWORDS(
+    PyObject *func, PyObject *const *args, size_t nargsf, PyObject *kwnames);
+static PyObject * cfunction_vectorcall_NOARGS(
+    PyObject *func, PyObject *const *args, size_t nargsf, PyObject *kwnames);
+static PyObject * cfunction_vectorcall_O(
+    PyObject *func, PyObject *const *args, size_t nargsf, PyObject *kwnames);
+
+
 PyObject *
 PyCFunction_New(PyMethodDef *ml, PyObject *self)
 {
@@ -28,6 +39,33 @@ PyCFunction_New(PyMethodDef *ml, PyObject *self)
 PyObject *
 PyCFunction_NewEx(PyMethodDef *ml, PyObject *self, PyObject *module)
 {
+    /* Figure out correct vectorcall function to use */
+    vectorcallfunc vectorcall;
+    switch (ml->ml_flags & (METH_VARARGS | METH_FASTCALL | METH_NOARGS | METH_O | METH_KEYWORDS))
+    {
+        case METH_VARARGS:
+        case METH_VARARGS | METH_KEYWORDS:
+            /* For METH_VARARGS functions, it's more efficient to use tp_call
+             * instead of vectorcall. */
+            vectorcall = NULL;
+            break;
+        case METH_FASTCALL:
+            vectorcall = cfunction_vectorcall_FASTCALL;
+            break;
+        case METH_FASTCALL | METH_KEYWORDS:
+            vectorcall = cfunction_vectorcall_FASTCALL_KEYWORDS;
+            break;
+        case METH_NOARGS:
+            vectorcall = cfunction_vectorcall_NOARGS;
+            break;
+        case METH_O:
+            vectorcall = cfunction_vectorcall_O;
+            break;
+        default:
+            PyErr_SetString(PyExc_SystemError, "bad call flags");
+            return NULL;
+    }
+
     PyCFunctionObject *op;
     op = free_list;
     if (op != NULL) {
@@ -46,14 +84,7 @@ PyCFunction_NewEx(PyMethodDef *ml, PyObject *self, PyObject *module)
     op->m_self = self;
     Py_XINCREF(module);
     op->m_module = module;
-    if (ml->ml_flags & METH_VARARGS) {
-        /* For METH_VARARGS functions, it's more efficient to use tp_call
-         * instead of vectorcall. */
-        op->vectorcall = NULL;
-    }
-    else {
-        op->vectorcall = _PyCFunction_Vectorcall;
-    }
+    op->vectorcall = vectorcall;
     _PyObject_GC_TRACK(op);
     return (PyObject *)op;
 }
@@ -333,3 +364,121 @@ _PyCFunction_DebugMallocStats(FILE *out)
                            "free PyCFunctionObject",
                            numfree, sizeof(PyCFunctionObject));
 }
+
+
+/* Vectorcall functions for each of the PyCFunction calling conventions,
+ * except for METH_VARARGS (possibly combined with METH_KEYWORDS) which
+ * doesn't use vectorcall.
+ *
+ * First, common helpers
+ */
+static const char *
+get_name(PyObject *func)
+{
+    assert(PyCFunction_Check(func));
+    PyMethodDef *method = ((PyCFunctionObject *)func)->m_ml;
+    return method->ml_name;
+}
+
+typedef void (*funcptr)(void);
+
+static inline int
+cfunction_check_kwargs(PyObject *func, PyObject *kwnames)
+{
+    assert(!PyErr_Occurred());
+    assert(PyCFunction_Check(func));
+    if (kwnames && PyTuple_GET_SIZE(kwnames)) {
+        PyErr_Format(PyExc_TypeError,
+                     "%.200s() takes no keyword arguments", get_name(func));
+        return -1;
+    }
+    return 0;
+}
+
+static inline funcptr
+cfunction_enter_call(PyObject *func)
+{
+    if (Py_EnterRecursiveCall(" while calling a Python object")) {
+        return NULL;
+    }
+    return (funcptr)PyCFunction_GET_FUNCTION(func);
+}
+
+/* Now the actual vectorcall functions */
+static PyObject *
+cfunction_vectorcall_FASTCALL(
+    PyObject *func, PyObject *const *args, size_t nargsf, PyObject *kwnames)
+{
+    if (cfunction_check_kwargs(func, kwnames)) {
+        return NULL;
+    }
+    Py_ssize_t nargs = PyVectorcall_NARGS(nargsf);
+    _PyCFunctionFast meth = (_PyCFunctionFast)
+                            cfunction_enter_call(func);
+    if (meth == NULL) {
+        return NULL;
+    }
+    PyObject *result = meth(PyCFunction_GET_SELF(func), args, nargs);
+    Py_LeaveRecursiveCall();
+    return result;
+}
+
+static PyObject *
+cfunction_vectorcall_FASTCALL_KEYWORDS(
+    PyObject *func, PyObject *const *args, size_t nargsf, PyObject *kwnames)
+{
+    Py_ssize_t nargs = PyVectorcall_NARGS(nargsf);
+    _PyCFunctionFastWithKeywords meth = (_PyCFunctionFastWithKeywords)
+                                        cfunction_enter_call(func);
+    if (meth == NULL) {
+        return NULL;
+    }
+    PyObject *result = meth(PyCFunction_GET_SELF(func), args, nargs, kwnames);
+    Py_LeaveRecursiveCall();
+    return result;
+}
+
+static PyObject *
+cfunction_vectorcall_NOARGS(
+    PyObject *func, PyObject *const *args, size_t nargsf, PyObject *kwnames)
+{
+    if (cfunction_check_kwargs(func, kwnames)) {
+        return NULL;
+    }
+    Py_ssize_t nargs = PyVectorcall_NARGS(nargsf);
+    if (nargs != 0) {
+        PyErr_Format(PyExc_TypeError,
+            "%.200s() takes no arguments (%zd given)", get_name(func), nargs);
+        return NULL;
+    }
+    PyCFunction meth = (PyCFunction)cfunction_enter_call(func);
+    if (meth == NULL) {
+        return NULL;
+    }
+    PyObject *result = meth(PyCFunction_GET_SELF(func), NULL);
+    Py_LeaveRecursiveCall();
+    return result;
+}
+
+static PyObject *
+cfunction_vectorcall_O(
+    PyObject *func, PyObject *const *args, size_t nargsf, PyObject *kwnames)
+{
+    if (cfunction_check_kwargs(func, kwnames)) {
+        return NULL;
+    }
+    Py_ssize_t nargs = PyVectorcall_NARGS(nargsf);
+    if (nargs != 1) {
+        PyErr_Format(PyExc_TypeError,
+            "%.200s() takes exactly one argument (%zd given)",
+            get_name(func), nargs);
+        return NULL;
+    }
+    PyCFunction meth = (PyCFunction)cfunction_enter_call(func);
+    if (meth == NULL) {
+        return NULL;
+    }
+    PyObject *result = meth(PyCFunction_GET_SELF(func), args[0]);
+    Py_LeaveRecursiveCall();
+    return result;
+}
diff --git a/Python/ceval.c b/Python/ceval.c
index b0fd6eec63a3..fdd299561c61 100644
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -4936,7 +4936,7 @@ trace_call_function(PyThreadState *tstate,
 {
     PyObject *x;
     if (PyCFunction_Check(func)) {
-        C_TRACE(x, _PyCFunction_Vectorcall(func, args, nargs, kwnames));
+        C_TRACE(x, _PyObject_Vectorcall(func, args, nargs, kwnames));
         return x;
     }
     else if (Py_TYPE(func) == &PyMethodDescr_Type && nargs > 0) {
@@ -4952,9 +4952,9 @@ trace_call_function(PyThreadState *tstate,
         if (func == NULL) {
             return NULL;
         }
-        C_TRACE(x, _PyCFunction_Vectorcall(func,
-                                           args+1, nargs-1,
-                                           kwnames));
+        C_TRACE(x, _PyObject_Vectorcall(func,
+                                        args+1, nargs-1,
+                                        kwnames));
         Py_DECREF(func);
         return x;
     }
diff --git a/Tools/gdb/libpython.py b/Tools/gdb/libpython.py
index abfea964a3d4..e40f79b5c3c7 100755
--- a/Tools/gdb/libpython.py
+++ b/Tools/gdb/libpython.py
@@ -1563,8 +1563,8 @@ def is_other_python_frame(self):
         if not caller:
             return False
 
-        if caller in ('_PyCFunction_Vectorcall',
-                      'cfunction_call_varargs'):
+        if (caller.startswith('cfunction_vectorcall_') or
+            caller == 'cfunction_call_varargs'):
             arg_name = 'func'
             # Within that frame:
             #   "func" is the local containing the PyObject* of the


From webhook-mailer at python.org  Fri Jul  5 10:16:03 2019
From: webhook-mailer at python.org (Victor Stinner)
Date: Fri, 05 Jul 2019 14:16:03 -0000
Subject: [Python-checkins] bpo-37421: multiprocessing tests now stop
 ForkServer (GH-14601)
Message-ID: <mailman.253.1562336164.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/8fbeb14312b4c1320d31ad86e69749515879d1c3
commit: 8fbeb14312b4c1320d31ad86e69749515879d1c3
branch: master
author: Victor Stinner <vstinner at redhat.com>
committer: GitHub <noreply at github.com>
date: 2019-07-05T16:15:39+02:00
summary:

bpo-37421: multiprocessing tests now stop ForkServer (GH-14601)

multiprocessing tests now stop the ForkServer instance if it's
running: close the "alive" file descriptor to ask the server to stop
and then remove its UNIX address.

files:
A Misc/NEWS.d/next/Tests/2019-07-05-14-47-55.bpo-37421.n8o2to.rst
M Lib/multiprocessing/forkserver.py
M Lib/test/_test_multiprocessing.py

diff --git a/Lib/multiprocessing/forkserver.py b/Lib/multiprocessing/forkserver.py
index 9b6398671dbc..87ebef6588ac 100644
--- a/Lib/multiprocessing/forkserver.py
+++ b/Lib/multiprocessing/forkserver.py
@@ -39,6 +39,25 @@ def __init__(self):
         self._lock = threading.Lock()
         self._preload_modules = ['__main__']
 
+    def _stop(self):
+        # Method used by unit tests to stop the server
+        with self._lock:
+            self._stop_unlocked()
+
+    def _stop_unlocked(self):
+        if self._forkserver_pid is None:
+            return
+
+        # close the "alive" file descriptor asks the server to stop
+        os.close(self._forkserver_alive_fd)
+        self._forkserver_alive_fd = None
+
+        os.waitpid(self._forkserver_pid, 0)
+        self._forkserver_pid = None
+
+        os.unlink(self._forkserver_address)
+        self._forkserver_address = None
+
     def set_forkserver_preload(self, modules_names):
         '''Set list of module names to try to load in forkserver process.'''
         if not all(type(mod) is str for mod in self._preload_modules):
diff --git a/Lib/test/_test_multiprocessing.py b/Lib/test/_test_multiprocessing.py
index af5b91d17e75..9a39f385952f 100644
--- a/Lib/test/_test_multiprocessing.py
+++ b/Lib/test/_test_multiprocessing.py
@@ -5650,7 +5650,13 @@ def tearDownModule():
         # Sleep 500 ms to give time to child processes to complete.
         if need_sleep:
             time.sleep(0.5)
+
         multiprocessing.process._cleanup()
+
+        # Stop the ForkServer process if it's running
+        from multiprocessing import forkserver
+        forkserver._forkserver._stop()
+
         # bpo-37421: Explicitly call _run_finalizers() to remove immediately
         # temporary directories created by multiprocessing.util.get_temp_dir().
         multiprocessing.util._run_finalizers()
diff --git a/Misc/NEWS.d/next/Tests/2019-07-05-14-47-55.bpo-37421.n8o2to.rst b/Misc/NEWS.d/next/Tests/2019-07-05-14-47-55.bpo-37421.n8o2to.rst
new file mode 100644
index 000000000000..136faa22d47a
--- /dev/null
+++ b/Misc/NEWS.d/next/Tests/2019-07-05-14-47-55.bpo-37421.n8o2to.rst
@@ -0,0 +1,3 @@
+multiprocessing tests now stop the ForkServer instance if it's running: close
+the "alive" file descriptor to ask the server to stop and then remove its UNIX
+address.


From webhook-mailer at python.org  Fri Jul  5 10:35:43 2019
From: webhook-mailer at python.org (Miss Islington (bot))
Date: Fri, 05 Jul 2019 14:35:43 -0000
Subject: [Python-checkins] bpo-37421: multiprocessing tests now stop
 ForkServer (GH-14601)
Message-ID: <mailman.254.1562337344.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/229f6e85f8b4d57a2e742e0d3fc361c5bd15f1cb
commit: 229f6e85f8b4d57a2e742e0d3fc361c5bd15f1cb
branch: 3.8
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: GitHub <noreply at github.com>
date: 2019-07-05T07:35:38-07:00
summary:

bpo-37421: multiprocessing tests now stop ForkServer (GH-14601)


multiprocessing tests now stop the ForkServer instance if it's
running: close the "alive" file descriptor to ask the server to stop
and then remove its UNIX address.
(cherry picked from commit 8fbeb14312b4c1320d31ad86e69749515879d1c3)

Co-authored-by: Victor Stinner <vstinner at redhat.com>

files:
A Misc/NEWS.d/next/Tests/2019-07-05-14-47-55.bpo-37421.n8o2to.rst
M Lib/multiprocessing/forkserver.py
M Lib/test/_test_multiprocessing.py

diff --git a/Lib/multiprocessing/forkserver.py b/Lib/multiprocessing/forkserver.py
index 9b6398671dbc..87ebef6588ac 100644
--- a/Lib/multiprocessing/forkserver.py
+++ b/Lib/multiprocessing/forkserver.py
@@ -39,6 +39,25 @@ def __init__(self):
         self._lock = threading.Lock()
         self._preload_modules = ['__main__']
 
+    def _stop(self):
+        # Method used by unit tests to stop the server
+        with self._lock:
+            self._stop_unlocked()
+
+    def _stop_unlocked(self):
+        if self._forkserver_pid is None:
+            return
+
+        # close the "alive" file descriptor asks the server to stop
+        os.close(self._forkserver_alive_fd)
+        self._forkserver_alive_fd = None
+
+        os.waitpid(self._forkserver_pid, 0)
+        self._forkserver_pid = None
+
+        os.unlink(self._forkserver_address)
+        self._forkserver_address = None
+
     def set_forkserver_preload(self, modules_names):
         '''Set list of module names to try to load in forkserver process.'''
         if not all(type(mod) is str for mod in self._preload_modules):
diff --git a/Lib/test/_test_multiprocessing.py b/Lib/test/_test_multiprocessing.py
index af5b91d17e75..9a39f385952f 100644
--- a/Lib/test/_test_multiprocessing.py
+++ b/Lib/test/_test_multiprocessing.py
@@ -5650,7 +5650,13 @@ def tearDownModule():
         # Sleep 500 ms to give time to child processes to complete.
         if need_sleep:
             time.sleep(0.5)
+
         multiprocessing.process._cleanup()
+
+        # Stop the ForkServer process if it's running
+        from multiprocessing import forkserver
+        forkserver._forkserver._stop()
+
         # bpo-37421: Explicitly call _run_finalizers() to remove immediately
         # temporary directories created by multiprocessing.util.get_temp_dir().
         multiprocessing.util._run_finalizers()
diff --git a/Misc/NEWS.d/next/Tests/2019-07-05-14-47-55.bpo-37421.n8o2to.rst b/Misc/NEWS.d/next/Tests/2019-07-05-14-47-55.bpo-37421.n8o2to.rst
new file mode 100644
index 000000000000..136faa22d47a
--- /dev/null
+++ b/Misc/NEWS.d/next/Tests/2019-07-05-14-47-55.bpo-37421.n8o2to.rst
@@ -0,0 +1,3 @@
+multiprocessing tests now stop the ForkServer instance if it's running: close
+the "alive" file descriptor to ask the server to stop and then remove its UNIX
+address.


From webhook-mailer at python.org  Fri Jul  5 11:43:47 2019
From: webhook-mailer at python.org (Petr Viktorin)
Date: Fri, 05 Jul 2019 15:43:47 -0000
Subject: [Python-checkins] bpo-37151: remove _PyMethodDef_RawFastCall*
 functions (GH-14603)
Message-ID: <mailman.255.1562341428.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/7b57c03a7cb63ccfb2b8dfa82a1bf169268d80ba
commit: 7b57c03a7cb63ccfb2b8dfa82a1bf169268d80ba
branch: master
author: Jeroen Demeyer <J.Demeyer at UGent.be>
committer: Petr Viktorin <encukou at gmail.com>
date: 2019-07-05T17:43:22+02:00
summary:

bpo-37151: remove _PyMethodDef_RawFastCall* functions (GH-14603)

files:
M Include/methodobject.h
M Objects/call.c

diff --git a/Include/methodobject.h b/Include/methodobject.h
index b43847110e18..ab66b03f7a97 100644
--- a/Include/methodobject.h
+++ b/Include/methodobject.h
@@ -95,20 +95,6 @@ typedef struct {
     PyObject    *m_weakreflist; /* List of weak references */
     vectorcallfunc vectorcall;
 } PyCFunctionObject;
-
-PyAPI_FUNC(PyObject *) _PyMethodDef_RawFastCallDict(
-    PyMethodDef *method,
-    PyObject *self,
-    PyObject *const *args,
-    Py_ssize_t nargs,
-    PyObject *kwargs);
-
-PyAPI_FUNC(PyObject *) _PyMethodDef_RawFastCallKeywords(
-    PyMethodDef *method,
-    PyObject *self,
-    PyObject *const *args,
-    Py_ssize_t nargs,
-    PyObject *kwnames);
 #endif
 
 PyAPI_FUNC(int) PyCFunction_ClearFreeList(void);
diff --git a/Objects/call.c b/Objects/call.c
index 861ab87a0745..df90595d6c6a 100644
--- a/Objects/call.c
+++ b/Objects/call.c
@@ -366,265 +366,6 @@ _PyFunction_Vectorcall(PyObject *func, PyObject* const* stack,
 
 /* --- PyCFunction call functions --------------------------------- */
 
-PyObject *
-_PyMethodDef_RawFastCallDict(PyMethodDef *method, PyObject *self,
-                             PyObject *const *args, Py_ssize_t nargs,
-                             PyObject *kwargs)
-{
-    /* _PyMethodDef_RawFastCallDict() must not be called with an exception set,
-       because it can clear it (directly or indirectly) and so the
-       caller loses its exception */
-    assert(!PyErr_Occurred());
-
-    assert(method != NULL);
-    assert(nargs >= 0);
-    assert(nargs == 0 || args != NULL);
-    assert(kwargs == NULL || PyDict_Check(kwargs));
-
-    PyCFunction meth = method->ml_meth;
-    int flags = method->ml_flags & ~(METH_CLASS | METH_STATIC | METH_COEXIST);
-    PyObject *result = NULL;
-
-    if (Py_EnterRecursiveCall(" while calling a Python object")) {
-        return NULL;
-    }
-
-    switch (flags)
-    {
-    case METH_NOARGS:
-        if (kwargs != NULL && PyDict_GET_SIZE(kwargs) != 0) {
-            goto no_keyword_error;
-        }
-
-        if (nargs != 0) {
-            PyErr_Format(PyExc_TypeError,
-                "%.200s() takes no arguments (%zd given)",
-                method->ml_name, nargs);
-            goto exit;
-        }
-
-        result = (*meth) (self, NULL);
-        break;
-
-    case METH_O:
-        if (kwargs != NULL && PyDict_GET_SIZE(kwargs) != 0) {
-            goto no_keyword_error;
-        }
-
-        if (nargs != 1) {
-            PyErr_Format(PyExc_TypeError,
-                "%.200s() takes exactly one argument (%zd given)",
-                method->ml_name, nargs);
-            goto exit;
-        }
-
-        result = (*meth) (self, args[0]);
-        break;
-
-    case METH_VARARGS:
-        if (kwargs != NULL && PyDict_GET_SIZE(kwargs) != 0) {
-            goto no_keyword_error;
-        }
-        /* fall through */
-
-    case METH_VARARGS | METH_KEYWORDS:
-    {
-        /* Slow-path: create a temporary tuple for positional arguments */
-        PyObject *argstuple = _PyTuple_FromArray(args, nargs);
-        if (argstuple == NULL) {
-            goto exit;
-        }
-
-        if (flags & METH_KEYWORDS) {
-            result = (*(PyCFunctionWithKeywords)(void(*)(void))meth) (self, argstuple, kwargs);
-        }
-        else {
-            result = (*meth) (self, argstuple);
-        }
-        Py_DECREF(argstuple);
-        break;
-    }
-
-    case METH_FASTCALL:
-    {
-        if (kwargs != NULL && PyDict_GET_SIZE(kwargs) != 0) {
-            goto no_keyword_error;
-        }
-
-        result = (*(_PyCFunctionFast)(void(*)(void))meth) (self, args, nargs);
-        break;
-    }
-
-    case METH_FASTCALL | METH_KEYWORDS:
-    {
-        _PyCFunctionFastWithKeywords fastmeth = (_PyCFunctionFastWithKeywords)(void(*)(void))meth;
-
-        /* Fast path for no keywords */
-        if (kwargs == NULL || PyDict_GET_SIZE(kwargs) == 0) {
-            result = (*fastmeth) (self, args, nargs, NULL);
-            break;
-        }
-
-        PyObject *const *stack;
-        PyObject *kwnames;
-        stack = _PyStack_UnpackDict(args, nargs, kwargs, &kwnames);
-        if (stack == NULL) {
-            goto exit;
-        }
-        result = (*fastmeth) (self, stack, nargs, kwnames);
-        _PyStack_UnpackDict_Free(stack, nargs, kwnames);
-        break;
-    }
-
-    default:
-        PyErr_SetString(PyExc_SystemError,
-                        "Bad call flags in _PyMethodDef_RawFastCallDict. "
-                        "METH_OLDARGS is no longer supported!");
-        goto exit;
-    }
-
-    goto exit;
-
-no_keyword_error:
-    PyErr_Format(PyExc_TypeError,
-                 "%.200s() takes no keyword arguments",
-                 method->ml_name);
-
-exit:
-    Py_LeaveRecursiveCall();
-    return result;
-}
-
-
-PyObject *
-_PyMethodDef_RawFastCallKeywords(PyMethodDef *method, PyObject *self,
-                                 PyObject *const *args, Py_ssize_t nargs,
-                                 PyObject *kwnames)
-{
-    /* _PyMethodDef_RawFastCallKeywords() must not be called with an exception set,
-       because it can clear it (directly or indirectly) and so the
-       caller loses its exception */
-    assert(!PyErr_Occurred());
-
-    assert(method != NULL);
-    assert(nargs >= 0);
-    assert(kwnames == NULL || PyTuple_CheckExact(kwnames));
-    /* kwnames must only contains str strings, no subclass, and all keys must
-       be unique */
-
-    PyCFunction meth = method->ml_meth;
-    int flags = method->ml_flags & ~(METH_CLASS | METH_STATIC | METH_COEXIST);
-    Py_ssize_t nkwargs = kwnames == NULL ? 0 : PyTuple_GET_SIZE(kwnames);
-    PyObject *result = NULL;
-
-    if (Py_EnterRecursiveCall(" while calling a Python object")) {
-        return NULL;
-    }
-
-    switch (flags)
-    {
-    case METH_NOARGS:
-        if (nkwargs) {
-            goto no_keyword_error;
-        }
-
-        if (nargs != 0) {
-            PyErr_Format(PyExc_TypeError,
-                "%.200s() takes no arguments (%zd given)",
-                method->ml_name, nargs);
-            goto exit;
-        }
-
-        result = (*meth) (self, NULL);
-        break;
-
-    case METH_O:
-        if (nkwargs) {
-            goto no_keyword_error;
-        }
-
-        if (nargs != 1) {
-            PyErr_Format(PyExc_TypeError,
-                "%.200s() takes exactly one argument (%zd given)",
-                method->ml_name, nargs);
-            goto exit;
-        }
-
-        result = (*meth) (self, args[0]);
-        break;
-
-    case METH_FASTCALL:
-        if (nkwargs) {
-            goto no_keyword_error;
-        }
-        result = ((_PyCFunctionFast)(void(*)(void))meth) (self, args, nargs);
-        break;
-
-    case METH_FASTCALL | METH_KEYWORDS:
-        /* Fast-path: avoid temporary dict to pass keyword arguments */
-        result = ((_PyCFunctionFastWithKeywords)(void(*)(void))meth) (self, args, nargs, kwnames);
-        break;
-
-    case METH_VARARGS:
-        if (nkwargs) {
-            goto no_keyword_error;
-        }
-        /* fall through */
-
-    case METH_VARARGS | METH_KEYWORDS:
-    {
-        /* Slow-path: create a temporary tuple for positional arguments
-           and a temporary dict for keyword arguments */
-        PyObject *argtuple;
-
-        argtuple = _PyTuple_FromArray(args, nargs);
-        if (argtuple == NULL) {
-            goto exit;
-        }
-
-        if (flags & METH_KEYWORDS) {
-            PyObject *kwdict;
-
-            if (nkwargs > 0) {
-                kwdict = _PyStack_AsDict(args + nargs, kwnames);
-                if (kwdict == NULL) {
-                    Py_DECREF(argtuple);
-                    goto exit;
-                }
-            }
-            else {
-                kwdict = NULL;
-            }
-
-            result = (*(PyCFunctionWithKeywords)(void(*)(void))meth) (self, argtuple, kwdict);
-            Py_XDECREF(kwdict);
-        }
-        else {
-            result = (*meth) (self, argtuple);
-        }
-        Py_DECREF(argtuple);
-        break;
-    }
-
-    default:
-        PyErr_SetString(PyExc_SystemError,
-                        "Bad call flags in _PyMethodDef_RawFastCallKeywords. "
-                        "METH_OLDARGS is no longer supported!");
-        goto exit;
-    }
-
-    goto exit;
-
-no_keyword_error:
-    PyErr_Format(PyExc_TypeError,
-                 "%.200s() takes no keyword arguments",
-                 method->ml_name);
-
-exit:
-    Py_LeaveRecursiveCall();
-    return result;
-}
-
 static PyObject *
 cfunction_call_varargs(PyObject *func, PyObject *args, PyObject *kwargs)
 {


From webhook-mailer at python.org  Fri Jul  5 15:14:03 2019
From: webhook-mailer at python.org (Miss Islington (bot))
Date: Fri, 05 Jul 2019 19:14:03 -0000
Subject: [Python-checkins] [3.7] bpo-37500: Revert commit
 85ed1712e428f93408f56fc684816f9a85b0ebc0 (GH-14605)
Message-ID: <mailman.256.1562354044.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/7d93effeb4f8e86dfa283f2376ec5362275635c6
commit: 7d93effeb4f8e86dfa283f2376ec5362275635c6
branch: 3.7
author: Pablo Galindo <Pablogsal at gmail.com>
committer: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
date: 2019-07-05T12:13:38-07:00
summary:

[3.7] bpo-37500: Revert commit 85ed1712e428f93408f56fc684816f9a85b0ebc0 (GH-14605)



https://bugs.python.org/issue37500

files:
M Lib/test/test_syntax.py
M Python/compile.c
M Python/peephole.c

diff --git a/Lib/test/test_syntax.py b/Lib/test/test_syntax.py
index 4918e5c4c428..2b96a94401a8 100644
--- a/Lib/test/test_syntax.py
+++ b/Lib/test/test_syntax.py
@@ -650,20 +650,6 @@ def error2():
     def test_break_outside_loop(self):
         self._check_error("break", "outside loop")
 
-    def test_yield_outside_function(self):
-        self._check_error("if 0: yield",               "outside function")
-        self._check_error("class C:\n    if 0: yield", "outside function")
-
-    def test_return_outside_function(self):
-        self._check_error("if 0: return",               "outside function")
-        self._check_error("class C:\n    if 0: return", "outside function")
-
-    def test_break_outside_loop(self):
-        self._check_error("if 0: break",                "outside loop")
-
-    def test_continue_outside_loop(self):
-        self._check_error("if 0: continue",     "not properly in loop")
-
     def test_unexpected_indent(self):
         self._check_error("foo()\n bar()\n", "unexpected indent",
                           subclass=IndentationError)
diff --git a/Python/compile.c b/Python/compile.c
index d2729d4c6ca3..5688ef8479c0 100644
--- a/Python/compile.c
+++ b/Python/compile.c
@@ -2301,12 +2301,13 @@ compiler_if(struct compiler *c, stmt_ty s)
         return 0;
 
     constant = expr_constant(s->v.If.test);
-    /* constant = 0: "if 0" Leave the optimizations to
-     * the pephole optimizer to check for syntax errors
-     * in the block.
+    /* constant = 0: "if 0"
      * constant = 1: "if 1", "if 2", ...
      * constant = -1: rest */
-    if (constant == 1) {
+    if (constant == 0) {
+        if (s->v.If.orelse)
+            VISIT_SEQ(c, stmt, s->v.If.orelse);
+    } else if (constant == 1) {
         VISIT_SEQ(c, stmt, s->v.If.body);
     } else {
         if (asdl_seq_LEN(s->v.If.orelse)) {
diff --git a/Python/peephole.c b/Python/peephole.c
index 277a216ae075..95b3dbb6bf51 100644
--- a/Python/peephole.c
+++ b/Python/peephole.c
@@ -304,18 +304,11 @@ PyCode_Optimize(PyObject *code, PyObject* consts, PyObject *names,
             case LOAD_CONST:
                 cumlc = lastlc + 1;
                 if (nextop != POP_JUMP_IF_FALSE  ||
-                    !ISBASICBLOCK(blocks, op_start, i + 1)) {
+                    !ISBASICBLOCK(blocks, op_start, i + 1)  ||
+                    !PyObject_IsTrue(PyList_GET_ITEM(consts, get_arg(codestr, i))))
                     break;
-                }
-                PyObject* cnt = PyList_GET_ITEM(consts, get_arg(codestr, i));
-                int is_true = PyObject_IsTrue(cnt);
-                if (is_true == -1) {
-                    goto exitError;
-                }
-                if (is_true == 1) {
-                    fill_nops(codestr, op_start, nexti + 1);
-                    cumlc = 0;
-                }
+                fill_nops(codestr, op_start, nexti + 1);
+                cumlc = 0;
                 break;
 
                 /* Try to fold tuples of constants.


From webhook-mailer at python.org  Fri Jul  5 17:23:04 2019
From: webhook-mailer at python.org (Brett Cannon)
Date: Fri, 05 Jul 2019 21:23:04 -0000
Subject: [Python-checkins] Move test_threaded_import.py to test_importlib/
 (GH-14582)
Message-ID: <mailman.257.1562361786.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/bad02cc3c881e5b55e1d3db5a3ce3aaf02ce8536
commit: bad02cc3c881e5b55e1d3db5a3ce3aaf02ce8536
branch: master
author: Kyle Stanley <aeros167 at gmail.com>
committer: Brett Cannon <54418+brettcannon at users.noreply.github.com>
date: 2019-07-05T14:22:42-07:00
summary:

Move test_threaded_import.py to test_importlib/ (GH-14582)

files:
A Lib/test/test_importlib/test_threaded_import.py
D Lib/test/test_threaded_import.py

diff --git a/Lib/test/test_threaded_import.py b/Lib/test/test_importlib/test_threaded_import.py
similarity index 100%
rename from Lib/test/test_threaded_import.py
rename to Lib/test/test_importlib/test_threaded_import.py


From webhook-mailer at python.org  Fri Jul  5 17:37:19 2019
From: webhook-mailer at python.org (Miss Islington (bot))
Date: Fri, 05 Jul 2019 21:37:19 -0000
Subject: [Python-checkins] Typo fix in file Include/object.h (GH-14556)
Message-ID: <mailman.258.1562362641.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/10e5c66789a06dc9015a24968e96e77a75725a7a
commit: 10e5c66789a06dc9015a24968e96e77a75725a7a
branch: master
author: Hansraj Das <raj.das.136 at gmail.com>
committer: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
date: 2019-07-05T14:37:15-07:00
summary:

Typo fix in file Include/object.h (GH-14556)



* accross -> across
* Extra space removed in comment

files:
M Include/object.h

diff --git a/Include/object.h b/Include/object.h
index cc98d8a1def7..a9d434b51080 100644
--- a/Include/object.h
+++ b/Include/object.h
@@ -337,8 +337,8 @@ given type object has a specified feature.
 /* NOTE: The following flags reuse lower bits (removed as part of the
  * Python 3.0 transition). */
 
-/* The following flag is kept for compatibility.  Starting with 3.8,
- * binary compatibility of C extensions accross feature releases of
+/* The following flag is kept for compatibility. Starting with 3.8,
+ * binary compatibility of C extensions across feature releases of
  * Python is not supported anymore, except when using the stable ABI.
  */
 


From webhook-mailer at python.org  Fri Jul  5 17:39:36 2019
From: webhook-mailer at python.org (Brett Cannon)
Date: Fri, 05 Jul 2019 21:39:36 -0000
Subject: [Python-checkins] Fix some typos (GH-14435)
Message-ID: <mailman.259.1562362777.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/f7d72e48fb235684e17668a1e5107e6b0dab7b80
commit: f7d72e48fb235684e17668a1e5107e6b0dab7b80
branch: master
author: Min ho Kim <minho42 at gmail.com>
committer: Brett Cannon <54418+brettcannon at users.noreply.github.com>
date: 2019-07-05T14:39:32-07:00
summary:

Fix some typos (GH-14435)

files:
M Misc/NEWS.d/3.8.0a1.rst
M Misc/NEWS.d/3.8.0a3.rst
M Misc/NEWS.d/3.8.0b1.rst
M Modules/_abc.c
M Modules/mathmodule.c

diff --git a/Misc/NEWS.d/3.8.0a1.rst b/Misc/NEWS.d/3.8.0a1.rst
index f4b0a0483300..84c2a6c12bcf 100644
--- a/Misc/NEWS.d/3.8.0a1.rst
+++ b/Misc/NEWS.d/3.8.0a1.rst
@@ -550,7 +550,7 @@ The *lineno* and *col_offset* attributes of the AST for decorated function
 and class refer now to the position of the corresponding ``def``, ``async
 def`` and ``class`` instead of the position of the first decorator. This
 leads to more correct line reporting in tracing. This is the only case when
-the position of child AST nodes can preceed the position of the parent AST
+the position of child AST nodes can precede the position of the parent AST
 node.
 
 ..
@@ -2366,7 +2366,7 @@ running external programs like ``cmd /c ver``.
 
 Previously, calling the strftime() method on a datetime object with a
 trailing '%' in the format string would result in an exception. However,
-this only occured when the datetime C module was being used; the python
+this only occurred when the datetime C module was being used; the python
 implementation did not match this behavior. Datetime is now PEP-399
 compliant, and will not throw an exception on a trailing '%'.
 
@@ -5278,7 +5278,7 @@ Improved error handling and fixed a reference leak in
 .. nonce: zncfvW
 .. section: Library
 
-Deleting a key from a read-only dbm database raises module specfic error
+Deleting a key from a read-only dbm database raises module specific error
 instead of KeyError.
 
 ..
diff --git a/Misc/NEWS.d/3.8.0a3.rst b/Misc/NEWS.d/3.8.0a3.rst
index a7397b520cb1..fc37b22ddb19 100644
--- a/Misc/NEWS.d/3.8.0a3.rst
+++ b/Misc/NEWS.d/3.8.0a3.rst
@@ -173,7 +173,7 @@ Update Unicode databases to version 12.0.0.
 .. nonce: dZemNt
 .. section: Core and Builtins
 
-Fix a segfault occuring when sorting a list of heterogeneous values. Patch
+Fix a segfault occurring when sorting a list of heterogeneous values. Patch
 contributed by R?mi Lapeyre and Elliot Gorokhovsky.
 
 ..
diff --git a/Misc/NEWS.d/3.8.0b1.rst b/Misc/NEWS.d/3.8.0b1.rst
index 77f57df397ac..3cebcfb587c4 100644
--- a/Misc/NEWS.d/3.8.0b1.rst
+++ b/Misc/NEWS.d/3.8.0b1.rst
@@ -1613,7 +1613,7 @@ versions.
 .. section: Documentation
 
 Improve documentation of the stdin, stdout, and stderr arguments of of the
-``asyncio.subprocess_exec`` function to specficy which values are supported.
+``asyncio.subprocess_exec`` function to specify which values are supported.
 Also mention that decoding as text is not supported.
 
 Add a few tests to verify that the various values passed to the std*
diff --git a/Modules/_abc.c b/Modules/_abc.c
index 7233690a57dc..219ea0dd628f 100644
--- a/Modules/_abc.c
+++ b/Modules/_abc.c
@@ -554,7 +554,7 @@ _abc__abc_instancecheck_impl(PyObject *module, PyObject *self,
 }
 
 
-// Return -1 when exception occured.
+// Return -1 when exception occurred.
 // Return 1 when result is set.
 // Return 0 otherwise.
 static int subclasscheck_check_registry(_abc_data *impl, PyObject *subclass,
@@ -666,7 +666,7 @@ _abc__abc_subclasscheck_impl(PyObject *module, PyObject *self,
 
     /* 5. Check if it's a subclass of a registered class (recursive). */
     if (subclasscheck_check_registry(impl, subclass, &result)) {
-        // Exception occured or result is set.
+        // Exception occurred or result is set.
         goto end;
     }
 
diff --git a/Modules/mathmodule.c b/Modules/mathmodule.c
index a75a3c929e7b..552cb78c88d1 100644
--- a/Modules/mathmodule.c
+++ b/Modules/mathmodule.c
@@ -1552,7 +1552,7 @@ prove that after that line is executed, we have
 
     (a - 1)**2 < (n >> 2*(c - d)) < (a + 1)**2
 
-To faciliate the proof, we make some changes of notation. Write `m` for
+To facilitate the proof, we make some changes of notation. Write `m` for
 `n >> 2*(c-d)`, and write `b` for the new value of `a`, so
 
     b = (a << d - e - 1) + (n >> 2*c - e - d + 1) // a


From webhook-mailer at python.org  Fri Jul  5 18:00:49 2019
From: webhook-mailer at python.org (Miss Islington (bot))
Date: Fri, 05 Jul 2019 22:00:49 -0000
Subject: [Python-checkins] Fix some typos (GH-14435)
Message-ID: <mailman.260.1562364050.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/4bc6bb928d35b4007f2dcb32523624a3205e0e46
commit: 4bc6bb928d35b4007f2dcb32523624a3205e0e46
branch: 3.8
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: GitHub <noreply at github.com>
date: 2019-07-05T15:00:43-07:00
summary:

Fix some typos (GH-14435)

(cherry picked from commit f7d72e48fb235684e17668a1e5107e6b0dab7b80)

Co-authored-by: Min ho Kim <minho42 at gmail.com>

files:
M Misc/NEWS.d/3.8.0a1.rst
M Misc/NEWS.d/3.8.0a3.rst
M Misc/NEWS.d/3.8.0b1.rst
M Modules/_abc.c
M Modules/mathmodule.c

diff --git a/Misc/NEWS.d/3.8.0a1.rst b/Misc/NEWS.d/3.8.0a1.rst
index f4b0a0483300..84c2a6c12bcf 100644
--- a/Misc/NEWS.d/3.8.0a1.rst
+++ b/Misc/NEWS.d/3.8.0a1.rst
@@ -550,7 +550,7 @@ The *lineno* and *col_offset* attributes of the AST for decorated function
 and class refer now to the position of the corresponding ``def``, ``async
 def`` and ``class`` instead of the position of the first decorator. This
 leads to more correct line reporting in tracing. This is the only case when
-the position of child AST nodes can preceed the position of the parent AST
+the position of child AST nodes can precede the position of the parent AST
 node.
 
 ..
@@ -2366,7 +2366,7 @@ running external programs like ``cmd /c ver``.
 
 Previously, calling the strftime() method on a datetime object with a
 trailing '%' in the format string would result in an exception. However,
-this only occured when the datetime C module was being used; the python
+this only occurred when the datetime C module was being used; the python
 implementation did not match this behavior. Datetime is now PEP-399
 compliant, and will not throw an exception on a trailing '%'.
 
@@ -5278,7 +5278,7 @@ Improved error handling and fixed a reference leak in
 .. nonce: zncfvW
 .. section: Library
 
-Deleting a key from a read-only dbm database raises module specfic error
+Deleting a key from a read-only dbm database raises module specific error
 instead of KeyError.
 
 ..
diff --git a/Misc/NEWS.d/3.8.0a3.rst b/Misc/NEWS.d/3.8.0a3.rst
index a7397b520cb1..fc37b22ddb19 100644
--- a/Misc/NEWS.d/3.8.0a3.rst
+++ b/Misc/NEWS.d/3.8.0a3.rst
@@ -173,7 +173,7 @@ Update Unicode databases to version 12.0.0.
 .. nonce: dZemNt
 .. section: Core and Builtins
 
-Fix a segfault occuring when sorting a list of heterogeneous values. Patch
+Fix a segfault occurring when sorting a list of heterogeneous values. Patch
 contributed by R?mi Lapeyre and Elliot Gorokhovsky.
 
 ..
diff --git a/Misc/NEWS.d/3.8.0b1.rst b/Misc/NEWS.d/3.8.0b1.rst
index 77f57df397ac..3cebcfb587c4 100644
--- a/Misc/NEWS.d/3.8.0b1.rst
+++ b/Misc/NEWS.d/3.8.0b1.rst
@@ -1613,7 +1613,7 @@ versions.
 .. section: Documentation
 
 Improve documentation of the stdin, stdout, and stderr arguments of of the
-``asyncio.subprocess_exec`` function to specficy which values are supported.
+``asyncio.subprocess_exec`` function to specify which values are supported.
 Also mention that decoding as text is not supported.
 
 Add a few tests to verify that the various values passed to the std*
diff --git a/Modules/_abc.c b/Modules/_abc.c
index 1fbf3a831007..de938dd0d7d5 100644
--- a/Modules/_abc.c
+++ b/Modules/_abc.c
@@ -547,7 +547,7 @@ _abc__abc_instancecheck_impl(PyObject *module, PyObject *self,
 }
 
 
-// Return -1 when exception occured.
+// Return -1 when exception occurred.
 // Return 1 when result is set.
 // Return 0 otherwise.
 static int subclasscheck_check_registry(_abc_data *impl, PyObject *subclass,
@@ -659,7 +659,7 @@ _abc__abc_subclasscheck_impl(PyObject *module, PyObject *self,
 
     /* 5. Check if it's a subclass of a registered class (recursive). */
     if (subclasscheck_check_registry(impl, subclass, &result)) {
-        // Exception occured or result is set.
+        // Exception occurred or result is set.
         goto end;
     }
 
diff --git a/Modules/mathmodule.c b/Modules/mathmodule.c
index 82a9a14724f5..dd596c8de6e3 100644
--- a/Modules/mathmodule.c
+++ b/Modules/mathmodule.c
@@ -1552,7 +1552,7 @@ prove that after that line is executed, we have
 
     (a - 1)**2 < (n >> 2*(c - d)) < (a + 1)**2
 
-To faciliate the proof, we make some changes of notation. Write `m` for
+To facilitate the proof, we make some changes of notation. Write `m` for
 `n >> 2*(c-d)`, and write `b` for the new value of `a`, so
 
     b = (a << d - e - 1) + (n >> 2*c - e - d + 1) // a


From webhook-mailer at python.org  Sat Jul  6 00:03:17 2019
From: webhook-mailer at python.org (Benjamin Peterson)
Date: Sat, 06 Jul 2019 04:03:17 -0000
Subject: [Python-checkins] closes bpo-37508: Fix name of type in memory.rst.
 (GH-14604)
Message-ID: <mailman.261.1562385797.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/39a5d17a7f1387582eb484422df450bc09a5543e
commit: 39a5d17a7f1387582eb484422df450bc09a5543e
branch: master
author: Hai Shi <shihai1992 at gmail.com>
committer: Benjamin Peterson <benjamin at python.org>
date: 2019-07-05T21:03:13-07:00
summary:

closes bpo-37508: Fix name of type in memory.rst. (GH-14604)

files:
M Doc/c-api/memory.rst

diff --git a/Doc/c-api/memory.rst b/Doc/c-api/memory.rst
index ab49e48782d7..f97ae453487f 100644
--- a/Doc/c-api/memory.rst
+++ b/Doc/c-api/memory.rst
@@ -67,7 +67,7 @@ example::
 
 In this example, the memory request for the I/O buffer is handled by the C
 library allocator. The Python memory manager is involved only in the allocation
-of the string object returned as a result.
+of the bytes object returned as a result.
 
 In most situations, however, it is recommended to allocate memory from the
 Python heap specifically because the latter is under control of the Python


From webhook-mailer at python.org  Sat Jul  6 00:08:44 2019
From: webhook-mailer at python.org (Miss Islington (bot))
Date: Sat, 06 Jul 2019 04:08:44 -0000
Subject: [Python-checkins] closes bpo-37508: Fix name of type in memory.rst.
 (GH-14604)
Message-ID: <mailman.262.1562386125.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/af5e62e9e2b56017d3716fce40d959adfb753554
commit: af5e62e9e2b56017d3716fce40d959adfb753554
branch: 3.7
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: GitHub <noreply at github.com>
date: 2019-07-05T21:08:40-07:00
summary:

closes bpo-37508: Fix name of type in memory.rst. (GH-14604)

(cherry picked from commit 39a5d17a7f1387582eb484422df450bc09a5543e)

Co-authored-by: Hai Shi <shihai1992 at gmail.com>

files:
M Doc/c-api/memory.rst

diff --git a/Doc/c-api/memory.rst b/Doc/c-api/memory.rst
index 9b42900b4350..01f7f4209fe9 100644
--- a/Doc/c-api/memory.rst
+++ b/Doc/c-api/memory.rst
@@ -67,7 +67,7 @@ example::
 
 In this example, the memory request for the I/O buffer is handled by the C
 library allocator. The Python memory manager is involved only in the allocation
-of the string object returned as a result.
+of the bytes object returned as a result.
 
 In most situations, however, it is recommended to allocate memory from the
 Python heap specifically because the latter is under control of the Python


From webhook-mailer at python.org  Sat Jul  6 00:10:01 2019
From: webhook-mailer at python.org (Miss Islington (bot))
Date: Sat, 06 Jul 2019 04:10:01 -0000
Subject: [Python-checkins] closes bpo-37508: Fix name of type in memory.rst.
 (GH-14604)
Message-ID: <mailman.263.1562386201.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/cf294c48e4f97117f708c116362208d28ebfe08f
commit: cf294c48e4f97117f708c116362208d28ebfe08f
branch: 3.8
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: GitHub <noreply at github.com>
date: 2019-07-05T21:09:57-07:00
summary:

closes bpo-37508: Fix name of type in memory.rst. (GH-14604)

(cherry picked from commit 39a5d17a7f1387582eb484422df450bc09a5543e)

Co-authored-by: Hai Shi <shihai1992 at gmail.com>

files:
M Doc/c-api/memory.rst

diff --git a/Doc/c-api/memory.rst b/Doc/c-api/memory.rst
index ab49e48782d7..f97ae453487f 100644
--- a/Doc/c-api/memory.rst
+++ b/Doc/c-api/memory.rst
@@ -67,7 +67,7 @@ example::
 
 In this example, the memory request for the I/O buffer is handled by the C
 library allocator. The Python memory manager is involved only in the allocation
-of the string object returned as a result.
+of the bytes object returned as a result.
 
 In most situations, however, it is recommended to allocate memory from the
 Python heap specifically because the latter is under control of the Python


From webhook-mailer at python.org  Sat Jul  6 02:32:00 2019
From: webhook-mailer at python.org (Terry Jan Reedy)
Date: Sat, 06 Jul 2019 06:32:00 -0000
Subject: [Python-checkins] bpo-37149: Replace dead link for online Tkinter
 reference (GH-14616)
Message-ID: <mailman.264.1562394721.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/45bc61b97178b27ae05bd3eb95481bf0325795bb
commit: 45bc61b97178b27ae05bd3eb95481bf0325795bb
branch: master
author: Terry Jan Reedy <tjreedy at udel.edu>
committer: GitHub <noreply at github.com>
date: 2019-07-06T02:31:54-04:00
summary:

bpo-37149: Replace dead link for online Tkinter reference  (GH-14616)

Also fix a name misspelling.

files:
A Misc/NEWS.d/next/Documentation/2019-07-06-02-19-02.bpo-37149.NumHn3.rst
M Doc/library/tkinter.rst

diff --git a/Doc/library/tkinter.rst b/Doc/library/tkinter.rst
index 640fb2ec61d3..e1fc051d9597 100644
--- a/Doc/library/tkinter.rst
+++ b/Doc/library/tkinter.rst
@@ -31,7 +31,7 @@ installed, so you can read the Tcl/Tk documentation specific to that version.
    `TKDocs <http://www.tkdocs.com/>`_
       Extensive tutorial plus friendlier widget pages for some of the widgets.
 
-   `Tkinter reference: a GUI for Python <https://infohost.nmt.edu/tcc/help/pubs/tkinter/web/index.html>`_
+   `Tkinter 8.5 reference: a GUI for Python <https://web.archive.org/web/20190524140835/https://infohost.nmt.edu/tcc/help/pubs/tkinter/web/index.html>`_
       On-line reference material.
 
    `Tkinter docs from effbot <http://effbot.org/tkinterbook/>`_
@@ -41,7 +41,7 @@ installed, so you can read the Tcl/Tk documentation specific to that version.
       Book by Mark Lutz, has excellent coverage of Tkinter.
 
    `Modern Tkinter for Busy Python Developers <https://www.amazon.com/Modern-Tkinter-Python-Developers-ebook/dp/B0071QDNLO/>`_
-      Book by Mark Rozerman about building attractive and modern graphical user interfaces with Python and Tkinter.
+      Book by Mark Roseman about building attractive and modern graphical user interfaces with Python and Tkinter.
 
    `Python and Tkinter Programming <https://www.manning.com/books/python-and-tkinter-programming>`_
       Book by John Grayson (ISBN 1-884777-81-3).
diff --git a/Misc/NEWS.d/next/Documentation/2019-07-06-02-19-02.bpo-37149.NumHn3.rst b/Misc/NEWS.d/next/Documentation/2019-07-06-02-19-02.bpo-37149.NumHn3.rst
new file mode 100644
index 000000000000..f9b88dc0bfe0
--- /dev/null
+++ b/Misc/NEWS.d/next/Documentation/2019-07-06-02-19-02.bpo-37149.NumHn3.rst
@@ -0,0 +1,2 @@
+Replace the dead link to the Tkinter 8.5 reference by John Shipman, New
+Mexico Tech, with a link to the archive.org copy.


From webhook-mailer at python.org  Sat Jul  6 02:37:42 2019
From: webhook-mailer at python.org (Miss Islington (bot))
Date: Sat, 06 Jul 2019 06:37:42 -0000
Subject: [Python-checkins] bpo-37149: Replace dead link for online Tkinter
 reference (GH-14616)
Message-ID: <mailman.265.1562395064.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/d2c5677a4f3be7de572def0a914b96385d7982b0
commit: d2c5677a4f3be7de572def0a914b96385d7982b0
branch: 3.7
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: GitHub <noreply at github.com>
date: 2019-07-05T23:37:38-07:00
summary:

bpo-37149: Replace dead link for online Tkinter reference  (GH-14616)


Also fix a name misspelling.
(cherry picked from commit 45bc61b97178b27ae05bd3eb95481bf0325795bb)

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

files:
A Misc/NEWS.d/next/Documentation/2019-07-06-02-19-02.bpo-37149.NumHn3.rst
M Doc/library/tkinter.rst

diff --git a/Doc/library/tkinter.rst b/Doc/library/tkinter.rst
index 640fb2ec61d3..e1fc051d9597 100644
--- a/Doc/library/tkinter.rst
+++ b/Doc/library/tkinter.rst
@@ -31,7 +31,7 @@ installed, so you can read the Tcl/Tk documentation specific to that version.
    `TKDocs <http://www.tkdocs.com/>`_
       Extensive tutorial plus friendlier widget pages for some of the widgets.
 
-   `Tkinter reference: a GUI for Python <https://infohost.nmt.edu/tcc/help/pubs/tkinter/web/index.html>`_
+   `Tkinter 8.5 reference: a GUI for Python <https://web.archive.org/web/20190524140835/https://infohost.nmt.edu/tcc/help/pubs/tkinter/web/index.html>`_
       On-line reference material.
 
    `Tkinter docs from effbot <http://effbot.org/tkinterbook/>`_
@@ -41,7 +41,7 @@ installed, so you can read the Tcl/Tk documentation specific to that version.
       Book by Mark Lutz, has excellent coverage of Tkinter.
 
    `Modern Tkinter for Busy Python Developers <https://www.amazon.com/Modern-Tkinter-Python-Developers-ebook/dp/B0071QDNLO/>`_
-      Book by Mark Rozerman about building attractive and modern graphical user interfaces with Python and Tkinter.
+      Book by Mark Roseman about building attractive and modern graphical user interfaces with Python and Tkinter.
 
    `Python and Tkinter Programming <https://www.manning.com/books/python-and-tkinter-programming>`_
       Book by John Grayson (ISBN 1-884777-81-3).
diff --git a/Misc/NEWS.d/next/Documentation/2019-07-06-02-19-02.bpo-37149.NumHn3.rst b/Misc/NEWS.d/next/Documentation/2019-07-06-02-19-02.bpo-37149.NumHn3.rst
new file mode 100644
index 000000000000..f9b88dc0bfe0
--- /dev/null
+++ b/Misc/NEWS.d/next/Documentation/2019-07-06-02-19-02.bpo-37149.NumHn3.rst
@@ -0,0 +1,2 @@
+Replace the dead link to the Tkinter 8.5 reference by John Shipman, New
+Mexico Tech, with a link to the archive.org copy.


From webhook-mailer at python.org  Sat Jul  6 02:38:34 2019
From: webhook-mailer at python.org (Miss Islington (bot))
Date: Sat, 06 Jul 2019 06:38:34 -0000
Subject: [Python-checkins] bpo-37149: Replace dead link for online Tkinter
 reference (GH-14616)
Message-ID: <mailman.266.1562395115.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/ea9c8caa13977561787bf2de430f18c2031dde0d
commit: ea9c8caa13977561787bf2de430f18c2031dde0d
branch: 3.8
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: GitHub <noreply at github.com>
date: 2019-07-05T23:38:30-07:00
summary:

bpo-37149: Replace dead link for online Tkinter reference  (GH-14616)


Also fix a name misspelling.
(cherry picked from commit 45bc61b97178b27ae05bd3eb95481bf0325795bb)

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

files:
A Misc/NEWS.d/next/Documentation/2019-07-06-02-19-02.bpo-37149.NumHn3.rst
M Doc/library/tkinter.rst

diff --git a/Doc/library/tkinter.rst b/Doc/library/tkinter.rst
index 640fb2ec61d3..e1fc051d9597 100644
--- a/Doc/library/tkinter.rst
+++ b/Doc/library/tkinter.rst
@@ -31,7 +31,7 @@ installed, so you can read the Tcl/Tk documentation specific to that version.
    `TKDocs <http://www.tkdocs.com/>`_
       Extensive tutorial plus friendlier widget pages for some of the widgets.
 
-   `Tkinter reference: a GUI for Python <https://infohost.nmt.edu/tcc/help/pubs/tkinter/web/index.html>`_
+   `Tkinter 8.5 reference: a GUI for Python <https://web.archive.org/web/20190524140835/https://infohost.nmt.edu/tcc/help/pubs/tkinter/web/index.html>`_
       On-line reference material.
 
    `Tkinter docs from effbot <http://effbot.org/tkinterbook/>`_
@@ -41,7 +41,7 @@ installed, so you can read the Tcl/Tk documentation specific to that version.
       Book by Mark Lutz, has excellent coverage of Tkinter.
 
    `Modern Tkinter for Busy Python Developers <https://www.amazon.com/Modern-Tkinter-Python-Developers-ebook/dp/B0071QDNLO/>`_
-      Book by Mark Rozerman about building attractive and modern graphical user interfaces with Python and Tkinter.
+      Book by Mark Roseman about building attractive and modern graphical user interfaces with Python and Tkinter.
 
    `Python and Tkinter Programming <https://www.manning.com/books/python-and-tkinter-programming>`_
       Book by John Grayson (ISBN 1-884777-81-3).
diff --git a/Misc/NEWS.d/next/Documentation/2019-07-06-02-19-02.bpo-37149.NumHn3.rst b/Misc/NEWS.d/next/Documentation/2019-07-06-02-19-02.bpo-37149.NumHn3.rst
new file mode 100644
index 000000000000..f9b88dc0bfe0
--- /dev/null
+++ b/Misc/NEWS.d/next/Documentation/2019-07-06-02-19-02.bpo-37149.NumHn3.rst
@@ -0,0 +1,2 @@
+Replace the dead link to the Tkinter 8.5 reference by John Shipman, New
+Mexico Tech, with a link to the archive.org copy.


From webhook-mailer at python.org  Sat Jul  6 03:04:57 2019
From: webhook-mailer at python.org (Miss Islington (bot))
Date: Sat, 06 Jul 2019 07:04:57 -0000
Subject: [Python-checkins] bpo-37149: Replace dead link for online Tkinter
 reference (GH-14616)
Message-ID: <mailman.267.1562396698.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/55270d09c212654c4f1bc9ebf9a0081c169a6d12
commit: 55270d09c212654c4f1bc9ebf9a0081c169a6d12
branch: 2.7
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: GitHub <noreply at github.com>
date: 2019-07-06T00:04:53-07:00
summary:

bpo-37149: Replace dead link for online Tkinter reference  (GH-14616)


Also fix a name misspelling.
(cherry picked from commit 45bc61b97178b27ae05bd3eb95481bf0325795bb)

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

files:
A Misc/NEWS.d/next/Documentation/2019-07-06-02-19-02.bpo-37149.NumHn3.rst
M Doc/library/tkinter.rst

diff --git a/Doc/library/tkinter.rst b/Doc/library/tkinter.rst
index 3356e4ef23ec..9aa6dcb3709b 100644
--- a/Doc/library/tkinter.rst
+++ b/Doc/library/tkinter.rst
@@ -33,7 +33,7 @@ installed, so you can read the Tcl/Tk documentation specific to that version.
    `TKDocs <http://www.tkdocs.com/>`_
       Extensive tutorial plus friendlier widget pages for some of the widgets.
 
-   `Tkinter reference: a GUI for Python <https://infohost.nmt.edu/tcc/help/pubs/tkinter/web/index.html>`_
+   `Tkinter 8.5 reference: a GUI for Python <https://web.archive.org/web/20190524140835/https://infohost.nmt.edu/tcc/help/pubs/tkinter/web/index.html>`_
       On-line reference material.
 
    `Tkinter docs from effbot <http://effbot.org/tkinterbook/>`_
@@ -43,7 +43,7 @@ installed, so you can read the Tcl/Tk documentation specific to that version.
       Book by Mark Lutz, has excellent coverage of Tkinter.
 
    `Modern Tkinter for Busy Python Developers <https://www.amazon.com/Modern-Tkinter-Python-Developers-ebook/dp/B0071QDNLO/>`_
-      Book by Mark Rozerman about building attractive and modern graphical user interfaces with Python and Tkinter.
+      Book by Mark Roseman about building attractive and modern graphical user interfaces with Python and Tkinter.
 
    `Python and Tkinter Programming <https://www.manning.com/books/python-and-tkinter-programming>`_
       Book by John Grayson (ISBN 1-884777-81-3).
diff --git a/Misc/NEWS.d/next/Documentation/2019-07-06-02-19-02.bpo-37149.NumHn3.rst b/Misc/NEWS.d/next/Documentation/2019-07-06-02-19-02.bpo-37149.NumHn3.rst
new file mode 100644
index 000000000000..f9b88dc0bfe0
--- /dev/null
+++ b/Misc/NEWS.d/next/Documentation/2019-07-06-02-19-02.bpo-37149.NumHn3.rst
@@ -0,0 +1,2 @@
+Replace the dead link to the Tkinter 8.5 reference by John Shipman, New
+Mexico Tech, with a link to the archive.org copy.


From webhook-mailer at python.org  Sat Jul  6 08:35:30 2019
From: webhook-mailer at python.org (Tal Einat)
Date: Sat, 06 Jul 2019 12:35:30 -0000
Subject: [Python-checkins] bpo-26806: add 30 to the recursion limit in
 IDLE's shell (GH-13944)
Message-ID: <mailman.268.1562416532.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/fcf1d003bf4f0100c9d0921ff3d70e1127ca1b71
commit: fcf1d003bf4f0100c9d0921ff3d70e1127ca1b71
branch: master
author: Tal Einat <taleinat+github at gmail.com>
committer: GitHub <noreply at github.com>
date: 2019-07-06T15:35:24+03:00
summary:

bpo-26806: add 30 to the recursion limit in IDLE's shell (GH-13944)

This is done to compensate for the extra stack frames added by
IDLE itself, which cause problems when setting the recursion limit
to low values.

This wraps sys.setrecursionlimit() and sys.getrecursionlimit()
as invisibly as possible.

files:
A Misc/NEWS.d/next/IDLE/2019-06-10-22-48-50.bpo-26806.Zltkum.rst
M Doc/library/idle.rst
M Lib/idlelib/NEWS.txt
M Lib/idlelib/help.html
M Lib/idlelib/idle_test/test_run.py
M Lib/idlelib/run.py

diff --git a/Doc/library/idle.rst b/Doc/library/idle.rst
index fb886a714d74..de58f266bf5e 100644
--- a/Doc/library/idle.rst
+++ b/Doc/library/idle.rst
@@ -713,6 +713,10 @@ or ``print`` or ``write`` to sys.stdout or sys.stderr,
 IDLE should be started in a command line window.  The secondary subprocess
 will then be attached to that window for input and output.
 
+The IDLE code running in the execution process adds frames to the call stack
+that would not be there otherwise.  IDLE wraps ``sys.getrecursionlimit`` and
+``sys.setrecursionlimit`` to reduce the effect of the additional stack frames.
+
 If ``sys`` is reset by user code, such as with ``importlib.reload(sys)``,
 IDLE's changes are lost and input from the keyboard and output to the screen
 will not work correctly.
diff --git a/Lib/idlelib/NEWS.txt b/Lib/idlelib/NEWS.txt
index 689539e73c12..5d4a936d63f5 100644
--- a/Lib/idlelib/NEWS.txt
+++ b/Lib/idlelib/NEWS.txt
@@ -3,6 +3,11 @@ Released on 2019-10-20?
 ======================================
 
 
+bpo-26806: To compensate for stack frames added by IDLE and avoid
+possible problems with low recursion limits, add 30 to limits in the
+user code execution process.  Subtract 30 when reporting recursion
+limits to make this addition mostly transparent.
+
 bpo-37325: Fix tab focus traversal order for help source and custom
 run dialogs.
 
diff --git a/Lib/idlelib/help.html b/Lib/idlelib/help.html
index 91803fd06c8f..cee6887df68f 100644
--- a/Lib/idlelib/help.html
+++ b/Lib/idlelib/help.html
@@ -14,7 +14,7 @@
     <script type="text/javascript" src="../_static/jquery.js"></script>
     <script type="text/javascript" src="../_static/underscore.js"></script>
     <script type="text/javascript" src="../_static/doctools.js"></script>
-    <script async="async" type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.1/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script>
+    <script type="text/javascript" src="../_static/language_data.js"></script>
 
     <script type="text/javascript" src="../_static/sidebar.js"></script>
 
@@ -135,113 +135,75 @@ <h2>Menus<a class="headerlink" href="#menus" title="Permalink to this headline">
 <div class="section" id="file-menu-shell-and-editor">
 <h3>File menu (Shell and Editor)<a class="headerlink" href="#file-menu-shell-and-editor" title="Permalink to this headline">?</a></h3>
 <dl class="docutils">
-<dt>New File</dt>
-<dd>Create a new file editing window.</dd>
-<dt>Open?</dt>
-<dd>Open an existing file with an Open dialog.</dd>
-<dt>Recent Files</dt>
-<dd>Open a list of recent files.  Click one to open it.</dd>
-<dt>Open Module?</dt>
-<dd>Open an existing module (searches sys.path).</dd>
+<dt>New File</dt><dd>Create a new file editing window.</dd>
+<dt>Open?</dt><dd>Open an existing file with an Open dialog.</dd>
+<dt>Recent Files</dt><dd>Open a list of recent files.  Click one to open it.</dd>
+<dt>Open Module?</dt><dd>Open an existing module (searches sys.path).</dd>
 </dl>
 <dl class="docutils" id="index-1">
-<dt>Class Browser</dt>
-<dd>Show functions, classes, and methods in the current Editor file in a
+<dt>Class Browser</dt><dd>Show functions, classes, and methods in the current Editor file in a
 tree structure.  In the shell, open a module first.</dd>
-<dt>Path Browser</dt>
-<dd>Show sys.path directories, modules, functions, classes and methods in a
+<dt>Path Browser</dt><dd>Show sys.path directories, modules, functions, classes and methods in a
 tree structure.</dd>
-<dt>Save</dt>
-<dd>Save the current window to the associated file, if there is one.  Windows
+<dt>Save</dt><dd>Save the current window to the associated file, if there is one.  Windows
 that have been changed since being opened or last saved have a * before
 and after the window title.  If there is no associated file,
 do Save As instead.</dd>
-<dt>Save As?</dt>
-<dd>Save the current window with a Save As dialog.  The file saved becomes the
+<dt>Save As?</dt><dd>Save the current window with a Save As dialog.  The file saved becomes the
 new associated file for the window.</dd>
-<dt>Save Copy As?</dt>
-<dd>Save the current window to different file without changing the associated
+<dt>Save Copy As?</dt><dd>Save the current window to different file without changing the associated
 file.</dd>
-<dt>Print Window</dt>
-<dd>Print the current window to the default printer.</dd>
-<dt>Close</dt>
-<dd>Close the current window (ask to save if unsaved).</dd>
-<dt>Exit</dt>
-<dd>Close all windows and quit IDLE (ask to save unsaved windows).</dd>
+<dt>Print Window</dt><dd>Print the current window to the default printer.</dd>
+<dt>Close</dt><dd>Close the current window (ask to save if unsaved).</dd>
+<dt>Exit</dt><dd>Close all windows and quit IDLE (ask to save unsaved windows).</dd>
 </dl>
 </div>
 <div class="section" id="edit-menu-shell-and-editor">
 <h3>Edit menu (Shell and Editor)<a class="headerlink" href="#edit-menu-shell-and-editor" title="Permalink to this headline">?</a></h3>
 <dl class="docutils">
-<dt>Undo</dt>
-<dd>Undo the last change to the current window.  A maximum of 1000 changes may
+<dt>Undo</dt><dd>Undo the last change to the current window.  A maximum of 1000 changes may
 be undone.</dd>
-<dt>Redo</dt>
-<dd>Redo the last undone change to the current window.</dd>
-<dt>Cut</dt>
-<dd>Copy selection into the system-wide clipboard; then delete the selection.</dd>
-<dt>Copy</dt>
-<dd>Copy selection into the system-wide clipboard.</dd>
-<dt>Paste</dt>
-<dd>Insert contents of the system-wide clipboard into the current window.</dd>
+<dt>Redo</dt><dd>Redo the last undone change to the current window.</dd>
+<dt>Cut</dt><dd>Copy selection into the system-wide clipboard; then delete the selection.</dd>
+<dt>Copy</dt><dd>Copy selection into the system-wide clipboard.</dd>
+<dt>Paste</dt><dd>Insert contents of the system-wide clipboard into the current window.</dd>
 </dl>
 <p>The clipboard functions are also available in context menus.</p>
 <dl class="docutils">
-<dt>Select All</dt>
-<dd>Select the entire contents of the current window.</dd>
-<dt>Find?</dt>
-<dd>Open a search dialog with many options</dd>
-<dt>Find Again</dt>
-<dd>Repeat the last search, if there is one.</dd>
-<dt>Find Selection</dt>
-<dd>Search for the currently selected string, if there is one.</dd>
-<dt>Find in Files?</dt>
-<dd>Open a file search dialog.  Put results in a new output window.</dd>
-<dt>Replace?</dt>
-<dd>Open a search-and-replace dialog.</dd>
-<dt>Go to Line</dt>
-<dd>Move cursor to the line number requested and make that line visible.</dd>
-<dt>Show Completions</dt>
-<dd>Open a scrollable list allowing selection of keywords and attributes. See
+<dt>Select All</dt><dd>Select the entire contents of the current window.</dd>
+<dt>Find?</dt><dd>Open a search dialog with many options</dd>
+<dt>Find Again</dt><dd>Repeat the last search, if there is one.</dd>
+<dt>Find Selection</dt><dd>Search for the currently selected string, if there is one.</dd>
+<dt>Find in Files?</dt><dd>Open a file search dialog.  Put results in a new output window.</dd>
+<dt>Replace?</dt><dd>Open a search-and-replace dialog.</dd>
+<dt>Go to Line</dt><dd>Move cursor to the line number requested and make that line visible.</dd>
+<dt>Show Completions</dt><dd>Open a scrollable list allowing selection of keywords and attributes. See
 <a class="reference internal" href="#completions"><span class="std std-ref">Completions</span></a> in the Editing and navigation section below.</dd>
-<dt>Expand Word</dt>
-<dd>Expand a prefix you have typed to match a full word in the same window;
+<dt>Expand Word</dt><dd>Expand a prefix you have typed to match a full word in the same window;
 repeat to get a different expansion.</dd>
-<dt>Show call tip</dt>
-<dd>After an unclosed parenthesis for a function, open a small window with
+<dt>Show call tip</dt><dd>After an unclosed parenthesis for a function, open a small window with
 function parameter hints.  See <a class="reference internal" href="#calltips"><span class="std std-ref">Calltips</span></a> in the
 Editing and navigation section below.</dd>
-<dt>Show surrounding parens</dt>
-<dd>Highlight the surrounding parenthesis.</dd>
+<dt>Show surrounding parens</dt><dd>Highlight the surrounding parenthesis.</dd>
 </dl>
 </div>
 <div class="section" id="format-menu-editor-window-only">
 <span id="format-menu"></span><h3>Format menu (Editor window only)<a class="headerlink" href="#format-menu-editor-window-only" title="Permalink to this headline">?</a></h3>
 <dl class="docutils">
-<dt>Indent Region</dt>
-<dd>Shift selected lines right by the indent width (default 4 spaces).</dd>
-<dt>Dedent Region</dt>
-<dd>Shift selected lines left by the indent width (default 4 spaces).</dd>
-<dt>Comment Out Region</dt>
-<dd>Insert ## in front of selected lines.</dd>
-<dt>Uncomment Region</dt>
-<dd>Remove leading # or ## from selected lines.</dd>
-<dt>Tabify Region</dt>
-<dd>Turn <em>leading</em> stretches of spaces into tabs. (Note: We recommend using
+<dt>Indent Region</dt><dd>Shift selected lines right by the indent width (default 4 spaces).</dd>
+<dt>Dedent Region</dt><dd>Shift selected lines left by the indent width (default 4 spaces).</dd>
+<dt>Comment Out Region</dt><dd>Insert ## in front of selected lines.</dd>
+<dt>Uncomment Region</dt><dd>Remove leading # or ## from selected lines.</dd>
+<dt>Tabify Region</dt><dd>Turn <em>leading</em> stretches of spaces into tabs. (Note: We recommend using
 4 space blocks to indent Python code.)</dd>
-<dt>Untabify Region</dt>
-<dd>Turn <em>all</em> tabs into the correct number of spaces.</dd>
-<dt>Toggle Tabs</dt>
-<dd>Open a dialog to switch between indenting with spaces and tabs.</dd>
-<dt>New Indent Width</dt>
-<dd>Open a dialog to change indent width. The accepted default by the Python
+<dt>Untabify Region</dt><dd>Turn <em>all</em> tabs into the correct number of spaces.</dd>
+<dt>Toggle Tabs</dt><dd>Open a dialog to switch between indenting with spaces and tabs.</dd>
+<dt>New Indent Width</dt><dd>Open a dialog to change indent width. The accepted default by the Python
 community is 4 spaces.</dd>
-<dt>Format Paragraph</dt>
-<dd>Reformat the current blank-line-delimited paragraph in comment block or
+<dt>Format Paragraph</dt><dd>Reformat the current blank-line-delimited paragraph in comment block or
 multiline string or selected line in a string.  All lines in the
 paragraph will be formatted to less than N columns, where N defaults to 72.</dd>
-<dt>Strip trailing whitespace</dt>
-<dd>Remove trailing space and other whitespace characters after the last
+<dt>Strip trailing whitespace</dt><dd>Remove trailing space and other whitespace characters after the last
 non-whitespace character of a line by applying str.rstrip to each line,
 including lines within multiline strings.</dd>
 </dl>
@@ -249,20 +211,17 @@ <h3>Edit menu (Shell and Editor)<a class="headerlink" href="#edit-menu-shell-and
 <div class="section" id="run-menu-editor-window-only">
 <span id="index-2"></span><h3>Run menu (Editor window only)<a class="headerlink" href="#run-menu-editor-window-only" title="Permalink to this headline">?</a></h3>
 <dl class="docutils" id="python-shell">
-<dt>Python Shell</dt>
-<dd>Open or wake up the Python Shell window.</dd>
+<dt>Python Shell</dt><dd>Open or wake up the Python Shell window.</dd>
 </dl>
 <dl class="docutils" id="check-module">
-<dt>Check Module</dt>
-<dd>Check the syntax of the module currently open in the Editor window. If the
+<dt>Check Module</dt><dd>Check the syntax of the module currently open in the Editor window. If the
 module has not been saved IDLE will either prompt the user to save or
 autosave, as selected in the General tab of the Idle Settings dialog.  If
 there is a syntax error, the approximate location is indicated in the
 Editor window.</dd>
 </dl>
 <dl class="docutils" id="run-module">
-<dt>Run Module</dt>
-<dd>Do <a class="reference internal" href="#check-module"><span class="std std-ref">Check Module</span></a>.  If no error, restart the shell to clean the
+<dt>Run Module</dt><dd>Do <a class="reference internal" href="#check-module"><span class="std std-ref">Check Module</span></a>.  If no error, restart the shell to clean the
 environment, then execute the module.  Output is displayed in the Shell
 window.  Note that output requires use of <code class="docutils literal notranslate"><span class="pre">print</span></code> or <code class="docutils literal notranslate"><span class="pre">write</span></code>.
 When execution is complete, the Shell retains focus and displays a prompt.
@@ -271,8 +230,7 @@ <h3>Edit menu (Shell and Editor)<a class="headerlink" href="#edit-menu-shell-and
 line.</dd>
 </dl>
 <dl class="docutils" id="run-custom">
-<dt>Run? Customized</dt>
-<dd>Same as <a class="reference internal" href="#run-module"><span class="std std-ref">Run Module</span></a>, but run the module with customized
+<dt>Run? Customized</dt><dd>Same as <a class="reference internal" href="#run-module"><span class="std std-ref">Run Module</span></a>, but run the module with customized
 settings.  <em>Command Line Arguments</em> extend <a class="reference internal" href="sys.html#sys.argv" title="sys.argv"><code class="xref py py-data docutils literal notranslate"><span class="pre">sys.argv</span></code></a> as if passed
 on a command line. The module can be run in the Shell without restarting.</dd>
 </dl>
@@ -280,56 +238,44 @@ <h3>Edit menu (Shell and Editor)<a class="headerlink" href="#edit-menu-shell-and
 <div class="section" id="shell-menu-shell-window-only">
 <h3>Shell menu (Shell window only)<a class="headerlink" href="#shell-menu-shell-window-only" title="Permalink to this headline">?</a></h3>
 <dl class="docutils">
-<dt>View Last Restart</dt>
-<dd>Scroll the shell window to the last Shell restart.</dd>
-<dt>Restart Shell</dt>
-<dd>Restart the shell to clean the environment.</dd>
-<dt>Previous History</dt>
-<dd>Cycle through earlier commands in history which match the current entry.</dd>
-<dt>Next History</dt>
-<dd>Cycle through later commands in history which match the current entry.</dd>
-<dt>Interrupt Execution</dt>
-<dd>Stop a running program.</dd>
+<dt>View Last Restart</dt><dd>Scroll the shell window to the last Shell restart.</dd>
+<dt>Restart Shell</dt><dd>Restart the shell to clean the environment.</dd>
+<dt>Previous History</dt><dd>Cycle through earlier commands in history which match the current entry.</dd>
+<dt>Next History</dt><dd>Cycle through later commands in history which match the current entry.</dd>
+<dt>Interrupt Execution</dt><dd>Stop a running program.</dd>
 </dl>
 </div>
 <div class="section" id="debug-menu-shell-window-only">
 <h3>Debug menu (Shell window only)<a class="headerlink" href="#debug-menu-shell-window-only" title="Permalink to this headline">?</a></h3>
 <dl class="docutils">
-<dt>Go to File/Line</dt>
-<dd>Look on the current line. with the cursor, and the line above for a filename
+<dt>Go to File/Line</dt><dd>Look on the current line. with the cursor, and the line above for a filename
 and line number.  If found, open the file if not already open, and show the
 line.  Use this to view source lines referenced in an exception traceback
 and lines found by Find in Files. Also available in the context menu of
 the Shell window and Output windows.</dd>
 </dl>
 <dl class="docutils" id="index-3">
-<dt>Debugger (toggle)</dt>
-<dd>When activated, code entered in the Shell or run from an Editor will run
+<dt>Debugger (toggle)</dt><dd>When activated, code entered in the Shell or run from an Editor will run
 under the debugger.  In the Editor, breakpoints can be set with the context
 menu.  This feature is still incomplete and somewhat experimental.</dd>
-<dt>Stack Viewer</dt>
-<dd>Show the stack traceback of the last exception in a tree widget, with
+<dt>Stack Viewer</dt><dd>Show the stack traceback of the last exception in a tree widget, with
 access to locals and globals.</dd>
-<dt>Auto-open Stack Viewer</dt>
-<dd>Toggle automatically opening the stack viewer on an unhandled exception.</dd>
+<dt>Auto-open Stack Viewer</dt><dd>Toggle automatically opening the stack viewer on an unhandled exception.</dd>
 </dl>
 </div>
 <div class="section" id="options-menu-shell-and-editor">
 <h3>Options menu (Shell and Editor)<a class="headerlink" href="#options-menu-shell-and-editor" title="Permalink to this headline">?</a></h3>
 <dl class="docutils">
-<dt>Configure IDLE</dt>
-<dd>Open a configuration dialog and change preferences for the following:
+<dt>Configure IDLE</dt><dd>Open a configuration dialog and change preferences for the following:
 fonts, indentation, keybindings, text color themes, startup windows and
 size, additional help sources, and extensions.  On macOS,  open the
 configuration dialog by selecting Preferences in the application
 menu. For more, see
 <a class="reference internal" href="#preferences"><span class="std std-ref">Setting preferences</span></a> under Help and preferences.</dd>
-<dt>Show/Hide Code Context (Editor Window only)</dt>
-<dd>Open a pane at the top of the edit window which shows the block context
+<dt>Show/Hide Code Context (Editor Window only)</dt><dd>Open a pane at the top of the edit window which shows the block context
 of the code which has scrolled above the top of the window.  See
 <a class="reference internal" href="#code-context"><span class="std std-ref">Code Context</span></a> in the Editing and Navigation section below.</dd>
-<dt>Zoom/Restore Height</dt>
-<dd>Toggles the window between normal size and maximum height. The initial size
+<dt>Zoom/Restore Height</dt><dd>Toggles the window between normal size and maximum height. The initial size
 defaults to 40 lines by 80 chars unless changed on the General tab of the
 Configure IDLE dialog.  The maximum height for a screen is determined by
 momentarily maximizing a window the first time one is zoomed on the screen.
@@ -345,16 +291,12 @@ <h3>Window menu (Shell and Editor)<a class="headerlink" href="#window-menu-shell
 <div class="section" id="help-menu-shell-and-editor">
 <h3>Help menu (Shell and Editor)<a class="headerlink" href="#help-menu-shell-and-editor" title="Permalink to this headline">?</a></h3>
 <dl class="docutils">
-<dt>About IDLE</dt>
-<dd>Display version, copyright, license, credits, and more.</dd>
-<dt>IDLE Help</dt>
-<dd>Display this IDLE document, detailing the menu options, basic editing and
+<dt>About IDLE</dt><dd>Display version, copyright, license, credits, and more.</dd>
+<dt>IDLE Help</dt><dd>Display this IDLE document, detailing the menu options, basic editing and
 navigation, and other tips.</dd>
-<dt>Python Docs</dt>
-<dd>Access local Python documentation, if installed, or start a web browser
+<dt>Python Docs</dt><dd>Access local Python documentation, if installed, or start a web browser
 and open docs.python.org showing the latest Python documentation.</dd>
-<dt>Turtle Demo</dt>
-<dd>Run the turtledemo module with example Python code and turtle drawings.</dd>
+<dt>Turtle Demo</dt><dd>Run the turtledemo module with example Python code and turtle drawings.</dd>
 </dl>
 <p>Additional help sources may be added here with the Configure IDLE dialog under
 the General tab. See the <a class="reference internal" href="#help-sources"><span class="std std-ref">Help sources</span></a> subsection below
@@ -365,32 +307,25 @@ <h3>Help menu (Shell and Editor)<a class="headerlink" href="#help-menu-shell-and
 <p>Open a context menu by right-clicking in a window (Control-click on macOS).
 Context menus have the standard clipboard functions also on the Edit menu.</p>
 <dl class="docutils">
-<dt>Cut</dt>
-<dd>Copy selection into the system-wide clipboard; then delete the selection.</dd>
-<dt>Copy</dt>
-<dd>Copy selection into the system-wide clipboard.</dd>
-<dt>Paste</dt>
-<dd>Insert contents of the system-wide clipboard into the current window.</dd>
+<dt>Cut</dt><dd>Copy selection into the system-wide clipboard; then delete the selection.</dd>
+<dt>Copy</dt><dd>Copy selection into the system-wide clipboard.</dd>
+<dt>Paste</dt><dd>Insert contents of the system-wide clipboard into the current window.</dd>
 </dl>
 <p>Editor windows also have breakpoint functions.  Lines with a breakpoint set are
 specially marked.  Breakpoints only have an effect when running under the
 debugger.  Breakpoints for a file are saved in the user?s .idlerc directory.</p>
 <dl class="docutils">
-<dt>Set Breakpoint</dt>
-<dd>Set a breakpoint on the current line.</dd>
-<dt>Clear Breakpoint</dt>
-<dd>Clear the breakpoint on that line.</dd>
+<dt>Set Breakpoint</dt><dd>Set a breakpoint on the current line.</dd>
+<dt>Clear Breakpoint</dt><dd>Clear the breakpoint on that line.</dd>
 </dl>
 <p>Shell and Output windows also have the following.</p>
 <dl class="docutils">
-<dt>Go to file/line</dt>
-<dd>Same as in Debug menu.</dd>
+<dt>Go to file/line</dt><dd>Same as in Debug menu.</dd>
 </dl>
 <p>The Shell window also has an output squeezing facility explained in the <em>Python
 Shell window</em> subsection below.</p>
 <dl class="docutils">
-<dt>Squeeze</dt>
-<dd>If the cursor is over an output line, squeeze all the output between
+<dt>Squeeze</dt><dd>If the cursor is over an output line, squeeze all the output between
 the code above and the prompt below down to a ?Squeezed text? label.</dd>
 </dl>
 </div>
@@ -670,6 +605,9 @@ <h3>Running user code<a class="headerlink" href="#running-user-code" title="Perm
 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
 will then be attached to that window for input and output.</p>
+<p>The IDLE code running in the execution process adds frames to the call stack
+that would not be there otherwise.  IDLE wraps <code class="docutils literal notranslate"><span class="pre">sys.getrecursionlimit</span></code> and
+<code class="docutils literal notranslate"><span class="pre">sys.setrecursionlimit</span></code> to reduce their visibility.</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
 will not work correctly.</p>
@@ -772,7 +710,7 @@ <h3>Running without a subprocess<a class="headerlink" href="#running-without-a-s
 are to take effect.  For these reasons, it is preferable to run IDLE
 with the default subprocess if at all possible.</p>
 <div class="deprecated">
-<p><span class="versionmodified">Deprecated since version 3.4.</span></p>
+<p><span class="versionmodified deprecated">Deprecated since version 3.4.</span></p>
 </div>
 </div>
 </div>
@@ -885,7 +823,7 @@ <h3><a href="../contents.html">Table of Contents</a></h3>
 
   <h4>Previous topic</h4>
   <p class="topless"><a href="tkinter.scrolledtext.html"
-                        title="previous chapter"><code class="docutils literal notranslate"><span class="pre">tkinter.scrolledtext</span></code> ? Scrolled Text Widget</a></p>
+                        title="previous chapter"><code class="xref py py-mod docutils literal notranslate"><span class="pre">tkinter.scrolledtext</span></code> ? Scrolled Text Widget</a></p>
   <h4>Next topic</h4>
   <p class="topless"><a href="othergui.html"
                         title="next chapter">Other Graphical User Interface Packages</a></p>
@@ -957,11 +895,11 @@ <h3>Navigation</h3>
 <br />
     <br />
 
-    Last updated on Jun 17, 2019.
+    Last updated on Jul 04, 2019.
     <a href="https://docs.python.org/3/bugs.html">Found a bug</a>?
     <br />
 
-    Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.8.1.
+    Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 2.1.1.
     </div>
 
   </body>
diff --git a/Lib/idlelib/idle_test/test_run.py b/Lib/idlelib/idle_test/test_run.py
index 46f0235fbfdc..d0f1e9207bb1 100644
--- a/Lib/idlelib/idle_test/test_run.py
+++ b/Lib/idlelib/idle_test/test_run.py
@@ -6,6 +6,8 @@
 from test.support import captured_stderr
 
 import io
+import sys
+
 
 class RunTest(unittest.TestCase):
 
@@ -260,5 +262,36 @@ def test_close(self):
         self.assertRaises(TypeError, f.close, 1)
 
 
+class TestSysRecursionLimitWrappers(unittest.TestCase):
+
+    def test_bad_setrecursionlimit_calls(self):
+        run.install_recursionlimit_wrappers()
+        self.addCleanup(run.uninstall_recursionlimit_wrappers)
+        f = sys.setrecursionlimit
+        self.assertRaises(TypeError, f, limit=100)
+        self.assertRaises(TypeError, f, 100, 1000)
+        self.assertRaises(ValueError, f, 0)
+
+    def test_roundtrip(self):
+        run.install_recursionlimit_wrappers()
+        self.addCleanup(run.uninstall_recursionlimit_wrappers)
+
+        # check that setting the recursion limit works
+        orig_reclimit = sys.getrecursionlimit()
+        self.addCleanup(sys.setrecursionlimit, orig_reclimit)
+        sys.setrecursionlimit(orig_reclimit + 3)
+
+        # check that the new limit is returned by sys.getrecursionlimit()
+        new_reclimit = sys.getrecursionlimit()
+        self.assertEqual(new_reclimit, orig_reclimit + 3)
+
+    def test_default_recursion_limit_preserved(self):
+        orig_reclimit = sys.getrecursionlimit()
+        run.install_recursionlimit_wrappers()
+        self.addCleanup(run.uninstall_recursionlimit_wrappers)
+        new_reclimit = sys.getrecursionlimit()
+        self.assertEqual(new_reclimit, orig_reclimit)
+
+
 if __name__ == '__main__':
     unittest.main(verbosity=2)
diff --git a/Lib/idlelib/run.py b/Lib/idlelib/run.py
index 6b3928b7bf2b..c6ed76b23a2d 100644
--- a/Lib/idlelib/run.py
+++ b/Lib/idlelib/run.py
@@ -4,10 +4,12 @@
 f'''{sys.executable} -c "__import__('idlelib.run').run.main()"'''
 '.run' is needed because __import__ returns idlelib, not idlelib.run.
 """
+import functools
 import io
 import linecache
 import queue
 import sys
+import textwrap
 import time
 import traceback
 import _thread as thread
@@ -305,6 +307,64 @@ def fix_scaling(root):
                 font['size'] = round(-0.75*size)
 
 
+RECURSIONLIMIT_DELTA = 30
+def install_recursionlimit_wrappers():
+    """Install wrappers to always add 30 to the recursion limit."""
+    # see: bpo-26806
+
+    @functools.wraps(sys.setrecursionlimit)
+    def setrecursionlimit(*args, **kwargs):
+        # mimic the original sys.setrecursionlimit()'s input handling
+        if kwargs:
+            raise TypeError(
+                "setrecursionlimit() takes no keyword arguments")
+        try:
+            limit, = args
+        except ValueError:
+            raise TypeError(f"setrecursionlimit() takes exactly one "
+                            f"argument ({len(args)} given)")
+        if not limit > 0:
+            raise ValueError(
+                "recursion limit must be greater or equal than 1")
+
+        return setrecursionlimit.__wrapped__(limit + RECURSIONLIMIT_DELTA)
+
+    setrecursionlimit.__doc__ += "\n\n" + textwrap.fill(textwrap.dedent(f"""\
+        This IDLE wrapper adds {RECURSIONLIMIT_DELTA} to prevent possible
+        uninterruptible loops.
+        """).strip())
+
+    @functools.wraps(sys.getrecursionlimit)
+    def getrecursionlimit():
+        return getrecursionlimit.__wrapped__() - RECURSIONLIMIT_DELTA
+
+    getrecursionlimit.__doc__ += "\n\n" + textwrap.fill(textwrap.dedent(f"""\
+        This IDLE wrapper subtracts {RECURSIONLIMIT_DELTA} to compensate for
+        the {RECURSIONLIMIT_DELTA} IDLE adds when setting the limit.
+        """).strip())
+
+    # add the delta to the default recursion limit, to compensate
+    sys.setrecursionlimit(sys.getrecursionlimit() + RECURSIONLIMIT_DELTA)
+
+    sys.setrecursionlimit = setrecursionlimit
+    sys.getrecursionlimit = getrecursionlimit
+
+
+def uninstall_recursionlimit_wrappers():
+    """Uninstall the recursion limit wrappers from the sys module.
+
+    IDLE only uses this for tests. Users can import run and call
+    this to remove the wrapping.
+    """
+    if (
+            getattr(sys.setrecursionlimit, '__wrapped__', None) and
+            getattr(sys.getrecursionlimit, '__wrapped__', None)
+    ):
+        sys.setrecursionlimit = sys.setrecursionlimit.__wrapped__
+        sys.getrecursionlimit = sys.getrecursionlimit.__wrapped__
+        sys.setrecursionlimit(sys.getrecursionlimit() - RECURSIONLIMIT_DELTA)
+
+
 class MyRPCServer(rpc.RPCServer):
 
     def handle_error(self, request, client_address):
@@ -448,6 +508,8 @@ def handle(self):
         # sys.stdin gets changed from within IDLE's shell. See issue17838.
         self._keep_stdin = sys.stdin
 
+        install_recursionlimit_wrappers()
+
         self.interp = self.get_remote_proxy("interp")
         rpc.RPCHandler.getresponse(self, myseq=None, wait=0.05)
 
diff --git a/Misc/NEWS.d/next/IDLE/2019-06-10-22-48-50.bpo-26806.Zltkum.rst b/Misc/NEWS.d/next/IDLE/2019-06-10-22-48-50.bpo-26806.Zltkum.rst
new file mode 100644
index 000000000000..8514bb9292fe
--- /dev/null
+++ b/Misc/NEWS.d/next/IDLE/2019-06-10-22-48-50.bpo-26806.Zltkum.rst
@@ -0,0 +1,4 @@
+To compensate for stack frames added by IDLE and avoid possible problems
+with low recursion limits, add 30 to limits in the user code execution
+process.  Subtract 30 when reporting recursion limits to make this addition
+mostly transparent.


From webhook-mailer at python.org  Sat Jul  6 08:54:21 2019
From: webhook-mailer at python.org (Miss Islington (bot))
Date: Sat, 06 Jul 2019 12:54:21 -0000
Subject: [Python-checkins] bpo-26806: add 30 to the recursion limit in
 IDLE's shell (GH-13944)
Message-ID: <mailman.269.1562417662.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/d4af55391f56286ab8d478591017174a5a0a5ce2
commit: d4af55391f56286ab8d478591017174a5a0a5ce2
branch: 3.8
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: GitHub <noreply at github.com>
date: 2019-07-06T05:54:17-07:00
summary:

bpo-26806: add 30 to the recursion limit in IDLE's shell (GH-13944)


This is done to compensate for the extra stack frames added by
IDLE itself, which cause problems when setting the recursion limit
to low values.

This wraps sys.setrecursionlimit() and sys.getrecursionlimit()
as invisibly as possible.
(cherry picked from commit fcf1d003bf4f0100c9d0921ff3d70e1127ca1b71)

Co-authored-by: Tal Einat <taleinat+github at gmail.com>

files:
A Misc/NEWS.d/next/IDLE/2019-06-10-22-48-50.bpo-26806.Zltkum.rst
M Doc/library/idle.rst
M Lib/idlelib/NEWS.txt
M Lib/idlelib/help.html
M Lib/idlelib/idle_test/test_run.py
M Lib/idlelib/run.py

diff --git a/Doc/library/idle.rst b/Doc/library/idle.rst
index fb886a714d74..de58f266bf5e 100644
--- a/Doc/library/idle.rst
+++ b/Doc/library/idle.rst
@@ -713,6 +713,10 @@ or ``print`` or ``write`` to sys.stdout or sys.stderr,
 IDLE should be started in a command line window.  The secondary subprocess
 will then be attached to that window for input and output.
 
+The IDLE code running in the execution process adds frames to the call stack
+that would not be there otherwise.  IDLE wraps ``sys.getrecursionlimit`` and
+``sys.setrecursionlimit`` to reduce the effect of the additional stack frames.
+
 If ``sys`` is reset by user code, such as with ``importlib.reload(sys)``,
 IDLE's changes are lost and input from the keyboard and output to the screen
 will not work correctly.
diff --git a/Lib/idlelib/NEWS.txt b/Lib/idlelib/NEWS.txt
index 689539e73c12..5d4a936d63f5 100644
--- a/Lib/idlelib/NEWS.txt
+++ b/Lib/idlelib/NEWS.txt
@@ -3,6 +3,11 @@ Released on 2019-10-20?
 ======================================
 
 
+bpo-26806: To compensate for stack frames added by IDLE and avoid
+possible problems with low recursion limits, add 30 to limits in the
+user code execution process.  Subtract 30 when reporting recursion
+limits to make this addition mostly transparent.
+
 bpo-37325: Fix tab focus traversal order for help source and custom
 run dialogs.
 
diff --git a/Lib/idlelib/help.html b/Lib/idlelib/help.html
index 91803fd06c8f..cee6887df68f 100644
--- a/Lib/idlelib/help.html
+++ b/Lib/idlelib/help.html
@@ -14,7 +14,7 @@
     <script type="text/javascript" src="../_static/jquery.js"></script>
     <script type="text/javascript" src="../_static/underscore.js"></script>
     <script type="text/javascript" src="../_static/doctools.js"></script>
-    <script async="async" type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.1/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script>
+    <script type="text/javascript" src="../_static/language_data.js"></script>
 
     <script type="text/javascript" src="../_static/sidebar.js"></script>
 
@@ -135,113 +135,75 @@ <h2>Menus<a class="headerlink" href="#menus" title="Permalink to this headline">
 <div class="section" id="file-menu-shell-and-editor">
 <h3>File menu (Shell and Editor)<a class="headerlink" href="#file-menu-shell-and-editor" title="Permalink to this headline">?</a></h3>
 <dl class="docutils">
-<dt>New File</dt>
-<dd>Create a new file editing window.</dd>
-<dt>Open?</dt>
-<dd>Open an existing file with an Open dialog.</dd>
-<dt>Recent Files</dt>
-<dd>Open a list of recent files.  Click one to open it.</dd>
-<dt>Open Module?</dt>
-<dd>Open an existing module (searches sys.path).</dd>
+<dt>New File</dt><dd>Create a new file editing window.</dd>
+<dt>Open?</dt><dd>Open an existing file with an Open dialog.</dd>
+<dt>Recent Files</dt><dd>Open a list of recent files.  Click one to open it.</dd>
+<dt>Open Module?</dt><dd>Open an existing module (searches sys.path).</dd>
 </dl>
 <dl class="docutils" id="index-1">
-<dt>Class Browser</dt>
-<dd>Show functions, classes, and methods in the current Editor file in a
+<dt>Class Browser</dt><dd>Show functions, classes, and methods in the current Editor file in a
 tree structure.  In the shell, open a module first.</dd>
-<dt>Path Browser</dt>
-<dd>Show sys.path directories, modules, functions, classes and methods in a
+<dt>Path Browser</dt><dd>Show sys.path directories, modules, functions, classes and methods in a
 tree structure.</dd>
-<dt>Save</dt>
-<dd>Save the current window to the associated file, if there is one.  Windows
+<dt>Save</dt><dd>Save the current window to the associated file, if there is one.  Windows
 that have been changed since being opened or last saved have a * before
 and after the window title.  If there is no associated file,
 do Save As instead.</dd>
-<dt>Save As?</dt>
-<dd>Save the current window with a Save As dialog.  The file saved becomes the
+<dt>Save As?</dt><dd>Save the current window with a Save As dialog.  The file saved becomes the
 new associated file for the window.</dd>
-<dt>Save Copy As?</dt>
-<dd>Save the current window to different file without changing the associated
+<dt>Save Copy As?</dt><dd>Save the current window to different file without changing the associated
 file.</dd>
-<dt>Print Window</dt>
-<dd>Print the current window to the default printer.</dd>
-<dt>Close</dt>
-<dd>Close the current window (ask to save if unsaved).</dd>
-<dt>Exit</dt>
-<dd>Close all windows and quit IDLE (ask to save unsaved windows).</dd>
+<dt>Print Window</dt><dd>Print the current window to the default printer.</dd>
+<dt>Close</dt><dd>Close the current window (ask to save if unsaved).</dd>
+<dt>Exit</dt><dd>Close all windows and quit IDLE (ask to save unsaved windows).</dd>
 </dl>
 </div>
 <div class="section" id="edit-menu-shell-and-editor">
 <h3>Edit menu (Shell and Editor)<a class="headerlink" href="#edit-menu-shell-and-editor" title="Permalink to this headline">?</a></h3>
 <dl class="docutils">
-<dt>Undo</dt>
-<dd>Undo the last change to the current window.  A maximum of 1000 changes may
+<dt>Undo</dt><dd>Undo the last change to the current window.  A maximum of 1000 changes may
 be undone.</dd>
-<dt>Redo</dt>
-<dd>Redo the last undone change to the current window.</dd>
-<dt>Cut</dt>
-<dd>Copy selection into the system-wide clipboard; then delete the selection.</dd>
-<dt>Copy</dt>
-<dd>Copy selection into the system-wide clipboard.</dd>
-<dt>Paste</dt>
-<dd>Insert contents of the system-wide clipboard into the current window.</dd>
+<dt>Redo</dt><dd>Redo the last undone change to the current window.</dd>
+<dt>Cut</dt><dd>Copy selection into the system-wide clipboard; then delete the selection.</dd>
+<dt>Copy</dt><dd>Copy selection into the system-wide clipboard.</dd>
+<dt>Paste</dt><dd>Insert contents of the system-wide clipboard into the current window.</dd>
 </dl>
 <p>The clipboard functions are also available in context menus.</p>
 <dl class="docutils">
-<dt>Select All</dt>
-<dd>Select the entire contents of the current window.</dd>
-<dt>Find?</dt>
-<dd>Open a search dialog with many options</dd>
-<dt>Find Again</dt>
-<dd>Repeat the last search, if there is one.</dd>
-<dt>Find Selection</dt>
-<dd>Search for the currently selected string, if there is one.</dd>
-<dt>Find in Files?</dt>
-<dd>Open a file search dialog.  Put results in a new output window.</dd>
-<dt>Replace?</dt>
-<dd>Open a search-and-replace dialog.</dd>
-<dt>Go to Line</dt>
-<dd>Move cursor to the line number requested and make that line visible.</dd>
-<dt>Show Completions</dt>
-<dd>Open a scrollable list allowing selection of keywords and attributes. See
+<dt>Select All</dt><dd>Select the entire contents of the current window.</dd>
+<dt>Find?</dt><dd>Open a search dialog with many options</dd>
+<dt>Find Again</dt><dd>Repeat the last search, if there is one.</dd>
+<dt>Find Selection</dt><dd>Search for the currently selected string, if there is one.</dd>
+<dt>Find in Files?</dt><dd>Open a file search dialog.  Put results in a new output window.</dd>
+<dt>Replace?</dt><dd>Open a search-and-replace dialog.</dd>
+<dt>Go to Line</dt><dd>Move cursor to the line number requested and make that line visible.</dd>
+<dt>Show Completions</dt><dd>Open a scrollable list allowing selection of keywords and attributes. See
 <a class="reference internal" href="#completions"><span class="std std-ref">Completions</span></a> in the Editing and navigation section below.</dd>
-<dt>Expand Word</dt>
-<dd>Expand a prefix you have typed to match a full word in the same window;
+<dt>Expand Word</dt><dd>Expand a prefix you have typed to match a full word in the same window;
 repeat to get a different expansion.</dd>
-<dt>Show call tip</dt>
-<dd>After an unclosed parenthesis for a function, open a small window with
+<dt>Show call tip</dt><dd>After an unclosed parenthesis for a function, open a small window with
 function parameter hints.  See <a class="reference internal" href="#calltips"><span class="std std-ref">Calltips</span></a> in the
 Editing and navigation section below.</dd>
-<dt>Show surrounding parens</dt>
-<dd>Highlight the surrounding parenthesis.</dd>
+<dt>Show surrounding parens</dt><dd>Highlight the surrounding parenthesis.</dd>
 </dl>
 </div>
 <div class="section" id="format-menu-editor-window-only">
 <span id="format-menu"></span><h3>Format menu (Editor window only)<a class="headerlink" href="#format-menu-editor-window-only" title="Permalink to this headline">?</a></h3>
 <dl class="docutils">
-<dt>Indent Region</dt>
-<dd>Shift selected lines right by the indent width (default 4 spaces).</dd>
-<dt>Dedent Region</dt>
-<dd>Shift selected lines left by the indent width (default 4 spaces).</dd>
-<dt>Comment Out Region</dt>
-<dd>Insert ## in front of selected lines.</dd>
-<dt>Uncomment Region</dt>
-<dd>Remove leading # or ## from selected lines.</dd>
-<dt>Tabify Region</dt>
-<dd>Turn <em>leading</em> stretches of spaces into tabs. (Note: We recommend using
+<dt>Indent Region</dt><dd>Shift selected lines right by the indent width (default 4 spaces).</dd>
+<dt>Dedent Region</dt><dd>Shift selected lines left by the indent width (default 4 spaces).</dd>
+<dt>Comment Out Region</dt><dd>Insert ## in front of selected lines.</dd>
+<dt>Uncomment Region</dt><dd>Remove leading # or ## from selected lines.</dd>
+<dt>Tabify Region</dt><dd>Turn <em>leading</em> stretches of spaces into tabs. (Note: We recommend using
 4 space blocks to indent Python code.)</dd>
-<dt>Untabify Region</dt>
-<dd>Turn <em>all</em> tabs into the correct number of spaces.</dd>
-<dt>Toggle Tabs</dt>
-<dd>Open a dialog to switch between indenting with spaces and tabs.</dd>
-<dt>New Indent Width</dt>
-<dd>Open a dialog to change indent width. The accepted default by the Python
+<dt>Untabify Region</dt><dd>Turn <em>all</em> tabs into the correct number of spaces.</dd>
+<dt>Toggle Tabs</dt><dd>Open a dialog to switch between indenting with spaces and tabs.</dd>
+<dt>New Indent Width</dt><dd>Open a dialog to change indent width. The accepted default by the Python
 community is 4 spaces.</dd>
-<dt>Format Paragraph</dt>
-<dd>Reformat the current blank-line-delimited paragraph in comment block or
+<dt>Format Paragraph</dt><dd>Reformat the current blank-line-delimited paragraph in comment block or
 multiline string or selected line in a string.  All lines in the
 paragraph will be formatted to less than N columns, where N defaults to 72.</dd>
-<dt>Strip trailing whitespace</dt>
-<dd>Remove trailing space and other whitespace characters after the last
+<dt>Strip trailing whitespace</dt><dd>Remove trailing space and other whitespace characters after the last
 non-whitespace character of a line by applying str.rstrip to each line,
 including lines within multiline strings.</dd>
 </dl>
@@ -249,20 +211,17 @@ <h3>Edit menu (Shell and Editor)<a class="headerlink" href="#edit-menu-shell-and
 <div class="section" id="run-menu-editor-window-only">
 <span id="index-2"></span><h3>Run menu (Editor window only)<a class="headerlink" href="#run-menu-editor-window-only" title="Permalink to this headline">?</a></h3>
 <dl class="docutils" id="python-shell">
-<dt>Python Shell</dt>
-<dd>Open or wake up the Python Shell window.</dd>
+<dt>Python Shell</dt><dd>Open or wake up the Python Shell window.</dd>
 </dl>
 <dl class="docutils" id="check-module">
-<dt>Check Module</dt>
-<dd>Check the syntax of the module currently open in the Editor window. If the
+<dt>Check Module</dt><dd>Check the syntax of the module currently open in the Editor window. If the
 module has not been saved IDLE will either prompt the user to save or
 autosave, as selected in the General tab of the Idle Settings dialog.  If
 there is a syntax error, the approximate location is indicated in the
 Editor window.</dd>
 </dl>
 <dl class="docutils" id="run-module">
-<dt>Run Module</dt>
-<dd>Do <a class="reference internal" href="#check-module"><span class="std std-ref">Check Module</span></a>.  If no error, restart the shell to clean the
+<dt>Run Module</dt><dd>Do <a class="reference internal" href="#check-module"><span class="std std-ref">Check Module</span></a>.  If no error, restart the shell to clean the
 environment, then execute the module.  Output is displayed in the Shell
 window.  Note that output requires use of <code class="docutils literal notranslate"><span class="pre">print</span></code> or <code class="docutils literal notranslate"><span class="pre">write</span></code>.
 When execution is complete, the Shell retains focus and displays a prompt.
@@ -271,8 +230,7 @@ <h3>Edit menu (Shell and Editor)<a class="headerlink" href="#edit-menu-shell-and
 line.</dd>
 </dl>
 <dl class="docutils" id="run-custom">
-<dt>Run? Customized</dt>
-<dd>Same as <a class="reference internal" href="#run-module"><span class="std std-ref">Run Module</span></a>, but run the module with customized
+<dt>Run? Customized</dt><dd>Same as <a class="reference internal" href="#run-module"><span class="std std-ref">Run Module</span></a>, but run the module with customized
 settings.  <em>Command Line Arguments</em> extend <a class="reference internal" href="sys.html#sys.argv" title="sys.argv"><code class="xref py py-data docutils literal notranslate"><span class="pre">sys.argv</span></code></a> as if passed
 on a command line. The module can be run in the Shell without restarting.</dd>
 </dl>
@@ -280,56 +238,44 @@ <h3>Edit menu (Shell and Editor)<a class="headerlink" href="#edit-menu-shell-and
 <div class="section" id="shell-menu-shell-window-only">
 <h3>Shell menu (Shell window only)<a class="headerlink" href="#shell-menu-shell-window-only" title="Permalink to this headline">?</a></h3>
 <dl class="docutils">
-<dt>View Last Restart</dt>
-<dd>Scroll the shell window to the last Shell restart.</dd>
-<dt>Restart Shell</dt>
-<dd>Restart the shell to clean the environment.</dd>
-<dt>Previous History</dt>
-<dd>Cycle through earlier commands in history which match the current entry.</dd>
-<dt>Next History</dt>
-<dd>Cycle through later commands in history which match the current entry.</dd>
-<dt>Interrupt Execution</dt>
-<dd>Stop a running program.</dd>
+<dt>View Last Restart</dt><dd>Scroll the shell window to the last Shell restart.</dd>
+<dt>Restart Shell</dt><dd>Restart the shell to clean the environment.</dd>
+<dt>Previous History</dt><dd>Cycle through earlier commands in history which match the current entry.</dd>
+<dt>Next History</dt><dd>Cycle through later commands in history which match the current entry.</dd>
+<dt>Interrupt Execution</dt><dd>Stop a running program.</dd>
 </dl>
 </div>
 <div class="section" id="debug-menu-shell-window-only">
 <h3>Debug menu (Shell window only)<a class="headerlink" href="#debug-menu-shell-window-only" title="Permalink to this headline">?</a></h3>
 <dl class="docutils">
-<dt>Go to File/Line</dt>
-<dd>Look on the current line. with the cursor, and the line above for a filename
+<dt>Go to File/Line</dt><dd>Look on the current line. with the cursor, and the line above for a filename
 and line number.  If found, open the file if not already open, and show the
 line.  Use this to view source lines referenced in an exception traceback
 and lines found by Find in Files. Also available in the context menu of
 the Shell window and Output windows.</dd>
 </dl>
 <dl class="docutils" id="index-3">
-<dt>Debugger (toggle)</dt>
-<dd>When activated, code entered in the Shell or run from an Editor will run
+<dt>Debugger (toggle)</dt><dd>When activated, code entered in the Shell or run from an Editor will run
 under the debugger.  In the Editor, breakpoints can be set with the context
 menu.  This feature is still incomplete and somewhat experimental.</dd>
-<dt>Stack Viewer</dt>
-<dd>Show the stack traceback of the last exception in a tree widget, with
+<dt>Stack Viewer</dt><dd>Show the stack traceback of the last exception in a tree widget, with
 access to locals and globals.</dd>
-<dt>Auto-open Stack Viewer</dt>
-<dd>Toggle automatically opening the stack viewer on an unhandled exception.</dd>
+<dt>Auto-open Stack Viewer</dt><dd>Toggle automatically opening the stack viewer on an unhandled exception.</dd>
 </dl>
 </div>
 <div class="section" id="options-menu-shell-and-editor">
 <h3>Options menu (Shell and Editor)<a class="headerlink" href="#options-menu-shell-and-editor" title="Permalink to this headline">?</a></h3>
 <dl class="docutils">
-<dt>Configure IDLE</dt>
-<dd>Open a configuration dialog and change preferences for the following:
+<dt>Configure IDLE</dt><dd>Open a configuration dialog and change preferences for the following:
 fonts, indentation, keybindings, text color themes, startup windows and
 size, additional help sources, and extensions.  On macOS,  open the
 configuration dialog by selecting Preferences in the application
 menu. For more, see
 <a class="reference internal" href="#preferences"><span class="std std-ref">Setting preferences</span></a> under Help and preferences.</dd>
-<dt>Show/Hide Code Context (Editor Window only)</dt>
-<dd>Open a pane at the top of the edit window which shows the block context
+<dt>Show/Hide Code Context (Editor Window only)</dt><dd>Open a pane at the top of the edit window which shows the block context
 of the code which has scrolled above the top of the window.  See
 <a class="reference internal" href="#code-context"><span class="std std-ref">Code Context</span></a> in the Editing and Navigation section below.</dd>
-<dt>Zoom/Restore Height</dt>
-<dd>Toggles the window between normal size and maximum height. The initial size
+<dt>Zoom/Restore Height</dt><dd>Toggles the window between normal size and maximum height. The initial size
 defaults to 40 lines by 80 chars unless changed on the General tab of the
 Configure IDLE dialog.  The maximum height for a screen is determined by
 momentarily maximizing a window the first time one is zoomed on the screen.
@@ -345,16 +291,12 @@ <h3>Window menu (Shell and Editor)<a class="headerlink" href="#window-menu-shell
 <div class="section" id="help-menu-shell-and-editor">
 <h3>Help menu (Shell and Editor)<a class="headerlink" href="#help-menu-shell-and-editor" title="Permalink to this headline">?</a></h3>
 <dl class="docutils">
-<dt>About IDLE</dt>
-<dd>Display version, copyright, license, credits, and more.</dd>
-<dt>IDLE Help</dt>
-<dd>Display this IDLE document, detailing the menu options, basic editing and
+<dt>About IDLE</dt><dd>Display version, copyright, license, credits, and more.</dd>
+<dt>IDLE Help</dt><dd>Display this IDLE document, detailing the menu options, basic editing and
 navigation, and other tips.</dd>
-<dt>Python Docs</dt>
-<dd>Access local Python documentation, if installed, or start a web browser
+<dt>Python Docs</dt><dd>Access local Python documentation, if installed, or start a web browser
 and open docs.python.org showing the latest Python documentation.</dd>
-<dt>Turtle Demo</dt>
-<dd>Run the turtledemo module with example Python code and turtle drawings.</dd>
+<dt>Turtle Demo</dt><dd>Run the turtledemo module with example Python code and turtle drawings.</dd>
 </dl>
 <p>Additional help sources may be added here with the Configure IDLE dialog under
 the General tab. See the <a class="reference internal" href="#help-sources"><span class="std std-ref">Help sources</span></a> subsection below
@@ -365,32 +307,25 @@ <h3>Help menu (Shell and Editor)<a class="headerlink" href="#help-menu-shell-and
 <p>Open a context menu by right-clicking in a window (Control-click on macOS).
 Context menus have the standard clipboard functions also on the Edit menu.</p>
 <dl class="docutils">
-<dt>Cut</dt>
-<dd>Copy selection into the system-wide clipboard; then delete the selection.</dd>
-<dt>Copy</dt>
-<dd>Copy selection into the system-wide clipboard.</dd>
-<dt>Paste</dt>
-<dd>Insert contents of the system-wide clipboard into the current window.</dd>
+<dt>Cut</dt><dd>Copy selection into the system-wide clipboard; then delete the selection.</dd>
+<dt>Copy</dt><dd>Copy selection into the system-wide clipboard.</dd>
+<dt>Paste</dt><dd>Insert contents of the system-wide clipboard into the current window.</dd>
 </dl>
 <p>Editor windows also have breakpoint functions.  Lines with a breakpoint set are
 specially marked.  Breakpoints only have an effect when running under the
 debugger.  Breakpoints for a file are saved in the user?s .idlerc directory.</p>
 <dl class="docutils">
-<dt>Set Breakpoint</dt>
-<dd>Set a breakpoint on the current line.</dd>
-<dt>Clear Breakpoint</dt>
-<dd>Clear the breakpoint on that line.</dd>
+<dt>Set Breakpoint</dt><dd>Set a breakpoint on the current line.</dd>
+<dt>Clear Breakpoint</dt><dd>Clear the breakpoint on that line.</dd>
 </dl>
 <p>Shell and Output windows also have the following.</p>
 <dl class="docutils">
-<dt>Go to file/line</dt>
-<dd>Same as in Debug menu.</dd>
+<dt>Go to file/line</dt><dd>Same as in Debug menu.</dd>
 </dl>
 <p>The Shell window also has an output squeezing facility explained in the <em>Python
 Shell window</em> subsection below.</p>
 <dl class="docutils">
-<dt>Squeeze</dt>
-<dd>If the cursor is over an output line, squeeze all the output between
+<dt>Squeeze</dt><dd>If the cursor is over an output line, squeeze all the output between
 the code above and the prompt below down to a ?Squeezed text? label.</dd>
 </dl>
 </div>
@@ -670,6 +605,9 @@ <h3>Running user code<a class="headerlink" href="#running-user-code" title="Perm
 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
 will then be attached to that window for input and output.</p>
+<p>The IDLE code running in the execution process adds frames to the call stack
+that would not be there otherwise.  IDLE wraps <code class="docutils literal notranslate"><span class="pre">sys.getrecursionlimit</span></code> and
+<code class="docutils literal notranslate"><span class="pre">sys.setrecursionlimit</span></code> to reduce their visibility.</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
 will not work correctly.</p>
@@ -772,7 +710,7 @@ <h3>Running without a subprocess<a class="headerlink" href="#running-without-a-s
 are to take effect.  For these reasons, it is preferable to run IDLE
 with the default subprocess if at all possible.</p>
 <div class="deprecated">
-<p><span class="versionmodified">Deprecated since version 3.4.</span></p>
+<p><span class="versionmodified deprecated">Deprecated since version 3.4.</span></p>
 </div>
 </div>
 </div>
@@ -885,7 +823,7 @@ <h3><a href="../contents.html">Table of Contents</a></h3>
 
   <h4>Previous topic</h4>
   <p class="topless"><a href="tkinter.scrolledtext.html"
-                        title="previous chapter"><code class="docutils literal notranslate"><span class="pre">tkinter.scrolledtext</span></code> ? Scrolled Text Widget</a></p>
+                        title="previous chapter"><code class="xref py py-mod docutils literal notranslate"><span class="pre">tkinter.scrolledtext</span></code> ? Scrolled Text Widget</a></p>
   <h4>Next topic</h4>
   <p class="topless"><a href="othergui.html"
                         title="next chapter">Other Graphical User Interface Packages</a></p>
@@ -957,11 +895,11 @@ <h3>Navigation</h3>
 <br />
     <br />
 
-    Last updated on Jun 17, 2019.
+    Last updated on Jul 04, 2019.
     <a href="https://docs.python.org/3/bugs.html">Found a bug</a>?
     <br />
 
-    Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.8.1.
+    Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 2.1.1.
     </div>
 
   </body>
diff --git a/Lib/idlelib/idle_test/test_run.py b/Lib/idlelib/idle_test/test_run.py
index 46f0235fbfdc..d0f1e9207bb1 100644
--- a/Lib/idlelib/idle_test/test_run.py
+++ b/Lib/idlelib/idle_test/test_run.py
@@ -6,6 +6,8 @@
 from test.support import captured_stderr
 
 import io
+import sys
+
 
 class RunTest(unittest.TestCase):
 
@@ -260,5 +262,36 @@ def test_close(self):
         self.assertRaises(TypeError, f.close, 1)
 
 
+class TestSysRecursionLimitWrappers(unittest.TestCase):
+
+    def test_bad_setrecursionlimit_calls(self):
+        run.install_recursionlimit_wrappers()
+        self.addCleanup(run.uninstall_recursionlimit_wrappers)
+        f = sys.setrecursionlimit
+        self.assertRaises(TypeError, f, limit=100)
+        self.assertRaises(TypeError, f, 100, 1000)
+        self.assertRaises(ValueError, f, 0)
+
+    def test_roundtrip(self):
+        run.install_recursionlimit_wrappers()
+        self.addCleanup(run.uninstall_recursionlimit_wrappers)
+
+        # check that setting the recursion limit works
+        orig_reclimit = sys.getrecursionlimit()
+        self.addCleanup(sys.setrecursionlimit, orig_reclimit)
+        sys.setrecursionlimit(orig_reclimit + 3)
+
+        # check that the new limit is returned by sys.getrecursionlimit()
+        new_reclimit = sys.getrecursionlimit()
+        self.assertEqual(new_reclimit, orig_reclimit + 3)
+
+    def test_default_recursion_limit_preserved(self):
+        orig_reclimit = sys.getrecursionlimit()
+        run.install_recursionlimit_wrappers()
+        self.addCleanup(run.uninstall_recursionlimit_wrappers)
+        new_reclimit = sys.getrecursionlimit()
+        self.assertEqual(new_reclimit, orig_reclimit)
+
+
 if __name__ == '__main__':
     unittest.main(verbosity=2)
diff --git a/Lib/idlelib/run.py b/Lib/idlelib/run.py
index 6b3928b7bf2b..c6ed76b23a2d 100644
--- a/Lib/idlelib/run.py
+++ b/Lib/idlelib/run.py
@@ -4,10 +4,12 @@
 f'''{sys.executable} -c "__import__('idlelib.run').run.main()"'''
 '.run' is needed because __import__ returns idlelib, not idlelib.run.
 """
+import functools
 import io
 import linecache
 import queue
 import sys
+import textwrap
 import time
 import traceback
 import _thread as thread
@@ -305,6 +307,64 @@ def fix_scaling(root):
                 font['size'] = round(-0.75*size)
 
 
+RECURSIONLIMIT_DELTA = 30
+def install_recursionlimit_wrappers():
+    """Install wrappers to always add 30 to the recursion limit."""
+    # see: bpo-26806
+
+    @functools.wraps(sys.setrecursionlimit)
+    def setrecursionlimit(*args, **kwargs):
+        # mimic the original sys.setrecursionlimit()'s input handling
+        if kwargs:
+            raise TypeError(
+                "setrecursionlimit() takes no keyword arguments")
+        try:
+            limit, = args
+        except ValueError:
+            raise TypeError(f"setrecursionlimit() takes exactly one "
+                            f"argument ({len(args)} given)")
+        if not limit > 0:
+            raise ValueError(
+                "recursion limit must be greater or equal than 1")
+
+        return setrecursionlimit.__wrapped__(limit + RECURSIONLIMIT_DELTA)
+
+    setrecursionlimit.__doc__ += "\n\n" + textwrap.fill(textwrap.dedent(f"""\
+        This IDLE wrapper adds {RECURSIONLIMIT_DELTA} to prevent possible
+        uninterruptible loops.
+        """).strip())
+
+    @functools.wraps(sys.getrecursionlimit)
+    def getrecursionlimit():
+        return getrecursionlimit.__wrapped__() - RECURSIONLIMIT_DELTA
+
+    getrecursionlimit.__doc__ += "\n\n" + textwrap.fill(textwrap.dedent(f"""\
+        This IDLE wrapper subtracts {RECURSIONLIMIT_DELTA} to compensate for
+        the {RECURSIONLIMIT_DELTA} IDLE adds when setting the limit.
+        """).strip())
+
+    # add the delta to the default recursion limit, to compensate
+    sys.setrecursionlimit(sys.getrecursionlimit() + RECURSIONLIMIT_DELTA)
+
+    sys.setrecursionlimit = setrecursionlimit
+    sys.getrecursionlimit = getrecursionlimit
+
+
+def uninstall_recursionlimit_wrappers():
+    """Uninstall the recursion limit wrappers from the sys module.
+
+    IDLE only uses this for tests. Users can import run and call
+    this to remove the wrapping.
+    """
+    if (
+            getattr(sys.setrecursionlimit, '__wrapped__', None) and
+            getattr(sys.getrecursionlimit, '__wrapped__', None)
+    ):
+        sys.setrecursionlimit = sys.setrecursionlimit.__wrapped__
+        sys.getrecursionlimit = sys.getrecursionlimit.__wrapped__
+        sys.setrecursionlimit(sys.getrecursionlimit() - RECURSIONLIMIT_DELTA)
+
+
 class MyRPCServer(rpc.RPCServer):
 
     def handle_error(self, request, client_address):
@@ -448,6 +508,8 @@ def handle(self):
         # sys.stdin gets changed from within IDLE's shell. See issue17838.
         self._keep_stdin = sys.stdin
 
+        install_recursionlimit_wrappers()
+
         self.interp = self.get_remote_proxy("interp")
         rpc.RPCHandler.getresponse(self, myseq=None, wait=0.05)
 
diff --git a/Misc/NEWS.d/next/IDLE/2019-06-10-22-48-50.bpo-26806.Zltkum.rst b/Misc/NEWS.d/next/IDLE/2019-06-10-22-48-50.bpo-26806.Zltkum.rst
new file mode 100644
index 000000000000..8514bb9292fe
--- /dev/null
+++ b/Misc/NEWS.d/next/IDLE/2019-06-10-22-48-50.bpo-26806.Zltkum.rst
@@ -0,0 +1,4 @@
+To compensate for stack frames added by IDLE and avoid possible problems
+with low recursion limits, add 30 to limits in the user code execution
+process.  Subtract 30 when reporting recursion limits to make this addition
+mostly transparent.


From webhook-mailer at python.org  Sat Jul  6 08:56:14 2019
From: webhook-mailer at python.org (Miss Islington (bot))
Date: Sat, 06 Jul 2019 12:56:14 -0000
Subject: [Python-checkins] bpo-26806: add 30 to the recursion limit in
 IDLE's shell (GH-13944)
Message-ID: <mailman.270.1562417775.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/d666217b26c373784761e3a84f243f02682bccb1
commit: d666217b26c373784761e3a84f243f02682bccb1
branch: 3.7
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: GitHub <noreply at github.com>
date: 2019-07-06T05:56:10-07:00
summary:

bpo-26806: add 30 to the recursion limit in IDLE's shell (GH-13944)


This is done to compensate for the extra stack frames added by
IDLE itself, which cause problems when setting the recursion limit
to low values.

This wraps sys.setrecursionlimit() and sys.getrecursionlimit()
as invisibly as possible.
(cherry picked from commit fcf1d003bf4f0100c9d0921ff3d70e1127ca1b71)

Co-authored-by: Tal Einat <taleinat+github at gmail.com>

files:
A Misc/NEWS.d/next/IDLE/2019-06-10-22-48-50.bpo-26806.Zltkum.rst
M Doc/library/idle.rst
M Lib/idlelib/NEWS.txt
M Lib/idlelib/help.html
M Lib/idlelib/idle_test/test_run.py
M Lib/idlelib/run.py

diff --git a/Doc/library/idle.rst b/Doc/library/idle.rst
index fb886a714d74..de58f266bf5e 100644
--- a/Doc/library/idle.rst
+++ b/Doc/library/idle.rst
@@ -713,6 +713,10 @@ or ``print`` or ``write`` to sys.stdout or sys.stderr,
 IDLE should be started in a command line window.  The secondary subprocess
 will then be attached to that window for input and output.
 
+The IDLE code running in the execution process adds frames to the call stack
+that would not be there otherwise.  IDLE wraps ``sys.getrecursionlimit`` and
+``sys.setrecursionlimit`` to reduce the effect of the additional stack frames.
+
 If ``sys`` is reset by user code, such as with ``importlib.reload(sys)``,
 IDLE's changes are lost and input from the keyboard and output to the screen
 will not work correctly.
diff --git a/Lib/idlelib/NEWS.txt b/Lib/idlelib/NEWS.txt
index 834646f7f776..4fad45b2de9c 100644
--- a/Lib/idlelib/NEWS.txt
+++ b/Lib/idlelib/NEWS.txt
@@ -3,6 +3,11 @@ Released on 2019-06-24?
 ======================================
 
 
+bpo-26806: To compensate for stack frames added by IDLE and avoid
+possible problems with low recursion limits, add 30 to limits in the
+user code execution process.  Subtract 30 when reporting recursion
+limits to make this addition mostly transparent.
+
 bpo-37325: Fix tab focus traversal order for help source and custom
 run dialogs.
 
diff --git a/Lib/idlelib/help.html b/Lib/idlelib/help.html
index 91803fd06c8f..cee6887df68f 100644
--- a/Lib/idlelib/help.html
+++ b/Lib/idlelib/help.html
@@ -14,7 +14,7 @@
     <script type="text/javascript" src="../_static/jquery.js"></script>
     <script type="text/javascript" src="../_static/underscore.js"></script>
     <script type="text/javascript" src="../_static/doctools.js"></script>
-    <script async="async" type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.1/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script>
+    <script type="text/javascript" src="../_static/language_data.js"></script>
 
     <script type="text/javascript" src="../_static/sidebar.js"></script>
 
@@ -135,113 +135,75 @@ <h2>Menus<a class="headerlink" href="#menus" title="Permalink to this headline">
 <div class="section" id="file-menu-shell-and-editor">
 <h3>File menu (Shell and Editor)<a class="headerlink" href="#file-menu-shell-and-editor" title="Permalink to this headline">?</a></h3>
 <dl class="docutils">
-<dt>New File</dt>
-<dd>Create a new file editing window.</dd>
-<dt>Open?</dt>
-<dd>Open an existing file with an Open dialog.</dd>
-<dt>Recent Files</dt>
-<dd>Open a list of recent files.  Click one to open it.</dd>
-<dt>Open Module?</dt>
-<dd>Open an existing module (searches sys.path).</dd>
+<dt>New File</dt><dd>Create a new file editing window.</dd>
+<dt>Open?</dt><dd>Open an existing file with an Open dialog.</dd>
+<dt>Recent Files</dt><dd>Open a list of recent files.  Click one to open it.</dd>
+<dt>Open Module?</dt><dd>Open an existing module (searches sys.path).</dd>
 </dl>
 <dl class="docutils" id="index-1">
-<dt>Class Browser</dt>
-<dd>Show functions, classes, and methods in the current Editor file in a
+<dt>Class Browser</dt><dd>Show functions, classes, and methods in the current Editor file in a
 tree structure.  In the shell, open a module first.</dd>
-<dt>Path Browser</dt>
-<dd>Show sys.path directories, modules, functions, classes and methods in a
+<dt>Path Browser</dt><dd>Show sys.path directories, modules, functions, classes and methods in a
 tree structure.</dd>
-<dt>Save</dt>
-<dd>Save the current window to the associated file, if there is one.  Windows
+<dt>Save</dt><dd>Save the current window to the associated file, if there is one.  Windows
 that have been changed since being opened or last saved have a * before
 and after the window title.  If there is no associated file,
 do Save As instead.</dd>
-<dt>Save As?</dt>
-<dd>Save the current window with a Save As dialog.  The file saved becomes the
+<dt>Save As?</dt><dd>Save the current window with a Save As dialog.  The file saved becomes the
 new associated file for the window.</dd>
-<dt>Save Copy As?</dt>
-<dd>Save the current window to different file without changing the associated
+<dt>Save Copy As?</dt><dd>Save the current window to different file without changing the associated
 file.</dd>
-<dt>Print Window</dt>
-<dd>Print the current window to the default printer.</dd>
-<dt>Close</dt>
-<dd>Close the current window (ask to save if unsaved).</dd>
-<dt>Exit</dt>
-<dd>Close all windows and quit IDLE (ask to save unsaved windows).</dd>
+<dt>Print Window</dt><dd>Print the current window to the default printer.</dd>
+<dt>Close</dt><dd>Close the current window (ask to save if unsaved).</dd>
+<dt>Exit</dt><dd>Close all windows and quit IDLE (ask to save unsaved windows).</dd>
 </dl>
 </div>
 <div class="section" id="edit-menu-shell-and-editor">
 <h3>Edit menu (Shell and Editor)<a class="headerlink" href="#edit-menu-shell-and-editor" title="Permalink to this headline">?</a></h3>
 <dl class="docutils">
-<dt>Undo</dt>
-<dd>Undo the last change to the current window.  A maximum of 1000 changes may
+<dt>Undo</dt><dd>Undo the last change to the current window.  A maximum of 1000 changes may
 be undone.</dd>
-<dt>Redo</dt>
-<dd>Redo the last undone change to the current window.</dd>
-<dt>Cut</dt>
-<dd>Copy selection into the system-wide clipboard; then delete the selection.</dd>
-<dt>Copy</dt>
-<dd>Copy selection into the system-wide clipboard.</dd>
-<dt>Paste</dt>
-<dd>Insert contents of the system-wide clipboard into the current window.</dd>
+<dt>Redo</dt><dd>Redo the last undone change to the current window.</dd>
+<dt>Cut</dt><dd>Copy selection into the system-wide clipboard; then delete the selection.</dd>
+<dt>Copy</dt><dd>Copy selection into the system-wide clipboard.</dd>
+<dt>Paste</dt><dd>Insert contents of the system-wide clipboard into the current window.</dd>
 </dl>
 <p>The clipboard functions are also available in context menus.</p>
 <dl class="docutils">
-<dt>Select All</dt>
-<dd>Select the entire contents of the current window.</dd>
-<dt>Find?</dt>
-<dd>Open a search dialog with many options</dd>
-<dt>Find Again</dt>
-<dd>Repeat the last search, if there is one.</dd>
-<dt>Find Selection</dt>
-<dd>Search for the currently selected string, if there is one.</dd>
-<dt>Find in Files?</dt>
-<dd>Open a file search dialog.  Put results in a new output window.</dd>
-<dt>Replace?</dt>
-<dd>Open a search-and-replace dialog.</dd>
-<dt>Go to Line</dt>
-<dd>Move cursor to the line number requested and make that line visible.</dd>
-<dt>Show Completions</dt>
-<dd>Open a scrollable list allowing selection of keywords and attributes. See
+<dt>Select All</dt><dd>Select the entire contents of the current window.</dd>
+<dt>Find?</dt><dd>Open a search dialog with many options</dd>
+<dt>Find Again</dt><dd>Repeat the last search, if there is one.</dd>
+<dt>Find Selection</dt><dd>Search for the currently selected string, if there is one.</dd>
+<dt>Find in Files?</dt><dd>Open a file search dialog.  Put results in a new output window.</dd>
+<dt>Replace?</dt><dd>Open a search-and-replace dialog.</dd>
+<dt>Go to Line</dt><dd>Move cursor to the line number requested and make that line visible.</dd>
+<dt>Show Completions</dt><dd>Open a scrollable list allowing selection of keywords and attributes. See
 <a class="reference internal" href="#completions"><span class="std std-ref">Completions</span></a> in the Editing and navigation section below.</dd>
-<dt>Expand Word</dt>
-<dd>Expand a prefix you have typed to match a full word in the same window;
+<dt>Expand Word</dt><dd>Expand a prefix you have typed to match a full word in the same window;
 repeat to get a different expansion.</dd>
-<dt>Show call tip</dt>
-<dd>After an unclosed parenthesis for a function, open a small window with
+<dt>Show call tip</dt><dd>After an unclosed parenthesis for a function, open a small window with
 function parameter hints.  See <a class="reference internal" href="#calltips"><span class="std std-ref">Calltips</span></a> in the
 Editing and navigation section below.</dd>
-<dt>Show surrounding parens</dt>
-<dd>Highlight the surrounding parenthesis.</dd>
+<dt>Show surrounding parens</dt><dd>Highlight the surrounding parenthesis.</dd>
 </dl>
 </div>
 <div class="section" id="format-menu-editor-window-only">
 <span id="format-menu"></span><h3>Format menu (Editor window only)<a class="headerlink" href="#format-menu-editor-window-only" title="Permalink to this headline">?</a></h3>
 <dl class="docutils">
-<dt>Indent Region</dt>
-<dd>Shift selected lines right by the indent width (default 4 spaces).</dd>
-<dt>Dedent Region</dt>
-<dd>Shift selected lines left by the indent width (default 4 spaces).</dd>
-<dt>Comment Out Region</dt>
-<dd>Insert ## in front of selected lines.</dd>
-<dt>Uncomment Region</dt>
-<dd>Remove leading # or ## from selected lines.</dd>
-<dt>Tabify Region</dt>
-<dd>Turn <em>leading</em> stretches of spaces into tabs. (Note: We recommend using
+<dt>Indent Region</dt><dd>Shift selected lines right by the indent width (default 4 spaces).</dd>
+<dt>Dedent Region</dt><dd>Shift selected lines left by the indent width (default 4 spaces).</dd>
+<dt>Comment Out Region</dt><dd>Insert ## in front of selected lines.</dd>
+<dt>Uncomment Region</dt><dd>Remove leading # or ## from selected lines.</dd>
+<dt>Tabify Region</dt><dd>Turn <em>leading</em> stretches of spaces into tabs. (Note: We recommend using
 4 space blocks to indent Python code.)</dd>
-<dt>Untabify Region</dt>
-<dd>Turn <em>all</em> tabs into the correct number of spaces.</dd>
-<dt>Toggle Tabs</dt>
-<dd>Open a dialog to switch between indenting with spaces and tabs.</dd>
-<dt>New Indent Width</dt>
-<dd>Open a dialog to change indent width. The accepted default by the Python
+<dt>Untabify Region</dt><dd>Turn <em>all</em> tabs into the correct number of spaces.</dd>
+<dt>Toggle Tabs</dt><dd>Open a dialog to switch between indenting with spaces and tabs.</dd>
+<dt>New Indent Width</dt><dd>Open a dialog to change indent width. The accepted default by the Python
 community is 4 spaces.</dd>
-<dt>Format Paragraph</dt>
-<dd>Reformat the current blank-line-delimited paragraph in comment block or
+<dt>Format Paragraph</dt><dd>Reformat the current blank-line-delimited paragraph in comment block or
 multiline string or selected line in a string.  All lines in the
 paragraph will be formatted to less than N columns, where N defaults to 72.</dd>
-<dt>Strip trailing whitespace</dt>
-<dd>Remove trailing space and other whitespace characters after the last
+<dt>Strip trailing whitespace</dt><dd>Remove trailing space and other whitespace characters after the last
 non-whitespace character of a line by applying str.rstrip to each line,
 including lines within multiline strings.</dd>
 </dl>
@@ -249,20 +211,17 @@ <h3>Edit menu (Shell and Editor)<a class="headerlink" href="#edit-menu-shell-and
 <div class="section" id="run-menu-editor-window-only">
 <span id="index-2"></span><h3>Run menu (Editor window only)<a class="headerlink" href="#run-menu-editor-window-only" title="Permalink to this headline">?</a></h3>
 <dl class="docutils" id="python-shell">
-<dt>Python Shell</dt>
-<dd>Open or wake up the Python Shell window.</dd>
+<dt>Python Shell</dt><dd>Open or wake up the Python Shell window.</dd>
 </dl>
 <dl class="docutils" id="check-module">
-<dt>Check Module</dt>
-<dd>Check the syntax of the module currently open in the Editor window. If the
+<dt>Check Module</dt><dd>Check the syntax of the module currently open in the Editor window. If the
 module has not been saved IDLE will either prompt the user to save or
 autosave, as selected in the General tab of the Idle Settings dialog.  If
 there is a syntax error, the approximate location is indicated in the
 Editor window.</dd>
 </dl>
 <dl class="docutils" id="run-module">
-<dt>Run Module</dt>
-<dd>Do <a class="reference internal" href="#check-module"><span class="std std-ref">Check Module</span></a>.  If no error, restart the shell to clean the
+<dt>Run Module</dt><dd>Do <a class="reference internal" href="#check-module"><span class="std std-ref">Check Module</span></a>.  If no error, restart the shell to clean the
 environment, then execute the module.  Output is displayed in the Shell
 window.  Note that output requires use of <code class="docutils literal notranslate"><span class="pre">print</span></code> or <code class="docutils literal notranslate"><span class="pre">write</span></code>.
 When execution is complete, the Shell retains focus and displays a prompt.
@@ -271,8 +230,7 @@ <h3>Edit menu (Shell and Editor)<a class="headerlink" href="#edit-menu-shell-and
 line.</dd>
 </dl>
 <dl class="docutils" id="run-custom">
-<dt>Run? Customized</dt>
-<dd>Same as <a class="reference internal" href="#run-module"><span class="std std-ref">Run Module</span></a>, but run the module with customized
+<dt>Run? Customized</dt><dd>Same as <a class="reference internal" href="#run-module"><span class="std std-ref">Run Module</span></a>, but run the module with customized
 settings.  <em>Command Line Arguments</em> extend <a class="reference internal" href="sys.html#sys.argv" title="sys.argv"><code class="xref py py-data docutils literal notranslate"><span class="pre">sys.argv</span></code></a> as if passed
 on a command line. The module can be run in the Shell without restarting.</dd>
 </dl>
@@ -280,56 +238,44 @@ <h3>Edit menu (Shell and Editor)<a class="headerlink" href="#edit-menu-shell-and
 <div class="section" id="shell-menu-shell-window-only">
 <h3>Shell menu (Shell window only)<a class="headerlink" href="#shell-menu-shell-window-only" title="Permalink to this headline">?</a></h3>
 <dl class="docutils">
-<dt>View Last Restart</dt>
-<dd>Scroll the shell window to the last Shell restart.</dd>
-<dt>Restart Shell</dt>
-<dd>Restart the shell to clean the environment.</dd>
-<dt>Previous History</dt>
-<dd>Cycle through earlier commands in history which match the current entry.</dd>
-<dt>Next History</dt>
-<dd>Cycle through later commands in history which match the current entry.</dd>
-<dt>Interrupt Execution</dt>
-<dd>Stop a running program.</dd>
+<dt>View Last Restart</dt><dd>Scroll the shell window to the last Shell restart.</dd>
+<dt>Restart Shell</dt><dd>Restart the shell to clean the environment.</dd>
+<dt>Previous History</dt><dd>Cycle through earlier commands in history which match the current entry.</dd>
+<dt>Next History</dt><dd>Cycle through later commands in history which match the current entry.</dd>
+<dt>Interrupt Execution</dt><dd>Stop a running program.</dd>
 </dl>
 </div>
 <div class="section" id="debug-menu-shell-window-only">
 <h3>Debug menu (Shell window only)<a class="headerlink" href="#debug-menu-shell-window-only" title="Permalink to this headline">?</a></h3>
 <dl class="docutils">
-<dt>Go to File/Line</dt>
-<dd>Look on the current line. with the cursor, and the line above for a filename
+<dt>Go to File/Line</dt><dd>Look on the current line. with the cursor, and the line above for a filename
 and line number.  If found, open the file if not already open, and show the
 line.  Use this to view source lines referenced in an exception traceback
 and lines found by Find in Files. Also available in the context menu of
 the Shell window and Output windows.</dd>
 </dl>
 <dl class="docutils" id="index-3">
-<dt>Debugger (toggle)</dt>
-<dd>When activated, code entered in the Shell or run from an Editor will run
+<dt>Debugger (toggle)</dt><dd>When activated, code entered in the Shell or run from an Editor will run
 under the debugger.  In the Editor, breakpoints can be set with the context
 menu.  This feature is still incomplete and somewhat experimental.</dd>
-<dt>Stack Viewer</dt>
-<dd>Show the stack traceback of the last exception in a tree widget, with
+<dt>Stack Viewer</dt><dd>Show the stack traceback of the last exception in a tree widget, with
 access to locals and globals.</dd>
-<dt>Auto-open Stack Viewer</dt>
-<dd>Toggle automatically opening the stack viewer on an unhandled exception.</dd>
+<dt>Auto-open Stack Viewer</dt><dd>Toggle automatically opening the stack viewer on an unhandled exception.</dd>
 </dl>
 </div>
 <div class="section" id="options-menu-shell-and-editor">
 <h3>Options menu (Shell and Editor)<a class="headerlink" href="#options-menu-shell-and-editor" title="Permalink to this headline">?</a></h3>
 <dl class="docutils">
-<dt>Configure IDLE</dt>
-<dd>Open a configuration dialog and change preferences for the following:
+<dt>Configure IDLE</dt><dd>Open a configuration dialog and change preferences for the following:
 fonts, indentation, keybindings, text color themes, startup windows and
 size, additional help sources, and extensions.  On macOS,  open the
 configuration dialog by selecting Preferences in the application
 menu. For more, see
 <a class="reference internal" href="#preferences"><span class="std std-ref">Setting preferences</span></a> under Help and preferences.</dd>
-<dt>Show/Hide Code Context (Editor Window only)</dt>
-<dd>Open a pane at the top of the edit window which shows the block context
+<dt>Show/Hide Code Context (Editor Window only)</dt><dd>Open a pane at the top of the edit window which shows the block context
 of the code which has scrolled above the top of the window.  See
 <a class="reference internal" href="#code-context"><span class="std std-ref">Code Context</span></a> in the Editing and Navigation section below.</dd>
-<dt>Zoom/Restore Height</dt>
-<dd>Toggles the window between normal size and maximum height. The initial size
+<dt>Zoom/Restore Height</dt><dd>Toggles the window between normal size and maximum height. The initial size
 defaults to 40 lines by 80 chars unless changed on the General tab of the
 Configure IDLE dialog.  The maximum height for a screen is determined by
 momentarily maximizing a window the first time one is zoomed on the screen.
@@ -345,16 +291,12 @@ <h3>Window menu (Shell and Editor)<a class="headerlink" href="#window-menu-shell
 <div class="section" id="help-menu-shell-and-editor">
 <h3>Help menu (Shell and Editor)<a class="headerlink" href="#help-menu-shell-and-editor" title="Permalink to this headline">?</a></h3>
 <dl class="docutils">
-<dt>About IDLE</dt>
-<dd>Display version, copyright, license, credits, and more.</dd>
-<dt>IDLE Help</dt>
-<dd>Display this IDLE document, detailing the menu options, basic editing and
+<dt>About IDLE</dt><dd>Display version, copyright, license, credits, and more.</dd>
+<dt>IDLE Help</dt><dd>Display this IDLE document, detailing the menu options, basic editing and
 navigation, and other tips.</dd>
-<dt>Python Docs</dt>
-<dd>Access local Python documentation, if installed, or start a web browser
+<dt>Python Docs</dt><dd>Access local Python documentation, if installed, or start a web browser
 and open docs.python.org showing the latest Python documentation.</dd>
-<dt>Turtle Demo</dt>
-<dd>Run the turtledemo module with example Python code and turtle drawings.</dd>
+<dt>Turtle Demo</dt><dd>Run the turtledemo module with example Python code and turtle drawings.</dd>
 </dl>
 <p>Additional help sources may be added here with the Configure IDLE dialog under
 the General tab. See the <a class="reference internal" href="#help-sources"><span class="std std-ref">Help sources</span></a> subsection below
@@ -365,32 +307,25 @@ <h3>Help menu (Shell and Editor)<a class="headerlink" href="#help-menu-shell-and
 <p>Open a context menu by right-clicking in a window (Control-click on macOS).
 Context menus have the standard clipboard functions also on the Edit menu.</p>
 <dl class="docutils">
-<dt>Cut</dt>
-<dd>Copy selection into the system-wide clipboard; then delete the selection.</dd>
-<dt>Copy</dt>
-<dd>Copy selection into the system-wide clipboard.</dd>
-<dt>Paste</dt>
-<dd>Insert contents of the system-wide clipboard into the current window.</dd>
+<dt>Cut</dt><dd>Copy selection into the system-wide clipboard; then delete the selection.</dd>
+<dt>Copy</dt><dd>Copy selection into the system-wide clipboard.</dd>
+<dt>Paste</dt><dd>Insert contents of the system-wide clipboard into the current window.</dd>
 </dl>
 <p>Editor windows also have breakpoint functions.  Lines with a breakpoint set are
 specially marked.  Breakpoints only have an effect when running under the
 debugger.  Breakpoints for a file are saved in the user?s .idlerc directory.</p>
 <dl class="docutils">
-<dt>Set Breakpoint</dt>
-<dd>Set a breakpoint on the current line.</dd>
-<dt>Clear Breakpoint</dt>
-<dd>Clear the breakpoint on that line.</dd>
+<dt>Set Breakpoint</dt><dd>Set a breakpoint on the current line.</dd>
+<dt>Clear Breakpoint</dt><dd>Clear the breakpoint on that line.</dd>
 </dl>
 <p>Shell and Output windows also have the following.</p>
 <dl class="docutils">
-<dt>Go to file/line</dt>
-<dd>Same as in Debug menu.</dd>
+<dt>Go to file/line</dt><dd>Same as in Debug menu.</dd>
 </dl>
 <p>The Shell window also has an output squeezing facility explained in the <em>Python
 Shell window</em> subsection below.</p>
 <dl class="docutils">
-<dt>Squeeze</dt>
-<dd>If the cursor is over an output line, squeeze all the output between
+<dt>Squeeze</dt><dd>If the cursor is over an output line, squeeze all the output between
 the code above and the prompt below down to a ?Squeezed text? label.</dd>
 </dl>
 </div>
@@ -670,6 +605,9 @@ <h3>Running user code<a class="headerlink" href="#running-user-code" title="Perm
 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
 will then be attached to that window for input and output.</p>
+<p>The IDLE code running in the execution process adds frames to the call stack
+that would not be there otherwise.  IDLE wraps <code class="docutils literal notranslate"><span class="pre">sys.getrecursionlimit</span></code> and
+<code class="docutils literal notranslate"><span class="pre">sys.setrecursionlimit</span></code> to reduce their visibility.</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
 will not work correctly.</p>
@@ -772,7 +710,7 @@ <h3>Running without a subprocess<a class="headerlink" href="#running-without-a-s
 are to take effect.  For these reasons, it is preferable to run IDLE
 with the default subprocess if at all possible.</p>
 <div class="deprecated">
-<p><span class="versionmodified">Deprecated since version 3.4.</span></p>
+<p><span class="versionmodified deprecated">Deprecated since version 3.4.</span></p>
 </div>
 </div>
 </div>
@@ -885,7 +823,7 @@ <h3><a href="../contents.html">Table of Contents</a></h3>
 
   <h4>Previous topic</h4>
   <p class="topless"><a href="tkinter.scrolledtext.html"
-                        title="previous chapter"><code class="docutils literal notranslate"><span class="pre">tkinter.scrolledtext</span></code> ? Scrolled Text Widget</a></p>
+                        title="previous chapter"><code class="xref py py-mod docutils literal notranslate"><span class="pre">tkinter.scrolledtext</span></code> ? Scrolled Text Widget</a></p>
   <h4>Next topic</h4>
   <p class="topless"><a href="othergui.html"
                         title="next chapter">Other Graphical User Interface Packages</a></p>
@@ -957,11 +895,11 @@ <h3>Navigation</h3>
 <br />
     <br />
 
-    Last updated on Jun 17, 2019.
+    Last updated on Jul 04, 2019.
     <a href="https://docs.python.org/3/bugs.html">Found a bug</a>?
     <br />
 
-    Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.8.1.
+    Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 2.1.1.
     </div>
 
   </body>
diff --git a/Lib/idlelib/idle_test/test_run.py b/Lib/idlelib/idle_test/test_run.py
index 46f0235fbfdc..d0f1e9207bb1 100644
--- a/Lib/idlelib/idle_test/test_run.py
+++ b/Lib/idlelib/idle_test/test_run.py
@@ -6,6 +6,8 @@
 from test.support import captured_stderr
 
 import io
+import sys
+
 
 class RunTest(unittest.TestCase):
 
@@ -260,5 +262,36 @@ def test_close(self):
         self.assertRaises(TypeError, f.close, 1)
 
 
+class TestSysRecursionLimitWrappers(unittest.TestCase):
+
+    def test_bad_setrecursionlimit_calls(self):
+        run.install_recursionlimit_wrappers()
+        self.addCleanup(run.uninstall_recursionlimit_wrappers)
+        f = sys.setrecursionlimit
+        self.assertRaises(TypeError, f, limit=100)
+        self.assertRaises(TypeError, f, 100, 1000)
+        self.assertRaises(ValueError, f, 0)
+
+    def test_roundtrip(self):
+        run.install_recursionlimit_wrappers()
+        self.addCleanup(run.uninstall_recursionlimit_wrappers)
+
+        # check that setting the recursion limit works
+        orig_reclimit = sys.getrecursionlimit()
+        self.addCleanup(sys.setrecursionlimit, orig_reclimit)
+        sys.setrecursionlimit(orig_reclimit + 3)
+
+        # check that the new limit is returned by sys.getrecursionlimit()
+        new_reclimit = sys.getrecursionlimit()
+        self.assertEqual(new_reclimit, orig_reclimit + 3)
+
+    def test_default_recursion_limit_preserved(self):
+        orig_reclimit = sys.getrecursionlimit()
+        run.install_recursionlimit_wrappers()
+        self.addCleanup(run.uninstall_recursionlimit_wrappers)
+        new_reclimit = sys.getrecursionlimit()
+        self.assertEqual(new_reclimit, orig_reclimit)
+
+
 if __name__ == '__main__':
     unittest.main(verbosity=2)
diff --git a/Lib/idlelib/run.py b/Lib/idlelib/run.py
index 6b3928b7bf2b..c6ed76b23a2d 100644
--- a/Lib/idlelib/run.py
+++ b/Lib/idlelib/run.py
@@ -4,10 +4,12 @@
 f'''{sys.executable} -c "__import__('idlelib.run').run.main()"'''
 '.run' is needed because __import__ returns idlelib, not idlelib.run.
 """
+import functools
 import io
 import linecache
 import queue
 import sys
+import textwrap
 import time
 import traceback
 import _thread as thread
@@ -305,6 +307,64 @@ def fix_scaling(root):
                 font['size'] = round(-0.75*size)
 
 
+RECURSIONLIMIT_DELTA = 30
+def install_recursionlimit_wrappers():
+    """Install wrappers to always add 30 to the recursion limit."""
+    # see: bpo-26806
+
+    @functools.wraps(sys.setrecursionlimit)
+    def setrecursionlimit(*args, **kwargs):
+        # mimic the original sys.setrecursionlimit()'s input handling
+        if kwargs:
+            raise TypeError(
+                "setrecursionlimit() takes no keyword arguments")
+        try:
+            limit, = args
+        except ValueError:
+            raise TypeError(f"setrecursionlimit() takes exactly one "
+                            f"argument ({len(args)} given)")
+        if not limit > 0:
+            raise ValueError(
+                "recursion limit must be greater or equal than 1")
+
+        return setrecursionlimit.__wrapped__(limit + RECURSIONLIMIT_DELTA)
+
+    setrecursionlimit.__doc__ += "\n\n" + textwrap.fill(textwrap.dedent(f"""\
+        This IDLE wrapper adds {RECURSIONLIMIT_DELTA} to prevent possible
+        uninterruptible loops.
+        """).strip())
+
+    @functools.wraps(sys.getrecursionlimit)
+    def getrecursionlimit():
+        return getrecursionlimit.__wrapped__() - RECURSIONLIMIT_DELTA
+
+    getrecursionlimit.__doc__ += "\n\n" + textwrap.fill(textwrap.dedent(f"""\
+        This IDLE wrapper subtracts {RECURSIONLIMIT_DELTA} to compensate for
+        the {RECURSIONLIMIT_DELTA} IDLE adds when setting the limit.
+        """).strip())
+
+    # add the delta to the default recursion limit, to compensate
+    sys.setrecursionlimit(sys.getrecursionlimit() + RECURSIONLIMIT_DELTA)
+
+    sys.setrecursionlimit = setrecursionlimit
+    sys.getrecursionlimit = getrecursionlimit
+
+
+def uninstall_recursionlimit_wrappers():
+    """Uninstall the recursion limit wrappers from the sys module.
+
+    IDLE only uses this for tests. Users can import run and call
+    this to remove the wrapping.
+    """
+    if (
+            getattr(sys.setrecursionlimit, '__wrapped__', None) and
+            getattr(sys.getrecursionlimit, '__wrapped__', None)
+    ):
+        sys.setrecursionlimit = sys.setrecursionlimit.__wrapped__
+        sys.getrecursionlimit = sys.getrecursionlimit.__wrapped__
+        sys.setrecursionlimit(sys.getrecursionlimit() - RECURSIONLIMIT_DELTA)
+
+
 class MyRPCServer(rpc.RPCServer):
 
     def handle_error(self, request, client_address):
@@ -448,6 +508,8 @@ def handle(self):
         # sys.stdin gets changed from within IDLE's shell. See issue17838.
         self._keep_stdin = sys.stdin
 
+        install_recursionlimit_wrappers()
+
         self.interp = self.get_remote_proxy("interp")
         rpc.RPCHandler.getresponse(self, myseq=None, wait=0.05)
 
diff --git a/Misc/NEWS.d/next/IDLE/2019-06-10-22-48-50.bpo-26806.Zltkum.rst b/Misc/NEWS.d/next/IDLE/2019-06-10-22-48-50.bpo-26806.Zltkum.rst
new file mode 100644
index 000000000000..8514bb9292fe
--- /dev/null
+++ b/Misc/NEWS.d/next/IDLE/2019-06-10-22-48-50.bpo-26806.Zltkum.rst
@@ -0,0 +1,4 @@
+To compensate for stack frames added by IDLE and avoid possible problems
+with low recursion limits, add 30 to limits in the user code execution
+process.  Subtract 30 when reporting recursion limits to make this addition
+mostly transparent.


From webhook-mailer at python.org  Sat Jul  6 17:40:31 2019
From: webhook-mailer at python.org (Terry Jan Reedy)
Date: Sat, 06 Jul 2019 21:40:31 -0000
Subject: [Python-checkins] bpo-37487: Fix PyList_GetItem index description.
 (GH-14623)
Message-ID: <mailman.271.1562449231.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/f8709e804d16ec5d44b1d2f00d59a0f78df7b792
commit: f8709e804d16ec5d44b1d2f00d59a0f78df7b792
branch: master
author: Terry Jan Reedy <tjreedy at udel.edu>
committer: GitHub <noreply at github.com>
date: 2019-07-06T17:40:27-04:00
summary:

bpo-37487: Fix PyList_GetItem index description. (GH-14623)

0 is a legal index.

files:
A Misc/NEWS.d/next/Documentation/2019-07-06-17-19-26.bpo-37487.QagfZ5.rst
M Doc/c-api/list.rst

diff --git a/Doc/c-api/list.rst b/Doc/c-api/list.rst
index 279783a243a1..dc9026605be3 100644
--- a/Doc/c-api/list.rst
+++ b/Doc/c-api/list.rst
@@ -59,9 +59,9 @@ List Objects
 .. c:function:: PyObject* PyList_GetItem(PyObject *list, Py_ssize_t index)
 
    Return the object at position *index* in the list pointed to by *list*.  The
-   position must be positive, indexing from the end of the list is not
-   supported.  If *index* is out of bounds, return *NULL* and set an
-   :exc:`IndexError` exception.
+   position must be non-negative; indexing from the end of the list is not
+   supported.  If *index* is out of bounds (<0 or >=len(list)),
+   return *NULL* and set an :exc:`IndexError` exception.
 
 
 .. c:function:: PyObject* PyList_GET_ITEM(PyObject *list, Py_ssize_t i)
diff --git a/Misc/NEWS.d/next/Documentation/2019-07-06-17-19-26.bpo-37487.QagfZ5.rst b/Misc/NEWS.d/next/Documentation/2019-07-06-17-19-26.bpo-37487.QagfZ5.rst
new file mode 100644
index 000000000000..605d08c3c040
--- /dev/null
+++ b/Misc/NEWS.d/next/Documentation/2019-07-06-17-19-26.bpo-37487.QagfZ5.rst
@@ -0,0 +1 @@
+Fix PyList_GetItem index description to include 0.


From webhook-mailer at python.org  Sat Jul  6 17:55:00 2019
From: webhook-mailer at python.org (Terry Jan Reedy)
Date: Sat, 06 Jul 2019 21:55:00 -0000
Subject: [Python-checkins] bpo-37487: Fix PyList_GetItem index description.
 (GH-14623) (GH-14624)
Message-ID: <mailman.272.1562450100.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/ad3720359faa933d04bde3d3222fd54e73ee7feb
commit: ad3720359faa933d04bde3d3222fd54e73ee7feb
branch: 3.8
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: Terry Jan Reedy <tjreedy at udel.edu>
date: 2019-07-06T17:54:56-04:00
summary:

bpo-37487: Fix PyList_GetItem index description. (GH-14623) (GH-14624)

0 is a legal index.
(cherry picked from commit f8709e804d16ec5d44b1d2f00d59a0f78df7b792)

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

files:
A Misc/NEWS.d/next/Documentation/2019-07-06-17-19-26.bpo-37487.QagfZ5.rst
M Doc/c-api/list.rst

diff --git a/Doc/c-api/list.rst b/Doc/c-api/list.rst
index 279783a243a1..dc9026605be3 100644
--- a/Doc/c-api/list.rst
+++ b/Doc/c-api/list.rst
@@ -59,9 +59,9 @@ List Objects
 .. c:function:: PyObject* PyList_GetItem(PyObject *list, Py_ssize_t index)
 
    Return the object at position *index* in the list pointed to by *list*.  The
-   position must be positive, indexing from the end of the list is not
-   supported.  If *index* is out of bounds, return *NULL* and set an
-   :exc:`IndexError` exception.
+   position must be non-negative; indexing from the end of the list is not
+   supported.  If *index* is out of bounds (<0 or >=len(list)),
+   return *NULL* and set an :exc:`IndexError` exception.
 
 
 .. c:function:: PyObject* PyList_GET_ITEM(PyObject *list, Py_ssize_t i)
diff --git a/Misc/NEWS.d/next/Documentation/2019-07-06-17-19-26.bpo-37487.QagfZ5.rst b/Misc/NEWS.d/next/Documentation/2019-07-06-17-19-26.bpo-37487.QagfZ5.rst
new file mode 100644
index 000000000000..605d08c3c040
--- /dev/null
+++ b/Misc/NEWS.d/next/Documentation/2019-07-06-17-19-26.bpo-37487.QagfZ5.rst
@@ -0,0 +1 @@
+Fix PyList_GetItem index description to include 0.


From webhook-mailer at python.org  Sat Jul  6 17:55:23 2019
From: webhook-mailer at python.org (Terry Jan Reedy)
Date: Sat, 06 Jul 2019 21:55:23 -0000
Subject: [Python-checkins] bpo-37487: Fix PyList_GetItem index description.
 (GH-14623) (GH-14625)
Message-ID: <mailman.273.1562450124.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/9c930d076a7225694b369d30636a29acb556c2be
commit: 9c930d076a7225694b369d30636a29acb556c2be
branch: 3.7
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: Terry Jan Reedy <tjreedy at udel.edu>
date: 2019-07-06T17:55:19-04:00
summary:

bpo-37487: Fix PyList_GetItem index description. (GH-14623) (GH-14625)

0 is a legal index.
(cherry picked from commit f8709e804d16ec5d44b1d2f00d59a0f78df7b792)

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

files:
A Misc/NEWS.d/next/Documentation/2019-07-06-17-19-26.bpo-37487.QagfZ5.rst
M Doc/c-api/list.rst

diff --git a/Doc/c-api/list.rst b/Doc/c-api/list.rst
index 5b263a7b1cdf..a5cd634a454a 100644
--- a/Doc/c-api/list.rst
+++ b/Doc/c-api/list.rst
@@ -59,9 +59,9 @@ List Objects
 .. c:function:: PyObject* PyList_GetItem(PyObject *list, Py_ssize_t index)
 
    Return the object at position *index* in the list pointed to by *list*.  The
-   position must be positive, indexing from the end of the list is not
-   supported.  If *index* is out of bounds, return *NULL* and set an
-   :exc:`IndexError` exception.
+   position must be non-negative; indexing from the end of the list is not
+   supported.  If *index* is out of bounds (<0 or >=len(list)),
+   return *NULL* and set an :exc:`IndexError` exception.
 
 
 .. c:function:: PyObject* PyList_GET_ITEM(PyObject *list, Py_ssize_t i)
diff --git a/Misc/NEWS.d/next/Documentation/2019-07-06-17-19-26.bpo-37487.QagfZ5.rst b/Misc/NEWS.d/next/Documentation/2019-07-06-17-19-26.bpo-37487.QagfZ5.rst
new file mode 100644
index 000000000000..605d08c3c040
--- /dev/null
+++ b/Misc/NEWS.d/next/Documentation/2019-07-06-17-19-26.bpo-37487.QagfZ5.rst
@@ -0,0 +1 @@
+Fix PyList_GetItem index description to include 0.


From webhook-mailer at python.org  Sat Jul  6 17:55:45 2019
From: webhook-mailer at python.org (Terry Jan Reedy)
Date: Sat, 06 Jul 2019 21:55:45 -0000
Subject: [Python-checkins] bpo-37487: Fix PyList_GetItem index description.
 (GH-14623) (GH-14626)
Message-ID: <mailman.274.1562450146.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/dd3862e167d573b6e9a3348c365229ca958d1f1f
commit: dd3862e167d573b6e9a3348c365229ca958d1f1f
branch: 2.7
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: Terry Jan Reedy <tjreedy at udel.edu>
date: 2019-07-06T17:55:41-04:00
summary:

bpo-37487: Fix PyList_GetItem index description. (GH-14623) (GH-14626)

0 is a legal index.
(cherry picked from commit f8709e804d16ec5d44b1d2f00d59a0f78df7b792)

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

files:
A Misc/NEWS.d/next/Documentation/2019-07-06-17-19-26.bpo-37487.QagfZ5.rst
M Doc/c-api/list.rst

diff --git a/Doc/c-api/list.rst b/Doc/c-api/list.rst
index 0aed0f3e8899..a5e4a45492b6 100644
--- a/Doc/c-api/list.rst
+++ b/Doc/c-api/list.rst
@@ -76,9 +76,9 @@ List Objects
 .. c:function:: PyObject* PyList_GetItem(PyObject *list, Py_ssize_t index)
 
    Return the object at position *index* in the list pointed to by *list*.  The
-   position must be positive, indexing from the end of the list is not
-   supported.  If *index* is out of bounds, return *NULL* and set an
-   :exc:`IndexError` exception.
+   position must be non-negative; indexing from the end of the list is not
+   supported.  If *index* is out of bounds (<0 or >=len(list)),
+   return *NULL* and set an :exc:`IndexError` exception.
 
    .. versionchanged:: 2.5
       This function used an :c:type:`int` for *index*. This might require
diff --git a/Misc/NEWS.d/next/Documentation/2019-07-06-17-19-26.bpo-37487.QagfZ5.rst b/Misc/NEWS.d/next/Documentation/2019-07-06-17-19-26.bpo-37487.QagfZ5.rst
new file mode 100644
index 000000000000..605d08c3c040
--- /dev/null
+++ b/Misc/NEWS.d/next/Documentation/2019-07-06-17-19-26.bpo-37487.QagfZ5.rst
@@ -0,0 +1 @@
+Fix PyList_GetItem index description to include 0.


From webhook-mailer at python.org  Sat Jul  6 18:13:07 2019
From: webhook-mailer at python.org (Terry Jan Reedy)
Date: Sat, 06 Jul 2019 22:13:07 -0000
Subject: [Python-checkins] bpo-37456: Slash ('/') is now part of syntax.
 (GH-14627)
Message-ID: <mailman.275.1562451187.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/6f2a8c08573c71b78d2f6e2bfaf31641a0cd092b
commit: 6f2a8c08573c71b78d2f6e2bfaf31641a0cd092b
branch: master
author: Terry Jan Reedy <tjreedy at udel.edu>
committer: GitHub <noreply at github.com>
date: 2019-07-06T18:13:02-04:00
summary:

bpo-37456: Slash ('/') is now part of syntax. (GH-14627)

files:
A Misc/NEWS.d/next/Documentation/2019-07-06-17-51-36.bpo-37456.lgAQHn.rst
M Doc/faq/programming.rst

diff --git a/Doc/faq/programming.rst b/Doc/faq/programming.rst
index a00c6a053ef1..a36fa4aefe88 100644
--- a/Doc/faq/programming.rst
+++ b/Doc/faq/programming.rst
@@ -800,10 +800,6 @@ an error::
      File "<stdin>", line 1, in <module>
    TypeError: pow() takes no keyword arguments
 
-Note that as of this writing this is only documentational and no valid syntax
-in Python, although there is :pep:`570`, which proposes a syntax for
-position-only parameters in Python.
-
 
 Numbers and strings
 ===================
diff --git a/Misc/NEWS.d/next/Documentation/2019-07-06-17-51-36.bpo-37456.lgAQHn.rst b/Misc/NEWS.d/next/Documentation/2019-07-06-17-51-36.bpo-37456.lgAQHn.rst
new file mode 100644
index 000000000000..4d158733b0ea
--- /dev/null
+++ b/Misc/NEWS.d/next/Documentation/2019-07-06-17-51-36.bpo-37456.lgAQHn.rst
@@ -0,0 +1 @@
+Slash ('/') is now part of syntax.


From webhook-mailer at python.org  Sat Jul  6 18:25:50 2019
From: webhook-mailer at python.org (Terry Jan Reedy)
Date: Sat, 06 Jul 2019 22:25:50 -0000
Subject: [Python-checkins] bpo-37456: Slash ('/') is now part of syntax.
 (GH-14627) (GH-14628)
Message-ID: <mailman.276.1562451952.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/90631f9bc5f78ec6cdc2096d5c5ae26e41e5f150
commit: 90631f9bc5f78ec6cdc2096d5c5ae26e41e5f150
branch: 3.8
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: Terry Jan Reedy <tjreedy at udel.edu>
date: 2019-07-06T18:25:47-04:00
summary:

bpo-37456: Slash ('/') is now part of syntax. (GH-14627) (GH-14628)

(cherry picked from commit 6f2a8c08573c71b78d2f6e2bfaf31641a0cd092b)

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

files:
A Misc/NEWS.d/next/Documentation/2019-07-06-17-51-36.bpo-37456.lgAQHn.rst
M Doc/faq/programming.rst

diff --git a/Doc/faq/programming.rst b/Doc/faq/programming.rst
index a00c6a053ef1..a36fa4aefe88 100644
--- a/Doc/faq/programming.rst
+++ b/Doc/faq/programming.rst
@@ -800,10 +800,6 @@ an error::
      File "<stdin>", line 1, in <module>
    TypeError: pow() takes no keyword arguments
 
-Note that as of this writing this is only documentational and no valid syntax
-in Python, although there is :pep:`570`, which proposes a syntax for
-position-only parameters in Python.
-
 
 Numbers and strings
 ===================
diff --git a/Misc/NEWS.d/next/Documentation/2019-07-06-17-51-36.bpo-37456.lgAQHn.rst b/Misc/NEWS.d/next/Documentation/2019-07-06-17-51-36.bpo-37456.lgAQHn.rst
new file mode 100644
index 000000000000..4d158733b0ea
--- /dev/null
+++ b/Misc/NEWS.d/next/Documentation/2019-07-06-17-51-36.bpo-37456.lgAQHn.rst
@@ -0,0 +1 @@
+Slash ('/') is now part of syntax.


From webhook-mailer at python.org  Sat Jul  6 21:20:20 2019
From: webhook-mailer at python.org (Terry Jan Reedy)
Date: Sun, 07 Jul 2019 01:20:20 -0000
Subject: [Python-checkins] bpo-37478: Specify possible exceptions for
 os.chdir() (GH-14611)
Message-ID: <mailman.277.1562462421.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/0717b4d9b3899c5c2ca13031e4ff619a15a4d368
commit: 0717b4d9b3899c5c2ca13031e4ff619a15a4d368
branch: master
author: Kyle Stanley <aeros167 at gmail.com>
committer: Terry Jan Reedy <tjreedy at udel.edu>
date: 2019-07-06T21:20:15-04:00
summary:

bpo-37478: Specify possible exceptions for os.chdir() (GH-14611)

files:
A Misc/NEWS.d/next/Documentation/2019-07-06-00-57-27.bpo-37478.B0ioLw.rst
M Doc/library/os.rst

diff --git a/Doc/library/os.rst b/Doc/library/os.rst
index 6e8df88cf052..760c05c6e52d 100644
--- a/Doc/library/os.rst
+++ b/Doc/library/os.rst
@@ -1599,6 +1599,9 @@ features:
    This function can support :ref:`specifying a file descriptor <path_fd>`.  The
    descriptor must refer to an opened directory, not an open file.
 
+   This function can raise :exc:`OSError` subclasses such as
+   :exc:`FileNotFoundError`, :exc:`PermissionError`, and :exc:`NotADirectoryError`.
+
    .. versionadded:: 3.3
       Added support for specifying *path* as a file descriptor
       on some platforms.
diff --git a/Misc/NEWS.d/next/Documentation/2019-07-06-00-57-27.bpo-37478.B0ioLw.rst b/Misc/NEWS.d/next/Documentation/2019-07-06-00-57-27.bpo-37478.B0ioLw.rst
new file mode 100644
index 000000000000..55b136621762
--- /dev/null
+++ b/Misc/NEWS.d/next/Documentation/2019-07-06-00-57-27.bpo-37478.B0ioLw.rst
@@ -0,0 +1 @@
+Added possible exceptions to the description of os.chdir().
\ No newline at end of file


From webhook-mailer at python.org  Sat Jul  6 22:18:53 2019
From: webhook-mailer at python.org (Terry Jan Reedy)
Date: Sun, 07 Jul 2019 02:18:53 -0000
Subject: [Python-checkins] bpo-37478: Specify possible exceptions for
 os.chdir() (GH-14611) (GH-14629)
Message-ID: <mailman.278.1562465934.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/4e6bfc4c605d92d2395fbcded9cf45cdd1ced810
commit: 4e6bfc4c605d92d2395fbcded9cf45cdd1ced810
branch: 3.8
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: Terry Jan Reedy <tjreedy at udel.edu>
date: 2019-07-06T22:18:50-04:00
summary:

bpo-37478: Specify possible exceptions for os.chdir() (GH-14611) (GH-14629)

(cherry picked from commit 0717b4d9b3899c5c2ca13031e4ff619a15a4d368)

Co-authored-by: Kyle Stanley <aeros167 at gmail.com>

files:
A Misc/NEWS.d/next/Documentation/2019-07-06-00-57-27.bpo-37478.B0ioLw.rst
M Doc/library/os.rst

diff --git a/Doc/library/os.rst b/Doc/library/os.rst
index 6e8df88cf052..760c05c6e52d 100644
--- a/Doc/library/os.rst
+++ b/Doc/library/os.rst
@@ -1599,6 +1599,9 @@ features:
    This function can support :ref:`specifying a file descriptor <path_fd>`.  The
    descriptor must refer to an opened directory, not an open file.
 
+   This function can raise :exc:`OSError` subclasses such as
+   :exc:`FileNotFoundError`, :exc:`PermissionError`, and :exc:`NotADirectoryError`.
+
    .. versionadded:: 3.3
       Added support for specifying *path* as a file descriptor
       on some platforms.
diff --git a/Misc/NEWS.d/next/Documentation/2019-07-06-00-57-27.bpo-37478.B0ioLw.rst b/Misc/NEWS.d/next/Documentation/2019-07-06-00-57-27.bpo-37478.B0ioLw.rst
new file mode 100644
index 000000000000..55b136621762
--- /dev/null
+++ b/Misc/NEWS.d/next/Documentation/2019-07-06-00-57-27.bpo-37478.B0ioLw.rst
@@ -0,0 +1 @@
+Added possible exceptions to the description of os.chdir().
\ No newline at end of file


From webhook-mailer at python.org  Sat Jul  6 22:19:11 2019
From: webhook-mailer at python.org (Terry Jan Reedy)
Date: Sun, 07 Jul 2019 02:19:11 -0000
Subject: [Python-checkins] bpo-37478: Specify possible exceptions for
 os.chdir() (GH-14611) (GH-14630)
Message-ID: <mailman.279.1562465952.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/1dd65075955337183ba2f78cb11a1eec2466dc74
commit: 1dd65075955337183ba2f78cb11a1eec2466dc74
branch: 3.7
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: Terry Jan Reedy <tjreedy at udel.edu>
date: 2019-07-06T22:19:08-04:00
summary:

bpo-37478: Specify possible exceptions for os.chdir() (GH-14611) (GH-14630)

(cherry picked from commit 0717b4d9b3899c5c2ca13031e4ff619a15a4d368)

Co-authored-by: Kyle Stanley <aeros167 at gmail.com>

files:
A Misc/NEWS.d/next/Documentation/2019-07-06-00-57-27.bpo-37478.B0ioLw.rst
M Doc/library/os.rst

diff --git a/Doc/library/os.rst b/Doc/library/os.rst
index 63d118d40f9a..856ef2b2dbe4 100644
--- a/Doc/library/os.rst
+++ b/Doc/library/os.rst
@@ -1566,6 +1566,9 @@ features:
    This function can support :ref:`specifying a file descriptor <path_fd>`.  The
    descriptor must refer to an opened directory, not an open file.
 
+   This function can raise :exc:`OSError` subclasses such as
+   :exc:`FileNotFoundError`, :exc:`PermissionError`, and :exc:`NotADirectoryError`.
+
    .. versionadded:: 3.3
       Added support for specifying *path* as a file descriptor
       on some platforms.
diff --git a/Misc/NEWS.d/next/Documentation/2019-07-06-00-57-27.bpo-37478.B0ioLw.rst b/Misc/NEWS.d/next/Documentation/2019-07-06-00-57-27.bpo-37478.B0ioLw.rst
new file mode 100644
index 000000000000..55b136621762
--- /dev/null
+++ b/Misc/NEWS.d/next/Documentation/2019-07-06-00-57-27.bpo-37478.B0ioLw.rst
@@ -0,0 +1 @@
+Added possible exceptions to the description of os.chdir().
\ No newline at end of file


From webhook-mailer at python.org  Sat Jul  6 22:44:04 2019
From: webhook-mailer at python.org (Terry Jan Reedy)
Date: Sun, 07 Jul 2019 02:44:04 -0000
Subject: [Python-checkins] bpo-37478: Add missing 'and'. (GH-14631)
Message-ID: <mailman.280.1562467446.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/a9b40e4546ca631e5ab41376b5b72e8f296f557d
commit: a9b40e4546ca631e5ab41376b5b72e8f296f557d
branch: master
author: Terry Jan Reedy <tjreedy at udel.edu>
committer: GitHub <noreply at github.com>
date: 2019-07-06T22:44:01-04:00
summary:

bpo-37478: Add missing 'and'. (GH-14631)

files:
M Doc/library/os.rst

diff --git a/Doc/library/os.rst b/Doc/library/os.rst
index 760c05c6e52d..519d5581603b 100644
--- a/Doc/library/os.rst
+++ b/Doc/library/os.rst
@@ -1599,7 +1599,7 @@ features:
    This function can support :ref:`specifying a file descriptor <path_fd>`.  The
    descriptor must refer to an opened directory, not an open file.
 
-   This function can raise :exc:`OSError` subclasses such as
+   This function can raise :exc:`OSError` and subclasses such as
    :exc:`FileNotFoundError`, :exc:`PermissionError`, and :exc:`NotADirectoryError`.
 
    .. versionadded:: 3.3


From webhook-mailer at python.org  Sat Jul  6 22:49:42 2019
From: webhook-mailer at python.org (Miss Islington (bot))
Date: Sun, 07 Jul 2019 02:49:42 -0000
Subject: [Python-checkins] bpo-37478: Add missing 'and'. (GH-14631)
Message-ID: <mailman.281.1562467784.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/e841a54206c65770aeb2b936cdc830dd4ed8bf9e
commit: e841a54206c65770aeb2b936cdc830dd4ed8bf9e
branch: 3.7
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: GitHub <noreply at github.com>
date: 2019-07-06T19:49:39-07:00
summary:

bpo-37478: Add missing 'and'. (GH-14631)

(cherry picked from commit a9b40e4546ca631e5ab41376b5b72e8f296f557d)

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

files:
M Doc/library/os.rst

diff --git a/Doc/library/os.rst b/Doc/library/os.rst
index 856ef2b2dbe4..24f14480ae04 100644
--- a/Doc/library/os.rst
+++ b/Doc/library/os.rst
@@ -1566,7 +1566,7 @@ features:
    This function can support :ref:`specifying a file descriptor <path_fd>`.  The
    descriptor must refer to an opened directory, not an open file.
 
-   This function can raise :exc:`OSError` subclasses such as
+   This function can raise :exc:`OSError` and subclasses such as
    :exc:`FileNotFoundError`, :exc:`PermissionError`, and :exc:`NotADirectoryError`.
 
    .. versionadded:: 3.3


From webhook-mailer at python.org  Sat Jul  6 22:50:52 2019
From: webhook-mailer at python.org (Miss Islington (bot))
Date: Sun, 07 Jul 2019 02:50:52 -0000
Subject: [Python-checkins] bpo-37478: Add missing 'and'. (GH-14631)
Message-ID: <mailman.282.1562467854.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/e414aa9cb002427a39dfd157cdad156336f93ca9
commit: e414aa9cb002427a39dfd157cdad156336f93ca9
branch: 3.8
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: GitHub <noreply at github.com>
date: 2019-07-06T19:50:48-07:00
summary:

bpo-37478: Add missing 'and'. (GH-14631)

(cherry picked from commit a9b40e4546ca631e5ab41376b5b72e8f296f557d)

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

files:
M Doc/library/os.rst

diff --git a/Doc/library/os.rst b/Doc/library/os.rst
index 760c05c6e52d..519d5581603b 100644
--- a/Doc/library/os.rst
+++ b/Doc/library/os.rst
@@ -1599,7 +1599,7 @@ features:
    This function can support :ref:`specifying a file descriptor <path_fd>`.  The
    descriptor must refer to an opened directory, not an open file.
 
-   This function can raise :exc:`OSError` subclasses such as
+   This function can raise :exc:`OSError` and subclasses such as
    :exc:`FileNotFoundError`, :exc:`PermissionError`, and :exc:`NotADirectoryError`.
 
    .. versionadded:: 3.3


From webhook-mailer at python.org  Sun Jul  7 11:40:31 2019
From: webhook-mailer at python.org (Xiang Zhang)
Date: Sun, 07 Jul 2019 15:40:31 -0000
Subject: [Python-checkins] bpo-37513: Change ValueError to TypeError in an
 example in ctypes doc (GH-14615)
Message-ID: <mailman.283.1562514031.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/f6cdd3ff687ebbf8209d793a18a042ea495c4aeb
commit: f6cdd3ff687ebbf8209d793a18a042ea495c4aeb
branch: master
author: Hai Shi <shihai1992 at gmail.com>
committer: Xiang Zhang <angwerzx at 126.com>
date: 2019-07-07T23:40:07+08:00
summary:

bpo-37513: Change ValueError to TypeError in an example in ctypes doc (GH-14615)

files:
M Doc/library/ctypes.rst

diff --git a/Doc/library/ctypes.rst b/Doc/library/ctypes.rst
index 2c57cc7ec427..680703d4483f 100644
--- a/Doc/library/ctypes.rst
+++ b/Doc/library/ctypes.rst
@@ -576,7 +576,7 @@ Here is a simple example of a POINT structure, which contains two integers named
    >>> POINT(1, 2, 3)
    Traceback (most recent call last):
      File "<stdin>", line 1, in <module>
-   ValueError: too many initializers
+   TypeError: too many initializers
    >>>
 
 You can, however, build much more complicated structures.  A structure can


From webhook-mailer at python.org  Sun Jul  7 11:46:06 2019
From: webhook-mailer at python.org (Miss Islington (bot))
Date: Sun, 07 Jul 2019 15:46:06 -0000
Subject: [Python-checkins] bpo-37513: Change ValueError to TypeError in an
 example in ctypes doc (GH-14615)
Message-ID: <mailman.284.1562514367.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/bc0a6ced30267d4e21e7566bfd6d14b30d6d1604
commit: bc0a6ced30267d4e21e7566bfd6d14b30d6d1604
branch: 3.7
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: GitHub <noreply at github.com>
date: 2019-07-07T08:45:59-07:00
summary:

bpo-37513: Change ValueError to TypeError in an example in ctypes doc (GH-14615)

(cherry picked from commit f6cdd3ff687ebbf8209d793a18a042ea495c4aeb)

Co-authored-by: Hai Shi <shihai1992 at gmail.com>

files:
M Doc/library/ctypes.rst

diff --git a/Doc/library/ctypes.rst b/Doc/library/ctypes.rst
index 60a2ec1c5e89..46a9d23ac392 100644
--- a/Doc/library/ctypes.rst
+++ b/Doc/library/ctypes.rst
@@ -576,7 +576,7 @@ Here is a simple example of a POINT structure, which contains two integers named
    >>> POINT(1, 2, 3)
    Traceback (most recent call last):
      File "<stdin>", line 1, in <module>
-   ValueError: too many initializers
+   TypeError: too many initializers
    >>>
 
 You can, however, build much more complicated structures.  A structure can


From webhook-mailer at python.org  Sun Jul  7 11:46:50 2019
From: webhook-mailer at python.org (Miss Islington (bot))
Date: Sun, 07 Jul 2019 15:46:50 -0000
Subject: [Python-checkins] bpo-37513: Change ValueError to TypeError in an
 example in ctypes doc (GH-14615)
Message-ID: <mailman.285.1562514412.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/3f7d0c9665ca546bb0073376cb83e31dd13b48d9
commit: 3f7d0c9665ca546bb0073376cb83e31dd13b48d9
branch: 3.8
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: GitHub <noreply at github.com>
date: 2019-07-07T08:46:46-07:00
summary:

bpo-37513: Change ValueError to TypeError in an example in ctypes doc (GH-14615)

(cherry picked from commit f6cdd3ff687ebbf8209d793a18a042ea495c4aeb)

Co-authored-by: Hai Shi <shihai1992 at gmail.com>

files:
M Doc/library/ctypes.rst

diff --git a/Doc/library/ctypes.rst b/Doc/library/ctypes.rst
index 2c57cc7ec427..680703d4483f 100644
--- a/Doc/library/ctypes.rst
+++ b/Doc/library/ctypes.rst
@@ -576,7 +576,7 @@ Here is a simple example of a POINT structure, which contains two integers named
    >>> POINT(1, 2, 3)
    Traceback (most recent call last):
      File "<stdin>", line 1, in <module>
-   ValueError: too many initializers
+   TypeError: too many initializers
    >>>
 
 You can, however, build much more complicated structures.  A structure can


From webhook-mailer at python.org  Sun Jul  7 11:59:18 2019
From: webhook-mailer at python.org (Miss Islington (bot))
Date: Sun, 07 Jul 2019 15:59:18 -0000
Subject: [Python-checkins] bpo-37513: Change ValueError to TypeError in an
 example in ctypes doc (GH-14615)
Message-ID: <mailman.286.1562515159.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/00bf4d64ecb01027be40c32d822e47e55d6b5c76
commit: 00bf4d64ecb01027be40c32d822e47e55d6b5c76
branch: 2.7
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: GitHub <noreply at github.com>
date: 2019-07-07T08:59:14-07:00
summary:

bpo-37513: Change ValueError to TypeError in an example in ctypes doc (GH-14615)

(cherry picked from commit f6cdd3ff687ebbf8209d793a18a042ea495c4aeb)

Co-authored-by: Hai Shi <shihai1992 at gmail.com>

files:
M Doc/library/ctypes.rst

diff --git a/Doc/library/ctypes.rst b/Doc/library/ctypes.rst
index df9ccbf39084..6a5299145f95 100644
--- a/Doc/library/ctypes.rst
+++ b/Doc/library/ctypes.rst
@@ -565,7 +565,7 @@ Here is a simple example of a POINT structure, which contains two integers named
    >>> POINT(1, 2, 3)
    Traceback (most recent call last):
      File "<stdin>", line 1, in <module>
-   ValueError: too many initializers
+   TypeError: too many initializers
    >>>
 
 You can, however, build much more complicated structures.  A structure can


From webhook-mailer at python.org  Sun Jul  7 17:37:54 2019
From: webhook-mailer at python.org (Jason R. Coombs)
Date: Sun, 07 Jul 2019 21:37:54 -0000
Subject: [Python-checkins] bpo-37520: Correct behavior for
 zipfile.Path.parent (GH-14638)
Message-ID: <mailman.287.1562535475.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/38f44b4a4adc37e8f5f8971917d8b3145f351a56
commit: 38f44b4a4adc37e8f5f8971917d8b3145f351a56
branch: master
author: Jason R. Coombs <jaraco at jaraco.com>
committer: GitHub <noreply at github.com>
date: 2019-07-07T17:37:50-04:00
summary:

bpo-37520: Correct behavior for zipfile.Path.parent (GH-14638)

* bpo-37520: Correct behavior for zipfile.Path.parent

* ?? Added by blurb_it.

files:
A Misc/NEWS.d/next/Library/2019-07-07-21-09-08.bpo-37520.Gg0KD6.rst
M Lib/test/test_zipfile.py
M Lib/zipfile.py

diff --git a/Lib/test/test_zipfile.py b/Lib/test/test_zipfile.py
index 19b550f80187..0c8ffcdbf14a 100644
--- a/Lib/test/test_zipfile.py
+++ b/Lib/test/test_zipfile.py
@@ -2514,5 +2514,16 @@ def test_parent(self):
             assert (root / 'a').parent.at == ''
             assert (root / 'a' / 'b').parent.at == 'a/'
 
+    def test_dir_parent(self):
+        for zipfile_abcde in self.zipfile_abcde():
+            root = zipfile.Path(zipfile_abcde)
+            assert (root / 'b').parent.at == ''
+            assert (root / 'b/').parent.at == ''
+
+    def test_missing_dir_parent(self):
+        for zipfile_abcde in self.zipfile_abcde():
+            root = zipfile.Path(zipfile_abcde)
+            assert (root / 'missing dir/').parent.at == ''
+
 if __name__ == "__main__":
     unittest.main()
diff --git a/Lib/zipfile.py b/Lib/zipfile.py
index 62f2fd27d3ce..3c1f1235034a 100644
--- a/Lib/zipfile.py
+++ b/Lib/zipfile.py
@@ -2236,7 +2236,7 @@ def _add_implied_dirs(names):
 
     @property
     def parent(self):
-        parent_at = posixpath.dirname(self.at)
+        parent_at = posixpath.dirname(self.at.rstrip('/'))
         if parent_at:
             parent_at += '/'
         return self._next(parent_at)
diff --git a/Misc/NEWS.d/next/Library/2019-07-07-21-09-08.bpo-37520.Gg0KD6.rst b/Misc/NEWS.d/next/Library/2019-07-07-21-09-08.bpo-37520.Gg0KD6.rst
new file mode 100644
index 000000000000..6584d3ebe1ed
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2019-07-07-21-09-08.bpo-37520.Gg0KD6.rst
@@ -0,0 +1 @@
+Correct behavior for zipfile.Path.parent when the path object identifies a subdirectory.
\ No newline at end of file


From webhook-mailer at python.org  Sun Jul  7 18:05:57 2019
From: webhook-mailer at python.org (Jason R. Coombs)
Date: Sun, 07 Jul 2019 22:05:57 -0000
Subject: [Python-checkins] bpo-37520: Correct behavior for
 zipfile.Path.parent (GH-14638) (GH-14641)
Message-ID: <mailman.288.1562537158.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/66905d14672517d50dc8ba516b9839f9ddbcc131
commit: 66905d14672517d50dc8ba516b9839f9ddbcc131
branch: 3.8
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: Jason R. Coombs <jaraco at jaraco.com>
date: 2019-07-07T18:05:53-04:00
summary:

bpo-37520: Correct behavior for zipfile.Path.parent (GH-14638) (GH-14641)

* bpo-37520: Correct behavior for zipfile.Path.parent

* ?? Added by blurb_it.
(cherry picked from commit 38f44b4a4adc37e8f5f8971917d8b3145f351a56)

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

files:
A Misc/NEWS.d/next/Library/2019-07-07-21-09-08.bpo-37520.Gg0KD6.rst
M Lib/test/test_zipfile.py
M Lib/zipfile.py

diff --git a/Lib/test/test_zipfile.py b/Lib/test/test_zipfile.py
index 19b550f80187..0c8ffcdbf14a 100644
--- a/Lib/test/test_zipfile.py
+++ b/Lib/test/test_zipfile.py
@@ -2514,5 +2514,16 @@ def test_parent(self):
             assert (root / 'a').parent.at == ''
             assert (root / 'a' / 'b').parent.at == 'a/'
 
+    def test_dir_parent(self):
+        for zipfile_abcde in self.zipfile_abcde():
+            root = zipfile.Path(zipfile_abcde)
+            assert (root / 'b').parent.at == ''
+            assert (root / 'b/').parent.at == ''
+
+    def test_missing_dir_parent(self):
+        for zipfile_abcde in self.zipfile_abcde():
+            root = zipfile.Path(zipfile_abcde)
+            assert (root / 'missing dir/').parent.at == ''
+
 if __name__ == "__main__":
     unittest.main()
diff --git a/Lib/zipfile.py b/Lib/zipfile.py
index 62f2fd27d3ce..3c1f1235034a 100644
--- a/Lib/zipfile.py
+++ b/Lib/zipfile.py
@@ -2236,7 +2236,7 @@ def _add_implied_dirs(names):
 
     @property
     def parent(self):
-        parent_at = posixpath.dirname(self.at)
+        parent_at = posixpath.dirname(self.at.rstrip('/'))
         if parent_at:
             parent_at += '/'
         return self._next(parent_at)
diff --git a/Misc/NEWS.d/next/Library/2019-07-07-21-09-08.bpo-37520.Gg0KD6.rst b/Misc/NEWS.d/next/Library/2019-07-07-21-09-08.bpo-37520.Gg0KD6.rst
new file mode 100644
index 000000000000..6584d3ebe1ed
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2019-07-07-21-09-08.bpo-37520.Gg0KD6.rst
@@ -0,0 +1 @@
+Correct behavior for zipfile.Path.parent when the path object identifies a subdirectory.
\ No newline at end of file


From webhook-mailer at python.org  Mon Jul  8 04:19:33 2019
From: webhook-mailer at python.org (Inada Naoki)
Date: Mon, 08 Jul 2019 08:19:33 -0000
Subject: [Python-checkins] bpo-37337: Add _PyObject_CallMethodNoArgs()
 (GH-14267)
Message-ID: <mailman.289.1562573974.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/762f93ff2efd6b7ef0177cad57939c0ab2002eac
commit: 762f93ff2efd6b7ef0177cad57939c0ab2002eac
branch: master
author: Jeroen Demeyer <J.Demeyer at UGent.be>
committer: Inada Naoki <songofacandy at gmail.com>
date: 2019-07-08T17:19:25+09:00
summary:

bpo-37337: Add _PyObject_CallMethodNoArgs() (GH-14267)

files:
M Doc/c-api/object.rst
M Include/cpython/abstract.h
M Misc/NEWS.d/next/C API/2019-06-19-12-06-31.bpo-37337.gXIGyU.rst
M Modules/_asynciomodule.c
M Modules/_collectionsmodule.c
M Modules/_ctypes/_ctypes.c
M Modules/_cursesmodule.c
M Modules/_datetimemodule.c
M Modules/_dbmmodule.c
M Modules/_gdbmmodule.c
M Modules/_io/_iomodule.c
M Modules/_io/bufferedio.c
M Modules/_io/iobase.c
M Modules/_io/stringio.c
M Modules/_io/textio.c
M Modules/_pickle.c
M Modules/_posixsubprocess.c
M Modules/_sqlite/connection.c
M Modules/_sqlite/cursor.c
M Modules/_sqlite/module.c
M Modules/_threadmodule.c
M Modules/faulthandler.c
M Modules/mmapmodule.c
M Modules/ossaudiodev.c
M Modules/selectmodule.c
M Objects/abstract.c
M Objects/descrobject.c
M Objects/fileobject.c
M Objects/odictobject.c
M Objects/typeobject.c
M Objects/weakrefobject.c
M Python/bltinmodule.c
M Python/errors.c
M Python/import.c
M Python/pylifecycle.c
M Python/pythonrun.c
M Python/traceback.c

diff --git a/Doc/c-api/object.rst b/Doc/c-api/object.rst
index 6d138558d60a..8ca034452954 100644
--- a/Doc/c-api/object.rst
+++ b/Doc/c-api/object.rst
@@ -364,6 +364,17 @@ Object Protocol
    *NULL* on failure.
 
 
+.. c:function:: PyObject* _PyObject_CallMethodNoArgs(PyObject *obj, PyObject *name)
+
+   Call a method of the Python object *obj* without arguments,
+   where the name of the method is given as a Python string object in *name*.
+
+   Return the result of the call on success, or raise an exception and return
+   *NULL* on failure.
+
+   .. versionadded:: 3.9
+
+
 .. c:function:: PyObject* _PyObject_Vectorcall(PyObject *callable, PyObject *const *args, size_t nargsf, PyObject *kwnames)
 
    Call a callable Python object *callable*, using
diff --git a/Include/cpython/abstract.h b/Include/cpython/abstract.h
index c9a8a0754588..e9a23195f414 100644
--- a/Include/cpython/abstract.h
+++ b/Include/cpython/abstract.h
@@ -156,6 +156,13 @@ PyAPI_FUNC(PyObject *) _PyObject_VectorcallMethod(
     PyObject *name, PyObject *const *args,
     size_t nargsf, PyObject *kwnames);
 
+static inline PyObject *
+_PyObject_CallMethodNoArgs(PyObject *self, PyObject *name)
+{
+    return _PyObject_VectorcallMethod(name, &self,
+           1 | PY_VECTORCALL_ARGUMENTS_OFFSET, NULL);
+}
+
 /* Like PyObject_CallMethod(), but expect a _Py_Identifier*
    as the method name. */
 PyAPI_FUNC(PyObject *) _PyObject_CallMethodId(PyObject *obj,
@@ -184,6 +191,13 @@ _PyObject_VectorcallMethodId(
     return _PyObject_VectorcallMethod(oname, args, nargsf, kwnames);
 }
 
+static inline PyObject *
+_PyObject_CallMethodIdNoArgs(PyObject *self, _Py_Identifier *name)
+{
+    return _PyObject_VectorcallMethodId(name, &self,
+           1 | PY_VECTORCALL_ARGUMENTS_OFFSET, NULL);
+}
+
 PyAPI_FUNC(int) _PyObject_HasLen(PyObject *o);
 
 /* Guess the size of object 'o' using len(o) or o.__length_hint__().
diff --git a/Misc/NEWS.d/next/C API/2019-06-19-12-06-31.bpo-37337.gXIGyU.rst b/Misc/NEWS.d/next/C API/2019-06-19-12-06-31.bpo-37337.gXIGyU.rst
index 96ba2d0ec085..df0e807e1166 100644
--- a/Misc/NEWS.d/next/C API/2019-06-19-12-06-31.bpo-37337.gXIGyU.rst	
+++ b/Misc/NEWS.d/next/C API/2019-06-19-12-06-31.bpo-37337.gXIGyU.rst	
@@ -1 +1,2 @@
-Add :c:func:`_PyObject_VectorcallMethod` for fast calling of methods.
+Add fast functions for calling methods: :c:func:`_PyObject_VectorcallMethod`
+and :c:func:`_PyObject_CallMethodNoArgs`
diff --git a/Modules/_asynciomodule.c b/Modules/_asynciomodule.c
index 443acc5723c3..6c469d2a2ec5 100644
--- a/Modules/_asynciomodule.c
+++ b/Modules/_asynciomodule.c
@@ -332,7 +332,7 @@ get_event_loop(void)
         return NULL;
     }
 
-    loop = _PyObject_CallMethodId(policy, &PyId_get_event_loop, NULL);
+    loop = _PyObject_CallMethodIdNoArgs(policy, &PyId_get_event_loop);
     Py_DECREF(policy);
     return loop;
 }
@@ -493,7 +493,7 @@ future_init(FutureObj *fut, PyObject *loop)
     }
     fut->fut_loop = loop;
 
-    res = _PyObject_CallMethodId(fut->fut_loop, &PyId_get_debug, NULL);
+    res = _PyObject_CallMethodIdNoArgs(fut->fut_loop, &PyId_get_debug);
     if (res == NULL) {
         return -1;
     }
@@ -1295,9 +1295,8 @@ FutureObj_repr(FutureObj *fut)
 
     ENSURE_FUTURE_ALIVE(fut)
 
-    PyObject *rinfo = _PyObject_CallMethodIdObjArgs((PyObject*)fut,
-                                                    &PyId__repr_info,
-                                                    NULL);
+    PyObject *rinfo = _PyObject_CallMethodIdNoArgs((PyObject*)fut,
+                                                   &PyId__repr_info);
     if (rinfo == NULL) {
         return NULL;
     }
@@ -2197,8 +2196,7 @@ _asyncio_Task_cancel_impl(TaskObj *self)
         PyObject *res;
         int is_true;
 
-        res = _PyObject_CallMethodId(
-            self->task_fut_waiter, &PyId_cancel, NULL);
+        res = _PyObject_CallMethodIdNoArgs(self->task_fut_waiter, &PyId_cancel);
         if (res == NULL) {
             return NULL;
         }
@@ -2735,7 +2733,7 @@ task_step_impl(TaskObj *task, PyObject *exc)
         if (task->task_must_cancel) {
             PyObject *r;
             int is_true;
-            r = _PyObject_CallMethodId(result, &PyId_cancel, NULL);
+            r = _PyObject_CallMethodIdNoArgs(result, &PyId_cancel);
             if (r == NULL) {
                 return NULL;
             }
@@ -2826,7 +2824,7 @@ task_step_impl(TaskObj *task, PyObject *exc)
         if (task->task_must_cancel) {
             PyObject *r;
             int is_true;
-            r = _PyObject_CallMethodId(result, &PyId_cancel, NULL);
+            r = _PyObject_CallMethodIdNoArgs(result, &PyId_cancel);
             if (r == NULL) {
                 return NULL;
             }
diff --git a/Modules/_collectionsmodule.c b/Modules/_collectionsmodule.c
index 7e9cf8a283a2..1d23973fd056 100644
--- a/Modules/_collectionsmodule.c
+++ b/Modules/_collectionsmodule.c
@@ -2039,7 +2039,7 @@ defdict_reduce(defdictobject *dd, PyObject *Py_UNUSED(ignored))
         args = PyTuple_Pack(1, dd->default_factory);
     if (args == NULL)
         return NULL;
-    items = _PyObject_CallMethodId((PyObject *)dd, &PyId_items, NULL);
+    items = _PyObject_CallMethodIdNoArgs((PyObject *)dd, &PyId_items);
     if (items == NULL) {
         Py_DECREF(args);
         return NULL;
diff --git a/Modules/_ctypes/_ctypes.c b/Modules/_ctypes/_ctypes.c
index c6ae487b4cf0..c1941c16400e 100644
--- a/Modules/_ctypes/_ctypes.c
+++ b/Modules/_ctypes/_ctypes.c
@@ -3974,7 +3974,7 @@ _build_result(PyObject *result, PyObject *callargs,
             _Py_IDENTIFIER(__ctypes_from_outparam__);
 
             v = PyTuple_GET_ITEM(callargs, i);
-            v = _PyObject_CallMethodId(v, &PyId___ctypes_from_outparam__, NULL);
+            v = _PyObject_CallMethodIdNoArgs(v, &PyId___ctypes_from_outparam__);
             if (v == NULL || numretvals == 1) {
                 Py_DECREF(callargs);
                 return v;
diff --git a/Modules/_cursesmodule.c b/Modules/_cursesmodule.c
index 2435e1c12955..8595b6282c1b 100644
--- a/Modules/_cursesmodule.c
+++ b/Modules/_cursesmodule.c
@@ -2906,7 +2906,7 @@ _curses_getwin(PyObject *module, PyObject *file)
     if (_Py_set_inheritable(fileno(fp), 0, NULL) < 0)
         goto error;
 
-    data = _PyObject_CallMethodId(file, &PyId_read, NULL);
+    data = _PyObject_CallMethodIdNoArgs(file, &PyId_read);
     if (data == NULL)
         goto error;
     if (!PyBytes_Check(data)) {
diff --git a/Modules/_datetimemodule.c b/Modules/_datetimemodule.c
index 2e0211cbbef8..0546368d1df7 100644
--- a/Modules/_datetimemodule.c
+++ b/Modules/_datetimemodule.c
@@ -1659,7 +1659,7 @@ time_time(void)
     if (time != NULL) {
         _Py_IDENTIFIER(time);
 
-        result = _PyObject_CallMethodId(time, &PyId_time, NULL);
+        result = _PyObject_CallMethodIdNoArgs(time, &PyId_time);
         Py_DECREF(time);
     }
     return result;
@@ -1918,7 +1918,7 @@ get_float_as_integer_ratio(PyObject *floatobj)
     PyObject *ratio;
 
     assert(floatobj && PyFloat_Check(floatobj));
-    ratio = _PyObject_CallMethodId(floatobj, &PyId_as_integer_ratio, NULL);
+    ratio = _PyObject_CallMethodIdNoArgs(floatobj, &PyId_as_integer_ratio);
     if (ratio == NULL) {
         return NULL;
     }
@@ -3162,7 +3162,7 @@ date_isoformat(PyDateTime_Date *self, PyObject *Py_UNUSED(ignored))
 static PyObject *
 date_str(PyDateTime_Date *self)
 {
-    return _PyObject_CallMethodId((PyObject *)self, &PyId_isoformat, NULL);
+    return _PyObject_CallMethodIdNoArgs((PyObject *)self, &PyId_isoformat);
 }
 
 
@@ -3188,7 +3188,7 @@ date_strftime(PyDateTime_Date *self, PyObject *args, PyObject *kw)
                                       &format))
         return NULL;
 
-    tuple = _PyObject_CallMethodId((PyObject *)self, &PyId_timetuple, NULL);
+    tuple = _PyObject_CallMethodIdNoArgs((PyObject *)self, &PyId_timetuple);
     if (tuple == NULL)
         return NULL;
     result = wrap_strftime((PyObject *)self, format, tuple,
@@ -4175,7 +4175,7 @@ time_repr(PyDateTime_Time *self)
 static PyObject *
 time_str(PyDateTime_Time *self)
 {
-    return _PyObject_CallMethodId((PyObject *)self, &PyId_isoformat, NULL);
+    return _PyObject_CallMethodIdNoArgs((PyObject *)self, &PyId_isoformat);
 }
 
 static PyObject *
diff --git a/Modules/_dbmmodule.c b/Modules/_dbmmodule.c
index ea0a9d6fc957..b317b57e7ae5 100644
--- a/Modules/_dbmmodule.c
+++ b/Modules/_dbmmodule.c
@@ -370,7 +370,7 @@ static PyObject *
 dbm__exit__(PyObject *self, PyObject *args)
 {
     _Py_IDENTIFIER(close);
-    return _PyObject_CallMethodId(self, &PyId_close, NULL);
+    return _PyObject_CallMethodIdNoArgs(self, &PyId_close);
 }
 
 
diff --git a/Modules/_gdbmmodule.c b/Modules/_gdbmmodule.c
index 77e788752506..dd4a348d136c 100644
--- a/Modules/_gdbmmodule.c
+++ b/Modules/_gdbmmodule.c
@@ -497,7 +497,7 @@ static PyObject *
 dbm__exit__(PyObject *self, PyObject *args)
 {
     _Py_IDENTIFIER(close);
-    return _PyObject_CallMethodId(self, &PyId_close, NULL);
+    return _PyObject_CallMethodIdNoArgs(self, &PyId_close);
 }
 
 static PyMethodDef dbm_methods[] = {
diff --git a/Modules/_io/_iomodule.c b/Modules/_io/_iomodule.c
index 5c2f019e840b..96426e0276ab 100644
--- a/Modules/_io/_iomodule.c
+++ b/Modules/_io/_iomodule.c
@@ -400,7 +400,7 @@ _io_open_impl(PyObject *module, PyObject *file, const char *mode,
 
     /* buffering */
     if (buffering < 0) {
-        PyObject *res = _PyObject_CallMethodId(raw, &PyId_isatty, NULL);
+        PyObject *res = _PyObject_CallMethodIdNoArgs(raw, &PyId_isatty);
         if (res == NULL)
             goto error;
         isatty = PyLong_AsLong(res);
@@ -494,7 +494,7 @@ _io_open_impl(PyObject *module, PyObject *file, const char *mode,
     if (result != NULL) {
         PyObject *exc, *val, *tb, *close_result;
         PyErr_Fetch(&exc, &val, &tb);
-        close_result = _PyObject_CallMethodId(result, &PyId_close, NULL);
+        close_result = _PyObject_CallMethodIdNoArgs(result, &PyId_close);
         _PyErr_ChainExceptions(exc, val, tb);
         Py_XDECREF(close_result);
         Py_DECREF(result);
diff --git a/Modules/_io/bufferedio.c b/Modules/_io/bufferedio.c
index 44e12db6a30e..9e7e5f3d0935 100644
--- a/Modules/_io/bufferedio.c
+++ b/Modules/_io/bufferedio.c
@@ -461,7 +461,7 @@ static PyObject *
 buffered_simple_flush(buffered *self, PyObject *args)
 {
     CHECK_INITIALIZED(self)
-    return PyObject_CallMethodObjArgs(self->raw, _PyIO_str_flush, NULL);
+    return _PyObject_CallMethodNoArgs(self->raw, _PyIO_str_flush);
 }
 
 static int
@@ -513,7 +513,7 @@ buffered_close(buffered *self, PyObject *args)
     }
     /* flush() will most probably re-take the lock, so drop it first */
     LEAVE_BUFFERED(self)
-    res = PyObject_CallMethodObjArgs((PyObject *)self, _PyIO_str_flush, NULL);
+    res = _PyObject_CallMethodNoArgs((PyObject *)self, _PyIO_str_flush);
     if (!ENTER_BUFFERED(self))
         return NULL;
     if (res == NULL)
@@ -521,7 +521,7 @@ buffered_close(buffered *self, PyObject *args)
     else
         Py_DECREF(res);
 
-    res = PyObject_CallMethodObjArgs(self->raw, _PyIO_str_close, NULL);
+    res = _PyObject_CallMethodNoArgs(self->raw, _PyIO_str_close);
 
     if (self->buffer) {
         PyMem_Free(self->buffer);
@@ -545,7 +545,7 @@ buffered_detach(buffered *self, PyObject *Py_UNUSED(ignored))
 {
     PyObject *raw, *res;
     CHECK_INITIALIZED(self)
-    res = PyObject_CallMethodObjArgs((PyObject *)self, _PyIO_str_flush, NULL);
+    res = _PyObject_CallMethodNoArgs((PyObject *)self, _PyIO_str_flush);
     if (res == NULL)
         return NULL;
     Py_DECREF(res);
@@ -562,21 +562,21 @@ static PyObject *
 buffered_seekable(buffered *self, PyObject *Py_UNUSED(ignored))
 {
     CHECK_INITIALIZED(self)
-    return PyObject_CallMethodObjArgs(self->raw, _PyIO_str_seekable, NULL);
+    return _PyObject_CallMethodNoArgs(self->raw, _PyIO_str_seekable);
 }
 
 static PyObject *
 buffered_readable(buffered *self, PyObject *Py_UNUSED(ignored))
 {
     CHECK_INITIALIZED(self)
-    return PyObject_CallMethodObjArgs(self->raw, _PyIO_str_readable, NULL);
+    return _PyObject_CallMethodNoArgs(self->raw, _PyIO_str_readable);
 }
 
 static PyObject *
 buffered_writable(buffered *self, PyObject *Py_UNUSED(ignored))
 {
     CHECK_INITIALIZED(self)
-    return PyObject_CallMethodObjArgs(self->raw, _PyIO_str_writable, NULL);
+    return _PyObject_CallMethodNoArgs(self->raw, _PyIO_str_writable);
 }
 
 static PyObject *
@@ -599,14 +599,14 @@ static PyObject *
 buffered_fileno(buffered *self, PyObject *Py_UNUSED(ignored))
 {
     CHECK_INITIALIZED(self)
-    return PyObject_CallMethodObjArgs(self->raw, _PyIO_str_fileno, NULL);
+    return _PyObject_CallMethodNoArgs(self->raw, _PyIO_str_fileno);
 }
 
 static PyObject *
 buffered_isatty(buffered *self, PyObject *Py_UNUSED(ignored))
 {
     CHECK_INITIALIZED(self)
-    return PyObject_CallMethodObjArgs(self->raw, _PyIO_str_isatty, NULL);
+    return _PyObject_CallMethodNoArgs(self->raw, _PyIO_str_isatty);
 }
 
 /* Forward decls */
@@ -670,7 +670,7 @@ _buffered_raw_tell(buffered *self)
 {
     Py_off_t n;
     PyObject *res;
-    res = PyObject_CallMethodObjArgs(self->raw, _PyIO_str_tell, NULL);
+    res = _PyObject_CallMethodNoArgs(self->raw, _PyIO_str_tell);
     if (res == NULL)
         return -1;
     n = PyNumber_AsOff_t(res, PyExc_ValueError);
@@ -1350,8 +1350,8 @@ buffered_iternext(buffered *self)
         line = _buffered_readline(self, -1);
     }
     else {
-        line = PyObject_CallMethodObjArgs((PyObject *)self,
-                                           _PyIO_str_readline, NULL);
+        line = _PyObject_CallMethodNoArgs((PyObject *)self,
+                                             _PyIO_str_readline);
         if (line && !PyBytes_Check(line)) {
             PyErr_Format(PyExc_OSError,
                          "readline() should have returned a bytes object, "
@@ -1566,7 +1566,7 @@ _bufferedreader_read_all(buffered *self)
         }
 
         /* Read until EOF or until read() would block. */
-        data = PyObject_CallMethodObjArgs(self->raw, _PyIO_str_read, NULL);
+        data = _PyObject_CallMethodNoArgs(self->raw, _PyIO_str_read);
         if (data == NULL)
             goto cleanup;
         if (data != Py_None && !PyBytes_Check(data)) {
diff --git a/Modules/_io/iobase.c b/Modules/_io/iobase.c
index 82cc77676523..d51fc944e1a6 100644
--- a/Modules/_io/iobase.c
+++ b/Modules/_io/iobase.c
@@ -235,7 +235,7 @@ _io__IOBase_close_impl(PyObject *self)
         Py_RETURN_NONE;
     }
 
-    res = PyObject_CallMethodObjArgs(self, _PyIO_str_flush, NULL);
+    res = _PyObject_CallMethodNoArgs(self, _PyIO_str_flush);
 
     PyErr_Fetch(&exc, &val, &tb);
     rc = _PyObject_SetAttrId(self, &PyId___IOBase_closed, Py_True);
@@ -281,8 +281,7 @@ iobase_finalize(PyObject *self)
            finalization process. */
         if (_PyObject_SetAttrId(self, &PyId__finalizing, Py_True))
             PyErr_Clear();
-        res = PyObject_CallMethodObjArgs((PyObject *) self, _PyIO_str_close,
-                                          NULL);
+        res = _PyObject_CallMethodNoArgs((PyObject *)self, _PyIO_str_close);
         /* Silencing I/O errors is bad, but printing spurious tracebacks is
            equally as bad, and potentially more frequent (because of
            shutdown issues). */
@@ -383,7 +382,7 @@ _io__IOBase_seekable_impl(PyObject *self)
 PyObject *
 _PyIOBase_check_seekable(PyObject *self, PyObject *args)
 {
-    PyObject *res  = PyObject_CallMethodObjArgs(self, _PyIO_str_seekable, NULL);
+    PyObject *res  = _PyObject_CallMethodNoArgs(self, _PyIO_str_seekable);
     if (res == NULL)
         return NULL;
     if (res != Py_True) {
@@ -416,7 +415,7 @@ _io__IOBase_readable_impl(PyObject *self)
 PyObject *
 _PyIOBase_check_readable(PyObject *self, PyObject *args)
 {
-    PyObject *res  = PyObject_CallMethodObjArgs(self, _PyIO_str_readable, NULL);
+    PyObject *res = _PyObject_CallMethodNoArgs(self, _PyIO_str_readable);
     if (res == NULL)
         return NULL;
     if (res != Py_True) {
@@ -449,7 +448,7 @@ _io__IOBase_writable_impl(PyObject *self)
 PyObject *
 _PyIOBase_check_writable(PyObject *self, PyObject *args)
 {
-    PyObject *res  = PyObject_CallMethodObjArgs(self, _PyIO_str_writable, NULL);
+    PyObject *res = _PyObject_CallMethodNoArgs(self, _PyIO_str_writable);
     if (res == NULL)
         return NULL;
     if (res != Py_True) {
@@ -478,7 +477,7 @@ iobase_enter(PyObject *self, PyObject *args)
 static PyObject *
 iobase_exit(PyObject *self, PyObject *args)
 {
-    return PyObject_CallMethodObjArgs(self, _PyIO_str_close, NULL);
+    return _PyObject_CallMethodNoArgs(self, _PyIO_str_close);
 }
 
 /* Lower-level APIs */
@@ -656,7 +655,7 @@ iobase_iter(PyObject *self)
 static PyObject *
 iobase_iternext(PyObject *self)
 {
-    PyObject *line = PyObject_CallMethodObjArgs(self, _PyIO_str_readline, NULL);
+    PyObject *line = _PyObject_CallMethodNoArgs(self, _PyIO_str_readline);
 
     if (line == NULL)
         return NULL;
@@ -921,7 +920,7 @@ _io__RawIOBase_read_impl(PyObject *self, Py_ssize_t n)
     if (n < 0) {
         _Py_IDENTIFIER(readall);
 
-        return _PyObject_CallMethodId(self, &PyId_readall, NULL);
+        return _PyObject_CallMethodIdNoArgs(self, &PyId_readall);
     }
 
     /* TODO: allocate a bytes object directly instead and manually construct
diff --git a/Modules/_io/stringio.c b/Modules/_io/stringio.c
index 9e9724db2d33..810cad6d63ce 100644
--- a/Modules/_io/stringio.c
+++ b/Modules/_io/stringio.c
@@ -408,8 +408,8 @@ stringio_iternext(stringio *self)
     }
     else {
         /* XXX is subclassing StringIO really supported? */
-        line = PyObject_CallMethodObjArgs((PyObject *)self,
-                                           _PyIO_str_readline, NULL);
+        line = _PyObject_CallMethodNoArgs((PyObject *)self,
+                                             _PyIO_str_readline);
         if (line && !PyUnicode_Check(line)) {
             PyErr_Format(PyExc_OSError,
                          "readline() should have returned a str object, "
diff --git a/Modules/_io/textio.c b/Modules/_io/textio.c
index 021231e4c6b5..ed1dc005c69a 100644
--- a/Modules/_io/textio.c
+++ b/Modules/_io/textio.c
@@ -527,8 +527,8 @@ _io_IncrementalNewlineDecoder_getstate_impl(nldecoder_object *self)
     unsigned long long flag;
 
     if (self->decoder != Py_None) {
-        PyObject *state = PyObject_CallMethodObjArgs(self->decoder,
-           _PyIO_str_getstate, NULL);
+        PyObject *state = _PyObject_CallMethodNoArgs(self->decoder,
+           _PyIO_str_getstate);
         if (state == NULL)
             return NULL;
         if (!PyTuple_Check(state)) {
@@ -601,7 +601,7 @@ _io_IncrementalNewlineDecoder_reset_impl(nldecoder_object *self)
     self->seennl = 0;
     self->pendingcr = 0;
     if (self->decoder != Py_None)
-        return PyObject_CallMethodObjArgs(self->decoder, _PyIO_str_reset, NULL);
+        return _PyObject_CallMethodNoArgs(self->decoder, _PyIO_str_reset);
     else
         Py_RETURN_NONE;
 }
@@ -862,7 +862,7 @@ _textiowrapper_set_decoder(textio *self, PyObject *codec_info,
     PyObject *res;
     int r;
 
-    res = _PyObject_CallMethodId(self->buffer, &PyId_readable, NULL);
+    res = _PyObject_CallMethodIdNoArgs(self->buffer, &PyId_readable);
     if (res == NULL)
         return -1;
 
@@ -917,7 +917,7 @@ _textiowrapper_set_encoder(textio *self, PyObject *codec_info,
     PyObject *res;
     int r;
 
-    res = _PyObject_CallMethodId(self->buffer, &PyId_writable, NULL);
+    res = _PyObject_CallMethodIdNoArgs(self->buffer, &PyId_writable);
     if (res == NULL)
         return -1;
 
@@ -963,8 +963,8 @@ _textiowrapper_fix_encoder_state(textio *self)
 
     self->encoding_start_of_stream = 1;
 
-    PyObject *cookieObj = PyObject_CallMethodObjArgs(
-        self->buffer, _PyIO_str_tell, NULL);
+    PyObject *cookieObj = _PyObject_CallMethodNoArgs(
+        self->buffer, _PyIO_str_tell);
     if (cookieObj == NULL) {
         return -1;
     }
@@ -1126,7 +1126,7 @@ _io_TextIOWrapper___init___impl(textio *self, PyObject *buffer,
         state = IO_STATE();
         if (state == NULL)
             goto error;
-        fileno = _PyObject_CallMethodId(buffer, &PyId_fileno, NULL);
+        fileno = _PyObject_CallMethodIdNoArgs(buffer, &PyId_fileno);
         /* Ignore only AttributeError and UnsupportedOperation */
         if (fileno == NULL) {
             if (PyErr_ExceptionMatches(PyExc_AttributeError) ||
@@ -1241,7 +1241,7 @@ _io_TextIOWrapper___init___impl(textio *self, PyObject *buffer,
         }
     }
 
-    res = _PyObject_CallMethodId(buffer, &PyId_seekable, NULL);
+    res = _PyObject_CallMethodIdNoArgs(buffer, &PyId_seekable);
     if (res == NULL)
         goto error;
     r = PyObject_IsTrue(res);
@@ -1386,7 +1386,7 @@ _io_TextIOWrapper_reconfigure_impl(textio *self, PyObject *encoding,
         return NULL;
     }
 
-    PyObject *res = PyObject_CallMethodObjArgs((PyObject *)self, _PyIO_str_flush, NULL);
+    PyObject *res = _PyObject_CallMethodNoArgs((PyObject *)self, _PyIO_str_flush);
     if (res == NULL) {
         return NULL;
     }
@@ -1525,7 +1525,7 @@ _io_TextIOWrapper_detach_impl(textio *self)
 {
     PyObject *buffer, *res;
     CHECK_ATTACHED(self);
-    res = PyObject_CallMethodObjArgs((PyObject *)self, _PyIO_str_flush, NULL);
+    res = _PyObject_CallMethodNoArgs((PyObject *)self, _PyIO_str_flush);
     if (res == NULL)
         return NULL;
     Py_DECREF(res);
@@ -1720,7 +1720,7 @@ _io_TextIOWrapper_write_impl(textio *self, PyObject *text)
     }
 
     if (needflush) {
-        ret = PyObject_CallMethodObjArgs(self->buffer, _PyIO_str_flush, NULL);
+        ret = _PyObject_CallMethodNoArgs(self->buffer, _PyIO_str_flush);
         if (ret == NULL)
             return NULL;
         Py_DECREF(ret);
@@ -1730,7 +1730,7 @@ _io_TextIOWrapper_write_impl(textio *self, PyObject *text)
     Py_CLEAR(self->snapshot);
 
     if (self->decoder) {
-        ret = _PyObject_CallMethodId(self->decoder, &PyId_reset, NULL);
+        ret = _PyObject_CallMethodIdNoArgs(self->decoder, &PyId_reset);
         if (ret == NULL)
             return NULL;
         Py_DECREF(ret);
@@ -1810,9 +1810,8 @@ textiowrapper_read_chunk(textio *self, Py_ssize_t size_hint)
         /* To prepare for tell(), we need to snapshot a point in the file
          * where the decoder's input buffer is empty.
          */
-
-        PyObject *state = PyObject_CallMethodObjArgs(self->decoder,
-                                                     _PyIO_str_getstate, NULL);
+        PyObject *state = _PyObject_CallMethodNoArgs(self->decoder,
+                                                     _PyIO_str_getstate);
         if (state == NULL)
             return -1;
         /* Given this, we know there was a valid snapshot point
@@ -1935,7 +1934,7 @@ _io_TextIOWrapper_read_impl(textio *self, Py_ssize_t n)
 
     if (n < 0) {
         /* Read everything */
-        PyObject *bytes = _PyObject_CallMethodId(self->buffer, &PyId_read, NULL);
+        PyObject *bytes = _PyObject_CallMethodIdNoArgs(self->buffer, &PyId_read);
         PyObject *decoded;
         if (bytes == NULL)
             goto fail;
@@ -2396,7 +2395,7 @@ _textiowrapper_decoder_setstate(textio *self, cookie_type *cookie)
        utf-16, that we are expecting a BOM).
     */
     if (cookie->start_pos == 0 && cookie->dec_flags == 0)
-        res = PyObject_CallMethodObjArgs(self->decoder, _PyIO_str_reset, NULL);
+        res = _PyObject_CallMethodNoArgs(self->decoder, _PyIO_str_reset);
     else
         res = _PyObject_CallMethodId(self->decoder, &PyId_setstate,
                                      "((yi))", "", cookie->dec_flags);
@@ -2411,7 +2410,7 @@ _textiowrapper_encoder_reset(textio *self, int start_of_stream)
 {
     PyObject *res;
     if (start_of_stream) {
-        res = PyObject_CallMethodObjArgs(self->encoder, _PyIO_str_reset, NULL);
+        res = _PyObject_CallMethodNoArgs(self->encoder, _PyIO_str_reset);
         self->encoding_start_of_stream = 1;
     }
     else {
@@ -2476,7 +2475,7 @@ _io_TextIOWrapper_seek_impl(textio *self, PyObject *cookieObj, int whence)
          * sync the underlying buffer with the current position.
          */
         Py_DECREF(cookieObj);
-        cookieObj = _PyObject_CallMethodId((PyObject *)self, &PyId_tell, NULL);
+        cookieObj = _PyObject_CallMethodIdNoArgs((PyObject *)self, &PyId_tell);
         if (cookieObj == NULL)
             goto fail;
         break;
@@ -2492,7 +2491,7 @@ _io_TextIOWrapper_seek_impl(textio *self, PyObject *cookieObj, int whence)
             goto fail;
         }
 
-        res = _PyObject_CallMethodId((PyObject *)self, &PyId_flush, NULL);
+        res = _PyObject_CallMethodIdNoArgs((PyObject *)self, &PyId_flush);
         if (res == NULL)
             goto fail;
         Py_DECREF(res);
@@ -2500,7 +2499,7 @@ _io_TextIOWrapper_seek_impl(textio *self, PyObject *cookieObj, int whence)
         textiowrapper_set_decoded_chars(self, NULL);
         Py_CLEAR(self->snapshot);
         if (self->decoder) {
-            res = _PyObject_CallMethodId(self->decoder, &PyId_reset, NULL);
+            res = _PyObject_CallMethodIdNoArgs(self->decoder, &PyId_reset);
             if (res == NULL)
                 goto fail;
             Py_DECREF(res);
@@ -2540,7 +2539,7 @@ _io_TextIOWrapper_seek_impl(textio *self, PyObject *cookieObj, int whence)
         goto fail;
     }
 
-    res = PyObject_CallMethodObjArgs((PyObject *)self, _PyIO_str_flush, NULL);
+    res = _PyObject_CallMethodNoArgs((PyObject *)self, _PyIO_str_flush);
     if (res == NULL)
         goto fail;
     Py_DECREF(res);
@@ -2663,12 +2662,12 @@ _io_TextIOWrapper_tell_impl(textio *self)
 
     if (_textiowrapper_writeflush(self) < 0)
         return NULL;
-    res = _PyObject_CallMethodId((PyObject *)self, &PyId_flush, NULL);
+    res = _PyObject_CallMethodIdNoArgs((PyObject *)self, &PyId_flush);
     if (res == NULL)
         goto fail;
     Py_DECREF(res);
 
-    posobj = _PyObject_CallMethodId(self->buffer, &PyId_tell, NULL);
+    posobj = _PyObject_CallMethodIdNoArgs(self->buffer, &PyId_tell);
     if (posobj == NULL)
         goto fail;
 
@@ -2704,15 +2703,15 @@ _io_TextIOWrapper_tell_impl(textio *self)
     chars_to_skip = self->decoded_chars_used;
 
     /* Decoder state will be restored at the end */
-    saved_state = PyObject_CallMethodObjArgs(self->decoder,
-                                             _PyIO_str_getstate, NULL);
+    saved_state = _PyObject_CallMethodNoArgs(self->decoder,
+                                             _PyIO_str_getstate);
     if (saved_state == NULL)
         goto fail;
 
 #define DECODER_GETSTATE() do { \
         PyObject *dec_buffer; \
-        PyObject *_state = PyObject_CallMethodObjArgs(self->decoder, \
-            _PyIO_str_getstate, NULL); \
+        PyObject *_state = _PyObject_CallMethodNoArgs(self->decoder, \
+            _PyIO_str_getstate); \
         if (_state == NULL) \
             goto fail; \
         if (!PyTuple_Check(_state)) { \
@@ -2874,7 +2873,7 @@ _io_TextIOWrapper_truncate_impl(textio *self, PyObject *pos)
 
     CHECK_ATTACHED(self)
 
-    res = PyObject_CallMethodObjArgs((PyObject *) self, _PyIO_str_flush, NULL);
+    res = _PyObject_CallMethodNoArgs((PyObject *)self, _PyIO_str_flush);
     if (res == NULL)
         return NULL;
     Py_DECREF(res);
@@ -2963,7 +2962,7 @@ _io_TextIOWrapper_fileno_impl(textio *self)
 /*[clinic end generated code: output=21490a4c3da13e6c input=c488ca83d0069f9b]*/
 {
     CHECK_ATTACHED(self);
-    return _PyObject_CallMethodId(self->buffer, &PyId_fileno, NULL);
+    return _PyObject_CallMethodIdNoArgs(self->buffer, &PyId_fileno);
 }
 
 /*[clinic input]
@@ -2975,7 +2974,7 @@ _io_TextIOWrapper_seekable_impl(textio *self)
 /*[clinic end generated code: output=ab223dbbcffc0f00 input=8b005ca06e1fca13]*/
 {
     CHECK_ATTACHED(self);
-    return _PyObject_CallMethodId(self->buffer, &PyId_seekable, NULL);
+    return _PyObject_CallMethodIdNoArgs(self->buffer, &PyId_seekable);
 }
 
 /*[clinic input]
@@ -2987,7 +2986,7 @@ _io_TextIOWrapper_readable_impl(textio *self)
 /*[clinic end generated code: output=72ff7ba289a8a91b input=0704ea7e01b0d3eb]*/
 {
     CHECK_ATTACHED(self);
-    return _PyObject_CallMethodId(self->buffer, &PyId_readable, NULL);
+    return _PyObject_CallMethodIdNoArgs(self->buffer, &PyId_readable);
 }
 
 /*[clinic input]
@@ -2999,7 +2998,7 @@ _io_TextIOWrapper_writable_impl(textio *self)
 /*[clinic end generated code: output=a728c71790d03200 input=c41740bc9d8636e8]*/
 {
     CHECK_ATTACHED(self);
-    return _PyObject_CallMethodId(self->buffer, &PyId_writable, NULL);
+    return _PyObject_CallMethodIdNoArgs(self->buffer, &PyId_writable);
 }
 
 /*[clinic input]
@@ -3011,7 +3010,7 @@ _io_TextIOWrapper_isatty_impl(textio *self)
 /*[clinic end generated code: output=12be1a35bace882e input=fb68d9f2c99bbfff]*/
 {
     CHECK_ATTACHED(self);
-    return _PyObject_CallMethodId(self->buffer, &PyId_isatty, NULL);
+    return _PyObject_CallMethodIdNoArgs(self->buffer, &PyId_isatty);
 }
 
 /*[clinic input]
@@ -3027,7 +3026,7 @@ _io_TextIOWrapper_flush_impl(textio *self)
     self->telling = self->seekable;
     if (_textiowrapper_writeflush(self) < 0)
         return NULL;
-    return _PyObject_CallMethodId(self->buffer, &PyId_flush, NULL);
+    return _PyObject_CallMethodIdNoArgs(self->buffer, &PyId_flush);
 }
 
 /*[clinic input]
@@ -3064,13 +3063,13 @@ _io_TextIOWrapper_close_impl(textio *self)
             else
                 PyErr_Clear();
         }
-        res = _PyObject_CallMethodId((PyObject *)self, &PyId_flush, NULL);
+        res = _PyObject_CallMethodIdNoArgs((PyObject *)self, &PyId_flush);
         if (res == NULL)
             PyErr_Fetch(&exc, &val, &tb);
         else
             Py_DECREF(res);
 
-        res = _PyObject_CallMethodId(self->buffer, &PyId_close, NULL);
+        res = _PyObject_CallMethodIdNoArgs(self->buffer, &PyId_close);
         if (exc != NULL) {
             _PyErr_ChainExceptions(exc, val, tb);
             Py_CLEAR(res);
@@ -3092,8 +3091,8 @@ textiowrapper_iternext(textio *self)
         line = _textiowrapper_readline(self, -1);
     }
     else {
-        line = PyObject_CallMethodObjArgs((PyObject *)self,
-                                           _PyIO_str_readline, NULL);
+        line = _PyObject_CallMethodNoArgs((PyObject *)self,
+                                          _PyIO_str_readline);
         if (line && !PyUnicode_Check(line)) {
             PyErr_Format(PyExc_OSError,
                          "readline() should have returned a str object, "
diff --git a/Modules/_pickle.c b/Modules/_pickle.c
index d6d1250d04f7..0b0928f5cd2f 100644
--- a/Modules/_pickle.c
+++ b/Modules/_pickle.c
@@ -3305,7 +3305,7 @@ save_dict(PicklerObject *self, PyObject *obj)
         } else {
             _Py_IDENTIFIER(items);
 
-            items = _PyObject_CallMethodId(obj, &PyId_items, NULL);
+            items = _PyObject_CallMethodIdNoArgs(obj, &PyId_items);
             if (items == NULL)
                 goto error;
             iter = PyObject_GetIter(items);
diff --git a/Modules/_posixsubprocess.c b/Modules/_posixsubprocess.c
index 81a23c6d3300..60c8eab90a15 100644
--- a/Modules/_posixsubprocess.c
+++ b/Modules/_posixsubprocess.c
@@ -60,7 +60,7 @@ _enable_gc(int need_to_reenable_gc, PyObject *gc_module)
 
     if (need_to_reenable_gc) {
         PyErr_Fetch(&exctype, &val, &tb);
-        result = _PyObject_CallMethodId(gc_module, &PyId_enable, NULL);
+        result = _PyObject_CallMethodIdNoArgs(gc_module, &PyId_enable);
         if (exctype != NULL) {
             PyErr_Restore(exctype, val, tb);
         }
@@ -606,7 +606,7 @@ subprocess_fork_exec(PyObject* self, PyObject *args)
         gc_module = PyImport_ImportModule("gc");
         if (gc_module == NULL)
             return NULL;
-        result = _PyObject_CallMethodId(gc_module, &PyId_isenabled, NULL);
+        result = _PyObject_CallMethodIdNoArgs(gc_module, &PyId_isenabled);
         if (result == NULL) {
             Py_DECREF(gc_module);
             return NULL;
@@ -617,7 +617,7 @@ subprocess_fork_exec(PyObject* self, PyObject *args)
             Py_DECREF(gc_module);
             return NULL;
         }
-        result = _PyObject_CallMethodId(gc_module, &PyId_disable, NULL);
+        result = _PyObject_CallMethodIdNoArgs(gc_module, &PyId_disable);
         if (result == NULL) {
             Py_DECREF(gc_module);
             return NULL;
diff --git a/Modules/_sqlite/connection.c b/Modules/_sqlite/connection.c
index 08604b99a6ac..30a9b889a9df 100644
--- a/Modules/_sqlite/connection.c
+++ b/Modules/_sqlite/connection.c
@@ -713,7 +713,7 @@ void _pysqlite_final_callback(sqlite3_context* context)
     PyErr_Fetch(&exception, &value, &tb);
     restore = 1;
 
-    function_result = _PyObject_CallMethodId(*aggregate_instance, &PyId_finalize, NULL);
+    function_result = _PyObject_CallMethodIdNoArgs(*aggregate_instance, &PyId_finalize);
 
     Py_DECREF(*aggregate_instance);
 
@@ -1275,7 +1275,7 @@ PyObject* pysqlite_connection_execute(pysqlite_Connection* self, PyObject* args)
     PyObject* result = 0;
     PyObject* method = 0;
 
-    cursor = _PyObject_CallMethodId((PyObject*)self, &PyId_cursor, NULL);
+    cursor = _PyObject_CallMethodIdNoArgs((PyObject*)self, &PyId_cursor);
     if (!cursor) {
         goto error;
     }
@@ -1304,7 +1304,7 @@ PyObject* pysqlite_connection_executemany(pysqlite_Connection* self, PyObject* a
     PyObject* result = 0;
     PyObject* method = 0;
 
-    cursor = _PyObject_CallMethodId((PyObject*)self, &PyId_cursor, NULL);
+    cursor = _PyObject_CallMethodIdNoArgs((PyObject*)self, &PyId_cursor);
     if (!cursor) {
         goto error;
     }
@@ -1333,7 +1333,7 @@ PyObject* pysqlite_connection_executescript(pysqlite_Connection* self, PyObject*
     PyObject* result = 0;
     PyObject* method = 0;
 
-    cursor = _PyObject_CallMethodId((PyObject*)self, &PyId_cursor, NULL);
+    cursor = _PyObject_CallMethodIdNoArgs((PyObject*)self, &PyId_cursor);
     if (!cursor) {
         goto error;
     }
diff --git a/Modules/_sqlite/cursor.c b/Modules/_sqlite/cursor.c
index e6fcac887fe3..6d9685b29642 100644
--- a/Modules/_sqlite/cursor.c
+++ b/Modules/_sqlite/cursor.c
@@ -106,7 +106,7 @@ _pysqlite_get_converter(const char *keystr, Py_ssize_t keylen)
     if (!key) {
         return NULL;
     }
-    upcase_key = _PyObject_CallMethodId(key, &PyId_upper, NULL);
+    upcase_key = _PyObject_CallMethodIdNoArgs(key, &PyId_upper);
     Py_DECREF(key);
     if (!upcase_key) {
         return NULL;
diff --git a/Modules/_sqlite/module.c b/Modules/_sqlite/module.c
index 9fe0dc952f0b..d5c353ea7bee 100644
--- a/Modules/_sqlite/module.c
+++ b/Modules/_sqlite/module.c
@@ -203,7 +203,7 @@ static PyObject* module_register_converter(PyObject* self, PyObject* args)
     }
 
     /* convert the name to upper case */
-    name = _PyObject_CallMethodId(orig_name, &PyId_upper, NULL);
+    name = _PyObject_CallMethodIdNoArgs(orig_name, &PyId_upper);
     if (!name) {
         goto error;
     }
diff --git a/Modules/_threadmodule.c b/Modules/_threadmodule.c
index 9ab8e7a0ceb3..6665827fe2ba 100644
--- a/Modules/_threadmodule.c
+++ b/Modules/_threadmodule.c
@@ -1358,7 +1358,7 @@ thread_excepthook_file(PyObject *file, PyObject *exc_type, PyObject *exc_value,
     _PyErr_Display(file, exc_type, exc_value, exc_traceback);
 
     /* Call file.flush() */
-    PyObject *res = _PyObject_CallMethodId(file, &PyId_flush, NULL);
+    PyObject *res = _PyObject_CallMethodIdNoArgs(file, &PyId_flush);
     if (!res) {
         return -1;
     }
diff --git a/Modules/faulthandler.c b/Modules/faulthandler.c
index f2b5a503f4ee..2331051f7907 100644
--- a/Modules/faulthandler.c
+++ b/Modules/faulthandler.c
@@ -172,7 +172,7 @@ faulthandler_get_fileno(PyObject **file_ptr)
         return fd;
     }
 
-    result = _PyObject_CallMethodId(file, &PyId_fileno, NULL);
+    result = _PyObject_CallMethodIdNoArgs(file, &PyId_fileno);
     if (result == NULL)
         return -1;
 
@@ -190,7 +190,7 @@ faulthandler_get_fileno(PyObject **file_ptr)
         return -1;
     }
 
-    result = _PyObject_CallMethodId(file, &PyId_flush, NULL);
+    result = _PyObject_CallMethodIdNoArgs(file, &PyId_flush);
     if (result != NULL)
         Py_DECREF(result);
     else {
@@ -1305,7 +1305,7 @@ faulthandler_init_enable(void)
         return -1;
     }
 
-    PyObject *res = _PyObject_CallMethodId(module, &PyId_enable, NULL);
+    PyObject *res = _PyObject_CallMethodIdNoArgs(module, &PyId_enable);
     Py_DECREF(module);
     if (res == NULL) {
         return -1;
diff --git a/Modules/mmapmodule.c b/Modules/mmapmodule.c
index 9e3414f94e31..51ab3f054f24 100644
--- a/Modules/mmapmodule.c
+++ b/Modules/mmapmodule.c
@@ -692,7 +692,7 @@ mmap__exit__method(PyObject *self, PyObject *args)
 {
     _Py_IDENTIFIER(close);
 
-    return _PyObject_CallMethodId(self, &PyId_close, NULL);
+    return _PyObject_CallMethodIdNoArgs(self, &PyId_close);
 }
 
 #ifdef MS_WINDOWS
diff --git a/Modules/ossaudiodev.c b/Modules/ossaudiodev.c
index affaf1d9680b..6e050e4bc4ca 100644
--- a/Modules/ossaudiodev.c
+++ b/Modules/ossaudiodev.c
@@ -539,7 +539,7 @@ oss_exit(PyObject *self, PyObject *unused)
 {
     _Py_IDENTIFIER(close);
 
-    PyObject *ret = _PyObject_CallMethodId(self, &PyId_close, NULL);
+    PyObject *ret = _PyObject_CallMethodIdNoArgs(self, &PyId_close);
     if (!ret)
         return NULL;
     Py_DECREF(ret);
diff --git a/Modules/selectmodule.c b/Modules/selectmodule.c
index ed71d8b0d598..2e06a897132a 100644
--- a/Modules/selectmodule.c
+++ b/Modules/selectmodule.c
@@ -1634,7 +1634,7 @@ select_epoll___exit___impl(pyEpoll_Object *self, PyObject *exc_type,
 {
     _Py_IDENTIFIER(close);
 
-    return _PyObject_CallMethodId((PyObject *)self, &PyId_close, NULL);
+    return _PyObject_CallMethodIdNoArgs((PyObject *)self, &PyId_close);
 }
 
 static PyGetSetDef pyepoll_getsetlist[] = {
diff --git a/Objects/abstract.c b/Objects/abstract.c
index 86178a74ea38..db1c3064db6f 100644
--- a/Objects/abstract.c
+++ b/Objects/abstract.c
@@ -2221,7 +2221,7 @@ method_output_as_list(PyObject *o, _Py_Identifier *meth_id)
     PyObject *it, *result, *meth_output;
 
     assert(o != NULL);
-    meth_output = _PyObject_CallMethodId(o, meth_id, NULL);
+    meth_output = _PyObject_CallMethodIdNoArgs(o, meth_id);
     if (meth_output == NULL || PyList_CheckExact(meth_output)) {
         return meth_output;
     }
diff --git a/Objects/descrobject.c b/Objects/descrobject.c
index 99855d8ae44c..edce250c7948 100644
--- a/Objects/descrobject.c
+++ b/Objects/descrobject.c
@@ -1019,28 +1019,28 @@ static PyObject *
 mappingproxy_keys(mappingproxyobject *pp, PyObject *Py_UNUSED(ignored))
 {
     _Py_IDENTIFIER(keys);
-    return _PyObject_CallMethodId(pp->mapping, &PyId_keys, NULL);
+    return _PyObject_CallMethodIdNoArgs(pp->mapping, &PyId_keys);
 }
 
 static PyObject *
 mappingproxy_values(mappingproxyobject *pp, PyObject *Py_UNUSED(ignored))
 {
     _Py_IDENTIFIER(values);
-    return _PyObject_CallMethodId(pp->mapping, &PyId_values, NULL);
+    return _PyObject_CallMethodIdNoArgs(pp->mapping, &PyId_values);
 }
 
 static PyObject *
 mappingproxy_items(mappingproxyobject *pp, PyObject *Py_UNUSED(ignored))
 {
     _Py_IDENTIFIER(items);
-    return _PyObject_CallMethodId(pp->mapping, &PyId_items, NULL);
+    return _PyObject_CallMethodIdNoArgs(pp->mapping, &PyId_items);
 }
 
 static PyObject *
 mappingproxy_copy(mappingproxyobject *pp, PyObject *Py_UNUSED(ignored))
 {
     _Py_IDENTIFIER(copy);
-    return _PyObject_CallMethodId(pp->mapping, &PyId_copy, NULL);
+    return _PyObject_CallMethodIdNoArgs(pp->mapping, &PyId_copy);
 }
 
 /* WARNING: mappingproxy methods must not give access
diff --git a/Objects/fileobject.c b/Objects/fileobject.c
index a21e490817eb..0faf7e70b5d8 100644
--- a/Objects/fileobject.c
+++ b/Objects/fileobject.c
@@ -61,7 +61,7 @@ PyFile_GetLine(PyObject *f, int n)
     }
 
     if (n <= 0) {
-        result = _PyObject_CallMethodIdObjArgs(f, &PyId_readline, NULL);
+        result = _PyObject_CallMethodIdNoArgs(f, &PyId_readline);
     }
     else {
         result = _PyObject_CallMethodId(f, &PyId_readline, "i", n);
diff --git a/Objects/odictobject.c b/Objects/odictobject.c
index 4c9ae3bc9346..dfbd30a976ca 100644
--- a/Objects/odictobject.c
+++ b/Objects/odictobject.c
@@ -920,7 +920,7 @@ odict_reduce(register PyODictObject *od, PyObject *Py_UNUSED(ignored))
     if (args == NULL)
         goto Done;
 
-    items = _PyObject_CallMethodIdObjArgs((PyObject *)od, &PyId_items, NULL);
+    items = _PyObject_CallMethodIdNoArgs((PyObject *)od, &PyId_items);
     if (items == NULL)
         goto Done;
 
@@ -1421,8 +1421,8 @@ odict_repr(PyODictObject *self)
             Py_SIZE(pieces) = count;
     }
     else {
-        PyObject *items = _PyObject_CallMethodIdObjArgs((PyObject *)self,
-                                                        &PyId_items, NULL);
+        PyObject *items = _PyObject_CallMethodIdNoArgs((PyObject *)self,
+                                                       &PyId_items);
         if (items == NULL)
             goto Done;
         pieces = PySequence_List(items);
diff --git a/Objects/typeobject.c b/Objects/typeobject.c
index 3b9a537936a3..96021eeccc57 100644
--- a/Objects/typeobject.c
+++ b/Objects/typeobject.c
@@ -4425,7 +4425,7 @@ _PyObject_GetItemsIter(PyObject *obj, PyObject **listitems,
         PyObject *items;
         _Py_IDENTIFIER(items);
 
-        items = _PyObject_CallMethodIdObjArgs(obj, &PyId_items, NULL);
+        items = _PyObject_CallMethodIdNoArgs(obj, &PyId_items);
         if (items == NULL) {
             Py_CLEAR(*listitems);
             return -1;
diff --git a/Objects/weakrefobject.c b/Objects/weakrefobject.c
index ae3f6dca9eed..e8a429ab5b54 100644
--- a/Objects/weakrefobject.c
+++ b/Objects/weakrefobject.c
@@ -455,7 +455,7 @@ proxy_checkref(PyWeakReference *proxy)
     method(PyObject *proxy, PyObject *Py_UNUSED(ignored)) { \
             _Py_IDENTIFIER(special); \
             UNWRAP(proxy); \
-                return _PyObject_CallMethodId(proxy, &PyId_##special, NULL); \
+                return _PyObject_CallMethodIdNoArgs(proxy, &PyId_##special); \
         }
 
 
diff --git a/Python/bltinmodule.c b/Python/bltinmodule.c
index 5de43636d96b..65110d8d12c6 100644
--- a/Python/bltinmodule.c
+++ b/Python/bltinmodule.c
@@ -1889,7 +1889,7 @@ builtin_print(PyObject *self, PyObject *const *args, Py_ssize_t nargs, PyObject
         if (do_flush == -1)
             return NULL;
         else if (do_flush) {
-            tmp = _PyObject_CallMethodId(file, &PyId_flush, NULL);
+            tmp = _PyObject_CallMethodIdNoArgs(file, &PyId_flush);
             if (tmp == NULL)
                 return NULL;
             else
@@ -1959,7 +1959,7 @@ builtin_input_impl(PyObject *module, PyObject *prompt)
     }
 
     /* First of all, flush stderr */
-    tmp = _PyObject_CallMethodId(ferr, &PyId_flush, NULL);
+    tmp = _PyObject_CallMethodIdNoArgs(ferr, &PyId_flush);
     if (tmp == NULL)
         PyErr_Clear();
     else
@@ -1968,7 +1968,7 @@ builtin_input_impl(PyObject *module, PyObject *prompt)
     /* We should only use (GNU) readline if Python's sys.stdin and
        sys.stdout are the same as C's stdin and stdout, because we
        need to pass it those. */
-    tmp = _PyObject_CallMethodId(fin, &PyId_fileno, NULL);
+    tmp = _PyObject_CallMethodIdNoArgs(fin, &PyId_fileno);
     if (tmp == NULL) {
         PyErr_Clear();
         tty = 0;
@@ -1981,7 +1981,7 @@ builtin_input_impl(PyObject *module, PyObject *prompt)
         tty = fd == fileno(stdin) && isatty(fd);
     }
     if (tty) {
-        tmp = _PyObject_CallMethodId(fout, &PyId_fileno, NULL);
+        tmp = _PyObject_CallMethodIdNoArgs(fout, &PyId_fileno);
         if (tmp == NULL) {
             PyErr_Clear();
             tty = 0;
@@ -2019,7 +2019,7 @@ builtin_input_impl(PyObject *module, PyObject *prompt)
         stdin_errors_str = PyUnicode_AsUTF8(stdin_errors);
         if (!stdin_encoding_str || !stdin_errors_str)
             goto _readline_errors;
-        tmp = _PyObject_CallMethodId(fout, &PyId_flush, NULL);
+        tmp = _PyObject_CallMethodIdNoArgs(fout, &PyId_flush);
         if (tmp == NULL)
             PyErr_Clear();
         else
@@ -2114,7 +2114,7 @@ builtin_input_impl(PyObject *module, PyObject *prompt)
         if (PyFile_WriteObject(prompt, fout, Py_PRINT_RAW) != 0)
             return NULL;
     }
-    tmp = _PyObject_CallMethodId(fout, &PyId_flush, NULL);
+    tmp = _PyObject_CallMethodIdNoArgs(fout, &PyId_flush);
     if (tmp == NULL)
         PyErr_Clear();
     else
diff --git a/Python/errors.c b/Python/errors.c
index a7d40c132d7b..b935341636f7 100644
--- a/Python/errors.c
+++ b/Python/errors.c
@@ -1263,7 +1263,7 @@ write_unraisable_exc_file(PyThreadState *tstate, PyObject *exc_type,
     }
 
     /* Explicitly call file.flush() */
-    PyObject *res = _PyObject_CallMethodId(file, &PyId_flush, NULL);
+    PyObject *res = _PyObject_CallMethodIdNoArgs(file, &PyId_flush);
     if (!res) {
         return -1;
     }
diff --git a/Python/import.c b/Python/import.c
index 76866ae645a7..df258751c82e 100644
--- a/Python/import.c
+++ b/Python/import.c
@@ -539,7 +539,7 @@ _PyImport_Cleanup(PyThreadState *tstate)
     }
     else {
         _Py_IDENTIFIER(clear);
-        if (_PyObject_CallMethodId(modules, &PyId_clear, "") == NULL) {
+        if (_PyObject_CallMethodIdNoArgs(modules, &PyId_clear) == NULL) {
             PyErr_WriteUnraisable(NULL);
         }
     }
diff --git a/Python/pylifecycle.c b/Python/pylifecycle.c
index 10765dab8f5d..e3333db4328a 100644
--- a/Python/pylifecycle.c
+++ b/Python/pylifecycle.c
@@ -1106,7 +1106,7 @@ flush_std_files(void)
     int status = 0;
 
     if (fout != NULL && fout != Py_None && !file_is_closed(fout)) {
-        tmp = _PyObject_CallMethodId(fout, &PyId_flush, NULL);
+        tmp = _PyObject_CallMethodIdNoArgs(fout, &PyId_flush);
         if (tmp == NULL) {
             PyErr_WriteUnraisable(fout);
             status = -1;
@@ -1116,7 +1116,7 @@ flush_std_files(void)
     }
 
     if (ferr != NULL && ferr != Py_None && !file_is_closed(ferr)) {
-        tmp = _PyObject_CallMethodId(ferr, &PyId_flush, NULL);
+        tmp = _PyObject_CallMethodIdNoArgs(ferr, &PyId_flush);
         if (tmp == NULL) {
             PyErr_Clear();
             status = -1;
@@ -1762,7 +1762,7 @@ create_stdio(const PyConfig *config, PyObject* io,
     text = PyUnicode_FromString(name);
     if (text == NULL || _PyObject_SetAttrId(raw, &PyId_name, text) < 0)
         goto error;
-    res = _PyObject_CallMethodId(raw, &PyId_isatty, NULL);
+    res = _PyObject_CallMethodIdNoArgs(raw, &PyId_isatty);
     if (res == NULL)
         goto error;
     isatty = PyObject_IsTrue(res);
@@ -2026,7 +2026,7 @@ _Py_FatalError_PrintExc(int fd)
     Py_XDECREF(tb);
 
     /* sys.stderr may be buffered: call sys.stderr.flush() */
-    res = _PyObject_CallMethodId(ferr, &PyId_flush, NULL);
+    res = _PyObject_CallMethodIdNoArgs(ferr, &PyId_flush);
     if (res == NULL) {
         _PyErr_Clear(tstate);
     }
@@ -2220,7 +2220,7 @@ wait_for_thread_shutdown(PyThreadState *tstate)
         /* else: threading not imported */
         return;
     }
-    result = _PyObject_CallMethodId(threading, &PyId__shutdown, NULL);
+    result = _PyObject_CallMethodIdNoArgs(threading, &PyId__shutdown);
     if (result == NULL) {
         PyErr_WriteUnraisable(threading);
     }
diff --git a/Python/pythonrun.c b/Python/pythonrun.c
index f1d946a0b0f8..608908607873 100644
--- a/Python/pythonrun.c
+++ b/Python/pythonrun.c
@@ -978,7 +978,7 @@ _PyErr_Display(PyObject *file, PyObject *exception, PyObject *value, PyObject *t
     Py_XDECREF(seen);
 
     /* Call file.flush() */
-    PyObject *res = _PyObject_CallMethodId(file, &PyId_flush, NULL);
+    PyObject *res = _PyObject_CallMethodIdNoArgs(file, &PyId_flush);
     if (!res) {
         /* Silently ignore file.flush() error */
         PyErr_Clear();
@@ -1072,7 +1072,7 @@ flush_io(void)
 
     f = _PySys_GetObjectId(&PyId_stderr);
     if (f != NULL) {
-        r = _PyObject_CallMethodId(f, &PyId_flush, NULL);
+        r = _PyObject_CallMethodIdNoArgs(f, &PyId_flush);
         if (r)
             Py_DECREF(r);
         else
@@ -1080,7 +1080,7 @@ flush_io(void)
     }
     f = _PySys_GetObjectId(&PyId_stdout);
     if (f != NULL) {
-        r = _PyObject_CallMethodId(f, &PyId_flush, NULL);
+        r = _PyObject_CallMethodIdNoArgs(f, &PyId_flush);
         if (r)
             Py_DECREF(r);
         else
diff --git a/Python/traceback.c b/Python/traceback.c
index 0463eb6d8c98..f396f1ad983c 100644
--- a/Python/traceback.c
+++ b/Python/traceback.c
@@ -430,7 +430,7 @@ _Py_DisplaySourceLine(PyObject *f, PyObject *filename, int lineno, int indent)
     if (fob == NULL) {
         PyErr_Clear();
 
-        res = _PyObject_CallMethodId(binary, &PyId_close, NULL);
+        res = _PyObject_CallMethodIdNoArgs(binary, &PyId_close);
         Py_DECREF(binary);
         if (res)
             Py_DECREF(res);
@@ -450,7 +450,7 @@ _Py_DisplaySourceLine(PyObject *f, PyObject *filename, int lineno, int indent)
             break;
         }
     }
-    res = _PyObject_CallMethodId(fob, &PyId_close, NULL);
+    res = _PyObject_CallMethodIdNoArgs(fob, &PyId_close);
     if (res)
         Py_DECREF(res);
     else


From webhook-mailer at python.org  Mon Jul  8 04:49:19 2019
From: webhook-mailer at python.org (Victor Stinner)
Date: Mon, 08 Jul 2019 08:49:19 -0000
Subject: [Python-checkins] bpo-37421: test_concurrent_futures stops
 ForkServer (GH-14643)
Message-ID: <mailman.290.1562575759.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/e676244235895aeb6ec3b81ca3ccf4a70e487919
commit: e676244235895aeb6ec3b81ca3ccf4a70e487919
branch: master
author: Victor Stinner <vstinner at redhat.com>
committer: GitHub <noreply at github.com>
date: 2019-07-08T10:49:11+02:00
summary:

bpo-37421: test_concurrent_futures stops ForkServer (GH-14643)

test_concurrent_futures now explicitly stops the ForkServer instance
if it's running.

files:
A Misc/NEWS.d/next/Tests/2019-07-08-10-11-36.bpo-37421.OY77go.rst
M Lib/test/test_concurrent_futures.py

diff --git a/Lib/test/test_concurrent_futures.py b/Lib/test/test_concurrent_futures.py
index c782d4c6e881..ff9a49380340 100644
--- a/Lib/test/test_concurrent_futures.py
+++ b/Lib/test/test_concurrent_futures.py
@@ -1309,6 +1309,9 @@ def tearDownModule():
 
     # cleanup multiprocessing
     multiprocessing.process._cleanup()
+    # Stop the ForkServer process if it's running
+    from multiprocessing import forkserver
+    forkserver._forkserver._stop()
     # bpo-37421: Explicitly call _run_finalizers() to remove immediately
     # temporary directories created by multiprocessing.util.get_temp_dir().
     multiprocessing.util._run_finalizers()
diff --git a/Misc/NEWS.d/next/Tests/2019-07-08-10-11-36.bpo-37421.OY77go.rst b/Misc/NEWS.d/next/Tests/2019-07-08-10-11-36.bpo-37421.OY77go.rst
new file mode 100644
index 000000000000..0766d70f6eda
--- /dev/null
+++ b/Misc/NEWS.d/next/Tests/2019-07-08-10-11-36.bpo-37421.OY77go.rst
@@ -0,0 +1,2 @@
+test_concurrent_futures now explicitly stops the ForkServer instance if it's
+running.


From webhook-mailer at python.org  Mon Jul  8 05:52:04 2019
From: webhook-mailer at python.org (Victor Stinner)
Date: Mon, 08 Jul 2019 09:52:04 -0000
Subject: [Python-checkins] bpo-37421: test_concurrent_futures stops
 ForkServer (GH-14643) (GH-14645)
Message-ID: <mailman.291.1562579526.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/cdada40b23b1f7f527797ba7cb14c25820b05981
commit: cdada40b23b1f7f527797ba7cb14c25820b05981
branch: 3.8
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: Victor Stinner <vstinner at redhat.com>
date: 2019-07-08T11:51:49+02:00
summary:

bpo-37421: test_concurrent_futures stops ForkServer (GH-14643) (GH-14645)

test_concurrent_futures now explicitly stops the ForkServer instance
if it's running.
(cherry picked from commit e676244235895aeb6ec3b81ca3ccf4a70e487919)

Co-authored-by: Victor Stinner <vstinner at redhat.com>

files:
A Misc/NEWS.d/next/Tests/2019-07-08-10-11-36.bpo-37421.OY77go.rst
M Lib/test/test_concurrent_futures.py

diff --git a/Lib/test/test_concurrent_futures.py b/Lib/test/test_concurrent_futures.py
index fa298207f6c5..98c9bc9b507a 100644
--- a/Lib/test/test_concurrent_futures.py
+++ b/Lib/test/test_concurrent_futures.py
@@ -1310,6 +1310,9 @@ def tearDownModule():
 
     # cleanup multiprocessing
     multiprocessing.process._cleanup()
+    # Stop the ForkServer process if it's running
+    from multiprocessing import forkserver
+    forkserver._forkserver._stop()
     # bpo-37421: Explicitly call _run_finalizers() to remove immediately
     # temporary directories created by multiprocessing.util.get_temp_dir().
     multiprocessing.util._run_finalizers()
diff --git a/Misc/NEWS.d/next/Tests/2019-07-08-10-11-36.bpo-37421.OY77go.rst b/Misc/NEWS.d/next/Tests/2019-07-08-10-11-36.bpo-37421.OY77go.rst
new file mode 100644
index 000000000000..0766d70f6eda
--- /dev/null
+++ b/Misc/NEWS.d/next/Tests/2019-07-08-10-11-36.bpo-37421.OY77go.rst
@@ -0,0 +1,2 @@
+test_concurrent_futures now explicitly stops the ForkServer instance if it's
+running.


From webhook-mailer at python.org  Mon Jul  8 12:57:48 2019
From: webhook-mailer at python.org (Ned Deily)
Date: Mon, 08 Jul 2019 16:57:48 -0000
Subject: [Python-checkins] bpo-37149: Replace dead link for online Tkinter
 reference (GH-14616)
Message-ID: <mailman.292.1562605069.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/317c33e67cb6076c5a87a66c75e8c35ac581398d
commit: 317c33e67cb6076c5a87a66c75e8c35ac581398d
branch: 3.6
author: Ned Deily <nad at python.org>
committer: Ned Deily <nad at python.org>
date: 2019-07-08T12:50:54-04:00
summary:

bpo-37149: Replace dead link for online Tkinter reference  (GH-14616)

Also fix a name misspelling.

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

files:
M Doc/library/tkinter.rst

diff --git a/Doc/library/tkinter.rst b/Doc/library/tkinter.rst
index 60cf892e0888..2515cf4f8b08 100644
--- a/Doc/library/tkinter.rst
+++ b/Doc/library/tkinter.rst
@@ -31,7 +31,7 @@ installed, so you can read the Tcl/Tk documentation specific to that version.
    `TKDocs <http://www.tkdocs.com/>`_
       Extensive tutorial plus friendlier widget pages for some of the widgets.
 
-   `Tkinter reference: a GUI for Python <https://infohost.nmt.edu/tcc/help/pubs/tkinter/web/index.html>`_
+   `Tkinter 8.5 reference: a GUI for Python <https://web.archive.org/web/20190524140835/https://infohost.nmt.edu/tcc/help/pubs/tkinter/web/index.html>`_
       On-line reference material.
 
    `Tkinter docs from effbot <http://effbot.org/tkinterbook/>`_
@@ -41,7 +41,7 @@ installed, so you can read the Tcl/Tk documentation specific to that version.
       Book by Mark Lutz, has excellent coverage of Tkinter.
 
    `Modern Tkinter for Busy Python Developers <https://www.amazon.com/Modern-Tkinter-Python-Developers-ebook/dp/B0071QDNLO/>`_
-      Book by Mark Rozerman about building attractive and modern graphical user interfaces with Python and Tkinter.
+      Book by Mark Roseman about building attractive and modern graphical user interfaces with Python and Tkinter.
 
    `Python and Tkinter Programming <https://www.manning.com/books/python-and-tkinter-programming>`_
       Book by John Grayson (ISBN 1-884777-81-3).


From webhook-mailer at python.org  Mon Jul  8 17:06:45 2019
From: webhook-mailer at python.org (Julien Palard)
Date: Mon, 08 Jul 2019 21:06:45 -0000
Subject: [Python-checkins] Doc: Fix: Proper UpperCamelCase and lowercase.
 (GH-14644)
Message-ID: <mailman.293.1562620006.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/2da622ff77a763327895656779370b80a833d95c
commit: 2da622ff77a763327895656779370b80a833d95c
branch: master
author: Julien Palard <julien at palard.fr>
committer: GitHub <noreply at github.com>
date: 2019-07-08T23:06:32+02:00
summary:

Doc: Fix: Proper UpperCamelCase and lowercase. (GH-14644)

Initial report by Michael Blankenship on docs@

files:
M Doc/tutorial/controlflow.rst

diff --git a/Doc/tutorial/controlflow.rst b/Doc/tutorial/controlflow.rst
index 79111f8518d9..92c042e26dfb 100644
--- a/Doc/tutorial/controlflow.rst
+++ b/Doc/tutorial/controlflow.rst
@@ -920,7 +920,7 @@ extracted for you:
   bracketing constructs: ``a = f(1, 2) + g(3, 4)``.
 
 * Name your classes and functions consistently; the convention is to use
-  ``CamelCase`` for classes and ``lower_case_with_underscores`` for functions
+  ``UpperCamelCase`` for classes and ``lowercase_with_underscores`` for functions
   and methods.  Always use ``self`` as the name for the first method argument
   (see :ref:`tut-firstclasses` for more on classes and methods).
 


From webhook-mailer at python.org  Mon Jul  8 17:08:11 2019
From: webhook-mailer at python.org (Julien Palard)
Date: Mon, 08 Jul 2019 21:08:11 -0000
Subject: [Python-checkins] Doc: Fix example title. (GH-14639)
Message-ID: <mailman.294.1562620092.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/66b4150f6f001640521ae6c9571cd4325cd67394
commit: 66b4150f6f001640521ae6c9571cd4325cd67394
branch: master
author: Julien Palard <julien at palard.fr>
committer: GitHub <noreply at github.com>
date: 2019-07-08T23:08:07+02:00
summary:

Doc: Fix example title. (GH-14639)

files:
M Doc/library/stdtypes.rst

diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst
index 8575f8a72af3..9dd557fabaae 100644
--- a/Doc/library/stdtypes.rst
+++ b/Doc/library/stdtypes.rst
@@ -3815,7 +3815,7 @@ copying.
          >>> z.nbytes
          48
 
-      Cast 1D/unsigned char to 2D/unsigned long::
+      Cast 1D/unsigned long to 2D/unsigned long::
 
          >>> buf = struct.pack("L"*6, *list(range(6)))
          >>> x = memoryview(buf)


From webhook-mailer at python.org  Mon Jul  8 17:14:02 2019
From: webhook-mailer at python.org (Miss Islington (bot))
Date: Mon, 08 Jul 2019 21:14:02 -0000
Subject: [Python-checkins] Doc: Fix: Proper UpperCamelCase and lowercase.
 (GH-14644)
Message-ID: <mailman.295.1562620443.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/975d4d3651c5fe9422801d8f7145486b23d46a13
commit: 975d4d3651c5fe9422801d8f7145486b23d46a13
branch: 3.8
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: GitHub <noreply at github.com>
date: 2019-07-08T14:13:57-07:00
summary:

Doc: Fix: Proper UpperCamelCase and lowercase. (GH-14644)


Initial report by Michael Blankenship on docs@
(cherry picked from commit 2da622ff77a763327895656779370b80a833d95c)

Co-authored-by: Julien Palard <julien at palard.fr>

files:
M Doc/tutorial/controlflow.rst

diff --git a/Doc/tutorial/controlflow.rst b/Doc/tutorial/controlflow.rst
index 79111f8518d9..92c042e26dfb 100644
--- a/Doc/tutorial/controlflow.rst
+++ b/Doc/tutorial/controlflow.rst
@@ -920,7 +920,7 @@ extracted for you:
   bracketing constructs: ``a = f(1, 2) + g(3, 4)``.
 
 * Name your classes and functions consistently; the convention is to use
-  ``CamelCase`` for classes and ``lower_case_with_underscores`` for functions
+  ``UpperCamelCase`` for classes and ``lowercase_with_underscores`` for functions
   and methods.  Always use ``self`` as the name for the first method argument
   (see :ref:`tut-firstclasses` for more on classes and methods).
 


From webhook-mailer at python.org  Mon Jul  8 17:14:03 2019
From: webhook-mailer at python.org (Miss Islington (bot))
Date: Mon, 08 Jul 2019 21:14:03 -0000
Subject: [Python-checkins] Doc: Fix: Proper UpperCamelCase and lowercase.
 (GH-14644)
Message-ID: <mailman.296.1562620444.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/6f5574866c4017e438b7ac5f5374889389c4eb24
commit: 6f5574866c4017e438b7ac5f5374889389c4eb24
branch: 3.7
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: GitHub <noreply at github.com>
date: 2019-07-08T14:13:59-07:00
summary:

Doc: Fix: Proper UpperCamelCase and lowercase. (GH-14644)


Initial report by Michael Blankenship on docs@
(cherry picked from commit 2da622ff77a763327895656779370b80a833d95c)

Co-authored-by: Julien Palard <julien at palard.fr>

files:
M Doc/tutorial/controlflow.rst

diff --git a/Doc/tutorial/controlflow.rst b/Doc/tutorial/controlflow.rst
index c3ce1205e52e..482a34399c7b 100644
--- a/Doc/tutorial/controlflow.rst
+++ b/Doc/tutorial/controlflow.rst
@@ -744,7 +744,7 @@ extracted for you:
   bracketing constructs: ``a = f(1, 2) + g(3, 4)``.
 
 * Name your classes and functions consistently; the convention is to use
-  ``CamelCase`` for classes and ``lower_case_with_underscores`` for functions
+  ``UpperCamelCase`` for classes and ``lowercase_with_underscores`` for functions
   and methods.  Always use ``self`` as the name for the first method argument
   (see :ref:`tut-firstclasses` for more on classes and methods).
 


From webhook-mailer at python.org  Mon Jul  8 17:17:35 2019
From: webhook-mailer at python.org (Miss Islington (bot))
Date: Mon, 08 Jul 2019 21:17:35 -0000
Subject: [Python-checkins] Doc: Fix example title. (GH-14639)
Message-ID: <mailman.297.1562620657.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/54348f46f8c8c023b7e78f9cebe8e54818227b92
commit: 54348f46f8c8c023b7e78f9cebe8e54818227b92
branch: 3.8
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: GitHub <noreply at github.com>
date: 2019-07-08T14:17:32-07:00
summary:

Doc: Fix example title. (GH-14639)

(cherry picked from commit 66b4150f6f001640521ae6c9571cd4325cd67394)

Co-authored-by: Julien Palard <julien at palard.fr>

files:
M Doc/library/stdtypes.rst

diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst
index 35a17a180809..965167640c98 100644
--- a/Doc/library/stdtypes.rst
+++ b/Doc/library/stdtypes.rst
@@ -3801,7 +3801,7 @@ copying.
          >>> z.nbytes
          48
 
-      Cast 1D/unsigned char to 2D/unsigned long::
+      Cast 1D/unsigned long to 2D/unsigned long::
 
          >>> buf = struct.pack("L"*6, *list(range(6)))
          >>> x = memoryview(buf)


From webhook-mailer at python.org  Mon Jul  8 17:18:00 2019
From: webhook-mailer at python.org (Ivan Levkivskyi)
Date: Mon, 08 Jul 2019 21:18:00 -0000
Subject: [Python-checkins] bpo-18374: fix wrong col_offset of some ast.BinOp
 instances (GH-14607)
Message-ID: <mailman.298.1562620681.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/110a47c4f42cf4db88edc1876899fff8f05190fb
commit: 110a47c4f42cf4db88edc1876899fff8f05190fb
branch: master
author: Carl Friedrich Bolz-Tereick <cfbolz at gmx.de>
committer: Ivan Levkivskyi <levkivskyi at gmail.com>
date: 2019-07-08T22:17:56+01:00
summary:

bpo-18374: fix wrong col_offset of some ast.BinOp instances (GH-14607)

Nested BinOp instances (e.g. a+b+c) had a wrong col_offset for the
second BinOp (e.g. 2 instead of 0 in the example). Fix it by using the
correct st node to copy the line and col_offset from in ast.c.

files:
A Misc/NEWS.d/next/Library/2019-07-05-21-46-45.bpo-18374.qgE0H3.rst
M Lib/test/test_ast.py
M Misc/ACKS
M Python/ast.c

diff --git a/Lib/test/test_ast.py b/Lib/test/test_ast.py
index e251e254afdd..1e07c573c846 100644
--- a/Lib/test/test_ast.py
+++ b/Lib/test/test_ast.py
@@ -576,6 +576,36 @@ def bad_normalize(*args):
         with support.swap_attr(unicodedata, 'normalize', bad_normalize):
             self.assertRaises(TypeError, ast.parse, '\u03D5')
 
+    def test_issue18374_binop_col_offset(self):
+        tree = ast.parse('4+5+6+7')
+        parent_binop = tree.body[0].value
+        child_binop = parent_binop.left
+        grandchild_binop = child_binop.left
+        self.assertEqual(parent_binop.col_offset, 0)
+        self.assertEqual(parent_binop.end_col_offset, 7)
+        self.assertEqual(child_binop.col_offset, 0)
+        self.assertEqual(child_binop.end_col_offset, 5)
+        self.assertEqual(grandchild_binop.col_offset, 0)
+        self.assertEqual(grandchild_binop.end_col_offset, 3)
+
+        tree = ast.parse('4+5-\\\n 6-7')
+        parent_binop = tree.body[0].value
+        child_binop = parent_binop.left
+        grandchild_binop = child_binop.left
+        self.assertEqual(parent_binop.col_offset, 0)
+        self.assertEqual(parent_binop.lineno, 1)
+        self.assertEqual(parent_binop.end_col_offset, 4)
+        self.assertEqual(parent_binop.end_lineno, 2)
+
+        self.assertEqual(child_binop.col_offset, 0)
+        self.assertEqual(parent_binop.lineno, 1)
+        self.assertEqual(child_binop.end_col_offset, 2)
+        self.assertEqual(parent_binop.end_lineno, 2)
+
+        self.assertEqual(grandchild_binop.col_offset, 0)
+        self.assertEqual(parent_binop.lineno, 1)
+        self.assertEqual(grandchild_binop.end_col_offset, 3)
+        self.assertEqual(parent_binop.end_lineno, 2)
 
 class ASTHelpers_Test(unittest.TestCase):
     maxDiff = None
diff --git a/Misc/ACKS b/Misc/ACKS
index 36fe727c8421..d916c45a8e44 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -178,6 +178,7 @@ Nikolay Bogoychev
 David Bolen
 Wouter Bolsterlee
 Gawain Bolton
+Carl Friedrich Bolz-Tereick
 Forest Bond
 Gregory Bond
 M?d?ric Boquien
diff --git a/Misc/NEWS.d/next/Library/2019-07-05-21-46-45.bpo-18374.qgE0H3.rst b/Misc/NEWS.d/next/Library/2019-07-05-21-46-45.bpo-18374.qgE0H3.rst
new file mode 100644
index 000000000000..f9e99e0474a4
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2019-07-05-21-46-45.bpo-18374.qgE0H3.rst
@@ -0,0 +1,2 @@
+Fix the ``.col_offset`` attribute of nested :class:`ast.BinOp` instances
+which had a too large value in some situations.
diff --git a/Python/ast.c b/Python/ast.c
index 16895ce62ec0..8dc86c23d62d 100644
--- a/Python/ast.c
+++ b/Python/ast.c
@@ -2645,7 +2645,7 @@ ast_for_binop(struct compiling *c, const node *n)
             return NULL;
 
         tmp_result = BinOp(result, newoperator, tmp,
-                           LINENO(next_oper), next_oper->n_col_offset,
+                           LINENO(n), n->n_col_offset,
                            CHILD(n, i * 2 + 2)->n_end_lineno,
                            CHILD(n, i * 2 + 2)->n_end_col_offset,
                            c->c_arena);


From webhook-mailer at python.org  Mon Jul  8 17:18:19 2019
From: webhook-mailer at python.org (Miss Islington (bot))
Date: Mon, 08 Jul 2019 21:18:19 -0000
Subject: [Python-checkins] Doc: Fix example title. (GH-14639)
Message-ID: <mailman.299.1562620699.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/8b1135fc602859119ce2e649b070c0d8d9dce7ca
commit: 8b1135fc602859119ce2e649b070c0d8d9dce7ca
branch: 3.7
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: GitHub <noreply at github.com>
date: 2019-07-08T14:18:15-07:00
summary:

Doc: Fix example title. (GH-14639)

(cherry picked from commit 66b4150f6f001640521ae6c9571cd4325cd67394)

Co-authored-by: Julien Palard <julien at palard.fr>

files:
M Doc/library/stdtypes.rst

diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst
index 3b74331e51f2..d35c171aba39 100644
--- a/Doc/library/stdtypes.rst
+++ b/Doc/library/stdtypes.rst
@@ -3733,7 +3733,7 @@ copying.
          >>> z.nbytes
          48
 
-      Cast 1D/unsigned char to 2D/unsigned long::
+      Cast 1D/unsigned long to 2D/unsigned long::
 
          >>> buf = struct.pack("L"*6, *list(range(6)))
          >>> x = memoryview(buf)


From webhook-mailer at python.org  Mon Jul  8 17:41:38 2019
From: webhook-mailer at python.org (Miss Islington (bot))
Date: Mon, 08 Jul 2019 21:41:38 -0000
Subject: [Python-checkins] bpo-18374: fix wrong col_offset of some ast.BinOp
 instances (GH-14607)
Message-ID: <mailman.300.1562622099.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/c7be35c2abd598f02a633879133caec356593241
commit: c7be35c2abd598f02a633879133caec356593241
branch: 3.8
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: GitHub <noreply at github.com>
date: 2019-07-08T14:41:34-07:00
summary:

bpo-18374: fix wrong col_offset of some ast.BinOp instances (GH-14607)


Nested BinOp instances (e.g. a+b+c) had a wrong col_offset for the
second BinOp (e.g. 2 instead of 0 in the example). Fix it by using the
correct st node to copy the line and col_offset from in ast.c.
(cherry picked from commit 110a47c4f42cf4db88edc1876899fff8f05190fb)

Co-authored-by: Carl Friedrich Bolz-Tereick <cfbolz at gmx.de>

files:
A Misc/NEWS.d/next/Library/2019-07-05-21-46-45.bpo-18374.qgE0H3.rst
M Lib/test/test_ast.py
M Misc/ACKS
M Python/ast.c

diff --git a/Lib/test/test_ast.py b/Lib/test/test_ast.py
index e251e254afdd..1e07c573c846 100644
--- a/Lib/test/test_ast.py
+++ b/Lib/test/test_ast.py
@@ -576,6 +576,36 @@ def bad_normalize(*args):
         with support.swap_attr(unicodedata, 'normalize', bad_normalize):
             self.assertRaises(TypeError, ast.parse, '\u03D5')
 
+    def test_issue18374_binop_col_offset(self):
+        tree = ast.parse('4+5+6+7')
+        parent_binop = tree.body[0].value
+        child_binop = parent_binop.left
+        grandchild_binop = child_binop.left
+        self.assertEqual(parent_binop.col_offset, 0)
+        self.assertEqual(parent_binop.end_col_offset, 7)
+        self.assertEqual(child_binop.col_offset, 0)
+        self.assertEqual(child_binop.end_col_offset, 5)
+        self.assertEqual(grandchild_binop.col_offset, 0)
+        self.assertEqual(grandchild_binop.end_col_offset, 3)
+
+        tree = ast.parse('4+5-\\\n 6-7')
+        parent_binop = tree.body[0].value
+        child_binop = parent_binop.left
+        grandchild_binop = child_binop.left
+        self.assertEqual(parent_binop.col_offset, 0)
+        self.assertEqual(parent_binop.lineno, 1)
+        self.assertEqual(parent_binop.end_col_offset, 4)
+        self.assertEqual(parent_binop.end_lineno, 2)
+
+        self.assertEqual(child_binop.col_offset, 0)
+        self.assertEqual(parent_binop.lineno, 1)
+        self.assertEqual(child_binop.end_col_offset, 2)
+        self.assertEqual(parent_binop.end_lineno, 2)
+
+        self.assertEqual(grandchild_binop.col_offset, 0)
+        self.assertEqual(parent_binop.lineno, 1)
+        self.assertEqual(grandchild_binop.end_col_offset, 3)
+        self.assertEqual(parent_binop.end_lineno, 2)
 
 class ASTHelpers_Test(unittest.TestCase):
     maxDiff = None
diff --git a/Misc/ACKS b/Misc/ACKS
index 082fa567f23a..f427d8b5a929 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -178,6 +178,7 @@ Nikolay Bogoychev
 David Bolen
 Wouter Bolsterlee
 Gawain Bolton
+Carl Friedrich Bolz-Tereick
 Forest Bond
 Gregory Bond
 M?d?ric Boquien
diff --git a/Misc/NEWS.d/next/Library/2019-07-05-21-46-45.bpo-18374.qgE0H3.rst b/Misc/NEWS.d/next/Library/2019-07-05-21-46-45.bpo-18374.qgE0H3.rst
new file mode 100644
index 000000000000..f9e99e0474a4
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2019-07-05-21-46-45.bpo-18374.qgE0H3.rst
@@ -0,0 +1,2 @@
+Fix the ``.col_offset`` attribute of nested :class:`ast.BinOp` instances
+which had a too large value in some situations.
diff --git a/Python/ast.c b/Python/ast.c
index 2a5941572148..317a42b7f121 100644
--- a/Python/ast.c
+++ b/Python/ast.c
@@ -2645,7 +2645,7 @@ ast_for_binop(struct compiling *c, const node *n)
             return NULL;
 
         tmp_result = BinOp(result, newoperator, tmp,
-                           LINENO(next_oper), next_oper->n_col_offset,
+                           LINENO(n), n->n_col_offset,
                            CHILD(n, i * 2 + 2)->n_end_lineno,
                            CHILD(n, i * 2 + 2)->n_end_col_offset,
                            c->c_arena);


From webhook-mailer at python.org  Mon Jul  8 17:54:52 2019
From: webhook-mailer at python.org (Ned Deily)
Date: Mon, 08 Jul 2019 21:54:52 -0000
Subject: [Python-checkins] [3.7] bpo-37500: Revert commit
 85ed1712e428f93408f56fc684816f9a85b0ebc0 (GH-14605)
Message-ID: <mailman.301.1562622893.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/4834c80d799471a6c9ddaad9c5c82c8af156e4fd
commit: 4834c80d799471a6c9ddaad9c5c82c8af156e4fd
branch: 3.7
author: Pablo Galindo <Pablogsal at gmail.com>
committer: Ned Deily <nad at python.org>
date: 2019-07-08T12:08:31-04:00
summary:

[3.7] bpo-37500: Revert commit 85ed1712e428f93408f56fc684816f9a85b0ebc0 (GH-14605)



https://bugs.python.org/issue37500

files:
M Lib/test/test_syntax.py
M Python/compile.c
M Python/peephole.c

diff --git a/Lib/test/test_syntax.py b/Lib/test/test_syntax.py
index 4918e5c4c428..2b96a94401a8 100644
--- a/Lib/test/test_syntax.py
+++ b/Lib/test/test_syntax.py
@@ -650,20 +650,6 @@ def error2():
     def test_break_outside_loop(self):
         self._check_error("break", "outside loop")
 
-    def test_yield_outside_function(self):
-        self._check_error("if 0: yield",               "outside function")
-        self._check_error("class C:\n    if 0: yield", "outside function")
-
-    def test_return_outside_function(self):
-        self._check_error("if 0: return",               "outside function")
-        self._check_error("class C:\n    if 0: return", "outside function")
-
-    def test_break_outside_loop(self):
-        self._check_error("if 0: break",                "outside loop")
-
-    def test_continue_outside_loop(self):
-        self._check_error("if 0: continue",     "not properly in loop")
-
     def test_unexpected_indent(self):
         self._check_error("foo()\n bar()\n", "unexpected indent",
                           subclass=IndentationError)
diff --git a/Python/compile.c b/Python/compile.c
index d2729d4c6ca3..5688ef8479c0 100644
--- a/Python/compile.c
+++ b/Python/compile.c
@@ -2301,12 +2301,13 @@ compiler_if(struct compiler *c, stmt_ty s)
         return 0;
 
     constant = expr_constant(s->v.If.test);
-    /* constant = 0: "if 0" Leave the optimizations to
-     * the pephole optimizer to check for syntax errors
-     * in the block.
+    /* constant = 0: "if 0"
      * constant = 1: "if 1", "if 2", ...
      * constant = -1: rest */
-    if (constant == 1) {
+    if (constant == 0) {
+        if (s->v.If.orelse)
+            VISIT_SEQ(c, stmt, s->v.If.orelse);
+    } else if (constant == 1) {
         VISIT_SEQ(c, stmt, s->v.If.body);
     } else {
         if (asdl_seq_LEN(s->v.If.orelse)) {
diff --git a/Python/peephole.c b/Python/peephole.c
index 277a216ae075..95b3dbb6bf51 100644
--- a/Python/peephole.c
+++ b/Python/peephole.c
@@ -304,18 +304,11 @@ PyCode_Optimize(PyObject *code, PyObject* consts, PyObject *names,
             case LOAD_CONST:
                 cumlc = lastlc + 1;
                 if (nextop != POP_JUMP_IF_FALSE  ||
-                    !ISBASICBLOCK(blocks, op_start, i + 1)) {
+                    !ISBASICBLOCK(blocks, op_start, i + 1)  ||
+                    !PyObject_IsTrue(PyList_GET_ITEM(consts, get_arg(codestr, i))))
                     break;
-                }
-                PyObject* cnt = PyList_GET_ITEM(consts, get_arg(codestr, i));
-                int is_true = PyObject_IsTrue(cnt);
-                if (is_true == -1) {
-                    goto exitError;
-                }
-                if (is_true == 1) {
-                    fill_nops(codestr, op_start, nexti + 1);
-                    cumlc = 0;
-                }
+                fill_nops(codestr, op_start, nexti + 1);
+                cumlc = 0;
                 break;
 
                 /* Try to fold tuples of constants.


From webhook-mailer at python.org  Tue Jul  9 06:37:00 2019
From: webhook-mailer at python.org (Victor Stinner)
Date: Tue, 09 Jul 2019 10:37:00 -0000
Subject: [Python-checkins] bpo-37322: Fix
 test_ssl.test_pha_required_nocert() ResourceWarning (GH-14662)
Message-ID: <mailman.302.1562668622.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/cf9c41c422de3774862db964fe3153086bad3f61
commit: cf9c41c422de3774862db964fe3153086bad3f61
branch: master
author: Victor Stinner <vstinner at redhat.com>
committer: GitHub <noreply at github.com>
date: 2019-07-09T12:36:55+02:00
summary:

bpo-37322: Fix test_ssl.test_pha_required_nocert() ResourceWarning (GH-14662)

Close the TLS connection in test_pha_required_nocert() of test_ssl to
fix a ResourceWarning.

files:
M Lib/test/test_ssl.py

diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py
index d2b9e2046d0e..166e28683e26 100644
--- a/Lib/test/test_ssl.py
+++ b/Lib/test/test_ssl.py
@@ -2382,6 +2382,7 @@ def run(self):
                         if self.server.chatty and support.verbose:
                             sys.stdout.write(err.args[1])
                         # test_pha_required_nocert is expecting this exception
+                        self.close()
                         raise ssl.SSLError('tlsv13 alert certificate required')
                 except OSError:
                     if self.server.chatty:


From webhook-mailer at python.org  Tue Jul  9 07:00:27 2019
From: webhook-mailer at python.org (Victor Stinner)
Date: Tue, 09 Jul 2019 11:00:27 -0000
Subject: [Python-checkins] bpo-37526: Add
 support.catch_threading_exception() (GH-14664)
Message-ID: <mailman.303.1562670028.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/91b4f7ab7f9a5e0908b91379ee085ae087a76483
commit: 91b4f7ab7f9a5e0908b91379ee085ae087a76483
branch: master
author: Victor Stinner <vstinner at redhat.com>
committer: GitHub <noreply at github.com>
date: 2019-07-09T13:00:23+02:00
summary:

bpo-37526: Add support.catch_threading_exception() (GH-14664)

Context manager catching threading.Thread exception using
threading.excepthook.

files:
A Misc/NEWS.d/next/Tests/2019-07-09-12-33-18.bpo-37526.vmm5y7.rst
M Doc/library/test.rst
M Lib/test/support/__init__.py

diff --git a/Doc/library/test.rst b/Doc/library/test.rst
index 920c018084b8..7d62a94d839b 100644
--- a/Doc/library/test.rst
+++ b/Doc/library/test.rst
@@ -1081,6 +1081,39 @@ The :mod:`test.support` module defines the following functions:
    :exc:`PermissionError` is raised.
 
 
+.. function:: catch_threading_exception()
+
+   Context manager catching :class:`threading.Thread` exception using
+   :func:`threading.excepthook`.
+
+   Attributes set when an exception is catched:
+
+   * ``exc_type``
+   * ``exc_value``
+   * ``exc_traceback``
+   * ``thread``
+
+   See :func:`threading.excepthook` documentation.
+
+   These attributes are deleted at the context manager exit.
+
+   Usage::
+
+       with support.catch_threading_exception() as cm:
+           # code spawning a thread which raises an exception
+           ...
+
+           # check the thread exception, use cm attributes:
+           # exc_type, exc_value, exc_traceback, thread
+           ...
+
+       # exc_type, exc_value, exc_traceback, thread attributes of cm no longer
+       # exists at this point
+       # (to avoid reference cycles)
+
+   .. versionadded:: 3.8
+
+
 .. function:: catch_unraisable_exception()
 
    Context manager catching unraisable exception using
diff --git a/Lib/test/support/__init__.py b/Lib/test/support/__init__.py
index 611c1cc9776d..423bb3ebd80d 100644
--- a/Lib/test/support/__init__.py
+++ b/Lib/test/support/__init__.py
@@ -3159,3 +3159,60 @@ def __enter__(self):
     def __exit__(self, *exc_info):
         sys.unraisablehook = self._old_hook
         del self.unraisable
+
+
+class catch_threading_exception:
+    """
+    Context manager catching threading.Thread exception using
+    threading.excepthook.
+
+    Attributes set when an exception is catched:
+
+    * exc_type
+    * exc_value
+    * exc_traceback
+    * thread
+
+    See threading.excepthook() documentation for these attributes.
+
+    These attributes are deleted at the context manager exit.
+
+    Usage:
+
+        with support.catch_threading_exception() as cm:
+            # code spawning a thread which raises an exception
+            ...
+
+            # check the thread exception, use cm attributes:
+            # exc_type, exc_value, exc_traceback, thread
+            ...
+
+        # exc_type, exc_value, exc_traceback, thread attributes of cm no longer
+        # exists at this point
+        # (to avoid reference cycles)
+    """
+
+    def __init__(self):
+        self.exc_type = None
+        self.exc_value = None
+        self.exc_traceback = None
+        self.thread = None
+        self._old_hook = None
+
+    def _hook(self, args):
+        self.exc_type = args.exc_type
+        self.exc_value = args.exc_value
+        self.exc_traceback = args.exc_traceback
+        self.thread = args.thread
+
+    def __enter__(self):
+        self._old_hook = threading.excepthook
+        threading.excepthook = self._hook
+        return self
+
+    def __exit__(self, *exc_info):
+        threading.excepthook = self._old_hook
+        del self.exc_type
+        del self.exc_value
+        del self.exc_traceback
+        del self.thread
diff --git a/Misc/NEWS.d/next/Tests/2019-07-09-12-33-18.bpo-37526.vmm5y7.rst b/Misc/NEWS.d/next/Tests/2019-07-09-12-33-18.bpo-37526.vmm5y7.rst
new file mode 100644
index 000000000000..aff6b6d1f12c
--- /dev/null
+++ b/Misc/NEWS.d/next/Tests/2019-07-09-12-33-18.bpo-37526.vmm5y7.rst
@@ -0,0 +1,2 @@
+Add :func:`test.support.catch_threading_exception`: context manager catching
+:class:`threading.Thread` exception using :func:`threading.excepthook`.


From webhook-mailer at python.org  Tue Jul  9 07:30:56 2019
From: webhook-mailer at python.org (Miss Islington (bot))
Date: Tue, 09 Jul 2019 11:30:56 -0000
Subject: [Python-checkins] bpo-37120: Fix _ssl get_num_tickets() (GH-14668)
Message-ID: <mailman.304.1562671857.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/76611c7c0af6b2f4d0d98a5db827d34cff54ce25
commit: 76611c7c0af6b2f4d0d98a5db827d34cff54ce25
branch: master
author: Victor Stinner <vstinner at redhat.com>
committer: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
date: 2019-07-09T04:30:52-07:00
summary:

bpo-37120: Fix _ssl get_num_tickets() (GH-14668)



Replace PyLong_FromLong() with PyLong_FromSize_t():
SSL_CTX_get_num_tickets() return type is size_t.


https://bugs.python.org/issue37120

files:
M Modules/_ssl.c

diff --git a/Modules/_ssl.c b/Modules/_ssl.c
index 3351af6cdefd..da30cbb758e2 100644
--- a/Modules/_ssl.c
+++ b/Modules/_ssl.c
@@ -3641,7 +3641,7 @@ set_maximum_version(PySSLContext *self, PyObject *arg, void *c)
 static PyObject *
 get_num_tickets(PySSLContext *self, void *c)
 {
-    return PyLong_FromLong(SSL_CTX_get_num_tickets(self->ctx));
+    return PyLong_FromSize_t(SSL_CTX_get_num_tickets(self->ctx));
 }
 
 static int


From webhook-mailer at python.org  Tue Jul  9 07:35:51 2019
From: webhook-mailer at python.org (Victor Stinner)
Date: Tue, 09 Jul 2019 11:35:51 -0000
Subject: [Python-checkins] Revert "bpo-37322: Fix
 test_ssl.test_pha_required_nocert() ResourceWarning (GH-14662)" (GH-14669)
Message-ID: <mailman.305.1562672152.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/61b1bc56069719fc6f17c73fdf2193636dbf6cc2
commit: 61b1bc56069719fc6f17c73fdf2193636dbf6cc2
branch: master
author: Victor Stinner <vstinner at redhat.com>
committer: GitHub <noreply at github.com>
date: 2019-07-09T13:35:47+02:00
summary:

Revert "bpo-37322: Fix test_ssl.test_pha_required_nocert() ResourceWarning (GH-14662)" (GH-14669)

This reverts commit cf9c41c422de3774862db964fe3153086bad3f61.

files:
M Lib/test/test_ssl.py

diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py
index 166e28683e26..d2b9e2046d0e 100644
--- a/Lib/test/test_ssl.py
+++ b/Lib/test/test_ssl.py
@@ -2382,7 +2382,6 @@ def run(self):
                         if self.server.chatty and support.verbose:
                             sys.stdout.write(err.args[1])
                         # test_pha_required_nocert is expecting this exception
-                        self.close()
                         raise ssl.SSLError('tlsv13 alert certificate required')
                 except OSError:
                     if self.server.chatty:


From webhook-mailer at python.org  Tue Jul  9 07:36:03 2019
From: webhook-mailer at python.org (Victor Stinner)
Date: Tue, 09 Jul 2019 11:36:03 -0000
Subject: [Python-checkins] bpo-37526: Add
 support.catch_threading_exception() (GH-14664) (GH-14666)
Message-ID: <mailman.306.1562672164.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/58f2c7f424fe91ba035918f0f66306af73a37543
commit: 58f2c7f424fe91ba035918f0f66306af73a37543
branch: 3.8
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: Victor Stinner <vstinner at redhat.com>
date: 2019-07-09T13:35:59+02:00
summary:

bpo-37526: Add support.catch_threading_exception() (GH-14664) (GH-14666)

Context manager catching threading.Thread exception using
threading.excepthook.
(cherry picked from commit 91b4f7ab7f9a5e0908b91379ee085ae087a76483)

Co-authored-by: Victor Stinner <vstinner at redhat.com>

files:
A Misc/NEWS.d/next/Tests/2019-07-09-12-33-18.bpo-37526.vmm5y7.rst
M Doc/library/test.rst
M Lib/test/support/__init__.py

diff --git a/Doc/library/test.rst b/Doc/library/test.rst
index 920c018084b8..7d62a94d839b 100644
--- a/Doc/library/test.rst
+++ b/Doc/library/test.rst
@@ -1081,6 +1081,39 @@ The :mod:`test.support` module defines the following functions:
    :exc:`PermissionError` is raised.
 
 
+.. function:: catch_threading_exception()
+
+   Context manager catching :class:`threading.Thread` exception using
+   :func:`threading.excepthook`.
+
+   Attributes set when an exception is catched:
+
+   * ``exc_type``
+   * ``exc_value``
+   * ``exc_traceback``
+   * ``thread``
+
+   See :func:`threading.excepthook` documentation.
+
+   These attributes are deleted at the context manager exit.
+
+   Usage::
+
+       with support.catch_threading_exception() as cm:
+           # code spawning a thread which raises an exception
+           ...
+
+           # check the thread exception, use cm attributes:
+           # exc_type, exc_value, exc_traceback, thread
+           ...
+
+       # exc_type, exc_value, exc_traceback, thread attributes of cm no longer
+       # exists at this point
+       # (to avoid reference cycles)
+
+   .. versionadded:: 3.8
+
+
 .. function:: catch_unraisable_exception()
 
    Context manager catching unraisable exception using
diff --git a/Lib/test/support/__init__.py b/Lib/test/support/__init__.py
index 1c91fc434eec..a0fe086049a1 100644
--- a/Lib/test/support/__init__.py
+++ b/Lib/test/support/__init__.py
@@ -3157,3 +3157,60 @@ def __enter__(self):
     def __exit__(self, *exc_info):
         sys.unraisablehook = self._old_hook
         del self.unraisable
+
+
+class catch_threading_exception:
+    """
+    Context manager catching threading.Thread exception using
+    threading.excepthook.
+
+    Attributes set when an exception is catched:
+
+    * exc_type
+    * exc_value
+    * exc_traceback
+    * thread
+
+    See threading.excepthook() documentation for these attributes.
+
+    These attributes are deleted at the context manager exit.
+
+    Usage:
+
+        with support.catch_threading_exception() as cm:
+            # code spawning a thread which raises an exception
+            ...
+
+            # check the thread exception, use cm attributes:
+            # exc_type, exc_value, exc_traceback, thread
+            ...
+
+        # exc_type, exc_value, exc_traceback, thread attributes of cm no longer
+        # exists at this point
+        # (to avoid reference cycles)
+    """
+
+    def __init__(self):
+        self.exc_type = None
+        self.exc_value = None
+        self.exc_traceback = None
+        self.thread = None
+        self._old_hook = None
+
+    def _hook(self, args):
+        self.exc_type = args.exc_type
+        self.exc_value = args.exc_value
+        self.exc_traceback = args.exc_traceback
+        self.thread = args.thread
+
+    def __enter__(self):
+        self._old_hook = threading.excepthook
+        threading.excepthook = self._hook
+        return self
+
+    def __exit__(self, *exc_info):
+        threading.excepthook = self._old_hook
+        del self.exc_type
+        del self.exc_value
+        del self.exc_traceback
+        del self.thread
diff --git a/Misc/NEWS.d/next/Tests/2019-07-09-12-33-18.bpo-37526.vmm5y7.rst b/Misc/NEWS.d/next/Tests/2019-07-09-12-33-18.bpo-37526.vmm5y7.rst
new file mode 100644
index 000000000000..aff6b6d1f12c
--- /dev/null
+++ b/Misc/NEWS.d/next/Tests/2019-07-09-12-33-18.bpo-37526.vmm5y7.rst
@@ -0,0 +1,2 @@
+Add :func:`test.support.catch_threading_exception`: context manager catching
+:class:`threading.Thread` exception using :func:`threading.excepthook`.


From webhook-mailer at python.org  Tue Jul  9 08:20:11 2019
From: webhook-mailer at python.org (Ivan Levkivskyi)
Date: Tue, 09 Jul 2019 12:20:11 -0000
Subject: [Python-checkins] bpo-18374: fix tests to check the correct thing
 about line numbers (GH-14659)
Message-ID: <mailman.307.1562674812.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/430a9f44fe22f029ae8cfeecb46621d7e199414b
commit: 430a9f44fe22f029ae8cfeecb46621d7e199414b
branch: master
author: Carl Friedrich Bolz-Tereick <cfbolz at gmx.de>
committer: Ivan Levkivskyi <levkivskyi at gmail.com>
date: 2019-07-09T13:20:01+01:00
summary:

bpo-18374: fix tests to check the correct thing about line numbers (GH-14659)

files:
M Lib/test/test_ast.py

diff --git a/Lib/test/test_ast.py b/Lib/test/test_ast.py
index 1e07c573c846..6bd27ce12a62 100644
--- a/Lib/test/test_ast.py
+++ b/Lib/test/test_ast.py
@@ -598,14 +598,14 @@ def test_issue18374_binop_col_offset(self):
         self.assertEqual(parent_binop.end_lineno, 2)
 
         self.assertEqual(child_binop.col_offset, 0)
-        self.assertEqual(parent_binop.lineno, 1)
+        self.assertEqual(child_binop.lineno, 1)
         self.assertEqual(child_binop.end_col_offset, 2)
-        self.assertEqual(parent_binop.end_lineno, 2)
+        self.assertEqual(child_binop.end_lineno, 2)
 
         self.assertEqual(grandchild_binop.col_offset, 0)
-        self.assertEqual(parent_binop.lineno, 1)
+        self.assertEqual(grandchild_binop.lineno, 1)
         self.assertEqual(grandchild_binop.end_col_offset, 3)
-        self.assertEqual(parent_binop.end_lineno, 2)
+        self.assertEqual(grandchild_binop.end_lineno, 1)
 
 class ASTHelpers_Test(unittest.TestCase):
     maxDiff = None


From webhook-mailer at python.org  Tue Jul  9 08:33:58 2019
From: webhook-mailer at python.org (Victor Stinner)
Date: Tue, 09 Jul 2019 12:33:58 -0000
Subject: [Python-checkins] bpo-37322: ssl test_pha_required_nocert() ignores
 expected SSLError (GH-14670)
Message-ID: <mailman.308.1562675639.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/73ea54620a6f91c3f2e53880373dd47813691a21
commit: 73ea54620a6f91c3f2e53880373dd47813691a21
branch: master
author: Victor Stinner <vstinner at redhat.com>
committer: GitHub <noreply at github.com>
date: 2019-07-09T14:33:49+02:00
summary:

bpo-37322: ssl test_pha_required_nocert() ignores expected SSLError (GH-14670)

test_ssl.test_pha_required_nocert() now uses
support.catch_threading_exception() to ignore the expected SSLError
in ConnectionHandler of ThreadedEchoServer (it is only raised
sometimes on Windows).

files:
M Lib/test/test_ssl.py

diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py
index d2b9e2046d0e..afc5be9a7e99 100644
--- a/Lib/test/test_ssl.py
+++ b/Lib/test/test_ssl.py
@@ -4326,21 +4326,24 @@ def test_pha_required_nocert(self):
         server_context.verify_mode = ssl.CERT_REQUIRED
         client_context.post_handshake_auth = True
 
-        server = ThreadedEchoServer(context=server_context, chatty=False)
-        with server:
-            with client_context.wrap_socket(socket.socket(),
-                                            server_hostname=hostname) as s:
-                s.connect((HOST, server.port))
-                s.write(b'PHA')
-                # receive CertificateRequest
-                self.assertEqual(s.recv(1024), b'OK\n')
-                # send empty Certificate + Finish
-                s.write(b'HASCERT')
-                # receive alert
-                with self.assertRaisesRegex(
-                        ssl.SSLError,
-                        'tlsv13 alert certificate required'):
-                    s.recv(1024)
+        # Ignore expected SSLError in ConnectionHandler of ThreadedEchoServer
+        # (it is only raised sometimes on Windows)
+        with support.catch_threading_exception() as cm:
+            server = ThreadedEchoServer(context=server_context, chatty=False)
+            with server:
+                with client_context.wrap_socket(socket.socket(),
+                                                server_hostname=hostname) as s:
+                    s.connect((HOST, server.port))
+                    s.write(b'PHA')
+                    # receive CertificateRequest
+                    self.assertEqual(s.recv(1024), b'OK\n')
+                    # send empty Certificate + Finish
+                    s.write(b'HASCERT')
+                    # receive alert
+                    with self.assertRaisesRegex(
+                            ssl.SSLError,
+                            'tlsv13 alert certificate required'):
+                        s.recv(1024)
 
     def test_pha_optional(self):
         if support.verbose:


From webhook-mailer at python.org  Tue Jul  9 08:43:04 2019
From: webhook-mailer at python.org (Miss Islington (bot))
Date: Tue, 09 Jul 2019 12:43:04 -0000
Subject: [Python-checkins] bpo-37120: Fix _ssl get_num_tickets() (GH-14668)
Message-ID: <mailman.309.1562676185.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/bbad695e7890513be7a9bc662e2d8ae13bfcd313
commit: bbad695e7890513be7a9bc662e2d8ae13bfcd313
branch: 3.8
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: GitHub <noreply at github.com>
date: 2019-07-09T05:42:49-07:00
summary:

bpo-37120: Fix _ssl get_num_tickets() (GH-14668)


Replace PyLong_FromLong() with PyLong_FromSize_t():
SSL_CTX_get_num_tickets() return type is size_t.

https://bugs.python.org/issue37120
(cherry picked from commit 76611c7c0af6b2f4d0d98a5db827d34cff54ce25)

Co-authored-by: Victor Stinner <vstinner at redhat.com>

files:
M Modules/_ssl.c

diff --git a/Modules/_ssl.c b/Modules/_ssl.c
index 3351af6cdefd..da30cbb758e2 100644
--- a/Modules/_ssl.c
+++ b/Modules/_ssl.c
@@ -3641,7 +3641,7 @@ set_maximum_version(PySSLContext *self, PyObject *arg, void *c)
 static PyObject *
 get_num_tickets(PySSLContext *self, void *c)
 {
-    return PyLong_FromLong(SSL_CTX_get_num_tickets(self->ctx));
+    return PyLong_FromSize_t(SSL_CTX_get_num_tickets(self->ctx));
 }
 
 static int


From webhook-mailer at python.org  Tue Jul  9 08:55:14 2019
From: webhook-mailer at python.org (Miss Islington (bot))
Date: Tue, 09 Jul 2019 12:55:14 -0000
Subject: [Python-checkins] bpo-37322: ssl test_pha_required_nocert() ignores
 expected SSLError (GH-14670)
Message-ID: <mailman.310.1562676915.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/4c403b8ca2d0ef44b691cceaeeac9e110fd3f05a
commit: 4c403b8ca2d0ef44b691cceaeeac9e110fd3f05a
branch: 3.8
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: GitHub <noreply at github.com>
date: 2019-07-09T05:55:08-07:00
summary:

bpo-37322: ssl test_pha_required_nocert() ignores expected SSLError (GH-14670)


test_ssl.test_pha_required_nocert() now uses
support.catch_threading_exception() to ignore the expected SSLError
in ConnectionHandler of ThreadedEchoServer (it is only raised
sometimes on Windows).
(cherry picked from commit 73ea54620a6f91c3f2e53880373dd47813691a21)

Co-authored-by: Victor Stinner <vstinner at redhat.com>

files:
M Lib/test/test_ssl.py

diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py
index f1b7aa731e9a..879d944f327e 100644
--- a/Lib/test/test_ssl.py
+++ b/Lib/test/test_ssl.py
@@ -4320,21 +4320,24 @@ def test_pha_required_nocert(self):
         server_context.verify_mode = ssl.CERT_REQUIRED
         client_context.post_handshake_auth = True
 
-        server = ThreadedEchoServer(context=server_context, chatty=False)
-        with server:
-            with client_context.wrap_socket(socket.socket(),
-                                            server_hostname=hostname) as s:
-                s.connect((HOST, server.port))
-                s.write(b'PHA')
-                # receive CertificateRequest
-                self.assertEqual(s.recv(1024), b'OK\n')
-                # send empty Certificate + Finish
-                s.write(b'HASCERT')
-                # receive alert
-                with self.assertRaisesRegex(
-                        ssl.SSLError,
-                        'tlsv13 alert certificate required'):
-                    s.recv(1024)
+        # Ignore expected SSLError in ConnectionHandler of ThreadedEchoServer
+        # (it is only raised sometimes on Windows)
+        with support.catch_threading_exception() as cm:
+            server = ThreadedEchoServer(context=server_context, chatty=False)
+            with server:
+                with client_context.wrap_socket(socket.socket(),
+                                                server_hostname=hostname) as s:
+                    s.connect((HOST, server.port))
+                    s.write(b'PHA')
+                    # receive CertificateRequest
+                    self.assertEqual(s.recv(1024), b'OK\n')
+                    # send empty Certificate + Finish
+                    s.write(b'HASCERT')
+                    # receive alert
+                    with self.assertRaisesRegex(
+                            ssl.SSLError,
+                            'tlsv13 alert certificate required'):
+                        s.recv(1024)
 
     def test_pha_optional(self):
         if support.verbose:


From webhook-mailer at python.org  Tue Jul  9 09:29:01 2019
From: webhook-mailer at python.org (Ivan Levkivskyi)
Date: Tue, 09 Jul 2019 13:29:01 -0000
Subject: [Python-checkins] bpo-18374: fix tests to check the correct thing
 about line numbers (GH-14659) (GH-14672)
Message-ID: <mailman.311.1562678943.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/68bd9c5691c4899d21cc7fe6cce7cd22b2f5ccb0
commit: 68bd9c5691c4899d21cc7fe6cce7cd22b2f5ccb0
branch: 3.8
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: Ivan Levkivskyi <levkivskyi at gmail.com>
date: 2019-07-09T14:28:56+01:00
summary:

bpo-18374: fix tests to check the correct thing about line numbers (GH-14659) (GH-14672)

(cherry picked from commit 430a9f44fe22f029ae8cfeecb46621d7e199414b)

Co-authored-by: Carl Friedrich Bolz-Tereick <cfbolz at gmx.de>

files:
M Lib/test/test_ast.py

diff --git a/Lib/test/test_ast.py b/Lib/test/test_ast.py
index 1e07c573c846..6bd27ce12a62 100644
--- a/Lib/test/test_ast.py
+++ b/Lib/test/test_ast.py
@@ -598,14 +598,14 @@ def test_issue18374_binop_col_offset(self):
         self.assertEqual(parent_binop.end_lineno, 2)
 
         self.assertEqual(child_binop.col_offset, 0)
-        self.assertEqual(parent_binop.lineno, 1)
+        self.assertEqual(child_binop.lineno, 1)
         self.assertEqual(child_binop.end_col_offset, 2)
-        self.assertEqual(parent_binop.end_lineno, 2)
+        self.assertEqual(child_binop.end_lineno, 2)
 
         self.assertEqual(grandchild_binop.col_offset, 0)
-        self.assertEqual(parent_binop.lineno, 1)
+        self.assertEqual(grandchild_binop.lineno, 1)
         self.assertEqual(grandchild_binop.end_col_offset, 3)
-        self.assertEqual(parent_binop.end_lineno, 2)
+        self.assertEqual(grandchild_binop.end_lineno, 1)
 
 class ASTHelpers_Test(unittest.TestCase):
     maxDiff = None


From webhook-mailer at python.org  Tue Jul  9 14:00:33 2019
From: webhook-mailer at python.org (Victor Stinner)
Date: Tue, 09 Jul 2019 18:00:33 -0000
Subject: [Python-checkins] bpo-27679: Remove set_bitfields() from
 _ctypes_test (GH-14648)
Message-ID: <mailman.312.1562695234.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/3a3db970de344efbb4017fb9dde9204f0fd4bbdc
commit: 3a3db970de344efbb4017fb9dde9204f0fd4bbdc
branch: master
author: Hai Shi <shihai1992 at gmail.com>
committer: Victor Stinner <vstinner at redhat.com>
date: 2019-07-09T20:00:27+02:00
summary:

bpo-27679: Remove set_bitfields() from _ctypes_test (GH-14648)

files:
M Modules/_ctypes/_ctypes_test.c

diff --git a/Modules/_ctypes/_ctypes_test.c b/Modules/_ctypes/_ctypes_test.c
index bae4976a08d3..4789d6bdda8c 100644
--- a/Modules/_ctypes/_ctypes_test.c
+++ b/Modules/_ctypes/_ctypes_test.c
@@ -425,30 +425,6 @@ struct BITS {
 #endif
 };
 
-EXPORT(void) set_bitfields(struct BITS *bits, char name, int value)
-{
-    switch (name) {
-    case 'A': bits->A = value; break;
-    case 'B': bits->B = value; break;
-    case 'C': bits->C = value; break;
-    case 'D': bits->D = value; break;
-    case 'E': bits->E = value; break;
-    case 'F': bits->F = value; break;
-    case 'G': bits->G = value; break;
-    case 'H': bits->H = value; break;
-    case 'I': bits->I = value; break;
-#ifdef SIGNED_SHORT_BITFIELDS
-    case 'M': bits->M = value; break;
-    case 'N': bits->N = value; break;
-    case 'O': bits->O = value; break;
-    case 'P': bits->P = value; break;
-    case 'Q': bits->Q = value; break;
-    case 'R': bits->R = value; break;
-    case 'S': bits->S = value; break;
-#endif
-    }
-}
-
 EXPORT(int) unpack_bitfields(struct BITS *bits, char name)
 {
     switch (name) {


From webhook-mailer at python.org  Tue Jul  9 14:37:31 2019
From: webhook-mailer at python.org (Terry Jan Reedy)
Date: Tue, 09 Jul 2019 18:37:31 -0000
Subject: [Python-checkins] bpo-26806: IDLE should run without docstrings
 (#14657)
Message-ID: <mailman.313.1562697452.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/6aeb2fe606408aae14c246470794f1303b3be812
commit: 6aeb2fe606408aae14c246470794f1303b3be812
branch: master
author: Terry Jan Reedy <tjreedy at udel.edu>
committer: GitHub <noreply at github.com>
date: 2019-07-09T14:37:25-04:00
summary:

bpo-26806: IDLE should run without docstrings (#14657)

After fcf1d00, IDLE startup failed with python compiled without docstrings.

files:
M Lib/idlelib/idle_test/test_run.py
M Lib/idlelib/run.py

diff --git a/Lib/idlelib/idle_test/test_run.py b/Lib/idlelib/idle_test/test_run.py
index d0f1e9207bb1..cad0b4d98f8e 100644
--- a/Lib/idlelib/idle_test/test_run.py
+++ b/Lib/idlelib/idle_test/test_run.py
@@ -292,6 +292,14 @@ def test_default_recursion_limit_preserved(self):
         new_reclimit = sys.getrecursionlimit()
         self.assertEqual(new_reclimit, orig_reclimit)
 
+    def test_fixdoc(self):
+        def func(): "docstring"
+        run.fixdoc(func, "more")
+        self.assertEqual(func.__doc__, "docstring\n\nmore")
+        func.__doc__ = None
+        run.fixdoc(func, "more")
+        self.assertEqual(func.__doc__, "more")
+
 
 if __name__ == '__main__':
     unittest.main(verbosity=2)
diff --git a/Lib/idlelib/run.py b/Lib/idlelib/run.py
index c6ed76b23a2d..41e0ded44029 100644
--- a/Lib/idlelib/run.py
+++ b/Lib/idlelib/run.py
@@ -307,7 +307,12 @@ def fix_scaling(root):
                 font['size'] = round(-0.75*size)
 
 
+def fixdoc(fun, text):
+    tem = (fun.__doc__ + '\n\n') if fun.__doc__ is not None else ''
+    fun.__doc__ = tem + textwrap.fill(textwrap.dedent(text))
+
 RECURSIONLIMIT_DELTA = 30
+
 def install_recursionlimit_wrappers():
     """Install wrappers to always add 30 to the recursion limit."""
     # see: bpo-26806
@@ -329,19 +334,17 @@ def setrecursionlimit(*args, **kwargs):
 
         return setrecursionlimit.__wrapped__(limit + RECURSIONLIMIT_DELTA)
 
-    setrecursionlimit.__doc__ += "\n\n" + textwrap.fill(textwrap.dedent(f"""\
-        This IDLE wrapper adds {RECURSIONLIMIT_DELTA} to prevent possible
-        uninterruptible loops.
-        """).strip())
+    fixdoc(setrecursionlimit, f"""\
+            This IDLE wrapper adds {RECURSIONLIMIT_DELTA} to prevent possible
+            uninterruptible loops.""")
 
     @functools.wraps(sys.getrecursionlimit)
     def getrecursionlimit():
         return getrecursionlimit.__wrapped__() - RECURSIONLIMIT_DELTA
 
-    getrecursionlimit.__doc__ += "\n\n" + textwrap.fill(textwrap.dedent(f"""\
-        This IDLE wrapper subtracts {RECURSIONLIMIT_DELTA} to compensate for
-        the {RECURSIONLIMIT_DELTA} IDLE adds when setting the limit.
-        """).strip())
+    fixdoc(getrecursionlimit, f"""\
+            This IDLE wrapper subtracts {RECURSIONLIMIT_DELTA} to compensate
+            for the {RECURSIONLIMIT_DELTA} IDLE adds when setting the limit.""")
 
     # add the delta to the default recursion limit, to compensate
     sys.setrecursionlimit(sys.getrecursionlimit() + RECURSIONLIMIT_DELTA)


From webhook-mailer at python.org  Tue Jul  9 14:59:30 2019
From: webhook-mailer at python.org (Terry Jan Reedy)
Date: Tue, 09 Jul 2019 18:59:30 -0000
Subject: [Python-checkins] bpo-26806: IDLE should run without docstrings
 (GH-14657) (GH-14677)
Message-ID: <mailman.314.1562698771.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/b82188d9bad1774624cb1788dbdec2f0d7d65688
commit: b82188d9bad1774624cb1788dbdec2f0d7d65688
branch: 3.8
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: Terry Jan Reedy <tjreedy at udel.edu>
date: 2019-07-09T14:59:19-04:00
summary:

bpo-26806: IDLE should run without docstrings (GH-14657) (GH-14677)

After fcf1d00, IDLE startup failed with python compiled without docstrings.
(cherry picked from commit 6aeb2fe606408aae14c246470794f1303b3be812)

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

files:
M Lib/idlelib/idle_test/test_run.py
M Lib/idlelib/run.py

diff --git a/Lib/idlelib/idle_test/test_run.py b/Lib/idlelib/idle_test/test_run.py
index d0f1e9207bb1..cad0b4d98f8e 100644
--- a/Lib/idlelib/idle_test/test_run.py
+++ b/Lib/idlelib/idle_test/test_run.py
@@ -292,6 +292,14 @@ def test_default_recursion_limit_preserved(self):
         new_reclimit = sys.getrecursionlimit()
         self.assertEqual(new_reclimit, orig_reclimit)
 
+    def test_fixdoc(self):
+        def func(): "docstring"
+        run.fixdoc(func, "more")
+        self.assertEqual(func.__doc__, "docstring\n\nmore")
+        func.__doc__ = None
+        run.fixdoc(func, "more")
+        self.assertEqual(func.__doc__, "more")
+
 
 if __name__ == '__main__':
     unittest.main(verbosity=2)
diff --git a/Lib/idlelib/run.py b/Lib/idlelib/run.py
index c6ed76b23a2d..41e0ded44029 100644
--- a/Lib/idlelib/run.py
+++ b/Lib/idlelib/run.py
@@ -307,7 +307,12 @@ def fix_scaling(root):
                 font['size'] = round(-0.75*size)
 
 
+def fixdoc(fun, text):
+    tem = (fun.__doc__ + '\n\n') if fun.__doc__ is not None else ''
+    fun.__doc__ = tem + textwrap.fill(textwrap.dedent(text))
+
 RECURSIONLIMIT_DELTA = 30
+
 def install_recursionlimit_wrappers():
     """Install wrappers to always add 30 to the recursion limit."""
     # see: bpo-26806
@@ -329,19 +334,17 @@ def setrecursionlimit(*args, **kwargs):
 
         return setrecursionlimit.__wrapped__(limit + RECURSIONLIMIT_DELTA)
 
-    setrecursionlimit.__doc__ += "\n\n" + textwrap.fill(textwrap.dedent(f"""\
-        This IDLE wrapper adds {RECURSIONLIMIT_DELTA} to prevent possible
-        uninterruptible loops.
-        """).strip())
+    fixdoc(setrecursionlimit, f"""\
+            This IDLE wrapper adds {RECURSIONLIMIT_DELTA} to prevent possible
+            uninterruptible loops.""")
 
     @functools.wraps(sys.getrecursionlimit)
     def getrecursionlimit():
         return getrecursionlimit.__wrapped__() - RECURSIONLIMIT_DELTA
 
-    getrecursionlimit.__doc__ += "\n\n" + textwrap.fill(textwrap.dedent(f"""\
-        This IDLE wrapper subtracts {RECURSIONLIMIT_DELTA} to compensate for
-        the {RECURSIONLIMIT_DELTA} IDLE adds when setting the limit.
-        """).strip())
+    fixdoc(getrecursionlimit, f"""\
+            This IDLE wrapper subtracts {RECURSIONLIMIT_DELTA} to compensate
+            for the {RECURSIONLIMIT_DELTA} IDLE adds when setting the limit.""")
 
     # add the delta to the default recursion limit, to compensate
     sys.setrecursionlimit(sys.getrecursionlimit() + RECURSIONLIMIT_DELTA)


From webhook-mailer at python.org  Tue Jul  9 15:16:49 2019
From: webhook-mailer at python.org (Terry Jan Reedy)
Date: Tue, 09 Jul 2019 19:16:49 -0000
Subject: [Python-checkins] bpo-26806: IDLE should run without docstrings
 (GH-14657) (GH-14678)
Message-ID: <mailman.315.1562699811.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/f54f062f68ac82fc3e7c92345b4d5fbe2534dc84
commit: f54f062f68ac82fc3e7c92345b4d5fbe2534dc84
branch: 3.7
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: Terry Jan Reedy <tjreedy at udel.edu>
date: 2019-07-09T15:16:44-04:00
summary:

bpo-26806: IDLE should run without docstrings (GH-14657) (GH-14678)

After fcf1d00, IDLE startup failed with python compiled without docstrings.
(cherry picked from commit 6aeb2fe606408aae14c246470794f1303b3be812)

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

files:
M Lib/idlelib/idle_test/test_run.py
M Lib/idlelib/run.py

diff --git a/Lib/idlelib/idle_test/test_run.py b/Lib/idlelib/idle_test/test_run.py
index d0f1e9207bb1..cad0b4d98f8e 100644
--- a/Lib/idlelib/idle_test/test_run.py
+++ b/Lib/idlelib/idle_test/test_run.py
@@ -292,6 +292,14 @@ def test_default_recursion_limit_preserved(self):
         new_reclimit = sys.getrecursionlimit()
         self.assertEqual(new_reclimit, orig_reclimit)
 
+    def test_fixdoc(self):
+        def func(): "docstring"
+        run.fixdoc(func, "more")
+        self.assertEqual(func.__doc__, "docstring\n\nmore")
+        func.__doc__ = None
+        run.fixdoc(func, "more")
+        self.assertEqual(func.__doc__, "more")
+
 
 if __name__ == '__main__':
     unittest.main(verbosity=2)
diff --git a/Lib/idlelib/run.py b/Lib/idlelib/run.py
index c6ed76b23a2d..41e0ded44029 100644
--- a/Lib/idlelib/run.py
+++ b/Lib/idlelib/run.py
@@ -307,7 +307,12 @@ def fix_scaling(root):
                 font['size'] = round(-0.75*size)
 
 
+def fixdoc(fun, text):
+    tem = (fun.__doc__ + '\n\n') if fun.__doc__ is not None else ''
+    fun.__doc__ = tem + textwrap.fill(textwrap.dedent(text))
+
 RECURSIONLIMIT_DELTA = 30
+
 def install_recursionlimit_wrappers():
     """Install wrappers to always add 30 to the recursion limit."""
     # see: bpo-26806
@@ -329,19 +334,17 @@ def setrecursionlimit(*args, **kwargs):
 
         return setrecursionlimit.__wrapped__(limit + RECURSIONLIMIT_DELTA)
 
-    setrecursionlimit.__doc__ += "\n\n" + textwrap.fill(textwrap.dedent(f"""\
-        This IDLE wrapper adds {RECURSIONLIMIT_DELTA} to prevent possible
-        uninterruptible loops.
-        """).strip())
+    fixdoc(setrecursionlimit, f"""\
+            This IDLE wrapper adds {RECURSIONLIMIT_DELTA} to prevent possible
+            uninterruptible loops.""")
 
     @functools.wraps(sys.getrecursionlimit)
     def getrecursionlimit():
         return getrecursionlimit.__wrapped__() - RECURSIONLIMIT_DELTA
 
-    getrecursionlimit.__doc__ += "\n\n" + textwrap.fill(textwrap.dedent(f"""\
-        This IDLE wrapper subtracts {RECURSIONLIMIT_DELTA} to compensate for
-        the {RECURSIONLIMIT_DELTA} IDLE adds when setting the limit.
-        """).strip())
+    fixdoc(getrecursionlimit, f"""\
+            This IDLE wrapper subtracts {RECURSIONLIMIT_DELTA} to compensate
+            for the {RECURSIONLIMIT_DELTA} IDLE adds when setting the limit.""")
 
     # add the delta to the default recursion limit, to compensate
     sys.setrecursionlimit(sys.getrecursionlimit() + RECURSIONLIMIT_DELTA)


From webhook-mailer at python.org  Wed Jul 10 11:56:19 2019
From: webhook-mailer at python.org (Stefan Krah)
Date: Wed, 10 Jul 2019 15:56:19 -0000
Subject: [Python-checkins] Really remove vcstdint.h. (#14686)
Message-ID: <mailman.316.1562774179.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/4749dbe54cfbcae64a06da2623e44f4017032207
commit: 4749dbe54cfbcae64a06da2623e44f4017032207
branch: master
author: Stefan Krah <skrah at bytereef.org>
committer: GitHub <noreply at github.com>
date: 2019-07-10T17:55:48+02:00
summary:

Really remove vcstdint.h. (#14686)

files:
D Modules/_decimal/libmpdec/vcstdint.h
M Modules/_decimal/libmpdec/README.txt
M Modules/_decimal/libmpdec/vccompat.h

diff --git a/Modules/_decimal/libmpdec/README.txt b/Modules/_decimal/libmpdec/README.txt
index 96b72232d2ad..4e0e4f30bed0 100644
--- a/Modules/_decimal/libmpdec/README.txt
+++ b/Modules/_decimal/libmpdec/README.txt
@@ -30,7 +30,6 @@ Files required for the Python _decimal module
     Visual Studio only:
     ~~~~~~~~~~~~~~~~~~~
       vccompat.h    ->  snprintf <==> sprintf_s and similar things.
-      vcstdint.h    ->  stdint.h (included in VS 2010 but not in VS 2008).
       vcdiv64.asm   ->  Double word division used in typearith.h. VS 2008 does
                         not allow inline asm for x64. Also, it does not provide
                         an intrinsic for double word division.
diff --git a/Modules/_decimal/libmpdec/vccompat.h b/Modules/_decimal/libmpdec/vccompat.h
index dd131d8da264..2ba805dcc564 100644
--- a/Modules/_decimal/libmpdec/vccompat.h
+++ b/Modules/_decimal/libmpdec/vccompat.h
@@ -30,7 +30,7 @@
 #define VCCOMPAT_H
 
 
-/* Visual C fixes: no stdint.h, no snprintf ... */
+/* Visual C fixes: no snprintf ... */
 #ifdef _MSC_VER
   #undef inline
   #define inline __inline
diff --git a/Modules/_decimal/libmpdec/vcstdint.h b/Modules/_decimal/libmpdec/vcstdint.h
deleted file mode 100644
index 17dcad4541ee..000000000000
--- a/Modules/_decimal/libmpdec/vcstdint.h
+++ /dev/null
@@ -1,232 +0,0 @@
-// ISO C9x  compliant stdint.h for Microsoft Visual Studio
-// Based on ISO/IEC 9899:TC2 Committee draft (May 6, 2005) WG14/N1124
-//
-//  Copyright (c) 2006-2008 Alexander Chemeris
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-//   1. Redistributions of source code must retain the above copyright notice,
-//      this list of conditions and the following disclaimer.
-//
-//   2. Redistributions in binary form must reproduce the above copyright
-//      notice, this list of conditions and the following disclaimer in the
-//      documentation and/or other materials provided with the distribution.
-//
-//   3. The name of the author may be used to endorse or promote products
-//      derived from this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
-// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-// EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-// OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-// WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-// ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _MSC_VER // [
-#error "Use this header only with Microsoft Visual C++ compilers!"
-#endif // _MSC_VER ]
-
-#ifndef _MSC_STDINT_H_ // [
-#define _MSC_STDINT_H_
-
-#if _MSC_VER > 1000
-#pragma once
-#endif
-
-#include <limits.h>
-
-// For Visual Studio 6 in C++ mode wrap <wchar.h> include with 'extern "C++" {}'
-// or compiler give many errors like this:
-//   error C2733: second C linkage of overloaded function 'wmemchr' not allowed
-#if (_MSC_VER < 1300) && defined(__cplusplus)
-   extern "C++" {
-#endif
-#     include <wchar.h>
-#if (_MSC_VER < 1300) && defined(__cplusplus)
-   }
-#endif
-
-// Define _W64 macros to mark types changing their size, like intptr_t.
-#ifndef _W64
-#  if !defined(__midl) && (defined(_X86_) || defined(_M_IX86)) && _MSC_VER >= 1300
-#     define _W64 __w64
-#  else
-#     define _W64
-#  endif
-#endif
-
-
-// 7.18.1 Integer types
-
-// 7.18.1.1 Exact-width integer types
-typedef __int8            int8_t;
-typedef __int16           int16_t;
-typedef __int32           int32_t;
-typedef __int64           int64_t;
-typedef unsigned __int8   uint8_t;
-typedef unsigned __int16  uint16_t;
-typedef unsigned __int32  uint32_t;
-typedef unsigned __int64  uint64_t;
-
-// 7.18.1.2 Minimum-width integer types
-typedef int8_t    int_least8_t;
-typedef int16_t   int_least16_t;
-typedef int32_t   int_least32_t;
-typedef int64_t   int_least64_t;
-typedef uint8_t   uint_least8_t;
-typedef uint16_t  uint_least16_t;
-typedef uint32_t  uint_least32_t;
-typedef uint64_t  uint_least64_t;
-
-// 7.18.1.3 Fastest minimum-width integer types
-typedef int8_t    int_fast8_t;
-typedef int16_t   int_fast16_t;
-typedef int32_t   int_fast32_t;
-typedef int64_t   int_fast64_t;
-typedef uint8_t   uint_fast8_t;
-typedef uint16_t  uint_fast16_t;
-typedef uint32_t  uint_fast32_t;
-typedef uint64_t  uint_fast64_t;
-
-// 7.18.1.4 Integer types capable of holding object pointers
-#ifdef _WIN64 // [
-   typedef __int64           intptr_t;
-   typedef unsigned __int64  uintptr_t;
-#else // _WIN64 ][
-   typedef _W64 int               intptr_t;
-   typedef _W64 unsigned int      uintptr_t;
-#endif // _WIN64 ]
-
-// 7.18.1.5 Greatest-width integer types
-typedef int64_t   intmax_t;
-typedef uint64_t  uintmax_t;
-
-
-// 7.18.2 Limits of specified-width integer types
-
-#if !defined(__cplusplus) || defined(__STDC_LIMIT_MACROS) // [   See footnote 220 at page 257 and footnote 221 at page 259
-
-// 7.18.2.1 Limits of exact-width integer types
-#define INT8_MIN     ((int8_t)_I8_MIN)
-#define INT8_MAX     _I8_MAX
-#define INT16_MIN    ((int16_t)_I16_MIN)
-#define INT16_MAX    _I16_MAX
-#define INT32_MIN    ((int32_t)_I32_MIN)
-#define INT32_MAX    _I32_MAX
-#define INT64_MIN    ((int64_t)_I64_MIN)
-#define INT64_MAX    _I64_MAX
-#define UINT8_MAX    _UI8_MAX
-#define UINT16_MAX   _UI16_MAX
-#define UINT32_MAX   _UI32_MAX
-#define UINT64_MAX   _UI64_MAX
-
-// 7.18.2.2 Limits of minimum-width integer types
-#define INT_LEAST8_MIN    INT8_MIN
-#define INT_LEAST8_MAX    INT8_MAX
-#define INT_LEAST16_MIN   INT16_MIN
-#define INT_LEAST16_MAX   INT16_MAX
-#define INT_LEAST32_MIN   INT32_MIN
-#define INT_LEAST32_MAX   INT32_MAX
-#define INT_LEAST64_MIN   INT64_MIN
-#define INT_LEAST64_MAX   INT64_MAX
-#define UINT_LEAST8_MAX   UINT8_MAX
-#define UINT_LEAST16_MAX  UINT16_MAX
-#define UINT_LEAST32_MAX  UINT32_MAX
-#define UINT_LEAST64_MAX  UINT64_MAX
-
-// 7.18.2.3 Limits of fastest minimum-width integer types
-#define INT_FAST8_MIN    INT8_MIN
-#define INT_FAST8_MAX    INT8_MAX
-#define INT_FAST16_MIN   INT16_MIN
-#define INT_FAST16_MAX   INT16_MAX
-#define INT_FAST32_MIN   INT32_MIN
-#define INT_FAST32_MAX   INT32_MAX
-#define INT_FAST64_MIN   INT64_MIN
-#define INT_FAST64_MAX   INT64_MAX
-#define UINT_FAST8_MAX   UINT8_MAX
-#define UINT_FAST16_MAX  UINT16_MAX
-#define UINT_FAST32_MAX  UINT32_MAX
-#define UINT_FAST64_MAX  UINT64_MAX
-
-// 7.18.2.4 Limits of integer types capable of holding object pointers
-#ifdef _WIN64 // [
-#  define INTPTR_MIN   INT64_MIN
-#  define INTPTR_MAX   INT64_MAX
-#  define UINTPTR_MAX  UINT64_MAX
-#else // _WIN64 ][
-#  define INTPTR_MIN   INT32_MIN
-#  define INTPTR_MAX   INT32_MAX
-#  define UINTPTR_MAX  UINT32_MAX
-#endif // _WIN64 ]
-
-// 7.18.2.5 Limits of greatest-width integer types
-#define INTMAX_MIN   INT64_MIN
-#define INTMAX_MAX   INT64_MAX
-#define UINTMAX_MAX  UINT64_MAX
-
-// 7.18.3 Limits of other integer types
-
-#ifdef _WIN64 // [
-#  define PTRDIFF_MIN  _I64_MIN
-#  define PTRDIFF_MAX  _I64_MAX
-#else  // _WIN64 ][
-#  define PTRDIFF_MIN  _I32_MIN
-#  define PTRDIFF_MAX  _I32_MAX
-#endif  // _WIN64 ]
-
-#define SIG_ATOMIC_MIN  INT_MIN
-#define SIG_ATOMIC_MAX  INT_MAX
-
-#ifndef SIZE_MAX // [
-#  ifdef _WIN64 // [
-#     define SIZE_MAX  _UI64_MAX
-#  else // _WIN64 ][
-#     define SIZE_MAX  _UI32_MAX
-#  endif // _WIN64 ]
-#endif // SIZE_MAX ]
-
-// WCHAR_MIN and WCHAR_MAX are also defined in <wchar.h>
-#ifndef WCHAR_MIN // [
-#  define WCHAR_MIN  0
-#endif  // WCHAR_MIN ]
-#ifndef WCHAR_MAX // [
-#  define WCHAR_MAX  _UI16_MAX
-#endif  // WCHAR_MAX ]
-
-#define WINT_MIN  0
-#define WINT_MAX  _UI16_MAX
-
-#endif // __STDC_LIMIT_MACROS ]
-
-
-// 7.18.4 Limits of other integer types
-
-#if !defined(__cplusplus) || defined(__STDC_CONSTANT_MACROS) // [   See footnote 224 at page 260
-
-// 7.18.4.1 Macros for minimum-width integer constants
-
-#define INT8_C(val)  val##i8
-#define INT16_C(val) val##i16
-#define INT32_C(val) val##i32
-#define INT64_C(val) val##i64
-
-#define UINT8_C(val)  val##ui8
-#define UINT16_C(val) val##ui16
-#define UINT32_C(val) val##ui32
-#define UINT64_C(val) val##ui64
-
-// 7.18.4.2 Macros for greatest-width integer constants
-#define INTMAX_C   INT64_C
-#define UINTMAX_C  UINT64_C
-
-#endif // __STDC_CONSTANT_MACROS ]
-
-
-#endif // _MSC_STDINT_H_ ]


From webhook-mailer at python.org  Wed Jul 10 12:27:45 2019
From: webhook-mailer at python.org (Stefan Krah)
Date: Wed, 10 Jul 2019 16:27:45 -0000
Subject: [Python-checkins] Rename memory.c to mpalloc.c for consistency with
 the header file. (#14687)
Message-ID: <mailman.317.1562776067.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/f117d871c467e82d98b127fd77d2542600d67c39
commit: f117d871c467e82d98b127fd77d2542600d67c39
branch: master
author: Stefan Krah <skrah at bytereef.org>
committer: GitHub <noreply at github.com>
date: 2019-07-10T18:27:38+02:00
summary:

Rename memory.c to mpalloc.c for consistency with the header file. (#14687)

files:
A Modules/_decimal/libmpdec/mpalloc.c
D Modules/_decimal/libmpdec/memory.c
M Modules/_decimal/libmpdec/README.txt
M PCbuild/_decimal.vcxproj
M PCbuild/_decimal.vcxproj.filters
M setup.py

diff --git a/Modules/_decimal/libmpdec/README.txt b/Modules/_decimal/libmpdec/README.txt
index 4e0e4f30bed0..dc97820a6eb0 100644
--- a/Modules/_decimal/libmpdec/README.txt
+++ b/Modules/_decimal/libmpdec/README.txt
@@ -20,7 +20,7 @@ Files required for the Python _decimal module
     context.c        ->  Context functions.
     io.{c,h}         ->  Conversions between mpd_t and ASCII strings,
                          mpd_t formatting (allows UTF-8 fill character).
-    memory.{c,h}     ->  Allocation handlers with overflow detection
+    mpalloc.{c,h}    ->  Allocation handlers with overflow detection
                          and functions for switching between static
                          and dynamic mpd_t.
     mpdecimal.{c,h}  ->  All (quiet) functions of the specification.
diff --git a/Modules/_decimal/libmpdec/memory.c b/Modules/_decimal/libmpdec/mpalloc.c
similarity index 100%
rename from Modules/_decimal/libmpdec/memory.c
rename to Modules/_decimal/libmpdec/mpalloc.c
diff --git a/PCbuild/_decimal.vcxproj b/PCbuild/_decimal.vcxproj
index 465a7ade9a01..f0f387f3bfaa 100644
--- a/PCbuild/_decimal.vcxproj
+++ b/PCbuild/_decimal.vcxproj
@@ -131,7 +131,7 @@
     <ClCompile Include="..\Modules\_decimal\libmpdec\fnt.c" />
     <ClCompile Include="..\Modules\_decimal\libmpdec\fourstep.c" />
     <ClCompile Include="..\Modules\_decimal\libmpdec\io.c" />
-    <ClCompile Include="..\Modules\_decimal\libmpdec\memory.c" />
+    <ClCompile Include="..\Modules\_decimal\libmpdec\mpalloc.c" />
     <ClCompile Include="..\Modules\_decimal\libmpdec\mpdecimal.c" />
     <ClCompile Include="..\Modules\_decimal\libmpdec\numbertheory.c" />
     <ClCompile Include="..\Modules\_decimal\libmpdec\sixstep.c" />
diff --git a/PCbuild/_decimal.vcxproj.filters b/PCbuild/_decimal.vcxproj.filters
index 7e19aa2f6596..1aa9d020d672 100644
--- a/PCbuild/_decimal.vcxproj.filters
+++ b/PCbuild/_decimal.vcxproj.filters
@@ -92,7 +92,7 @@
     <ClCompile Include="..\Modules\_decimal\libmpdec\io.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\Modules\_decimal\libmpdec\memory.c">
+    <ClCompile Include="..\Modules\_decimal\libmpdec\mpalloc.c">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="..\Modules\_decimal\libmpdec\mpdecimal.c">
diff --git a/setup.py b/setup.py
index e54d31f53338..3ec89cedfd57 100644
--- a/setup.py
+++ b/setup.py
@@ -2095,7 +2095,7 @@ def detect_decimal(self):
               '_decimal/libmpdec/fnt.c',
               '_decimal/libmpdec/fourstep.c',
               '_decimal/libmpdec/io.c',
-              '_decimal/libmpdec/memory.c',
+              '_decimal/libmpdec/mpalloc.c',
               '_decimal/libmpdec/mpdecimal.c',
               '_decimal/libmpdec/numbertheory.c',
               '_decimal/libmpdec/sixstep.c',


From webhook-mailer at python.org  Wed Jul 10 15:04:39 2019
From: webhook-mailer at python.org (Neil Schemenauer)
Date: Wed, 10 Jul 2019 19:04:39 -0000
Subject: [Python-checkins] bpo-37537: Compute allocated blocks in
 _Py_GetAllocatedBlocks() (#14680)
Message-ID: <mailman.318.1562785480.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/5d25f2b70351fc6a56ce5513ccf5f58556c18837
commit: 5d25f2b70351fc6a56ce5513ccf5f58556c18837
branch: master
author: Neil Schemenauer <nas-github at arctrix.com>
committer: GitHub <noreply at github.com>
date: 2019-07-10T12:04:16-07:00
summary:

bpo-37537: Compute allocated blocks in _Py_GetAllocatedBlocks() (#14680)

Keeping an account of allocated blocks slows down _PyObject_Malloc()
and _PyObject_Free() by a measureable amount.  Have
_Py_GetAllocatedBlocks() iterate over the arenas to sum up the
allocated blocks for pymalloc.

files:
A Misc/NEWS.d/next/Core and Builtins/2019-07-10-09-56-47.bpo-37537.OkB0wd.rst
M Objects/obmalloc.c

diff --git a/Misc/NEWS.d/next/Core and Builtins/2019-07-10-09-56-47.bpo-37537.OkB0wd.rst b/Misc/NEWS.d/next/Core and Builtins/2019-07-10-09-56-47.bpo-37537.OkB0wd.rst
new file mode 100644
index 000000000000..abf874475d6d
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2019-07-10-09-56-47.bpo-37537.OkB0wd.rst	
@@ -0,0 +1,3 @@
+Compute allocated pymalloc blocks inside _Py_GetAllocatedBlocks().  This
+slows down _Py_GetAllocatedBlocks() but gives a small speedup to
+_PyObject_Malloc() and _PyObject_Free().
diff --git a/Objects/obmalloc.c b/Objects/obmalloc.c
index 622da3ad08fc..bb154c76ab18 100644
--- a/Objects/obmalloc.c
+++ b/Objects/obmalloc.c
@@ -1206,12 +1206,29 @@ static size_t ntimes_arena_allocated = 0;
 /* High water mark (max value ever seen) for narenas_currently_allocated. */
 static size_t narenas_highwater = 0;
 
-static Py_ssize_t _Py_AllocatedBlocks = 0;
+static Py_ssize_t raw_allocated_blocks;
 
 Py_ssize_t
 _Py_GetAllocatedBlocks(void)
 {
-    return _Py_AllocatedBlocks;
+    Py_ssize_t n = raw_allocated_blocks;
+    /* add up allocated blocks for used pools */
+    for (uint i = 0; i < maxarenas; ++i) {
+        /* Skip arenas which are not allocated. */
+        if (arenas[i].address == NULL) {
+            continue;
+        }
+
+        uintptr_t base = (uintptr_t)_Py_ALIGN_UP(arenas[i].address, POOL_SIZE);
+
+        /* visit every pool in the arena */
+        assert(base <= (uintptr_t) arenas[i].pool_address);
+        for (; base < (uintptr_t) arenas[i].pool_address; base += POOL_SIZE) {
+            poolp p = (poolp)base;
+            n += p->ref.count;
+        }
+    }
+    return n;
 }
 
 
@@ -1622,13 +1639,12 @@ _PyObject_Malloc(void *ctx, size_t nbytes)
 {
     void* ptr;
     if (pymalloc_alloc(ctx, &ptr, nbytes)) {
-        _Py_AllocatedBlocks++;
         return ptr;
     }
 
     ptr = PyMem_RawMalloc(nbytes);
     if (ptr != NULL) {
-        _Py_AllocatedBlocks++;
+        raw_allocated_blocks++;
     }
     return ptr;
 }
@@ -1644,13 +1660,12 @@ _PyObject_Calloc(void *ctx, size_t nelem, size_t elsize)
 
     if (pymalloc_alloc(ctx, &ptr, nbytes)) {
         memset(ptr, 0, nbytes);
-        _Py_AllocatedBlocks++;
         return ptr;
     }
 
     ptr = PyMem_RawCalloc(nelem, elsize);
     if (ptr != NULL) {
-        _Py_AllocatedBlocks++;
+        raw_allocated_blocks++;
     }
     return ptr;
 }
@@ -1899,10 +1914,10 @@ _PyObject_Free(void *ctx, void *p)
         return;
     }
 
-    _Py_AllocatedBlocks--;
     if (!pymalloc_free(ctx, p)) {
         /* pymalloc didn't allocate this address */
         PyMem_RawFree(p);
+        raw_allocated_blocks--;
     }
 }
 


From webhook-mailer at python.org  Wed Jul 10 17:24:05 2019
From: webhook-mailer at python.org (Tim Peters)
Date: Wed, 10 Jul 2019 21:24:05 -0000
Subject: [Python-checkins] Fix compiler warning in new code. (#14690)
Message-ID: <mailman.319.1562793847.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/b64c2c66e5cfe6d138b342ee58ee3b13a8d7ef16
commit: b64c2c66e5cfe6d138b342ee58ee3b13a8d7ef16
branch: master
author: Tim Peters <tim.peters at gmail.com>
committer: GitHub <noreply at github.com>
date: 2019-07-10T16:24:01-05:00
summary:

Fix compiler warning in new code. (#14690)

uintptr_t is an integer type, and can't be compared to NULL directly.

files:
M Objects/obmalloc.c

diff --git a/Objects/obmalloc.c b/Objects/obmalloc.c
index bb154c76ab18..2c00efc255dc 100644
--- a/Objects/obmalloc.c
+++ b/Objects/obmalloc.c
@@ -1215,7 +1215,7 @@ _Py_GetAllocatedBlocks(void)
     /* add up allocated blocks for used pools */
     for (uint i = 0; i < maxarenas; ++i) {
         /* Skip arenas which are not allocated. */
-        if (arenas[i].address == NULL) {
+        if (arenas[i].address == 0) {
             continue;
         }
 


From webhook-mailer at python.org  Wed Jul 10 22:43:08 2019
From: webhook-mailer at python.org (Benjamin Peterson)
Date: Thu, 11 Jul 2019 02:43:08 -0000
Subject: [Python-checkins] Document default parameter of .seek() in the
 signature. (GH-14691)
Message-ID: <mailman.320.1562812989.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/2a3d4d9c53dd4831c3ecf56bc7c4a289c33030d6
commit: 2a3d4d9c53dd4831c3ecf56bc7c4a289c33030d6
branch: master
author: Benjamin Peterson <benjamin at python.org>
committer: GitHub <noreply at github.com>
date: 2019-07-10T19:43:04-07:00
summary:

Document default parameter of .seek() in the signature. (GH-14691)

files:
M Doc/library/io.rst

diff --git a/Doc/library/io.rst b/Doc/library/io.rst
index fce9a747fd32..70e01153d419 100644
--- a/Doc/library/io.rst
+++ b/Doc/library/io.rst
@@ -327,7 +327,7 @@ I/O Base Classes
       Note that it's already possible to iterate on file objects using ``for
       line in file: ...`` without calling ``file.readlines()``.
 
-   .. method:: seek(offset[, whence])
+   .. method:: seek(offset, whence=SEEK_SET)
 
       Change the stream position to the given byte *offset*.  *offset* is
       interpreted relative to the position indicated by *whence*.  The default
@@ -831,7 +831,7 @@ Text I/O
 
       If *size* is specified, at most *size* characters will be read.
 
-   .. method:: seek(offset[, whence])
+   .. method:: seek(offset, whence=SEEK_SET)
 
       Change the stream position to the given *offset*.  Behaviour depends on
       the *whence* parameter.  The default value for *whence* is


From webhook-mailer at python.org  Wed Jul 10 22:49:41 2019
From: webhook-mailer at python.org (Miss Islington (bot))
Date: Thu, 11 Jul 2019 02:49:41 -0000
Subject: [Python-checkins] Document default parameter of .seek() in the
 signature. (GH-14691)
Message-ID: <mailman.321.1562813382.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/2847a75c21821dce21ad496980031751330b33b9
commit: 2847a75c21821dce21ad496980031751330b33b9
branch: 3.7
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: GitHub <noreply at github.com>
date: 2019-07-10T19:49:37-07:00
summary:

Document default parameter of .seek() in the signature. (GH-14691)

(cherry picked from commit 2a3d4d9c53dd4831c3ecf56bc7c4a289c33030d6)

Co-authored-by: Benjamin Peterson <benjamin at python.org>

files:
M Doc/library/io.rst

diff --git a/Doc/library/io.rst b/Doc/library/io.rst
index 966fb9cc7663..6bf56bc415b2 100644
--- a/Doc/library/io.rst
+++ b/Doc/library/io.rst
@@ -306,7 +306,7 @@ I/O Base Classes
       Note that it's already possible to iterate on file objects using ``for
       line in file: ...`` without calling ``file.readlines()``.
 
-   .. method:: seek(offset[, whence])
+   .. method:: seek(offset, whence=SEEK_SET)
 
       Change the stream position to the given byte *offset*.  *offset* is
       interpreted relative to the position indicated by *whence*.  The default
@@ -810,7 +810,7 @@ Text I/O
 
       If *size* is specified, at most *size* characters will be read.
 
-   .. method:: seek(offset[, whence])
+   .. method:: seek(offset, whence=SEEK_SET)
 
       Change the stream position to the given *offset*.  Behaviour depends on
       the *whence* parameter.  The default value for *whence* is


From webhook-mailer at python.org  Wed Jul 10 22:49:52 2019
From: webhook-mailer at python.org (Miss Islington (bot))
Date: Thu, 11 Jul 2019 02:49:52 -0000
Subject: [Python-checkins] Document default parameter of .seek() in the
 signature. (GH-14691)
Message-ID: <mailman.322.1562813392.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/aca82977632fafa1d97c938999d76fae37c64f23
commit: aca82977632fafa1d97c938999d76fae37c64f23
branch: 3.8
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: GitHub <noreply at github.com>
date: 2019-07-10T19:49:49-07:00
summary:

Document default parameter of .seek() in the signature. (GH-14691)

(cherry picked from commit 2a3d4d9c53dd4831c3ecf56bc7c4a289c33030d6)

Co-authored-by: Benjamin Peterson <benjamin at python.org>

files:
M Doc/library/io.rst

diff --git a/Doc/library/io.rst b/Doc/library/io.rst
index fce9a747fd32..70e01153d419 100644
--- a/Doc/library/io.rst
+++ b/Doc/library/io.rst
@@ -327,7 +327,7 @@ I/O Base Classes
       Note that it's already possible to iterate on file objects using ``for
       line in file: ...`` without calling ``file.readlines()``.
 
-   .. method:: seek(offset[, whence])
+   .. method:: seek(offset, whence=SEEK_SET)
 
       Change the stream position to the given byte *offset*.  *offset* is
       interpreted relative to the position indicated by *whence*.  The default
@@ -831,7 +831,7 @@ Text I/O
 
       If *size* is specified, at most *size* characters will be read.
 
-   .. method:: seek(offset[, whence])
+   .. method:: seek(offset, whence=SEEK_SET)
 
       Change the stream position to the given *offset*.  Behaviour depends on
       the *whence* parameter.  The default value for *whence* is


From webhook-mailer at python.org  Wed Jul 10 22:50:03 2019
From: webhook-mailer at python.org (Miss Islington (bot))
Date: Thu, 11 Jul 2019 02:50:03 -0000
Subject: [Python-checkins] Document default parameter of .seek() in the
 signature. (GH-14691)
Message-ID: <mailman.323.1562813404.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/0517375c4494b728171b0e306959e3f2703e0046
commit: 0517375c4494b728171b0e306959e3f2703e0046
branch: 2.7
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: GitHub <noreply at github.com>
date: 2019-07-10T19:49:59-07:00
summary:

Document default parameter of .seek() in the signature. (GH-14691)

(cherry picked from commit 2a3d4d9c53dd4831c3ecf56bc7c4a289c33030d6)

Co-authored-by: Benjamin Peterson <benjamin at python.org>

files:
M Doc/library/io.rst

diff --git a/Doc/library/io.rst b/Doc/library/io.rst
index dcdd01cd0aa5..7c053f973aa1 100644
--- a/Doc/library/io.rst
+++ b/Doc/library/io.rst
@@ -304,7 +304,7 @@ I/O Base Classes
       Note that it's already possible to iterate on file objects using ``for
       line in file: ...`` without calling ``file.readlines()``.
 
-   .. method:: seek(offset[, whence])
+   .. method:: seek(offset, whence=SEEK_SET)
 
       Change the stream position to the given byte *offset*.  *offset* is
       interpreted relative to the position indicated by *whence*.  The default
@@ -736,7 +736,7 @@ Text I/O
 
       If *limit* is specified, at most *limit* characters will be read.
 
-   .. method:: seek(offset[, whence])
+   .. method:: seek(offset, whence=SEEK_SET)
 
       Change the stream position to the given *offset*.  Behaviour depends on
       the *whence* parameter.  The default value for *whence* is


From webhook-mailer at python.org  Thu Jul 11 04:59:23 2019
From: webhook-mailer at python.org (Inada Naoki)
Date: Thu, 11 Jul 2019 08:59:23 -0000
Subject: [Python-checkins] bpo-37547: add _PyObject_CallMethodOneArg
 (GH-14685)
Message-ID: <mailman.324.1562835564.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/59ad110d7a7784d53d0b502eebce0346597a6bef
commit: 59ad110d7a7784d53d0b502eebce0346597a6bef
branch: master
author: Jeroen Demeyer <J.Demeyer at UGent.be>
committer: Inada Naoki <songofacandy at gmail.com>
date: 2019-07-11T17:59:05+09:00
summary:

bpo-37547: add _PyObject_CallMethodOneArg (GH-14685)

files:
M Doc/c-api/object.rst
M Include/cpython/abstract.h
M Misc/NEWS.d/next/C API/2019-06-19-12-06-31.bpo-37337.gXIGyU.rst
M Modules/_abc.c
M Modules/_asynciomodule.c
M Modules/_ctypes/callproc.c
M Modules/_datetimemodule.c
M Modules/_elementtree.c
M Modules/_io/bufferedio.c
M Modules/_io/fileio.c
M Modules/_io/textio.c
M Modules/_io/winconsoleio.c
M Modules/_pickle.c
M Modules/_sqlite/connection.c
M Modules/arraymodule.c
M Modules/cjkcodecs/multibytecodec.c
M Objects/dictobject.c
M Objects/typeobject.c
M Python/_warnings.c
M Python/ceval.c
M Python/import.c
M Python/marshal.c
M Python/sysmodule.c

diff --git a/Doc/c-api/object.rst b/Doc/c-api/object.rst
index 8ca034452954..2cf032821afb 100644
--- a/Doc/c-api/object.rst
+++ b/Doc/c-api/object.rst
@@ -375,6 +375,18 @@ Object Protocol
    .. versionadded:: 3.9
 
 
+.. c:function:: PyObject* _PyObject_CallMethodOneArg(PyObject *obj, PyObject *name, PyObject *arg)
+
+   Call a method of the Python object *obj* with a single positional argument
+   *arg*, where the name of the method is given as a Python string object in
+   *name*.
+
+   Return the result of the call on success, or raise an exception and return
+   *NULL* on failure.
+
+   .. versionadded:: 3.9
+
+
 .. c:function:: PyObject* _PyObject_Vectorcall(PyObject *callable, PyObject *const *args, size_t nargsf, PyObject *kwnames)
 
    Call a callable Python object *callable*, using
diff --git a/Include/cpython/abstract.h b/Include/cpython/abstract.h
index e9a23195f414..d57aa54bc466 100644
--- a/Include/cpython/abstract.h
+++ b/Include/cpython/abstract.h
@@ -163,6 +163,15 @@ _PyObject_CallMethodNoArgs(PyObject *self, PyObject *name)
            1 | PY_VECTORCALL_ARGUMENTS_OFFSET, NULL);
 }
 
+static inline PyObject *
+_PyObject_CallMethodOneArg(PyObject *self, PyObject *name, PyObject *arg)
+{
+    assert(arg != NULL);
+    PyObject *args[2] = {self, arg};
+    return _PyObject_VectorcallMethod(name, args,
+           2 | PY_VECTORCALL_ARGUMENTS_OFFSET, NULL);
+}
+
 /* Like PyObject_CallMethod(), but expect a _Py_Identifier*
    as the method name. */
 PyAPI_FUNC(PyObject *) _PyObject_CallMethodId(PyObject *obj,
@@ -198,6 +207,15 @@ _PyObject_CallMethodIdNoArgs(PyObject *self, _Py_Identifier *name)
            1 | PY_VECTORCALL_ARGUMENTS_OFFSET, NULL);
 }
 
+static inline PyObject *
+_PyObject_CallMethodIdOneArg(PyObject *self, _Py_Identifier *name, PyObject *arg)
+{
+    assert(arg != NULL);
+    PyObject *args[2] = {self, arg};
+    return _PyObject_VectorcallMethodId(name, args,
+           2 | PY_VECTORCALL_ARGUMENTS_OFFSET, NULL);
+}
+
 PyAPI_FUNC(int) _PyObject_HasLen(PyObject *o);
 
 /* Guess the size of object 'o' using len(o) or o.__length_hint__().
diff --git a/Misc/NEWS.d/next/C API/2019-06-19-12-06-31.bpo-37337.gXIGyU.rst b/Misc/NEWS.d/next/C API/2019-06-19-12-06-31.bpo-37337.gXIGyU.rst
index df0e807e1166..63b355ecdb33 100644
--- a/Misc/NEWS.d/next/C API/2019-06-19-12-06-31.bpo-37337.gXIGyU.rst	
+++ b/Misc/NEWS.d/next/C API/2019-06-19-12-06-31.bpo-37337.gXIGyU.rst	
@@ -1,2 +1,2 @@
-Add fast functions for calling methods: :c:func:`_PyObject_VectorcallMethod`
-and :c:func:`_PyObject_CallMethodNoArgs`
+Add fast functions for calling methods: :c:func:`_PyObject_VectorcallMethod`,
+:c:func:`_PyObject_CallMethodNoArgs` and :c:func:`_PyObject_CallMethodOneArg`.
diff --git a/Modules/_abc.c b/Modules/_abc.c
index 219ea0dd628f..7b5d4180bf87 100644
--- a/Modules/_abc.c
+++ b/Modules/_abc.c
@@ -480,7 +480,6 @@ _abc__abc_instancecheck_impl(PyObject *module, PyObject *self,
 /*[clinic end generated code: output=b8b5148f63b6b56f input=a4f4525679261084]*/
 {
     PyObject *subtype, *result = NULL, *subclass = NULL;
-    PyObject *margs[2];
     _abc_data *impl = _get_impl(self);
     if (impl == NULL) {
         return NULL;
@@ -515,16 +514,12 @@ _abc__abc_instancecheck_impl(PyObject *module, PyObject *self,
             }
         }
         /* Fall back to the subclass check. */
-        margs[0] = self;
-        margs[1] = subclass;
-        result = _PyObject_VectorcallMethodId(&PyId___subclasscheck__, margs,
-            2 | PY_VECTORCALL_ARGUMENTS_OFFSET, NULL);
+        result = _PyObject_CallMethodIdOneArg(self, &PyId___subclasscheck__,
+                                              subclass);
         goto end;
     }
-    margs[0] = self;
-    margs[1] = subclass;
-    result = _PyObject_VectorcallMethodId(&PyId___subclasscheck__, margs,
-        2 | PY_VECTORCALL_ARGUMENTS_OFFSET, NULL);
+    result = _PyObject_CallMethodIdOneArg(self, &PyId___subclasscheck__,
+                                          subclass);
     if (result == NULL) {
         goto end;
     }
@@ -536,10 +531,8 @@ _abc__abc_instancecheck_impl(PyObject *module, PyObject *self,
         break;
     case 0:
         Py_DECREF(result);
-        margs[0] = self;
-        margs[1] = subtype;
-        result = _PyObject_VectorcallMethodId(&PyId___subclasscheck__, margs,
-            2 | PY_VECTORCALL_ARGUMENTS_OFFSET, NULL);
+        result = _PyObject_CallMethodIdOneArg(self, &PyId___subclasscheck__,
+                                              subtype);
         break;
     case 1:  // Nothing to do.
         break;
@@ -620,8 +613,8 @@ _abc__abc_subclasscheck_impl(PyObject *module, PyObject *self,
     }
 
     /* 3. Check the subclass hook. */
-    ok = _PyObject_CallMethodIdObjArgs((PyObject *)self, &PyId___subclasshook__,
-                                       subclass, NULL);
+    ok = _PyObject_CallMethodIdOneArg((PyObject *)self, &PyId___subclasshook__,
+                                      subclass);
     if (ok == NULL) {
         goto end;
     }
diff --git a/Modules/_asynciomodule.c b/Modules/_asynciomodule.c
index 6c469d2a2ec5..e9e6c5682d62 100644
--- a/Modules/_asynciomodule.c
+++ b/Modules/_asynciomodule.c
@@ -1842,8 +1842,8 @@ register_task(PyObject *task)
 {
     _Py_IDENTIFIER(add);
 
-    PyObject *res = _PyObject_CallMethodIdObjArgs(
-        all_tasks, &PyId_add, task, NULL);
+    PyObject *res = _PyObject_CallMethodIdOneArg(all_tasks,
+                                                 &PyId_add, task);
     if (res == NULL) {
         return -1;
     }
@@ -1857,8 +1857,8 @@ unregister_task(PyObject *task)
 {
     _Py_IDENTIFIER(discard);
 
-    PyObject *res = _PyObject_CallMethodIdObjArgs(
-        all_tasks, &PyId_discard, task, NULL);
+    PyObject *res = _PyObject_CallMethodIdOneArg(all_tasks,
+                                                 &PyId_discard, task);
     if (res == NULL) {
         return -1;
     }
@@ -2611,13 +2611,11 @@ task_step_impl(TaskObj *task, PyObject *exc)
             result = _PyGen_Send((PyGenObject*)coro, Py_None);
         }
         else {
-            result = _PyObject_CallMethodIdObjArgs(coro, &PyId_send,
-                                                   Py_None, NULL);
+            result = _PyObject_CallMethodIdOneArg(coro, &PyId_send, Py_None);
         }
     }
     else {
-        result = _PyObject_CallMethodIdObjArgs(coro, &PyId_throw,
-                                               exc, NULL);
+        result = _PyObject_CallMethodIdOneArg(coro, &PyId_throw, exc);
         if (clear_exc) {
             /* We created 'exc' during this call */
             Py_DECREF(exc);
diff --git a/Modules/_ctypes/callproc.c b/Modules/_ctypes/callproc.c
index 973a654bf355..bd67c6eeaeed 100644
--- a/Modules/_ctypes/callproc.c
+++ b/Modules/_ctypes/callproc.c
@@ -1699,7 +1699,7 @@ unpickle(PyObject *self, PyObject *args)
 
     if (!PyArg_ParseTuple(args, "OO!", &typ, &PyTuple_Type, &state))
         return NULL;
-    obj = _PyObject_CallMethodIdObjArgs(typ, &PyId___new__, typ, NULL);
+    obj = _PyObject_CallMethodIdOneArg(typ, &PyId___new__, typ);
     if (obj == NULL)
         return NULL;
 
diff --git a/Modules/_datetimemodule.c b/Modules/_datetimemodule.c
index 0546368d1df7..19d3d7e848f5 100644
--- a/Modules/_datetimemodule.c
+++ b/Modules/_datetimemodule.c
@@ -1237,8 +1237,7 @@ call_tzname(PyObject *tzinfo, PyObject *tzinfoarg)
     if (tzinfo == Py_None)
         Py_RETURN_NONE;
 
-    result = _PyObject_CallMethodIdObjArgs(tzinfo, &PyId_tzname,
-                                           tzinfoarg, NULL);
+    result = _PyObject_CallMethodIdOneArg(tzinfo, &PyId_tzname, tzinfoarg);
 
     if (result == NULL || result == Py_None)
         return result;
@@ -1693,8 +1692,7 @@ build_struct_time(int y, int m, int d, int hh, int mm, int ss, int dstflag)
         return NULL;
     }
 
-    result = _PyObject_CallMethodIdObjArgs(time, &PyId_struct_time,
-                                           args, NULL);
+    result = _PyObject_CallMethodIdOneArg(time, &PyId_struct_time, args);
     Py_DECREF(time);
     Py_DECREF(args);
     return result;
@@ -2894,8 +2892,7 @@ date_today(PyObject *cls, PyObject *dummy)
      * time.time() delivers; if someone were gonzo about optimization,
      * date.today() could get away with plain C time().
      */
-    result = _PyObject_CallMethodIdObjArgs(cls, &PyId_fromtimestamp,
-                                           time, NULL);
+    result = _PyObject_CallMethodIdOneArg(cls, &PyId_fromtimestamp, time);
     Py_DECREF(time);
     return result;
 }
@@ -3209,8 +3206,8 @@ date_format(PyDateTime_Date *self, PyObject *args)
     if (PyUnicode_GetLength(format) == 0)
         return PyObject_Str((PyObject *)self);
 
-    return _PyObject_CallMethodIdObjArgs((PyObject *)self, &PyId_strftime,
-                                         format, NULL);
+    return _PyObject_CallMethodIdOneArg((PyObject *)self, &PyId_strftime,
+                                        format);
 }
 
 /* ISO methods. */
@@ -5960,7 +5957,7 @@ datetime_astimezone(PyDateTime_DateTime *self, PyObject *args, PyObject *kw)
 
     temp = (PyObject *)result;
     result = (PyDateTime_DateTime *)
-        _PyObject_CallMethodIdObjArgs(tzinfo, &PyId_fromutc, temp, NULL);
+        _PyObject_CallMethodIdOneArg(tzinfo, &PyId_fromutc, temp);
     Py_DECREF(temp);
 
     return result;
diff --git a/Modules/_elementtree.c b/Modules/_elementtree.c
index b93ec3d12786..b9b50165bfda 100644
--- a/Modules/_elementtree.c
+++ b/Modules/_elementtree.c
@@ -2679,7 +2679,7 @@ treebuilder_add_subelement(PyObject *element, PyObject *child)
     }
     else {
         PyObject *res;
-        res = _PyObject_CallMethodIdObjArgs(element, &PyId_append, child, NULL);
+        res = _PyObject_CallMethodIdOneArg(element, &PyId_append, child);
         if (res == NULL)
             return -1;
         Py_DECREF(res);
diff --git a/Modules/_io/bufferedio.c b/Modules/_io/bufferedio.c
index 9e7e5f3d0935..86dd277f94c1 100644
--- a/Modules/_io/bufferedio.c
+++ b/Modules/_io/bufferedio.c
@@ -439,8 +439,8 @@ buffered_dealloc_warn(buffered *self, PyObject *source)
 {
     if (self->ok && self->raw) {
         PyObject *r;
-        r = _PyObject_CallMethodIdObjArgs(self->raw, &PyId__dealloc_warn,
-                                          source, NULL);
+        r = _PyObject_CallMethodIdOneArg(self->raw, &PyId__dealloc_warn,
+                                         source);
         if (r)
             Py_DECREF(r);
         else
@@ -1323,7 +1323,7 @@ _io__Buffered_truncate_impl(buffered *self, PyObject *pos)
             goto end;
         Py_CLEAR(res);
     }
-    res = PyObject_CallMethodObjArgs(self->raw, _PyIO_str_truncate, pos, NULL);
+    res = _PyObject_CallMethodOneArg(self->raw, _PyIO_str_truncate, pos);
     if (res == NULL)
         goto end;
     /* Reset cached position */
@@ -1467,7 +1467,7 @@ _bufferedreader_raw_read(buffered *self, char *start, Py_ssize_t len)
        raised (see issue #10956).
     */
     do {
-        res = PyObject_CallMethodObjArgs(self->raw, _PyIO_str_readinto, memobj, NULL);
+        res = _PyObject_CallMethodOneArg(self->raw, _PyIO_str_readinto, memobj);
     } while (res == NULL && _PyIO_trap_eintr());
     Py_DECREF(memobj);
     if (res == NULL)
@@ -1815,7 +1815,7 @@ _bufferedwriter_raw_write(buffered *self, char *start, Py_ssize_t len)
     */
     do {
         errno = 0;
-        res = PyObject_CallMethodObjArgs(self->raw, _PyIO_str_write, memobj, NULL);
+        res = _PyObject_CallMethodOneArg(self->raw, _PyIO_str_write, memobj);
         errnum = errno;
     } while (res == NULL && _PyIO_trap_eintr());
     Py_DECREF(memobj);
diff --git a/Modules/_io/fileio.c b/Modules/_io/fileio.c
index 7f784a34c30d..e4cbbfa9bb8c 100644
--- a/Modules/_io/fileio.c
+++ b/Modules/_io/fileio.c
@@ -145,8 +145,8 @@ _io_FileIO_close_impl(fileio *self)
     PyObject *exc, *val, *tb;
     int rc;
     _Py_IDENTIFIER(close);
-    res = _PyObject_CallMethodIdObjArgs((PyObject*)&PyRawIOBase_Type,
-                                        &PyId_close, self, NULL);
+    res = _PyObject_CallMethodIdOneArg((PyObject*)&PyRawIOBase_Type,
+                                       &PyId_close, (PyObject *)self);
     if (!self->closefd) {
         self->fd = -1;
         return res;
diff --git a/Modules/_io/textio.c b/Modules/_io/textio.c
index ed1dc005c69a..05911d9222ff 100644
--- a/Modules/_io/textio.c
+++ b/Modules/_io/textio.c
@@ -977,8 +977,8 @@ _textiowrapper_fix_encoder_state(textio *self)
 
     if (cmp == 0) {
         self->encoding_start_of_stream = 0;
-        PyObject *res = PyObject_CallMethodObjArgs(
-            self->encoder, _PyIO_str_setstate, _PyLong_Zero, NULL);
+        PyObject *res = _PyObject_CallMethodOneArg(
+            self->encoder, _PyIO_str_setstate, _PyLong_Zero);
         if (res == NULL) {
             return -1;
         }
@@ -1155,8 +1155,8 @@ _io_TextIOWrapper___init___impl(textio *self, PyObject *buffer,
         PyObject *locale_module = _PyIO_get_locale_module(state);
         if (locale_module == NULL)
             goto catch_ImportError;
-        self->encoding = _PyObject_CallMethodIdObjArgs(
-            locale_module, &PyId_getpreferredencoding, Py_False, NULL);
+        self->encoding = _PyObject_CallMethodIdOneArg(
+            locale_module, &PyId_getpreferredencoding, Py_False);
         Py_DECREF(locale_module);
         if (self->encoding == NULL) {
           catch_ImportError:
@@ -1597,8 +1597,7 @@ _textiowrapper_writeflush(textio *self)
 
     PyObject *ret;
     do {
-        ret = PyObject_CallMethodObjArgs(self->buffer,
-                                         _PyIO_str_write, b, NULL);
+        ret = _PyObject_CallMethodOneArg(self->buffer, _PyIO_str_write, b);
     } while (ret == NULL && _PyIO_trap_eintr());
     Py_DECREF(b);
     if (ret == NULL)
@@ -1668,8 +1667,7 @@ _io_TextIOWrapper_write_impl(textio *self, PyObject *text)
         self->encoding_start_of_stream = 0;
     }
     else
-        b = PyObject_CallMethodObjArgs(self->encoder,
-                                       _PyIO_str_encode, text, NULL);
+        b = _PyObject_CallMethodOneArg(self->encoder, _PyIO_str_encode, text);
 
     Py_DECREF(text);
     if (b == NULL)
@@ -1851,9 +1849,9 @@ textiowrapper_read_chunk(textio *self, Py_ssize_t size_hint)
     if (chunk_size == NULL)
         goto fail;
 
-    input_chunk = PyObject_CallMethodObjArgs(self->buffer,
+    input_chunk = _PyObject_CallMethodOneArg(self->buffer,
         (self->has_read1 ? _PyIO_str_read1: _PyIO_str_read),
-        chunk_size, NULL);
+        chunk_size);
     Py_DECREF(chunk_size);
     if (input_chunk == NULL)
         goto fail;
@@ -2414,8 +2412,8 @@ _textiowrapper_encoder_reset(textio *self, int start_of_stream)
         self->encoding_start_of_stream = 1;
     }
     else {
-        res = PyObject_CallMethodObjArgs(self->encoder, _PyIO_str_setstate,
-                                         _PyLong_Zero, NULL);
+        res = _PyObject_CallMethodOneArg(self->encoder, _PyIO_str_setstate,
+                                        _PyLong_Zero);
         self->encoding_start_of_stream = 0;
     }
     if (res == NULL)
@@ -2554,8 +2552,7 @@ _io_TextIOWrapper_seek_impl(textio *self, PyObject *cookieObj, int whence)
     posobj = PyLong_FromOff_t(cookie.start_pos);
     if (posobj == NULL)
         goto fail;
-    res = PyObject_CallMethodObjArgs(self->buffer,
-                                     _PyIO_str_seek, posobj, NULL);
+    res = _PyObject_CallMethodOneArg(self->buffer, _PyIO_str_seek, posobj);
     Py_DECREF(posobj);
     if (res == NULL)
         goto fail;
@@ -2837,7 +2834,7 @@ _io_TextIOWrapper_tell_impl(textio *self)
     }
 
 finally:
-    res = _PyObject_CallMethodIdObjArgs(self->decoder, &PyId_setstate, saved_state, NULL);
+    res = _PyObject_CallMethodIdOneArg(self->decoder, &PyId_setstate, saved_state);
     Py_DECREF(saved_state);
     if (res == NULL)
         return NULL;
@@ -2851,7 +2848,7 @@ _io_TextIOWrapper_tell_impl(textio *self)
     if (saved_state) {
         PyObject *type, *value, *traceback;
         PyErr_Fetch(&type, &value, &traceback);
-        res = _PyObject_CallMethodIdObjArgs(self->decoder, &PyId_setstate, saved_state, NULL);
+        res = _PyObject_CallMethodIdOneArg(self->decoder, &PyId_setstate, saved_state);
         _PyErr_ChainExceptions(type, value, traceback);
         Py_DECREF(saved_state);
         Py_XDECREF(res);
@@ -2878,7 +2875,7 @@ _io_TextIOWrapper_truncate_impl(textio *self, PyObject *pos)
         return NULL;
     Py_DECREF(res);
 
-    return PyObject_CallMethodObjArgs(self->buffer, _PyIO_str_truncate, pos, NULL);
+    return _PyObject_CallMethodOneArg(self->buffer, _PyIO_str_truncate, pos);
 }
 
 static PyObject *
@@ -3055,9 +3052,9 @@ _io_TextIOWrapper_close_impl(textio *self)
     else {
         PyObject *exc = NULL, *val, *tb;
         if (self->finalizing) {
-            res = _PyObject_CallMethodIdObjArgs(self->buffer,
-                                                &PyId__dealloc_warn,
-                                                self, NULL);
+            res = _PyObject_CallMethodIdOneArg(self->buffer,
+                                              &PyId__dealloc_warn,
+                                              (PyObject *)self);
             if (res)
                 Py_DECREF(res);
             else
diff --git a/Modules/_io/winconsoleio.c b/Modules/_io/winconsoleio.c
index ea5d24f950a1..f27a6dc93a2b 100644
--- a/Modules/_io/winconsoleio.c
+++ b/Modules/_io/winconsoleio.c
@@ -204,8 +204,8 @@ _io__WindowsConsoleIO_close_impl(winconsoleio *self)
     PyObject *exc, *val, *tb;
     int rc;
     _Py_IDENTIFIER(close);
-    res = _PyObject_CallMethodIdObjArgs((PyObject*)&PyRawIOBase_Type,
-                                        &PyId_close, self, NULL);
+    res = _PyObject_CallMethodIdOneArg((PyObject*)&PyRawIOBase_Type,
+                                       &PyId_close, self);
     if (!self->closehandle) {
         self->handle = INVALID_HANDLE_VALUE;
         return res;
diff --git a/Modules/_pickle.c b/Modules/_pickle.c
index 0b0928f5cd2f..735c13d03d8f 100644
--- a/Modules/_pickle.c
+++ b/Modules/_pickle.c
@@ -5773,7 +5773,7 @@ instantiate(PyObject *cls, PyObject *args)
             return NULL;
         }
         if (func == NULL) {
-            return _PyObject_CallMethodIdObjArgs(cls, &PyId___new__, cls, NULL);
+            return _PyObject_CallMethodIdOneArg(cls, &PyId___new__, cls);
         }
         Py_DECREF(func);
     }
diff --git a/Modules/_sqlite/connection.c b/Modules/_sqlite/connection.c
index 30a9b889a9df..47b8b62cea26 100644
--- a/Modules/_sqlite/connection.c
+++ b/Modules/_sqlite/connection.c
@@ -1185,9 +1185,9 @@ pysqlite_connection_set_isolation_level(pysqlite_Connection* self, PyObject* iso
             return -1;
         }
 
-        uppercase_level = _PyObject_CallMethodIdObjArgs(
+        uppercase_level = _PyObject_CallMethodIdOneArg(
                         (PyObject *)&PyUnicode_Type, &PyId_upper,
-                        isolation_level, NULL);
+                        isolation_level);
         if (!uppercase_level) {
             return -1;
         }
@@ -1648,8 +1648,8 @@ pysqlite_connection_create_collation(pysqlite_Connection* self, PyObject* args)
         goto finally;
     }
 
-    uppercase_name = _PyObject_CallMethodIdObjArgs((PyObject *)&PyUnicode_Type,
-                                                   &PyId_upper, name, NULL);
+    uppercase_name = _PyObject_CallMethodIdOneArg((PyObject *)&PyUnicode_Type,
+                                                  &PyId_upper, name);
     if (!uppercase_name) {
         goto finally;
     }
diff --git a/Modules/arraymodule.c b/Modules/arraymodule.c
index 26c90a8a5983..48986c419029 100644
--- a/Modules/arraymodule.c
+++ b/Modules/arraymodule.c
@@ -1507,7 +1507,7 @@ array_array_tofile(arrayobject *self, PyObject *f)
         bytes = PyBytes_FromStringAndSize(ptr, size);
         if (bytes == NULL)
             return NULL;
-        res = _PyObject_CallMethodIdObjArgs(f, &PyId_write, bytes, NULL);
+        res = _PyObject_CallMethodIdOneArg(f, &PyId_write, bytes);
         Py_DECREF(bytes);
         if (res == NULL)
             return NULL;
diff --git a/Modules/cjkcodecs/multibytecodec.c b/Modules/cjkcodecs/multibytecodec.c
index 052ed8878c1c..4de678757b38 100644
--- a/Modules/cjkcodecs/multibytecodec.c
+++ b/Modules/cjkcodecs/multibytecodec.c
@@ -1776,7 +1776,7 @@ mbstreamwriter_iwrite(MultibyteStreamWriterObject *self,
     if (str == NULL)
         return -1;
 
-    wr = _PyObject_CallMethodIdObjArgs(self->stream, &PyId_write, str, NULL);
+    wr = _PyObject_CallMethodIdOneArg(self->stream, &PyId_write, str);
     Py_DECREF(str);
     if (wr == NULL)
         return -1;
@@ -1870,7 +1870,7 @@ _multibytecodec_MultibyteStreamWriter_reset_impl(MultibyteStreamWriterObject *se
     if (PyBytes_Size(pwrt) > 0) {
         PyObject *wr;
 
-        wr = _PyObject_CallMethodIdObjArgs(self->stream, &PyId_write, pwrt);
+        wr = _PyObject_CallMethodIdOneArg(self->stream, &PyId_write, pwrt);
         if (wr == NULL) {
             Py_DECREF(pwrt);
             return NULL;
diff --git a/Objects/dictobject.c b/Objects/dictobject.c
index 422f4b0230ba..b6205d93ca14 100644
--- a/Objects/dictobject.c
+++ b/Objects/dictobject.c
@@ -4159,7 +4159,7 @@ dictviews_sub(PyObject* self, PyObject *other)
     if (result == NULL)
         return NULL;
 
-    tmp = _PyObject_CallMethodIdObjArgs(result, &PyId_difference_update, other, NULL);
+    tmp = _PyObject_CallMethodIdOneArg(result, &PyId_difference_update, other);
     if (tmp == NULL) {
         Py_DECREF(result);
         return NULL;
@@ -4179,7 +4179,7 @@ _PyDictView_Intersect(PyObject* self, PyObject *other)
     if (result == NULL)
         return NULL;
 
-    tmp = _PyObject_CallMethodIdObjArgs(result, &PyId_intersection_update, other, NULL);
+    tmp = _PyObject_CallMethodIdOneArg(result, &PyId_intersection_update, other);
     if (tmp == NULL) {
         Py_DECREF(result);
         return NULL;
@@ -4199,7 +4199,7 @@ dictviews_or(PyObject* self, PyObject *other)
     if (result == NULL)
         return NULL;
 
-    tmp = _PyObject_CallMethodIdObjArgs(result, &PyId_update, other, NULL);
+    tmp = _PyObject_CallMethodIdOneArg(result, &PyId_update, other);
     if (tmp == NULL) {
         Py_DECREF(result);
         return NULL;
@@ -4219,7 +4219,7 @@ dictviews_xor(PyObject* self, PyObject *other)
     if (result == NULL)
         return NULL;
 
-    tmp = _PyObject_CallMethodIdObjArgs(result, &PyId_symmetric_difference_update, other, NULL);
+    tmp = _PyObject_CallMethodIdOneArg(result, &PyId_symmetric_difference_update, other);
     if (tmp == NULL) {
         Py_DECREF(result);
         return NULL;
diff --git a/Objects/typeobject.c b/Objects/typeobject.c
index 96021eeccc57..8acf678fc9a4 100644
--- a/Objects/typeobject.c
+++ b/Objects/typeobject.c
@@ -4145,8 +4145,8 @@ _PyType_GetSlotNames(PyTypeObject *cls)
     /* Use _slotnames function from the copyreg module to find the slots
        by this class and its bases. This function will cache the result
        in __slotnames__. */
-    slotnames = _PyObject_CallMethodIdObjArgs(copyreg, &PyId__slotnames,
-                                              cls, NULL);
+    slotnames = _PyObject_CallMethodIdOneArg(copyreg, &PyId__slotnames,
+                                             (PyObject *)cls);
     Py_DECREF(copyreg);
     if (slotnames == NULL)
         return NULL;
diff --git a/Python/_warnings.c b/Python/_warnings.c
index b1762e6bedaf..ecee399db6e8 100644
--- a/Python/_warnings.c
+++ b/Python/_warnings.c
@@ -164,7 +164,7 @@ check_matched(PyObject *obj, PyObject *arg)
     }
 
     /* Otherwise assume a regex filter and call its match() method */
-    result = _PyObject_CallMethodIdObjArgs(obj, &PyId_match, arg, NULL);
+    result = _PyObject_CallMethodIdOneArg(obj, &PyId_match, arg);
     if (result == NULL)
         return -1;
 
diff --git a/Python/ceval.c b/Python/ceval.c
index fdd299561c61..7c7359166dad 100644
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -2052,7 +2052,7 @@ _PyEval_EvalFrameDefault(PyFrameObject *f, int throwflag)
                 if (v == Py_None)
                     retval = Py_TYPE(receiver)->tp_iternext(receiver);
                 else
-                    retval = _PyObject_CallMethodIdObjArgs(receiver, &PyId_send, v, NULL);
+                    retval = _PyObject_CallMethodIdOneArg(receiver, &PyId_send, v);
             }
             Py_DECREF(v);
             if (retval == NULL) {
diff --git a/Python/import.c b/Python/import.c
index df258751c82e..15f1d9417600 100644
--- a/Python/import.c
+++ b/Python/import.c
@@ -962,9 +962,8 @@ PyImport_ExecCodeModuleWithPathnames(const char *name, PyObject *co,
         external= PyObject_GetAttrString(interp->importlib,
                                          "_bootstrap_external");
         if (external != NULL) {
-            pathobj = _PyObject_CallMethodIdObjArgs(external,
-                                                    &PyId__get_sourcefile, cpathobj,
-                                                    NULL);
+            pathobj = _PyObject_CallMethodIdOneArg(
+                external, &PyId__get_sourcefile, cpathobj);
             Py_DECREF(external);
         }
         if (pathobj == NULL)
@@ -1827,9 +1826,8 @@ PyImport_ImportModuleLevelObject(PyObject *name, PyObject *globals,
          */
         spec = _PyObject_GetAttrId(mod, &PyId___spec__);
         if (_PyModuleSpec_IsInitializing(spec)) {
-            PyObject *value = _PyObject_CallMethodIdObjArgs(interp->importlib,
-                                            &PyId__lock_unlock_module, abs_name,
-                                            NULL);
+            PyObject *value = _PyObject_CallMethodIdOneArg(
+                interp->importlib, &PyId__lock_unlock_module, abs_name);
             if (value == NULL) {
                 Py_DECREF(spec);
                 goto error;
@@ -1968,7 +1966,7 @@ PyImport_ReloadModule(PyObject *m)
         }
     }
 
-    reloaded_module = _PyObject_CallMethodIdObjArgs(imp, &PyId_reload, m, NULL);
+    reloaded_module = _PyObject_CallMethodIdOneArg(imp, &PyId_reload, m);
     Py_DECREF(imp);
     return reloaded_module;
 }
diff --git a/Python/marshal.c b/Python/marshal.c
index b2daff2c8a3b..cb11c8c74ef3 100644
--- a/Python/marshal.c
+++ b/Python/marshal.c
@@ -1653,7 +1653,7 @@ marshal_dump_impl(PyObject *module, PyObject *value, PyObject *file,
     s = PyMarshal_WriteObjectToString(value, version);
     if (s == NULL)
         return NULL;
-    res = _PyObject_CallMethodIdObjArgs(file, &PyId_write, s, NULL);
+    res = _PyObject_CallMethodIdOneArg(file, &PyId_write, s);
     Py_DECREF(s);
     return res;
 }
diff --git a/Python/sysmodule.c b/Python/sysmodule.c
index dc198a5d1e05..103a11152412 100644
--- a/Python/sysmodule.c
+++ b/Python/sysmodule.c
@@ -581,7 +581,7 @@ sys_displayhook_unencodable(PyThreadState *tstate, PyObject *outf, PyObject *o)
 
     buffer = _PyObject_GetAttrId(outf, &PyId_buffer);
     if (buffer) {
-        result = _PyObject_CallMethodIdObjArgs(buffer, &PyId_write, encoded, NULL);
+        result = _PyObject_CallMethodIdOneArg(buffer, &PyId_write, encoded);
         Py_DECREF(buffer);
         Py_DECREF(encoded);
         if (result == NULL)
@@ -3114,9 +3114,7 @@ sys_pyfile_write_unicode(PyObject *unicode, PyObject *file)
     if (file == NULL)
         return -1;
     assert(unicode != NULL);
-    PyObject *margs[2] = {file, unicode};
-    PyObject *result = _PyObject_VectorcallMethodId(&PyId_write, margs,
-        2 | PY_VECTORCALL_ARGUMENTS_OFFSET, NULL);
+    PyObject *result = _PyObject_CallMethodIdOneArg(file, &PyId_write, unicode);
     if (result == NULL) {
         return -1;
     }


From webhook-mailer at python.org  Thu Jul 11 10:01:02 2019
From: webhook-mailer at python.org (Tal Einat)
Date: Thu, 11 Jul 2019 14:01:02 -0000
Subject: [Python-checkins] bpo-34369: make kqueue.control() docs better
 reflect that timeout is positional-only (GH-9499)
Message-ID: <mailman.325.1562853663.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/79042ac4348ccc09344014f20dd49401579f8795
commit: 79042ac4348ccc09344014f20dd49401579f8795
branch: master
author: Tal Einat <taleinat at gmail.com>
committer: GitHub <noreply at github.com>
date: 2019-07-11T17:00:34+03:00
summary:

bpo-34369: make kqueue.control() docs better reflect that timeout is positional-only (GH-9499)

files:
M Doc/library/select.rst

diff --git a/Doc/library/select.rst b/Doc/library/select.rst
index 733a91e20b68..8f5a2cea9257 100644
--- a/Doc/library/select.rst
+++ b/Doc/library/select.rst
@@ -480,13 +480,14 @@ Kqueue Objects
    Create a kqueue object from a given file descriptor.
 
 
-.. method:: kqueue.control(changelist, max_events[, timeout=None]) -> eventlist
+.. method:: kqueue.control(changelist, max_events[, timeout]) -> eventlist
 
    Low level interface to kevent
 
-   - changelist must be an iterable of kevent object or ``None``
+   - changelist must be an iterable of kevent objects or ``None``
    - max_events must be 0 or a positive integer
-   - timeout in seconds (floats possible)
+   - timeout in seconds (floats possible); the default is ``None``,
+     to wait forever
 
    .. versionchanged:: 3.5
       The function is now retried with a recomputed timeout when interrupted by


From webhook-mailer at python.org  Thu Jul 11 10:16:10 2019
From: webhook-mailer at python.org (Miss Islington (bot))
Date: Thu, 11 Jul 2019 14:16:10 -0000
Subject: [Python-checkins] bpo-34369: make kqueue.control() docs better
 reflect that timeout is positional-only (GH-9499)
Message-ID: <mailman.326.1562854571.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/dc0b6af42eca70e520b67d0bcf4dc5278a3f02dd
commit: dc0b6af42eca70e520b67d0bcf4dc5278a3f02dd
branch: 3.8
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: GitHub <noreply at github.com>
date: 2019-07-11T07:16:03-07:00
summary:

bpo-34369: make kqueue.control() docs better reflect that timeout is positional-only (GH-9499)

(cherry picked from commit 79042ac4348ccc09344014f20dd49401579f8795)

Co-authored-by: Tal Einat <taleinat at gmail.com>

files:
M Doc/library/select.rst

diff --git a/Doc/library/select.rst b/Doc/library/select.rst
index 733a91e20b68..8f5a2cea9257 100644
--- a/Doc/library/select.rst
+++ b/Doc/library/select.rst
@@ -480,13 +480,14 @@ Kqueue Objects
    Create a kqueue object from a given file descriptor.
 
 
-.. method:: kqueue.control(changelist, max_events[, timeout=None]) -> eventlist
+.. method:: kqueue.control(changelist, max_events[, timeout]) -> eventlist
 
    Low level interface to kevent
 
-   - changelist must be an iterable of kevent object or ``None``
+   - changelist must be an iterable of kevent objects or ``None``
    - max_events must be 0 or a positive integer
-   - timeout in seconds (floats possible)
+   - timeout in seconds (floats possible); the default is ``None``,
+     to wait forever
 
    .. versionchanged:: 3.5
       The function is now retried with a recomputed timeout when interrupted by


From webhook-mailer at python.org  Thu Jul 11 10:16:49 2019
From: webhook-mailer at python.org (Tal Einat)
Date: Thu, 11 Jul 2019 14:16:49 -0000
Subject: [Python-checkins] bpo-34369: make kqueue.control() docs better
 reflect that timeout is positional-only (GH-9499)
Message-ID: <mailman.327.1562854610.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/d3747fd8fa91b768b73b60f2e2a14044e5404afa
commit: d3747fd8fa91b768b73b60f2e2a14044e5404afa
branch: 3.7
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: Tal Einat <taleinat at gmail.com>
date: 2019-07-11T17:16:45+03:00
summary:

bpo-34369: make kqueue.control() docs better reflect that timeout is positional-only (GH-9499)

(cherry picked from commit 79042ac4348ccc09344014f20dd49401579f8795)

Co-authored-by: Tal Einat <taleinat at gmail.com>

files:
M Doc/library/select.rst

diff --git a/Doc/library/select.rst b/Doc/library/select.rst
index 5b8fd7ee805c..7d65363e4931 100644
--- a/Doc/library/select.rst
+++ b/Doc/library/select.rst
@@ -480,13 +480,14 @@ Kqueue Objects
    Create a kqueue object from a given file descriptor.
 
 
-.. method:: kqueue.control(changelist, max_events[, timeout=None]) -> eventlist
+.. method:: kqueue.control(changelist, max_events[, timeout]) -> eventlist
 
    Low level interface to kevent
 
-   - changelist must be an iterable of kevent object or ``None``
+   - changelist must be an iterable of kevent objects or ``None``
    - max_events must be 0 or a positive integer
-   - timeout in seconds (floats possible)
+   - timeout in seconds (floats possible); the default is ``None``,
+     to wait forever
 
    .. versionchanged:: 3.5
       The function is now retried with a recomputed timeout when interrupted by


From webhook-mailer at python.org  Thu Jul 11 10:17:12 2019
From: webhook-mailer at python.org (Tal Einat)
Date: Thu, 11 Jul 2019 14:17:12 -0000
Subject: [Python-checkins] bpo-34369: make kqueue.control() docs better
 reflect that timeout is positional-only (GH-9499)
Message-ID: <mailman.328.1562854633.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/46c2eff5adca7dc309f077ec65faf95b95c47b43
commit: 46c2eff5adca7dc309f077ec65faf95b95c47b43
branch: 2.7
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: Tal Einat <taleinat at gmail.com>
date: 2019-07-11T17:17:08+03:00
summary:

bpo-34369: make kqueue.control() docs better reflect that timeout is positional-only (GH-9499)

(cherry picked from commit 79042ac4348ccc09344014f20dd49401579f8795)

Co-authored-by: Tal Einat <taleinat at gmail.com>

files:
M Doc/library/select.rst

diff --git a/Doc/library/select.rst b/Doc/library/select.rst
index 7a080457a05e..b68b32486ad8 100644
--- a/Doc/library/select.rst
+++ b/Doc/library/select.rst
@@ -291,13 +291,14 @@ Kqueue Objects
    Create a kqueue object from a given file descriptor.
 
 
-.. method:: kqueue.control(changelist, max_events[, timeout=None]) -> eventlist
+.. method:: kqueue.control(changelist, max_events[, timeout]) -> eventlist
 
    Low level interface to kevent
 
-   - changelist must be an iterable of kevent object or ``None``
+   - changelist must be an iterable of kevent objects or ``None``
    - max_events must be 0 or a positive integer
-   - timeout in seconds (floats possible)
+   - timeout in seconds (floats possible); the default is ``None``,
+     to wait forever
 
 
 .. _kevent-objects:


From webhook-mailer at python.org  Thu Jul 11 10:20:21 2019
From: webhook-mailer at python.org (Tal Einat)
Date: Thu, 11 Jul 2019 14:20:21 -0000
Subject: [Python-checkins] bpo-36390: simplify classifyws(),
 rename it and add unit tests (GH-14500)
Message-ID: <mailman.329.1562854822.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/9b5ce62cac27fec9dea473865d79c2c654312957
commit: 9b5ce62cac27fec9dea473865d79c2c654312957
branch: master
author: Tal Einat <taleinat at gmail.com>
committer: GitHub <noreply at github.com>
date: 2019-07-11T17:20:14+03:00
summary:

bpo-36390: simplify classifyws(), rename it and add unit tests (GH-14500)

files:
M Lib/idlelib/editor.py
M Lib/idlelib/idle_test/test_editor.py

diff --git a/Lib/idlelib/editor.py b/Lib/idlelib/editor.py
index 606de71a6add..9b5364f0c774 100644
--- a/Lib/idlelib/editor.py
+++ b/Lib/idlelib/editor.py
@@ -1281,7 +1281,7 @@ def smart_indent_event(self, event):
                 text.delete(first, last)
                 text.mark_set("insert", first)
             prefix = text.get("insert linestart", "insert")
-            raw, effective = classifyws(prefix, self.tabwidth)
+            raw, effective = get_line_indent(prefix, self.tabwidth)
             if raw == len(prefix):
                 # only whitespace to the left
                 self.reindent_to(effective + self.indentwidth)
@@ -1415,7 +1415,7 @@ def indent_region_event(self, event):
         for pos in range(len(lines)):
             line = lines[pos]
             if line:
-                raw, effective = classifyws(line, self.tabwidth)
+                raw, effective = get_line_indent(line, self.tabwidth)
                 effective = effective + self.indentwidth
                 lines[pos] = self._make_blanks(effective) + line[raw:]
         self.set_region(head, tail, chars, lines)
@@ -1426,7 +1426,7 @@ def dedent_region_event(self, event):
         for pos in range(len(lines)):
             line = lines[pos]
             if line:
-                raw, effective = classifyws(line, self.tabwidth)
+                raw, effective = get_line_indent(line, self.tabwidth)
                 effective = max(effective - self.indentwidth, 0)
                 lines[pos] = self._make_blanks(effective) + line[raw:]
         self.set_region(head, tail, chars, lines)
@@ -1461,7 +1461,7 @@ def tabify_region_event(self, event):
         for pos in range(len(lines)):
             line = lines[pos]
             if line:
-                raw, effective = classifyws(line, tabwidth)
+                raw, effective = get_line_indent(line, tabwidth)
                 ntabs, nspaces = divmod(effective, tabwidth)
                 lines[pos] = '\t' * ntabs + ' ' * nspaces + line[raw:]
         self.set_region(head, tail, chars, lines)
@@ -1575,8 +1575,8 @@ def _asktabwidth(self):
     def guess_indent(self):
         opener, indented = IndentSearcher(self.text, self.tabwidth).run()
         if opener and indented:
-            raw, indentsmall = classifyws(opener, self.tabwidth)
-            raw, indentlarge = classifyws(indented, self.tabwidth)
+            raw, indentsmall = get_line_indent(opener, self.tabwidth)
+            raw, indentlarge = get_line_indent(indented, self.tabwidth)
         else:
             indentsmall = indentlarge = 0
         return indentlarge - indentsmall
@@ -1585,23 +1585,16 @@ def guess_indent(self):
 def index2line(index):
     return int(float(index))
 
-# Look at the leading whitespace in s.
-# Return pair (# of leading ws characters,
-#              effective # of leading blanks after expanding
-#              tabs to width tabwidth)
-
-def classifyws(s, tabwidth):
-    raw = effective = 0
-    for ch in s:
-        if ch == ' ':
-            raw = raw + 1
-            effective = effective + 1
-        elif ch == '\t':
-            raw = raw + 1
-            effective = (effective // tabwidth + 1) * tabwidth
-        else:
-            break
-    return raw, effective
+
+_line_indent_re = re.compile(r'[ \t]*')
+def get_line_indent(line, tabwidth):
+    """Return a line's indentation as (# chars, effective # of spaces).
+
+    The effective # of spaces is the length after properly "expanding"
+    the tabs into spaces, as done by str.expandtabs(tabwidth).
+    """
+    m = _line_indent_re.match(line)
+    return m.end(), len(m.group().expandtabs(tabwidth))
 
 
 class IndentSearcher(object):
diff --git a/Lib/idlelib/idle_test/test_editor.py b/Lib/idlelib/idle_test/test_editor.py
index 12bc84736683..4af4ff0242d7 100644
--- a/Lib/idlelib/idle_test/test_editor.py
+++ b/Lib/idlelib/idle_test/test_editor.py
@@ -42,5 +42,66 @@ class dummy():
             self.assertEqual(func(dummy, inp), out)
 
 
+class TestGetLineIndent(unittest.TestCase):
+    def test_empty_lines(self):
+        for tabwidth in [1, 2, 4, 6, 8]:
+            for line in ['', '\n']:
+                with self.subTest(line=line, tabwidth=tabwidth):
+                    self.assertEqual(
+                        editor.get_line_indent(line, tabwidth=tabwidth),
+                        (0, 0),
+                    )
+
+    def test_tabwidth_4(self):
+        #        (line, (raw, effective))
+        tests = (('no spaces', (0, 0)),
+                 # Internal space isn't counted.
+                 ('    space test', (4, 4)),
+                 ('\ttab test', (1, 4)),
+                 ('\t\tdouble tabs test', (2, 8)),
+                 # Different results when mixing tabs and spaces.
+                 ('    \tmixed test', (5, 8)),
+                 ('  \t  mixed test', (5, 6)),
+                 ('\t    mixed test', (5, 8)),
+                 # Spaces not divisible by tabwidth.
+                 ('  \tmixed test', (3, 4)),
+                 (' \t mixed test', (3, 5)),
+                 ('\t  mixed test', (3, 6)),
+                 # Only checks spaces and tabs.
+                 ('\nnewline test', (0, 0)))
+
+        for line, expected in tests:
+            with self.subTest(line=line):
+                self.assertEqual(
+                    editor.get_line_indent(line, tabwidth=4),
+                    expected,
+                )
+
+    def test_tabwidth_8(self):
+        #        (line, (raw, effective))
+        tests = (('no spaces', (0, 0)),
+                 # Internal space isn't counted.
+                 ('        space test', (8, 8)),
+                 ('\ttab test', (1, 8)),
+                 ('\t\tdouble tabs test', (2, 16)),
+                 # Different results when mixing tabs and spaces.
+                 ('        \tmixed test', (9, 16)),
+                 ('      \t  mixed test', (9, 10)),
+                 ('\t        mixed test', (9, 16)),
+                 # Spaces not divisible by tabwidth.
+                 ('  \tmixed test', (3, 8)),
+                 (' \t mixed test', (3, 9)),
+                 ('\t  mixed test', (3, 10)),
+                 # Only checks spaces and tabs.
+                 ('\nnewline test', (0, 0)))
+
+        for line, expected in tests:
+            with self.subTest(line=line):
+                self.assertEqual(
+                    editor.get_line_indent(line, tabwidth=8),
+                    expected,
+                )
+
+
 if __name__ == '__main__':
     unittest.main(verbosity=2)


From webhook-mailer at python.org  Thu Jul 11 10:55:27 2019
From: webhook-mailer at python.org (Tal Einat)
Date: Thu, 11 Jul 2019 14:55:27 -0000
Subject: [Python-checkins] bpo-36390: simplify classifyws(),
 rename it and add unit tests (GH-14500)
Message-ID: <mailman.330.1562856927.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/242ad1f375bf564c35cf99cd754b2c5819c4d056
commit: 242ad1f375bf564c35cf99cd754b2c5819c4d056
branch: 3.8
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: Tal Einat <taleinat at gmail.com>
date: 2019-07-11T17:55:05+03:00
summary:

bpo-36390: simplify classifyws(), rename it and add unit tests (GH-14500)

(cherry picked from commit 9b5ce62cac27fec9dea473865d79c2c654312957)

Co-authored-by: Tal Einat <taleinat at gmail.com>

files:
M Lib/idlelib/editor.py
M Lib/idlelib/idle_test/test_editor.py

diff --git a/Lib/idlelib/editor.py b/Lib/idlelib/editor.py
index 606de71a6add..9b5364f0c774 100644
--- a/Lib/idlelib/editor.py
+++ b/Lib/idlelib/editor.py
@@ -1281,7 +1281,7 @@ def smart_indent_event(self, event):
                 text.delete(first, last)
                 text.mark_set("insert", first)
             prefix = text.get("insert linestart", "insert")
-            raw, effective = classifyws(prefix, self.tabwidth)
+            raw, effective = get_line_indent(prefix, self.tabwidth)
             if raw == len(prefix):
                 # only whitespace to the left
                 self.reindent_to(effective + self.indentwidth)
@@ -1415,7 +1415,7 @@ def indent_region_event(self, event):
         for pos in range(len(lines)):
             line = lines[pos]
             if line:
-                raw, effective = classifyws(line, self.tabwidth)
+                raw, effective = get_line_indent(line, self.tabwidth)
                 effective = effective + self.indentwidth
                 lines[pos] = self._make_blanks(effective) + line[raw:]
         self.set_region(head, tail, chars, lines)
@@ -1426,7 +1426,7 @@ def dedent_region_event(self, event):
         for pos in range(len(lines)):
             line = lines[pos]
             if line:
-                raw, effective = classifyws(line, self.tabwidth)
+                raw, effective = get_line_indent(line, self.tabwidth)
                 effective = max(effective - self.indentwidth, 0)
                 lines[pos] = self._make_blanks(effective) + line[raw:]
         self.set_region(head, tail, chars, lines)
@@ -1461,7 +1461,7 @@ def tabify_region_event(self, event):
         for pos in range(len(lines)):
             line = lines[pos]
             if line:
-                raw, effective = classifyws(line, tabwidth)
+                raw, effective = get_line_indent(line, tabwidth)
                 ntabs, nspaces = divmod(effective, tabwidth)
                 lines[pos] = '\t' * ntabs + ' ' * nspaces + line[raw:]
         self.set_region(head, tail, chars, lines)
@@ -1575,8 +1575,8 @@ def _asktabwidth(self):
     def guess_indent(self):
         opener, indented = IndentSearcher(self.text, self.tabwidth).run()
         if opener and indented:
-            raw, indentsmall = classifyws(opener, self.tabwidth)
-            raw, indentlarge = classifyws(indented, self.tabwidth)
+            raw, indentsmall = get_line_indent(opener, self.tabwidth)
+            raw, indentlarge = get_line_indent(indented, self.tabwidth)
         else:
             indentsmall = indentlarge = 0
         return indentlarge - indentsmall
@@ -1585,23 +1585,16 @@ def guess_indent(self):
 def index2line(index):
     return int(float(index))
 
-# Look at the leading whitespace in s.
-# Return pair (# of leading ws characters,
-#              effective # of leading blanks after expanding
-#              tabs to width tabwidth)
-
-def classifyws(s, tabwidth):
-    raw = effective = 0
-    for ch in s:
-        if ch == ' ':
-            raw = raw + 1
-            effective = effective + 1
-        elif ch == '\t':
-            raw = raw + 1
-            effective = (effective // tabwidth + 1) * tabwidth
-        else:
-            break
-    return raw, effective
+
+_line_indent_re = re.compile(r'[ \t]*')
+def get_line_indent(line, tabwidth):
+    """Return a line's indentation as (# chars, effective # of spaces).
+
+    The effective # of spaces is the length after properly "expanding"
+    the tabs into spaces, as done by str.expandtabs(tabwidth).
+    """
+    m = _line_indent_re.match(line)
+    return m.end(), len(m.group().expandtabs(tabwidth))
 
 
 class IndentSearcher(object):
diff --git a/Lib/idlelib/idle_test/test_editor.py b/Lib/idlelib/idle_test/test_editor.py
index 12bc84736683..4af4ff0242d7 100644
--- a/Lib/idlelib/idle_test/test_editor.py
+++ b/Lib/idlelib/idle_test/test_editor.py
@@ -42,5 +42,66 @@ class dummy():
             self.assertEqual(func(dummy, inp), out)
 
 
+class TestGetLineIndent(unittest.TestCase):
+    def test_empty_lines(self):
+        for tabwidth in [1, 2, 4, 6, 8]:
+            for line in ['', '\n']:
+                with self.subTest(line=line, tabwidth=tabwidth):
+                    self.assertEqual(
+                        editor.get_line_indent(line, tabwidth=tabwidth),
+                        (0, 0),
+                    )
+
+    def test_tabwidth_4(self):
+        #        (line, (raw, effective))
+        tests = (('no spaces', (0, 0)),
+                 # Internal space isn't counted.
+                 ('    space test', (4, 4)),
+                 ('\ttab test', (1, 4)),
+                 ('\t\tdouble tabs test', (2, 8)),
+                 # Different results when mixing tabs and spaces.
+                 ('    \tmixed test', (5, 8)),
+                 ('  \t  mixed test', (5, 6)),
+                 ('\t    mixed test', (5, 8)),
+                 # Spaces not divisible by tabwidth.
+                 ('  \tmixed test', (3, 4)),
+                 (' \t mixed test', (3, 5)),
+                 ('\t  mixed test', (3, 6)),
+                 # Only checks spaces and tabs.
+                 ('\nnewline test', (0, 0)))
+
+        for line, expected in tests:
+            with self.subTest(line=line):
+                self.assertEqual(
+                    editor.get_line_indent(line, tabwidth=4),
+                    expected,
+                )
+
+    def test_tabwidth_8(self):
+        #        (line, (raw, effective))
+        tests = (('no spaces', (0, 0)),
+                 # Internal space isn't counted.
+                 ('        space test', (8, 8)),
+                 ('\ttab test', (1, 8)),
+                 ('\t\tdouble tabs test', (2, 16)),
+                 # Different results when mixing tabs and spaces.
+                 ('        \tmixed test', (9, 16)),
+                 ('      \t  mixed test', (9, 10)),
+                 ('\t        mixed test', (9, 16)),
+                 # Spaces not divisible by tabwidth.
+                 ('  \tmixed test', (3, 8)),
+                 (' \t mixed test', (3, 9)),
+                 ('\t  mixed test', (3, 10)),
+                 # Only checks spaces and tabs.
+                 ('\nnewline test', (0, 0)))
+
+        for line, expected in tests:
+            with self.subTest(line=line):
+                self.assertEqual(
+                    editor.get_line_indent(line, tabwidth=8),
+                    expected,
+                )
+
+
 if __name__ == '__main__':
     unittest.main(verbosity=2)


From webhook-mailer at python.org  Thu Jul 11 10:58:11 2019
From: webhook-mailer at python.org (Tal Einat)
Date: Thu, 11 Jul 2019 14:58:11 -0000
Subject: [Python-checkins] bpo-36390: simplify classifyws(),
 rename it and add unit tests (GH-14500)
Message-ID: <mailman.331.1562857093.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/a2cf88efc417f1991720856f6913d16660e48941
commit: a2cf88efc417f1991720856f6913d16660e48941
branch: 3.7
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: Tal Einat <taleinat at gmail.com>
date: 2019-07-11T17:57:45+03:00
summary:

bpo-36390: simplify classifyws(), rename it and add unit tests (GH-14500)

(cherry picked from commit 9b5ce62cac27fec9dea473865d79c2c654312957)

Co-authored-by: Tal Einat <taleinat at gmail.com>

files:
M Lib/idlelib/editor.py
M Lib/idlelib/idle_test/test_editor.py

diff --git a/Lib/idlelib/editor.py b/Lib/idlelib/editor.py
index 606de71a6add..9b5364f0c774 100644
--- a/Lib/idlelib/editor.py
+++ b/Lib/idlelib/editor.py
@@ -1281,7 +1281,7 @@ def smart_indent_event(self, event):
                 text.delete(first, last)
                 text.mark_set("insert", first)
             prefix = text.get("insert linestart", "insert")
-            raw, effective = classifyws(prefix, self.tabwidth)
+            raw, effective = get_line_indent(prefix, self.tabwidth)
             if raw == len(prefix):
                 # only whitespace to the left
                 self.reindent_to(effective + self.indentwidth)
@@ -1415,7 +1415,7 @@ def indent_region_event(self, event):
         for pos in range(len(lines)):
             line = lines[pos]
             if line:
-                raw, effective = classifyws(line, self.tabwidth)
+                raw, effective = get_line_indent(line, self.tabwidth)
                 effective = effective + self.indentwidth
                 lines[pos] = self._make_blanks(effective) + line[raw:]
         self.set_region(head, tail, chars, lines)
@@ -1426,7 +1426,7 @@ def dedent_region_event(self, event):
         for pos in range(len(lines)):
             line = lines[pos]
             if line:
-                raw, effective = classifyws(line, self.tabwidth)
+                raw, effective = get_line_indent(line, self.tabwidth)
                 effective = max(effective - self.indentwidth, 0)
                 lines[pos] = self._make_blanks(effective) + line[raw:]
         self.set_region(head, tail, chars, lines)
@@ -1461,7 +1461,7 @@ def tabify_region_event(self, event):
         for pos in range(len(lines)):
             line = lines[pos]
             if line:
-                raw, effective = classifyws(line, tabwidth)
+                raw, effective = get_line_indent(line, tabwidth)
                 ntabs, nspaces = divmod(effective, tabwidth)
                 lines[pos] = '\t' * ntabs + ' ' * nspaces + line[raw:]
         self.set_region(head, tail, chars, lines)
@@ -1575,8 +1575,8 @@ def _asktabwidth(self):
     def guess_indent(self):
         opener, indented = IndentSearcher(self.text, self.tabwidth).run()
         if opener and indented:
-            raw, indentsmall = classifyws(opener, self.tabwidth)
-            raw, indentlarge = classifyws(indented, self.tabwidth)
+            raw, indentsmall = get_line_indent(opener, self.tabwidth)
+            raw, indentlarge = get_line_indent(indented, self.tabwidth)
         else:
             indentsmall = indentlarge = 0
         return indentlarge - indentsmall
@@ -1585,23 +1585,16 @@ def guess_indent(self):
 def index2line(index):
     return int(float(index))
 
-# Look at the leading whitespace in s.
-# Return pair (# of leading ws characters,
-#              effective # of leading blanks after expanding
-#              tabs to width tabwidth)
-
-def classifyws(s, tabwidth):
-    raw = effective = 0
-    for ch in s:
-        if ch == ' ':
-            raw = raw + 1
-            effective = effective + 1
-        elif ch == '\t':
-            raw = raw + 1
-            effective = (effective // tabwidth + 1) * tabwidth
-        else:
-            break
-    return raw, effective
+
+_line_indent_re = re.compile(r'[ \t]*')
+def get_line_indent(line, tabwidth):
+    """Return a line's indentation as (# chars, effective # of spaces).
+
+    The effective # of spaces is the length after properly "expanding"
+    the tabs into spaces, as done by str.expandtabs(tabwidth).
+    """
+    m = _line_indent_re.match(line)
+    return m.end(), len(m.group().expandtabs(tabwidth))
 
 
 class IndentSearcher(object):
diff --git a/Lib/idlelib/idle_test/test_editor.py b/Lib/idlelib/idle_test/test_editor.py
index 12bc84736683..4af4ff0242d7 100644
--- a/Lib/idlelib/idle_test/test_editor.py
+++ b/Lib/idlelib/idle_test/test_editor.py
@@ -42,5 +42,66 @@ class dummy():
             self.assertEqual(func(dummy, inp), out)
 
 
+class TestGetLineIndent(unittest.TestCase):
+    def test_empty_lines(self):
+        for tabwidth in [1, 2, 4, 6, 8]:
+            for line in ['', '\n']:
+                with self.subTest(line=line, tabwidth=tabwidth):
+                    self.assertEqual(
+                        editor.get_line_indent(line, tabwidth=tabwidth),
+                        (0, 0),
+                    )
+
+    def test_tabwidth_4(self):
+        #        (line, (raw, effective))
+        tests = (('no spaces', (0, 0)),
+                 # Internal space isn't counted.
+                 ('    space test', (4, 4)),
+                 ('\ttab test', (1, 4)),
+                 ('\t\tdouble tabs test', (2, 8)),
+                 # Different results when mixing tabs and spaces.
+                 ('    \tmixed test', (5, 8)),
+                 ('  \t  mixed test', (5, 6)),
+                 ('\t    mixed test', (5, 8)),
+                 # Spaces not divisible by tabwidth.
+                 ('  \tmixed test', (3, 4)),
+                 (' \t mixed test', (3, 5)),
+                 ('\t  mixed test', (3, 6)),
+                 # Only checks spaces and tabs.
+                 ('\nnewline test', (0, 0)))
+
+        for line, expected in tests:
+            with self.subTest(line=line):
+                self.assertEqual(
+                    editor.get_line_indent(line, tabwidth=4),
+                    expected,
+                )
+
+    def test_tabwidth_8(self):
+        #        (line, (raw, effective))
+        tests = (('no spaces', (0, 0)),
+                 # Internal space isn't counted.
+                 ('        space test', (8, 8)),
+                 ('\ttab test', (1, 8)),
+                 ('\t\tdouble tabs test', (2, 16)),
+                 # Different results when mixing tabs and spaces.
+                 ('        \tmixed test', (9, 16)),
+                 ('      \t  mixed test', (9, 10)),
+                 ('\t        mixed test', (9, 16)),
+                 # Spaces not divisible by tabwidth.
+                 ('  \tmixed test', (3, 8)),
+                 (' \t mixed test', (3, 9)),
+                 ('\t  mixed test', (3, 10)),
+                 # Only checks spaces and tabs.
+                 ('\nnewline test', (0, 0)))
+
+        for line, expected in tests:
+            with self.subTest(line=line):
+                self.assertEqual(
+                    editor.get_line_indent(line, tabwidth=8),
+                    expected,
+                )
+
+
 if __name__ == '__main__':
     unittest.main(verbosity=2)


From webhook-mailer at python.org  Thu Jul 11 11:58:01 2019
From: webhook-mailer at python.org (Inada Naoki)
Date: Thu, 11 Jul 2019 15:58:01 -0000
Subject: [Python-checkins] bpo-29548: no longer use PyEval_Call* functions
 (GH-14683)
Message-ID: <mailman.332.1562860682.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/1dbd084f1f68d7293718b663df675cfbd0c65712
commit: 1dbd084f1f68d7293718b663df675cfbd0c65712
branch: master
author: Jeroen Demeyer <J.Demeyer at UGent.be>
committer: Inada Naoki <songofacandy at gmail.com>
date: 2019-07-12T00:57:32+09:00
summary:

bpo-29548: no longer use PyEval_Call* functions (GH-14683)

files:
M Modules/pyexpat.c
M Modules/signalmodule.c
M Objects/call.c
M Python/codecs.c

diff --git a/Modules/pyexpat.c b/Modules/pyexpat.c
index 3d193e717c88..b0096e664780 100644
--- a/Modules/pyexpat.c
+++ b/Modules/pyexpat.c
@@ -208,7 +208,7 @@ call_with_frame(const char *funcname, int lineno, PyObject* func, PyObject* args
 {
     PyObject *res;
 
-    res = PyEval_CallObject(func, args);
+    res = PyObject_Call(func, args, NULL);
     if (res == NULL) {
         _PyTraceback_Add(funcname, __FILE__, lineno);
         XML_StopParser(self->itself, XML_FALSE);
diff --git a/Modules/signalmodule.c b/Modules/signalmodule.c
index 7698984ff3af..95569b931d60 100644
--- a/Modules/signalmodule.c
+++ b/Modules/signalmodule.c
@@ -1667,8 +1667,7 @@ _PyErr_CheckSignals(void)
             _Py_atomic_store_relaxed(&Handlers[i].tripped, 0);
 
             if (arglist) {
-                result = PyEval_CallObject(Handlers[i].func,
-                                           arglist);
+                result = PyObject_Call(Handlers[i].func, arglist, NULL);
                 Py_DECREF(arglist);
             }
             if (!result) {
diff --git a/Objects/call.c b/Objects/call.c
index df90595d6c6a..7d917891bc0c 100644
--- a/Objects/call.c
+++ b/Objects/call.c
@@ -457,7 +457,16 @@ PyEval_CallObjectWithKeywords(PyObject *callable,
 PyObject *
 PyObject_CallObject(PyObject *callable, PyObject *args)
 {
-    return PyEval_CallObjectWithKeywords(callable, args, NULL);
+    assert(!PyErr_Occurred());
+    if (args == NULL) {
+        return _PyObject_CallNoArg(callable);
+    }
+    if (!PyTuple_Check(args)) {
+        PyErr_SetString(PyExc_TypeError,
+                        "argument list must be a tuple");
+        return NULL;
+    }
+    return PyObject_Call(callable, args, NULL);
 }
 
 
diff --git a/Python/codecs.c b/Python/codecs.c
index 75b60ec6bd77..4f38b33e0b76 100644
--- a/Python/codecs.c
+++ b/Python/codecs.c
@@ -416,7 +416,7 @@ _PyCodec_EncodeInternal(PyObject *object,
     if (args == NULL)
         goto onError;
 
-    result = PyEval_CallObject(encoder, args);
+    result = PyObject_Call(encoder, args, NULL);
     if (result == NULL) {
         wrap_codec_error("encoding", encoding);
         goto onError;
@@ -462,7 +462,7 @@ _PyCodec_DecodeInternal(PyObject *object,
     if (args == NULL)
         goto onError;
 
-    result = PyEval_CallObject(decoder,args);
+    result = PyObject_Call(decoder, args, NULL);
     if (result == NULL) {
         wrap_codec_error("decoding", encoding);
         goto onError;


From webhook-mailer at python.org  Thu Jul 11 13:31:54 2019
From: webhook-mailer at python.org (Miss Islington (bot))
Date: Thu, 11 Jul 2019 17:31:54 -0000
Subject: [Python-checkins] closes bpo-37554: Remove `q:q` in os.rst
 documentation (GH-14692)
Message-ID: <mailman.333.1562866315.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/7cbef72902f32866a416ca6c4e732af4541951b8
commit: 7cbef72902f32866a416ca6c4e732af4541951b8
branch: master
author: Mariatta <Mariatta at users.noreply.github.com>
committer: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
date: 2019-07-11T10:31:19-07:00
summary:

closes bpo-37554: Remove `q:q` in os.rst documentation (GH-14692)



https://bugs.python.org/issue37554

files:
M Doc/library/os.rst

diff --git a/Doc/library/os.rst b/Doc/library/os.rst
index 519d5581603b..c74d687f08fb 100644
--- a/Doc/library/os.rst
+++ b/Doc/library/os.rst
@@ -2098,7 +2098,7 @@ features:
 
    On Windows, if *dst* exists a :exc:`FileExistsError` is always raised.
 
-   On Unix, if *src* is a file and *dst* is a directory or vice-versa, anq:q
+   On Unix, if *src* is a file and *dst* is a directory or vice-versa, an
    :exc:`IsADirectoryError` or a :exc:`NotADirectoryError` will be raised
    respectively.  If both are directories and *dst* is empty, *dst* will be
    silently replaced.  If *dst* is a non-empty directory, an :exc:`OSError`


From webhook-mailer at python.org  Thu Jul 11 13:45:41 2019
From: webhook-mailer at python.org (Miss Islington (bot))
Date: Thu, 11 Jul 2019 17:45:41 -0000
Subject: [Python-checkins] closes bpo-37554: Remove `q:q` in os.rst
 documentation (GH-14692)
Message-ID: <mailman.334.1562867143.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/107171500d7d6e60f463eeb4db492c0ae292a669
commit: 107171500d7d6e60f463eeb4db492c0ae292a669
branch: 3.8
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: GitHub <noreply at github.com>
date: 2019-07-11T10:45:36-07:00
summary:

closes bpo-37554: Remove `q:q` in os.rst documentation (GH-14692)


https://bugs.python.org/issue37554
(cherry picked from commit 7cbef72902f32866a416ca6c4e732af4541951b8)

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

files:
M Doc/library/os.rst

diff --git a/Doc/library/os.rst b/Doc/library/os.rst
index 519d5581603b..c74d687f08fb 100644
--- a/Doc/library/os.rst
+++ b/Doc/library/os.rst
@@ -2098,7 +2098,7 @@ features:
 
    On Windows, if *dst* exists a :exc:`FileExistsError` is always raised.
 
-   On Unix, if *src* is a file and *dst* is a directory or vice-versa, anq:q
+   On Unix, if *src* is a file and *dst* is a directory or vice-versa, an
    :exc:`IsADirectoryError` or a :exc:`NotADirectoryError` will be raised
    respectively.  If both are directories and *dst* is empty, *dst* will be
    silently replaced.  If *dst* is a non-empty directory, an :exc:`OSError`


From webhook-mailer at python.org  Thu Jul 11 13:48:06 2019
From: webhook-mailer at python.org (Miss Islington (bot))
Date: Thu, 11 Jul 2019 17:48:06 -0000
Subject: [Python-checkins] closes bpo-37554: Remove `q:q` in os.rst
 documentation (GH-14692)
Message-ID: <mailman.335.1562867286.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/71435f685c0423f878946e584f4b9eb01233d332
commit: 71435f685c0423f878946e584f4b9eb01233d332
branch: 3.7
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: GitHub <noreply at github.com>
date: 2019-07-11T10:48:00-07:00
summary:

closes bpo-37554: Remove `q:q` in os.rst documentation (GH-14692)


https://bugs.python.org/issue37554
(cherry picked from commit 7cbef72902f32866a416ca6c4e732af4541951b8)

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

files:
M Doc/library/os.rst

diff --git a/Doc/library/os.rst b/Doc/library/os.rst
index 24f14480ae04..5572b62420fe 100644
--- a/Doc/library/os.rst
+++ b/Doc/library/os.rst
@@ -2056,7 +2056,7 @@ features:
 
    On Windows, if *dst* exists a :exc:`FileExistsError` is always raised.
 
-   On Unix, if *src* is a file and *dst* is a directory or vice-versa, anq:q
+   On Unix, if *src* is a file and *dst* is a directory or vice-versa, an
    :exc:`IsADirectoryError` or a :exc:`NotADirectoryError` will be raised
    respectively.  If both are directories and *dst* is empty, *dst* will be
    silently replaced.  If *dst* is a non-empty directory, an :exc:`OSError`


From webhook-mailer at python.org  Thu Jul 11 14:04:19 2019
From: webhook-mailer at python.org (Miss Islington (bot))
Date: Thu, 11 Jul 2019 18:04:19 -0000
Subject: [Python-checkins] bpo-37558: Shared memory tests are failing due to
 double slashes (GH-14703)
Message-ID: <mailman.336.1562868260.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/4737265622251756a9480ab84af2442b6b986850
commit: 4737265622251756a9480ab84af2442b6b986850
branch: master
author: Jakub Kul?k <Kulikjak at gmail.com>
committer: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
date: 2019-07-11T11:04:09-07:00
summary:

bpo-37558: Shared memory tests are failing due to double slashes (GH-14703)



With the addition of shared memory into Python 3.8, we now have three tests failing on Solaris, namely `test_multiprocessing_fork`, `test_multiprocessing_forkserver` and `test_multiprocessing_spawn`. The reason seems to be incorrect name handling which results in two slashes being prepended.


https://bugs.python.org/issue37558

files:
A Misc/NEWS.d/next/Tests/2019-07-11-10-33-56.bpo-37558.SKHRsL.rst
M Lib/test/_test_multiprocessing.py

diff --git a/Lib/test/_test_multiprocessing.py b/Lib/test/_test_multiprocessing.py
index 9a39f385952f..2fe0def2bcd2 100644
--- a/Lib/test/_test_multiprocessing.py
+++ b/Lib/test/_test_multiprocessing.py
@@ -3990,7 +3990,7 @@ def test_shared_memory_cleaned_after_process_termination(self):
 
             # Create a shared_memory segment, and send the segment name
             sm = shared_memory.SharedMemory(create=True, size=10)
-            sys.stdout.write(sm._name + '\\n')
+            sys.stdout.write(sm.name + '\\n')
             sys.stdout.flush()
             time.sleep(100)
         '''
diff --git a/Misc/NEWS.d/next/Tests/2019-07-11-10-33-56.bpo-37558.SKHRsL.rst b/Misc/NEWS.d/next/Tests/2019-07-11-10-33-56.bpo-37558.SKHRsL.rst
new file mode 100644
index 000000000000..9f393d71a3f2
--- /dev/null
+++ b/Misc/NEWS.d/next/Tests/2019-07-11-10-33-56.bpo-37558.SKHRsL.rst
@@ -0,0 +1 @@
+Fix test_shared_memory_cleaned_after_process_termination name handling


From webhook-mailer at python.org  Thu Jul 11 14:38:59 2019
From: webhook-mailer at python.org (Miss Islington (bot))
Date: Thu, 11 Jul 2019 18:38:59 -0000
Subject: [Python-checkins] bpo-37558: Shared memory tests are failing due to
 double slashes (GH-14703)
Message-ID: <mailman.337.1562870340.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/3d58b78481e0238593f85cc182b798fe3b77648c
commit: 3d58b78481e0238593f85cc182b798fe3b77648c
branch: 3.8
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: GitHub <noreply at github.com>
date: 2019-07-11T11:38:37-07:00
summary:

bpo-37558: Shared memory tests are failing due to double slashes (GH-14703)


With the addition of shared memory into Python 3.8, we now have three tests failing on Solaris, namely `test_multiprocessing_fork`, `test_multiprocessing_forkserver` and `test_multiprocessing_spawn`. The reason seems to be incorrect name handling which results in two slashes being prepended.

https://bugs.python.org/issue37558
(cherry picked from commit 4737265622251756a9480ab84af2442b6b986850)

Co-authored-by: Jakub Kul?k <Kulikjak at gmail.com>

files:
A Misc/NEWS.d/next/Tests/2019-07-11-10-33-56.bpo-37558.SKHRsL.rst
M Lib/test/_test_multiprocessing.py

diff --git a/Lib/test/_test_multiprocessing.py b/Lib/test/_test_multiprocessing.py
index 9a39f385952f..2fe0def2bcd2 100644
--- a/Lib/test/_test_multiprocessing.py
+++ b/Lib/test/_test_multiprocessing.py
@@ -3990,7 +3990,7 @@ def test_shared_memory_cleaned_after_process_termination(self):
 
             # Create a shared_memory segment, and send the segment name
             sm = shared_memory.SharedMemory(create=True, size=10)
-            sys.stdout.write(sm._name + '\\n')
+            sys.stdout.write(sm.name + '\\n')
             sys.stdout.flush()
             time.sleep(100)
         '''
diff --git a/Misc/NEWS.d/next/Tests/2019-07-11-10-33-56.bpo-37558.SKHRsL.rst b/Misc/NEWS.d/next/Tests/2019-07-11-10-33-56.bpo-37558.SKHRsL.rst
new file mode 100644
index 000000000000..9f393d71a3f2
--- /dev/null
+++ b/Misc/NEWS.d/next/Tests/2019-07-11-10-33-56.bpo-37558.SKHRsL.rst
@@ -0,0 +1 @@
+Fix test_shared_memory_cleaned_after_process_termination name handling


From webhook-mailer at python.org  Thu Jul 11 17:57:54 2019
From: webhook-mailer at python.org (Miss Islington (bot))
Date: Thu, 11 Jul 2019 21:57:54 -0000
Subject: [Python-checkins] Remove redundant check from arraymodule b_getitem
 (GH-14676)
Message-ID: <mailman.338.1562882276.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/13ab570febac64bb55fb46d866a9ba5a46ab8902
commit: 13ab570febac64bb55fb46d866a9ba5a46ab8902
branch: master
author: Disconnect3d <dominik.b.czarnota at gmail.com>
committer: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
date: 2019-07-11T14:57:42-07:00
summary:

Remove redundant check from arraymodule b_getitem (GH-14676)



The `arraymodule`'s `b_getitem` function returns a `PyLong` converted 
from `arrayobject`'s array, by dereferencing a pointer to `char`.

When the `char` type is `signed char`, the `if (x >= 128) x -= 256;` comparison/code is redundant because a `signed char` will have a value of `[-128, 127]` and so `x` will never be greater or equal than 128.

This check was indeed needed for situations where a given compiler would assume `char` being `unsigned char` which would make `x` in `[0, 256]` range.

However, the check can be removed if we cast the `ob_item` into a signed char pointer (`signed char*`) instead of `char*`.

This PR/commit introduces this change.

files:
M Modules/arraymodule.c

diff --git a/Modules/arraymodule.c b/Modules/arraymodule.c
index 48986c419029..6aa981daca1d 100644
--- a/Modules/arraymodule.c
+++ b/Modules/arraymodule.c
@@ -185,9 +185,7 @@ in bounds; that's the responsibility of the caller.
 static PyObject *
 b_getitem(arrayobject *ap, Py_ssize_t i)
 {
-    long x = ((char *)ap->ob_item)[i];
-    if (x >= 128)
-        x -= 256;
+    long x = ((signed char *)ap->ob_item)[i];
     return PyLong_FromLong(x);
 }
 


From webhook-mailer at python.org  Thu Jul 11 22:18:16 2019
From: webhook-mailer at python.org (Benjamin Peterson)
Date: Fri, 12 Jul 2019 02:18:16 -0000
Subject: [Python-checkins] closes bpo-37566: Remove _realsocket from
 socket.py. (GH-14711)
Message-ID: <mailman.339.1562897897.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/c8e7146de257930ea8d0d4aa74b3a64fcaa79d4b
commit: c8e7146de257930ea8d0d4aa74b3a64fcaa79d4b
branch: master
author: Hai Shi <shihai1992 at gmail.com>
committer: Benjamin Peterson <benjamin at python.org>
date: 2019-07-11T19:17:52-07:00
summary:

closes bpo-37566: Remove _realsocket from socket.py. (GH-14711)

files:
M Lib/socket.py

diff --git a/Lib/socket.py b/Lib/socket.py
index 0dd8ec70e168..3016b03104d4 100644
--- a/Lib/socket.py
+++ b/Lib/socket.py
@@ -104,8 +104,6 @@ def _intenum_converter(value, enum_klass):
     except ValueError:
         return value
 
-_realsocket = socket
-
 # WSA error codes
 if sys.platform.lower().startswith("win"):
     errorTab = {}


From webhook-mailer at python.org  Mon Jul  1 07:29:19 2019
From: webhook-mailer at python.org (=?utf-8?q?=C5=81ukasz?= Langa)
Date: Mon, 01 Jul 2019 11:29:19 -0000
Subject: [Python-checkins] (no subject)
Message-ID: <mailman.341.1562940337.29657.python-checkins@python.org>




To: python-checkins at python.org
Subject: bpo-37221: Add PyCode_NewWithPosOnlyArgs to be used internally and
 set PyCode_New as a compatibility wrapper (GH-13959) (#14505)
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0

https://github.com/python/cpython/commit/cb083f7cdf604c1d9d264f387f9e8846bc95=
3eb3
commit: cb083f7cdf604c1d9d264f387f9e8846bc953eb3
branch: 3.8
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.co=
m>
committer: =C5=81ukasz Langa <lukasz at langa.pl>
date: 2019-07-01T13:29:14+02:00
summary:

bpo-37221: Add PyCode_NewWithPosOnlyArgs to be used internally and set PyCode=
_New as a compatibility wrapper (GH-13959) (#14505)

Add PyCode_NewEx to be used internally and set PyCode_New as a compatibility =
wrapper
(cherry picked from commit 4a2edc34a405150d0b23ecfdcb401e7cf59f4650)

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

files:
A Misc/NEWS.d/next/C API/2019-06-11-02-50-38.bpo-37221.4tClQT.rst
M Doc/c-api/code.rst
M Doc/data/refcounts.dat
M Doc/whatsnew/3.8.rst
M Include/code.h
M Objects/codeobject.c
M Python/compile.c
M Python/marshal.c

diff --git a/Doc/c-api/code.rst b/Doc/c-api/code.rst
index 7353df56e7d3..3c4f66923da5 100644
--- a/Doc/c-api/code.rst
+++ b/Doc/c-api/code.rst
@@ -33,20 +33,21 @@ bound into a function.
=20
    Return the number of free variables in *co*.
=20
-.. c:function:: PyCodeObject* PyCode_New(int argcount, int posonlyargcount, =
int kwonlyargcount, int nlocals, int stacksize, int flags, PyObject *code, Py=
Object *consts, PyObject *names, PyObject *varnames, PyObject *freevars, PyOb=
ject *cellvars, PyObject *filename, PyObject *name, int firstlineno, PyObject=
 *lnotab)
+.. c:function:: PyCodeObject* PyCode_New(int argcount, int kwonlyargcount, i=
nt nlocals, int stacksize, int flags, PyObject *code, PyObject *consts, PyObj=
ect *names, PyObject *varnames, PyObject *freevars, PyObject *cellvars, PyObj=
ect *filename, PyObject *name, int firstlineno, PyObject *lnotab)
=20
-   Return a new code object.  If you need a dummy code object to
-   create a frame, use :c:func:`PyCode_NewEmpty` instead.  Calling
-   :c:func:`PyCode_New` directly can bind you to a precise Python
-   version since the definition of the bytecode changes often.
-
-   .. versionchanged:: 3.8
-      An extra parameter is required (*posonlyargcount*) to support :PEP:`57=
0`.
-      The first parameter (*argcount*) now represents the total number of po=
sitional arguments,
-      including positional-only.
+   Return a new code object.  If you need a dummy code object to create a fr=
ame,
+   use :c:func:`PyCode_NewEmpty` instead.  Calling :c:func:`PyCode_New` dire=
ctly
+   can bind you to a precise Python version since the definition of the byte=
code
+   changes often.
=20
    .. audit-event:: code.__new__ code,filename,name,argcount,posonlyargcount=
,kwonlyargcount,nlocals,stacksize,flags c.PyCode_New
=20
+.. c:function:: PyCodeObject* PyCode_NewWithPosOnlyArgs(int argcount, int po=
sonlyargcount, int kwonlyargcount, int nlocals, int stacksize, int flags, PyO=
bject *code, PyObject *consts, PyObject *names, PyObject *varnames, PyObject =
*freevars, PyObject *cellvars, PyObject *filename, PyObject *name, int firstl=
ineno, PyObject *lnotab)
+
+   Similar to :c:func:`PyCode_New`, but with an extra "posonlyargcount" for =
positonal-only arguments.
+
+   .. versionadded:: 3.8
+
 .. c:function:: PyCodeObject* PyCode_NewEmpty(const char *filename, const ch=
ar *funcname, int firstlineno)
=20
    Return a new empty code object with the specified filename,
diff --git a/Doc/data/refcounts.dat b/Doc/data/refcounts.dat
index aca57a1dae9d..fda347eab102 100644
--- a/Doc/data/refcounts.dat
+++ b/Doc/data/refcounts.dat
@@ -234,9 +234,26 @@ PyCode_Check:PyObject*:co:0:
 PyCode_GetNumFree:int:::
 PyCode_GetNumFree:PyCodeObject*:co:0:
=20
+PyCode_NewWithPosOnlyArgs:PyCodeObject*::+1:
+PyCode_NewWithPosOnlyArgs:int:argcount::
+PyCode_NewWithPosOnlyArgs:int:posonlyargcount::
+PyCode_NewWithPosOnlyArgs:int:kwonlyargcount::
+PyCode_NewWithPosOnlyArgs:int:nlocals::
+PyCode_NewWithPosOnlyArgs:int:stacksize::
+PyCode_NewWithPosOnlyArgs:int:flags::
+PyCode_NewWithPosOnlyArgs:PyObject*:code:0:
+PyCode_NewWithPosOnlyArgs:PyObject*:consts:0:
+PyCode_NewWithPosOnlyArgs:PyObject*:names:0:
+PyCode_NewWithPosOnlyArgs:PyObject*:varnames:0:
+PyCode_NewWithPosOnlyArgs:PyObject*:freevars:0:
+PyCode_NewWithPosOnlyArgs:PyObject*:cellvars:0:
+PyCode_NewWithPosOnlyArgs:PyObject*:filename:0:
+PyCode_NewWithPosOnlyArgs:PyObject*:name:0:
+PyCode_NewWithPosOnlyArgs:int:firstlineno::
+PyCode_NewWithPosOnlyArgs:PyObject*:lnotab:0:
+
 PyCode_New:PyCodeObject*::+1:
 PyCode_New:int:argcount::
-PyCode_New:int:posonlyargcount::
 PyCode_New:int:kwonlyargcount::
 PyCode_New:int:nlocals::
 PyCode_New:int:stacksize::
diff --git a/Doc/whatsnew/3.8.rst b/Doc/whatsnew/3.8.rst
index 8c2f80ce24e0..f423765c8917 100644
--- a/Doc/whatsnew/3.8.rst
+++ b/Doc/whatsnew/3.8.rst
@@ -1042,6 +1042,11 @@ Build and C API Changes
   allocation or deallocation may need to be adjusted.
   (Contributed by Eddie Elizondo in :issue:`35810`.)
=20
+* The new function :c:func:`PyCode_NewWithPosOnlyArgs` allows to create
+  code objects like :c:func:`PyCode_New`, but with an extra *posonlyargcount*
+  parameter for indicating the number of positional-only arguments.
+  (Contributed by Pablo Galindo in :issue:`37221`.)
+
=20
 Deprecated
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
diff --git a/Include/code.h b/Include/code.h
index b79d977394e0..3afddd20c80d 100644
--- a/Include/code.h
+++ b/Include/code.h
@@ -120,6 +120,11 @@ PyAPI_DATA(PyTypeObject) PyCode_Type;
=20
 /* Public interface */
 PyAPI_FUNC(PyCodeObject *) PyCode_New(
+        int, int, int, int, int, PyObject *, PyObject *,
+        PyObject *, PyObject *, PyObject *, PyObject *,
+        PyObject *, PyObject *, int, PyObject *);
+
+PyAPI_FUNC(PyCodeObject *) PyCode_NewWithPosOnlyArgs(
         int, int, int, int, int, int, PyObject *, PyObject *,
         PyObject *, PyObject *, PyObject *, PyObject *,
         PyObject *, PyObject *, int, PyObject *);
diff --git a/Misc/NEWS.d/next/C API/2019-06-11-02-50-38.bpo-37221.4tClQT.rst =
b/Misc/NEWS.d/next/C API/2019-06-11-02-50-38.bpo-37221.4tClQT.rst
new file mode 100644
index 000000000000..0ea8b9b86788
--- /dev/null
+++ b/Misc/NEWS.d/next/C API/2019-06-11-02-50-38.bpo-37221.4tClQT.rst=09
@@ -0,0 +1,3 @@
+The new function :c:func:`PyCode_NewWithPosOnlyArgs` allows to create
+code objects like :c:func:`PyCode_New`, but with an extra *posonlyargcount*
+parameter for indicating the number of positonal-only arguments.
diff --git a/Objects/codeobject.c b/Objects/codeobject.c
index 1333cc833e1e..39bf6fc6f228 100644
--- a/Objects/codeobject.c
+++ b/Objects/codeobject.c
@@ -102,14 +102,13 @@ intern_string_constants(PyObject *tuple)
     return modified;
 }
=20
-
 PyCodeObject *
-PyCode_New(int argcount, int posonlyargcount, int kwonlyargcount,
-           int nlocals, int stacksize, int flags,
-           PyObject *code, PyObject *consts, PyObject *names,
-           PyObject *varnames, PyObject *freevars, PyObject *cellvars,
-           PyObject *filename, PyObject *name, int firstlineno,
-           PyObject *lnotab)
+PyCode_NewWithPosOnlyArgs(int argcount, int posonlyargcount, int kwonlyargco=
unt,
+                          int nlocals, int stacksize, int flags,
+                          PyObject *code, PyObject *consts, PyObject *names,
+                          PyObject *varnames, PyObject *freevars, PyObject *=
cellvars,
+                          PyObject *filename, PyObject *name, int firstlinen=
o,
+                          PyObject *lnotab)
 {
     PyCodeObject *co;
     Py_ssize_t *cell2arg =3D NULL;
@@ -243,6 +242,20 @@ PyCode_New(int argcount, int posonlyargcount, int kwonly=
argcount,
     return co;
 }
=20
+PyCodeObject *
+PyCode_New(int argcount, int kwonlyargcount,
+           int nlocals, int stacksize, int flags,
+           PyObject *code, PyObject *consts, PyObject *names,
+           PyObject *varnames, PyObject *freevars, PyObject *cellvars,
+           PyObject *filename, PyObject *name, int firstlineno,
+           PyObject *lnotab)
+{
+    return PyCode_NewWithPosOnlyArgs(argcount, 0, kwonlyargcount, nlocals,
+                                     stacksize, flags, code, consts, names,
+                                     varnames, freevars, cellvars, filename,
+                                     name, firstlineno, lnotab);
+}
+
 int
 _PyCode_InitOpcache(PyCodeObject *co)
 {
@@ -311,7 +324,8 @@ PyCode_NewEmpty(const char *filename, const char *funcnam=
e, int firstlineno)
     if (filename_ob =3D=3D NULL)
         goto failed;
=20
-    result =3D PyCode_New(0,                      /* argcount */
+    result =3D PyCode_NewWithPosOnlyArgs(
+                0,                    /* argcount */
                 0,                              /* posonlyargcount */
                 0,                              /* kwonlyargcount */
                 0,                              /* nlocals */
@@ -492,12 +506,14 @@ code_new(PyTypeObject *type, PyObject *args, PyObject *=
kw)
     if (ourcellvars =3D=3D NULL)
         goto cleanup;
=20
-    co =3D (PyObject *)PyCode_New(argcount, posonlyargcount, kwonlyargcount,
-                                nlocals, stacksize, flags,
-                                code, consts, ournames, ourvarnames,
-                                ourfreevars, ourcellvars, filename,
-                                name, firstlineno, lnotab);
-  cleanup:
+    co =3D (PyObject *)PyCode_NewWithPosOnlyArgs(argcount, posonlyargcount,
+                                               kwonlyargcount,
+                                               nlocals, stacksize, flags,
+                                               code, consts, ournames,
+                                               ourvarnames, ourfreevars,
+                                               ourcellvars, filename,
+                                               name, firstlineno, lnotab);
+  cleanup:=20
     Py_XDECREF(ournames);
     Py_XDECREF(ourvarnames);
     Py_XDECREF(ourfreevars);
@@ -625,7 +641,7 @@ code_replace_impl(PyCodeObject *self, int co_argcount,
=20
 #undef CHECK_INT_ARG
=20
-    return (PyObject *)PyCode_New(
+    return (PyObject *)PyCode_NewWithPosOnlyArgs(
         co_argcount, co_posonlyargcount, co_kwonlyargcount, co_nlocals,
         co_stacksize, co_flags, (PyObject*)co_code, co_consts, co_names,
         co_varnames, co_freevars, co_cellvars, co_filename, co_name,
diff --git a/Python/compile.c b/Python/compile.c
index 7bdf406079d3..9cce8aeb4e1f 100644
--- a/Python/compile.c
+++ b/Python/compile.c
@@ -5813,13 +5813,11 @@ makecode(struct compiler *c, struct assembler *a)
     if (maxdepth < 0) {
         goto error;
     }
-    co =3D PyCode_New(posonlyargcount+posorkeywordargcount, posonlyargcount,
-                    kwonlyargcount, nlocals_int, maxdepth, flags,
-                    bytecode, consts, names, varnames,
-                    freevars, cellvars,
-                    c->c_filename, c->u->u_name,
-                    c->u->u_firstlineno,
-                    a->a_lnotab);
+    co =3D PyCode_NewWithPosOnlyArgs(posonlyargcount+posorkeywordargcount,
+                                   posonlyargcount, kwonlyargcount, nlocals_=
int,=20
+                                   maxdepth, flags, bytecode, consts, names,
+                                   varnames, freevars, cellvars, c->c_filena=
me,
+                                   c->u->u_name, c->u->u_firstlineno, a->a_l=
notab);
  error:
     Py_XDECREF(consts);
     Py_XDECREF(names);
diff --git a/Python/marshal.c b/Python/marshal.c
index caaddfe9e44e..b2daff2c8a3b 100644
--- a/Python/marshal.c
+++ b/Python/marshal.c
@@ -1396,7 +1396,7 @@ r_object(RFILE *p)
             if (lnotab =3D=3D NULL)
                 goto code_error;
=20
-            v =3D (PyObject *) PyCode_New(
+            v =3D (PyObject *) PyCode_NewWithPosOnlyArgs(
                             argcount, posonlyargcount, kwonlyargcount,
                             nlocals, stacksize, flags,
                             code, consts, names, varnames,


From webhook-mailer at python.org  Tue Jul  2 07:32:47 2019
From: webhook-mailer at python.org (=?utf-8?q?=C5=81ukasz?= Langa)
Date: Tue, 02 Jul 2019 11:32:47 -0000
Subject: [Python-checkins] (no subject)
Message-ID: <mailman.342.1562940337.29657.python-checkins@python.org>




To: python-checkins at python.org
Subject: Stop using Argument Clinic for dict_pop (GH-13935)
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0

https://github.com/python/cpython/commit/d4c664736e43284405100d98d516fa269a64=
7461
commit: d4c664736e43284405100d98d516fa269a647461
branch: 3.8
author: Inada Naoki <songofacandy at gmail.com>
committer: =C5=81ukasz Langa <lukasz at langa.pl>
date: 2019-07-02T13:32:43+02:00
summary:

Stop using Argument Clinic for dict_pop (GH-13935)

files:
M Objects/clinic/dictobject.c.h
M Objects/dictobject.c

diff --git a/Objects/clinic/dictobject.c.h b/Objects/clinic/dictobject.c.h
index b87244d87348..8d5493330835 100644
--- a/Objects/clinic/dictobject.c.h
+++ b/Objects/clinic/dictobject.c.h
@@ -116,42 +116,6 @@ dict_setdefault(PyDictObject *self, PyObject *const *arg=
s, Py_ssize_t nargs)
     return return_value;
 }
=20
-PyDoc_STRVAR(dict_pop__doc__,
-"pop($self, key, default=3DNone, /)\n"
-"--\n"
-"\n"
-"Remove specified key and return the corresponding value.\n"
-"\n"
-"If key is not found, default is returned if given, otherwise KeyError is ra=
ised");
-
-#define DICT_POP_METHODDEF    \
-    {"pop", (PyCFunction)(void(*)(void))dict_pop, METH_FASTCALL, dict_pop__d=
oc__},
-
-static PyObject *
-dict_pop_impl(PyDictObject *self, PyObject *key, PyObject *default_value);
-
-static PyObject *
-dict_pop(PyDictObject *self, PyObject *const *args, Py_ssize_t nargs)
-{
-    PyObject *return_value =3D NULL;
-    PyObject *key;
-    PyObject *default_value =3D NULL;
-
-    if (!_PyArg_CheckPositional("pop", nargs, 1, 2)) {
-        goto exit;
-    }
-    key =3D args[0];
-    if (nargs < 2) {
-        goto skip_optional;
-    }
-    default_value =3D args[1];
-skip_optional:
-    return_value =3D dict_pop_impl(self, key, default_value);
-
-exit:
-    return return_value;
-}
-
 PyDoc_STRVAR(dict_popitem__doc__,
 "popitem($self, /)\n"
 "--\n"
@@ -190,4 +154,4 @@ dict___reversed__(PyDictObject *self, PyObject *Py_UNUSED=
(ignored))
 {
     return dict___reversed___impl(self);
 }
-/*[clinic end generated code: output=3D0fd5cafc61a51d3c input=3Da9049054013a=
1b77]*/
+/*[clinic end generated code: output=3D676532dcc941d399 input=3Da9049054013a=
1b77]*/
diff --git a/Objects/dictobject.c b/Objects/dictobject.c
index 0cc144375006..e417cd2119c6 100644
--- a/Objects/dictobject.c
+++ b/Objects/dictobject.c
@@ -2987,23 +2987,37 @@ dict_clear(PyDictObject *mp, PyObject *Py_UNUSED(igno=
red))
     Py_RETURN_NONE;
 }
=20
-/*[clinic input]
-dict.pop
-
-    key: object
-    default: object =3D NULL
-    /
+/*
+We don't use Argument Clinic for dict.pop because it doesn't support
+custom signature for now.
+*/
+PyDoc_STRVAR(dict_pop__doc__,
+"D.pop(k[,d]) -> v, remove specified key and return the corresponding value.=
\n\
+If key is not found, d is returned if given, otherwise KeyError is raised");
=20
-Remove specified key and return the corresponding value.
-
-If key is not found, default is returned if given, otherwise KeyError is rai=
sed
-[clinic start generated code]*/
+#define DICT_POP_METHODDEF    \
+    {"pop", (PyCFunction)(void(*)(void))dict_pop, METH_FASTCALL, dict_pop__d=
oc__},
=20
 static PyObject *
-dict_pop_impl(PyDictObject *self, PyObject *key, PyObject *default_value)
-/*[clinic end generated code: output=3D3abb47b89f24c21c input=3D016f6a000e4e=
633b]*/
+dict_pop(PyDictObject *self, PyObject *const *args, Py_ssize_t nargs)
 {
-    return _PyDict_Pop((PyObject*)self, key, default_value);
+    PyObject *return_value =3D NULL;
+    PyObject *key;
+    PyObject *default_value =3D NULL;
+
+    if (!_PyArg_CheckPositional("pop", nargs, 1, 2)) {
+        goto exit;
+    }
+    key =3D args[0];
+    if (nargs < 2) {
+        goto skip_optional;
+    }
+    default_value =3D args[1];
+skip_optional:
+    return_value =3D _PyDict_Pop((PyObject*)self, key, default_value);
+
+exit:
+    return return_value;
 }
=20
 /*[clinic input]


From webhook-mailer at python.org  Thu Jul  4 17:47:48 2019
From: webhook-mailer at python.org (=?utf-8?q?=C5=81ukasz?= Langa)
Date: Thu, 04 Jul 2019 21:47:48 -0000
Subject: [Python-checkins] (no subject)
Message-ID: <mailman.343.1562940338.29657.python-checkins@python.org>




To: python-checkins at python.org
Subject: Python 3.8.0b2
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0

https://github.com/python/cpython/commit/21dd01dad7b6b38d4fd40b37d65f1ac7203e=
c4e6
commit: 21dd01dad7b6b38d4fd40b37d65f1ac7203ec4e6
branch: 3.8
author: =C5=81ukasz Langa <lukasz at langa.pl>
committer: =C5=81ukasz Langa <lukasz at langa.pl>
date: 2019-07-04T12:50:19+02:00
summary:

Python 3.8.0b2

files:
A Misc/NEWS.d/3.8.0b2.rst
D Misc/NEWS.d/next/Build/2019-06-17-09-40-59.bpo-37189.j5ebdT.rst
D Misc/NEWS.d/next/C API/2019-06-06-08-47-04.bpo-37170.hO_fpM.rst
D Misc/NEWS.d/next/C API/2019-06-07-10-47-37.bpo-37191.iGL1_K.rst
D Misc/NEWS.d/next/C API/2019-06-10-15-32-34.bpo-37215.yzoNyU.rst
D Misc/NEWS.d/next/C API/2019-06-11-02-50-38.bpo-37221.4tClQT.rst
D Misc/NEWS.d/next/C API/2019-06-12-11-45-36.bpo-37221.RhP1E7.rst
D Misc/NEWS.d/next/C API/2019-06-14-14-03-51.bpo-28805.qZC0N_.rst
D Misc/NEWS.d/next/C API/2019-06-28-15-49-16.bpo-36763.zrmgki.rst
D Misc/NEWS.d/next/Core and Builtins/2019-05-28-11-47-44.bpo-37077.S1h0Fc.rst
D Misc/NEWS.d/next/Core and Builtins/2019-06-05-09-24-17.bpo-37160.O3IAY3.rst
D Misc/NEWS.d/next/Core and Builtins/2019-06-06-11-00-55.bpo-36974.wdzzym.rst
D Misc/NEWS.d/next/Core and Builtins/2019-06-06-13-59-52.bpo-36922.EMZ3TF.rst
D Misc/NEWS.d/next/Core and Builtins/2019-06-10-23-18-31.bpo-37219.jPSufq.rst
D Misc/NEWS.d/next/Core and Builtins/2019-06-11-11-15-19.bpo-37213.UPii5K.rst
D Misc/NEWS.d/next/Core and Builtins/2019-06-14-06-32-33.bpo-37269.SjVVAe.rst
D Misc/NEWS.d/next/Core and Builtins/2019-06-17-03-53-16.bpo-37316.LytDX_.rst
D Misc/NEWS.d/next/Core and Builtins/2019-06-17-06-03-55.bpo-35224.FHWPGv.rst
D Misc/NEWS.d/next/Core and Builtins/2019-06-22-12-45-20.bpo-24214.hIiHeD.rst
D Misc/NEWS.d/next/Core and Builtins/2019-06-26-18-41-00.bpo-37417.VsZeHL.rst
D Misc/NEWS.d/next/Core and Builtins/2019-07-01-12-22-44.bpo-37467.u-XyEu.rst
D Misc/NEWS.d/next/Documentation/2019-06-17-09-36-46.bpo-34903.r_wGRc.rst
D Misc/NEWS.d/next/IDLE/2019-06-03-00-39-29.bpo-5680.VCQfOO.rst
D Misc/NEWS.d/next/IDLE/2019-06-04-20-36-24.bpo-35763.7XdoWz.rst
D Misc/NEWS.d/next/IDLE/2019-06-04-23-27-33.bpo-37039.FN_fBf.rst
D Misc/NEWS.d/next/IDLE/2019-06-07-00-17-41.bpo-37177.voU6pQ.rst
D Misc/NEWS.d/next/IDLE/2019-06-17-16-35-30.bpo-37321.zVTTGS.rst
D Misc/NEWS.d/next/IDLE/2019-06-18-16-40-05.bpo-37325.GssOf1.rst
D Misc/NEWS.d/next/Library/2017-08-15-11-24-41.bpo-4963.LRYres.rst
D Misc/NEWS.d/next/Library/2018-11-12-19-08-50.bpo-11122.Gj7BQn.rst
D Misc/NEWS.d/next/Library/2019-02-03-19-13-08.bpo-32627.b68f64.rst
D Misc/NEWS.d/next/Library/2019-05-09-18-50-55.bpo-35070.4vaqNL.rst
D Misc/NEWS.d/next/Library/2019-05-17-15-11-08.bpo-35805.E4YwYz.rst
D Misc/NEWS.d/next/Library/2019-05-27-15-29-46.bpo-30835.3FoaWH.rst
D Misc/NEWS.d/next/Library/2019-05-28-02-37-00.bpo-36520.W4tday.rst
D Misc/NEWS.d/next/Library/2019-05-28-19-03-46.bpo-35621.Abc1lf.rst
D Misc/NEWS.d/next/Library/2019-06-04-14-44-41.bpo-37150.TTzHxj.rst
D Misc/NEWS.d/next/Library/2019-06-04-22-25-38.bpo-37158.JKm15S.rst
D Misc/NEWS.d/next/Library/2019-06-04-23-44-52.bpo-34767.BpDShN.rst
D Misc/NEWS.d/next/Library/2019-06-05-11-48-19.bpo-37165.V_rwfE.rst
D Misc/NEWS.d/next/Library/2019-06-07-08-18-05.bpo-37163.36JkUh.rst
D Misc/NEWS.d/next/Library/2019-06-07-17-11-34.bpo-37178.b1StSv.rst
D Misc/NEWS.d/next/Library/2019-06-07-17-16-09.bpo-37178.Day_oB.rst
D Misc/NEWS.d/next/Library/2019-06-08-11-33-48.bpo-37173.0e_8gS.rst
D Misc/NEWS.d/next/Library/2019-06-08-16-03-19.bpo-34886.Ov-pc9.rst
D Misc/NEWS.d/next/Library/2019-06-11-00-35-02.bpo-36402.b0IJVp.rst
D Misc/NEWS.d/next/Library/2019-06-11-01-54-19.bpo-18748.ADqCkq.rst
D Misc/NEWS.d/next/Library/2019-06-11-13-52-04.bpo-36607.5_mJkQ.rst
D Misc/NEWS.d/next/Library/2019-06-11-16-41-40.bpo-35766.v1Kj-T.rst
D Misc/NEWS.d/next/Library/2019-06-11-19-34-29.bpo-35922.rxpzWr.rst
D Misc/NEWS.d/next/Library/2019-06-12-16-10-50.bpo-37210.r4yMg6.rst
D Misc/NEWS.d/next/Library/2019-06-14-08-30-16.bpo-19865.FRGH4I.rst
D Misc/NEWS.d/next/Library/2019-06-14-13-25-56.bpo-37279.OHlW6l.rst
D Misc/NEWS.d/next/Library/2019-06-14-13-30-47.bpo-37280.Fxur0F.rst
D Misc/NEWS.d/next/Library/2019-06-15-14-39-50.bpo-33972.XxnNPw.rst
D Misc/NEWS.d/next/Library/2019-06-25-02-10-00.bpo-37394.srZ1zx.rst
D Misc/NEWS.d/next/Library/2019-06-25-05-07-48.bpo-36546.RUcxaK.rst
D Misc/NEWS.d/next/Library/2019-06-25-19-27-25.bpo-29412.n4Zqdh.rst
D Misc/NEWS.d/next/Library/2019-06-26-16-28-59.bpo-37412.lx0VjC.rst
D Misc/NEWS.d/next/Library/2019-06-26-22-25-05.bpo-37420.CxFJ09.rst
D Misc/NEWS.d/next/Library/2019-06-27-13-27-02.bpo-37428._wcwUd.rst
D Misc/NEWS.d/next/Library/2019-06-27-20-33-50.bpo-37437.du39_A.rst
D Misc/NEWS.d/next/Library/2019-06-28-16-40-17.bpo-37440.t3wX-N.rst
D Misc/NEWS.d/next/Security/2019-06-17-09-34-25.bpo-34631.DBfM4j.rst
D Misc/NEWS.d/next/Security/2019-06-21-14-42-53.bpo-37364.IIRc2s.rst
D Misc/NEWS.d/next/Security/2019-06-21-15-58-59.bpo-37363.diouyl.rst
D Misc/NEWS.d/next/Security/2019-07-01-08-46-14.bpo-37463.1CHwjE.rst
D Misc/NEWS.d/next/Security/2019-07-01-10-31-14.bpo-37363.fSjatj.rst
D Misc/NEWS.d/next/Tests/2019-04-11-07-59-43.bpo-28009.s85urF.rst
D Misc/NEWS.d/next/Tests/2019-06-04-18-30-39.bpo-37153.711INB.rst
D Misc/NEWS.d/next/Tests/2019-06-07-12-23-15.bpo-37169.yfXTFg.rst
D Misc/NEWS.d/next/Tests/2019-06-13-12-19-56.bpo-37261.NuKFVo.rst
D Misc/NEWS.d/next/Tests/2019-06-14-12-21-47.bpo-37278.z0HUOr.rst
D Misc/NEWS.d/next/Tests/2019-06-14-17-05-49.bpo-35998.yX82oD.rst
D Misc/NEWS.d/next/Tests/2019-06-21-15-47-33.bpo-37362.D3xppx.rst
D Misc/NEWS.d/next/Tests/2019-06-24-10-47-07.bpo-37359.CkdtyO.rst
D Misc/NEWS.d/next/Tests/2019-06-25-16-02-43.bpo-37400.cx_EWv.rst
D Misc/NEWS.d/next/Tests/2019-06-26-15-28-45.bpo-37411.5lGNhM.rst
D Misc/NEWS.d/next/Tests/2019-06-27-00-37-59.bpo-37421.rVJb3x.rst
D Misc/NEWS.d/next/Tests/2019-06-28-16-37-52.bpo-37335.o5S2hY.rst
D Misc/NEWS.d/next/Tests/2019-06-29-23-56-28.bpo-37199.FHDsLf.rst
D Misc/NEWS.d/next/Tests/2019-07-01-19-57-26.bpo-37421.NFH1f0.rst
D Misc/NEWS.d/next/Tests/2019-07-02-23-20-35.bpo-37421.HCkKWz.rst
D Misc/NEWS.d/next/Tests/2019-07-02-23-29-06.bpo-37421.WEfc5A.rst
D Misc/NEWS.d/next/Tests/2019-07-03-00-05-28.bpo-37421.ORGRSG.rst
D Misc/NEWS.d/next/Windows/2019-06-11-15-41-34.bpo-36779.0TMw6f.rst
D Misc/NEWS.d/next/Windows/2019-06-13-04-15-51.bpo-37267.Ygo5ef.rst
D Misc/NEWS.d/next/Windows/2019-06-18-09-05-08.bpo-35360.tdqSmo.rst
D Misc/NEWS.d/next/Windows/2019-06-20-12-50-32.bpo-37351.asTnVW.rst
D Misc/NEWS.d/next/Windows/2019-06-28-09-44-08.bpo-37369.1iVpxq.rst
D Misc/NEWS.d/next/Windows/2019-07-01-12-38-48.bpo-10945.s0YBHG.rst
D Misc/NEWS.d/next/macOS/2019-06-18-00-30-40.bpo-34631.vSifcv.rst
D Misc/NEWS.d/next/macOS/2019-06-18-08-58-30.bpo-35360.-CWbfy.rst
D Misc/NEWS.d/next/macOS/2019-07-02-01-06-47.bpo-34602.10d4wl.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 4a52f833a525..bb31b47bddd6 100644
--- a/Include/patchlevel.h
+++ b/Include/patchlevel.h
@@ -20,10 +20,10 @@
 #define PY_MINOR_VERSION        8
 #define PY_MICRO_VERSION        0
 #define PY_RELEASE_LEVEL        PY_RELEASE_LEVEL_BETA
-#define PY_RELEASE_SERIAL       1
+#define PY_RELEASE_SERIAL       2
=20
 /* Version as a string */
-#define PY_VERSION              "3.8.0b1+"
+#define PY_VERSION              "3.8.0b2"
 /*--end constants--*/
=20
 /* Version as a single 4-byte hex number, e.g. 0x010502B2 =3D=3D 1.5.2b2.
diff --git a/Lib/pydoc_data/topics.py b/Lib/pydoc_data/topics.py
index 1fb19f241ac3..636219108342 100644
--- a/Lib/pydoc_data/topics.py
+++ b/Lib/pydoc_data/topics.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Autogenerated by Sphinx on Tue Jun  4 19:40:37 2019
+# Autogenerated by Sphinx on Thu Jul  4 12:44:09 2019
 topics =3D {'assert': 'The "assert" statement\n'
            '**********************\n'
            '\n'
@@ -3758,6 +3758,8 @@
              '\n'
              "      import pdb; pdb.Pdb(skip=3D['django.*']).set_trace()\n"
              '\n'
+             '   Raises an auditing event "pdb.Pdb" with no arguments.\n'
+             '\n'
              '   New in version 3.1: The *skip* argument.\n'
              '\n'
              '   New in version 3.2: The *nosigint* argument.  Previously, a=
 '
@@ -4289,7 +4291,14 @@
          'section The standard type hierarchy.  (To summarize, the key type\=
n'
          'should be *hashable*, which excludes all mutable objects.)  Clashe=
s\n'
          'between duplicate keys are not detected; the last datum (textually=
\n'
-         'rightmost in the display) stored for a given key value prevails.\n=
',
+         'rightmost in the display) stored for a given key value prevails.\n'
+         '\n'
+         'Changed in version 3.8: Prior to Python 3.8, in dict '
+         'comprehensions,\n'
+         'the evaluation order of key and value was not well-defined.  In\n'
+         'CPython, the value was evaluated before the key.  Starting with '
+         '3.8,\n'
+         'the key is evaluated before the value, as proposed by **PEP 572**.=
\n',
  'dynamic-features': 'Interaction with dynamic features\n'
                      '*********************************\n'
                      '\n'
diff --git a/Misc/NEWS.d/3.8.0b2.rst b/Misc/NEWS.d/3.8.0b2.rst
new file mode 100644
index 000000000000..f462e753956b
--- /dev/null
+++ b/Misc/NEWS.d/3.8.0b2.rst
@@ -0,0 +1,933 @@
+.. bpo: 37363
+.. date: 2019-07-01-10-31-14
+.. nonce: fSjatj
+.. release date: 2019-07-04
+.. section: Security
+
+Adds audit events for the range of supported run commands (see
+:ref:`using-on-general`).
+
+..
+
+.. bpo: 37463
+.. date: 2019-07-01-08-46-14
+.. nonce: 1CHwjE
+.. section: Security
+
+ssl.match_hostname() no longer accepts IPv4 addresses with additional text
+after the address and only quad-dotted notation without trailing
+whitespaces. Some inet_aton() implementations ignore whitespace and all data
+after whitespace, e.g. '127.0.0.1 whatever'.
+
+..
+
+.. bpo: 37363
+.. date: 2019-06-21-15-58-59
+.. nonce: diouyl
+.. section: Security
+
+Adds audit events for :mod:`ensurepip`, :mod:`ftplib`, :mod:`glob`,
+:mod:`imaplib`, :mod:`nntplib`, :mod:`pdb`, :mod:`poplib`, :mod:`shutil`,
+:mod:`smtplib`, :mod:`sqlite3`, :mod:`subprocess`, :mod:`telnetlib`,
+:mod:`tempfile` and :mod:`webbrowser`, as well as :func:`os.listdir`,
+:func:`os.scandir` and :func:`breakpoint`.
+
+..
+
+.. bpo: 37364
+.. date: 2019-06-21-14-42-53
+.. nonce: IIRc2s
+.. section: Security
+
+:func:`io.open_code` is now used when reading :file:`.pth` files.
+
+..
+
+.. bpo: 34631
+.. date: 2019-06-17-09-34-25
+.. nonce: DBfM4j
+.. section: Security
+
+Updated OpenSSL to 1.1.1c in Windows installer
+
+..
+
+.. bpo: 37467
+.. date: 2019-07-01-12-22-44
+.. nonce: u-XyEu
+.. section: Core and Builtins
+
+Fix :func:`sys.excepthook` and :c:func:`PyErr_Display` if a filename is a
+bytes string. For example, for a SyntaxError exception where the filename
+attribute is a bytes string.
+
+..
+
+.. bpo: 37417
+.. date: 2019-06-26-18-41-00
+.. nonce: VsZeHL
+.. section: Core and Builtins
+
+:meth:`bytearray.extend` now correctly handles errors that arise during
+iteration. Patch by Brandt Bucher.
+
+..
+
+.. bpo: 24214
+.. date: 2019-06-22-12-45-20
+.. nonce: hIiHeD
+.. section: Core and Builtins
+
+Improved support of the surrogatepass error handler in the UTF-8 and UTF-16
+incremental decoders.
+
+..
+
+.. bpo: 35224
+.. date: 2019-06-17-06-03-55
+.. nonce: FHWPGv
+.. section: Core and Builtins
+
+Reverse evaluation order of key: value in dict comprehensions as proposed in
+PEP 572. I.e. in ``{k: v for ...}``, ``k`` will be evaluated before ``v``.
+
+..
+
+.. bpo: 37316
+.. date: 2019-06-17-03-53-16
+.. nonce: LytDX_
+.. section: Core and Builtins
+
+Fix the :c:func:`PySys_Audit` call in :class:`mmap.mmap`.
+
+..
+
+.. bpo: 37269
+.. date: 2019-06-14-06-32-33
+.. nonce: SjVVAe
+.. section: Core and Builtins
+
+Fix a bug in the peephole optimizer that was not treating correctly constant
+conditions with binary operators. Patch by Pablo Galindo.
+
+..
+
+.. bpo: 37213
+.. date: 2019-06-11-11-15-19
+.. nonce: UPii5K
+.. section: Core and Builtins
+
+Handle correctly negative line offsets in the peephole optimizer. Patch by
+Pablo Galindo.
+
+..
+
+.. bpo: 37219
+.. date: 2019-06-10-23-18-31
+.. nonce: jPSufq
+.. section: Core and Builtins
+
+Remove errorneous optimization for empty set differences.
+
+..
+
+.. bpo: 36922
+.. date: 2019-06-06-13-59-52
+.. nonce: EMZ3TF
+.. section: Core and Builtins
+
+Slot functions optimize any callable with ``Py_TPFLAGS_METHOD_DESCRIPTOR``
+instead of only instances of ``function``.
+
+..
+
+.. bpo: 36974
+.. date: 2019-06-06-11-00-55
+.. nonce: wdzzym
+.. section: Core and Builtins
+
+The slot ``tp_vectorcall_offset`` is inherited unconditionally to support
+``super().__call__()`` when the base class uses vectorcall.
+
+..
+
+.. bpo: 37160
+.. date: 2019-06-05-09-24-17
+.. nonce: O3IAY3
+.. section: Core and Builtins
+
+:func:`threading.get_native_id` now also supports NetBSD.
+
+..
+
+.. bpo: 37077
+.. date: 2019-05-28-11-47-44
+.. nonce: S1h0Fc
+.. section: Core and Builtins
+
+Add :func:`threading.get_native_id` support for AIX. Patch by M. Felt
+
+..
+
+.. bpo: 37440
+.. date: 2019-06-28-16-40-17
+.. nonce: t3wX-N
+.. section: Library
+
+http.client now enables TLS 1.3 post-handshake authentication for default
+context or if a cert_file is passed to HTTPSConnection.
+
+..
+
+.. bpo: 37437
+.. date: 2019-06-27-20-33-50
+.. nonce: du39_A
+.. section: Library
+
+Update vendorized expat version to 2.2.7.
+
+..
+
+.. bpo: 37428
+.. date: 2019-06-27-13-27-02
+.. nonce: _wcwUd
+.. section: Library
+
+SSLContext.post_handshake_auth =3D True no longer sets
+SSL_VERIFY_POST_HANDSHAKE verify flag for client connections. Although the
+option is documented as ignored for clients, OpenSSL implicitly enables cert
+chain validation when the flag is set.
+
+..
+
+.. bpo: 37420
+.. date: 2019-06-26-22-25-05
+.. nonce: CxFJ09
+.. section: Library
+
+:func:`os.sched_setaffinity` now correctly handles errors that arise during
+iteration over its ``mask`` argument. Patch by Brandt Bucher.
+
+..
+
+.. bpo: 37412
+.. date: 2019-06-26-16-28-59
+.. nonce: lx0VjC
+.. section: Library
+
+The :func:`os.getcwdb` function now uses the UTF-8 encoding on Windows,
+rather than the ANSI code page: see :pep:`529` for the rationale. The
+function is no longer deprecated on Windows.
+
+..
+
+.. bpo: 29412
+.. date: 2019-06-25-19-27-25
+.. nonce: n4Zqdh
+.. section: Library
+
+Fix IndexError in parsing a header value ending unexpectedly. Patch by
+Abhilash Raj.
+
+..
+
+.. bpo: 36546
+.. date: 2019-06-25-05-07-48
+.. nonce: RUcxaK
+.. section: Library
+
+The *dist* argument for statistics.quantiles() is now positional only. The
+current name doesn't reflect that the argument can be either a dataset or a
+distribution.  Marking the parameter as positional avoids confusion and
+makes it possible to change the name later.
+
+..
+
+.. bpo: 37394
+.. date: 2019-06-25-02-10-00
+.. nonce: srZ1zx
+.. section: Library
+
+Fix a bug that was causing the :mod:`queue` module to fail if the
+accelerator module was not available. Patch by Pablo Galindo.
+
+..
+
+.. bpo: 33972
+.. date: 2019-06-15-14-39-50
+.. nonce: XxnNPw
+.. section: Library
+
+Email with single part but content-type set to ``multipart/*`` doesn't raise
+AttributeError anymore.
+
+..
+
+.. bpo: 37280
+.. date: 2019-06-14-13-30-47
+.. nonce: Fxur0F
+.. section: Library
+
+Use threadpool for reading from file for sendfile fallback mode.
+
+..
+
+.. bpo: 37279
+.. date: 2019-06-14-13-25-56
+.. nonce: OHlW6l
+.. section: Library
+
+Fix asyncio sendfile support when sendfile sends extra data in fallback
+mode.
+
+..
+
+.. bpo: 19865
+.. date: 2019-06-14-08-30-16
+.. nonce: FRGH4I
+.. section: Library
+
+:func:`ctypes.create_unicode_buffer()` now also supports non-BMP characters
+on platforms with 16-bit :c:type:`wchar_t` (for example, Windows and AIX).
+
+..
+
+.. bpo: 37210
+.. date: 2019-06-12-16-10-50
+.. nonce: r4yMg6
+.. section: Library
+
+Allow pure Python implementation of :mod:`pickle` to work even when the C
+:mod:`_pickle` module is unavailable.
+
+..
+
+.. bpo: 35922
+.. date: 2019-06-11-19-34-29
+.. nonce: rxpzWr
+.. section: Library
+
+Fix :meth:`RobotFileParser.crawl_delay` and
+:meth:`RobotFileParser.request_rate` to return ``None`` rather than raise
+:exc:`AttributeError` when no relevant rule is defined in the robots.txt
+file.  Patch by R=C3=A9mi Lapeyre.
+
+..
+
+.. bpo: 35766
+.. date: 2019-06-11-16-41-40
+.. nonce: v1Kj-T
+.. section: Library
+
+Change the format of feature_version to be a (major, minor) tuple.
+
+..
+
+.. bpo: 36607
+.. date: 2019-06-11-13-52-04
+.. nonce: 5_mJkQ
+.. section: Library
+
+Eliminate :exc:`RuntimeError` raised by :func:`asyncio.all_tasks()` if
+internal tasks weak set is changed by another thread during iteration.
+
+..
+
+.. bpo: 18748
+.. date: 2019-06-11-01-54-19
+.. nonce: ADqCkq
+.. section: Library
+
+:class:`_pyio.IOBase` destructor now does nothing if getting the ``closed``
+attribute fails to better mimick :class:`_io.IOBase` finalizer.
+
+..
+
+.. bpo: 36402
+.. date: 2019-06-11-00-35-02
+.. nonce: b0IJVp
+.. section: Library
+
+Fix a race condition at Python shutdown when waiting for threads. Wait until
+the Python thread state of all non-daemon threads get deleted (join all
+non-daemon threads), rather than just wait until non-daemon Python threads
+complete.
+
+..
+
+.. bpo: 34886
+.. date: 2019-06-08-16-03-19
+.. nonce: Ov-pc9
+.. section: Library
+
+Fix an unintended ValueError from :func:`subprocess.run` when checking for
+conflicting `input` and `stdin` or `capture_output` and `stdout` or `stderr`
+args when they were explicitly provided but with `None` values within a
+passed in `**kwargs` dict rather than as passed directly by name. Patch
+contributed by R=C3=A9mi Lapeyre.
+
+..
+
+.. bpo: 37173
+.. date: 2019-06-08-11-33-48
+.. nonce: 0e_8gS
+.. section: Library
+
+The exception message for ``inspect.getfile()`` now correctly reports the
+passed class rather than the builtins module.
+
+..
+
+.. bpo: 37178
+.. date: 2019-06-07-17-16-09
+.. nonce: Day_oB
+.. section: Library
+
+Give math.perm() a one argument form that means the same as
+math.factorial().
+
+..
+
+.. bpo: 37178
+.. date: 2019-06-07-17-11-34
+.. nonce: b1StSv
+.. section: Library
+
+For math.perm(n, k), let k default to n, giving the same result as
+factorial.
+
+..
+
+.. bpo: 37163
+.. date: 2019-06-07-08-18-05
+.. nonce: 36JkUh
+.. section: Library
+
+Deprecated passing ``obj`` argument of :func:`dataclasses.replace` as
+keyword argument.
+
+..
+
+.. bpo: 37165
+.. date: 2019-06-05-11-48-19
+.. nonce: V_rwfE
+.. section: Library
+
+Converted _collections._count_elements to use the Argument Clinic.
+
+..
+
+.. bpo: 34767
+.. date: 2019-06-04-23-44-52
+.. nonce: BpDShN
+.. section: Library
+
+Do not always create a :class:`collections.deque` in :class:`asyncio.Lock`.
+
+..
+
+.. bpo: 37158
+.. date: 2019-06-04-22-25-38
+.. nonce: JKm15S
+.. section: Library
+
+Speed-up statistics.fmean() by switching from a function to a generator.
+
+..
+
+.. bpo: 37150
+.. date: 2019-06-04-14-44-41
+.. nonce: TTzHxj
+.. section: Library
+
+`argparse._ActionsContainer.add_argument` now throws error, if someone
+accidentally pass FileType class object instead of instance of FileType as
+`type` argument
+
+..
+
+.. bpo: 35621
+.. date: 2019-05-28-19-03-46
+.. nonce: Abc1lf
+.. section: Library
+
+Support running asyncio subprocesses when execution event loop in a thread
+on UNIX.
+
+..
+
+.. bpo: 36520
+.. date: 2019-05-28-02-37-00
+.. nonce: W4tday
+.. section: Library
+
+Lengthy email headers with UTF-8 characters are now properly encoded when
+they are folded. Patch by Jeffrey Kintscher.
+
+..
+
+.. bpo: 30835
+.. date: 2019-05-27-15-29-46
+.. nonce: 3FoaWH
+.. section: Library
+
+Fixed a bug in email parsing where a message with invalid bytes in
+content-transfer-encoding of a multipart message can cause an
+AttributeError. Patch by Andrew Donnellan.
+
+..
+
+.. bpo: 35805
+.. date: 2019-05-17-15-11-08
+.. nonce: E4YwYz
+.. section: Library
+
+Add parser for Message-ID header and add it to default HeaderRegistry. This
+should prevent folding of Message-ID using RFC 2048 encoded words.
+
+..
+
+.. bpo: 35070
+.. date: 2019-05-09-18-50-55
+.. nonce: 4vaqNL
+.. section: Library
+
+posix.getgrouplist() now works correctly when the user belongs to
+NGROUPS_MAX supplemental groups. Patch by Jeffrey Kintscher.
+
+..
+
+.. bpo: 32627
+.. date: 2019-02-03-19-13-08
+.. nonce: b68f64
+.. section: Library
+
+Fix compile error when ``_uuid`` headers conflicting included.
+
+..
+
+.. bpo: 11122
+.. date: 2018-11-12-19-08-50
+.. nonce: Gj7BQn
+.. section: Library
+
+Distutils won't check for rpmbuild in specified paths only.
+
+..
+
+.. bpo: 4963
+.. date: 2017-08-15-11-24-41
+.. nonce: LRYres
+.. section: Library
+
+Fixed non-deterministic behavior related to mimetypes extension mapping and
+module reinitialization.
+
+..
+
+.. bpo: 34903
+.. date: 2019-06-17-09-36-46
+.. nonce: r_wGRc
+.. section: Documentation
+
+Documented that in :meth:`datetime.datetime.strptime()`, the leading zero in
+some two-digit formats is optional. Patch by Mike Gleen.
+
+..
+
+.. bpo: 37421
+.. date: 2019-07-03-00-05-28
+.. nonce: ORGRSG
+.. section: Tests
+
+test_distutils.test_build_ext() is now able to remove the temporary
+directory on Windows: don't import the newly built C extension ("xx") in the
+current process, but test it in a separated process.
+
+..
+
+.. bpo: 37421
+.. date: 2019-07-02-23-29-06
+.. nonce: WEfc5A
+.. section: Tests
+
+test_concurrent_futures now cleans up multiprocessing to remove immediately
+temporary directories created by multiprocessing.util.get_temp_dir().
+
+..
+
+.. bpo: 37421
+.. date: 2019-07-02-23-20-35
+.. nonce: HCkKWz
+.. section: Tests
+
+test_winconsoleio doesn't leak a temporary file anymore: use
+tempfile.TemporaryFile() to remove it when the test completes.
+
+..
+
+.. bpo: 37421
+.. date: 2019-07-01-19-57-26
+.. nonce: NFH1f0
+.. section: Tests
+
+multiprocessing tests now explicitly call ``_run_finalizers()`` to
+immediately remove temporary directories created by tests.
+
+..
+
+.. bpo: 37199
+.. date: 2019-06-29-23-56-28
+.. nonce: FHDsLf
+.. section: Tests
+
+Fix test failures when IPv6 is unavailable or disabled.
+
+..
+
+.. bpo: 37335
+.. date: 2019-06-28-16-37-52
+.. nonce: o5S2hY
+.. section: Tests
+
+Remove no longer necessary code from c locale coercion tests
+
+..
+
+.. bpo: 37421
+.. date: 2019-06-27-00-37-59
+.. nonce: rVJb3x
+.. section: Tests
+
+Fix test_shutil to no longer leak temporary files.
+
+..
+
+.. bpo: 37411
+.. date: 2019-06-26-15-28-45
+.. nonce: 5lGNhM
+.. section: Tests
+
+Fix test_wsgiref.testEnviron() to no longer depend on the environment
+variables (don't fail if "X" variable is set).
+
+..
+
+.. bpo: 37400
+.. date: 2019-06-25-16-02-43
+.. nonce: cx_EWv
+.. section: Tests
+
+Fix test_os.test_chown(): use os.getgroups() rather than grp.getgrall() to
+get groups. Rename also the test to test_chown_gid().
+
+..
+
+.. bpo: 37359
+.. date: 2019-06-24-10-47-07
+.. nonce: CkdtyO
+.. section: Tests
+
+Add --cleanup option to python3 -m test to remove ``test_python_*``
+directories of previous failed jobs. Add "make cleantest" to run ``python3
+-m test --cleanup``.
+
+..
+
+.. bpo: 37362
+.. date: 2019-06-21-15-47-33
+.. nonce: D3xppx
+.. section: Tests
+
+test_gdb no longer fails if it gets an "unexpected" message on stderr: it
+now ignores stderr. The purpose of test_gdb is to test that python-gdb.py
+commands work as expected, not to test gdb.
+
+..
+
+.. bpo: 35998
+.. date: 2019-06-14-17-05-49
+.. nonce: yX82oD
+.. section: Tests
+
+Avoid TimeoutError in test_asyncio: test_start_tls_server_1()
+
+..
+
+.. bpo: 37278
+.. date: 2019-06-14-12-21-47
+.. nonce: z0HUOr
+.. section: Tests
+
+Fix test_asyncio ProactorLoopCtrlC: join the thread to prevent leaking a
+running thread and leaking a reference.
+
+..
+
+.. bpo: 37261
+.. date: 2019-06-13-12-19-56
+.. nonce: NuKFVo
+.. section: Tests
+
+Fix :func:`test.support.catch_unraisable_exception`: its __exit__() method
+now ignores unraisable exception raised when clearing its ``unraisable``
+attribute.
+
+..
+
+.. bpo: 37169
+.. date: 2019-06-07-12-23-15
+.. nonce: yfXTFg
+.. section: Tests
+
+Rewrite ``_PyObject_IsFreed()`` unit tests.
+
+..
+
+.. bpo: 37153
+.. date: 2019-06-04-18-30-39
+.. nonce: 711INB
+.. section: Tests
+
+``test_venv.test_mutiprocessing()`` now explicitly calls
+``pool.terminate()`` to wait until the pool completes.
+
+..
+
+.. bpo: 28009
+.. date: 2019-04-11-07-59-43
+.. nonce: s85urF
+.. section: Tests
+
+Modify the test_uuid logic to test when a program is available AND can be
+used to obtain a MACADDR as basis for an UUID. Patch by M. Felt
+
+..
+
+.. bpo: 37189
+.. date: 2019-06-17-09-40-59
+.. nonce: j5ebdT
+.. section: Build
+
+Many ``PyRun_XXX()`` functions like :c:func:`PyRun_String` were no longer
+exported in ``libpython38.dll`` by mistake. Export them again to fix the ABI
+compatibiliy.
+
+..
+
+.. bpo: 10945
+.. date: 2019-07-01-12-38-48
+.. nonce: s0YBHG
+.. section: Windows
+
+Officially drop support for creating bdist_wininst installers on non-Windows
+systems.
+
+..
+
+.. bpo: 37369
+.. date: 2019-06-28-09-44-08
+.. nonce: 1iVpxq
+.. section: Windows
+
+Fixes path for :data:`sys.executable` when running from the Microsoft Store.
+
+..
+
+.. bpo: 37351
+.. date: 2019-06-20-12-50-32
+.. nonce: asTnVW
+.. section: Windows
+
+Removes libpython38.a from standard Windows distribution.
+
+..
+
+.. bpo: 35360
+.. date: 2019-06-18-09-05-08
+.. nonce: tdqSmo
+.. section: Windows
+
+Update Windows builds to use SQLite 3.28.0.
+
+..
+
+.. bpo: 37267
+.. date: 2019-06-13-04-15-51
+.. nonce: Ygo5ef
+.. section: Windows
+
+On Windows, :func:`os.dup` no longer creates an inheritable fd when handling
+a character file.
+
+..
+
+.. bpo: 36779
+.. date: 2019-06-11-15-41-34
+.. nonce: 0TMw6f
+.. section: Windows
+
+Ensure ``time.tzname`` is correct on Windows when the active code page is
+set to CP_UTF7 or CP_UTF8.
+
+..
+
+.. bpo: 34602
+.. date: 2019-07-02-01-06-47
+.. nonce: 10d4wl
+.. section: macOS
+
+Avoid test suite failures on macOS by no longer calling resource.setrlimit
+to increase the process stack size limit at runtime.  The runtime change is
+no longer needed since the interpreter is being built with a larger default
+stack size.
+
+..
+
+.. bpo: 35360
+.. date: 2019-06-18-08-58-30
+.. nonce: -CWbfy
+.. section: macOS
+
+Update macOS installer to use SQLite 3.28.0.
+
+..
+
+.. bpo: 34631
+.. date: 2019-06-18-00-30-40
+.. nonce: vSifcv
+.. section: macOS
+
+Updated OpenSSL to 1.1.1c in macOS installer.
+
+..
+
+.. bpo: 37325
+.. date: 2019-06-18-16-40-05
+.. nonce: GssOf1
+.. section: IDLE
+
+Fix tab focus traversal order for help source and custom run dialogs.
+
+..
+
+.. bpo: 37321
+.. date: 2019-06-17-16-35-30
+.. nonce: zVTTGS
+.. section: IDLE
+
+Both subprocess connection error messages now refer to the 'Startup failure'
+section of the IDLE doc.
+
+..
+
+.. bpo: 37177
+.. date: 2019-06-07-00-17-41
+.. nonce: voU6pQ
+.. section: IDLE
+
+Properly 'attach' search dialogs to their main window so that they behave
+like other dialogs and do not get hidden behind their main window.
+
+..
+
+.. bpo: 37039
+.. date: 2019-06-04-23-27-33
+.. nonce: FN_fBf
+.. section: IDLE
+
+Adjust "Zoom Height" to individual screens by momemtarily maximizing the
+window on first use with a particular screen.  Changing screen settings may
+invalidate the saved height.  While a window is maximized, "Zoom Height" has
+no effect.
+
+..
+
+.. bpo: 35763
+.. date: 2019-06-04-20-36-24
+.. nonce: 7XdoWz
+.. section: IDLE
+
+Make calltip reminder about '/' meaning positional-only less obtrusive by
+only adding it when there is room on the first line.
+
+..
+
+.. bpo: 5680
+.. date: 2019-06-03-00-39-29
+.. nonce: VCQfOO
+.. section: IDLE
+
+Add 'Run... Customized' to the Run menu to run a module with customized
+settings.  Any 'command line arguments' entered are added to sys.argv. One
+can suppress the normal Shell main module restart.
+
+..
+
+.. bpo: 36763
+.. date: 2019-06-28-15-49-16
+.. nonce: zrmgki
+.. section: C API
+
+Add :func:`PyConfig_SetWideStringList` function.
+
+..
+
+.. bpo: 28805
+.. date: 2019-06-14-14-03-51
+.. nonce: qZC0N_
+.. section: C API
+
+The :const:`METH_FASTCALL` calling convention has been documented.
+
+..
+
+.. bpo: 37221
+.. date: 2019-06-12-11-45-36
+.. nonce: RhP1E7
+.. section: C API
+
+``tp_print`` is put back at the end of the ``PyTypeObject`` structure to
+restore support for old code (in particular generated by Cython) setting
+``tp_print =3D 0``. Note that ``tp_print`` will be removed entirely in Python
+3.9.
+
+..
+
+.. bpo: 37221
+.. date: 2019-06-11-02-50-38
+.. nonce: 4tClQT
+.. section: C API
+
+The new function :c:func:`PyCode_NewWithPosOnlyArgs` allows to create code
+objects like :c:func:`PyCode_New`, but with an extra *posonlyargcount*
+parameter for indicating the number of positonal-only arguments.
+
+..
+
+.. bpo: 37215
+.. date: 2019-06-10-15-32-34
+.. nonce: yzoNyU
+.. section: C API
+
+Fix dtrace issue introduce by bpo-36842
+
+..
+
+.. bpo: 37191
+.. date: 2019-06-07-10-47-37
+.. nonce: iGL1_K
+.. section: C API
+
+Python.h does not need compiler support for intermingled declarations (GCC's
+``-Wdeclaration-after-statement``), which were added in 3.8.0 Beta 1. Note
+that in Python 3.9, intermingled declarations will be needed again.
+
+..
+
+.. bpo: 37170
+.. date: 2019-06-06-08-47-04
+.. nonce: hO_fpM
+.. section: C API
+
+Fix the cast on error in :c:func:`PyLong_AsUnsignedLongLongMask()`.
diff --git a/Misc/NEWS.d/next/Build/2019-06-17-09-40-59.bpo-37189.j5ebdT.rst =
b/Misc/NEWS.d/next/Build/2019-06-17-09-40-59.bpo-37189.j5ebdT.rst
deleted file mode 100644
index f11f2746e5a0..000000000000
--- a/Misc/NEWS.d/next/Build/2019-06-17-09-40-59.bpo-37189.j5ebdT.rst
+++ /dev/null
@@ -1,3 +0,0 @@
-Many ``PyRun_XXX()`` functions like :c:func:`PyRun_String` were no longer
-exported in ``libpython38.dll`` by mistake. Export them again to fix the ABI
-compatibiliy.
diff --git a/Misc/NEWS.d/next/C API/2019-06-06-08-47-04.bpo-37170.hO_fpM.rst =
b/Misc/NEWS.d/next/C API/2019-06-06-08-47-04.bpo-37170.hO_fpM.rst
deleted file mode 100644
index 7a35c9583d69..000000000000
--- a/Misc/NEWS.d/next/C API/2019-06-06-08-47-04.bpo-37170.hO_fpM.rst=09
+++ /dev/null
@@ -1 +0,0 @@
-Fix the cast on error in :c:func:`PyLong_AsUnsignedLongLongMask()`.
diff --git a/Misc/NEWS.d/next/C API/2019-06-07-10-47-37.bpo-37191.iGL1_K.rst =
b/Misc/NEWS.d/next/C API/2019-06-07-10-47-37.bpo-37191.iGL1_K.rst
deleted file mode 100644
index 7cb296d33bb5..000000000000
--- a/Misc/NEWS.d/next/C API/2019-06-07-10-47-37.bpo-37191.iGL1_K.rst=09
+++ /dev/null
@@ -1,3 +0,0 @@
-Python.h does not need compiler support for intermingled declarations (GCC's
-``-Wdeclaration-after-statement``), which were added in 3.8.0 Beta 1. Note
-that in Python 3.9, intermingled declarations will be needed again.
diff --git a/Misc/NEWS.d/next/C API/2019-06-10-15-32-34.bpo-37215.yzoNyU.rst =
b/Misc/NEWS.d/next/C API/2019-06-10-15-32-34.bpo-37215.yzoNyU.rst
deleted file mode 100644
index 58038b21729b..000000000000
--- a/Misc/NEWS.d/next/C API/2019-06-10-15-32-34.bpo-37215.yzoNyU.rst=09
+++ /dev/null
@@ -1 +0,0 @@
-Fix dtrace issue introduce by bpo-36842
diff --git a/Misc/NEWS.d/next/C API/2019-06-11-02-50-38.bpo-37221.4tClQT.rst =
b/Misc/NEWS.d/next/C API/2019-06-11-02-50-38.bpo-37221.4tClQT.rst
deleted file mode 100644
index 0ea8b9b86788..000000000000
--- a/Misc/NEWS.d/next/C API/2019-06-11-02-50-38.bpo-37221.4tClQT.rst=09
+++ /dev/null
@@ -1,3 +0,0 @@
-The new function :c:func:`PyCode_NewWithPosOnlyArgs` allows to create
-code objects like :c:func:`PyCode_New`, but with an extra *posonlyargcount*
-parameter for indicating the number of positonal-only arguments.
diff --git a/Misc/NEWS.d/next/C API/2019-06-12-11-45-36.bpo-37221.RhP1E7.rst =
b/Misc/NEWS.d/next/C API/2019-06-12-11-45-36.bpo-37221.RhP1E7.rst
deleted file mode 100644
index 96b61dea0d9c..000000000000
--- a/Misc/NEWS.d/next/C API/2019-06-12-11-45-36.bpo-37221.RhP1E7.rst=09
+++ /dev/null
@@ -1,4 +0,0 @@
-``tp_print`` is put back at the end of the ``PyTypeObject`` structure
-to restore support for old code (in particular generated by Cython)
-setting ``tp_print =3D 0``.
-Note that ``tp_print`` will be removed entirely in Python 3.9.
diff --git a/Misc/NEWS.d/next/C API/2019-06-14-14-03-51.bpo-28805.qZC0N_.rst =
b/Misc/NEWS.d/next/C API/2019-06-14-14-03-51.bpo-28805.qZC0N_.rst
deleted file mode 100644
index 6d6c4ad4af60..000000000000
--- a/Misc/NEWS.d/next/C API/2019-06-14-14-03-51.bpo-28805.qZC0N_.rst=09
+++ /dev/null
@@ -1 +0,0 @@
-The :const:`METH_FASTCALL` calling convention has been documented.
diff --git a/Misc/NEWS.d/next/C API/2019-06-28-15-49-16.bpo-36763.zrmgki.rst =
b/Misc/NEWS.d/next/C API/2019-06-28-15-49-16.bpo-36763.zrmgki.rst
deleted file mode 100644
index 095d58116385..000000000000
--- a/Misc/NEWS.d/next/C API/2019-06-28-15-49-16.bpo-36763.zrmgki.rst=09
+++ /dev/null
@@ -1 +0,0 @@
-Add :func:`PyConfig_SetWideStringList` function.
diff --git a/Misc/NEWS.d/next/Core and Builtins/2019-05-28-11-47-44.bpo-37077=
.S1h0Fc.rst b/Misc/NEWS.d/next/Core and Builtins/2019-05-28-11-47-44.bpo-3707=
7.S1h0Fc.rst
deleted file mode 100644
index 832dfc94ac49..000000000000
--- a/Misc/NEWS.d/next/Core and Builtins/2019-05-28-11-47-44.bpo-37077.S1h0Fc=
.rst=09
+++ /dev/null
@@ -1,2 +0,0 @@
-Add :func:`threading.get_native_id` support for AIX.
-Patch by M. Felt
diff --git a/Misc/NEWS.d/next/Core and Builtins/2019-06-05-09-24-17.bpo-37160=
.O3IAY3.rst b/Misc/NEWS.d/next/Core and Builtins/2019-06-05-09-24-17.bpo-3716=
0.O3IAY3.rst
deleted file mode 100644
index c2fc6804a126..000000000000
--- a/Misc/NEWS.d/next/Core and Builtins/2019-06-05-09-24-17.bpo-37160.O3IAY3=
.rst=09
+++ /dev/null
@@ -1 +0,0 @@
-:func:`threading.get_native_id` now also supports NetBSD.
diff --git a/Misc/NEWS.d/next/Core and Builtins/2019-06-06-11-00-55.bpo-36974=
.wdzzym.rst b/Misc/NEWS.d/next/Core and Builtins/2019-06-06-11-00-55.bpo-3697=
4.wdzzym.rst
deleted file mode 100644
index 035cdd3d6a9e..000000000000
--- a/Misc/NEWS.d/next/Core and Builtins/2019-06-06-11-00-55.bpo-36974.wdzzym=
.rst=09
+++ /dev/null
@@ -1,2 +0,0 @@
-The slot ``tp_vectorcall_offset`` is inherited unconditionally to support
-``super().__call__()`` when the base class uses vectorcall.
diff --git a/Misc/NEWS.d/next/Core and Builtins/2019-06-06-13-59-52.bpo-36922=
.EMZ3TF.rst b/Misc/NEWS.d/next/Core and Builtins/2019-06-06-13-59-52.bpo-3692=
2.EMZ3TF.rst
deleted file mode 100644
index c2a2ad4e8e73..000000000000
--- a/Misc/NEWS.d/next/Core and Builtins/2019-06-06-13-59-52.bpo-36922.EMZ3TF=
.rst=09
+++ /dev/null
@@ -1 +0,0 @@
-Slot functions optimize any callable with ``Py_TPFLAGS_METHOD_DESCRIPTOR`` i=
nstead of only instances of ``function``.
\ No newline at end of file
diff --git a/Misc/NEWS.d/next/Core and Builtins/2019-06-10-23-18-31.bpo-37219=
.jPSufq.rst b/Misc/NEWS.d/next/Core and Builtins/2019-06-10-23-18-31.bpo-3721=
9.jPSufq.rst
deleted file mode 100644
index ef8f52dce678..000000000000
--- a/Misc/NEWS.d/next/Core and Builtins/2019-06-10-23-18-31.bpo-37219.jPSufq=
.rst=09
+++ /dev/null
@@ -1 +0,0 @@
-Remove errorneous optimization for empty set differences.
diff --git a/Misc/NEWS.d/next/Core and Builtins/2019-06-11-11-15-19.bpo-37213=
.UPii5K.rst b/Misc/NEWS.d/next/Core and Builtins/2019-06-11-11-15-19.bpo-3721=
3.UPii5K.rst
deleted file mode 100644
index b949883da9c2..000000000000
--- a/Misc/NEWS.d/next/Core and Builtins/2019-06-11-11-15-19.bpo-37213.UPii5K=
.rst=09
+++ /dev/null
@@ -1,2 +0,0 @@
-Handle correctly negative line offsets in the peephole optimizer. Patch by
-Pablo Galindo.
diff --git a/Misc/NEWS.d/next/Core and Builtins/2019-06-14-06-32-33.bpo-37269=
.SjVVAe.rst b/Misc/NEWS.d/next/Core and Builtins/2019-06-14-06-32-33.bpo-3726=
9.SjVVAe.rst
deleted file mode 100644
index b9b79066774f..000000000000
--- a/Misc/NEWS.d/next/Core and Builtins/2019-06-14-06-32-33.bpo-37269.SjVVAe=
.rst=09
+++ /dev/null
@@ -1,2 +0,0 @@
-Fix a bug in the peephole optimizer that was not treating correctly constant
-conditions with binary operators. Patch by Pablo Galindo.
diff --git a/Misc/NEWS.d/next/Core and Builtins/2019-06-17-03-53-16.bpo-37316=
.LytDX_.rst b/Misc/NEWS.d/next/Core and Builtins/2019-06-17-03-53-16.bpo-3731=
6.LytDX_.rst
deleted file mode 100644
index 40436d467c85..000000000000
--- a/Misc/NEWS.d/next/Core and Builtins/2019-06-17-03-53-16.bpo-37316.LytDX_=
.rst=09
+++ /dev/null
@@ -1 +0,0 @@
-Fix the :c:func:`PySys_Audit` call in :class:`mmap.mmap`.
diff --git a/Misc/NEWS.d/next/Core and Builtins/2019-06-17-06-03-55.bpo-35224=
.FHWPGv.rst b/Misc/NEWS.d/next/Core and Builtins/2019-06-17-06-03-55.bpo-3522=
4.FHWPGv.rst
deleted file mode 100644
index 5a1a79be098a..000000000000
--- a/Misc/NEWS.d/next/Core and Builtins/2019-06-17-06-03-55.bpo-35224.FHWPGv=
.rst=09
+++ /dev/null
@@ -1,2 +0,0 @@
-Reverse evaluation order of key: value in dict comprehensions as proposed in=
 PEP 572.
-I.e. in ``{k: v for ...}``, ``k`` will be evaluated before ``v``.
diff --git a/Misc/NEWS.d/next/Core and Builtins/2019-06-22-12-45-20.bpo-24214=
.hIiHeD.rst b/Misc/NEWS.d/next/Core and Builtins/2019-06-22-12-45-20.bpo-2421=
4.hIiHeD.rst
deleted file mode 100644
index 2d70ce05deae..000000000000
--- a/Misc/NEWS.d/next/Core and Builtins/2019-06-22-12-45-20.bpo-24214.hIiHeD=
.rst=09
+++ /dev/null
@@ -1,2 +0,0 @@
-Improved support of the surrogatepass error handler in the UTF-8 and UTF-16
-incremental decoders.
diff --git a/Misc/NEWS.d/next/Core and Builtins/2019-06-26-18-41-00.bpo-37417=
.VsZeHL.rst b/Misc/NEWS.d/next/Core and Builtins/2019-06-26-18-41-00.bpo-3741=
7.VsZeHL.rst
deleted file mode 100644
index f004631e2361..000000000000
--- a/Misc/NEWS.d/next/Core and Builtins/2019-06-26-18-41-00.bpo-37417.VsZeHL=
.rst=09
+++ /dev/null
@@ -1,2 +0,0 @@
-:meth:`bytearray.extend` now correctly handles errors that arise during iter=
ation.
-Patch by Brandt Bucher.
\ No newline at end of file
diff --git a/Misc/NEWS.d/next/Core and Builtins/2019-07-01-12-22-44.bpo-37467=
.u-XyEu.rst b/Misc/NEWS.d/next/Core and Builtins/2019-07-01-12-22-44.bpo-3746=
7.u-XyEu.rst
deleted file mode 100644
index 5e809646b4b8..000000000000
--- a/Misc/NEWS.d/next/Core and Builtins/2019-07-01-12-22-44.bpo-37467.u-XyEu=
.rst=09
+++ /dev/null
@@ -1,3 +0,0 @@
-Fix :func:`sys.excepthook` and :c:func:`PyErr_Display` if a filename is a
-bytes string. For example, for a SyntaxError exception where the filename
-attribute is a bytes string.
diff --git a/Misc/NEWS.d/next/Documentation/2019-06-17-09-36-46.bpo-34903.r_w=
GRc.rst b/Misc/NEWS.d/next/Documentation/2019-06-17-09-36-46.bpo-34903.r_wGRc=
.rst
deleted file mode 100644
index 7e277f4ec1ae..000000000000
--- a/Misc/NEWS.d/next/Documentation/2019-06-17-09-36-46.bpo-34903.r_wGRc.rst
+++ /dev/null
@@ -1 +0,0 @@
-Documented that in :meth:`datetime.datetime.strptime()`, the leading zero in=
 some two-digit formats is optional. Patch by Mike Gleen.
diff --git a/Misc/NEWS.d/next/IDLE/2019-06-03-00-39-29.bpo-5680.VCQfOO.rst b/=
Misc/NEWS.d/next/IDLE/2019-06-03-00-39-29.bpo-5680.VCQfOO.rst
deleted file mode 100644
index 9fc642077488..000000000000
--- a/Misc/NEWS.d/next/IDLE/2019-06-03-00-39-29.bpo-5680.VCQfOO.rst
+++ /dev/null
@@ -1,3 +0,0 @@
-Add 'Run... Customized' to the Run menu to run a module with customized
-settings.  Any 'command line arguments' entered are added to sys.argv.
-One can suppress the normal Shell main module restart.
diff --git a/Misc/NEWS.d/next/IDLE/2019-06-04-20-36-24.bpo-35763.7XdoWz.rst b=
/Misc/NEWS.d/next/IDLE/2019-06-04-20-36-24.bpo-35763.7XdoWz.rst
deleted file mode 100644
index c2b6594cc350..000000000000
--- a/Misc/NEWS.d/next/IDLE/2019-06-04-20-36-24.bpo-35763.7XdoWz.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Make calltip reminder about '/' meaning positional-only less obtrusive by
-only adding it when there is room on the first line.
diff --git a/Misc/NEWS.d/next/IDLE/2019-06-04-23-27-33.bpo-37039.FN_fBf.rst b=
/Misc/NEWS.d/next/IDLE/2019-06-04-23-27-33.bpo-37039.FN_fBf.rst
deleted file mode 100644
index 71c8c892ba6a..000000000000
--- a/Misc/NEWS.d/next/IDLE/2019-06-04-23-27-33.bpo-37039.FN_fBf.rst
+++ /dev/null
@@ -1,4 +0,0 @@
-Adjust "Zoom Height" to individual screens by momemtarily maximizing the
-window on first use with a particular screen.  Changing screen settings
-may invalidate the saved height.  While a window is maximized,
-"Zoom Height" has no effect.
diff --git a/Misc/NEWS.d/next/IDLE/2019-06-07-00-17-41.bpo-37177.voU6pQ.rst b=
/Misc/NEWS.d/next/IDLE/2019-06-07-00-17-41.bpo-37177.voU6pQ.rst
deleted file mode 100644
index 74e48eef89a6..000000000000
--- a/Misc/NEWS.d/next/IDLE/2019-06-07-00-17-41.bpo-37177.voU6pQ.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Properly 'attach' search dialogs to their main window so that they behave
-like other dialogs and do not get hidden behind their main window.
diff --git a/Misc/NEWS.d/next/IDLE/2019-06-17-16-35-30.bpo-37321.zVTTGS.rst b=
/Misc/NEWS.d/next/IDLE/2019-06-17-16-35-30.bpo-37321.zVTTGS.rst
deleted file mode 100644
index 1321986c5a2c..000000000000
--- a/Misc/NEWS.d/next/IDLE/2019-06-17-16-35-30.bpo-37321.zVTTGS.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Both subprocess connection error messages now refer to the 'Startup failure'
-section of the IDLE doc.
diff --git a/Misc/NEWS.d/next/IDLE/2019-06-18-16-40-05.bpo-37325.GssOf1.rst b=
/Misc/NEWS.d/next/IDLE/2019-06-18-16-40-05.bpo-37325.GssOf1.rst
deleted file mode 100644
index edfffbefe884..000000000000
--- a/Misc/NEWS.d/next/IDLE/2019-06-18-16-40-05.bpo-37325.GssOf1.rst
+++ /dev/null
@@ -1 +0,0 @@
-Fix tab focus traversal order for help source and custom run dialogs.
diff --git a/Misc/NEWS.d/next/Library/2017-08-15-11-24-41.bpo-4963.LRYres.rst=
 b/Misc/NEWS.d/next/Library/2017-08-15-11-24-41.bpo-4963.LRYres.rst
deleted file mode 100644
index 3b060052fd35..000000000000
--- a/Misc/NEWS.d/next/Library/2017-08-15-11-24-41.bpo-4963.LRYres.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Fixed non-deterministic behavior related to mimetypes extension mapping and
-module reinitialization.
diff --git a/Misc/NEWS.d/next/Library/2018-11-12-19-08-50.bpo-11122.Gj7BQn.rs=
t b/Misc/NEWS.d/next/Library/2018-11-12-19-08-50.bpo-11122.Gj7BQn.rst
deleted file mode 100644
index 483906613801..000000000000
--- a/Misc/NEWS.d/next/Library/2018-11-12-19-08-50.bpo-11122.Gj7BQn.rst
+++ /dev/null
@@ -1 +0,0 @@
-Distutils won't check for rpmbuild in specified paths only.
diff --git a/Misc/NEWS.d/next/Library/2019-02-03-19-13-08.bpo-32627.b68f64.rs=
t b/Misc/NEWS.d/next/Library/2019-02-03-19-13-08.bpo-32627.b68f64.rst
deleted file mode 100644
index 16708aa5ee54..000000000000
--- a/Misc/NEWS.d/next/Library/2019-02-03-19-13-08.bpo-32627.b68f64.rst
+++ /dev/null
@@ -1 +0,0 @@
-Fix compile error when ``_uuid`` headers conflicting included.
diff --git a/Misc/NEWS.d/next/Library/2019-05-09-18-50-55.bpo-35070.4vaqNL.rs=
t b/Misc/NEWS.d/next/Library/2019-05-09-18-50-55.bpo-35070.4vaqNL.rst
deleted file mode 100644
index e823f1d469cc..000000000000
--- a/Misc/NEWS.d/next/Library/2019-05-09-18-50-55.bpo-35070.4vaqNL.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-posix.getgrouplist() now works correctly when the user belongs to
-NGROUPS_MAX supplemental groups. Patch by Jeffrey Kintscher.
diff --git a/Misc/NEWS.d/next/Library/2019-05-17-15-11-08.bpo-35805.E4YwYz.rs=
t b/Misc/NEWS.d/next/Library/2019-05-17-15-11-08.bpo-35805.E4YwYz.rst
deleted file mode 100644
index 2d8c8b3222d0..000000000000
--- a/Misc/NEWS.d/next/Library/2019-05-17-15-11-08.bpo-35805.E4YwYz.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Add parser for Message-ID header and add it to default HeaderRegistry. This
-should prevent folding of Message-ID using RFC 2048 encoded words.
diff --git a/Misc/NEWS.d/next/Library/2019-05-27-15-29-46.bpo-30835.3FoaWH.rs=
t b/Misc/NEWS.d/next/Library/2019-05-27-15-29-46.bpo-30835.3FoaWH.rst
deleted file mode 100644
index 019321d6f1d7..000000000000
--- a/Misc/NEWS.d/next/Library/2019-05-27-15-29-46.bpo-30835.3FoaWH.rst
+++ /dev/null
@@ -1,3 +0,0 @@
-Fixed a bug in email parsing where a message with invalid bytes in
-content-transfer-encoding of a multipart message can cause an AttributeError.
-Patch by Andrew Donnellan.
diff --git a/Misc/NEWS.d/next/Library/2019-05-28-02-37-00.bpo-36520.W4tday.rs=
t b/Misc/NEWS.d/next/Library/2019-05-28-02-37-00.bpo-36520.W4tday.rst
deleted file mode 100644
index 8171bfe9e2df..000000000000
--- a/Misc/NEWS.d/next/Library/2019-05-28-02-37-00.bpo-36520.W4tday.rst
+++ /dev/null
@@ -1 +0,0 @@
-Lengthy email headers with UTF-8 characters are now properly encoded when th=
ey are folded. Patch by Jeffrey Kintscher.
diff --git a/Misc/NEWS.d/next/Library/2019-05-28-19-03-46.bpo-35621.Abc1lf.rs=
t b/Misc/NEWS.d/next/Library/2019-05-28-19-03-46.bpo-35621.Abc1lf.rst
deleted file mode 100644
index c492e1de6d5c..000000000000
--- a/Misc/NEWS.d/next/Library/2019-05-28-19-03-46.bpo-35621.Abc1lf.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Support running asyncio subprocesses when execution event loop in a thread
-on UNIX.
diff --git a/Misc/NEWS.d/next/Library/2019-06-04-14-44-41.bpo-37150.TTzHxj.rs=
t b/Misc/NEWS.d/next/Library/2019-06-04-14-44-41.bpo-37150.TTzHxj.rst
deleted file mode 100644
index c5be46e1e5d3..000000000000
--- a/Misc/NEWS.d/next/Library/2019-06-04-14-44-41.bpo-37150.TTzHxj.rst
+++ /dev/null
@@ -1 +0,0 @@
-`argparse._ActionsContainer.add_argument` now throws error, if someone accid=
entally pass FileType class object instead of instance of FileType as `type` =
argument
\ No newline at end of file
diff --git a/Misc/NEWS.d/next/Library/2019-06-04-22-25-38.bpo-37158.JKm15S.rs=
t b/Misc/NEWS.d/next/Library/2019-06-04-22-25-38.bpo-37158.JKm15S.rst
deleted file mode 100644
index 4a5ec4122f94..000000000000
--- a/Misc/NEWS.d/next/Library/2019-06-04-22-25-38.bpo-37158.JKm15S.rst
+++ /dev/null
@@ -1 +0,0 @@
-Speed-up statistics.fmean() by switching from a function to a generator.
diff --git a/Misc/NEWS.d/next/Library/2019-06-04-23-44-52.bpo-34767.BpDShN.rs=
t b/Misc/NEWS.d/next/Library/2019-06-04-23-44-52.bpo-34767.BpDShN.rst
deleted file mode 100644
index b46bc44506f4..000000000000
--- a/Misc/NEWS.d/next/Library/2019-06-04-23-44-52.bpo-34767.BpDShN.rst
+++ /dev/null
@@ -1 +0,0 @@
-Do not always create a :class:`collections.deque` in :class:`asyncio.Lock`.
diff --git a/Misc/NEWS.d/next/Library/2019-06-05-11-48-19.bpo-37165.V_rwfE.rs=
t b/Misc/NEWS.d/next/Library/2019-06-05-11-48-19.bpo-37165.V_rwfE.rst
deleted file mode 100644
index 5430a57ef54c..000000000000
--- a/Misc/NEWS.d/next/Library/2019-06-05-11-48-19.bpo-37165.V_rwfE.rst
+++ /dev/null
@@ -1 +0,0 @@
-Converted _collections._count_elements to use the Argument Clinic.
diff --git a/Misc/NEWS.d/next/Library/2019-06-07-08-18-05.bpo-37163.36JkUh.rs=
t b/Misc/NEWS.d/next/Library/2019-06-07-08-18-05.bpo-37163.36JkUh.rst
deleted file mode 100644
index 04cf61d3e099..000000000000
--- a/Misc/NEWS.d/next/Library/2019-06-07-08-18-05.bpo-37163.36JkUh.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Deprecated passing ``obj`` argument of :func:`dataclasses.replace` as
-keyword argument.
diff --git a/Misc/NEWS.d/next/Library/2019-06-07-17-11-34.bpo-37178.b1StSv.rs=
t b/Misc/NEWS.d/next/Library/2019-06-07-17-11-34.bpo-37178.b1StSv.rst
deleted file mode 100644
index 77b872319a91..000000000000
--- a/Misc/NEWS.d/next/Library/2019-06-07-17-11-34.bpo-37178.b1StSv.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-For math.perm(n, k), let k default to n, giving the same result as
-factorial.
diff --git a/Misc/NEWS.d/next/Library/2019-06-07-17-16-09.bpo-37178.Day_oB.rs=
t b/Misc/NEWS.d/next/Library/2019-06-07-17-16-09.bpo-37178.Day_oB.rst
deleted file mode 100644
index 500ef54fd615..000000000000
--- a/Misc/NEWS.d/next/Library/2019-06-07-17-16-09.bpo-37178.Day_oB.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Give math.perm() a one argument form that means the same as
-math.factorial().
diff --git a/Misc/NEWS.d/next/Library/2019-06-08-11-33-48.bpo-37173.0e_8gS.rs=
t b/Misc/NEWS.d/next/Library/2019-06-08-11-33-48.bpo-37173.0e_8gS.rst
deleted file mode 100644
index e996f97ecddd..000000000000
--- a/Misc/NEWS.d/next/Library/2019-06-08-11-33-48.bpo-37173.0e_8gS.rst
+++ /dev/null
@@ -1 +0,0 @@
-The exception message for ``inspect.getfile()`` now correctly reports the pa=
ssed class rather than the builtins module.
\ No newline at end of file
diff --git a/Misc/NEWS.d/next/Library/2019-06-08-16-03-19.bpo-34886.Ov-pc9.rs=
t b/Misc/NEWS.d/next/Library/2019-06-08-16-03-19.bpo-34886.Ov-pc9.rst
deleted file mode 100644
index 1b5fc3702521..000000000000
--- a/Misc/NEWS.d/next/Library/2019-06-08-16-03-19.bpo-34886.Ov-pc9.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-Fix an unintended ValueError from :func:`subprocess.run` when checking for
-conflicting `input` and `stdin` or `capture_output` and `stdout` or `stderr`
-args when they were explicitly provided but with `None` values within a
-passed in `**kwargs` dict rather than as passed directly by name. Patch
-contributed by R=C3=A9mi Lapeyre.
diff --git a/Misc/NEWS.d/next/Library/2019-06-11-00-35-02.bpo-36402.b0IJVp.rs=
t b/Misc/NEWS.d/next/Library/2019-06-11-00-35-02.bpo-36402.b0IJVp.rst
deleted file mode 100644
index 3bc537e40ff6..000000000000
--- a/Misc/NEWS.d/next/Library/2019-06-11-00-35-02.bpo-36402.b0IJVp.rst
+++ /dev/null
@@ -1,4 +0,0 @@
-Fix a race condition at Python shutdown when waiting for threads. Wait until
-the Python thread state of all non-daemon threads get deleted (join all
-non-daemon threads), rather than just wait until non-daemon Python threads
-complete.
diff --git a/Misc/NEWS.d/next/Library/2019-06-11-01-54-19.bpo-18748.ADqCkq.rs=
t b/Misc/NEWS.d/next/Library/2019-06-11-01-54-19.bpo-18748.ADqCkq.rst
deleted file mode 100644
index 295ddebb2a40..000000000000
--- a/Misc/NEWS.d/next/Library/2019-06-11-01-54-19.bpo-18748.ADqCkq.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-:class:`_pyio.IOBase` destructor now does nothing if getting the ``closed``
-attribute fails to better mimick :class:`_io.IOBase` finalizer.
diff --git a/Misc/NEWS.d/next/Library/2019-06-11-13-52-04.bpo-36607.5_mJkQ.rs=
t b/Misc/NEWS.d/next/Library/2019-06-11-13-52-04.bpo-36607.5_mJkQ.rst
deleted file mode 100644
index 337c8e2668c4..000000000000
--- a/Misc/NEWS.d/next/Library/2019-06-11-13-52-04.bpo-36607.5_mJkQ.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Eliminate :exc:`RuntimeError` raised by :func:`asyncio.all_tasks()` if
-internal tasks weak set is changed by another thread during iteration.
diff --git a/Misc/NEWS.d/next/Library/2019-06-11-16-41-40.bpo-35766.v1Kj-T.rs=
t b/Misc/NEWS.d/next/Library/2019-06-11-16-41-40.bpo-35766.v1Kj-T.rst
deleted file mode 100644
index 6dd49998cb4c..000000000000
--- a/Misc/NEWS.d/next/Library/2019-06-11-16-41-40.bpo-35766.v1Kj-T.rst
+++ /dev/null
@@ -1 +0,0 @@
-Change the format of feature_version to be a (major, minor) tuple.
diff --git a/Misc/NEWS.d/next/Library/2019-06-11-19-34-29.bpo-35922.rxpzWr.rs=
t b/Misc/NEWS.d/next/Library/2019-06-11-19-34-29.bpo-35922.rxpzWr.rst
deleted file mode 100644
index 5271a495624d..000000000000
--- a/Misc/NEWS.d/next/Library/2019-06-11-19-34-29.bpo-35922.rxpzWr.rst
+++ /dev/null
@@ -1,4 +0,0 @@
-Fix :meth:`RobotFileParser.crawl_delay` and
-:meth:`RobotFileParser.request_rate` to return ``None`` rather than
-raise :exc:`AttributeError` when no relevant rule is defined in the
-robots.txt file.  Patch by R=C3=A9mi Lapeyre.
diff --git a/Misc/NEWS.d/next/Library/2019-06-12-16-10-50.bpo-37210.r4yMg6.rs=
t b/Misc/NEWS.d/next/Library/2019-06-12-16-10-50.bpo-37210.r4yMg6.rst
deleted file mode 100644
index 58fc66b59059..000000000000
--- a/Misc/NEWS.d/next/Library/2019-06-12-16-10-50.bpo-37210.r4yMg6.rst
+++ /dev/null
@@ -1 +0,0 @@
-Allow pure Python implementation of :mod:`pickle` to work even when the C :m=
od:`_pickle` module is unavailable.
diff --git a/Misc/NEWS.d/next/Library/2019-06-14-08-30-16.bpo-19865.FRGH4I.rs=
t b/Misc/NEWS.d/next/Library/2019-06-14-08-30-16.bpo-19865.FRGH4I.rst
deleted file mode 100644
index efd1f55c0135..000000000000
--- a/Misc/NEWS.d/next/Library/2019-06-14-08-30-16.bpo-19865.FRGH4I.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-:func:`ctypes.create_unicode_buffer()` now also supports non-BMP characters
-on platforms with 16-bit :c:type:`wchar_t` (for example, Windows and AIX).
diff --git a/Misc/NEWS.d/next/Library/2019-06-14-13-25-56.bpo-37279.OHlW6l.rs=
t b/Misc/NEWS.d/next/Library/2019-06-14-13-25-56.bpo-37279.OHlW6l.rst
deleted file mode 100644
index d740b9b62b08..000000000000
--- a/Misc/NEWS.d/next/Library/2019-06-14-13-25-56.bpo-37279.OHlW6l.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Fix asyncio sendfile support when sendfile sends extra data in fallback
-mode.
diff --git a/Misc/NEWS.d/next/Library/2019-06-14-13-30-47.bpo-37280.Fxur0F.rs=
t b/Misc/NEWS.d/next/Library/2019-06-14-13-30-47.bpo-37280.Fxur0F.rst
deleted file mode 100644
index 7cdc56a72ce4..000000000000
--- a/Misc/NEWS.d/next/Library/2019-06-14-13-30-47.bpo-37280.Fxur0F.rst
+++ /dev/null
@@ -1 +0,0 @@
-Use threadpool for reading from file for sendfile fallback mode.
diff --git a/Misc/NEWS.d/next/Library/2019-06-15-14-39-50.bpo-33972.XxnNPw.rs=
t b/Misc/NEWS.d/next/Library/2019-06-15-14-39-50.bpo-33972.XxnNPw.rst
deleted file mode 100644
index ded1570b308f..000000000000
--- a/Misc/NEWS.d/next/Library/2019-06-15-14-39-50.bpo-33972.XxnNPw.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Email with single part but content-type set to ``multipart/*`` doesn't raise
-AttributeError anymore.
diff --git a/Misc/NEWS.d/next/Library/2019-06-25-02-10-00.bpo-37394.srZ1zx.rs=
t b/Misc/NEWS.d/next/Library/2019-06-25-02-10-00.bpo-37394.srZ1zx.rst
deleted file mode 100644
index 8d0d2fa311bc..000000000000
--- a/Misc/NEWS.d/next/Library/2019-06-25-02-10-00.bpo-37394.srZ1zx.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Fix a bug that was causing the :mod:`queue` module to fail if the
-accelerator module was not available. Patch by Pablo Galindo.
diff --git a/Misc/NEWS.d/next/Library/2019-06-25-05-07-48.bpo-36546.RUcxaK.rs=
t b/Misc/NEWS.d/next/Library/2019-06-25-05-07-48.bpo-36546.RUcxaK.rst
deleted file mode 100644
index f6829fb1727e..000000000000
--- a/Misc/NEWS.d/next/Library/2019-06-25-05-07-48.bpo-36546.RUcxaK.rst
+++ /dev/null
@@ -1,4 +0,0 @@
-The *dist* argument for statistics.quantiles() is now positional only. The
-current name doesn't reflect that the argument can be either a dataset or a
-distribution.  Marking the parameter as positional avoids confusion and
-makes it possible to change the name later.
diff --git a/Misc/NEWS.d/next/Library/2019-06-25-19-27-25.bpo-29412.n4Zqdh.rs=
t b/Misc/NEWS.d/next/Library/2019-06-25-19-27-25.bpo-29412.n4Zqdh.rst
deleted file mode 100644
index b8fac4673686..000000000000
--- a/Misc/NEWS.d/next/Library/2019-06-25-19-27-25.bpo-29412.n4Zqdh.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Fix IndexError in parsing a header value ending unexpectedly. Patch by Abhil=
ash
-Raj.
diff --git a/Misc/NEWS.d/next/Library/2019-06-26-16-28-59.bpo-37412.lx0VjC.rs=
t b/Misc/NEWS.d/next/Library/2019-06-26-16-28-59.bpo-37412.lx0VjC.rst
deleted file mode 100644
index 3ce4102129f0..000000000000
--- a/Misc/NEWS.d/next/Library/2019-06-26-16-28-59.bpo-37412.lx0VjC.rst
+++ /dev/null
@@ -1,3 +0,0 @@
-The :func:`os.getcwdb` function now uses the UTF-8 encoding on Windows,
-rather than the ANSI code page: see :pep:`529` for the rationale. The functi=
on
-is no longer deprecated on Windows.
diff --git a/Misc/NEWS.d/next/Library/2019-06-26-22-25-05.bpo-37420.CxFJ09.rs=
t b/Misc/NEWS.d/next/Library/2019-06-26-22-25-05.bpo-37420.CxFJ09.rst
deleted file mode 100644
index dea1a2925014..000000000000
--- a/Misc/NEWS.d/next/Library/2019-06-26-22-25-05.bpo-37420.CxFJ09.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-:func:`os.sched_setaffinity` now correctly handles errors that arise during =
iteration over its ``mask`` argument.
-Patch by Brandt Bucher.
\ No newline at end of file
diff --git a/Misc/NEWS.d/next/Library/2019-06-27-13-27-02.bpo-37428._wcwUd.rs=
t b/Misc/NEWS.d/next/Library/2019-06-27-13-27-02.bpo-37428._wcwUd.rst
deleted file mode 100644
index 2cdce6b24dc6..000000000000
--- a/Misc/NEWS.d/next/Library/2019-06-27-13-27-02.bpo-37428._wcwUd.rst
+++ /dev/null
@@ -1,4 +0,0 @@
-SSLContext.post_handshake_auth =3D True no longer sets
-SSL_VERIFY_POST_HANDSHAKE verify flag for client connections. Although the
-option is documented as ignored for clients, OpenSSL implicitly enables cert
-chain validation when the flag is set.
diff --git a/Misc/NEWS.d/next/Library/2019-06-27-20-33-50.bpo-37437.du39_A.rs=
t b/Misc/NEWS.d/next/Library/2019-06-27-20-33-50.bpo-37437.du39_A.rst
deleted file mode 100644
index 80719ee152d7..000000000000
--- a/Misc/NEWS.d/next/Library/2019-06-27-20-33-50.bpo-37437.du39_A.rst
+++ /dev/null
@@ -1 +0,0 @@
-Update vendorized expat version to 2.2.7.
diff --git a/Misc/NEWS.d/next/Library/2019-06-28-16-40-17.bpo-37440.t3wX-N.rs=
t b/Misc/NEWS.d/next/Library/2019-06-28-16-40-17.bpo-37440.t3wX-N.rst
deleted file mode 100644
index b336e061e15e..000000000000
--- a/Misc/NEWS.d/next/Library/2019-06-28-16-40-17.bpo-37440.t3wX-N.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-http.client now enables TLS 1.3 post-handshake authentication for default
-context or if a cert_file is passed to HTTPSConnection.
diff --git a/Misc/NEWS.d/next/Security/2019-06-17-09-34-25.bpo-34631.DBfM4j.r=
st b/Misc/NEWS.d/next/Security/2019-06-17-09-34-25.bpo-34631.DBfM4j.rst
deleted file mode 100644
index 90aa30192fc8..000000000000
--- a/Misc/NEWS.d/next/Security/2019-06-17-09-34-25.bpo-34631.DBfM4j.rst
+++ /dev/null
@@ -1 +0,0 @@
-Updated OpenSSL to 1.1.1c in Windows installer
diff --git a/Misc/NEWS.d/next/Security/2019-06-21-14-42-53.bpo-37364.IIRc2s.r=
st b/Misc/NEWS.d/next/Security/2019-06-21-14-42-53.bpo-37364.IIRc2s.rst
deleted file mode 100644
index 7506fa9064b1..000000000000
--- a/Misc/NEWS.d/next/Security/2019-06-21-14-42-53.bpo-37364.IIRc2s.rst
+++ /dev/null
@@ -1 +0,0 @@
-:func:`io.open_code` is now used when reading :file:`.pth` files.
diff --git a/Misc/NEWS.d/next/Security/2019-06-21-15-58-59.bpo-37363.diouyl.r=
st b/Misc/NEWS.d/next/Security/2019-06-21-15-58-59.bpo-37363.diouyl.rst
deleted file mode 100644
index 1b724ff559e2..000000000000
--- a/Misc/NEWS.d/next/Security/2019-06-21-15-58-59.bpo-37363.diouyl.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-Adds audit events for :mod:`ensurepip`, :mod:`ftplib`, :mod:`glob`,
-:mod:`imaplib`, :mod:`nntplib`, :mod:`pdb`, :mod:`poplib`, :mod:`shutil`,
-:mod:`smtplib`, :mod:`sqlite3`, :mod:`subprocess`, :mod:`telnetlib`,
-:mod:`tempfile` and :mod:`webbrowser`, as well as :func:`os.listdir`,
-:func:`os.scandir` and :func:`breakpoint`.
diff --git a/Misc/NEWS.d/next/Security/2019-07-01-08-46-14.bpo-37463.1CHwjE.r=
st b/Misc/NEWS.d/next/Security/2019-07-01-08-46-14.bpo-37463.1CHwjE.rst
deleted file mode 100644
index 4f4a62e78374..000000000000
--- a/Misc/NEWS.d/next/Security/2019-07-01-08-46-14.bpo-37463.1CHwjE.rst
+++ /dev/null
@@ -1,4 +0,0 @@
-ssl.match_hostname() no longer accepts IPv4 addresses with additional text
-after the address and only quad-dotted notation without trailing
-whitespaces. Some inet_aton() implementations ignore whitespace and all data
-after whitespace, e.g. '127.0.0.1 whatever'.
diff --git a/Misc/NEWS.d/next/Security/2019-07-01-10-31-14.bpo-37363.fSjatj.r=
st b/Misc/NEWS.d/next/Security/2019-07-01-10-31-14.bpo-37363.fSjatj.rst
deleted file mode 100644
index a8bde90db496..000000000000
--- a/Misc/NEWS.d/next/Security/2019-07-01-10-31-14.bpo-37363.fSjatj.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Adds audit events for the range of supported run commands (see
-:ref:`using-on-general`).
diff --git a/Misc/NEWS.d/next/Tests/2019-04-11-07-59-43.bpo-28009.s85urF.rst =
b/Misc/NEWS.d/next/Tests/2019-04-11-07-59-43.bpo-28009.s85urF.rst
deleted file mode 100644
index 233640716d15..000000000000
--- a/Misc/NEWS.d/next/Tests/2019-04-11-07-59-43.bpo-28009.s85urF.rst
+++ /dev/null
@@ -1,3 +0,0 @@
-Modify the test_uuid logic to test when a program is available
-AND can be used to obtain a MACADDR as basis for an UUID.
-Patch by M. Felt
diff --git a/Misc/NEWS.d/next/Tests/2019-06-04-18-30-39.bpo-37153.711INB.rst =
b/Misc/NEWS.d/next/Tests/2019-06-04-18-30-39.bpo-37153.711INB.rst
deleted file mode 100644
index 138a22f6acc2..000000000000
--- a/Misc/NEWS.d/next/Tests/2019-06-04-18-30-39.bpo-37153.711INB.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-``test_venv.test_mutiprocessing()`` now explicitly calls
-``pool.terminate()`` to wait until the pool completes.
diff --git a/Misc/NEWS.d/next/Tests/2019-06-07-12-23-15.bpo-37169.yfXTFg.rst =
b/Misc/NEWS.d/next/Tests/2019-06-07-12-23-15.bpo-37169.yfXTFg.rst
deleted file mode 100644
index f2f0a8b8d8ea..000000000000
--- a/Misc/NEWS.d/next/Tests/2019-06-07-12-23-15.bpo-37169.yfXTFg.rst
+++ /dev/null
@@ -1 +0,0 @@
-Rewrite ``_PyObject_IsFreed()`` unit tests.
diff --git a/Misc/NEWS.d/next/Tests/2019-06-13-12-19-56.bpo-37261.NuKFVo.rst =
b/Misc/NEWS.d/next/Tests/2019-06-13-12-19-56.bpo-37261.NuKFVo.rst
deleted file mode 100644
index 27ce78a70f2b..000000000000
--- a/Misc/NEWS.d/next/Tests/2019-06-13-12-19-56.bpo-37261.NuKFVo.rst
+++ /dev/null
@@ -1,3 +0,0 @@
-Fix :func:`test.support.catch_unraisable_exception`: its __exit__() method
-now ignores unraisable exception raised when clearing its ``unraisable``
-attribute.
diff --git a/Misc/NEWS.d/next/Tests/2019-06-14-12-21-47.bpo-37278.z0HUOr.rst =
b/Misc/NEWS.d/next/Tests/2019-06-14-12-21-47.bpo-37278.z0HUOr.rst
deleted file mode 100644
index 3d3011b51c5b..000000000000
--- a/Misc/NEWS.d/next/Tests/2019-06-14-12-21-47.bpo-37278.z0HUOr.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Fix test_asyncio ProactorLoopCtrlC: join the thread to prevent leaking a
-running thread and leaking a reference.
diff --git a/Misc/NEWS.d/next/Tests/2019-06-14-17-05-49.bpo-35998.yX82oD.rst =
b/Misc/NEWS.d/next/Tests/2019-06-14-17-05-49.bpo-35998.yX82oD.rst
deleted file mode 100644
index 23b6d00f42c5..000000000000
--- a/Misc/NEWS.d/next/Tests/2019-06-14-17-05-49.bpo-35998.yX82oD.rst
+++ /dev/null
@@ -1 +0,0 @@
-Avoid TimeoutError in test_asyncio: test_start_tls_server_1()
diff --git a/Misc/NEWS.d/next/Tests/2019-06-21-15-47-33.bpo-37362.D3xppx.rst =
b/Misc/NEWS.d/next/Tests/2019-06-21-15-47-33.bpo-37362.D3xppx.rst
deleted file mode 100644
index 43fdc1030c57..000000000000
--- a/Misc/NEWS.d/next/Tests/2019-06-21-15-47-33.bpo-37362.D3xppx.rst
+++ /dev/null
@@ -1,3 +0,0 @@
-test_gdb no longer fails if it gets an "unexpected" message on stderr: it now
-ignores stderr. The purpose of test_gdb is to test that python-gdb.py comman=
ds
-work as expected, not to test gdb.
diff --git a/Misc/NEWS.d/next/Tests/2019-06-24-10-47-07.bpo-37359.CkdtyO.rst =
b/Misc/NEWS.d/next/Tests/2019-06-24-10-47-07.bpo-37359.CkdtyO.rst
deleted file mode 100644
index 3d5350de4f43..000000000000
--- a/Misc/NEWS.d/next/Tests/2019-06-24-10-47-07.bpo-37359.CkdtyO.rst
+++ /dev/null
@@ -1,4 +0,0 @@
-Add --cleanup option to python3 -m test to remove ``test_python_*``
-directories of previous failed jobs. Add "make cleantest" to run
-``python3 -m test --cleanup``.
-
diff --git a/Misc/NEWS.d/next/Tests/2019-06-25-16-02-43.bpo-37400.cx_EWv.rst =
b/Misc/NEWS.d/next/Tests/2019-06-25-16-02-43.bpo-37400.cx_EWv.rst
deleted file mode 100644
index 737c78189009..000000000000
--- a/Misc/NEWS.d/next/Tests/2019-06-25-16-02-43.bpo-37400.cx_EWv.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Fix test_os.test_chown(): use os.getgroups() rather than grp.getgrall()
-to get groups. Rename also the test to test_chown_gid().
diff --git a/Misc/NEWS.d/next/Tests/2019-06-26-15-28-45.bpo-37411.5lGNhM.rst =
b/Misc/NEWS.d/next/Tests/2019-06-26-15-28-45.bpo-37411.5lGNhM.rst
deleted file mode 100644
index 20e52d3c74f7..000000000000
--- a/Misc/NEWS.d/next/Tests/2019-06-26-15-28-45.bpo-37411.5lGNhM.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Fix test_wsgiref.testEnviron() to no longer depend on the environment
-variables (don't fail if "X" variable is set).
diff --git a/Misc/NEWS.d/next/Tests/2019-06-27-00-37-59.bpo-37421.rVJb3x.rst =
b/Misc/NEWS.d/next/Tests/2019-06-27-00-37-59.bpo-37421.rVJb3x.rst
deleted file mode 100644
index 9f4033831d68..000000000000
--- a/Misc/NEWS.d/next/Tests/2019-06-27-00-37-59.bpo-37421.rVJb3x.rst
+++ /dev/null
@@ -1 +0,0 @@
-Fix test_shutil to no longer leak temporary files.
diff --git a/Misc/NEWS.d/next/Tests/2019-06-28-16-37-52.bpo-37335.o5S2hY.rst =
b/Misc/NEWS.d/next/Tests/2019-06-28-16-37-52.bpo-37335.o5S2hY.rst
deleted file mode 100644
index cb884d926590..000000000000
--- a/Misc/NEWS.d/next/Tests/2019-06-28-16-37-52.bpo-37335.o5S2hY.rst
+++ /dev/null
@@ -1 +0,0 @@
-Remove no longer necessary code from c locale coercion tests
diff --git a/Misc/NEWS.d/next/Tests/2019-06-29-23-56-28.bpo-37199.FHDsLf.rst =
b/Misc/NEWS.d/next/Tests/2019-06-29-23-56-28.bpo-37199.FHDsLf.rst
deleted file mode 100644
index b05209159cc8..000000000000
--- a/Misc/NEWS.d/next/Tests/2019-06-29-23-56-28.bpo-37199.FHDsLf.rst
+++ /dev/null
@@ -1 +0,0 @@
-Fix test failures when IPv6 is unavailable or disabled.
diff --git a/Misc/NEWS.d/next/Tests/2019-07-01-19-57-26.bpo-37421.NFH1f0.rst =
b/Misc/NEWS.d/next/Tests/2019-07-01-19-57-26.bpo-37421.NFH1f0.rst
deleted file mode 100644
index c379b504ba8a..000000000000
--- a/Misc/NEWS.d/next/Tests/2019-07-01-19-57-26.bpo-37421.NFH1f0.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-multiprocessing tests now explicitly call ``_run_finalizers()`` to
-immediately remove temporary directories created by tests.
diff --git a/Misc/NEWS.d/next/Tests/2019-07-02-23-20-35.bpo-37421.HCkKWz.rst =
b/Misc/NEWS.d/next/Tests/2019-07-02-23-20-35.bpo-37421.HCkKWz.rst
deleted file mode 100644
index 6671ffe922fd..000000000000
--- a/Misc/NEWS.d/next/Tests/2019-07-02-23-20-35.bpo-37421.HCkKWz.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-test_winconsoleio doesn't leak a temporary file anymore: use
-tempfile.TemporaryFile() to remove it when the test completes.
diff --git a/Misc/NEWS.d/next/Tests/2019-07-02-23-29-06.bpo-37421.WEfc5A.rst =
b/Misc/NEWS.d/next/Tests/2019-07-02-23-29-06.bpo-37421.WEfc5A.rst
deleted file mode 100644
index 215a0a144459..000000000000
--- a/Misc/NEWS.d/next/Tests/2019-07-02-23-29-06.bpo-37421.WEfc5A.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-test_concurrent_futures now cleans up multiprocessing to remove immediately
-temporary directories created by multiprocessing.util.get_temp_dir().
diff --git a/Misc/NEWS.d/next/Tests/2019-07-03-00-05-28.bpo-37421.ORGRSG.rst =
b/Misc/NEWS.d/next/Tests/2019-07-03-00-05-28.bpo-37421.ORGRSG.rst
deleted file mode 100644
index 8610509e4b72..000000000000
--- a/Misc/NEWS.d/next/Tests/2019-07-03-00-05-28.bpo-37421.ORGRSG.rst
+++ /dev/null
@@ -1,3 +0,0 @@
-test_distutils.test_build_ext() is now able to remove the temporary
-directory on Windows: don't import the newly built C extension ("xx") in the
-current process, but test it in a separated process.
diff --git a/Misc/NEWS.d/next/Windows/2019-06-11-15-41-34.bpo-36779.0TMw6f.rs=
t b/Misc/NEWS.d/next/Windows/2019-06-11-15-41-34.bpo-36779.0TMw6f.rst
deleted file mode 100644
index 618cfcae7b89..000000000000
--- a/Misc/NEWS.d/next/Windows/2019-06-11-15-41-34.bpo-36779.0TMw6f.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Ensure ``time.tzname`` is correct on Windows when the active code page is
-set to CP_UTF7 or CP_UTF8.
diff --git a/Misc/NEWS.d/next/Windows/2019-06-13-04-15-51.bpo-37267.Ygo5ef.rs=
t b/Misc/NEWS.d/next/Windows/2019-06-13-04-15-51.bpo-37267.Ygo5ef.rst
deleted file mode 100644
index a4dcfcde35b0..000000000000
--- a/Misc/NEWS.d/next/Windows/2019-06-13-04-15-51.bpo-37267.Ygo5ef.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-On Windows, :func:`os.dup` no longer creates an inheritable fd when handling
-a character file.
diff --git a/Misc/NEWS.d/next/Windows/2019-06-18-09-05-08.bpo-35360.tdqSmo.rs=
t b/Misc/NEWS.d/next/Windows/2019-06-18-09-05-08.bpo-35360.tdqSmo.rst
deleted file mode 100644
index 8fea56a00fdc..000000000000
--- a/Misc/NEWS.d/next/Windows/2019-06-18-09-05-08.bpo-35360.tdqSmo.rst
+++ /dev/null
@@ -1 +0,0 @@
-Update Windows builds to use SQLite 3.28.0.
diff --git a/Misc/NEWS.d/next/Windows/2019-06-20-12-50-32.bpo-37351.asTnVW.rs=
t b/Misc/NEWS.d/next/Windows/2019-06-20-12-50-32.bpo-37351.asTnVW.rst
deleted file mode 100644
index df2efd4a9a41..000000000000
--- a/Misc/NEWS.d/next/Windows/2019-06-20-12-50-32.bpo-37351.asTnVW.rst
+++ /dev/null
@@ -1 +0,0 @@
-Removes libpython38.a from standard Windows distribution.
diff --git a/Misc/NEWS.d/next/Windows/2019-06-28-09-44-08.bpo-37369.1iVpxq.rs=
t b/Misc/NEWS.d/next/Windows/2019-06-28-09-44-08.bpo-37369.1iVpxq.rst
deleted file mode 100644
index 5eaed61a9261..000000000000
--- a/Misc/NEWS.d/next/Windows/2019-06-28-09-44-08.bpo-37369.1iVpxq.rst
+++ /dev/null
@@ -1 +0,0 @@
-Fixes path for :data:`sys.executable` when running from the Microsoft Store.
diff --git a/Misc/NEWS.d/next/Windows/2019-07-01-12-38-48.bpo-10945.s0YBHG.rs=
t b/Misc/NEWS.d/next/Windows/2019-07-01-12-38-48.bpo-10945.s0YBHG.rst
deleted file mode 100644
index d39576545efa..000000000000
--- a/Misc/NEWS.d/next/Windows/2019-07-01-12-38-48.bpo-10945.s0YBHG.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Officially drop support for creating bdist_wininst installers on non-Windows
-systems.
diff --git a/Misc/NEWS.d/next/macOS/2019-06-18-00-30-40.bpo-34631.vSifcv.rst =
b/Misc/NEWS.d/next/macOS/2019-06-18-00-30-40.bpo-34631.vSifcv.rst
deleted file mode 100644
index 164950a37c83..000000000000
--- a/Misc/NEWS.d/next/macOS/2019-06-18-00-30-40.bpo-34631.vSifcv.rst
+++ /dev/null
@@ -1 +0,0 @@
-Updated OpenSSL to 1.1.1c in macOS installer.
diff --git a/Misc/NEWS.d/next/macOS/2019-06-18-08-58-30.bpo-35360.-CWbfy.rst =
b/Misc/NEWS.d/next/macOS/2019-06-18-08-58-30.bpo-35360.-CWbfy.rst
deleted file mode 100644
index 5e05ac56b095..000000000000
--- a/Misc/NEWS.d/next/macOS/2019-06-18-08-58-30.bpo-35360.-CWbfy.rst
+++ /dev/null
@@ -1 +0,0 @@
-Update macOS installer to use SQLite 3.28.0.
diff --git a/Misc/NEWS.d/next/macOS/2019-07-02-01-06-47.bpo-34602.10d4wl.rst =
b/Misc/NEWS.d/next/macOS/2019-07-02-01-06-47.bpo-34602.10d4wl.rst
deleted file mode 100644
index c50ac638df57..000000000000
--- a/Misc/NEWS.d/next/macOS/2019-07-02-01-06-47.bpo-34602.10d4wl.rst
+++ /dev/null
@@ -1,4 +0,0 @@
-Avoid test suite failures on macOS by no longer calling resource.setrlimit
-to increase the process stack size limit at runtime.  The runtime change is
-no longer needed since the interpreter is being built with a larger default
-stack size.
diff --git a/README.rst b/README.rst
index b0a0ce7ec287..e1d89b3d811a 100644
--- a/README.rst
+++ b/README.rst
@@ -1,4 +1,4 @@
-This is Python version 3.8.0 beta 1
+This is Python version 3.8.0 beta 2
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
=20
 .. image:: https://travis-ci.org/python/cpython.svg?branch=3Dmaster


From webhook-mailer at python.org  Fri Jul 12 17:22:26 2019
From: webhook-mailer at python.org (Miss Islington (bot))
Date: Fri, 12 Jul 2019 21:22:26 -0000
Subject: [Python-checkins] bpo-19696: Move threaded_import_hangers (GH-14655)
Message-ID: <mailman.344.1562966547.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/a65c977552507dd19d2cc073fc91ae22cc66bbff
commit: a65c977552507dd19d2cc073fc91ae22cc66bbff
branch: master
author: Kyle Stanley <aeros167 at gmail.com>
committer: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
date: 2019-07-12T14:22:05-07:00
summary:

bpo-19696: Move threaded_import_hangers (GH-14655)



Move `threaded_import_hangers`, a dependency of `test_threaded_import`, to the directory `test_importlib/`. Also update the import references for `threaded_import_hangers` in `test_threaded_import`.





https://bugs.python.org/issue19696

files:
A Lib/test/test_importlib/threaded_import_hangers.py
D Lib/test/threaded_import_hangers.py
M Lib/test/test_importlib/test_threaded_import.py

diff --git a/Lib/test/test_importlib/test_threaded_import.py b/Lib/test/test_importlib/test_threaded_import.py
index 8607f363db21..d1f64c70fac8 100644
--- a/Lib/test/test_importlib/test_threaded_import.py
+++ b/Lib/test/test_importlib/test_threaded_import.py
@@ -178,11 +178,11 @@ def test_import_hangers(self):
         # In case this test is run again, make sure the helper module
         # gets loaded from scratch again.
         try:
-            del sys.modules['test.threaded_import_hangers']
+            del sys.modules['test.test_importlib.threaded_import_hangers']
         except KeyError:
             pass
-        import test.threaded_import_hangers
-        self.assertFalse(test.threaded_import_hangers.errors)
+        import test.test_importlib.threaded_import_hangers
+        self.assertFalse(test.test_importlib.threaded_import_hangers.errors)
 
     def test_circular_imports(self):
         # The goal of this test is to exercise implementations of the import
diff --git a/Lib/test/threaded_import_hangers.py b/Lib/test/test_importlib/threaded_import_hangers.py
similarity index 100%
rename from Lib/test/threaded_import_hangers.py
rename to Lib/test/test_importlib/threaded_import_hangers.py


From webhook-mailer at python.org  Fri Jul 12 18:35:43 2019
From: webhook-mailer at python.org (Miss Islington (bot))
Date: Fri, 12 Jul 2019 22:35:43 -0000
Subject: [Python-checkins] bpo-37521: No longer treat insertion into
 sys.modules as optional in importlib examples (GH-14723)
Message-ID: <mailman.345.1562970944.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/0827064c955f88df8ba5621d8e3d81be3cfc26a9
commit: 0827064c955f88df8ba5621d8e3d81be3cfc26a9
branch: master
author: Brett Cannon <54418+brettcannon at users.noreply.github.com>
committer: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
date: 2019-07-12T15:35:34-07:00
summary:

bpo-37521: No longer treat insertion into sys.modules as optional in importlib examples (GH-14723)



Fix importlib examples to insert any newly created modules via importlib.util.module_from_spec() immediately into sys.modules instead of after calling loader.exec_module().

Thanks to Benjamin Mintz for finding the bug.


https://bugs.python.org/issue37521

files:
A Misc/NEWS.d/next/Documentation/2019-07-12-15-09-56.bpo-37521.7tiFR-.rst
M Doc/library/importlib.rst

diff --git a/Doc/library/importlib.rst b/Doc/library/importlib.rst
index df184b33d0e7..9fab0779aa74 100644
--- a/Doc/library/importlib.rst
+++ b/Doc/library/importlib.rst
@@ -1638,15 +1638,16 @@ import, then you should use :func:`importlib.util.find_spec`.
   # For illustrative purposes.
   name = 'itertools'
 
-  spec = importlib.util.find_spec(name)
-  if spec is None:
-      print("can't find the itertools module")
+  if name in sys.modules:
+      print(f"{name!r} already in sys.modules")
+  elif (spec := importlib.util.find_spec(name)) is None:
+      print(f"can't find the {name!r} module")
   else:
       # If you chose to perform the actual import ...
       module = importlib.util.module_from_spec(spec)
-      spec.loader.exec_module(module)
-      # Adding the module to sys.modules is optional.
       sys.modules[name] = module
+      spec.loader.exec_module(module)
+      print(f"{name!r} has been imported")
 
 
 Importing a source file directly
@@ -1665,10 +1666,9 @@ To import a Python source file directly, use the following recipe
 
   spec = importlib.util.spec_from_file_location(module_name, file_path)
   module = importlib.util.module_from_spec(spec)
-  spec.loader.exec_module(module)
-  # Optional; only necessary if you want to be able to import the module
-  # by name later.
   sys.modules[module_name] = module
+  spec.loader.exec_module(module)
+
 
 
 Setting up an importer
@@ -1740,8 +1740,8 @@ Python 3.6 and newer for other parts of the code).
           msg = f'No module named {absolute_name!r}'
           raise ModuleNotFoundError(msg, name=absolute_name)
       module = importlib.util.module_from_spec(spec)
-      spec.loader.exec_module(module)
       sys.modules[absolute_name] = module
+      spec.loader.exec_module(module)
       if path is not None:
           setattr(parent_module, child_name, module)
       return module
diff --git a/Misc/NEWS.d/next/Documentation/2019-07-12-15-09-56.bpo-37521.7tiFR-.rst b/Misc/NEWS.d/next/Documentation/2019-07-12-15-09-56.bpo-37521.7tiFR-.rst
new file mode 100644
index 000000000000..35d7f56f732f
--- /dev/null
+++ b/Misc/NEWS.d/next/Documentation/2019-07-12-15-09-56.bpo-37521.7tiFR-.rst
@@ -0,0 +1,5 @@
+Fix `importlib` examples to insert any newly created modules via
+importlib.util.module_from_spec() immediately into sys.modules instead of
+after calling loader.exec_module().
+
+Thanks to Benjamin Mintz for finding the bug.


From webhook-mailer at python.org  Fri Jul 12 18:51:52 2019
From: webhook-mailer at python.org (Miss Islington (bot))
Date: Fri, 12 Jul 2019 22:51:52 -0000
Subject: [Python-checkins] [3.8] bpo-37521: No longer treat insertion into
 sys.modules as optional in importlib examples (GH-14723) (GH-14724)
Message-ID: <mailman.346.1562971913.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/bfb709b771230e7e466961b5ddf4852962602450
commit: bfb709b771230e7e466961b5ddf4852962602450
branch: 3.8
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: GitHub <noreply at github.com>
date: 2019-07-12T15:51:48-07:00
summary:

[3.8] bpo-37521: No longer treat insertion into sys.modules as optional in importlib examples (GH-14723) (GH-14724)



Fix importlib examples to insert any newly created modules via importlib.util.module_from_spec() immediately into sys.modules instead of after calling loader.exec_module().

Thanks to Benjamin Mintz for finding the bug.


https://bugs.python.org/issue37521
(cherry picked from commit 0827064c955f88df8ba5621d8e3d81be3cfc26a9)


Co-authored-by: Brett Cannon <54418+brettcannon at users.noreply.github.com>


https://bugs.python.org/issue37521

files:
A Misc/NEWS.d/next/Documentation/2019-07-12-15-09-56.bpo-37521.7tiFR-.rst
M Doc/library/importlib.rst

diff --git a/Doc/library/importlib.rst b/Doc/library/importlib.rst
index df184b33d0e7..9fab0779aa74 100644
--- a/Doc/library/importlib.rst
+++ b/Doc/library/importlib.rst
@@ -1638,15 +1638,16 @@ import, then you should use :func:`importlib.util.find_spec`.
   # For illustrative purposes.
   name = 'itertools'
 
-  spec = importlib.util.find_spec(name)
-  if spec is None:
-      print("can't find the itertools module")
+  if name in sys.modules:
+      print(f"{name!r} already in sys.modules")
+  elif (spec := importlib.util.find_spec(name)) is None:
+      print(f"can't find the {name!r} module")
   else:
       # If you chose to perform the actual import ...
       module = importlib.util.module_from_spec(spec)
-      spec.loader.exec_module(module)
-      # Adding the module to sys.modules is optional.
       sys.modules[name] = module
+      spec.loader.exec_module(module)
+      print(f"{name!r} has been imported")
 
 
 Importing a source file directly
@@ -1665,10 +1666,9 @@ To import a Python source file directly, use the following recipe
 
   spec = importlib.util.spec_from_file_location(module_name, file_path)
   module = importlib.util.module_from_spec(spec)
-  spec.loader.exec_module(module)
-  # Optional; only necessary if you want to be able to import the module
-  # by name later.
   sys.modules[module_name] = module
+  spec.loader.exec_module(module)
+
 
 
 Setting up an importer
@@ -1740,8 +1740,8 @@ Python 3.6 and newer for other parts of the code).
           msg = f'No module named {absolute_name!r}'
           raise ModuleNotFoundError(msg, name=absolute_name)
       module = importlib.util.module_from_spec(spec)
-      spec.loader.exec_module(module)
       sys.modules[absolute_name] = module
+      spec.loader.exec_module(module)
       if path is not None:
           setattr(parent_module, child_name, module)
       return module
diff --git a/Misc/NEWS.d/next/Documentation/2019-07-12-15-09-56.bpo-37521.7tiFR-.rst b/Misc/NEWS.d/next/Documentation/2019-07-12-15-09-56.bpo-37521.7tiFR-.rst
new file mode 100644
index 000000000000..35d7f56f732f
--- /dev/null
+++ b/Misc/NEWS.d/next/Documentation/2019-07-12-15-09-56.bpo-37521.7tiFR-.rst
@@ -0,0 +1,5 @@
+Fix `importlib` examples to insert any newly created modules via
+importlib.util.module_from_spec() immediately into sys.modules instead of
+after calling loader.exec_module().
+
+Thanks to Benjamin Mintz for finding the bug.


From webhook-mailer at python.org  Fri Jul 12 23:16:13 2019
From: webhook-mailer at python.org (Benjamin Peterson)
Date: Sat, 13 Jul 2019 03:16:13 -0000
Subject: [Python-checkins] closes bpo-37347: Fix refcount problem in
 sqlite3. (GH-14268)
Message-ID: <mailman.347.1562987774.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/b9a0376b0dedf16a2f82fa43d851119d1f7a2707
commit: b9a0376b0dedf16a2f82fa43d851119d1f7a2707
branch: master
author: gescheit <gescheit at yandex-team.ru>
committer: Benjamin Peterson <benjamin at python.org>
date: 2019-07-12T20:15:48-07:00
summary:

closes bpo-37347: Fix refcount problem in sqlite3. (GH-14268)

files:
A Misc/NEWS.d/next/Library/2019-06-20-14-23-48.bpo-37347.Gf9yYI.rst
M Lib/sqlite3/test/regression.py
M Misc/ACKS
M Modules/_sqlite/connection.c
M Modules/_sqlite/connection.h
M setup.py

diff --git a/Lib/sqlite3/test/regression.py b/Lib/sqlite3/test/regression.py
index ee326168bc12..c714116ac492 100644
--- a/Lib/sqlite3/test/regression.py
+++ b/Lib/sqlite3/test/regression.py
@@ -25,6 +25,7 @@
 import unittest
 import sqlite3 as sqlite
 import weakref
+import functools
 from test import support
 
 class RegressionTests(unittest.TestCase):
@@ -383,72 +384,26 @@ def CheckDelIsolation_levelSegfault(self):
         with self.assertRaises(AttributeError):
             del self.con.isolation_level
 
+    def CheckBpo37347(self):
+        class Printer:
+            def log(self, *args):
+                return sqlite.SQLITE_OK
 
-class UnhashableFunc:
-    __hash__ = None
+        for method in [self.con.set_trace_callback,
+                       functools.partial(self.con.set_progress_handler, n=1),
+                       self.con.set_authorizer]:
+            printer_instance = Printer()
+            method(printer_instance.log)
+            method(printer_instance.log)
+            self.con.execute("select 1")  # trigger seg fault
+            method(None)
 
-    def __init__(self, return_value=None):
-        self.calls = 0
-        self.return_value = return_value
-
-    def __call__(self, *args, **kwargs):
-        self.calls += 1
-        return self.return_value
-
-
-class UnhashableCallbacksTestCase(unittest.TestCase):
-    """
-    https://bugs.python.org/issue34052
-
-    Registering unhashable callbacks raises TypeError, callbacks are not
-    registered in SQLite after such registration attempt.
-    """
-    def setUp(self):
-        self.con = sqlite.connect(':memory:')
-
-    def tearDown(self):
-        self.con.close()
-
-    def test_progress_handler(self):
-        f = UnhashableFunc(return_value=0)
-        with self.assertRaisesRegex(TypeError, 'unhashable type'):
-            self.con.set_progress_handler(f, 1)
-        self.con.execute('SELECT 1')
-        self.assertFalse(f.calls)
-
-    def test_func(self):
-        func_name = 'func_name'
-        f = UnhashableFunc()
-        with self.assertRaisesRegex(TypeError, 'unhashable type'):
-            self.con.create_function(func_name, 0, f)
-        msg = 'no such function: %s' % func_name
-        with self.assertRaisesRegex(sqlite.OperationalError, msg):
-            self.con.execute('SELECT %s()' % func_name)
-        self.assertFalse(f.calls)
-
-    def test_authorizer(self):
-        f = UnhashableFunc(return_value=sqlite.SQLITE_DENY)
-        with self.assertRaisesRegex(TypeError, 'unhashable type'):
-            self.con.set_authorizer(f)
-        self.con.execute('SELECT 1')
-        self.assertFalse(f.calls)
-
-    def test_aggr(self):
-        class UnhashableType(type):
-            __hash__ = None
-        aggr_name = 'aggr_name'
-        with self.assertRaisesRegex(TypeError, 'unhashable type'):
-            self.con.create_aggregate(aggr_name, 0, UnhashableType('Aggr', (), {}))
-        msg = 'no such function: %s' % aggr_name
-        with self.assertRaisesRegex(sqlite.OperationalError, msg):
-            self.con.execute('SELECT %s()' % aggr_name)
 
 
 def suite():
     regression_suite = unittest.makeSuite(RegressionTests, "Check")
     return unittest.TestSuite((
         regression_suite,
-        unittest.makeSuite(UnhashableCallbacksTestCase),
     ))
 
 def test():
diff --git a/Misc/ACKS b/Misc/ACKS
index d916c45a8e44..c0119992cffe 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -1870,3 +1870,4 @@ Diego Rojas
 Edison Abahurire
 Geoff Shannon
 Batuhan Taskaya
+Aleksandr Balezin
diff --git a/Misc/NEWS.d/next/Library/2019-06-20-14-23-48.bpo-37347.Gf9yYI.rst b/Misc/NEWS.d/next/Library/2019-06-20-14-23-48.bpo-37347.Gf9yYI.rst
new file mode 100644
index 000000000000..1e61f5e0b3db
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2019-06-20-14-23-48.bpo-37347.Gf9yYI.rst
@@ -0,0 +1,6 @@
+:meth:`sqlite3.Connection.create_aggregate`,
+:meth:`sqlite3.Connection.create_function`,
+:meth:`sqlite3.Connection.set_authorizer`,
+:meth:`sqlite3.Connection.set_progress_handler` 
+:meth:`sqlite3.Connection.set_trace_callback` 
+methods lead to segfaults if some of these methods are called twice with an equal object but not the same. Now callbacks are stored more carefully. Patch by Aleksandr Balezin.
\ No newline at end of file
diff --git a/Modules/_sqlite/connection.c b/Modules/_sqlite/connection.c
index 47b8b62cea26..ae03aed8f0b8 100644
--- a/Modules/_sqlite/connection.c
+++ b/Modules/_sqlite/connection.c
@@ -186,10 +186,9 @@ int pysqlite_connection_init(pysqlite_Connection* self, PyObject* args, PyObject
     }
     self->check_same_thread = check_same_thread;
 
-    Py_XSETREF(self->function_pinboard, PyDict_New());
-    if (!self->function_pinboard) {
-        return -1;
-    }
+    self->function_pinboard_trace_callback = NULL;
+    self->function_pinboard_progress_handler = NULL;
+    self->function_pinboard_authorizer_cb = NULL;
 
     Py_XSETREF(self->collations, PyDict_New());
     if (!self->collations) {
@@ -249,19 +248,18 @@ void pysqlite_connection_dealloc(pysqlite_Connection* self)
 
     /* Clean up if user has not called .close() explicitly. */
     if (self->db) {
-        Py_BEGIN_ALLOW_THREADS
         SQLITE3_CLOSE(self->db);
-        Py_END_ALLOW_THREADS
     }
 
     Py_XDECREF(self->isolation_level);
-    Py_XDECREF(self->function_pinboard);
+    Py_XDECREF(self->function_pinboard_trace_callback);
+    Py_XDECREF(self->function_pinboard_progress_handler);
+    Py_XDECREF(self->function_pinboard_authorizer_cb);
     Py_XDECREF(self->row_factory);
     Py_XDECREF(self->text_factory);
     Py_XDECREF(self->collations);
     Py_XDECREF(self->statements);
     Py_XDECREF(self->cursors);
-
     Py_TYPE(self)->tp_free((PyObject*)self);
 }
 
@@ -342,9 +340,7 @@ PyObject* pysqlite_connection_close(pysqlite_Connection* self, PyObject* args)
     pysqlite_do_all_statements(self, ACTION_FINALIZE, 1);
 
     if (self->db) {
-        Py_BEGIN_ALLOW_THREADS
         rc = SQLITE3_CLOSE(self->db);
-        Py_END_ALLOW_THREADS
 
         if (rc != SQLITE_OK) {
             _pysqlite_seterror(self->db, NULL);
@@ -808,6 +804,11 @@ static void _pysqlite_drop_unused_cursor_references(pysqlite_Connection* self)
     Py_SETREF(self->cursors, new_list);
 }
 
+static void _destructor(void* args)
+{
+    Py_DECREF((PyObject*)args);
+}
+
 PyObject* pysqlite_connection_create_function(pysqlite_Connection* self, PyObject* args, PyObject* kwargs)
 {
     static char *kwlist[] = {"name", "narg", "func", "deterministic", NULL};
@@ -843,17 +844,16 @@ PyObject* pysqlite_connection_create_function(pysqlite_Connection* self, PyObjec
         flags |= SQLITE_DETERMINISTIC;
 #endif
     }
-    if (PyDict_SetItem(self->function_pinboard, func, Py_None) == -1) {
-        return NULL;
-    }
-    rc = sqlite3_create_function(self->db,
-                                 name,
-                                 narg,
-                                 flags,
-                                 (void*)func,
-                                 _pysqlite_func_callback,
-                                 NULL,
-                                 NULL);
+    Py_INCREF(func);
+    rc = sqlite3_create_function_v2(self->db,
+                                    name,
+                                    narg,
+                                    flags,
+                                    (void*)func,
+                                    _pysqlite_func_callback,
+                                    NULL,
+                                    NULL,
+                                    &_destructor);  // will decref func
 
     if (rc != SQLITE_OK) {
         /* Workaround for SQLite bug: no error code or string is available here */
@@ -880,11 +880,16 @@ PyObject* pysqlite_connection_create_aggregate(pysqlite_Connection* self, PyObje
                                       kwlist, &name, &n_arg, &aggregate_class)) {
         return NULL;
     }
-
-    if (PyDict_SetItem(self->function_pinboard, aggregate_class, Py_None) == -1) {
-        return NULL;
-    }
-    rc = sqlite3_create_function(self->db, name, n_arg, SQLITE_UTF8, (void*)aggregate_class, 0, &_pysqlite_step_callback, &_pysqlite_final_callback);
+    Py_INCREF(aggregate_class);
+    rc = sqlite3_create_function_v2(self->db,
+                                    name,
+                                    n_arg,
+                                    SQLITE_UTF8,
+                                    (void*)aggregate_class,
+                                    0,
+                                    &_pysqlite_step_callback,
+                                    &_pysqlite_final_callback,
+                                    &_destructor); // will decref func
     if (rc != SQLITE_OK) {
         /* Workaround for SQLite bug: no error code or string is available here */
         PyErr_SetString(pysqlite_OperationalError, "Error creating aggregate");
@@ -1003,13 +1008,14 @@ static PyObject* pysqlite_connection_set_authorizer(pysqlite_Connection* self, P
         return NULL;
     }
 
-    if (PyDict_SetItem(self->function_pinboard, authorizer_cb, Py_None) == -1) {
-        return NULL;
-    }
     rc = sqlite3_set_authorizer(self->db, _authorizer_callback, (void*)authorizer_cb);
     if (rc != SQLITE_OK) {
         PyErr_SetString(pysqlite_OperationalError, "Error setting authorizer callback");
+        Py_XSETREF(self->function_pinboard_authorizer_cb, NULL);
         return NULL;
+    } else {
+        Py_INCREF(authorizer_cb);
+        Py_XSETREF(self->function_pinboard_authorizer_cb, authorizer_cb);
     }
     Py_RETURN_NONE;
 }
@@ -1033,12 +1039,12 @@ static PyObject* pysqlite_connection_set_progress_handler(pysqlite_Connection* s
     if (progress_handler == Py_None) {
         /* None clears the progress handler previously set */
         sqlite3_progress_handler(self->db, 0, 0, (void*)0);
+        Py_XSETREF(self->function_pinboard_progress_handler, NULL);
     } else {
-        if (PyDict_SetItem(self->function_pinboard, progress_handler, Py_None) == -1)
-            return NULL;
         sqlite3_progress_handler(self->db, n, _progress_handler, progress_handler);
+        Py_INCREF(progress_handler);
+        Py_XSETREF(self->function_pinboard_progress_handler, progress_handler);
     }
-
     Py_RETURN_NONE;
 }
 
@@ -1060,10 +1066,11 @@ static PyObject* pysqlite_connection_set_trace_callback(pysqlite_Connection* sel
     if (trace_callback == Py_None) {
         /* None clears the trace callback previously set */
         sqlite3_trace(self->db, 0, (void*)0);
+        Py_XSETREF(self->function_pinboard_trace_callback, NULL);
     } else {
-        if (PyDict_SetItem(self->function_pinboard, trace_callback, Py_None) == -1)
-            return NULL;
         sqlite3_trace(self->db, _trace_callback, trace_callback);
+        Py_INCREF(trace_callback);
+        Py_XSETREF(self->function_pinboard_trace_callback, trace_callback);
     }
 
     Py_RETURN_NONE;
diff --git a/Modules/_sqlite/connection.h b/Modules/_sqlite/connection.h
index 4e9d94c5f308..206085e00a00 100644
--- a/Modules/_sqlite/connection.h
+++ b/Modules/_sqlite/connection.h
@@ -85,11 +85,10 @@ typedef struct
      */
     PyObject* text_factory;
 
-    /* remember references to functions/classes used in
-     * create_function/create/aggregate, use these as dictionary keys, so we
-     * can keep the total system refcount constant by clearing that dictionary
-     * in connection_dealloc */
-    PyObject* function_pinboard;
+    /* remember references to object used in trace_callback/progress_handler/authorizer_cb */
+    PyObject* function_pinboard_trace_callback;
+    PyObject* function_pinboard_progress_handler;
+    PyObject* function_pinboard_authorizer_cb;
 
     /* a dictionary of registered collation name => collation callable mappings */
     PyObject* collations;
diff --git a/setup.py b/setup.py
index 3ec89cedfd57..7cd77257ae35 100644
--- a/setup.py
+++ b/setup.py
@@ -1357,7 +1357,7 @@ def detect_sqlite(self):
                              ]
         if CROSS_COMPILING:
             sqlite_inc_paths = []
-        MIN_SQLITE_VERSION_NUMBER = (3, 3, 9)
+        MIN_SQLITE_VERSION_NUMBER = (3, 7, 2)
         MIN_SQLITE_VERSION = ".".join([str(x)
                                     for x in MIN_SQLITE_VERSION_NUMBER])
 


From webhook-mailer at python.org  Fri Jul 12 23:33:58 2019
From: webhook-mailer at python.org (Miss Islington (bot))
Date: Sat, 13 Jul 2019 03:33:58 -0000
Subject: [Python-checkins] closes bpo-37347: Fix refcount problem in
 sqlite3. (GH-14268)
Message-ID: <mailman.348.1562988839.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/36101c2c5daf692d1716e17720c6c5197f28e25d
commit: 36101c2c5daf692d1716e17720c6c5197f28e25d
branch: 3.8
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: GitHub <noreply at github.com>
date: 2019-07-12T20:33:53-07:00
summary:

closes bpo-37347: Fix refcount problem in sqlite3. (GH-14268)

(cherry picked from commit b9a0376b0dedf16a2f82fa43d851119d1f7a2707)

Co-authored-by: gescheit <gescheit at yandex-team.ru>

files:
A Misc/NEWS.d/next/Library/2019-06-20-14-23-48.bpo-37347.Gf9yYI.rst
M Lib/sqlite3/test/regression.py
M Misc/ACKS
M Modules/_sqlite/connection.c
M Modules/_sqlite/connection.h
M setup.py

diff --git a/Lib/sqlite3/test/regression.py b/Lib/sqlite3/test/regression.py
index 865bd88f74f1..dd5aec50d186 100644
--- a/Lib/sqlite3/test/regression.py
+++ b/Lib/sqlite3/test/regression.py
@@ -25,6 +25,7 @@
 import unittest
 import sqlite3 as sqlite
 import weakref
+import functools
 from test import support
 
 class RegressionTests(unittest.TestCase):
@@ -383,72 +384,26 @@ def CheckDelIsolation_levelSegfault(self):
         with self.assertRaises(AttributeError):
             del self.con.isolation_level
 
+    def CheckBpo37347(self):
+        class Printer:
+            def log(self, *args):
+                return sqlite.SQLITE_OK
 
-class UnhashableFunc:
-    __hash__ = None
+        for method in [self.con.set_trace_callback,
+                       functools.partial(self.con.set_progress_handler, n=1),
+                       self.con.set_authorizer]:
+            printer_instance = Printer()
+            method(printer_instance.log)
+            method(printer_instance.log)
+            self.con.execute("select 1")  # trigger seg fault
+            method(None)
 
-    def __init__(self, return_value=None):
-        self.calls = 0
-        self.return_value = return_value
-
-    def __call__(self, *args, **kwargs):
-        self.calls += 1
-        return self.return_value
-
-
-class UnhashableCallbacksTestCase(unittest.TestCase):
-    """
-    https://bugs.python.org/issue34052
-
-    Registering unhashable callbacks raises TypeError, callbacks are not
-    registered in SQLite after such registration attempt.
-    """
-    def setUp(self):
-        self.con = sqlite.connect(':memory:')
-
-    def tearDown(self):
-        self.con.close()
-
-    def test_progress_handler(self):
-        f = UnhashableFunc(return_value=0)
-        with self.assertRaisesRegex(TypeError, 'unhashable type'):
-            self.con.set_progress_handler(f, 1)
-        self.con.execute('SELECT 1')
-        self.assertFalse(f.calls)
-
-    def test_func(self):
-        func_name = 'func_name'
-        f = UnhashableFunc()
-        with self.assertRaisesRegex(TypeError, 'unhashable type'):
-            self.con.create_function(func_name, 0, f)
-        msg = 'no such function: %s' % func_name
-        with self.assertRaisesRegex(sqlite.OperationalError, msg):
-            self.con.execute('SELECT %s()' % func_name)
-        self.assertFalse(f.calls)
-
-    def test_authorizer(self):
-        f = UnhashableFunc(return_value=sqlite.SQLITE_DENY)
-        with self.assertRaisesRegex(TypeError, 'unhashable type'):
-            self.con.set_authorizer(f)
-        self.con.execute('SELECT 1')
-        self.assertFalse(f.calls)
-
-    def test_aggr(self):
-        class UnhashableType(type):
-            __hash__ = None
-        aggr_name = 'aggr_name'
-        with self.assertRaisesRegex(TypeError, 'unhashable type'):
-            self.con.create_aggregate(aggr_name, 0, UnhashableType('Aggr', (), {}))
-        msg = 'no such function: %s' % aggr_name
-        with self.assertRaisesRegex(sqlite.OperationalError, msg):
-            self.con.execute('SELECT %s()' % aggr_name)
 
 
 def suite():
     regression_suite = unittest.makeSuite(RegressionTests, "Check")
     return unittest.TestSuite((
         regression_suite,
-        unittest.makeSuite(UnhashableCallbacksTestCase),
     ))
 
 def test():
diff --git a/Misc/ACKS b/Misc/ACKS
index f427d8b5a929..53285403e695 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -1866,3 +1866,4 @@ Diego Rojas
 Edison Abahurire
 Geoff Shannon
 Batuhan Taskaya
+Aleksandr Balezin
diff --git a/Misc/NEWS.d/next/Library/2019-06-20-14-23-48.bpo-37347.Gf9yYI.rst b/Misc/NEWS.d/next/Library/2019-06-20-14-23-48.bpo-37347.Gf9yYI.rst
new file mode 100644
index 000000000000..1e61f5e0b3db
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2019-06-20-14-23-48.bpo-37347.Gf9yYI.rst
@@ -0,0 +1,6 @@
+:meth:`sqlite3.Connection.create_aggregate`,
+:meth:`sqlite3.Connection.create_function`,
+:meth:`sqlite3.Connection.set_authorizer`,
+:meth:`sqlite3.Connection.set_progress_handler` 
+:meth:`sqlite3.Connection.set_trace_callback` 
+methods lead to segfaults if some of these methods are called twice with an equal object but not the same. Now callbacks are stored more carefully. Patch by Aleksandr Balezin.
\ No newline at end of file
diff --git a/Modules/_sqlite/connection.c b/Modules/_sqlite/connection.c
index 0d6462ef7dc2..ebe073f644aa 100644
--- a/Modules/_sqlite/connection.c
+++ b/Modules/_sqlite/connection.c
@@ -186,10 +186,9 @@ int pysqlite_connection_init(pysqlite_Connection* self, PyObject* args, PyObject
     }
     self->check_same_thread = check_same_thread;
 
-    Py_XSETREF(self->function_pinboard, PyDict_New());
-    if (!self->function_pinboard) {
-        return -1;
-    }
+    self->function_pinboard_trace_callback = NULL;
+    self->function_pinboard_progress_handler = NULL;
+    self->function_pinboard_authorizer_cb = NULL;
 
     Py_XSETREF(self->collations, PyDict_New());
     if (!self->collations) {
@@ -249,19 +248,18 @@ void pysqlite_connection_dealloc(pysqlite_Connection* self)
 
     /* Clean up if user has not called .close() explicitly. */
     if (self->db) {
-        Py_BEGIN_ALLOW_THREADS
         SQLITE3_CLOSE(self->db);
-        Py_END_ALLOW_THREADS
     }
 
     Py_XDECREF(self->isolation_level);
-    Py_XDECREF(self->function_pinboard);
+    Py_XDECREF(self->function_pinboard_trace_callback);
+    Py_XDECREF(self->function_pinboard_progress_handler);
+    Py_XDECREF(self->function_pinboard_authorizer_cb);
     Py_XDECREF(self->row_factory);
     Py_XDECREF(self->text_factory);
     Py_XDECREF(self->collations);
     Py_XDECREF(self->statements);
     Py_XDECREF(self->cursors);
-
     Py_TYPE(self)->tp_free((PyObject*)self);
 }
 
@@ -342,9 +340,7 @@ PyObject* pysqlite_connection_close(pysqlite_Connection* self, PyObject* args)
     pysqlite_do_all_statements(self, ACTION_FINALIZE, 1);
 
     if (self->db) {
-        Py_BEGIN_ALLOW_THREADS
         rc = SQLITE3_CLOSE(self->db);
-        Py_END_ALLOW_THREADS
 
         if (rc != SQLITE_OK) {
             _pysqlite_seterror(self->db, NULL);
@@ -808,6 +804,11 @@ static void _pysqlite_drop_unused_cursor_references(pysqlite_Connection* self)
     Py_SETREF(self->cursors, new_list);
 }
 
+static void _destructor(void* args)
+{
+    Py_DECREF((PyObject*)args);
+}
+
 PyObject* pysqlite_connection_create_function(pysqlite_Connection* self, PyObject* args, PyObject* kwargs)
 {
     static char *kwlist[] = {"name", "narg", "func", "deterministic", NULL};
@@ -843,17 +844,16 @@ PyObject* pysqlite_connection_create_function(pysqlite_Connection* self, PyObjec
         flags |= SQLITE_DETERMINISTIC;
 #endif
     }
-    if (PyDict_SetItem(self->function_pinboard, func, Py_None) == -1) {
-        return NULL;
-    }
-    rc = sqlite3_create_function(self->db,
-                                 name,
-                                 narg,
-                                 flags,
-                                 (void*)func,
-                                 _pysqlite_func_callback,
-                                 NULL,
-                                 NULL);
+    Py_INCREF(func);
+    rc = sqlite3_create_function_v2(self->db,
+                                    name,
+                                    narg,
+                                    flags,
+                                    (void*)func,
+                                    _pysqlite_func_callback,
+                                    NULL,
+                                    NULL,
+                                    &_destructor);  // will decref func
 
     if (rc != SQLITE_OK) {
         /* Workaround for SQLite bug: no error code or string is available here */
@@ -880,11 +880,16 @@ PyObject* pysqlite_connection_create_aggregate(pysqlite_Connection* self, PyObje
                                       kwlist, &name, &n_arg, &aggregate_class)) {
         return NULL;
     }
-
-    if (PyDict_SetItem(self->function_pinboard, aggregate_class, Py_None) == -1) {
-        return NULL;
-    }
-    rc = sqlite3_create_function(self->db, name, n_arg, SQLITE_UTF8, (void*)aggregate_class, 0, &_pysqlite_step_callback, &_pysqlite_final_callback);
+    Py_INCREF(aggregate_class);
+    rc = sqlite3_create_function_v2(self->db,
+                                    name,
+                                    n_arg,
+                                    SQLITE_UTF8,
+                                    (void*)aggregate_class,
+                                    0,
+                                    &_pysqlite_step_callback,
+                                    &_pysqlite_final_callback,
+                                    &_destructor); // will decref func
     if (rc != SQLITE_OK) {
         /* Workaround for SQLite bug: no error code or string is available here */
         PyErr_SetString(pysqlite_OperationalError, "Error creating aggregate");
@@ -1003,13 +1008,14 @@ static PyObject* pysqlite_connection_set_authorizer(pysqlite_Connection* self, P
         return NULL;
     }
 
-    if (PyDict_SetItem(self->function_pinboard, authorizer_cb, Py_None) == -1) {
-        return NULL;
-    }
     rc = sqlite3_set_authorizer(self->db, _authorizer_callback, (void*)authorizer_cb);
     if (rc != SQLITE_OK) {
         PyErr_SetString(pysqlite_OperationalError, "Error setting authorizer callback");
+        Py_XSETREF(self->function_pinboard_authorizer_cb, NULL);
         return NULL;
+    } else {
+        Py_INCREF(authorizer_cb);
+        Py_XSETREF(self->function_pinboard_authorizer_cb, authorizer_cb);
     }
     Py_RETURN_NONE;
 }
@@ -1033,12 +1039,12 @@ static PyObject* pysqlite_connection_set_progress_handler(pysqlite_Connection* s
     if (progress_handler == Py_None) {
         /* None clears the progress handler previously set */
         sqlite3_progress_handler(self->db, 0, 0, (void*)0);
+        Py_XSETREF(self->function_pinboard_progress_handler, NULL);
     } else {
-        if (PyDict_SetItem(self->function_pinboard, progress_handler, Py_None) == -1)
-            return NULL;
         sqlite3_progress_handler(self->db, n, _progress_handler, progress_handler);
+        Py_INCREF(progress_handler);
+        Py_XSETREF(self->function_pinboard_progress_handler, progress_handler);
     }
-
     Py_RETURN_NONE;
 }
 
@@ -1060,10 +1066,11 @@ static PyObject* pysqlite_connection_set_trace_callback(pysqlite_Connection* sel
     if (trace_callback == Py_None) {
         /* None clears the trace callback previously set */
         sqlite3_trace(self->db, 0, (void*)0);
+        Py_XSETREF(self->function_pinboard_trace_callback, NULL);
     } else {
-        if (PyDict_SetItem(self->function_pinboard, trace_callback, Py_None) == -1)
-            return NULL;
         sqlite3_trace(self->db, _trace_callback, trace_callback);
+        Py_INCREF(trace_callback);
+        Py_XSETREF(self->function_pinboard_trace_callback, trace_callback);
     }
 
     Py_RETURN_NONE;
diff --git a/Modules/_sqlite/connection.h b/Modules/_sqlite/connection.h
index 4e9d94c5f308..206085e00a00 100644
--- a/Modules/_sqlite/connection.h
+++ b/Modules/_sqlite/connection.h
@@ -85,11 +85,10 @@ typedef struct
      */
     PyObject* text_factory;
 
-    /* remember references to functions/classes used in
-     * create_function/create/aggregate, use these as dictionary keys, so we
-     * can keep the total system refcount constant by clearing that dictionary
-     * in connection_dealloc */
-    PyObject* function_pinboard;
+    /* remember references to object used in trace_callback/progress_handler/authorizer_cb */
+    PyObject* function_pinboard_trace_callback;
+    PyObject* function_pinboard_progress_handler;
+    PyObject* function_pinboard_authorizer_cb;
 
     /* a dictionary of registered collation name => collation callable mappings */
     PyObject* collations;
diff --git a/setup.py b/setup.py
index edc343424297..6cbbec9e1212 100644
--- a/setup.py
+++ b/setup.py
@@ -1348,7 +1348,7 @@ def detect_sqlite(self):
                              ]
         if CROSS_COMPILING:
             sqlite_inc_paths = []
-        MIN_SQLITE_VERSION_NUMBER = (3, 3, 9)
+        MIN_SQLITE_VERSION_NUMBER = (3, 7, 2)
         MIN_SQLITE_VERSION = ".".join([str(x)
                                     for x in MIN_SQLITE_VERSION_NUMBER])
 


From webhook-mailer at python.org  Sat Jul 13 04:35:16 2019
From: webhook-mailer at python.org (Xiang Zhang)
Date: Sat, 13 Jul 2019 08:35:16 -0000
Subject: [Python-checkins] Fix typo in re.escape documentation (GH-14722)
Message-ID: <mailman.349.1563006916.29657.python-checkins@python.org>

https://github.com/python/cpython/commit/fb6c1f8d3b116c7e3e3f814bf750d984a2f2ecbf
commit: fb6c1f8d3b116c7e3e3f814bf750d984a2f2ecbf
branch: master
author: Robert DiPietro <rdipietro at gmail.com>
committer: Xiang Zhang <angwerzx at 126.com>
date: 2019-07-13T16:35:04+08:00
summary:

Fix typo in re.escape documentation (GH-14722)

files:
M D