From: Michael W. Hudson <mwh@python.net>
Date: Sat, 7 Aug 2004 15:27:16 +0000 (+0000)
Subject: This is more-or-less:
X-Git-Tag: v2.4a3~376
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2b3feec58f82fee5a8f74ef78e7061bfb73f09a2;p=thirdparty%2FPython%2Fcpython.git

This is more-or-less:

[ 1005123 ] test_curses fails on MacOS X 10.3

Be a bit more guarded about what we expect a terminal to be capable
of.
---

diff --git a/Lib/test/test_curses.py b/Lib/test/test_curses.py
index 2065ef24a1a7..fa57e293521e 100644
--- a/Lib/test/test_curses.py
+++ b/Lib/test/test_curses.py
@@ -140,7 +140,8 @@ def module_funcs(stdscr):
         func()
 
     # Functions that actually need arguments
-    curses.curs_set(1)
+    if curses.tigetstr("cnorm"):
+        curses.curs_set(1)
     curses.delay_output(1)
     curses.echo() ; curses.echo(1)
 
@@ -181,8 +182,8 @@ def module_funcs(stdscr):
         curses.pair_content(curses.COLOR_PAIRS)
         curses.pair_number(0)
 
-    if hasattr(curses, 'use_default_colors'):
-        curses.use_default_colors()
+        if hasattr(curses, 'use_default_colors'):
+            curses.use_default_colors()
 
     if hasattr(curses, 'keyname'):
         curses.keyname(13)