diff options
| author | Sol Jerome <sol.jerome@gmail.com> | 2015-10-01 19:58:20 -0500 |
|---|---|---|
| committer | Sol Jerome <sol.jerome@gmail.com> | 2015-10-01 19:58:20 -0500 |
| commit | 35a2ad1d76790b62b3dbb41cb7fa112c81dc4d5f (patch) | |
| tree | a451a77147bc9fabce6e224e2038eedc78e27969 /reports | |
| parent | 061bd6abbb598659554f28a1a5bba45fd6eca6da (diff) | |
| parent | a505fb3b2df0d1eddfe7a92afb080b016e951a43 (diff) | |
| download | bcfg2-35a2ad1d76790b62b3dbb41cb7fa112c81dc4d5f.tar.gz bcfg2-35a2ad1d76790b62b3dbb41cb7fa112c81dc4d5f.tar.bz2 bcfg2-35a2ad1d76790b62b3dbb41cb7fa112c81dc4d5f.zip | |
Merge branch 'fix/django1.7' of https://github.com/AlexanderS/bcfg2
Diffstat (limited to 'reports')
| -rw-r--r-- | reports/reports.wsgi | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/reports/reports.wsgi b/reports/reports.wsgi index 7113b3308..979bcd389 100644 --- a/reports/reports.wsgi +++ b/reports/reports.wsgi @@ -4,9 +4,6 @@ import Bcfg2.DBSettings config_parsed = False -import django.core.handlers.wsgi - - def application(environ, start_response): global config_parsed @@ -18,4 +15,9 @@ def application(environ, start_response): Bcfg2.Options.get_parser().parse() config_parsed = True - return django.core.handlers.wsgi.WSGIHandler()(environ, start_response) + try: + from django.core.wsgi import get_wsgi_application + return get_wsgi_application()(environ, start_response) + except ImportError: + import django.core.handlers.wsgi + return django.core.handlers.wsgi.WSGIHandler()(environ, start_response) |