X Tutup
Skip to content

Commit 4884271

Browse files
serhiy-storchakaserhiy-storchaka
committed
Issue python#22570: Renamed Py_SETREF to Py_XSETREF.
1 parent 0e0563c commit 4884271

37 files changed

+132
-132
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
}
@@ -5152,7 +5152,7 @@ comerror_init(PyObject *self, PyObject *args, PyObject *kwds)
51525152

51535153
bself = (PyBaseExceptionObject *)self;
51545154
Py_INCREF(args);
5155-
Py_SETREF(bself->args, args);
5155+
Py_XSETREF(bself->args, args);
51565156

51575157
return 0;
51585158
}

‎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/_elementtree.c‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -936,7 +936,7 @@ element_setstate_from_attributes(ElementObject *self,
936936
}
937937

938938
Py_INCREF(tag);
939-
Py_SETREF(self->tag, tag);
939+
Py_XSETREF(self->tag, tag);
940940

941941
_clear_joined_ptr(&self->text);
942942
self->text = text ? JOIN_SET(text, PyList_CheckExact(text)) : Py_None;
@@ -980,7 +980,7 @@ element_setstate_from_attributes(ElementObject *self,
980980
/* Stash attrib. */
981981
if (attrib) {
982982
Py_INCREF(attrib);
983-
Py_SETREF(self->extra->attrib, attrib);
983+
Py_XSETREF(self->extra->attrib, attrib);
984984
}
985985

986986
Py_RETURN_NONE;
@@ -1943,7 +1943,7 @@ element_setattro(ElementObject* self, PyObject* nameobj, PyObject* value)
19431943

19441944
if (strcmp(name, "tag") == 0) {
19451945
Py_INCREF(value);
1946-
Py_SETREF(self->tag, value);
1946+
Py_XSETREF(self->tag, value);
19471947
} else if (strcmp(name, "text") == 0) {
19481948
Py_DECREF(JOIN_OBJ(self->text));
19491949
self->text = value;
@@ -1958,7 +1958,7 @@ element_setattro(ElementObject* self, PyObject* nameobj, PyObject* value)
19581958
return -1;
19591959
}
19601960
Py_INCREF(value);
1961-
Py_SETREF(self->extra->attrib, value);
1961+
Py_XSETREF(self->extra->attrib, value);
19621962
} else {
19631963
PyErr_SetString(PyExc_AttributeError,
19641964
"Can't set arbitrary attributes on Element");
@@ -2551,9 +2551,9 @@ treebuilder_handle_start(TreeBuilderObject* self, PyObject* tag,
25512551
self->index++;
25522552

25532553
Py_INCREF(node);
2554-
Py_SETREF(self->this, node);
2554+
Py_XSETREF(self->this, node);
25552555
Py_INCREF(node);
2556-
Py_SETREF(self->last, node);
2556+
Py_XSETREF(self->last, node);
25572557

25582558
if (treebuilder_append_event(self, self->start_event_obj, node) < 0)
25592559
goto error;
@@ -3604,7 +3604,7 @@ _elementtree_XMLParser__setevents_impl(XMLParserObject *self,
36043604
target = (TreeBuilderObject*) self->target;
36053605

36063606
Py_INCREF(events_queue);
3607-
Py_SETREF(target->events, events_queue);
3607+
Py_XSETREF(target->events, events_queue);
36083608

36093609
/* clear out existing events */
36103610
Py_CLEAR(target->start_event_obj);
@@ -3639,18 +3639,18 @@ _elementtree_XMLParser__setevents_impl(XMLParserObject *self,
36393639

36403640
Py_INCREF(event_name_obj);
36413641
if (strcmp(event_name, "start") == 0) {
3642-
Py_SETREF(target->start_event_obj, event_name_obj);
3642+
Py_XSETREF(target->start_event_obj, event_name_obj);
36433643
} else if (strcmp(event_name, "end") == 0) {
3644-
Py_SETREF(target->end_event_obj, event_name_obj);
3644+
Py_XSETREF(target->end_event_obj, event_name_obj);
36453645
} else if (strcmp(event_name, "start-ns") == 0) {
3646-
Py_SETREF(target->start_ns_event_obj, event_name_obj);
3646+
Py_XSETREF(target->start_ns_event_obj, event_name_obj);
36473647
EXPAT(SetNamespaceDeclHandler)(
36483648
self->parser,
36493649
(XML_StartNamespaceDeclHandler) expat_start_ns_handler,
36503650
(XML_EndNamespaceDeclHandler) expat_end_ns_handler
36513651
);
36523652
} else if (strcmp(event_name, "end-ns") == 0) {
3653-
Py_SETREF(target->end_ns_event_obj, event_name_obj);
3653+
Py_XSETREF(target->end_ns_event_obj, event_name_obj);
36543654
EXPAT(SetNamespaceDeclHandler)(
36553655
self->parser,
36563656
(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;

‎Modules/_io/bytesio.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -969,7 +969,7 @@ _io_BytesIO___init___impl(bytesio *self, PyObject *initvalue)
969969
if (initvalue && initvalue != Py_None) {
970970
if (PyBytes_CheckExact(initvalue)) {
971971
Py_INCREF(initvalue);
972-
Py_SETREF(self->buf, initvalue);
972+
Py_XSETREF(self->buf, initvalue);
973973
self->string_size = PyBytes_GET_SIZE(initvalue);
974974
}
975975
else {

‎Modules/_io/textio.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -995,7 +995,7 @@ _io_TextIOWrapper___init___impl(textio *self, PyObject *buffer,
995995
"Oi", self->decoder, (int)self->readtranslate);
996996
if (incrementalDecoder == NULL)
997997
goto error;
998-
Py_SETREF(self->decoder, incrementalDecoder);
998+
Py_XSETREF(self->decoder, incrementalDecoder);
999999
}
10001000
}
10011001

@@ -1373,7 +1373,7 @@ _io_TextIOWrapper_write_impl(textio *self, PyObject *text)
13731373
static void
13741374
textiowrapper_set_decoded_chars(textio *self, PyObject *chars)
13751375
{
1376-
Py_SETREF(self->decoded_chars, chars);
1376+
Py_XSETREF(self->decoded_chars, chars);
13771377
self->decoded_chars_used = 0;
13781378
}
13791379

@@ -1521,7 +1521,7 @@ textiowrapper_read_chunk(textio *self, Py_ssize_t size_hint)
15211521
dec_buffer = NULL; /* Reference lost to PyBytes_Concat */
15221522
goto fail;
15231523
}
1524-
Py_SETREF(self->snapshot, Py_BuildValue("NN", dec_flags, next_input));
1524+
Py_XSETREF(self->snapshot, Py_BuildValue("NN", dec_flags, next_input));
15251525
}
15261526
Py_DECREF(input_chunk);
15271527

@@ -1627,7 +1627,7 @@ _io_TextIOWrapper_read_impl(textio *self, Py_ssize_t n)
16271627
if (chunks != NULL) {
16281628
if (result != NULL && PyList_Append(chunks, result) < 0)
16291629
goto fail;
1630-
Py_SETREF(result, PyUnicode_Join(_PyIO_empty_str, chunks));
1630+
Py_XSETREF(result, PyUnicode_Join(_PyIO_empty_str, chunks));
16311631
if (result == NULL)
16321632
goto fail;
16331633
Py_CLEAR(chunks);

0 commit comments

Comments
 (0)
X Tutup