Mailman 3 December 2020 - Python-checkins

bpo-42770: Fix a typo in the email.headerregistry docs (GH-23982)
by miss-islington Dec. 29, 2020

Dec. 29, 2020

https://github.com/python/cpython/commit/c56988b88fecf6dc70f039704fda6051a0… commit: c56988b88fecf6dc70f039704fda6051a0754db1 branch: master author: Zackery Spytz <zspytz(a)gmail.com> committer: miss-islington <31488909+miss-islington(a)users.noreply.github.com> date: 2020-12-28T20:12:37-08:00 summary: bpo-42770: Fix a typo in the email.headerregistry docs (GH-23982) Automerge-Triggered-By: GH:zware files: M Doc/library/email.headerregistry.rst diff --git a/Doc/library/email.headerregistry.rst b/Doc/library/email.headerregistry.rst index 9376da2b8d39c..3e1d97a03264b 100644 --- a/Doc/library/email.headerregistry.rst +++ b/Doc/library/email.headerregistry.rst @@ -289,7 +289,7 @@ variant, :attr:`~.BaseHeader.max_count` is set to 1. A :class:`ParameterizedMIMEHeader` class that handles the :mailheader:`Content-Disposition` header. - .. attribute:: content-disposition + .. attribute:: content_disposition ``inline`` and ``attachment`` are the only valid values in common use.

1 0

bpo-42740: Support PEP 604, 612 for typing.py get_args and get_origin (GH-23942)
by gvanrossum Dec. 29, 2020

Dec. 29, 2020

https://github.com/python/cpython/commit/efb1f0918fad2ba3346a986b0e958dc575… commit: efb1f0918fad2ba3346a986b0e958dc5753a7bbe branch: master author: Ken Jin <28750310+Fidget-Spinner(a)users.noreply.github.com> committer: gvanrossum <gvanrossum(a)gmail.com> date: 2020-12-28T18:26:19-08:00 summary: bpo-42740: Support PEP 604, 612 for typing.py get_args and get_origin (GH-23942) files: A Misc/NEWS.d/next/Library/2020-12-25-23-23-11.bpo-42740.F0rQ_E.rst M Lib/test/test_typing.py M Lib/typing.py diff --git a/Lib/test/test_typing.py b/Lib/test/test_typing.py index 3dcc31fe5be56..3b8efe16c6e23 100644 --- a/Lib/test/test_typing.py +++ b/Lib/test/test_typing.py @@ -3021,6 +3021,7 @@ class C(Generic[T]): pass self.assertIs(get_origin(Callable), collections.abc.Callable) self.assertIs(get_origin(list[int]), list) self.assertIs(get_origin(list), None) + self.assertIs(get_origin(list | str), types.Union) def test_get_args(self): T = TypeVar('T') @@ -3053,6 +3054,11 @@ class C(Generic[T]): pass self.assertEqual(get_args(collections.abc.Callable[[], str]), ([], str)) self.assertEqual(get_args(collections.abc.Callable[[int], str]), get_args(Callable[[int], str])) + P = ParamSpec('P') + self.assertEqual(get_args(Callable[P, int]), (P, int)) + self.assertEqual(get_args(Callable[Concatenate[int, P], int]), + (Concatenate[int, P], int)) + self.assertEqual(get_args(list | str), (list, str)) class CollectionsAbcTests(BaseTestCase): diff --git a/Lib/typing.py b/Lib/typing.py index 67e95dd78f34d..d1db76f2f8c19 100644 --- a/Lib/typing.py +++ b/Lib/typing.py @@ -1668,6 +1668,8 @@ def get_origin(tp): return tp.__origin__ if tp is Generic: return Generic + if isinstance(tp, types.Union): + return types.Union return None @@ -1686,9 +1688,13 @@ def get_args(tp): return (tp.__origin__,) + tp.__metadata__ if isinstance(tp, (_GenericAlias, GenericAlias)): res = tp.__args__ - if tp.__origin__ is collections.abc.Callable and res[0] is not Ellipsis: + if (tp.__origin__ is collections.abc.Callable + and not (res[0] is Ellipsis + or isinstance(res[0], (ParamSpec, _ConcatenateGenericAlias)))): res = (list(res[:-1]), res[-1]) return res + if isinstance(tp, types.Union): + return tp.__args__ return () diff --git a/Misc/NEWS.d/next/Library/2020-12-25-23-23-11.bpo-42740.F0rQ_E.rst b/Misc/NEWS.d/next/Library/2020-12-25-23-23-11.bpo-42740.F0rQ_E.rst new file mode 100644 index 0000000000000..588d90f623306 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2020-12-25-23-23-11.bpo-42740.F0rQ_E.rst @@ -0,0 +1,2 @@ +:func:`typing.get_args` and :func:`typing.get_origin` now support :pep:`604` +union types and :pep:`612` additions to ``Callable``.

1 0

Fix compiler warnings regarding loss of data (GH-23983)
by pablogsal Dec. 29, 2020

Dec. 29, 2020

https://github.com/python/cpython/commit/a6d63a20df63b3fd33b5e1f629e7f96d00… commit: a6d63a20df63b3fd33b5e1f629e7f96d00f6ae39 branch: master author: Pablo Galindo <Pablogsal(a)gmail.com> committer: pablogsal <Pablogsal(a)gmail.com> date: 2020-12-29T00:28:09Z summary: Fix compiler warnings regarding loss of data (GH-23983) files: M Modules/_sqlite/connection.c M Objects/unicodeobject.c diff --git a/Modules/_sqlite/connection.c b/Modules/_sqlite/connection.c index 5c7b4eeae6ae9..1e23daca44558 100644 --- a/Modules/_sqlite/connection.c +++ b/Modules/_sqlite/connection.c @@ -1601,7 +1601,7 @@ pysqlite_connection_backup_impl(pysqlite_Connection *self, { int rc; int callback_error = 0; - int sleep_ms = sleep * 1000.0; + int sleep_ms = (int)(sleep * 1000.0); sqlite3 *bck_conn; sqlite3_backup *bck_handle; diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c index ad32a062d4854..64fd408085d5e 100644 --- a/Objects/unicodeobject.c +++ b/Objects/unicodeobject.c @@ -2302,7 +2302,7 @@ _PyUnicode_FromId(_Py_Identifier *id) PyInterpreterState *interp = _PyInterpreterState_GET(); struct _Py_unicode_ids *ids = &interp->unicode.ids; - int index = _Py_atomic_size_get(&id->index); + Py_ssize_t index = _Py_atomic_size_get(&id->index); if (index < 0) { struct _Py_unicode_runtime_ids *rt_ids = &interp->runtime->unicode_ids;

1 0

Use Py_NewRef in Modules/_struct.c (GH-23981)
by pablogsal Dec. 28, 2020

Dec. 28, 2020

https://github.com/python/cpython/commit/290f5ae9977488d0faa0890d596aeed88e… commit: 290f5ae9977488d0faa0890d596aeed88e97355f branch: master author: Pablo Galindo <Pablogsal(a)gmail.com> committer: pablogsal <Pablogsal(a)gmail.com> date: 2020-12-28T23:59:16Z summary: Use Py_NewRef in Modules/_struct.c (GH-23981) files: M Modules/_struct.c diff --git a/Modules/_struct.c b/Modules/_struct.c index c95c76f8ae039..1a5e0ae28e876 100644 --- a/Modules/_struct.c +++ b/Modules/_struct.c @@ -1442,8 +1442,7 @@ s_new(PyTypeObject *type, PyObject *args, PyObject *kwds) self = alloc_func(type, 0); if (self != NULL) { PyStructObject *s = (PyStructObject*)self; - Py_INCREF(Py_None); - s->s_format = Py_None; + s->s_format = Py_NewRef(Py_None); s->s_codes = NULL; s->s_size = -1; s->s_len = -1;

1 0

bpo-42740: Fix get_args for PEP 585 collections.abc.Callable (GH-23963)
by miss-islington Dec. 28, 2020

Dec. 28, 2020

https://github.com/python/cpython/commit/03e571f1d5f3e7a11f33bb9f47dd4acedf… commit: 03e571f1d5f3e7a11f33bb9f47dd4acedf17b166 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: 2020-12-28T12:26:39-08:00 summary: bpo-42740: Fix get_args for PEP 585 collections.abc.Callable (GH-23963) PR 1/2. Needs backport to 3.9. (cherry picked from commit 4140f10a16f06c32fd49f9e21fb2a53abe7357f0) Co-authored-by: Ken Jin <28750310+Fidget-Spinner(a)users.noreply.github.com> files: M Lib/test/test_typing.py M Lib/typing.py diff --git a/Lib/test/test_typing.py b/Lib/test/test_typing.py index 3b3aa29de7221..4bdb2a0fad6c7 100644 --- a/Lib/test/test_typing.py +++ b/Lib/test/test_typing.py @@ -3071,6 +3071,11 @@ class C(Generic[T]): pass self.assertEqual(get_args(Callable), ()) self.assertEqual(get_args(list[int]), (int,)) self.assertEqual(get_args(list), ()) + self.assertEqual(get_args(collections.abc.Callable[[int], str]), ([int], str)) + self.assertEqual(get_args(collections.abc.Callable[..., str]), (..., str)) + self.assertEqual(get_args(collections.abc.Callable[[], str]), ([], str)) + self.assertEqual(get_args(collections.abc.Callable[[int], str]), + get_args(Callable[[int], str])) class CollectionsAbcTests(BaseTestCase): diff --git a/Lib/typing.py b/Lib/typing.py index 81e4a2fa403b9..3556b8adb8190 100644 --- a/Lib/typing.py +++ b/Lib/typing.py @@ -1507,13 +1507,11 @@ def get_args(tp): """ if isinstance(tp, _AnnotatedAlias): return (tp.__origin__,) + tp.__metadata__ - if isinstance(tp, _GenericAlias): + if isinstance(tp, (_GenericAlias, GenericAlias)): res = tp.__args__ if tp.__origin__ is collections.abc.Callable and res[0] is not Ellipsis: res = (list(res[:-1]), res[-1]) return res - if isinstance(tp, GenericAlias): - return tp.__args__ return ()

1 0

bpo-42740: Fix get_args for PEP 585 collections.abc.Callable (GH-23963)
by miss-islington Dec. 28, 2020

Dec. 28, 2020

https://github.com/python/cpython/commit/4140f10a16f06c32fd49f9e21fb2a53abe… commit: 4140f10a16f06c32fd49f9e21fb2a53abe7357f0 branch: master author: Ken Jin <28750310+Fidget-Spinner(a)users.noreply.github.com> committer: miss-islington <31488909+miss-islington(a)users.noreply.github.com> date: 2020-12-28T12:06:19-08:00 summary: bpo-42740: Fix get_args for PEP 585 collections.abc.Callable (GH-23963) PR 1/2. Needs backport to 3.9. files: M Lib/test/test_typing.py M Lib/typing.py diff --git a/Lib/test/test_typing.py b/Lib/test/test_typing.py index c340c8a898289..3dcc31fe5be56 100644 --- a/Lib/test/test_typing.py +++ b/Lib/test/test_typing.py @@ -3048,6 +3048,11 @@ class C(Generic[T]): pass self.assertEqual(get_args(Callable), ()) self.assertEqual(get_args(list[int]), (int,)) self.assertEqual(get_args(list), ()) + self.assertEqual(get_args(collections.abc.Callable[[int], str]), ([int], str)) + self.assertEqual(get_args(collections.abc.Callable[..., str]), (..., str)) + self.assertEqual(get_args(collections.abc.Callable[[], str]), ([], str)) + self.assertEqual(get_args(collections.abc.Callable[[int], str]), + get_args(Callable[[int], str])) class CollectionsAbcTests(BaseTestCase): diff --git a/Lib/typing.py b/Lib/typing.py index 7b79876d4ebc7..67e95dd78f34d 100644 --- a/Lib/typing.py +++ b/Lib/typing.py @@ -1684,13 +1684,11 @@ def get_args(tp): """ if isinstance(tp, _AnnotatedAlias): return (tp.__origin__,) + tp.__metadata__ - if isinstance(tp, _GenericAlias): + if isinstance(tp, (_GenericAlias, GenericAlias)): res = tp.__args__ if tp.__origin__ is collections.abc.Callable and res[0] is not Ellipsis: res = (list(res[:-1]), res[-1]) return res - if isinstance(tp, GenericAlias): - return tp.__args__ return ()

1 0

bpo-42222: Modernize integer test/conversion in randrange() (#23064)
by rhettinger Dec. 28, 2020

Dec. 28, 2020

https://github.com/python/cpython/commit/a9621bb301dba44494e81edc00e3a3b62c… commit: a9621bb301dba44494e81edc00e3a3b62c96af26 branch: master author: Raymond Hettinger <rhettinger(a)users.noreply.github.com> committer: rhettinger <rhettinger(a)users.noreply.github.com> date: 2020-12-28T11:10:34-08:00 summary: bpo-42222: Modernize integer test/conversion in randrange() (#23064) files: A Misc/NEWS.d/next/Library/2020-10-31-10-28-32.bpo-42222.Cfl1eR.rst M Doc/library/random.rst M Lib/random.py M Lib/test/test_random.py diff --git a/Doc/library/random.rst b/Doc/library/random.rst index fa5c74b40b25e..07ee011521429 100644 --- a/Doc/library/random.rst +++ b/Doc/library/random.rst @@ -135,6 +135,15 @@ Functions for integers values. Formerly it used a style like ``int(random()*n)`` which could produce slightly uneven distributions. + .. deprecated:: 3.10 + The automatic conversion of non-integer types to equivalent integers is + deprecated. Currently ``randrange(10.0)`` is losslessly converted to + ``randrange(10)``. In the future, this will raise a :exc:`TypeError`. + + .. deprecated:: 3.10 + The exception raised for non-integral values such as ``range(10.5)`` + will be changed from :exc:`ValueError` to :exc:`TypeError`. + .. function:: randint(a, b) Return a random integer *N* such that ``a <= N <= b``. Alias for diff --git a/Lib/random.py b/Lib/random.py index 66433baa8cc18..a4128c28fb2c6 100644 --- a/Lib/random.py +++ b/Lib/random.py @@ -51,6 +51,7 @@ from math import tau as TWOPI, floor as _floor, isfinite as _isfinite from os import urandom as _urandom from _collections_abc import Set as _Set, Sequence as _Sequence +from operator import index as _index from itertools import accumulate as _accumulate, repeat as _repeat from bisect import bisect as _bisect import os as _os @@ -297,28 +298,59 @@ def randrange(self, start, stop=None, step=1): # This code is a bit messy to make it fast for the # common case while still doing adequate error checking. - istart = int(start) - if istart != start: - raise ValueError("non-integer arg 1 for randrange()") + try: + istart = _index(start) + except TypeError: + if int(start) == start: + istart = int(start) + _warn('Float arguments to randrange() have been deprecated\n' + 'since Python 3.10 and will be removed in a subsequent ' + 'version.', + DeprecationWarning, 2) + else: + _warn('randrange() will raise TypeError in the future', + DeprecationWarning, 2) + raise ValueError("non-integer arg 1 for randrange()") if stop is None: if istart > 0: return self._randbelow(istart) raise ValueError("empty range for randrange()") # stop argument supplied. - istop = int(stop) - if istop != stop: - raise ValueError("non-integer stop for randrange()") + try: + istop = _index(stop) + except TypeError: + if int(stop) == stop: + istop = int(stop) + _warn('Float arguments to randrange() have been deprecated\n' + 'since Python 3.10 and will be removed in a subsequent ' + 'version.', + DeprecationWarning, 2) + else: + _warn('randrange() will raise TypeError in the future', + DeprecationWarning, 2) + raise ValueError("non-integer stop for randrange()") + + try: + istep = _index(step) + except TypeError: + if int(step) == step: + istep = int(step) + _warn('Float arguments to randrange() have been deprecated\n' + 'since Python 3.10 and will be removed in a subsequent ' + 'version.', + DeprecationWarning, 2) + else: + _warn('randrange() will raise TypeError in the future', + DeprecationWarning, 2) + raise ValueError("non-integer step for randrange()") width = istop - istart - if step == 1 and width > 0: + if istep == 1 and width > 0: return istart + self._randbelow(width) - if step == 1: + if istep == 1: raise ValueError("empty range for randrange() (%d, %d, %d)" % (istart, istop, width)) # Non-unit step argument supplied. - istep = int(step) - if istep != step: - raise ValueError("non-integer step for randrange()") if istep > 0: n = (width + istep - 1) // istep elif istep < 0: diff --git a/Lib/test/test_random.py b/Lib/test/test_random.py index e7f911d12875e..436f3c98e6394 100644 --- a/Lib/test/test_random.py +++ b/Lib/test/test_random.py @@ -542,6 +542,26 @@ def test_randrange_errors(self): raises(0, 42, 0) raises(0, 42, 3.14159) + def test_randrange_argument_handling(self): + randrange = self.gen.randrange + with self.assertWarns(DeprecationWarning): + randrange(10.0, 20, 2) + with self.assertWarns(DeprecationWarning): + randrange(10, 20.0, 2) + with self.assertWarns(DeprecationWarning): + randrange(10, 20, 1.0) + with self.assertWarns(DeprecationWarning): + randrange(10, 20, 2.0) + with self.assertWarns(DeprecationWarning): + with self.assertRaises(ValueError): + randrange(10.5) + with self.assertWarns(DeprecationWarning): + with self.assertRaises(ValueError): + randrange(10, 20.5) + with self.assertWarns(DeprecationWarning): + with self.assertRaises(ValueError): + randrange(10, 20, 1.5) + def test_randbelow_logic(self, _log=log, int=int): # check bitcount transition points: 2**i and 2**(i+1)-1 # show that: k = int(1.001 + _log(n, 2)) diff --git a/Misc/NEWS.d/next/Library/2020-10-31-10-28-32.bpo-42222.Cfl1eR.rst b/Misc/NEWS.d/next/Library/2020-10-31-10-28-32.bpo-42222.Cfl1eR.rst new file mode 100644 index 0000000000000..2f570bb9824d0 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2020-10-31-10-28-32.bpo-42222.Cfl1eR.rst @@ -0,0 +1,9 @@ +Harmonized random.randrange() argument handling to match range(). + +* The integer test and conversion in randrange() now uses + operator.index(). +* Non-integer arguments to randrange() are deprecated. +* The *ValueError* is deprecated in favor of a *TypeError*. +* It now runs a little faster than before. + +(Contributed by Raymond Hettinger and Serhiy Storchaka.)

1 0

[workflow] Use MSVC problem matcher for Windows action build (GH-18532)
by zware Dec. 28, 2020

Dec. 28, 2020

https://github.com/python/cpython/commit/1031f23fc3aed6760785bf0f8290bd2b2c… commit: 1031f23fc3aed6760785bf0f8290bd2b2cce41c2 branch: master author: Ammar Askar <ammar(a)ammaraskar.com> committer: zware <zachary.ware(a)gmail.com> date: 2020-12-28T12:28:40-06:00 summary: [workflow] Use MSVC problem matcher for Windows action build (GH-18532) This makes warnings and errors from the compiler very prominent so this should help prevent warnings from sneaking into the code base and catch them in review. See https://discuss.python.org/t/using-github-problem-matchers-to-catch-warning… for more details You can see a demo of this in action here: https://github.com/ammaraskar/cpython/pull/15/files#diff-9ba2eeca0f254ece0a… GCC and Sphinx matchers have previously been added in GH-18567 and GH-20325, respectively. files: A .github/problem-matchers/msvc.json M .github/workflows/build.yml diff --git a/.github/problem-matchers/msvc.json b/.github/problem-matchers/msvc.json new file mode 100644 index 0000000000000..303a36b1c585e --- /dev/null +++ b/.github/problem-matchers/msvc.json @@ -0,0 +1,19 @@ +{ + "__comment": "Taken from vscode's vs/workbench/contrib/tasks/common/problemMatcher.ts msCompile rule", + "problemMatcher": [ + { + "owner": "msvc-problem-matcher", + "pattern": [ + { + "regexp": "^(?:\\s+\\d+\\>)?([^\\s].*)\$(\\d+),?(\\d+)?(?:,\\d+,\\d+)?\$\\s*:\\s+(error|warning|info)\\s+(\\w{1,2}\\d+)\\s*:\\s*(.*)$", + "file": 1, + "line": 2, + "column": 3, + "severity": 4, + "code": 5, + "message": 6 + } + ] + } + ] + } \ No newline at end of file diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 71c307b6c62a3..1b865a17b09dd 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -99,6 +99,8 @@ jobs: if: needs.check_source.outputs.run_tests == 'true' steps: - uses: actions/checkout@v2 + - name: Register MSVC problem matcher + run: echo "::add-matcher::.github/problem-matchers/msvc.json" - name: Build CPython run: .\PCbuild\build.bat -e -p x64 - name: Display build info

1 0

bpo-40077: Fix typo in simplequeue_get_state_by_type() (GH-23975)
by miss-islington Dec. 28, 2020

Dec. 28, 2020

https://github.com/python/cpython/commit/bf108bb21e1d75e30bd17141cc531dd08a… commit: bf108bb21e1d75e30bd17141cc531dd08a5e5d0c branch: master author: Erlend Egeberg Aasland <erlend.aasland(a)innova.no> committer: miss-islington <31488909+miss-islington(a)users.noreply.github.com> date: 2020-12-28T09:47:16-08:00 summary: bpo-40077: Fix typo in simplequeue_get_state_by_type() (GH-23975) The typo did no damage, but it looks suspicious and confusing. Introduced by GH-23136. Skip news. Automerge-Triggered-By: GH:pitrou files: M Modules/_queuemodule.c diff --git a/Modules/_queuemodule.c b/Modules/_queuemodule.c index a2b6ac87a72eb..7a52617ade5b0 100644 --- a/Modules/_queuemodule.c +++ b/Modules/_queuemodule.c @@ -15,7 +15,7 @@ simplequeue_get_state(PyObject *module) return state; } static struct PyModuleDef queuemodule; -#define simplequeue_get_state_by_type(tp) \ +#define simplequeue_get_state_by_type(type) \ (simplequeue_get_state(_PyType_GetModuleByDef(type, &queuemodule))) typedef struct {

1 0

bpo-1635741: sqlite3: Fix ref leak introduced by commit bf64d90 (GH-23972)
by vstinner Dec. 28, 2020

Dec. 28, 2020

https://github.com/python/cpython/commit/897387d2c8a956e74770c6bdd0447dfec6… commit: 897387d2c8a956e74770c6bdd0447dfec61e8e27 branch: master author: Erlend Egeberg Aasland <erlend.aasland(a)innova.no> committer: vstinner <vstinner(a)python.org> date: 2020-12-28T03:09:26+01:00 summary: bpo-1635741: sqlite3: Fix ref leak introduced by commit bf64d90 (GH-23972) files: M Modules/_sqlite/connection.c diff --git a/Modules/_sqlite/connection.c b/Modules/_sqlite/connection.c index 46717acf7c7d9..5c7b4eeae6ae9 100644 --- a/Modules/_sqlite/connection.c +++ b/Modules/_sqlite/connection.c @@ -891,7 +891,6 @@ pysqlite_connection_create_aggregate_impl(pysqlite_Connection *self, return NULL; } - Py_INCREF(aggregate_class); rc = sqlite3_create_function_v2(self->db, name, n_arg,

1 0