changeset:   95089:6dd201b6bb4f
user:        Victor Stinner <victor.stinner@gmail.com>
date:        Fri Mar 20 11:21:41 2015 +0100
files:       Python/fileutils.c
description:
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".


diff -r 597a87099713 -r 6dd201b6bb4f Python/fileutils.c
--- a/Python/fileutils.c	Fri Mar 20 10:52:25 2015 +0100
+++ b/Python/fileutils.c	Fri Mar 20 11:21:41 2015 +0100
@@ -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) {