Kaydet (Commit) 75163600 authored tarafından Walter Dörwald's avatar Walter Dörwald

Simplify error formatting and type_repr().

üst d376dd97
...@@ -384,12 +384,8 @@ type_repr(PyTypeObject *type) ...@@ -384,12 +384,8 @@ type_repr(PyTypeObject *type)
else else
kind = "type"; kind = "type";
if (mod != NULL && strcmp(PyUnicode_AsString(mod), "__builtin__")) { if (mod != NULL && PyUnicode_CompareWithASCIIString(mod, "__builtin__"))
rtn = PyUnicode_FromFormat("<%s '%s.%s'>", rtn = PyUnicode_FromFormat("<%s '%U.%U'>", kind, mod, name);
kind,
PyUnicode_AsString(mod),
PyUnicode_AsString(name));
}
else else
rtn = PyUnicode_FromFormat("<%s '%s'>", kind, type->tp_name); rtn = PyUnicode_FromFormat("<%s '%s'>", kind, type->tp_name);
...@@ -2155,8 +2151,8 @@ type_getattro(PyTypeObject *type, PyObject *name) ...@@ -2155,8 +2151,8 @@ type_getattro(PyTypeObject *type, PyObject *name)
/* Give up */ /* Give up */
PyErr_Format(PyExc_AttributeError, PyErr_Format(PyExc_AttributeError,
"type object '%.50s' has no attribute '%.400s'", "type object '%.50s' has no attribute '%U'",
type->tp_name, PyUnicode_AsString(name)); type->tp_name, name);
return NULL; return NULL;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment