Merged revisions 75248 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r75248 | benjamin.peterson | 2009-10-04 15:40:17 -0500 (Sun, 04 Oct 2009) | 11 lines

  Merged revisions 75066 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r75066 | andrew.kuchling | 2009-09-25 17:23:54 -0500 (Fri, 25 Sep 2009) | 4 lines

    #6243: fix segfault when keyname() returns a NULL pointer.

    Bug noted by Trundle, patched by Trundle and Jerry Chen.
  ........
................
diff --git a/Lib/test/test_curses.py b/Lib/test/test_curses.py
index 4be2029..2615ffb 100644
--- a/Lib/test/test_curses.py
+++ b/Lib/test/test_curses.py
@@ -259,6 +259,10 @@
         if curses.LINES != lines - 1 or curses.COLS != cols + 1:
             raise RuntimeError("Expected resizeterm to update LINES and COLS")
 
+def test_issue6243(stdscr):
+    curses.ungetch(1025)
+    stdscr.getkey()
+
 def main(stdscr):
     curses.savetty()
     try:
@@ -266,6 +270,7 @@
         window_funcs(stdscr)
         test_userptr_without_set(stdscr)
         test_resize_term(stdscr)
+        test_issue6243(stdscr)
     finally:
         curses.resetty()