diff options
| author | Rafael Ortiz <rafael@activitycentral.com> | 2012-08-09 18:32:40 (GMT) |
|---|---|---|
| committer | Aleksey Lim <alsroot@sugarlabs.org> | 2012-08-11 06:48:09 (GMT) |
| commit | 8e6e5f5466dc3d92a055561ec378115c2639eee3 (patch) | |
| tree | bb22cab862573c7ad9dca54e4d62e6c6356befa0 | |
| parent | b7c6667e007f2722885d291275d9200e4be0f87c (diff) | |
cjson --> json sl#3142
Patch to change cjson for json, acording to SL#3142
| -rw-r--r-- | activity.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activity.py b/activity.py index d84e194..d67bfe4 100644 --- a/activity.py +++ b/activity.py @@ -16,7 +16,7 @@ import gtk import logging -import cjson +import json import math from gettext import gettext as _ @@ -161,7 +161,7 @@ class Chat(activity.Activity): """Handle a private invite from a non-Sugar XMPP client.""" if self.shared_activity or self.text_channel: return - bus_name, connection, channel = cjson.decode(tp_channel) + bus_name, connection, channel = json.loads(tp_channel) logger.debug('GOT XMPP: %s %s %s', bus_name, connection, channel) Connection( |