[Python-checkins] cpython (merge 3.1 -> 3.2): merge 3.1

[benjamin.peterson]

http://hg.python.org/cpython/rev/169b57028bac
changeset:   70344:169b57028bac
branch:      3.2
parent:      70340:72e93f0ebe36
parent:      70343:3e1709213532
user:        Benjamin Peterson <benjamin at python.org>
date:        Tue May 24 12:51:24 2011 -0500
summary:
  merge 3.1

files:
  Lib/socketserver.py |  2 --
  1 files changed, 0 insertions(+), 2 deletions(-)


diff --git a/Lib/socketserver.py b/Lib/socketserver.py
--- a/Lib/socketserver.py
+++ b/Lib/socketserver.py
@@ -555,13 +555,11 @@
             try:
                 self.finish_request(request, client_address)
                 self.shutdown_request(request)
-                self.socket.close()
                 os._exit(0)
             except:
                 try:
                     self.handle_error(request, client_address)
                     self.shutdown_request(request)
-                    self.socket.close()
                 finally:
                     os._exit(1)
 

-- 
Repository URL: http://hg.python.org/cpython