Changeset 1553d27 for fedd/federation

Timestamp:

Nov 12, 2010 8:46:13 AM (14 years ago)

Author:

Ted Faber <faber@…>

Branches:

version-3.02

Parents:

d608a90

Message:

Back port topology version

File:

• fedd/federation/topdl.py (modified) (5 diffs)

fedd/federation/topdl.py

@@ -532 +532 @@
 
 class Topology(base):
+    version = "1.0"
     @staticmethod
     def init_element(e):
@@ -554 +555 @@
             return e
 
-    def __init__(self, substrates=[], elements=[], attribute=[]):
+    def __init__(self, substrates=[], elements=[], attribute=[], 
+            version=None):
+
+        if version is None: self.version = Topology.version
+        else: self.version = version
+
         self.substrates = [ self.init_class(Substrate, s) \
                 for s in self.make_list(substrates) ]
@@ -619 +625 @@
         return Topology(substrates=[s.clone() for s in self.substrates], 
                 elements=[e.clone() for e in self.elements],
-                attribute=[a.clone() for a in self.attribute])
+                attribute=[a.clone() for a in self.attribute],
+                version=self.version)
 
 
@@ -628 +635 @@
     def to_dict(self):
         rv = { }
+        rv['version'] = self.version
         if self.substrates:
             rv['substrates'] = [ s.to_dict() for s in self.substrates ]
@@ -637 +645 @@
 
     def to_xml(self):
-        rv = ""
+        rv = "<version>%s</version>" % escape(self.version)
         if self.substrates:
             rv += join(["<substrates>%s</substrates>" % s.to_xml() \