magic-removal: Merged to [2359]

git-svn-id: http://code.djangoproject.com/svn/django/branches/magic-removal@2360 bcc190cf-cafb-0310-a4f2-bffc1f526a37

django/core/handlers/base.py

@@ -85,6 +85,10 @@ class BaseHandler:
             if response is None:
                 raise ValueError, "The view %s.%s didn't return an HttpResponse object." % (callback.__module__, callback.func_name)
 
+            # Apply response middleware
+            for middleware_method in self._response_middleware:
+                response = middleware_method(request, response)
+
             return response
         except http.Http404, e:
             if settings.DEBUG:

django/core/handlers/modpython.py

@@ -147,10 +147,6 @@ class ModPythonHandler(BaseHandler):
         finally:
             dispatcher.send(signal=signals.request_finished)
 
-        # Apply response middleware
-        for middleware_method in self._response_middleware:
-            response = middleware_method(request, response)
-
         # Convert our custom HttpResponse object back into the mod_python req.
         populate_apache_request(response, req)
         return 0 # mod_python.apache.OK

django/core/handlers/wsgi.py

@@ -163,10 +163,6 @@ class WSGIHandler(BaseHandler):
         finally:
             dispatcher.send(signal=signals.request_finished)
 
-        # Apply response middleware
-        for middleware_method in self._response_middleware:
-            response = middleware_method(request, response)
-
         try:
             status_text = STATUS_CODE_TEXT[response.status_code]
         except KeyError:

django/core/management.py

@@ -1011,8 +1011,8 @@ def runserver(addr, port):
         from django.conf import settings
         print "Validating models..."
         validate()
-        print "\nStarting server on port %s with settings module %r." % (port, settings.SETTINGS_MODULE)
-        print "Go to http://%s:%s/ for Django." % (addr, port)
+        print "\nDjango version %s, using settings %r" % (get_version(), settings.SETTINGS_MODULE)
+        print "Development server is running at http://%s:%s/" % (addr, port)
         print "Quit the server with CONTROL-C (Unix) or CTRL-BREAK (Windows)."
         try:
             run(addr, int(port), AdminMediaHandler(WSGIHandler()))