Deactivate on -E

Author: pablogsal

Lib/test/test_capi/test_misc.py

@@ -25,7 +25,6 @@
 from test.support import import_helper
 from test.support import threading_helper
 from test.support import warnings_helper
-from test.support import force_not_colorized
 from test.support import requires_limited_api
 from test.support.script_helper import assert_python_failure, assert_python_ok, run_python_until_end
 try:
@@ -206,7 +205,6 @@ def test_c_type_with_ipow(self):
         self.assertEqual(o.__ipow__(1), (1, None))
         self.assertEqual(o.__ipow__(2, 2), (2, 2))
 
-    @force_not_colorized
     def test_return_null_without_error(self):
         # Issue #23571: A function must not return NULL without setting an
         # error
@@ -236,7 +234,6 @@ def test_return_null_without_error(self):
                              'return_null_without_error.* '
                              'returned NULL without setting an exception')
 
-    @force_not_colorized
     def test_return_result_with_error(self):
         # Issue #23571: A function must not return a result with an error set
         if support.Py_DEBUG:
@@ -271,7 +268,6 @@ def test_return_result_with_error(self):
                              'return_result_with_error.* '
                              'returned a result with an exception set')
 
-    @force_not_colorized
     def test_getitem_with_error(self):
         # Test _Py_CheckSlotResult(). Raise an exception and then calls
         # PyObject_GetItem(): check that the assertion catches the bug.

Lib/test/test_cmd_line_script.py

@@ -14,7 +14,7 @@
 
 import textwrap
 from test import support
-from test.support import import_helper, is_apple, os_helper, force_not_colorized
+from test.support import import_helper, is_apple, os_helper
 from test.support.script_helper import (
     make_pkg, make_script, make_zip_pkg, make_zip_script,
     assert_python_ok, assert_python_failure, spawn_python, kill_python)
@@ -195,7 +195,6 @@ def check_repl_stdout_flush(self, separate_stderr=False):
             p.stdin.flush()
             self.assertEqual(b'foo', p.stdout.readline().strip())
 
-    @force_not_colorized
     def check_repl_stderr_flush(self, separate_stderr=False):
         with self.interactive_python(separate_stderr) as p:
             p.stdin.write(b"1/0\n")
@@ -538,7 +537,6 @@ def test_dash_m_main_traceback(self):
             self.assertIn(b'Exception in __main__ module', err)
             self.assertIn(b'Traceback', err)
 
-    @force_not_colorized
     def test_pep_409_verbiage(self):
         # Make sure PEP 409 syntax properly suppresses
         # the context of an exception
@@ -604,7 +602,6 @@ def test_issue20500_exit_with_exception_value(self):
             text = stderr.decode('ascii')
             self.assertEqual(text.rstrip(), "some text")
 
-    @force_not_colorized
     def test_syntaxerror_unindented_caret_position(self):
         script = "1 + 1 = 2\n"
         with os_helper.temp_dir() as script_dir:
@@ -614,7 +611,6 @@ def test_syntaxerror_unindented_caret_position(self):
             # Confirm that the caret is located under the '=' sign
             self.assertIn("\n    ^^^^^\n", text)
 
-    @force_not_colorized
     def test_syntaxerror_indented_caret_position(self):
         script = textwrap.dedent("""\
             if True:
@@ -638,7 +634,6 @@ def test_syntaxerror_indented_caret_position(self):
             self.assertNotIn("\f", text)
             self.assertIn("\n    1 + 1 = 2\n    ^^^^^\n", text)
 
-    @force_not_colorized
     def test_syntaxerror_multi_line_fstring(self):
         script = 'foo = f"""{}\nfoo"""\n'
         with os_helper.temp_dir() as script_dir:
@@ -653,7 +648,6 @@ def test_syntaxerror_multi_line_fstring(self):
                 ],
             )
 
-    @force_not_colorized
     def test_syntaxerror_invalid_escape_sequence_multi_line(self):
         script = 'foo = """\\q"""\n'
         with os_helper.temp_dir() as script_dir:
@@ -669,7 +663,6 @@ def test_syntaxerror_invalid_escape_sequence_multi_line(self):
                 ],
             )
 
-    @force_not_colorized
     def test_syntaxerror_null_bytes(self):
         script = "x = '\0' nothing to see here\n';import os;os.system('echo pwnd')\n"
         with os_helper.temp_dir() as script_dir:
@@ -682,7 +675,6 @@ def test_syntaxerror_null_bytes(self):
                 ],
             )
 
-    @force_not_colorized
     def test_syntaxerror_null_bytes_in_multiline_string(self):
         scripts = ["\n'''\nmultilinestring\0\n'''", "\nf'''\nmultilinestring\0\n'''"] # Both normal and f-strings
         with os_helper.temp_dir() as script_dir:
@@ -696,7 +688,6 @@ def test_syntaxerror_null_bytes_in_multiline_string(self):
                     ]
                 )
 
-    @force_not_colorized
     def test_source_lines_are_shown_when_running_source(self):
         _, _, stderr = assert_python_failure("-c", "1/0")
         expected_lines = [
@@ -707,7 +698,6 @@ def test_source_lines_are_shown_when_running_source(self):
             b'ZeroDivisionError: division by zero']
         self.assertEqual(stderr.splitlines(), expected_lines)
 
-    @force_not_colorized
     def test_syntaxerror_does_not_crash(self):
         script = "nonlocal x\n"
         with os_helper.temp_dir() as script_dir:

Lib/test/test_compileall.py

@@ -29,7 +29,6 @@
 from test import support
 from test.support import os_helper
 from test.support import script_helper
-from test.support import force_not_colorized
 from test.test_py_compile import without_source_date_epoch
 from test.test_py_compile import SourceDateEpochTestMeta
 
@@ -761,7 +760,6 @@ def test_d_compile_error(self):
         rc, out, err = self.assertRunNotOK('-q', '-d', 'dinsdale', self.pkgdir)
         self.assertRegex(out, b'File "dinsdale')
 
-    @force_not_colorized
     def test_d_runtime_error(self):
         bazfn = script_helper.make_script(self.pkgdir, 'baz', 'raise Exception')
         self.assertRunOK('-q', '-d', 'dinsdale', self.pkgdir)

Lib/test/test_eof.py

@@ -5,7 +5,6 @@
 from test.support import os_helper
 from test.support import script_helper
 from test.support import warnings_helper
-from test.support import force_not_colorized
 import unittest
 
 class EOFTestCase(unittest.TestCase):
@@ -59,7 +58,6 @@ def test_line_continuation_EOF(self):
         self.assertEqual(str(excinfo.exception), expect)
 
     @unittest.skipIf(not sys.executable, "sys.executable required")
-    @force_not_colorized
     def test_line_continuation_EOF_from_file_bpo2180(self):
         """Ensure tok_nextc() does not add too many ending newlines."""
         with os_helper.temp_dir() as temp_dir:

Lib/test/test_exceptions.py

@@ -1440,7 +1440,6 @@ def gen():
 
     @cpython_only
     @unittest.skipIf(_testcapi is None, "requires _testcapi")
-    @force_not_colorized
     def test_recursion_normalizing_infinite_exception(self):
         # Issue #30697. Test that a RecursionError is raised when
         # maximum recursion depth has been exceeded when creating
@@ -2197,7 +2196,6 @@ def test_range_of_offsets(self):
                     self.assertIn(expected, err.getvalue())
                     the_exception = exc
 
-    @force_not_colorized
     def test_encodings(self):
         source = (
             '# -*- coding: cp437 -*-\n'
@@ -2227,7 +2225,6 @@ def test_encodings(self):
         finally:
             unlink(TESTFN)
 
-    @force_not_colorized
     def test_non_utf8(self):
         # Check non utf-8 characters
         try:

Lib/test/test_inspect/test_inspect.py

@@ -38,7 +38,6 @@
 from test.support.os_helper import TESTFN, temp_cwd
 from test.support.script_helper import assert_python_ok, assert_python_failure, kill_python
 from test.support import has_subprocess_support, SuppressCrashReport
-from test.support import force_not_colorized
 from test import support
 
 from test.test_inspect import inspect_fodder as mod
@@ -817,7 +816,6 @@ def test_getsource_on_code_object(self):
         self.assertSourceEqual(mod.eggs.__code__, 12, 18)
 
 class TestGetsourceInteractive(unittest.TestCase):
-    @force_not_colorized
     def test_getclasses_interactive(self):
         # bpo-44648: simulate a REPL session;
         # there is no `__file__` in the __main__ module

Lib/test/test_regrtest.py

@@ -23,7 +23,6 @@
 import unittest
 from test import support
 from test.support import os_helper, without_optimizer
-from test.support import force_not_colorized
 from test.libregrtest import cmdline
 from test.libregrtest import main
 from test.libregrtest import setup
@@ -1836,7 +1835,6 @@ def test_unraisable_exc(self):
         self.assertIn("Warning -- Unraisable exception", output)
         self.assertIn("Exception: weakref callback bug", output)
 
-    @force_not_colorized
     def test_threading_excepthook(self):
         # --fail-env-changed must catch uncaught thread exception.
         # The exception must be displayed even if sys.stderr is redirected.

Lib/test/test_repl.py

@@ -7,7 +7,6 @@
 from textwrap import dedent
 from test import support
 from test.support import cpython_only, has_subprocess_support, SuppressCrashReport
-from test.support import force_not_colorized
 from test.support.script_helper import kill_python
 from test.support.import_helper import import_module
 
@@ -16,7 +15,6 @@
     raise unittest.SkipTest("test module requires subprocess")
 
 
-@force_not_colorized
 def spawn_repl(*args, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, **kw):
     """Run the Python REPL with the given arguments.
 
@@ -45,7 +43,6 @@ def spawn_repl(*args, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, **kw):
                             stdout=stdout, stderr=stderr,
                             **kw)
 
-@force_not_colorized
 def run_on_interactive_mode(source):
     """Spawn a new Python interpreter, pass the given
     input source code from the stdin and return the

Lib/test/test_runpy.py

@@ -13,8 +13,7 @@
 import unittest
 import warnings
 from test.support import (infinite_recursion, no_tracing, verbose,
-                          requires_subprocess, requires_resource,
-                          force_not_colorized)
+                          requires_subprocess, requires_resource)
 from test.support.import_helper import forget, make_legacy_pyc, unload
 from test.support.os_helper import create_empty_file, temp_dir
 from test.support.script_helper import make_script, make_zip_script
@@ -787,7 +786,6 @@ def run(self, *args, **kwargs):
             super().run(*args, **kwargs)
 
     @requires_subprocess()
-    @force_not_colorized
     def assertSigInt(self, cmd, *args, **kwargs):
         # Use -E to ignore PYTHONSAFEPATH
         cmd = [sys.executable, '-E', *cmd]
@@ -798,7 +796,6 @@ def assertSigInt(self, cmd, *args, **kwargs):
     def test_pymain_run_file(self):
         self.assertSigInt([self.ham])
 
-    @force_not_colorized
     def test_pymain_run_file_runpy_run_module(self):
         tmp = self.ham.parent
         run_module = tmp / "run_module.py"
@@ -812,7 +809,6 @@ def test_pymain_run_file_runpy_run_module(self):
         )
         self.assertSigInt([run_module], cwd=tmp)
 
-    @force_not_colorized
     def test_pymain_run_file_runpy_run_module_as_main(self):
         tmp = self.ham.parent
         run_module_as_main = tmp / "run_module_as_main.py"
@@ -826,22 +822,18 @@ def test_pymain_run_file_runpy_run_module_as_main(self):
         )
         self.assertSigInt([run_module_as_main], cwd=tmp)
 
-    @force_not_colorized
     def test_pymain_run_command_run_module(self):
         self.assertSigInt(
             ["-c", "import runpy; runpy.run_module('ham')"],
             cwd=self.ham.parent,
         )
 
-    @force_not_colorized
     def test_pymain_run_command(self):
         self.assertSigInt(["-c", "import ham"], cwd=self.ham.parent)
 
-    @force_not_colorized
     def test_pymain_run_stdin(self):
         self.assertSigInt([], input="import ham", cwd=self.ham.parent)
 
-    @force_not_colorized
     def test_pymain_run_module(self):
         ham = self.ham
         self.assertSigInt(["-m", ham.stem], cwd=ham.parent)

Lib/test/test_traceback.py

@@ -396,7 +396,7 @@ def test_encoded_file(self):
         process = subprocess.Popen([sys.executable, "-c",
                                     "import sys; print(sys.stdout.encoding)"],
                                    stdout=subprocess.PIPE,
-                                   stderr=subprocess.STDOUT, env={})
+                                   stderr=subprocess.STDOUT)
         stdout, stderr = process.communicate()
         output_encoding = str(stdout, 'ascii').splitlines()[0]
 

Lib/test/test_tracemalloc.py

@@ -8,7 +8,6 @@
                                         interpreter_requires_environment)
 from test import support
 from test.support import os_helper
-from test.support import force_not_colorized
 
 try:
     import _testcapi
@@ -980,7 +979,6 @@ def check_sys_xoptions_invalid(self, nframe):
             return
         self.fail(f"unexpected output: {stderr!a}")
 
-    @force_not_colorized
     def test_sys_xoptions_invalid(self):
         for nframe in INVALID_NFRAME:
             with self.subTest(nframe=nframe):

Lib/test/test_unicodedata.py

@@ -12,7 +12,7 @@
 import unicodedata
 import unittest
 from test.support import (open_urlresource, requires_resource, script_helper,
-                          cpython_only, check_disallow_instantiation, force_not_colorized)
+                          cpython_only, check_disallow_instantiation)
 
 
 class UnicodeMethodsTest(unittest.TestCase):
@@ -277,7 +277,6 @@ def test_disallow_instantiation(self):
         # Ensure that the type disallows instantiation (bpo-43916)
         check_disallow_instantiation(self, unicodedata.UCD)
 
-    @force_not_colorized
     def test_failed_import_during_compiling(self):
         # Issue 4367
         # Decoding \N escapes requires the unicodedata module. If it can't be

Lib/traceback.py

@@ -146,14 +146,15 @@ def _can_colorize():
             return False
         if os.environ.get("PYTHON_COLORS") == "1":
             return True
-    if "NO_COLOR" in os.environ:
-        return False
+        if "NO_COLOR" in os.environ:
+            return False
     if not _COLORIZE:
         return False
-    if "FORCE_COLOR" in os.environ:
-        return True
-    if os.environ.get("TERM") == "dumb":
-        return False
+    if not sys.flags.ignore_environment:
+        if "FORCE_COLOR" in os.environ:
+            return True
+        if os.environ.get("TERM") == "dumb":
+            return False
     try:
         return os.isatty(sys.stderr.fileno())
     except io.UnsupportedOperation: