Back sessions with It's Dangerous.

[mediagoblin.git] / mediagoblin / tools / response.py

diff --git a/mediagoblin/tools/response.py b/mediagoblin/tools/response.py
index 81939a77bdac7a746a0b478e3102db7765eb1d7b..80df1f5a9951efcb35681ebfa96440b421c2b84e 100644 (file)
--- a/mediagoblin/tools/response.py
+++ b/mediagoblin/tools/response.py
@@ -14,11 +14,16 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-from webob import Response, exc
+import werkzeug.utils
+from werkzeug.wrappers import Response as wz_Response
 from mediagoblin.tools.template import render_template
 from mediagoblin.tools.translate import (lazy_pass_to_ugettext as _,
                                          pass_to_ugettext)
 
+class Response(wz_Response):
+    """Set default response mimetype to HTML, otherwise we get text/plain"""
+    default_mimetype = u'text/html'
+
 
 def render_to_response(request, template, context, status=200):
     """Much like Django's shortcut.render()"""
@@ -57,15 +62,40 @@ def render_404(request):
                 "you're looking for has been moved or deleted.")
     return render_error(request, 404, err_msg=err_msg)
 
+
+def render_http_exception(request, exc, description):
+    """Return Response() given a werkzeug.HTTPException
+
+    :param exc: werkzeug.HTTPException or subclass thereof
+    :description: message describing the error."""
+    # If we were passed the HTTPException stock description on
+    # exceptions where we have localized ones, use those:
+    stock_desc = (description == exc.__class__.description)
+
+    if stock_desc and exc.code == 403:
+        return render_403(request)
+    elif stock_desc and exc.code == 404:
+        return render_404(request)
+
+    return render_error(request, title=exc.args[0],
+                        err_msg=description,
+                        status=exc.code)
+
+
 def redirect(request, *args, **kwargs):
-    """Returns a HTTPFound(), takes a request and then urlgen params"""
+    """Redirects to an URL, using urlgen params or location string
+
+    :param querystring: querystring to be appended to the URL
+    :param location: If the location keyword is given, redirect to the URL
+    """
+    querystring = kwargs.pop('querystring', None)
 
-    querystring = None
-    if kwargs.get('querystring'):
-        querystring = kwargs.get('querystring')
-        del kwargs['querystring']
+    # Redirect to URL if given by "location=..."
+    if 'location' in kwargs:
+        location = kwargs.pop('location')
+    else:
+        location = request.urlgen(*args, **kwargs)
 
-    return exc.HTTPFound(
-        location=''.join([
-                request.urlgen(*args, **kwargs),
-                querystring if querystring else '']))
+    if querystring:
+        location += querystring
+    return werkzeug.utils.redirect(location)