Skip to content

Commit f93920d

Browse files
committed
Default to color help in argparse
1 parent 5c4080a commit f93920d

File tree

2 files changed

+22
-3
lines changed

2 files changed

+22
-3
lines changed

Lib/argparse.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1231,7 +1231,7 @@ def __init__(self,
12311231
self._name_parser_map = {}
12321232
self._choices_actions = []
12331233
self._deprecated = set()
1234-
self._color = False
1234+
self._color = True
12351235

12361236
super(_SubParsersAction, self).__init__(
12371237
option_strings=option_strings,
@@ -1878,7 +1878,7 @@ def __init__(self,
18781878
exit_on_error=True,
18791879
*,
18801880
suggest_on_error=False,
1881-
color=False,
1881+
color=True,
18821882
):
18831883
superinit = super(ArgumentParser, self).__init__
18841884
superinit(description=description,

Lib/test/test_argparse.py

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,11 @@
1818
import warnings
1919

2020
from enum import StrEnum
21-
from test.support import captured_stderr
21+
from test.support import (
22+
captured_stderr,
23+
force_not_colorized,
24+
force_not_colorized_test_class,
25+
)
2226
from test.support import import_helper
2327
from test.support import os_helper
2428
from test.support import script_helper
@@ -1007,6 +1011,7 @@ def test_parse_enum_value(self):
10071011
args = parser.parse_args(['--color', 'red'])
10081012
self.assertEqual(args.color, self.Color.RED)
10091013

1014+
@force_not_colorized
10101015
def test_help_message_contains_enum_choices(self):
10111016
parser = argparse.ArgumentParser()
10121017
parser.add_argument('--color', choices=self.Color, help='Choose a color')
@@ -2403,6 +2408,7 @@ def test_modified_invalid_action(self):
24032408
# Subparsers tests
24042409
# ================
24052410

2411+
@force_not_colorized_test_class
24062412
class TestAddSubparsers(TestCase):
24072413
"""Test the add_subparsers method"""
24082414

@@ -3009,6 +3015,7 @@ def test_nested_argument_group(self):
30093015
# Parent parser tests
30103016
# ===================
30113017

3018+
@force_not_colorized_test_class
30123019
class TestParentParsers(TestCase):
30133020
"""Tests that parsers can be created with parent parsers"""
30143021

@@ -3216,6 +3223,7 @@ def test_mutex_groups_parents(self):
32163223
# Mutually exclusive group tests
32173224
# ==============================
32183225

3226+
@force_not_colorized_test_class
32193227
class TestMutuallyExclusiveGroupErrors(TestCase):
32203228

32213229
def test_invalid_add_argument_group(self):
@@ -3344,21 +3352,25 @@ def test_successes_when_required(self):
33443352
actual_ns = parse_args(args_string.split())
33453353
self.assertEqual(actual_ns, expected_ns)
33463354

3355+
@force_not_colorized
33473356
def test_usage_when_not_required(self):
33483357
format_usage = self.get_parser(required=False).format_usage
33493358
expected_usage = self.usage_when_not_required
33503359
self.assertEqual(format_usage(), textwrap.dedent(expected_usage))
33513360

3361+
@force_not_colorized
33523362
def test_usage_when_required(self):
33533363
format_usage = self.get_parser(required=True).format_usage
33543364
expected_usage = self.usage_when_required
33553365
self.assertEqual(format_usage(), textwrap.dedent(expected_usage))
33563366

3367+
@force_not_colorized
33573368
def test_help_when_not_required(self):
33583369
format_help = self.get_parser(required=False).format_help
33593370
help = self.usage_when_not_required + self.help
33603371
self.assertEqual(format_help(), textwrap.dedent(help))
33613372

3373+
@force_not_colorized
33623374
def test_help_when_required(self):
33633375
format_help = self.get_parser(required=True).format_help
33643376
help = self.usage_when_required + self.help
@@ -4030,11 +4042,13 @@ def _test(self, tester, parser_text):
40304042
tester.maxDiff = None
40314043
tester.assertEqual(expected_text, parser_text)
40324044

4045+
@force_not_colorized
40334046
def test_format(self, tester):
40344047
parser = self._get_parser(tester)
40354048
format = getattr(parser, 'format_%s' % self.func_suffix)
40364049
self._test(tester, format())
40374050

4051+
@force_not_colorized
40384052
def test_print(self, tester):
40394053
parser = self._get_parser(tester)
40404054
print_ = getattr(parser, 'print_%s' % self.func_suffix)
@@ -4047,6 +4061,7 @@ def test_print(self, tester):
40474061
setattr(sys, self.std_name, old_stream)
40484062
self._test(tester, parser_text)
40494063

4064+
@force_not_colorized
40504065
def test_print_file(self, tester):
40514066
parser = self._get_parser(tester)
40524067
print_ = getattr(parser, 'print_%s' % self.func_suffix)
@@ -4788,6 +4803,7 @@ class TestHelpUsageMetavarsSpacesParentheses(HelpTestCase):
47884803
version = ''
47894804

47904805

4806+
@force_not_colorized_test_class
47914807
class TestHelpUsageNoWhitespaceCrash(TestCase):
47924808

47934809
def test_all_suppressed_mutex_followed_by_long_arg(self):
@@ -5469,6 +5485,7 @@ def custom_type(string):
54695485
version = ''
54705486

54715487

5488+
@force_not_colorized_test_class
54725489
class TestHelpCustomHelpFormatter(TestCase):
54735490
maxDiff = None
54745491

@@ -5765,6 +5782,7 @@ def test_conflict_error(self):
57655782
self.assertRaises(argparse.ArgumentError,
57665783
parser.add_argument, '--spam')
57675784

5785+
@force_not_colorized
57685786
def test_resolve_error(self):
57695787
get_parser = argparse.ArgumentParser
57705788
parser = get_parser(prog='PROG', conflict_handler='resolve')
@@ -6829,6 +6847,7 @@ def setUp(self):
68296847
metavar = '<http[s]://example:1234>'
68306848
self.parser.add_argument('--proxy', metavar=metavar)
68316849

6850+
@force_not_colorized
68326851
def test_help_with_metavar(self):
68336852
help_text = self.parser.format_help()
68346853
self.assertEqual(help_text, textwrap.dedent('''\

0 commit comments

Comments
 (0)