git://git.onelab.eu
/
sfa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove py23 compat layer
[sfa.git]
/
sfa
/
util
/
xml.py
diff --git
a/sfa/util/xml.py
b/sfa/util/xml.py
index
d9e23d5
..
9f43b96
100755
(executable)
--- 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.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
# helper functions to help build xpaths
@@
-174,7
+173,7
@@
class XML:
self.namespaces = namespaces
self.default_namespace = None
self.schema = None
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
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)
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
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()):
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)
del d[k]
element.attrib.update(d)