From 69d7246513000a88bd903f3cf16497c1d5f9ff91 Mon Sep 17 00:00:00 2001
From: Aleksey Lim <alsroot@member.fsf.org>
Date: Thu, 05 Mar 2009 02:17:47 +0000
Subject: Use simplejson instead of cjson

---
diff --git a/document.py b/document.py
index 9273f2c..d3ba739 100644
--- a/document.py
+++ b/document.py
@@ -14,9 +14,14 @@
 
 import os
 import gtk
-import cjson
 from zipfile import ZipFile
 
+try:
+    import json
+    json.dumps
+except (ImportError, AttributeError):
+    import simplejson as json
+
 import theme
 from sound import *
 from ground import *
@@ -70,7 +75,7 @@ def save(filepath):
             node['index'] = i
             cfg['tape'].append(node)
 
-    zip.writestr('MANIFEST', cjson.encode(cfg))
+    zip.writestr('MANIFEST', json.dumps(cfg))
     zip.close()
 
     import shutil
@@ -78,7 +83,7 @@ def save(filepath):
 
 def load(filepath):
     zip = ZipFile(filepath, 'r')
-    cfg = cjson.decode(zip.read('MANIFEST'))
+    cfg = json.loads(zip.read('MANIFEST'))
 
     def _load(node, restored_class, preinstalled_class):
         if node['custom']:
diff --git a/messenger.py b/messenger.py
index 04773c1..e6e72f3 100644
--- a/messenger.py
+++ b/messenger.py
@@ -12,12 +12,17 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-import cjson
 import logging
 import dbus
 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 char
@@ -34,7 +39,7 @@ PATH = '/org/sugarlabs/CartoonBuilder'
 class Slot:
     def __init__(self, sender=None, raw=None):
         if sender:
-            data = cjson.decode(raw)
+            data = json.loads(raw)
             self.seqno = data['seqno']
             self.oid = data['oid']
             self.sender = sender
@@ -44,7 +49,7 @@ class Slot:
             self.sender = None
 
     def serialize(self):
-        return cjson.encode({
+        return json.dumps({
             'seqno': self.seqno,
             'oid'  : self.oid})
 
--
cgit v0.9.1