From da11bce9a752d18a33cd27c4e63fa5435c02f219 Mon Sep 17 00:00:00 2001 From: benoitc Date: Mon, 14 May 2012 23:17:12 +0200 Subject: [PATCH] detect if AdminHandler can be imported. close #333 --- gunicorn/app/django_wsgi.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/gunicorn/app/django_wsgi.py b/gunicorn/app/django_wsgi.py index e66724b4..910dd265 100644 --- a/gunicorn/app/django_wsgi.py +++ b/gunicorn/app/django_wsgi.py @@ -23,7 +23,6 @@ try: django14 = True except ImportError: from django.core.handlers.wsgi import WSGIHandler - from django.core.servers.basehttp import AdminMediaHandler django14 = False from gunicorn import util @@ -109,7 +108,9 @@ 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) + try: + from django.core.servers.basehttp import AdminMediaHandler + return AdminMediaHandler(make_wsgi_application(), admin_mediapath) + except ImportError: + return make_wsgi_application()