Mailman 3 September 2020 - Python-checkins

Fix grammar in secrets module documentation (GH-22467)
by Miss Islington (bot) Sept. 30, 2020

Sept. 30, 2020

https://github.com/python/cpython/commit/4c2e299d80c53591f05de2669c0edeaf8a… commit: 4c2e299d80c53591f05de2669c0edeaf8acd8544 branch: 3.8 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: GitHub <noreply(a)github.com> date: 2020-09-30T15:50:07-07:00 summary: Fix grammar in secrets module documentation (GH-22467) >From `In particularly,` to `In particular,` (cherry picked from commit 63298930fb531ba2bb4f23bc3b915dbf1e17e9e1) Co-authored-by: Max Smolens <msmolens(a)users.noreply.github.com> files: M Doc/library/secrets.rst diff --git a/Doc/library/secrets.rst b/Doc/library/secrets.rst index bc4766da2785b..afa8e2d385fa4 100644 --- a/Doc/library/secrets.rst +++ b/Doc/library/secrets.rst @@ -21,7 +21,7 @@ The :mod:`secrets` module is used for generating cryptographically strong random numbers suitable for managing data such as passwords, account authentication, security tokens, and related secrets. -In particularly, :mod:`secrets` should be used in preference to the +In particular, :mod:`secrets` should be used in preference to the default pseudo-random number generator in the :mod:`random` module, which is designed for modelling and simulation, not security or cryptography.

1 0

Fix grammar in secrets module documentation (GH-22467)
by Miss Islington (bot) Sept. 30, 2020

Sept. 30, 2020

https://github.com/python/cpython/commit/8fc828ec4e867c111cef137a2daeea6c3d… commit: 8fc828ec4e867c111cef137a2daeea6c3d5db2c7 branch: 3.9 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: GitHub <noreply(a)github.com> date: 2020-09-30T15:49:52-07:00 summary: Fix grammar in secrets module documentation (GH-22467) >From `In particularly,` to `In particular,` (cherry picked from commit 63298930fb531ba2bb4f23bc3b915dbf1e17e9e1) Co-authored-by: Max Smolens <msmolens(a)users.noreply.github.com> files: M Doc/library/secrets.rst diff --git a/Doc/library/secrets.rst b/Doc/library/secrets.rst index bc4766da2785b..afa8e2d385fa4 100644 --- a/Doc/library/secrets.rst +++ b/Doc/library/secrets.rst @@ -21,7 +21,7 @@ The :mod:`secrets` module is used for generating cryptographically strong random numbers suitable for managing data such as passwords, account authentication, security tokens, and related secrets. -In particularly, :mod:`secrets` should be used in preference to the +In particular, :mod:`secrets` should be used in preference to the default pseudo-random number generator in the :mod:`random` module, which is designed for modelling and simulation, not security or cryptography.

1 0

Fix grammar in secrets module documentation (GH-22467)
by Max Smolens Sept. 30, 2020

Sept. 30, 2020

https://github.com/python/cpython/commit/63298930fb531ba2bb4f23bc3b915dbf1e… commit: 63298930fb531ba2bb4f23bc3b915dbf1e17e9e1 branch: master author: Max Smolens <msmolens(a)users.noreply.github.com> committer: GitHub <noreply(a)github.com> date: 2020-09-30T15:05:51-07:00 summary: Fix grammar in secrets module documentation (GH-22467) >From `In particularly,` to `In particular,` files: M Doc/library/secrets.rst diff --git a/Doc/library/secrets.rst b/Doc/library/secrets.rst index bc4766da2785b..afa8e2d385fa4 100644 --- a/Doc/library/secrets.rst +++ b/Doc/library/secrets.rst @@ -21,7 +21,7 @@ The :mod:`secrets` module is used for generating cryptographically strong random numbers suitable for managing data such as passwords, account authentication, security tokens, and related secrets. -In particularly, :mod:`secrets` should be used in preference to the +In particular, :mod:`secrets` should be used in preference to the default pseudo-random number generator in the :mod:`random` module, which is designed for modelling and simulation, not security or cryptography.

1 0

bpo-41670: Remove outdated predict macro invocation. (GH-22026)
by Mark Shannon Sept. 29, 2020

Sept. 29, 2020

https://github.com/python/cpython/commit/17b5be0c0a3f74141014e06a660f1b5ddb… commit: 17b5be0c0a3f74141014e06a660f1b5ddb002fec branch: master author: Mark Shannon <mark(a)hotpy.org> committer: GitHub <noreply(a)github.com> date: 2020-09-29T10:09:13+01:00 summary: bpo-41670: Remove outdated predict macro invocation. (GH-22026) Remove PREDICTion of POP_BLOCK from FOR_ITER. files: A Misc/NEWS.d/next/Core and Builtins/2020-08-31-11-37-59.bpo-41670.vmRJRx.rst M Lib/test/test_sys_settrace.py M Python/ceval.c diff --git a/Lib/test/test_sys_settrace.py b/Lib/test/test_sys_settrace.py index 3f902b1fe74ce..dd4418dd98b22 100644 --- a/Lib/test/test_sys_settrace.py +++ b/Lib/test/test_sys_settrace.py @@ -602,6 +602,23 @@ def run(tracer): self.compare_events(doit_async.__code__.co_firstlineno, tracer.events, events) + def test_loop_in_try_except(self): + # https://bugs.python.org/issue41670 + + def func(): + try: + for i in []: pass + return 1 + except: + return 2 + + self.run_and_compare(func, + [(0, 'call'), + (1, 'line'), + (2, 'line'), + (3, 'line'), + (3, 'return')]) + class SkipLineEventsTraceTestCase(TraceTestCase): """Repeat the trace tests, but with per-line events skipped""" diff --git a/Misc/NEWS.d/next/Core and Builtins/2020-08-31-11-37-59.bpo-41670.vmRJRx.rst b/Misc/NEWS.d/next/Core and Builtins/2020-08-31-11-37-59.bpo-41670.vmRJRx.rst new file mode 100644 index 0000000000000..6ad5fb6dc9bb4 --- /dev/null +++ b/Misc/NEWS.d/next/Core and Builtins/2020-08-31-11-37-59.bpo-41670.vmRJRx.rst @@ -0,0 +1,4 @@ +Prevent line trace being skipped on platforms not compiled +with ``USE_COMPUTED_GOTOS``. +Fixes issue where some lines nested within a try-except block +were not being traced on Windows. diff --git a/Python/ceval.c b/Python/ceval.c index 6430e792b8c5d..6bd2d6bc13d86 100644 --- a/Python/ceval.c +++ b/Python/ceval.c @@ -2311,7 +2311,6 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, PyFrameObject *f, int throwflag) } case TARGET(POP_BLOCK): { - PREDICTED(POP_BLOCK); PyFrame_BlockPop(f); DISPATCH(); } @@ -3366,7 +3365,6 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, PyFrameObject *f, int throwflag) STACK_SHRINK(1); Py_DECREF(iter); JUMPBY(oparg); - PREDICT(POP_BLOCK); DISPATCH(); }

1 0

bpo-41774: Add programming FAQ entry (GH-22402)
by Miss Islington (bot) Sept. 29, 2020

Sept. 29, 2020

https://github.com/python/cpython/commit/868c8e41eb1d7dc032679ae06e62c0d60e… commit: 868c8e41eb1d7dc032679ae06e62c0d60edd7725 branch: 3.9 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: GitHub <noreply(a)github.com> date: 2020-09-28T22:27:06-07:00 summary: bpo-41774: Add programming FAQ entry (GH-22402) In the "Sequences (Tuples/Lists)" section, add "How do you remove multiple items from a list". (cherry picked from commit 5b0181d1f6474c2cb9b80bdaf3bc56a78bf5fbe7) Co-authored-by: Terry Jan Reedy <tjreedy(a)udel.edu> files: A Misc/NEWS.d/next/Documentation/2020-09-24-15-35-13.bpo-41774.5IqdGP.rst M Doc/faq/programming.rst diff --git a/Doc/faq/programming.rst b/Doc/faq/programming.rst index 66d210a55fac7..1435765063f73 100644 --- a/Doc/faq/programming.rst +++ b/Doc/faq/programming.rst @@ -1164,6 +1164,21 @@ This converts the list into a set, thereby removing duplicates, and then back into a list. +How do you remove multiple items from a list +-------------------------------------------- + +As with removing duplicates, explicitly iterating in reverse with a +delete condition is one possibility. However, it is easier and faster +to use slice replacement with an implicit or explicit forward iteration. +Here are three variations.:: + + mylist[:] = filter(keep_function, mylist) + mylist[:] = (x for x in mylist if keep_condition) + mylist[:] = [x for x in mylist if keep_condition] + +If space is not an issue, the list comprehension may be fastest. + + How do you make an array in Python? ----------------------------------- diff --git a/Misc/NEWS.d/next/Documentation/2020-09-24-15-35-13.bpo-41774.5IqdGP.rst b/Misc/NEWS.d/next/Documentation/2020-09-24-15-35-13.bpo-41774.5IqdGP.rst new file mode 100644 index 0000000000000..af8e02437cb2b --- /dev/null +++ b/Misc/NEWS.d/next/Documentation/2020-09-24-15-35-13.bpo-41774.5IqdGP.rst @@ -0,0 +1,2 @@ +In Programming FAQ "Sequences (Tuples/Lists)" section, add "How do you +remove multiple items from a list".

1 0

bpo-41774: Add programming FAQ entry (GH-22402)
by Miss Islington (bot) Sept. 29, 2020

Sept. 29, 2020

https://github.com/python/cpython/commit/d50a0700265536a20bcce3fb108c954746… commit: d50a0700265536a20bcce3fb108c954746d97625 branch: 3.8 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: GitHub <noreply(a)github.com> date: 2020-09-28T22:11:06-07:00 summary: bpo-41774: Add programming FAQ entry (GH-22402) In the "Sequences (Tuples/Lists)" section, add "How do you remove multiple items from a list". (cherry picked from commit 5b0181d1f6474c2cb9b80bdaf3bc56a78bf5fbe7) Co-authored-by: Terry Jan Reedy <tjreedy(a)udel.edu> files: A Misc/NEWS.d/next/Documentation/2020-09-24-15-35-13.bpo-41774.5IqdGP.rst M Doc/faq/programming.rst diff --git a/Doc/faq/programming.rst b/Doc/faq/programming.rst index 70e9190e5a520..1af04483eb329 100644 --- a/Doc/faq/programming.rst +++ b/Doc/faq/programming.rst @@ -1163,6 +1163,21 @@ This converts the list into a set, thereby removing duplicates, and then back into a list. +How do you remove multiple items from a list +-------------------------------------------- + +As with removing duplicates, explicitly iterating in reverse with a +delete condition is one possibility. However, it is easier and faster +to use slice replacement with an implicit or explicit forward iteration. +Here are three variations.:: + + mylist[:] = filter(keep_function, mylist) + mylist[:] = (x for x in mylist if keep_condition) + mylist[:] = [x for x in mylist if keep_condition] + +If space is not an issue, the list comprehension may be fastest. + + How do you make an array in Python? ----------------------------------- diff --git a/Misc/NEWS.d/next/Documentation/2020-09-24-15-35-13.bpo-41774.5IqdGP.rst b/Misc/NEWS.d/next/Documentation/2020-09-24-15-35-13.bpo-41774.5IqdGP.rst new file mode 100644 index 0000000000000..af8e02437cb2b --- /dev/null +++ b/Misc/NEWS.d/next/Documentation/2020-09-24-15-35-13.bpo-41774.5IqdGP.rst @@ -0,0 +1,2 @@ +In Programming FAQ "Sequences (Tuples/Lists)" section, add "How do you +remove multiple items from a list".

1 0

bpo-41774: Add programming FAQ entry (GH-22402)
by Terry Jan Reedy Sept. 29, 2020

Sept. 29, 2020

https://github.com/python/cpython/commit/5b0181d1f6474c2cb9b80bdaf3bc56a78b… commit: 5b0181d1f6474c2cb9b80bdaf3bc56a78bf5fbe7 branch: master author: Terry Jan Reedy <tjreedy(a)udel.edu> committer: GitHub <noreply(a)github.com> date: 2020-09-29T01:02:44-04:00 summary: bpo-41774: Add programming FAQ entry (GH-22402) In the "Sequences (Tuples/Lists)" section, add "How do you remove multiple items from a list". files: A Misc/NEWS.d/next/Documentation/2020-09-24-15-35-13.bpo-41774.5IqdGP.rst M Doc/faq/programming.rst diff --git a/Doc/faq/programming.rst b/Doc/faq/programming.rst index 4f4ea8b18176c..76ae4d260fad4 100644 --- a/Doc/faq/programming.rst +++ b/Doc/faq/programming.rst @@ -1164,6 +1164,21 @@ This converts the list into a set, thereby removing duplicates, and then back into a list. +How do you remove multiple items from a list +-------------------------------------------- + +As with removing duplicates, explicitly iterating in reverse with a +delete condition is one possibility. However, it is easier and faster +to use slice replacement with an implicit or explicit forward iteration. +Here are three variations.:: + + mylist[:] = filter(keep_function, mylist) + mylist[:] = (x for x in mylist if keep_condition) + mylist[:] = [x for x in mylist if keep_condition] + +If space is not an issue, the list comprehension may be fastest. + + How do you make an array in Python? ----------------------------------- diff --git a/Misc/NEWS.d/next/Documentation/2020-09-24-15-35-13.bpo-41774.5IqdGP.rst b/Misc/NEWS.d/next/Documentation/2020-09-24-15-35-13.bpo-41774.5IqdGP.rst new file mode 100644 index 0000000000000..af8e02437cb2b --- /dev/null +++ b/Misc/NEWS.d/next/Documentation/2020-09-24-15-35-13.bpo-41774.5IqdGP.rst @@ -0,0 +1,2 @@ +In Programming FAQ "Sequences (Tuples/Lists)" section, add "How do you +remove multiple items from a list".

1 0

bpo-41773: Raise exception for non-finite weights in random.choices(). (GH-22441)
by Ram Rachum Sept. 29, 2020

Sept. 29, 2020

https://github.com/python/cpython/commit/b0dfc7581697f20385813582de7e92ba6b… commit: b0dfc7581697f20385813582de7e92ba6ba0105f branch: master author: Ram Rachum <ram(a)rachum.com> committer: GitHub <noreply(a)github.com> date: 2020-09-28T18:32:10-07:00 summary: bpo-41773: Raise exception for non-finite weights in random.choices(). (GH-22441) files: A Misc/NEWS.d/next/Library/2020-09-28-23-22-25.bpo-41773.oKkus0.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 0cdf0a6ac4a47..af5131df280c2 100644 --- a/Doc/library/random.rst +++ b/Doc/library/random.rst @@ -180,8 +180,8 @@ Functions for sequences The *weights* or *cum_weights* can use any numeric type that interoperates with the :class:`float` values returned by :func:`random` (that includes - integers, floats, and fractions but excludes decimals). Behavior is - undefined if any weight is negative. A :exc:`ValueError` is raised if all + integers, floats, and fractions but excludes decimals). Weights are assumed + to be non-negative and finite. A :exc:`ValueError` is raised if all weights are zero. For a given seed, the :func:`choices` function with equal weighting diff --git a/Lib/random.py b/Lib/random.py index 3ea369b81b3e5..139e8a40bb272 100644 --- a/Lib/random.py +++ b/Lib/random.py @@ -48,7 +48,7 @@ from warnings import warn as _warn from math import log as _log, exp as _exp, pi as _pi, e as _e, ceil as _ceil from math import sqrt as _sqrt, acos as _acos, cos as _cos, sin as _sin -from math import tau as TWOPI, floor as _floor +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 itertools import accumulate as _accumulate, repeat as _repeat @@ -492,6 +492,8 @@ def choices(self, population, weights=None, *, cum_weights=None, k=1): total = cum_weights[-1] + 0.0 # convert to float if total <= 0.0: raise ValueError('Total of weights must be greater than zero') + if not _isfinite(total): + raise ValueError('Total of weights must be finite') bisect = _bisect hi = n - 1 return [population[bisect(cum_weights, random() * total, 0, hi)] diff --git a/Lib/test/test_random.py b/Lib/test/test_random.py index a80e71e67e4c6..0c1fdeec9915e 100644 --- a/Lib/test/test_random.py +++ b/Lib/test/test_random.py @@ -324,6 +324,22 @@ def test_choices_with_all_zero_weights(self): with self.assertRaises(ValueError): self.gen.choices('AB', [0.0, 0.0]) + def test_choices_negative_total(self): + with self.assertRaises(ValueError): + self.gen.choices('ABC', [3, -5, 1]) + + def test_choices_infinite_total(self): + with self.assertRaises(ValueError): + self.gen.choices('A', [float('inf')]) + with self.assertRaises(ValueError): + self.gen.choices('AB', [0.0, float('inf')]) + with self.assertRaises(ValueError): + self.gen.choices('AB', [-float('inf'), 123]) + with self.assertRaises(ValueError): + self.gen.choices('AB', [0.0, float('nan')]) + with self.assertRaises(ValueError): + self.gen.choices('AB', [float('-inf'), float('inf')]) + def test_gauss(self): # Ensure that the seed() method initializes all the hidden state. In # particular, through 2.2.1 it failed to reset a piece of state used diff --git a/Misc/NEWS.d/next/Library/2020-09-28-23-22-25.bpo-41773.oKkus0.rst b/Misc/NEWS.d/next/Library/2020-09-28-23-22-25.bpo-41773.oKkus0.rst new file mode 100644 index 0000000000000..cef7ff0188354 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2020-09-28-23-22-25.bpo-41773.oKkus0.rst @@ -0,0 +1,2 @@ +Note in documentation that :func:`random.choices` doesn't support non-finite +weights, raise :exc:`ValueError` when given non-finite weights.

1 0

bpo-41873: Add vectorcall for float() (GH-22432)
by Dennis Sweeney Sept. 29, 2020

Sept. 29, 2020

https://github.com/python/cpython/commit/e8acc355d430b45f1c3ff83312e7227226… commit: e8acc355d430b45f1c3ff83312e72272262a854f branch: master author: Dennis Sweeney <36520290+sweeneyde(a)users.noreply.github.com> committer: GitHub <noreply(a)github.com> date: 2020-09-29T09:55:52+09:00 summary: bpo-41873: Add vectorcall for float() (GH-22432) files: A Misc/NEWS.d/next/Core and Builtins/2020-09-28-08-58-28.bpo-41873.VzEDhA.rst M Lib/test/test_float.py M Objects/floatobject.c diff --git a/Lib/test/test_float.py b/Lib/test/test_float.py index 9651281e24edb..99c81f0b72a5a 100644 --- a/Lib/test/test_float.py +++ b/Lib/test/test_float.py @@ -64,6 +64,9 @@ def test_float(self): # See bpo-34087 self.assertRaises(ValueError, float, '\u3053\u3093\u306b\u3061\u306f') + def test_noargs(self): + self.assertEqual(float(), 0.0) + def test_underscores(self): for lit in VALID_UNDERSCORE_LITERALS: if not any(ch in lit for ch in 'jJxXoObB'): diff --git a/Misc/NEWS.d/next/Core and Builtins/2020-09-28-08-58-28.bpo-41873.VzEDhA.rst b/Misc/NEWS.d/next/Core and Builtins/2020-09-28-08-58-28.bpo-41873.VzEDhA.rst new file mode 100644 index 0000000000000..ee2636704c299 --- /dev/null +++ b/Misc/NEWS.d/next/Core and Builtins/2020-09-28-08-58-28.bpo-41873.VzEDhA.rst @@ -0,0 +1 @@ +Calls to ``float()`` are now faster due to the ``vectorcall`` calling convention. Patch by Dennis Sweeney. \ No newline at end of file diff --git a/Objects/floatobject.c b/Objects/floatobject.c index 0606f29ff5408..d0af0ea1a9825 100644 --- a/Objects/floatobject.c +++ b/Objects/floatobject.c @@ -1649,6 +1649,24 @@ float_subtype_new(PyTypeObject *type, PyObject *x) return newobj; } +static PyObject * +float_vectorcall(PyObject *type, PyObject * const*args, + size_t nargsf, PyObject *kwnames) +{ + if (!_PyArg_NoKwnames("float", kwnames)) { + return NULL; + } + + Py_ssize_t nargs = PyVectorcall_NARGS(nargsf); + if (!_PyArg_CheckPositional("float", nargs, 0, 1)) { + return NULL; + } + + PyObject *x = nargs >= 1 ? args[0] : _PyLong_Zero; + return float_new_impl((PyTypeObject *)type, x); +} + + /*[clinic input] float.__getnewargs__ [clinic start generated code]*/ @@ -1937,6 +1955,7 @@ PyTypeObject PyFloat_Type = { 0, /* tp_init */ 0, /* tp_alloc */ float_new, /* tp_new */ + .tp_vectorcall = (vectorcallfunc)float_vectorcall, }; int

1 0

bpo-41875: Use __builtin_unreachable when possible (GH-22433)
by Miss Islington (bot) Sept. 28, 2020

Sept. 28, 2020

https://github.com/python/cpython/commit/cca896e13b230a934fdb709b7f10c5451f… commit: cca896e13b230a934fdb709b7f10c5451ffc25ba branch: 3.9 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: GitHub <noreply(a)github.com> date: 2020-09-28T15:16:24-07:00 summary: bpo-41875: Use __builtin_unreachable when possible (GH-22433) (cherry picked from commit 24ba3b0df5e5f2f237d7b23b4017ba12f16320ae) Co-authored-by: Dong-hee Na <donghee.na92(a)gmail.com> files: A Misc/NEWS.d/next/Build/2020-09-28-21-56-51.bpo-38249.uzMCaZ.rst M Include/pymacro.h diff --git a/Include/pymacro.h b/Include/pymacro.h index 856cae774d61c..202b936d964f0 100644 --- a/Include/pymacro.h +++ b/Include/pymacro.h @@ -118,7 +118,9 @@ "We've reached an unreachable state. Anything is possible.\n" \ "The limits were in our heads all along. Follow your dreams.\n" \ "https://xkcd.com/2200") -#elif defined(__GNUC__) || defined(__clang__) || defined(__INTEL_COMPILER) +#elif defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 5)) +# define Py_UNREACHABLE() __builtin_unreachable() +#elif defined(__clang__) || defined(__INTEL_COMPILER) # define Py_UNREACHABLE() __builtin_unreachable() #elif defined(_MSC_VER) # define Py_UNREACHABLE() __assume(0) diff --git a/Misc/NEWS.d/next/Build/2020-09-28-21-56-51.bpo-38249.uzMCaZ.rst b/Misc/NEWS.d/next/Build/2020-09-28-21-56-51.bpo-38249.uzMCaZ.rst new file mode 100644 index 0000000000000..3e409ec2e7c20 --- /dev/null +++ b/Misc/NEWS.d/next/Build/2020-09-28-21-56-51.bpo-38249.uzMCaZ.rst @@ -0,0 +1,2 @@ +Update :c:macro:`Py_UNREACHABLE` to use __builtin_unreachable() if only the +compiler is able to use it. Patch by Dong-hee Na.

1 0