Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

bpo-15037: Add a workaround for getkey() in curses for ncurses 5.7 and earlier. (#3826) 

Skip a test for unget_wch()/get_wch() on OpenBSD since they are broken
in ncurses 5.7.
This commit is contained in:
Serhiy Storchaka 2017-11-01 16:03:40 +02:00 committed by GitHub
parent d1e34031f6
commit 7e68790f3d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Lib/test/test_curses.py
View File

@ -359,6 +359,9 @@ class TestCurses(unittest.TestCase):
self.stdscr.getkey()
@requires_curses_func('unget_wch')
# XXX Remove the decorator when ncurses on OpenBSD be updated
@unittest.skipIf(sys.platform.startswith("openbsd"),
"OpenBSD's curses (v.5.7) has bugs")
def test_unget_wch(self):
stdscr = self.stdscr
encoding = stdscr.encoding

1
Misc/NEWS.d/next/Library/2017-09-29-19-19-36.bpo-15037.ykimLK.rst Normal file
View File

@ -0,0 +1 @@
Added a workaround for getkey() in curses for ncurses 5.7 and earlier.

12
Modules/_cursesmodule.c
View File

@ -1163,8 +1163,16 @@ PyCursesWindow_GetKey(PyCursesWindowObject *self, PyObject *args)
if (!PyErr_Occurred())
PyErr_SetString(PyCursesError, "no input");
return NULL;
} else if (rtn<=255) {
return Py_BuildValue("C", rtn);
} else if (rtn <= 255) {
#ifdef NCURSES_VERSION_MAJOR
#if NCURSES_VERSION_MAJOR*100+NCURSES_VERSION_MINOR <= 507
/* Work around a bug in ncurses 5.7 and earlier */
if (rtn < 0) {
rtn += 256;
}
#endif
#endif
return PyUnicode_FromOrdinal(rtn);
} else {
const char *knp = keyname(rtn);
return PyUnicode_FromString((knp == NULL) ? "" : knp);