Mailman 3 December 2015 - Python-checkins

cpython (merge 3.5 -> default): Issue #20440: More use of Py_SETREF.
by serhiy.storchaka 27 Dec '15

27 Dec '15

https://hg.python.org/cpython/rev/539ba7267701 changeset: 99689:539ba7267701 parent: 99685:bc7c56a225de parent: 99687:4bfbb2714ae9 user: Serhiy Storchaka <storchaka(a)gmail.com> date: Sun Dec 27 15:44:33 2015 +0200 summary: Issue #20440: More use of Py_SETREF. This patch is manually crafted and contains changes that couldn't be handled automatically. files: Modules/_ctypes/_ctypes.c | 3 +- Modules/_elementtree.c | 34 +++++++++----------------- Modules/_sqlite/cursor.c | 4 +- Modules/zlibmodule.c | 18 ++++--------- Objects/exceptions.c | 19 +++++++------- Objects/unicodeobject.c | 2 +- Python/ast.c | 10 ++----- Python/errors.c | 13 +++------ 8 files changed, 40 insertions(+), 63 deletions(-) diff --git a/Modules/_ctypes/_ctypes.c b/Modules/_ctypes/_ctypes.c --- a/Modules/_ctypes/_ctypes.c +++ b/Modules/_ctypes/_ctypes.c @@ -2983,10 +2983,9 @@ "restype must be a type, a callable, or None"); return -1; } - Py_XDECREF(self->checker); Py_INCREF(ob); Py_SETREF(self->restype, ob); - self->checker = PyObject_GetAttrString(ob, "_check_retval_"); + Py_SETREF(self->checker, PyObject_GetAttrString(ob, "_check_retval_")); if (self->checker == NULL) PyErr_Clear(); return 0; diff --git a/Modules/_elementtree.c b/Modules/_elementtree.c --- a/Modules/_elementtree.c +++ b/Modules/_elementtree.c @@ -965,9 +965,8 @@ return NULL; } - Py_CLEAR(self->tag); - self->tag = tag; - Py_INCREF(self->tag); + Py_INCREF(tag); + Py_SETREF(self->tag, tag); _clear_joined_ptr(&self->text); self->text = text ? JOIN_SET(text, PyList_CheckExact(text)) : Py_None; @@ -1010,9 +1009,8 @@ /* Stash attrib. */ if (attrib) { - Py_CLEAR(self->extra->attrib); - self->extra->attrib = attrib; Py_INCREF(attrib); + Py_SETREF(self->extra->attrib, attrib); } Py_RETURN_NONE; @@ -1961,8 +1959,7 @@ { _VALIDATE_ATTR_VALUE(value); Py_INCREF(value); - Py_DECREF(self->tag); - self->tag = value; + Py_SETREF(self->tag, value); return 0; } @@ -1995,8 +1992,7 @@ return -1; } Py_INCREF(value); - Py_DECREF(self->extra->attrib); - self->extra->attrib = value; + Py_SETREF(self->extra->attrib, value); return 0; } @@ -2533,13 +2529,10 @@ } self->index++; - Py_DECREF(this); Py_INCREF(node); - self->this = node; - - Py_DECREF(self->last); + Py_SETREF(self->this, node); Py_INCREF(node); - self->last = node; + Py_SETREF(self->last, node); if (treebuilder_append_event(self, self->start_event_obj, node) < 0) goto error; @@ -2612,15 +2605,12 @@ return NULL; } + item = self->last; + self->last = self->this; self->index--; - - item = PyList_GET_ITEM(self->stack, self->index); - Py_INCREF(item); - - Py_DECREF(self->last); - - self->last = self->this; - self->this = item; + self->this = PyList_GET_ITEM(self->stack, self->index); + Py_INCREF(self->this); + Py_DECREF(item); if (treebuilder_append_event(self, self->end_event_obj, self->last) < 0) return NULL; diff --git a/Modules/_sqlite/cursor.c b/Modules/_sqlite/cursor.c --- a/Modules/_sqlite/cursor.c +++ b/Modules/_sqlite/cursor.c @@ -524,10 +524,10 @@ if (self->statement) { (void)pysqlite_statement_reset(self->statement); - Py_DECREF(self->statement); } - self->statement = (pysqlite_Statement*)pysqlite_cache_get(self->connection->statement_cache, func_args); + Py_SETREF(self->statement, + (pysqlite_Statement *)pysqlite_cache_get(self->connection->statement_cache, func_args)); Py_DECREF(func_args); if (!self->statement) { diff --git a/Modules/zlibmodule.c b/Modules/zlibmodule.c --- a/Modules/zlibmodule.c +++ b/Modules/zlibmodule.c @@ -961,14 +961,11 @@ goto error; } Py_INCREF(self->unused_data); + Py_SETREF(retval->unused_data, self->unused_data); Py_INCREF(self->unconsumed_tail); + Py_SETREF(retval->unconsumed_tail, self->unconsumed_tail); Py_XINCREF(self->zdict); - Py_XDECREF(retval->unused_data); - Py_XDECREF(retval->unconsumed_tail); - Py_XDECREF(retval->zdict); - retval->unused_data = self->unused_data; - retval->unconsumed_tail = self->unconsumed_tail; - retval->zdict = self->zdict; + Py_SETREF(retval->zdict, self->zdict); retval->eof = self->eof; /* Mark it as being initialized */ @@ -1020,14 +1017,11 @@ } Py_INCREF(self->unused_data); + Py_SETREF(retval->unused_data, self->unused_data); Py_INCREF(self->unconsumed_tail); + Py_SETREF(retval->unconsumed_tail, self->unconsumed_tail); Py_XINCREF(self->zdict); - Py_XDECREF(retval->unused_data); - Py_XDECREF(retval->unconsumed_tail); - Py_XDECREF(retval->zdict); - retval->unused_data = self->unused_data; - retval->unconsumed_tail = self->unconsumed_tail; - retval->zdict = self->zdict; + Py_SETREF(retval->zdict, self->zdict); retval->eof = self->eof; /* Mark it as being initialized */ diff --git a/Objects/exceptions.c b/Objects/exceptions.c --- a/Objects/exceptions.c +++ b/Objects/exceptions.c @@ -561,12 +561,14 @@ if (size == 0) return 0; - Py_CLEAR(self->code); - if (size == 1) - self->code = PyTuple_GET_ITEM(args, 0); - else /* size > 1 */ - self->code = args; - Py_INCREF(self->code); + if (size == 1) { + Py_INCREF(PyTuple_GET_ITEM(args, 0)); + Py_SETREF(self->code, PyTuple_GET_ITEM(args, 0)); + } + else { /* size > 1 */ + Py_INCREF(args); + Py_SETREF(self->code, args); + } return 0; } @@ -625,9 +627,8 @@ #define GET_KWD(kwd) { \ kwd = PyDict_GetItemString(kwds, #kwd); \ if (kwd) { \ - Py_CLEAR(self->kwd); \ - self->kwd = kwd; \ - Py_INCREF(self->kwd);\ + Py_INCREF(kwd); \ + Py_SETREF(self->kwd, kwd); \ if (PyDict_DelItemString(kwds, #kwd)) \ return -1; \ } \ diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c --- a/Objects/unicodeobject.c +++ b/Objects/unicodeobject.c @@ -14443,8 +14443,8 @@ if (key == NULL) return -1; if (ctx->args_owned) { + ctx->args_owned = 0; Py_DECREF(ctx->args); - ctx->args_owned = 0; } ctx->args = PyObject_GetItem(ctx->dict, key); Py_DECREF(key); diff --git a/Python/ast.c b/Python/ast.c --- a/Python/ast.c +++ b/Python/ast.c @@ -4496,8 +4496,7 @@ return 0; error: - Py_XDECREF(*literal); - *literal = NULL; + Py_CLEAR(*literal); return -1; } @@ -4692,11 +4691,8 @@ state->last_str = str; } else { /* Concatenate this with the previous string. */ - PyObject *temp = PyUnicode_Concat(state->last_str, str); - Py_DECREF(state->last_str); - Py_DECREF(str); - state->last_str = temp; - if (!temp) + PyUnicode_AppendAndDel(&state->last_str, str); + if (!state->last_str) return -1; } FstringParser_check_invariants(state); diff --git a/Python/errors.c b/Python/errors.c --- a/Python/errors.c +++ b/Python/errors.c @@ -315,14 +315,11 @@ tstate = PyThreadState_GET(); if (++tstate->recursion_depth > Py_GetRecursionLimit()) { --tstate->recursion_depth; - /* throw away the old exception... */ - Py_DECREF(*exc); - Py_DECREF(*val); - /* ... and use the recursion error instead */ - *exc = PyExc_RecursionError; - *val = PyExc_RecursionErrorInst; - Py_INCREF(*exc); - Py_INCREF(*val); + /* throw away the old exception and use the recursion error instead */ + Py_INCREF(PyExc_RecursionError); + Py_SETREF(*exc, PyExc_RecursionError); + Py_INCREF(PyExc_RecursionErrorInst); + Py_SETREF(*val, PyExc_RecursionErrorInst); /* just keeping the old traceback */ return; } -- Repository URL: https://hg.python.org/cpython

1 0

cpython (2.7): Issue #20440: More use of Py_SETREF.
by serhiy.storchaka 27 Dec '15

27 Dec '15

https://hg.python.org/cpython/rev/11670e4be1a9 changeset: 99688:11670e4be1a9 branch: 2.7 parent: 99686:e6502bf289ab user: Serhiy Storchaka <storchaka(a)gmail.com> date: Sun Dec 27 15:41:58 2015 +0200 summary: Issue #20440: More use of Py_SETREF. This patch is manually crafted and contains changes that couldn't be handled automatically. files: Modules/_ctypes/_ctypes.c | 3 +- Modules/_elementtree.c | 33 ++++++++++---------------- Modules/_sqlite/cursor.c | 4 +- Modules/zlibmodule.c | 12 +++------ Objects/exceptions.c | 14 ++++++---- Python/errors.c | 13 ++++------ 6 files changed, 33 insertions(+), 46 deletions(-) diff --git a/Modules/_ctypes/_ctypes.c b/Modules/_ctypes/_ctypes.c --- a/Modules/_ctypes/_ctypes.c +++ b/Modules/_ctypes/_ctypes.c @@ -3081,10 +3081,9 @@ "restype must be a type, a callable, or None"); return -1; } - Py_XDECREF(self->checker); Py_INCREF(ob); Py_SETREF(self->restype, ob); - self->checker = PyObject_GetAttrString(ob, "_check_retval_"); + Py_SETREF(self->checker, PyObject_GetAttrString(ob, "_check_retval_")); if (self->checker == NULL) PyErr_Clear(); return 0; diff --git a/Modules/_elementtree.c b/Modules/_elementtree.c --- a/Modules/_elementtree.c +++ b/Modules/_elementtree.c @@ -1573,9 +1573,8 @@ } if (strcmp(name, "tag") == 0) { - Py_DECREF(self->tag); - self->tag = value; - Py_INCREF(self->tag); + Py_INCREF(value); + Py_SETREF(self->tag, value); } else if (strcmp(name, "text") == 0) { Py_DECREF(JOIN_OBJ(self->text)); self->text = value; @@ -1587,9 +1586,8 @@ } else if (strcmp(name, "attrib") == 0) { if (!self->extra) element_new_extra(self, NULL); - Py_DECREF(self->extra->attrib); - self->extra->attrib = value; - Py_INCREF(self->extra->attrib); + Py_INCREF(value); + Py_SETREF(self->extra->attrib, value); } else { PyErr_SetString(PyExc_AttributeError, name); return -1; @@ -1800,13 +1798,11 @@ } self->index++; - Py_DECREF(this); Py_INCREF(node); - self->this = (ElementObject*) node; - - Py_DECREF(self->last); + Py_SETREF(self->this, (ElementObject*) node); + Py_INCREF(node); - self->last = (ElementObject*) node; + Py_SETREF(self->last, (ElementObject*) node); if (treebuilder_append_event(self, self->start_event_obj, node) < 0) goto error; @@ -1857,7 +1853,7 @@ LOCAL(PyObject*) treebuilder_handle_end(TreeBuilderObject* self, PyObject* tag) { - PyObject* item; + ElementObject *item; if (self->data) { if (self->this == self->last) { @@ -1882,15 +1878,12 @@ return NULL; } + item = self->last; + self->last = self->this; self->index--; - - item = PyList_GET_ITEM(self->stack, self->index); - Py_INCREF(item); - - Py_DECREF(self->last); - - self->last = (ElementObject*) self->this; - self->this = (ElementObject*) item; + self->this = (ElementObject *) PyList_GET_ITEM(self->stack, self->index); + Py_INCREF(self->this); + Py_DECREF(item); if (treebuilder_append_event(self, self->end_event_obj, (PyObject*)self->last) < 0) return NULL; diff --git a/Modules/_sqlite/cursor.c b/Modules/_sqlite/cursor.c --- a/Modules/_sqlite/cursor.c +++ b/Modules/_sqlite/cursor.c @@ -558,10 +558,10 @@ if (self->statement) { (void)pysqlite_statement_reset(self->statement); - Py_DECREF(self->statement); } - self->statement = (pysqlite_Statement*)pysqlite_cache_get(self->connection->statement_cache, func_args); + Py_SETREF(self->statement, + (pysqlite_Statement *)pysqlite_cache_get(self->connection->statement_cache, func_args)); Py_DECREF(func_args); if (!self->statement) { diff --git a/Modules/zlibmodule.c b/Modules/zlibmodule.c --- a/Modules/zlibmodule.c +++ b/Modules/zlibmodule.c @@ -731,11 +731,9 @@ } Py_INCREF(self->unused_data); + Py_SETREF(retval->unused_data, self->unused_data); Py_INCREF(self->unconsumed_tail); - Py_XDECREF(retval->unused_data); - Py_XDECREF(retval->unconsumed_tail); - retval->unused_data = self->unused_data; - retval->unconsumed_tail = self->unconsumed_tail; + Py_SETREF(retval->unconsumed_tail, self->unconsumed_tail); /* Mark it as being initialized */ retval->is_initialised = 1; @@ -782,11 +780,9 @@ } Py_INCREF(self->unused_data); + Py_SETREF(retval->unused_data, self->unused_data); Py_INCREF(self->unconsumed_tail); - Py_XDECREF(retval->unused_data); - Py_XDECREF(retval->unconsumed_tail); - retval->unused_data = self->unused_data; - retval->unconsumed_tail = self->unconsumed_tail; + Py_SETREF(retval->unconsumed_tail, self->unconsumed_tail); /* Mark it as being initialized */ retval->is_initialised = 1; diff --git a/Objects/exceptions.c b/Objects/exceptions.c --- a/Objects/exceptions.c +++ b/Objects/exceptions.c @@ -517,12 +517,14 @@ if (size == 0) return 0; - Py_CLEAR(self->code); - if (size == 1) - self->code = PyTuple_GET_ITEM(args, 0); - else if (size > 1) - self->code = args; - Py_INCREF(self->code); + if (size == 1) { + Py_INCREF(PyTuple_GET_ITEM(args, 0)); + Py_SETREF(self->code, PyTuple_GET_ITEM(args, 0)); + } + else { /* size > 1 */ + Py_INCREF(args); + Py_SETREF(self->code, args); + } return 0; } diff --git a/Python/errors.c b/Python/errors.c --- a/Python/errors.c +++ b/Python/errors.c @@ -227,14 +227,11 @@ tstate = PyThreadState_GET(); if (++tstate->recursion_depth > Py_GetRecursionLimit()) { --tstate->recursion_depth; - /* throw away the old exception... */ - Py_DECREF(*exc); - Py_DECREF(*val); - /* ... and use the recursion error instead */ - *exc = PyExc_RuntimeError; - *val = PyExc_RecursionErrorInst; - Py_INCREF(*exc); - Py_INCREF(*val); + /* throw away the old exception and use the recursion error instead */ + Py_INCREF(PyExc_RuntimeError); + Py_SETREF(*exc, PyExc_RuntimeError); + Py_INCREF(PyExc_RecursionErrorInst); + Py_SETREF(*val, PyExc_RecursionErrorInst); /* just keeping the old traceback */ return; } -- Repository URL: https://hg.python.org/cpython

1 0

cpython (3.5): Issue #20440: More use of Py_SETREF.
by serhiy.storchaka 27 Dec '15

27 Dec '15

https://hg.python.org/cpython/rev/4bfbb2714ae9 changeset: 99687:4bfbb2714ae9 branch: 3.5 parent: 99684:9fb57c0209ea user: Serhiy Storchaka <storchaka(a)gmail.com> date: Sun Dec 27 15:41:34 2015 +0200 summary: Issue #20440: More use of Py_SETREF. This patch is manually crafted and contains changes that couldn't be handled automatically. files: Modules/_ctypes/_ctypes.c | 3 +- Modules/_elementtree.c | 38 +++++++++----------------- Modules/_sqlite/cursor.c | 4 +- Modules/zlibmodule.c | 18 ++++-------- Objects/exceptions.c | 19 +++++++------ Objects/unicodeobject.c | 2 +- Python/errors.c | 13 +++----- 7 files changed, 39 insertions(+), 58 deletions(-) diff --git a/Modules/_ctypes/_ctypes.c b/Modules/_ctypes/_ctypes.c --- a/Modules/_ctypes/_ctypes.c +++ b/Modules/_ctypes/_ctypes.c @@ -2983,10 +2983,9 @@ "restype must be a type, a callable, or None"); return -1; } - Py_XDECREF(self->checker); Py_INCREF(ob); Py_SETREF(self->restype, ob); - self->checker = PyObject_GetAttrString(ob, "_check_retval_"); + Py_SETREF(self->checker, PyObject_GetAttrString(ob, "_check_retval_")); if (self->checker == NULL) PyErr_Clear(); return 0; diff --git a/Modules/_elementtree.c b/Modules/_elementtree.c --- a/Modules/_elementtree.c +++ b/Modules/_elementtree.c @@ -935,9 +935,8 @@ return NULL; } - Py_CLEAR(self->tag); - self->tag = tag; - Py_INCREF(self->tag); + Py_INCREF(tag); + Py_SETREF(self->tag, tag); _clear_joined_ptr(&self->text); self->text = text ? JOIN_SET(text, PyList_CheckExact(text)) : Py_None; @@ -980,9 +979,8 @@ /* Stash attrib. */ if (attrib) { - Py_CLEAR(self->extra->attrib); - self->extra->attrib = attrib; Py_INCREF(attrib); + Py_SETREF(self->extra->attrib, attrib); } Py_RETURN_NONE; @@ -1944,9 +1942,8 @@ return -1; if (strcmp(name, "tag") == 0) { - Py_DECREF(self->tag); - self->tag = value; - Py_INCREF(self->tag); + Py_INCREF(value); + Py_SETREF(self->tag, value); } else if (strcmp(name, "text") == 0) { Py_DECREF(JOIN_OBJ(self->text)); self->text = value; @@ -1960,9 +1957,8 @@ if (create_extra(self, NULL) < 0) return -1; } - Py_DECREF(self->extra->attrib); - self->extra->attrib = value; - Py_INCREF(self->extra->attrib); + Py_INCREF(value); + Py_SETREF(self->extra->attrib, value); } else { PyErr_SetString(PyExc_AttributeError, "Can't set arbitrary attributes on Element"); @@ -2554,13 +2550,10 @@ } self->index++; - Py_DECREF(this); Py_INCREF(node); - self->this = node; - - Py_DECREF(self->last); + Py_SETREF(self->this, node); Py_INCREF(node); - self->last = node; + Py_SETREF(self->last, node); if (treebuilder_append_event(self, self->start_event_obj, node) < 0) goto error; @@ -2633,15 +2626,12 @@ return NULL; } + item = self->last; + self->last = self->this; self->index--; - - item = PyList_GET_ITEM(self->stack, self->index); - Py_INCREF(item); - - Py_DECREF(self->last); - - self->last = self->this; - self->this = item; + self->this = PyList_GET_ITEM(self->stack, self->index); + Py_INCREF(self->this); + Py_DECREF(item); if (treebuilder_append_event(self, self->end_event_obj, self->last) < 0) return NULL; diff --git a/Modules/_sqlite/cursor.c b/Modules/_sqlite/cursor.c --- a/Modules/_sqlite/cursor.c +++ b/Modules/_sqlite/cursor.c @@ -524,10 +524,10 @@ if (self->statement) { (void)pysqlite_statement_reset(self->statement); - Py_DECREF(self->statement); } - self->statement = (pysqlite_Statement*)pysqlite_cache_get(self->connection->statement_cache, func_args); + Py_SETREF(self->statement, + (pysqlite_Statement *)pysqlite_cache_get(self->connection->statement_cache, func_args)); Py_DECREF(func_args); if (!self->statement) { diff --git a/Modules/zlibmodule.c b/Modules/zlibmodule.c --- a/Modules/zlibmodule.c +++ b/Modules/zlibmodule.c @@ -961,14 +961,11 @@ goto error; } Py_INCREF(self->unused_data); + Py_SETREF(retval->unused_data, self->unused_data); Py_INCREF(self->unconsumed_tail); + Py_SETREF(retval->unconsumed_tail, self->unconsumed_tail); Py_XINCREF(self->zdict); - Py_XDECREF(retval->unused_data); - Py_XDECREF(retval->unconsumed_tail); - Py_XDECREF(retval->zdict); - retval->unused_data = self->unused_data; - retval->unconsumed_tail = self->unconsumed_tail; - retval->zdict = self->zdict; + Py_SETREF(retval->zdict, self->zdict); retval->eof = self->eof; /* Mark it as being initialized */ @@ -1020,14 +1017,11 @@ } Py_INCREF(self->unused_data); + Py_SETREF(retval->unused_data, self->unused_data); Py_INCREF(self->unconsumed_tail); + Py_SETREF(retval->unconsumed_tail, self->unconsumed_tail); Py_XINCREF(self->zdict); - Py_XDECREF(retval->unused_data); - Py_XDECREF(retval->unconsumed_tail); - Py_XDECREF(retval->zdict); - retval->unused_data = self->unused_data; - retval->unconsumed_tail = self->unconsumed_tail; - retval->zdict = self->zdict; + Py_SETREF(retval->zdict, self->zdict); retval->eof = self->eof; /* Mark it as being initialized */ diff --git a/Objects/exceptions.c b/Objects/exceptions.c --- a/Objects/exceptions.c +++ b/Objects/exceptions.c @@ -561,12 +561,14 @@ if (size == 0) return 0; - Py_CLEAR(self->code); - if (size == 1) - self->code = PyTuple_GET_ITEM(args, 0); - else /* size > 1 */ - self->code = args; - Py_INCREF(self->code); + if (size == 1) { + Py_INCREF(PyTuple_GET_ITEM(args, 0)); + Py_SETREF(self->code, PyTuple_GET_ITEM(args, 0)); + } + else { /* size > 1 */ + Py_INCREF(args); + Py_SETREF(self->code, args); + } return 0; } @@ -625,9 +627,8 @@ #define GET_KWD(kwd) { \ kwd = PyDict_GetItemString(kwds, #kwd); \ if (kwd) { \ - Py_CLEAR(self->kwd); \ - self->kwd = kwd; \ - Py_INCREF(self->kwd);\ + Py_INCREF(kwd); \ + Py_SETREF(self->kwd, kwd); \ if (PyDict_DelItemString(kwds, #kwd)) \ return -1; \ } \ diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c --- a/Objects/unicodeobject.c +++ b/Objects/unicodeobject.c @@ -14191,8 +14191,8 @@ if (key == NULL) return -1; if (ctx->args_owned) { + ctx->args_owned = 0; Py_DECREF(ctx->args); - ctx->args_owned = 0; } ctx->args = PyObject_GetItem(ctx->dict, key); Py_DECREF(key); diff --git a/Python/errors.c b/Python/errors.c --- a/Python/errors.c +++ b/Python/errors.c @@ -315,14 +315,11 @@ tstate = PyThreadState_GET(); if (++tstate->recursion_depth > Py_GetRecursionLimit()) { --tstate->recursion_depth; - /* throw away the old exception... */ - Py_DECREF(*exc); - Py_DECREF(*val); - /* ... and use the recursion error instead */ - *exc = PyExc_RecursionError; - *val = PyExc_RecursionErrorInst; - Py_INCREF(*exc); - Py_INCREF(*val); + /* throw away the old exception and use the recursion error instead */ + Py_INCREF(PyExc_RecursionError); + Py_SETREF(*exc, PyExc_RecursionError); + Py_INCREF(PyExc_RecursionErrorInst); + Py_SETREF(*val, PyExc_RecursionErrorInst); /* just keeping the old traceback */ return; } -- Repository URL: https://hg.python.org/cpython

1 0

peps: Revise implementation strategy for PEP 432
by nick.coghlan 27 Dec '15

27 Dec '15

https://hg.python.org/peps/rev/7e423549e0df changeset: 6143:7e423549e0df user: Nick Coghlan <ncoghlan(a)gmail.com> date: Sun Dec 27 21:44:47 2015 +1000 summary: Revise implementation strategy for PEP 432 files: pep-0432.txt | 96 +++++++++++++++++++++++++++++++-------- 1 files changed, 76 insertions(+), 20 deletions(-) diff --git a/pep-0432.txt b/pep-0432.txt --- a/pep-0432.txt +++ b/pep-0432.txt @@ -7,7 +7,7 @@ Type: Standards Track Content-Type: text/x-rst Created: 28-Dec-2012 -Python-Version: 3.5 +Python-Version: 3.6 Post-History: 28-Dec-2012, 2-Jan-2013 @@ -100,7 +100,7 @@ Key Concerns ============ -There are a couple of key concerns that any change to the startup sequence +There are a few key concerns that any change to the startup sequence needs to take into account. @@ -123,6 +123,17 @@ future to add new configuration options. +Testability +----------- + +One of the problems with the complexity of the CPython startup sequence is the +combinatorial explosion of possible interactions between different configuration +settings. + +This concern impacts both the design of the new initialisation system, and +the proposed approach for getting there. + + Performance ----------- @@ -226,6 +237,54 @@ settings to the new structure). +Implementation Strategy +======================= + +An initial attempt was made at implementing an earlier version of this PEP for +Python 3.4 [2_], with one of the significant problems encountered being merge +conflicts after the initial structural changes were put in place to start the +refactoring process. Unlike some other previous major changes, such as the +switch to an AST-based compiler in Python 2.5, or the switch to the importlib +implementation of the import system in Python 3.3, there is no clear way to +structure a draft implementation that won't be prone to the kinds of merge +conflicts that afflicted the original attempt. + +Accordingly, the implementation strategy now being proposed is to implement this +refactoring as a private API for CPython 3.6, before exposing the new functions +and structures as public API elements in CPython 3.7. + +The affected APIs with a leading underscore, as they would be named in CPython +3.6: + +* ``_Py_IsCoreInitialized`` +* ``_Py_InitializeCore`` +* ``_PyCoreConfig`` +* ``_PyCoreConfig_INIT`` +* ``_Py_ReadHashSeed`` +* ``_Py_InitializeMainInterpreter`` +* ``_PyMainInterpreterConfig`` +* ``_PyMainInterpreterConfig_INIT`` +* ``_Py_ReadMainInterpreterConfig`` +* ``_PyRun_PrepareMain`` +* ``_PyRun_ExecMain`` +* ``_Py_InterpreterState_Main`` + +New APIs described in the rest of the PEP with a leading underscore are +intended to be retained permanently as private CPython implementation details. + +The principle benefit of this approach is allowing the refactoring to adopt the +new configuration structures to be handled on a setting by setting basis +over the course of the 3.6 and 3.7 development cycles, rather than having to +migrate them in a single monolithic change. It also means any new settings can +be handled using the new approach, even if some existing settings have yet to +be migrated. + +If all existing settings are successfully migrated to the new initialization +model in time for the 3.6.0a4 release in August 2016, then the proposal would +be to make the APIs public for the 3.6.0b1 release in September 2016, rather +than waiting for 3.7. + + Design Details ============== @@ -255,7 +314,7 @@ * ``Py_IsInitialized()`` returns ``0`` * The embedding application determines the settings required to create the main interpreter and moves to the next phase by calling - ``Py_InitializationCore``. + ``Py_InitializeCore``. * Core Initialized: @@ -329,8 +388,7 @@ void Py_InitializeCore(const PyCoreConfig *config); -Like ``Py_Initialize``, this part of the new API treats initialization -failures +Like ``Py_Initialize``, this part of the new API treats initialization failures as fatal errors. While that's still not particularly embedding friendly, the operations in this step *really* shouldn't be failing, and changing them to return error codes instead of aborting would be an even larger task than @@ -446,7 +504,7 @@ * Only builtin and frozen modules may be imported (due to above limitations) * ``sys.stderr`` is set to a temporary IO object using unbuffered binary mode -* The ``sys.flags`` attribute exists, but may contain flags may not yet +* The ``sys.flags`` attribute exists, but the individual flags may not yet have their final values. * The ``sys.flags.initialized`` attribute is set to ``0`` * The ``warnings`` module is not yet initialized @@ -466,7 +524,7 @@ Any call to ``Py_InitializeCore()`` must have a matching call to ``Py_Finalize()``. It is acceptable to skip calling ``Py_InitializeMainInterpreter()`` in between (e.g. if attempting to read the -main interpreter configuration settings fails) +main interpreter configuration settings fails). Determining the remaining configuration settings @@ -583,9 +641,9 @@ /* Main module * * If prepare_main is set, at most one of the main_* settings should - * be set before calling PyRun_PrepareMain (Py_ReadConfiguration will - * set one of them based on the command line arguments if prepare_main - * is non-zero when that API is called). + * be set before calling PyRun_PrepareMain (Py_ReadMainInterpreterConfig + * will set one of them based on the command line arguments if + * prepare_main is non-zero when that API is called). int prepare_main; PyUnicodeObject *main_source; /* -c switch */ PyUnicodeObject *main_path; /* filesystem path */ @@ -923,7 +981,7 @@ Issue 16499 [6_] added a ``-I`` option to change the behaviour of the normal CPython executable, but this is a hard to discover solution (and adds yet another option to an already complex CLI). This PEP proposes to -instead add a separate ``pysystem`` executable +instead add a separate ``system-python`` executable Currently, providing a separate executable with different default behaviour would be prohibitively hard to maintain. One of the goals of this PEP is to @@ -965,21 +1023,19 @@ both PyMainInterpreterConfig and PyMainInterpreterConfig_INIT when adding new fields? * The name of the new system Python executable is a bikeshed waiting to be - painted. The 3 options considered so far are ``spython``, ``pysystem`` - and ``python-minimal``. The PEP text reflects my current preferred choice - (``pysystem``). + painted. The 4 options considered so far are ``spython``, ``pysystem``, + ``python-minimal`` and `system-python``. The PEP text reflects my current + preferred choice (``system-python``). Implementation ============== -The reference implementation is being developed as a feature branch in my -BitBucket sandbox [2_]. Pull requests to fix the inevitably broken -Windows builds are welcome, but the basic design is still in too much flux -for other pull requests to be feasible just yet. Once the overall design -settles down and it's a matter of migrating individual settings over to -the new design, that level of collaboration should become more practical. +A reference implementation for an earlier design was developed as a feature +branch in my BitBucket sandbox [2_]. +There is not yet a reference implementation for the design currently +described in the PEP. The Status Quo ============== -- Repository URL: https://hg.python.org/peps

1 0

cpython (merge 3.5 -> default): Issue #20440: Applied yet one patch for using Py_SETREF.
by serhiy.storchaka 27 Dec '15

27 Dec '15

https://hg.python.org/cpython/rev/bc7c56a225de changeset: 99685:bc7c56a225de parent: 99683:ba1e102c3320 parent: 99684:9fb57c0209ea user: Serhiy Storchaka <storchaka(a)gmail.com> date: Sun Dec 27 12:38:28 2015 +0200 summary: Issue #20440: Applied yet one patch for using Py_SETREF. The patch is automatically generated, it replaces the code that uses Py_CLEAR. files: Modules/_bz2module.c | 5 +- Modules/_io/bufferedio.c | 12 +-- Modules/_io/textio.c | 12 +-- Modules/_lzmamodule.c | 5 +- Modules/_pickle.c | 8 +- Modules/_struct.c | 3 +- Modules/cjkcodecs/multibytecodec.c | 3 +- Modules/itertoolsmodule.c | 55 ++++++---------- Objects/exceptions.c | 58 +++++++---------- Objects/rangeobject.c | 8 +- Python/ceval.c | 4 +- 11 files changed, 65 insertions(+), 108 deletions(-) diff --git a/Modules/_bz2module.c b/Modules/_bz2module.c --- a/Modules/_bz2module.c +++ b/Modules/_bz2module.c @@ -540,9 +540,8 @@ if (d->eof) { d->needs_input = 0; if (d->bzs_avail_in_real > 0) { - Py_CLEAR(d->unused_data); - d->unused_data = PyBytes_FromStringAndSize( - bzs->next_in, d->bzs_avail_in_real); + Py_SETREF(d->unused_data, + PyBytes_FromStringAndSize(bzs->next_in, d->bzs_avail_in_real)); if (d->unused_data == NULL) goto error; } diff --git a/Modules/_io/bufferedio.c b/Modules/_io/bufferedio.c --- a/Modules/_io/bufferedio.c +++ b/Modules/_io/bufferedio.c @@ -1196,8 +1196,7 @@ Py_CLEAR(res); goto end; } - Py_CLEAR(res); - res = _PyBytes_Join(_PyIO_empty_bytes, chunks); + Py_SETREF(res, _PyBytes_Join(_PyIO_empty_bytes, chunks)); end: LEAVE_BUFFERED(self) @@ -1452,9 +1451,8 @@ if (_PyIOBase_check_readable(raw, Py_True) == NULL) return -1; - Py_CLEAR(self->raw); Py_INCREF(raw); - self->raw = raw; + Py_SETREF(self->raw, raw); self->buffer_size = buffer_size; self->readable = 1; self->writable = 0; @@ -1805,9 +1803,8 @@ if (_PyIOBase_check_writable(raw, Py_True) == NULL) return -1; - Py_CLEAR(self->raw); Py_INCREF(raw); - self->raw = raw; + Py_SETREF(self->raw, raw); self->readable = 0; self->writable = 1; @@ -2309,9 +2306,8 @@ if (_PyIOBase_check_writable(raw, Py_True) == NULL) return -1; - Py_CLEAR(self->raw); Py_INCREF(raw); - self->raw = raw; + Py_SETREF(self->raw, raw); self->buffer_size = buffer_size; self->readable = 1; self->writable = 1; diff --git a/Modules/_io/textio.c b/Modules/_io/textio.c --- a/Modules/_io/textio.c +++ b/Modules/_io/textio.c @@ -995,8 +995,7 @@ "Oi", self->decoder, (int)self->readtranslate); if (incrementalDecoder == NULL) goto error; - Py_CLEAR(self->decoder); - self->decoder = incrementalDecoder; + Py_SETREF(self->decoder, incrementalDecoder); } } @@ -1374,8 +1373,7 @@ static void textiowrapper_set_decoded_chars(textio *self, PyObject *chars) { - Py_CLEAR(self->decoded_chars); - self->decoded_chars = chars; + Py_SETREF(self->decoded_chars, chars); self->decoded_chars_used = 0; } @@ -1523,8 +1521,7 @@ dec_buffer = NULL; /* Reference lost to PyBytes_Concat */ goto fail; } - Py_CLEAR(self->snapshot); - self->snapshot = Py_BuildValue("NN", dec_flags, next_input); + Py_SETREF(self->snapshot, Py_BuildValue("NN", dec_flags, next_input)); } Py_DECREF(input_chunk); @@ -1630,8 +1627,7 @@ if (chunks != NULL) { if (result != NULL && PyList_Append(chunks, result) < 0) goto fail; - Py_CLEAR(result); - result = PyUnicode_Join(_PyIO_empty_str, chunks); + Py_SETREF(result, PyUnicode_Join(_PyIO_empty_str, chunks)); if (result == NULL) goto fail; Py_CLEAR(chunks); diff --git a/Modules/_lzmamodule.c b/Modules/_lzmamodule.c --- a/Modules/_lzmamodule.c +++ b/Modules/_lzmamodule.c @@ -1011,9 +1011,8 @@ if (d->eof) { d->needs_input = 0; if (lzs->avail_in > 0) { - Py_CLEAR(d->unused_data); - d->unused_data = PyBytes_FromStringAndSize( - (char *)lzs->next_in, lzs->avail_in); + Py_SETREF(d->unused_data, + PyBytes_FromStringAndSize((char *)lzs->next_in, lzs->avail_in)); if (d->unused_data == NULL) goto error; } diff --git a/Modules/_pickle.c b/Modules/_pickle.c --- a/Modules/_pickle.c +++ b/Modules/_pickle.c @@ -869,9 +869,8 @@ static int _Pickler_ClearBuffer(PicklerObject *self) { - Py_CLEAR(self->output_buffer); - self->output_buffer = - PyBytes_FromStringAndSize(NULL, self->max_output_len); + Py_SETREF(self->output_buffer, + PyBytes_FromStringAndSize(NULL, self->max_output_len)); if (self->output_buffer == NULL) return -1; self->output_len = 0; @@ -3116,9 +3115,8 @@ Py_TYPE(item)->tp_name); return -1; } - Py_CLEAR(*module_name); Py_INCREF(item); - *module_name = item; + Py_SETREF(*module_name, item); } else if (PyErr_Occurred()) { return -1; diff --git a/Modules/_struct.c b/Modules/_struct.c --- a/Modules/_struct.c +++ b/Modules/_struct.c @@ -1437,8 +1437,7 @@ return -1; } - Py_CLEAR(soself->s_format); - soself->s_format = o_format; + Py_SETREF(soself->s_format, o_format); ret = prepare_s(soself); return ret; diff --git a/Modules/cjkcodecs/multibytecodec.c b/Modules/cjkcodecs/multibytecodec.c --- a/Modules/cjkcodecs/multibytecodec.c +++ b/Modules/cjkcodecs/multibytecodec.c @@ -793,8 +793,7 @@ ctx->errors, final ? MBENC_FLUSH | MBENC_RESET : 0); if (r == NULL) { /* recover the original pending buffer */ - Py_CLEAR(ctx->pending); - ctx->pending = origpending; + Py_SETREF(ctx->pending, origpending); origpending = NULL; goto errorexit; } diff --git a/Modules/itertoolsmodule.c b/Modules/itertoolsmodule.c --- a/Modules/itertoolsmodule.c +++ b/Modules/itertoolsmodule.c @@ -158,15 +158,12 @@ PyObject *currkey, *currvalue, *tgtkey; if (!PyArg_ParseTuple(state, "OOO", &currkey, &currvalue, &tgtkey)) return NULL; - Py_CLEAR(lz->currkey); - lz->currkey = currkey; - Py_INCREF(lz->currkey); - Py_CLEAR(lz->currvalue); - lz->currvalue = currvalue; - Py_INCREF(lz->currvalue); - Py_CLEAR(lz->tgtkey); - lz->tgtkey = tgtkey; - Py_INCREF(lz->tgtkey); + Py_INCREF(currkey); + Py_SETREF(lz->currkey, currkey); + Py_INCREF(currvalue); + Py_SETREF(lz->currvalue, currvalue); + Py_INCREF(tgtkey); + Py_SETREF(lz->tgtkey, tgtkey); Py_RETURN_NONE; } @@ -745,9 +742,8 @@ PyErr_SetString(PyExc_ValueError, "Index out of range"); return NULL; } - Py_CLEAR(to->dataobj); - to->dataobj = tdo; - Py_INCREF(to->dataobj); + Py_INCREF(tdo); + Py_SETREF(to->dataobj, tdo); to->index = index; Py_RETURN_NONE; } @@ -988,8 +984,7 @@ if (!PyArg_ParseTuple(state, "O!i", &PyList_Type, &saved, &firstpass)) return NULL; Py_INCREF(saved); - Py_CLEAR(lz->saved); - lz->saved = saved; + Py_SETREF(lz->saved, saved); lz->firstpass = firstpass != 0; lz->index = 0; Py_RETURN_NONE; @@ -1920,12 +1915,10 @@ if (! PyArg_ParseTuple(state, "O|O", &source, &active)) return NULL; - Py_CLEAR(lz->source); - lz->source = source; - Py_INCREF(lz->source); - Py_CLEAR(lz->active); - lz->active = active; - Py_XINCREF(lz->active); + Py_INCREF(source); + Py_SETREF(lz->source, source); + Py_XINCREF(active); + Py_SETREF(lz->active, active); Py_RETURN_NONE; } @@ -2282,8 +2275,7 @@ Py_INCREF(element); PyTuple_SET_ITEM(result, i, element); } - Py_CLEAR(lz->result); - lz->result = result; + Py_SETREF(lz->result, result); Py_RETURN_NONE; } @@ -2604,8 +2596,7 @@ PyTuple_SET_ITEM(result, i, element); } - Py_CLEAR(lz->result); - lz->result = result; + Py_SETREF(lz->result, result); Py_RETURN_NONE; } @@ -2935,8 +2926,7 @@ Py_INCREF(element); PyTuple_SET_ITEM(result, i, element); } - Py_CLEAR(lz->result); - lz->result = result; + Py_SETREF(lz->result, result); Py_RETURN_NONE; } @@ -3324,8 +3314,7 @@ Py_INCREF(element); PyTuple_SET_ITEM(result, i, element); } - Py_CLEAR(po->result); - po->result = result; + Py_SETREF(po->result, result); Py_RETURN_NONE; } @@ -3495,9 +3484,8 @@ static PyObject * accumulate_setstate(accumulateobject *lz, PyObject *state) { - Py_CLEAR(lz->total); - lz->total = state; - Py_INCREF(lz->total); + Py_INCREF(state); + Py_SETREF(lz->total, state); Py_RETURN_NONE; } @@ -4475,9 +4463,8 @@ static PyObject * zip_longest_setstate(ziplongestobject *lz, PyObject *state) { - Py_CLEAR(lz->fillvalue); - lz->fillvalue = state; - Py_INCREF(lz->fillvalue); + Py_INCREF(state); + Py_SETREF(lz->fillvalue, state); Py_RETURN_NONE; } diff --git a/Objects/exceptions.c b/Objects/exceptions.c --- a/Objects/exceptions.c +++ b/Objects/exceptions.c @@ -206,8 +206,7 @@ seq = PySequence_Tuple(val); if (!seq) return -1; - Py_CLEAR(self->args); - self->args = seq; + Py_SETREF(self->args, seq); return 0; } @@ -646,9 +645,8 @@ if (!PyArg_UnpackTuple(args, "ImportError", 1, 1, &msg)) return -1; - Py_CLEAR(self->msg); /* replacing */ - self->msg = msg; - Py_INCREF(self->msg); + Py_INCREF(msg); + Py_SETREF(self->msg, msg); return 0; } @@ -858,8 +856,7 @@ #endif /* Steals the reference to args */ - Py_CLEAR(self->args); - self->args = args; + Py_SETREF(self->args, args); *p_args = args = NULL; return 0; @@ -1278,9 +1275,8 @@ return -1; if (lenargs >= 1) { - Py_CLEAR(self->msg); - self->msg = PyTuple_GET_ITEM(args, 0); - Py_INCREF(self->msg); + Py_INCREF(PyTuple_GET_ITEM(args, 0)); + Py_SETREF(self->msg, PyTuple_GET_ITEM(args, 0)); } if (lenargs == 2) { info = PyTuple_GET_ITEM(args, 1); @@ -1295,21 +1291,17 @@ return -1; } - Py_CLEAR(self->filename); - self->filename = PyTuple_GET_ITEM(info, 0); - Py_INCREF(self->filename); - - Py_CLEAR(self->lineno); - self->lineno = PyTuple_GET_ITEM(info, 1); - Py_INCREF(self->lineno); - - Py_CLEAR(self->offset); - self->offset = PyTuple_GET_ITEM(info, 2); - Py_INCREF(self->offset); - - Py_CLEAR(self->text); - self->text = PyTuple_GET_ITEM(info, 3); - Py_INCREF(self->text); + Py_INCREF(PyTuple_GET_ITEM(info, 0)); + Py_SETREF(self->filename, PyTuple_GET_ITEM(info, 0)); + + Py_INCREF(PyTuple_GET_ITEM(info, 1)); + Py_SETREF(self->lineno, PyTuple_GET_ITEM(info, 1)); + + Py_INCREF(PyTuple_GET_ITEM(info, 2)); + Py_SETREF(self->offset, PyTuple_GET_ITEM(info, 2)); + + Py_INCREF(PyTuple_GET_ITEM(info, 3)); + Py_SETREF(self->text, PyTuple_GET_ITEM(info, 3)); Py_DECREF(info); @@ -1554,8 +1546,7 @@ PyObject *obj = PyUnicode_FromString(value); if (!obj) return -1; - Py_CLEAR(*attr); - *attr = obj; + Py_SETREF(*attr, obj); return 0; } @@ -1961,8 +1952,7 @@ Py_buffer view; if (PyObject_GetBuffer(ude->object, &view, PyBUF_SIMPLE) != 0) goto error; - Py_CLEAR(ude->object); - ude->object = PyBytes_FromStringAndSize(view.buf, view.len); + Py_SETREF(ude->object, PyBytes_FromStringAndSize(view.buf, view.len)); PyBuffer_Release(&view); if (!ude->object) goto error; @@ -2871,9 +2861,8 @@ } if (PyUnicode_Tailmatch(self->text, print_prefix, start, text_len, -1)) { - Py_CLEAR(self->msg); - self->msg = PyUnicode_FromString( - "Missing parentheses in call to 'print'"); + Py_SETREF(self->msg, + PyUnicode_FromString("Missing parentheses in call to 'print'")); return 1; } @@ -2886,9 +2875,8 @@ } if (PyUnicode_Tailmatch(self->text, exec_prefix, start, text_len, -1)) { - Py_CLEAR(self->msg); - self->msg = PyUnicode_FromString( - "Missing parentheses in call to 'exec'"); + Py_SETREF(self->msg, + PyUnicode_FromString("Missing parentheses in call to 'exec'")); return 1; } /* Fall back to the default error message */ diff --git a/Objects/rangeobject.c b/Objects/rangeobject.c --- a/Objects/rangeobject.c +++ b/Objects/rangeobject.c @@ -1001,8 +1001,7 @@ return NULL; cmp = PyObject_RichCompareBool(state, zero, Py_LT); if (cmp > 0) { - Py_CLEAR(r->index); - r->index = zero; + Py_SETREF(r->index, zero); Py_RETURN_NONE; } Py_DECREF(zero); @@ -1015,9 +1014,8 @@ if (cmp > 0) state = r->len; - Py_CLEAR(r->index); - r->index = state; - Py_INCREF(r->index); + Py_INCREF(state); + Py_SETREF(r->index, state); Py_RETURN_NONE; } diff --git a/Python/ceval.c b/Python/ceval.c --- a/Python/ceval.c +++ b/Python/ceval.c @@ -4474,10 +4474,8 @@ { PyThreadState *tstate = PyThreadState_GET(); - Py_CLEAR(tstate->coroutine_wrapper); - Py_XINCREF(wrapper); - tstate->coroutine_wrapper = wrapper; + Py_SETREF(tstate->coroutine_wrapper, wrapper); } PyObject * -- Repository URL: https://hg.python.org/cpython

1 0

cpython (2.7): Issue #20440: Applied yet one patch for using Py_SETREF.
by serhiy.storchaka 27 Dec '15

27 Dec '15

https://hg.python.org/cpython/rev/e6502bf289ab changeset: 99686:e6502bf289ab branch: 2.7 parent: 99678:512a628c683e user: Serhiy Storchaka <storchaka(a)gmail.com> date: Sun Dec 27 12:38:48 2015 +0200 summary: Issue #20440: Applied yet one patch for using Py_SETREF. The patch is automatically generated, it replaces the code that uses Py_CLEAR. files: Modules/_io/bufferedio.c | 12 +--- Modules/_io/textio.c | 15 ++---- Modules/_struct.c | 6 +- Objects/exceptions.c | 57 ++++++++++----------------- 4 files changed, 33 insertions(+), 57 deletions(-) diff --git a/Modules/_io/bufferedio.c b/Modules/_io/bufferedio.c --- a/Modules/_io/bufferedio.c +++ b/Modules/_io/bufferedio.c @@ -1028,8 +1028,7 @@ Py_CLEAR(res); goto end; } - Py_CLEAR(res); - res = _PyBytes_Join(_PyIO_empty_bytes, chunks); + Py_SETREF(res, _PyBytes_Join(_PyIO_empty_bytes, chunks)); end: LEAVE_BUFFERED(self) @@ -1264,9 +1263,8 @@ if (_PyIOBase_check_readable(raw, Py_True) == NULL) return -1; - Py_CLEAR(self->raw); Py_INCREF(raw); - self->raw = raw; + Py_SETREF(self->raw, raw); self->buffer_size = buffer_size; self->readable = 1; self->writable = 0; @@ -1687,9 +1685,8 @@ if (_PyIOBase_check_writable(raw, Py_True) == NULL) return -1; - Py_CLEAR(self->raw); Py_INCREF(raw); - self->raw = raw; + Py_SETREF(self->raw, raw); self->readable = 0; self->writable = 1; @@ -2344,9 +2341,8 @@ if (_PyIOBase_check_writable(raw, Py_True) == NULL) return -1; - Py_CLEAR(self->raw); Py_INCREF(raw); - self->raw = raw; + Py_SETREF(self->raw, raw); self->buffer_size = buffer_size; self->readable = 1; self->writable = 1; diff --git a/Modules/_io/textio.c b/Modules/_io/textio.c --- a/Modules/_io/textio.c +++ b/Modules/_io/textio.c @@ -966,8 +966,7 @@ "Oi", self->decoder, (int)self->readtranslate); if (incrementalDecoder == NULL) goto error; - Py_CLEAR(self->decoder); - self->decoder = incrementalDecoder; + Py_SETREF(self->decoder, incrementalDecoder); } } @@ -1347,8 +1346,7 @@ static void textiowrapper_set_decoded_chars(textio *self, PyObject *chars) { - Py_CLEAR(self->decoded_chars); - self->decoded_chars = chars; + Py_SETREF(self->decoded_chars, chars); self->decoded_chars_used = 0; } @@ -1477,8 +1475,7 @@ goto fail; } Py_DECREF(dec_buffer); - Py_CLEAR(self->snapshot); - self->snapshot = Py_BuildValue("NN", dec_flags, next_input); + Py_SETREF(self->snapshot, Py_BuildValue("NN", dec_flags, next_input)); } Py_DECREF(input_chunk); @@ -1578,8 +1575,7 @@ if (chunks != NULL) { if (result != NULL && PyList_Append(chunks, result) < 0) goto fail; - Py_CLEAR(result); - result = PyUnicode_Join(_PyIO_empty_str, chunks); + Py_SETREF(result, PyUnicode_Join(_PyIO_empty_str, chunks)); if (result == NULL) goto fail; Py_CLEAR(chunks); @@ -1836,8 +1832,7 @@ if (chunks != NULL) { if (line != NULL && PyList_Append(chunks, line) < 0) goto error; - Py_CLEAR(line); - line = PyUnicode_Join(_PyIO_empty_str, chunks); + Py_SETREF(line, PyUnicode_Join(_PyIO_empty_str, chunks)); if (line == NULL) goto error; Py_DECREF(chunks); diff --git a/Modules/_struct.c b/Modules/_struct.c --- a/Modules/_struct.c +++ b/Modules/_struct.c @@ -1377,15 +1377,13 @@ if (PyString_Check(o_format)) { Py_INCREF(o_format); - Py_CLEAR(soself->s_format); - soself->s_format = o_format; + Py_SETREF(soself->s_format, o_format); } else if (PyUnicode_Check(o_format)) { PyObject *str = PyUnicode_AsEncodedString(o_format, "ascii", NULL); if (str == NULL) return -1; - Py_CLEAR(soself->s_format); - soself->s_format = str; + Py_SETREF(soself->s_format, str); } else { PyErr_Format(PyExc_TypeError, diff --git a/Objects/exceptions.c b/Objects/exceptions.c --- a/Objects/exceptions.c +++ b/Objects/exceptions.c @@ -62,9 +62,8 @@ Py_SETREF(self->args, args); if (PyTuple_GET_SIZE(self->args) == 1) { - Py_CLEAR(self->message); - self->message = PyTuple_GET_ITEM(self->args, 0); - Py_INCREF(self->message); + Py_INCREF(PyTuple_GET_ITEM(self->args, 0)); + Py_SETREF(self->message, PyTuple_GET_ITEM(self->args, 0)); } return 0; } @@ -279,9 +278,8 @@ PyErr_SetString(PyExc_TypeError, "__dict__ must be a dictionary"); return -1; } - Py_CLEAR(self->dict); Py_INCREF(val); - self->dict = val; + Py_SETREF(self->dict, val); return 0; } @@ -307,8 +305,7 @@ seq = PySequence_Tuple(val); if (!seq) return -1; - Py_CLEAR(self->args); - self->args = seq; + Py_SETREF(self->args, seq); return 0; } @@ -608,19 +605,16 @@ &myerrno, &strerror, &filename)) { return -1; } - Py_CLEAR(self->myerrno); /* replacing */ - self->myerrno = myerrno; - Py_INCREF(self->myerrno); + Py_INCREF(myerrno); + Py_SETREF(self->myerrno, myerrno); - Py_CLEAR(self->strerror); /* replacing */ - self->strerror = strerror; - Py_INCREF(self->strerror); + Py_INCREF(strerror); + Py_SETREF(self->strerror, strerror); /* self->filename will remain Py_None otherwise */ if (filename != NULL) { - Py_CLEAR(self->filename); /* replacing */ - self->filename = filename; - Py_INCREF(self->filename); + Py_INCREF(filename); + Py_SETREF(self->filename, filename); subslice = PyTuple_GetSlice(args, 0, 2); if (!subslice) @@ -877,8 +871,7 @@ return -1; posix_errno = winerror_to_errno(errcode); - Py_CLEAR(self->winerror); - self->winerror = self->myerrno; + Py_SETREF(self->winerror, self->myerrno); o_errcode = PyInt_FromLong(posix_errno); if (!o_errcode) @@ -1063,9 +1056,8 @@ return -1; if (lenargs >= 1) { - Py_CLEAR(self->msg); - self->msg = PyTuple_GET_ITEM(args, 0); - Py_INCREF(self->msg); + Py_INCREF(PyTuple_GET_ITEM(args, 0)); + Py_SETREF(self->msg, PyTuple_GET_ITEM(args, 0)); } if (lenargs == 2) { info = PyTuple_GET_ITEM(args, 1); @@ -1080,21 +1072,17 @@ return -1; } - Py_CLEAR(self->filename); - self->filename = PyTuple_GET_ITEM(info, 0); - Py_INCREF(self->filename); + Py_INCREF(PyTuple_GET_ITEM(info, 0)); + Py_SETREF(self->filename, PyTuple_GET_ITEM(info, 0)); - Py_CLEAR(self->lineno); - self->lineno = PyTuple_GET_ITEM(info, 1); - Py_INCREF(self->lineno); + Py_INCREF(PyTuple_GET_ITEM(info, 1)); + Py_SETREF(self->lineno, PyTuple_GET_ITEM(info, 1)); - Py_CLEAR(self->offset); - self->offset = PyTuple_GET_ITEM(info, 2); - Py_INCREF(self->offset); + Py_INCREF(PyTuple_GET_ITEM(info, 2)); + Py_SETREF(self->offset, PyTuple_GET_ITEM(info, 2)); - Py_CLEAR(self->text); - self->text = PyTuple_GET_ITEM(info, 3); - Py_INCREF(self->text); + Py_INCREF(PyTuple_GET_ITEM(info, 3)); + Py_SETREF(self->text, PyTuple_GET_ITEM(info, 3)); Py_DECREF(info); } @@ -1327,8 +1315,7 @@ PyObject *obj = PyString_FromString(value); if (!obj) return -1; - Py_CLEAR(*attr); - *attr = obj; + Py_SETREF(*attr, obj); return 0; } -- Repository URL: https://hg.python.org/cpython

1 0

cpython (3.5): Issue #20440: Applied yet one patch for using Py_SETREF.
by serhiy.storchaka 27 Dec '15

27 Dec '15

https://hg.python.org/cpython/rev/9fb57c0209ea changeset: 99684:9fb57c0209ea branch: 3.5 parent: 99682:2af2367d7eda user: Serhiy Storchaka <storchaka(a)gmail.com> date: Sun Dec 27 12:36:18 2015 +0200 summary: Issue #20440: Applied yet one patch for using Py_SETREF. The patch is automatically generated, it replaces the code that uses Py_CLEAR. files: Modules/_bz2module.c | 5 +- Modules/_io/bufferedio.c | 12 +-- Modules/_io/textio.c | 12 +-- Modules/_lzmamodule.c | 5 +- Modules/_pickle.c | 8 +- Modules/_struct.c | 3 +- Modules/cjkcodecs/multibytecodec.c | 3 +- Modules/itertoolsmodule.c | 57 ++++++---------- Objects/exceptions.c | 58 +++++++---------- Objects/rangeobject.c | 8 +- Python/ceval.c | 4 +- 11 files changed, 66 insertions(+), 109 deletions(-) diff --git a/Modules/_bz2module.c b/Modules/_bz2module.c --- a/Modules/_bz2module.c +++ b/Modules/_bz2module.c @@ -540,9 +540,8 @@ if (d->eof) { d->needs_input = 0; if (d->bzs_avail_in_real > 0) { - Py_CLEAR(d->unused_data); - d->unused_data = PyBytes_FromStringAndSize( - bzs->next_in, d->bzs_avail_in_real); + Py_SETREF(d->unused_data, + PyBytes_FromStringAndSize(bzs->next_in, d->bzs_avail_in_real)); if (d->unused_data == NULL) goto error; } diff --git a/Modules/_io/bufferedio.c b/Modules/_io/bufferedio.c --- a/Modules/_io/bufferedio.c +++ b/Modules/_io/bufferedio.c @@ -1196,8 +1196,7 @@ Py_CLEAR(res); goto end; } - Py_CLEAR(res); - res = _PyBytes_Join(_PyIO_empty_bytes, chunks); + Py_SETREF(res, _PyBytes_Join(_PyIO_empty_bytes, chunks)); end: LEAVE_BUFFERED(self) @@ -1452,9 +1451,8 @@ if (_PyIOBase_check_readable(raw, Py_True) == NULL) return -1; - Py_CLEAR(self->raw); Py_INCREF(raw); - self->raw = raw; + Py_SETREF(self->raw, raw); self->buffer_size = buffer_size; self->readable = 1; self->writable = 0; @@ -1805,9 +1803,8 @@ if (_PyIOBase_check_writable(raw, Py_True) == NULL) return -1; - Py_CLEAR(self->raw); Py_INCREF(raw); - self->raw = raw; + Py_SETREF(self->raw, raw); self->readable = 0; self->writable = 1; @@ -2309,9 +2306,8 @@ if (_PyIOBase_check_writable(raw, Py_True) == NULL) return -1; - Py_CLEAR(self->raw); Py_INCREF(raw); - self->raw = raw; + Py_SETREF(self->raw, raw); self->buffer_size = buffer_size; self->readable = 1; self->writable = 1; diff --git a/Modules/_io/textio.c b/Modules/_io/textio.c --- a/Modules/_io/textio.c +++ b/Modules/_io/textio.c @@ -995,8 +995,7 @@ "Oi", self->decoder, (int)self->readtranslate); if (incrementalDecoder == NULL) goto error; - Py_CLEAR(self->decoder); - self->decoder = incrementalDecoder; + Py_SETREF(self->decoder, incrementalDecoder); } } @@ -1374,8 +1373,7 @@ static void textiowrapper_set_decoded_chars(textio *self, PyObject *chars) { - Py_CLEAR(self->decoded_chars); - self->decoded_chars = chars; + Py_SETREF(self->decoded_chars, chars); self->decoded_chars_used = 0; } @@ -1523,8 +1521,7 @@ dec_buffer = NULL; /* Reference lost to PyBytes_Concat */ goto fail; } - Py_CLEAR(self->snapshot); - self->snapshot = Py_BuildValue("NN", dec_flags, next_input); + Py_SETREF(self->snapshot, Py_BuildValue("NN", dec_flags, next_input)); } Py_DECREF(input_chunk); @@ -1630,8 +1627,7 @@ if (chunks != NULL) { if (result != NULL && PyList_Append(chunks, result) < 0) goto fail; - Py_CLEAR(result); - result = PyUnicode_Join(_PyIO_empty_str, chunks); + Py_SETREF(result, PyUnicode_Join(_PyIO_empty_str, chunks)); if (result == NULL) goto fail; Py_CLEAR(chunks); diff --git a/Modules/_lzmamodule.c b/Modules/_lzmamodule.c --- a/Modules/_lzmamodule.c +++ b/Modules/_lzmamodule.c @@ -1011,9 +1011,8 @@ if (d->eof) { d->needs_input = 0; if (lzs->avail_in > 0) { - Py_CLEAR(d->unused_data); - d->unused_data = PyBytes_FromStringAndSize( - (char *)lzs->next_in, lzs->avail_in); + Py_SETREF(d->unused_data, + PyBytes_FromStringAndSize((char *)lzs->next_in, lzs->avail_in)); if (d->unused_data == NULL) goto error; } diff --git a/Modules/_pickle.c b/Modules/_pickle.c --- a/Modules/_pickle.c +++ b/Modules/_pickle.c @@ -846,9 +846,8 @@ static int _Pickler_ClearBuffer(PicklerObject *self) { - Py_CLEAR(self->output_buffer); - self->output_buffer = - PyBytes_FromStringAndSize(NULL, self->max_output_len); + Py_SETREF(self->output_buffer, + PyBytes_FromStringAndSize(NULL, self->max_output_len)); if (self->output_buffer == NULL) return -1; self->output_len = 0; @@ -3089,9 +3088,8 @@ Py_TYPE(item)->tp_name); return -1; } - Py_CLEAR(*module_name); Py_INCREF(item); - *module_name = item; + Py_SETREF(*module_name, item); } else if (PyErr_Occurred()) { return -1; diff --git a/Modules/_struct.c b/Modules/_struct.c --- a/Modules/_struct.c +++ b/Modules/_struct.c @@ -1437,8 +1437,7 @@ return -1; } - Py_CLEAR(soself->s_format); - soself->s_format = o_format; + Py_SETREF(soself->s_format, o_format); ret = prepare_s(soself); return ret; diff --git a/Modules/cjkcodecs/multibytecodec.c b/Modules/cjkcodecs/multibytecodec.c --- a/Modules/cjkcodecs/multibytecodec.c +++ b/Modules/cjkcodecs/multibytecodec.c @@ -793,8 +793,7 @@ ctx->errors, final ? MBENC_FLUSH | MBENC_RESET : 0); if (r == NULL) { /* recover the original pending buffer */ - Py_CLEAR(ctx->pending); - ctx->pending = origpending; + Py_SETREF(ctx->pending, origpending); origpending = NULL; goto errorexit; } diff --git a/Modules/itertoolsmodule.c b/Modules/itertoolsmodule.c --- a/Modules/itertoolsmodule.c +++ b/Modules/itertoolsmodule.c @@ -159,15 +159,12 @@ PyObject *currkey, *currvalue, *tgtkey; if (!PyArg_ParseTuple(state, "OOO", &currkey, &currvalue, &tgtkey)) return NULL; - Py_CLEAR(lz->currkey); - lz->currkey = currkey; - Py_INCREF(lz->currkey); - Py_CLEAR(lz->currvalue); - lz->currvalue = currvalue; - Py_INCREF(lz->currvalue); - Py_CLEAR(lz->tgtkey); - lz->tgtkey = tgtkey; - Py_INCREF(lz->tgtkey); + Py_INCREF(currkey); + Py_SETREF(lz->currkey, currkey); + Py_INCREF(currvalue); + Py_SETREF(lz->currvalue, currvalue); + Py_INCREF(tgtkey); + Py_SETREF(lz->tgtkey, tgtkey); Py_RETURN_NONE; } @@ -747,9 +744,8 @@ PyErr_SetString(PyExc_ValueError, "Index out of range"); return NULL; } - Py_CLEAR(to->dataobj); - to->dataobj = tdo; - Py_INCREF(to->dataobj); + Py_INCREF(tdo); + Py_SETREF(to->dataobj, tdo); to->index = index; Py_RETURN_NONE; } @@ -974,9 +970,8 @@ int firstpass; if (!PyArg_ParseTuple(state, "Oi", &saved, &firstpass)) return NULL; - Py_CLEAR(lz->saved); - lz->saved = saved; - Py_XINCREF(lz->saved); + Py_XINCREF(saved); + Py_SETREF(lz->saved, saved); lz->firstpass = firstpass != 0; Py_RETURN_NONE; } @@ -1901,12 +1896,10 @@ if (! PyArg_ParseTuple(state, "O|O", &source, &active)) return NULL; - Py_CLEAR(lz->source); - lz->source = source; - Py_INCREF(lz->source); - Py_CLEAR(lz->active); - lz->active = active; - Py_XINCREF(lz->active); + Py_INCREF(source); + Py_SETREF(lz->source, source); + Py_XINCREF(active); + Py_SETREF(lz->active, active); Py_RETURN_NONE; } @@ -2262,8 +2255,7 @@ Py_INCREF(element); PyTuple_SET_ITEM(result, i, element); } - Py_CLEAR(lz->result); - lz->result = result; + Py_SETREF(lz->result, result); Py_RETURN_NONE; } @@ -2585,8 +2577,7 @@ PyTuple_SET_ITEM(result, i, element); } - Py_CLEAR(lz->result); - lz->result = result; + Py_SETREF(lz->result, result); Py_RETURN_NONE; } @@ -2916,8 +2907,7 @@ Py_INCREF(element); PyTuple_SET_ITEM(result, i, element); } - Py_CLEAR(lz->result); - lz->result = result; + Py_SETREF(lz->result, result); Py_RETURN_NONE; } @@ -3310,8 +3300,7 @@ Py_INCREF(element); PyTuple_SET_ITEM(result, i, element); } - Py_CLEAR(po->result); - po->result = result; + Py_SETREF(po->result, result); Py_RETURN_NONE; } @@ -3481,9 +3470,8 @@ static PyObject * accumulate_setstate(accumulateobject *lz, PyObject *state) { - Py_CLEAR(lz->total); - lz->total = state; - Py_INCREF(lz->total); + Py_INCREF(state); + Py_SETREF(lz->total, state); Py_RETURN_NONE; } @@ -4464,9 +4452,8 @@ static PyObject * zip_longest_setstate(ziplongestobject *lz, PyObject *state) { - Py_CLEAR(lz->fillvalue); - lz->fillvalue = state; - Py_INCREF(lz->fillvalue); + Py_INCREF(state); + Py_SETREF(lz->fillvalue, state); Py_RETURN_NONE; } diff --git a/Objects/exceptions.c b/Objects/exceptions.c --- a/Objects/exceptions.c +++ b/Objects/exceptions.c @@ -206,8 +206,7 @@ seq = PySequence_Tuple(val); if (!seq) return -1; - Py_CLEAR(self->args); - self->args = seq; + Py_SETREF(self->args, seq); return 0; } @@ -646,9 +645,8 @@ if (!PyArg_UnpackTuple(args, "ImportError", 1, 1, &msg)) return -1; - Py_CLEAR(self->msg); /* replacing */ - self->msg = msg; - Py_INCREF(self->msg); + Py_INCREF(msg); + Py_SETREF(self->msg, msg); return 0; } @@ -858,8 +856,7 @@ #endif /* Steals the reference to args */ - Py_CLEAR(self->args); - self->args = args; + Py_SETREF(self->args, args); *p_args = args = NULL; return 0; @@ -1278,9 +1275,8 @@ return -1; if (lenargs >= 1) { - Py_CLEAR(self->msg); - self->msg = PyTuple_GET_ITEM(args, 0); - Py_INCREF(self->msg); + Py_INCREF(PyTuple_GET_ITEM(args, 0)); + Py_SETREF(self->msg, PyTuple_GET_ITEM(args, 0)); } if (lenargs == 2) { info = PyTuple_GET_ITEM(args, 1); @@ -1295,21 +1291,17 @@ return -1; } - Py_CLEAR(self->filename); - self->filename = PyTuple_GET_ITEM(info, 0); - Py_INCREF(self->filename); - - Py_CLEAR(self->lineno); - self->lineno = PyTuple_GET_ITEM(info, 1); - Py_INCREF(self->lineno); - - Py_CLEAR(self->offset); - self->offset = PyTuple_GET_ITEM(info, 2); - Py_INCREF(self->offset); - - Py_CLEAR(self->text); - self->text = PyTuple_GET_ITEM(info, 3); - Py_INCREF(self->text); + Py_INCREF(PyTuple_GET_ITEM(info, 0)); + Py_SETREF(self->filename, PyTuple_GET_ITEM(info, 0)); + + Py_INCREF(PyTuple_GET_ITEM(info, 1)); + Py_SETREF(self->lineno, PyTuple_GET_ITEM(info, 1)); + + Py_INCREF(PyTuple_GET_ITEM(info, 2)); + Py_SETREF(self->offset, PyTuple_GET_ITEM(info, 2)); + + Py_INCREF(PyTuple_GET_ITEM(info, 3)); + Py_SETREF(self->text, PyTuple_GET_ITEM(info, 3)); Py_DECREF(info); @@ -1554,8 +1546,7 @@ PyObject *obj = PyUnicode_FromString(value); if (!obj) return -1; - Py_CLEAR(*attr); - *attr = obj; + Py_SETREF(*attr, obj); return 0; } @@ -1961,8 +1952,7 @@ Py_buffer view; if (PyObject_GetBuffer(ude->object, &view, PyBUF_SIMPLE) != 0) goto error; - Py_CLEAR(ude->object); - ude->object = PyBytes_FromStringAndSize(view.buf, view.len); + Py_SETREF(ude->object, PyBytes_FromStringAndSize(view.buf, view.len)); PyBuffer_Release(&view); if (!ude->object) goto error; @@ -2871,9 +2861,8 @@ } if (PyUnicode_Tailmatch(self->text, print_prefix, start, text_len, -1)) { - Py_CLEAR(self->msg); - self->msg = PyUnicode_FromString( - "Missing parentheses in call to 'print'"); + Py_SETREF(self->msg, + PyUnicode_FromString("Missing parentheses in call to 'print'")); return 1; } @@ -2886,9 +2875,8 @@ } if (PyUnicode_Tailmatch(self->text, exec_prefix, start, text_len, -1)) { - Py_CLEAR(self->msg); - self->msg = PyUnicode_FromString( - "Missing parentheses in call to 'exec'"); + Py_SETREF(self->msg, + PyUnicode_FromString("Missing parentheses in call to 'exec'")); return 1; } /* Fall back to the default error message */ diff --git a/Objects/rangeobject.c b/Objects/rangeobject.c --- a/Objects/rangeobject.c +++ b/Objects/rangeobject.c @@ -1001,8 +1001,7 @@ return NULL; cmp = PyObject_RichCompareBool(state, zero, Py_LT); if (cmp > 0) { - Py_CLEAR(r->index); - r->index = zero; + Py_SETREF(r->index, zero); Py_RETURN_NONE; } Py_DECREF(zero); @@ -1015,9 +1014,8 @@ if (cmp > 0) state = r->len; - Py_CLEAR(r->index); - r->index = state; - Py_INCREF(r->index); + Py_INCREF(state); + Py_SETREF(r->index, state); Py_RETURN_NONE; } diff --git a/Python/ceval.c b/Python/ceval.c --- a/Python/ceval.c +++ b/Python/ceval.c @@ -4410,10 +4410,8 @@ { PyThreadState *tstate = PyThreadState_GET(); - Py_CLEAR(tstate->coroutine_wrapper); - Py_XINCREF(wrapper); - tstate->coroutine_wrapper = wrapper; + Py_SETREF(tstate->coroutine_wrapper, wrapper); } PyObject * -- Repository URL: https://hg.python.org/cpython

1 0

Daily reference leaks (ba1e102c3320): sum=7
by solipsis＠pitrou.net 27 Dec '15

27 Dec '15

results for ba1e102c3320 on branch "default" -------------------------------------------- test_asyncio leaked [0, 0, 3] memory blocks, sum=3 test_functools leaked [0, 2, 2] memory blocks, sum=4 Command line was: ['./python', '-m', 'test.regrtest', '-uall', '-R', '3:3:/home/psf-users/antoine/refleaks/reflogiUC8jp', '--timeout', '7200']

1 0

cpython (3.5): Fixes #25360: Search for pythonw.exe when in pyw.exe.
by vinay.sajip 26 Dec '15

26 Dec '15

https://hg.python.org/cpython/rev/2af2367d7eda changeset: 99682:2af2367d7eda branch: 3.5 parent: 99680:6210b41a2394 user: Vinay Sajip <vinay_sajip(a)yahoo.co.uk> date: Sat Dec 26 13:10:51 2015 +0000 summary: Fixes #25360: Search for pythonw.exe when in pyw.exe. files: PC/launcher.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/PC/launcher.c b/PC/launcher.c --- a/PC/launcher.c +++ b/PC/launcher.c @@ -1254,7 +1254,7 @@ * is no version specification. */ debug(L"searching PATH for python executable\n"); - cmd = find_on_path(L"python"); + cmd = find_on_path(PYTHON_EXECUTABLE); debug(L"Python on path: %ls\n", cmd ? cmd->value : L"<not found>"); if (cmd) { debug(L"located python on PATH: %ls\n", cmd->value); -- Repository URL: https://hg.python.org/cpython

1 0

cpython (merge 3.5 -> default): Closes #25360: Merged fix from 3.5.
by vinay.sajip 26 Dec '15

26 Dec '15

https://hg.python.org/cpython/rev/ba1e102c3320 changeset: 99683:ba1e102c3320 parent: 99681:6a6a68a3d323 parent: 99682:2af2367d7eda user: Vinay Sajip <vinay_sajip(a)yahoo.co.uk> date: Sat Dec 26 13:11:38 2015 +0000 summary: Closes #25360: Merged fix from 3.5. files: PC/launcher.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/PC/launcher.c b/PC/launcher.c --- a/PC/launcher.c +++ b/PC/launcher.c @@ -1255,7 +1255,7 @@ * is no version specification. */ debug(L"searching PATH for python executable\n"); - cmd = find_on_path(L"python"); + cmd = find_on_path(PYTHON_EXECUTABLE); debug(L"Python on path: %ls\n", cmd ? cmd->value : L"<not found>"); if (cmd) { debug(L"located python on PATH: %ls\n", cmd->value); -- Repository URL: https://hg.python.org/cpython

1 0