diff options
author | Jonas Jochmaring <jjonas@mail.upb.de> | 2015-05-22 15:29:02 +0200 |
---|---|---|
committer | Alexander Sulfrian <alexander.sulfrian@fu-berlin.de> | 2015-09-23 19:28:57 +0200 |
commit | fe2e0a3ddbe05e5eace11268ddf909ed386438d0 (patch) | |
tree | 2029a7903813eedff19bc232a3ec92246a64452a /src/lib/Bcfg2/Server/Admin.py | |
parent | 5b0a2d1ba24a210a66a91cc1755f4e24fd8a9b7f (diff) | |
download | bcfg2-fe2e0a3ddbe05e5eace11268ddf909ed386438d0.tar.gz bcfg2-fe2e0a3ddbe05e5eace11268ddf909ed386438d0.tar.bz2 bcfg2-fe2e0a3ddbe05e5eace11268ddf909ed386438d0.zip |
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
Diffstat (limited to 'src/lib/Bcfg2/Server/Admin.py')
-rw-r--r-- | src/lib/Bcfg2/Server/Admin.py | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/src/lib/Bcfg2/Server/Admin.py b/src/lib/Bcfg2/Server/Admin.py index c294e6be5..0eba843c7 100644 --- a/src/lib/Bcfg2/Server/Admin.py +++ b/src/lib/Bcfg2/Server/Admin.py @@ -25,15 +25,19 @@ import Bcfg2.Server.Plugins.Metadata try: from django.core.exceptions import ImproperlyConfigured from django.core import management + import django import django.conf import Bcfg2.Server.models HAS_DJANGO = True - try: - import south # pylint: disable=W0611 + if django.VERSION[0] == 1 and django.VERSION[1] >= 7: HAS_REPORTS = True - except ImportError: - HAS_REPORTS = False + elif django.VERSION[0] == 1 and django.VERSION[1] <= 6: + try: + import south # pylint: disable=W0611 + HAS_REPORTS = True + except ImportError: + HAS_REPORTS = False except ImportError: HAS_DJANGO = False HAS_REPORTS = False @@ -1194,6 +1198,10 @@ class CLI(Bcfg2.Options.CommandRegistry): components=[self]) parser.add_options(self.subcommand_options) parser.parse() + if django.VERSION[0] == 1 and django.VERSION[1] >= 7: + # this has been introduced in django 1.7, so pylint fails with + # older django releases + django.setup() # pylint disable=E1101 def run(self): """ Run bcfg2-admin """ |