Simplify error formatting and type_repr().
diff --git a/Objects/typeobject.c b/Objects/typeobject.c
index b826eb4..d8da4fc 100644
--- a/Objects/typeobject.c
+++ b/Objects/typeobject.c
@@ -384,12 +384,8 @@
else
kind = "type";
- if (mod != NULL && strcmp(PyUnicode_AsString(mod), "__builtin__")) {
- rtn = PyUnicode_FromFormat("<%s '%s.%s'>",
- kind,
- PyUnicode_AsString(mod),
- PyUnicode_AsString(name));
- }
+ if (mod != NULL && PyUnicode_CompareWithASCIIString(mod, "__builtin__"))
+ rtn = PyUnicode_FromFormat("<%s '%U.%U'>", kind, mod, name);
else
rtn = PyUnicode_FromFormat("<%s '%s'>", kind, type->tp_name);
@@ -2155,8 +2151,8 @@
/* Give up */
PyErr_Format(PyExc_AttributeError,
- "type object '%.50s' has no attribute '%.400s'",
- type->tp_name, PyUnicode_AsString(name));
+ "type object '%.50s' has no attribute '%U'",
+ type->tp_name, name);
return NULL;
}