From bb3732b2c1f8aab604e39993f36adde5794585ba Mon Sep 17 00:00:00 2001
From: Matthew Jones <mat@matburt.net>
Date: Tue, 10 Feb 2015 17:00:09 -0500
Subject: [PATCH] Cleaning up some flake8 errors, pyflakes in this case

---
 awx/api/permissions.py     |  6 +++---
 awx/api/renderers.py       |  8 --------
 awx/api/tests/__init__.py  |  4 ++--
 awx/api/tests/job_tasks.py | 10 ----------
 awx/lib/compat.py          |  6 ++++--
 awx/main/access.py         | 19 ++-----------------
 awx/main/fields.py         |  2 --
 awx/main/managers.py       |  1 -
 awx/main/middleware.py     | 11 ++++-------
 awx/main/queue.py          |  1 -
 awx/main/signals.py        | 12 ++----------
 awx/main/storage.py        |  2 --
 awx/main/tasks.py          |  7 +++----
 awx/main/urls.py           |  3 +--
 awx/main/utils.py          | 11 +----------
 awx/main/views.py          |  2 --
 16 files changed, 22 insertions(+), 83 deletions(-)

diff --git a/awx/api/permissions.py b/awx/api/permissions.py
index 91b18f8f81..a1b06b4b0b 100644
--- a/awx/api/permissions.py
+++ b/awx/api/permissions.py
@@ -12,8 +12,8 @@ from rest_framework.exceptions import PermissionDenied
 from rest_framework import permissions
 
 # AWX
-from awx.main.access import *
-from awx.main.models import *
+from awx.main.access import * # noqa
+from awx.main.models import * # noqa
 from awx.main.utils import get_object_or_400
 
 logger = logging.getLogger('awx.api.permissions')
@@ -45,7 +45,7 @@ class ModelAccessPermission(permissions.BasePermission):
 
     def check_post_permissions(self, request, view, obj=None):
         if hasattr(view, 'parent_model'):
-            parent_obj = get_object_or_400(view.parent_model, pk=view.kwargs['pk'])
+            get_object_or_400(view.parent_model, pk=view.kwargs['pk'])
             return True
         elif getattr(view, 'is_job_start', False):
             if not obj:
diff --git a/awx/api/renderers.py b/awx/api/renderers.py
index c38b02941a..b314d5900c 100644
--- a/awx/api/renderers.py
+++ b/awx/api/renderers.py
@@ -1,9 +1,6 @@
 # Copyright (c) 2014 AnsibleWorks, Inc.
 # All Rights Reserved.
 
-# Django
-from django.utils.datastructures import SortedDict
-
 # Django REST Framework
 from rest_framework import renderers
 
@@ -36,11 +33,6 @@ class BrowsableAPIRenderer(renderers.BrowsableAPIRenderer):
 
     def get_context(self, data, accepted_media_type, renderer_context):
         context = super(BrowsableAPIRenderer, self).get_context(data, accepted_media_type, renderer_context)
-        # FIXME: Sort headers / preserve sorting?
-        #response_headers = SortedDict(context['response'].items())
-        #if 'Content-Type' in context['response_headers']:
-        #    response_headers['Content-Type'] = context['response_headers']['Content-Type']
-        #context['response_headers'] = response_headers
         return context
 
 class PlainTextRenderer(renderers.BaseRenderer):
diff --git a/awx/api/tests/__init__.py b/awx/api/tests/__init__.py
index 79e94eb8b3..42be9b7339 100644
--- a/awx/api/tests/__init__.py
+++ b/awx/api/tests/__init__.py
@@ -3,5 +3,5 @@
 
 from __future__ import absolute_import
 
-from .decorator_paginated import *
-from .job_tasks import *
+from .decorator_paginated import PaginatedDecoratorTests # noqa
+from .job_tasks import JobTasksTests # noqa
diff --git a/awx/api/tests/job_tasks.py b/awx/api/tests/job_tasks.py
index f43edc4cce..b76122f422 100644
--- a/awx/api/tests/job_tasks.py
+++ b/awx/api/tests/job_tasks.py
@@ -1,20 +1,10 @@
 # Copyright (c) 2014 Ansible, Inc.
 # All Rights Reserved.
 
-from datetime import datetime
-
 from django.conf import settings
-from django.contrib.auth.models import User
-from django.core.urlresolvers import reverse
 from django.test import LiveServerTestCase
 from django.test.utils import override_settings
 
-from rest_framework.test import APIClient
-
-import mock
-
-from awx.api.views import JobJobTasksList
-from awx.main.models import Job, JobTemplate, JobEvent
 from awx.main.tests.jobs import BaseJobTestMixin
 
 
diff --git a/awx/lib/compat.py b/awx/lib/compat.py
index e6adccd50c..e7df635237 100644
--- a/awx/lib/compat.py
+++ b/awx/lib/compat.py
@@ -10,6 +10,7 @@ try:
 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
@@ -21,11 +22,12 @@ try:
 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
+    from django.utils.text import slugify # noqa
 except ImportError:
-    from django.template.defaultfilters import slugify
+    from django.template.defaultfilters import slugify # noqa
diff --git a/awx/main/access.py b/awx/main/access.py
index e9981c7e74..2ee2f836d3 100644
--- a/awx/main/access.py
+++ b/awx/main/access.py
@@ -14,8 +14,8 @@ from django.contrib.auth.models import User
 from rest_framework.exceptions import ParseError, PermissionDenied
 
 # AWX
-from awx.main.utils import *
-from awx.main.models import *
+from awx.main.utils import * # noqa
+from awx.main.models import * # noqa
 from awx.main.task_engine import TaskSerializer
 
 __all__ = ['get_user_queryset', 'check_user_access']
@@ -672,7 +672,6 @@ class ProjectAccess(BaseAccess):
                        Q(organizations__admins__in=[self.user], organizations__active=True) |
                        Q(organizations__users__in=[self.user], organizations__active=True) |
                        Q(teams__in=team_ids))
-        allowed = [PERM_INVENTORY_DEPLOY, PERM_INVENTORY_CHECK]
         allowed_deploy = [PERM_JOBTEMPLATE_CREATE, PERM_INVENTORY_DEPLOY]
         allowed_check = [PERM_JOBTEMPLATE_CREATE, PERM_INVENTORY_DEPLOY, PERM_INVENTORY_CHECK]
 
@@ -854,7 +853,6 @@ class JobTemplateAccess(BaseAccess):
         org_admin_qs = base_qs.filter(
             project__organizations__admins__in=[self.user]
         )
-        allowed = [PERM_INVENTORY_CHECK, PERM_INVENTORY_DEPLOY]
         allowed_deploy = [PERM_JOBTEMPLATE_CREATE, PERM_INVENTORY_DEPLOY]
         allowed_check = [PERM_JOBTEMPLATE_CREATE, PERM_INVENTORY_DEPLOY, PERM_INVENTORY_CHECK]
 
@@ -1052,21 +1050,8 @@ class JobAccess(BaseAccess):
         org_admin_qs = base_qs.filter(
             project__organizations__admins__in=[self.user]
         )
-        allowed = [PERM_INVENTORY_CHECK, PERM_INVENTORY_DEPLOY]
-
         allowed_deploy = [PERM_JOBTEMPLATE_CREATE, PERM_INVENTORY_DEPLOY]
         allowed_check = [PERM_JOBTEMPLATE_CREATE, PERM_INVENTORY_DEPLOY, PERM_INVENTORY_CHECK]
-
-        # perm_qs = base_qs.filter(
-        #     Q(inventory__permissions__user=self.user) | Q(inventory__permissions__team__users__in=[self.user]),
-        #     Q(project__permissions__user=self.user) | Q(project__permissions__team__users__in=[self.user]),
-        #     inventory__permissions__permission_type__in=allowed,
-        #     project__permissions__permission_type__in=allowed,
-        #     inventory__permissions__active=True,
-        #     project__permissions__active=True,
-        #     inventory__permissions__pk=F('project__permissions__pk'),
-        # )
-
         team_ids = set(Team.objects.filter(users__in=[self.user]).values_list('id', flat=True))
 
         deploy_permissions_ids = set(Permission.objects.filter(
diff --git a/awx/main/fields.py b/awx/main/fields.py
index d8295503eb..683d89ee72 100644
--- a/awx/main/fields.py
+++ b/awx/main/fields.py
@@ -4,8 +4,6 @@
 # Django
 from django.db import models
 from django.db.models.fields.related import SingleRelatedObjectDescriptor
-from django.utils.translation import ugettext_lazy as _
-
 
 # South
 from south.modelsinspector import add_introspection_rules
diff --git a/awx/main/managers.py b/awx/main/managers.py
index 9ba978dc84..442792258e 100644
--- a/awx/main/managers.py
+++ b/awx/main/managers.py
@@ -5,7 +5,6 @@ import sys
 
 from django.conf import settings
 from django.db import models
-from django.utils.functional import cached_property
 
 
 class HostManager(models.Manager):
diff --git a/awx/main/middleware.py b/awx/main/middleware.py
index a4b72bf91f..a2f1298fa3 100644
--- a/awx/main/middleware.py
+++ b/awx/main/middleware.py
@@ -1,22 +1,19 @@
 # Copyright (c) 2014 Ansible, Inc.
 # All Rights Reserved.
 
-import json
 import logging
 import threading
 import uuid
-import urllib2
 
-from django.conf import settings
-from django.contrib.auth.models import User, AnonymousUser
-from django.db.models.signals import pre_save, post_save
+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, AuthToken, Instance
+from awx.main.models import ActivityStream, Instance
 
 
 logger = logging.getLogger('awx.main.middleware')
@@ -50,7 +47,7 @@ class ActivityStreamMiddleware(threading.local):
                 instance.actor = drf_user
                 try:
                     instance.save(update_fields=['actor'])
-                except IntegrityError, e:
+                except IntegrityError:
                     logger.debug("Integrity Error saving Activity Stream instance for id : " + str(instance.id))
             # else:
             #     obj1_type_actual = instance.object1_type.split(".")[-1]
diff --git a/awx/main/queue.py b/awx/main/queue.py
index 54102b6c2f..4eef121494 100644
--- a/awx/main/queue.py
+++ b/awx/main/queue.py
@@ -2,7 +2,6 @@
 # All Rights Reserved.
 
 import json
-import time
 
 from redis import StrictRedis
 
diff --git a/awx/main/signals.py b/awx/main/signals.py
index 73b65c1f15..556ed8bf57 100644
--- a/awx/main/signals.py
+++ b/awx/main/signals.py
@@ -17,8 +17,8 @@ from crum import get_current_request
 from crum.signals import current_user_getter
 
 # AWX
-from awx.main.models import *
-from awx.api.serializers import *
+from awx.main.models import * # noqa
+from awx.api.serializers import * # noqa
 from awx.main.utils import model_instance_diff, model_to_dict, camelcase_to_underscore, emit_websocket_notification
 from awx.main.utils import ignore_inventory_computed_fields, ignore_inventory_group_removal, _inventory_updates
 from awx.main.tasks import update_inventory_computed_fields
@@ -35,14 +35,6 @@ def emit_job_event_detail(sender, **kwargs):
     instance = kwargs['instance']
     created = kwargs['created']
     if created:
-        if instance.host is not None:
-            host_id = instance.host.id
-        else:
-            host_id = None
-        if instance.parent is not None:
-            parent_id = instance.parent.id
-        else:
-            parent_id = None
         event_serialized = JobEventSerializer(instance).data
         event_serialized['id'] = instance.id
         event_serialized["created"] = event_serialized["created"].isoformat()
diff --git a/awx/main/storage.py b/awx/main/storage.py
index 9c96be641f..1093f7b951 100644
--- a/awx/main/storage.py
+++ b/awx/main/storage.py
@@ -2,12 +2,10 @@
 # All Rights Reserved.
 
 import base64
-import os
 from cStringIO import StringIO
 
 from django.core import files
 from django.core.files.storage import Storage
-from django.core.urlresolvers import reverse
 
 
 class DatabaseStorage(Storage):
diff --git a/awx/main/tasks.py b/awx/main/tasks.py
index 82d9ed77c1..dde73b2159 100644
--- a/awx/main/tasks.py
+++ b/awx/main/tasks.py
@@ -14,7 +14,6 @@ import pipes
 import re
 import shutil
 import stat
-import subprocess
 import tempfile
 import time
 import traceback
@@ -28,7 +27,6 @@ import pexpect
 
 # Celery
 from celery import Task, task
-from djcelery.models import PeriodicTask
 
 # Django
 from django.conf import settings
@@ -38,7 +36,7 @@ from django.utils.timezone import now
 
 # AWX
 from awx.main.constants import CLOUD_PROVIDERS
-from awx.main.models import *
+from awx.main.models import * # noqa
 from awx.main.queue import FifoQueue
 from awx.main.utils import (get_ansible_version, decrypt_field, update_scm_url,
                             ignore_inventory_computed_fields, emit_websocket_notification,
@@ -71,7 +69,8 @@ def tower_periodic_scheduler(self):
         try:
             last_run = dateutil.parser.parse(fd.read())
             return last_run
-        except Exception, e:
+        except Exception:
+            #TODO: LOG
             return None
 
     def write_last_run(last_run):
diff --git a/awx/main/urls.py b/awx/main/urls.py
index dced12ddb8..6ea095c1e6 100644
--- a/awx/main/urls.py
+++ b/awx/main/urls.py
@@ -1,7 +1,6 @@
 # Copyright (c) 2014 AnsibleWorks, Inc.
 # All Rights Reserved.
 
-from django.conf import settings
-from django.conf.urls import *
+from django.conf.urls import patterns
 
 urlpatterns = patterns()
diff --git a/awx/main/utils.py b/awx/main/utils.py
index 07aa16213d..7fc42acad5 100644
--- a/awx/main/utils.py
+++ b/awx/main/utils.py
@@ -276,15 +276,6 @@ def model_instance_diff(old, new, serializer_mapping=None):
 
     diff = {}
 
-    if old is not None and new is not None:
-        fields = set(old._meta.fields + new._meta.fields)
-    elif old is not None:
-        fields = set(old._meta.fields)
-    elif new is not None:
-        fields = set(new._meta.fields)
-    else:
-        fields = set()
-
     if serializer_mapping is not None and new.__class__ in serializer_mapping:
         serializer_actual = serializer_mapping[new.__class__]()
         allowed_fields = [x for x in serializer_actual.fields if not serializer_actual.fields[x].read_only] + ['id']
@@ -421,7 +412,7 @@ def check_proot_installed():
     try:
         proc = subprocess.Popen(cmd, stdout=subprocess.PIPE,
                                 stderr=subprocess.PIPE)
-        result = proc.communicate()
+        proc.communicate()
         return bool(proc.returncode == 0)
     except (OSError, ValueError):
         return False
diff --git a/awx/main/views.py b/awx/main/views.py
index 10299dc2ed..e402347746 100644
--- a/awx/main/views.py
+++ b/awx/main/views.py
@@ -2,9 +2,7 @@
 # All Rights Reserved.
 
 # Django
-from django.conf import settings
 from django.shortcuts import render
-from django.template import RequestContext
 from django.utils.safestring import mark_safe
 
 def handle_error(request, status=404, **kwargs):