Updated to support TOML 1.1.0

StanFromIreland · StanFromIreland · commit 8c15afd787fb · 2025-12-20T20:07:48.000Z
diff --git a/Doc/library/tomllib.rst b/Doc/library/tomllib.rst
@@ -13,7 +13,7 @@
 
 --------------
 
-This module provides an interface for parsing TOML 1.0.0 (Tom's Obvious Minimal
+This module provides an interface for parsing TOML 1.1.0 (Tom's Obvious Minimal
 Language, `https://toml.io <https://toml.io/en/>`_). This module does not
 support writing TOML.
 
@@ -31,6 +31,10 @@ support writing TOML.
     It is a recommended replacement for this module for editing already
     existing TOML files.
 
+.. versionchanged:: next
+
+   This module supports TOML 1.1.0.
+
 
 This module defines the following functions:
 
diff --git a/Doc/whatsnew/3.15.rst b/Doc/whatsnew/3.15.rst
@@ -751,6 +751,7 @@ timeit
   :ref:`environment variables <using-on-controlling-color>`.
   (Contributed by Yi Hong in :gh:`139374`.)
 
+
 tkinter
 -------
 
@@ -765,8 +766,16 @@ tkinter
   using Tcl's ``-all`` and ``-overlap`` options.
   (Contributed by Rihaan Meher in :gh:`130848`)
 
+
+tomllib
+-------
+
+* Updated to support `TOML 1.1.0
+  <https://github.com/toml-lang/toml/blob/1.1.0/CHANGELOG.md#110--2025-12-18>`__.
+
+
 types
-------
+-----
 
 * Expose the write-through :func:`locals` proxy type
   as :data:`types.FrameLocalsProxyType`.
diff --git a/Lib/test/test_tomllib/data/valid/dates-and-times/datetimes.json b/Lib/test/test_tomllib/data/valid/dates-and-times/datetimes.json
@@ -1,4 +1,5 @@
 {
   "local-dt": {"type":"datetime-local","value":"1988-10-27t01:01:01"},
-  "zulu-dt": {"type":"datetime","value":"1988-10-27t01:01:01z"}
+  "zulu-dt": {"type":"datetime","value":"1988-10-27t01:01:01z"},
+  "local-dt-nosec": {"type":"datetime-local","value":"1988-10-27T14:30:00"}
 }
diff --git a/Lib/test/test_tomllib/data/valid/dates-and-times/datetimes.toml b/Lib/test/test_tomllib/data/valid/dates-and-times/datetimes.toml
@@ -1,2 +1,3 @@
 local-dt=1988-10-27t01:01:01
 zulu-dt=1988-10-27t01:01:01z
+local-dt-nosec=1988-10-27T14:30
diff --git a/Lib/test/test_tomllib/data/valid/dates-and-times/localtime.json b/Lib/test/test_tomllib/data/valid/dates-and-times/localtime.json
@@ -1,2 +1,4 @@
-{"t":
-  {"type":"time-local","value":"00:00:00.999999"}}
+{
+  "t": {"type":"time-local","value":"00:00:00.999999"},
+  "t2": {"type":"time-local","value":"14:30:00"}
+}
diff --git a/Lib/test/test_tomllib/data/valid/dates-and-times/localtime.toml b/Lib/test/test_tomllib/data/valid/dates-and-times/localtime.toml
@@ -1 +1,2 @@
-t=00:00:00.99999999999999
+t=00:00:00.99999999999999
+t2=14:30
diff --git a/Lib/test/test_tomllib/data/valid/hex-char.json b/Lib/test/test_tomllib/data/valid/hex-char.json
@@ -1,5 +1,7 @@
 {
   "a": {"type":"string","value":"a"},
   "b": {"type":"string","value":"b"},
-  "c": {"type":"string","value":"c"}
+  "c": {"type":"string","value":"c"},
+  "d": {"type":"string","value":"d"},
+  "esc": {"type":"string","value":"\u001b"}
 }
diff --git a/Lib/test/test_tomllib/data/valid/hex-char.toml b/Lib/test/test_tomllib/data/valid/hex-char.toml
@@ -1,3 +1,5 @@
 a="\u0061"
 b="\u0062"
-c="\U00000063"
+c="\U00000063"
+d="\x64"
+esc="\e"
diff --git a/Lib/test/test_tomllib/data/valid/trailing-comma.json b/Lib/test/test_tomllib/data/valid/trailing-comma.json
@@ -1,7 +1,5 @@
-{"arr":
-  {"type":"array","value":
-    [
-      {"type":"integer","value":"1"}
-    ]
-  }
+{
+  "arr": {"type":"array","value":[{"type":"integer","value":"1"}]},
+  "tbl": {"a":{"type":"integer","value":"1"}},
+  "tbl2": {"b":{"type":"integer","value":"2"}}
 }
diff --git a/Lib/test/test_tomllib/data/valid/trailing-comma.toml b/Lib/test/test_tomllib/data/valid/trailing-comma.toml
@@ -1 +1,5 @@
-arr=[1,]
+arr=[1,]
+tbl={a=1,}
+tbl2={
+  b=2,
+}
diff --git a/Lib/tomllib/_parser.py b/Lib/tomllib/_parser.py
@@ -49,6 +49,7 @@
         "\\n": "\u000A",  # linefeed
         "\\f": "\u000C",  # form feed
         "\\r": "\u000D",  # carriage return
+        "\\e": "\u001B",  # escape
         '\\"': "\u0022",  # quote
         "\\\\": "\u005C",  # backslash
     }
@@ -515,7 +516,7 @@ def parse_inline_table(src: str, pos: Pos, parse_float: ParseFloat) -> tuple[Pos
     nested_dict = NestedDict()
     flags = Flags()
 
-    pos = skip_chars(src, pos, TOML_WS)
+    pos = skip_comments_and_array_ws(src, pos)
     if src.startswith("}", pos):
         return pos + 1, nested_dict.dict
     while True:
@@ -530,7 +531,7 @@ def parse_inline_table(src: str, pos: Pos, parse_float: ParseFloat) -> tuple[Pos
         if key_stem in nest:
             raise TOMLDecodeError(f"Duplicate inline table key {key_stem!r}", src, pos)
         nest[key_stem] = value
-        pos = skip_chars(src, pos, TOML_WS)
+        pos = skip_comments_and_array_ws(src, pos)
         c = src[pos : pos + 1]
         if c == "}":
             return pos + 1, nested_dict.dict
@@ -539,7 +540,9 @@ def parse_inline_table(src: str, pos: Pos, parse_float: ParseFloat) -> tuple[Pos
         if isinstance(value, (dict, list)):
             flags.set(key, Flags.FROZEN, recursive=True)
         pos += 1
-        pos = skip_chars(src, pos, TOML_WS)
+        pos = skip_comments_and_array_ws(src, pos)
+        if src.startswith("}", pos):
+            return pos + 1, nested_dict.dict
 
 
 def parse_basic_str_escape(
@@ -565,6 +568,8 @@ def parse_basic_str_escape(
         return parse_hex_char(src, pos, 4)
     if escape_id == "\\U":
         return parse_hex_char(src, pos, 8)
+    if escape_id == "\\x":
+        return parse_hex_char(src, pos, 2)
     try:
         return pos, BASIC_STR_ESCAPE_REPLACEMENTS[escape_id]
     except KeyError:
diff --git a/Lib/tomllib/_re.py b/Lib/tomllib/_re.py
@@ -17,7 +17,8 @@
 # E.g.
 # - 00:32:00.999999
 # - 00:32:00
-_TIME_RE_STR = r"([01][0-9]|2[0-3]):([0-5][0-9]):([0-5][0-9])(?:\.([0-9]{1,6})[0-9]*)?"
+# - 00:32
+_TIME_RE_STR = r"([01][0-9]|2[0-3]):([0-5][0-9])(?::([0-5][0-9])(?:\.([0-9]{1,6})[0-9]*)?)?"
 
 RE_NUMBER = re.compile(
     r"""
@@ -74,7 +75,8 @@ def match_to_datetime(match: re.Match[str]) -> datetime | date:
     year, month, day = int(year_str), int(month_str), int(day_str)
     if hour_str is None:
         return date(year, month, day)
-    hour, minute, sec = int(hour_str), int(minute_str), int(sec_str)
+    hour, minute = int(hour_str), int(minute_str)
+    sec = int(sec_str) if sec_str else 0
     micros = int(micros_str.ljust(6, "0")) if micros_str else 0
     if offset_sign_str:
         tz: tzinfo | None = cached_tz(
@@ -103,8 +105,9 @@ def cached_tz(hour_str: str, minute_str: str, sign_str: str) -> timezone:
 
 def match_to_localtime(match: re.Match[str]) -> time:
     hour_str, minute_str, sec_str, micros_str = match.groups()
+    sec = int(sec_str) if sec_str else 0
     micros = int(micros_str.ljust(6, "0")) if micros_str else 0
-    return time(int(hour_str), int(minute_str), int(sec_str), micros)
+    return time(int(hour_str), int(minute_str), sec, micros)
 
 
 def match_to_number(match: re.Match[str], parse_float: ParseFloat) -> Any:
diff --git a/Misc/NEWS.d/next/Library/2025-12-20-20-07-17.gh-issue-142956.xKtwLn.rst b/Misc/NEWS.d/next/Library/2025-12-20-20-07-17.gh-issue-142956.xKtwLn.rst
@@ -0,0 +1,2 @@
+:mod:`tomllib`: Updated to support `TOML 1.1.0
+<https://github.com/toml-lang/toml/blob/1.1.0/CHANGELOG.md#110--2025-12-18>`_.

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`{`
`2`	`2`	`"local-dt": {"type":"datetime-local","value":"1988-10-27t01:01:01"},`
`3`		`- "zulu-dt": {"type":"datetime","value":"1988-10-27t01:01:01z"}`
	`3`	`+ "zulu-dt": {"type":"datetime","value":"1988-10-27t01:01:01z"},`
	`4`	`+ "local-dt-nosec": {"type":"datetime-local","value":"1988-10-27T14:30:00"}`
`4`	`5`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,3 @@`
`1`	`1`	`local-dt=1988-10-27t01:01:01`
`2`	`2`	`zulu-dt=1988-10-27t01:01:01z`
	`3`	`+local-dt-nosec=1988-10-27T14:30`
Original file line number	Diff line number	Diff line change
`@@ -1 +1,2 @@`
`1`		`-t=00:00:00.99999999999999`
	`1`	`+t=00:00:00.99999999999999`
	`2`	`+t2=14:30`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"a": {"type":"string","value":"a"},`
`3`	`3`	`"b": {"type":"string","value":"b"},`
`4`		`- "c": {"type":"string","value":"c"}`
	`4`	`+ "c": {"type":"string","value":"c"},`
	`5`	`+ "d": {"type":"string","value":"d"},`
	`6`	`+ "esc": {"type":"string","value":"\u001b"}`
`5`	`7`	`}`