diff options
| author | Martin v. Löwis <martin@v.loewis.de> | 2007-07-21 18:47:48 (GMT) |
|---|---|---|
| committer | Martin v. Löwis <martin@v.loewis.de> | 2007-07-21 18:47:48 (GMT) |
| commit | 5d7428b8ce0ffc79b24b05df2b3d2865db037902 (patch) | |
| tree | c673d91d8fe112d194cb9bbf45006b8b35838965 /Objects/setobject.c | |
| parent | 9f2e346911988cda95fec7c901e8d10d34fa9563 (diff) | |
| download | cpython-5d7428b8ce0ffc79b24b05df2b3d2865db037902.zip cpython-5d7428b8ce0ffc79b24b05df2b3d2865db037902.tar.gz cpython-5d7428b8ce0ffc79b24b05df2b3d2865db037902.tar.bz2 | |
Fix merge breakage.
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 cc60488..a5366c8 100644 --- a/Objects/setobject.c +++ b/Objects/setobject.c @@ -619,21 +619,21 @@ set_repr(PySetObject *so) if (status != 0) { if (status < 0) return NULL; - return PyUnicode_FromFormat("%s(...)", so->ob_type->tp_name); + return PyUnicode_FromFormat("%s(...)", Py_Type(so)->tp_name); } /* shortcut for the empty set */ if (!so->used) { Py_ReprLeave((PyObject*)so); - return PyUnicode_FromFormat("%s()", so->ob_type->tp_name); + return PyUnicode_FromFormat("%s()", Py_Type(so)->tp_name); } keys = PySequence_List((PyObject *)so); if (keys == NULL) goto done; - if (so->ob_type != &PySet_Type) { - result = PyUnicode_FromFormat("%s(%R)", so->ob_type->tp_name, keys); + if (Py_Type(so) != &PySet_Type) { + result = PyUnicode_FromFormat("%s(%R)", Py_Type(so)->tp_name, keys); Py_DECREF(keys); } else { |