Mailman 3 May 2019 - Python-checkins

bpo-36953: Delay removal of ABCs from collections. (GH-13409)
by Miss Islington (bot) May 30, 2019

May 30, 2019

https://github.com/python/cpython/commit/eea47e09394dfb64d3a59a601d947d25bb… commit: eea47e09394dfb64d3a59a601d947d25bb1bdc96 branch: master author: Matthias Bussonnier <mbussonnier(a)ucmerced.edu> committer: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> date: 2019-05-30T14:45:48-07:00 summary: bpo-36953: Delay removal of ABCs from collections. (GH-13409) Bump the removal to 3.9, indicate collections.abc available since 3.3, replace version-changed directive to deprecated-removed. https://bugs.python.org/issue36953 files: A Misc/NEWS.d/next/Library/2019-05-20-08-54-41.bpo-36952.I_glok.rst M Doc/library/collections.rst M Lib/collections/__init__.py diff --git a/Doc/library/collections.rst b/Doc/library/collections.rst index ae21db216fde..ec921d79d0c4 100644 --- a/Doc/library/collections.rst +++ b/Doc/library/collections.rst @@ -33,10 +33,10 @@ Python's general purpose built-in containers, :class:`dict`, :class:`list`, :class:`UserString` wrapper around string objects for easier string subclassing ===================== ==================================================================== -.. versionchanged:: 3.3 +.. deprecated-removed:: 3.3 3.9 Moved :ref:`collections-abstract-base-classes` to the :mod:`collections.abc` module. For backwards compatibility, they continue to be visible in this module through - Python 3.7. Subsequently, they will be removed entirely. + Python 3.8. :class:`ChainMap` objects diff --git a/Lib/collections/__init__.py b/Lib/collections/__init__.py index cb7f1bb1fcfe..5b740d84c275 100644 --- a/Lib/collections/__init__.py +++ b/Lib/collections/__init__.py @@ -47,8 +47,8 @@ def __getattr__(name): obj = getattr(_collections_abc, name) import warnings warnings.warn("Using or importing the ABCs from 'collections' instead " - "of from 'collections.abc' is deprecated, " - "and in 3.8 it will stop working", + "of from 'collections.abc' is deprecated since Python 3.3," + "and in 3.9 it will stop working", DeprecationWarning, stacklevel=2) globals()[name] = obj return obj diff --git a/Misc/NEWS.d/next/Library/2019-05-20-08-54-41.bpo-36952.I_glok.rst b/Misc/NEWS.d/next/Library/2019-05-20-08-54-41.bpo-36952.I_glok.rst new file mode 100644 index 000000000000..eeb4fd71e67b --- /dev/null +++ b/Misc/NEWS.d/next/Library/2019-05-20-08-54-41.bpo-36952.I_glok.rst @@ -0,0 +1,5 @@ +Starting with Python 3.3, importing ABCs from :mod:`collections` is +deprecated, and import should be done from :mod:`collections.abc`. Still +being able to import from :mod:`collections` was marked for removal in 3.8, +but has been delayed to 3.9; documentation and ``DeprecationWarning`` +clarified.

1 0

bpo-36342: Fix test_multiprocessing in test_venv (GH-12513)
by Miss Islington (bot) May 30, 2019

May 30, 2019

https://github.com/python/cpython/commit/5437ccca1424e415a938c583df43d8cc74… commit: 5437ccca1424e415a938c583df43d8cc74047d16 branch: master author: xdegaye <xdegaye(a)gmail.com> committer: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> date: 2019-05-30T14:42:29-07:00 summary: bpo-36342: Fix test_multiprocessing in test_venv (GH-12513) when platform lacks a functioning sem_open implementation https://bugs.python.org/issue36342 files: A Misc/NEWS.d/next/Tests/2019-03-23-13-58-49.bpo-36342.q6Quiq.rst M Lib/test/test_venv.py diff --git a/Lib/test/test_venv.py b/Lib/test/test_venv.py index 6822d567e42b..278c68699d8e 100644 --- a/Lib/test/test_venv.py +++ b/Lib/test/test_venv.py @@ -14,7 +14,8 @@ import sys import tempfile from test.support import (captured_stdout, captured_stderr, requires_zlib, - can_symlink, EnvironmentVarGuard, rmtree) + can_symlink, EnvironmentVarGuard, rmtree, + import_module) import threading import unittest import venv @@ -315,6 +316,10 @@ def test_multiprocessing(self): """ Test that the multiprocessing is able to spawn. """ + # Issue bpo-36342: Instanciation of a Pool object imports the + # multiprocessing.synchronize module. Skip the test if this module + # cannot be imported. + import_module('multiprocessing.synchronize') rmtree(self.env_dir) self.run_with_capture(venv.create, self.env_dir) envpy = os.path.join(os.path.realpath(self.env_dir), diff --git a/Misc/NEWS.d/next/Tests/2019-03-23-13-58-49.bpo-36342.q6Quiq.rst b/Misc/NEWS.d/next/Tests/2019-03-23-13-58-49.bpo-36342.q6Quiq.rst new file mode 100644 index 000000000000..a7c92980fd77 --- /dev/null +++ b/Misc/NEWS.d/next/Tests/2019-03-23-13-58-49.bpo-36342.q6Quiq.rst @@ -0,0 +1 @@ +Fix test_multiprocessing in test_venv if platform lacks functioning sem_open.

1 0

bpo-30969: Fix docs about the comparison in absence of __contains__ (GH-2761)
by Miss Islington (bot) May 30, 2019

May 30, 2019

https://github.com/python/cpython/commit/e8661c1dabc206bf7fe6e302e38fa426aa… commit: e8661c1dabc206bf7fe6e302e38fa426aa734dd0 branch: 3.7 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: GitHub <noreply(a)github.com> date: 2019-05-30T13:41:06-07:00 summary: bpo-30969: Fix docs about the comparison in absence of __contains__ (GH-2761) (cherry picked from commit 2f5b9dcc0a89cbde1499c76df81c36bfd5ef9aa8) Co-authored-by: Antti Haapala <antti(a)haapala.name> files: M Doc/reference/expressions.rst diff --git a/Doc/reference/expressions.rst b/Doc/reference/expressions.rst index 3fb27c8a8031..990600ec1888 100644 --- a/Doc/reference/expressions.rst +++ b/Doc/reference/expressions.rst @@ -1568,14 +1568,15 @@ y`` returns ``True`` if ``y.__contains__(x)`` returns a true value, and ``False`` otherwise. For user-defined classes which do not define :meth:`__contains__` but do define -:meth:`__iter__`, ``x in y`` is ``True`` if some value ``z`` with ``x == z`` is -produced while iterating over ``y``. If an exception is raised during the -iteration, it is as if :keyword:`in` raised that exception. +:meth:`__iter__`, ``x in y`` is ``True`` if some value ``z``, for which the +expression ``x is z or x == z`` is true, is produced while iterating over ``y``. +If an exception is raised during the iteration, it is as if :keyword:`in` raised +that exception. Lastly, the old-style iteration protocol is tried: if a class defines :meth:`__getitem__`, ``x in y`` is ``True`` if and only if there is a non-negative -integer index *i* such that ``x == y[i]``, and all lower integer indices do not -raise :exc:`IndexError` exception. (If any other exception is raised, it is as +integer index *i* such that ``x is y[i] or x == y[i]``, and no lower integer index +raises the :exc:`IndexError` exception. (If any other exception is raised, it is as if :keyword:`in` raised that exception). .. index::

1 0

bpo-30969: Fix docs about the comparison in absence of __contains__ (GH-2761)
by Cheryl Sabella May 30, 2019

May 30, 2019

https://github.com/python/cpython/commit/2f5b9dcc0a89cbde1499c76df81c36bfd5… commit: 2f5b9dcc0a89cbde1499c76df81c36bfd5ef9aa8 branch: master author: Antti Haapala <antti(a)haapala.name> committer: Cheryl Sabella <cheryl.sabella(a)gmail.com> date: 2019-05-30T16:19:28-04:00 summary: bpo-30969: Fix docs about the comparison in absence of __contains__ (GH-2761) files: M Doc/reference/expressions.rst diff --git a/Doc/reference/expressions.rst b/Doc/reference/expressions.rst index 52b41929d7bc..8b7110615240 100644 --- a/Doc/reference/expressions.rst +++ b/Doc/reference/expressions.rst @@ -1563,14 +1563,15 @@ y`` returns ``True`` if ``y.__contains__(x)`` returns a true value, and ``False`` otherwise. For user-defined classes which do not define :meth:`__contains__` but do define -:meth:`__iter__`, ``x in y`` is ``True`` if some value ``z`` with ``x == z`` is -produced while iterating over ``y``. If an exception is raised during the -iteration, it is as if :keyword:`in` raised that exception. +:meth:`__iter__`, ``x in y`` is ``True`` if some value ``z``, for which the +expression ``x is z or x == z`` is true, is produced while iterating over ``y``. +If an exception is raised during the iteration, it is as if :keyword:`in` raised +that exception. Lastly, the old-style iteration protocol is tried: if a class defines :meth:`__getitem__`, ``x in y`` is ``True`` if and only if there is a non-negative -integer index *i* such that ``x == y[i]``, and all lower integer indices do not -raise :exc:`IndexError` exception. (If any other exception is raised, it is as +integer index *i* such that ``x is y[i] or x == y[i]``, and no lower integer index +raises the :exc:`IndexError` exception. (If any other exception is raised, it is as if :keyword:`in` raised that exception). .. index::

1 0

bpo-5028: fix doc bug for tokenize (GH-11683)
by Miss Islington (bot) May 30, 2019

May 30, 2019

https://github.com/python/cpython/commit/1e36f75d634383eb243aa1798c0f2405c9… commit: 1e36f75d634383eb243aa1798c0f2405c9ceb5d4 branch: master author: Andrew Carr <andrewnc(a)users.noreply.github.com> committer: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> date: 2019-05-30T12:31:51-07:00 summary: bpo-5028: fix doc bug for tokenize (GH-11683) https://bugs.python.org/issue5028 files: M Doc/library/tokenize.rst M Lib/lib2to3/pgen2/tokenize.py M Lib/tokenize.py diff --git a/Doc/library/tokenize.rst b/Doc/library/tokenize.rst index 111289c767f3..c89d3d4b082f 100644 --- a/Doc/library/tokenize.rst +++ b/Doc/library/tokenize.rst @@ -39,7 +39,7 @@ The primary entry point is a :term:`generator`: column where the token begins in the source; a 2-tuple ``(erow, ecol)`` of ints specifying the row and column where the token ends in the source; and the line on which the token was found. The line passed (the last tuple item) - is the *logical* line; continuation lines are included. The 5 tuple is + is the *physical* line; continuation lines are included. The 5 tuple is returned as a :term:`named tuple` with the field names: ``type string start end line``. diff --git a/Lib/lib2to3/pgen2/tokenize.py b/Lib/lib2to3/pgen2/tokenize.py index 279d322971da..0f9fde3fb0d5 100644 --- a/Lib/lib2to3/pgen2/tokenize.py +++ b/Lib/lib2to3/pgen2/tokenize.py @@ -346,7 +346,7 @@ def generate_tokens(readline): column where the token begins in the source; a 2-tuple (erow, ecol) of ints specifying the row and column where the token ends in the source; and the line on which the token was found. The line passed is the - logical line; continuation lines are included. + physical line; continuation lines are included. """ lnum = parenlev = continued = 0 contstr, needcont = '', 0 diff --git a/Lib/tokenize.py b/Lib/tokenize.py index 0f9d5dd554d5..738fb71d188b 100644 --- a/Lib/tokenize.py +++ b/Lib/tokenize.py @@ -415,7 +415,7 @@ def tokenize(readline): column where the token begins in the source; a 2-tuple (erow, ecol) of ints specifying the row and column where the token ends in the source; and the line on which the token was found. The line passed is the - logical line; continuation lines are included. + physical line; continuation lines are included. The first token sequence will always be an ENCODING token which tells you which encoding was used to decode the bytes stream.

1 0

Fix audit event typo : urllib.request -> urllib.Request (GH-13550)
by Miss Islington (bot) May 30, 2019

May 30, 2019

https://github.com/python/cpython/commit/1b69c09248c4b51962933e3551f1ae6fc1… commit: 1b69c09248c4b51962933e3551f1ae6fc11369b6 branch: master author: Xtreak <tir.karthi(a)gmail.com> committer: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> date: 2019-05-30T10:58:27-07:00 summary: Fix audit event typo : urllib.request -> urllib.Request (GH-13550) As per the PEP and the [audit event raised](https://github.com/python/cpython/blob/13d4e6a4a090031f8214e058ed3c… in urllib.request this should be `urllib.Request` cc: @zooba files: M Doc/library/urllib.request.rst diff --git a/Doc/library/urllib.request.rst b/Doc/library/urllib.request.rst index 1895ae74b4f5..a53c969ec629 100644 --- a/Doc/library/urllib.request.rst +++ b/Doc/library/urllib.request.rst @@ -95,10 +95,10 @@ The :mod:`urllib.request` module defines the following functions: parameter to ``urllib.urlopen``, can be obtained by using :class:`ProxyHandler` objects. - .. audit-event:: urllib.request "fullurl data headers method" + .. audit-event:: urllib.Request "fullurl data headers method" The default opener raises an :func:`auditing event <sys.audit>` - ``urllib.request`` with arguments ``fullurl``, ``data``, ``headers``, + ``urllib.Request`` with arguments ``fullurl``, ``data``, ``headers``, ``method`` taken from the request object. .. versionchanged:: 3.2

1 0

bpo-36999: Add asyncio.Task.get_coro() (GH-13680)
by Miss Islington (bot) May 30, 2019

May 30, 2019

https://github.com/python/cpython/commit/98ef92002ec289bf8086b0ef3d4f96c258… commit: 98ef92002ec289bf8086b0ef3d4f96c2589f4e68 branch: master author: Alex Grönholm <alex.gronholm(a)nextday.fi> committer: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> date: 2019-05-30T08:30:09-07:00 summary: bpo-36999: Add asyncio.Task.get_coro() (GH-13680) https://bugs.python.org/issue36999 files: A Misc/NEWS.d/next/Library/2019-05-30-13-30-46.bpo-36999.EjY_L2.rst M Doc/library/asyncio-task.rst M Lib/asyncio/tasks.py M Lib/test/test_asyncio/test_tasks.py M Modules/_asynciomodule.c M Modules/clinic/_asynciomodule.c.h diff --git a/Doc/library/asyncio-task.rst b/Doc/library/asyncio-task.rst index d94fa587cd3a..1fcdcb985d88 100644 --- a/Doc/library/asyncio-task.rst +++ b/Doc/library/asyncio-task.rst @@ -842,6 +842,12 @@ Task Object The *file* argument is an I/O stream to which the output is written; by default output is written to :data:`sys.stderr`. + .. method:: get_coro() + + Return the coroutine object wrapped by the :class:`Task`. + + .. versionadded:: 3.8 + .. method:: get_name() Return the name of the Task. diff --git a/Lib/asyncio/tasks.py b/Lib/asyncio/tasks.py index 78e76003b3ac..95e85600a2e8 100644 --- a/Lib/asyncio/tasks.py +++ b/Lib/asyncio/tasks.py @@ -152,6 +152,9 @@ def __del__(self): def _repr_info(self): return base_tasks._task_repr_info(self) + def get_coro(self): + return self._coro + def get_name(self): return self._name diff --git a/Lib/test/test_asyncio/test_tasks.py b/Lib/test/test_asyncio/test_tasks.py index 114dd76687cd..74ce25908a33 100644 --- a/Lib/test/test_asyncio/test_tasks.py +++ b/Lib/test/test_asyncio/test_tasks.py @@ -2425,6 +2425,16 @@ def test_context_3(self): self.assertEqual(cvar.get(), -1) + def test_get_coro(self): + loop = asyncio.new_event_loop() + coro = coroutine_function() + try: + task = self.new_task(loop, coro) + loop.run_until_complete(task) + self.assertIs(task.get_coro(), coro) + finally: + loop.close() + def add_subclass_tests(cls): BaseTask = cls.Task diff --git a/Misc/NEWS.d/next/Library/2019-05-30-13-30-46.bpo-36999.EjY_L2.rst b/Misc/NEWS.d/next/Library/2019-05-30-13-30-46.bpo-36999.EjY_L2.rst new file mode 100644 index 000000000000..5c897fb4dbc7 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2019-05-30-13-30-46.bpo-36999.EjY_L2.rst @@ -0,0 +1,2 @@ +Add the ``asyncio.Task.get_coro()`` method to publicly expose the tasks's +coroutine object. diff --git a/Modules/_asynciomodule.c b/Modules/_asynciomodule.c index d8b631b7c7a2..281161b68611 100644 --- a/Modules/_asynciomodule.c +++ b/Modules/_asynciomodule.c @@ -2313,6 +2313,18 @@ _asyncio_Task_set_exception(TaskObj *self, PyObject *exception) return NULL; } +/*[clinic input] +_asyncio.Task.get_coro +[clinic start generated code]*/ + +static PyObject * +_asyncio_Task_get_coro_impl(TaskObj *self) +/*[clinic end generated code: output=bcac27c8cc6c8073 input=d2e8606c42a7b403]*/ +{ + Py_INCREF(self->task_coro); + return self->task_coro; +} + /*[clinic input] _asyncio.Task.get_name [clinic start generated code]*/ @@ -2439,6 +2451,7 @@ static PyMethodDef TaskType_methods[] = { _ASYNCIO_TASK__REPR_INFO_METHODDEF _ASYNCIO_TASK_GET_NAME_METHODDEF _ASYNCIO_TASK_SET_NAME_METHODDEF + _ASYNCIO_TASK_GET_CORO_METHODDEF {NULL, NULL} /* Sentinel */ }; diff --git a/Modules/clinic/_asynciomodule.c.h b/Modules/clinic/_asynciomodule.c.h index 87669f7c9f32..b9daee6aae96 100644 --- a/Modules/clinic/_asynciomodule.c.h +++ b/Modules/clinic/_asynciomodule.c.h @@ -569,6 +569,23 @@ PyDoc_STRVAR(_asyncio_Task_set_exception__doc__, #define _ASYNCIO_TASK_SET_EXCEPTION_METHODDEF \ {"set_exception", (PyCFunction)_asyncio_Task_set_exception, METH_O, _asyncio_Task_set_exception__doc__}, +PyDoc_STRVAR(_asyncio_Task_get_coro__doc__, +"get_coro($self, /)\n" +"--\n" +"\n"); + +#define _ASYNCIO_TASK_GET_CORO_METHODDEF \ + {"get_coro", (PyCFunction)_asyncio_Task_get_coro, METH_NOARGS, _asyncio_Task_get_coro__doc__}, + +static PyObject * +_asyncio_Task_get_coro_impl(TaskObj *self); + +static PyObject * +_asyncio_Task_get_coro(TaskObj *self, PyObject *Py_UNUSED(ignored)) +{ + return _asyncio_Task_get_coro_impl(self); +} + PyDoc_STRVAR(_asyncio_Task_get_name__doc__, "get_name($self, /)\n" "--\n" @@ -815,4 +832,4 @@ _asyncio__leave_task(PyObject *module, PyObject *const *args, Py_ssize_t nargs, exit: return return_value; } -/*[clinic end generated code: output=e3b02d96da56e80c input=a9049054013a1b77]*/ +/*[clinic end generated code: output=51c50219f6a0863a input=a9049054013a1b77]*/

1 0

Revert adding @maxking to CODEOWNERS file (GH-13660)
by Miss Islington (bot) May 30, 2019

May 30, 2019

https://github.com/python/cpython/commit/25ee0c3bf10820496448e2886069f9c279… commit: 25ee0c3bf10820496448e2886069f9c2794be7ac branch: master author: Brett Cannon <54418+brettcannon(a)users.noreply.github.com> committer: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> date: 2019-05-30T07:59:01-07:00 summary: Revert adding @maxking to CODEOWNERS file (GH-13660) This reverts commit 71dc7c5fbd856df83202f39c1f41ccd07c6eceb7. Turns out you must have write access for CODEOWNERS to work. files: M .github/CODEOWNERS diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 6a4ca54dd34e..963ab4dcff42 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -44,7 +44,7 @@ Objects/dict* @methane Python/bootstrap_hash.c @python/crypto-team @tiran # Email and related -**/*mail* @python/email-team @maxking +**/*mail* @python/email-team **/*smtp* @python/email-team **/*mime* @python/email-team **/*imap* @python/email-team

1 0

bpo-36974: rename _FastCallKeywords -> _Vectorcall (GH-13653)
by Petr Viktorin May 30, 2019

May 30, 2019

https://github.com/python/cpython/commit/37788bc23f6f1ed0362b9b3b248daf296c… commit: 37788bc23f6f1ed0362b9b3b248daf296c024849 branch: master author: Jeroen Demeyer <J.Demeyer(a)UGent.be> committer: Petr Viktorin <encukou(a)gmail.com> date: 2019-05-30T15:11:22+02:00 summary: bpo-36974: rename _FastCallKeywords -> _Vectorcall (GH-13653) files: M Include/descrobject.h M Include/funcobject.h M Include/methodobject.h M Objects/call.c M Objects/descrobject.c M Objects/funcobject.c M Objects/methodobject.c M Python/ceval.c M Tools/gdb/libpython.py diff --git a/Include/descrobject.h b/Include/descrobject.h index 3db09635399c..d7114852c1e2 100644 --- a/Include/descrobject.h +++ b/Include/descrobject.h @@ -92,7 +92,7 @@ PyAPI_FUNC(PyObject *) PyDescr_NewGetSet(PyTypeObject *, struct PyGetSetDef *); #ifndef Py_LIMITED_API -PyAPI_FUNC(PyObject *) _PyMethodDescr_FastCallKeywords( +PyAPI_FUNC(PyObject *) _PyMethodDescr_Vectorcall( PyObject *descrobj, PyObject *const *args, size_t nargsf, PyObject *kwnames); PyAPI_FUNC(PyObject *) PyDescr_NewWrapper(PyTypeObject *, struct wrapperbase *, void *); diff --git a/Include/funcobject.h b/Include/funcobject.h index 7ba000e1f13c..e563a74a15b6 100644 --- a/Include/funcobject.h +++ b/Include/funcobject.h @@ -66,7 +66,7 @@ PyAPI_FUNC(PyObject *) _PyFunction_FastCallDict( Py_ssize_t nargs, PyObject *kwargs); -PyAPI_FUNC(PyObject *) _PyFunction_FastCallKeywords( +PyAPI_FUNC(PyObject *) _PyFunction_Vectorcall( PyObject *func, PyObject *const *stack, size_t nargsf, diff --git a/Include/methodobject.h b/Include/methodobject.h index 5dbe2145dadc..e92adde7bf6b 100644 --- a/Include/methodobject.h +++ b/Include/methodobject.h @@ -47,7 +47,7 @@ PyAPI_FUNC(PyObject *) _PyCFunction_FastCallDict(PyObject *func, Py_ssize_t nargs, PyObject *kwargs); -PyAPI_FUNC(PyObject *) _PyCFunction_FastCallKeywords(PyObject *func, +PyAPI_FUNC(PyObject *) _PyCFunction_Vectorcall(PyObject *func, PyObject *const *stack, size_t nargsf, PyObject *kwnames); diff --git a/Objects/call.c b/Objects/call.c index 55dfc520f1de..acd1f26dcbb5 100644 --- a/Objects/call.c +++ b/Objects/call.c @@ -374,8 +374,8 @@ _PyFunction_FastCallDict(PyObject *func, PyObject *const *args, Py_ssize_t nargs PyObject * -_PyFunction_FastCallKeywords(PyObject *func, PyObject* const* stack, - size_t nargsf, PyObject *kwnames) +_PyFunction_Vectorcall(PyObject *func, PyObject* const* stack, + size_t nargsf, PyObject *kwnames) { PyCodeObject *co = (PyCodeObject *)PyFunction_GET_CODE(func); PyObject *globals = PyFunction_GET_GLOBALS(func); @@ -714,9 +714,9 @@ _PyMethodDef_RawFastCallKeywords(PyMethodDef *method, PyObject *self, PyObject * -_PyCFunction_FastCallKeywords(PyObject *func, - PyObject *const *args, size_t nargsf, - PyObject *kwnames) +_PyCFunction_Vectorcall(PyObject *func, + PyObject *const *args, size_t nargsf, + PyObject *kwnames) { PyObject *result; diff --git a/Objects/descrobject.c b/Objects/descrobject.c index 759018503c65..3aaeaa6e890f 100644 --- a/Objects/descrobject.c +++ b/Objects/descrobject.c @@ -264,9 +264,9 @@ methoddescr_call(PyMethodDescrObject *descr, PyObject *args, PyObject *kwargs) // same to methoddescr_call(), but use FASTCALL convention. PyObject * -_PyMethodDescr_FastCallKeywords(PyObject *descrobj, - PyObject *const *args, size_t nargsf, - PyObject *kwnames) +_PyMethodDescr_Vectorcall(PyObject *descrobj, + PyObject *const *args, size_t nargsf, + PyObject *kwnames) { assert(Py_TYPE(descrobj) == &PyMethodDescr_Type); PyMethodDescrObject *descr = (PyMethodDescrObject *)descrobj; @@ -756,7 +756,7 @@ PyDescr_NewMethod(PyTypeObject *type, PyMethodDef *method) type, method->ml_name); if (descr != NULL) { descr->d_method = method; - descr->vectorcall = &_PyMethodDescr_FastCallKeywords; + descr->vectorcall = _PyMethodDescr_Vectorcall; } return (PyObject *)descr; } diff --git a/Objects/funcobject.c b/Objects/funcobject.c index 2b1f42db746d..6f5b5d223d9b 100644 --- a/Objects/funcobject.c +++ b/Objects/funcobject.c @@ -36,7 +36,7 @@ PyFunction_NewWithQualName(PyObject *code, PyObject *globals, PyObject *qualname op->func_defaults = NULL; /* No default arguments */ op->func_kwdefaults = NULL; /* No keyword only defaults */ op->func_closure = NULL; - op->vectorcall = _PyFunction_FastCallKeywords; + op->vectorcall = _PyFunction_Vectorcall; consts = ((PyCodeObject *)code)->co_consts; if (PyTuple_Size(consts) >= 1) { diff --git a/Objects/methodobject.c b/Objects/methodobject.c index 76497c93894a..544baee09113 100644 --- a/Objects/methodobject.c +++ b/Objects/methodobject.c @@ -52,7 +52,7 @@ PyCFunction_NewEx(PyMethodDef *ml, PyObject *self, PyObject *module) op->vectorcall = NULL; } else { - op->vectorcall = &_PyCFunction_FastCallKeywords; + op->vectorcall = _PyCFunction_Vectorcall; } _PyObject_GC_TRACK(op); return (PyObject *)op; diff --git a/Python/ceval.c b/Python/ceval.c index 47baa4d03ed9..71e6eb8ebcfd 100644 --- a/Python/ceval.c +++ b/Python/ceval.c @@ -4815,7 +4815,7 @@ trace_call_function(PyThreadState *tstate, { PyObject *x; if (PyCFunction_Check(func)) { - C_TRACE(x, _PyCFunction_FastCallKeywords(func, args, nargs, kwnames)); + C_TRACE(x, _PyCFunction_Vectorcall(func, args, nargs, kwnames)); return x; } else if (Py_TYPE(func) == &PyMethodDescr_Type && nargs > 0) { @@ -4831,9 +4831,9 @@ trace_call_function(PyThreadState *tstate, if (func == NULL) { return NULL; } - C_TRACE(x, _PyCFunction_FastCallKeywords(func, - args+1, nargs-1, - kwnames)); + C_TRACE(x, _PyCFunction_Vectorcall(func, + args+1, nargs-1, + kwnames)); Py_DECREF(func); return x; } diff --git a/Tools/gdb/libpython.py b/Tools/gdb/libpython.py index d49546fa9c46..93f720ab7e2a 100755 --- a/Tools/gdb/libpython.py +++ b/Tools/gdb/libpython.py @@ -1564,7 +1564,7 @@ def is_other_python_frame(self): return False if caller in ('_PyCFunction_FastCallDict', - '_PyCFunction_FastCallKeywords', + '_PyCFunction_Vectorcall', 'cfunction_call_varargs'): arg_name = 'func' # Within that frame:

1 0

bpo-37099: Silence DeprecationWarning in test_inspect (GH-13679)
by Miss Islington (bot) May 30, 2019

May 30, 2019

https://github.com/python/cpython/commit/6d0b7470a4738a403ef48cfd50d9447e0f… commit: 6d0b7470a4738a403ef48cfd50d9447e0f32f00c branch: master author: Xtreak <tir.karthi(a)gmail.com> committer: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> date: 2019-05-30T05:01:39-07:00 summary: bpo-37099: Silence DeprecationWarning in test_inspect (GH-13679) Fix DeprecationWarning introduced in aee19f54f6fe45f6b3c906987941e5a8af4468e9 https://bugs.python.org/issue37099 files: M Lib/test/test_inspect.py diff --git a/Lib/test/test_inspect.py b/Lib/test/test_inspect.py index b3aae3a18ecf..83a5f7ec1f53 100644 --- a/Lib/test/test_inspect.py +++ b/Lib/test/test_inspect.py @@ -750,14 +750,16 @@ class D(B, C): pass def assertArgSpecEquals(self, routine, args_e, varargs_e=None, varkw_e=None, defaults_e=None, formatted=None): - args, varargs, varkw, defaults = inspect.getargspec(routine) + with self.assertWarns(DeprecationWarning): + args, varargs, varkw, defaults = inspect.getargspec(routine) self.assertEqual(args, args_e) self.assertEqual(varargs, varargs_e) self.assertEqual(varkw, varkw_e) self.assertEqual(defaults, defaults_e) if formatted is not None: - self.assertEqual(inspect.formatargspec(args, varargs, varkw, defaults), - formatted) + with self.assertWarns(DeprecationWarning): + self.assertEqual(inspect.formatargspec(args, varargs, varkw, defaults), + formatted) def assertFullArgSpecEquals(self, routine, args_e, varargs_e=None, varkw_e=None, defaults_e=None, @@ -774,9 +776,10 @@ def assertFullArgSpecEquals(self, routine, args_e, varargs_e=None, self.assertEqual(kwonlydefaults, kwonlydefaults_e) self.assertEqual(ann, ann_e) if formatted is not None: - self.assertEqual(inspect.formatargspec(args, varargs, varkw, defaults, - kwonlyargs, kwonlydefaults, ann), - formatted) + with self.assertWarns(DeprecationWarning): + self.assertEqual(inspect.formatargspec(args, varargs, varkw, defaults, + kwonlyargs, kwonlydefaults, ann), + formatted) def test_getargspec(self): self.assertArgSpecEquals(mod.eggs, ['x', 'y'], formatted='(x, y)')

1 0