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

[benjamin.peterson]

http://hg.python.org/cpython/rev/a5681f50bae2
changeset:   84805:a5681f50bae2
parent:      84803:d6213012d87b
parent:      84804:042ff9325c5e
user:        Benjamin Peterson <benjamin at python.org>
date:        Mon Jul 22 22:08:17 2013 -0700
summary:
  merge 3.3

files:
  Python/dynload_shlib.c |  3 ++-
  1 files changed, 2 insertions(+), 1 deletions(-)


diff --git a/Python/dynload_shlib.c b/Python/dynload_shlib.c
--- a/Python/dynload_shlib.c
+++ b/Python/dynload_shlib.c
@@ -82,7 +82,8 @@
         int i;
         struct stat statb;
         if (fstat(fileno(fp), &statb) == -1) {
-            return PyErr_SetFromErrno(PyExc_IOError);
+            PyErr_SetFromErrno(PyExc_IOError);
+            return NULL;
         }
         for (i = 0; i < nhandles; i++) {
             if (statb.st_dev == handles[i].dev &&

-- 
Repository URL: http://hg.python.org/cpython