diff options
author | Rafael Ortiz <rafael@activitycentral.com> | 2012-12-19 15:16:03 (GMT) |
---|---|---|
committer | Rafael Ortiz <rafael@activitycentral.com> | 2012-12-19 15:16:03 (GMT) |
commit | f0ece64d68676ab4418da872205450ff823515e8 (patch) | |
tree | ed35b210e5676c280dc6a07e1b6c192d338ea3e1 | |
parent | 45cee85ba7175ed92dd19a3e40bf9c40d029e01a (diff) |
cjson to json (matching mainline)
-rw-r--r-- | speak/face.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/speak/face.py b/speak/face.py index 5ad632c..f11a74c 100644 --- a/speak/face.py +++ b/speak/face.py @@ -24,7 +24,7 @@ import logging import gtk -import cjson +import json from gettext import gettext as _ import sugar.graphics.style as style @@ -56,7 +56,7 @@ class Status: fft_mouth.FFTMouth : 2, waveform_mouth.WaveformMouth : 3 } - return cjson.encode({ + return json.dumps({ 'voice' : { 'language' : self.voice.language, 'name' : self.voice.name }, 'pitch' : self.pitch, @@ -71,7 +71,7 @@ class Status: 2: fft_mouth.FFTMouth, 3: waveform_mouth.WaveformMouth } - data = cjson.decode(buf) + data = json.loads(buf) self.voice = voice.Voice(data['voice']['language'], data['voice']['name']) self.pitch = data['pitch'] |