Merge aeff7a6 into 081a974

RDFLib · Mar 28, 2023 · f949c4e · f949c4e
2 parents 081a974 + aeff7a6
commit f949c4e
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 20 deletions.
diff --git a/rdflib/plugins/sparql/evaluate.py b/rdflib/plugins/sparql/evaluate.py
@@ -642,7 +642,7 @@ def evalDescribeQuery(ctx: QueryContext, query) -> Dict[str, Union[str, Graph]]:
 def evalQuery(
     graph: Graph,
     query: Query,
-    initBindings: Mapping[str, Identifier],
+    initBindings: Optional[Mapping[str, Identifier]] = None,
     base: Optional[str] = None,
 ) -> Mapping[Any, Any]:
     """
@@ -661,7 +661,7 @@ def evalQuery(
         documentation.
     """
 
-    initBindings = dict((Variable(k), v) for k, v in initBindings.items())
+    initBindings = dict((Variable(k), v) for k, v in (initBindings or {}).items())
 
     ctx = QueryContext(graph, initBindings=initBindings)
 

diff --git a/rdflib/plugins/sparql/processor.py b/rdflib/plugins/sparql/processor.py
@@ -19,22 +19,30 @@
 
 
 def prepareQuery(
-    queryString: str, initNs: Mapping[str, Any] = {}, base: Optional[str] = None
+    queryString: str,
+    initNs: Optional[Mapping[str, Any]] = {},
+    base: Optional[str] = None,
 ) -> Query:
     """
     Parse and translate a SPARQL Query
     """
+    if initNs is None:
+        initNs = {}
     ret = translateQuery(parseQuery(queryString), base, initNs)
     ret._original_args = (queryString, initNs, base)
     return ret
 
 
 def prepareUpdate(
-    updateString: str, initNs: Mapping[str, Any] = {}, base: Optional[str] = None
+    updateString: str,
+    initNs: Optional[Mapping[str, Any]] = {},
+    base: Optional[str] = None,
 ) -> Update:
     """
     Parse and translate a SPARQL Update
     """
+    if initNs is None:
+        initNs = {}
     ret = translateUpdate(parseUpdate(updateString), base, initNs)
     ret._original_args = (updateString, initNs, base)
     return ret
@@ -43,8 +51,8 @@ def prepareUpdate(
 def processUpdate(
     graph: Graph,
     updateString: str,
-    initBindings: Mapping[str, Identifier] = {},
-    initNs: Mapping[str, Any] = {},
+    initBindings: Optional[Mapping[str, Identifier]] = {},
+    initNs: Optional[Mapping[str, Any]] = {},
     base: Optional[str] = None,
 ) -> None:
     """
@@ -73,8 +81,8 @@ def __init__(self, graph):
     def update(
         self,
         strOrQuery: Union[str, Update],
-        initBindings: Mapping[str, Identifier] = {},
-        initNs: Mapping[str, Any] = {},
+        initBindings: Optional[Mapping[str, Identifier]] = {},
+        initNs: Optional[Mapping[str, Any]] = {},
     ) -> None:
         """
         .. caution::
@@ -108,8 +116,8 @@ def __init__(self, graph):
     def query(  # type: ignore[override]
         self,
         strOrQuery: Union[str, Query],
-        initBindings: Mapping[str, Identifier] = {},
-        initNs: Mapping[str, Any] = {},
+        initBindings: Optional[Mapping[str, Identifier]] = {},
+        initNs: Optional[Mapping[str, Any]] = {},
         base: Optional[str] = None,
         DEBUG: bool = False,
     ) -> Mapping[str, Any]:
@@ -132,9 +140,7 @@ def query(  # type: ignore[override]
            documentation.
         """
 
-        if not isinstance(strOrQuery, Query):
-            parsetree = parseQuery(strOrQuery)
-            query = translateQuery(parsetree, base, initNs)
-        else:
-            query = strOrQuery
-        return evalQuery(self.graph, query, initBindings, base)
+        if isinstance(strOrQuery, str):
+            strOrQuery = translateQuery(parseQuery(strOrQuery), base, initNs)
+
+        return evalQuery(self.graph, strOrQuery, initBindings, base)
diff --git a/rdflib/plugins/sparql/update.py b/rdflib/plugins/sparql/update.py
@@ -280,7 +280,9 @@ def evalCopy(ctx: QueryContext, u: CompValue) -> None:
 
 
 def evalUpdate(
-    graph: Graph, update: Update, initBindings: Mapping[str, Identifier] = {}
+    graph: Graph,
+    update: Update,
+    initBindings: Optional[Mapping[str, Identifier]] = {},
 ) -> None:
     """
 
@@ -315,7 +317,7 @@ def evalUpdate(
     """
 
     for u in update.algebra:
-        initBindings = dict((Variable(k), v) for k, v in initBindings.items())
+        initBindings = dict((Variable(k), v) for k, v in (initBindings or {}).items())
 
         ctx = QueryContext(graph, initBindings=initBindings)
         ctx.prologue = u.prologue

diff --git a/rdflib/query.py b/rdflib/query.py
@@ -57,8 +57,8 @@ def __init__(self, graph: "Graph"):
     def query(  # type: ignore[empty-body]
         self,
         strOrQuery: Union[str, "Query"],  # noqa: N803
-        initBindings: Mapping["str", "Identifier"] = {},  # noqa: N803
-        initNs: Mapping[str, Any] = {},  # noqa: N803
+        initBindings: Optional[Mapping["str", "Identifier"]] = {},  # noqa: N803
+        initNs: Optional[Mapping[str, Any]] = {},  # noqa: N803
         DEBUG: bool = False,
     ) -> Mapping[str, Any]:
         pass