From: R David Murray <rdmurray@bitdance.com>
Date: Tue, 19 Mar 2013 20:26:53 +0000 (-0400)
Subject: #8862: Fix curses cleanup with getchar is interrupted by a signal.
X-Git-Tag: v2.7.4rc1~24
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a39c47aab0ec3032e25e8b0783616d50905ea9e2;p=thirdparty%2FPython%2Fcpython.git

#8862: Fix curses cleanup with getchar is interrupted by a signal.

I have no idea how one would write a test for this.

Patch by July Tikhonov.
---

diff --git a/Misc/NEWS b/Misc/NEWS
index 5c3c6320f47a..6b8cf1ff3c06 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -214,6 +214,8 @@ Core and Builtins
 Library
 -------
 
+- Issue #8862: Fixed curses cleanup when getkey is interrputed by a signal.
+
 - Issue #9090: When a socket with a timeout fails with EWOULDBLOCK or EAGAIN,
   retry the select() loop instead of bailing out.  This is because select()
   can incorrectly report a socket as ready for reading (for example, if it
diff --git a/Modules/_cursesmodule.c b/Modules/_cursesmodule.c
index 5f26c7fa81bb..b914e5f68197 100644
--- a/Modules/_cursesmodule.c
+++ b/Modules/_cursesmodule.c
@@ -885,7 +885,9 @@ PyCursesWindow_GetKey(PyCursesWindowObject *self, PyObject *args)
     }
     if (rtn == ERR) {
         /* getch() returns ERR in nodelay mode */
-        PyErr_SetString(PyCursesError, "no input");
+        PyErr_CheckSignals();
+        if (!PyErr_Occurred())
+            PyErr_SetString(PyCursesError, "no input");
         return NULL;
     } else if (rtn<=255) {
         return Py_BuildValue("c", rtn);