diff --git a/awx/api/authentication.py b/awx/api/authentication.py index 85ad62963e..300c5cfc65 100644 --- a/awx/api/authentication.py +++ b/awx/api/authentication.py @@ -6,7 +6,6 @@ import urllib # Django from django.utils.timezone import now as tz_now -from django.conf import settings # Django REST Framework from rest_framework import authentication diff --git a/awx/main/access.py b/awx/main/access.py index a786920b24..ad5327a20b 100644 --- a/awx/main/access.py +++ b/awx/main/access.py @@ -7,7 +7,6 @@ import sys import logging # Django -from django.conf import settings from django.db.models import F, Q from django.contrib.auth.models import User diff --git a/awx/main/conf.py b/awx/main/conf.py index 915f361639..75be6280bd 100644 --- a/awx/main/conf.py +++ b/awx/main/conf.py @@ -1,7 +1,6 @@ # Copyright (c) 2015 Ansible, Inc.. # All Rights Reserved. -import json from django.conf import settings as django_settings from awx.main.models.configuration import TowerSettings diff --git a/awx/main/middleware.py b/awx/main/middleware.py index 4737ed74a8..49077efa6f 100644 --- a/awx/main/middleware.py +++ b/awx/main/middleware.py @@ -11,7 +11,6 @@ from django.db import IntegrityError from django.http import HttpResponseRedirect from django.template.response import TemplateResponse from django.utils.functional import curry -from django.conf import settings from awx import __version__ as version from awx.main.models import ActivityStream, Instance diff --git a/awx/main/models/configuration.py b/awx/main/models/configuration.py index c3591dd31c..6b35ea4d77 100644 --- a/awx/main/models/configuration.py +++ b/awx/main/models/configuration.py @@ -2,9 +2,9 @@ # All Rights Reserved. # Python +import json # Django -from django.conf import settings from django.db import models from django.utils.translation import ugettext_lazy as _ # Tower diff --git a/awx/main/models/projects.py b/awx/main/models/projects.py index 30c6c9d9d1..c266f33971 100644 --- a/awx/main/models/projects.py +++ b/awx/main/models/projects.py @@ -8,7 +8,6 @@ import re import urlparse # Django -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 diff --git a/awx/main/registrar.py b/awx/main/registrar.py index 20783745ad..c78bf22f7c 100644 --- a/awx/main/registrar.py +++ b/awx/main/registrar.py @@ -3,7 +3,6 @@ import logging -from django.conf import settings from django.db.models.signals import pre_save, post_save, post_delete, m2m_changed logger = logging.getLogger('awx.main.registrar') diff --git a/awx/main/signals.py b/awx/main/signals.py index 483626a7c7..aebf2ac7ee 100644 --- a/awx/main/signals.py +++ b/awx/main/signals.py @@ -8,7 +8,6 @@ import threading import json # Django -from django.conf import settings from django.db.models.signals import pre_save, post_save, pre_delete, post_delete, m2m_changed from django.dispatch import receiver diff --git a/awx/main/utils.py b/awx/main/utils.py index ef19e42d8c..de95460201 100644 --- a/awx/main/utils.py +++ b/awx/main/utils.py @@ -463,6 +463,7 @@ def wrap_args_with_proot(args, cwd, **kwargs): - /tmp (except for own tmp files) ''' from awx.main.conf import tower_settings + from django.conf import settings new_args = [getattr(settings, 'AWX_PROOT_CMD', 'proot'), '-v', str(getattr(settings, 'AWX_PROOT_VERBOSITY', '0')), '-r', '/'] hide_paths = ['/etc/tower', '/var/lib/awx', '/var/log',