Merge pull request #1684 from aucampia/iwana-20220123T0031-jsonld_rdf…

…_prefix

Merging as fix is trivial and PR has one review.

rdflib/plugins/serializers/turtle.py

@@ -257,7 +257,8 @@ def serialize(self, stream, base=None, encoding=None, spacious=None, **args):
     def preprocessTriple(self, triple):
         super(TurtleSerializer, self).preprocessTriple(triple)
         for i, node in enumerate(triple):
-            if node in self.keywords:
+            if i == VERB and node in self.keywords:
+                # predicate is a keyword
                 continue
             # Don't use generated prefixes for subjects and objects
             self.getQName(node, gen_prefix=(i == VERB))

test/test_roundtrip.py

@@ -138,22 +138,6 @@
         reason="missing escaping: PCDATA invalid Char value 12 and 8",
         raises=SAXParseException,
     ),
-    ("n3", "rdf_prefix.jsonld"): pytest.mark.xfail(
-        reason="missing 'rdf:' prefix",
-        raises=BadSyntax,
-    ),
-    ("ttl", "rdf_prefix.jsonld"): pytest.mark.xfail(
-        reason="missing 'rdf:' prefix",
-        raises=BadSyntax,
-    ),
-    ("trig", "rdf_prefix.jsonld"): pytest.mark.xfail(
-        reason="missing 'rdf:' prefix",
-        raises=BadSyntax,
-    ),
-    ("turtle", "rdf_prefix.jsonld"): pytest.mark.xfail(
-        reason="missing 'rdf:' prefix",
-        raises=BadSyntax,
-    ),
 }
 
 # This is for files which can only be represented properly in one format

test/test_serializer.py

@@ -1,8 +1,53 @@
+import logging
 import unittest
-from rdflib import Graph, URIRef, Literal
+from rdflib import RDF, Graph, Literal, Namespace, URIRef
 from tempfile import TemporaryDirectory
 from pathlib import Path, PurePath
 
+from typing import Tuple, cast
+
+import pytest
+import itertools
+
+from rdflib.graph import ConjunctiveGraph
+
+from .testutils import GraphHelper
+
+
+@pytest.mark.parametrize(
+    "format, tuple_index, is_keyword",
+    [
+        (format, tuple_index, keyword)
+        for format, (tuple_index, keyword) in itertools.product(
+            ["turtle", "n3", "trig"],
+            [
+                (0, False),
+                (1, True),
+                (2, False),
+            ],
+        )
+    ]
+    + [("trig", 3, False)],
+)
+def test_rdf_type(format: str, tuple_index: int, is_keyword: bool) -> None:
+    NS = Namespace("example:")
+    graph = ConjunctiveGraph()
+    graph.bind("eg", NS)
+    nodes = [NS.subj, NS.pred, NS.obj, NS.graph]
+    nodes[tuple_index] = RDF.type
+    quad = cast(Tuple[URIRef, URIRef, URIRef, URIRef], tuple(nodes))
+    graph.add(quad)
+    data = graph.serialize(format=format)
+    logging.info("data = %s", data)
+    assert NS in data
+    if is_keyword:
+        assert str(RDF) not in data
+    else:
+        assert str(RDF) in data
+    parsed_graph = ConjunctiveGraph()
+    parsed_graph.parse(data=data, format=format)
+    GraphHelper.assert_triple_sets_equals(graph, parsed_graph)
+
 
 class TestSerialize(unittest.TestCase):
     def setUp(self) -> None:
@@ -56,7 +101,3 @@ def test_serialize_to_fileurl(self):
             graph_check = Graph()
             graph_check.parse(source=tfpath, format="nt")
         self.assertEqual(self.triple, next(iter(graph_check)))
-
-
-if __name__ == "__main__":
-    unittest.main()