From c0ccd07a3c88e39f2be08280ce3da5c67aaf6049 Mon Sep 17 00:00:00 2001 From: Antonio Rojas Date: Sat, 1 Mar 2025 23:05:46 +0100 Subject: [PATCH] Fix tests with IPython 9 --- src/sage/doctest/test.py | 2 +- src/sage/repl/configuration.py | 5 +++-- src/sage/repl/ipython_extension.py | 4 ++-- src/sage/tests/cmdline.py | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/sage/doctest/test.py b/src/sage/doctest/test.py index a6aa893bb22..c6849a88ce3 100644 --- a/src/sage/doctest/test.py +++ b/src/sage/doctest/test.py @@ -419,7 +419,7 @@ s...: a = 3 s...: b = 5 s...: a + b - 8 + 8... sage: Returning to doctests... diff --git a/src/sage/repl/configuration.py b/src/sage/repl/configuration.py index 7016e12837b..208f9496e0c 100644 --- a/src/sage/repl/configuration.py +++ b/src/sage/repl/configuration.py @@ -72,7 +72,7 @@ def colors(self): """ Return the IPython color palette. - This returns ``'NoColor'`` during doctests to avoid ANSI escape + This returns ``'nocolor'`` during doctests to avoid ANSI escape sequences. EXAMPLES:: @@ -82,7 +82,8 @@ def colors(self): True """ if not self._allow_ansi(): - return 'NoColor' + from IPython import version_info + return 'nocolor' if version_info[0] >= 9 else 'NoColor' from sage.repl.interpreter import SageTerminalInteractiveShell return SageTerminalInteractiveShell.colors.default() diff --git a/src/sage/repl/ipython_extension.py b/src/sage/repl/ipython_extension.py index 05468142142..ff378ee2831 100644 --- a/src/sage/repl/ipython_extension.py +++ b/src/sage/repl/ipython_extension.py @@ -662,10 +662,10 @@ def init_line_transforms(self): sage: from IPython import get_ipython sage: ip = get_ipython() - sage: ip.input_transformer_manager.check_complete(''' # indirect doctest + sage: ip.input_transformer_manager.check_complete(''' ....: for i in [1 .. 2]: ....: a = 2''') - ('incomplete', 2) + ('incomplete', 4) sage: ip.input_transformer_manager.check_complete(''' ....: def foo(L) ....: K. = L''') diff --git a/src/sage/tests/cmdline.py b/src/sage/tests/cmdline.py index 27c614d290f..48b0b316820 100644 --- a/src/sage/tests/cmdline.py +++ b/src/sage/tests/cmdline.py @@ -375,7 +375,7 @@ def test_executable(args, input='', timeout=100.0, pydebug_ignore_warnings=False 4 ********************************************************************** Previously executed commands: - s...: assert True is False + s...: assert True is False... sage: Returning to doctests...