diff options
| author | Alexandre Vassalotti <alexandre@peadrop.com> | 2008-05-07 02:48:42 (GMT) |
|---|---|---|
| committer | Alexandre Vassalotti <alexandre@peadrop.com> | 2008-05-07 02:48:42 (GMT) |
| commit | ec924c995c95198e4391f426a6581e5ccedc1bc6 (patch) | |
| tree | e1fc6c11bba8a6ca82e9daac800a48d34e49e038 /Modules/zipimport.c | |
| parent | 9ea011750037d755deb5ba30b2cef5fb58433e3f (diff) | |
| download | cpython-ec924c995c95198e4391f426a6581e5ccedc1bc6.zip cpython-ec924c995c95198e4391f426a6581e5ccedc1bc6.tar.gz cpython-ec924c995c95198e4391f426a6581e5ccedc1bc6.tar.bz2 | |
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.
Diffstat (limited to 'Modules/zipimport.c')
| -rw-r--r-- | Modules/zipimport.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Modules/zipimport.c b/Modules/zipimport.c index 3b8eb93..91b8488 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; |