Fixing up HA induced flake8 issues

awx/main/management/commands/_base_instance.py

@@ -7,8 +7,6 @@ from optparse import make_option
 from django.core.management.base import BaseCommand, CommandError
 from django.conf import settings
 
-from awx.main.models import Project
-
 
 class OptionEnforceError(Exception):
     def __init__(self, value):

awx/main/management/commands/register_instance.py

@@ -1,8 +1,6 @@
 # Copyright (c) 2015 Ansible, Inc.
 # All Rights Reserved
 
-from django.core.management.base import CommandError
-
 from awx.main.management.commands._base_instance import BaseCommandInstance
 from awx.main.models import Instance
 

awx/main/management/commands/run_callback_receiver.py

@@ -2,31 +2,22 @@
 # All Rights Reserved.
 
 # Python
-import os
-import sys
 import datetime
 import logging
-import signal
-import time
 
 from kombu import Connection, Exchange, Queue
 from kombu.mixins import ConsumerMixin
-from kombu.log import get_logger
-from kombu.utils import kwdict, reprcall
-from kombu.utils.debug import setup_logging
 
 # Django
 from django.conf import settings
 from django.core.management.base import NoArgsCommand
 from django.core.cache import cache
-from django.db import transaction, DatabaseError
+from django.db import DatabaseError
 from django.utils.dateparse import parse_datetime
 from django.utils.timezone import FixedOffset
-from django.db import connection
 
 # AWX
 from awx.main.models import * # noqa
-from awx.main.socket_queue import Socket
 
 logger = logging.getLogger('awx.main.commands.run_callback_receiver')
 
@@ -106,7 +97,7 @@ class CallbackBrokerWorker(ConsumerMixin):
                     i['module_args'] = ''
 
             if 'ad_hoc_command_id' in payload:
-                ad_hoc_command_event = AdHocCommandEvent.objects.create(**data)
+                AdHocCommandEvent.objects.create(**data)
                 return
             
             j = JobEvent(**payload)
@@ -119,7 +110,7 @@ class CallbackBrokerWorker(ConsumerMixin):
                     parent_id = cache.get("{}_{}".format(payload['job_id'], parent_event_uuid), None)
                     if parent_id is None:
                         parent_id_obj = JobEvent.objects.filter(uuid=parent_event_uuid, job_id=payload['job_id'])
-                        if parent_id_obj.exists():  #Problematic if not there, means the parent hasn't been written yet... TODO
+                        if parent_id_obj.exists():  # Problematic if not there, means the parent hasn't been written yet... TODO
                             j.parent_id = parent_id_obj[0].id
                             print("Settings cache: {}_{} with value {}".format(payload['job_id'], parent_event_uuid, j.parent_id))
                             cache.set("{}_{}".format(payload['job_id'], parent_event_uuid), j.parent_id, 300)

awx/main/managers.py

@@ -4,7 +4,6 @@
 import sys
 import socket
 
-from django.conf import settings
 from django.db import models
 
 

awx/main/middleware.py

@@ -8,12 +8,9 @@ import uuid
 from django.contrib.auth.models import User
 from django.db.models.signals import post_save
 from django.db import IntegrityError
-from django.http import HttpResponseRedirect
-from django.template.response import TemplateResponse
 from django.utils.functional import curry
 
-from awx import __version__ as version
+from awx.main.models import ActivityStream
-from awx.main.models import ActivityStream, Instance
 from awx.main.conf import tower_settings
 from awx.api.authentication import TokenAuthentication
 

awx/main/models/ha.py

@@ -1,8 +1,6 @@
 # Copyright (c) 2015 Ansible, Inc.
 # All Rights Reserved.
 
-import functools
-
 from django.db import models
 from django.db.models.signals import post_save
 from django.dispatch import receiver
@@ -11,7 +9,7 @@ from awx.main.managers import InstanceManager
 from awx.main.models.inventory import InventoryUpdate
 from awx.main.models.jobs import Job
 from awx.main.models.projects import ProjectUpdate
-from awx.main.models.unified_jobs import UnifiedJob, CAN_CANCEL
+from awx.main.models.unified_jobs import UnifiedJob
 
 __all__ = ('Instance', 'JobOrigin')
 

awx/plugins/callback/job_event_callback.py

@@ -161,13 +161,13 @@ class BaseCallbackModule(object):
                      'playbook_on_vars_prompt'):
             msg['parent_uuid'] = str(self.active_playbook)
         elif event in ('playbook_on_notify',
-                     'playbook_on_setup',
+                       'playbook_on_setup',
-                     'playbook_on_task_start',
+                       'playbook_on_task_start',
-                     'playbook_on_no_hosts_matched',
+                       'playbook_on_no_hosts_matched',
-                     'playbook_on_no_hosts_remaining',
+                       'playbook_on_no_hosts_remaining',
-                     'playbook_on_include',
+                       'playbook_on_include',
-                     'playbook_on_import_for_host',
+                       'playbook_on_import_for_host',
-                     'playbook_on_not_import_for_host'):
+                       'playbook_on_not_import_for_host'):
             msg['parent_uuid'] = str(self.active_play)
         elif event.startswith('runner_on_') or event.startswith('runner_item_on_'):
             msg['parent_uuid'] = str(self.active_task)

awx/settings/defaults.py

@@ -346,15 +346,14 @@ CELERY_QUEUES = (
     Broadcast('projects'),
 )
 CELERY_ROUTES = ({'awx.main.tasks.run_job': {'queue': 'jobs',
-                                            'routing_key': 'jobs'},
+                                             'routing_key': 'jobs'},
                   'awx.main.tasks.run_project_update': {'queue': 'projects'},
                   'awx.main.tasks.run_inventory_update': {'queue': 'jobs',
-                                                        'routing_key': 'jobs'},
+                                                          'routing_key': 'jobs'},
                   'awx.main.tasks.run_ad_hoc_command': {'queue': 'jobs',
-                                                     'routing_key': 'jobs'},
+                                                        'routing_key': 'jobs'},
                   'awx.main.tasks.run_system_job': {'queue': 'jobs',
-                                                  'routing_key': 'jobs'}
+                                                    'routing_key': 'jobs'}})
-})
 
 CELERYBEAT_SCHEDULE = {
     'tower_scheduler': {