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 302ddb9bda939674c35f324a33de9e48fd5f0153..b9ff34644b6b2cfb191f290c07d4c7b6d4d055d2 100644 (file)
--- a/Lib/test/test_curses.py
+++ b/Lib/test/test_curses.py
@@ -220,8 +220,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 d8c79c2229d83dd5545c7d1bc36a214aadf19bfb..aceb158dbd079cbb530a14e5455ebc2076a36573 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -446,6 +446,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ù.