Skip to content

Widen Graph.__contains__ type hint #2323

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

Merged
merged 2 commits into from
Apr 3, 2023
Merged

Widen Graph.__contains__ type hint #2323

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
40be70e
remove commented out type hints
EFord36 Mar 28, 2023
c7bbb64
widen Graph.__contains___ triple type hint
EFord36 Mar 28, 2023
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
8 changes: 3 additions & 5 deletions rdflib/graph.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,8 +105,6 @@
_TripleOrQuadSelectorType = Union["_TripleSelectorType", "_QuadSelectorType"]
_TriplePathType = Tuple["_SubjectType", Path, "_ObjectType"]
_TripleOrTriplePathType = Union["_TripleType", "_TriplePathType"]
# _QuadPathType = Tuple["_SubjectType", Path, "_ObjectType", "_ContextType"]
# _QuadOrQuadPathType = Union["_QuadType", "_QuadPathType"]

_GraphT = TypeVar("_GraphT", bound="Graph")
_ConjunctiveGraphT = TypeVar("_ConjunctiveGraphT", bound="ConjunctiveGraph")
Expand Down Expand Up @@ -677,7 +675,7 @@ def __iter__(self) -> Generator["_TripleType", None, None]:
"""Iterates over all triples in the store"""
return self.triples((None, None, None))

def __contains__(self, triple: _TriplePatternType) -> bool:
def __contains__(self, triple: _TripleSelectorType) -> bool:
"""Support for 'triple in graph' syntax"""
for triple in self.triples(triple):
return True
Expand Down Expand Up @@ -1979,7 +1977,7 @@ def _spoc(
c = self._graph(c)
return s, p, o, c

def __contains__(self, triple_or_quad: _TripleOrQuadPatternType) -> bool:
def __contains__(self, triple_or_quad: _TripleOrQuadSelectorType) -> bool:
"""Support for 'triple/quad in graph' syntax"""
s, p, o, c = self._spoc(triple_or_quad)
for t in self.triples((s, p, o), context=c):
Expand Down Expand Up @@ -2753,7 +2751,7 @@ def triples(
for s1, p1, o1 in graph.triples((s, p, o)):
yield s1, p1, o1

def __contains__(self, triple_or_quad: _TripleOrQuadPatternType) -> bool:
def __contains__(self, triple_or_quad: _TripleOrQuadSelectorType) -> bool:
context = None
if len(triple_or_quad) == 4:
# type error: Tuple index out of range
Expand Down