(original) (raw)

changeset: 73348:94017ce9304d branch: 3.2 parent: 73342:fa9c69dcf31b user: Florent Xicluna florent.xicluna@gmail.com date: Fri Nov 04 10:16:28 2011 +0100 files: Lib/socketserver.py Lib/test/test_socketserver.py Misc/NEWS description: Closes #13140: Fix the daemon_threads attribute of ThreadingMixIn. diff -r fa9c69dcf31b -r 94017ce9304d Lib/socketserver.py --- a/Lib/socketserver.py Fri Nov 04 07:09:14 2011 +0200 +++ b/Lib/socketserver.py Fri Nov 04 10:16:28 2011 +0100 @@ -588,8 +588,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 fa9c69dcf31b -r 94017ce9304d Lib/test/test_socketserver.py --- a/Lib/test/test_socketserver.py Fri Nov 04 07:09:14 2011 +0200 +++ b/Lib/test/test_socketserver.py Fri Nov 04 10:16:28 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 fa9c69dcf31b -r 94017ce9304d Misc/NEWS --- a/Misc/NEWS Fri Nov 04 07:09:14 2011 +0200 +++ b/Misc/NEWS Fri Nov 04 10:16:28 2011 +0100 @@ -66,6 +66,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