Merge pull request #3789 from AlanCoding/rm_compat

Delete awx.lib

awx/lib/__init__.py

@@ -1,2 +0,0 @@
-# Copyright (c) 2015 Ansible, Inc.
-# All Rights Reserved.

awx/lib/compat.py

@@ -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

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 (

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',