[Python-checkins] cpython (merge default -> default): merge heads

senthil.kumaran python-checkins at python.org
Mon Jun 20 16:38:26 CEST 2011


http://hg.python.org/cpython/rev/d84760f1dcbe
changeset: 70907:d84760f1dcbe
parent: 70904:18ebc7809cb2
parent: 70901:b4a7cd376d6f
user: Senthil Kumaran <senthil at uthcode.com>
date: Mon Jun 20 07:37:59 2011 -0700
summary:
 merge heads
files:
 Python/import.c | 4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/Python/import.c b/Python/import.c
--- a/Python/import.c
+++ b/Python/import.c
@@ -3567,6 +3567,10 @@
 if (fd != -1)
 fd = dup(fd);
 fclose(fp);
+ if (fd == -1) {
+ PyErr_SetFromErrno(PyExc_OSError);
+ return NULL;
+ }
 fp = NULL;
 }
 if (fd != -1) {
-- 
Repository URL: http://hg.python.org/cpython


More information about the Python-checkins mailing list

AltStyle によって変換されたページ (->オリジナル) /