Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Merge 3.2: issue #13140

This commit is contained in:
Florent Xicluna 2011-11-04 10:22:57 +01:00
parent 3d7acb08c4 12b66b5217
commit 495dcbd5c1
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Lib/socketserver.py
View File

@ -606,8 +606,7 @@ class ThreadingMixIn:
"""Start a new thread to process the request.""" """Start a new thread to process the request."""
t = threading.Thread(target = self.process_request_thread, t = threading.Thread(target = self.process_request_thread,
args = (request, client_address)) args = (request, client_address))
if self.daemon_threads: t.daemon = self.daemon_threads
t.daemon = True
t.start() t.start()

1
Lib/test/test_socketserver.py
View File

@ -123,7 +123,6 @@ class SocketServerTest(unittest.TestCase):
self.assertEqual(server.server_address, server.socket.getsockname()) self.assertEqual(server.server_address, server.socket.getsockname())
return server return server
@unittest.skipUnless(threading, 'Threading required for this test.')
@reap_threads @reap_threads
def run_server(self, svrcls, hdlrbase, testfunc): def run_server(self, svrcls, hdlrbase, testfunc):
server = self.make_server(self.pickaddr(svrcls.address_family), server = self.make_server(self.pickaddr(svrcls.address_family),

2
Misc/NEWS
View File

@ -350,6 +350,8 @@ Core and Builtins
Library Library
------- -------
- Issue #13140: Fix the daemon_threads attribute of ThreadingMixIn.
- Issue #13339: Fix compile error in posixmodule.c due to missing semicolon. - Issue #13339: Fix compile error in posixmodule.c due to missing semicolon.
Thanks to Robert Xiao. Thanks to Robert Xiao.