[Python-3000-checkins] r62812 - python/branches/py3k/Modules/zipimport.c

[alexandre.vassalotti]

Author: alexandre.vassalotti
Date: Wed May  7 04:48:42 2008
New Revision: 62812

Log:
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.



Modified:
   python/branches/py3k/Modules/zipimport.c

Modified: python/branches/py3k/Modules/zipimport.c
==============================================================================
--- python/branches/py3k/Modules/zipimport.c	(original)
+++ python/branches/py3k/Modules/zipimport.c	Wed May  7 04:48:42 2008
@@ -61,14 +61,15 @@
 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;