Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions src/tomli/_parser.py
Original file line number Diff line number Diff line change
Expand Up @@ -532,7 +532,7 @@ def parse_inline_table(
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:
Expand All @@ -547,16 +547,18 @@ def parse_inline_table(
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
if c != ",":
raise TOMLDecodeError("Unclosed inline table", src, pos)
pos += 1
pos = skip_comments_and_array_ws(src, pos)
if src.startswith("}", pos):
return pos + 1, nested_dict.dict
if isinstance(value, (dict, list)):
flags.set(key, Flags.FROZEN, recursive=True)
pos += 1
pos = skip_chars(src, pos, TOML_WS)


def parse_basic_str_escape(
Expand Down
35 changes: 35 additions & 0 deletions tests/data/valid/inline-table/multiline-inline-table.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
{
"multiline": {
"a": {
"type": "integer",
"value": "1"
},
"b": {
"type": "integer",
"value": "2"
},
"c": [
{
"type": "integer",
"value": "1"
},
{
"type": "integer",
"value": "2"
},
{
"type": "integer",
"value": "3"
}
],
"d": {
"type": "integer",
"value": "3"
},
"e": {
"type": "integer",
"value": "4"
},
"f": {}
}
}
12 changes: 12 additions & 0 deletions tests/data/valid/inline-table/multiline-inline-table.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
multiline = {
"a" = 1, "b" = 2,
c = [
1,
2,
3,
],# comment
d = 3,
e = 4, f = {
# comment
},
}
3 changes: 0 additions & 3 deletions tests/test_data.py
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,7 @@ def test_valid(self):
# compatible with yet.
if valid.stem in {
"no-seconds",
"newline",
"newline-comment",
"hex-escape",
"common-47",
"common-34",
"common-31",
"common-29",
Expand Down