Mailman 3 May 2022 - Python-checkins

gh-91611: Use example.com for documentation, not mydomain.com (GH-91613)
by miss-islington May 1, 2022

May 1, 2022

https://github.com/python/cpython/commit/cef3a994c7c966511563edc45292ec8f69… commit: cef3a994c7c966511563edc45292ec8f69770268 branch: 3.9 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: miss-islington <31488909+miss-islington(a)users.noreply.github.com> date: 2022-04-30T21:02:51-07:00 summary: gh-91611: Use example.com for documentation, not mydomain.com (GH-91613) example.com is reserved by the IANA as special-use domain name for documentation purposes. The domain names are used widely in books, tutorials, sample network configurations, and generally as examples for the use of domain name. On the other hand, mydomain.com is real Domain Name Registration service. (cherry picked from commit ea392467829d6e93f824bde8eb87bdb31d9e4c62) Co-authored-by: Motoki Naruse <motoki(a)naru.se> files: M Doc/library/secrets.rst M Doc/library/ssl.rst diff --git a/Doc/library/secrets.rst b/Doc/library/secrets.rst index afa8e2d385fa4..c22da727b55c9 100644 --- a/Doc/library/secrets.rst +++ b/Doc/library/secrets.rst @@ -193,7 +193,7 @@ suitable for password recovery applications: .. testcode:: import secrets - url = 'https://mydomain.com/reset=' + secrets.token_urlsafe() + url = 'https://example.com/reset=' + secrets.token_urlsafe() diff --git a/Doc/library/ssl.rst b/Doc/library/ssl.rst index f5446808cbdeb..af9bf798da3b4 100644 --- a/Doc/library/ssl.rst +++ b/Doc/library/ssl.rst @@ -2345,7 +2345,7 @@ waiting for clients to connect:: context.load_cert_chain(certfile="mycertfile", keyfile="mykeyfile") bindsocket = socket.socket() - bindsocket.bind(('myaddr.mydomain.com', 10023)) + bindsocket.bind(('myaddr.example.com', 10023)) bindsocket.listen(5) When a client connects, you'll call :meth:`accept` on the socket to get the

1 0

gh-91952: Make TextIOWrapper.reconfigure() supports "locale" encoding (GH-91982)
by methane May 1, 2022

May 1, 2022

https://github.com/python/cpython/commit/0729b31a8b9ac35ef9b79fdc5aed22ccce… commit: 0729b31a8b9ac35ef9b79fdc5aed22cccec9ba16 branch: main author: Inada Naoki <songofacandy(a)gmail.com> committer: methane <songofacandy(a)gmail.com> date: 2022-05-01T10:44:14+09:00 summary: gh-91952: Make TextIOWrapper.reconfigure() supports "locale" encoding (GH-91982) files: A Misc/NEWS.d/next/Library/2022-04-27-18-04-24.gh-issue-91952.9A4RXx.rst M Doc/library/io.rst M Lib/_pyio.py M Modules/_io/textio.c diff --git a/Doc/library/io.rst b/Doc/library/io.rst index ecd8c8043351d..d8e7b1621e2ea 100644 --- a/Doc/library/io.rst +++ b/Doc/library/io.rst @@ -1038,6 +1038,9 @@ Text I/O .. versionadded:: 3.7 + .. versionchanged:: 3.11 + The method supports ``encoding="locale"`` option. + .. class:: StringIO(initial_value='', newline='\\n') diff --git a/Lib/_pyio.py b/Lib/_pyio.py index 380a7a736c64e..0f647eed99d81 100644 --- a/Lib/_pyio.py +++ b/Lib/_pyio.py @@ -2161,6 +2161,8 @@ def reconfigure(self, *, else: if not isinstance(encoding, str): raise TypeError("invalid encoding: %r" % encoding) + if encoding == "locale": + encoding = locale.getencoding() if newline is Ellipsis: newline = self._readnl diff --git a/Misc/NEWS.d/next/Library/2022-04-27-18-04-24.gh-issue-91952.9A4RXx.rst b/Misc/NEWS.d/next/Library/2022-04-27-18-04-24.gh-issue-91952.9A4RXx.rst new file mode 100644 index 0000000000000..a0b48d16fe866 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2022-04-27-18-04-24.gh-issue-91952.9A4RXx.rst @@ -0,0 +1 @@ +Add ``encoding="locale"`` support to :meth:`TextIOWrapper.reconfigure`. diff --git a/Modules/_io/textio.c b/Modules/_io/textio.c index f1cd6d01da859..3cbaca3ef4606 100644 --- a/Modules/_io/textio.c +++ b/Modules/_io/textio.c @@ -1248,8 +1248,16 @@ textiowrapper_change_encoding(textio *self, PyObject *encoding, errors = self->errors; } } - else if (errors == Py_None) { - errors = &_Py_ID(strict); + else { + if (_PyUnicode_EqualToASCIIString(encoding, "locale")) { + encoding = _Py_GetLocaleEncodingObject(); + if (encoding == NULL) { + return -1; + } + } + if (errors == Py_None) { + errors = &_Py_ID(strict); + } } const char *c_errors = PyUnicode_AsUTF8(errors);

1 0

gh-91954: Use shell=True in test_subprocess.test_encoding_warning (GH-92090)
by sweeneyde May 1, 2022

May 1, 2022

https://github.com/python/cpython/commit/b9636180b32ea483f12564657ba1c3eb5b… commit: b9636180b32ea483f12564657ba1c3eb5b6d73d8 branch: main author: Dennis Sweeney <36520290+sweeneyde(a)users.noreply.github.com> committer: sweeneyde <36520290+sweeneyde(a)users.noreply.github.com> date: 2022-04-30T20:38:19-04:00 summary: gh-91954: Use shell=True in test_subprocess.test_encoding_warning (GH-92090) files: M Lib/test/test_subprocess.py diff --git a/Lib/test/test_subprocess.py b/Lib/test/test_subprocess.py index 5814a6d924e12..0764120952ebd 100644 --- a/Lib/test/test_subprocess.py +++ b/Lib/test/test_subprocess.py @@ -1736,16 +1736,15 @@ def test_run_with_shell_timeout_and_capture_output(self): def test_encoding_warning(self): code = textwrap.dedent("""\ from subprocess import * - args = ["echo", "hello"] - run(args, text=True) - check_output(args, text=True) + run("echo hello", shell=True, text=True) + check_output("echo hello", shell=True, text=True) """) cp = subprocess.run([sys.executable, "-Xwarn_default_encoding", "-c", code], capture_output=True) lines = cp.stderr.splitlines() - self.assertEqual(len(lines), 2) - self.assertTrue(lines[0].startswith(b"<string>:3: EncodingWarning: ")) - self.assertTrue(lines[1].startswith(b"<string>:4: EncodingWarning: ")) + self.assertEqual(len(lines), 2, lines) + self.assertTrue(lines[0].startswith(b"<string>:2: EncodingWarning: ")) + self.assertTrue(lines[1].startswith(b"<string>:3: EncodingWarning: ")) def _get_test_grp_name():

1 0