[Python-checkins] cpython: Issue #23708: Split assertion expression in two assertions in _Py_read() and

Fri Mar 20 11:37:37 CET 2015

https://hg.python.org/cpython/rev/6dd201b6bb4f
changeset: 95089:6dd201b6bb4f
user: Victor Stinner <victor.stinner at gmail.com>
date: Fri Mar 20 11:21:41 2015 +0100
summary:
 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".
files:
 Python/fileutils.c | 6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Python/fileutils.c b/Python/fileutils.c
--- a/Python/fileutils.c
+++ b/Python/fileutils.c
@@ -1178,7 +1178,8 @@
 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 @@
 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) {
-- 
Repository URL: https://hg.python.org/cpython
