Check for EINTR and turn it into KeyboardInterrupt

in err_errno().

diff --git a/Python/errors.c b/Python/errors.c
index f1e7151801ee8c6f2f47d9ceb9f718cb0f5aa9a3..70a85ba9e78b944a0222e97d80ffa8fec1eb5cb0 100644 (file)
--- a/Python/errors.c
+++ b/Python/errors.c
@@ -148,7 +148,12 @@ object *
 err_errno(exc)
        object *exc;
 {
-       object *v = newtupleobject(2);
+       object *v;
+       if (errno == EINTR && intrcheck()) {
+               err_set(KeyboardInterrupt);
+               return NULL;
+       }
+       v = newtupleobject(2);
        if (v != NULL) {
                settupleitem(v, 0, newintobject((long)errno));
                settupleitem(v, 1, newstringobject(strerror(errno)));