diff options
| author | Jessica Tallon <jessica@megworld.co.uk> | 2014-09-08 17:55:03 +0100 |
|---|---|---|
| committer | Jessica Tallon <jessica@megworld.co.uk> | 2014-09-08 17:55:03 +0100 |
| commit | 8998300b981d1a906ae271eb122b387454c53f60 (patch) | |
| tree | 0d61930fb8ef60d99993f3f743dc84b64f445367 /mediagoblin/tools/response.py | |
| parent | 1b4e199668ada5c2ec47df7432ab69e315dc0601 (diff) | |
| parent | 1bce996181d9ae18756e6bbc0750bb6dc9d09609 (diff) | |
| download | mediagoblin-8998300b981d1a906ae271eb122b387454c53f60.tar.lz mediagoblin-8998300b981d1a906ae271eb122b387454c53f60.tar.xz mediagoblin-8998300b981d1a906ae271eb122b387454c53f60.zip | |
Merge branch '945-well-known'
* 945-well-known:
Add /.well-known/webfinger API to lookup user hrefs
Add XRD+XML formatting for /.well-known/host-meta
Diffstat (limited to 'mediagoblin/tools/response.py')
| -rw-r--r-- | mediagoblin/tools/response.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/mediagoblin/tools/response.py b/mediagoblin/tools/response.py index 57552963..88270265 100644 --- a/mediagoblin/tools/response.py +++ b/mediagoblin/tools/response.py @@ -29,11 +29,12 @@ class Response(wz_Response): default_mimetype = u'text/html' -def render_to_response(request, template, context, status=200): +def render_to_response(request, template, context, status=200, mimetype=None): """Much like Django's shortcut.render()""" return Response( render_template(request, template, context), - status=status) + status=status, + mimetype=mimetype) def render_error(request, status=500, title=_('Oops!'), err_msg=_('An error occured')): @@ -164,7 +165,7 @@ def json_error(error_str, status=400, *args, **kwargs): code to 400. """ return json_response({"error": error_str}, status=status, *args, **kwargs) - + def form_response(data, *args, **kwargs): """ Responds using application/x-www-form-urlencoded and returns a werkzeug |