[Openautomation-svn] SF.net SVN: openautomation:[68] PyWireGate/trunk/DSupdate.py

[<ni...@us...>]

Revision: 68
          http://openautomation.svn.sourceforge.net/openautomation/?rev=68&view=rev
Author:   nilss1
Date:     2010-11-04 08:05:36 +0000 (Thu, 04 Nov 2010)

Log Message:
-----------
cleanup, removed pickle and XML

Modified Paths:
--------------
    PyWireGate/trunk/DSupdate.py

Modified: PyWireGate/trunk/DSupdate.py
===================================================================
--- PyWireGate/trunk/DSupdate.py	2010-11-04 08:01:58 UTC (rev 67)
+++ PyWireGate/trunk/DSupdate.py	2010-11-04 08:05:36 UTC (rev 68)
@@ -1,20 +1,16 @@
 import getopt
 import ConfigParser
-try:
-    import cPickle as pickle
-except ImportError:
-    import pickle
+import sys
+import datastore
 
 try:
+    ## try Python 2.6 json lib
     import json
 except ImportError:
     import simplejson as json
 
 
-import datastore
 
-import sys
-
 class dbloader:
     def __init__(self,config,fname):
         self.config = config
@@ -63,6 +59,7 @@
         ow = self.readConfig(fname)
         for key in ow.keys():
             id = "%s:%s_temperature" % (self.config['namespace'],key)
+            ## Fixme: Humidity ... not included
             print "add %s " % id
             self.dataobjects[id] = datastore.dataObject(False,id,unicode(ow[key]['name'],errors='ignore'))
             if 'resolution' in ow[key]:
@@ -72,18 +69,16 @@
                     knxid = "KNX:%s" % ow[key]['eib_ga_temp']
                     print "Try to attach to  %s " % knxid
                     self.dataobjects[id].connected.append(knxid)
-                    print "attaached"
+                    print "attached"
 
 
     def debug(self,msg=''):
         print msg
 
     def load(self):
-        ## TODO:
         self.debug("load DATASTORE")
         try:
             db = open(self.config['datastore'],"rb")
-            #loaddict = pickle.Unpickler(db).load()
             loaddict = json.load(db)
             db.close()
             for name, obj in loaddict.items():
@@ -95,13 +90,10 @@
         except:
             ## no DB File
             print "DB not found"
-            pass
-            ## Fixme: should belong to conncetor
         
 
 
     def save(self):
-        ## TODO:
         self.debug("save DATASTORE")
         savedict = {}
         ## FIXME: user create a __reduce__ method for the Datastoreitem object
@@ -115,8 +107,6 @@
                 'connected' : obj.connected
             }
         dbfile = open(self.config['datastore'],"wb")
-        #db = pickle.Pickler(dbfile,-1)
-        #db.dump(savedict)
         json.dump(savedict,dbfile,sort_keys=True,indent=3)
         dbfile.close()
         for i in savedict.keys():


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.