merge 3.3

766e10c4 · Benjamin Peterson · 69fdbf9c · 21e7d4cd · 766e10c4
Kaydet (Commit) 766e10c4 authored Ock 09, 2014 tarafından Benjamin Peterson
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 3 deletions

zipimport.c Modules/zipimport.c +1 -3

No files found.
--- a/Modules/zipimport.c
+++ b/Modules/zipimport.c
@@ -961,10 +961,8 @@ safely_reopen_archive(ZipImporter *self)
            }
            Py_XDECREF(self->files);  /* free the old value. */
            self->files = files;
-        } else {
-            /* No problem, discard the new stat data. */
-            Py_DECREF(stat_now);
        }
+        Py_DECREF(stat_now);
    }  /* stat succeeded */

    return fp;