diff options
| author | Alexander Sulfrian <alexander.sulfrian@fu-berlin.de> | 2015-09-23 21:08:02 +0200 |
|---|---|---|
| committer | Alexander Sulfrian <alexander.sulfrian@fu-berlin.de> | 2015-09-23 21:08:02 +0200 |
| commit | 0fe55e5b3d2bff6e31ce9556d0f411118bd89c1d (patch) | |
| tree | 8038e301bc3c796abd50dfa397a9622443d9bf77 | |
| parent | 7cc349e27836f760e2a14b65e690473bd63bf3ad (diff) | |
| download | bcfg2-0fe55e5b3d2bff6e31ce9556d0f411118bd89c1d.tar.gz bcfg2-0fe55e5b3d2bff6e31ce9556d0f411118bd89c1d.tar.bz2 bcfg2-0fe55e5b3d2bff6e31ce9556d0f411118bd89c1d.zip | |
DBSettings: XViewMiddleware was moved into another package
The old name was deprecated with django1.6 and removed with django1.8.
| -rw-r--r-- | src/lib/Bcfg2/DBSettings.py | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/lib/Bcfg2/DBSettings.py b/src/lib/Bcfg2/DBSettings.py index 61ab80253..03e34bbc3 100644 --- a/src/lib/Bcfg2/DBSettings.py +++ b/src/lib/Bcfg2/DBSettings.py @@ -50,8 +50,7 @@ settings = dict( # pylint: disable=C0103 MIDDLEWARE_CLASSES=( 'django.middleware.common.CommonMiddleware', 'django.contrib.sessions.middleware.SessionMiddleware', - 'django.contrib.auth.middleware.AuthenticationMiddleware', - 'django.middleware.doc.XViewMiddleware'), + 'django.contrib.auth.middleware.AuthenticationMiddleware'), ROOT_URLCONF='Bcfg2.Reporting.urls', AUTHENTICATION_BACKENDS=('django.contrib.auth.backends.ModelBackend'), LOGIN_URL='/login', @@ -68,6 +67,13 @@ settings = dict( # pylint: disable=C0103 DATABASE_ROUTERS=['Bcfg2.DBSettings.PerApplicationRouter'], TEST_RUNNER='django.test.simple.DjangoTestSuiteRunner') +if HAS_DJANGO and django.VERSION[0] == 1 and django.VERSION[1] >= 6: + settings['MIDDLEWARE_CLASSES'] += \ + ('django.contrib.admindocs.middleware.XViewMiddleware',) +elif HAS_SOUTH: + settings['MIDDLEWARE_CLASSES'] += \ + ('django.middleware.doc.XViewMiddleware',) + if HAS_DJANGO and django.VERSION[0] == 1 and django.VERSION[1] >= 7: settings['INSTALLED_APPS'] += ('Bcfg2.Reporting',) elif HAS_SOUTH: |