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

ambv webhook-mailer at python.org
Mon Feb 15 16:36:05 EST 2021


https://github.com/python/cpython/commit/ab2d48163901c9635401db0f6d784c45482d17ec
commit: ab2d48163901c9635401db0f6d784c45482d17ec
branch: master
author: Pablo Galindo <Pablogsal at gmail.com>
committer: ambv <lukasz at langa.pl>
date: 2021-02-15T22:35:48+01:00
summary:

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

files:
M Lib/test/test_curses.py

diff --git a/Lib/test/test_curses.py b/Lib/test/test_curses.py
index a9f7001d39f08..f6bd27d02e431 100644
--- a/Lib/test/test_curses.py
+++ b/Lib/test/test_curses.py
@@ -926,6 +926,13 @@ def get_pair_limit(self):
             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



More information about the Python-checkins mailing list