detect if AdminHandler can be imported. close #333

This commit is contained in:
benoitc 2012-05-14 23:17:12 +02:00
parent 0d58056132
commit da11bce9a7

View File

@ -23,7 +23,6 @@ try:
django14 = True django14 = True
except ImportError: except ImportError:
from django.core.handlers.wsgi import WSGIHandler from django.core.handlers.wsgi import WSGIHandler
from django.core.servers.basehttp import AdminMediaHandler
django14 = False django14 = False
from gunicorn import util from gunicorn import util
@ -109,7 +108,9 @@ def reload_django_settings():
def make_command_wsgi_application(admin_mediapath): def make_command_wsgi_application(admin_mediapath):
reload_django_settings() 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()