Merged revisions 83780 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r83780 | mark.dickinson | 2010-08-07 13:33:36 +0100 (Sat, 07 Aug 2010) | 1 line

  Issue #8433: Fix test_curses failure for platforms with recent versions of ncurses.
........

diff --git a/Lib/test/test_curses.py b/Lib/test/test_curses.py
index 18d73fc79e86615c305cc3befd02ef927284ed9f..fa0d469e475f4459565c8a3591dae243840382e1 100644 (file)
--- a/Lib/test/test_curses.py
+++ b/Lib/test/test_curses.py
@@ -218,8 +218,8 @@ def module_funcs(stdscr):
         if availmask != 0:
             curses.mouseinterval(10)
             # just verify these don't cause errors
+            curses.ungetmouse(0, 0, 0, 0, curses.BUTTON1_PRESSED)
             m = curses.getmouse()
-            curses.ungetmouse(*m)
 
     if hasattr(curses, 'is_term_resized'):
         curses.is_term_resized(*stdscr.getmaxyx())

diff --git a/Misc/NEWS b/Misc/NEWS
index 1d75aa9c067f8766db83a416137809dc79d5088c..b14b4c1bf13f0806a2cdc3cb1e765001dba5bf98 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -194,6 +194,8 @@ Build
 Tests
 -----
 
+- Issue #8433: Fix test_curses failure with newer versions of ncurses.
+
 - Issue #9496: Provide a test suite for the rlcompleter module.  Patch by
   Michele Orrù.