diff options
| author | Florent Xicluna <florent.xicluna@gmail.com> | 2011-11-04 09:15:57 (GMT) |
|---|---|---|
| committer | Florent Xicluna <florent.xicluna@gmail.com> | 2011-11-04 09:15:57 (GMT) |
| commit | 5f761d79c0578c24f72663493915b8975e246fbd (patch) | |
| tree | 4eb7b006ebca307d40e3f694fc4b400179388dc0 /Lib | |
| parent | 09f871462f2b6cd53daf7cb43e861737af9ebc52 (diff) | |
| download | cpython-5f761d79c0578c24f72663493915b8975e246fbd.zip cpython-5f761d79c0578c24f72663493915b8975e246fbd.tar.gz cpython-5f761d79c0578c24f72663493915b8975e246fbd.tar.bz2 | |
Issue #13140: Fix the daemon_threads attribute of ThreadingMixIn.
Diffstat (limited to 'Lib')
| -rw-r--r-- | Lib/SocketServer.py | 3 | ||||
| -rw-r--r-- | Lib/test/test_socketserver.py | 1 |
2 files changed, 1 insertions, 3 deletions
diff --git a/Lib/SocketServer.py b/Lib/SocketServer.py index 71b9caa..2ff3888 100644 --- 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 41634e7..08fb033 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), |