git://git.onelab.eu
/
nepi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
still making both branches closer
[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
cbbaff0
..
c11782d
100644
(file)
--- a/
src/nepi/util/parsers/xml_parser.py
+++ b/
src/nepi/util/parsers/xml_parser.py
@@
-16,6
+16,8
@@
#
# Author: Alina Quereilhac <alina.quereilhac@inria.fr>
#
# 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
from nepi.util.netgraph import NetGraph, TopologyType
from nepi.util.timefuncs import stformat, tsformat
@@
-81,7
+83,7
@@
class ECXMLParser(object):
try:
xml = doc.toprettyxml(indent=" ", encoding="UTF-8")
except:
try:
xml = doc.toprettyxml(indent=" ", encoding="UTF-8")
except:
- print
>>sys.stderr, "Oops: generating XML from %s" % (data,
)
+ print
("Oops: generating XML from %s" % (data,), file=sys.stderr
)
raise
return xml
raise
return xml
@@
-100,7
+102,7
@@
class ECXMLParser(object):
rmsnode = doc.createElement("rms")
ecnode.appendChild(rmsnode)
rmsnode = doc.createElement("rms")
ecnode.appendChild(rmsnode)
- for guid, rm in ec._resources.ite
rite
ms():
+ for guid, rm in ec._resources.items():
self._rm_to_xml(doc, rmsnode, ec, guid, rm)
return doc
self._rm_to_xml(doc, rmsnode, ec, guid, rm)
return doc
@@
-223,7
+225,7
@@
class ECXMLParser(object):
cnnode = doc.createElement("conditions")
conditions = False
cnnode = doc.createElement("conditions")
conditions = False
- for action, conds in rm._conditions.ite
rite
ms():
+ for action, conds in rm._conditions.items():
conditions = True
for (group, state, time) in conds:
ccnnode = doc.createElement("condition")
conditions = True
for (group, state, time) in conds:
ccnnode = doc.createElement("condition")