Changeset 6a50b78 for fedd/deter

Timestamp:

Feb 5, 2012 7:29:57 PM (12 years ago)

Author:

Ted Faber <faber@…>

Branches:

compt_changes, master

Children:

25930db

Parents:

e8979e2

Message:

Initial benito plug in. Fixed bug pickling topdl as well

File:

• fedd/deter/topdl.py (modified) (4 diffs)

fedd/deter/topdl.py

@@ -250 +250 @@
         return rv
 
+    def __getstate__(self):
+        d = self.__dict__.copy()
+        del d['interfaces']
+        return d
+
+    def __setstate__(self, d):
+        # Import everything from the pickle dict (except what we excluded in
+        # __getstate__)
+        self.__dict__.update(d)
+        self.interfaces = []
+
 class CPU(base):
     def __init__(self, type, attribute=[]):
@@ -417 +428 @@
                     for a in self.attribute], "")
         return rv
+
+    def __getstate__(self):
+        d = self.__dict__.copy()
+        del d['subs']
+        return d
+
+    def __setstate__(self, d):
+        # Import everything from the pickle dict (except what we excluded in
+        # __getstate__)
+        self.__dict__.update(d)
+        self.subs = []
 
 
@@ -813 +835 @@
         return rv
 
+    def __setstate__(self, d):
+        # Import everything from the pickle dict and call incorporate to
+        # connect them.
+        self.__dict__.update(d)
+        self.incorporate_elements()
+
 
 def topology_from_xml(string=None, file=None, filename=None, top="topology"):
@@ -891 +919 @@
         xp.ParseFile(file)
     elif string:
-        xp.Parse(string, isfinal=True)
+        xp.Parse(string, True)
     else:
         return None