ilusha/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython synced 2026-09-29 12:10:30 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

bpo-39573: Use the Py_TYPE() macro (GH-21433)

Browse source 
Replace obj->ob_type with Py_TYPE(obj).
This commit is contained in:
Victor Stinner 2020-07-10 12:40:38 +02:00 • committed by GitHub
parent d878349bac
commit 8182cc2e68
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Objects/abstract.c
View file

@ -1382,7 +1382,7 @@ PyNumber_Long(PyObject *o)
if (!PyLong_Check(result)) {
PyErr_Format(PyExc_TypeError,
"__int__ returned non-int (type %.200s)",
result->ob_type->tp_name);
Py_TYPE(result)->tp_name);
Py_DECREF(result);
return NULL;
}
@ -1391,7 +1391,7 @@ PyNumber_Long(PyObject *o)
"__int__ returned non-int (type %.200s). "
"The ability to return an instance of a strict subclass of int "
"is deprecated, and may be removed in a future version of Python.",
result->ob_type->tp_name)) {
Py_TYPE(result)->tp_name)) {
Py_DECREF(result);
return NULL;
}

2
Objects/genericaliasobject.c
View file

@ -20,7 +20,7 @@ ga_dealloc(PyObject *self)
Py_XDECREF(alias->origin);
Py_XDECREF(alias->args);
Py_XDECREF(alias->parameters);
self->ob_type->tp_free(self);
Py_TYPE(self)->tp_free(self);
}
static int

4
Objects/unicodeobject.c
View file

@ -3325,7 +3325,7 @@ _PyUnicode_WideCharString_Converter(PyObject *obj, void *ptr)
}
PyErr_Format(PyExc_TypeError,
"argument must be str, not %.50s",
obj->ob_type->tp_name);
Py_TYPE(obj)->tp_name);
return 0;
}
@ -3361,7 +3361,7 @@ _PyUnicode_WideCharString_Opt_Converter(PyObject *obj, void *ptr)
}
PyErr_Format(PyExc_TypeError,
"argument must be str or None, not %.50s",
obj->ob_type->tp_name);
Py_TYPE(obj)->tp_name);
return 0;
}