Mailman 3 April 2018 - Python-checkins

bpo-33209: End framing at the end of C implementation of pickle.Pickler.dump(). (GH-6366)
by Łukasz Langa April 3, 2018

April 3, 2018

https://github.com/python/cpython/commit/74735e2a404949b2a0c17ac13a2de0e0ca… commit: 74735e2a404949b2a0c17ac13a2de0e0cac6fc41 branch: 3.7 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: Łukasz Langa <lukasz(a)langa.pl> date: 2018-04-03T14:35:11-07:00 summary: bpo-33209: End framing at the end of C implementation of pickle.Pickler.dump(). (GH-6366) (cherry picked from commit c869529ea9fbed574d34cf7ac139ca3f81b62ef0) Co-authored-by: Serhiy Storchaka <storchaka(a)gmail.com> files: A Misc/NEWS.d/next/Library/2018-04-03-10-37-13.bpo-33209.9sGWE_.rst M Lib/test/pickletester.py M Modules/_pickle.c diff --git a/Lib/test/pickletester.py b/Lib/test/pickletester.py index b84b87861d01..71c2feadb613 100644 --- a/Lib/test/pickletester.py +++ b/Lib/test/pickletester.py @@ -2781,29 +2781,30 @@ def test_clear_pickler_memo(self): # object again, the third serialized form should be identical to the # first one we obtained. data = ["abcdefg", "abcdefg", 44] - f = io.BytesIO() - pickler = self.pickler_class(f) + for proto in protocols: + f = io.BytesIO() + pickler = self.pickler_class(f, proto) - pickler.dump(data) - first_pickled = f.getvalue() + pickler.dump(data) + first_pickled = f.getvalue() - # Reset BytesIO object. - f.seek(0) - f.truncate() + # Reset BytesIO object. + f.seek(0) + f.truncate() - pickler.dump(data) - second_pickled = f.getvalue() + pickler.dump(data) + second_pickled = f.getvalue() - # Reset the Pickler and BytesIO objects. - pickler.clear_memo() - f.seek(0) - f.truncate() + # Reset the Pickler and BytesIO objects. + pickler.clear_memo() + f.seek(0) + f.truncate() - pickler.dump(data) - third_pickled = f.getvalue() + pickler.dump(data) + third_pickled = f.getvalue() - self.assertNotEqual(first_pickled, second_pickled) - self.assertEqual(first_pickled, third_pickled) + self.assertNotEqual(first_pickled, second_pickled) + self.assertEqual(first_pickled, third_pickled) def test_priming_pickler_memo(self): # Verify that we can set the Pickler's memo attribute. diff --git a/Misc/NEWS.d/next/Library/2018-04-03-10-37-13.bpo-33209.9sGWE_.rst b/Misc/NEWS.d/next/Library/2018-04-03-10-37-13.bpo-33209.9sGWE_.rst new file mode 100644 index 000000000000..d98b1e174e55 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2018-04-03-10-37-13.bpo-33209.9sGWE_.rst @@ -0,0 +1 @@ +End framing at the end of C implementation of :func:`pickle.Pickler.dump`. diff --git a/Modules/_pickle.c b/Modules/_pickle.c index 9525ad6d9661..6a684f25fefd 100644 --- a/Modules/_pickle.c +++ b/Modules/_pickle.c @@ -4152,9 +4152,10 @@ dump(PicklerObject *self, PyObject *obj) } if (save(self, obj, 0) < 0 || - _Pickler_Write(self, &stop_op, 1) < 0) + _Pickler_Write(self, &stop_op, 1) < 0 || + _Pickler_CommitFrame(self) < 0) return -1; - + self->framing = 0; return 0; }

1 0

bpo-33209: End framing at the end of C implementation of pickle.Pickler.dump(). (GH-6363)
by Łukasz Langa April 3, 2018

April 3, 2018

https://github.com/python/cpython/commit/c869529ea9fbed574d34cf7ac139ca3f81… commit: c869529ea9fbed574d34cf7ac139ca3f81b62ef0 branch: master author: Serhiy Storchaka <storchaka(a)gmail.com> committer: Łukasz Langa <lukasz(a)langa.pl> date: 2018-04-03T14:11:27-07:00 summary: bpo-33209: End framing at the end of C implementation of pickle.Pickler.dump(). (GH-6363) files: A Misc/NEWS.d/next/Library/2018-04-03-10-37-13.bpo-33209.9sGWE_.rst M Lib/test/pickletester.py M Modules/_pickle.c diff --git a/Lib/test/pickletester.py b/Lib/test/pickletester.py index b84b87861d01..71c2feadb613 100644 --- a/Lib/test/pickletester.py +++ b/Lib/test/pickletester.py @@ -2781,29 +2781,30 @@ def test_clear_pickler_memo(self): # object again, the third serialized form should be identical to the # first one we obtained. data = ["abcdefg", "abcdefg", 44] - f = io.BytesIO() - pickler = self.pickler_class(f) + for proto in protocols: + f = io.BytesIO() + pickler = self.pickler_class(f, proto) - pickler.dump(data) - first_pickled = f.getvalue() + pickler.dump(data) + first_pickled = f.getvalue() - # Reset BytesIO object. - f.seek(0) - f.truncate() + # Reset BytesIO object. + f.seek(0) + f.truncate() - pickler.dump(data) - second_pickled = f.getvalue() + pickler.dump(data) + second_pickled = f.getvalue() - # Reset the Pickler and BytesIO objects. - pickler.clear_memo() - f.seek(0) - f.truncate() + # Reset the Pickler and BytesIO objects. + pickler.clear_memo() + f.seek(0) + f.truncate() - pickler.dump(data) - third_pickled = f.getvalue() + pickler.dump(data) + third_pickled = f.getvalue() - self.assertNotEqual(first_pickled, second_pickled) - self.assertEqual(first_pickled, third_pickled) + self.assertNotEqual(first_pickled, second_pickled) + self.assertEqual(first_pickled, third_pickled) def test_priming_pickler_memo(self): # Verify that we can set the Pickler's memo attribute. diff --git a/Misc/NEWS.d/next/Library/2018-04-03-10-37-13.bpo-33209.9sGWE_.rst b/Misc/NEWS.d/next/Library/2018-04-03-10-37-13.bpo-33209.9sGWE_.rst new file mode 100644 index 000000000000..d98b1e174e55 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2018-04-03-10-37-13.bpo-33209.9sGWE_.rst @@ -0,0 +1 @@ +End framing at the end of C implementation of :func:`pickle.Pickler.dump`. diff --git a/Modules/_pickle.c b/Modules/_pickle.c index 9525ad6d9661..6a684f25fefd 100644 --- a/Modules/_pickle.c +++ b/Modules/_pickle.c @@ -4152,9 +4152,10 @@ dump(PicklerObject *self, PyObject *obj) } if (save(self, obj, 0) < 0 || - _Pickler_Write(self, &stop_op, 1) < 0) + _Pickler_Write(self, &stop_op, 1) < 0 || + _Pickler_CommitFrame(self) < 0) return -1; - + self->framing = 0; return 0; }

1 0

Daily reference leaks (4243df51fe43): sum=-1
by solipsis＠pitrou.net April 3, 2018

April 3, 2018

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

1 0

bpo-32360: Remove object_pairs_hook=OrderedDict examples (GH-5001)
by Miss Islington (bot) April 3, 2018

April 3, 2018

https://github.com/python/cpython/commit/0c533573c527c63dacab5921becb66dc3e… commit: 0c533573c527c63dacab5921becb66dc3eb274c1 branch: 3.7 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: GitHub <noreply(a)github.com> date: 2018-04-02T21:31:27-07:00 summary: bpo-32360: Remove object_pairs_hook=OrderedDict examples (GH-5001) (cherry picked from commit 629338f1404ea9cd75e4fb0389a2fbe1b589de43) Co-authored-by: INADA Naoki <methane(a)users.noreply.github.com> files: M Doc/library/json.rst M Lib/json/__init__.py M Lib/json/decoder.py diff --git a/Doc/library/json.rst b/Doc/library/json.rst index 829218d55843..bcad61aeca3b 100644 --- a/Doc/library/json.rst +++ b/Doc/library/json.rst @@ -230,10 +230,8 @@ Basic Usage *object_pairs_hook* is an optional function that will be called with the result of any object literal decoded with an ordered list of pairs. The return value of *object_pairs_hook* will be used instead of the - :class:`dict`. This feature can be used to implement custom decoders that - rely on the order that the key and value pairs are decoded (for example, - :func:`collections.OrderedDict` will remember the order of insertion). If - *object_hook* is also defined, the *object_pairs_hook* takes priority. + :class:`dict`. This feature can be used to implement custom decoders. + If *object_hook* is also defined, the *object_pairs_hook* takes priority. .. versionchanged:: 3.1 Added support for *object_pairs_hook*. @@ -325,10 +323,8 @@ Encoders and Decoders *object_pairs_hook*, if specified will be called with the result of every JSON object decoded with an ordered list of pairs. The return value of *object_pairs_hook* will be used instead of the :class:`dict`. This - feature can be used to implement custom decoders that rely on the order - that the key and value pairs are decoded (for example, - :func:`collections.OrderedDict` will remember the order of insertion). If - *object_hook* is also defined, the *object_pairs_hook* takes priority. + feature can be used to implement custom decoders. If *object_hook* is also + defined, the *object_pairs_hook* takes priority. .. versionchanged:: 3.1 Added support for *object_pairs_hook*. diff --git a/Lib/json/__init__.py b/Lib/json/__init__.py index a5660099af75..3bb4490e818b 100644 --- a/Lib/json/__init__.py +++ b/Lib/json/__init__.py @@ -28,8 +28,7 @@ Compact encoding:: >>> import json - >>> from collections import OrderedDict - >>> mydict = OrderedDict([('4', 5), ('6', 7)]) + >>> mydict = {'4': 5, '6': 7} >>> json.dumps([1,2,3,mydict], separators=(',', ':')) '[1,2,3,{"4":5,"6":7}]' @@ -285,14 +284,11 @@ def load(fp, *, cls=None, object_hook=None, parse_float=None, ``object_pairs_hook`` is an optional function that will be called with the result of any object literal decoded with an ordered list of pairs. The return value of ``object_pairs_hook`` will be used instead of the ``dict``. - This feature can be used to implement custom decoders that rely on the - order that the key and value pairs are decoded (for example, - collections.OrderedDict will remember the order of insertion). If - ``object_hook`` is also defined, the ``object_pairs_hook`` takes priority. + This feature can be used to implement custom decoders. If ``object_hook`` + is also defined, the ``object_pairs_hook`` takes priority. To use a custom ``JSONDecoder`` subclass, specify it with the ``cls`` kwarg; otherwise ``JSONDecoder`` is used. - """ return loads(fp.read(), cls=cls, object_hook=object_hook, @@ -313,10 +309,8 @@ def loads(s, *, encoding=None, cls=None, object_hook=None, parse_float=None, ``object_pairs_hook`` is an optional function that will be called with the result of any object literal decoded with an ordered list of pairs. The return value of ``object_pairs_hook`` will be used instead of the ``dict``. - This feature can be used to implement custom decoders that rely on the - order that the key and value pairs are decoded (for example, - collections.OrderedDict will remember the order of insertion). If - ``object_hook`` is also defined, the ``object_pairs_hook`` takes priority. + This feature can be used to implement custom decoders. If ``object_hook`` + is also defined, the ``object_pairs_hook`` takes priority. ``parse_float``, if specified, will be called with the string of every JSON float to be decoded. By default this is equivalent to @@ -337,7 +331,6 @@ def loads(s, *, encoding=None, cls=None, object_hook=None, parse_float=None, kwarg; otherwise ``JSONDecoder`` is used. The ``encoding`` argument is ignored and deprecated. - """ if isinstance(s, str): if s.startswith('\ufeff'): diff --git a/Lib/json/decoder.py b/Lib/json/decoder.py index 3741deed7d52..d7d824454e1b 100644 --- a/Lib/json/decoder.py +++ b/Lib/json/decoder.py @@ -292,10 +292,8 @@ def __init__(self, *, object_hook=None, parse_float=None, ``object_pairs_hook``, if specified will be called with the result of every JSON object decoded with an ordered list of pairs. The return value of ``object_pairs_hook`` will be used instead of the ``dict``. - This feature can be used to implement custom decoders that rely on the - order that the key and value pairs are decoded (for example, - collections.OrderedDict will remember the order of insertion). If - ``object_hook`` is also defined, the ``object_pairs_hook`` takes + This feature can be used to implement custom decoders. + If ``object_hook`` is also defined, the ``object_pairs_hook`` takes priority. ``parse_float``, if specified, will be called with the string @@ -317,7 +315,6 @@ def __init__(self, *, object_hook=None, parse_float=None, characters will be allowed inside strings. Control characters in this context are those with character codes in the 0-31 range, including ``'\\t'`` (tab), ``'\\n'``, ``'\\r'`` and ``'\\0'``. - """ self.object_hook = object_hook self.parse_float = parse_float or float

1 0

bpo-32360: Remove object_pairs_hook=OrderedDict examples (GH-5001)
by INADA Naoki April 3, 2018

April 3, 2018

https://github.com/python/cpython/commit/629338f1404ea9cd75e4fb0389a2fbe1b5… commit: 629338f1404ea9cd75e4fb0389a2fbe1b589de43 branch: master author: INADA Naoki <methane(a)users.noreply.github.com> committer: GitHub <noreply(a)github.com> date: 2018-04-03T12:39:47+09:00 summary: bpo-32360: Remove object_pairs_hook=OrderedDict examples (GH-5001) files: M Doc/library/json.rst M Lib/json/__init__.py M Lib/json/decoder.py diff --git a/Doc/library/json.rst b/Doc/library/json.rst index 829218d55843..bcad61aeca3b 100644 --- a/Doc/library/json.rst +++ b/Doc/library/json.rst @@ -230,10 +230,8 @@ Basic Usage *object_pairs_hook* is an optional function that will be called with the result of any object literal decoded with an ordered list of pairs. The return value of *object_pairs_hook* will be used instead of the - :class:`dict`. This feature can be used to implement custom decoders that - rely on the order that the key and value pairs are decoded (for example, - :func:`collections.OrderedDict` will remember the order of insertion). If - *object_hook* is also defined, the *object_pairs_hook* takes priority. + :class:`dict`. This feature can be used to implement custom decoders. + If *object_hook* is also defined, the *object_pairs_hook* takes priority. .. versionchanged:: 3.1 Added support for *object_pairs_hook*. @@ -325,10 +323,8 @@ Encoders and Decoders *object_pairs_hook*, if specified will be called with the result of every JSON object decoded with an ordered list of pairs. The return value of *object_pairs_hook* will be used instead of the :class:`dict`. This - feature can be used to implement custom decoders that rely on the order - that the key and value pairs are decoded (for example, - :func:`collections.OrderedDict` will remember the order of insertion). If - *object_hook* is also defined, the *object_pairs_hook* takes priority. + feature can be used to implement custom decoders. If *object_hook* is also + defined, the *object_pairs_hook* takes priority. .. versionchanged:: 3.1 Added support for *object_pairs_hook*. diff --git a/Lib/json/__init__.py b/Lib/json/__init__.py index a5660099af75..3bb4490e818b 100644 --- a/Lib/json/__init__.py +++ b/Lib/json/__init__.py @@ -28,8 +28,7 @@ Compact encoding:: >>> import json - >>> from collections import OrderedDict - >>> mydict = OrderedDict([('4', 5), ('6', 7)]) + >>> mydict = {'4': 5, '6': 7} >>> json.dumps([1,2,3,mydict], separators=(',', ':')) '[1,2,3,{"4":5,"6":7}]' @@ -285,14 +284,11 @@ def load(fp, *, cls=None, object_hook=None, parse_float=None, ``object_pairs_hook`` is an optional function that will be called with the result of any object literal decoded with an ordered list of pairs. The return value of ``object_pairs_hook`` will be used instead of the ``dict``. - This feature can be used to implement custom decoders that rely on the - order that the key and value pairs are decoded (for example, - collections.OrderedDict will remember the order of insertion). If - ``object_hook`` is also defined, the ``object_pairs_hook`` takes priority. + This feature can be used to implement custom decoders. If ``object_hook`` + is also defined, the ``object_pairs_hook`` takes priority. To use a custom ``JSONDecoder`` subclass, specify it with the ``cls`` kwarg; otherwise ``JSONDecoder`` is used. - """ return loads(fp.read(), cls=cls, object_hook=object_hook, @@ -313,10 +309,8 @@ def loads(s, *, encoding=None, cls=None, object_hook=None, parse_float=None, ``object_pairs_hook`` is an optional function that will be called with the result of any object literal decoded with an ordered list of pairs. The return value of ``object_pairs_hook`` will be used instead of the ``dict``. - This feature can be used to implement custom decoders that rely on the - order that the key and value pairs are decoded (for example, - collections.OrderedDict will remember the order of insertion). If - ``object_hook`` is also defined, the ``object_pairs_hook`` takes priority. + This feature can be used to implement custom decoders. If ``object_hook`` + is also defined, the ``object_pairs_hook`` takes priority. ``parse_float``, if specified, will be called with the string of every JSON float to be decoded. By default this is equivalent to @@ -337,7 +331,6 @@ def loads(s, *, encoding=None, cls=None, object_hook=None, parse_float=None, kwarg; otherwise ``JSONDecoder`` is used. The ``encoding`` argument is ignored and deprecated. - """ if isinstance(s, str): if s.startswith('\ufeff'): diff --git a/Lib/json/decoder.py b/Lib/json/decoder.py index 3741deed7d52..d7d824454e1b 100644 --- a/Lib/json/decoder.py +++ b/Lib/json/decoder.py @@ -292,10 +292,8 @@ def __init__(self, *, object_hook=None, parse_float=None, ``object_pairs_hook``, if specified will be called with the result of every JSON object decoded with an ordered list of pairs. The return value of ``object_pairs_hook`` will be used instead of the ``dict``. - This feature can be used to implement custom decoders that rely on the - order that the key and value pairs are decoded (for example, - collections.OrderedDict will remember the order of insertion). If - ``object_hook`` is also defined, the ``object_pairs_hook`` takes + This feature can be used to implement custom decoders. + If ``object_hook`` is also defined, the ``object_pairs_hook`` takes priority. ``parse_float``, if specified, will be called with the string @@ -317,7 +315,6 @@ def __init__(self, *, object_hook=None, parse_float=None, characters will be allowed inside strings. Control characters in this context are those with character codes in the 0-31 range, including ``'\\t'`` (tab), ``'\\n'``, ``'\\r'`` and ``'\\0'``. - """ self.object_hook = object_hook self.parse_float = parse_float or float

1 0

closes bpo-33202: fix os.walk mentioning os.listdir instead of os.scandir (GH-6335)
by Miss Islington (bot) April 3, 2018

April 3, 2018

https://github.com/python/cpython/commit/fa5157e0499f7afdb59e220e3f4fdbf44a… commit: fa5157e0499f7afdb59e220e3f4fdbf44adb5ac8 branch: 3.6 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: GitHub <noreply(a)github.com> date: 2018-04-02T20:39:14-07:00 summary: closes bpo-33202: fix os.walk mentioning os.listdir instead of os.scandir (GH-6335) (cherry picked from commit badb894bbbb8aaa8b669c4a6f675a0bc7d98e188) Co-authored-by: Andrés Delfino <34587441+andresdelfino(a)users.noreply.github.com> files: M Doc/library/os.rst diff --git a/Doc/library/os.rst b/Doc/library/os.rst index b2722168bc21..b3179acac0d8 100644 --- a/Doc/library/os.rst +++ b/Doc/library/os.rst @@ -2725,7 +2725,7 @@ features: no effect on the behavior of the walk, because in bottom-up mode the directories in *dirnames* are generated before *dirpath* itself is generated. - By default, errors from the :func:`listdir` call are ignored. If optional + By default, errors from the :func:`scandir` call are ignored. If optional argument *onerror* is specified, it should be a function; it will be called with one argument, an :exc:`OSError` instance. It can report the error to continue with the walk, or raise the exception to abort the walk. Note that the filename

1 0

closes bpo-33202: fix os.walk mentioning os.listdir instead of os.scandir (GH-6335)
by Miss Islington (bot) April 3, 2018

April 3, 2018

https://github.com/python/cpython/commit/f6d1d65803f290dfe14048f17d8125f809… commit: f6d1d65803f290dfe14048f17d8125f8093a61ec branch: 3.7 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: GitHub <noreply(a)github.com> date: 2018-04-02T20:33:38-07:00 summary: closes bpo-33202: fix os.walk mentioning os.listdir instead of os.scandir (GH-6335) (cherry picked from commit badb894bbbb8aaa8b669c4a6f675a0bc7d98e188) Co-authored-by: Andrés Delfino <34587441+andresdelfino(a)users.noreply.github.com> files: M Doc/library/os.rst diff --git a/Doc/library/os.rst b/Doc/library/os.rst index e685b33302bd..d269d0b0eaa6 100644 --- a/Doc/library/os.rst +++ b/Doc/library/os.rst @@ -2812,7 +2812,7 @@ features: no effect on the behavior of the walk, because in bottom-up mode the directories in *dirnames* are generated before *dirpath* itself is generated. - By default, errors from the :func:`listdir` call are ignored. If optional + By default, errors from the :func:`scandir` call are ignored. If optional argument *onerror* is specified, it should be a function; it will be called with one argument, an :exc:`OSError` instance. It can report the error to continue with the walk, or raise the exception to abort the walk. Note that the filename

1 0

bpo-33199: Initialize ma_version_tag in PyDict_Copy (GH-6341)
by Miss Islington (bot) April 3, 2018

April 3, 2018

https://github.com/python/cpython/commit/9a90826c9b64183713ebe5a98ec82423d9… commit: 9a90826c9b64183713ebe5a98ec82423d9cae3ee branch: 3.6 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: GitHub <noreply(a)github.com> date: 2018-04-02T20:22:14-07:00 summary: bpo-33199: Initialize ma_version_tag in PyDict_Copy (GH-6341) (cherry picked from commit d1c82c5cc7be0c21dddf86fd19c1702f6218459b) Co-authored-by: INADA Naoki <methane(a)users.noreply.github.com> files: A Misc/NEWS.d/next/Core and Builtins/2018-04-02-09-32-40.bpo-33199.TPnxQu.rst M Objects/dictobject.c diff --git a/Misc/NEWS.d/next/Core and Builtins/2018-04-02-09-32-40.bpo-33199.TPnxQu.rst b/Misc/NEWS.d/next/Core and Builtins/2018-04-02-09-32-40.bpo-33199.TPnxQu.rst new file mode 100644 index 000000000000..22abf8d00011 --- /dev/null +++ b/Misc/NEWS.d/next/Core and Builtins/2018-04-02-09-32-40.bpo-33199.TPnxQu.rst @@ -0,0 +1,2 @@ +Fix ``ma_version_tag`` in dict implementation is uninitialized when copying +from key-sharing dict. diff --git a/Objects/dictobject.c b/Objects/dictobject.c index 8862be81482d..ddd05826ea5f 100644 --- a/Objects/dictobject.c +++ b/Objects/dictobject.c @@ -2654,6 +2654,7 @@ PyDict_Copy(PyObject *o) split_copy->ma_values = newvalues; split_copy->ma_keys = mp->ma_keys; split_copy->ma_used = mp->ma_used; + split_copy->ma_version_tag = DICT_NEXT_VERSION(); DK_INCREF(mp->ma_keys); for (i = 0, n = size; i < n; i++) { PyObject *value = mp->ma_values[i];

1 0

bpo-33199: Initialize ma_version_tag in PyDict_Copy (GH-6341)
by Miss Islington (bot) April 3, 2018

April 3, 2018

https://github.com/python/cpython/commit/de755129a7a14cb3bee89aa256ca2e4a9a… commit: de755129a7a14cb3bee89aa256ca2e4a9a6605ce branch: 3.7 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: GitHub <noreply(a)github.com> date: 2018-04-02T20:00:26-07:00 summary: bpo-33199: Initialize ma_version_tag in PyDict_Copy (GH-6341) (cherry picked from commit d1c82c5cc7be0c21dddf86fd19c1702f6218459b) Co-authored-by: INADA Naoki <methane(a)users.noreply.github.com> files: A Misc/NEWS.d/next/Core and Builtins/2018-04-02-09-32-40.bpo-33199.TPnxQu.rst M Objects/dictobject.c diff --git a/Misc/NEWS.d/next/Core and Builtins/2018-04-02-09-32-40.bpo-33199.TPnxQu.rst b/Misc/NEWS.d/next/Core and Builtins/2018-04-02-09-32-40.bpo-33199.TPnxQu.rst new file mode 100644 index 000000000000..22abf8d00011 --- /dev/null +++ b/Misc/NEWS.d/next/Core and Builtins/2018-04-02-09-32-40.bpo-33199.TPnxQu.rst @@ -0,0 +1,2 @@ +Fix ``ma_version_tag`` in dict implementation is uninitialized when copying +from key-sharing dict. diff --git a/Objects/dictobject.c b/Objects/dictobject.c index bb4ea1f5f9c5..be895d4c1524 100644 --- a/Objects/dictobject.c +++ b/Objects/dictobject.c @@ -2551,6 +2551,7 @@ PyDict_Copy(PyObject *o) split_copy->ma_values = newvalues; split_copy->ma_keys = mp->ma_keys; split_copy->ma_used = mp->ma_used; + split_copy->ma_version_tag = DICT_NEXT_VERSION(); DK_INCREF(mp->ma_keys); for (i = 0, n = size; i < n; i++) { PyObject *value = mp->ma_values[i];

1 0

closes bpo-33202: fix os.walk mentioning os.listdir instead of os.scandir (GH-6335)
by Benjamin Peterson April 3, 2018

April 3, 2018

https://github.com/python/cpython/commit/badb894bbbb8aaa8b669c4a6f675a0bc7d… commit: badb894bbbb8aaa8b669c4a6f675a0bc7d98e188 branch: master author: Andrés Delfino <34587441+andresdelfino(a)users.noreply.github.com> committer: Benjamin Peterson <benjamin(a)python.org> date: 2018-04-02T19:48:54-07:00 summary: closes bpo-33202: fix os.walk mentioning os.listdir instead of os.scandir (GH-6335) files: M Doc/library/os.rst diff --git a/Doc/library/os.rst b/Doc/library/os.rst index e685b33302bd..d269d0b0eaa6 100644 --- a/Doc/library/os.rst +++ b/Doc/library/os.rst @@ -2812,7 +2812,7 @@ features: no effect on the behavior of the walk, because in bottom-up mode the directories in *dirnames* are generated before *dirpath* itself is generated. - By default, errors from the :func:`listdir` call are ignored. If optional + By default, errors from the :func:`scandir` call are ignored. If optional argument *onerror* is specified, it should be a function; it will be called with one argument, an :exc:`OSError` instance. It can report the error to continue with the walk, or raise the exception to abort the walk. Note that the filename

1 0