Mailman 3 March 2022 - Python-checkins

bpo-47162: Add call trampoline to mitigate bad fpcasts on Emscripten (GH-32189)
by miss-islington March 30, 2022

March 30, 2022

https://github.com/python/cpython/commit/581c4434de62d9d36392f10e65866c081f… commit: 581c4434de62d9d36392f10e65866c081fb18d71 branch: main author: Christian Heimes <christian(a)python.org> committer: miss-islington <31488909+miss-islington(a)users.noreply.github.com> date: 2022-03-30T12:28:33-07:00 summary: bpo-47162: Add call trampoline to mitigate bad fpcasts on Emscripten (GH-32189) files: A Misc/NEWS.d/next/Core and Builtins/2022-03-30-13-13-25.bpo-47162.yDJMUm.rst M Include/internal/pycore_object.h M Objects/call.c M Objects/descrobject.c M Objects/methodobject.c M Python/import.c M Python/importdl.c M Python/importdl.h diff --git a/Include/internal/pycore_object.h b/Include/internal/pycore_object.h index 06671b5057afa..177b06e2dd4f7 100644 --- a/Include/internal/pycore_object.h +++ b/Include/internal/pycore_object.h @@ -242,6 +242,33 @@ extern PyObject* _PyType_GetSubclasses(PyTypeObject *); PyAPI_FUNC(PyObject *) _PyObject_LookupSpecial(PyObject *, PyObject *); +/* C function call trampolines to mitigate bad function pointer casts. + * + * Typical native ABIs ignore additional arguments or fill in missing + * values with 0/NULL in function pointer cast. Compilers do not show + * warnings when a function pointer is explicitly casted to an + * incompatible type. + * + * Bad fpcasts are an issue in WebAssembly. WASM's indirect_call has strict + * function signature checks. Argument count, types, and return type must + * match. + * + * Third party code unintentionally rely on problematic fpcasts. The call + * trampoline mitigates common occurences of bad fpcasts on Emscripten. + */ +#if defined(__EMSCRIPTEN__) && defined(PY_CALL_TRAMPOLINE) +#define _PyCFunction_TrampolineCall(meth, self, args) \ + _PyCFunctionWithKeywords_TrampolineCall( \ + (*(PyCFunctionWithKeywords)(void(*)(void))meth), self, args, NULL) +extern PyObject* _PyCFunctionWithKeywords_TrampolineCall( + PyCFunctionWithKeywords meth, PyObject *, PyObject *, PyObject *); +#else +#define _PyCFunction_TrampolineCall(meth, self, args) \ + (meth)((self), (args)) +#define _PyCFunctionWithKeywords_TrampolineCall(meth, self, args, kw) \ + (meth)((self), (args), (kw)) +#endif // __EMSCRIPTEN__ && PY_CALL_TRAMPOLINE + #ifdef __cplusplus } #endif diff --git a/Misc/NEWS.d/next/Core and Builtins/2022-03-30-13-13-25.bpo-47162.yDJMUm.rst b/Misc/NEWS.d/next/Core and Builtins/2022-03-30-13-13-25.bpo-47162.yDJMUm.rst new file mode 100644 index 0000000000000..7ecbfb37cd17b --- /dev/null +++ b/Misc/NEWS.d/next/Core and Builtins/2022-03-30-13-13-25.bpo-47162.yDJMUm.rst @@ -0,0 +1,4 @@ +WebAssembly cannot deal with bad function pointer casts (different count +or types of arguments). Python can now use call trampolines to mitigate +the problem. Define :c:macro:`PY_CALL_TRAMPOLINE` to enable call +trampolines. diff --git a/Objects/call.c b/Objects/call.c index cf8fa1eeffe1c..448476223adc0 100644 --- a/Objects/call.c +++ b/Objects/call.c @@ -211,7 +211,8 @@ _PyObject_MakeTpCall(PyThreadState *tstate, PyObject *callable, PyObject *result = NULL; if (_Py_EnterRecursiveCall(tstate, " while calling a Python object") == 0) { - result = call(callable, argstuple, kwdict); + result = _PyCFunctionWithKeywords_TrampolineCall( + (PyCFunctionWithKeywords)call, callable, argstuple, kwdict); _Py_LeaveRecursiveCall(tstate); } diff --git a/Objects/descrobject.c b/Objects/descrobject.c index e255d4ae5f86f..7cbfe8d9c1940 100644 --- a/Objects/descrobject.c +++ b/Objects/descrobject.c @@ -13,6 +13,25 @@ class property "propertyobject *" "&PyProperty_Type" [clinic start generated code]*/ /*[clinic end generated code: output=da39a3ee5e6b4b0d input=556352653fd4c02e]*/ +// see pycore_object.h +#if defined(__EMSCRIPTEN__) && defined(PY_CALL_TRAMPOLINE) +#include <emscripten.h> +EM_JS(PyObject*, descr_set_trampoline_call, (setter set, PyObject *obj, PyObject *value, void *closure), { + return wasmTable.get(set)(obj, value, closure); +}); + +EM_JS(PyObject*, descr_get_trampoline_call, (getter get, PyObject *obj, void *closure), { + return wasmTable.get(get)(obj, closure); +}); +#else +#define descr_set_trampoline_call(set, obj, value, closure) \ + (set)((obj), (value), (closure)) + +#define descr_get_trampoline_call(get, obj, closure) \ + (get)((obj), (closure)) + +#endif // __EMSCRIPTEN__ && PY_CALL_TRAMPOLINE + static void descr_dealloc(PyDescrObject *descr) { @@ -180,7 +199,8 @@ getset_get(PyGetSetDescrObject *descr, PyObject *obj, PyObject *type) return NULL; } if (descr->d_getset->get != NULL) - return descr->d_getset->get(obj, descr->d_getset->closure); + return descr_get_trampoline_call( + descr->d_getset->get, obj, descr->d_getset->closure); PyErr_Format(PyExc_AttributeError, "attribute '%V' of '%.100s' objects is not readable", descr_name((PyDescrObject *)descr), "?", @@ -232,8 +252,9 @@ getset_set(PyGetSetDescrObject *descr, PyObject *obj, PyObject *value) return -1; } if (descr->d_getset->set != NULL) { - return descr->d_getset->set(obj, value, - descr->d_getset->closure); + return descr_set_trampoline_call( + descr->d_getset->set, obj, value, + descr->d_getset->closure); } PyErr_Format(PyExc_AttributeError, "attribute '%V' of '%.100s' objects is not writable", @@ -306,7 +327,8 @@ method_vectorcall_VARARGS( Py_DECREF(argstuple); return NULL; } - PyObject *result = meth(args[0], argstuple); + PyObject *result = _PyCFunction_TrampolineCall( + meth, args[0], argstuple); Py_DECREF(argstuple); _Py_LeaveRecursiveCall(tstate); return result; @@ -339,7 +361,8 @@ method_vectorcall_VARARGS_KEYWORDS( if (meth == NULL) { goto exit; } - result = meth(args[0], argstuple, kwdict); + result = _PyCFunctionWithKeywords_TrampolineCall( + meth, args[0], argstuple, kwdict); _Py_LeaveRecursiveCall(tstate); exit: Py_DECREF(argstuple); @@ -427,7 +450,7 @@ method_vectorcall_NOARGS( if (meth == NULL) { return NULL; } - PyObject *result = meth(args[0], NULL); + PyObject *result = _PyCFunction_TrampolineCall(meth, args[0], NULL); _Py_LeaveRecursiveCall(tstate); return result; } @@ -455,7 +478,7 @@ method_vectorcall_O( if (meth == NULL) { return NULL; } - PyObject *result = meth(args[0], args[1]); + PyObject *result = _PyCFunction_TrampolineCall(meth, args[0], args[1]); _Py_LeaveRecursiveCall(tstate); return result; } diff --git a/Objects/methodobject.c b/Objects/methodobject.c index 93fac22ec437c..8bcb1e0fadb8c 100644 --- a/Objects/methodobject.c +++ b/Objects/methodobject.c @@ -483,7 +483,8 @@ cfunction_vectorcall_NOARGS( if (meth == NULL) { return NULL; } - PyObject *result = meth(PyCFunction_GET_SELF(func), NULL); + PyObject *result = _PyCFunction_TrampolineCall( + meth, PyCFunction_GET_SELF(func), NULL); _Py_LeaveRecursiveCall(tstate); return result; } @@ -510,7 +511,8 @@ cfunction_vectorcall_O( if (meth == NULL) { return NULL; } - PyObject *result = meth(PyCFunction_GET_SELF(func), args[0]); + PyObject *result = _PyCFunction_TrampolineCall( + meth, PyCFunction_GET_SELF(func), args[0]); _Py_LeaveRecursiveCall(tstate); return result; } @@ -537,7 +539,9 @@ cfunction_call(PyObject *func, PyObject *args, PyObject *kwargs) PyObject *result; if (flags & METH_KEYWORDS) { - result = (*(PyCFunctionWithKeywords)(void(*)(void))meth)(self, args, kwargs); + result = _PyCFunctionWithKeywords_TrampolineCall( + (*(PyCFunctionWithKeywords)(void(*)(void))meth), + self, args, kwargs); } else { if (kwargs != NULL && PyDict_GET_SIZE(kwargs) != 0) { @@ -546,7 +550,15 @@ cfunction_call(PyObject *func, PyObject *args, PyObject *kwargs) ((PyCFunctionObject*)func)->m_ml->ml_name); return NULL; } - result = meth(self, args); + result = _PyCFunction_TrampolineCall(meth, self, args); } return _Py_CheckFunctionResult(tstate, func, result, NULL); } + +#if defined(__EMSCRIPTEN__) && defined(PY_CALL_TRAMPOLINE) +#include <emscripten.h> + +EM_JS(PyObject*, _PyCFunctionWithKeywords_TrampolineCall, (PyCFunctionWithKeywords func, PyObject *self, PyObject *args, PyObject *kw), { + return wasmTable.get(func)(self, args, kw); +}); +#endif diff --git a/Python/import.c b/Python/import.c index 982ec8cfe631a..4b6d6d16821a9 100644 --- a/Python/import.c +++ b/Python/import.c @@ -527,7 +527,7 @@ import_find_extension(PyThreadState *tstate, PyObject *name, else { if (def->m_base.m_init == NULL) return NULL; - mod = def->m_base.m_init(); + mod = _PyImport_InitFunc_TrampolineCall(def->m_base.m_init); if (mod == NULL) return NULL; if (PyObject_SetItem(modules, name, mod) == -1) { @@ -958,6 +958,13 @@ PyImport_GetImporter(PyObject *path) return get_path_importer(tstate, path_importer_cache, path_hooks, path); } +#if defined(__EMSCRIPTEN__) && defined(PY_CALL_TRAMPOLINE) +#include <emscripten.h> +EM_JS(PyObject*, _PyImport_InitFunc_TrampolineCall, (PyModInitFunction func), { + return wasmTable.get(func)(); +}); +#endif // __EMSCRIPTEN__ && PY_CALL_TRAMPOLINE + static PyObject* create_builtin(PyThreadState *tstate, PyObject *name, PyObject *spec) { @@ -973,8 +980,7 @@ create_builtin(PyThreadState *tstate, PyObject *name, PyObject *spec) /* Cannot re-init internal module ("sys" or "builtins") */ return PyImport_AddModuleObject(name); } - - mod = (*p->initfunc)(); + mod = _PyImport_InitFunc_TrampolineCall(*p->initfunc); if (mod == NULL) { return NULL; } diff --git a/Python/importdl.c b/Python/importdl.c index f66c6013d2c98..870ae2730071b 100644 --- a/Python/importdl.c +++ b/Python/importdl.c @@ -102,7 +102,7 @@ _PyImport_LoadDynamicModuleWithSpec(PyObject *spec, FILE *fp) const char *oldcontext; dl_funcptr exportfunc; PyModuleDef *def; - PyObject *(*p0)(void); + PyModInitFunction p0; name_unicode = PyObject_GetAttrString(spec, "name"); if (name_unicode == NULL) { @@ -157,7 +157,7 @@ _PyImport_LoadDynamicModuleWithSpec(PyObject *spec, FILE *fp) goto error; } - p0 = (PyObject *(*)(void))exportfunc; + p0 = (PyModInitFunction)exportfunc; /* Package context is needed for single-phase init */ oldcontext = _Py_PackageContext; @@ -166,7 +166,7 @@ _PyImport_LoadDynamicModuleWithSpec(PyObject *spec, FILE *fp) _Py_PackageContext = oldcontext; goto error; } - m = p0(); + m = _PyImport_InitFunc_TrampolineCall(p0); _Py_PackageContext = oldcontext; if (m == NULL) { diff --git a/Python/importdl.h b/Python/importdl.h index 9847652b1f1b3..26d18b626df05 100644 --- a/Python/importdl.h +++ b/Python/importdl.h @@ -10,6 +10,14 @@ extern const char *_PyImport_DynLoadFiletab[]; extern PyObject *_PyImport_LoadDynamicModuleWithSpec(PyObject *spec, FILE *); +typedef PyObject *(*PyModInitFunction)(void); + +#if defined(__EMSCRIPTEN__) && defined(PY_CALL_TRAMPOLINE) +extern PyObject *_PyImport_InitFunc_TrampolineCall(PyModInitFunction func); +#else +#define _PyImport_InitFunc_TrampolineCall(func) (func)() +#endif + /* Max length of module suffix searched for -- accommodates "module.slb" */ #define MAXSUFFIXSIZE 12

1 0

Add CODEOWNERS entry for pathlib (GH-32202)
by brettcannon March 30, 2022

March 30, 2022

https://github.com/python/cpython/commit/795c00b91cbc208969302e9e16a269c204… commit: 795c00b91cbc208969302e9e16a269c2049af3e9 branch: main author: Brett Cannon <brett(a)python.org> committer: brettcannon <brett(a)python.org> date: 2022-03-30T11:34:29-07:00 summary: Add CODEOWNERS entry for pathlib (GH-32202) files: M .github/CODEOWNERS diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 33a3ebb3a3870..62ee6f89cda67 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -146,3 +146,6 @@ Lib/ast.py @isidentical # macOS /Mac/ @python/macos-team **/*osx_support* @python/macos-team + +# pathlib +**/*pathlib* @brettcannon

1 0

bpo-46775: OSError should call winerror_to_errno unconditionally on Windows (GH-32179)
by zooba March 30, 2022

March 30, 2022

https://github.com/python/cpython/commit/d0c67ea0645b7ad37b867c167882a346a2… commit: d0c67ea0645b7ad37b867c167882a346a24de641 branch: main author: Dong-hee Na <donghee.na(a)python.org> committer: zooba <steve.dower(a)microsoft.com> date: 2022-03-30T18:31:33+01:00 summary: bpo-46775: OSError should call winerror_to_errno unconditionally on Windows (GH-32179) files: A Misc/NEWS.d/next/Core and Builtins/2022-03-30-02-36-25.bpo-46775.e3Oxqf.rst M Objects/exceptions.c diff --git a/Misc/NEWS.d/next/Core and Builtins/2022-03-30-02-36-25.bpo-46775.e3Oxqf.rst b/Misc/NEWS.d/next/Core and Builtins/2022-03-30-02-36-25.bpo-46775.e3Oxqf.rst new file mode 100644 index 0000000000000..da56ecd89367b --- /dev/null +++ b/Misc/NEWS.d/next/Core and Builtins/2022-03-30-02-36-25.bpo-46775.e3Oxqf.rst @@ -0,0 +1,3 @@ +Some Windows system error codes(>= 10000) are now mapped into +the correct errno and may now raise a subclass of :exc:`OSError`. +Patch by Dong-hee Na. diff --git a/Objects/exceptions.c b/Objects/exceptions.c index 9dbbd40f1de1c..df10a3c2416e3 100644 --- a/Objects/exceptions.c +++ b/Objects/exceptions.c @@ -1634,14 +1634,7 @@ oserror_parse_args(PyObject **p_args, winerrcode = PyLong_AsLong(*winerror); if (winerrcode == -1 && PyErr_Occurred()) return -1; - /* Set errno to the corresponding POSIX errno (overriding - first argument). Windows Socket error codes (>= 10000) - have the same value as their POSIX counterparts. - */ - if (winerrcode < 10000) - errcode = winerror_to_errno(winerrcode); - else - errcode = winerrcode; + errcode = winerror_to_errno(winerrcode); *myerrno = PyLong_FromLong(errcode); if (!*myerrno) return -1;

1 0

Replace with_traceback() with exception chaining and reraising (GH-32074)
by asvetlov March 30, 2022

March 30, 2022

https://github.com/python/cpython/commit/a03a09e068435f47d02649dda93988dc44… commit: a03a09e068435f47d02649dda93988dc44ffaaf1 branch: main author: Oleg Iarygin <oleg(a)arhadthedev.net> committer: asvetlov <andrew.svetlov(a)gmail.com> date: 2022-03-30T15:28:20+03:00 summary: Replace with_traceback() with exception chaining and reraising (GH-32074) files: A Misc/NEWS.d/next/Library/2022-03-23-13-55-41.bpo-47099.P6quRP.rst A Misc/NEWS.d/next/Library/2022-03-23-14-16-38.bpo-47099.2raait.rst M Lib/test/support/socket_helper.py M Lib/urllib/parse.py M Lib/urllib/request.py M Lib/wsgiref/handlers.py diff --git a/Lib/test/support/socket_helper.py b/Lib/test/support/socket_helper.py index b51677383ebc5..0ee7a5d69a1b3 100644 --- a/Lib/test/support/socket_helper.py +++ b/Lib/test/support/socket_helper.py @@ -256,7 +256,7 @@ def filter_error(err): err = a[0] # The error can also be wrapped as args[1]: # except socket.error as msg: - # raise OSError('socket error', msg).with_traceback(sys.exc_info()[2]) + # raise OSError('socket error', msg) from msg elif len(a) >= 2 and isinstance(a[1], OSError): err = a[1] else: diff --git a/Lib/urllib/parse.py b/Lib/urllib/parse.py index 67ba308c409a2..d70a6943f0a73 100644 --- a/Lib/urllib/parse.py +++ b/Lib/urllib/parse.py @@ -940,10 +940,9 @@ def urlencode(query, doseq=False, safe='', encoding=None, errors=None, # but that's a minor nit. Since the original implementation # allowed empty dicts that type of behavior probably should be # preserved for consistency - except TypeError: - ty, va, tb = sys.exc_info() + except TypeError as err: raise TypeError("not a valid non-string sequence " - "or mapping object").with_traceback(tb) + "or mapping object") from err l = [] if not doseq: diff --git a/Lib/urllib/request.py b/Lib/urllib/request.py index 02f96265a8900..84997f268c930 100644 --- a/Lib/urllib/request.py +++ b/Lib/urllib/request.py @@ -1579,8 +1579,7 @@ def ftp_open(self, req): headers = email.message_from_string(headers) return addinfourl(fp, headers, req.full_url) except ftplib.all_errors as exp: - exc = URLError('ftp error: %r' % exp) - raise exc.with_traceback(sys.exc_info()[2]) + raise URLError(f'ftp error: {exp}') from exp def connect_ftp(self, user, passwd, host, port, dirs, timeout): return ftpwrapper(user, passwd, host, port, dirs, timeout, @@ -1791,7 +1790,7 @@ def open(self, fullurl, data=None): except (HTTPError, URLError): raise except OSError as msg: - raise OSError('socket error', msg).with_traceback(sys.exc_info()[2]) + raise OSError('socket error', msg) from msg def open_unknown(self, fullurl, data=None): """Overridable interface to open unknown URL type.""" @@ -2093,7 +2092,7 @@ def open_ftp(self, url): headers = email.message_from_string(headers) return addinfourl(fp, headers, "ftp:" + url) except ftperrors() as exp: - raise URLError('ftp error %r' % exp).with_traceback(sys.exc_info()[2]) + raise URLError(f'ftp error: {exp}') from exp def open_data(self, url, data=None): """Use "data" URL.""" @@ -2443,8 +2442,7 @@ def retrfile(self, file, type): conn, retrlen = self.ftp.ntransfercmd(cmd) except ftplib.error_perm as reason: if str(reason)[:3] != '550': - raise URLError('ftp error: %r' % reason).with_traceback( - sys.exc_info()[2]) + raise URLError(f'ftp error: {reason}') from reason if not conn: # Set transfer mode to ASCII! self.ftp.voidcmd('TYPE A') diff --git a/Lib/wsgiref/handlers.py b/Lib/wsgiref/handlers.py index 31360e58785ac..6623b700537cf 100644 --- a/Lib/wsgiref/handlers.py +++ b/Lib/wsgiref/handlers.py @@ -228,8 +228,7 @@ def start_response(self, status, headers,exc_info=None): if exc_info: try: if self.headers_sent: - # Re-raise original exception if headers sent - raise exc_info[0](exc_info[1]).with_traceback(exc_info[2]) + raise finally: exc_info = None # avoid dangling circular ref elif self.headers is not None: diff --git a/Misc/NEWS.d/next/Library/2022-03-23-13-55-41.bpo-47099.P6quRP.rst b/Misc/NEWS.d/next/Library/2022-03-23-13-55-41.bpo-47099.P6quRP.rst new file mode 100644 index 0000000000000..fa2c87e941e8b --- /dev/null +++ b/Misc/NEWS.d/next/Library/2022-03-23-13-55-41.bpo-47099.P6quRP.rst @@ -0,0 +1,3 @@ +Exception chaining is changed from +:func:`Exception.with_traceback`/:func:`sys.exc_info` to :pep:`3134`. +Patch by Oleg Iarygin. diff --git a/Misc/NEWS.d/next/Library/2022-03-23-14-16-38.bpo-47099.2raait.rst b/Misc/NEWS.d/next/Library/2022-03-23-14-16-38.bpo-47099.2raait.rst new file mode 100644 index 0000000000000..785e53c123f91 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2022-03-23-14-16-38.bpo-47099.2raait.rst @@ -0,0 +1,5 @@ +All :exc:`URLError` exception messages raised in +:class:`urllib.request.URLopener` now contain a colon between ``ftp error`` +and the rest of the message. Previously, +:func:`~urllib.request.URLopener.open_ftp` missed the colon. Patch by Oleg +Iarygin.

1 0

bpo-39622: Interrupt the main asyncio task on Ctrl+C (GH-32105)
by asvetlov March 30, 2022

March 30, 2022

https://github.com/python/cpython/commit/f08a191882f75bb79d42a49039892105b2… commit: f08a191882f75bb79d42a49039892105b2212fb9 branch: main author: Andrew Svetlov <andrew.svetlov(a)gmail.com> committer: asvetlov <andrew.svetlov(a)gmail.com> date: 2022-03-30T15:15:06+03:00 summary: bpo-39622: Interrupt the main asyncio task on Ctrl+C (GH-32105) Co-authored-by: Kumar Aditya <59607654+kumaraditya303(a)users.noreply.github.com> files: A Misc/NEWS.d/next/Library/2022-03-25-01-27-25.bpo-39622.ieBIMp.rst M Doc/library/asyncio-runner.rst M Lib/asyncio/runners.py M Lib/test/test_asyncio/test_runners.py diff --git a/Doc/library/asyncio-runner.rst b/Doc/library/asyncio-runner.rst index 31becf192ada3..a526b459f7474 100644 --- a/Doc/library/asyncio-runner.rst +++ b/Doc/library/asyncio-runner.rst @@ -119,3 +119,30 @@ Runner context manager Embedded *loop* and *context* are created at the :keyword:`with` body entering or the first call of :meth:`run` or :meth:`get_loop`. + + +Handling Keyboard Interruption +============================== + +.. versionadded:: 3.11 + +When :const:`signal.SIGINT` is raised by :kbd:`Ctrl-C`, :exc:`KeyboardInterrupt` +exception is raised in the main thread by default. However this doesn't work with +:mod:`asyncio` because it can interrupt asyncio internals and can hang the program from +exiting. + +To mitigate this issue, :mod:`asyncio` handles :const:`signal.SIGINT` as follows: + +1. :meth:`asyncio.Runner.run` installs a custom :const:`signal.SIGINT` handler before + any user code is executed and removes it when exiting from the function. +2. The :class:`~asyncio.Runner` creates the main task for the passed coroutine for its + execution. +3. When :const:`signal.SIGINT` is raised by :kbd:`Ctrl-C`, the custom signal handler + cancels the main task by calling :meth:`asyncio.Task.cancel` which raises + :exc:`asyncio.CancelledError` inside the the main task. This causes the Python stack + to unwind, ``try/except`` and ``try/finally`` blocks can be used for resource + cleanup. After the main task is cancelled, :meth:`asyncio.Runner.run` raises + :exc:`KeyboardInterrupt`. +4. A user could write a tight loop which cannot be interrupted by + :meth:`asyncio.Task.cancel`, in which case the second following :kbd:`Ctrl-C` + immediately raises the :exc:`KeyboardInterrupt` without cancelling the main task. diff --git a/Lib/asyncio/runners.py b/Lib/asyncio/runners.py index 768a403a85bee..2bb9ca331fd68 100644 --- a/Lib/asyncio/runners.py +++ b/Lib/asyncio/runners.py @@ -2,8 +2,13 @@ import contextvars import enum +import functools +import threading +import signal +import sys from . import coroutines from . import events +from . import exceptions from . import tasks @@ -47,6 +52,7 @@ def __init__(self, *, debug=None, loop_factory=None): self._loop_factory = loop_factory self._loop = None self._context = None + self._interrupt_count = 0 def __enter__(self): self._lazy_init() @@ -89,7 +95,28 @@ def run(self, coro, *, context=None): if context is None: context = self._context task = self._loop.create_task(coro, context=context) - return self._loop.run_until_complete(task) + + if (threading.current_thread() is threading.main_thread() + and signal.getsignal(signal.SIGINT) is signal.default_int_handler + ): + sigint_handler = functools.partial(self._on_sigint, main_task=task) + signal.signal(signal.SIGINT, sigint_handler) + else: + sigint_handler = None + + self._interrupt_count = 0 + try: + return self._loop.run_until_complete(task) + except exceptions.CancelledError: + if self._interrupt_count > 0 and task.uncancel() == 0: + raise KeyboardInterrupt() + else: + raise # CancelledError + finally: + if (sigint_handler is not None + and signal.getsignal(signal.SIGINT) is sigint_handler + ): + signal.signal(signal.SIGINT, signal.default_int_handler) def _lazy_init(self): if self._state is _State.CLOSED: @@ -105,6 +132,14 @@ def _lazy_init(self): self._context = contextvars.copy_context() self._state = _State.INITIALIZED + def _on_sigint(self, signum, frame, main_task): + self._interrupt_count += 1 + if self._interrupt_count == 1 and not main_task.done(): + main_task.cancel() + # wakeup loop if it is blocked by select() with long timeout + self._loop.call_soon_threadsafe(lambda: None) + return + raise KeyboardInterrupt() def run(main, *, debug=None): diff --git a/Lib/test/test_asyncio/test_runners.py b/Lib/test/test_asyncio/test_runners.py index 94f26797b3309..42aa07a0e089d 100644 --- a/Lib/test/test_asyncio/test_runners.py +++ b/Lib/test/test_asyncio/test_runners.py @@ -1,7 +1,9 @@ +import _thread import asyncio import contextvars import gc import re +import threading import unittest from unittest import mock @@ -12,6 +14,10 @@ def tearDownModule(): asyncio.set_event_loop_policy(None) +def interrupt_self(): + _thread.interrupt_main() + + class TestPolicy(asyncio.AbstractEventLoopPolicy): def __init__(self, loop_factory): @@ -298,7 +304,7 @@ async def get_context(): self.assertEqual(2, runner.run(get_context()).get(cvar)) - def test_recursine_run(self): + def test_recursive_run(self): async def g(): pass @@ -318,6 +324,57 @@ async def f(): ): runner.run(f()) + def test_interrupt_call_soon(self): + # The only case when task is not suspended by waiting a future + # or another task + assert threading.current_thread() is threading.main_thread() + + async def coro(): + with self.assertRaises(asyncio.CancelledError): + while True: + await asyncio.sleep(0) + raise asyncio.CancelledError() + + with asyncio.Runner() as runner: + runner.get_loop().call_later(0.1, interrupt_self) + with self.assertRaises(KeyboardInterrupt): + runner.run(coro()) + + def test_interrupt_wait(self): + # interrupting when waiting a future cancels both future and main task + assert threading.current_thread() is threading.main_thread() + + async def coro(fut): + with self.assertRaises(asyncio.CancelledError): + await fut + raise asyncio.CancelledError() + + with asyncio.Runner() as runner: + fut = runner.get_loop().create_future() + runner.get_loop().call_later(0.1, interrupt_self) + + with self.assertRaises(KeyboardInterrupt): + runner.run(coro(fut)) + + self.assertTrue(fut.cancelled()) + + def test_interrupt_cancelled_task(self): + # interrupting cancelled main task doesn't raise KeyboardInterrupt + assert threading.current_thread() is threading.main_thread() + + async def subtask(task): + await asyncio.sleep(0) + task.cancel() + interrupt_self() + + async def coro(): + asyncio.create_task(subtask(asyncio.current_task())) + await asyncio.sleep(10) + + with asyncio.Runner() as runner: + with self.assertRaises(asyncio.CancelledError): + runner.run(coro()) + if __name__ == '__main__': unittest.main() diff --git a/Misc/NEWS.d/next/Library/2022-03-25-01-27-25.bpo-39622.ieBIMp.rst b/Misc/NEWS.d/next/Library/2022-03-25-01-27-25.bpo-39622.ieBIMp.rst new file mode 100644 index 0000000000000..25c6aa3703ad2 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2022-03-25-01-27-25.bpo-39622.ieBIMp.rst @@ -0,0 +1 @@ +Handle Ctrl+C in asyncio programs to interrupt the main task.

1 0

Merge deoptimization blocks in interpreter (GH-32155)
by markshannon March 30, 2022

March 30, 2022

https://github.com/python/cpython/commit/04acfa94bb383cce973739478a7b58ab20… commit: 04acfa94bb383cce973739478a7b58ab20ab47f4 branch: main author: Mark Shannon <mark(a)hotpy.org> committer: markshannon <mark(a)hotpy.org> date: 2022-03-30T13:11:33+01:00 summary: Merge deoptimization blocks in interpreter (GH-32155) files: M Include/internal/pycore_code.h M Python/ceval.c M Python/specialize.c diff --git a/Include/internal/pycore_code.h b/Include/internal/pycore_code.h index 0f6613b6c1e3d..8c868bcd5b5cb 100644 --- a/Include/internal/pycore_code.h +++ b/Include/internal/pycore_code.h @@ -110,6 +110,8 @@ _PyCode_Warmup(PyCodeObject *code) } } +extern uint8_t _PyOpcode_Adaptive[256]; + extern Py_ssize_t _Py_QuickenedCount; // Borrowed references to common callables: diff --git a/Python/ceval.c b/Python/ceval.c index 4b9d33404bb78..a7b377724bb54 100644 --- a/Python/ceval.c +++ b/Python/ceval.c @@ -1431,7 +1431,7 @@ eval_frame_handle_pending(PyThreadState *tstate) #define JUMP_TO_INSTRUCTION(op) goto PREDICT_ID(op) -#define DEOPT_IF(cond, instname) if (cond) { goto instname ## _miss; } +#define DEOPT_IF(cond, instname) if (cond) { goto miss; } #define GLOBALS() frame->f_globals @@ -2551,18 +2551,18 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, _PyInterpreterFrame *frame, int } Py_DECREF(v); if (gen_status == PYGEN_ERROR) { - assert (retval == NULL); + assert(retval == NULL); goto error; } if (gen_status == PYGEN_RETURN) { - assert (retval != NULL); + assert(retval != NULL); Py_DECREF(receiver); SET_TOP(retval); JUMPBY(oparg); DISPATCH(); } - assert (gen_status == PYGEN_NEXT); - assert (retval != NULL); + assert(gen_status == PYGEN_NEXT); + assert(retval != NULL); PUSH(retval); DISPATCH(); } @@ -4595,7 +4595,6 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, _PyInterpreterFrame *frame, int } TARGET(CALL) { - PREDICTED(CALL); int is_meth; call_function: is_meth = is_method(stack_pointer, oparg); @@ -5524,34 +5523,25 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, _PyInterpreterFrame *frame, int /* Specialization misses */ -#define MISS_WITH_INLINE_CACHE(opname) \ -opname ## _miss: \ - { \ - STAT_INC(opcode, miss); \ - STAT_INC(opname, miss); \ - /* The counter is always the first cache entry: */ \ - _Py_CODEUNIT *counter = (_Py_CODEUNIT *)next_instr; \ - *counter -= 1; \ - if (*counter == 0) { \ - _Py_SET_OPCODE(next_instr[-1], opname ## _ADAPTIVE); \ - STAT_INC(opname, deopt); \ - *counter = ADAPTIVE_CACHE_BACKOFF; \ - } \ - JUMP_TO_INSTRUCTION(opname); \ +miss: + { + STAT_INC(opcode, miss); + opcode = _PyOpcode_Deopt[opcode]; + STAT_INC(opcode, miss); + /* The counter is always the first cache entry: */ + _Py_CODEUNIT *counter = (_Py_CODEUNIT *)next_instr; + *counter -= 1; + if (*counter == 0) { + int adaptive_opcode = _PyOpcode_Adaptive[opcode]; + assert(adaptive_opcode); + _Py_SET_OPCODE(next_instr[-1], adaptive_opcode); + STAT_INC(opcode, deopt); + *counter = ADAPTIVE_CACHE_BACKOFF; + } + next_instr--; + DISPATCH_GOTO(); } -MISS_WITH_INLINE_CACHE(LOAD_ATTR) -MISS_WITH_INLINE_CACHE(STORE_ATTR) -MISS_WITH_INLINE_CACHE(LOAD_GLOBAL) -MISS_WITH_INLINE_CACHE(LOAD_METHOD) -MISS_WITH_INLINE_CACHE(PRECALL) -MISS_WITH_INLINE_CACHE(CALL) -MISS_WITH_INLINE_CACHE(BINARY_OP) -MISS_WITH_INLINE_CACHE(COMPARE_OP) -MISS_WITH_INLINE_CACHE(BINARY_SUBSCR) -MISS_WITH_INLINE_CACHE(UNPACK_SEQUENCE) -MISS_WITH_INLINE_CACHE(STORE_SUBSCR) - binary_subscr_dict_error: { PyObject *sub = POP(); @@ -6717,7 +6707,7 @@ call_trace(Py_tracefunc func, PyObject *obj, int old_what = tstate->tracing_what; tstate->tracing_what = what; PyThreadState_EnterTracing(tstate); - assert (frame->f_lasti >= 0); + assert(frame->f_lasti >= 0); initialize_trace_info(&tstate->trace_info, frame); f->f_lineno = _PyCode_CheckLineNumber(frame->f_lasti*sizeof(_Py_CODEUNIT), &tstate->trace_info.bounds); result = func(obj, f, what, arg); diff --git a/Python/specialize.c b/Python/specialize.c index 5839d7629466d..244318a609e66 100644 --- a/Python/specialize.c +++ b/Python/specialize.c @@ -17,7 +17,7 @@ /* Map from opcode to adaptive opcode. Values of zero are ignored. */ -static uint8_t adaptive_opcodes[256] = { +uint8_t _PyOpcode_Adaptive[256] = { [LOAD_ATTR] = LOAD_ATTR_ADAPTIVE, [LOAD_GLOBAL] = LOAD_GLOBAL_ADAPTIVE, [LOAD_METHOD] = LOAD_METHOD_ADAPTIVE, @@ -143,7 +143,7 @@ print_spec_stats(FILE *out, OpcodeStats *stats) * even though we don't specialize them yet. */ fprintf(out, "opcode[%d].specializable : 1\n", FOR_ITER); for (int i = 0; i < 256; i++) { - if (adaptive_opcodes[i]) { + if (_PyOpcode_Adaptive[i]) { fprintf(out, "opcode[%d].specializable : 1\n", i); } PRINT_STAT(i, specialization.success); @@ -259,7 +259,7 @@ _PyCode_Quicken(PyCodeObject *code) _Py_CODEUNIT *instructions = _PyCode_CODE(code); for (int i = 0; i < Py_SIZE(code); i++) { int opcode = _Py_OPCODE(instructions[i]); - uint8_t adaptive_opcode = adaptive_opcodes[opcode]; + uint8_t adaptive_opcode = _PyOpcode_Adaptive[opcode]; if (adaptive_opcode) { _Py_SET_OPCODE(instructions[i], adaptive_opcode); // Make sure the adaptive counter is zero:

1 0

bpo-34861: Make cumtime the default sorting key for cProfile (GH-31929)
by pablogsal March 30, 2022

March 30, 2022

https://github.com/python/cpython/commit/75eee1d57eb28283a8682a660d9949afc8… commit: 75eee1d57eb28283a8682a660d9949afc89fd010 branch: main author: Daniël van Noord <13665637+DanielNoord(a)users.noreply.github.com> committer: pablogsal <Pablogsal(a)gmail.com> date: 2022-03-30T12:10:10+01:00 summary: bpo-34861: Make cumtime the default sorting key for cProfile (GH-31929) files: A Misc/NEWS.d/next/Library/2022-03-16-08-49-12.bpo-34861.p8ugVg.rst M Doc/library/profile.rst M Lib/cProfile.py diff --git a/Doc/library/profile.rst b/Doc/library/profile.rst index cf324a57e79fd..5278d1a58802e 100644 --- a/Doc/library/profile.rst +++ b/Doc/library/profile.rst @@ -66,22 +66,23 @@ your system.) The above action would run :func:`re.compile` and print profile results like the following:: - 197 function calls (192 primitive calls) in 0.002 seconds + 214 function calls (207 primitive calls) in 0.002 seconds - Ordered by: standard name + Ordered by: cumulative time ncalls tottime percall cumtime percall filename:lineno(function) + 1 0.000 0.000 0.002 0.002 {built-in method builtins.exec} 1 0.000 0.000 0.001 0.001 <string>:1(<module>) - 1 0.000 0.000 0.001 0.001 re.py:212(compile) - 1 0.000 0.000 0.001 0.001 re.py:268(_compile) - 1 0.000 0.000 0.000 0.000 sre_compile.py:172(_compile_charset) - 1 0.000 0.000 0.000 0.000 sre_compile.py:201(_optimize_charset) - 4 0.000 0.000 0.000 0.000 sre_compile.py:25(_identityfunction) - 3/1 0.000 0.000 0.000 0.000 sre_compile.py:33(_compile) - -The first line indicates that 197 calls were monitored. Of those calls, 192 + 1 0.000 0.000 0.001 0.001 re.py:250(compile) + 1 0.000 0.000 0.001 0.001 re.py:289(_compile) + 1 0.000 0.000 0.000 0.000 sre_compile.py:759(compile) + 1 0.000 0.000 0.000 0.000 sre_parse.py:937(parse) + 1 0.000 0.000 0.000 0.000 sre_compile.py:598(_code) + 1 0.000 0.000 0.000 0.000 sre_parse.py:435(_parse_sub) + +The first line indicates that 214 calls were monitored. Of those calls, 207 were :dfn:`primitive`, meaning that the call was not induced via recursion. The -next line: ``Ordered by: standard name``, indicates that the text string in the +next line: ``Ordered by: cumulative name``, indicates that the text string in the far right column was used to sort the output. The column headings include: ncalls diff --git a/Lib/cProfile.py b/Lib/cProfile.py index 22a7d0aade855..9fc9788302084 100755 --- a/Lib/cProfile.py +++ b/Lib/cProfile.py @@ -140,7 +140,7 @@ def main(): help="Save stats to <outfile>", default=None) parser.add_option('-s', '--sort', dest="sort", help="Sort order when printing to stdout, based on pstats.Stats class", - default=-1, + default=2, choices=sorted(pstats.Stats.sort_arg_dict_default)) parser.add_option('-m', dest="module", action="store_true", help="Profile a library module", default=False) diff --git a/Misc/NEWS.d/next/Library/2022-03-16-08-49-12.bpo-34861.p8ugVg.rst b/Misc/NEWS.d/next/Library/2022-03-16-08-49-12.bpo-34861.p8ugVg.rst new file mode 100644 index 0000000000000..0277ffbf5508d --- /dev/null +++ b/Misc/NEWS.d/next/Library/2022-03-16-08-49-12.bpo-34861.p8ugVg.rst @@ -0,0 +1 @@ +Made cumtime the default sorting key for cProfile

1 0

bpo-47126: Update to canonical PEP URLs specified by PEP 676 (GH-32124)
by pablogsal March 30, 2022

March 30, 2022

https://github.com/python/cpython/commit/6881ea936e277b1733bee581c4e59e3a5d… commit: 6881ea936e277b1733bee581c4e59e3a5d53bb29 branch: main author: Hugo van Kemenade <hugovk(a)users.noreply.github.com> committer: pablogsal <Pablogsal(a)gmail.com> date: 2022-03-30T12:00:27+01:00 summary: bpo-47126: Update to canonical PEP URLs specified by PEP 676 (GH-32124) files: A Misc/NEWS.d/next/Documentation/2022-03-26-12-20-16.bpo-47126.p6_Ovm.rst M Doc/c-api/code.rst M Doc/conf.py M Doc/distutils/sourcedist.rst M Doc/faq/general.rst M Doc/library/ast.rst M Doc/library/functools.rst M Doc/library/sqlite3.rst M Doc/requirements.txt M Doc/tools/templates/indexsidebar.html M Doc/whatsnew/2.0.rst M Doc/whatsnew/2.7.rst M Doc/whatsnew/3.4.rst M Doc/whatsnew/3.7.rst M Lib/dataclasses.py M Lib/distutils/command/build_ext.py M Lib/pydoc.py M Lib/secrets.py M Lib/test/test_docxmlrpc.py M Lib/weakref.py M Lib/xmlrpc/server.py M Parser/tokenizer.c M README.rst M Tools/scripts/stable_abi.py diff --git a/Doc/c-api/code.rst b/Doc/c-api/code.rst index 2b0cdf4324340..840b8426dbbdc 100644 --- a/Doc/c-api/code.rst +++ b/Doc/c-api/code.rst @@ -58,7 +58,7 @@ bound into a function. If you just need the line number of a frame, use :c:func:`PyFrame_GetLineNumber` instead. For efficiently iterating over the line numbers in a code object, use `the API described in PEP 626 - <https://www.python.org/dev/peps/pep-0626/#out-of-process-debuggers-and-prof…>`_. + <https://peps.python.org/pep-0626/#out-of-process-debuggers-and-profilers>`_. .. c:function:: int PyCode_Addr2Location(PyObject *co, int byte_offset, int *start_line, int *start_column, int *end_line, int *end_column) diff --git a/Doc/conf.py b/Doc/conf.py index cbf201a314eec..1aadd961b6ef0 100644 --- a/Doc/conf.py +++ b/Doc/conf.py @@ -218,9 +218,7 @@ # ---------------------------- # Ignore certain URLs. -linkcheck_ignore = [r'https://bugs.python.org/(issue)?\d+', - # Ignore PEPs for now, they all have permanent redirects. - r'http://www.python.org/dev/peps/pep-\d+'] +linkcheck_ignore = [r'https://bugs.python.org/(issue)?\d+'] # Options for extensions diff --git a/Doc/distutils/sourcedist.rst b/Doc/distutils/sourcedist.rst index 7b1e22f824e8c..b55d01157f3ee 100644 --- a/Doc/distutils/sourcedist.rst +++ b/Doc/distutils/sourcedist.rst @@ -62,7 +62,7 @@ Notes: requires the :program:`compress` program. Notice that this format is now pending for deprecation and will be removed in the future versions of Python. (5) - deprecated by `PEP 527 <https://www.python.org/dev/peps/pep-0527/>`_; + deprecated by `PEP 527 <https://peps.python.org/pep-0527/>`_; `PyPI <https://pypi.org>`_ only accepts ``.zip`` and ``.tar.gz`` files. When using any ``tar`` format (``gztar``, ``bztar``, ``xztar``, ``ztar`` or diff --git a/Doc/faq/general.rst b/Doc/faq/general.rst index 7723114bcc18d..99534c2ebf6e1 100644 --- a/Doc/faq/general.rst +++ b/Doc/faq/general.rst @@ -310,7 +310,7 @@ The latest stable releases can always be found on the `Python download page <https://www.python.org/downloads/>`_. There are two production-ready versions of Python: 2.x and 3.x. The recommended version is 3.x, which is supported by most widely used libraries. Although 2.x is still widely used, `it is not -maintained anymore <https://www.python.org/dev/peps/pep-0373/>`_. +maintained anymore <https://peps.python.org/pep-0373/>`_. How many people are using Python? --------------------------------- @@ -345,7 +345,7 @@ include Google, Yahoo, and Lucasfilm Ltd. What new developments are expected for Python in the future? ------------------------------------------------------------ -See https://www.python.org/dev/peps/ for the Python Enhancement Proposals +See https://peps.python.org/ for the Python Enhancement Proposals (PEPs). PEPs are design documents describing a suggested new feature for Python, providing a concise technical specification and a rationale. Look for a PEP titled "Python X.Y Release Schedule", where X.Y is a version that hasn't been diff --git a/Doc/library/ast.rst b/Doc/library/ast.rst index 6486ed4f21696..b10aa7cd50d17 100644 --- a/Doc/library/ast.rst +++ b/Doc/library/ast.rst @@ -1826,7 +1826,7 @@ Function and class definitions * ``bases`` is a list of nodes for explicitly specified base classes. * ``keywords`` is a list of :class:`keyword` nodes, principally for 'metaclass'. Other keywords will be passed to the metaclass, as per `PEP-3115 - <https://www.python.org/dev/peps/pep-3115/>`_. + <https://peps.python.org/pep-3115/>`_. * ``starargs`` and ``kwargs`` are each a single node, as in a function call. starargs will be expanded to join the list of base classes, and kwargs will be passed to the metaclass. diff --git a/Doc/library/functools.rst b/Doc/library/functools.rst index c78818bfab1a5..e23946a0a45e7 100644 --- a/Doc/library/functools.rst +++ b/Doc/library/functools.rst @@ -208,7 +208,7 @@ The :mod:`functools` module defines the following functions: @lru_cache(maxsize=32) def get_pep(num): 'Retrieve text of a Python Enhancement Proposal' - resource = 'https://www.python.org/dev/peps/pep-%04d/' % num + resource = 'https://peps.python.org/pep-%04d/' % num try: with urllib.request.urlopen(resource) as s: return s.read() diff --git a/Doc/library/sqlite3.rst b/Doc/library/sqlite3.rst index a1a7e1bd49e8e..e70d038e61d82 100644 --- a/Doc/library/sqlite3.rst +++ b/Doc/library/sqlite3.rst @@ -191,7 +191,7 @@ Module functions and constants | | | | connections and cursors | +------------------+-----------------+----------------------+-------------------------------+ - .. _threadsafety: https://www.python.org/dev/peps/pep-0249/#threadsafety + .. _threadsafety: https://peps.python.org/pep-0249/#threadsafety .. _SQLITE_THREADSAFE: https://sqlite.org/compile.html#threadsafe .. versionchanged:: 3.11 diff --git a/Doc/requirements.txt b/Doc/requirements.txt index 3b28495d4b4d0..f8a7f9db144c2 100644 --- a/Doc/requirements.txt +++ b/Doc/requirements.txt @@ -3,7 +3,7 @@ # Sphinx version is pinned so that new versions that introduce new warnings # won't suddenly cause build failures. Updating the version is fine as long # as no warnings are raised by doing so. -sphinx==4.2.0 +sphinx==4.5.0 blurb diff --git a/Doc/tools/templates/indexsidebar.html b/Doc/tools/templates/indexsidebar.html index f7bf6d8e49117..5986204256f4b 100644 --- a/Doc/tools/templates/indexsidebar.html +++ b/Doc/tools/templates/indexsidebar.html @@ -10,7 +10,7 @@ <h3>{% trans %}Docs by version{% endtrans %}</h3> <h3>{% trans %}Other resources{% endtrans %}</h3> <ul> {# XXX: many of these should probably be merged in the main docs #} - <li><a href="https://www.python.org/dev/peps/">{% trans %}PEP Index{% endtrans %}</a></li> + <li><a href="https://peps.python.org/">{% trans %}PEP Index{% endtrans %}</a></li> <li><a href="https://wiki.python.org/moin/BeginnersGuide">{% trans %}Beginner's Guide{% endtrans %}</a></li> <li><a href="https://wiki.python.org/moin/PythonBooks">{% trans %}Book List{% endtrans %}</a></li> <li><a href="https://www.python.org/doc/av/">{% trans %}Audio/Visual Talks{% endtrans %}</a></li> diff --git a/Doc/whatsnew/2.0.rst b/Doc/whatsnew/2.0.rst index 0e1cf1fd0ce46..325def51c274e 100644 --- a/Doc/whatsnew/2.0.rst +++ b/Doc/whatsnew/2.0.rst @@ -130,7 +130,7 @@ Guidelines": Read the rest of :pep:`1` for the details of the PEP editorial process, style, and format. PEPs are kept in the Python CVS tree on SourceForge, though they're not part of the Python 2.0 distribution, and are also available in HTML form from -https://www.python.org/dev/peps/. As of September 2000, there are 25 PEPS, ranging +https://peps.python.org/. As of September 2000, there are 25 PEPS, ranging from :pep:`201`, "Lockstep Iteration", to PEP 225, "Elementwise/Objectwise Operators". diff --git a/Doc/whatsnew/2.7.rst b/Doc/whatsnew/2.7.rst index abb65222ddd3d..999f148fa6b79 100644 --- a/Doc/whatsnew/2.7.rst +++ b/Doc/whatsnew/2.7.rst @@ -2681,7 +2681,7 @@ these commands by default, as long as, when invoked, they provide clear and simple directions on how to install them on that platform (usually using the system package manager). -__ https://www.python.org/dev/peps/pep-0477/#disabling-ensurepip-by-downstream… +__ https://peps.python.org/pep-0477/#disabling-ensurepip-by-downstream-distrib… Documentation Changes diff --git a/Doc/whatsnew/3.4.rst b/Doc/whatsnew/3.4.rst index 0405f2ba19346..f4ff143224196 100644 --- a/Doc/whatsnew/3.4.rst +++ b/Doc/whatsnew/3.4.rst @@ -220,7 +220,7 @@ these commands by default, as long as, when invoked, they provide clear and simple directions on how to install them on that platform (usually using the system package manager). -__ https://www.python.org/dev/peps/pep-0453/#recommendations-for-downstream-di… +__ https://peps.python.org/pep-0453/#recommendations-for-downstream-distributo… .. note:: diff --git a/Doc/whatsnew/3.7.rst b/Doc/whatsnew/3.7.rst index 5ce637a6c12c1..49246be57639d 100644 --- a/Doc/whatsnew/3.7.rst +++ b/Doc/whatsnew/3.7.rst @@ -353,7 +353,7 @@ module: The new functions return the number of nanoseconds as an integer value. -`Measurements <https://www.python.org/dev/peps/pep-0564/#annex-clocks-resolution-in-python>`_ +`Measurements <https://peps.python.org/pep-0564/#annex-clocks-resolution-in-python>`_ show that on Linux and Windows the resolution of :func:`time.time_ns` is approximately 3 times better than that of :func:`time.time`. diff --git a/Lib/dataclasses.py b/Lib/dataclasses.py index 6be7c7b5de917..1acb7128f1a0c 100644 --- a/Lib/dataclasses.py +++ b/Lib/dataclasses.py @@ -298,7 +298,7 @@ def __repr__(self): # This is used to support the PEP 487 __set_name__ protocol in the # case where we're using a field that contains a descriptor as a # default value. For details on __set_name__, see - # https://www.python.org/dev/peps/pep-0487/#implementation-details. + # https://peps.python.org/pep-0487/#implementation-details. # # Note that in _process_class, this Field object is overwritten # with the default value, so the end result is a descriptor that diff --git a/Lib/distutils/command/build_ext.py b/Lib/distutils/command/build_ext.py index 1a9bd1200f823..f287b349984ff 100644 --- a/Lib/distutils/command/build_ext.py +++ b/Lib/distutils/command/build_ext.py @@ -692,7 +692,7 @@ def get_export_symbols(self, ext): suffix = '_' + ext.name.split('.')[-1] try: # Unicode module name support as defined in PEP-489 - # https://www.python.org/dev/peps/pep-0489/#export-hook-name + # https://peps.python.org/pep-0489/#export-hook-name suffix.encode('ascii') except UnicodeEncodeError: suffix = 'U' + suffix.encode('punycode').replace(b'-', b'_').decode('ascii') diff --git a/Lib/pydoc.py b/Lib/pydoc.py index 18b476ee660dc..12c2bb450e4f5 100755 --- a/Lib/pydoc.py +++ b/Lib/pydoc.py @@ -701,10 +701,10 @@ def markup(self, text, escape=None, funcs={}, classes={}, methods={}): url = escape(all).replace('"', '"') results.append('<a href="%s">%s</a>' % (url, url)) elif rfc: - url = 'http://www.rfc-editor.org/rfc/rfc%d.txt' % int(rfc) + url = 'https://www.rfc-editor.org/rfc/rfc%d.txt' % int(rfc) results.append('<a href="%s">%s</a>' % (url, escape(all))) elif pep: - url = 'https://www.python.org/dev/peps/pep-%04d/' % int(pep) + url = 'https://peps.python.org/pep-%04d/' % int(pep) results.append('<a href="%s">%s</a>' % (url, escape(all))) elif selfdot: # Create a link for methods like 'self.method(...)' diff --git a/Lib/secrets.py b/Lib/secrets.py index a546efbdd4204..900381a89f53e 100644 --- a/Lib/secrets.py +++ b/Lib/secrets.py @@ -2,7 +2,7 @@ managing secrets such as account authentication, tokens, and similar. See PEP 506 for more information. -https://www.python.org/dev/peps/pep-0506/ +https://peps.python.org/pep-0506/ """ diff --git a/Lib/test/test_docxmlrpc.py b/Lib/test/test_docxmlrpc.py index 89d80091850f5..2ad422079b7f2 100644 --- a/Lib/test/test_docxmlrpc.py +++ b/Lib/test/test_docxmlrpc.py @@ -146,9 +146,9 @@ def test_autolinking(self): self.assertIn( (b'<dl><dt><a name="-add"><strong>add</strong></a>(x, y)</dt><dd>' b'<tt>Add two instances together. This ' - b'follows <a href="https://www.python.org/dev/peps/pep-0008/">' + b'follows <a href="https://peps.python.org/pep-0008/">' b'PEP008</a>, but has nothing<br>\nto do ' - b'with <a href="http://www.rfc-editor.org/rfc/rfc1952.txt">' + b'with <a href="https://www.rfc-editor.org/rfc/rfc1952.txt">' b'RFC1952</a>. Case should matter: pEp008 ' b'and rFC1952.  Things<br>\nthat start ' b'with http and ftp should be ' diff --git a/Lib/weakref.py b/Lib/weakref.py index 994ea8aa37de5..42aba654de549 100644 --- a/Lib/weakref.py +++ b/Lib/weakref.py @@ -2,7 +2,7 @@ This module is an implementation of PEP 205: -https://www.python.org/dev/peps/pep-0205/ +https://peps.python.org/pep-0205/ """ # Naming convention: Variables named "wr" are weak reference objects; diff --git a/Lib/xmlrpc/server.py b/Lib/xmlrpc/server.py index 4228a8535bfba..0c4b558045a9f 100644 --- a/Lib/xmlrpc/server.py +++ b/Lib/xmlrpc/server.py @@ -731,10 +731,10 @@ def markup(self, text, escape=None, funcs={}, classes={}, methods={}): url = escape(all).replace('"', '"') results.append('<a href="%s">%s</a>' % (url, url)) elif rfc: - url = 'http://www.rfc-editor.org/rfc/rfc%d.txt' % int(rfc) + url = 'https://www.rfc-editor.org/rfc/rfc%d.txt' % int(rfc) results.append('<a href="%s">%s</a>' % (url, escape(all))) elif pep: - url = 'https://www.python.org/dev/peps/pep-%04d/' % int(pep) + url = 'https://peps.python.org/pep-%04d/' % int(pep) results.append('<a href="%s">%s</a>' % (url, escape(all))) elif text[end:end+1] == '(': results.append(self.namelink(name, methods, funcs, classes)) diff --git a/Misc/NEWS.d/next/Documentation/2022-03-26-12-20-16.bpo-47126.p6_Ovm.rst b/Misc/NEWS.d/next/Documentation/2022-03-26-12-20-16.bpo-47126.p6_Ovm.rst new file mode 100644 index 0000000000000..4cbd0154eac4e --- /dev/null +++ b/Misc/NEWS.d/next/Documentation/2022-03-26-12-20-16.bpo-47126.p6_Ovm.rst @@ -0,0 +1 @@ +Update PEP URLs to :pep:`676`'s new canonical form. diff --git a/Parser/tokenizer.c b/Parser/tokenizer.c index 0941bcaaecc62..13116d052ea59 100644 --- a/Parser/tokenizer.c +++ b/Parser/tokenizer.c @@ -523,7 +523,7 @@ ensure_utf8(char *line, struct tok_state *tok) "Non-UTF-8 code starting with '\\x%.2x' " "in file %U on line %i, " "but no encoding declared; " - "see https://python.org/dev/peps/pep-0263/ for details", + "see https://peps.python.org/pep-0263/ for details", badchar, tok->filename, tok->lineno + 1); return 0; } diff --git a/README.rst b/README.rst index 2b1bfadcccfa0..d5cf8205c6b88 100644 --- a/README.rst +++ b/README.rst @@ -228,7 +228,7 @@ If you have a proposal to change Python, you may want to send an email to the `comp.lang.python`_ or `python-ideas`_ mailing lists for initial feedback. A Python Enhancement Proposal (PEP) may be submitted if your idea gains ground. All current PEPs, as well as guidelines for submitting a new PEP, are listed at -`python.org/dev/peps/ <https://www.python.org/dev/peps/>`_. +`peps.python.org <https://peps.python.org/>`_. .. _python-ideas: https://mail.python.org/mailman/listinfo/python-ideas/ .. _comp.lang.python: https://mail.python.org/mailman/listinfo/python-list diff --git a/Tools/scripts/stable_abi.py b/Tools/scripts/stable_abi.py index 04b1f78e00adb..2d951788d12c4 100755 --- a/Tools/scripts/stable_abi.py +++ b/Tools/scripts/stable_abi.py @@ -656,7 +656,7 @@ def main(): And in PEP 384: - https://www.python.org/dev/peps/pep-0384/ + https://peps.python.org/pep-0384/ """)

1 0

bpo-46864: Suppress even more ob_shash deprecation warnings (GH-32176)
by tiran March 30, 2022

March 30, 2022

https://github.com/python/cpython/commit/d8f530fe329c6bd9ad6e1a9db9aa32b465… commit: d8f530fe329c6bd9ad6e1a9db9aa32b465c2d67f branch: main author: Christian Heimes <christian(a)python.org> committer: tiran <christian(a)python.org> date: 2022-03-30T08:35:15+02:00 summary: bpo-46864: Suppress even more ob_shash deprecation warnings (GH-32176) files: M Python/pylifecycle.c diff --git a/Python/pylifecycle.c b/Python/pylifecycle.c index 0754c1ac3bf40..273f6d62b2a20 100644 --- a/Python/pylifecycle.c +++ b/Python/pylifecycle.c @@ -95,11 +95,16 @@ __attribute__(( #endif +/* Suppress deprecation warning for PyBytesObject.ob_shash */ +_Py_COMP_DIAG_PUSH +_Py_COMP_DIAG_IGNORE_DEPR_DECLS _PyRuntimeState _PyRuntime #if defined(__linux__) && (defined(__GNUC__) || defined(__clang__)) __attribute__ ((section (".PyRuntime"))) #endif = _PyRuntimeState_INIT; +_Py_COMP_DIAG_POP + static int runtime_initialized = 0; PyStatus

1 0

bpo-26120: do not exclude __future__ import in pydoc of the __future__ module itself (GH-32180)
by iritkatriel March 29, 2022

March 29, 2022

https://github.com/python/cpython/commit/63f32fae79e16e6dc71777bd3fcb623b2c… commit: 63f32fae79e16e6dc71777bd3fcb623b2c3ff742 branch: main author: Irit Katriel <1055913+iritkatriel(a)users.noreply.github.com> committer: iritkatriel <1055913+iritkatriel(a)users.noreply.github.com> date: 2022-03-29T23:07:15+01:00 summary: bpo-26120: do not exclude __future__ import in pydoc of the __future__ module itself (GH-32180) files: M Lib/pydoc.py M Lib/test/test_pydoc.py diff --git a/Lib/pydoc.py b/Lib/pydoc.py index 7ae390852fa01..18b476ee660dc 100755 --- a/Lib/pydoc.py +++ b/Lib/pydoc.py @@ -292,7 +292,7 @@ def visiblename(name, all=None, obj=None): if name.startswith('_') and hasattr(obj, '_fields'): return True # Ignore __future__ imports. - if name in _future_feature_names: + if obj is not __future__ and name in _future_feature_names: if isinstance(getattr(obj, name, None), __future__._Feature): return False if all is not None: diff --git a/Lib/test/test_pydoc.py b/Lib/test/test_pydoc.py index e2dab1207172d..9c900c3e8ee0a 100644 --- a/Lib/test/test_pydoc.py +++ b/Lib/test/test_pydoc.py @@ -850,6 +850,23 @@ class B(A) for expected_line in expected_lines: self.assertIn(expected_line, as_text) + def test__future__imports(self): + # __future__ features are excluded from module help, + # except when it's the __future__ module itself + import __future__ + future_text, _ = get_pydoc_text(__future__) + future_html, _ = get_pydoc_html(__future__) + pydoc_mod_text, _ = get_pydoc_text(pydoc_mod) + pydoc_mod_html, _ = get_pydoc_html(pydoc_mod) + + for feature in __future__.all_feature_names: + txt = f"{feature} = _Feature" + html = f"<strong>{feature}</strong> = _Feature" + self.assertIn(txt, future_text) + self.assertIn(html, future_html) + self.assertNotIn(txt, pydoc_mod_text) + self.assertNotIn(html, pydoc_mod_html) + class PydocImportTest(PydocBaseTest):

1 0