FIX: correctly handle plus signs in dbpedia URIs

impl/util/rdf.py

@@ -57,15 +57,15 @@ def parse_triples_from_file(filepath: str) -> Iterator[Triple]:
             object_triple = object_pattern.match(line)
             if object_triple:
                 [sub, pred, obj] = object_triple.groups()
-                sub = urllib.parse.unquote_plus(sub.decode('utf-8'))
+                sub = urllib.parse.unquote(sub.decode('utf-8'))
                 pred = pred.decode('utf-8')
-                obj = urllib.parse.unquote_plus(obj.decode('utf-8'))
+                obj = urllib.parse.unquote(obj.decode('utf-8'))
                 yield Triple(sub=sub, pred=pred, obj=obj)
             else:
                 literal_triple = literal_pattern.match(line)
                 if literal_triple:
                     [sub, pred, obj] = literal_triple.groups()
-                    sub = urllib.parse.unquote_plus(sub.decode('utf-8'))
+                    sub = urllib.parse.unquote(sub.decode('utf-8'))
                     yield Triple(sub=sub, pred=pred.decode('utf-8'), obj=obj.decode('utf-8'))
 
 

impl/util/serialize.py

@@ -9,7 +9,7 @@
     int: 'http://www.w3.org/2001/XMLSchema#integer',
     datetime.datetime: 'http://www.w3.org/2001/XMLSchema#date'
 }
-RESOURCE_ENCODING_EXCEPTIONS = ['#', ':', ',', ';', '(', ')', '\'', '&', '!', '*', '+', '=', '$']
+RESOURCE_ENCODING_EXCEPTIONS = ['#', ':', ',', ';', '(', ')', '\'', '&', '!', '*', '=', '$']
 LITERAL_ENCODED_CHARS = ['\\', '\'', '"']
 
 
@@ -52,9 +52,9 @@ def _resource_to_string(resource: str) -> str:
 
 
 def _encode_resource(resource: str) -> str:
-    res_name = urllib.parse.quote_plus(resource)
+    res_name = urllib.parse.quote(resource)
     for char in RESOURCE_ENCODING_EXCEPTIONS:
-        res_name = res_name.replace(urllib.parse.quote_plus(char), char)
+        res_name = res_name.replace(urllib.parse.quote(char), char)
     return res_name