Mailman 3 April 2018 - Python-checkins

acks += chrBrd (#6584)
by Łukasz Langa April 23, 2018

April 23, 2018

https://github.com/python/cpython/commit/650ba4ffd1dcd4e5eb246d7c176e204eb9… commit: 650ba4ffd1dcd4e5eb246d7c176e204eb90c7a86 branch: master author: Łukasz Langa <lukasz(a)langa.pl> committer: GitHub <noreply(a)github.com> date: 2018-04-23T14:18:55-07:00 summary: acks += chrBrd (#6584) files: M Misc/ACKS diff --git a/Misc/ACKS b/Misc/ACKS index 5efe37fb0a22..c96f31c80d17 100644 --- a/Misc/ACKS +++ b/Misc/ACKS @@ -182,6 +182,7 @@ Thierry Bousch Sebastian Boving Michal Bozon Jeff Bradberry +Chris Bradbury Aaron Brancotti Monty Brandenberg Georg Brandl

1 0

bpo-33251: Update documentation to reflect change. (GH-6446) (#6583)
by Łukasz Langa April 23, 2018

April 23, 2018

https://github.com/python/cpython/commit/e500839796c7fa43998e72edb77165872b… commit: e500839796c7fa43998e72edb77165872b9ce034 branch: master author: Chris Bradbury <chris(a)binaryspanner.com> committer: Łukasz Langa <lukasz(a)langa.pl> date: 2018-04-23T13:56:39-07:00 summary: bpo-33251: Update documentation to reflect change. (GH-6446) (#6583) files: M Doc/library/configparser.rst diff --git a/Doc/library/configparser.rst b/Doc/library/configparser.rst index 5da5cd9f96d9..f51c580c0de1 100644 --- a/Doc/library/configparser.rst +++ b/Doc/library/configparser.rst @@ -1120,6 +1120,11 @@ ConfigParser Objects given *section*. Optional arguments have the same meaning as for the :meth:`get` method. + .. versionchanged:: 3.8 + Items present in *vars* no longer appear in the result. The previous + behaviour mixed actual parser options with variables provided for + interpolation. + .. method:: set(section, option, value)

1 0

[3.6] bpo-33329: Fix multiprocessing regression on newer glibcs (GH-6575) (GH-6582)
by Antoine Pitrou April 23, 2018

April 23, 2018

https://github.com/python/cpython/commit/b0ca398cabd2d2ea2d66fa50b08e297a60… commit: b0ca398cabd2d2ea2d66fa50b08e297a60388c75 branch: 3.6 author: Antoine Pitrou <pitrou(a)free.fr> committer: GitHub <noreply(a)github.com> date: 2018-04-23T22:22:49+02:00 summary: [3.6] bpo-33329: Fix multiprocessing regression on newer glibcs (GH-6575) (GH-6582) Starting with glibc 2.27.9000-xxx, sigaddset() can return EINVAL for some reserved signal numbers between 1 and NSIG. The `range(1, NSIG)` idiom is commonly used to select all signals for blocking with `pthread_sigmask`. So we ignore the sigaddset() return value until we expose sigfillset() to provide a better idiom. (cherry picked from commit 25038ecfb665bef641abf8cb61afff7505b0e008) files: A Misc/NEWS.d/next/Library/2018-04-23-13-21-39.bpo-33329.lQ-Eod.rst M Modules/signalmodule.c diff --git a/Misc/NEWS.d/next/Library/2018-04-23-13-21-39.bpo-33329.lQ-Eod.rst b/Misc/NEWS.d/next/Library/2018-04-23-13-21-39.bpo-33329.lQ-Eod.rst new file mode 100644 index 000000000000..d1a4e56d04b9 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2018-04-23-13-21-39.bpo-33329.lQ-Eod.rst @@ -0,0 +1 @@ +Fix multiprocessing regression on newer glibcs diff --git a/Modules/signalmodule.c b/Modules/signalmodule.c index 0b9e8f1c23a9..14665cbfd5cb 100644 --- a/Modules/signalmodule.c +++ b/Modules/signalmodule.c @@ -759,7 +759,6 @@ iterable_to_sigset(PyObject *iterable, sigset_t *mask) int result = -1; PyObject *iterator, *item; long signum; - int err; sigemptyset(mask); @@ -781,11 +780,14 @@ iterable_to_sigset(PyObject *iterable, sigset_t *mask) Py_DECREF(item); if (signum == -1 && PyErr_Occurred()) goto error; - if (0 < signum && signum < NSIG) - err = sigaddset(mask, (int)signum); - else - err = 1; - if (err) { + if (0 < signum && signum < NSIG) { + /* bpo-33329: ignore sigaddset() return value as it can fail + * for some reserved signals, but we want the `range(1, NSIG)` + * idiom to allow selecting all valid signals. + */ + (void) sigaddset(mask, (int)signum); + } + else { PyErr_Format(PyExc_ValueError, "signal number %ld out of range", signum); goto error;

1 0

bpo-33329: Fix multiprocessing regression on newer glibcs (GH-6575) (GH-6579)
by Antoine Pitrou April 23, 2018

April 23, 2018

https://github.com/python/cpython/commit/75a3e3d5bc0be1ce41289b661e7c53039c… commit: 75a3e3d5bc0be1ce41289b661e7c53039cf3d5ba branch: 3.7 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: Antoine Pitrou <pitrou(a)free.fr> date: 2018-04-23T21:42:26+02:00 summary: bpo-33329: Fix multiprocessing regression on newer glibcs (GH-6575) (GH-6579) Starting with glibc 2.27.9000-xxx, sigaddset() can return EINVAL for some reserved signal numbers between 1 and NSIG. The `range(1, NSIG)` idiom is commonly used to select all signals for blocking with `pthread_sigmask`. So we ignore the sigaddset() return value until we expose sigfillset() to provide a better idiom. (cherry picked from commit 25038ecfb665bef641abf8cb61afff7505b0e008) Co-authored-by: Antoine Pitrou <pitrou(a)free.fr> files: A Misc/NEWS.d/next/Library/2018-04-23-13-21-39.bpo-33329.lQ-Eod.rst M Modules/signalmodule.c diff --git a/Misc/NEWS.d/next/Library/2018-04-23-13-21-39.bpo-33329.lQ-Eod.rst b/Misc/NEWS.d/next/Library/2018-04-23-13-21-39.bpo-33329.lQ-Eod.rst new file mode 100644 index 000000000000..d1a4e56d04b9 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2018-04-23-13-21-39.bpo-33329.lQ-Eod.rst @@ -0,0 +1 @@ +Fix multiprocessing regression on newer glibcs diff --git a/Modules/signalmodule.c b/Modules/signalmodule.c index b553eedc0f2c..aa224fd78c98 100644 --- a/Modules/signalmodule.c +++ b/Modules/signalmodule.c @@ -759,7 +759,6 @@ iterable_to_sigset(PyObject *iterable, sigset_t *mask) int result = -1; PyObject *iterator, *item; long signum; - int err; sigemptyset(mask); @@ -781,11 +780,14 @@ iterable_to_sigset(PyObject *iterable, sigset_t *mask) Py_DECREF(item); if (signum == -1 && PyErr_Occurred()) goto error; - if (0 < signum && signum < NSIG) - err = sigaddset(mask, (int)signum); - else - err = 1; - if (err) { + if (0 < signum && signum < NSIG) { + /* bpo-33329: ignore sigaddset() return value as it can fail + * for some reserved signals, but we want the `range(1, NSIG)` + * idiom to allow selecting all valid signals. + */ + (void) sigaddset(mask, (int)signum); + } + else { PyErr_Format(PyExc_ValueError, "signal number %ld out of range", signum); goto error;

1 0

bpo-33251: Prevent ConfigParser.items returning items present in vars. (#6446)
by Łukasz Langa April 23, 2018

April 23, 2018

https://github.com/python/cpython/commit/1d4a733cceee237f0850b7887c2945dee7… commit: 1d4a733cceee237f0850b7887c2945dee707da27 branch: master author: Chris Bradbury <chris(a)binaryspanner.com> committer: Łukasz Langa <lukasz(a)langa.pl> date: 2018-04-23T12:16:17-07:00 summary: bpo-33251: Prevent ConfigParser.items returning items present in vars. (#6446) * bpo-33251: ConfigParser.items no longer returns items present in vars. Documentation for `ConfigParser.items()` states: 'Items present in vars no longer appear in the result.' This fix aligns behaviour to that specified in the documentation. files: A Misc/NEWS.d/next/Library/2018-04-23-18-25-36.bpo-33251.C_K-J9.rst M Lib/configparser.py M Lib/test/test_configparser.py diff --git a/Lib/configparser.py b/Lib/configparser.py index 33dc9b9046f1..a681d3990e72 100644 --- a/Lib/configparser.py +++ b/Lib/configparser.py @@ -846,6 +846,7 @@ def items(self, section=_UNSET, raw=False, vars=None): except KeyError: if section != self.default_section: raise NoSectionError(section) + orig_keys = list(d.keys()) # Update with the entry specific variables if vars: for key, value in vars.items(): @@ -854,7 +855,7 @@ def items(self, section=_UNSET, raw=False, vars=None): section, option, d[option], d) if raw: value_getter = lambda option: d[option] - return [(option, value_getter(option)) for option in d.keys()] + return [(option, value_getter(option)) for option in orig_keys] def popitem(self): """Remove a section from the parser and return it as diff --git a/Lib/test/test_configparser.py b/Lib/test/test_configparser.py index 4d07203b9dac..87b811f09b6e 100644 --- a/Lib/test/test_configparser.py +++ b/Lib/test/test_configparser.py @@ -915,8 +915,7 @@ def test_items(self): self.check_items_config([('default', '<default>'), ('getdefault', '|<default>|'), ('key', '|value|'), - ('name', 'value'), - ('value', 'value')]) + ('name', 'value')]) def test_safe_interpolation(self): # See http://www.python.org/sf/511737 @@ -1093,8 +1092,7 @@ def test_items(self): self.check_items_config([('default', '<default>'), ('getdefault', '|%(default)s|'), ('key', '|%(name)s|'), - ('name', '%(value)s'), - ('value', 'value')]) + ('name', '%(value)s')]) def test_set_nonstring_types(self): cf = self.newconfig() diff --git a/Misc/NEWS.d/next/Library/2018-04-23-18-25-36.bpo-33251.C_K-J9.rst b/Misc/NEWS.d/next/Library/2018-04-23-18-25-36.bpo-33251.C_K-J9.rst new file mode 100644 index 000000000000..fc6861f0d368 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2018-04-23-18-25-36.bpo-33251.C_K-J9.rst @@ -0,0 +1,2 @@ +`ConfigParser.items()` was fixed so that key-value pairs passed in via `vars` +are not included in the resulting output.

1 0

bpo-33329: Fix multiprocessing regression on newer glibcs (GH-6575)
by Antoine Pitrou April 23, 2018

April 23, 2018

https://github.com/python/cpython/commit/25038ecfb665bef641abf8cb61afff7505… commit: 25038ecfb665bef641abf8cb61afff7505b0e008 branch: master author: Antoine Pitrou <pitrou(a)free.fr> committer: GitHub <noreply(a)github.com> date: 2018-04-23T20:53:33+02:00 summary: bpo-33329: Fix multiprocessing regression on newer glibcs (GH-6575) Starting with glibc 2.27.9000-xxx, sigaddset() can return EINVAL for some reserved signal numbers between 1 and NSIG. The `range(1, NSIG)` idiom is commonly used to select all signals for blocking with `pthread_sigmask`. So we ignore the sigaddset() return value until we expose sigfillset() to provide a better idiom. files: A Misc/NEWS.d/next/Library/2018-04-23-13-21-39.bpo-33329.lQ-Eod.rst M Modules/signalmodule.c diff --git a/Misc/NEWS.d/next/Library/2018-04-23-13-21-39.bpo-33329.lQ-Eod.rst b/Misc/NEWS.d/next/Library/2018-04-23-13-21-39.bpo-33329.lQ-Eod.rst new file mode 100644 index 000000000000..d1a4e56d04b9 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2018-04-23-13-21-39.bpo-33329.lQ-Eod.rst @@ -0,0 +1 @@ +Fix multiprocessing regression on newer glibcs diff --git a/Modules/signalmodule.c b/Modules/signalmodule.c index 791616014384..35fd87e2d1e7 100644 --- a/Modules/signalmodule.c +++ b/Modules/signalmodule.c @@ -819,7 +819,6 @@ iterable_to_sigset(PyObject *iterable, sigset_t *mask) int result = -1; PyObject *iterator, *item; long signum; - int err; sigemptyset(mask); @@ -841,11 +840,14 @@ iterable_to_sigset(PyObject *iterable, sigset_t *mask) Py_DECREF(item); if (signum == -1 && PyErr_Occurred()) goto error; - if (0 < signum && signum < NSIG) - err = sigaddset(mask, (int)signum); - else - err = 1; - if (err) { + if (0 < signum && signum < NSIG) { + /* bpo-33329: ignore sigaddset() return value as it can fail + * for some reserved signals, but we want the `range(1, NSIG)` + * idiom to allow selecting all valid signals. + */ + (void) sigaddset(mask, (int)signum); + } + else { PyErr_Format(PyExc_ValueError, "signal number %ld out of range", signum); goto error;

1 0

[2.7] Update `make patchcheck` for blurb and NEWS.d (GH-2381) (GH-6576)
by Antoine Pitrou April 23, 2018

April 23, 2018

https://github.com/python/cpython/commit/36af11877adc0fcebbcde9d39ed709db0f… commit: 36af11877adc0fcebbcde9d39ed709db0f29de2b branch: 2.7 author: Antoine Pitrou <pitrou(a)free.fr> committer: GitHub <noreply(a)github.com> date: 2018-04-23T14:22:15+02:00 summary: [2.7] Update `make patchcheck` for blurb and NEWS.d (GH-2381) (GH-6576) (cherry picked from commit 1ba9469) files: M Tools/scripts/patchcheck.py diff --git a/Tools/scripts/patchcheck.py b/Tools/scripts/patchcheck.py index b69d54029ac9..093ef313143e 100755 --- a/Tools/scripts/patchcheck.py +++ b/Tools/scripts/patchcheck.py @@ -221,10 +221,11 @@ def credit_given(file_paths): return os.path.join('Misc', 'ACKS') in file_paths -@status("Misc/NEWS updated", modal=True) +@status("Misc/NEWS.d updated with `blurb`", modal=True) def reported_news(file_paths): - """Check if Misc/NEWS has been changed.""" - return os.path.join('Misc', 'NEWS') in file_paths + """Check if Misc/NEWS.d has been changed.""" + return any(p.startswith(os.path.join('Misc', 'NEWS.d', 'next')) + for p in file_paths) def main(): @@ -234,8 +235,7 @@ def main(): c_files = [fn for fn in file_paths if fn.endswith(('.c', '.h'))] doc_files = [fn for fn in file_paths if fn.startswith('Doc') and fn.endswith(('.rst', '.inc'))] - misc_files = {os.path.join('Misc', 'ACKS'), os.path.join('Misc', 'NEWS')}\ - & set(file_paths) + misc_files = {p for p in file_paths if p.startswith('Misc')} # PEP 8 whitespace rules enforcement. normalize_whitespace(python_files) # C rules enforcement.

1 0

Daily reference leaks (4243df51fe43): sum=12
by solipsis＠pitrou.net April 23, 2018

April 23, 2018

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

1 0

bpo-33338: [tokenize] Minor code cleanup (#6573)
by Łukasz Langa April 23, 2018

April 23, 2018

https://github.com/python/cpython/commit/c2d384dbd7c6ed9bdfaac45f05b463263c… commit: c2d384dbd7c6ed9bdfaac45f05b463263c743ee7 branch: master author: Łukasz Langa <lukasz(a)langa.pl> committer: GitHub <noreply(a)github.com> date: 2018-04-23T01:07:11-07:00 summary: bpo-33338: [tokenize] Minor code cleanup (#6573) This change contains minor things that make diffing between Lib/tokenize.py and Lib/lib2to3/pgen2/tokenize.py cleaner. files: M Lib/tokenize.py diff --git a/Lib/tokenize.py b/Lib/tokenize.py index 6528b9006128..40e6a8b9297b 100644 --- a/Lib/tokenize.py +++ b/Lib/tokenize.py @@ -28,7 +28,6 @@ from codecs import lookup, BOM_UTF8 import collections from io import TextIOWrapper -from itertools import chain import itertools as _itertools import re import sys @@ -278,7 +277,7 @@ def compat(self, token, iterable): startline = token[0] in (NEWLINE, NL) prevstring = False - for tok in chain([token], iterable): + for tok in _itertools.chain([token], iterable): toknum, tokval = tok[:2] if toknum == ENCODING: self.encoding = tokval @@ -475,13 +474,10 @@ def tokenize(readline): The first token sequence will always be an ENCODING token which tells you which encoding was used to decode the bytes stream. """ - # This import is here to avoid problems when the itertools module is not - # built yet and tokenize is imported. - from itertools import chain, repeat encoding, consumed = detect_encoding(readline) - rl_gen = iter(readline, b"") - empty = repeat(b"") - return _tokenize(chain(consumed, rl_gen, empty).__next__, encoding) + empty = _itertools.repeat(b"") + rl_gen = _itertools.chain(consumed, iter(readline, b""), empty) + return _tokenize(rl_gen.__next__, encoding) def _tokenize(readline, encoding): @@ -496,7 +492,7 @@ def _tokenize(readline, encoding): # BOM will already have been stripped. encoding = "utf-8" yield TokenInfo(ENCODING, encoding, (0, 0), (0, 0), '') - while True: # loop over lines in stream + while True: # loop over lines in stream try: line = readline() except StopIteration: @@ -581,7 +577,7 @@ def _tokenize(readline, encoding): continue token, initial = line[start:end], line[start] - if (initial in numchars or # ordinary number + if (initial in numchars or # ordinary number (initial == '.' and token != '.' and token != '...')): yield TokenInfo(NUMBER, token, spos, epos, line) elif initial in '\r\n': @@ -667,7 +663,8 @@ def main(): # Helper error handling routines def perror(message): - print(message, file=sys.stderr) + sys.stderr.write(message) + sys.stderr.write('\n') def error(message, filename=None, location=None): if location:

1 0

bpo-991266: Fix quoting of Comment attribute of SimpleCookie (GH-6555)
by Berker Peksag April 23, 2018

April 23, 2018

https://github.com/python/cpython/commit/8a6f4b4bba950fb8eead1b176c58202d77… commit: 8a6f4b4bba950fb8eead1b176c58202d773f2f70 branch: 3.6 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: Berker Peksag <berker.peksag(a)gmail.com> date: 2018-04-23T03:58:51+03:00 summary: bpo-991266: Fix quoting of Comment attribute of SimpleCookie (GH-6555) (cherry picked from commit d5a2377c3d70e4143bcbee4a765b3434e21f683a) Co-authored-by: Berker Peksag <berker.peksag(a)gmail.com> files: A Misc/NEWS.d/next/Library/2018-04-21-00-24-08.bpo-991266.h93TP_.rst M Lib/http/cookies.py M Lib/test/test_http_cookies.py diff --git a/Lib/http/cookies.py b/Lib/http/cookies.py index be3b080aa3d7..008857b7aaa1 100644 --- a/Lib/http/cookies.py +++ b/Lib/http/cookies.py @@ -436,6 +436,8 @@ def OutputString(self, attrs=None): append("%s=%s" % (self._reserved[key], _getdate(value))) elif key == "max-age" and isinstance(value, int): append("%s=%d" % (self._reserved[key], value)) + elif key == "comment" and isinstance(value, str): + append("%s=%s" % (self._reserved[key], _quote(value))) elif key in self._flags: if value: append(str(self._reserved[key])) diff --git a/Lib/test/test_http_cookies.py b/Lib/test/test_http_cookies.py index 2432e0bf5340..234b9ee05762 100644 --- a/Lib/test/test_http_cookies.py +++ b/Lib/test/test_http_cookies.py @@ -216,6 +216,16 @@ def test_illegal_chars(self): with self.assertRaises(cookies.CookieError): C.load(rawdata) + def test_comment_quoting(self): + c = cookies.SimpleCookie() + c['foo'] = '\N{COPYRIGHT SIGN}' + self.assertEqual(str(c['foo']), 'Set-Cookie: foo="\\251"') + c['foo']['comment'] = 'comment \N{COPYRIGHT SIGN}' + self.assertEqual( + str(c['foo']), + 'Set-Cookie: foo="\\251"; Comment="comment \\251"' + ) + class MorselTests(unittest.TestCase): """Tests for the Morsel object.""" diff --git a/Misc/NEWS.d/next/Library/2018-04-21-00-24-08.bpo-991266.h93TP_.rst b/Misc/NEWS.d/next/Library/2018-04-21-00-24-08.bpo-991266.h93TP_.rst new file mode 100644 index 000000000000..3af6c27cf21d --- /dev/null +++ b/Misc/NEWS.d/next/Library/2018-04-21-00-24-08.bpo-991266.h93TP_.rst @@ -0,0 +1 @@ +Fix quoting of the ``Comment`` attribute of :class:`http.cookies.SimpleCookie`.

1 0