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.

diff --git a/Modules/zipimport.c b/Modules/zipimport.c
index 3b8eb936b1b516363fc90d322c5beb6e225de3a3..91b8488c553178ebcbfb1ad44b179772b781def5 100644 (file)
--- a/Modules/zipimport.c
+++ b/Modules/zipimport.c
@@ -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;