(original) (raw)

changeset: 73347:f09e3b1603ee branch: 2.7 parent: 73306:d1cde7081bf5 user: Florent Xicluna florent.xicluna@gmail.com date: Fri Nov 04 10:15:57 2011 +0100 files: Lib/SocketServer.py Lib/test/test_socketserver.py Misc/NEWS description: Issue #13140: Fix the daemon_threads attribute of ThreadingMixIn. diff -r d1cde7081bf5 -r f09e3b1603ee Lib/SocketServer.py --- a/Lib/SocketServer.py Wed Nov 02 19:32:54 2011 +0100 +++ b/Lib/SocketServer.py Fri Nov 04 10:15:57 2011 +0100 @@ -589,8 +589,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.setDaemon (1) + t.daemon = self.daemon_threads t.start() diff -r d1cde7081bf5 -r f09e3b1603ee Lib/test/test_socketserver.py --- a/Lib/test/test_socketserver.py Wed Nov 02 19:32:54 2011 +0100 +++ b/Lib/test/test_socketserver.py Fri Nov 04 10:15: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 d1cde7081bf5 -r f09e3b1603ee Misc/NEWS --- a/Misc/NEWS Wed Nov 02 19:32:54 2011 +0100 +++ b/Misc/NEWS Fri Nov 04 10:15:57 2011 +0100 @@ -74,6 +74,8 @@ Library ------- +- Issue #13140: Fix the daemon_threads attribute of ThreadingMixIn. + - Issue #2892: preserve iterparse events in case of SyntaxError. - Issue #670664: Fix HTMLParser to correctly handle the content of /florent.xicluna@gmail.com