Files
2018-11-10 15:41:09 +08:00

151 lines
4.5 KiB
Diff

diff --git a/pipenv/vendor/tomlkit/api.py b/pipenv/vendor/tomlkit/api.py
index e541c20c..0ac26752 100644
--- a/pipenv/vendor/tomlkit/api.py
+++ b/pipenv/vendor/tomlkit/api.py
@@ -1,7 +1,5 @@
import datetime as _datetime
-from typing import Tuple
-
from ._utils import parse_rfc3339
from .container import Container
from .items import AoT
diff --git a/pipenv/vendor/tomlkit/container.py b/pipenv/vendor/tomlkit/container.py
index cb8af1d5..9b5db5cb 100644
--- a/pipenv/vendor/tomlkit/container.py
+++ b/pipenv/vendor/tomlkit/container.py
@@ -1,13 +1,5 @@
from __future__ import unicode_literals
-from typing import Any
-from typing import Dict
-from typing import Generator
-from typing import List
-from typing import Optional
-from typing import Tuple
-from typing import Union
-
from ._compat import decode
from .exceptions import KeyAlreadyPresent
from .exceptions import NonExistentKey
@@ -17,6 +9,7 @@ from .items import Item
from .items import Key
from .items import Null
from .items import Table
+from .items import Trivia
from .items import Whitespace
from .items import item as _item
@@ -221,7 +214,12 @@ class Container(dict):
for i in idx:
self._body[i] = (None, Null())
else:
- self._body[idx] = (None, Null())
+ old_data = self._body[idx][1]
+ trivia = getattr(old_data, "trivia", None)
+ if trivia and trivia.comment:
+ self._body[idx] = (None, Comment(Trivia(comment_ws="", comment=trivia.comment)))
+ else:
+ self._body[idx] = (None, Null())
super(Container, self).__delitem__(key.key)
diff --git a/pipenv/vendor/tomlkit/exceptions.py b/pipenv/vendor/tomlkit/exceptions.py
index 4fbc667b..c1a4e620 100644
--- a/pipenv/vendor/tomlkit/exceptions.py
+++ b/pipenv/vendor/tomlkit/exceptions.py
@@ -1,5 +1,3 @@
-from typing import Optional
-
class TOMLKitError(Exception):
diff --git a/pipenv/vendor/tomlkit/items.py b/pipenv/vendor/tomlkit/items.py
index 375b5f02..cccfd4a1 100644
--- a/pipenv/vendor/tomlkit/items.py
+++ b/pipenv/vendor/tomlkit/items.py
@@ -6,14 +6,6 @@ import string
from datetime import date
from datetime import datetime
from datetime import time
-from enum import Enum
-from typing import Any
-from typing import Dict
-from typing import Generator
-from typing import List
-from typing import Optional
-from typing import Union
-
from ._compat import PY2
from ._compat import decode
@@ -22,9 +14,12 @@ from ._compat import unicode
from ._utils import escape_string
if PY2:
+ from pipenv.vendor.backports.enum import Enum
from pipenv.vendor.backports.functools_lru_cache import lru_cache
else:
+ from enum import Enum
from functools import lru_cache
+from toml.decoder import InlineTableDict
def item(value, _parent=None):
@@ -40,7 +35,10 @@ def item(value, _parent=None):
elif isinstance(value, float):
return Float(value, Trivia(), str(value))
elif isinstance(value, dict):
- val = Table(Container(), Trivia(), False)
+ if isinstance(value, InlineTableDict):
+ val = InlineTable(Container(), Trivia())
+ else:
+ val = Table(Container(), Trivia(), False)
for k, v in sorted(value.items(), key=lambda i: (isinstance(i[1], dict), i[0])):
val[k] = item(v, _parent=val)
diff --git a/pipenv/vendor/tomlkit/parser.py b/pipenv/vendor/tomlkit/parser.py
index 7b948331..3f507bb4 100644
--- a/pipenv/vendor/tomlkit/parser.py
+++ b/pipenv/vendor/tomlkit/parser.py
@@ -4,13 +4,6 @@ from __future__ import unicode_literals
import re
import string
-from typing import Any
-from typing import Generator
-from typing import List
-from typing import Optional
-from typing import Tuple
-from typing import Union
-
from ._compat import chr
from ._compat import decode
from ._utils import _escaped
diff --git a/pipenv/vendor/tomlkit/source.py b/pipenv/vendor/tomlkit/source.py
index 1a96e058..dcfdafd0 100644
--- a/pipenv/vendor/tomlkit/source.py
+++ b/pipenv/vendor/tomlkit/source.py
@@ -4,8 +4,6 @@ from __future__ import unicode_literals
import itertools
from copy import copy
-from typing import Optional
-from typing import Tuple
from ._compat import PY2
from ._compat import unicode
diff --git a/pipenv/vendor/tomlkit/toml_file.py b/pipenv/vendor/tomlkit/toml_file.py
index 3b416664..631e9959 100644
--- a/pipenv/vendor/tomlkit/toml_file.py
+++ b/pipenv/vendor/tomlkit/toml_file.py
@@ -1,8 +1,5 @@
import io
-from typing import Any
-from typing import Dict
-
from .api import loads
from .toml_document import TOMLDocument