chore: Tweaks to satisfy mypy

Author: mgberg

rdflib/plugins/sparql/algebra.py

@@ -335,7 +335,11 @@ def translateGroupGraphPattern(graphPattern: CompValue) -> CompValue:
     """
 
     if graphPattern.name == "SubSelect":
-        return ToMultiSet(translate(graphPattern)[0])
+        # The first output from translate cannot be None for a subselect query
+        # as it can only be None for certain DESCRIBE queries.
+        # type error: Argument 1 to "ToMultiSet" has incompatible type "Optional[CompValue]";
+        #   expected "Union[List[Dict[Variable, str]], CompValue]"
+        return ToMultiSet(translate(graphPattern)[0])  # type: ignore[arg-type]
 
     if not graphPattern.part:
         graphPattern.part = []  # empty { }

rdflib/plugins/sparql/evaluate.py

@@ -588,7 +588,8 @@ def evalConstructQuery(ctx: QueryContext, query) -> Dict[str, Union[str, Graph]]
 def evalDescribeQuery(ctx: QueryContext, query) -> Dict[str, Union[str, Graph]]:
     # Create a result graph and bind namespaces from the graph being queried
     graph = Graph()
-    for pfx, ns in ctx.graph.namespaces():
+    # type error: Item "None" of "Optional[Graph]" has no attribute "namespaces"
+    for pfx, ns in ctx.graph.namespaces():  # type: ignore[union-attr]
         graph.bind(pfx, ns)
 
     to_describe = set()
@@ -609,7 +610,8 @@ def evalDescribeQuery(ctx: QueryContext, query) -> Dict[str, Union[str, Graph]]:
 
     # Get a CBD for all resources identified to describe
     for resource in to_describe:
-        graph += ctx.graph.cbd(resource)
+        # type error: Item "None" of "Optional[Graph]" has no attribute "cbd"
+        graph += ctx.graph.cbd(resource)  # type: ignore[union-attr]
 
     res: Dict[str, Union[str, Graph]] = {}
     res["type_"] = "DESCRIBE"

test/test_sparql/test_sparql.py

@@ -946,7 +946,7 @@ def test_queries(
 )
 def test_sparql_describe(
     query_string: str,
-    expected_subjects: set[Identifier],
+    expected_subjects: set,
     expected_size: int,
     rdfs_graph: Graph,
 ) -> None: