From 1fec29dcb31b620b55397dcca568030cdbc65220 Mon Sep 17 00:00:00 2001
From: AlanCoding <arominge@redhat.com>
Date: Wed, 26 Oct 2016 17:22:03 -0400
Subject: [PATCH] remove awx.compat, since it looks like it is not necessary

---
 awx/lib/__init__.py         |  2 --
 awx/lib/compat.py           | 33 ---------------------------------
 awx/main/models/projects.py |  2 +-
 awx/settings/defaults.py    |  2 +-
 4 files changed, 2 insertions(+), 37 deletions(-)
 delete mode 100644 awx/lib/__init__.py
 delete mode 100644 awx/lib/compat.py

diff --git a/awx/lib/__init__.py b/awx/lib/__init__.py
deleted file mode 100644
index e484e62be1..0000000000
--- a/awx/lib/__init__.py
+++ /dev/null
@@ -1,2 +0,0 @@
-# Copyright (c) 2015 Ansible, Inc.
-# All Rights Reserved.
diff --git a/awx/lib/compat.py b/awx/lib/compat.py
deleted file mode 100644
index fb686dd11c..0000000000
--- a/awx/lib/compat.py
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright (c) 2015 Ansible, Inc.
-# All Rights Reserved.
-
-'''
-Compability library for support of both Django 1.4.x and Django 1.5.x.
-'''
-
-try:
-    from django.utils.html import format_html
-except ImportError:
-    from django.utils.html import conditional_escape
-    from django.utils.safestring import mark_safe
-
-    def format_html(format_string, *args, **kwargs):
-        args_safe = map(conditional_escape, args)
-        kwargs_safe = dict([(k, conditional_escape(v)) for (k, v) in
-                            kwargs.items()])
-        return mark_safe(format_string.format(*args_safe, **kwargs_safe))
-
-try:
-    from django.utils.log import RequireDebugTrue
-except ImportError:
-    import logging
-    from django.conf import settings
-
-    class RequireDebugTrue(logging.Filter):
-        def filter(self, record):
-            return settings.DEBUG
-
-try:
-    from django.utils.text import slugify # noqa
-except ImportError:
-    from django.template.defaultfilters import slugify # noqa
diff --git a/awx/main/models/projects.py b/awx/main/models/projects.py
index 9888afaaa7..1c693a6398 100644
--- a/awx/main/models/projects.py
+++ b/awx/main/models/projects.py
@@ -15,12 +15,12 @@ from django.conf import settings
 from django.db import models
 from django.utils.translation import ugettext_lazy as _
 from django.utils.encoding import smart_str, smart_text
+from django.utils.text import slugify
 from django.core.exceptions import ValidationError
 from django.core.urlresolvers import reverse
 from django.utils.timezone import now, make_aware, get_default_timezone
 
 # AWX
-from awx.lib.compat import slugify
 from awx.main.models.base import * # noqa
 from awx.main.models.jobs import Job
 from awx.main.models.notifications import (
diff --git a/awx/settings/defaults.py b/awx/settings/defaults.py
index 928ac39afa..05a0fe3d1f 100644
--- a/awx/settings/defaults.py
+++ b/awx/settings/defaults.py
@@ -796,7 +796,7 @@ LOGGING = {
             '()': 'django.utils.log.RequireDebugFalse',
         },
         'require_debug_true': {
-            '()': 'awx.lib.compat.RequireDebugTrue',
+            '()': 'django.utils.log.RequireDebugTrue',
         },
         'require_debug_true_or_test': {
             '()': 'awx.main.utils.RequireDebugTrueOrTest',