diff options
| author | Kristján Valur Jónsson <kristjan@ccpgames.com> | 2009-07-04 15:16:38 (GMT) |
|---|---|---|
| committer | Kristján Valur Jónsson <kristjan@ccpgames.com> | 2009-07-04 15:16:38 (GMT) |
| commit | b8e138aa238e23e9b3e53e012cd4e0b54ec28022 (patch) | |
| tree | 8858575e95a59943468576ca305f929f257eabc4 /Lib | |
| parent | 8c4f4178cbd22b49c19f56baa0b305cbb64b9e94 (diff) | |
| download | cpython-b8e138aa238e23e9b3e53e012cd4e0b54ec28022.zip cpython-b8e138aa238e23e9b3e53e012cd4e0b54ec28022.tar.gz cpython-b8e138aa238e23e9b3e53e012cd4e0b54ec28022.tar.bz2 | |
Revert last change, which was incorrect.
Diffstat (limited to 'Lib')
| -rw-r--r-- | Lib/socketserver.py | 7 | ||||
| -rw-r--r-- | Lib/test/test_sys.py | 2 |
2 files changed, 1 insertions, 8 deletions
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 @@ class TCPServer(BaseServer): 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() 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 @@ class SysModuleTest(unittest.TestCase): "under Windows, test would generate a spurious crash dialog") code = textwrap.dedent(""" import sys - import msvcrt - msvcrt.SetErrorMode(msvcrt.SEM_FAILCRITICALERRORS) def f(): try: |