[tools/rdfConv] Properly use unicode

Author: mpsonntag

odml/tools/rdf_converter.py

@@ -73,7 +73,7 @@ def save_element(self, e, node=None):
         fmt = e.format()
 
         if not node:
-            curr_node = URIRef(odmlns + str(e.id))
+            curr_node = URIRef(odmlns + unicode(e.id))
         else:
             curr_node = node
 
@@ -101,7 +101,7 @@ def save_element(self, e, node=None):
                     self.g.add((curr_node, fmt.rdf_map(k), terminology_node))
                 else:
                     # adding terminology to the hub and to link with the doc
-                    node = URIRef(odmlns + str(uuid.uuid4()))
+                    node = URIRef(odmlns + unicode(uuid.uuid4()))
                     self.g.add((node, RDF.type, URIRef(terminology_url)))
                     self.g.add((self.hub_root, odmlns.hasTerminology, node))
                     self.g.add((curr_node, fmt.rdf_map(k), node))
@@ -111,20 +111,20 @@ def save_element(self, e, node=None):
                     k == 'sections' and len(getattr(e, k)) > 0:
                 sections = getattr(e, k)
                 for s in sections:
-                    node = URIRef(odmlns + str(s.id))
+                    node = URIRef(odmlns + unicode(s.id))
                     self.g.add((curr_node, fmt.rdf_map(k), node))
                     self.save_element(s, node)
             elif isinstance(fmt, Section.__class__) and \
                     k == 'properties' and len(getattr(e, k)) > 0:
                 properties = getattr(e, k)
                 for p in properties:
-                    node = URIRef(odmlns + str(p.id))
+                    node = URIRef(odmlns + unicode(p.id))
                     self.g.add((curr_node, fmt.rdf_map(k), node))
                     self.save_element(p, node)
             elif isinstance(fmt, Property.__class__) and \
                     k == 'value' and len(getattr(e, k)) > 0:
                 values = getattr(e, k)
-                seq = URIRef(odmlns + str(uuid.uuid4()))
+                seq = URIRef(odmlns + unicode(uuid.uuid4()))
                 self.g.add((seq, RDF.type, RDF.Seq))
                 self.g.add((curr_node, fmt.rdf_map(k), seq))
                 # rdflib so far does not respect RDF:li item order
@@ -133,15 +133,15 @@ def save_element(self, e, node=None):
                 # this should be reversed to RDF:li again!
                 # see https://github.com/RDFLib/rdflib/issues/280
                 # -- keep until supported
-                # bag = URIRef(odmlns + str(uuid.uuid4()))
+                # bag = URIRef(odmlns + unicode(uuid.uuid4()))
                 # self.g.add((bag, RDF.type, RDF.Bag))
                 # self.g.add((curr_node, fmt.rdf_map(k), bag))
                 # for v in values:
                 #     self.g.add((bag, RDF.li, Literal(v)))
 
                 counter = 1
                 for v in values:
-                    pred = "%s_%s" % (str(RDF), counter)
+                    pred = "%s_%s" % (unicode(RDF), counter)
                     self.g.add((seq, URIRef(pred), Literal(v)))
                     counter = counter + 1
 
@@ -242,7 +242,7 @@ def parse_document(self, doc_uri):
                 doc_attrs[attr[0]] = doc_uri.split("#", 1)[1]
             else:
                 if len(elems) > 0:
-                    doc_attrs[attr[0]] = str(elems[0].toPython())
+                    doc_attrs[attr[0]] = unicode(elems[0].toPython())
 
         return {'Document': doc_attrs, 'odml-version': FORMAT_VERSION}
 
@@ -264,7 +264,7 @@ def parse_section(self, sec_uri):
                 sec_attrs[attr[0]] = sec_uri.split("#", 1)[1]
             else:
                 if len(elems) > 0:
-                    sec_attrs[attr[0]] = str(elems[0].toPython())
+                    sec_attrs[attr[0]] = unicode(elems[0].toPython())
         self._check_mandatory_attrs(sec_attrs)
         return sec_attrs
 
@@ -293,7 +293,7 @@ def parse_property(self, prop_uri):
                 prop_attrs[attr[0]] = prop_uri.split("#", 1)[1]
             else:
                 if len(elems) > 0:
-                    prop_attrs[attr[0]] = str(elems[0].toPython())
+                    prop_attrs[attr[0]] = unicode(elems[0].toPython())
         self._check_mandatory_attrs(prop_attrs)
         return prop_attrs