diff options
author | Aleksey Lim <alsroot@member.fsf.org> | 2009-03-05 02:17:47 (GMT) |
---|---|---|
committer | Aleksey Lim <alsroot@member.fsf.org> | 2009-03-05 02:17:47 (GMT) |
commit | 69d7246513000a88bd903f3cf16497c1d5f9ff91 (patch) | |
tree | 29cd49b0ac5c08503241e0b6e8f073a50c3d0c0f /messenger.py | |
parent | a003ca0fa671f5424c9ce1baa0d15ddcaff6db35 (diff) |
Use simplejson instead of cjson
Diffstat (limited to 'messenger.py')
-rw-r--r-- | messenger.py | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/messenger.py b/messenger.py index 04773c1..e6e72f3 100644 --- a/messenger.py +++ b/messenger.py @@ -12,12 +12,17 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -import cjson import logging import dbus from dbus.gobject_service import ExportedGObject from dbus.service import method, signal +try: + import json + json.dumps +except (ImportError, AttributeError): + import simplejson as json + from sugar.presence import presenceservice import char @@ -34,7 +39,7 @@ PATH = '/org/sugarlabs/CartoonBuilder' class Slot: def __init__(self, sender=None, raw=None): if sender: - data = cjson.decode(raw) + data = json.loads(raw) self.seqno = data['seqno'] self.oid = data['oid'] self.sender = sender @@ -44,7 +49,7 @@ class Slot: self.sender = None def serialize(self): - return cjson.encode({ + return json.dumps({ 'seqno': self.seqno, 'oid' : self.oid}) |