Issue #22570: Renamed Py_SETREF to Py_XSETREF.
diff --git a/Objects/descrobject.c b/Objects/descrobject.c
index c7271ef..8d6e6e3 100644
--- a/Objects/descrobject.c
+++ b/Objects/descrobject.c
@@ -1332,7 +1332,7 @@
PyObject *get_doc = PyObject_GetAttrString(get, "__doc__");
if (get_doc) {
if (Py_TYPE(self) == &PyProperty_Type) {
- Py_SETREF(prop->prop_doc, get_doc);
+ Py_XSETREF(prop->prop_doc, get_doc);
}
else {
/* If this is a property subclass, put __doc__
diff --git a/Objects/exceptions.c b/Objects/exceptions.c
index 8f2c7a6..8906f1a 100644
--- a/Objects/exceptions.c
+++ b/Objects/exceptions.c
@@ -59,11 +59,11 @@
return -1;
Py_INCREF(args);
- Py_SETREF(self->args, args);
+ Py_XSETREF(self->args, args);
if (PyTuple_GET_SIZE(self->args) == 1) {
Py_INCREF(PyTuple_GET_ITEM(self->args, 0));
- Py_SETREF(self->message, PyTuple_GET_ITEM(self->args, 0));
+ Py_XSETREF(self->message, PyTuple_GET_ITEM(self->args, 0));
}
return 0;
}
@@ -279,7 +279,7 @@
return -1;
}
Py_INCREF(val);
- Py_SETREF(self->dict, val);
+ Py_XSETREF(self->dict, val);
return 0;
}
@@ -305,7 +305,7 @@
seq = PySequence_Tuple(val);
if (!seq)
return -1;
- Py_SETREF(self->args, seq);
+ Py_XSETREF(self->args, seq);
return 0;
}
@@ -519,11 +519,11 @@
return 0;
if (size == 1) {
Py_INCREF(PyTuple_GET_ITEM(args, 0));
- Py_SETREF(self->code, PyTuple_GET_ITEM(args, 0));
+ Py_XSETREF(self->code, PyTuple_GET_ITEM(args, 0));
}
else { /* size > 1 */
Py_INCREF(args);
- Py_SETREF(self->code, args);
+ Py_XSETREF(self->code, args);
}
return 0;
}
@@ -608,21 +608,21 @@
return -1;
}
Py_INCREF(myerrno);
- Py_SETREF(self->myerrno, myerrno);
+ Py_XSETREF(self->myerrno, myerrno);
Py_INCREF(strerror);
- Py_SETREF(self->strerror, strerror);
+ Py_XSETREF(self->strerror, strerror);
/* self->filename will remain Py_None otherwise */
if (filename != NULL) {
Py_INCREF(filename);
- Py_SETREF(self->filename, filename);
+ Py_XSETREF(self->filename, filename);
subslice = PyTuple_GetSlice(args, 0, 2);
if (!subslice)
return -1;
- Py_SETREF(self->args, subslice);
+ Py_XSETREF(self->args, subslice);
}
return 0;
}
@@ -873,7 +873,7 @@
return -1;
posix_errno = winerror_to_errno(errcode);
- Py_SETREF(self->winerror, self->myerrno);
+ Py_XSETREF(self->winerror, self->myerrno);
o_errcode = PyInt_FromLong(posix_errno);
if (!o_errcode)
@@ -1059,7 +1059,7 @@
if (lenargs >= 1) {
Py_INCREF(PyTuple_GET_ITEM(args, 0));
- Py_SETREF(self->msg, PyTuple_GET_ITEM(args, 0));
+ Py_XSETREF(self->msg, PyTuple_GET_ITEM(args, 0));
}
if (lenargs == 2) {
info = PyTuple_GET_ITEM(args, 1);
@@ -1075,16 +1075,16 @@
}
Py_INCREF(PyTuple_GET_ITEM(info, 0));
- Py_SETREF(self->filename, PyTuple_GET_ITEM(info, 0));
+ Py_XSETREF(self->filename, PyTuple_GET_ITEM(info, 0));
Py_INCREF(PyTuple_GET_ITEM(info, 1));
- Py_SETREF(self->lineno, PyTuple_GET_ITEM(info, 1));
+ Py_XSETREF(self->lineno, PyTuple_GET_ITEM(info, 1));
Py_INCREF(PyTuple_GET_ITEM(info, 2));
- Py_SETREF(self->offset, PyTuple_GET_ITEM(info, 2));
+ Py_XSETREF(self->offset, PyTuple_GET_ITEM(info, 2));
Py_INCREF(PyTuple_GET_ITEM(info, 3));
- Py_SETREF(self->text, PyTuple_GET_ITEM(info, 3));
+ Py_XSETREF(self->text, PyTuple_GET_ITEM(info, 3));
Py_DECREF(info);
}
@@ -1317,7 +1317,7 @@
PyObject *obj = PyString_FromString(value);
if (!obj)
return -1;
- Py_SETREF(*attr, obj);
+ Py_XSETREF(*attr, obj);
return 0;
}
diff --git a/Objects/fileobject.c b/Objects/fileobject.c
index 9ae068c..e4f7fc4 100644
--- a/Objects/fileobject.c
+++ b/Objects/fileobject.c
@@ -574,8 +574,8 @@
oerrors = Py_None;
Py_INCREF(Py_None);
}
- Py_SETREF(file->f_encoding, str);
- Py_SETREF(file->f_errors, oerrors);
+ Py_XSETREF(file->f_encoding, str);
+ Py_XSETREF(file->f_errors, oerrors);
return 1;
}
diff --git a/Objects/frameobject.c b/Objects/frameobject.c
index 6ca390b..4ba3e84 100644
--- a/Objects/frameobject.c
+++ b/Objects/frameobject.c
@@ -859,7 +859,7 @@
}
} else if (values[j] != value) {
Py_XINCREF(value);
- Py_SETREF(values[j], value);
+ Py_XSETREF(values[j], value);
}
Py_XDECREF(value);
}
diff --git a/Objects/funcobject.c b/Objects/funcobject.c
index da54069..2636962 100644
--- a/Objects/funcobject.c
+++ b/Objects/funcobject.c
@@ -116,7 +116,7 @@
PyErr_SetString(PyExc_SystemError, "non-tuple default args");
return -1;
}
- Py_SETREF(((PyFunctionObject *)op)->func_defaults, defaults);
+ Py_XSETREF(((PyFunctionObject *)op)->func_defaults, defaults);
return 0;
}
@@ -148,7 +148,7 @@
closure->ob_type->tp_name);
return -1;
}
- Py_SETREF(((PyFunctionObject *)op)->func_closure, closure);
+ Py_XSETREF(((PyFunctionObject *)op)->func_closure, closure);
return 0;
}
@@ -428,7 +428,7 @@
if (name != Py_None) {
Py_INCREF(name);
- Py_SETREF(newfunc->func_name, name);
+ Py_XSETREF(newfunc->func_name, name);
}
if (defaults != Py_None) {
Py_INCREF(defaults);
diff --git a/Objects/stringobject.c b/Objects/stringobject.c
index f585ffc..faaa111 100644
--- a/Objects/stringobject.c
+++ b/Objects/stringobject.c
@@ -3865,7 +3865,7 @@
return;
}
v = string_concat((PyStringObject *) *pv, w);
- Py_SETREF(*pv, v);
+ Py_XSETREF(*pv, v);
}
void
@@ -4750,7 +4750,7 @@
t = PyDict_GetItem(interned, (PyObject *)s);
if (t) {
Py_INCREF(t);
- Py_SETREF(*p, t);
+ Py_XSETREF(*p, t);
return;
}
diff --git a/Objects/typeobject.c b/Objects/typeobject.c
index a5f3997..b186623 100644
--- a/Objects/typeobject.c
+++ b/Objects/typeobject.c
@@ -188,7 +188,7 @@
for (i = 0; i < (1 << MCACHE_SIZE_EXP); i++) {
method_cache[i].value = NULL;
Py_INCREF(Py_None);
- Py_SETREF(method_cache[i].name, Py_None);
+ Py_XSETREF(method_cache[i].name, Py_None);
}
/* mark all version tags as invalid */
PyType_Modified(&PyBaseObject_Type);
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
index 9f503bd..454451e 100644
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -436,7 +436,7 @@
return -1;
Py_UNICODE_COPY(w->str, v->str,
length < v->length ? length : v->length);
- Py_SETREF(*unicode, w);
+ Py_XSETREF(*unicode, w);
return 0;
}