From: Florent Xicluna <florent.xicluna@gmail.com>
Date: Fri, 4 Nov 2011 09:16:28 +0000 (+0100)
Subject: Closes #13140: Fix the daemon_threads attribute of ThreadingMixIn.
X-Git-Tag: v3.2.3rc1~429
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=12b66b5217d7cbccbeb918683f6df8ab9ae84c3d;p=thirdparty%2FPython%2Fcpython.git

Closes #13140: Fix the daemon_threads attribute of ThreadingMixIn.
---

diff --git a/Lib/socketserver.py b/Lib/socketserver.py
index 0e2ba83d1d66..cd367f15e2d3 100644
--- a/Lib/socketserver.py
+++ b/Lib/socketserver.py
@@ -588,8 +588,7 @@ class ThreadingMixIn:
         """Start a new thread to process the request."""
         t = threading.Thread(target = self.process_request_thread,
                              args = (request, client_address))
-        if self.daemon_threads:
-            t.daemon = True
+        t.daemon = self.daemon_threads
         t.start()
 
 
diff --git a/Lib/test/test_socketserver.py b/Lib/test/test_socketserver.py
index 08d79c01f36e..b3660c1e6cf1 100644
--- a/Lib/test/test_socketserver.py
+++ b/Lib/test/test_socketserver.py
@@ -123,7 +123,6 @@ class SocketServerTest(unittest.TestCase):
         self.assertEqual(server.server_address, server.socket.getsockname())
         return server
 
-    @unittest.skipUnless(threading, 'Threading required for this test.')
     @reap_threads
     def run_server(self, svrcls, hdlrbase, testfunc):
         server = self.make_server(self.pickaddr(svrcls.address_family),
diff --git a/Misc/NEWS b/Misc/NEWS
index a605909c3d8d..c91c094a2fa4 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -66,6 +66,8 @@ Core and Builtins
 Library
 -------
 
+- Issue #13140: Fix the daemon_threads attribute of ThreadingMixIn.
+
 - Issue #13339: Fix compile error in posixmodule.c due to missing semicolon.
   Thanks to Robert Xiao.