Ticket #2557: basehttp-GenerellMediaHandler.diff

django/core/servers/basehttp.py

@@ -587 +587 @@
             return
         sys.stderr.write("[%s] %s\n" % (self.log_date_time_string(), format % args))
 
+# At compile time, cache the directories to search.
+from django.conf import settings
+app_media_dirs = []
+for app in settings.INSTALLED_APPS:
+    i = app.rfind('.')
+    if i == -1:
+        m, a = app, None
+    else:
+        m, a = app[:i], app[i+1:]
+    try:
+        if a is None:
+            mod = __import__(m, '', '', [])
+        else:
+            mod = getattr(__import__(m, '', '', [a]), a)
+    except ImportError, e:
+        raise ImproperlyConfigured, 'ImportError %s: %s' % (app, e.args[0])
+    media_dir = os.path.join(os.path.dirname(mod.__file__), 'media')
+    if os.path.isdir(media_dir):
+        app_media_dirs.append(media_dir)
+
+# It won't change, so convert it to a tuple to save memory.
+app_media_dirs = tuple(app_media_dirs)
+
 class AdminMediaHandler(object):
     """
     WSGI middleware that intercepts calls to the admin media directory, as
@@ -598 +621 @@
         from django.conf import settings
         import django
         self.application = application
-        self.media_dir = django.__path__[0] + '/contrib/admin/media'
         self.media_url = settings.ADMIN_MEDIA_PREFIX
 
     def __call__(self, environ, start_response):
@@ -612 +634 @@
 
         # Find the admin file and serve it up, if it exists and is readable.
         relative_url = environ['PATH_INFO'][len(self.media_url):]
-        file_path = os.path.join(self.media_dir, relative_url)
+        for media_dir in app_media_dirs:
+            file_path = os.path.join(media_dir, relative_url)
+            if os.path.exists(file_path):
+                break
         if not os.path.exists(file_path):
             status = '404 NOT FOUND'
             headers = {'Content-type': 'text/plain'}