diff options
| author | Benjamin Peterson <benjamin@python.org> | 2009-04-05 21:24:58 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2009-04-05 21:24:58 (GMT) |
| commit | 965ce8799190b7017a41cd00eede083b342a15fb (patch) | |
| tree | b903bd81fdf0c37363160a69aa0371ddac4b90c7 /Modules/_multiprocessing/connection.h | |
| parent | 1cdd83c2abf273cc5d5d214f064cc2125dd0f537 (diff) | |
| download | cpython-965ce8799190b7017a41cd00eede083b342a15fb.zip cpython-965ce8799190b7017a41cd00eede083b342a15fb.tar.gz cpython-965ce8799190b7017a41cd00eede083b342a15fb.tar.bz2 | |
Merged revisions 70908,70939,71009,71022,71036 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r70908 | jesse.noller | 2009-03-31 17:20:35 -0500 (Tue, 31 Mar 2009) | 1 line
Issue 5619: Pass MS CRT debug flags into subprocesses
........
r70939 | jesse.noller | 2009-03-31 22:45:50 -0500 (Tue, 31 Mar 2009) | 1 line
Fix multiprocessing.event to match the new threading.Event API
........
r71009 | jesse.noller | 2009-04-01 19:03:28 -0500 (Wed, 01 Apr 2009) | 1 line
issue5545: Switch to Autoconf for multiprocessing; special thanks to Martin Lowis for help
........
r71022 | jesse.noller | 2009-04-01 21:32:55 -0500 (Wed, 01 Apr 2009) | 1 line
Issue 3110: Additional protection for SEM_VALUE_MAX on platforms, thanks to Martin Loewis
........
r71036 | jesse.noller | 2009-04-01 23:22:09 -0500 (Wed, 01 Apr 2009) | 1 line
Issue 3551: Raise ValueError if the size causes ERROR_NO_SYSTEM_RESOURCES
........
Diffstat (limited to 'Modules/_multiprocessing/connection.h')
| -rw-r--r-- | Modules/_multiprocessing/connection.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/Modules/_multiprocessing/connection.h b/Modules/_multiprocessing/connection.h index 581beac..2ee5368 100644 --- a/Modules/_multiprocessing/connection.h +++ b/Modules/_multiprocessing/connection.h @@ -139,8 +139,12 @@ connection_sendbytes(ConnectionObject *self, PyObject *args) res = conn_send_string(self, buffer + offset, size); PyBuffer_Release(&pbuffer); - if (res < 0) - return mp_SetError(PyExc_IOError, res); + if (res < 0) { + if (PyErr_Occurred()) + return NULL; + else + return mp_SetError(PyExc_IOError, res); + } Py_RETURN_NONE; } |