Mailman 3 April 2018 - Python-checkins

bpo-29922: Improve error messages in 'async with' (GH-6352)
by Miss Islington (bot) April 4, 2018

April 4, 2018

https://github.com/python/cpython/commit/4fd6c27dc8ba7ca97aa70e1ab98729f220… commit: 4fd6c27dc8ba7ca97aa70e1ab98729f2207bbe19 branch: 3.6 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: GitHub <noreply(a)github.com> date: 2018-04-04T07:09:14-07:00 summary: bpo-29922: Improve error messages in 'async with' (GH-6352) when __aenter__() or __aexit__() return non-awaitable object. (cherry picked from commit a68f2f0578bbf812fa2264d0e0bb388340d6e230) Co-authored-by: Serhiy Storchaka <storchaka(a)gmail.com> files: A Misc/NEWS.d/next/Core and Builtins/2018-04-03-00-30-25.bpo-29922.CdLuMl.rst M Lib/test/test_coroutines.py M Python/ceval.c diff --git a/Lib/test/test_coroutines.py b/Lib/test/test_coroutines.py index 41126b675b5c..769879f082c5 100644 --- a/Lib/test/test_coroutines.py +++ b/Lib/test/test_coroutines.py @@ -1229,7 +1229,9 @@ def __aexit__(self, *e): pass with self.assertRaisesRegex( - TypeError, "object int can't be used in 'await' expression"): + TypeError, + "'async with' received an object from __aenter__ " + "that does not implement __await__: int"): # it's important that __aexit__ wasn't called run_async(foo()) @@ -1249,7 +1251,9 @@ def __aexit__(self, *e): run_async(foo()) except TypeError as exc: self.assertRegex( - exc.args[0], "object int can't be used in 'await' expression") + exc.args[0], + "'async with' received an object from __aexit__ " + "that does not implement __await__: int") self.assertTrue(exc.__context__ is not None) self.assertTrue(isinstance(exc.__context__, ZeroDivisionError)) else: @@ -1273,8 +1277,9 @@ def __aexit__(self, *e): with self.assertRaisesRegex( - TypeError, "object int can't be used in 'await' expression"): - + TypeError, + "'async with' received an object from __aexit__ " + "that does not implement __await__: int"): run_async(foo()) self.assertEqual(CNT, 1) diff --git a/Misc/NEWS.d/next/Core and Builtins/2018-04-03-00-30-25.bpo-29922.CdLuMl.rst b/Misc/NEWS.d/next/Core and Builtins/2018-04-03-00-30-25.bpo-29922.CdLuMl.rst new file mode 100644 index 000000000000..d8c144e59d6c --- /dev/null +++ b/Misc/NEWS.d/next/Core and Builtins/2018-04-03-00-30-25.bpo-29922.CdLuMl.rst @@ -0,0 +1,2 @@ +Improved error messages in 'async with' when ``__aenter__()`` or +``__aexit__()`` return non-awaitable object. diff --git a/Python/ceval.c b/Python/ceval.c index 9ad582b15c57..6252e89c9106 100644 --- a/Python/ceval.c +++ b/Python/ceval.c @@ -66,6 +66,7 @@ static PyObject * unicode_concatenate(PyObject *, PyObject *, static PyObject * special_lookup(PyObject *, _Py_Identifier *); static int check_args_iterable(PyObject *func, PyObject *vararg); static void format_kwargs_mapping_error(PyObject *func, PyObject *kwargs); +static void format_awaitable_error(PyTypeObject *, int); #define NAME_ERROR_MSG \ "name '%.200s' is not defined" @@ -2040,6 +2041,11 @@ _PyEval_EvalFrameDefault(PyFrameObject *f, int throwflag) PyObject *iterable = TOP(); PyObject *iter = _PyCoro_GetAwaitableIter(iterable); + if (iter == NULL) { + format_awaitable_error(Py_TYPE(iterable), + _Py_OPCODE(next_instr[-2])); + } + Py_DECREF(iterable); if (iter != NULL && PyCoro_CheckExact(iter)) { @@ -5403,6 +5409,25 @@ format_exc_unbound(PyCodeObject *co, int oparg) } } +static void +format_awaitable_error(PyTypeObject *type, int prevopcode) +{ + if (type->tp_as_async == NULL || type->tp_as_async->am_await == NULL) { + if (prevopcode == BEFORE_ASYNC_WITH) { + PyErr_Format(PyExc_TypeError, + "'async with' received an object from __aenter__ " + "that does not implement __await__: %.100s", + type->tp_name); + } + else if (prevopcode == WITH_CLEANUP_START) { + PyErr_Format(PyExc_TypeError, + "'async with' received an object from __aexit__ " + "that does not implement __await__: %.100s", + type->tp_name); + } + } +} + static PyObject * unicode_concatenate(PyObject *v, PyObject *w, PyFrameObject *f, const _Py_CODEUNIT *next_instr)

1 0

bpo-29922: Improve error messages in 'async with' (GH-6352)
by Miss Islington (bot) April 4, 2018

April 4, 2018

https://github.com/python/cpython/commit/fcd4e03e08a2d4ec1cde17beb66e2b22a0… commit: fcd4e03e08a2d4ec1cde17beb66e2b22a052500f branch: 3.7 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: GitHub <noreply(a)github.com> date: 2018-04-04T07:09:00-07:00 summary: bpo-29922: Improve error messages in 'async with' (GH-6352) when __aenter__() or __aexit__() return non-awaitable object. (cherry picked from commit a68f2f0578bbf812fa2264d0e0bb388340d6e230) Co-authored-by: Serhiy Storchaka <storchaka(a)gmail.com> files: A Misc/NEWS.d/next/Core and Builtins/2018-04-03-00-30-25.bpo-29922.CdLuMl.rst M Lib/test/test_coroutines.py M Python/ceval.c diff --git a/Lib/test/test_coroutines.py b/Lib/test/test_coroutines.py index 72e404da09be..429de489ad1d 100644 --- a/Lib/test/test_coroutines.py +++ b/Lib/test/test_coroutines.py @@ -1255,7 +1255,9 @@ def __aexit__(self, *e): pass with self.assertRaisesRegex( - TypeError, "object int can't be used in 'await' expression"): + TypeError, + "'async with' received an object from __aenter__ " + "that does not implement __await__: int"): # it's important that __aexit__ wasn't called run_async(foo()) @@ -1275,7 +1277,9 @@ def __aexit__(self, *e): run_async(foo()) except TypeError as exc: self.assertRegex( - exc.args[0], "object int can't be used in 'await' expression") + exc.args[0], + "'async with' received an object from __aexit__ " + "that does not implement __await__: int") self.assertTrue(exc.__context__ is not None) self.assertTrue(isinstance(exc.__context__, ZeroDivisionError)) else: @@ -1299,8 +1303,9 @@ def __aexit__(self, *e): with self.assertRaisesRegex( - TypeError, "object int can't be used in 'await' expression"): - + TypeError, + "'async with' received an object from __aexit__ " + "that does not implement __await__: int"): run_async(foo()) self.assertEqual(CNT, 1) diff --git a/Misc/NEWS.d/next/Core and Builtins/2018-04-03-00-30-25.bpo-29922.CdLuMl.rst b/Misc/NEWS.d/next/Core and Builtins/2018-04-03-00-30-25.bpo-29922.CdLuMl.rst new file mode 100644 index 000000000000..d8c144e59d6c --- /dev/null +++ b/Misc/NEWS.d/next/Core and Builtins/2018-04-03-00-30-25.bpo-29922.CdLuMl.rst @@ -0,0 +1,2 @@ +Improved error messages in 'async with' when ``__aenter__()`` or +``__aexit__()`` return non-awaitable object. diff --git a/Python/ceval.c b/Python/ceval.c index af5eb99d6c90..b37205e50a61 100644 --- a/Python/ceval.c +++ b/Python/ceval.c @@ -69,6 +69,7 @@ static PyObject * unicode_concatenate(PyObject *, PyObject *, static PyObject * special_lookup(PyObject *, _Py_Identifier *); static int check_args_iterable(PyObject *func, PyObject *vararg); static void format_kwargs_mapping_error(PyObject *func, PyObject *kwargs); +static void format_awaitable_error(PyTypeObject *, int); #define NAME_ERROR_MSG \ "name '%.200s' is not defined" @@ -1739,6 +1740,11 @@ _PyEval_EvalFrameDefault(PyFrameObject *f, int throwflag) PyObject *iterable = TOP(); PyObject *iter = _PyCoro_GetAwaitableIter(iterable); + if (iter == NULL) { + format_awaitable_error(Py_TYPE(iterable), + _Py_OPCODE(next_instr[-2])); + } + Py_DECREF(iterable); if (iter != NULL && PyCoro_CheckExact(iter)) { @@ -4948,6 +4954,25 @@ format_exc_unbound(PyCodeObject *co, int oparg) } } +static void +format_awaitable_error(PyTypeObject *type, int prevopcode) +{ + if (type->tp_as_async == NULL || type->tp_as_async->am_await == NULL) { + if (prevopcode == BEFORE_ASYNC_WITH) { + PyErr_Format(PyExc_TypeError, + "'async with' received an object from __aenter__ " + "that does not implement __await__: %.100s", + type->tp_name); + } + else if (prevopcode == WITH_CLEANUP_START) { + PyErr_Format(PyExc_TypeError, + "'async with' received an object from __aexit__ " + "that does not implement __await__: %.100s", + type->tp_name); + } + } +} + static PyObject * unicode_concatenate(PyObject *v, PyObject *w, PyFrameObject *f, const _Py_CODEUNIT *next_instr)

1 0

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

April 4, 2018

results for 4243df51fe43 on branch "default" -------------------------------------------- test_collections leaked [7, -7, 1] memory blocks, sum=1 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 [0, -2, 2] memory blocks, sum=0 test_multiprocessing_spawn leaked [0, -2, 1] memory blocks, sum=-1 Command line was: ['./python', '-m', 'test.regrtest', '-uall', '-R', '3:3:/home/psf-users/antoine/refleaks/reflogTNfHga', '--timeout', '7200']

1 0

bpo-23403: Bump pickle.DEFAULT_PROTOCOL to 4 (#6355)
by Łukasz Langa April 4, 2018

April 4, 2018

https://github.com/python/cpython/commit/c51d8c9ba6211d77db639487501f89aa9b… commit: c51d8c9ba6211d77db639487501f89aa9b4bcbb1 branch: master author: Łukasz Langa <lukasz(a)langa.pl> committer: GitHub <noreply(a)github.com> date: 2018-04-03T23:06:53-07:00 summary: bpo-23403: Bump pickle.DEFAULT_PROTOCOL to 4 (#6355) This makes performance better and produces shorter pickles. This change is backwards compatible up to the oldest currently supported version of Python (3.4). files: A Misc/NEWS.d/next/Library/2018-04-02-16-10-12.bpo-23403.KG7ADV.rst M Doc/library/pickle.rst M Doc/whatsnew/3.8.rst M Lib/pickle.py M Modules/_pickle.c M Modules/clinic/_pickle.c.h diff --git a/Doc/library/pickle.rst b/Doc/library/pickle.rst index d0c4cf937c8a..ea854fae1944 100644 --- a/Doc/library/pickle.rst +++ b/Doc/library/pickle.rst @@ -135,14 +135,14 @@ to read the pickle produced. information about improvements brought by protocol 2. * Protocol version 3 was added in Python 3.0. It has explicit support for - :class:`bytes` objects and cannot be unpickled by Python 2.x. This is - the default protocol, and the recommended protocol when compatibility with - other Python 3 versions is required. + :class:`bytes` objects and cannot be unpickled by Python 2.x. This was + the default protocol in Python 3.0--3.7. * Protocol version 4 was added in Python 3.4. It adds support for very large objects, pickling more kinds of objects, and some data format - optimizations. Refer to :pep:`3154` for information about improvements - brought by protocol 4. + optimizations. It is the default protocol starting with Python 3.8. + Refer to :pep:`3154` for information about improvements brought by + protocol 4. .. note:: Serialization is a more primitive notion than persistence; although @@ -179,8 +179,16 @@ The :mod:`pickle` module provides the following constants: An integer, the default :ref:`protocol version <pickle-protocols>` used for pickling. May be less than :data:`HIGHEST_PROTOCOL`. Currently the - default protocol is 3, a new protocol designed for Python 3. + default protocol is 4, first introduced in Python 3.4 and incompatible + with previous versions. + .. versionchanged:: 3.0 + + The default protocol is 3. + + .. versionchanged:: 3.8 + + The default protocol is 4. The :mod:`pickle` module provides the following functions to make the pickling process more convenient: diff --git a/Doc/whatsnew/3.8.rst b/Doc/whatsnew/3.8.rst index 4e6c85173751..2f42a9f8ba77 100644 --- a/Doc/whatsnew/3.8.rst +++ b/Doc/whatsnew/3.8.rst @@ -94,6 +94,9 @@ Improved Modules Optimizations ============= +* The default protocol in the :mod:`pickle` module is now Protocol 4, + first introduced in Python 3.4. It offers better performance and smaller + size compared to Protocol 3 available since Python 3.0. Build and C API Changes ======================= diff --git a/Lib/pickle.py b/Lib/pickle.py index e6d003787bad..b852fbd2296b 100644 --- a/Lib/pickle.py +++ b/Lib/pickle.py @@ -57,9 +57,9 @@ HIGHEST_PROTOCOL = 4 # The protocol we write by default. May be less than HIGHEST_PROTOCOL. -# We intentionally write a protocol that Python 2.x cannot read; -# there are too many issues with that. -DEFAULT_PROTOCOL = 3 +# Only bump this if the oldest still supported version of Python already +# includes it. +DEFAULT_PROTOCOL = 4 class PickleError(Exception): """A common base class for the other pickling exceptions.""" @@ -376,8 +376,8 @@ def __init__(self, file, protocol=None, *, fix_imports=True): The optional *protocol* argument tells the pickler to use the given protocol; supported protocols are 0, 1, 2, 3 and 4. The - default protocol is 3; a backward-incompatible protocol designed - for Python 3. + default protocol is 4. It was introduced in Python 3.4, it is + incompatible with previous versions. Specifying a negative protocol version selects the highest protocol version supported. The higher the protocol used, the diff --git a/Misc/NEWS.d/next/Library/2018-04-02-16-10-12.bpo-23403.KG7ADV.rst b/Misc/NEWS.d/next/Library/2018-04-02-16-10-12.bpo-23403.KG7ADV.rst new file mode 100644 index 000000000000..d1fbbebfadc6 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2018-04-02-16-10-12.bpo-23403.KG7ADV.rst @@ -0,0 +1,4 @@ +``DEFAULT_PROTOCOL`` in :mod:`pickle` was bumped to 4. Protocol 4 is +described in :pep:`3154` and available since Python 3.4. It offers +better performance and smaller size compared to protocol 3 introduced +in Python 3.0. diff --git a/Modules/_pickle.c b/Modules/_pickle.c index 6a684f25fefd..aa672afacffd 100644 --- a/Modules/_pickle.c +++ b/Modules/_pickle.c @@ -20,10 +20,12 @@ class _pickle.UnpicklerMemoProxy "UnpicklerMemoProxyObject *" "&UnpicklerMemoPro [clinic start generated code]*/ /*[clinic end generated code: output=da39a3ee5e6b4b0d input=4b3e113468a58e6c]*/ -/* Bump this when new opcodes are added to the pickle protocol. */ +/* Bump HIGHEST_PROTOCOL when new opcodes are added to the pickle protocol. + Bump DEFAULT_PROTOCOL only when the oldest still supported version of Python + already includes it. */ enum { HIGHEST_PROTOCOL = 4, - DEFAULT_PROTOCOL = 3 + DEFAULT_PROTOCOL = 4 }; /* Pickle opcodes. These must be kept updated with pickle.py. @@ -7176,8 +7178,9 @@ This is equivalent to ``Pickler(file, protocol).dump(obj)``, but may be more efficient. The optional *protocol* argument tells the pickler to use the given -protocol supported protocols are 0, 1, 2, 3 and 4. The default -protocol is 3; a backward-incompatible protocol designed for Python 3. +protocol; supported protocols are 0, 1, 2, 3 and 4. The default +protocol is 4. It was introduced in Python 3.4, it is incompatible +with previous versions. Specifying a negative protocol version selects the highest protocol version supported. The higher the protocol used, the more recent the @@ -7196,7 +7199,7 @@ to map the new Python 3 names to the old module names used in Python static PyObject * _pickle_dump_impl(PyObject *module, PyObject *obj, PyObject *file, PyObject *protocol, int fix_imports) -/*[clinic end generated code: output=a4774d5fde7d34de input=830f8a64cef6f042]*/ +/*[clinic end generated code: output=a4774d5fde7d34de input=93f1408489a87472]*/ { PicklerObject *pickler = _Pickler_New(); @@ -7236,7 +7239,8 @@ Return the pickled representation of the object as a bytes object. The optional *protocol* argument tells the pickler to use the given protocol; supported protocols are 0, 1, 2, 3 and 4. The default -protocol is 3; a backward-incompatible protocol designed for Python 3. +protocol is 4. It was introduced in Python 3.4, it is incompatible +with previous versions. Specifying a negative protocol version selects the highest protocol version supported. The higher the protocol used, the more recent the @@ -7250,7 +7254,7 @@ Python 2, so that the pickle data stream is readable with Python 2. static PyObject * _pickle_dumps_impl(PyObject *module, PyObject *obj, PyObject *protocol, int fix_imports) -/*[clinic end generated code: output=d75d5cda456fd261 input=293dbeda181580b7]*/ +/*[clinic end generated code: output=d75d5cda456fd261 input=b6efb45a7d19b5ab]*/ { PyObject *result; PicklerObject *pickler = _Pickler_New(); diff --git a/Modules/clinic/_pickle.c.h b/Modules/clinic/_pickle.c.h index 7fc00a00479c..6d9072832cea 100644 --- a/Modules/clinic/_pickle.c.h +++ b/Modules/clinic/_pickle.c.h @@ -367,8 +367,9 @@ PyDoc_STRVAR(_pickle_dump__doc__, "be more efficient.\n" "\n" "The optional *protocol* argument tells the pickler to use the given\n" -"protocol supported protocols are 0, 1, 2, 3 and 4. The default\n" -"protocol is 3; a backward-incompatible protocol designed for Python 3.\n" +"protocol; supported protocols are 0, 1, 2, 3 and 4. The default\n" +"protocol is 4. It was introduced in Python 3.4, it is incompatible\n" +"with previous versions.\n" "\n" "Specifying a negative protocol version selects the highest protocol\n" "version supported. The higher the protocol used, the more recent the\n" @@ -419,7 +420,8 @@ PyDoc_STRVAR(_pickle_dumps__doc__, "\n" "The optional *protocol* argument tells the pickler to use the given\n" "protocol; supported protocols are 0, 1, 2, 3 and 4. The default\n" -"protocol is 3; a backward-incompatible protocol designed for Python 3.\n" +"protocol is 4. It was introduced in Python 3.4, it is incompatible\n" +"with previous versions.\n" "\n" "Specifying a negative protocol version selects the highest protocol\n" "version supported. The higher the protocol used, the more recent the\n" @@ -560,4 +562,4 @@ _pickle_loads(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObjec exit: return return_value; } -/*[clinic end generated code: output=e995dd494045d876 input=a9049054013a1b77]*/ +/*[clinic end generated code: output=6fc104b8299c82dd input=a9049054013a1b77]*/

1 0

bpo-33195: Doc: Deprecate Py_UNICODE in c-api/arg (GH-6329)
by Miss Islington (bot) April 4, 2018

April 4, 2018

https://github.com/python/cpython/commit/b8fc2d658094941250116a48577f54d1f6… commit: b8fc2d658094941250116a48577f54d1f6300362 branch: 3.7 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: GitHub <noreply(a)github.com> date: 2018-04-03T22:13:38-07:00 summary: bpo-33195: Doc: Deprecate Py_UNICODE in c-api/arg (GH-6329) Py_UNICODE is deprecated since Python 3.3. But the deprecation is missed in the c-api/arg document. (cherry picked from commit 42ec190761a2e8503aaa06f0bfaaabe98749179b) Co-authored-by: INADA Naoki <methane(a)users.noreply.github.com> files: A Misc/NEWS.d/next/Documentation/2018-04-01-14-30-36.bpo-33195.dRS-XX.rst M Doc/c-api/arg.rst diff --git a/Doc/c-api/arg.rst b/Doc/c-api/arg.rst index e4b48e66bc2d..b41130ede416 100644 --- a/Doc/c-api/arg.rst +++ b/Doc/c-api/arg.rst @@ -151,19 +151,35 @@ which disallows mutable objects such as :class:`bytearray`. Previously, :exc:`TypeError` was raised when embedded null code points were encountered in the Python string. + .. deprecated-removed:: 3.3 4.0 + Part of the old-style :c:type:`Py_UNICODE` API; please migrate to using + :c:func:`PyUnicode_AsWideCharString`. + ``u#`` (:class:`str`) [const Py_UNICODE \*, int] This variant on ``u`` stores into two C variables, the first one a pointer to a Unicode data buffer, the second one its length. This variant allows null code points. + .. deprecated-removed:: 3.3 4.0 + Part of the old-style :c:type:`Py_UNICODE` API; please migrate to using + :c:func:`PyUnicode_AsWideCharString`. + ``Z`` (:class:`str` or ``None``) [const Py_UNICODE \*] Like ``u``, but the Python object may also be ``None``, in which case the :c:type:`Py_UNICODE` pointer is set to *NULL*. + .. deprecated-removed:: 3.3 4.0 + Part of the old-style :c:type:`Py_UNICODE` API; please migrate to using + :c:func:`PyUnicode_AsWideCharString`. + ``Z#`` (:class:`str` or ``None``) [const Py_UNICODE \*, int] Like ``u#``, but the Python object may also be ``None``, in which case the :c:type:`Py_UNICODE` pointer is set to *NULL*. + .. deprecated-removed:: 3.3 4.0 + Part of the old-style :c:type:`Py_UNICODE` API; please migrate to using + :c:func:`PyUnicode_AsWideCharString`. + ``U`` (:class:`str`) [PyObject \*] Requires that the Python object is a Unicode object, without attempting any conversion. Raises :exc:`TypeError` if the object is not a Unicode @@ -552,12 +568,13 @@ Building values ``z#`` (:class:`str` or ``None``) [const char \*, int] Same as ``s#``. - ``u`` (:class:`str`) [const Py_UNICODE \*] - Convert a null-terminated buffer of Unicode (UCS-2 or UCS-4) data to a Python - Unicode object. If the Unicode buffer pointer is *NULL*, ``None`` is returned. + ``u`` (:class:`str`) [const wchar_t \*] + Convert a null-terminated :c:type:`wchar_t` buffer of Unicode (UTF-16 or UCS-4) + data to a Python Unicode object. If the Unicode buffer pointer is *NULL*, + ``None`` is returned. - ``u#`` (:class:`str`) [const Py_UNICODE \*, int] - Convert a Unicode (UCS-2 or UCS-4) data buffer and its length to a Python + ``u#`` (:class:`str`) [const wchar_t \*, int] + Convert a Unicode (UTF-16 or UCS-4) data buffer and its length to a Python Unicode object. If the Unicode buffer pointer is *NULL*, the length is ignored and ``None`` is returned. diff --git a/Misc/NEWS.d/next/Documentation/2018-04-01-14-30-36.bpo-33195.dRS-XX.rst b/Misc/NEWS.d/next/Documentation/2018-04-01-14-30-36.bpo-33195.dRS-XX.rst new file mode 100644 index 000000000000..6884640325b0 --- /dev/null +++ b/Misc/NEWS.d/next/Documentation/2018-04-01-14-30-36.bpo-33195.dRS-XX.rst @@ -0,0 +1,3 @@ +Deprecate ``Py_UNICODE`` usage in ``c-api/arg`` document. ``Py_UNICODE`` +related APIs are deprecated since Python 3.3, but it is missed in the +document.

1 0

bpo-32337: Update documentats about dict order (GH-4973)
by Miss Islington (bot) April 4, 2018

April 4, 2018

https://github.com/python/cpython/commit/9216dffbc8a2aa62789f81f51f64bc1ec7… commit: 9216dffbc8a2aa62789f81f51f64bc1ec7bf6883 branch: 3.7 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: GitHub <noreply(a)github.com> date: 2018-04-03T22:01:46-07:00 summary: bpo-32337: Update documentats about dict order (GH-4973) (cherry picked from commit dfbbbf16f9aab82330c634913441b5ac73267d9c) Co-authored-by: hui shang <shangdahao(a)gmail.com> files: A Misc/NEWS.d/next/Documentation/2017-12-22-17-29-37.bpo-32337.eZe-ID.rst M Doc/library/stdtypes.rst M Doc/tutorial/datastructures.rst M Misc/ACKS diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst index ad7f578e0860..a213189a3407 100644 --- a/Doc/library/stdtypes.rst +++ b/Doc/library/stdtypes.rst @@ -4256,17 +4256,17 @@ support membership tests: Return an iterator over the keys, values or items (represented as tuples of ``(key, value)``) in the dictionary. - Keys and values are iterated over in an arbitrary order which is non-random, - varies across Python implementations, and depends on the dictionary's history - of insertions and deletions. If keys, values and items views are iterated - over with no intervening modifications to the dictionary, the order of items - will directly correspond. This allows the creation of ``(value, key)`` pairs + Keys and values are iterated over in insertion order. + This allows the creation of ``(value, key)`` pairs using :func:`zip`: ``pairs = zip(d.values(), d.keys())``. Another way to create the same list is ``pairs = [(v, k) for (k, v) in d.items()]``. Iterating views while adding or deleting entries in the dictionary may raise a :exc:`RuntimeError` or fail to iterate over all entries. + .. versionchanged:: 3.7 + Dict order is guaranteed to be insertion order. + .. describe:: x in dictview Return ``True`` if *x* is in the underlying dictionary's keys, values or @@ -4293,9 +4293,9 @@ An example of dictionary view usage:: >>> print(n) 504 - >>> # keys and values are iterated over in the same order + >>> # keys and values are iterated over in the same order (insertion order) >>> list(keys) - ['eggs', 'bacon', 'sausage', 'spam'] + ['eggs', 'sausage', 'bacon', 'spam'] >>> list(values) [2, 1, 1, 500] @@ -4303,7 +4303,7 @@ An example of dictionary view usage:: >>> del dishes['eggs'] >>> del dishes['sausage'] >>> list(keys) - ['spam', 'bacon'] + ['bacon', 'spam'] >>> # set operations >>> keys & {'eggs', 'bacon', 'salad'} diff --git a/Doc/tutorial/datastructures.rst b/Doc/tutorial/datastructures.rst index b95aca885252..7855ef2d2882 100644 --- a/Doc/tutorial/datastructures.rst +++ b/Doc/tutorial/datastructures.rst @@ -497,7 +497,7 @@ You can't use lists as keys, since lists can be modified in place using index assignments, slice assignments, or methods like :meth:`append` and :meth:`extend`. -It is best to think of a dictionary as an unordered set of *key: value* pairs, +It is best to think of a dictionary as a set of *key: value* pairs, with the requirement that the keys are unique (within one dictionary). A pair of braces creates an empty dictionary: ``{}``. Placing a comma-separated list of key:value pairs within the braces adds initial key:value pairs to the @@ -509,9 +509,9 @@ pair with ``del``. If you store using a key that is already in use, the old value associated with that key is forgotten. It is an error to extract a value using a non-existent key. -Performing ``list(d.keys())`` on a dictionary returns a list of all the keys -used in the dictionary, in arbitrary order (if you want it sorted, just use -``sorted(d.keys())`` instead). [2]_ To check whether a single key is in the +Performing ``list(d)`` on a dictionary returns a list of all the keys +used in the dictionary, in insertion order (if you want it sorted, just use +``sorted(d)`` instead). To check whether a single key is in the dictionary, use the :keyword:`in` keyword. Here is a small example using a dictionary:: @@ -519,16 +519,16 @@ Here is a small example using a dictionary:: >>> tel = {'jack': 4098, 'sape': 4139} >>> tel['guido'] = 4127 >>> tel - {'sape': 4139, 'guido': 4127, 'jack': 4098} + {'jack': 4098, 'sape': 4139, 'guido': 4127} >>> tel['jack'] 4098 >>> del tel['sape'] >>> tel['irv'] = 4127 >>> tel - {'guido': 4127, 'irv': 4127, 'jack': 4098} - >>> list(tel.keys()) - ['irv', 'guido', 'jack'] - >>> sorted(tel.keys()) + {'jack': 4098, 'guido': 4127, 'irv': 4127} + >>> list(tel) + ['jack', 'guido', 'irv'] + >>> sorted(tel) ['guido', 'irv', 'jack'] >>> 'guido' in tel True @@ -539,7 +539,7 @@ The :func:`dict` constructor builds dictionaries directly from sequences of key-value pairs:: >>> dict([('sape', 4139), ('guido', 4127), ('jack', 4098)]) - {'sape': 4139, 'jack': 4098, 'guido': 4127} + {'sape': 4139, 'guido': 4127, 'jack': 4098} In addition, dict comprehensions can be used to create dictionaries from arbitrary key and value expressions:: @@ -551,7 +551,7 @@ When the keys are simple strings, it is sometimes easier to specify pairs using keyword arguments:: >>> dict(sape=4139, guido=4127, jack=4098) - {'sape': 4139, 'jack': 4098, 'guido': 4127} + {'sape': 4139, 'guido': 4127, 'jack': 4098} .. _tut-loopidioms: @@ -710,7 +710,3 @@ interpreter will raise a :exc:`TypeError` exception. .. [1] Other languages may return the mutated object, which allows method chaining, such as ``d->insert("a")->remove("b")->sort();``. - -.. [2] Calling ``d.keys()`` will return a :dfn:`dictionary view` object. It - supports operations like membership test and iteration, but its contents - are not independent of the original dictionary -- it is only a *view*. diff --git a/Misc/ACKS b/Misc/ACKS index 729e88e56582..c70f62efcf5f 100644 --- a/Misc/ACKS +++ b/Misc/ACKS @@ -1449,6 +1449,7 @@ Ian Seyer Dmitry Shachnev Anish Shah Daniel Shahaf +Hui Shang Mark Shannon Ha Shao Richard Shapiro diff --git a/Misc/NEWS.d/next/Documentation/2017-12-22-17-29-37.bpo-32337.eZe-ID.rst b/Misc/NEWS.d/next/Documentation/2017-12-22-17-29-37.bpo-32337.eZe-ID.rst new file mode 100644 index 000000000000..a905467cd59f --- /dev/null +++ b/Misc/NEWS.d/next/Documentation/2017-12-22-17-29-37.bpo-32337.eZe-ID.rst @@ -0,0 +1 @@ +Update documentation related with ``dict`` order.

1 0

bpo-33195: Doc: Deprecate Py_UNICODE in c-api/arg (GH-6329)
by INADA Naoki April 4, 2018

April 4, 2018

https://github.com/python/cpython/commit/42ec190761a2e8503aaa06f0bfaaabe987… commit: 42ec190761a2e8503aaa06f0bfaaabe98749179b branch: master author: INADA Naoki <methane(a)users.noreply.github.com> committer: GitHub <noreply(a)github.com> date: 2018-04-04T13:59:08+09:00 summary: bpo-33195: Doc: Deprecate Py_UNICODE in c-api/arg (GH-6329) Py_UNICODE is deprecated since Python 3.3. But the deprecation is missed in the c-api/arg document. files: A Misc/NEWS.d/next/Documentation/2018-04-01-14-30-36.bpo-33195.dRS-XX.rst M Doc/c-api/arg.rst diff --git a/Doc/c-api/arg.rst b/Doc/c-api/arg.rst index e4b48e66bc2d..b41130ede416 100644 --- a/Doc/c-api/arg.rst +++ b/Doc/c-api/arg.rst @@ -151,19 +151,35 @@ which disallows mutable objects such as :class:`bytearray`. Previously, :exc:`TypeError` was raised when embedded null code points were encountered in the Python string. + .. deprecated-removed:: 3.3 4.0 + Part of the old-style :c:type:`Py_UNICODE` API; please migrate to using + :c:func:`PyUnicode_AsWideCharString`. + ``u#`` (:class:`str`) [const Py_UNICODE \*, int] This variant on ``u`` stores into two C variables, the first one a pointer to a Unicode data buffer, the second one its length. This variant allows null code points. + .. deprecated-removed:: 3.3 4.0 + Part of the old-style :c:type:`Py_UNICODE` API; please migrate to using + :c:func:`PyUnicode_AsWideCharString`. + ``Z`` (:class:`str` or ``None``) [const Py_UNICODE \*] Like ``u``, but the Python object may also be ``None``, in which case the :c:type:`Py_UNICODE` pointer is set to *NULL*. + .. deprecated-removed:: 3.3 4.0 + Part of the old-style :c:type:`Py_UNICODE` API; please migrate to using + :c:func:`PyUnicode_AsWideCharString`. + ``Z#`` (:class:`str` or ``None``) [const Py_UNICODE \*, int] Like ``u#``, but the Python object may also be ``None``, in which case the :c:type:`Py_UNICODE` pointer is set to *NULL*. + .. deprecated-removed:: 3.3 4.0 + Part of the old-style :c:type:`Py_UNICODE` API; please migrate to using + :c:func:`PyUnicode_AsWideCharString`. + ``U`` (:class:`str`) [PyObject \*] Requires that the Python object is a Unicode object, without attempting any conversion. Raises :exc:`TypeError` if the object is not a Unicode @@ -552,12 +568,13 @@ Building values ``z#`` (:class:`str` or ``None``) [const char \*, int] Same as ``s#``. - ``u`` (:class:`str`) [const Py_UNICODE \*] - Convert a null-terminated buffer of Unicode (UCS-2 or UCS-4) data to a Python - Unicode object. If the Unicode buffer pointer is *NULL*, ``None`` is returned. + ``u`` (:class:`str`) [const wchar_t \*] + Convert a null-terminated :c:type:`wchar_t` buffer of Unicode (UTF-16 or UCS-4) + data to a Python Unicode object. If the Unicode buffer pointer is *NULL*, + ``None`` is returned. - ``u#`` (:class:`str`) [const Py_UNICODE \*, int] - Convert a Unicode (UCS-2 or UCS-4) data buffer and its length to a Python + ``u#`` (:class:`str`) [const wchar_t \*, int] + Convert a Unicode (UTF-16 or UCS-4) data buffer and its length to a Python Unicode object. If the Unicode buffer pointer is *NULL*, the length is ignored and ``None`` is returned. diff --git a/Misc/NEWS.d/next/Documentation/2018-04-01-14-30-36.bpo-33195.dRS-XX.rst b/Misc/NEWS.d/next/Documentation/2018-04-01-14-30-36.bpo-33195.dRS-XX.rst new file mode 100644 index 000000000000..6884640325b0 --- /dev/null +++ b/Misc/NEWS.d/next/Documentation/2018-04-01-14-30-36.bpo-33195.dRS-XX.rst @@ -0,0 +1,3 @@ +Deprecate ``Py_UNICODE`` usage in ``c-api/arg`` document. ``Py_UNICODE`` +related APIs are deprecated since Python 3.3, but it is missed in the +document.

1 0

bpo-32337: Update documentats about dict order (GH-4973)
by INADA Naoki April 4, 2018

April 4, 2018

https://github.com/python/cpython/commit/dfbbbf16f9aab82330c634913441b5ac73… commit: dfbbbf16f9aab82330c634913441b5ac73267d9c branch: master author: hui shang <shangdahao(a)gmail.com> committer: INADA Naoki <methane(a)users.noreply.github.com> date: 2018-04-04T13:55:05+09:00 summary: bpo-32337: Update documentats about dict order (GH-4973) files: A Misc/NEWS.d/next/Documentation/2017-12-22-17-29-37.bpo-32337.eZe-ID.rst M Doc/library/stdtypes.rst M Doc/tutorial/datastructures.rst M Misc/ACKS diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst index ad7f578e0860..a213189a3407 100644 --- a/Doc/library/stdtypes.rst +++ b/Doc/library/stdtypes.rst @@ -4256,17 +4256,17 @@ support membership tests: Return an iterator over the keys, values or items (represented as tuples of ``(key, value)``) in the dictionary. - Keys and values are iterated over in an arbitrary order which is non-random, - varies across Python implementations, and depends on the dictionary's history - of insertions and deletions. If keys, values and items views are iterated - over with no intervening modifications to the dictionary, the order of items - will directly correspond. This allows the creation of ``(value, key)`` pairs + Keys and values are iterated over in insertion order. + This allows the creation of ``(value, key)`` pairs using :func:`zip`: ``pairs = zip(d.values(), d.keys())``. Another way to create the same list is ``pairs = [(v, k) for (k, v) in d.items()]``. Iterating views while adding or deleting entries in the dictionary may raise a :exc:`RuntimeError` or fail to iterate over all entries. + .. versionchanged:: 3.7 + Dict order is guaranteed to be insertion order. + .. describe:: x in dictview Return ``True`` if *x* is in the underlying dictionary's keys, values or @@ -4293,9 +4293,9 @@ An example of dictionary view usage:: >>> print(n) 504 - >>> # keys and values are iterated over in the same order + >>> # keys and values are iterated over in the same order (insertion order) >>> list(keys) - ['eggs', 'bacon', 'sausage', 'spam'] + ['eggs', 'sausage', 'bacon', 'spam'] >>> list(values) [2, 1, 1, 500] @@ -4303,7 +4303,7 @@ An example of dictionary view usage:: >>> del dishes['eggs'] >>> del dishes['sausage'] >>> list(keys) - ['spam', 'bacon'] + ['bacon', 'spam'] >>> # set operations >>> keys & {'eggs', 'bacon', 'salad'} diff --git a/Doc/tutorial/datastructures.rst b/Doc/tutorial/datastructures.rst index b95aca885252..7855ef2d2882 100644 --- a/Doc/tutorial/datastructures.rst +++ b/Doc/tutorial/datastructures.rst @@ -497,7 +497,7 @@ You can't use lists as keys, since lists can be modified in place using index assignments, slice assignments, or methods like :meth:`append` and :meth:`extend`. -It is best to think of a dictionary as an unordered set of *key: value* pairs, +It is best to think of a dictionary as a set of *key: value* pairs, with the requirement that the keys are unique (within one dictionary). A pair of braces creates an empty dictionary: ``{}``. Placing a comma-separated list of key:value pairs within the braces adds initial key:value pairs to the @@ -509,9 +509,9 @@ pair with ``del``. If you store using a key that is already in use, the old value associated with that key is forgotten. It is an error to extract a value using a non-existent key. -Performing ``list(d.keys())`` on a dictionary returns a list of all the keys -used in the dictionary, in arbitrary order (if you want it sorted, just use -``sorted(d.keys())`` instead). [2]_ To check whether a single key is in the +Performing ``list(d)`` on a dictionary returns a list of all the keys +used in the dictionary, in insertion order (if you want it sorted, just use +``sorted(d)`` instead). To check whether a single key is in the dictionary, use the :keyword:`in` keyword. Here is a small example using a dictionary:: @@ -519,16 +519,16 @@ Here is a small example using a dictionary:: >>> tel = {'jack': 4098, 'sape': 4139} >>> tel['guido'] = 4127 >>> tel - {'sape': 4139, 'guido': 4127, 'jack': 4098} + {'jack': 4098, 'sape': 4139, 'guido': 4127} >>> tel['jack'] 4098 >>> del tel['sape'] >>> tel['irv'] = 4127 >>> tel - {'guido': 4127, 'irv': 4127, 'jack': 4098} - >>> list(tel.keys()) - ['irv', 'guido', 'jack'] - >>> sorted(tel.keys()) + {'jack': 4098, 'guido': 4127, 'irv': 4127} + >>> list(tel) + ['jack', 'guido', 'irv'] + >>> sorted(tel) ['guido', 'irv', 'jack'] >>> 'guido' in tel True @@ -539,7 +539,7 @@ The :func:`dict` constructor builds dictionaries directly from sequences of key-value pairs:: >>> dict([('sape', 4139), ('guido', 4127), ('jack', 4098)]) - {'sape': 4139, 'jack': 4098, 'guido': 4127} + {'sape': 4139, 'guido': 4127, 'jack': 4098} In addition, dict comprehensions can be used to create dictionaries from arbitrary key and value expressions:: @@ -551,7 +551,7 @@ When the keys are simple strings, it is sometimes easier to specify pairs using keyword arguments:: >>> dict(sape=4139, guido=4127, jack=4098) - {'sape': 4139, 'jack': 4098, 'guido': 4127} + {'sape': 4139, 'guido': 4127, 'jack': 4098} .. _tut-loopidioms: @@ -710,7 +710,3 @@ interpreter will raise a :exc:`TypeError` exception. .. [1] Other languages may return the mutated object, which allows method chaining, such as ``d->insert("a")->remove("b")->sort();``. - -.. [2] Calling ``d.keys()`` will return a :dfn:`dictionary view` object. It - supports operations like membership test and iteration, but its contents - are not independent of the original dictionary -- it is only a *view*. diff --git a/Misc/ACKS b/Misc/ACKS index c7bdbd4a2312..f7ac37ea7ac8 100644 --- a/Misc/ACKS +++ b/Misc/ACKS @@ -1451,6 +1451,7 @@ Ian Seyer Dmitry Shachnev Anish Shah Daniel Shahaf +Hui Shang Mark Shannon Ha Shao Richard Shapiro diff --git a/Misc/NEWS.d/next/Documentation/2017-12-22-17-29-37.bpo-32337.eZe-ID.rst b/Misc/NEWS.d/next/Documentation/2017-12-22-17-29-37.bpo-32337.eZe-ID.rst new file mode 100644 index 000000000000..a905467cd59f --- /dev/null +++ b/Misc/NEWS.d/next/Documentation/2017-12-22-17-29-37.bpo-32337.eZe-ID.rst @@ -0,0 +1 @@ +Update documentation related with ``dict`` order.

1 0

[65 flat] Results for Python (master branch) 2018-04-03
by lp_benchmark_robot＠intel.com April 3, 2018

April 3, 2018

Results for project python/master, build date: 2018-04-03 03:04:29-07:00. - commit: 629338f - previous commit: da58533 - revision date: 2018-04-03 12:39:47+09:00 - environment: Broadwell-EP - cpu: Intel(R) Xeon(R) CPU E5-2699 v4 @ 2.20GHz 2x22 cores, stepping 1, LLC 55 MB - mem: 128 GB - os: Ubuntu 16.04.2 LTS - kernel: 4.4.0-62-generic x86_64 GNU/Linux Baseline results were generated using release v3.6.0, with hash 5c4568a from 2016-12-22 23:38:47+00:00. +-----+------------------------+--------+------------+------------+------------+ | | |relative|change since|change since|current rev | | | benchmark|std_dev*| last run | baseline |run with PGO| +-----+------------------------+--------+------------+------------+------------+ | :-| | 2to3| 1.160% | -0.132% | +8.159% | +8.139% | +-----+------------------------+--------+------------+------------+------------+ | :-| | call_method| 0.614% | -1.330% | +24.845% | +9.031% | +-----+------------------------+--------+------------+------------+------------+ | :-| | call_method_slots| 1.088% | +1.323% | +26.330% | +10.010% | +-----+------------------------+--------+------------+------------+------------+ | :-| | call_method_unknown| 0.851% | -1.400% | +23.677% | +8.349% | +-----+------------------------+--------+------------+------------+------------+ | :-| | call_simple| 3.324% | -0.173% | +9.310% | +15.400% | +-----+------------------------+--------+------------+------------+------------+ | :-| | chameleon| 1.509% | +3.596% | +12.996% | +11.958% | +-----+------------------------+--------+------------+------------+------------+ | :-| | chaos| 1.143% | +0.335% | +7.206% | +10.567% | +-----+------------------------+--------+------------+------------+------------+ | :-| | crypto_pyaes| 0.695% | -1.126% | -1.585% | +10.509% | +-----+------------------------+--------+------------+------------+------------+ | :-| | deltablue| 3.592% | -0.674% | +11.495% | +17.039% | +-----+------------------------+--------+------------+------------+------------+ | :-| | django_template| 4.289% | +1.172% | +14.479% | +15.028% | +-----+------------------------+--------+------------+------------+------------+ | :-| | dulwich_log| 1.467% | +0.250% | +5.494% | +7.689% | +-----+------------------------+--------+------------+------------+------------+ | :-| | fannkuch| 0.262% | -0.070% | +6.295% | +6.122% | +-----+------------------------+--------+------------+------------+------------+ | :-| | float| 1.249% | -1.000% | +2.742% | +7.632% | +-----+------------------------+--------+------------+------------+------------+ | :-| | genshi_text| 1.659% | +0.688% | +14.330% | +9.605% | +-----+------------------------+--------+------------+------------+------------+ | :-| | genshi_xml| 1.314% | -0.147% | +10.581% | +10.984% | +-----+------------------------+--------+------------+------------+------------+ | :-| | go| 7.223% | +0.491% | +4.673% | +12.808% | +-----+------------------------+--------+------------+------------+------------+ | :-| | hexiom| 0.501% | -0.508% | +11.445% | +12.303% | +-----+------------------------+--------+------------+------------+------------+ | :-| | html5lib| 2.730% | +1.492% | +12.859% | +9.590% | +-----+------------------------+--------+------------+------------+------------+ | :-| | json_dumps| 1.477% | -0.383% | +1.833% | +11.400% | +-----+------------------------+--------+------------+------------+------------+ | :-| | json_loads| 5.977% | -3.714% | -3.862% | +13.327% | +-----+------------------------+--------+------------+------------+------------+ | :-| | logging_format| 1.916% | +0.735% | +19.189% | +10.462% | +-----+------------------------+--------+------------+------------+------------+ | :-| | logging_silent| 2.580% | -0.751% | +47.328% | +13.107% | +-----+------------------------+--------+------------+------------+------------+ | :-| | logging_simple| 1.707% | -0.647% | +12.924% | +11.949% | +-----+------------------------+--------+------------+------------+------------+ | :-| | mako| 0.620% | +1.779% | +17.340% | +15.103% | +-----+------------------------+--------+------------+------------+------------+ | :-| | mdp| 1.834% | +0.576% | +9.147% | +10.547% | +-----+------------------------+--------+------------+------------+------------+ | :-| | meteor_contest| 2.151% | +1.043% | +5.704% | +5.421% | +-----+------------------------+--------+------------+------------+------------+ | :-| | nbody| 0.658% | +2.894% | +0.178% | +1.021% | +-----+------------------------+--------+------------+------------+------------+ | :-| | nqueens| 0.496% | +0.977% | +6.025% | +7.422% | +-----+------------------------+--------+------------+------------+------------+ | :-| | pathlib| 1.323% | +1.223% | +2.026% | +9.107% | +-----+------------------------+--------+------------+------------+------------+ | :-| | pickle| 5.125% | -1.124% | +0.197% | +18.939% | +-----+------------------------+--------+------------+------------+------------+ | :-| | pickle_dict| 0.289% | +0.739% | +1.642% | +15.151% | +-----+------------------------+--------+------------+------------+------------+ | :-| | pickle_list| 0.896% | -0.522% | +4.392% | +16.729% | +-----+------------------------+--------+------------+------------+------------+ | :-| | pickle_pure_python| 3.989% | +0.083% | +11.926% | +10.284% | +-----+------------------------+--------+------------+------------+------------+ | :-| | pidigits| 0.215% | -0.057% | +0.148% | +9.892% | +-----+------------------------+--------+------------+------------+------------+ | :-| | python_startup| 0.125% | +0.100% | +18.219% | +4.918% | +-----+------------------------+--------+------------+------------+------------+ | :-| | python_startup_no_site| 0.091% | +0.135% | +5.220% | +5.003% | +-----+------------------------+--------+------------+------------+------------+ | :-| | raytrace| 1.188% | +0.437% | +10.523% | +13.748% | +-----+------------------------+--------+------------+------------+------------+ | :-| | regex_compile| 4.179% | +0.617% | +6.522% | +10.345% | +-----+------------------------+--------+------------+------------+------------+ | :-| | regex_dna| 0.384% | -1.681% | -2.066% | +11.897% | +-----+------------------------+--------+------------+------------+------------+ | :-| | regex_effbot| 2.240% | -3.663% | -7.084% | +7.910% | +-----+------------------------+--------+------------+------------+------------+ | :-| | regex_v8| 1.387% | -0.128% | +3.748% | +9.848% | +-----+------------------------+--------+------------+------------+------------+ | :-| | richards| 1.269% | +0.105% | +10.636% | +15.099% | +-----+------------------------+--------+------------+------------+------------+ | :-| | scimark_fft| 2.176% | -0.686% | -2.570% | +6.353% | +-----+------------------------+--------+------------+------------+------------+ | :-| | scimark_lu| 3.158% | +0.810% | +24.029% | +11.787% | +-----+------------------------+--------+------------+------------+------------+ | :-| | scimark_monte_carlo| 2.488% | -0.496% | +3.767% | +6.301% | +-----+------------------------+--------+------------+------------+------------+ | :-| | scimark_sor| 2.090% | -0.473% | +14.288% | +10.447% | +-----+------------------------+--------+------------+------------+------------+ | :-| | scimark_sparse_mat_mult| 4.524% | -2.807% | -7.775% | +4.422% | +-----+------------------------+--------+------------+------------+------------+ | :-| | spectral_norm| 0.454% | -1.806% | +2.828% | +7.746% | +-----+------------------------+--------+------------+------------+------------+ | :-| | sqlalchemy_declarative| 1.381% | +0.192% | +6.611% | +6.898% | +-----+------------------------+--------+------------+------------+------------+ | :-| | sqlalchemy_imperative| 3.100% | +0.888% | +8.031% | +4.628% | +-----+------------------------+--------+------------+------------+------------+ | :-| | sqlite_synth| 3.797% | -1.266% | +0.413% | +10.941% | +-----+------------------------+--------+------------+------------+------------+ | :-| | sympy_expand| 3.378% | +0.432% | +17.137% | +8.302% | +-----+------------------------+--------+------------+------------+------------+ | :-| | sympy_integrate| 1.681% | +0.228% | +13.023% | +6.493% | +-----+------------------------+--------+------------+------------+------------+ | :-| | sympy_str| 3.786% | +0.200% | +17.891% | +9.032% | +-----+------------------------+--------+------------+------------+------------+ | :-| | sympy_sum| 6.027% | +0.501% | +16.643% | +10.205% | +-----+------------------------+--------+------------+------------+------------+ | :-| | telco| 5.026% | -0.930% | +20.231% | +9.480% | +-----+------------------------+--------+------------+------------+------------+ | :-| | tornado_http| 0.923% | +0.552% | +7.859% | +6.230% | +-----+------------------------+--------+------------+------------+------------+ | :-| | unpack_sequence| 1.171% | +0.141% | +2.256% | +2.627% | +-----+------------------------+--------+------------+------------+------------+ | :-| | unpickle| 7.743% | -4.008% | +6.472% | +22.780% | +-----+------------------------+--------+------------+------------+------------+ | :-| | unpickle_list| 3.270% | -2.290% | -2.828% | +15.784% | +-----+------------------------+--------+------------+------------+------------+ | :-| | unpickle_pure_python| 0.808% | +0.059% | +8.312% | +7.125% | +-----+------------------------+--------+------------+------------+------------+ | :-| | xml_etree_generate| 1.049% | +0.522% | +5.266% | +10.420% | +-----+------------------------+--------+------------+------------+------------+ | :-| | xml_etree_iterparse| 1.805% | +1.561% | +3.583% | +8.019% | +-----+------------------------+--------+------------+------------+------------+ | :-| | xml_etree_parse| 2.880% | +2.679% | -5.863% | +11.102% | +-----+------------------------+--------+------------+------------+------------+ | :-| | xml_etree_process| 2.090% | -0.061% | +6.103% | +10.629% | +-----+------------------------+--------+------------+------------+------------+ * Relative Standard Deviation (Standard Deviation/Average) If this is not displayed properly please visit our results page here: http://languagesperformance.intel.com/65-flat-results-for-python-master-bra… Our lab does a nightly source pull and build of the Python project and measures performance changes against the previous stable version and the previous nightly measurement. This is provided as a service to the community so that quality issues with current hardware can be identified quickly. Intel technologies' features and benefits depend on system configuration and may require enabled hardware, software or service activation. Performance varies depending on system configuration.

1 0

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

April 3, 2018

https://github.com/python/cpython/commit/a5c8830637cde632ab3bcf5475698dcf0f… commit: a5c8830637cde632ab3bcf5475698dcf0fb0546d branch: 3.6 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: GitHub <noreply(a)github.com> date: 2018-04-03T15:05:11-07:00 summary: bpo-33209: End framing at the end of C implementation of pickle.Pickler.dump(). (GH-6363) (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 a1c0bd726fe2..764057a86641 100644 --- a/Lib/test/pickletester.py +++ b/Lib/test/pickletester.py @@ -2667,29 +2667,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 7e9bb9895ca2..792c7604b59e 100644 --- a/Modules/_pickle.c +++ b/Modules/_pickle.c @@ -4061,9 +4061,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