From 5cd643861b48768a90788f9d6ad3bacf7566e586 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonah=20Br=C3=BCchert?= <jbb@kaidan.im>
Date: Thu, 23 May 2024 04:02:21 +0200
Subject: Remove broken django version checks

---
 src/lib/Bcfg2/Server/Admin.py             | 9 +--------
 src/lib/Bcfg2/Server/Core.py              | 7 ++-----
 src/lib/Bcfg2/Server/Plugins/Reporting.py | 6 +-----
 3 files changed, 4 insertions(+), 18 deletions(-)

(limited to 'src/lib/Bcfg2/Server')

diff --git a/src/lib/Bcfg2/Server/Admin.py b/src/lib/Bcfg2/Server/Admin.py
index 98ce9e524..30c04411a 100644
--- a/src/lib/Bcfg2/Server/Admin.py
+++ b/src/lib/Bcfg2/Server/Admin.py
@@ -30,14 +30,7 @@ try:
     import Bcfg2.Server.models
 
     HAS_DJANGO = True
-    if django.VERSION[0] == 1 and django.VERSION[1] >= 7:
-        HAS_REPORTS = True
-    else:
-        try:
-            import south  # pylint: disable=W0611
-            HAS_REPORTS = True
-        except ImportError:
-            HAS_REPORTS = False
+    HAS_REPORTS = True
 except ImportError:
     HAS_DJANGO = False
     HAS_REPORTS = False
diff --git a/src/lib/Bcfg2/Server/Core.py b/src/lib/Bcfg2/Server/Core.py
index 78eed4b3e..59e9254c1 100644
--- a/src/lib/Bcfg2/Server/Core.py
+++ b/src/lib/Bcfg2/Server/Core.py
@@ -87,11 +87,8 @@ def close_db_connection(func):
             self.logger.debug("%s: Closing database connection" %
                               threading.current_thread().getName())
 
-            if django.VERSION[0] == 1 and django.VERSION[1] >= 7:
-                for connection in django.db.connections.all():
-                    connection.close()
-            else:
-                django.db.close_connection()  # pylint: disable=E1101
+            for connection in django.db.connections.all():
+                connection.close()
         return rv
 
     return inner
diff --git a/src/lib/Bcfg2/Server/Plugins/Reporting.py b/src/lib/Bcfg2/Server/Plugins/Reporting.py
index e372006c7..fcce10fc8 100644
--- a/src/lib/Bcfg2/Server/Plugins/Reporting.py
+++ b/src/lib/Bcfg2/Server/Plugins/Reporting.py
@@ -11,11 +11,7 @@ from Bcfg2.Server.Plugin import Statistics, PullSource, Threaded, \
 
 try:
     import django
-    if django.VERSION[0] == 1 and django.VERSION[1] >= 7:
-        HAS_REPORTING = True
-    else:
-        import south  # pylint: disable=W0611
-        HAS_REPORTING = True
+    HAS_REPORTING = True
 except ImportError:
     HAS_REPORTING = False
 
-- 
cgit v1.2.3-1-g7c22