git://git.onelab.eu
/
sface.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix sliverstatus, add storage of raw values
[sface.git]
/
sface
/
sfidata.py
diff --git
a/sface/sfidata.py
b/sface/sfidata.py
index
0adda24
..
9209b1e
100644
(file)
--- a/
sface/sfidata.py
+++ b/
sface/sfidata.py
@@
-1,3
+1,4
@@
+import json
import os
import pickle
from PyQt4.QtCore import *
import os
import pickle
from PyQt4.QtCore import *
@@
-112,7
+113,14
@@
class SfiData:
if os.path.exists(filename):
data = open(filename).read()
if os.path.exists(filename):
data = open(filename).read()
- return pickle.loads(data)
+ try:
+ if hasattr(json, "loads"):
+ return json.loads(data) # python 2.6
+ else:
+ return json.read(data) # python 2.5
+ except:
+ print "Exception in getSliverStatus"
+ return None
return None
return None