Fix 939 return cg from parse

rdflib/graph.py

@@ -2216,7 +2216,7 @@ def parse(
         file: Optional[Union[BinaryIO, TextIO]] = None,
         data: Optional[Union[str, bytes]] = None,
         **args: Any,
-    ) -> "Graph":
+    ) -> "ConjunctiveGraph":
         """
         Parse source adding the resulting triples to its own context (sub graph
         of this graph).
@@ -2272,8 +2272,7 @@ def parse(
 
         context = self.default_context
         context.parse(source, publicID=publicID, format=format, **args)
-        # TODO: FIXME: This should not return context, but self.
-        return context
+        return self
 
     def __reduce__(self) -> Tuple[Type[Graph], Tuple[Store, _ContextIdentifierType]]:
         return ConjunctiveGraph, (self.store, self.identifier)
@@ -2476,7 +2475,7 @@ def parse(
         file: Optional[Union[BinaryIO, TextIO]] = None,
         data: Optional[Union[str, bytes]] = None,
         **args: Any,
-    ) -> "Graph":
+    ) -> "Dataset":
         """
         Parse an RDF source adding the resulting triples to the Graph.
 
@@ -2512,8 +2511,11 @@ def parse(
         c = ConjunctiveGraph.parse(
             self, source, publicID, format, location, file, data, **args
         )
-        self.graph(c)
-        return c
+
+        for context in c.contexts():
+            self.graph(context)
+
+        return self
 
     def add_graph(
         self, g: Optional[Union[_ContextIdentifierType, _ContextType, str]]

rdflib/plugins/parsers/nquads.py

@@ -7,7 +7,7 @@
 >>> g = ConjunctiveGraph()
 >>> data = open("test/data/nquads.rdflib/example.nquads", "rb")
 >>> g.parse(data, format="nquads") # doctest:+ELLIPSIS
-<Graph identifier=... (<class 'rdflib.graph.Graph'>)>
+<Graph identifier=... (<class 'rdflib.graph.ConjunctiveGraph'>)>
 >>> assert len(g.store) == 449
 >>> # There should be 16 separate contexts
 >>> assert len([x for x in g.store.contexts()]) == 16

test/test_conjunctivegraph/test_conjunctive_graph.py

@@ -3,6 +3,8 @@
 """
 
 
+from io import StringIO
+
 import pytest
 
 from rdflib import ConjunctiveGraph, Graph
@@ -77,3 +79,21 @@ def check(kws):
 @pytest.mark.parametrize("checker, kws", get_graph_ids_tests())
 def test_graph_ids(checker, kws):
     checker(kws)
+
+
+def test_parse_return_type():
+    g = ConjunctiveGraph()
+    g.parse(data=DATA, format="turtle")
+    assert type(g) is ConjunctiveGraph
+
+    g = ConjunctiveGraph()
+    g = g.parse(data=DATA, format="turtle")
+    assert type(g) is ConjunctiveGraph
+
+    g = ConjunctiveGraph()
+    g.parse(source=StringIO(DATA), format="turtle")
+    assert type(g) is ConjunctiveGraph
+
+    g = ConjunctiveGraph()
+    g = g.parse(source=StringIO(DATA), format="turtle")
+    assert type(g) is ConjunctiveGraph

test/test_dataset/test_dataset.py

@@ -2,6 +2,7 @@
 import os
 import shutil
 import tempfile
+from io import StringIO
 from test.data import context1, likes, pizza, tarek
 from test.utils.namespace import EGSCHEME
 
@@ -25,6 +26,9 @@
 
 HOST = "http://localhost:3030"
 DB = "/db/"
+DATA = """
+<http://example.org/record/1> a <http://xmlns.com/foaf/0.1/Document> .
+"""
 
 pluginstores = []
 
@@ -262,3 +266,21 @@ def test_subgraph_without_identifier() -> None:
     ) == ("genid", genid_prefix)
 
     assert f"{subgraph.identifier}".startswith(genid_prefix)
+
+
+def test_parse_return_type():
+    g = Dataset()
+    g.parse(data=DATA, format="turtle")
+    assert type(g) is Dataset
+
+    g = Dataset()
+    g = g.parse(data=DATA, format="turtle")
+    assert type(g) is Dataset
+
+    g = Dataset()
+    g.parse(source=StringIO(DATA), format="turtle")
+    assert type(g) is Dataset
+
+    g = Dataset()
+    g = g.parse(source=StringIO(DATA), format="turtle")
+    assert type(g) is Dataset