Fix string regex

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>[\d\-+.Ee]+)      |   # Number
+    (?P<boolean>true|false)      |   # Boolean
+    (?P<null>null)                   # Null
 ''', re.VERBOSE)
 
 

Lib/test/test_json/test_tool.py

@@ -268,6 +268,16 @@ def test_colors(self):
             (r'" \"foo\" "', b'\x1b[32m" \\"foo\\" "\x1b[0m'),
             ('123', b'\x1b[33m123\x1b[0m'),
             ('-1.2345e+23', b'\x1b[33m-1.2345e+23\x1b[0m'),
+            (r'{"\\": ""}',
+             b'''\
+{
+    \x1b[32m"\\\\"\x1b[0m: \x1b[32m""\x1b[0m
+}'''),
+            (r'{"\\\\": ""}',
+             b'''\
+{
+    \x1b[32m"\\\\\\\\"\x1b[0m: \x1b[32m""\x1b[0m
+}'''),
             ('{"foo": "bar", "baz": 1234, "qux": [true, false, null]}',
              b'''\
 {