Merge pull request #5713 from wenottingham/devel

Fix some lint

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul

awx/main/dispatch/worker/callback.py

@@ -4,7 +4,6 @@ import traceback
 from queue import Empty as QueueEmpty
 
 from django.utils.timezone import now as tz_now
-from django.conf import settings
 from django.db import DatabaseError, OperationalError, connection as django_connection
 from django.db.utils import InterfaceError, InternalError, IntegrityError
 

awx/main/models/unified_jobs.py

@@ -842,7 +842,7 @@ class UnifiedJob(PolymorphicModel, PasswordFieldsModel, CommonModelNameNotUnique
                 update_fields.append('unified_job_template')
         
         if self.cancel_flag and not self.canceled_on:
-        # Record the 'canceled' time. 
+            # Record the 'canceled' time.
             self.canceled_on = now()
             if 'canceled_on' not in update_fields:
                 update_fields.append('canceled_on')