Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove the is_tomlkit check #195

Merged
merged 1 commit into from May 24, 2022
Merged

Remove the is_tomlkit check #195

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 0 additions & 8 deletions tests/test_items.py
View file
Open in desktop
Expand Up @@ -10,15 +10,10 @@

from tomlkit import api
from tomlkit import parse
from tomlkit.check import is_tomlkit
from tomlkit.exceptions import NonExistentKey
from tomlkit.items import AoT
from tomlkit.items import Array
from tomlkit.items import Bool
from tomlkit.items import Comment
from tomlkit.items import Date
from tomlkit.items import DateTime
from tomlkit.items import Float
from tomlkit.items import InlineTable
from tomlkit.items import Integer
from tomlkit.items import Item
Expand All @@ -28,7 +23,6 @@
from tomlkit.items import String
from tomlkit.items import StringType
from tomlkit.items import Table
from tomlkit.items import Time
from tomlkit.items import Trivia
from tomlkit.items import item
from tomlkit.parser import Parser
Expand Down Expand Up @@ -124,7 +118,6 @@ def test_null_unwrap():

def test_aot_unwrap():
d = item([{"a": "A"}, {"b": "B"}])
assert is_tomlkit(d)
unwrapped = d.unwrap()
assert_is_ppo(unwrapped, list)
for du, dw in zip(unwrapped, d):
Expand Down Expand Up @@ -161,7 +154,6 @@ def test_array_unwrap():
def test_abstract_table_unwrap():
table = item({"foo": "bar"})
super_table = item({"table": table, "baz": "borg"})
assert is_tomlkit(super_table["table"])

table_unwrapped = super_table.unwrap()
sub_table = table_unwrapped["table"]
Expand Down
12 changes: 0 additions & 12 deletions tomlkit/check.py
View file
Open in desktop

This file was deleted.

3 changes: 1 addition & 2 deletions tomlkit/container.py
View file
Open in desktop
Expand Up @@ -10,7 +10,6 @@

from ._compat import decode
from ._utils import merge_dicts
from .check import is_tomlkit
from .exceptions import KeyAlreadyPresent
from .exceptions import NonExistentKey
from .exceptions import TOMLKitError
Expand Down Expand Up @@ -53,7 +52,7 @@ def unwrap(self) -> str:
if k is None:
continue

if not isinstance(k, str):
if isinstance(k, Key):
k = k.key

if isinstance(v, Item):
Expand Down
19 changes: 7 additions & 12 deletions tomlkit/items.py
View file
Open in desktop
Expand Up @@ -27,7 +27,6 @@
from ._compat import decode
from ._utils import CONTROL_CHARS
from ._utils import escape_string
from .check import is_tomlkit
from .exceptions import InvalidStringError
from .toml_char import TOMLChar

Expand Down Expand Up @@ -1091,7 +1090,7 @@ def __init__(self, value: list, trivia: Trivia, multiline: bool = False) -> None
def unwrap(self) -> str:
unwrapped = []
for v in self:
if is_tomlkit(v):
if isinstance(v, Item):
unwrapped.append(v.unwrap())
else:
unwrapped.append(v)
Expand Down Expand Up @@ -1343,16 +1342,12 @@ def __init__(self, value: "container.Container", trivia: Trivia):

def unwrap(self):
unwrapped = {}
for k in self:
if is_tomlkit(k):
nk = k.unwrap()
else:
nk = k
if is_tomlkit(self[k]):
nv = self[k].unwrap()
else:
nv = self[k]
unwrapped[nk] = nv
for k, v in self.items():
if isinstance(k, Key):
k = k.key
if isinstance(v, Item):
v = v.unwrap()
unwrapped[k] = v

return unwrapped

Expand Down