fix: typing + imports from cherry pick

RDFLib · Jan 15, 2025 · 3102c46 · 3102c46
1 parent d51a1ec
commit 3102c46
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 10 deletions.
diff --git a/rdflib/extras/shacl.py b/rdflib/extras/shacl.py
@@ -4,15 +4,14 @@
 
 from __future__ import annotations
 
-from typing import Optional, Union
+from typing import TYPE_CHECKING, Optional, Union
 
-from rdflib import BNode, Graph, Literal, URIRef, paths
+from rdflib import BNode, Graph, Literal, Node, URIRef, paths
 from rdflib.collection import Collection
 from rdflib.namespace import RDF, SH
 from rdflib.paths import Path
 
 if TYPE_CHECKING:
-    from rdflib.graph import _ObjectType
     from rdflib.term import IdentifiedNode
 
 

diff --git a/rdflib/graph.py b/rdflib/graph.py
@@ -301,6 +301,7 @@
     Node,
     RDFLibGenid,
     URIRef,
+    Variable,
 )
 
 if TYPE_CHECKING:

diff --git a/rdflib/plugins/serializers/longturtle.py b/rdflib/plugins/serializers/longturtle.py
@@ -18,8 +18,6 @@
 
 from __future__ import annotations
 
-from typing import IO, Any, Optional
-
 from rdflib.compare import to_canonical_graph
 from rdflib.exceptions import Error
 from rdflib.graph import Graph

diff --git a/rdflib/store.py b/rdflib/store.py
@@ -36,7 +36,6 @@
     Generator,
     Iterable,
     Iterator,
-    List,
     Mapping,
     Optional,
     Tuple,

diff --git a/test_reports/rdflib_w3c_sparql10-HEAD.ttl b/test_reports/rdflib_w3c_sparql10-HEAD.ttl
@@ -1795,7 +1795,7 @@
     earl:assertedBy <https://github.com/RDFLib/rdflib> ;
     earl:mode earl:automatic ;
     earl:result [ a earl:TestResult ;
-            earl:outcome earl:failed ] ;
+            earl:outcome earl:passed ] ;
     earl:subject <https://github.com/RDFLib/rdflib> ;
     earl:test <http://www.w3.org/2001/sw/DataAccess/tests/data-r2/syntax-sparql1/manifest#syntax-bnodes-03> .
 
@@ -1859,7 +1859,7 @@
     earl:assertedBy <https://github.com/RDFLib/rdflib> ;
     earl:mode earl:automatic ;
     earl:result [ a earl:TestResult ;
-            earl:outcome earl:failed ] ;
+            earl:outcome earl:passed ] ;
     earl:subject <https://github.com/RDFLib/rdflib> ;
     earl:test <http://www.w3.org/2001/sw/DataAccess/tests/data-r2/syntax-sparql1/manifest#syntax-forms-01> .
 
@@ -1907,7 +1907,7 @@
     earl:assertedBy <https://github.com/RDFLib/rdflib> ;
     earl:mode earl:automatic ;
     earl:result [ a earl:TestResult ;
-            earl:outcome earl:failed ] ;
+            earl:outcome earl:passed ] ;
     earl:subject <https://github.com/RDFLib/rdflib> ;
     earl:test <http://www.w3.org/2001/sw/DataAccess/tests/data-r2/syntax-sparql1/manifest#syntax-lists-01> .
 
@@ -2787,7 +2787,7 @@
     earl:assertedBy <https://github.com/RDFLib/rdflib> ;
     earl:mode earl:automatic ;
     earl:result [ a earl:TestResult ;
-            earl:outcome earl:failed ] ;
+            earl:outcome earl:passed ] ;
     earl:subject <https://github.com/RDFLib/rdflib> ;
     earl:test <http://www.w3.org/2001/sw/DataAccess/tests/data-r2/syntax-sparql2/manifest#syntax-lists-04> .
-Original file line number
+Diff line change
@@ Expand Up / @@ -301,6 +301,7 @@ @@
         Node,
         RDFLibGenid,
         URIRef,
+        Variable,
     )
     if TYPE_CHECKING:
@@ Expand Down @@