X-Git-Url: http://git.onelab.eu/?p=sface.git;a=blobdiff_plain;f=sface%2Fsfidata.py;fp=sface%2Fsfidata.py;h=9209b1e3cc47494354bb9142658129d2c02e736f;hp=0adda24850d8b0ed6d3a2fe18ebf82e80cbd71b8;hb=955398020858a5c3efb59a6cbe02ebfbc15d833f;hpb=44743e4122a7a015518988f8b5ef07aca9a5f01e

diff --git a/sface/sfidata.py b/sface/sfidata.py
index 0adda24..9209b1e 100644
--- a/sface/sfidata.py
+++ b/sface/sfidata.py
@@ -1,3 +1,4 @@
+import json
 import os
 import pickle
 from PyQt4.QtCore import *
@@ -112,7 +113,14 @@ class SfiData:
 
         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