changes for 3.0

[monitor.git] / database.py

diff --git a/database.py b/database.py
index 3b5bd65..254a5b5 100644 (file)
--- a/database.py
+++ b/database.py
@@ -3,8 +3,8 @@ 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
@@ -12,10 +12,9 @@ except:
 import inspect
 import shutil
 import config
-import config as monitorconfig
 
 DEBUG= 0
-PICKLE_PATH=monitorconfig.MONITOR_DATA_ROOT
+PICKLE_PATH=config.MONITOR_DATA_ROOT
 
 
 def dbLoad(name, type=None):
@@ -111,8 +110,6 @@ class SPickle:
                                raise Exception, "No such file %s" % name
                                
 
-               #import traceback
-               #print traceback.print_stack()
                #print "loading %s" % self.__file(name, type)
                #sys.stderr.write("-----------------------------\n")
                f = open(self.__file(name, type), 'r')