X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Futil%2Fxml.py;h=3a38ecc32c860584a5cd01732aaaa60f44482a81;hb=031774db6b99361059196ae9b63ecd1f0be9e19a;hp=9c4a80f01866b0bc676368cd1af3a6d648c5ac43;hpb=30d9951e075d93127c3909dcb41be09b420b3525;p=sfa.git

diff --git a/sfa/util/xml.py b/sfa/util/xml.py
index 9c4a80f0..3a38ecc3 100755
--- a/sfa/util/xml.py
+++ b/sfa/util/xml.py
@@ -1,10 +1,10 @@
 #!/usr/bin/python 
 from lxml import etree
-from StringIO import StringIO
 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
 
 # helper functions to help build xpaths
 class XpathFilter:
@@ -164,7 +164,7 @@ class XML:
         self.namespaces = namespaces
         self.default_namespace = None
         self.schema = None
-        if isinstance(xml, basestring):
+        if isinstance(xml, StringType):
             self.parse_xml(xml)
         if isinstance(xml, XmlElement):
             self.root = xml
@@ -227,7 +227,7 @@ class XML:
                     if isinstance(val, dict):
                         child_element = etree.SubElement(element, key)
                         self.parse_dict(val, key, child_element)
-                    elif isinstance(val, basestring):
+                    elif isinstance(val, StringType):
                         child_element = etree.SubElement(element, key).text = val
 
             elif isinstance(value, int):