__module__ is a unicode string now:

use PyUnicode_CompareWithASCIIString() instead of
strcmp().

Simplify repr formatting.

diff --git a/Objects/typeobject.c b/Objects/typeobject.c
index 4fc51a626ab9fc5bd98a9b0207ea1568deb00790..bc5fad1c1370b9f5f41bdca57e778ba450aa0485 100644 (file)
--- a/Objects/typeobject.c
+++ b/Objects/typeobject.c
@@ -2479,11 +2479,8 @@ object_repr(PyObject *self)
        name = type_name(type, NULL);
        if (name == NULL)
                return NULL;
-       if (mod != NULL && strcmp(PyString_AS_STRING(mod), "__builtin__"))
-               rtn = PyUnicode_FromFormat("<%s.%s object at %p>",
-                                         PyUnicode_AsString(mod),
-                                         PyUnicode_AsString(name),
-                                         self);
+       if (mod != NULL && PyUnicode_CompareWithASCIIString(mod, "__builtin__"))
+               rtn = PyUnicode_FromFormat("<%U.%U object at %p>", mod, name, self);
        else
                rtn = PyUnicode_FromFormat("<%s object at %p>",
                                          type->tp_name, self);