X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Futil%2Fstorage.py;h=9b682064eed12f71068bf94e4738ce2ab6cb3581;hb=47090c0a12d8ccffa6d67692461da61a7b7f67e7;hp=9033434f6cf8d146df5d147a29a2e147db0b5895;hpb=ecc85e0b923922cf7117d29b380f5284edb88f21;p=sfa.git diff --git a/sfa/util/storage.py b/sfa/util/storage.py index 9033434f..9b682064 100644 --- a/sfa/util/storage.py +++ b/sfa/util/storage.py @@ -1,6 +1,7 @@ import os from sfa.util.xml import XML + class SimpleStorage(dict): """ Handles storing and loading python dictionaries. The storage file created @@ -8,49 +9,51 @@ class SimpleStorage(dict): """ db_filename = None type = 'dict' - - def __init__(self, db_filename, db = None): - if db is None: db={} + + def __init__(self, db_filename, db=None): + if db is None: + db = {} dict.__init__(self, db) self.db_filename = db_filename - + def load(self): if os.path.exists(self.db_filename) and os.path.isfile(self.db_filename): db_file = open(self.db_filename, 'r') dict.__init__(self, eval(db_file.read())) 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) + raise IOError('%s exists but is not a file. please remove it and try again' + % self.db_filename) else: self.write() self.load() - + def write(self): - db_file = open(self.db_filename, 'w') + db_file = open(self.db_filename, 'w') db_file.write(str(self)) db_file.close() - + def sync(self): self.write() + class XmlStorage(SimpleStorage): """ Handles storing and loading python dictionaries. The storage file created is a xml representation of the python dictionary. - """ + """ db_filename = None type = 'xml' def load(self): """ Parse an xml file and store it as a dict - """ + """ if os.path.exists(self.db_filename) and os.path.isfile(self.db_filename): 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) + raise IOError('%s exists but is not a file. please remove it and try again' + % self.db_filename) else: self.write() self.load() @@ -64,5 +67,3 @@ class XmlStorage(SimpleStorage): def sync(self): self.write() - -