Update tojson to allow arbitrary args
#56022
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ghost
requested a review
from 
cmcmarrow
previously approved these changes
Mar 23, 2020
DmitryKuzmenko
previously approved these changes
Apr 6, 2020
waynew
force-pushed
the
55911-to-json-sorted-jinja
branch
2 times, most recently
from
f2a0391 to
09b21e2
Compare
|
@waynew it looks failures are related. |
waynew
force-pushed
the
55911-to-json-sorted-jinja
branch
from
fb41c6c to
da7d833
Compare
sagetherage
added
Magnesium
waynew
force-pushed
the
55911-to-json-sorted-jinja
branch
from
90da99e to
644b723
Compare
sagetherage
added
Magnesium
dwoz
previously approved these changes
Sep 29, 2020
DmitryKuzmenko
previously approved these changes
Sep 30, 2020
waynew
force-pushed
the
55911-to-json-sorted-jinja
branch
from
95072df to
4895666
Compare
|
rebased + py2 drop precommit. Should be good now (or in a couple hours when all tests are done) |
|
ping @waynew theres some failing tests here |
sagetherage
added
Aluminium
|
moving this to another release |
We're already vendoring the filter, which also has less features than what we want to support.
waynew
force-pushed
the
55911-to-json-sorted-jinja
branch
from
2b8c235 to
21d32c2
Compare
I goofed and was not sorting in one test - that's fixed. The other test was failing because earlier versions of Python don't remember dict insertion/creation order. Without sorting the output order was accidental. On certain platforms they were accidental in a different order than expected, so this caused a problem. Changing to OrderedDict allows us to specify the order, and this should work on those older versions of Python.
|
@sagetherage hopefully this should pass the broken tests -- I fell victim to one of the classic blunders - no, not "Never get involved in a land war in Asia,"... and no, not "Never go up against a Sicilian when death is on the line" This one was, "Earlier versions of Python are arbitrary with their dictionary ordering no matter how lucky you think you are." Anyway, this should be better now, please let me know if it isn't! |
Ch3LL
approved these changes
Mar 5, 2021
garethgreenaway
approved these changes
Mar 5, 2021
s0undt3ch
approved these changes
Mar 5, 2021
|
@waynew Note that the .. jinja_ref:: tojson
``tojson``
----------
.. versionadded:: 2018.3.3,2019.2.0
Dumps a data structure to JSON.
This filter was added to provide this functionality to hosts which have a
Jinja release older than version 2.9 installed. If Jinja 2.9 or newer is
installed, then the upstream version of the filter will be used. See the
`upstream docs`__ for more information.I.e. This part:
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What does this PR do?
The builtin Jinja tojson filter only supports
indentas an arg that can be passed to the underlying json dump function. This doesn't allow all the functionality people might want.This updates the
tojsonfilter to allow arbitrary keyword arguments to be passed along to the underlying JSON library.What issues does this PR fix or reference?
#55911 and closes #56012
Previous Behavior
It was impossible to get unsorted JSON, or use other functionality.
New Behavior
It's possible to specify sorted or unsorted JSON, as well as pass arbitrary arguments to the underlying JSON dump function.
Tests written?
Yes
Commits signed with GPG?
Yes