bpo-39573: Use Py_TYPE() macro in Objects directory (GH-18392)

Replace direct access to PyObject.ob_type with Py_TYPE().
This commit is contained in:
Victor Stinner 2020-02-07 03:04:21 +01:00 committed by GitHub
parent a102ed7d2f
commit 58ac700fb0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
20 changed files with 109 additions and 109 deletions

View file

@ -8401,7 +8401,7 @@ charmapencode_lookup(Py_UCS4 c, PyObject *mapping)
/* wrong return value */
PyErr_Format(PyExc_TypeError,
"character mapping must return integer, bytes or None, not %.400s",
x->ob_type->tp_name);
Py_TYPE(x)->tp_name);
Py_DECREF(x);
return NULL;
}
@ -11082,8 +11082,8 @@ PyUnicode_Compare(PyObject *left, PyObject *right)
}
PyErr_Format(PyExc_TypeError,
"Can't compare %.100s and %.100s",
left->ob_type->tp_name,
right->ob_type->tp_name);
Py_TYPE(left)->tp_name,
Py_TYPE(right)->tp_name);
return -1;
}
@ -11353,7 +11353,7 @@ PyUnicode_Concat(PyObject *left, PyObject *right)
if (!PyUnicode_Check(right)) {
PyErr_Format(PyExc_TypeError,
"can only concatenate str (not \"%.200s\") to str",
right->ob_type->tp_name);
Py_TYPE(right)->tp_name);
return NULL;
}
if (PyUnicode_READY(right) < 0)