Collect JSON utility functions #430
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
As `ensure_text_type` is a more general utility function, go ahead and move it over to `zarr.util` and drop it from `zarr.meta`. Though make sure to import it into `zarr.meta` so that it can still be used there.
As `json_dumps` has broader use than just for metdata (e.g. attributes would also benefit from it), this moves `json_dumps` to `zarr.util`.
As `json_loads` is more generally useful than just parsing metadata, move it over to `zarr.util`. Though ensure it is still imported in `zarr.meta`.
Should ensure that the `ConsolidatedMetadataStore` is able to handle loading JSON data in a standard way.
As every use of `json_dumps` is followed by a call to `encode` to convert the string to bytes, go ahead and incorporate this step in `json_dumps`. Should make it a bit easier to use.
As the `encode` step is now part of `json_dumps`, remove that step when using the `json_dumps` function.
After moving `encode` within `json_dumps`, there were intermediate variables left over that weren't really needed. This drops them.
|
Planning on merging Monday evening if no comments. |
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.
This refactors out the JSON utility functions created in PR ( #429 ) and moves them from
zarr.metatozarr.util. It also employs them in other places where thejsonmodule was being used directly. Should make it easier to leverage the buffer protocol as part of the loading process. Finally includes theencodestep withinjson_dumps, which eliminates the need for it to be done every timejson_dumpsis called, which simplifies the code a bit.TODO:
tox -e docs)