diff options
| author | Florent Xicluna <florent.xicluna@gmail.com> | 2011-11-04 09:22:57 (GMT) |
|---|---|---|
| committer | Florent Xicluna <florent.xicluna@gmail.com> | 2011-11-04 09:22:57 (GMT) |
| commit | 495dcbd5c13007dfd679edc8067131228c65bccb (patch) | |
| tree | e35235d872f0727a1d56311b5e212c7615b022e2 /Lib | |
| parent | 3d7acb08c43f0319b200c967b009e926daa97222 (diff) | |
| parent | 12b66b5217d7cbccbeb918683f6df8ab9ae84c3d (diff) | |
| download | cpython-495dcbd5c13007dfd679edc8067131228c65bccb.zip cpython-495dcbd5c13007dfd679edc8067131228c65bccb.tar.gz cpython-495dcbd5c13007dfd679edc8067131228c65bccb.tar.bz2 | |
Merge 3.2: issue #13140
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 0d217ed..a487e63 100644 --- a/Lib/socketserver.py +++ b/Lib/socketserver.py @@ -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() 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), |