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 /webactivity.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 'webactivity.py')
-rw-r--r-- | webactivity.py | 4 |
1 files changed, 2 insertions, 2 deletions
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() |