Merge branch 'develop' into gilbert-ext4

[philo.git] / philo / contrib / winer / middleware.py

diff --git a/philo/contrib/penfield/middleware.py b/philo/contrib/winer/middleware.py
similarity index 59%
rename from philo/contrib/penfield/middleware.py
rename to philo/contrib/winer/middleware.py
index b25a28b..89a5bd2 100644 (file)
--- a/philo/contrib/penfield/middleware.py
+++ b/philo/contrib/winer/middleware.py
@@ -1,11 +1,11 @@
 from django.http import HttpResponse
 from django.utils.decorators import decorator_from_middleware
-from philo.contrib.penfield.exceptions import HttpNotAcceptable
+
+from philo.contrib.winer.exceptions import HttpNotAcceptable
 
 
 class HttpNotAcceptableMiddleware(object):
-       """Middleware to catch HttpNotAcceptable errors and return an Http406 response.
-       See RFC 2616."""
+       """Middleware to catch :exc:`~philo.contrib.winer.exceptions.HttpNotAcceptable` and return an :class:`HttpResponse` with a 406 response code. See :rfc:`2616`."""
        def process_exception(self, request, exception):
                if isinstance(exception, HttpNotAcceptable):
                        return HttpResponse(status=406)