3 files changed, 6 insertions, 21 deletions
diff --git a/src/lib/Bcfg2/Reporting/Storage/DjangoORM.py b/src/lib/Bcfg2/Reporting/Storage/DjangoORM.py
index 57accdb3b..49089ae12 100644
--- a/src/lib/Bcfg2/Reporting/Storage/DjangoORM.py
+++ b/src/lib/Bcfg2/Reporting/Storage/DjangoORM.py
@@ -43,13 +43,10 @@ def load_django_models():
 
 
 def get_all_field_names(model):
-    if django.VERSION[0] == 1 and django.VERSION[1] >= 8:
-        return [field.name
-                for field in model._meta.get_fields()
-                if field.auto_created == False and
-                    not (field.is_relation and field.related_model is None)]
-    else:
-        return model._meta.get_all_field_names()
+    return [field.name
+            for field in model._meta.get_fields()
+            if field.auto_created == False and
+                not (field.is_relation and field.related_model is None)]
 
 
 class DjangoORM(StorageBase):
diff --git a/src/lib/Bcfg2/Reporting/models.py b/src/lib/Bcfg2/Reporting/models.py
index 345dd1bc3..faa972204 100644
--- a/src/lib/Bcfg2/Reporting/models.py
+++ b/src/lib/Bcfg2/Reporting/models.py
@@ -62,15 +62,7 @@ def _quote(value):
     """
     global _our_backend
     if not _our_backend:
-        if django.VERSION[0] == 1 and django.VERSION[1] >= 7:
-            _our_backend = connections[get_db_label('Reporting')].ops
-        else:
-            from django.db import backend
-            try:
-                _our_backend = backend.DatabaseOperations(
-                    connections[get_db_label('Reporting')])
-            except TypeError:
-                _our_backend = backend.DatabaseOperations()
+        _our_backend = connections[get_db_label('Reporting')].ops
     return _our_backend.quote_name(value)
 
 
diff --git a/src/lib/Bcfg2/Reporting/templatetags/bcfg2_tags.py b/src/lib/Bcfg2/Reporting/templatetags/bcfg2_tags.py
index b42c10766..92cbe1196 100644
--- a/src/lib/Bcfg2/Reporting/templatetags/bcfg2_tags.py
+++ b/src/lib/Bcfg2/Reporting/templatetags/bcfg2_tags.py
@@ -395,11 +395,7 @@ class SortLinkNode(template.Node):
         self.text = template.Variable(text)
 
     def _render_template(self, context):
-        if django.VERSION[0] == 1 and django.VERSION[1] >= 8:
-            return context.template.engine.from_string(self.__TMPL__)
-        else:
-            from django.template.loader import get_template_from_string
-            return get_template_from_string(self.__TMPL__).render(context)
+        return context.template.engine.from_string(self.__TMPL__)
 
     def render(self, context):
         try: