From 208a68e451635883d0c6f58e56c8308bafe8b16c Mon Sep 17 00:00:00 2001 From: Walter Bender Date: Sun, 09 Jun 2013 22:06:54 +0000 Subject: refactoring based on lasted commits upstream --- (limited to 'src/jarabe/journal/journalentrybundle.py') diff --git a/src/jarabe/journal/journalentrybundle.py b/src/jarabe/journal/journalentrybundle.py index 87ae74b..79666b8 100644 --- a/src/jarabe/journal/journalentrybundle.py +++ b/src/jarabe/journal/journalentrybundle.py @@ -18,7 +18,7 @@ import os import tempfile import shutil -import simplejson +import json import dbus from sugar3.bundle.bundle import Bundle, MalformedBundleException @@ -70,13 +70,13 @@ class JournalEntryBundle(Bundle): metadata_path = os.path.join(bundle_dir, '_metadata.json') if not os.path.exists(metadata_path): raise MalformedBundleException( - 'Bundle must contain the file "_metadata.json"') + 'Bundle must contain the file "_metadata.json"') f = open(metadata_path, 'r') try: json_data = f.read() finally: f.close() - return simplejson.loads(json_data) + return json.loads(json_data) def _read_preview(self, uid, bundle_dir): preview_path = os.path.join(bundle_dir, 'preview', uid) -- cgit v0.9.1