(original) (raw)

changeset: 73349:6fe6769e54a5 parent: 73346:5f49b496d161 parent: 73348:94017ce9304d user: Florent Xicluna florent.xicluna@gmail.com date: Fri Nov 04 10:22:57 2011 +0100 files: Lib/socketserver.py Misc/NEWS description: Merge 3.2: issue #13140 diff -r 5f49b496d161 -r 6fe6769e54a5 Lib/socketserver.py --- a/Lib/socketserver.py Fri Nov 04 09:49:24 2011 +0100 +++ b/Lib/socketserver.py Fri Nov 04 10:22:57 2011 +0100 @@ -606,8 +606,7 @@ """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 -r 5f49b496d161 -r 6fe6769e54a5 Lib/test/test_socketserver.py --- a/Lib/test/test_socketserver.py Fri Nov 04 09:49:24 2011 +0100 +++ b/Lib/test/test_socketserver.py Fri Nov 04 10:22:57 2011 +0100 @@ -123,7 +123,6 @@ 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 -r 5f49b496d161 -r 6fe6769e54a5 Misc/NEWS --- a/Misc/NEWS Fri Nov 04 09:49:24 2011 +0100 +++ b/Misc/NEWS Fri Nov 04 10:22:57 2011 +0100 @@ -350,6 +350,8 @@ 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. /florent.xicluna@gmail.com