diff options
Diffstat (limited to 'sugar_network/client/journal.py')
-rw-r--r-- | sugar_network/client/journal.py | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/sugar_network/client/journal.py b/sugar_network/client/journal.py index 0dcae12..6a8f5ed 100644 --- a/sugar_network/client/journal.py +++ b/sugar_network/client/journal.py @@ -19,8 +19,8 @@ import logging from shutil import copyfileobj from tempfile import NamedTemporaryFile -from sugar_network import client, toolkit -from sugar_network.toolkit.router import route, Request +from sugar_network import client +from sugar_network.toolkit.router import route, Request, File from sugar_network.toolkit import enforce @@ -105,14 +105,15 @@ class Routes(object): @route('GET', ['journal', None, 'preview']) def journal_get_preview(self, request, response): - return toolkit.File(_prop_path(request.guid, 'preview'), { - 'mime_type': 'image/png', + return File(_prop_path(request.guid, 'preview'), meta={ + 'content-type': 'image/png', }) @route('GET', ['journal', None, 'data']) def journal_get_data(self, request, response): - return toolkit.File(_ds_path(request.guid, 'data'), { - 'mime_type': get(request.guid, 'mime_type') or 'application/octet', + return File(_ds_path(request.guid, 'data'), meta={ + 'content-type': get(request.guid, 'mime_type') or + 'application/octet', }) @route('GET', ['journal', None, None], mime_type='application/json') |