From 75163600de0a6f4a4fe7cfc851cc6d3c517cb475 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Walter=20D=C3=B6rwald?= Date: Mon, 11 Jun 2007 15:47:13 +0000 Subject: [PATCH] Simplify error formatting and type_repr(). --- Objects/typeobject.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/Objects/typeobject.c b/Objects/typeobject.c index b826eb4be0..d8da4fcdc6 100644 --- a/Objects/typeobject.c +++ b/Objects/typeobject.c @@ -384,12 +384,8 @@ type_repr(PyTypeObject *type) 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 @@ type_getattro(PyTypeObject *type, PyObject *name) /* 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; } -- 2.40.0