commit b8e138aa238e23e9b3e53e012cd4e0b54ec28022
author Kristján Valur Jónsson <kristjan@ccpgames.com> Sat Jul 04 15:16:38 2009 +0000
committer Kristján Valur Jónsson <kristjan@ccpgames.com> Sat Jul 04 15:16:38 2009 +0000
tree 8858575e95a59943468576ca305f929f257eabc4
parent 8c4f4178cbd22b49c19f56baa0b305cbb64b9e94

Revert last change, which was incorrect.

Lib/socketserver.py

diff --git a/Lib/socketserver.py b/Lib/socketserver.py
index 37df2ba..e5f5778 100644
--- a/Lib/socketserver.py
+++ b/Lib/socketserver.py
@@ -445,12 +445,7 @@
 
     def close_request(self, request):
         """Called to clean up an individual request."""
-        try:
-            #explicitly shutdown.  socket.close() merely releases
-            #the socket and waits for GC to perform the actual close.
-            request.shutdown(socket.SHUT_WR)
-        except socket.error:
-            pass #some platforms may raise ENOTCONN here
+        request.shutdown(socket.SHUT_WR)
         request.close()
 
 

Lib/test/test_sys.py

diff --git a/Lib/test/test_sys.py b/Lib/test/test_sys.py
index 8986741..cac90f4 100644
--- a/Lib/test/test_sys.py
+++ b/Lib/test/test_sys.py
@@ -182,8 +182,6 @@
                 "under Windows, test would generate a spurious crash dialog")
         code = textwrap.dedent("""
             import sys
-            import msvcrt
-            msvcrt.SetErrorMode(msvcrt.SEM_FAILCRITICALERRORS)
 
             def f():
                 try: