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

[raymond.hettinger]

https://hg.python.org/cpython/rev/16bba5b49441
changeset:   102970:16bba5b49441
parent:      102968:5f6dac170b9b
parent:      102969:caf547c9e589
user:        Raymond Hettinger <python at rcn.com>
date:        Wed Aug 31 08:44:26 2016 -0700
summary:
  Merge

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


diff --git a/Python/import.c b/Python/import.c
--- a/Python/import.c
+++ b/Python/import.c
@@ -1047,7 +1047,7 @@
     mod = _PyImport_FindExtensionObject(name, name);
     if (mod || PyErr_Occurred()) {
         Py_DECREF(name);
-        Py_INCREF(mod);
+        Py_XINCREF(mod);
         return mod;
     }
 

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