Merge pull request #1142 from Tpt/#1141

N3 parser: do not create formulas if the Turtle mode is activated

2 files changed, 30 insertions, 2 deletions

diff --git a/rdflib/plugins/parsers/notation3.py b/rdflib/plugins/parsers/notation3.py
index 742deaf6..9915b1aa 100755
--- a/rdflib/plugins/parsers/notation3.py
+++ b/rdflib/plugins/parsers/notation3.py
@@ -404,7 +404,7 @@ class SinkParser:
             else:
                 self._genPrefix = uniqueURI()
 
-        if openFormula is None:
+        if openFormula is None and not turtle:
             if self._thisDoc:
                 self._formula = store.newFormula(thisDoc + "#_formula")
             else:
@@ -1726,6 +1726,7 @@ r_hibyte = re.compile(r"([\x80-\xff])")
 class RDFSink(object):
     def __init__(self, graph):
         self.rootFormula = None
+        self.uuid = uuid4().hex
         self.counter = 0
         self.graph = graph
 
@@ -1745,7 +1746,7 @@ class RDFSink(object):
             return arg.newBlankNode(uri)
         elif isinstance(arg, Graph) or arg is None:
             self.counter += 1
-            bn = BNode("n" + str(self.counter))
+            bn = BNode("n%sb%s" % (self.uuid, self.counter))
         else:
             bn = BNode(str(arg[0]).split("#").pop().replace("_", "b"))
         return bn
diff --git a/test/test_issue1141.py b/test/test_issue1141.py
new file mode 100644
index 00000000..78940052
--- /dev/null
+++ b/test/test_issue1141.py
@@ -0,0 +1,27 @@
+import unittest
+from io import BytesIO
+
+from rdflib import Graph
+from rdflib.plugins.memory import IOMemory
+from rdflib.plugins.stores.auditable import AuditableStore
+
+
+class TestIssue1141(unittest.TestCase):
+    """
+    Tests is Turtle and TriG parsing works with a store with or without formula support
+    """
+    def test_issue_1141(self):
+        file = b"@prefix : <http://example.com/> . :s :p :o ."
+
+        for format in ("turtle", "trig"):
+            # with formula
+            graph = Graph()
+            self.assertTrue(graph.store.formula_aware)
+            graph.load(BytesIO(file), format=format)
+            self.assertEqual(len(graph), 1)
+
+            # without
+            graph = Graph(store=AuditableStore(IOMemory()))
+            self.assertFalse(graph.store.formula_aware)
+            graph.load(BytesIO(file), format=format)
+            self.assertEqual(len(graph), 1)