From: Alexandre Vassalotti <alexandre@peadrop.com>
Date: Wed, 7 May 2008 02:48:42 +0000 (+0000)
Subject: Reverted (partially) patch r62667 to zipimport.c.
X-Git-Tag: v3.0a5~6
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ec924c995c95198e4391f426a6581e5ccedc1bc6;p=python

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 3b8eb936b1..91b8488c55 100644
--- 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;