Mailman 3 October 2018 - Python-checkins

bpo-35116, urllib.parse: Document the new max_num_fields parameter (GH-10247)
by Victor Stinner Oct. 30, 2018

Oct. 30, 2018

https://github.com/python/cpython/commit/68f323715e6627c550d1e8ffed7e36f1bb… commit: 68f323715e6627c550d1e8ffed7e36f1bb4aa42b branch: master author: matthewbelisle-wf <matthew.belisle(a)workiva.com> committer: Victor Stinner <vstinner(a)redhat.com> date: 2018-10-30T21:30:19+01:00 summary: bpo-35116, urllib.parse: Document the new max_num_fields parameter (GH-10247) files: M Doc/library/urllib.parse.rst diff --git a/Doc/library/urllib.parse.rst b/Doc/library/urllib.parse.rst index 2d3488bb5eef..913e933d657c 100644 --- a/Doc/library/urllib.parse.rst +++ b/Doc/library/urllib.parse.rst @@ -137,7 +137,7 @@ or on combining URL components into a URL string. returning :const:`None`. -.. function:: parse_qs(qs, keep_blank_values=False, strict_parsing=False, encoding='utf-8', errors='replace') +.. function:: parse_qs(qs, keep_blank_values=False, strict_parsing=False, encoding='utf-8', errors='replace', max_num_fields=None) Parse a query string given as a string argument (data of type :mimetype:`application/x-www-form-urlencoded`). Data are returned as a @@ -158,6 +158,10 @@ or on combining URL components into a URL string. percent-encoded sequences into Unicode characters, as accepted by the :meth:`bytes.decode` method. + The optional argument *max_num_fields* is the maximum number of fields to + read. If set, then throws a :exc:`ValueError` if there are more than + *max_num_fields* fields read. + Use the :func:`urllib.parse.urlencode` function (with the ``doseq`` parameter set to ``True``) to convert such dictionaries into query strings. @@ -166,8 +170,11 @@ or on combining URL components into a URL string. .. versionchanged:: 3.2 Add *encoding* and *errors* parameters. + .. versionchanged:: 3.8 + Added *max_num_fields* parameter. + -.. function:: parse_qsl(qs, keep_blank_values=False, strict_parsing=False, encoding='utf-8', errors='replace') +.. function:: parse_qsl(qs, keep_blank_values=False, strict_parsing=False, encoding='utf-8', errors='replace', max_num_fields=None) Parse a query string given as a string argument (data of type :mimetype:`application/x-www-form-urlencoded`). Data are returned as a list of @@ -187,12 +194,19 @@ or on combining URL components into a URL string. percent-encoded sequences into Unicode characters, as accepted by the :meth:`bytes.decode` method. + The optional argument *max_num_fields* is the maximum number of fields to + read. If set, then throws a :exc:`ValueError` if there are more than + *max_num_fields* fields read. + Use the :func:`urllib.parse.urlencode` function to convert such lists of pairs into query strings. .. versionchanged:: 3.2 Add *encoding* and *errors* parameters. + .. versionchanged:: 3.8 + Added *max_num_fields* parameter. + .. function:: urlunparse(parts)

1 0

bpo-35086: Fix tkinter example "A Simple Hello World Program". (GH-10160)
by Miss Islington (bot) Oct. 30, 2018

Oct. 30, 2018

https://github.com/python/cpython/commit/c843a47007293d8361d0bfd45bfd7169af… commit: c843a47007293d8361d0bfd45bfd7169afaa601c branch: 3.6 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: GitHub <noreply(a)github.com> date: 2018-10-30T08:35:02-07:00 summary: bpo-35086: Fix tkinter example "A Simple Hello World Program". (GH-10160) The root widget was accessed as a global variable in the Application's method. (cherry picked from commit a80af770870937271865b5e2b05a2cfe40b024b6) Co-authored-by: Daniel Lovell <lovell.daniel92(a)gmail.com> files: M Doc/library/tkinter.rst diff --git a/Doc/library/tkinter.rst b/Doc/library/tkinter.rst index 4af4b7356e1c..60cf892e0888 100644 --- a/Doc/library/tkinter.rst +++ b/Doc/library/tkinter.rst @@ -205,6 +205,7 @@ A Simple Hello World Program class Application(tk.Frame): def __init__(self, master=None): super().__init__(master) + self.master = master self.pack() self.create_widgets() @@ -215,7 +216,7 @@ A Simple Hello World Program self.hi_there.pack(side="top") self.quit = tk.Button(self, text="QUIT", fg="red", - command=root.destroy) + command=self.master.destroy) self.quit.pack(side="bottom") def say_hi(self):

1 0

bpo-35086: Fix tkinter example "A Simple Hello World Program". (GH-10160)
by Miss Islington (bot) Oct. 30, 2018

Oct. 30, 2018

https://github.com/python/cpython/commit/f51ef51db686938486bff453e791a3093a… commit: f51ef51db686938486bff453e791a3093a1df108 branch: 3.7 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: GitHub <noreply(a)github.com> date: 2018-10-30T08:34:54-07:00 summary: bpo-35086: Fix tkinter example "A Simple Hello World Program". (GH-10160) The root widget was accessed as a global variable in the Application's method. (cherry picked from commit a80af770870937271865b5e2b05a2cfe40b024b6) Co-authored-by: Daniel Lovell <lovell.daniel92(a)gmail.com> files: M Doc/library/tkinter.rst diff --git a/Doc/library/tkinter.rst b/Doc/library/tkinter.rst index 4af4b7356e1c..60cf892e0888 100644 --- a/Doc/library/tkinter.rst +++ b/Doc/library/tkinter.rst @@ -205,6 +205,7 @@ A Simple Hello World Program class Application(tk.Frame): def __init__(self, master=None): super().__init__(master) + self.master = master self.pack() self.create_widgets() @@ -215,7 +216,7 @@ A Simple Hello World Program self.hi_there.pack(side="top") self.quit = tk.Button(self, text="QUIT", fg="red", - command=root.destroy) + command=self.master.destroy) self.quit.pack(side="bottom") def say_hi(self):

1 0

bpo-35086: Fix tkinter example "A Simple Hello World Program". (GH-10160)
by Serhiy Storchaka Oct. 30, 2018

Oct. 30, 2018

https://github.com/python/cpython/commit/a80af770870937271865b5e2b05a2cfe40… commit: a80af770870937271865b5e2b05a2cfe40b024b6 branch: master author: Daniel Lovell <lovell.daniel92(a)gmail.com> committer: Serhiy Storchaka <storchaka(a)gmail.com> date: 2018-10-30T16:56:07+02:00 summary: bpo-35086: Fix tkinter example "A Simple Hello World Program". (GH-10160) The root widget was accessed as a global variable in the Application's method. files: M Doc/library/tkinter.rst diff --git a/Doc/library/tkinter.rst b/Doc/library/tkinter.rst index 4af4b7356e1c..60cf892e0888 100644 --- a/Doc/library/tkinter.rst +++ b/Doc/library/tkinter.rst @@ -205,6 +205,7 @@ A Simple Hello World Program class Application(tk.Frame): def __init__(self, master=None): super().__init__(master) + self.master = master self.pack() self.create_widgets() @@ -215,7 +216,7 @@ A Simple Hello World Program self.hi_there.pack(side="top") self.quit = tk.Button(self, text="QUIT", fg="red", - command=root.destroy) + command=self.master.destroy) self.quit.pack(side="bottom") def say_hi(self):

1 0

bpo-35081: Move Include/pyatomic.c to Include/internal/ (GH-10239)
by Victor Stinner Oct. 30, 2018

Oct. 30, 2018

https://github.com/python/cpython/commit/31368a4f0e531c19affe2a1becd25fc316… commit: 31368a4f0e531c19affe2a1becd25fc316bc7501 branch: master author: Victor Stinner <vstinner(a)redhat.com> committer: GitHub <noreply(a)github.com> date: 2018-10-30T15:14:25+01:00 summary: bpo-35081: Move Include/pyatomic.c to Include/internal/ (GH-10239) Add pyatomic.h to the VS project (it wasn't referenced). files: A Include/internal/pyatomic.h D Include/pyatomic.h M Include/Python.h M Include/internal/ceval.h M Include/internal/gil.h M Include/internal/pystate.h M Makefile.pre.in M Modules/signalmodule.c M PCbuild/pythoncore.vcxproj M PCbuild/pythoncore.vcxproj.filters M Python/ceval_gil.h diff --git a/Include/Python.h b/Include/Python.h index 80200feb9033..cf87a5ce7a70 100644 --- a/Include/Python.h +++ b/Include/Python.h @@ -53,8 +53,6 @@ #include "pyport.h" #include "pymacro.h" -#include "pyatomic.h" - /* Debug-mode build with pymalloc implies PYMALLOC_DEBUG. * PYMALLOC_DEBUG is in error if pymalloc is not in use. */ diff --git a/Include/internal/ceval.h b/Include/internal/ceval.h index cdabb9521d10..4297b5a51ce4 100644 --- a/Include/internal/ceval.h +++ b/Include/internal/ceval.h @@ -4,7 +4,7 @@ extern "C" { #endif -#include "pyatomic.h" +#include "internal/pyatomic.h" #include "pythread.h" struct _pending_calls { diff --git a/Include/internal/gil.h b/Include/internal/gil.h index 6139bd215c38..7743b3f0aa8b 100644 --- a/Include/internal/gil.h +++ b/Include/internal/gil.h @@ -4,11 +4,11 @@ extern "C" { #endif -#include "pyatomic.h" - #include "internal/condvar.h" +#include "internal/pyatomic.h" + #ifndef Py_HAVE_CONDVAR -#error You need either a POSIX-compatible or a Windows system! +# error You need either a POSIX-compatible or a Windows system! #endif /* Enable if you want to force the switching of threads at least diff --git a/Include/pyatomic.h b/Include/internal/pyatomic.h similarity index 99% rename from Include/pyatomic.h rename to Include/internal/pyatomic.h index 9a497a683688..5f349cc3e9e9 100644 --- a/Include/pyatomic.h +++ b/Include/internal/pyatomic.h @@ -1,6 +1,12 @@ #ifndef Py_ATOMIC_H #define Py_ATOMIC_H -#ifdef Py_BUILD_CORE +#ifdef __cplusplus +extern "C" { +#endif + +#ifndef Py_BUILD_CORE +# error "Py_BUILD_CORE must be defined to include this header" +#endif #include "dynamic_annotations.h" @@ -531,5 +537,8 @@ typedef struct _Py_atomic_int { _Py_atomic_store_explicit(ATOMIC_VAL, NEW_VAL, _Py_memory_order_relaxed) #define _Py_atomic_load_relaxed(ATOMIC_VAL) \ _Py_atomic_load_explicit(ATOMIC_VAL, _Py_memory_order_relaxed) -#endif /* Py_BUILD_CORE */ + +#ifdef __cplusplus +} +#endif #endif /* Py_ATOMIC_H */ diff --git a/Include/internal/pystate.h b/Include/internal/pystate.h index c93dda28954a..38845d32ecaf 100644 --- a/Include/internal/pystate.h +++ b/Include/internal/pystate.h @@ -5,7 +5,6 @@ extern "C" { #endif #include "pystate.h" -#include "pyatomic.h" #include "pythread.h" #include "internal/mem.h" diff --git a/Makefile.pre.in b/Makefile.pre.in index 61b469d4504e..232025f1cb61 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -988,7 +988,6 @@ PYTHON_HEADERS= \ $(srcdir)/Include/pgen.h \ $(srcdir)/Include/pgenheaders.h \ $(srcdir)/Include/pyarena.h \ - $(srcdir)/Include/pyatomic.h \ $(srcdir)/Include/pycapsule.h \ $(srcdir)/Include/pyctype.h \ $(srcdir)/Include/pydebug.h \ @@ -1029,6 +1028,7 @@ PYTHON_HEADERS= \ $(srcdir)/Include/internal/ceval.h \ $(srcdir)/Include/internal/gil.h \ $(srcdir)/Include/internal/mem.h \ + $(srcdir)/Include/internal/pyatomic.h \ $(srcdir)/Include/internal/pygetopt.h \ $(srcdir)/Include/internal/pystate.h \ $(srcdir)/Include/internal/context.h \ diff --git a/Modules/signalmodule.c b/Modules/signalmodule.c index d12094858273..a81de6ab6462 100644 --- a/Modules/signalmodule.c +++ b/Modules/signalmodule.c @@ -4,6 +4,8 @@ /* XXX Signals should be recorded per thread, now we have thread state. */ #include "Python.h" +#include "internal/pyatomic.h" + #ifndef MS_WINDOWS #include "posixmodule.h" #endif diff --git a/PCbuild/pythoncore.vcxproj b/PCbuild/pythoncore.vcxproj index cb835390ee13..f65bb5b2197c 100644 --- a/PCbuild/pythoncore.vcxproj +++ b/PCbuild/pythoncore.vcxproj @@ -118,6 +118,7 @@ <ClInclude Include="..\Include\internal\gil.h" /> <ClInclude Include="..\Include\internal\hamt.h" /> <ClInclude Include="..\Include\internal\mem.h" /> + <ClInclude Include="..\Include\internal\pyatomic.h" /> <ClInclude Include="..\Include\internal\pystate.h" /> <ClInclude Include="..\Include\internal\warnings.h" /> <ClInclude Include="..\Include\intrcheck.h" /> diff --git a/PCbuild/pythoncore.vcxproj.filters b/PCbuild/pythoncore.vcxproj.filters index 510a9c2b2e4e..7fdadc81676d 100644 --- a/PCbuild/pythoncore.vcxproj.filters +++ b/PCbuild/pythoncore.vcxproj.filters @@ -153,6 +153,9 @@ <ClInclude Include="..\Include\internal\mem.h"> <Filter>Include</Filter> </ClInclude> + <ClInclude Include="..\Include\internal\pyatomic.h"> + <Filter>Include</Filter> + </ClInclude> <ClInclude Include="..\Include\internal\pystate.h"> <Filter>Include</Filter> </ClInclude> diff --git a/Python/ceval_gil.h b/Python/ceval_gil.h index ef5189068e0c..4a054a97f710 100644 --- a/Python/ceval_gil.h +++ b/Python/ceval_gil.h @@ -5,6 +5,7 @@ #include <stdlib.h> #include <errno.h> +#include "internal/pyatomic.h" /* First some general settings */

1 0

bpo-35081: Cleanup pystate.c and pystate.h (GH-10240)
by Victor Stinner Oct. 30, 2018

Oct. 30, 2018

https://github.com/python/cpython/commit/9204fb8623896cc5f68ae350784ee25e8a… commit: 9204fb8623896cc5f68ae350784ee25e8a7b2184 branch: master author: Victor Stinner <vstinner(a)redhat.com> committer: GitHub <noreply(a)github.com> date: 2018-10-30T15:13:17+01:00 summary: bpo-35081: Cleanup pystate.c and pystate.h (GH-10240) * Remove _PyThreadState_Current * Replace GET_TSTATE() with PyThreadState_GET() * Replace GET_INTERP_STATE() with _PyInterpreterState_GET_UNSAFE() * Replace direct access to _PyThreadState_Current with PyThreadState_GET() * Replace _PyThreadState_Current with _PyRuntime.gilstate.tstate_current * Rename SET_TSTATE() to _PyThreadState_SET(), name more consistent with _PyThreadState_GET() * Update outdated comments files: M Include/pystate.h M Objects/dictobject.c M Python/ceval.c M Python/pystate.c diff --git a/Include/pystate.h b/Include/pystate.h index 80ee0d112daa..8860f124002c 100644 --- a/Include/pystate.h +++ b/Include/pystate.h @@ -208,8 +208,8 @@ typedef struct _ts { * if the thread holds the last reference to the lock, decref'ing the * lock will delete the lock, and that may trigger arbitrary Python code * if there's a weakref, with a callback, to the lock. But by this time - * _PyThreadState_Current is already NULL, so only the simplest of C code - * can be allowed to run (in particular it must not be possible to + * _PyRuntime.gilstate.tstate_current is already NULL, so only the simplest + * of C code can be allowed to run (in particular it must not be possible to * release the GIL). * So instead of holding the lock directly, the tstate holds a weakref to * the lock: that's the value of on_delete_data below. Decref'ing a @@ -307,9 +307,8 @@ PyAPI_FUNC(int) PyThreadState_SetAsyncExc(unsigned long, PyObject *); /* Assuming the current thread holds the GIL, this is the PyThreadState for the current thread. */ #ifdef Py_BUILD_CORE -# define _PyThreadState_Current _PyRuntime.gilstate.tstate_current # define PyThreadState_GET() \ - ((PyThreadState*)_Py_atomic_load_relaxed(&_PyThreadState_Current)) + ((PyThreadState*)_Py_atomic_load_relaxed(&_PyRuntime.gilstate.tstate_current)) #else # define PyThreadState_GET() PyThreadState_Get() #endif diff --git a/Objects/dictobject.c b/Objects/dictobject.c index ee656953e072..363d902e9c59 100644 --- a/Objects/dictobject.c +++ b/Objects/dictobject.c @@ -1314,8 +1314,8 @@ PyDict_GetItem(PyObject *op, PyObject *key) /* We can arrive here with a NULL tstate during initialization: try running "python -Wi" for an example related to string interning. Let's just hope that no exception occurs then... This must be - _PyThreadState_Current and not PyThreadState_GET() because in debug - mode, the latter complains if tstate is NULL. */ + PyThreadState_GET() and not PyThreadState_Get() because the latter + abort Python if tstate is NULL. */ tstate = PyThreadState_GET(); if (tstate != NULL && tstate->curexc_type != NULL) { /* preserve the existing exception */ diff --git a/Python/ceval.c b/Python/ceval.c index 9a96dc7b37b9..644312384843 100644 --- a/Python/ceval.c +++ b/Python/ceval.c @@ -188,8 +188,7 @@ PyEval_ReleaseLock(void) We therefore avoid PyThreadState_GET() which dumps a fatal error in debug mode. */ - drop_gil((PyThreadState*)_Py_atomic_load_relaxed( - &_PyThreadState_Current)); + drop_gil(PyThreadState_GET()); } void diff --git a/Python/pystate.c b/Python/pystate.c index 7b3d3d4c9032..d04981121c1c 100644 --- a/Python/pystate.c +++ b/Python/pystate.c @@ -4,12 +4,9 @@ #include "Python.h" #include "internal/pystate.h" -#define GET_TSTATE() \ - ((PyThreadState*)_Py_atomic_load_relaxed(&_PyThreadState_Current)) -#define SET_TSTATE(value) \ - _Py_atomic_store_relaxed(&_PyThreadState_Current, (uintptr_t)(value)) -#define GET_INTERP_STATE() \ - (GET_TSTATE()->interp) +#define _PyThreadState_SET(value) \ + _Py_atomic_store_relaxed(&_PyRuntime.gilstate.tstate_current, \ + (uintptr_t)(value)) /* -------------------------------------------------------------------------- @@ -309,7 +306,7 @@ _PyInterpreterState_DeleteExceptMain() PyInterpreterState * _PyInterpreterState_Get(void) { - PyThreadState *tstate = GET_TSTATE(); + PyThreadState *tstate = PyThreadState_GET(); if (tstate == NULL) { Py_FatalError("_PyInterpreterState_Get(): no current thread state"); } @@ -508,7 +505,7 @@ PyObject* PyState_FindModule(struct PyModuleDef* module) { Py_ssize_t index = module->m_base.m_index; - PyInterpreterState *state = GET_INTERP_STATE(); + PyInterpreterState *state = _PyInterpreterState_GET_UNSAFE(); PyObject *res; if (module->m_slots) { return NULL; @@ -536,7 +533,7 @@ _PyState_AddModule(PyObject* module, struct PyModuleDef* def) "PyState_AddModule called on module with slots"); return -1; } - state = GET_INTERP_STATE(); + state = _PyInterpreterState_GET_UNSAFE(); if (!state->modules_by_index) { state->modules_by_index = PyList_New(0); if (!state->modules_by_index) @@ -554,7 +551,7 @@ int PyState_AddModule(PyObject* module, struct PyModuleDef* def) { Py_ssize_t index; - PyInterpreterState *state = GET_INTERP_STATE(); + PyInterpreterState *state = _PyInterpreterState_GET_UNSAFE(); if (!def) { Py_FatalError("PyState_AddModule: Module Definition is NULL"); return -1; @@ -581,7 +578,7 @@ PyState_RemoveModule(struct PyModuleDef* def) "PyState_RemoveModule called on module with slots"); return -1; } - state = GET_INTERP_STATE(); + state = _PyInterpreterState_GET_UNSAFE(); if (index == 0) { Py_FatalError("PyState_RemoveModule: Module index invalid."); return -1; @@ -601,7 +598,7 @@ PyState_RemoveModule(struct PyModuleDef* def) void _PyState_ClearModules(void) { - PyInterpreterState *state = GET_INTERP_STATE(); + PyInterpreterState *state = _PyInterpreterState_GET_UNSAFE(); if (state->modules_by_index) { Py_ssize_t i; for (i = 0; i < PyList_GET_SIZE(state->modules_by_index); i++) { @@ -691,7 +688,7 @@ tstate_delete_common(PyThreadState *tstate) void PyThreadState_Delete(PyThreadState *tstate) { - if (tstate == GET_TSTATE()) + if (tstate == PyThreadState_GET()) Py_FatalError("PyThreadState_Delete: tstate is still current"); if (_PyRuntime.gilstate.autoInterpreterState && PyThread_tss_get(&_PyRuntime.gilstate.autoTSSkey) == tstate) @@ -705,7 +702,7 @@ PyThreadState_Delete(PyThreadState *tstate) void PyThreadState_DeleteCurrent() { - PyThreadState *tstate = GET_TSTATE(); + PyThreadState *tstate = PyThreadState_GET(); if (tstate == NULL) Py_FatalError( "PyThreadState_DeleteCurrent: no current tstate"); @@ -715,7 +712,7 @@ PyThreadState_DeleteCurrent() { PyThread_tss_set(&_PyRuntime.gilstate.autoTSSkey, NULL); } - SET_TSTATE(NULL); + _PyThreadState_SET(NULL); PyEval_ReleaseLock(); } @@ -760,14 +757,14 @@ _PyThreadState_DeleteExcept(PyThreadState *tstate) PyThreadState * _PyThreadState_UncheckedGet(void) { - return GET_TSTATE(); + return PyThreadState_GET(); } PyThreadState * PyThreadState_Get(void) { - PyThreadState *tstate = GET_TSTATE(); + PyThreadState *tstate = PyThreadState_GET(); if (tstate == NULL) Py_FatalError("PyThreadState_Get: no current thread"); @@ -778,9 +775,9 @@ PyThreadState_Get(void) PyThreadState * PyThreadState_Swap(PyThreadState *newts) { - PyThreadState *oldts = GET_TSTATE(); + PyThreadState *oldts = PyThreadState_GET(); - SET_TSTATE(newts); + _PyThreadState_SET(newts); /* It should not be possible for more than one thread state to be used for a thread. Check this the best we can in debug builds. @@ -809,7 +806,7 @@ PyThreadState_Swap(PyThreadState *newts) PyObject * PyThreadState_GetDict(void) { - PyThreadState *tstate = GET_TSTATE(); + PyThreadState *tstate = PyThreadState_GET(); if (tstate == NULL) return NULL; @@ -834,7 +831,7 @@ PyThreadState_GetDict(void) int PyThreadState_SetAsyncExc(unsigned long id, PyObject *exc) { - PyInterpreterState *interp = GET_INTERP_STATE(); + PyInterpreterState *interp = _PyInterpreterState_GET_UNSAFE(); PyThreadState *p; /* Although the GIL is held, a few C API functions can be called @@ -960,7 +957,7 @@ PyThreadState_IsCurrent(PyThreadState *tstate) { /* Must be the tstate for this thread */ assert(PyGILState_GetThisThreadState()==tstate); - return tstate == GET_TSTATE(); + return tstate == PyThreadState_GET(); } /* Internal initialization/finalization functions called by @@ -1087,7 +1084,7 @@ PyGILState_Check(void) return 1; } - tstate = GET_TSTATE(); + tstate = PyThreadState_GET(); if (tstate == NULL) return 0;

1 0

bpo-35059: Convert _Py_Dealloc() to static inline function (GH-10223)
by Victor Stinner Oct. 30, 2018

Oct. 30, 2018

https://github.com/python/cpython/commit/3c09dca4b5de9fe8c8756251d02f49cf09… commit: 3c09dca4b5de9fe8c8756251d02f49cf093b88c1 branch: master author: Victor Stinner <vstinner(a)redhat.com> committer: GitHub <noreply(a)github.com> date: 2018-10-30T14:48:26+01:00 summary: bpo-35059: Convert _Py_Dealloc() to static inline function (GH-10223) Convert _Py_Dealloc() macro into a static inline function. Moreover, it is now also defined as a static inline function if Py_TRACE_REFS is defined. files: M Include/object.h M Objects/object.c diff --git a/Include/object.h b/Include/object.h index 799c40b2caf0..10ec60051e5e 100644 --- a/Include/object.h +++ b/Include/object.h @@ -768,7 +768,6 @@ PyAPI_FUNC(int) _PyTraceMalloc_NewReference(PyObject *op); /* Py_TRACE_REFS is such major surgery that we call external routines. */ PyAPI_FUNC(void) _Py_NewReference(PyObject *); PyAPI_FUNC(void) _Py_ForgetReference(PyObject *); -PyAPI_FUNC(void) _Py_Dealloc(PyObject *); PyAPI_FUNC(void) _Py_PrintReferences(FILE *); PyAPI_FUNC(void) _Py_PrintReferenceAddresses(FILE *); PyAPI_FUNC(void) _Py_AddToAllObjects(PyObject *, int force); @@ -790,15 +789,25 @@ static inline void _Py_ForgetReference(PyObject *op) { _Py_INC_TPFREES(op); } +#endif /* !Py_TRACE_REFS */ + -#ifdef Py_LIMITED_API PyAPI_FUNC(void) _Py_Dealloc(PyObject *); + +#ifndef Py_LIMITED_API +static inline void _Py_Dealloc_inline(PyObject *op) +{ + destructor dealloc = Py_TYPE(op)->tp_dealloc; +#ifdef Py_TRACE_REFS + _Py_ForgetReference(op); #else -#define _Py_Dealloc(op) ( \ - _Py_INC_TPFREES(op) _Py_COUNT_ALLOCS_COMMA \ - (*Py_TYPE(op)->tp_dealloc)((PyObject *)(op))) + _Py_INC_TPFREES(op); #endif -#endif /* !Py_TRACE_REFS */ + (*dealloc)(op); +} + +# define _Py_Dealloc(op) _Py_Dealloc_inline(op) +#endif /* !defined(Py_LIMITED_API) */ static inline void _Py_INCREF(PyObject *op) diff --git a/Objects/object.c b/Objects/object.c index de9eb2cb4e2c..b72ad019c796 100644 --- a/Objects/object.c +++ b/Objects/object.c @@ -1964,14 +1964,6 @@ _Py_ForgetReference(PyObject *op) _Py_INC_TPFREES(op); } -void -_Py_Dealloc(PyObject *op) -{ - destructor dealloc = Py_TYPE(op)->tp_dealloc; - _Py_ForgetReference(op); - (*dealloc)(op); -} - /* Print all live objects. Because PyObject_Print is called, the * interpreter must be in a healthy state. */ @@ -2265,18 +2257,20 @@ _PyObject_AssertFailed(PyObject *obj, const char *msg, const char *expr, Py_FatalError("_PyObject_AssertFailed"); } -#ifndef Py_TRACE_REFS -/* For Py_LIMITED_API, we need an out-of-line version of _Py_Dealloc. - Define this here, so we can undefine the macro. */ + #undef _Py_Dealloc -void _Py_Dealloc(PyObject *); + void _Py_Dealloc(PyObject *op) { - _Py_INC_TPFREES(op) _Py_COUNT_ALLOCS_COMMA - (*Py_TYPE(op)->tp_dealloc)(op); -} + destructor dealloc = Py_TYPE(op)->tp_dealloc; +#ifdef Py_TRACE_REFS + _Py_ForgetReference(op); +#else + _Py_INC_TPFREES(op); #endif + (*dealloc)(op); +} #ifdef __cplusplus }

1 0

bpo-34403: Always implement _Py_GetForceASCII() (GH-10235)
by Victor Stinner Oct. 30, 2018

Oct. 30, 2018

https://github.com/python/cpython/commit/7d35f79012db89ce9a152a77ac6809eb9c… commit: 7d35f79012db89ce9a152a77ac6809eb9c34a35d branch: 3.7 author: Victor Stinner <vstinner(a)redhat.com> committer: GitHub <noreply(a)github.com> date: 2018-10-30T14:32:01+01:00 summary: bpo-34403: Always implement _Py_GetForceASCII() (GH-10235) Compilation fails on macOS because _Py_GetForceASCII() wasn't define: always implement implement (default implementation: just return 0). files: M Python/fileutils.c diff --git a/Python/fileutils.c b/Python/fileutils.c index 1b7e6697c74a..b3b7925073b2 100644 --- a/Python/fileutils.c +++ b/Python/fileutils.c @@ -246,6 +246,12 @@ encode_ascii(const wchar_t *text, char **str, *str = result; return 0; } +#else +int +_Py_GetForceASCII(void) +{ + return 0; +} #endif /* !defined(__APPLE__) && !defined(__ANDROID__) && !defined(MS_WINDOWS) */

1 0

bpo-32030: Make _PySys_AddXOptionWithError() private (GH-10236)
by Victor Stinner Oct. 30, 2018

Oct. 30, 2018

https://github.com/python/cpython/commit/e1b29950bf751381538e3c8ea6a3e0a98d… commit: e1b29950bf751381538e3c8ea6a3e0a98d01dbfb branch: master author: Victor Stinner <vstinner(a)redhat.com> committer: GitHub <noreply(a)github.com> date: 2018-10-30T14:31:42+01:00 summary: bpo-32030: Make _PySys_AddXOptionWithError() private (GH-10236) Make _PySys_AddXOptionWithError() and _PySys_AddWarnOptionWithError() functions private again. They are no longer needed to initialize Python: _PySys_EndInit() is now responsible to add these options instead. Moreover, PySys_AddWarnOptionUnicode() now clears the exception on failure if possible. files: M Include/sysmodule.h M Python/sysmodule.c diff --git a/Include/sysmodule.h b/Include/sysmodule.h index 719ecfcf61f2..c5547ff6742e 100644 --- a/Include/sysmodule.h +++ b/Include/sysmodule.h @@ -37,11 +37,6 @@ PyAPI_FUNC(PyObject *) PySys_GetXOptions(void); PyAPI_FUNC(size_t) _PySys_GetSizeOf(PyObject *); #endif -#ifdef Py_BUILD_CORE -PyAPI_FUNC(int) _PySys_AddXOptionWithError(const wchar_t *s); -PyAPI_FUNC(int) _PySys_AddWarnOptionWithError(PyObject *option); -#endif - #ifdef __cplusplus } #endif diff --git a/Python/sysmodule.c b/Python/sysmodule.c index f88b273e26b1..9579eae4ff5f 100644 --- a/Python/sysmodule.c +++ b/Python/sysmodule.c @@ -1807,7 +1807,7 @@ PySys_ResetWarnOptions(void) PyList_SetSlice(warnoptions, 0, PyList_GET_SIZE(warnoptions), NULL); } -int +static int _PySys_AddWarnOptionWithError(PyObject *option) { PyObject *warnoptions = get_warnoptions(); @@ -1823,7 +1823,12 @@ _PySys_AddWarnOptionWithError(PyObject *option) void PySys_AddWarnOptionUnicode(PyObject *option) { - (void)_PySys_AddWarnOptionWithError(option); + if (_PySys_AddWarnOptionWithError(option) < 0) { + /* No return value, therefore clear error state if possible */ + if (_PyThreadState_UncheckedGet()) { + PyErr_Clear(); + } + } } void @@ -1877,7 +1882,7 @@ get_xoptions(void) return xoptions; } -int +static int _PySys_AddXOptionWithError(const wchar_t *s) { PyObject *name = NULL, *value = NULL;

1 0

bpo-34403: Fix initfsencoding() for ASCII (GH-10233)
by Victor Stinner Oct. 30, 2018

Oct. 30, 2018

https://github.com/python/cpython/commit/21220bbe65108f5a763ead24a6b572f80d… commit: 21220bbe65108f5a763ead24a6b572f80d84c9e2 branch: 3.7 author: Victor Stinner <vstinner(a)redhat.com> committer: GitHub <noreply(a)github.com> date: 2018-10-30T12:59:20+01:00 summary: bpo-34403: Fix initfsencoding() for ASCII (GH-10233) * Add _Py_GetForceASCII(): check if Python forces the usage of ASCII in Py_DecodeLocale() and Py_EncodeLocale(). * initfsencoding() now uses ASCII if _Py_GetForceASCII() is true. files: M Include/fileutils.h M Python/fileutils.c M Python/pylifecycle.c diff --git a/Include/fileutils.h b/Include/fileutils.h index c05ff43f5163..d75189a95c50 100644 --- a/Include/fileutils.h +++ b/Include/fileutils.h @@ -183,6 +183,10 @@ PyAPI_FUNC(int) _Py_GetLocaleconvNumeric( #endif /* Py_LIMITED_API */ +#ifdef Py_BUILD_CORE +PyAPI_FUNC(int) _Py_GetForceASCII(void); +#endif + #ifdef __cplusplus } #endif diff --git a/Python/fileutils.c b/Python/fileutils.c index e72ce543cb68..1b7e6697c74a 100644 --- a/Python/fileutils.c +++ b/Python/fileutils.c @@ -180,6 +180,18 @@ check_force_ascii(void) return 1; } + +int +_Py_GetForceASCII(void) +{ + if (force_ascii == -1) { + force_ascii = check_force_ascii(); + } + return force_ascii; +} + + + static int encode_ascii(const wchar_t *text, char **str, size_t *error_pos, const char **reason, diff --git a/Python/pylifecycle.c b/Python/pylifecycle.c index ba4b54864fd8..c01b21ffebad 100644 --- a/Python/pylifecycle.c +++ b/Python/pylifecycle.c @@ -1615,6 +1615,10 @@ initfsencoding(PyInterpreterState *interp) Py_FileSystemDefaultEncoding = "utf-8"; Py_HasFileSystemDefaultEncoding = 1; } + else if (_Py_GetForceASCII()) { + Py_FileSystemDefaultEncoding = "ascii"; + Py_HasFileSystemDefaultEncoding = 1; + } else if (Py_FileSystemDefaultEncoding == NULL) { Py_FileSystemDefaultEncoding = get_locale_encoding(); if (Py_FileSystemDefaultEncoding == NULL) {

1 0