a first very rough step towards python3

[nepi.git] / src / nepi / util / parsers / xml_parser.py

diff --git a/src/nepi/util/parsers/xml_parser.py b/src/nepi/util/parsers/xml_parser.py
index 18b7a7d..7a23736 100644 (file)
--- a/src/nepi/util/parsers/xml_parser.py
+++ b/src/nepi/util/parsers/xml_parser.py
@@ -16,7 +16,7 @@
 #
 # Author: Alina Quereilhac <alina.quereilhac@inria.fr>
 
-from __future__ import print_function
+
 
 from nepi.util.netgraph import NetGraph, TopologyType 
 from nepi.util.timefuncs import stformat, tsformat
@@ -37,14 +37,14 @@ def xmlencode(s):
         rv = s.decode("latin1")
     if isinstance(s, datetime.datetime):
         rv = tsformat(s)
-    elif not isinstance(s, unicode):
-        rv = unicode(s)
+    elif not isinstance(s, str):
+        rv = str(s)
     else:
         rv = s
-    return rv.replace(u'\x00',u'&#0000;')
+    return rv.replace('\x00','&#0000;')
 
 def xmldecode(s, cast = str):
-    ret = s.replace(u'&#0000',u'\x00').encode("ascii")
+    ret = s.replace('&#0000','\x00').encode("ascii")
     ret = cast(ret)
     if s == "None":
         return None
@@ -102,7 +102,7 @@ class ECXMLParser(object):
         rmsnode = doc.createElement("rms")
         ecnode.appendChild(rmsnode)
 
-        for guid, rm in ec._resources.iteritems():
+        for guid, rm in ec._resources.items():
             self._rm_to_xml(doc, rmsnode, ec, guid, rm)
 
         return doc
@@ -198,7 +198,7 @@ class ECXMLParser(object):
         anode = doc.createElement("attributes")
         attributes = False
 
-        for attr in rm._attrs.values():
+        for attr in list(rm._attrs.values()):
             if attr.has_changed:
                 attributes = True
                 aanode = doc.createElement("attribute")
@@ -225,7 +225,7 @@ class ECXMLParser(object):
         cnnode = doc.createElement("conditions")
         conditions = False
 
-        for action, conds in rm._conditions.iteritems():
+        for action, conds in rm._conditions.items():
             conditions = True
             for (group, state, time) in conds:
                 ccnnode = doc.createElement("condition")
@@ -241,7 +241,7 @@ class ECXMLParser(object):
         tnode = doc.createElement("traces")
         traces = False
 
-        for trace in rm._trcs.values():
+        for trace in list(rm._trcs.values()):
             if trace.enabled:
                 traces = True
                 ttnode = doc.createElement("trace")