diff options
| author | Daniel Drake <dsd@laptop.org> | 2009-11-18 12:17:47 (GMT) |
|---|---|---|
| committer | Daniel Drake <dsd@laptop.org> | 2009-11-23 11:01:46 (GMT) |
| commit | cff9e43527ead20b088a9bfc6bbf12b0827debfd (patch) | |
| tree | b7e55fd146187bfca81a8ffccd36704fea0d93eb /src/jarabe/journal/listmodel.py | |
| parent | 03d80f06f184e1e1e4635f7eb284b15113126251 (diff) | |
Revert "Move to cjson and drop pyjson and simplejson"
This reverts commit ee4535c98ae74347e7072909d49dcf8a5e16ca7b.
cjson has a big bug dealing with slashes, this is a significant
long-term bug and upstream has not been responsive other than
acknowledging it. This bug breaks journal entry bundles.
http://dev.sugarlabs.org/ticket/1553
Thanks to Martin Langhoff for identifying and researching this issue
Diffstat (limited to 'src/jarabe/journal/listmodel.py')
| -rw-r--r-- | src/jarabe/journal/listmodel.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/jarabe/journal/listmodel.py b/src/jarabe/journal/listmodel.py index 32df853..bc53a9c 100644 --- a/src/jarabe/journal/listmodel.py +++ b/src/jarabe/journal/listmodel.py @@ -16,7 +16,7 @@ import logging -import cjson +import json import gobject import gtk @@ -144,7 +144,9 @@ class ListModel(gtk.GenericTreeModel, gtk.TreeDragSource): self._cached_row.append(int(metadata.get('progress', 100))) if metadata.get('buddies', ''): - buddies = cjson.decode(metadata['buddies']).values() + # json cannot read unicode strings + buddies_str = metadata['buddies'].encode('utf8') + buddies = json.read(buddies_str).values() else: buddies = [] |