diff options
| author | Jonas Jochmaring <jjonas@mail.upb.de> | 2015-07-06 14:51:48 +0200 |
|---|---|---|
| committer | Alexander Sulfrian <alexander.sulfrian@fu-berlin.de> | 2015-09-23 19:28:57 +0200 |
| commit | 07672ad6e6985b029c0ccf750f63576b488b95d7 (patch) | |
| tree | 80dd70e96f611aa434f07e30e72c88dd5181f53b /src | |
| parent | fe2e0a3ddbe05e5eace11268ddf909ed386438d0 (diff) | |
| download | bcfg2-07672ad6e6985b029c0ccf750f63576b488b95d7.tar.gz bcfg2-07672ad6e6985b029c0ccf750f63576b488b95d7.tar.bz2 bcfg2-07672ad6e6985b029c0ccf750f63576b488b95d7.zip | |
some more django 1.7 compatibility fixes
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/Bcfg2/DBSettings.py | 3 | ||||
| -rw-r--r-- | src/lib/Bcfg2/Server/Admin.py | 5 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/lib/Bcfg2/DBSettings.py b/src/lib/Bcfg2/DBSettings.py index bff24ffce..80e6caf20 100644 --- a/src/lib/Bcfg2/DBSettings.py +++ b/src/lib/Bcfg2/DBSettings.py @@ -65,7 +65,8 @@ settings = dict( # pylint: disable=C0103 'django.core.context_processors.i18n', 'django.core.context_processors.media', 'django.core.context_processors.request'), - DATABASE_ROUTERS=['Bcfg2.DBSettings.PerApplicationRouter']) + DATABASE_ROUTERS=['Bcfg2.DBSettings.PerApplicationRouter'], + TEST_RUNNER='django.test.simple.DjangoTestSuiteRunner') if HAS_DJANGO and django.VERSION[0] == 1 and django.VERSION[1] >= 7: settings['INSTALLED_APPS'] += ('Bcfg2.Reporting',) diff --git a/src/lib/Bcfg2/Server/Admin.py b/src/lib/Bcfg2/Server/Admin.py index 0eba843c7..b7ee0c0ed 100644 --- a/src/lib/Bcfg2/Server/Admin.py +++ b/src/lib/Bcfg2/Server/Admin.py @@ -32,7 +32,7 @@ try: HAS_DJANGO = True if django.VERSION[0] == 1 and django.VERSION[1] >= 7: HAS_REPORTS = True - elif django.VERSION[0] == 1 and django.VERSION[1] <= 6: + else: try: import south # pylint: disable=W0611 HAS_REPORTS = True @@ -904,6 +904,9 @@ if HAS_DJANGO: class Syncdb(AdminCmd): """ Sync the Django ORM with the configured database """ + if HAS_DJANGO and django.VERSION[0] == 1 and django.VERSION[1] >= 7: + django.setup() + def run(self, setup): Bcfg2.Server.models.load_models() try: |