summaryrefslogtreecommitdiffstats
path: root/Python
diff options
context:
space:
mode:
authorSerhiy Storchaka <storchaka@gmail.com>2016-04-06 06:50:03 (GMT)
committerSerhiy Storchaka <storchaka@gmail.com>2016-04-06 06:50:03 (GMT)
commitec39756960def5fdd8cb0ae191429f2f8e229f55 (patch)
treeadb8bb87ed393db602face59929660b968f452e5 /Python
parent72783056983f216104087b6c49d85ea273bf67c4 (diff)
parent48842714b948fa239392ddd7e207151d5fcb8bc7 (diff)
downloadcpython-ec39756960def5fdd8cb0ae191429f2f8e229f55.zip
cpython-ec39756960def5fdd8cb0ae191429f2f8e229f55.tar.gz
cpython-ec39756960def5fdd8cb0ae191429f2f8e229f55.tar.bz2
Issue #22570: Renamed Py_SETREF to Py_XSETREF.
Diffstat (limited to 'Python')
-rw-r--r--Python/_warnings.c2
-rw-r--r--Python/ceval.c6
-rw-r--r--Python/compile.c2
-rw-r--r--Python/errors.c4
-rw-r--r--Python/import.c4
-rw-r--r--Python/peephole.c2
-rw-r--r--Python/sysmodule.c2
7 files changed, 11 insertions, 11 deletions
diff --git a/Python/_warnings.c b/Python/_warnings.c
index 40f5c8e..2d9d878 100644
--- a/Python/_warnings.c
+++ b/Python/_warnings.c
@@ -730,7 +730,7 @@ setup_context(Py_ssize_t stack_level, PyObject **filename, int *lineno,
goto handle_error;
}
else if (!is_true) {
- Py_SETREF(*filename, PyUnicode_FromString("__main__"));
+ Py_XSETREF(*filename, PyUnicode_FromString("__main__"));
if (*filename == NULL)
goto handle_error;
}
diff --git a/Python/ceval.c b/Python/ceval.c
index 7b07475..c83743d 100644
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -3236,7 +3236,7 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag)
Py_INCREF(self);
func = PyMethod_GET_FUNCTION(func);
Py_INCREF(func);
- Py_SETREF(*pfunc, self);
+ Py_XSETREF(*pfunc, self);
na++;
/* n++; */
} else
@@ -4491,7 +4491,7 @@ _PyEval_SetCoroutineWrapper(PyObject *wrapper)
PyThreadState *tstate = PyThreadState_GET();
Py_XINCREF(wrapper);
- Py_SETREF(tstate->coroutine_wrapper, wrapper);
+ Py_XSETREF(tstate->coroutine_wrapper, wrapper);
}
PyObject *
@@ -4747,7 +4747,7 @@ call_function(PyObject ***pp_stack, int oparg
Py_INCREF(self);
func = PyMethod_GET_FUNCTION(func);
Py_INCREF(func);
- Py_SETREF(*pfunc, self);
+ Py_XSETREF(*pfunc, self);
na++;
n++;
} else
diff --git a/Python/compile.c b/Python/compile.c
index 92fea3d..29a2ade 100644
--- a/Python/compile.c
+++ b/Python/compile.c
@@ -1756,7 +1756,7 @@ compiler_class(struct compiler *c, stmt_ty s)
{
/* use the class name for name mangling */
Py_INCREF(s->v.ClassDef.name);
- Py_SETREF(c->u->u_private, s->v.ClassDef.name);
+ Py_XSETREF(c->u->u_private, s->v.ClassDef.name);
/* load (global) __name__ ... */
str = PyUnicode_InternFromString("__name__");
if (!str || !compiler_nameop(c, str, Load)) {
diff --git a/Python/errors.c b/Python/errors.c
index 47d7c4b..1d6e432 100644
--- a/Python/errors.c
+++ b/Python/errors.c
@@ -311,9 +311,9 @@ finally:
--tstate->recursion_depth;
/* throw away the old exception and use the recursion error instead */
Py_INCREF(PyExc_RecursionError);
- Py_SETREF(*exc, PyExc_RecursionError);
+ Py_XSETREF(*exc, PyExc_RecursionError);
Py_INCREF(PyExc_RecursionErrorInst);
- Py_SETREF(*val, PyExc_RecursionErrorInst);
+ Py_XSETREF(*val, PyExc_RecursionErrorInst);
/* just keeping the old traceback */
return;
}
diff --git a/Python/import.c b/Python/import.c
index 22f94f5..0608924 100644
--- a/Python/import.c
+++ b/Python/import.c
@@ -884,7 +884,7 @@ update_code_filenames(PyCodeObject *co, PyObject *oldname, PyObject *newname)
return;
Py_INCREF(newname);
- Py_SETREF(co->co_filename, newname);
+ Py_XSETREF(co->co_filename, newname);
constants = co->co_consts;
n = PyTuple_GET_SIZE(constants);
@@ -1330,7 +1330,7 @@ remove_importlib_frames(void)
PyUnicode_CompareWithASCIIString(code->co_name,
remove_frames) == 0)) {
Py_XINCREF(next);
- Py_SETREF(*outer_link, next);
+ Py_XSETREF(*outer_link, next);
prev_link = outer_link;
}
else {
diff --git a/Python/peephole.c b/Python/peephole.c
index c33bf1a..2b2e4c4 100644
--- a/Python/peephole.c
+++ b/Python/peephole.c
@@ -118,7 +118,7 @@ tuple_of_constants(unsigned char *codestr, Py_ssize_t n,
/* If it's a BUILD_SET, use the PyTuple we just built to create a
PyFrozenSet, and use that as the constant instead: */
if (codestr[0] == BUILD_SET) {
- Py_SETREF(newconst, PyFrozenSet_New(newconst));
+ Py_XSETREF(newconst, PyFrozenSet_New(newconst));
if (newconst == NULL)
return 0;
}
diff --git a/Python/sysmodule.c b/Python/sysmodule.c
index c5b4ac1..0c68c54 100644
--- a/Python/sysmodule.c
+++ b/Python/sysmodule.c
@@ -436,7 +436,7 @@ trace_trampoline(PyObject *self, PyFrameObject *frame,
return -1;
}
if (result != Py_None) {
- Py_SETREF(frame->f_trace, result);
+ Py_XSETREF(frame->f_trace, result);
}
else {
Py_DECREF(result);