Mailman 3 March 2020 - Python-checkins

bpo-39689: Do not use native packing for format "?" with standard size (GH-18969)
by Miss Islington (bot) March 31, 2020

March 31, 2020

https://github.com/python/cpython/commit/0f9e889cd94c1e86f8ff28733b207c9980… commit: 0f9e889cd94c1e86f8ff28733b207c99803ca8a4 branch: 3.7 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: GitHub <noreply(a)github.com> date: 2020-03-31T05:24:07-07:00 summary: bpo-39689: Do not use native packing for format "?" with standard size (GH-18969) (cherry picked from commit 472fc843ca816d65c12f9508ac762ca492165c45) Co-authored-by: Stefan Krah … [View More]

1 0

bpo-40121: Fixes audit event raised on creating a new socket (GH-19238)
by Miss Islington (bot) March 31, 2020

March 31, 2020

https://github.com/python/cpython/commit/6a0ee60db4cee4a01bae1a2922d21a859e… commit: 6a0ee60db4cee4a01bae1a2922d21a859e9ea2ed branch: 3.8 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: GitHub <noreply(a)github.com> date: 2020-03-31T04:57:06-07:00 summary: bpo-40121: Fixes audit event raised on creating a new socket (GH-19238) (cherry picked from commit 63ba5cccf484b9ec23dfbf4cf7ffdc833eda98c3) Co-authored-by: Steve Dower <steve.… [View More]dower(a)python.org> files: A Misc/NEWS.d/next/Security/2020-03-30-23-16-25.bpo-40121.p2LIio.rst M Lib/test/audit-tests.py M Lib/test/test_audit.py M Modules/socketmodule.c diff --git a/Lib/test/audit-tests.py b/Lib/test/audit-tests.py index 33f320992bb23..dda52a5a518f6 100644 --- a/Lib/test/audit-tests.py +++ b/Lib/test/audit-tests.py @@ -327,6 +327,28 @@ def hook(event, args): CloseKey(kv) +def test_socket(): + import socket + + def hook(event, args): + if event.startswith("socket."): + print(event, *args) + + sys.addaudithook(hook) + + socket.gethostname() + + # Don't care if this fails, we just want the audit message + sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) + try: + # Don't care if this fails, we just want the audit message + sock.bind(('127.0.0.1', 8080)) + except error: + pass + finally: + sock.close() + + if __name__ == "__main__": from test.libregrtest.setup import suppress_msvcrt_asserts diff --git a/Lib/test/test_audit.py b/Lib/test/test_audit.py index 73dd5c5b7db30..f405c6923979c 100644 --- a/Lib/test/test_audit.py +++ b/Lib/test/test_audit.py @@ -118,6 +118,18 @@ def test_winreg(self): self.assertSequenceEqual(["winreg.EnumKey", " ", f"{expected} 10000"], events[3]) self.assertSequenceEqual(["winreg.PyHKEY.Detach", " ", expected], events[4]) + def test_socket(self): + support.import_module("socket") + returncode, events, stderr = self.run_python("test_socket") + if returncode: + self.fail(stderr) + + if support.verbose: + print(*events, sep='\n') + self.assertEqual(events[0][0], "socket.gethostname") + self.assertEqual(events[1][0], "socket.__new__") + self.assertEqual(events[2][0], "socket.bind") + self.assertTrue(events[2][2].endswith("('127.0.0.1', 8080)")) if __name__ == "__main__": unittest.main() diff --git a/Misc/NEWS.d/next/Security/2020-03-30-23-16-25.bpo-40121.p2LIio.rst b/Misc/NEWS.d/next/Security/2020-03-30-23-16-25.bpo-40121.p2LIio.rst new file mode 100644 index 0000000000000..5aac6cd8b9959 --- /dev/null +++ b/Misc/NEWS.d/next/Security/2020-03-30-23-16-25.bpo-40121.p2LIio.rst @@ -0,0 +1 @@ +Fixes audit events raised on creating a new socket. diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c index 594a0d6efad19..5dc5f4e0d397b 100644 --- a/Modules/socketmodule.c +++ b/Modules/socketmodule.c @@ -5069,7 +5069,7 @@ sock_initobj(PyObject *self, PyObject *args, PyObject *kwds) #ifdef MS_WINDOWS /* In this case, we don't use the family, type and proto args */ - if (fdobj != NULL && fdobj != Py_None) + if (fdobj == NULL || fdobj == Py_None) #endif { if (PySys_Audit("socket.__new__", "Oiii", @@ -5091,8 +5091,9 @@ sock_initobj(PyObject *self, PyObject *args, PyObject *kwds) } memcpy(&info, PyBytes_AS_STRING(fdobj), sizeof(info)); - if (PySys_Audit("socket()", "iii", info.iAddressFamily, - info.iSocketType, info.iProtocol) < 0) { + if (PySys_Audit("socket.__new__", "Oiii", s, + info.iAddressFamily, info.iSocketType, + info.iProtocol) < 0) { return -1; } [View Less]

1 0

bpo-40121: Fixes audit event raised on creating a new socket (GH-19238)
by Steve Dower March 31, 2020

March 31, 2020

https://github.com/python/cpython/commit/63ba5cccf484b9ec23dfbf4cf7ffdc833e… commit: 63ba5cccf484b9ec23dfbf4cf7ffdc833eda98c3 branch: master author: Steve Dower <steve.dower(a)python.org> committer: GitHub <noreply(a)github.com> date: 2020-03-31T12:38:53+01:00 summary: bpo-40121: Fixes audit event raised on creating a new socket (GH-19238) files: A Misc/NEWS.d/next/Security/2020-03-30-23-16-25.bpo-40121.p2LIio.rst M Lib/test/audit-tests.py M Lib/test/test_audit.py M Modules/… [View More]socketmodule.c diff --git a/Lib/test/audit-tests.py b/Lib/test/audit-tests.py index 33f320992bb23..dda52a5a518f6 100644 --- a/Lib/test/audit-tests.py +++ b/Lib/test/audit-tests.py @@ -327,6 +327,28 @@ def hook(event, args): CloseKey(kv) +def test_socket(): + import socket + + def hook(event, args): + if event.startswith("socket."): + print(event, *args) + + sys.addaudithook(hook) + + socket.gethostname() + + # Don't care if this fails, we just want the audit message + sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) + try: + # Don't care if this fails, we just want the audit message + sock.bind(('127.0.0.1', 8080)) + except error: + pass + finally: + sock.close() + + if __name__ == "__main__": from test.libregrtest.setup import suppress_msvcrt_asserts diff --git a/Lib/test/test_audit.py b/Lib/test/test_audit.py index 73dd5c5b7db30..f405c6923979c 100644 --- a/Lib/test/test_audit.py +++ b/Lib/test/test_audit.py @@ -118,6 +118,18 @@ def test_winreg(self): self.assertSequenceEqual(["winreg.EnumKey", " ", f"{expected} 10000"], events[3]) self.assertSequenceEqual(["winreg.PyHKEY.Detach", " ", expected], events[4]) + def test_socket(self): + support.import_module("socket") + returncode, events, stderr = self.run_python("test_socket") + if returncode: + self.fail(stderr) + + if support.verbose: + print(*events, sep='\n') + self.assertEqual(events[0][0], "socket.gethostname") + self.assertEqual(events[1][0], "socket.__new__") + self.assertEqual(events[2][0], "socket.bind") + self.assertTrue(events[2][2].endswith("('127.0.0.1', 8080)")) if __name__ == "__main__": unittest.main() diff --git a/Misc/NEWS.d/next/Security/2020-03-30-23-16-25.bpo-40121.p2LIio.rst b/Misc/NEWS.d/next/Security/2020-03-30-23-16-25.bpo-40121.p2LIio.rst new file mode 100644 index 0000000000000..5aac6cd8b9959 --- /dev/null +++ b/Misc/NEWS.d/next/Security/2020-03-30-23-16-25.bpo-40121.p2LIio.rst @@ -0,0 +1 @@ +Fixes audit events raised on creating a new socket. diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c index 2818ac7f20570..b5c241e643dfc 100644 --- a/Modules/socketmodule.c +++ b/Modules/socketmodule.c @@ -5099,7 +5099,7 @@ sock_initobj(PyObject *self, PyObject *args, PyObject *kwds) #ifdef MS_WINDOWS /* In this case, we don't use the family, type and proto args */ - if (fdobj != NULL && fdobj != Py_None) + if (fdobj == NULL || fdobj == Py_None) #endif { if (PySys_Audit("socket.__new__", "Oiii", @@ -5121,8 +5121,9 @@ sock_initobj(PyObject *self, PyObject *args, PyObject *kwds) } memcpy(&info, PyBytes_AS_STRING(fdobj), sizeof(info)); - if (PySys_Audit("socket()", "iii", info.iAddressFamily, - info.iSocketType, info.iProtocol) < 0) { + if (PySys_Audit("socket.__new__", "Oiii", s, + info.iAddressFamily, info.iSocketType, + info.iProtocol) < 0) { return -1; } [View Less]

1 0

bpo-40108: Improve the error message in runpy when importing a module that includes the extension (GH-19239)
by Pablo Galindo March 31, 2020

March 31, 2020

https://github.com/python/cpython/commit/ef67512b40240f765026ad41d60b0c9a6d… commit: ef67512b40240f765026ad41d60b0c9a6dacd2b9 branch: master author: Pablo Galindo <Pablogsal(a)gmail.com> committer: GitHub <noreply(a)github.com> date: 2020-03-31T12:23:55+01:00 summary: bpo-40108: Improve the error message in runpy when importing a module that includes the extension (GH-19239) files: A Misc/NEWS.d/next/Library/2020-03-31-01-11-20.bpo-40108.EGDVQ_.rst M Lib/runpy.py M Lib/test/… [View More]test_cmd_line_script.py diff --git a/Lib/runpy.py b/Lib/runpy.py index 0f54f3e71b6fe..7e1e1ac5dde2d 100644 --- a/Lib/runpy.py +++ b/Lib/runpy.py @@ -133,6 +133,9 @@ def _get_module_details(mod_name, error=ImportError): # importlib, where the latter raises other errors for cases where # pkgutil previously raised ImportError msg = "Error while finding module specification for {!r} ({}: {})" + if mod_name.endswith(".py"): + msg += (f". Try using '{mod_name[:-3]}' instead of " + f"'{mod_name}' as the module name.") raise error(msg.format(mod_name, type(ex).__name__, ex)) from ex if spec is None: raise error("No module named %s" % mod_name) diff --git a/Lib/test/test_cmd_line_script.py b/Lib/test/test_cmd_line_script.py index adfb8ce5ed245..44a5487d75dff 100644 --- a/Lib/test/test_cmd_line_script.py +++ b/Lib/test/test_cmd_line_script.py @@ -499,6 +499,16 @@ def test_dash_m_bad_pyc(self): self.assertNotIn(b'is a package', err) self.assertNotIn(b'Traceback', err) + def test_hint_when_triying_to_import_a_py_file(self): + with support.temp_dir() as script_dir, \ + support.change_cwd(path=script_dir): + # Create invalid *.pyc as empty file + with open('asyncio.py', 'wb'): + pass + err = self.check_dash_m_failure('asyncio.py') + self.assertIn(b"Try using 'asyncio' instead " + b"of 'asyncio.py' as the module name", err) + def test_dash_m_init_traceback(self): # These were wrapped in an ImportError and tracebacks were # suppressed; see Issue 14285 diff --git a/Misc/NEWS.d/next/Library/2020-03-31-01-11-20.bpo-40108.EGDVQ_.rst b/Misc/NEWS.d/next/Library/2020-03-31-01-11-20.bpo-40108.EGDVQ_.rst new file mode 100644 index 0000000000000..778a0f1b1a596 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2020-03-31-01-11-20.bpo-40108.EGDVQ_.rst @@ -0,0 +1,3 @@ +Improve the error message when triying to import a module using :mod:`runpy` +and incorrently use the ".py" extension at the end of the module name. Patch +by Pablo Galindo. [View Less]

1 0

fix comma location in various places (GH-19233)
by Miss Islington (bot) March 30, 2020

March 30, 2020

https://github.com/python/cpython/commit/6c9a2a831ea235fad7a6398bba395f4c77… commit: 6c9a2a831ea235fad7a6398bba395f4c776dc85c branch: 3.8 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: GitHub <noreply(a)github.com> date: 2020-03-30T14:34:31-07:00 summary: fix comma location in various places (GH-19233) (cherry picked from commit c49016e67c3255b37599b354a8d7995d40663991) Co-authored-by: Mathieu Dupuy <deronnax(a)users.noreply.github.… [View More]com> files: M Doc/install/index.rst M Doc/library/mailcap.rst M Doc/library/pprint.rst M Doc/library/ssl.rst M Doc/library/textwrap.rst M Doc/library/tokenize.rst M Doc/reference/datamodel.rst M Doc/reference/expressions.rst diff --git a/Doc/install/index.rst b/Doc/install/index.rst index a91606c0f38e6..e6d5a3e6ebde6 100644 --- a/Doc/install/index.rst +++ b/Doc/install/index.rst @@ -532,7 +532,7 @@ scripts will wind up in :file:`/usr/local/python/bin`. If you want them in python setup.py install --install-scripts=/usr/local/bin -(This performs an installation using the "prefix scheme," where the prefix is +(This performs an installation using the "prefix scheme", where the prefix is whatever your Python interpreter was installed with--- :file:`/usr/local/python` in this case.) diff --git a/Doc/library/mailcap.rst b/Doc/library/mailcap.rst index 896afd1d73062..bf9639bdaca50 100644 --- a/Doc/library/mailcap.rst +++ b/Doc/library/mailcap.rst @@ -18,7 +18,7 @@ belonging to a temporary file) and the :program:`xmpeg` program can be automatically started to view the file. The mailcap format is documented in :rfc:`1524`, "A User Agent Configuration -Mechanism For Multimedia Mail Format Information," but is not an Internet +Mechanism For Multimedia Mail Format Information", but is not an Internet standard. However, mailcap files are supported on most Unix systems. diff --git a/Doc/library/pprint.rst b/Doc/library/pprint.rst index 9abf2865ef614..b8b7f4213969a 100644 --- a/Doc/library/pprint.rst +++ b/Doc/library/pprint.rst @@ -144,7 +144,7 @@ The :mod:`pprint` module also provides several shortcut functions: .. index:: builtin: eval - Determine if the formatted representation of *object* is "readable," or can be + Determine if the formatted representation of *object* is "readable", or can be used to reconstruct the value using :func:`eval`. This always returns ``False`` for recursive objects. diff --git a/Doc/library/ssl.rst b/Doc/library/ssl.rst index bbb4c412d9303..4142e41dcb451 100644 --- a/Doc/library/ssl.rst +++ b/Doc/library/ssl.rst @@ -42,7 +42,7 @@ This module provides a class, :class:`ssl.SSLSocket`, which is derived from the :class:`socket.socket` type, and provides a socket-like wrapper that also encrypts and decrypts the data going over the socket with SSL. It supports additional methods such as :meth:`getpeercert`, which retrieves the -certificate of the other side of the connection, and :meth:`cipher`,which +certificate of the other side of the connection, and :meth:`cipher`, which retrieves the cipher being used for the secure connection. For more sophisticated applications, the :class:`ssl.SSLContext` class @@ -2271,7 +2271,7 @@ Visual inspection shows that the certificate does identify the desired service (('postalCode', '03894-4801'),), (('countryName', 'US'),), (('stateOrProvinceName', 'NH'),), - (('localityName', 'Wolfeboro,'),), + (('localityName', 'Wolfeboro'),), (('organizationName', 'Python Software Foundation'),), (('commonName', 'www.python.org'),)), 'subjectAltName': (('DNS', 'www.python.org'), diff --git a/Doc/library/textwrap.rst b/Doc/library/textwrap.rst index 0f11ef401569d..16837104b6ceb 100644 --- a/Doc/library/textwrap.rst +++ b/Doc/library/textwrap.rst @@ -239,7 +239,7 @@ hyphenated words; only then will long words be broken if necessary, unless :attr:`fix_sentence_endings` is false by default. Since the sentence detection algorithm relies on ``string.lowercase`` for - the definition of "lowercase letter," and a convention of using two spaces + the definition of "lowercase letter", and a convention of using two spaces after a period to separate sentences on the same line, it is specific to English-language texts. diff --git a/Doc/library/tokenize.rst b/Doc/library/tokenize.rst index 96778f23f8f06..11f569df2e7cd 100644 --- a/Doc/library/tokenize.rst +++ b/Doc/library/tokenize.rst @@ -13,7 +13,7 @@ The :mod:`tokenize` module provides a lexical scanner for Python source code, implemented in Python. The scanner in this module returns comments as tokens -as well, making it useful for implementing "pretty-printers," including +as well, making it useful for implementing "pretty-printers", including colorizers for on-screen displays. To simplify token stream handling, all :ref:`operator <operators>` and diff --git a/Doc/reference/datamodel.rst b/Doc/reference/datamodel.rst index de1e717e56deb..d364e61b8cf46 100644 --- a/Doc/reference/datamodel.rst +++ b/Doc/reference/datamodel.rst @@ -17,7 +17,7 @@ Objects, values and types :dfn:`Objects` are Python's abstraction for data. All data in a Python program is represented by objects or by relations between objects. (In a sense, and in -conformance to Von Neumann's model of a "stored program computer," code is also +conformance to Von Neumann's model of a "stored program computer", code is also represented by objects.) .. index:: diff --git a/Doc/reference/expressions.rst b/Doc/reference/expressions.rst index 3fcc5e17d9a7c..16542cdcec197 100644 --- a/Doc/reference/expressions.rst +++ b/Doc/reference/expressions.rst @@ -28,7 +28,7 @@ Arithmetic conversions .. index:: pair: arithmetic; conversion When a description of an arithmetic operator below uses the phrase "the numeric -arguments are converted to a common type," this means that the operator +arguments are converted to a common type", this means that the operator implementation for built-in types works as follows: * If either argument is a complex number, the other is converted to complex; [View Less]

1 0

fix comma location in various places (GH-19233)
by Miss Islington (bot) March 30, 2020

March 30, 2020

https://github.com/python/cpython/commit/bb7a491b4122d4491f6f72d2d42f733b04… commit: bb7a491b4122d4491f6f72d2d42f733b04e38530 branch: 3.7 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: GitHub <noreply(a)github.com> date: 2020-03-30T14:33:31-07:00 summary: fix comma location in various places (GH-19233) (cherry picked from commit c49016e67c3255b37599b354a8d7995d40663991) Co-authored-by: Mathieu Dupuy <deronnax(a)users.noreply.github.… [View More]com> files: M Doc/install/index.rst M Doc/library/mailcap.rst M Doc/library/pprint.rst M Doc/library/ssl.rst M Doc/library/textwrap.rst M Doc/library/tokenize.rst M Doc/reference/datamodel.rst M Doc/reference/expressions.rst diff --git a/Doc/install/index.rst b/Doc/install/index.rst index f6a8cd6833a9a..b82c1b23f11f0 100644 --- a/Doc/install/index.rst +++ b/Doc/install/index.rst @@ -578,7 +578,7 @@ scripts will wind up in :file:`/usr/local/python/bin`. If you want them in python setup.py install --install-scripts=/usr/local/bin -(This performs an installation using the "prefix scheme," where the prefix is +(This performs an installation using the "prefix scheme", where the prefix is whatever your Python interpreter was installed with--- :file:`/usr/local/python` in this case.) diff --git a/Doc/library/mailcap.rst b/Doc/library/mailcap.rst index 896afd1d73062..bf9639bdaca50 100644 --- a/Doc/library/mailcap.rst +++ b/Doc/library/mailcap.rst @@ -18,7 +18,7 @@ belonging to a temporary file) and the :program:`xmpeg` program can be automatically started to view the file. The mailcap format is documented in :rfc:`1524`, "A User Agent Configuration -Mechanism For Multimedia Mail Format Information," but is not an Internet +Mechanism For Multimedia Mail Format Information", but is not an Internet standard. However, mailcap files are supported on most Unix systems. diff --git a/Doc/library/pprint.rst b/Doc/library/pprint.rst index deadf18208515..3167c9f0bd39a 100644 --- a/Doc/library/pprint.rst +++ b/Doc/library/pprint.rst @@ -120,7 +120,7 @@ The :mod:`pprint` module also provides several shortcut functions: .. index:: builtin: eval - Determine if the formatted representation of *object* is "readable," or can be + Determine if the formatted representation of *object* is "readable", or can be used to reconstruct the value using :func:`eval`. This always returns ``False`` for recursive objects. diff --git a/Doc/library/ssl.rst b/Doc/library/ssl.rst index 5aff697b8dfe2..0646b30f6f594 100644 --- a/Doc/library/ssl.rst +++ b/Doc/library/ssl.rst @@ -42,7 +42,7 @@ This module provides a class, :class:`ssl.SSLSocket`, which is derived from the :class:`socket.socket` type, and provides a socket-like wrapper that also encrypts and decrypts the data going over the socket with SSL. It supports additional methods such as :meth:`getpeercert`, which retrieves the -certificate of the other side of the connection, and :meth:`cipher`,which +certificate of the other side of the connection, and :meth:`cipher`, which retrieves the cipher being used for the secure connection. For more sophisticated applications, the :class:`ssl.SSLContext` class @@ -2235,7 +2235,7 @@ Visual inspection shows that the certificate does identify the desired service (('postalCode', '03894-4801'),), (('countryName', 'US'),), (('stateOrProvinceName', 'NH'),), - (('localityName', 'Wolfeboro,'),), + (('localityName', 'Wolfeboro'),), (('organizationName', 'Python Software Foundation'),), (('commonName', 'www.python.org'),)), 'subjectAltName': (('DNS', 'www.python.org'), diff --git a/Doc/library/textwrap.rst b/Doc/library/textwrap.rst index 0f11ef401569d..16837104b6ceb 100644 --- a/Doc/library/textwrap.rst +++ b/Doc/library/textwrap.rst @@ -239,7 +239,7 @@ hyphenated words; only then will long words be broken if necessary, unless :attr:`fix_sentence_endings` is false by default. Since the sentence detection algorithm relies on ``string.lowercase`` for - the definition of "lowercase letter," and a convention of using two spaces + the definition of "lowercase letter", and a convention of using two spaces after a period to separate sentences on the same line, it is specific to English-language texts. diff --git a/Doc/library/tokenize.rst b/Doc/library/tokenize.rst index 4dd56f9e7c8bf..2f6cf290bb380 100644 --- a/Doc/library/tokenize.rst +++ b/Doc/library/tokenize.rst @@ -13,7 +13,7 @@ The :mod:`tokenize` module provides a lexical scanner for Python source code, implemented in Python. The scanner in this module returns comments as tokens -as well, making it useful for implementing "pretty-printers," including +as well, making it useful for implementing "pretty-printers", including colorizers for on-screen displays. To simplify token stream handling, all :ref:`operator <operators>` and diff --git a/Doc/reference/datamodel.rst b/Doc/reference/datamodel.rst index 6bd77176d0de3..af28c1712a997 100644 --- a/Doc/reference/datamodel.rst +++ b/Doc/reference/datamodel.rst @@ -17,7 +17,7 @@ Objects, values and types :dfn:`Objects` are Python's abstraction for data. All data in a Python program is represented by objects or by relations between objects. (In a sense, and in -conformance to Von Neumann's model of a "stored program computer," code is also +conformance to Von Neumann's model of a "stored program computer", code is also represented by objects.) .. index:: diff --git a/Doc/reference/expressions.rst b/Doc/reference/expressions.rst index 0a61ded2e3abd..51e779c053688 100644 --- a/Doc/reference/expressions.rst +++ b/Doc/reference/expressions.rst @@ -28,7 +28,7 @@ Arithmetic conversions .. index:: pair: arithmetic; conversion When a description of an arithmetic operator below uses the phrase "the numeric -arguments are converted to a common type," this means that the operator +arguments are converted to a common type", this means that the operator implementation for built-in types works as follows: * If either argument is a complex number, the other is converted to complex; [View Less]

1 0

fix comma location in various places (GH-19233)
by Mathieu Dupuy March 30, 2020

March 30, 2020

https://github.com/python/cpython/commit/c49016e67c3255b37599b354a8d7995d40… commit: c49016e67c3255b37599b354a8d7995d40663991 branch: master author: Mathieu Dupuy <deronnax(a)users.noreply.github.com> committer: GitHub <noreply(a)github.com> date: 2020-03-30T14:28:25-07:00 summary: fix comma location in various places (GH-19233) files: M Doc/install/index.rst M Doc/library/mailcap.rst M Doc/library/pprint.rst M Doc/library/ssl.rst M Doc/library/textwrap.rst M Doc/library/tokenize.… [View More]rst M Doc/reference/datamodel.rst M Doc/reference/expressions.rst diff --git a/Doc/install/index.rst b/Doc/install/index.rst index a91606c0f38e6..e6d5a3e6ebde6 100644 --- a/Doc/install/index.rst +++ b/Doc/install/index.rst @@ -532,7 +532,7 @@ scripts will wind up in :file:`/usr/local/python/bin`. If you want them in python setup.py install --install-scripts=/usr/local/bin -(This performs an installation using the "prefix scheme," where the prefix is +(This performs an installation using the "prefix scheme", where the prefix is whatever your Python interpreter was installed with--- :file:`/usr/local/python` in this case.) diff --git a/Doc/library/mailcap.rst b/Doc/library/mailcap.rst index 896afd1d73062..bf9639bdaca50 100644 --- a/Doc/library/mailcap.rst +++ b/Doc/library/mailcap.rst @@ -18,7 +18,7 @@ belonging to a temporary file) and the :program:`xmpeg` program can be automatically started to view the file. The mailcap format is documented in :rfc:`1524`, "A User Agent Configuration -Mechanism For Multimedia Mail Format Information," but is not an Internet +Mechanism For Multimedia Mail Format Information", but is not an Internet standard. However, mailcap files are supported on most Unix systems. diff --git a/Doc/library/pprint.rst b/Doc/library/pprint.rst index 207c3f8bca928..16256c549208f 100644 --- a/Doc/library/pprint.rst +++ b/Doc/library/pprint.rst @@ -147,7 +147,7 @@ The :mod:`pprint` module also provides several shortcut functions: .. index:: builtin: eval - Determine if the formatted representation of *object* is "readable," or can be + Determine if the formatted representation of *object* is "readable", or can be used to reconstruct the value using :func:`eval`. This always returns ``False`` for recursive objects. diff --git a/Doc/library/ssl.rst b/Doc/library/ssl.rst index 3e5fcab22d028..570d4f720a25a 100644 --- a/Doc/library/ssl.rst +++ b/Doc/library/ssl.rst @@ -42,7 +42,7 @@ This module provides a class, :class:`ssl.SSLSocket`, which is derived from the :class:`socket.socket` type, and provides a socket-like wrapper that also encrypts and decrypts the data going over the socket with SSL. It supports additional methods such as :meth:`getpeercert`, which retrieves the -certificate of the other side of the connection, and :meth:`cipher`,which +certificate of the other side of the connection, and :meth:`cipher`, which retrieves the cipher being used for the secure connection. For more sophisticated applications, the :class:`ssl.SSLContext` class @@ -2271,7 +2271,7 @@ Visual inspection shows that the certificate does identify the desired service (('postalCode', '03894-4801'),), (('countryName', 'US'),), (('stateOrProvinceName', 'NH'),), - (('localityName', 'Wolfeboro,'),), + (('localityName', 'Wolfeboro'),), (('organizationName', 'Python Software Foundation'),), (('commonName', 'www.python.org'),)), 'subjectAltName': (('DNS', 'www.python.org'), diff --git a/Doc/library/textwrap.rst b/Doc/library/textwrap.rst index 0f11ef401569d..16837104b6ceb 100644 --- a/Doc/library/textwrap.rst +++ b/Doc/library/textwrap.rst @@ -239,7 +239,7 @@ hyphenated words; only then will long words be broken if necessary, unless :attr:`fix_sentence_endings` is false by default. Since the sentence detection algorithm relies on ``string.lowercase`` for - the definition of "lowercase letter," and a convention of using two spaces + the definition of "lowercase letter", and a convention of using two spaces after a period to separate sentences on the same line, it is specific to English-language texts. diff --git a/Doc/library/tokenize.rst b/Doc/library/tokenize.rst index 96778f23f8f06..11f569df2e7cd 100644 --- a/Doc/library/tokenize.rst +++ b/Doc/library/tokenize.rst @@ -13,7 +13,7 @@ The :mod:`tokenize` module provides a lexical scanner for Python source code, implemented in Python. The scanner in this module returns comments as tokens -as well, making it useful for implementing "pretty-printers," including +as well, making it useful for implementing "pretty-printers", including colorizers for on-screen displays. To simplify token stream handling, all :ref:`operator <operators>` and diff --git a/Doc/reference/datamodel.rst b/Doc/reference/datamodel.rst index e91e855674dc5..1c2706362b718 100644 --- a/Doc/reference/datamodel.rst +++ b/Doc/reference/datamodel.rst @@ -17,7 +17,7 @@ Objects, values and types :dfn:`Objects` are Python's abstraction for data. All data in a Python program is represented by objects or by relations between objects. (In a sense, and in -conformance to Von Neumann's model of a "stored program computer," code is also +conformance to Von Neumann's model of a "stored program computer", code is also represented by objects.) .. index:: diff --git a/Doc/reference/expressions.rst b/Doc/reference/expressions.rst index 3fcc5e17d9a7c..16542cdcec197 100644 --- a/Doc/reference/expressions.rst +++ b/Doc/reference/expressions.rst @@ -28,7 +28,7 @@ Arithmetic conversions .. index:: pair: arithmetic; conversion When a description of an arithmetic operator below uses the phrase "the numeric -arguments are converted to a common type," this means that the operator +arguments are converted to a common type", this means that the operator implementation for built-in types works as follows: * If either argument is a complex number, the other is converted to complex; [View Less]

1 0

bpo-40020: Fix realloc leak on failure in growable_comment_array_add (GH-19083)
by Alexander Riccio March 30, 2020

March 30, 2020

https://github.com/python/cpython/commit/51e3e450fbed46198d9be92add1a5dee6a… commit: 51e3e450fbed46198d9be92add1a5dee6a1f7f41 branch: master author: Alexander Riccio <test35965(a)gmail.com> committer: GitHub <noreply(a)github.com> date: 2020-03-30T23:15:59+02:00 summary: bpo-40020: Fix realloc leak on failure in growable_comment_array_add (GH-19083) Fix a leak and subsequent crash in parsetok.c caused by realloc misuse on a rare codepath. Realloc returns a null pointer on … [View More]

1 0

bpo-39943: Remove unnecessary casts in import.c that remove constness (GH-19209)
by Andy Lester March 30, 2020

March 30, 2020

https://github.com/python/cpython/commit/fc2d8d62af25be90f5fd490df141a775d9… commit: fc2d8d62af25be90f5fd490df141a775d9619b23 branch: master author: Andy Lester <andy(a)petdance.com> committer: GitHub <noreply(a)github.com> date: 2020-03-30T13:19:14-07:00 summary: bpo-39943: Remove unnecessary casts in import.c that remove constness (GH-19209) files: M Python/import.c diff --git a/Python/import.c b/Python/import.c index 5d500df93235f..2e434561f63c5 100644 --- a/Python/import.c +++… [View More]

1 0

Fix bug in test_collections.py (#19221)
by Curtis Bucher March 30, 2020

March 30, 2020

https://github.com/python/cpython/commit/0c5ad5499798aed4cd305d324051986ed4… commit: 0c5ad5499798aed4cd305d324051986ed4c48c8c branch: master author: Curtis Bucher <cpbucher5(a)gmail.com> committer: GitHub <noreply(a)github.com> date: 2020-03-30T09:50:57-07:00 summary: Fix bug in test_collections.py (#19221) Test in TestChainMap() line 257 did not properly check union behavior. files: M Lib/test/test_collections.py diff --git a/Lib/test/test_collections.py b/Lib/test/… [View More]

1 0