changes for 3.0

[monitor.git] / database.py

diff --git a/database.py b/database.py
index 1173d8a..254a5b5 100644 (file)
--- a/database.py
+++ b/database.py
@@ -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')