From ad3e72557ce06cd03a2cb573872fd16552bd8201 Mon Sep 17 00:00:00 2001 From: "Gregory P. Smith" Date: Tue, 7 Jan 2014 01:11:09 -0800 Subject: [PATCH] Should fix the issue19081 fix on Windows. Don't let the previous posix module ImportError cause the nt module import to fail. --- Modules/zipimport.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Modules/zipimport.c b/Modules/zipimport.c index bbfbda956f..f458ec6841 100644 --- a/Modules/zipimport.c +++ b/Modules/zipimport.c @@ -1429,9 +1429,10 @@ initzipimport(void) * live within a zipped up standard library. Import the posix or nt * builtin that provides the fstat() function we want instead. */ PyObject *os_like_module; - Py_XDECREF(fstat_function); /* Avoid embedded interpreter leaks. */ + Py_CLEAR(fstat_function); /* Avoid embedded interpreter leaks. */ os_like_module = PyImport_ImportModule("posix"); if (os_like_module == NULL) { + PyErr_Clear(); os_like_module = PyImport_ImportModule("nt"); } if (os_like_module != NULL) { @@ -1440,6 +1441,8 @@ initzipimport(void) } if (fstat_function == NULL) { PyErr_Clear(); /* non-fatal, we'll go on without it. */ + if (Py_VerboseFlag) + PySys_WriteStderr("# zipimport unable to use os.fstat().\n"); } } } -- 2.50.1