Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/src/jarabe/journal/listmodel.py
diff options
context:
space:
mode:
authorDaniel Drake <dsd@laptop.org>2009-11-23 12:36:33 (GMT)
committer Daniel Drake <dsd@laptop.org>2009-11-23 12:47:11 (GMT)
commitbd3fdd73a853d618aa5000ff5b1ce82f196c8b70 (patch)
treeef9c4b32cc06693a90200d77dc75879023fec298 /src/jarabe/journal/listmodel.py
parentcff9e43527ead20b088a9bfc6bbf12b0827debfd (diff)
Switch entirely to simplejson
I misunderstood the state of affairs with the numerous json parsers. Whatever we used to have as 'json' isn't really available on Py2.6. Move to simplejson which seems to be the most functional implementation, available on both old and new setups.
Diffstat (limited to 'src/jarabe/journal/listmodel.py')
-rw-r--r--src/jarabe/journal/listmodel.py6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/jarabe/journal/listmodel.py b/src/jarabe/journal/listmodel.py
index bc53a9c..d3b7e24 100644
--- a/src/jarabe/journal/listmodel.py
+++ b/src/jarabe/journal/listmodel.py
@@ -16,7 +16,7 @@
import logging
-import json
+import simplejson
import gobject
import gtk
@@ -144,9 +144,7 @@ class ListModel(gtk.GenericTreeModel, gtk.TreeDragSource):
self._cached_row.append(int(metadata.get('progress', 100)))
if metadata.get('buddies', ''):
- # json cannot read unicode strings
- buddies_str = metadata['buddies'].encode('utf8')
- buddies = json.read(buddies_str).values()
+ buddies = simplejson.loads(metadata['buddies']).values()
else:
buddies = []