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 /model.py | |
parent | 3651da1c280cf5b7c8d8a1f9f3ce1babb26281f9 (diff) | |
parent | 8b7a3b5cebb8ed7ead60841d052c02753d09ac34 (diff) |
Merge branch 'master' of git.sugarlabs.org:browse/mainline
Diffstat (limited to 'model.py')
-rw-r--r-- | model.py | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -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', []) |