Issue #13140: Fix the daemon_threads attribute of ThreadingMixIn.

diff --git a/Lib/SocketServer.py b/Lib/SocketServer.py
index 71b9caa973a8462069d207215f689d7f7f84506f..2ff388836a0eacb8739c346b629d2b922d8d3443 100644 (file)
--- a/Lib/SocketServer.py
+++ b/Lib/SocketServer.py
@@ -589,8 +589,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.setDaemon (1)
+        t.daemon = self.daemon_threads
         t.start()
 
 

diff --git a/Lib/test/test_socketserver.py b/Lib/test/test_socketserver.py
index 41634e73a22a6e0315a3b8f9cbaac8559beafe28..08fb03350d6c1fad3b0a98601cad7cf2c9ebab87 100644 (file)
--- 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 c7637beca09774c83023ebccc80cc8f02de3eb30..2701b870138bed5187efdbc0c4c65b76ef2a4120 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -74,6 +74,8 @@ Core and Builtins
 Library
 -------
 
+- Issue #13140: Fix the daemon_threads attribute of ThreadingMixIn.
+
 - Issue #2892: preserve iterparse events in case of SyntaxError.
 
 - Issue #670664: Fix HTMLParser to correctly handle the content of