Merge pull request #373 from AlexanderS/fix/django1.9/report-collector

Fix bcfg2-report-collector for django-1.9

3 files changed, 16 insertions, 25 deletions

diff --git a/src/lib/Bcfg2/Server/Admin.py b/src/lib/Bcfg2/Server/Admin.py
index b35f73ba4..77bca88eb 100644
--- a/src/lib/Bcfg2/Server/Admin.py
+++ b/src/lib/Bcfg2/Server/Admin.py
@@ -1228,10 +1228,6 @@ class CLI(Bcfg2.Options.CommandRegistry):
             components=[self])
         parser.add_options(self.subcommand_options)
         parser.parse()
-        if HAS_DJANGO and 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 """
diff --git a/src/lib/Bcfg2/Server/Plugins/Metadata.py b/src/lib/Bcfg2/Server/Plugins/Metadata.py
index 40504e15e..b912d3725 100644
--- a/src/lib/Bcfg2/Server/Plugins/Metadata.py
+++ b/src/lib/Bcfg2/Server/Plugins/Metadata.py
@@ -21,30 +21,27 @@ from Bcfg2.Compat import MutableMapping, all, any, wraps
 # pylint: enable=W0622
 from Bcfg2.version import Bcfg2VersionInfo
 
+try:
+    from django.db import models
+    HAS_DJANGO = True
+except ImportError:
+    HAS_DJANGO = False
+
 # pylint: disable=C0103
 ClientVersions = None
 MetadataClientModel = None
 # pylint: enable=C0103
-HAS_DJANGO = False
 
 
 def load_django_models():
     """ Load models for Django after option parsing has completed """
     # pylint: disable=W0602
-    global MetadataClientModel, ClientVersions, HAS_DJANGO
+    global MetadataClientModel, ClientVersions
     # pylint: enable=W0602
 
-    try:
-        import django
-        from django.db import models
-        HAS_DJANGO = True
-    except ImportError:
-        HAS_DJANGO = False
+    if not HAS_DJANGO:
         return
 
-    if django.VERSION[0] == 1 and django.VERSION[1] >= 7:
-        django.setup()  # pylint: disable=E1101
-
     class MetadataClientModel(models.Model,  # pylint: disable=W0621
                               Bcfg2.Server.Plugin.PluginDatabaseModel):
         """ django model for storing clients in the database """
diff --git a/src/lib/Bcfg2/Server/Plugins/Probes.py b/src/lib/Bcfg2/Server/Plugins/Probes.py
index 33b0d4284..ae4ea4cb1 100644
--- a/src/lib/Bcfg2/Server/Plugins/Probes.py
+++ b/src/lib/Bcfg2/Server/Plugins/Probes.py
@@ -15,6 +15,12 @@ import Bcfg2.Server.FileMonitor
 from Bcfg2.Logger import Debuggable
 from Bcfg2.Server.Statistics import track_statistics
 
+try:
+    from django.db import models
+    HAS_DJANGO = True
+except ImportError:
+    HAS_DJANGO = False
+
 HAS_DJANGO = False
 # pylint: disable=C0103
 ProbesDataModel = None
@@ -25,20 +31,12 @@ ProbesGroupsModel = None
 def load_django_models():
     """ Load models for Django after option parsing has completed """
     # pylint: disable=W0602
-    global ProbesDataModel, ProbesGroupsModel, HAS_DJANGO
+    global ProbesDataModel, ProbesGroupsModel
     # pylint: enable=W0602
 
-    try:
-        import django
-        from django.db import models
-        HAS_DJANGO = True
-    except ImportError:
-        HAS_DJANGO = False
+    if not HAS_DJANGO:
         return
 
-    if django.VERSION[0] == 1 and django.VERSION[1] >= 7:
-        django.setup()  # pylint: disable=E1101
-
     class ProbesDataModel(models.Model,  # pylint: disable=W0621,W0612
                           Bcfg2.Server.Plugin.PluginDatabaseModel):
         """ The database model for storing probe data """