Ticket #21451: 21451-patch-Django-1.6.diff

django/contrib/staticfiles/handlers.py

@@ -60 +60 @@
                 if settings.DEBUG:
                     from django.views import debug
                     return debug.technical_404_response(request, e)
+                else:
+                    raise
         return super(StaticFilesHandler, self).get_response(request)
 
     def __call__(self, environ, start_response):

django/test/testcases.py

@@ -1081 +1081 @@
                 connections[alias] = conn
         try:
             # Create the handler for serving static and media files
-            handler = StaticFilesHandler(_MediaFilesHandler(WSGIHandler()))
+            handler = WSGIHandler()
+            if settings.MEDIA_URL:
+                handler = _MediaFilesHandler(handler)
+            handler = StaticFilesHandler(handler)
 
             # Go through the list of possible ports, hoping that we can find
             # one that is free to use for the WSGI server.

tests/servers/tests.py

@@ -7 +7 @@
 import os
 import socket
 
+from django.conf import settings
 from django.core.exceptions import ImproperlyConfigured
 from django.test import LiveServerTestCase
 from django.test.utils import override_settings
@@ -178 +179 @@
             ['jane', 'robert', 'emily'],
             lambda b: b.name
         )
+
+@override_settings(DEBUG=True)
+class LiveServerWithoutMediaUrlInDebugMode(LiveServerBase):
+
+    @classmethod
+    def setUpClass(cls):
+        MEDIA_URL = TEST_SETTINGS.pop('MEDIA_URL')
+        super(LiveServerWithoutMediaUrlInDebugMode, cls).setUpClass()
+        TEST_SETTINGS['MEDIA_URL'] = MEDIA_URL
+
+    def test_existing_url(self):
+        """
+        Ensure that LiveServerTestCase serves views when MEDIA_URL is unset
+        and DEBUG is True. Refs #21451.
+        """
+        f = self.urlopen('/example_view/')
+        self.assertEqual(f.read(), b'example view')