git://git.onelab.eu
/
monitor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
changes for 3.0
[monitor.git]
/
database.py
diff --git
a/database.py
b/database.py
index
3c657fe
..
254a5b5
100644
(file)
--- a/
database.py
+++ b/
database.py
@@
-3,8
+3,8
@@
import sys
import pickle
noserial=False
try:
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
except:
#print >>sys.stderr, "PHPSerial db type not allowed."
noserial=True
@@
-12,10
+12,9
@@
except:
import inspect
import shutil
import config
import inspect
import shutil
import config
-import monitorconfig
DEBUG= 0
DEBUG= 0
-PICKLE_PATH=
monitor
config.MONITOR_DATA_ROOT
+PICKLE_PATH=config.MONITOR_DATA_ROOT
def dbLoad(name, type=None):
def dbLoad(name, type=None):
@@
-112,6
+111,7
@@
class SPickle:
#print "loading %s" % self.__file(name, type)
#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)
f = open(self.__file(name, type), 'r')
if type == None:
o = pickle.load(f)