diff options
author | Simon Schampijer <simon@schampijer.de> | 2012-03-23 11:37:34 (GMT) |
---|---|---|
committer | Simon Schampijer <simon@schampijer.de> | 2012-03-23 14:33:29 (GMT) |
commit | 8b7a3b5cebb8ed7ead60841d052c02753d09ac34 (patch) | |
tree | e3cd38ca9a7b3d8d328a8b2a67a319c4dac2d17a /model.py | |
parent | 3a2bd49d8d284995e0924e2d6b0a9759fe4c46f3 (diff) |
Use json as included in Python SL #3142
We use json as included in Python. This will make Sugar dependent on
Python 2.6 and Python 2.7 to have the highest JSON performance.
Signed-off-by: Simon Schampijer <simon@laptop.org>
Acked-by: Manuel QuiƱones <manuq@laptop.org>
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', []) |