cubicweb/dataimport/importer.py
branch3.26
changeset 12625 ba5231e1aa45
parent 12173 d13fc09301bd
child 12626 32ee89340e59
--- a/cubicweb/dataimport/importer.py	Thu May 16 14:26:38 2019 +0200
+++ b/cubicweb/dataimport/importer.py	Tue May 21 10:50:08 2019 +0200
@@ -30,6 +30,8 @@
 from collections import defaultdict
 import logging
 
+import six
+
 from logilab.mtconverter import xml_escape
 
 from cubicweb import Binary
@@ -71,7 +73,10 @@
     def use_extid_as_cwuri_filter(extentities):
         for extentity in extentities:
             if extentity.extid not in extid2eid:
-                extentity.values.setdefault('cwuri', set([extentity.extid.decode('utf-8')]))
+                cwuri = extentity.extid
+                if isinstance(cwuri, six.binary_type):
+                    cwuri = cwuri.decode('utf-8')
+                extentity.values.setdefault('cwuri', set([cwuri]))
             yield extentity
     return use_extid_as_cwuri_filter