From: Gregory P. Smith <greg@krypto.org>
Date: Fri, 1 Feb 2013 21:02:59 +0000 (-0800)
Subject: Additional fix for Issue #12268: The io module file object writelines() methods
X-Git-Tag: v2.7.4rc1~176
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a998ad013591407162c633af938994e18ba3be39;p=thirdparty%2FPython%2Fcpython.git

Additional fix for Issue #12268: The io module file object writelines() methods
no longer abort early when one of its write system calls is interrupted (EINTR).
---

diff --git a/Misc/NEWS b/Misc/NEWS
index 2d46d7d75f9f..b74b2f64d44b 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -679,6 +679,9 @@ Library
 Extension Modules
 -----------------
 
+- Issue #12268: The io module file object writelines() methods no longer
+  abort early when one of its write system calls is interrupted (EINTR).
+
 - Fix the leak of a dict in the time module when used in an embedded
   interpreter that is repeatedly initialized and shutdown and reinitialized.
 
diff --git a/Modules/_io/iobase.c b/Modules/_io/iobase.c
index 04caea4cb6e4..063ba2ebd83c 100644
--- a/Modules/_io/iobase.c
+++ b/Modules/_io/iobase.c
@@ -660,7 +660,10 @@ iobase_writelines(PyObject *self, PyObject *args)
                 break; /* Stop Iteration */
         }
 
-        res = PyObject_CallMethodObjArgs(self, _PyIO_str_write, line, NULL);
+        res = NULL;
+        do {
+            res = PyObject_CallMethodObjArgs(self, _PyIO_str_write, line, NULL);
+        } while (res == NULL && _PyIO_trap_eintr());
         Py_DECREF(line);
         if (res == NULL) {
             Py_DECREF(iter);
diff --git a/Modules/_io/textio.c b/Modules/_io/textio.c
index d2e92fa20170..c9913d4a9eb9 100644
--- a/Modules/_io/textio.c
+++ b/Modules/_io/textio.c
@@ -1213,8 +1213,11 @@ _textiowrapper_writeflush(textio *self)
     Py_DECREF(pending);
     if (b == NULL)
         return -1;
-    ret = PyObject_CallMethodObjArgs(self->buffer,
-                                     _PyIO_str_write, b, NULL);
+    ret = NULL;
+    do {
+        ret = PyObject_CallMethodObjArgs(self->buffer,
+                                         _PyIO_str_write, b, NULL);
+    } while (ret == NULL && _PyIO_trap_eintr());
     Py_DECREF(b);
     if (ret == NULL)
         return -1;