Merge pull request #548 from joernhees/fix_from_n3_backslashreduction

fix double reduction of \ escapes in from_n3, fixes #546

Author: joernhees

rdflib/util.py

@@ -177,7 +177,7 @@ def from_n3(s, default=None, backend=None, nsm=None):
             if rest.startswith("@"):
                 language = rest[1:]  # strip leading at sign
 
-        value = value.replace(r'\"', '"').replace('\\\\', '\\')
+        value = value.replace(r'\"', '"')
         # Hack: this should correctly handle strings with either native unicode
         # characters, or \u1234 unicode escapes.
         value = value.encode("raw-unicode-escape").decode("unicode-escape")

test/test_util.py

@@ -223,6 +223,12 @@ def test_util_from_n3_expectliteralwithescapedquote(self):
         s = '"\\""'
         res = util.from_n3(s, default=None, backend=None)
         self.assert_(res, Literal('\\"', lang='en'))
+
+    def test_util_from_n3_expectliteralwithtrailingbackslash(self):
+        s = '"trailing\\\\"^^<http://www.w3.org/2001/XMLSchema#string>'
+        res = util.from_n3(s)
+        self.assert_(res, Literal('trailing\\', datatype=XSD['string']))
+        self.assert_(res.n3(), s)
 
     def test_util_from_n3_expectpartialidempotencewithn3(self):
         for n3 in ('<http://ex.com/foo>',