From 8d89d68d5e45d6c3f42b645d4ba82fe9dee890e0 Mon Sep 17 00:00:00 2001
From: AlanCoding <arominge@redhat.com>
Date: Fri, 14 Oct 2016 08:54:37 -0400
Subject: [PATCH] flake8 fixes for Jenkins

---
 awx/asgi.py                                   |  4 +--
 .../management/commands/deprovision_node.py   |  2 +-
 .../management/commands/register_instance.py  |  2 +-
 .../tests/functional/api/test_settings.py     |  1 -
 awx/settings/defaults.py                      | 29 +++++++++----------
 5 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/awx/asgi.py b/awx/asgi.py
index 42d800d939..3190a7032c 100644
--- a/awx/asgi.py
+++ b/awx/asgi.py
@@ -6,9 +6,10 @@ from awx import __version__ as tower_version
 
 # Prepare the AWX environment.
 from awx import prepare_env, MODE
-prepare_env()
+prepare_env() # NOQA
 
 from django.core.wsgi import get_wsgi_application  # NOQA
+from channels.asgi import get_channel_layer
 
 """
 ASGI config for AWX project.
@@ -29,7 +30,6 @@ if MODE == 'production':
         logger.error("Missing or incorrect metadata for Tower version.  Ensure Tower was installed using the setup playbook.")
         raise Exception("Missing or incorrect metadata for Tower version.  Ensure Tower was installed using the setup playbook.")
 
-from channels.asgi import get_channel_layer
 
 os.environ.setdefault("DJANGO_SETTINGS_MODULE", "awx.settings")
 
diff --git a/awx/main/management/commands/deprovision_node.py b/awx/main/management/commands/deprovision_node.py
index ac27960daa..52b9e4f115 100644
--- a/awx/main/management/commands/deprovision_node.py
+++ b/awx/main/management/commands/deprovision_node.py
@@ -1,7 +1,7 @@
 # Copyright (c) 2016 Ansible, Inc.
 # All Rights Reserved
 
-from django.core.management.base import CommandError, BaseCommand
+from django.core.management.base import BaseCommand
 from optparse import make_option
 from awx.main.models import Instance
 
diff --git a/awx/main/management/commands/register_instance.py b/awx/main/management/commands/register_instance.py
index 04b2b08a8a..01e2011aa0 100644
--- a/awx/main/management/commands/register_instance.py
+++ b/awx/main/management/commands/register_instance.py
@@ -5,7 +5,7 @@ from awx.main.models import Instance
 from django.conf import settings
 
 from optparse import make_option
-from django.core.management.base import CommandError, BaseCommand
+from django.core.management.base import BaseCommand
 
 class Command(BaseCommand):
     """
diff --git a/awx/main/tests/functional/api/test_settings.py b/awx/main/tests/functional/api/test_settings.py
index 51314defb5..450fbd8dc9 100644
--- a/awx/main/tests/functional/api/test_settings.py
+++ b/awx/main/tests/functional/api/test_settings.py
@@ -3,7 +3,6 @@
 
 # Python
 import pytest
-import mock
 
 # Django
 from django.core.urlresolvers import reverse
diff --git a/awx/settings/defaults.py b/awx/settings/defaults.py
index c740bed39b..630b5ee6ee 100644
--- a/awx/settings/defaults.py
+++ b/awx/settings/defaults.py
@@ -361,21 +361,20 @@ CELERY_QUEUES = (
     Broadcast('projects'),
 )
 CELERY_ROUTES = {'awx.main.tasks.run_job': {'queue': 'jobs',
-                                             'routing_key': 'jobs'},
-                  'awx.main.tasks.run_project_update': {'queue': 'projects'},
-                  'awx.main.tasks.run_inventory_update': {'queue': 'jobs',
-                                                          'routing_key': 'jobs'},
-                  'awx.main.tasks.run_ad_hoc_command': {'queue': 'jobs',
-                                                        'routing_key': 'jobs'},
-                  'awx.main.tasks.run_system_job': {'queue': 'jobs',
-                                                    'routing_key': 'jobs'},
-                  'awx.main.scheduler.tasks.run_job_launch': {'queue': 'scheduler',
-                                                              'routing_key': 'scheduler.job.launch'},
-                  'awx.main.scheduler.tasks.run_job_complete': {'queue': 'scheduler',
-                                                                'routing_key': 'scheduler.job.complete'},
-                  'awx.main.tasks.cluster_node_heartbeat': {'queue': 'default',
-                                                            'routing_key': 'cluster.heartbeat'},
-}
+                                            'routing_key': 'jobs'},
+                 'awx.main.tasks.run_project_update': {'queue': 'projects'},
+                 'awx.main.tasks.run_inventory_update': {'queue': 'jobs',
+                                                         'routing_key': 'jobs'},
+                 'awx.main.tasks.run_ad_hoc_command': {'queue': 'jobs',
+                                                       'routing_key': 'jobs'},
+                 'awx.main.tasks.run_system_job': {'queue': 'jobs',
+                                                   'routing_key': 'jobs'},
+                 'awx.main.scheduler.tasks.run_job_launch': {'queue': 'scheduler',
+                                                             'routing_key': 'scheduler.job.launch'},
+                 'awx.main.scheduler.tasks.run_job_complete': {'queue': 'scheduler',
+                                                               'routing_key': 'scheduler.job.complete'},
+                 'awx.main.tasks.cluster_node_heartbeat': {'queue': 'default',
+                                                           'routing_key': 'cluster.heartbeat'},}
 
 CELERYBEAT_SCHEDULE = {
     'tower_scheduler': {