Mailman 3 January 2019 - Python-checkins

Move float conversion into a macro. Apply to fsum (GH-11698)
by Raymond Hettinger Jan. 29, 2019

Jan. 29, 2019

https://github.com/python/cpython/commit/cfd735ea28a2b985598236f955c72c3f0e… commit: cfd735ea28a2b985598236f955c72c3f0e82e01d branch: master author: Raymond Hettinger <rhettinger(a)users.noreply.github.com> committer: GitHub <noreply(a)github.com> date: 2019-01-29T20:39:53-08:00 summary: Move float conversion into a macro. Apply to fsum (GH-11698) files: M Modules/mathmodule.c diff --git a/Modules/mathmodule.c b/Modules/mathmodule.c index c4353771d960..83dab1269d63 100644 --- a/Modules/mathmodule.c +++ b/Modules/mathmodule.c @@ -76,6 +76,29 @@ static const double logpi = 1.144729885849400174143427351353058711647; static const double sqrtpi = 1.772453850905516027298167483341145182798; #endif /* !defined(HAVE_ERF) || !defined(HAVE_ERFC) */ + +/* Version of PyFloat_AsDouble() with in-line fast paths + for exact floats and integers. Gives a substantial + speed improvement for extracting float arguments. +*/ + +#define ASSIGN_DOUBLE(target_var, obj, error_label) \ + if (PyFloat_CheckExact(obj)) { \ + target_var = PyFloat_AS_DOUBLE(obj); \ + } \ + else if (PyLong_CheckExact(obj)) { \ + target_var = PyLong_AsDouble(obj); \ + if (target_var == -1.0 && PyErr_Occurred()) { \ + goto error_label; \ + } \ + } \ + else { \ + target_var = PyFloat_AsDouble(obj); \ + if (target_var == -1.0 && PyErr_Occurred()) { \ + goto error_label; \ + } \ + } + static double sinpi(double x) { @@ -1323,10 +1346,8 @@ math_fsum(PyObject *module, PyObject *seq) goto _fsum_error; break; } - x = PyFloat_AsDouble(item); + ASSIGN_DOUBLE(x, item, error_with_item); Py_DECREF(item); - if (PyErr_Occurred()) - goto _fsum_error; xsave = x; for (i = j = 0; j < n; j++) { /* for y in partials */ @@ -1407,12 +1428,16 @@ math_fsum(PyObject *module, PyObject *seq) } sum = PyFloat_FromDouble(hi); -_fsum_error: + _fsum_error: PyFPE_END_PROTECT(hi) Py_DECREF(iter); if (p != ps) PyMem_Free(p); return sum; + + error_with_item: + Py_DECREF(item); + goto _fsum_error; } #undef NUM_PARTIALS @@ -2142,37 +2167,9 @@ math_dist_impl(PyObject *module, PyObject *p, PyObject *q) } for (i=0 ; i<n ; i++) { item = PyTuple_GET_ITEM(p, i); - if (PyFloat_CheckExact(item)) { - px = PyFloat_AS_DOUBLE(item); - } - else if (PyLong_CheckExact(item)) { - px = PyLong_AsDouble(item); - if (px == -1.0 && PyErr_Occurred()) { - goto error_exit; - } - } - else { - px = PyFloat_AsDouble(item); - if (px == -1.0 && PyErr_Occurred()) { - goto error_exit; - } - } + ASSIGN_DOUBLE(px, item, error_exit); item = PyTuple_GET_ITEM(q, i); - if (PyFloat_CheckExact(item)) { - qx = PyFloat_AS_DOUBLE(item); - } - else if (PyLong_CheckExact(item)) { - qx = PyLong_AsDouble(item); - if (qx == -1.0 && PyErr_Occurred()) { - goto error_exit; - } - } - else { - qx = PyFloat_AsDouble(item); - if (qx == -1.0 && PyErr_Occurred()) { - goto error_exit; - } - } + ASSIGN_DOUBLE(qx, item, error_exit); x = fabs(px - qx); diffs[i] = x; found_nan |= Py_IS_NAN(x); @@ -2213,21 +2210,7 @@ math_hypot(PyObject *self, PyObject *const *args, Py_ssize_t nargs) } for (i = 0; i < nargs; i++) { item = args[i]; - if (PyFloat_CheckExact(item)) { - x = PyFloat_AS_DOUBLE(item); - } - else if (PyLong_CheckExact(item)) { - x = PyLong_AsDouble(item); - if (x == -1.0 && PyErr_Occurred()) { - goto error_exit; - } - } - else { - x = PyFloat_AsDouble(item); - if (x == -1.0 && PyErr_Occurred()) { - goto error_exit; - } - } + ASSIGN_DOUBLE(x, item, error_exit); x = fabs(x); coordinates[i] = x; found_nan |= Py_IS_NAN(x);

1 0

subprocess: close pipes/fds by using ExitStack (GH-11686)
by Gregory P. Smith Jan. 29, 2019

Jan. 29, 2019

https://github.com/python/cpython/commit/bafa8487f77fa076de3a06755399daf81c… commit: bafa8487f77fa076de3a06755399daf81cb75598 branch: master author: Giampaolo Rodola <g.rodola(a)gmail.com> committer: Gregory P. Smith <greg(a)krypto.org> date: 2019-01-29T13:14:24-08:00 summary: subprocess: close pipes/fds by using ExitStack (GH-11686) Close pipes/fds in subprocess by using ExitStack. "In case of premature failure on X.Close() or os.close(X) the remaining pipes/fds will remain "open". Perhaps it makes sense to use contextlib.ExitStack." - Rationale: https://github.com/python/cpython/pull/11575#discussion_r250288394 files: A Misc/NEWS.d/next/Library/2019-01-29-17-24-52.bpo-35537.Q0ktFC.rst M Lib/subprocess.py diff --git a/Lib/subprocess.py b/Lib/subprocess.py index 1f6eb63b387f..0496b447e8ea 100644 --- a/Lib/subprocess.py +++ b/Lib/subprocess.py @@ -50,6 +50,7 @@ import sys import threading import warnings +import contextlib from time import monotonic as _time @@ -1072,28 +1073,28 @@ def _close_pipe_fds(self, # self._devnull is not always defined. devnull_fd = getattr(self, '_devnull', None) - if _mswindows: - if p2cread != -1: - p2cread.Close() - if c2pwrite != -1: - c2pwrite.Close() - if errwrite != -1: - errwrite.Close() - else: - if p2cread != -1 and p2cwrite != -1 and p2cread != devnull_fd: - os.close(p2cread) - if c2pwrite != -1 and c2pread != -1 and c2pwrite != devnull_fd: - os.close(c2pwrite) - if errwrite != -1 and errread != -1 and errwrite != devnull_fd: - os.close(errwrite) + with contextlib.ExitStack() as stack: + if _mswindows: + if p2cread != -1: + stack.callback(p2cread.Close) + if c2pwrite != -1: + stack.callback(c2pwrite.Close) + if errwrite != -1: + stack.callback(errwrite.Close) + else: + if p2cread != -1 and p2cwrite != -1 and p2cread != devnull_fd: + stack.callback(os.close, p2cread) + if c2pwrite != -1 and c2pread != -1 and c2pwrite != devnull_fd: + stack.callback(os.close, c2pwrite) + if errwrite != -1 and errread != -1 and errwrite != devnull_fd: + stack.callback(os.close, errwrite) - if devnull_fd is not None: - os.close(devnull_fd) + if devnull_fd is not None: + stack.callback(os.close, devnull_fd) # Prevent a double close of these handles/fds from __init__ on error. self._closed_child_pipe_fds = True - if _mswindows: # # Windows methods diff --git a/Misc/NEWS.d/next/Library/2019-01-29-17-24-52.bpo-35537.Q0ktFC.rst b/Misc/NEWS.d/next/Library/2019-01-29-17-24-52.bpo-35537.Q0ktFC.rst new file mode 100644 index 000000000000..2a9588e745f4 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2019-01-29-17-24-52.bpo-35537.Q0ktFC.rst @@ -0,0 +1,4 @@ +An ExitStack is now used internally within subprocess.POpen to clean up pipe +file handles. No behavior change in normal operation. But if closing one +handle were ever to cause an exception, the others will now be closed +instead of leaked. (patch by Giampaolo Rodola)

1 0

bpo-35847: RISC-V needs CTYPES_PASS_BY_REF_HACK (GH-11694)
by Miss Islington (bot) Jan. 29, 2019

Jan. 29, 2019

https://github.com/python/cpython/commit/10354cbb5067b4719ba1c2d51d22314a64… commit: 10354cbb5067b4719ba1c2d51d22314a644ed3e5 branch: 3.7 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: GitHub <noreply(a)github.com> date: 2019-01-29T13:11:36-08:00 summary: bpo-35847: RISC-V needs CTYPES_PASS_BY_REF_HACK (GH-11694) This fixes the ctypes.test.test_structures.StructureTestCase test. https://bugs.python.org/issue35847 (cherry picked from commit 742d768656512a469ce9571b1cbd777def7bc5ea) Co-authored-by: Andreas Schwab <schwab(a)linux-m68k.org> files: A Misc/NEWS.d/next/Library/2019-01-29-09-11-09.bpo-35847.eiSi4t.rst M Modules/_ctypes/callproc.c diff --git a/Misc/NEWS.d/next/Library/2019-01-29-09-11-09.bpo-35847.eiSi4t.rst b/Misc/NEWS.d/next/Library/2019-01-29-09-11-09.bpo-35847.eiSi4t.rst new file mode 100644 index 000000000000..e3775f96f36e --- /dev/null +++ b/Misc/NEWS.d/next/Library/2019-01-29-09-11-09.bpo-35847.eiSi4t.rst @@ -0,0 +1 @@ +RISC-V needed the CTYPES_PASS_BY_REF_HACK. Fixes ctypes Structure test_pass_by_value. diff --git a/Modules/_ctypes/callproc.c b/Modules/_ctypes/callproc.c index ec596b4de31d..e971388f69b9 100644 --- a/Modules/_ctypes/callproc.c +++ b/Modules/_ctypes/callproc.c @@ -1052,7 +1052,7 @@ GetComError(HRESULT errcode, GUID *riid, IUnknown *pIunk) #endif #if (defined(__x86_64__) && (defined(__MINGW64__) || defined(__CYGWIN__))) || \ - defined(__aarch64__) + defined(__aarch64__) || defined(__riscv) #define CTYPES_PASS_BY_REF_HACK #define POW2(x) (((x & ~(x - 1)) == x) ? x : 0) #define IS_PASS_BY_REF(x) (x > 8 || !POW2(x))

1 0

bpo-35847: RISC-V needs CTYPES_PASS_BY_REF_HACK (GH-11694)
by Miss Islington (bot) Jan. 29, 2019

Jan. 29, 2019

https://github.com/python/cpython/commit/742d768656512a469ce9571b1cbd777def… commit: 742d768656512a469ce9571b1cbd777def7bc5ea branch: master author: Andreas Schwab <schwab(a)linux-m68k.org> committer: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> date: 2019-01-29T08:16:10-08:00 summary: bpo-35847: RISC-V needs CTYPES_PASS_BY_REF_HACK (GH-11694) This fixes the ctypes.test.test_structures.StructureTestCase test. https://bugs.python.org/issue35847 files: A Misc/NEWS.d/next/Library/2019-01-29-09-11-09.bpo-35847.eiSi4t.rst M Modules/_ctypes/callproc.c diff --git a/Misc/NEWS.d/next/Library/2019-01-29-09-11-09.bpo-35847.eiSi4t.rst b/Misc/NEWS.d/next/Library/2019-01-29-09-11-09.bpo-35847.eiSi4t.rst new file mode 100644 index 000000000000..e3775f96f36e --- /dev/null +++ b/Misc/NEWS.d/next/Library/2019-01-29-09-11-09.bpo-35847.eiSi4t.rst @@ -0,0 +1 @@ +RISC-V needed the CTYPES_PASS_BY_REF_HACK. Fixes ctypes Structure test_pass_by_value. diff --git a/Modules/_ctypes/callproc.c b/Modules/_ctypes/callproc.c index a7965c19b70c..bed536402023 100644 --- a/Modules/_ctypes/callproc.c +++ b/Modules/_ctypes/callproc.c @@ -1058,7 +1058,7 @@ GetComError(HRESULT errcode, GUID *riid, IUnknown *pIunk) #endif #if (defined(__x86_64__) && (defined(__MINGW64__) || defined(__CYGWIN__))) || \ - defined(__aarch64__) + defined(__aarch64__) || defined(__riscv) #define CTYPES_PASS_BY_REF_HACK #define POW2(x) (((x & ~(x - 1)) == x) ? x : 0) #define IS_PASS_BY_REF(x) (x > 8 || !POW2(x))

1 0

Daily reference leaks (4243df51fe43): sum=8
by solipsis＠pitrou.net Jan. 29, 2019

Jan. 29, 2019

results for 4243df51fe43 on branch "default" -------------------------------------------- test_asyncio leaked [3, 0, 0] memory blocks, sum=3 test_functools leaked [0, 3, 1] memory blocks, sum=4 test_multiprocessing_fork leaked [-2, 2, 0] memory blocks, sum=0 test_multiprocessing_forkserver leaked [-1, 2, 0] memory blocks, sum=1 Command line was: ['./python', '-m', 'test.regrtest', '-uall', '-R', '3:3:/home/psf-users/antoine/refleaks/reflog0Qujvw', '--timeout', '7200']

1 0

Fast path for int inputs to math.dist() and math.hypot() (GH-11692)
by Raymond Hettinger Jan. 28, 2019

Jan. 28, 2019

https://github.com/python/cpython/commit/808180c206fbde390d9dbdf24a8989fc8a… commit: 808180c206fbde390d9dbdf24a8989fc8a6446ec branch: master author: Raymond Hettinger <rhettinger(a)users.noreply.github.com> committer: GitHub <noreply(a)github.com> date: 2019-01-28T13:59:56-08:00 summary: Fast path for int inputs to math.dist() and math.hypot() (GH-11692) files: M Lib/test/test_math.py M Modules/mathmodule.c diff --git a/Lib/test/test_math.py b/Lib/test/test_math.py index b476a39e0aeb..f9b11f3f74e6 100644 --- a/Lib/test/test_math.py +++ b/Lib/test/test_math.py @@ -766,6 +766,9 @@ def testHypot(self): hypot(x=1) with self.assertRaises(TypeError): # Reject values without __float__ hypot(1.1, 'string', 2.2) + int_too_big_for_float = 10 ** (sys.float_info.max_10_exp + 5) + with self.assertRaises((ValueError, OverflowError)): + hypot(1, int_too_big_for_float) # Any infinity gives positive infinity. self.assertEqual(hypot(INF), INF) @@ -805,7 +808,8 @@ def testDist(self): dist = math.dist sqrt = math.sqrt - # Simple exact case + # Simple exact cases + self.assertEqual(dist((1.0, 2.0, 3.0), (4.0, 2.0, -1.0)), 5.0) self.assertEqual(dist((1, 2, 3), (4, 2, -1)), 5.0) # Test different numbers of arguments (from zero to nine) @@ -869,6 +873,11 @@ class T(tuple): dist((1, 2, 3), (4, 5, 6, 7)) with self.assertRaises(TypeError): # Rejects invalid types dist("abc", "xyz") + int_too_big_for_float = 10 ** (sys.float_info.max_10_exp + 5) + with self.assertRaises((ValueError, OverflowError)): + dist((1, int_too_big_for_float), (2, 3)) + with self.assertRaises((ValueError, OverflowError)): + dist((2, 3), (1, int_too_big_for_float)) # Verify that the one dimensional case is equivalent to abs() for i in range(20): diff --git a/Modules/mathmodule.c b/Modules/mathmodule.c index a190f5ccf7e3..c4353771d960 100644 --- a/Modules/mathmodule.c +++ b/Modules/mathmodule.c @@ -2144,7 +2144,14 @@ math_dist_impl(PyObject *module, PyObject *p, PyObject *q) item = PyTuple_GET_ITEM(p, i); if (PyFloat_CheckExact(item)) { px = PyFloat_AS_DOUBLE(item); - } else { + } + else if (PyLong_CheckExact(item)) { + px = PyLong_AsDouble(item); + if (px == -1.0 && PyErr_Occurred()) { + goto error_exit; + } + } + else { px = PyFloat_AsDouble(item); if (px == -1.0 && PyErr_Occurred()) { goto error_exit; @@ -2153,7 +2160,14 @@ math_dist_impl(PyObject *module, PyObject *p, PyObject *q) item = PyTuple_GET_ITEM(q, i); if (PyFloat_CheckExact(item)) { qx = PyFloat_AS_DOUBLE(item); - } else { + } + else if (PyLong_CheckExact(item)) { + qx = PyLong_AsDouble(item); + if (qx == -1.0 && PyErr_Occurred()) { + goto error_exit; + } + } + else { qx = PyFloat_AsDouble(item); if (qx == -1.0 && PyErr_Occurred()) { goto error_exit; @@ -2201,7 +2215,14 @@ math_hypot(PyObject *self, PyObject *const *args, Py_ssize_t nargs) item = args[i]; if (PyFloat_CheckExact(item)) { x = PyFloat_AS_DOUBLE(item); - } else { + } + else if (PyLong_CheckExact(item)) { + x = PyLong_AsDouble(item); + if (x == -1.0 && PyErr_Occurred()) { + goto error_exit; + } + } + else { x = PyFloat_AsDouble(item); if (x == -1.0 && PyErr_Occurred()) { goto error_exit;

1 0

bpo-35701: Update doc for UUID weak referencing (GH-11621)
by Victor Stinner Jan. 28, 2019

Jan. 28, 2019

https://github.com/python/cpython/commit/ea446409cd5f1364beafd5e5255da67999… commit: ea446409cd5f1364beafd5e5255da6799993f285 branch: master author: David H <dhdavvie(a)gmail.com> committer: Victor Stinner <vstinner(a)redhat.com> date: 2019-01-28T10:31:19+01:00 summary: bpo-35701: Update doc for UUID weak referencing (GH-11621) files: M Doc/whatsnew/3.8.rst diff --git a/Doc/whatsnew/3.8.rst b/Doc/whatsnew/3.8.rst index ce46afd48158..fb25ce2f7669 100644 --- a/Doc/whatsnew/3.8.rst +++ b/Doc/whatsnew/3.8.rst @@ -316,8 +316,6 @@ Optimizations (Contributed by Inada Naoki in :issue:`33597`) * :class:`uuid.UUID` now uses ``__slots__`` to reduce its memory footprint. - Note that this means that instances can no longer be weak-referenced and - that arbitrary attributes can no longer be added to them. * The :class:`list` constructor does not overallocate the internal item buffer if the input iterable has a known length (the input implements ``__len__``). @@ -514,9 +512,6 @@ Changes in the Python API * The function :func:`math.factorial` no longer accepts arguments that are not int-like. (Contributed by Pablo Galindo in :issue:`33083`.) -* :class:`uuid.UUID` now uses ``__slots__``, therefore instances can no longer - be weak-referenced and attributes can no longer be added. - * :mod:`xml.dom.minidom` and :mod:`xml.sax` modules no longer process external entities by default. (Contributed by Christian Heimes in :issue:`17239`.)

1 0

Daily reference leaks (4243df51fe43): sum=1
by solipsis＠pitrou.net Jan. 28, 2019

Jan. 28, 2019

results for 4243df51fe43 on branch "default" -------------------------------------------- test_functools leaked [0, 3, 1] memory blocks, sum=4 test_multiprocessing_fork leaked [-2, 2, -1] memory blocks, sum=-1 test_multiprocessing_forkserver leaked [-1, 2, -1] memory blocks, sum=0 test_multiprocessing_spawn leaked [0, 0, -2] memory blocks, sum=-2 Command line was: ['./python', '-m', 'test.regrtest', '-uall', '-R', '3:3:/home/psf-users/antoine/refleaks/refloglf3rbV', '--timeout', '7200']

1 0

Fix typo: class declaration (GH-11678)
by Miss Islington (bot) Jan. 27, 2019

Jan. 27, 2019

https://github.com/python/cpython/commit/ff27f8145d7194fb3891b610443dee15be… commit: ff27f8145d7194fb3891b610443dee15be8f8f63 branch: 3.7 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: GitHub <noreply(a)github.com> date: 2019-01-27T14:25:49-08:00 summary: Fix typo: class declaration (GH-11678) (cherry picked from commit dfc8bb987d1fcba9225a19542c0fb9132b846b5b) Co-authored-by: nu_no <nuno.an(a)gmail.com> files: M Doc/library/enum.rst diff --git a/Doc/library/enum.rst b/Doc/library/enum.rst index 81e9766e429b..a6285ffaf191 100644 --- a/Doc/library/enum.rst +++ b/Doc/library/enum.rst @@ -394,7 +394,7 @@ A new :class:`Enum` class must have one base Enum class, up to one concrete data type, and as many :class:`object`-based mixin classes as needed. The order of these base classes is:: - def EnumName([mix-in, ...,] [data-type,] base-enum): + class EnumName([mix-in, ...,] [data-type,] base-enum): pass Also, subclassing an enumeration is allowed only if the enumeration does not define

1 0

Fix typo: class declaration (GH-11678)
by Miss Islington (bot) Jan. 27, 2019

Jan. 27, 2019

https://github.com/python/cpython/commit/dfc8bb987d1fcba9225a19542c0fb9132b… commit: dfc8bb987d1fcba9225a19542c0fb9132b846b5b branch: master author: nu_no <nuno.an(a)gmail.com> committer: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> date: 2019-01-27T14:07:47-08:00 summary: Fix typo: class declaration (GH-11678) files: M Doc/library/enum.rst diff --git a/Doc/library/enum.rst b/Doc/library/enum.rst index 702eacd0e98a..19277d76995f 100644 --- a/Doc/library/enum.rst +++ b/Doc/library/enum.rst @@ -394,7 +394,7 @@ A new :class:`Enum` class must have one base Enum class, up to one concrete data type, and as many :class:`object`-based mixin classes as needed. The order of these base classes is:: - def EnumName([mix-in, ...,] [data-type,] base-enum): + class EnumName([mix-in, ...,] [data-type,] base-enum): pass Also, subclassing an enumeration is allowed only if the enumeration does not define

1 0