summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorent Xicluna <florent.xicluna@gmail.com>2011-11-04 09:16:28 (GMT)
committerFlorent Xicluna <florent.xicluna@gmail.com>2011-11-04 09:16:28 (GMT)
commit12b66b5217d7cbccbeb918683f6df8ab9ae84c3d (patch)
tree8234a13900a989e53f34919bf361739e53d2fb9a
parentdcfde5aac99cd1ff7e43b75103feba44a453055a (diff)
downloadcpython-12b66b5217d7cbccbeb918683f6df8ab9ae84c3d.zip
cpython-12b66b5217d7cbccbeb918683f6df8ab9ae84c3d.tar.gz
cpython-12b66b5217d7cbccbeb918683f6df8ab9ae84c3d.tar.bz2
Closes #13140: Fix the daemon_threads attribute of ThreadingMixIn.
-rw-r--r--Lib/socketserver.py3
-rw-r--r--Lib/test/test_socketserver.py1
-rw-r--r--Misc/NEWS2
3 files changed, 3 insertions, 3 deletions
diff --git a/Lib/socketserver.py b/Lib/socketserver.py
index 0e2ba83..cd367f1 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 08d79c0..b3660c1 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 a605909..c91c094 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.