Use PyUnicode_FromFormat() directly in

zipimporter_repr().
This commit is contained in:
Walter Dörwald 2007-06-05 16:19:33 +00:00
parent 4254e76319
commit 5b0443cf3e
1 changed files with 4 additions and 8 deletions

View File

@ -187,7 +187,6 @@ zipimporter_dealloc(ZipImporter *self)
static PyObject *
zipimporter_repr(ZipImporter *self)
{
char buf[500];
char *archive = "???";
char *prefix = "";
@ -196,14 +195,11 @@ zipimporter_repr(ZipImporter *self)
if (self->prefix != NULL && PyString_Check(self->prefix))
prefix = PyString_AsString(self->prefix);
if (prefix != NULL && *prefix)
PyOS_snprintf(buf, sizeof(buf),
"<zipimporter object \"%.300s%c%.150s\">",
archive, SEP, prefix);
return PyUnicode_FromFormat("<zipimporter object \"%.300s%c%.150s\">",
archive, SEP, prefix);
else
PyOS_snprintf(buf, sizeof(buf),
"<zipimporter object \"%.300s\">",
archive);
return PyUnicode_FromString(buf);
return PyUnicode_FromFormat("<zipimporter object \"%.300s\">",
archive);
}
/* return fullname.split(".")[-1] */