Skip to content

Commit 7f9e78b

Browse files
Address PR comments to use same color scheme and color message
1 parent 1d768a7 commit 7f9e78b

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

Lib/_colorize.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -170,8 +170,9 @@ class Argparse(ThemeSection):
170170
label: str = ANSIColors.BOLD_YELLOW
171171
action: str = ANSIColors.BOLD_GREEN
172172
reset: str = ANSIColors.RESET
173-
error: str = ANSIColors.BOLD_RED
174-
warning: str = ANSIColors.BOLD_YELLOW
173+
error: str = ANSIColors.BOLD_MAGENTA
174+
warning: str = ANSIColors.BOLD_MAGENTA
175+
message: str = ANSIColors.MAGENTA
175176

176177

177178
@dataclass(frozen=True, kw_only=True)

Lib/argparse.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2778,15 +2778,17 @@ def error(self, message):
27782778
self.print_usage(_sys.stderr)
27792779
theme = self._get_theme(file=_sys.stderr)
27802780
fmt = _('%(prog)s: error: %(message)s\n')
2781-
fmt = fmt.replace('error:', f'{theme.error}error:{theme.reset}')
2781+
fmt = fmt.replace('error: %(message)s',
2782+
f'{theme.error}error:{theme.reset} {theme.message}%(message)s{theme.reset}')
27822783

27832784
args = {'prog': self.prog, 'message': message}
27842785
self.exit(2, fmt % args)
27852786

27862787
def _warning(self, message):
27872788
theme = self._get_theme(file=_sys.stderr)
27882789
fmt = _('%(prog)s: warning: %(message)s\n')
2789-
fmt = fmt.replace('warning:', f'{theme.warning}warning:{theme.reset}')
2790+
fmt = fmt.replace('warning: %(message)s',
2791+
f'{theme.warning}warning:{theme.reset} {theme.message}%(message)s{theme.reset}')
27902792
args = {'prog': self.prog, 'message': message}
27912793
self._print_message(fmt % args, _sys.stderr)
27922794

0 commit comments

Comments
 (0)