diff options
author | Pootle daemon <pootle@pootle.sugarlabs.org> | 2012-03-24 04:33:51 (GMT) |
---|---|---|
committer | Pootle daemon <pootle@pootle.sugarlabs.org> | 2012-03-24 04:33:51 (GMT) |
commit | eb44eb423179d5f524ed029b63eeab3308e1b0b0 (patch) | |
tree | 1831d6b3d88252e4cfe444447855f8711dbcaca4 | |
parent | 3651da1c280cf5b7c8d8a1f9f3ce1babb26281f9 (diff) | |
parent | 8b7a3b5cebb8ed7ead60841d052c02753d09ac34 (diff) |
Merge branch 'master' of git.sugarlabs.org:browse/mainline
-rw-r--r-- | activity/activity.info | 2 | ||||
-rw-r--r-- | model.py | 6 | ||||
-rw-r--r-- | webactivity.py | 4 |
3 files changed, 6 insertions, 6 deletions
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 @@ -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() |