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

Switch to tomlkit for parsing and writing #3191

Closed
wants to merge 16 commits into from
Closed

Switch to tomlkit for parsing and writing #3191

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
3eba19d
Improve toml parsing
frostming Nov 8, 2018
e147dc3
Drops prettytoml/contoml form vendors
frostming Nov 8, 2018
b27d6a7
clear references in patched.txt
frostming Nov 8, 2018
1555200
Add back some tests
frostming Nov 8, 2018
53b073c
python 2.7 unicode
frostming Nov 8, 2018
b3aa66b
make tomlkit dump toml's inline table
frostming Nov 8, 2018
9743d98
Merge branch 'master' into improve-toml-parse
techalchemy Nov 8, 2018
65d7090
Force inline table
frostming Nov 8, 2018
0762528
Final fix
frostming Nov 9, 2018
3490fc8
fix patch
frostming Nov 9, 2018
de78c1e
Only convert outline tables when write toml
frostming Nov 9, 2018
accd0ea
Move to utils function
frostming Nov 9, 2018
6df7d88
update tomlkit
frostming Nov 10, 2018
1f7c9ef
update patch
frostming Nov 10, 2018
de98b87
backports import
frostming Nov 10, 2018
f5c7c58
Change fallback style
frostming Nov 10, 2018
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
3 changes: 1 addition & 2 deletions pipenv/vendor/tomlkit/container.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,8 +196,7 @@ def remove(self, key): # type: (Union[Key, str]) -> Container
self._body[idx] = (None, Comment(Trivia(comment_ws="", comment=trivia.comment)))
else:
self._body[idx] = (None, Null())
super(Container, self).__delitem__(key.key)

super(Container, self).__delitem__(key.key)
uranusjr marked this conversation as resolved.
Show resolved Hide resolved

return self

Expand Down
11 changes: 5 additions & 6 deletions tasks/vendoring/patches/vendor/tomlkit-update-items.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,21 +9,20 @@ index 37014921..5ddd72e7 100644
+from .items import Trivia
from .items import Whitespace
from .items import item as _item

@@ -189,9 +190,14 @@ class Container(dict):
if idx is None:
raise NonExistentKey(key)

- self._body[idx] = (None, Null())
+ old_data = self._body[idx][1]
+ trivia = getattr(old_data, "trivia", None)
+ if trivia and getattr(trivia, "comment", None):
+ self._body[idx] = (None, Comment(Trivia(comment_ws="", comment=trivia.comment)))
+ else:
+ self._body[idx] = (None, Null())
+ super(Container, self).__delitem__(key.key)
+ super(Container, self).__delitem__(key.key)

- super(Container, self).__delitem__(key.key)

return self