Mirrors
/
cpython
mirror of https://github.com/python/cpython
3
0
Fork 0
Code Releases Activity
Browse Source

Issue #22570: Renamed Py_SETREF to Py_XSETREF.

pull/40/head
Serhiy Storchaka 10 years ago
parent
0e0563ca2c
commit
48842714b9
37 changed files with 132 additions and 132 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      Include/object.h
  2. 2
      Modules/_bz2module.c
  3. 4
      Modules/_csv.c
  4. 28
      Modules/_ctypes/_ctypes.c
  5. 2
      Modules/_curses_panel.c
  6. 22
      Modules/_elementtree.c
  7. 8
      Modules/_functoolsmodule.c
  8. 8
      Modules/_io/bufferedio.c
  9. 2
      Modules/_io/bytesio.c
  10. 8
      Modules/_io/textio.c
  11. 2
      Modules/_lzmamodule.c
  12. 4
      Modules/_pickle.c
  13. 8
      Modules/_sqlite/connection.c
  14. 10
      Modules/_sqlite/cursor.c
  15. 2
      Modules/_sre.c
  16. 4
      Modules/_ssl.c
  17. 2
      Modules/_struct.c
  18. 2
      Modules/cjkcodecs/multibytecodec.c
  19. 6
      Modules/faulthandler.c
  20. 28
      Modules/itertoolsmodule.c
  21. 2
      Modules/signalmodule.c
  22. 2
      Modules/zipimport.c
  23. 16
      Modules/zlibmodule.c
  24. 2
      Objects/bytesobject.c
  25. 2
      Objects/descrobject.c
  26. 32
      Objects/exceptions.c
  27. 2
      Objects/frameobject.c
  28. 10
      Objects/funcobject.c
  29. 2
      Objects/moduleobject.c
  30. 6
      Objects/rangeobject.c
  31. 8
      Objects/typeobject.c
  32. 8
      Objects/unicodeobject.c
  33. 2
      Parser/tokenizer.c
  34. 2
      Python/_warnings.c
  35. 6
      Python/ceval.c
  36. 2
      Python/compile.c
  37. 4
      Python/errors.c

4
Include/object.h
View File

@ -856,14 +856,14 @@ PyAPI_FUNC(void) _Py_Dealloc(PyObject *);
*
* The safe way is:
*
* Py_SETREF(op, op2);
* Py_XSETREF(op, op2);
*
* That arranges to set `op` to `op2` _before_ decref'ing, so that any code
* triggered as a side-effect of `op` getting torn down no longer believes
* `op` points to a valid object.
*/
#define Py_SETREF(op, op2) \
#define Py_XSETREF(op, op2) \
do { \
PyObject *_py_tmp = (PyObject *)(op); \
(op) = (op2); \

2
Modules/_bz2module.c
View File

@ -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;

4
Modules/_csv.c
View File

@ -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;

28
Modules/_ctypes/_ctypes.c
View File

@ -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;
}

2
Modules/_curses_panel.c
View File

@ -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;
}

22
Modules/_elementtree.c
View File

@ -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,

8
Modules/_functoolsmodule.c
View File

@ -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;
}

8
Modules/_io/bufferedio.c
View File

@ -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;

2
Modules/_io/bytesio.c
View File

@ -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 {

8
Modules/_io/textio.c
View File

@ -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);

2
Modules/_lzmamodule.c
View File

@ -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;

4
Modules/_pickle.c
View File

@ -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;

8
Modules/_sqlite/connection.c
View File

@ -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)

10
Modules/_sqlite/cursor.c
View File

@ -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;
}

2
Modules/_sre.c
View File

@ -756,7 +756,7 @@ deepcopy(PyObject** object, PyObject* memo)
if (!copy)
return 0;
Py_SETREF(*object, copy);
Py_XSETREF(*object, copy);
return 1; /* success */
}

4
Modules/_ssl.c
View File

@ -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;

2
Modules/_struct.c
View File

@ -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;

2
Modules/cjkcodecs/multibytecodec.c
View File

@ -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;
}

6
Modules/faulthandler.c
View File

@ -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;

28
Modules/itertoolsmodule.c
View File

@ -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;
}

2
Modules/signalmodule.c
View File

@ -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);
}

2
Modules/zipimport.c
View File

@ -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

16
Modules/zlibmodule.c
View File

@ -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 */

2
Objects/bytesobject.c
View File

@ -3520,7 +3520,7 @@ PyBytes_Concat(PyObject **pv, PyObject *w)
/* Multiple references, need to create new object */
PyObject *v;
v = bytes_concat(*pv, w);
Py_SETREF(*pv, v);
Py_XSETREF(*pv, v);
}
}

2
Objects/descrobject.c
View File

@ -1509,7 +1509,7 @@ property_init(PyObject *self, PyObject *args, PyObject *kwds)
PyObject *get_doc = _PyObject_GetAttrId(get, &PyId___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__

32
Objects/exceptions.c
View File

@ -206,7 +206,7 @@ BaseException_set_args(PyBaseExceptionObject *self, PyObject *val)
seq = PySequence_Tuple(val);
if (!seq)
return -1;
Py_SETREF(self->args, seq);
Py_XSETREF(self->args, seq);
return 0;
}
@ -235,7 +235,7 @@ BaseException_set_tb(PyBaseExceptionObject *self, PyObject *tb)
}
Py_XINCREF(tb);
Py_SETREF(self->traceback, tb);
Py_XSETREF(self->traceback, tb);
return 0;
}
@ -563,11 +563,11 @@ SystemExit_init(PySystemExitObject *self, PyObject *args, PyObject *kwds)
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;
}
@ -628,7 +628,7 @@ ImportError_init(PyImportErrorObject *self, PyObject *args, PyObject *kwds)
kwd = PyDict_GetItemString(kwds, #kwd); \
if (kwd) { \
Py_INCREF(kwd); \
Py_SETREF(self->kwd, kwd); \
Py_XSETREF(self->kwd, kwd); \
if (PyDict_DelItemString(kwds, #kwd)) \
return -1; \
} \
@ -647,7 +647,7 @@ ImportError_init(PyImportErrorObject *self, PyObject *args, PyObject *kwds)
return -1;
Py_INCREF(msg);
Py_SETREF(self->msg, msg);
Py_XSETREF(self->msg, msg);
return 0;
}
@ -857,7 +857,7 @@ oserror_init(PyOSErrorObject *self, PyObject **p_args,
#endif
/* Steals the reference to args */
Py_SETREF(self->args, args);
Py_XSETREF(self->args, args);
*p_args = args = NULL;
return 0;
@ -1277,7 +1277,7 @@ SyntaxError_init(PySyntaxErrorObject *self, PyObject *args, PyObject *kwds)
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);
@ -1293,16 +1293,16 @@ SyntaxError_init(PySyntaxErrorObject *self, PyObject *args, PyObject *kwds)
}
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);
@ -1547,7 +1547,7 @@ set_unicodefromstring(PyObject **attr, const char *value)
PyObject *obj = PyUnicode_FromString(value);
if (!obj)
return -1;
Py_SETREF(*attr, obj);
Py_XSETREF(*attr, obj);
return 0;
}
@ -1953,7 +1953,7 @@ UnicodeDecodeError_init(PyObject *self, PyObject *args, PyObject *kwds)
Py_buffer view;
if (PyObject_GetBuffer(ude->object, &view, PyBUF_SIMPLE) != 0)
goto error;
Py_SETREF(ude->object, PyBytes_FromStringAndSize(view.buf, view.len));
Py_XSETREF(ude->object, PyBytes_FromStringAndSize(view.buf, view.len));
PyBuffer_Release(&view);
if (!ude->object)
goto error;
@ -2862,7 +2862,7 @@ _check_for_legacy_statements(PySyntaxErrorObject *self, Py_ssize_t start)
}
if (PyUnicode_Tailmatch(self->text, print_prefix,
start, text_len, -1)) {
Py_SETREF(self->msg,
Py_XSETREF(self->msg,
PyUnicode_FromString("Missing parentheses in call to 'print'"));
return 1;
}
@ -2876,7 +2876,7 @@ _check_for_legacy_statements(PySyntaxErrorObject *self, Py_ssize_t start)
}
if (PyUnicode_Tailmatch(self->text, exec_prefix,
start, text_len, -1)) {
Py_SETREF(self->msg,
Py_XSETREF(self->msg,
PyUnicode_FromString("Missing parentheses in call to 'exec'"));
return 1;
}

2
Objects/frameobject.c
View File

@ -857,7 +857,7 @@ dict_to_map(PyObject *map, Py_ssize_t nmap, PyObject *dict, PyObject **values,
}
} else if (values[j] != value) {
Py_XINCREF(value);
Py_SETREF(values[j], value);
Py_XSETREF(values[j], value);
}
Py_XDECREF(value);
}

10
Objects/funcobject.c
View File

@ -127,7 +127,7 @@ PyFunction_SetDefaults(PyObject *op, PyObject *defaults)
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;
}
@ -158,7 +158,7 @@ PyFunction_SetKwDefaults(PyObject *op, PyObject *defaults)
"non-dict keyword only default args");
return -1;
}
Py_SETREF(((PyFunctionObject *)op)->func_kwdefaults, defaults);
Py_XSETREF(((PyFunctionObject *)op)->func_kwdefaults, defaults);
return 0;
}
@ -190,7 +190,7 @@ PyFunction_SetClosure(PyObject *op, PyObject *closure)
closure->ob_type->tp_name);
return -1;
}
Py_SETREF(((PyFunctionObject *)op)->func_closure, closure);
Py_XSETREF(((PyFunctionObject *)op)->func_closure, closure);
return 0;
}
@ -221,7 +221,7 @@ PyFunction_SetAnnotations(PyObject *op, PyObject *annotations)
"non-dict annotations");
return -1;
}
Py_SETREF(((PyFunctionObject *)op)->func_annotations, annotations);
Py_XSETREF(((PyFunctionObject *)op)->func_annotations, annotations);
return 0;
}
@ -527,7 +527,7 @@ func_new(PyTypeObject* type, PyObject* args, PyObject* kw)
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);

2
Objects/moduleobject.c
View File

@ -69,7 +69,7 @@ module_init_dict(PyModuleObject *mod, PyObject *md_dict,
return -1;
if (PyUnicode_CheckExact(name)) {
Py_INCREF(name);
Py_SETREF(mod->md_name, name);
Py_XSETREF(mod->md_name, name);
}
return 0;

6
Objects/rangeobject.c
View File

@ -1001,7 +1001,7 @@ longrangeiter_setstate(longrangeiterobject *r, PyObject *state)
return NULL;
cmp = PyObject_RichCompareBool(state, zero, Py_LT);
if (cmp > 0) {
Py_SETREF(r->index, zero);
Py_XSETREF(r->index, zero);
Py_RETURN_NONE;
}
Py_DECREF(zero);
@ -1015,7 +1015,7 @@ longrangeiter_setstate(longrangeiterobject *r, PyObject *state)
state = r->len;
Py_INCREF(state);
Py_SETREF(r->index, state);
Py_XSETREF(r->index, state);
Py_RETURN_NONE;
}
@ -1064,7 +1064,7 @@ longrangeiter_next(longrangeiterobject *r)
result = PyNumber_Add(r->start, product);
Py_DECREF(product);
if (result) {
Py_SETREF(r->index, new_index);
Py_XSETREF(r->index, new_index);
}
else {
Py_DECREF(new_index);

8
Objects/typeobject.c
View File

@ -316,7 +316,7 @@ assign_version_tag(PyTypeObject *type)
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);
@ -424,7 +424,7 @@ type_set_name(PyTypeObject *type, PyObject *value, void *context)
type->tp_name = tp_name;
Py_INCREF(value);
Py_SETREF(((PyHeapTypeObject*)type)->ht_name, value);
Py_XSETREF(((PyHeapTypeObject*)type)->ht_name, value);
return 0;
}
@ -445,7 +445,7 @@ type_set_qualname(PyTypeObject *type, PyObject *value, void *context)
et = (PyHeapTypeObject*)type;
Py_INCREF(value);
Py_SETREF(et->ht_qualname, value);
Py_XSETREF(et->ht_qualname, value);
return 0;
}
@ -2897,7 +2897,7 @@ _PyType_Lookup(PyTypeObject *type, PyObject *name)
else
method_cache_misses++;
#endif
Py_SETREF(method_cache[h].name, name);
Py_XSETREF(method_cache[h].name, name);
}
return res;
}

8
Objects/unicodeobject.c
View File

@ -1667,7 +1667,7 @@ unicode_resize(PyObject **p_unicode, Py_ssize_t length)
_Py_INCREF_UNICODE_EMPTY();
if (!unicode_empty)
return -1;
Py_SETREF(*p_unicode, unicode_empty);
Py_XSETREF(*p_unicode, unicode_empty);
return 0;
}
@ -1675,7 +1675,7 @@ unicode_resize(PyObject **p_unicode, Py_ssize_t length)
PyObject *copy = resize_copy(unicode, length);
if (copy == NULL)
return -1;
Py_SETREF(*p_unicode, copy);
Py_XSETREF(*p_unicode, copy);
return 0;
}
@ -13326,7 +13326,7 @@ _PyUnicodeWriter_PrepareInternal(_PyUnicodeWriter *writer,
return -1;
_PyUnicode_FastCopyCharacters(newbuffer, 0,
writer->buffer, 0, writer->pos);
Py_SETREF(writer->buffer, newbuffer);
Py_XSETREF(writer->buffer, newbuffer);
}
_PyUnicodeWriter_Update(writer);
return 0;
@ -15012,7 +15012,7 @@ PyUnicode_InternInPlace(PyObject **p)
if (t) {
Py_INCREF(t);
Py_SETREF(*p, t);
Py_XSETREF(*p, t);
return;
}

2
Parser/tokenizer.c
View File

@ -526,7 +526,7 @@ fp_setreadl(struct tok_state *tok, const char* enc)
goto cleanup;
readline = _PyObject_GetAttrId(stream, &PyId_readline);
Py_SETREF(tok->decoding_readline, readline);
Py_XSETREF(tok->decoding_readline, readline);
if (pos > 0) {
if (PyObject_CallObject(readline, NULL) == NULL) {
readline = NULL;

2
Python/_warnings.c
View File

@ -680,7 +680,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;
}

6
Python/ceval.c
View File

@ -3229,7 +3229,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
@ -4426,7 +4426,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 *
@ -4682,7 +4682,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

2
Python/compile.c
View File

@ -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)) {

4
Python/errors.c
View File

@ -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;
}

Write Preview
Loading…
Cancel
Save