Skip to content

Commit ec39756

Browse files
serhiy-storchakaserhiy-storchaka
committed
Issue #22570: Renamed Py_SETREF to Py_XSETREF.
2 parents 7278305 + 4884271 commit ec39756

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+174
-174
lines changed

‎Include/object.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -856,14 +856,14 @@ PyAPI_FUNC(void) _Py_Dealloc(PyObject *);
856856
*
857857
* The safe way is:
858858
*
859-
* Py_SETREF(op, op2);
859+
* Py_XSETREF(op, op2);
860860
*
861861
* That arranges to set `op` to `op2` _before_ decref'ing, so that any code
862862
* triggered as a side-effect of `op` getting torn down no longer believes
863863
* `op` points to a valid object.
864864
*/
865865

866-
#define Py_SETREF(op, op2) \
866+
#define Py_XSETREF(op, op2) \
867867
do { \
868868
PyObject *_py_tmp = (PyObject *)(op); \
869869
(op) = (op2); \

‎Modules/_bz2module.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -540,7 +540,7 @@ decompress(BZ2Decompressor *d, char *data, size_t len, Py_ssize_t max_length)
540540
if (d->eof) {
541541
d->needs_input = 0;
542542
if (d->bzs_avail_in_real > 0) {
543-
Py_SETREF(d->unused_data,
543+
Py_XSETREF(d->unused_data,
544544
PyBytes_FromStringAndSize(bzs->next_in, d->bzs_avail_in_real));
545545
if (d->unused_data == NULL)
546546
goto error;

‎Modules/_csv.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,7 @@ _set_str(const char *name, PyObject **target, PyObject *src, const char *dflt)
277277
if (PyUnicode_READY(src) == -1)
278278
return -1;
279279
Py_INCREF(src);
280-
Py_SETREF(*target, src);
280+
Py_XSETREF(*target, src);
281281
}
282282
}
283283
return 0;
@@ -783,7 +783,7 @@ parse_process_char(ReaderObj *self, Py_UCS4 c)
783783
static int
784784
parse_reset(ReaderObj *self)
785785
{
786-
Py_SETREF(self->fields, PyList_New(0));
786+
Py_XSETREF(self->fields, PyList_New(0));
787787
if (self->fields == NULL)
788788
return -1;
789789
self->field_len = 0;

‎Modules/_ctypes/_ctypes.c‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -391,7 +391,7 @@ StructUnionType_new(PyTypeObject *type, PyObject *args, PyObject *kwds, int isSt
391391
Py_DECREF((PyObject *)dict);
392392
return NULL;
393393
}
394-
Py_SETREF(result->tp_dict, (PyObject *)dict);
394+
Py_XSETREF(result->tp_dict, (PyObject *)dict);
395395
dict->format = _ctypes_alloc_format_string(NULL, "B");
396396
if (dict->format == NULL) {
397397
Py_DECREF(result);
@@ -870,7 +870,7 @@ PyCPointerType_SetProto(StgDictObject *stgdict, PyObject *proto)
870870
return -1;
871871
}
872872
Py_INCREF(proto);
873-
Py_SETREF(stgdict->proto, proto);
873+
Py_XSETREF(stgdict->proto, proto);
874874
return 0;
875875
}
876876

@@ -960,7 +960,7 @@ PyCPointerType_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
960960
Py_DECREF((PyObject *)stgdict);
961961
return NULL;
962962
}
963-
Py_SETREF(result->tp_dict, (PyObject *)stgdict);
963+
Py_XSETREF(result->tp_dict, (PyObject *)stgdict);
964964

965965
return (PyObject *)result;
966966
}
@@ -1403,7 +1403,7 @@ PyCArrayType_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
14031403
/* replace the class dict by our updated spam dict */
14041404
if (-1 == PyDict_Update((PyObject *)stgdict, result->tp_dict))
14051405
goto error;
1406-
Py_SETREF(result->tp_dict, (PyObject *)stgdict); /* steal the reference */
1406+
Py_XSETREF(result->tp_dict, (PyObject *)stgdict); /* steal the reference */
14071407
stgdict = NULL;
14081408

14091409
/* Special case for character arrays.
@@ -1816,7 +1816,7 @@ static PyObject *CreateSwappedType(PyTypeObject *type, PyObject *args, PyObject
18161816
Py_DECREF((PyObject *)stgdict);
18171817
return NULL;
18181818
}
1819-
Py_SETREF(result->tp_dict, (PyObject *)stgdict);
1819+
Py_XSETREF(result->tp_dict, (PyObject *)stgdict);
18201820

18211821
return (PyObject *)result;
18221822
}
@@ -1944,7 +1944,7 @@ PyCSimpleType_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
19441944
Py_DECREF((PyObject *)stgdict);
19451945
return NULL;
19461946
}
1947-
Py_SETREF(result->tp_dict, (PyObject *)stgdict);
1947+
Py_XSETREF(result->tp_dict, (PyObject *)stgdict);
19481948

19491949
/* Install from_param class methods in ctypes base classes.
19501950
Overrides the PyCSimpleType_from_param generic method.
@@ -2307,7 +2307,7 @@ PyCFuncPtrType_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
23072307
Py_DECREF((PyObject *)stgdict);
23082308
return NULL;
23092309
}
2310-
Py_SETREF(result->tp_dict, (PyObject *)stgdict);
2310+
Py_XSETREF(result->tp_dict, (PyObject *)stgdict);
23112311

23122312
if (-1 == make_funcptrtype_dict(stgdict)) {
23132313
Py_DECREF(result);
@@ -2451,7 +2451,7 @@ KeepRef(CDataObject *target, Py_ssize_t index, PyObject *keep)
24512451
return -1;
24522452
}
24532453
if (ob->b_objects == NULL || !PyDict_CheckExact(ob->b_objects)) {
2454-
Py_SETREF(ob->b_objects, keep); /* refcount consumed */
2454+
Py_XSETREF(ob->b_objects, keep); /* refcount consumed */
24552455
return 0;
24562456
}
24572457
key = unique_key(target, index);
@@ -2955,7 +2955,7 @@ PyCFuncPtr_set_errcheck(PyCFuncPtrObject *self, PyObject *ob)
29552955
return -1;
29562956
}
29572957
Py_XINCREF(ob);
2958-
Py_SETREF(self->errcheck, ob);
2958+
Py_XSETREF(self->errcheck, ob);
29592959
return 0;
29602960
}
29612961

@@ -2984,8 +2984,8 @@ PyCFuncPtr_set_restype(PyCFuncPtrObject *self, PyObject *ob)
29842984
return -1;
29852985
}
29862986
Py_INCREF(ob);
2987-
Py_SETREF(self->restype, ob);
2988-
Py_SETREF(self->checker, PyObject_GetAttrString(ob, "_check_retval_"));
2987+
Py_XSETREF(self->restype, ob);
2988+
Py_XSETREF(self->checker, PyObject_GetAttrString(ob, "_check_retval_"));
29892989
if (self->checker == NULL)
29902990
PyErr_Clear();
29912991
return 0;
@@ -3022,9 +3022,9 @@ PyCFuncPtr_set_argtypes(PyCFuncPtrObject *self, PyObject *ob)
30223022
converters = converters_from_argtypes(ob);
30233023
if (!converters)
30243024
return -1;
3025-
Py_SETREF(self->converters, converters);
3025+
Py_XSETREF(self->converters, converters);
30263026
Py_INCREF(ob);
3027-
Py_SETREF(self->argtypes, ob);
3027+
Py_XSETREF(self->argtypes, ob);
30283028
}
30293029
return 0;
30303030
}
@@ -5150,7 +5150,7 @@ comerror_init(PyObject *self, PyObject *args, PyObject *kwds)
51505150
return -1;
51515151

51525152
Py_INCREF(args);
5153-
Py_SETREF(((PyBaseExceptionObject *)self)->args, args);
5153+
Py_XSETREF(((PyBaseExceptionObject *)self)->args, args);
51545154

51555155
return 0;
51565156
}

‎Modules/_curses_panel.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -313,7 +313,7 @@ PyCursesPanel_replace_panel(PyCursesPanelObject *self, PyObject *args)
313313
return NULL;
314314
}
315315
Py_INCREF(temp);
316-
Py_SETREF(po->wo, temp);
316+
Py_XSETREF(po->wo, temp);
317317
Py_INCREF(Py_None);
318318
return Py_None;
319319
}

‎Modules/_datetimemodule.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1058,7 +1058,7 @@ format_utcoffset(char *buf, size_t buflen, const char *sep,
10581058
/* Offset is normalized, so it is negative if days < 0 */
10591059
if (GET_TD_DAYS(offset) < 0) {
10601060
sign = '-';
1061-
Py_SETREF(offset, delta_negative((PyDateTime_Delta *)offset));
1061+
Py_XSETREF(offset, delta_negative((PyDateTime_Delta *)offset));
10621062
if (offset == NULL)
10631063
return -1;
10641064
}
@@ -3045,7 +3045,7 @@ tzinfo_fromutc(PyDateTime_TZInfo *self, PyObject *dt)
30453045
if (dst == Py_None)
30463046
goto Inconsistent;
30473047
if (delta_bool((PyDateTime_Delta *)dst) != 0) {
3048-
Py_SETREF(result, add_datetime_timedelta((PyDateTime_DateTime *)result,
3048+
Py_XSETREF(result, add_datetime_timedelta((PyDateTime_DateTime *)result,
30493049
(PyDateTime_Delta *)dst, 1));
30503050
if (result == NULL)
30513051
goto Fail;
@@ -4445,7 +4445,7 @@ datetime_subtract(PyObject *left, PyObject *right)
44454445
return NULL;
44464446

44474447
if (offdiff != NULL) {
4448-
Py_SETREF(result, delta_subtract(result, offdiff));
4448+
Py_XSETREF(result, delta_subtract(result, offdiff));
44494449
Py_DECREF(offdiff);
44504450
}
44514451
}

‎Modules/_decimal/_decimal.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3439,14 +3439,14 @@ dec_as_integer_ratio(PyObject *self, PyObject *args UNUSED)
34393439
goto error;
34403440
}
34413441

3442-
Py_SETREF(exponent, long_methods->nb_power(tmp, exponent, Py_None));
3442+
Py_XSETREF(exponent, long_methods->nb_power(tmp, exponent, Py_None));
34433443
Py_DECREF(tmp);
34443444
if (exponent == NULL) {
34453445
goto error;
34463446
}
34473447

34483448
if (exp >= 0) {
3449-
Py_SETREF(numerator, long_methods->nb_multiply(numerator, exponent));
3449+
Py_XSETREF(numerator, long_methods->nb_multiply(numerator, exponent));
34503450
if (numerator == NULL) {
34513451
goto error;
34523452
}
@@ -3462,8 +3462,8 @@ dec_as_integer_ratio(PyObject *self, PyObject *args UNUSED)
34623462
if (tmp == NULL) {
34633463
goto error;
34643464
}
3465-
Py_SETREF(numerator, long_methods->nb_floor_divide(numerator, tmp));
3466-
Py_SETREF(denominator, long_methods->nb_floor_divide(denominator, tmp));
3465+
Py_XSETREF(numerator, long_methods->nb_floor_divide(numerator, tmp));
3466+
Py_XSETREF(denominator, long_methods->nb_floor_divide(denominator, tmp));
34673467
Py_DECREF(tmp);
34683468
if (numerator == NULL || denominator == NULL) {
34693469
goto error;

‎Modules/_elementtree.c‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -397,7 +397,7 @@ element_init(PyObject *self, PyObject *args, PyObject *kwds)
397397

398398
/* Replace the objects already pointed to by tag, text and tail. */
399399
Py_INCREF(tag);
400-
Py_SETREF(self_elem->tag, tag);
400+
Py_XSETREF(self_elem->tag, tag);
401401

402402
tmp = self_elem->text;
403403
Py_INCREF(Py_None);
@@ -964,7 +964,7 @@ element_setstate_from_attributes(ElementObject *self,
964964
}
965965

966966
Py_INCREF(tag);
967-
Py_SETREF(self->tag, tag);
967+
Py_XSETREF(self->tag, tag);
968968

969969
_clear_joined_ptr(&self->text);
970970
self->text = text ? JOIN_SET(text, PyList_CheckExact(text)) : Py_None;
@@ -1008,7 +1008,7 @@ element_setstate_from_attributes(ElementObject *self,
10081008
/* Stash attrib. */
10091009
if (attrib) {
10101010
Py_INCREF(attrib);
1011-
Py_SETREF(self->extra->attrib, attrib);
1011+
Py_XSETREF(self->extra->attrib, attrib);
10121012
}
10131013

10141014
Py_RETURN_NONE;
@@ -1957,7 +1957,7 @@ element_tag_setter(ElementObject *self, PyObject *value, void *closure)
19571957
{
19581958
_VALIDATE_ATTR_VALUE(value);
19591959
Py_INCREF(value);
1960-
Py_SETREF(self->tag, value);
1960+
Py_XSETREF(self->tag, value);
19611961
return 0;
19621962
}
19631963

@@ -1990,7 +1990,7 @@ element_attrib_setter(ElementObject *self, PyObject *value, void *closure)
19901990
return -1;
19911991
}
19921992
Py_INCREF(value);
1993-
Py_SETREF(self->extra->attrib, value);
1993+
Py_XSETREF(self->extra->attrib, value);
19941994
return 0;
19951995
}
19961996

@@ -2338,7 +2338,7 @@ _elementtree_TreeBuilder___init___impl(TreeBuilderObject *self,
23382338
{
23392339
if (element_factory) {
23402340
Py_INCREF(element_factory);
2341-
Py_SETREF(self->element_factory, element_factory);
2341+
Py_XSETREF(self->element_factory, element_factory);
23422342
}
23432343

23442344
return 0;
@@ -2524,9 +2524,9 @@ treebuilder_handle_start(TreeBuilderObject* self, PyObject* tag,
25242524
self->index++;
25252525

25262526
Py_INCREF(node);
2527-
Py_SETREF(self->this, node);
2527+
Py_XSETREF(self->this, node);
25282528
Py_INCREF(node);
2529-
Py_SETREF(self->last, node);
2529+
Py_XSETREF(self->last, node);
25302530

25312531
if (treebuilder_append_event(self, self->start_event_obj, node) < 0)
25322532
goto error;
@@ -3583,7 +3583,7 @@ _elementtree_XMLParser__setevents_impl(XMLParserObject *self,
35833583
events_append = PyObject_GetAttrString(events_queue, "append");
35843584
if (events_append == NULL)
35853585
return NULL;
3586-
Py_SETREF(target->events_append, events_append);
3586+
Py_XSETREF(target->events_append, events_append);
35873587

35883588
/* clear out existing events */
35893589
Py_CLEAR(target->start_event_obj);
@@ -3618,18 +3618,18 @@ _elementtree_XMLParser__setevents_impl(XMLParserObject *self,
36183618

36193619
Py_INCREF(event_name_obj);
36203620
if (strcmp(event_name, "start") == 0) {
3621-
Py_SETREF(target->start_event_obj, event_name_obj);
3621+
Py_XSETREF(target->start_event_obj, event_name_obj);
36223622
} else if (strcmp(event_name, "end") == 0) {
3623-
Py_SETREF(target->end_event_obj, event_name_obj);
3623+
Py_XSETREF(target->end_event_obj, event_name_obj);
36243624
} else if (strcmp(event_name, "start-ns") == 0) {
3625-
Py_SETREF(target->start_ns_event_obj, event_name_obj);
3625+
Py_XSETREF(target->start_ns_event_obj, event_name_obj);
36263626
EXPAT(SetNamespaceDeclHandler)(
36273627
self->parser,
36283628
(XML_StartNamespaceDeclHandler) expat_start_ns_handler,
36293629
(XML_EndNamespaceDeclHandler) expat_end_ns_handler
36303630
);
36313631
} else if (strcmp(event_name, "end-ns") == 0) {
3632-
Py_SETREF(target->end_ns_event_obj, event_name_obj);
3632+
Py_XSETREF(target->end_ns_event_obj, event_name_obj);
36333633
EXPAT(SetNamespaceDeclHandler)(
36343634
self->parser,
36353635
(XML_StartNamespaceDeclHandler) expat_start_ns_handler,

‎Modules/_functoolsmodule.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -294,10 +294,10 @@ partial_setstate(partialobject *pto, PyObject *state)
294294
else
295295
Py_INCREF(dict);
296296

297-
Py_SETREF(pto->fn, fn);
298-
Py_SETREF(pto->args, fnargs);
299-
Py_SETREF(pto->kw, kw);
300-
Py_SETREF(pto->dict, dict);
297+
Py_XSETREF(pto->fn, fn);
298+
Py_XSETREF(pto->args, fnargs);
299+
Py_XSETREF(pto->kw, kw);
300+
Py_XSETREF(pto->dict, dict);
301301
Py_RETURN_NONE;
302302
}
303303

‎Modules/_io/bufferedio.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1196,7 +1196,7 @@ _buffered_readline(buffered *self, Py_ssize_t limit)
11961196
Py_CLEAR(res);
11971197
goto end;
11981198
}
1199-
Py_SETREF(res, _PyBytes_Join(_PyIO_empty_bytes, chunks));
1199+
Py_XSETREF(res, _PyBytes_Join(_PyIO_empty_bytes, chunks));
12001200

12011201
end:
12021202
LEAVE_BUFFERED(self)
@@ -1452,7 +1452,7 @@ _io_BufferedReader___init___impl(buffered *self, PyObject *raw,
14521452
return -1;
14531453

14541454
Py_INCREF(raw);
1455-
Py_SETREF(self->raw, raw);
1455+
Py_XSETREF(self->raw, raw);
14561456
self->buffer_size = buffer_size;
14571457
self->readable = 1;
14581458
self->writable = 0;
@@ -1804,7 +1804,7 @@ _io_BufferedWriter___init___impl(buffered *self, PyObject *raw,
18041804
return -1;
18051805

18061806
Py_INCREF(raw);
1807-
Py_SETREF(self->raw, raw);
1807+
Py_XSETREF(self->raw, raw);
18081808
self->readable = 0;
18091809
self->writable = 1;
18101810

@@ -2307,7 +2307,7 @@ _io_BufferedRandom___init___impl(buffered *self, PyObject *raw,
23072307
return -1;
23082308

23092309
Py_INCREF(raw);
2310-
Py_SETREF(self->raw, raw);
2310+
Py_XSETREF(self->raw, raw);
23112311
self->buffer_size = buffer_size;
23122312
self->readable = 1;
23132313
self->writable = 1;

0 commit comments

Comments
 (0)