Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIgnacio Rodríguez <ignaciorodriguez@sugarlabs.org>2013-12-06 19:15:16 (GMT)
committer Ignacio Rodríguez <ignacio@sugarlabs.org>2013-12-06 19:23:33 (GMT)
commita909b601665bb4a1f326afaae61f97250c7cc26b (patch)
tree7b515e77f75f3e8b26a03add1a7736adc402990d
parented96496170a4a2ba868f002f8ff8eface6177716 (diff)
Stopwatch: Replace cPickle by jsonHEADmaster
-rw-r--r--activity.py11
1 files changed, 8 insertions, 3 deletions
diff --git a/activity.py b/activity.py
index 6660fa7..7a88367 100644
--- a/activity.py
+++ b/activity.py
@@ -28,7 +28,11 @@ import stopwatch
import gobject
import dobject
-import cPickle
+try:
+ import json
+except ImportError:
+ import simplejson as json
+
import gtk.gdk
SERVICE = "org.laptop.StopWatch"
@@ -169,7 +173,7 @@ class StopWatchActivity(Activity):
def read_file(self, file_path):
f = open(file_path, 'r')
- q = cPickle.load(f)
+ q = json.loads(f.read())
f.close()
self.gui.set_all(q)
@@ -177,7 +181,8 @@ class StopWatchActivity(Activity):
self.metadata['mime_type'] = 'application/x-stopwatch-activity'
q = self.gui.get_all()
f = open(file_path, 'w')
- cPickle.dump(q, f)
+ data = json.dumps(q)
+ f.write(data)
f.close()
def _active_cb(self, widget, event):