commit bd0850b8575730fb1ea587a64e95c818e9504c13
author Victor Stinner <victor.stinner@haypocalc.com> Sun Dec 18 20:47:30 2011 +0100
committer Victor Stinner <victor.stinner@haypocalc.com> Sun Dec 18 20:47:30 2011 +0100
tree 54fd7553ce6a3465af3422e6056f7fd0b4dadfe6
parent 7bfe89945b6960bb68e27fd25fea421eee9b1fca

import.c now catchs _Py_stat() exceptions

_Py_stat() now returns -2 if an exception was raised.

Modules/zipimport.c

diff --git a/Modules/zipimport.c b/Modules/zipimport.c
index fd89e9b..ed835c9 100644
--- a/Modules/zipimport.c
+++ b/Modules/zipimport.c
@@ -102,6 +102,8 @@
         int rv;
 
         rv = _Py_stat(filename, &statbuf);
+        if (rv == -2)
+            goto error;
         if (rv == 0) {
             /* it exists */
             if (!S_ISREG(statbuf.st_mode))
@@ -109,8 +111,6 @@
                 Py_CLEAR(filename);
             break;
         }
-        else if (PyErr_Occurred())
-            goto error;
         Py_CLEAR(filename);
         /* back up one path element */
         flen = PyUnicode_FindChar(path, SEP, 0, flen, -1);