From 6cffb5b4734090a052b1080ffe99e71b919b7e36 Mon Sep 17 00:00:00 2001 From: Benoit Chesneau Date: Tue, 17 Apr 2012 14:06:48 +0200 Subject: [PATCH] no mre AdminMediaHandler class in django 1.4 . close #333 --- gunicorn/app/django_wsgi.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/gunicorn/app/django_wsgi.py b/gunicorn/app/django_wsgi.py index 5722978c..e66724b4 100644 --- a/gunicorn/app/django_wsgi.py +++ b/gunicorn/app/django_wsgi.py @@ -17,12 +17,13 @@ except ImportError: from django.conf import settings from django.core.management.validation import get_validation_errors from django.utils import translation -from django.core.servers.basehttp import AdminMediaHandler + try: from django.core.servers.basehttp import get_internal_wsgi_application django14 = True except ImportError: from django.core.handlers.wsgi import WSGIHandler + from django.core.servers.basehttp import AdminMediaHandler django14 = False from gunicorn import util @@ -108,4 +109,7 @@ def reload_django_settings(): def make_command_wsgi_application(admin_mediapath): reload_django_settings() + if django14: + return make_wsgi_application() + return AdminMediaHandler(make_wsgi_application(), admin_mediapath)