Mailman 3 May 2021 - Python-checkins

Fixing doc for callback for lambda (GG-25779) (GH-25788)
by ericvsmith May 1, 2021

May 1, 2021

https://github.com/python/cpython/commit/5c018db4673aceab69dccb3e68579bbb87… commit: 5c018db4673aceab69dccb3e68579bbb8756164f branch: 3.9 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: ericvsmith <ericvsmith(a)users.noreply.github.com> date: 2021-05-01T15:55:46-04:00 summary: Fixing doc for callback for lambda (GG-25779) (GH-25788) Fixing callback for lambda when no return value is provided (cherry picked from commit 50c21ad35372983680b44130be560d856c5f27ca) Co-authored-by: Shreyash Sharma <shreyash.sharma(a)philips.com> Co-authored-by: Shreyash Sharma <shreyash.sharma(a)philips.com> files: M Doc/library/types.rst diff --git a/Doc/library/types.rst b/Doc/library/types.rst index d1099cf2af085..83e2cb4cbddb6 100644 --- a/Doc/library/types.rst +++ b/Doc/library/types.rst @@ -34,7 +34,7 @@ Dynamic Type Creation freshly created class namespace. It should accept the class namespace as its sole argument and update the namespace directly with the class contents. If no callback is provided, it has the same effect as passing - in ``lambda ns: ns``. + in ``lambda ns: None``. .. versionadded:: 3.3

1 0

bpo-43957: Add a missins space to the new format enum warning (#25770)
by pablogsal May 1, 2021

May 1, 2021

https://github.com/python/cpython/commit/9a42d5069a4c2a531076abfb198d2be26b… commit: 9a42d5069a4c2a531076abfb198d2be26b57216c branch: master author: Pablo Galindo <Pablogsal(a)gmail.com> committer: pablogsal <Pablogsal(a)gmail.com> date: 2021-05-01T20:26:09+01:00 summary: bpo-43957: Add a missins space to the new format enum warning (#25770) files: M Lib/enum.py diff --git a/Lib/enum.py b/Lib/enum.py index bccf024b520a9..01f431001a9bf 100644 --- a/Lib/enum.py +++ b/Lib/enum.py @@ -1018,7 +1018,7 @@ def __format__(self, format_spec): import warnings warnings.warn( "in 3.12 format() will use the enum member, not the enum member's value;\n" - "use a format specifier, such as :d for an IntEnum member, to maintain" + "use a format specifier, such as :d for an IntEnum member, to maintain " "the current display", DeprecationWarning, stacklevel=2,

1 0

bpo-43998: Default to TLS 1.2 and increase cipher suite security (GH-25778)
by tiran May 1, 2021

May 1, 2021

https://github.com/python/cpython/commit/e983252b516edb15d4338b0a47631b59ef… commit: e983252b516edb15d4338b0a47631b59ef1e2536 branch: master author: Christian Heimes <christian(a)python.org> committer: tiran <christian(a)python.org> date: 2021-05-01T20:53:10+02:00 summary: bpo-43998: Default to TLS 1.2 and increase cipher suite security (GH-25778) The ssl module now has more secure default settings. Ciphers without forward secrecy or SHA-1 MAC are disabled by default. Security level 2 prohibits weak RSA, DH, and ECC keys with less than 112 bits of security. :class:`~ssl.SSLContext` defaults to minimum protocol version TLS 1.2. Settings are based on Hynek Schlawack's research. ``` $ openssl version OpenSSL 1.1.1k FIPS 25 Mar 2021 $ openssl ciphers -v '@SECLEVEL=2:ECDH+AESGCM:ECDH+CHACHA20:ECDH+AES:DHE+AES:!aNULL:!eNULL:!aDSS:!SHA1:!AESCCM' TLS_AES_256_GCM_SHA384 TLSv1.3 Kx=any Au=any Enc=AESGCM(256) Mac=AEAD TLS_CHACHA20_POLY1305_SHA256 TLSv1.3 Kx=any Au=any Enc=CHACHA20/POLY1305(256) Mac=AEAD TLS_AES_128_GCM_SHA256 TLSv1.3 Kx=any Au=any Enc=AESGCM(128) Mac=AEAD TLS_AES_128_CCM_SHA256 TLSv1.3 Kx=any Au=any Enc=AESCCM(128) Mac=AEAD ECDHE-ECDSA-AES256-GCM-SHA384 TLSv1.2 Kx=ECDH Au=ECDSA Enc=AESGCM(256) Mac=AEAD ECDHE-RSA-AES256-GCM-SHA384 TLSv1.2 Kx=ECDH Au=RSA Enc=AESGCM(256) Mac=AEAD ECDHE-ECDSA-AES128-GCM-SHA256 TLSv1.2 Kx=ECDH Au=ECDSA Enc=AESGCM(128) Mac=AEAD ECDHE-RSA-AES128-GCM-SHA256 TLSv1.2 Kx=ECDH Au=RSA Enc=AESGCM(128) Mac=AEAD ECDHE-ECDSA-CHACHA20-POLY1305 TLSv1.2 Kx=ECDH Au=ECDSA Enc=CHACHA20/POLY1305(256) Mac=AEAD ECDHE-RSA-CHACHA20-POLY1305 TLSv1.2 Kx=ECDH Au=RSA Enc=CHACHA20/POLY1305(256) Mac=AEAD ECDHE-ECDSA-AES256-SHA384 TLSv1.2 Kx=ECDH Au=ECDSA Enc=AES(256) Mac=SHA384 ECDHE-RSA-AES256-SHA384 TLSv1.2 Kx=ECDH Au=RSA Enc=AES(256) Mac=SHA384 ECDHE-ECDSA-AES128-SHA256 TLSv1.2 Kx=ECDH Au=ECDSA Enc=AES(128) Mac=SHA256 ECDHE-RSA-AES128-SHA256 TLSv1.2 Kx=ECDH Au=RSA Enc=AES(128) Mac=SHA256 DHE-RSA-AES256-GCM-SHA384 TLSv1.2 Kx=DH Au=RSA Enc=AESGCM(256) Mac=AEAD DHE-RSA-AES128-GCM-SHA256 TLSv1.2 Kx=DH Au=RSA Enc=AESGCM(128) Mac=AEAD DHE-RSA-AES256-SHA256 TLSv1.2 Kx=DH Au=RSA Enc=AES(256) Mac=SHA256 DHE-RSA-AES128-SHA256 TLSv1.2 Kx=DH Au=RSA Enc=AES(128) Mac=SHA256 ``` Signed-off-by: Christian Heimes <christian(a)python.org> files: A Misc/NEWS.d/next/Security/2021-05-01-13-13-40.bpo-43998.xhmWD7.rst M Doc/library/ssl.rst M Doc/using/configure.rst M Doc/whatsnew/3.10.rst M Lib/test/test_nntplib.py M Modules/_ssl.c M configure M configure.ac diff --git a/Doc/library/ssl.rst b/Doc/library/ssl.rst index f7c49dc7c1ea79..4d43fa0b792849 100644 --- a/Doc/library/ssl.rst +++ b/Doc/library/ssl.rst @@ -1509,6 +1509,14 @@ to speed up repeated connections from the same clients. context class will either require :data:`PROTOCOL_TLS_CLIENT` or :data:`PROTOCOL_TLS_SERVER` protocol in the future. + .. versionchanged:: 3.10 + + The default cipher suites now include only secure AES and ChaCha20 + ciphers with forward secrecy and security level 2. RSA and DH keys with + less than 2048 bits and ECC keys with less than 224 bits are prohibited. + :data:`PROTOCOL_TLS`, :data:`PROTOCOL_TLS_CLIENT`, and + :data:`PROTOCOL_TLS_SERVER` use TLS 1.2 as minimum TLS version. + :class:`SSLContext` objects have the following methods and attributes: diff --git a/Doc/using/configure.rst b/Doc/using/configure.rst index 4f3953ea5d7580..c37540c7e031d6 100644 --- a/Doc/using/configure.rst +++ b/Doc/using/configure.rst @@ -441,12 +441,16 @@ Security Options * ``python`` (default): use Python's preferred selection; * ``openssl``: leave OpenSSL's defaults untouched; - * *STRING*: use a custom string, PROTOCOL_SSLv2 ignores the setting. + * *STRING*: use a custom string See the :mod:`ssl` module. .. versionadded:: 3.7 + .. versionchanged:: 3.10 + + The settings ``python`` and *STRING* also set TLS 1.2 as minimum + protocol version. macOS Options ------------- diff --git a/Doc/whatsnew/3.10.rst b/Doc/whatsnew/3.10.rst index 797e1e3b21bf2b..a59e2e511154b2 100644 --- a/Doc/whatsnew/3.10.rst +++ b/Doc/whatsnew/3.10.rst @@ -1105,6 +1105,13 @@ Added option to create MPTCP sockets with ``IPPROTO_MPTCP`` ssl --- +The ssl module now has more secure default settings. Ciphers without forward +secrecy or SHA-1 MAC are disabled by default. Security level 2 prohibits +weak RSA, DH, and ECC keys with less than 112 bits of security. +:class:`~ssl.SSLContext` defaults to minimum protocol version TLS 1.2. +Settings are based on Hynek Schlawack's research. +(Contributed by Christian Heimes in :issue:`43998`.) + Add a *timeout* parameter to the :func:`ssl.get_server_certificate` function. (Contributed by Zackery Spytz in :issue:`31870`.) diff --git a/Lib/test/test_nntplib.py b/Lib/test/test_nntplib.py index 230a4443894678..19509463a2ba13 100644 --- a/Lib/test/test_nntplib.py +++ b/Lib/test/test_nntplib.py @@ -37,6 +37,8 @@ class SSLError(Exception): class NetworkedNNTPTestsMixin: + ssl_context = None + def test_welcome(self): welcome = self.server.getwelcome() self.assertEqual(str, type(welcome)) @@ -273,18 +275,21 @@ def is_connected(): return False return True + kwargs = dict( + timeout=support.INTERNET_TIMEOUT, + usenetrc=False + ) + if self.ssl_context is not None: + kwargs["ssl_context"] = self.ssl_context + try: - server = self.NNTP_CLASS(self.NNTP_HOST, - timeout=support.INTERNET_TIMEOUT, - usenetrc=False) + server = self.NNTP_CLASS(self.NNTP_HOST, **kwargs) with server: self.assertTrue(is_connected()) self.assertTrue(server.help()) self.assertFalse(is_connected()) - server = self.NNTP_CLASS(self.NNTP_HOST, - timeout=support.INTERNET_TIMEOUT, - usenetrc=False) + server = self.NNTP_CLASS(self.NNTP_HOST, **kwargs) with server: server.quit() self.assertFalse(is_connected()) @@ -316,16 +321,21 @@ class NetworkedNNTPTests(NetworkedNNTPTestsMixin, unittest.TestCase): @classmethod def setUpClass(cls): support.requires("network") + kwargs = dict( + timeout=support.INTERNET_TIMEOUT, + usenetrc=False + ) + if cls.ssl_context is not None: + kwargs["ssl_context"] = cls.ssl_context with socket_helper.transient_internet(cls.NNTP_HOST): try: - cls.server = cls.NNTP_CLASS(cls.NNTP_HOST, - timeout=support.INTERNET_TIMEOUT, - usenetrc=False) + cls.server = cls.NNTP_CLASS(cls.NNTP_HOST, **kwargs) except SSLError as ssl_err: # matches "[SSL: DH_KEY_TOO_SMALL] dh key too small" if re.search(r'(?i)KEY.TOO.SMALL', ssl_err.reason): raise unittest.SkipTest(f"{cls} got {ssl_err} connecting " f"to {cls.NNTP_HOST!r}") + print(cls.NNTP_HOST) raise except EOF_ERRORS: raise unittest.SkipTest(f"{cls} got EOF error on connecting " @@ -358,6 +368,9 @@ class NetworkedNNTP_SSLTests(NetworkedNNTPTests): # Disabled as the connection will already be encrypted. test_starttls = None + ssl_context = ssl._create_unverified_context() + ssl_context.set_ciphers("DEFAULT") + ssl_context.maximum_version = ssl.TLSVersion.TLSv1_2 # # Non-networked tests using a local server (or something mocking it). diff --git a/Misc/NEWS.d/next/Security/2021-05-01-13-13-40.bpo-43998.xhmWD7.rst b/Misc/NEWS.d/next/Security/2021-05-01-13-13-40.bpo-43998.xhmWD7.rst new file mode 100644 index 00000000000000..6a40346128e187 --- /dev/null +++ b/Misc/NEWS.d/next/Security/2021-05-01-13-13-40.bpo-43998.xhmWD7.rst @@ -0,0 +1,5 @@ +The :mod:`ssl` module sets more secure cipher suites defaults. Ciphers +without forward secrecy and with SHA-1 MAC are disabled by default. Security +level 2 prohibits weak RSA, DH, and ECC keys with less than 112 bits of +security. :class:`~ssl.SSLContext` defaults to minimum protocol version TLS +1.2. Settings are based on Hynek Schlawack's research. diff --git a/Modules/_ssl.c b/Modules/_ssl.c index 65370c58a38b5d..91639277a83027 100644 --- a/Modules/_ssl.c +++ b/Modules/_ssl.c @@ -152,15 +152,27 @@ extern const SSL_METHOD *TLSv1_2_method(void); #ifndef PY_SSL_DEFAULT_CIPHER_STRING #error "Py_SSL_DEFAULT_CIPHERS 0 needs Py_SSL_DEFAULT_CIPHER_STRING" #endif + #ifndef PY_SSL_MIN_PROTOCOL + #define PY_SSL_MIN_PROTOCOL TLS1_2_VERSION + #endif #elif PY_SSL_DEFAULT_CIPHERS == 1 /* Python custom selection of sensible cipher suites - * DEFAULT: OpenSSL's default cipher list. Since 1.0.2 the list is in sensible order. + * @SECLEVEL=2: security level 2 with 112 bits minimum security (e.g. 2048 bits RSA key) + * ECDH+*: enable ephemeral elliptic curve Diffie-Hellman + * DHE+*: fallback to ephemeral finite field Diffie-Hellman + * encryption order: AES AEAD (GCM), ChaCha AEAD, AES CBC * !aNULL:!eNULL: really no NULL ciphers - * !MD5:!3DES:!DES:!RC4:!IDEA:!SEED: no weak or broken algorithms on old OpenSSL versions. * !aDSS: no authentication with discrete logarithm DSA algorithm - * !SRP:!PSK: no secure remote password or pre-shared key authentication + * !SHA1: no weak SHA1 MAC + * !AESCCM: no CCM mode, it's uncommon and slow + * + * Based on Hynek's excellent blog post (update 2021-02-11) + * https://hynek.me/articles/hardening-your-web-servers-ssl-ciphers/ */ - #define PY_SSL_DEFAULT_CIPHER_STRING "DEFAULT:!aNULL:!eNULL:!MD5:!3DES:!DES:!RC4:!IDEA:!SEED:!aDSS:!SRP:!PSK" + #define PY_SSL_DEFAULT_CIPHER_STRING "@SECLEVEL=2:ECDH+AESGCM:ECDH+CHACHA20:ECDH+AES:DHE+AES:!aNULL:!eNULL:!aDSS:!SHA1:!AESCCM" + #ifndef PY_SSL_MIN_PROTOCOL + #define PY_SSL_MIN_PROTOCOL TLS1_2_VERSION + #endif #elif PY_SSL_DEFAULT_CIPHERS == 2 /* Ignored in SSLContext constructor, only used to as _ssl.DEFAULT_CIPHER_STRING */ #define PY_SSL_DEFAULT_CIPHER_STRING SSL_DEFAULT_CIPHER_LIST @@ -3095,8 +3107,25 @@ _ssl__SSLContext_impl(PyTypeObject *type, int proto_version) ERR_clear_error(); PyErr_SetString(get_state_ctx(self)->PySSLErrorObject, "No cipher can be selected."); - return NULL; + goto error; } +#ifdef PY_SSL_MIN_PROTOCOL + switch(proto_version) { + case PY_SSL_VERSION_TLS: + case PY_SSL_VERSION_TLS_CLIENT: + case PY_SSL_VERSION_TLS_SERVER: + result = SSL_CTX_set_min_proto_version(ctx, PY_SSL_MIN_PROTOCOL); + if (result == 0) { + PyErr_Format(PyExc_ValueError, + "Failed to set minimum protocol 0x%x", + PY_SSL_MIN_PROTOCOL); + goto error; + } + break; + default: + break; + } +#endif /* Set SSL_MODE_RELEASE_BUFFERS. This potentially greatly reduces memory usage for no cost at all. */ @@ -3119,6 +3148,10 @@ _ssl__SSLContext_impl(PyTypeObject *type, int proto_version) #endif return (PyObject *)self; + error: + Py_XDECREF(self); + ERR_clear_error(); + return NULL; } static int diff --git a/configure b/configure index 08a88aa46d5e19..4dc0eabf24c03e 100755 --- a/configure +++ b/configure @@ -1604,8 +1604,8 @@ Optional Packages: override default cipher suites string, python: use Python's preferred selection (default), openssl: leave OpenSSL's defaults untouched, STRING: use a - custom string, PROTOCOL_SSLv2 ignores the setting, - see Doc/library/ssl.rst + custom string, python and STRING also set TLS 1.2 as + minimum TLS version --with-builtin-hashlib-hashes=md5,sha1,sha256,sha512,sha3,blake2 builtin hash modules, md5, sha1, sha256, sha512, sha3 (with shake), blake2 diff --git a/configure.ac b/configure.ac index b2643292b2c3e3..221996a1de52f0 100644 --- a/configure.ac +++ b/configure.ac @@ -5836,7 +5836,7 @@ AC_ARG_WITH(ssl-default-suites, python: use Python's preferred selection (default), openssl: leave OpenSSL's defaults untouched, STRING: use a custom string, - PROTOCOL_SSLv2 ignores the setting, see Doc/library/ssl.rst]), + python and STRING also set TLS 1.2 as minimum TLS version]), [ AC_MSG_RESULT($withval) case "$withval" in

1 0

Fixing doc for callback for lambda (GH-25779) (GH-25789)
by ericvsmith May 1, 2021

May 1, 2021

https://github.com/python/cpython/commit/3519ac416df230d686fdec470352f25fcc… commit: 3519ac416df230d686fdec470352f25fcce4a54b branch: 3.8 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: ericvsmith <ericvsmith(a)users.noreply.github.com> date: 2021-05-01T14:26:46-04:00 summary: Fixing doc for callback for lambda (GH-25779) (GH-25789) Fixing callback for lambda when no return value is provided (cherry picked from commit 50c21ad35372983680b44130be560d856c5f27ca) Co-authored-by: Shreyash Sharma <shreyash.sharma(a)philips.com> Co-authored-by: Shreyash Sharma <shreyash.sharma(a)philips.com> files: M Doc/library/types.rst diff --git a/Doc/library/types.rst b/Doc/library/types.rst index 999a1f40c3391..ef19031910fd7 100644 --- a/Doc/library/types.rst +++ b/Doc/library/types.rst @@ -34,7 +34,7 @@ Dynamic Type Creation freshly created class namespace. It should accept the class namespace as its sole argument and update the namespace directly with the class contents. If no callback is provided, it has the same effect as passing - in ``lambda ns: ns``. + in ``lambda ns: None``. .. versionadded:: 3.3

1 0

Fixing doc for callback for lambda (GG-25779)
by ericvsmith May 1, 2021

May 1, 2021

https://github.com/python/cpython/commit/50c21ad35372983680b44130be560d856c… commit: 50c21ad35372983680b44130be560d856c5f27ca branch: master author: Shreyash Sharma <shreyash.sharma(a)philips.com> committer: ericvsmith <ericvsmith(a)users.noreply.github.com> date: 2021-05-01T14:24:10-04:00 summary: Fixing doc for callback for lambda (GG-25779) Fixing callback for lambda when no return value is provided files: M Doc/library/types.rst diff --git a/Doc/library/types.rst b/Doc/library/types.rst index 956b9e8f959c6..b3fac293ecc9e 100644 --- a/Doc/library/types.rst +++ b/Doc/library/types.rst @@ -34,7 +34,7 @@ Dynamic Type Creation freshly created class namespace. It should accept the class namespace as its sole argument and update the namespace directly with the class contents. If no callback is provided, it has the same effect as passing - in ``lambda ns: ns``. + in ``lambda ns: None``. .. versionadded:: 3.3

1 0

If using a frozen class with slots, add __getstate__ and __setstate__ to set the instance values. (GH-25786)
by ericvsmith May 1, 2021

May 1, 2021

https://github.com/python/cpython/commit/823fbf4e0eb66cbef0eacb7e8dbfb5dc8e… commit: 823fbf4e0eb66cbef0eacb7e8dbfb5dc8ea83b40 branch: master author: Eric V. Smith <ericvsmith(a)users.noreply.github.com> committer: ericvsmith <ericvsmith(a)users.noreply.github.com> date: 2021-05-01T13:27:30-04:00 summary: If using a frozen class with slots, add __getstate__ and __setstate__ to set the instance values. (GH-25786) files: M Lib/dataclasses.py M Lib/test/test_dataclasses.py diff --git a/Lib/dataclasses.py b/Lib/dataclasses.py index 5e5716316f095..363d0b66d208e 100644 --- a/Lib/dataclasses.py +++ b/Lib/dataclasses.py @@ -1087,14 +1087,28 @@ def _process_class(cls, init, repr, eq, order, unsafe_hash, frozen, tuple(f.name for f in std_init_fields)) if slots: - cls = _add_slots(cls) + cls = _add_slots(cls, frozen) abc.update_abstractmethods(cls) return cls -def _add_slots(cls): +# _dataclass_getstate and _dataclass_setstate are needed for pickling frozen +# classes with slots. These could be slighly more performant if we generated +# the code instead of iterating over fields. But that can be a project for +# another day, if performance becomes an issue. +def _dataclass_getstate(self): + return [getattr(self, f.name) for f in fields(self)] + + +def _dataclass_setstate(self, state): + for field, value in zip(fields(self), state): + # use setattr because dataclass may be frozen + object.__setattr__(self, field.name, value) + + +def _add_slots(cls, is_frozen): # Need to create a new class, since we can't set __slots__ # after a class has been created. @@ -1120,6 +1134,11 @@ def _add_slots(cls): if qualname is not None: cls.__qualname__ = qualname + if is_frozen: + # Need this for pickling frozen classes with slots. + cls.__getstate__ = _dataclass_getstate + cls.__setstate__ = _dataclass_setstate + return cls diff --git a/Lib/test/test_dataclasses.py b/Lib/test/test_dataclasses.py index 2fa0ae0126bf8..16ee4c7705d8c 100644 --- a/Lib/test/test_dataclasses.py +++ b/Lib/test/test_dataclasses.py @@ -2833,6 +2833,19 @@ class A: self.assertFalse(hasattr(A, "__slots__")) self.assertTrue(hasattr(B, "__slots__")) + # Can't be local to test_frozen_pickle. + @dataclass(frozen=True, slots=True) + class FrozenSlotsClass: + foo: str + bar: int + + def test_frozen_pickle(self): + # bpo-43999 + + assert self.FrozenSlotsClass.__slots__ == ("foo", "bar") + p = pickle.dumps(self.FrozenSlotsClass("a", 1)) + assert pickle.loads(p) == self.FrozenSlotsClass("a", 1) + class TestDescriptors(unittest.TestCase): def test_set_name(self):

1 0

[3.8] bpo-43993: Update vendored pip to 21.1.1 (GH-25761). (GH-25783)
by pfmoore May 1, 2021

May 1, 2021

https://github.com/python/cpython/commit/6034c4aa58fe7257d39b53c77944393700… commit: 6034c4aa58fe7257d39b53c77944393700c66396 branch: 3.8 author: Stéphane Bidoul <stephane.bidoul(a)gmail.com> committer: pfmoore <p.f.moore(a)gmail.com> date: 2021-05-01T16:50:07+01:00 summary: [3.8] bpo-43993: Update vendored pip to 21.1.1 (GH-25761). (GH-25783) files: A Lib/ensurepip/_bundled/pip-21.1.1-py3-none-any.whl A Misc/NEWS.d/next/Library/2021-04-30-19-23-45.bpo-43993.T7_yoq.rst D Lib/ensurepip/_bundled/pip-21.1-py3-none-any.whl M Lib/ensurepip/__init__.py diff --git a/Lib/ensurepip/__init__.py b/Lib/ensurepip/__init__.py index d77987011d3a8b..597a1ef9eeaa12 100644 --- a/Lib/ensurepip/__init__.py +++ b/Lib/ensurepip/__init__.py @@ -11,7 +11,7 @@ _SETUPTOOLS_VERSION = "56.0.0" -_PIP_VERSION = "21.1" +_PIP_VERSION = "21.1.1" _PROJECTS = [ ("setuptools", _SETUPTOOLS_VERSION, "py3"), diff --git a/Lib/ensurepip/_bundled/pip-21.1-py3-none-any.whl b/Lib/ensurepip/_bundled/pip-21.1.1-py3-none-any.whl similarity index 94% rename from Lib/ensurepip/_bundled/pip-21.1-py3-none-any.whl rename to Lib/ensurepip/_bundled/pip-21.1.1-py3-none-any.whl index 59395be72f135f..291cc296fa7b48 100644 Binary files a/Lib/ensurepip/_bundled/pip-21.1-py3-none-any.whl and b/Lib/ensurepip/_bundled/pip-21.1.1-py3-none-any.whl differ diff --git a/Misc/NEWS.d/next/Library/2021-04-30-19-23-45.bpo-43993.T7_yoq.rst b/Misc/NEWS.d/next/Library/2021-04-30-19-23-45.bpo-43993.T7_yoq.rst new file mode 100644 index 00000000000000..c9d2c458eee75c --- /dev/null +++ b/Misc/NEWS.d/next/Library/2021-04-30-19-23-45.bpo-43993.T7_yoq.rst @@ -0,0 +1 @@ +Update bundled pip to 21.1.1. \ No newline at end of file

1 0

[3.9] bpo-43993: Update vendored pip to 21.1.1 (GH-25761). (GH-25782)
by pfmoore May 1, 2021

May 1, 2021

https://github.com/python/cpython/commit/af1e06c62f3958082c4b409e771f291d12… commit: af1e06c62f3958082c4b409e771f291d12479b3d branch: 3.9 author: Stéphane Bidoul <stephane.bidoul(a)gmail.com> committer: pfmoore <p.f.moore(a)gmail.com> date: 2021-05-01T16:49:34+01:00 summary: [3.9] bpo-43993: Update vendored pip to 21.1.1 (GH-25761). (GH-25782) files: A Lib/ensurepip/_bundled/pip-21.1.1-py3-none-any.whl A Misc/NEWS.d/next/Library/2021-04-30-19-23-45.bpo-43993.T7_yoq.rst D Lib/ensurepip/_bundled/pip-21.1-py3-none-any.whl M Lib/ensurepip/__init__.py diff --git a/Lib/ensurepip/__init__.py b/Lib/ensurepip/__init__.py index 783b3232c80fc4..57e576d1a3503f 100644 --- a/Lib/ensurepip/__init__.py +++ b/Lib/ensurepip/__init__.py @@ -15,7 +15,7 @@ _SETUPTOOLS_VERSION = "56.0.0" -_PIP_VERSION = "21.1" +_PIP_VERSION = "21.1.1" _PROJECTS = [ ("setuptools", _SETUPTOOLS_VERSION, "py3"), diff --git a/Lib/ensurepip/_bundled/pip-21.1-py3-none-any.whl b/Lib/ensurepip/_bundled/pip-21.1.1-py3-none-any.whl similarity index 94% rename from Lib/ensurepip/_bundled/pip-21.1-py3-none-any.whl rename to Lib/ensurepip/_bundled/pip-21.1.1-py3-none-any.whl index 59395be72f135f..291cc296fa7b48 100644 Binary files a/Lib/ensurepip/_bundled/pip-21.1-py3-none-any.whl and b/Lib/ensurepip/_bundled/pip-21.1.1-py3-none-any.whl differ diff --git a/Misc/NEWS.d/next/Library/2021-04-30-19-23-45.bpo-43993.T7_yoq.rst b/Misc/NEWS.d/next/Library/2021-04-30-19-23-45.bpo-43993.T7_yoq.rst new file mode 100644 index 00000000000000..c9d2c458eee75c --- /dev/null +++ b/Misc/NEWS.d/next/Library/2021-04-30-19-23-45.bpo-43993.T7_yoq.rst @@ -0,0 +1 @@ +Update bundled pip to 21.1.1. \ No newline at end of file

1 0

bpo-43989: Temporarily disable warnings in ssltests (GH-25780)
by tiran May 1, 2021

May 1, 2021

https://github.com/python/cpython/commit/f82fd77717b58c97a16c05e25c72388b35… commit: f82fd77717b58c97a16c05e25c72388b35860459 branch: master author: Christian Heimes <christian(a)python.org> committer: tiran <christian(a)python.org> date: 2021-05-01T16:05:01+02:00 summary: bpo-43989: Temporarily disable warnings in ssltests (GH-25780) -Werror is currently broken. files: M Lib/test/ssltests.py diff --git a/Lib/test/ssltests.py b/Lib/test/ssltests.py index 5073ae12204b1..292453a813dcd 100644 --- a/Lib/test/ssltests.py +++ b/Lib/test/ssltests.py @@ -16,7 +16,7 @@ def run_regrtests(*extra_args): print(ssl.OPENSSL_VERSION) args = [ sys.executable, - '-Werror', '-bb', # turn warnings into exceptions + # '-Werror', '-bb', # turn warnings into exceptions '-m', 'test', ] if not extra_args:

1 0

bpo-43993: Update vendored pip to 21.1.1 (GH-25761)
by pfmoore May 1, 2021

May 1, 2021

https://github.com/python/cpython/commit/bf99b7151663905fd5e71efe45184dc8ff… commit: bf99b7151663905fd5e71efe45184dc8fffc3236 branch: master author: Stéphane Bidoul <stephane.bidoul(a)gmail.com> committer: pfmoore <p.f.moore(a)gmail.com> date: 2021-05-01T10:15:19+01:00 summary: bpo-43993: Update vendored pip to 21.1.1 (GH-25761) files: A Lib/ensurepip/_bundled/pip-21.1.1-py3-none-any.whl A Misc/NEWS.d/next/Library/2021-04-30-19-23-45.bpo-43993.T7_yoq.rst D Lib/ensurepip/_bundled/pip-21.1-py3-none-any.whl M Lib/ensurepip/__init__.py diff --git a/Lib/ensurepip/__init__.py b/Lib/ensurepip/__init__.py index 93d8ed5bdc8581..4c606b9f2a89b8 100644 --- a/Lib/ensurepip/__init__.py +++ b/Lib/ensurepip/__init__.py @@ -12,7 +12,7 @@ __all__ = ["version", "bootstrap"] _PACKAGE_NAMES = ('setuptools', 'pip') _SETUPTOOLS_VERSION = "56.0.0" -_PIP_VERSION = "21.1" +_PIP_VERSION = "21.1.1" _PROJECTS = [ ("setuptools", _SETUPTOOLS_VERSION, "py3"), ("pip", _PIP_VERSION, "py3"), diff --git a/Lib/ensurepip/_bundled/pip-21.1-py3-none-any.whl b/Lib/ensurepip/_bundled/pip-21.1.1-py3-none-any.whl similarity index 94% rename from Lib/ensurepip/_bundled/pip-21.1-py3-none-any.whl rename to Lib/ensurepip/_bundled/pip-21.1.1-py3-none-any.whl index 59395be72f135f..291cc296fa7b48 100644 Binary files a/Lib/ensurepip/_bundled/pip-21.1-py3-none-any.whl and b/Lib/ensurepip/_bundled/pip-21.1.1-py3-none-any.whl differ diff --git a/Misc/NEWS.d/next/Library/2021-04-30-19-23-45.bpo-43993.T7_yoq.rst b/Misc/NEWS.d/next/Library/2021-04-30-19-23-45.bpo-43993.T7_yoq.rst new file mode 100644 index 00000000000000..c9d2c458eee75c --- /dev/null +++ b/Misc/NEWS.d/next/Library/2021-04-30-19-23-45.bpo-43993.T7_yoq.rst @@ -0,0 +1 @@ +Update bundled pip to 21.1.1. \ No newline at end of file

1 0