Use simplejson instead of cjson

2 files changed, 17 insertions, 7 deletions

diff --git a/messenger.py b/messenger.py
index 10701c5..25ffc71 100644
--- a/messenger.py
+++ b/messenger.py
@@ -14,11 +14,16 @@
 
 import dbus
 import pickle
-import cjson
 import logging
 from dbus.gobject_service import ExportedGObject
 from dbus.service import method, signal
 
+try:
+    import json
+    json.dumps
+except (ImportError, AttributeError):
+    import simplejson as json
+
 from sugar.presence import presenceservice
 
 import model
@@ -96,7 +101,7 @@ class Messenger(ExportedGObject):
 
         for i, slot in enumerate(self._slots):
             out.append((slot.seqno, slot.owner,
-                    cjson.encode(model.keys[i].collect())))
+                    json.dumps(model.keys[i].collect())))
 
         return out
 
@@ -159,7 +164,7 @@ class Messenger(ExportedGObject):
         else:
             logger.debug('accept higher seqno')
 
-        self._view.props.keyframe = (slot, model.StoredFrame(cjson.decode(raw)))
+        self._view.props.keyframe = (slot, model.StoredFrame(json.loads(raw)))
         self._slots[slot] = new
 
     def _send(self, slot_num):
@@ -168,7 +173,7 @@ class Messenger(ExportedGObject):
         slot.owner = self.me
 
         self._notify(slot_num, slot.seqno, slot.owner,
-                cjson.encode(model.keys[slot_num].collect()))
+                json.dumps(model.keys[slot_num].collect()))
 
         logger.debug('_send slot=%s seqno=%d' % (slot_num, slot.seqno))
 
diff --git a/model.py b/model.py
index 6d34dfb..0778481 100644
--- a/model.py
+++ b/model.py
@@ -13,9 +13,14 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 import os
-import cjson
 import math
 
+try:
+    import json
+    json.dumps
+except (ImportError, AttributeError):
+    import simplejson as json
+
 from theme import *
 
 keys = []
@@ -134,10 +139,10 @@ def save(filename):
     for i in keys:
         out.append(i.collect())
 
-    file(filename, 'w').write(cjson.encode(out))
+    file(filename, 'w').write(json.dumps(out))
 
 def load(filename):
-    inc = cjson.decode(file(filename, 'r').read())
+    inc = json.loads(file(filename, 'r').read())
 
     for i, data in enumerate(inc):
         keys[i] = StoredFrame(data)