From e594296c9b174583266618a0ed2a23660a152ae0 Mon Sep 17 00:00:00 2001 From: Chris Church Date: Tue, 20 Aug 2013 16:46:14 -0400 Subject: [PATCH] Fix to maintain Django 1.4 compatibility. --- awx/main/compat.py | 5 +++++ awx/main/models/__init__.py | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/awx/main/compat.py b/awx/main/compat.py index dae7e85e25..42ce2f7962 100644 --- a/awx/main/compat.py +++ b/awx/main/compat.py @@ -24,3 +24,8 @@ except ImportError: class RequireDebugTrue(logging.Filter): def filter(self, record): return settings.DEBUG + +try: + from django.utils.text import slugify +except ImportError: + from django.template.defaultfilters import slugify diff --git a/awx/main/models/__init__.py b/awx/main/models/__init__.py index e4036edd58..cf827dad04 100644 --- a/awx/main/models/__init__.py +++ b/awx/main/models/__init__.py @@ -19,7 +19,6 @@ from django.utils.translation import ugettext_lazy as _ from django.core.urlresolvers import reverse from django.contrib.auth.models import User from django.utils.timezone import now -from django.utils.text import slugify # Django-JSONField from jsonfield import JSONField @@ -30,6 +29,9 @@ from taggit.managers import TaggableManager # Django-Celery from djcelery.models import TaskMeta +# AWX +from awx.main.compat import slugify + __all__ = ['PrimordialModel', 'Organization', 'Team', 'Project', 'ProjectUpdate', 'Credential', 'Inventory', 'Host', 'Group', 'Permission', 'JobTemplate', 'Job', 'JobHostSummary', 'JobEvent',