From eb44eb423179d5f524ed029b63eeab3308e1b0b0 Mon Sep 17 00:00:00 2001
From: Pootle daemon <pootle@pootle.sugarlabs.org>
Date: Sat, 24 Mar 2012 04:33:51 +0000
Subject: Merge branch 'master' of git.sugarlabs.org:browse/mainline

---
diff --git a/activity/activity.info b/activity/activity.info
index 1d9f579..d31c306 100644
--- a/activity/activity.info
+++ b/activity/activity.info
@@ -1,6 +1,6 @@
 [Activity]
 name = Browse
-activity_version = 132
+activity_version = 133
 bundle_id = org.laptop.WebActivity
 icon = activity-web
 exec = sugar-activity webactivity.WebActivity -s
diff --git a/model.py b/model.py
index d3d26e4..5dce50c 100644
--- a/model.py
+++ b/model.py
@@ -16,7 +16,7 @@
 #    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 #
 
-import cjson
+import json
 import sha
 from gi.repository import GObject
 import base64
@@ -59,10 +59,10 @@ class Model(GObject.GObject):
                 break
 
     def serialize(self):
-        return cjson.encode(self.data)
+        return json.dumps(self.data)
 
     def deserialize(self, data):
-        self.data = cjson.decode(data)
+        self.data = json.loads(data)
         self.data.setdefault('shared_links', [])
         self.data.setdefault('deleted', [])
 
diff --git a/webactivity.py b/webactivity.py
index 8b8db59..29258e6 100644
--- a/webactivity.py
+++ b/webactivity.py
@@ -33,7 +33,7 @@ import base64
 import time
 import shutil
 import sqlite3
-import cjson
+import json
 from gi.repository import GConf
 import locale
 import cairo
@@ -123,7 +123,7 @@ def _seed_xs_cookie():
                                               path, expiry, lastAccessed,
                                               isSecure, isHttpOnly)
                      VALUES(?,?,?,?,?,?,?,?)''',
-                  ('xoid', cjson.encode(cookie_data), jabber_server,
+                  ('xoid', json.loads(cookie_data), jabber_server,
                    '/', expire, 0, 0, 0))
         cookies_db.commit()
         cookies_db.close()
--
cgit v0.9.1