diff options
| author | Benjamin Peterson <benjamin@python.org> | 2017-09-14 04:20:29 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-14 04:20:29 (GMT) |
| commit | a72d15c97f9837f6c9c6bd476a62175c942cc588 (patch) | |
| tree | 104b0a1b090a9743e3efcdeae924c3ac9e306f12 /Objects/setobject.c | |
| parent | 860839cc8e0a4a0890418f77c984955697f96828 (diff) | |
| download | cpython-a72d15c97f9837f6c9c6bd476a62175c942cc588.zip cpython-a72d15c97f9837f6c9c6bd476a62175c942cc588.tar.gz cpython-a72d15c97f9837f6c9c6bd476a62175c942cc588.tar.bz2 | |
consistently use Py_TYPE, Py_REFCNT, and correct initializer macros (#3563)
This no-op change makes 2.7 more consistent with 3.x to ease comparison and backports.
Diffstat (limited to 'Objects/setobject.c')
| -rw-r--r-- | Objects/setobject.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Objects/setobject.c b/Objects/setobject.c index 0c69fac..154be43 100644 --- a/Objects/setobject.c +++ b/Objects/setobject.c @@ -583,13 +583,13 @@ set_tp_print(PySetObject *so, FILE *fp, int flags) if (status < 0) return status; Py_BEGIN_ALLOW_THREADS - fprintf(fp, "%s(...)", so->ob_type->tp_name); + fprintf(fp, "%s(...)", Py_TYPE(so)->tp_name); Py_END_ALLOW_THREADS return 0; } Py_BEGIN_ALLOW_THREADS - fprintf(fp, "%s([", so->ob_type->tp_name); + fprintf(fp, "%s([", Py_TYPE(so)->tp_name); Py_END_ALLOW_THREADS while (set_next(so, &pos, &entry)) { Py_BEGIN_ALLOW_THREADS @@ -617,7 +617,7 @@ set_repr(PySetObject *so) if (status != 0) { if (status < 0) return NULL; - return PyString_FromFormat("%s(...)", so->ob_type->tp_name); + return PyString_FromFormat("%s(...)", Py_TYPE(so)->tp_name); } keys = PySequence_List((PyObject *)so); @@ -628,7 +628,7 @@ set_repr(PySetObject *so) if (listrepr == NULL) goto done; - result = PyString_FromFormat("%s(%s)", so->ob_type->tp_name, + result = PyString_FromFormat("%s(%s)", Py_TYPE(so)->tp_name, PyString_AS_STRING(listrepr)); Py_DECREF(listrepr); done: |