From 5c1d2a6f0bec54f8bf9ba79bfdbe910757f051e2 Mon Sep 17 00:00:00 2001
From: Wayne Witzel III <wayne@riotousliving.com>
Date: Mon, 8 Apr 2019 09:35:46 -0400
Subject: [PATCH] flake8 cleanup

---
 awx/api/views/metrics.py                      | 10 +---------
 awx/main/analytics/collectors.py              | 19 ++++++++++---------
 .../functional/analytics/test_metrics.py      | 17 +++++++++--------
 3 files changed, 20 insertions(+), 26 deletions(-)

diff --git a/awx/api/views/metrics.py b/awx/api/views/metrics.py
index 5646a16189..abc66d8e44 100644
--- a/awx/api/views/metrics.py
+++ b/awx/api/views/metrics.py
@@ -5,14 +5,11 @@
 import logging
 
 # Django
-from django.conf import settings
 from django.utils.translation import ugettext_lazy as _
-from django.utils.timezone import now
 
 # Django REST Framework
-from rest_framework.exceptions import PermissionDenied
 from rest_framework.response import Response
-from rest_framework.renderers import JSONRenderer, StaticHTMLRenderer
+from rest_framework.renderers import JSONRenderer
 
 # AWX
 # from awx.main.analytics import collectors
@@ -23,15 +20,10 @@ from awx.api.generics import (
     APIView,
 )
 
-from awx.api.serializers import (
-    InventorySerializer,
-    ActivityStreamSerializer,
-)
 
 logger = logging.getLogger('awx.main.analytics')
 
 
-
 class MetricsView(APIView):
 
     view_name = _('Metrics')
diff --git a/awx/main/analytics/collectors.py b/awx/main/analytics/collectors.py
index 4c9f1d9c83..9544c7359e 100644
--- a/awx/main/analytics/collectors.py
+++ b/awx/main/analytics/collectors.py
@@ -158,15 +158,16 @@ def instance_info(since):
     instances = models.Instance.objects.values_list('hostname').annotate().values(
         'uuid', 'version', 'capacity', 'cpu', 'memory', 'managed_by_policy', 'hostname', 'last_isolated_check', 'enabled')
     for instance in instances:
-        instance_info = {'uuid': instance['uuid'],
-                'version': instance['version'],
-                'capacity': instance['capacity'],
-                'cpu': instance['cpu'],
-                'memory': instance['memory'],
-                'managed_by_policy': instance['managed_by_policy'],
-                'last_isolated_check': instance['last_isolated_check'],
-                'enabled': instance['enabled']
-                }
+        instance_info = {
+            'uuid': instance['uuid'],
+            'version': instance['version'],
+            'capacity': instance['capacity'],
+            'cpu': instance['cpu'],
+            'memory': instance['memory'],
+            'managed_by_policy': instance['managed_by_policy'],
+            'last_isolated_check': instance['last_isolated_check'],
+            'enabled': instance['enabled']
+        }
         info[instance['uuid']] = instance_info
     return info
 
diff --git a/awx/main/tests/functional/analytics/test_metrics.py b/awx/main/tests/functional/analytics/test_metrics.py
index 314a300969..4cd0e0b24a 100644
--- a/awx/main/tests/functional/analytics/test_metrics.py
+++ b/awx/main/tests/functional/analytics/test_metrics.py
@@ -27,15 +27,16 @@ EXPECTED_VALUES = {
     'awx_instance_memory':0.0,
     'awx_instance_info':1.0,
 }
+
+
 @pytest.mark.django_db
-def test_metrics_counts(organization_factory, job_template_factory,
-                         workflow_job_template_factory):
-
-
+def test_metrics_counts(organization_factory, job_template_factory, workflow_job_template_factory):
     objs = organization_factory('org', superusers=['admin'])
-    jt = job_template_factory('test', organization=objs.organization,
-                              inventory='test_inv', project='test_project',
-                              credential='test_cred')
+    jt = job_template_factory(
+        'test', organization=objs.organization,
+        inventory='test_inv', project='test_project',
+        credential='test_cred'
+    )
     workflow_job_template_factory('test')
     models.Team(organization=objs.organization).save()
     models.Host(inventory=jt.inventory).save()
@@ -52,4 +53,4 @@ def test_metrics_counts(organization_factory, job_template_factory,
         for sample in gauge.samples:
             # name, label, value, timestamp, exemplar
             name, _, value, _, _ = sample
-            assert EXPECTED_VALUES[name] == value
\ No newline at end of file
+            assert EXPECTED_VALUES[name] == value