Fixes issue python-oca#43 (python-oca#27)

sysradium · web-flow · commit 6a419381025e · 2016-09-01T17:52:45.000+04:00
diff --git a/oca/pool.py b/oca/pool.py
@@ -14,8 +14,15 @@ class WrongIdError(OpenNebulaException):
 def extractString(xml_or_string):
     if isinstance(xml_or_string, str):
         return xml_or_string
-    else:
-        return xml_or_string.text or ''
+
+    # Py2 compatibility
+    try:
+        if isinstance(xml_or_string, unicode):
+            return xml_or_string
+    except NameError:
+        pass
+
+    return xml_or_string.text or ''
 
 class Template(object):
     def __init__(self, xml_element, multiple=[]):
@@ -51,7 +58,7 @@ def __init__(self, xml=None):
         self.xml = xml
 
     def _initialize_xml(self, xml, root_element):
-        self.xml = ET.fromstring(xml)
+        self.xml = ET.fromstring(xml.encode('utf-8'))
         if self.xml.tag != root_element.upper():
             self.xml = None
         self._convert_types()
