X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=blobdiff_plain;f=sfa%2Futil%2Fxml.py;fp=sfa%2Futil%2Fxml.py;h=9f43b96f8380b62f5c6beef9b70fbad061bd25bb;hp=d9e23d566b39de938ae2f65aa479b3c130123827;hb=04acd3228e5911d36d0cd58dc35b9319fc558e17;hpb=e5537b113b6fe5874fdcd5b12414568500aa106c

diff --git a/sfa/util/xml.py b/sfa/util/xml.py
index d9e23d56..9f43b96f 100755
--- a/sfa/util/xml.py
+++ b/sfa/util/xml.py
@@ -3,8 +3,7 @@ from lxml import etree
 from sfa.util.faults import InvalidXML
 from sfa.rspecs.elements.element import Element
 
-from sfa.util.py23 import StringType
-from sfa.util.py23 import StringIO
+from io import StringIO
 
 # helper functions to help build xpaths
 
@@ -174,7 +173,7 @@ class XML:
         self.namespaces = namespaces
         self.default_namespace = None
         self.schema = None
-        if isinstance(xml, StringType):
+        if isinstance(xml, str):
             self.parse_xml(xml)
         if isinstance(xml, XmlElement):
             self.root = xml
@@ -238,7 +237,7 @@ class XML:
                     if isinstance(val, dict):
                         child_element = etree.SubElement(element, key)
                         self.parse_dict(val, key, child_element)
-                    elif isinstance(val, StringType):
+                    elif isinstance(val, str):
                         child_element = etree.SubElement(
                             element, key).text = val
 
@@ -252,7 +251,7 @@ class XML:
         d = d.copy()
         # looks like iteritems won't stand side-effects
         for k in list(d.keys()):
-            if not isinstance(d[k], StringType):
+            if not isinstance(d[k], str):
                 del d[k]
 
         element.attrib.update(d)