From fe2e0a3ddbe05e5eace11268ddf909ed386438d0 Mon Sep 17 00:00:00 2001 From: Jonas Jochmaring Date: Fri, 22 May 2015 15:29:02 +0200 Subject: make Bcfg2-web compatible with django 1.7 - reports.wsgi uses get_wsgi_application() now - old south-based migrations have been moved - manage.py has been updated --- reports/reports.wsgi | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) (limited to 'reports') diff --git a/reports/reports.wsgi b/reports/reports.wsgi index 7113b3308..1a2a17f07 100644 --- a/reports/reports.wsgi +++ b/reports/reports.wsgi @@ -1,21 +1,23 @@ import os import Bcfg2.Options import Bcfg2.DBSettings +import django config_parsed = False -import django.core.handlers.wsgi +# with wsgi, the environment isn't present in os.environ, but +# is passwd to the application function +if 'BCFG2_CONFIG_FILE' in environ: + os.environ['BCFG2_CONFIG_FILE'] = environ['BCFG2_CONFIG_FILE'] +if not config_parsed: + Bcfg2.Options.get_parser().parse() + config_parsed = True -def application(environ, start_response): - global config_parsed - - # with wsgi, the environment isn't present in os.environ, but - # is passwd to the application function - if 'BCFG2_CONFIG_FILE' in environ: - os.environ['BCFG2_CONFIG_FILE'] = environ['BCFG2_CONFIG_FILE'] - if not config_parsed: - Bcfg2.Options.get_parser().parse() - config_parsed = True - - return django.core.handlers.wsgi.WSGIHandler()(environ, start_response) +if django.VERSION[0] == 1 and django.VERSION[1] >= 7: + from django.core.wsgi import get_wsgi_application + application = get_wsgi_application() +else: + def application(environ, start_response): + import django.core.handlers.wsgi + return django.core.handlers.wsgi.WSGIHandler()(environ, start_response) -- cgit v1.2.3-1-g7c22