Merge 3.2: issue #13140
This commit is contained in:
commit
495dcbd5c1
|
@ -606,8 +606,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()
|
||||
|
||||
|
||||
|
|
|
@ -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),
|
||||
|
|
Loading…
Reference in New Issue