From: Pablo Galindo <Pablogsal@gmail.com>
Date: Mon, 15 Feb 2021 21:35:48 +0000 (+0000)
Subject: bpo-43231: Fix test.test_curses.TestCurses.test_init_pair when running under -R ... 
X-Git-Tag: v3.10.0a6~88
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ab2d48163901c9635401db0f6d784c45482d17ec;p=thirdparty%2FPython%2Fcpython.git

bpo-43231: Fix test.test_curses.TestCurses.test_init_pair when running under -R (GH-24539)
---

diff --git a/Lib/test/test_curses.py b/Lib/test/test_curses.py
index a9f7001d39f0..f6bd27d02e43 100644
--- a/Lib/test/test_curses.py
+++ b/Lib/test/test_curses.py
@@ -926,6 +926,13 @@ class TestCurses(unittest.TestCase):
             if (not curses.has_extended_color_support()
                     or (6, 1) <= curses.ncurses_version < (6, 2)):
                 pair_limit = min(pair_limit, SHORT_MAX)
+            # If use_default_colors() is called, the upper limit of the extended
+            # range may be restricted, so we need to check if the limit is still
+            # correct
+            try:
+                curses.init_pair(pair_limit, 0, 0)
+            except ValueError:
+                pair_limit = curses.COLOR_PAIRS
         return pair_limit
 
     @requires_colors