fix flake8

awx/api/views/metrics.py

@@ -41,6 +41,7 @@ class MetricsView(APIView):
             return Response(metrics().decode('UTF-8'))
         raise PermissionDenied()
 
+
 class BroadcastWebsocketMetricsView(APIView):
     name = _('Broadcast Websockets')
     swagger_topic = 'Broadcast Websockets'

awx/main/analytics/broadcast_websocket.py

@@ -1,8 +1,6 @@
 import datetime
-import os
 import asyncio
 import logging
-import json
 import aioredis
 import redis
 
@@ -11,10 +9,7 @@ from prometheus_client import (
     Gauge,
     Counter,
     Enum,
-    Histogram,
-    Enum,
     CollectorRegistry,
-    parser,
 )
 
 from django.conf import settings
@@ -118,7 +113,7 @@ class BroadcastWebsocketStats():
                                                 'Number of messages received, to be forwarded, by the broadcast websocket system',
                                                 registry=self._registry)
         self._messages_received = Gauge(f'awx_{self.remote_name}_messages_received',
-                                        'Number of messages received, to be forwarded, by the broadcast websocket system, for the duration of the current connection',
+                                        'Number forwarded messages received by the broadcast websocket system, for the duration of the current connection',
                                         registry=self._registry)
         self._connection = Enum(f'awx_{self.remote_name}_connection',
                                 'Websocket broadcast connection',
@@ -160,6 +155,5 @@ class BroadcastWebsocketStats():
     def serialize(self):
         self.render()
 
-        data = {}
         registry_data = generate_latest(self._registry).decode('UTF-8')
         return registry_data

awx/main/consumers.py

@@ -1,15 +1,9 @@
-
-import os
 import json
 import logging
-import codecs
 import datetime
 import hmac
 import asyncio
 
-from django.utils.encoding import force_bytes
-from django.utils.encoding import smart_str
-from django.http.cookie import parse_cookie
 from django.core.serializers.json import DjangoJSONEncoder
 from django.conf import settings
 from django.utils.encoding import force_bytes
@@ -19,8 +13,6 @@ from channels.generic.websocket import AsyncJsonWebsocketConsumer
 from channels.layers import get_channel_layer
 from channels.db import database_sync_to_async
 
-from asgiref.sync import async_to_sync
-
 
 logger = logging.getLogger('awx.main.consumers')
 XRF_KEY = '_auth_user_xrf'
@@ -53,8 +45,6 @@ class WebsocketSecretAuthHelper:
 
     @classmethod
     def verify_secret(cls, s, nonce_tolerance=300):
-        hex_decoder = codecs.getdecoder("hex_codec")
-
         try:
             (prefix, payload) = s.split(' ')
             if prefix != 'HMAC-SHA256':
@@ -160,9 +150,7 @@ class EventConsumer(AsyncJsonWebsocketConsumer):
             XRF_KEY not in self.scope["session"] or
             xrftoken != self.scope["session"][XRF_KEY]
         ):
-            logger.error(
+            logger.error(f"access denied to channel, XRF mismatch for {user.username}")
-            "access denied to channel, XRF mismatch for {}".format(user.username)
-            )
             await self.send_json({"error": "access denied to channel"})
             return
 

awx/main/dispatch/control.py

@@ -1,5 +1,4 @@
 import logging
-import socket
 import string
 import random
 import json

awx/main/dispatch/publish.py

@@ -2,13 +2,11 @@ import inspect
 import logging
 import sys
 import json
-import re
 from uuid import uuid4
 
 from django.conf import settings
-from django.db import connection
 
-from . import pg_bus_conn, get_local_queuename
+from . import pg_bus_conn
 
 logger = logging.getLogger('awx.main.dispatch')
 

awx/main/dispatch/worker/base.py

@@ -7,7 +7,6 @@ import signal
 import sys
 import redis
 import json
-import re
 import psycopg2
 from uuid import UUID
 from queue import Empty as QueueEmpty

awx/main/management/commands/run_dispatcher.py

@@ -5,7 +5,7 @@ import logging
 from django.conf import settings
 from django.core.cache import cache as django_cache
 from django.core.management.base import BaseCommand
-from django.db import connection as django_connection, connections
+from django.db import connection as django_connection
 
 from awx.main.utils.handlers import AWXProxyHandler
 from awx.main.dispatch import get_local_queuename, reaper

awx/main/queue.py

@@ -4,7 +4,6 @@
 # Python
 import json
 import logging
-import os
 import redis
 
 # Django

awx/main/routing.py

@@ -1,4 +1,3 @@
-from django.urls import re_path
 from django.conf.urls import url
 from channels.auth import AuthMiddlewareStack
 from channels.routing import ProtocolTypeRouter, URLRouter

awx/main/wsbroadcast.py

@@ -1,18 +1,12 @@
-
-import os
 import json
 import logging
 import asyncio
-import datetime
-import sys
 
 import aiohttp
 from aiohttp import client_exceptions
 
-from channels_redis.core import RedisChannelLayer
 from channels.layers import get_channel_layer
 
-from django.utils.encoding import force_bytes
 from django.conf import settings
 from django.apps import apps
 from django.core.serializers.json import DjangoJSONEncoder

awxkit/awxkit/ws.py

@@ -1,10 +1,8 @@
-import time
 import threading
 import logging
 import atexit
 import json
 import ssl
-from datetime import datetime
 
 from six.moves.queue import Queue, Empty
 from six.moves.urllib.parse import urlparse
@@ -187,7 +185,6 @@ class WSClient(object):
         self._send(json.dumps(payload))
 
     def unsubscribe(self, wait=True, timeout=10):
-        time_start = datetime.now()
         if wait:
             # Other unnsubscribe events could have caused the edge to trigger.
             # This way the _next_ event will trigger our waiting.