Skip to content

Commit cc92518

Browse files
committed
Use default color for numbers
1 parent 1e6f4ea commit cc92518

File tree

2 files changed

+9
-11
lines changed

2 files changed

+9
-11
lines changed

Lib/json/tool.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
_color_pattern = re.compile(r'''
1818
(?P<key>"(\\.|[^"\\])*")(?=:) |
1919
(?P<string>"(\\.|[^"\\])*") |
20-
(?P<number>NaN|-?Infinity|[0-9\-+.Ee]+) |
2120
(?P<boolean>true|false) |
2221
(?P<null>null)
2322
''', re.VERBOSE)
@@ -26,7 +25,6 @@
2625
_colors = {
2726
'key': ANSIColors.INTENSE_BLUE,
2827
'string': ANSIColors.BOLD_GREEN,
29-
'number': ANSIColors.BOLD_YELLOW,
3028
'boolean': ANSIColors.BOLD_CYAN,
3129
'null': ANSIColors.BOLD_CYAN,
3230
}

Lib/test/test_json/test_tool.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -256,14 +256,14 @@ def test_colors(self):
256256
('null', b'\x1b[1;36mnull\x1b[0m'),
257257
('true', b'\x1b[1;36mtrue\x1b[0m'),
258258
('false', b'\x1b[1;36mfalse\x1b[0m'),
259-
('NaN', b'\x1b[1;33mNaN\x1b[0m'),
260-
('Infinity', b'\x1b[1;33mInfinity\x1b[0m'),
261-
('-Infinity', b'\x1b[1;33m-Infinity\x1b[0m'),
259+
('NaN', b'NaN'),
260+
('Infinity', b'Infinity'),
261+
('-Infinity', b'-Infinity'),
262262
('"foo"', b'\x1b[1;32m"foo"\x1b[0m'),
263263
(r'" \"foo\" "', b'\x1b[1;32m" \\"foo\\" "\x1b[0m'),
264264
('"α"', b'\x1b[1;32m"\\u03b1"\x1b[0m'),
265-
('123', b'\x1b[1;33m123\x1b[0m'),
266-
('-1.2345e+23', b'\x1b[1;33m-1.2345e+23\x1b[0m'),
265+
('123', b'123'),
266+
('-1.2345e+23', b'-1.2345e+23'),
267267
(r'{"\\": ""}',
268268
b'''\
269269
{
@@ -284,16 +284,16 @@ def test_colors(self):
284284
b'''\
285285
{
286286
\x1b[94m"foo"\x1b[0m: \x1b[1;32m"bar"\x1b[0m,
287-
\x1b[94m"baz"\x1b[0m: \x1b[1;33m1234\x1b[0m,
287+
\x1b[94m"baz"\x1b[0m: 1234,
288288
\x1b[94m"qux"\x1b[0m: [
289289
\x1b[1;36mtrue\x1b[0m,
290290
\x1b[1;36mfalse\x1b[0m,
291291
\x1b[1;36mnull\x1b[0m
292292
],
293293
\x1b[94m"xyz"\x1b[0m: [
294-
\x1b[1;33mNaN\x1b[0m,
295-
\x1b[1;33m-Infinity\x1b[0m,
296-
\x1b[1;33mInfinity\x1b[0m
294+
NaN,
295+
-Infinity,
296+
Infinity
297297
]
298298
}'''),
299299
)

0 commit comments

Comments
 (0)