aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/tools/response.py
diff options
context:
space:
mode:
authorChristopher Allan Webber <cwebber@dustycloud.org>2013-06-22 12:25:31 -0500
committerChristopher Allan Webber <cwebber@dustycloud.org>2013-07-10 13:42:42 -0500
commit20e4e6c140f852e5142f930dd15684497fb9468a (patch)
tree2e032ec6ccec15be64d1d565b537aff3182e37ad /mediagoblin/tools/response.py
parentcd1fda4d947bf13ed3708859f83cef6160538751 (diff)
downloadmediagoblin-20e4e6c140f852e5142f930dd15684497fb9468a.tar.lz
mediagoblin-20e4e6c140f852e5142f930dd15684497fb9468a.tar.xz
mediagoblin-20e4e6c140f852e5142f930dd15684497fb9468a.zip
Fix by Rodney Ewing so render_http_exception works with newer Werkzeug versions.
This commit back-cherry-picked from current master for the 0.4.1 fix release.
Diffstat (limited to 'mediagoblin/tools/response.py')
-rw-r--r--mediagoblin/tools/response.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/mediagoblin/tools/response.py b/mediagoblin/tools/response.py
index aaf31d0b..0be1f835 100644
--- a/mediagoblin/tools/response.py
+++ b/mediagoblin/tools/response.py
@@ -77,7 +77,7 @@ def render_http_exception(request, exc, description):
elif stock_desc and exc.code == 404:
return render_404(request)
- return render_error(request, title=exc.args[0],
+ return render_error(request, title='{0} {1}'.format(exc.code, exc.name),
err_msg=description,
status=exc.code)