tidy up rdflib type hints

cwltool/cwlviewer.py

@@ -157,7 +157,7 @@ def _set_output_edges(self) -> None:
                 pydot.Edge(output_edge_row["step"], output_edge_row["output"])
             )
 
-    def _get_root_graph_uri(self) -> rdflib.URIRef:
+    def _get_root_graph_uri(self) -> rdflib.term.Identifier:
         with open(_get_root_query_path) as f:
             get_root_query = f.read()
         root = cast(
@@ -173,7 +173,7 @@ def _get_root_graph_uri(self) -> rdflib.URIRef:
                 "Cannot identify root workflow! Notice that only Workflows can be visualized"
             )
 
-        workflow = root[0]["workflow"]  # type: rdflib.URIRef
+        workflow = root[0]["workflow"]
         return workflow
 
     @classmethod

mypy-stubs/rdflib/paths.pyi

@@ -15,12 +15,7 @@ class Path:
     __truediv__: Callable[[Path, Union["URIRef", "Path"]], "SequencePath"]
     __mul__: Callable[[Path, str], "MulPath"]
     def __hash__(self) -> int: ...
-    def __eq__(self, other: Any) -> bool: ...
     def __lt__(self, other: Any) -> bool: ...
-    def __le__(self, other: Any) -> bool: ...
-    def __ne__(self, other: Any) -> bool: ...
-    def __gt__(self, other: Any) -> bool: ...
-    def __ge__(self, other: Any) -> bool: ...
 
 class InvPath(Path): ...
 class SequencePath(Path): ...

mypy-stubs/rdflib/plugins/parsers/notation3.pyi

@@ -1,11 +1 @@
-# Stubs for rdflib.plugins.parsers.notation3 (Python 3.5)
-#
-# NOTE: This dynamically typed stub was automatically generated by stubgen.
-
-from typing import Any
-
-class BadSyntax(SyntaxError):
-    lines = ...  # type: Any
-    def __init__(self, uri: Any, lines: Any, argstr: Any, i: Any, why: Any): ...
-    @property
-    def message(self) -> Any: ...
+class BadSyntax(SyntaxError): ...

mypy-stubs/rdflib/query.pyi

@@ -1,22 +1,22 @@
-from io import BufferedIOBase
-from typing import Any, Dict, Iterator, List, Optional, Tuple, overload
+from typing import IO, Any, Dict, Iterator, List, Mapping, Optional, Tuple, overload
 
 from rdflib import URIRef, Variable
+from rdflib.term import Identifier
 from typing_extensions import SupportsIndex
 
-class ResultRow:  # Tuple[Variable, URIRef]):
+class ResultRow(Tuple["Identifier", ...]):
     def __new__(
-        cls, values: Dict[Variable, URIRef], labels: List[Variable]
+        cls, values: Mapping[Variable, Identifier], labels: List[Variable]
     ) -> ResultRow: ...
-    def __getattr__(self, name: str) -> Any: ...
+    def __getattr__(self, name: str) -> Identifier: ...
     @overload
-    def __getitem__(self, name: str) -> URIRef: ...
+    def __getitem__(self, name: str) -> Identifier: ...
     @overload
-    def __getitem__(self, __x: SupportsIndex) -> Variable | URIRef: ...
+    def __getitem__(self, __x: SupportsIndex) -> Identifier: ...
     @overload
-    def __getitem__(self, __x: slice) -> Tuple[Variable | URIRef, ...]: ...
-    def get(self, name: str, default: Any | None = ...) -> URIRef: ...
-    def asdict(self) -> Dict[Variable, URIRef]: ...
+    def __getitem__(self, __x: slice) -> Tuple[Identifier, ...]: ...
+    def get(self, name: str, default: Any | None = ...) -> Identifier: ...
+    def asdict(self) -> Dict[str, Identifier]: ...
 
 class Result:
     type: Any
@@ -28,14 +28,14 @@ class Result:
     def __iter__(self) -> Iterator[bool | ResultRow]: ...
     @staticmethod
     def parse(
-        source: str | None = ...,
+        source: IO[Any] | None = ...,
         format: str | None = ...,
         content_type: str | None = ...,
         **kwargs: Any
     ) -> Result: ...
     def serialize(
         self,
-        destination: str | BufferedIOBase | None = ...,
+        destination: str | IO[Any] | None = ...,
         encoding: str = ...,
         format: str = ...,
         **args: Any

mypy-stubs/rdflib/term.pyi

@@ -7,7 +7,9 @@ class Identifier(Node, str):
     def eq(self, other: Any) -> bool: ...
     def neq(self, other: Any) -> bool: ...
 
-class URIRef(Identifier):
+class IdentifiedNode(Identifier): ...
+
+class URIRef(IdentifiedNode):
     def toPython(self) -> str: ...
     def n3(self, namespace_manager: Any | None = ...) -> str: ...
     def defrag(self) -> "URIRef": ...
@@ -16,7 +18,7 @@ class URIRef(Identifier):
 class Genid(URIRef): ...
 class RDFLibGenid(Genid): ...
 
-class BNode(Identifier):
+class BNode(IdentifiedNode):
     def toPython(self) -> str: ...
     def n3(self, namespace_manager: Any | None = ...) -> str: ...
     def skolemize(
@@ -36,14 +38,6 @@ class Literal(Identifier):
     def n3(self, namespace_manager: Any | None = ...) -> str: ...
     def toPython(self) -> str: ...
 
-def bind(
-    datatype: str | None,
-    pythontype: type,
-    constructor: Callable[..., Any] | None = ...,
-    lexicalizer: Callable[..., Any] | None = ...,
-    datatype_specific: bool = ...,
-) -> None: ...
-
 class Variable(Identifier):
     def toPython(self) -> str: ...
     def n3(self, namespace_manager: Any | None = ...) -> str: ...