diff options
| author | Daniel Drake <dsd@laptop.org> | 2009-11-23 12:36:33 (GMT) |
|---|---|---|
| committer | Daniel Drake <dsd@laptop.org> | 2009-11-23 12:47:11 (GMT) |
| commit | bd3fdd73a853d618aa5000ff5b1ce82f196c8b70 (patch) | |
| tree | ef9c4b32cc06693a90200d77dc75879023fec298 /src/jarabe/journal/journalentrybundle.py | |
| parent | cff9e43527ead20b088a9bfc6bbf12b0827debfd (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/journalentrybundle.py')
| -rw-r--r-- | src/jarabe/journal/journalentrybundle.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/jarabe/journal/journalentrybundle.py b/src/jarabe/journal/journalentrybundle.py index a0bc935..74b2ac5 100644 --- a/src/jarabe/journal/journalentrybundle.py +++ b/src/jarabe/journal/journalentrybundle.py @@ -18,7 +18,7 @@ import os import tempfile import shutil -import json +import simplejson import dbus from sugar.bundle.bundle import Bundle, MalformedBundleException @@ -75,7 +75,7 @@ class JournalEntryBundle(Bundle): json_data = f.read() finally: f.close() - return json.read(json_data) + return simplejson.loads(json_data) def _read_preview(self, uid, bundle_dir): preview_path = os.path.join(bundle_dir, 'preview', uid) |