Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNirbheek Chauhan <nirbheek.chauhan@gmail.com>2008-12-25 10:22:11 (GMT)
committer Nirbheek Chauhan <nirbheek.chauhan@gmail.com>2008-12-25 10:22:11 (GMT)
commit3d66b9a6505984f2c3185b7cdbd469b7c2792caa (patch)
treea2fa37e4ba66184849d0d8db2b8c52909c1ad8f1
parent0658f02d73aac8e501713becd3dc138cb3b08f2a (diff)
Use cjson instead of simple-jsonHEADmaster
python-cjson is listed as a system module dep of sugar, but simple-json is not.
-rw-r--r--pippy_app.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/pippy_app.py b/pippy_app.py
index 7be5cf2..215f349 100644
--- a/pippy_app.py
+++ b/pippy_app.py
@@ -20,7 +20,7 @@ import gtk
import pango
import logging
import re
-import simplejson
+import cjson
import time
from datetime import datetime
from activity import ViewSourceActivity
@@ -98,7 +98,7 @@ class Chat(ViewSourceActivity):
"""Handle a private invite from a non-Sugar XMPP client."""
if self.shared_activity or self.text_channel:
return
- bus_name, connection, channel = simplejson.loads(tp_channel)
+ bus_name, connection, channel = cjson.decode(tp_channel)
logger.debug('GOT XMPP: %s %s %s', bus_name, connection,
channel)
conn = Connection(