From d42b313b5d9ae54cbfbfc072f90acd51554f2015 Mon Sep 17 00:00:00 2001 From: jsbautista Date: Tue, 25 Jun 2024 13:23:52 -0500 Subject: [PATCH 1/7] Change color 3 to gold --- qtconsole/ansi_code_processor.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtconsole/ansi_code_processor.py b/qtconsole/ansi_code_processor.py index 08f222f6..636b14e1 100644 --- a/qtconsole/ansi_code_processor.py +++ b/qtconsole/ansi_code_processor.py @@ -302,7 +302,7 @@ class QtAnsiCodeProcessor(AnsiCodeProcessor): 0 : 'black', # black 1 : 'darkred', # red 2 : 'darkgreen', # green - 3 : 'brown', # yellow + 3 : 'gold', # yellow 4 : 'darkblue', # blue 5 : 'darkviolet', # magenta 6 : 'steelblue', # cyan From 1c0c0797393ca9d2891111036eb5ed60c4e0d863 Mon Sep 17 00:00:00 2001 From: jsbautista Date: Tue, 2 Jul 2024 13:30:42 -0500 Subject: [PATCH 2/7] fix test --- qtconsole/tests/test_ansi_code_processor.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qtconsole/tests/test_ansi_code_processor.py b/qtconsole/tests/test_ansi_code_processor.py index 0bba7b51..24a7917a 100644 --- a/qtconsole/tests/test_ansi_code_processor.py +++ b/qtconsole/tests/test_ansi_code_processor.py @@ -37,7 +37,7 @@ def test_clear(self): def test_colors(self): """ Do basic controls sequences for colors work? """ - string = 'first\x1b[34mblue\x1b[0mlast' + string = 'first\x1b[34mblue\x1b[0mlast\033[33mYellow' i = -1 for i, substring in enumerate(self.processor.split_string(string)): if i == 0: @@ -49,6 +49,9 @@ def test_colors(self): elif i == 2: self.assertEqual(substring, 'last') self.assertEqual(self.processor.foreground_color, None) + elif i == 3: + self.assertEqual(substring, 'Yellow') + self.assertEqual(self.processor.foreground_color, 3) else: self.fail('Too many substrings.') self.assertEqual(i, 2, 'Too few substrings.') From 8e94756c5d6fbdb2ce0ef62604a344e577f993de Mon Sep 17 00:00:00 2001 From: jsbautista <42411448+jsbautista@users.noreply.github.com> Date: Sun, 7 Jul 2024 09:44:04 -0500 Subject: [PATCH 3/7] Update qtconsole/tests/test_ansi_code_processor.py MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Daniel Althviz Moré <16781833+dalthviz@users.noreply.github.com> --- qtconsole/tests/test_ansi_code_processor.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtconsole/tests/test_ansi_code_processor.py b/qtconsole/tests/test_ansi_code_processor.py index 24a7917a..dc787803 100644 --- a/qtconsole/tests/test_ansi_code_processor.py +++ b/qtconsole/tests/test_ansi_code_processor.py @@ -54,7 +54,7 @@ def test_colors(self): self.assertEqual(self.processor.foreground_color, 3) else: self.fail('Too many substrings.') - self.assertEqual(i, 2, 'Too few substrings.') + self.assertEqual(i, 3, 'Too few substrings.') def test_colors_xterm(self): """ Do xterm-specific control sequences for colors work? From 6f932b061cd1c850e582298dbaa4f719e358500d Mon Sep 17 00:00:00 2001 From: jsbautista Date: Mon, 8 Jul 2024 12:00:20 -0500 Subject: [PATCH 4/7] fix test --- qtconsole/tests/test_ansi_code_processor.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/qtconsole/tests/test_ansi_code_processor.py b/qtconsole/tests/test_ansi_code_processor.py index 24a7917a..0e03c374 100644 --- a/qtconsole/tests/test_ansi_code_processor.py +++ b/qtconsole/tests/test_ansi_code_processor.py @@ -2,13 +2,14 @@ import unittest # Local imports -from qtconsole.ansi_code_processor import AnsiCodeProcessor +from qtconsole.ansi_code_processor import AnsiCodeProcessor, QtAnsiCodeProcessor class TestAnsiCodeProcessor(unittest.TestCase): def setUp(self): self.processor = AnsiCodeProcessor() + self.qt_processor = QtAnsiCodeProcessor() def test_clear(self): """ Do control sequences for clearing the console work? @@ -50,8 +51,11 @@ def test_colors(self): self.assertEqual(substring, 'last') self.assertEqual(self.processor.foreground_color, None) elif i == 3: + foreground_color = self.processor.foreground_color + self.assertEqual(self.qt_processor.get_color(foreground_color).name(), '#ffd700') self.assertEqual(substring, 'Yellow') self.assertEqual(self.processor.foreground_color, 3) + else: self.fail('Too many substrings.') self.assertEqual(i, 2, 'Too few substrings.') From f36e18b2dba56411e19098ab8622d5979111af23 Mon Sep 17 00:00:00 2001 From: jsbautista <42411448+jsbautista@users.noreply.github.com> Date: Mon, 15 Jul 2024 12:22:26 -0500 Subject: [PATCH 5/7] Update qtconsole/tests/test_ansi_code_processor.py MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Daniel Althviz Moré <16781833+dalthviz@users.noreply.github.com> --- qtconsole/tests/test_ansi_code_processor.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/qtconsole/tests/test_ansi_code_processor.py b/qtconsole/tests/test_ansi_code_processor.py index 3fd4b4c7..8863db18 100644 --- a/qtconsole/tests/test_ansi_code_processor.py +++ b/qtconsole/tests/test_ansi_code_processor.py @@ -52,9 +52,10 @@ def test_colors(self): self.assertEqual(self.processor.foreground_color, None) elif i == 3: foreground_color = self.processor.foreground_color - self.assertEqual(self.qt_processor.get_color(foreground_color).name(), '#ffd700') self.assertEqual(substring, 'Yellow') - self.assertEqual(self.processor.foreground_color, 3) + self.assertEqual(foreground_color, 3) + self.assertEqual(self.qt_processor.get_color(foreground_color).name(), '#ffd700') + else: self.fail('Too many substrings.') From 5878751310850abd955bdc3d36388180225dec6a Mon Sep 17 00:00:00 2001 From: jsbautista <42411448+jsbautista@users.noreply.github.com> Date: Tue, 16 Jul 2024 01:08:54 -0500 Subject: [PATCH 6/7] Update qtconsole/tests/test_ansi_code_processor.py MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Daniel Althviz Moré <16781833+dalthviz@users.noreply.github.com> --- qtconsole/tests/test_ansi_code_processor.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/qtconsole/tests/test_ansi_code_processor.py b/qtconsole/tests/test_ansi_code_processor.py index 8863db18..2b7dd71f 100644 --- a/qtconsole/tests/test_ansi_code_processor.py +++ b/qtconsole/tests/test_ansi_code_processor.py @@ -55,8 +55,6 @@ def test_colors(self): self.assertEqual(substring, 'Yellow') self.assertEqual(foreground_color, 3) self.assertEqual(self.qt_processor.get_color(foreground_color).name(), '#ffd700') - - else: self.fail('Too many substrings.') self.assertEqual(i, 3, 'Too few substrings.') From dbf35875f75af102ee5441fec9ecc381d6f2274d Mon Sep 17 00:00:00 2001 From: jsbautista Date: Tue, 16 Jul 2024 01:11:28 -0500 Subject: [PATCH 7/7] change to enable bold format by default --- qtconsole/ansi_code_processor.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtconsole/ansi_code_processor.py b/qtconsole/ansi_code_processor.py index 636b14e1..8ebe5c92 100644 --- a/qtconsole/ansi_code_processor.py +++ b/qtconsole/ansi_code_processor.py @@ -61,7 +61,7 @@ class AnsiCodeProcessor(object): # Whether to increase intensity or set boldness for SGR code 1. # (Different terminals handle this in different ways.) - bold_text_enabled = False + bold_text_enabled = True # We provide an empty default color map because subclasses will likely want # to use a custom color format.