Handle NaN & Infinity

Author: tomasr8

Lib/json/tool.py

@@ -83,10 +83,10 @@ def main():
 
 
 color_pattern = re.compile(r'''
-    (?P<string>"(\\.|[^"\\])*?") |   # String
-    (?P<number>[\d\-+.Ee]+)      |   # Number
-    (?P<boolean>true|false)      |   # Boolean
-    (?P<null>null)                   # Null
+    (?P<string>"(\\.|[^"\\])*?")           |   # String
+    (?P<number>NaN|-?Infinity|[\d\-+.Ee]+) |   # Number
+    (?P<boolean>true|false)                |   # Boolean
+    (?P<null>null)                             # Null
 ''', re.VERBOSE)
 
 

Lib/test/test_json/test_tool.py

@@ -264,6 +264,9 @@ def test_colors(self):
             ('null', b'\x1b[36mnull\x1b[0m'),
             ('true', b'\x1b[36mtrue\x1b[0m'),
             ('false', b'\x1b[36mfalse\x1b[0m'),
+            ('NaN', b'\x1b[33mNaN\x1b[0m'),
+            ('Infinity', b'\x1b[33mInfinity\x1b[0m'),
+            ('-Infinity', b'\x1b[33m-Infinity\x1b[0m'),
             ('"foo"', b'\x1b[32m"foo"\x1b[0m'),
             (r'" \"foo\" "', b'\x1b[32m" \\"foo\\" "\x1b[0m'),
             ('123', b'\x1b[33m123\x1b[0m'),
@@ -278,7 +281,13 @@ def test_colors(self):
 {
     \x1b[32m"\\\\\\\\"\x1b[0m: \x1b[32m""\x1b[0m
 }'''),
-            ('{"foo": "bar", "baz": 1234, "qux": [true, false, null]}',
+            ('''\
+{
+    "foo": "bar",
+    "baz": 1234,
+    "qux": [true, false, null],
+    "xyz": [NaN, -Infinity, Infinity]
+}''',
              b'''\
 {
     \x1b[32m"foo"\x1b[0m: \x1b[32m"bar"\x1b[0m,
@@ -287,6 +296,11 @@ def test_colors(self):
         \x1b[36mtrue\x1b[0m,
         \x1b[36mfalse\x1b[0m,
         \x1b[36mnull\x1b[0m
+    ],
+    \x1b[32m"xyz"\x1b[0m: [
+        \x1b[33mNaN\x1b[0m,
+        \x1b[33m-Infinity\x1b[0m,
+        \x1b[33mInfinity\x1b[0m
     ]
 }'''),
         )