changes for 3.0

[monitor.git] / database.py

diff --git a/database.py b/database.py
index 14fc0e3..254a5b5 100644 (file)
--- a/database.py
+++ b/database.py
@@ -3,23 +3,19 @@ import sys
 import pickle
 noserial=False
 try:
-       from PHPSerialize import *
-       from PHPUnserialize import *
+       from util.PHPSerialize import *
+       from util.PHPUnserialize import *
 except:
        #print >>sys.stderr, "PHPSerial db type not allowed."
        noserial=True
 
 import inspect
 import shutil
-from config import config as cfg
-config = cfg()
-
-import monitorconfig
+import config
 
 DEBUG= 0
-PICKLE_PATH=monitorconfig.MONITOR_DATA_ROOT
+PICKLE_PATH=config.MONITOR_DATA_ROOT
 
-class ExceptionTimeout(Exception): pass
 
 def dbLoad(name, type=None):
        return SPickle().load(name, type)
@@ -115,6 +111,7 @@ class SPickle:
                                
 
                #print "loading %s" % self.__file(name, type)
+               #sys.stderr.write("-----------------------------\n")
                f = open(self.__file(name, type), 'r')
                if type == None:
                        o = pickle.load(f)