From ee84a608587b930176d37303afae8a4358e15990 Mon Sep 17 00:00:00 2001
From: Antoine Pitrou <pitrou@free.fr>
Date: Wed, 16 Aug 2017 20:53:28 +0200
Subject: bpo-18966: non-daemonic threads created by a multiprocessing.Process
 should be joined on exit (#3111)

* bpo-18966: non-daemonic threads created by a multiprocessing.Process should be joined on exit

* Add NEWS blurb
---
 Lib/multiprocessing/process.py | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'Lib/multiprocessing/process.py')

diff --git a/Lib/multiprocessing/process.py b/Lib/multiprocessing/process.py
index 8e500dc93d..8fff3e105e 100644
--- a/Lib/multiprocessing/process.py
+++ b/Lib/multiprocessing/process.py
@@ -17,6 +17,7 @@ import os
 import sys
 import signal
 import itertools
+import threading
 from _weakrefset import WeakSet
 
 #
@@ -311,6 +312,7 @@ class BaseProcess(object):
             sys.stderr.write('Process %s:\n' % self.name)
             traceback.print_exc()
         finally:
+            threading._shutdown()
             util.info('process exiting with exitcode %d' % exitcode)
             sys.stdout.flush()
             sys.stderr.flush()
-- 
cgit v1.2.1