From: Mark Dickinson <dickinsm@gmail.com>
Date: Sat, 7 Aug 2010 13:05:49 +0000 (+0000)
Subject: Merged revisions 83780 via svnmerge from
X-Git-Tag: v3.1.3rc1~380
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=998308b75a87387572d8d0497f73eb8b34763e1a;p=python

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 302ddb9bda..b9ff34644b 100644
--- 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 d8c79c2229..aceb158dbd 100644
--- 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ù.