From 41d5393af03e29989897b82844ce20b5835b3c27 Mon Sep 17 00:00:00 2001 From: Matthew Jones Date: Tue, 23 Feb 2016 15:30:07 -0500 Subject: [PATCH] Clean up flake8 related issues --- awx/api/serializers.py | 2 +- awx/main/models/notifications.py | 2 +- awx/main/models/projects.py | 1 - awx/main/models/unified_jobs.py | 1 - awx/main/notifications/email_backend.py | 2 +- awx/main/notifications/irc_backend.py | 2 +- 6 files changed, 4 insertions(+), 6 deletions(-) diff --git a/awx/api/serializers.py b/awx/api/serializers.py index a680e5b00c..f42c20812c 100644 --- a/awx/api/serializers.py +++ b/awx/api/serializers.py @@ -2108,7 +2108,7 @@ class NotifierSerializer(BaseSerializer): if incorrect_type_fields: for type_field_error in incorrect_type_fields: error_list.append("Configuration field '{}' incorrect type, expected {}".format(type_field_error[0], - type_field_error[1])) + type_field_error[1])) if error_list: raise serializers.ValidationError(error_list) return attrs diff --git a/awx/main/models/notifications.py b/awx/main/models/notifications.py index 04bd5b0e53..29a51cf9ac 100644 --- a/awx/main/models/notifications.py +++ b/awx/main/models/notifications.py @@ -104,7 +104,7 @@ class Notifier(CommonModel): def send(self, subject, body): for field in filter(lambda x: self.notification_class.init_parameters[x]['type'] == "password", - self.notification_class.init_parameters): + self.notification_class.init_parameters): self.notification_configuration[field] = decrypt_field(self, 'notification_configuration', subfield=field) diff --git a/awx/main/models/projects.py b/awx/main/models/projects.py index 01e4220d6d..415c674bb1 100644 --- a/awx/main/models/projects.py +++ b/awx/main/models/projects.py @@ -10,7 +10,6 @@ import urlparse # Django from django.conf import settings from django.db import models -from django.db.models import Q from django.utils.translation import ugettext_lazy as _ from django.utils.encoding import smart_str, smart_text from django.core.exceptions import ValidationError diff --git a/awx/main/models/unified_jobs.py b/awx/main/models/unified_jobs.py index 9a324048c3..7bb4cdd798 100644 --- a/awx/main/models/unified_jobs.py +++ b/awx/main/models/unified_jobs.py @@ -30,7 +30,6 @@ from djcelery.models import TaskMeta # AWX from awx.main.models.base import * # noqa from awx.main.models.schedules import Schedule -from awx.main.models.notifications import Notification from awx.main.utils import decrypt_field, emit_websocket_notification, _inventory_updates from awx.main.redact import UriCleaner diff --git a/awx/main/notifications/email_backend.py b/awx/main/notifications/email_backend.py index 364e45fc28..9a9d0a9e2d 100644 --- a/awx/main/notifications/email_backend.py +++ b/awx/main/notifications/email_backend.py @@ -1,7 +1,7 @@ # Copyright (c) 2016 Ansible, Inc. # All Rights Reserved. -import logging +import pprint from django.utils.encoding import smart_text from django.core.mail.backends.smtp import EmailBackend diff --git a/awx/main/notifications/irc_backend.py b/awx/main/notifications/irc_backend.py index e01d390c09..61158bbe5d 100644 --- a/awx/main/notifications/irc_backend.py +++ b/awx/main/notifications/irc_backend.py @@ -88,7 +88,7 @@ class IrcBackend(TowerBaseEmailBackend): self.connection.add_global_handler("join", self.on_join) start_time = time.time() process_time = time.time() - while self.channels_sent < len(self.channels) and (process_time-start_time) < 60: + while self.channels_sent < len(self.channels) and (process_time - start_time) < 60: self.reactor.process_once(0.1) process_time = time.time() self.reactor.disconnect_all()