Ticket #1553: 0001-Revert-Move-to-cjson-and-drop-pyjson-and-simplejson.patch

src/jarabe/journal/expandedentry.py

@@ -23 +23 @@
 import cairo
 import gobject
 import gtk
-import cjson
+import json
 
 from sugar.graphics import style
 from sugar.graphics.icon import CanvasIcon
@@ -303 +303 @@
 
         if self._metadata.has_key('buddies') and \
                 self._metadata['buddies']:
-            buddies = cjson.decode(self._metadata['buddies']).values()
+            # json cannot read unicode strings
+            buddies_str = self._metadata['buddies'].encode('utf8')
+            buddies = json.read(buddies_str).values()
             vbox.append(BuddyList(buddies))
             return vbox
         else:

src/jarabe/journal/journalentrybundle.py

@@ -18 +18 @@
 import tempfile
 import shutil
 
-import cjson
+import json
 import dbus
 
 from sugar.bundle.bundle import Bundle, MalformedBundleException
@@ -70 +70 @@
         if not os.path.exists(metadata_path):
             raise MalformedBundleException(
                     'Bundle must contain the file "_metadata.json"')
-        return cjson.decode(open(metadata_path, 'r').read())
+        f = open(metadata_path, 'r')
+        try:
+            json_data = f.read()
+        finally:
+            f.close()
+        return json.read(json_data)
 
     def _read_preview(self, uid, bundle_dir):
         preview_path = os.path.join(bundle_dir, 'preview', uid)

src/jarabe/journal/listmodel.py

@@ -16 +16 @@
 
 import logging
 
-import cjson
+import json
 import gobject
 import gtk
 
@@ -144 +144 @@
         self._cached_row.append(int(metadata.get('progress', 100)))
 
         if metadata.get('buddies', ''):
-            buddies = cjson.decode(metadata['buddies']).values()
+            # json cannot read unicode strings
+            buddies_str = metadata['buddies'].encode('utf8')
+            buddies = json.read(buddies_str).values()
         else:
             buddies = []
 

src/jarabe/model/bundleregistry.py

@@ -21 +21 @@
 
 import gobject
 import gio
-import cjson
+import simplejson
 
 from sugar.bundle.activitybundle import ActivityBundle
 from sugar.bundle.contentbundle import ContentBundle
@@ -107 +107 @@
     def _load_favorites(self):
         favorites_path = env.get_profile_path('favorite_activities')
         if os.path.exists(favorites_path):
-            favorites_data = cjson.decode(open(favorites_path).read())
+            favorites_data = simplejson.load(open(favorites_path))
 
             favorite_bundles = favorites_data['favorites']
             if not isinstance(favorite_bundles, dict):
@@ -322 +322 @@
         path = env.get_profile_path('favorite_activities')
         favorites_data = {'defaults-mtime': self._last_defaults_mtime,
                           'favorites': self._favorite_bundles}
-        open(path, 'w').write(cjson.encode(favorites_data))
+        simplejson.dump(favorites_data, open(path, 'w'), indent=1)
 
     def is_installed(self, bundle):
         # TODO treat ContentBundle in special way

src/jarabe/model/owner.py

@@ -17 +17 @@
 
 import gobject
 import os
-import cjson
 import gconf
+import simplejson
 
 from telepathy.interfaces import CHANNEL_TYPE_TEXT
 
@@ -98 +98 @@
             bundle_id = 'org.laptop.Chat'
         else:
             bundle_id = 'org.laptop.VideoChat'
-        tp_channel = cjson.encode([bus_name, connection, channel])
+        tp_channel = simplejson.dumps([bus_name, connection, channel])
         self._invites.add_private_invite(tp_channel, bundle_id)
 
     def _activity_disappeared_cb(self, pservice, activity):