Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

http://bugs.python.org/issue6381 

merging revision 73819 from trunk
This commit is contained in:
Kristján Valur Jónsson 2009-07-04 15:09:25 +00:00
parent 04cecafce1
commit 8c4f4178cb
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Lib/socketserver.py
View File

@ -445,7 +445,12 @@ class TCPServer(BaseServer):
def close_request(self, request): def close_request(self, request):
"""Called to clean up an individual 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) request.shutdown(socket.SHUT_WR)
except socket.error:
pass #some platforms may raise ENOTCONN here
request.close() request.close()

2
Lib/test/test_sys.py
View File

@ -182,6 +182,8 @@ class SysModuleTest(unittest.TestCase):
"under Windows, test would generate a spurious crash dialog") "under Windows, test would generate a spurious crash dialog")
code = textwrap.dedent(""" code = textwrap.dedent("""
import sys import sys
import msvcrt
msvcrt.SetErrorMode(msvcrt.SEM_FAILCRITICALERRORS)
def f(): def f():
try: try:

6
Modules/_multiprocessing/win32_functions.c
View File

@ -130,12 +130,6 @@ win32_ExitProcess(PyObject *self, PyObject *args)
if (!PyArg_ParseTuple(args, "I", &uExitCode)) if (!PyArg_ParseTuple(args, "I", &uExitCode))
return NULL; return NULL;
#if defined(Py_DEBUG)
SetErrorMode(SEM_FAILCRITICALERRORS|SEM_NOALIGNMENTFAULTEXCEPT|SEM_NOGPFAULTERRORBOX|SEM_NOOPENFILEERRORBOX);
_CrtSetReportMode(_CRT_ASSERT, _CRTDBG_MODE_DEBUG);
#endif
ExitProcess(uExitCode); ExitProcess(uExitCode);
return NULL; return NULL;