From 7f04d4d4b7fe0ed5c56b1778c63ee6ac2170a694 Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Fri, 20 Mar 2015 11:21:41 +0100 Subject: Issue #23708: Split assertion expression in two assertions in _Py_read() and _Py_write() to know which test failed on the buildbot "AMD64 Snow Leop 3.x". --- Python/fileutils.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Python/fileutils.c b/Python/fileutils.c index 702e25d..cc6582c 100644 --- a/Python/fileutils.c +++ b/Python/fileutils.c @@ -1178,7 +1178,8 @@ _Py_read(int fd, void *buf, size_t count) if (async_err) { /* read() was interrupted by a signal (failed with EINTR) * and the Python signal handler raised an exception */ - assert(errno == EINTR && PyErr_Occurred()); + assert(errno == EINTR); + assert(PyErr_Occurred()); return -1; } if (n < 0) { @@ -1254,7 +1255,8 @@ _Py_write(int fd, const void *buf, size_t count) if (async_err) { /* write() was interrupted by a signal (failed with EINTR) * and the Python signal handler raised an exception */ - assert(errno == EINTR && PyErr_Occurred()); + assert(errno == EINTR); + assert(PyErr_Occurred()); return -1; } if (n < 0) { -- cgit v0.12