diff options
author | Rafael Ortiz <rafael@activitycentral.com> | 2012-11-08 03:15:06 (GMT) |
---|---|---|
committer | Rafael Ortiz <rafael@activitycentral.com> | 2012-11-08 03:15:06 (GMT) |
commit | 891c16fc8ef2c42ccb3cfb27c00a86b0e5d061cf (patch) | |
tree | fe572f7545416680558ec00fd79d66c73beb9eb4 | |
parent | 9d6d938e4c653e46a117f955e67a048c1d77f5c6 (diff) |
removing cjson leftovers
-rw-r--r-- | activity.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/activity.py b/activity.py index b973ca9..d80bb39 100644 --- a/activity.py +++ b/activity.py @@ -28,7 +28,7 @@ import logging import gtk import gobject import pango -import cjson +import json from gettext import gettext as _ from sugar.graphics.toolbutton import ToolButton @@ -195,7 +195,7 @@ class SpeakActivity(SharedActivity): % xoOwner.props.nick) def resume_instance(self, file_path): - cfg = cjson.decode(file(file_path, 'r').read()) + cfg = json.loads(file(file_path, 'r').read()) status = self.face.status = face.Status().deserialize(cfg['status']) self.voices.select(status.voice) @@ -217,7 +217,7 @@ class SpeakActivity(SharedActivity): 'history': [unicode(i[0], 'utf-8', 'ignore') \ for i in self.entrycombo.get_model()], } - file(file_path, 'w').write(cjson.encode(cfg)) + file(file_path, 'w').write(json.dumps(cfg)) def share_instance(self, connection, is_initiator): self.chat.messenger = Messenger(connection, is_initiator, self.chat) |