Merge branch 'senslab2' of ssh://flab-git.pl.sophia.inria.fr/git/sfa into senslab2

[sfa.git] / sfa / util / storage.py

diff --git a/sfa/util/storage.py b/sfa/util/storage.py
index 95ed8f5..ee2e41b 100644 (file)
--- a/sfa/util/storage.py
+++ b/sfa/util/storage.py
@@ -1,10 +1,5 @@
-### $Id$
-### $URL$
-
 import os
-
-from sfa.util.rspec import RecordSpec
-
+from sfa.util.xml import XML
 class SimpleStorage(dict):
     """
     Handles storing and loading python dictionaries. The storage file created
@@ -49,10 +44,9 @@ class XmlStorage(SimpleStorage):
         """
         Parse an xml file and store it as a dict
         """ 
-        data = RecordSpec()
         if os.path.exists(self.db_filename) and os.path.isfile(self.db_filename):
-            data.parseFile(self.db_filename)
-            dict.__init__(self, data.toDict())
+            xml = XML(self.db_filename)
+            dict.__init__(self, xml.todict())
         elif os.path.exists(self.db_filename) and not os.path.isfile(self.db_filename):
             raise IOError, '%s exists but is not a file. please remove it and try again' \
                            % self.db_filename
@@ -61,8 +55,8 @@ class XmlStorage(SimpleStorage):
             self.load()
 
     def write(self):
-        data = RecordSpec()
-        data.parseDict(self)
+        xml = XML()
+        xml.parseDict(self)
         db_file = open(self.db_filename, 'w')
         db_file.write(data.toprettyxml())
         db_file.close()