fix: handling of Literal datatype #2076
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
fb8e1f7 to
476bce1
Compare
476bce1 to
ab23328
Compare
ab23328 to
ee0a4e9
Compare
Check datatype against `None` instead of checking it's truthiness (i.e. `if datatype is not None:` instead of `if datatype:`). Checking truthiness instead of `is not None` causes a blank string to be treated the same as None. The consequence of this was that `Literal.datatype` could be a `str`, a `URIRef` or `None`, instead of just a `URIRef` or `None` as was seemingly intended. Other changes: - Changed the type of `Literal.datatype` to be `Optional[URIRef]` instead of `Optional[str]` now that `str` will always be converted to `URIRef` even if it is a blank string. - Changed `rdflib.util._coalesce` to make it easier and safer to use with a non-`None` default value. - Added `rdflib.util._convert_optional` that makes it easy to convert optional values while retaining their optional nature. - Changed `rdflib.util` to avoid issues with circular imports.
ee0a4e9 to
713af0d
Compare
aucampia
commented
Aug 9, 2022
Easy enough to just use `z = None if None else convert(x)`
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.
Summary of changes
Check datatype against
Noneinstead of checking it's truthiness (i.e.if datatype is not None:instead ofif datatype:).Checking truthiness instead of
is not Nonecauses a blank string tobe treated the same as None. The consequence of this was that
Literal.datatypecould be astr, aURIReforNone, instead ofjust a
URIReforNoneas was seemingly intended.Other changes:
Literal.datatypeto beOptional[URIRef]instead of
Optional[str]now thatstrwill always be converted toURIRefeven if it is a blank string.rdflib.util._coalesceto make it easier and safer to usewith a non-
Nonedefault value.rdflib.util._convert_optionalthat makes it easy to convertoptional values while retaining their optional nature.
rdflib.utilto avoid issues with circular imports.Checklist
the same change.
CHANGELOG.md).so maintainers can fix minor issues and keep your PR up to date.