[Python-checkins] cpython (merge 3.4 -> default): Issue #21226: Merge from 3.4.

[eric.snow]

http://hg.python.org/cpython/rev/57130574d1e8
changeset:   90895:57130574d1e8
parent:      90893:0eedac3d0b0a
parent:      90894:baa7b5555656
user:        Eric Snow <ericsnowcurrently at gmail.com>
date:        Thu May 29 12:32:39 2014 -0600
summary:
  Issue #21226: Merge from 3.4.

files:
  Python/import.c |  1 +
  1 files changed, 1 insertions(+), 0 deletions(-)


diff --git a/Python/import.c b/Python/import.c
--- a/Python/import.c
+++ b/Python/import.c
@@ -904,6 +904,7 @@
                                         &PyId__fix_up_module,
                                         d, name, pathname, cpathname, NULL);
     if (res != NULL) {
+        Py_DECREF(res);
         res = exec_code_in_module(name, d, co);
     }
     return res;

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