diff options
Diffstat (limited to 'Modules')
-rw-r--r-- | Modules/_bz2module.c | 2 | ||||
-rw-r--r-- | Modules/_csv.c | 4 | ||||
-rw-r--r-- | Modules/_ctypes/_ctypes.c | 28 | ||||
-rw-r--r-- | Modules/_curses_panel.c | 2 | ||||
-rw-r--r-- | Modules/_elementtree.c | 22 | ||||
-rw-r--r-- | Modules/_functoolsmodule.c | 8 | ||||
-rw-r--r-- | Modules/_io/bufferedio.c | 8 | ||||
-rw-r--r-- | Modules/_io/bytesio.c | 2 | ||||
-rw-r--r-- | Modules/_io/textio.c | 8 | ||||
-rw-r--r-- | Modules/_lzmamodule.c | 2 | ||||
-rw-r--r-- | Modules/_pickle.c | 4 | ||||
-rw-r--r-- | Modules/_sqlite/connection.c | 8 | ||||
-rw-r--r-- | Modules/_sqlite/cursor.c | 10 | ||||
-rw-r--r-- | Modules/_sre.c | 2 | ||||
-rw-r--r-- | Modules/_ssl.c | 4 | ||||
-rw-r--r-- | Modules/_struct.c | 2 | ||||
-rw-r--r-- | Modules/cjkcodecs/multibytecodec.c | 2 | ||||
-rw-r--r-- | Modules/faulthandler.c | 6 | ||||
-rw-r--r-- | Modules/itertoolsmodule.c | 28 | ||||
-rw-r--r-- | Modules/signalmodule.c | 2 | ||||
-rw-r--r-- | Modules/zipimport.c | 2 | ||||
-rw-r--r-- | Modules/zlibmodule.c | 16 |
22 files changed, 86 insertions, 86 deletions
diff --git a/Modules/_bz2module.c b/Modules/_bz2module.c index 425845f..e3e0eb1 100644 --- a/Modules/_bz2module.c +++ b/Modules/_bz2module.c @@ -540,7 +540,7 @@ decompress(BZ2Decompressor *d, char *data, size_t len, Py_ssize_t max_length) if (d->eof) { d->needs_input = 0; if (d->bzs_avail_in_real > 0) { - Py_SETREF(d->unused_data, + Py_XSETREF(d->unused_data, PyBytes_FromStringAndSize(bzs->next_in, d->bzs_avail_in_real)); if (d->unused_data == NULL) goto error; diff --git a/Modules/_csv.c b/Modules/_csv.c index fe85069..d6f2ca8 100644 --- a/Modules/_csv.c +++ b/Modules/_csv.c @@ -277,7 +277,7 @@ _set_str(const char *name, PyObject **target, PyObject *src, const char *dflt) if (PyUnicode_READY(src) == -1) return -1; Py_INCREF(src); - Py_SETREF(*target, src); + Py_XSETREF(*target, src); } } return 0; @@ -783,7 +783,7 @@ parse_process_char(ReaderObj *self, Py_UCS4 c) static int parse_reset(ReaderObj *self) { - Py_SETREF(self->fields, PyList_New(0)); + Py_XSETREF(self->fields, PyList_New(0)); if (self->fields == NULL) return -1; self->field_len = 0; diff --git a/Modules/_ctypes/_ctypes.c b/Modules/_ctypes/_ctypes.c index ff1827c..1b804ae 100644 --- a/Modules/_ctypes/_ctypes.c +++ b/Modules/_ctypes/_ctypes.c @@ -391,7 +391,7 @@ StructUnionType_new(PyTypeObject *type, PyObject *args, PyObject *kwds, int isSt Py_DECREF((PyObject *)dict); return NULL; } - Py_SETREF(result->tp_dict, (PyObject *)dict); + Py_XSETREF(result->tp_dict, (PyObject *)dict); dict->format = _ctypes_alloc_format_string(NULL, "B"); if (dict->format == NULL) { Py_DECREF(result); @@ -870,7 +870,7 @@ PyCPointerType_SetProto(StgDictObject *stgdict, PyObject *proto) return -1; } Py_INCREF(proto); - Py_SETREF(stgdict->proto, proto); + Py_XSETREF(stgdict->proto, proto); return 0; } @@ -960,7 +960,7 @@ PyCPointerType_new(PyTypeObject *type, PyObject *args, PyObject *kwds) Py_DECREF((PyObject *)stgdict); return NULL; } - Py_SETREF(result->tp_dict, (PyObject *)stgdict); + Py_XSETREF(result->tp_dict, (PyObject *)stgdict); return (PyObject *)result; } @@ -1403,7 +1403,7 @@ PyCArrayType_new(PyTypeObject *type, PyObject *args, PyObject *kwds) /* replace the class dict by our updated spam dict */ if (-1 == PyDict_Update((PyObject *)stgdict, result->tp_dict)) goto error; - Py_SETREF(result->tp_dict, (PyObject *)stgdict); /* steal the reference */ + Py_XSETREF(result->tp_dict, (PyObject *)stgdict); /* steal the reference */ stgdict = NULL; /* Special case for character arrays. @@ -1816,7 +1816,7 @@ static PyObject *CreateSwappedType(PyTypeObject *type, PyObject *args, PyObject Py_DECREF((PyObject *)stgdict); return NULL; } - Py_SETREF(result->tp_dict, (PyObject *)stgdict); + Py_XSETREF(result->tp_dict, (PyObject *)stgdict); return (PyObject *)result; } @@ -1944,7 +1944,7 @@ PyCSimpleType_new(PyTypeObject *type, PyObject *args, PyObject *kwds) Py_DECREF((PyObject *)stgdict); return NULL; } - Py_SETREF(result->tp_dict, (PyObject *)stgdict); + Py_XSETREF(result->tp_dict, (PyObject *)stgdict); /* Install from_param class methods in ctypes base classes. Overrides the PyCSimpleType_from_param generic method. @@ -2307,7 +2307,7 @@ PyCFuncPtrType_new(PyTypeObject *type, PyObject *args, PyObject *kwds) Py_DECREF((PyObject *)stgdict); return NULL; } - Py_SETREF(result->tp_dict, (PyObject *)stgdict); + Py_XSETREF(result->tp_dict, (PyObject *)stgdict); if (-1 == make_funcptrtype_dict(stgdict)) { Py_DECREF(result); @@ -2451,7 +2451,7 @@ KeepRef(CDataObject *target, Py_ssize_t index, PyObject *keep) return -1; } if (ob->b_objects == NULL || !PyDict_CheckExact(ob->b_objects)) { - Py_SETREF(ob->b_objects, keep); /* refcount consumed */ + Py_XSETREF(ob->b_objects, keep); /* refcount consumed */ return 0; } key = unique_key(target, index); @@ -2955,7 +2955,7 @@ PyCFuncPtr_set_errcheck(PyCFuncPtrObject *self, PyObject *ob) return -1; } Py_XINCREF(ob); - Py_SETREF(self->errcheck, ob); + Py_XSETREF(self->errcheck, ob); return 0; } @@ -2984,8 +2984,8 @@ PyCFuncPtr_set_restype(PyCFuncPtrObject *self, PyObject *ob) return -1; } Py_INCREF(ob); - Py_SETREF(self->restype, ob); - Py_SETREF(self->checker, PyObject_GetAttrString(ob, "_check_retval_")); + Py_XSETREF(self->restype, ob); + Py_XSETREF(self->checker, PyObject_GetAttrString(ob, "_check_retval_")); if (self->checker == NULL) PyErr_Clear(); return 0; @@ -3022,9 +3022,9 @@ PyCFuncPtr_set_argtypes(PyCFuncPtrObject *self, PyObject *ob) converters = converters_from_argtypes(ob); if (!converters) return -1; - Py_SETREF(self->converters, converters); + Py_XSETREF(self->converters, converters); Py_INCREF(ob); - Py_SETREF(self->argtypes, ob); + Py_XSETREF(self->argtypes, ob); } return 0; } @@ -5152,7 +5152,7 @@ comerror_init(PyObject *self, PyObject *args, PyObject *kwds) bself = (PyBaseExceptionObject *)self; Py_INCREF(args); - Py_SETREF(bself->args, args); + Py_XSETREF(bself->args, args); return 0; } diff --git a/Modules/_curses_panel.c b/Modules/_curses_panel.c index 759b731..75bbb17 100644 --- a/Modules/_curses_panel.c +++ b/Modules/_curses_panel.c @@ -313,7 +313,7 @@ PyCursesPanel_replace_panel(PyCursesPanelObject *self, PyObject *args) return NULL; } Py_INCREF(temp); - Py_SETREF(po->wo, temp); + Py_XSETREF(po->wo, temp); Py_INCREF(Py_None); return Py_None; } diff --git a/Modules/_elementtree.c b/Modules/_elementtree.c index 11d1aec..6619048 100644 --- a/Modules/_elementtree.c +++ b/Modules/_elementtree.c @@ -936,7 +936,7 @@ element_setstate_from_attributes(ElementObject *self, } Py_INCREF(tag); - Py_SETREF(self->tag, tag); + Py_XSETREF(self->tag, tag); _clear_joined_ptr(&self->text); self->text = text ? JOIN_SET(text, PyList_CheckExact(text)) : Py_None; @@ -980,7 +980,7 @@ element_setstate_from_attributes(ElementObject *self, /* Stash attrib. */ if (attrib) { Py_INCREF(attrib); - Py_SETREF(self->extra->attrib, attrib); + Py_XSETREF(self->extra->attrib, attrib); } Py_RETURN_NONE; @@ -1943,7 +1943,7 @@ element_setattro(ElementObject* self, PyObject* nameobj, PyObject* value) if (strcmp(name, "tag") == 0) { Py_INCREF(value); - Py_SETREF(self->tag, value); + Py_XSETREF(self->tag, value); } else if (strcmp(name, "text") == 0) { Py_DECREF(JOIN_OBJ(self->text)); self->text = value; @@ -1958,7 +1958,7 @@ element_setattro(ElementObject* self, PyObject* nameobj, PyObject* value) return -1; } Py_INCREF(value); - Py_SETREF(self->extra->attrib, value); + Py_XSETREF(self->extra->attrib, value); } else { PyErr_SetString(PyExc_AttributeError, "Can't set arbitrary attributes on Element"); @@ -2551,9 +2551,9 @@ treebuilder_handle_start(TreeBuilderObject* self, PyObject* tag, self->index++; Py_INCREF(node); - Py_SETREF(self->this, node); + Py_XSETREF(self->this, node); Py_INCREF(node); - Py_SETREF(self->last, node); + Py_XSETREF(self->last, node); if (treebuilder_append_event(self, self->start_event_obj, node) < 0) goto error; @@ -3604,7 +3604,7 @@ _elementtree_XMLParser__setevents_impl(XMLParserObject *self, target = (TreeBuilderObject*) self->target; Py_INCREF(events_queue); - Py_SETREF(target->events, events_queue); + Py_XSETREF(target->events, events_queue); /* clear out existing events */ Py_CLEAR(target->start_event_obj); @@ -3639,18 +3639,18 @@ _elementtree_XMLParser__setevents_impl(XMLParserObject *self, Py_INCREF(event_name_obj); if (strcmp(event_name, "start") == 0) { - Py_SETREF(target->start_event_obj, event_name_obj); + Py_XSETREF(target->start_event_obj, event_name_obj); } else if (strcmp(event_name, "end") == 0) { - Py_SETREF(target->end_event_obj, event_name_obj); + Py_XSETREF(target->end_event_obj, event_name_obj); } else if (strcmp(event_name, "start-ns") == 0) { - Py_SETREF(target->start_ns_event_obj, event_name_obj); + Py_XSETREF(target->start_ns_event_obj, event_name_obj); EXPAT(SetNamespaceDeclHandler)( self->parser, (XML_StartNamespaceDeclHandler) expat_start_ns_handler, (XML_EndNamespaceDeclHandler) expat_end_ns_handler ); } else if (strcmp(event_name, "end-ns") == 0) { - Py_SETREF(target->end_ns_event_obj, event_name_obj); + Py_XSETREF(target->end_ns_event_obj, event_name_obj); EXPAT(SetNamespaceDeclHandler)( self->parser, (XML_StartNamespaceDeclHandler) expat_start_ns_handler, diff --git a/Modules/_functoolsmodule.c b/Modules/_functoolsmodule.c index 8da5eb3..6205708 100644 --- a/Modules/_functoolsmodule.c +++ b/Modules/_functoolsmodule.c @@ -294,10 +294,10 @@ partial_setstate(partialobject *pto, PyObject *state) else Py_INCREF(dict); - Py_SETREF(pto->fn, fn); - Py_SETREF(pto->args, fnargs); - Py_SETREF(pto->kw, kw); - Py_SETREF(pto->dict, dict); + Py_XSETREF(pto->fn, fn); + Py_XSETREF(pto->args, fnargs); + Py_XSETREF(pto->kw, kw); + Py_XSETREF(pto->dict, dict); Py_RETURN_NONE; } diff --git a/Modules/_io/bufferedio.c b/Modules/_io/bufferedio.c index f751446..625a61e 100644 --- a/Modules/_io/bufferedio.c +++ b/Modules/_io/bufferedio.c @@ -1196,7 +1196,7 @@ found: Py_CLEAR(res); goto end; } - Py_SETREF(res, _PyBytes_Join(_PyIO_empty_bytes, chunks)); + Py_XSETREF(res, _PyBytes_Join(_PyIO_empty_bytes, chunks)); end: LEAVE_BUFFERED(self) @@ -1452,7 +1452,7 @@ _io_BufferedReader___init___impl(buffered *self, PyObject *raw, return -1; Py_INCREF(raw); - Py_SETREF(self->raw, raw); + Py_XSETREF(self->raw, raw); self->buffer_size = buffer_size; self->readable = 1; self->writable = 0; @@ -1804,7 +1804,7 @@ _io_BufferedWriter___init___impl(buffered *self, PyObject *raw, return -1; Py_INCREF(raw); - Py_SETREF(self->raw, raw); + Py_XSETREF(self->raw, raw); self->readable = 0; self->writable = 1; @@ -2307,7 +2307,7 @@ _io_BufferedRandom___init___impl(buffered *self, PyObject *raw, return -1; Py_INCREF(raw); - Py_SETREF(self->raw, raw); + Py_XSETREF(self->raw, raw); self->buffer_size = buffer_size; self->readable = 1; self->writable = 1; diff --git a/Modules/_io/bytesio.c b/Modules/_io/bytesio.c index 99e71bc..49174b4 100644 --- a/Modules/_io/bytesio.c +++ b/Modules/_io/bytesio.c @@ -969,7 +969,7 @@ _io_BytesIO___init___impl(bytesio *self, PyObject *initvalue) if (initvalue && initvalue != Py_None) { if (PyBytes_CheckExact(initvalue)) { Py_INCREF(initvalue); - Py_SETREF(self->buf, initvalue); + Py_XSETREF(self->buf, initvalue); self->string_size = PyBytes_GET_SIZE(initvalue); } else { diff --git a/Modules/_io/textio.c b/Modules/_io/textio.c index b1d2b6f..063caa6 100644 --- a/Modules/_io/textio.c +++ b/Modules/_io/textio.c @@ -995,7 +995,7 @@ _io_TextIOWrapper___init___impl(textio *self, PyObject *buffer, "Oi", self->decoder, (int)self->readtranslate); if (incrementalDecoder == NULL) goto error; - Py_SETREF(self->decoder, incrementalDecoder); + Py_XSETREF(self->decoder, incrementalDecoder); } } @@ -1373,7 +1373,7 @@ _io_TextIOWrapper_write_impl(textio *self, PyObject *text) static void textiowrapper_set_decoded_chars(textio *self, PyObject *chars) { - Py_SETREF(self->decoded_chars, chars); + Py_XSETREF(self->decoded_chars, chars); self->decoded_chars_used = 0; } @@ -1521,7 +1521,7 @@ textiowrapper_read_chunk(textio *self, Py_ssize_t size_hint) dec_buffer = NULL; /* Reference lost to PyBytes_Concat */ goto fail; } - Py_SETREF(self->snapshot, Py_BuildValue("NN", dec_flags, next_input)); + Py_XSETREF(self->snapshot, Py_BuildValue("NN", dec_flags, next_input)); } Py_DECREF(input_chunk); @@ -1627,7 +1627,7 @@ _io_TextIOWrapper_read_impl(textio *self, Py_ssize_t n) if (chunks != NULL) { if (result != NULL && PyList_Append(chunks, result) < 0) goto fail; - Py_SETREF(result, PyUnicode_Join(_PyIO_empty_str, chunks)); + Py_XSETREF(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 index 9bc8033..f3bcd76 100644 --- a/Modules/_lzmamodule.c +++ b/Modules/_lzmamodule.c @@ -1011,7 +1011,7 @@ decompress(Decompressor *d, uint8_t *data, size_t len, Py_ssize_t max_length) if (d->eof) { d->needs_input = 0; if (lzs->avail_in > 0) { - Py_SETREF(d->unused_data, + Py_XSETREF(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 index f500038..1acf14a 100644 --- a/Modules/_pickle.c +++ b/Modules/_pickle.c @@ -846,7 +846,7 @@ PyMemoTable_Set(PyMemoTable *self, PyObject *key, Py_ssize_t value) static int _Pickler_ClearBuffer(PicklerObject *self) { - Py_SETREF(self->output_buffer, + Py_XSETREF(self->output_buffer, PyBytes_FromStringAndSize(NULL, self->max_output_len)); if (self->output_buffer == NULL) return -1; @@ -3089,7 +3089,7 @@ fix_imports(PyObject **module_name, PyObject **global_name) return -1; } Py_INCREF(item); - Py_SETREF(*module_name, item); + Py_XSETREF(*module_name, item); } else if (PyErr_Occurred()) { return -1; diff --git a/Modules/_sqlite/connection.c b/Modules/_sqlite/connection.c index 7018f9f..42e4158 100644 --- a/Modules/_sqlite/connection.c +++ b/Modules/_sqlite/connection.c @@ -204,7 +204,7 @@ void pysqlite_flush_statement_cache(pysqlite_Connection* self) node = node->next; } - Py_SETREF(self->statement_cache, + Py_XSETREF(self->statement_cache, (pysqlite_Cache *)PyObject_CallFunction((PyObject *)&pysqlite_CacheType, "O", self)); Py_DECREF(self); self->statement_cache->decref_factory = 0; @@ -319,7 +319,7 @@ PyObject* pysqlite_connection_cursor(pysqlite_Connection* self, PyObject* args, if (cursor && self->row_factory != Py_None) { Py_INCREF(self->row_factory); - Py_SETREF(((pysqlite_Cursor *)cursor)->row_factory, self->row_factory); + Py_XSETREF(((pysqlite_Cursor *)cursor)->row_factory, self->row_factory); } return cursor; @@ -794,7 +794,7 @@ static void _pysqlite_drop_unused_statement_references(pysqlite_Connection* self } } - Py_SETREF(self->statements, new_list); + Py_XSETREF(self->statements, new_list); } static void _pysqlite_drop_unused_cursor_references(pysqlite_Connection* self) @@ -825,7 +825,7 @@ static void _pysqlite_drop_unused_cursor_references(pysqlite_Connection* self) } } - Py_SETREF(self->cursors, new_list); + Py_XSETREF(self->cursors, new_list); } PyObject* pysqlite_connection_create_function(pysqlite_Connection* self, PyObject* args, PyObject* kwargs) diff --git a/Modules/_sqlite/cursor.c b/Modules/_sqlite/cursor.c index c0c8746..0931c84 100644 --- a/Modules/_sqlite/cursor.c +++ b/Modules/_sqlite/cursor.c @@ -170,7 +170,7 @@ int pysqlite_build_row_cast_map(pysqlite_Cursor* self) return 0; } - Py_SETREF(self->row_cast_map, PyList_New(0)); + Py_XSETREF(self->row_cast_map, PyList_New(0)); for (i = 0; i < sqlite3_column_count(self->statement->st); i++) { converter = NULL; @@ -510,7 +510,7 @@ PyObject* _pysqlite_query_execute(pysqlite_Cursor* self, int multiple, PyObject* /* reset description and rowcount */ Py_INCREF(Py_None); - Py_SETREF(self->description, Py_None); + Py_XSETREF(self->description, Py_None); self->rowcount = -1L; func_args = PyTuple_New(1); @@ -526,7 +526,7 @@ PyObject* _pysqlite_query_execute(pysqlite_Cursor* self, int multiple, PyObject* (void)pysqlite_statement_reset(self->statement); } - Py_SETREF(self->statement, + Py_XSETREF(self->statement, (pysqlite_Statement *)pysqlite_cache_get(self->connection->statement_cache, func_args)); Py_DECREF(func_args); @@ -535,7 +535,7 @@ PyObject* _pysqlite_query_execute(pysqlite_Cursor* self, int multiple, PyObject* } if (self->statement->in_use) { - Py_SETREF(self->statement, + Py_XSETREF(self->statement, PyObject_New(pysqlite_Statement, &pysqlite_StatementType)); if (!self->statement) { goto error; @@ -652,7 +652,7 @@ PyObject* _pysqlite_query_execute(pysqlite_Cursor* self, int multiple, PyObject* numcols = sqlite3_column_count(self->statement->st); Py_END_ALLOW_THREADS - Py_SETREF(self->description, PyTuple_New(numcols)); + Py_XSETREF(self->description, PyTuple_New(numcols)); if (!self->description) { goto error; } diff --git a/Modules/_sre.c b/Modules/_sre.c index 150229d..6b58560 100644 --- a/Modules/_sre.c +++ b/Modules/_sre.c @@ -756,7 +756,7 @@ deepcopy(PyObject** object, PyObject* memo) if (!copy) return 0; - Py_SETREF(*object, copy); + Py_XSETREF(*object, copy); return 1; /* success */ } diff --git a/Modules/_ssl.c b/Modules/_ssl.c index 51b5399..8b5b8f7 100644 --- a/Modules/_ssl.c +++ b/Modules/_ssl.c @@ -1589,7 +1589,7 @@ static int PySSL_set_context(PySSLSocket *self, PyObject *value, return -1; #else Py_INCREF(value); - Py_SETREF(self->ctx, (PySSLContext *)value); + Py_XSETREF(self->ctx, (PySSLContext *)value); SSL_set_SSL_CTX(self->ssl, self->ctx->ctx); #endif } else { @@ -1646,7 +1646,7 @@ PySSL_get_owner(PySSLSocket *self, void *c) static int PySSL_set_owner(PySSLSocket *self, PyObject *value, void *c) { - Py_SETREF(self->owner, PyWeakref_NewRef(value, NULL)); + Py_XSETREF(self->owner, PyWeakref_NewRef(value, NULL)); if (self->owner == NULL) return -1; return 0; diff --git a/Modules/_struct.c b/Modules/_struct.c index 1f1bb93..ffedb9f 100644 --- a/Modules/_struct.c +++ b/Modules/_struct.c @@ -1437,7 +1437,7 @@ s_init(PyObject *self, PyObject *args, PyObject *kwds) return -1; } - Py_SETREF(soself->s_format, o_format); + Py_XSETREF(soself->s_format, o_format); ret = prepare_s(soself); return ret; diff --git a/Modules/cjkcodecs/multibytecodec.c b/Modules/cjkcodecs/multibytecodec.c index 70a606f..e1cdb2c 100644 --- a/Modules/cjkcodecs/multibytecodec.c +++ b/Modules/cjkcodecs/multibytecodec.c @@ -793,7 +793,7 @@ encoder_encode_stateful(MultibyteStatefulEncoderContext *ctx, ctx->errors, final ? MBENC_FLUSH | MBENC_RESET : 0); if (r == NULL) { /* recover the original pending buffer */ - Py_SETREF(ctx->pending, origpending); + Py_XSETREF(ctx->pending, origpending); origpending = NULL; goto errorexit; } diff --git a/Modules/faulthandler.c b/Modules/faulthandler.c index 45c9fcb..9485e24 100644 --- a/Modules/faulthandler.c +++ b/Modules/faulthandler.c @@ -381,7 +381,7 @@ faulthandler_enable(PyObject *self, PyObject *args, PyObject *kwargs) return NULL; Py_XINCREF(file); - Py_SETREF(fatal_error.file, file); + Py_XSETREF(fatal_error.file, file); fatal_error.fd = fd; fatal_error.all_threads = all_threads; fatal_error.interp = tstate->interp; @@ -599,7 +599,7 @@ faulthandler_dump_traceback_later(PyObject *self, cancel_dump_traceback_later(); Py_XINCREF(file); - Py_SETREF(thread.file, file); + Py_XSETREF(thread.file, file); thread.fd = fd; thread.timeout_us = timeout_us; thread.repeat = repeat; @@ -777,7 +777,7 @@ faulthandler_register_py(PyObject *self, } Py_XINCREF(file); - Py_SETREF(user->file, file); + Py_XSETREF(user->file, file); user->fd = fd; user->all_threads = all_threads; user->chain = chain; diff --git a/Modules/itertoolsmodule.c b/Modules/itertoolsmodule.c index 11ce5ea..a7f1111 100644 --- a/Modules/itertoolsmodule.c +++ b/Modules/itertoolsmodule.c @@ -158,11 +158,11 @@ groupby_setstate(groupbyobject *lz, PyObject *state) if (!PyArg_ParseTuple(state, "OOO", &currkey, &currvalue, &tgtkey)) return NULL; Py_INCREF(currkey); - Py_SETREF(lz->currkey, currkey); + Py_XSETREF(lz->currkey, currkey); Py_INCREF(currvalue); - Py_SETREF(lz->currvalue, currvalue); + Py_XSETREF(lz->currvalue, currvalue); Py_INCREF(tgtkey); - Py_SETREF(lz->tgtkey, tgtkey); + Py_XSETREF(lz->tgtkey, tgtkey); Py_RETURN_NONE; } @@ -631,7 +631,7 @@ tee_next(teeobject *to) link = teedataobject_jumplink(to->dataobj); if (link == NULL) return NULL; - Py_SETREF(to->dataobj, (teedataobject *)link); + Py_XSETREF(to->dataobj, (teedataobject *)link); to->index = 0; } value = teedataobject_getitem(to->dataobj, to->index); @@ -743,7 +743,7 @@ tee_setstate(teeobject *to, PyObject *state) return NULL; } Py_INCREF(tdo); - Py_SETREF(to->dataobj, tdo); + Py_XSETREF(to->dataobj, tdo); to->index = index; Py_RETURN_NONE; } @@ -969,7 +969,7 @@ cycle_setstate(cycleobject *lz, PyObject *state) if (!PyArg_ParseTuple(state, "Oi", &saved, &firstpass)) return NULL; Py_XINCREF(saved); - Py_SETREF(lz->saved, saved); + Py_XSETREF(lz->saved, saved); lz->firstpass = firstpass != 0; Py_RETURN_NONE; } @@ -1895,9 +1895,9 @@ chain_setstate(chainobject *lz, PyObject *state) return NULL; Py_INCREF(source); - Py_SETREF(lz->source, source); + Py_XSETREF(lz->source, source); Py_XINCREF(active); - Py_SETREF(lz->active, active); + Py_XSETREF(lz->active, active); Py_RETURN_NONE; } @@ -2253,7 +2253,7 @@ product_setstate(productobject *lz, PyObject *state) Py_INCREF(element); PyTuple_SET_ITEM(result, i, element); } - Py_SETREF(lz->result, result); + Py_XSETREF(lz->result, result); Py_RETURN_NONE; } @@ -2575,7 +2575,7 @@ combinations_setstate(combinationsobject *lz, PyObject *state) PyTuple_SET_ITEM(result, i, element); } - Py_SETREF(lz->result, result); + Py_XSETREF(lz->result, result); Py_RETURN_NONE; } @@ -2905,7 +2905,7 @@ cwr_setstate(cwrobject *lz, PyObject *state) Py_INCREF(element); PyTuple_SET_ITEM(result, i, element); } - Py_SETREF(lz->result, result); + Py_XSETREF(lz->result, result); Py_RETURN_NONE; } @@ -3298,7 +3298,7 @@ permutations_setstate(permutationsobject *po, PyObject *state) Py_INCREF(element); PyTuple_SET_ITEM(result, i, element); } - Py_SETREF(po->result, result); + Py_XSETREF(po->result, result); Py_RETURN_NONE; } @@ -3486,7 +3486,7 @@ static PyObject * accumulate_setstate(accumulateobject *lz, PyObject *state) { Py_INCREF(state); - Py_SETREF(lz->total, state); + Py_XSETREF(lz->total, state); Py_RETURN_NONE; } @@ -4468,7 +4468,7 @@ static PyObject * zip_longest_setstate(ziplongestobject *lz, PyObject *state) { Py_INCREF(state); - Py_SETREF(lz->fillvalue, state); + Py_XSETREF(lz->fillvalue, state); Py_RETURN_NONE; } diff --git a/Modules/signalmodule.c b/Modules/signalmodule.c index da454de..3edf158 100644 --- a/Modules/signalmodule.c +++ b/Modules/signalmodule.c @@ -1266,7 +1266,7 @@ PyInit__signal(void) if (Handlers[SIGINT].func == DefaultHandler) { /* Install default int handler */ Py_INCREF(IntHandler); - Py_SETREF(Handlers[SIGINT].func, IntHandler); + Py_XSETREF(Handlers[SIGINT].func, IntHandler); old_siginthandler = PyOS_setsig(SIGINT, signal_handler); } diff --git a/Modules/zipimport.c b/Modules/zipimport.c index e840271..3abb9f0 100644 --- a/Modules/zipimport.c +++ b/Modules/zipimport.c @@ -155,7 +155,7 @@ zipimporter_init(ZipImporter *self, PyObject *args, PyObject *kwds) tmp = PyUnicode_FromFormat("%U%c", self->prefix, SEP); if (tmp == NULL) goto error; - Py_SETREF(self->prefix, tmp); + Py_XSETREF(self->prefix, tmp); } } else diff --git a/Modules/zlibmodule.c b/Modules/zlibmodule.c index 11a34bb..802e7db 100644 --- a/Modules/zlibmodule.c +++ b/Modules/zlibmodule.c @@ -668,7 +668,7 @@ save_unconsumed_input(compobject *self, int err) PyBytes_AS_STRING(self->unused_data), old_size); Py_MEMCPY(PyBytes_AS_STRING(new_data) + old_size, self->zst.next_in, self->zst.avail_in); - Py_SETREF(self->unused_data, new_data); + Py_XSETREF(self->unused_data, new_data); self->zst.avail_in = 0; } } @@ -680,7 +680,7 @@ save_unconsumed_input(compobject *self, int err) (char *)self->zst.next_in, self->zst.avail_in); if (new_data == NULL) return -1; - Py_SETREF(self->unconsumed_tail, new_data); + Py_XSETREF(self->unconsumed_tail, new_data); } return 0; } @@ -962,11 +962,11 @@ zlib_Compress_copy_impl(compobject *self) goto error; } Py_INCREF(self->unused_data); - Py_SETREF(retval->unused_data, self->unused_data); + Py_XSETREF(retval->unused_data, self->unused_data); Py_INCREF(self->unconsumed_tail); - Py_SETREF(retval->unconsumed_tail, self->unconsumed_tail); + Py_XSETREF(retval->unconsumed_tail, self->unconsumed_tail); Py_XINCREF(self->zdict); - Py_SETREF(retval->zdict, self->zdict); + Py_XSETREF(retval->zdict, self->zdict); retval->eof = self->eof; /* Mark it as being initialized */ @@ -1018,11 +1018,11 @@ zlib_Decompress_copy_impl(compobject *self) } Py_INCREF(self->unused_data); - Py_SETREF(retval->unused_data, self->unused_data); + Py_XSETREF(retval->unused_data, self->unused_data); Py_INCREF(self->unconsumed_tail); - Py_SETREF(retval->unconsumed_tail, self->unconsumed_tail); + Py_XSETREF(retval->unconsumed_tail, self->unconsumed_tail); Py_XINCREF(self->zdict); - Py_SETREF(retval->zdict, self->zdict); + Py_XSETREF(retval->zdict, self->zdict); retval->eof = self->eof; /* Mark it as being initialized */ |