merge heads

Lib/test/test_concurrent_futures.py

@@ -598,7 +598,9 @@ class FutureTests(unittest.TestCase):
 
         self.assertTrue(isinstance(f1.exception(timeout=5), IOError))
 
+@test.support.reap_threads
 def test_main():
+    try:
         test.support.run_unittest(ProcessPoolExecutorTest,
                                   ThreadPoolExecutorTest,
                                   ProcessPoolWaitTests,
@@ -608,6 +610,8 @@ def test_main():
                                   FutureTests,
                                   ProcessPoolShutdownTest,
                                   ThreadPoolShutdownTest)
+    finally:
+        test.support.reap_children()
 
 if __name__ == "__main__":
     test_main()

Misc/NEWS

@@ -30,6 +30,9 @@ Core and Builtins
 Library
 -------
 
+- Issue #11321: Fix a crash with multiple imports of the _pickle module when
+  embedding Python.  Patch by Andreas Stührk.
+
 - Issue #12502: asyncore: fix polling loop with AF_UNIX sockets.
 
 - Issue #4376: ctypes now supports nested structures in a endian different than

Modules/_pickle.c

@@ -6321,8 +6321,10 @@ PyInit__pickle(void)
     if (m == NULL)
         return NULL;
 
+    Py_INCREF(&Pickler_Type);
     if (PyModule_AddObject(m, "Pickler", (PyObject *)&Pickler_Type) < 0)
         return NULL;
+    Py_INCREF(&Unpickler_Type);
     if (PyModule_AddObject(m, "Unpickler", (PyObject *)&Unpickler_Type) < 0)
         return NULL;