Commit c4587fac authored by Alexandre Vassalotti's avatar Alexandre Vassalotti

Reverted (partially) patch r62667 to zipimport.c.

test_pkgutil and test_zipimport are failing on the amd64-gentoo
buildbot due to a yet unknown change introduced by r62667. To find
out what is causing the failure, I am reverting partially r62667.
parent 84364447
......@@ -61,14 +61,15 @@ static int
zipimporter_init(ZipImporter *self, PyObject *args, PyObject *kwds)
{
char *path, *p, *prefix, buf[MAXPATHLEN+2];
Py_ssize_t len;
size_t len;
if (!_PyArg_NoKeywords("zipimporter()", kwds))
return -1;
if (!PyArg_ParseTuple(args, "s#:zipimporter", &path, &len))
if (!PyArg_ParseTuple(args, "s:zipimporter", &path))
return -1;
len = strlen(path);
if (len == 0) {
PyErr_SetString(ZipImportError, "archive path is empty");
return -1;
......
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