mirror of
https://github.com/python/cpython.git
synced 2024-11-28 20:33:54 +08:00
Revert last change, which was incorrect.
This commit is contained in:
parent
8c4f4178cb
commit
b8e138aa23
@ -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()
|
||||
|
||||
|
||||
|
@ -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:
|
||||
|
@ -130,6 +130,12 @@ win32_ExitProcess(PyObject *self, PyObject *args)
|
||||
if (!PyArg_ParseTuple(args, "I", &uExitCode))
|
||||
return NULL;
|
||||
|
||||
#if defined(Py_DEBUG)
|
||||
SetErrorMode(SEM_FAILCRITICALERRORS|SEM_NOALIGNMENTFAULTEXCEPT|SEM_NOGPFAULTERRORBOX|SEM_NOOPENFILEERRORBOX);
|
||||
_CrtSetReportMode(_CRT_ASSERT, _CRTDBG_MODE_DEBUG);
|
||||
#endif
|
||||
|
||||
|
||||
ExitProcess(uExitCode);
|
||||
|
||||
return NULL;
|
||||
|
Loading…
Reference in New Issue
Block a user