Only move test_colorized_detection_checks_for_environment_variables f…

…rom test_traceback to test__colorize
python · hugovk · Apr 24, 2024 · Apr 6, 2024 · Apr 6, 2024 · Apr 6, 2024
commit 796e9f228a70da282296309cf71aab63d72d7aa3
diff --git a/Lib/test/test__colorize.py b/Lib/test/test__colorize.py
@@ -8,97 +8,6 @@
 
 
 class TestColorizedTraceback(unittest.TestCase):
-    def test_colorized_traceback(self):
-        def foo(*args):
-            x = {'a':{'b': None}}
-            y = x['a']['b']['c']
-
-        def baz(*args):
-            return foo(1,2,3,4)
-
-        def bar():
-            return baz(1,
-                    2,3
-                    ,4)
-        try:
-            bar()
-        except Exception as e:
-            exc = traceback.TracebackException.from_exception(
-                e, capture_locals=True
-            )
-        lines = "".join(exc.format(colorize=True))
-        red = _colorize.ANSIColors.RED
-        boldr = _colorize.ANSIColors.BOLD_RED
-        reset = _colorize.ANSIColors.RESET
-
-        expected = [
-            "y = " + red + "x['a']['b']" + reset + boldr + "['c']" + reset,
-            "return " + red + "foo" + reset + boldr + "(1,2,3,4)" + reset,
-            "return " + red + "baz" + reset + boldr + "(1," + reset,
-            boldr + "2,3" + reset,
-            boldr + ",4)" + reset,
-            red + "bar" + reset + boldr + "()" + reset,
-        ]
-        for line in expected:
-            self.assertIn(line, lines)
-
-    def test_colorized_syntax_error(self):
-        try:
-            compile("a $ b", "<string>", "exec")
-        except SyntaxError as e:
-            exc = traceback.TracebackException.from_exception(
-                e, capture_locals=True
-            )
-        actual = "".join(exc.format(colorize=True))
-        magenta = _colorize.ANSIColors.MAGENTA
-        boldm = _colorize.ANSIColors.BOLD_MAGENTA
-        boldr = _colorize.ANSIColors.BOLD_RED
-        reset = _colorize.ANSIColors.RESET
-        expected = "".join(
-            [
-                f'  File {magenta}"<string>"{reset}, line {magenta}1{reset}\n',
-                f'    a {boldr}${reset} b\n',
-                f'      {boldr}^{reset}\n',
-                f'{boldm}SyntaxError{reset}: {magenta}invalid syntax{reset}\n',
-            ]
-        )
-        self.assertIn(expected, actual)
-
-    def test_colorized_traceback_is_the_default(self):
-        def foo():
-            1/0
-
-        from _testcapi import exception_print
-
-        try:
-            foo()
-            self.fail("No exception thrown.")
-        except Exception as e:
-            with captured_output("stderr") as tbstderr:
-                with unittest.mock.patch('_colorize.can_colorize', return_value=True):
-                    exception_print(e)
-            actual = tbstderr.getvalue().splitlines()
-
-        red = _colorize.ANSIColors.RED
-        boldr = _colorize.ANSIColors.BOLD_RED
-        magenta = _colorize.ANSIColors.MAGENTA
-        boldm = _colorize.ANSIColors.BOLD_MAGENTA
-        reset = _colorize.ANSIColors.RESET
-        lno_foo = foo.__code__.co_firstlineno
-        expected = [
-            'Traceback (most recent call last):',
-            f'  File {magenta}"{__file__}"{reset}, '
-            f'line {magenta}{lno_foo+6}{reset}, in {magenta}test_colorized_traceback_is_the_default{reset}',
-            f'    {red}foo{reset+boldr}(){reset}',
-            f'    {red}~~~{reset+boldr}^^{reset}',
-            f'  File {magenta}"{__file__}"{reset}, '
-            f'line {magenta}{lno_foo+1}{reset}, in {magenta}foo{reset}',
-            f'    {red}1{reset+boldr}/{reset+red}0{reset}',
-            f'    {red}~{reset+boldr}^{reset+red}~{reset}',
-            f'{boldm}ZeroDivisionError{reset}: {magenta}division by zero{reset}',
-        ]
-        self.assertEqual(actual, expected)
-
     def test_colorized_detection_checks_for_environment_variables(self):
         if sys.platform == "win32":
             virtual_patching = unittest.mock.patch(

diff --git a/Lib/test/test_traceback.py b/Lib/test/test_traceback.py
@@ -7,6 +7,7 @@
 import types
 import inspect
 import builtins
+import unittest
 import unittest.mock
 import re
 import tempfile
@@ -4270,6 +4271,89 @@ def test_levenshtein_distance_short_circuit(self):
                 res3 = traceback._levenshtein_distance(a, b, threshold)
                 self.assertGreater(res3, threshold, msg=(a, b, threshold))
 
+class TestColorizedTraceback(unittest.TestCase):
+    def test_colorized_traceback(self):
+        def foo(*args):
+            x = {'a':{'b': None}}
+            y = x['a']['b']['c']
+
+        def baz(*args):
+            return foo(1,2,3,4)
+
+        def bar():
+            return baz(1,
+                    2,3
+                    ,4)
+        try:
+            bar()
+        except Exception as e:
+            exc = traceback.TracebackException.from_exception(
+                e, capture_locals=True
+            )
+        lines = "".join(exc.format(colorize=True))
+        red = _colorize.ANSIColors.RED
+        boldr = _colorize.ANSIColors.BOLD_RED
+        reset = _colorize.ANSIColors.RESET
+        self.assertIn("y = " + red + "x['a']['b']" + reset + boldr + "['c']" + reset, lines)
+        self.assertIn("return " + red + "foo" + reset + boldr + "(1,2,3,4)" + reset, lines)
+        self.assertIn("return " + red + "baz" + reset + boldr + "(1," + reset, lines)
+        self.assertIn(boldr + "2,3" + reset, lines)
+        self.assertIn(boldr + ",4)" + reset, lines)
+        self.assertIn(red + "bar" + reset + boldr + "()" + reset, lines)
+
+    def test_colorized_syntax_error(self):
+        try:
+            compile("a $ b", "<string>", "exec")
+        except SyntaxError as e:
+            exc = traceback.TracebackException.from_exception(
+                e, capture_locals=True
+            )
+        actual = "".join(exc.format(colorize=True))
+        red = _colorize.ANSIColors.RED
+        magenta = _colorize.ANSIColors.MAGENTA
+        boldm = _colorize.ANSIColors.BOLD_MAGENTA
+        boldr = _colorize.ANSIColors.BOLD_RED
+        reset = _colorize.ANSIColors.RESET
+        expected = "".join([
+        f'  File {magenta}"<string>"{reset}, line {magenta}1{reset}\n',
+        f'    a {boldr}${reset} b\n',
+        f'      {boldr}^{reset}\n',
+        f'{boldm}SyntaxError{reset}: {magenta}invalid syntax{reset}\n']
+        )
+        self.assertIn(expected, actual)
+
+    def test_colorized_traceback_is_the_default(self):
+        def foo():
+            1/0
+
+        from _testcapi import exception_print
+        try:
+            foo()
+            self.fail("No exception thrown.")
+        except Exception as e:
+            with captured_output("stderr") as tbstderr:
+                with unittest.mock.patch('_colorize.can_colorize', return_value=True):
+                    exception_print(e)
+            actual = tbstderr.getvalue().splitlines()
+
+        red = _colorize.ANSIColors.RED
+        boldr = _colorize.ANSIColors.BOLD_RED
+        magenta = _colorize.ANSIColors.MAGENTA
+        boldm = _colorize.ANSIColors.BOLD_MAGENTA
+        reset = _colorize.ANSIColors.RESET
+        lno_foo = foo.__code__.co_firstlineno
+        expected = ['Traceback (most recent call last):',
+            f'  File {magenta}"{__file__}"{reset}, '
+            f'line {magenta}{lno_foo+5}{reset}, in {magenta}test_colorized_traceback_is_the_default{reset}',
+            f'    {red}foo{reset+boldr}(){reset}',
+            f'    {red}~~~{reset+boldr}^^{reset}',
+            f'  File {magenta}"{__file__}"{reset}, '
+            f'line {magenta}{lno_foo+1}{reset}, in {magenta}foo{reset}',
+            f'    {red}1{reset+boldr}/{reset+red}0{reset}',
+            f'    {red}~{reset+boldr}^{reset+red}~{reset}',
+            f'{boldm}ZeroDivisionError{reset}: {magenta}division by zero{reset}']
+        self.assertEqual(actual, expected)
+
 
 if __name__ == "__main__":
     unittest.main()