External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-17 14:27:42 -02:30
Code Issues Packages Projects Releases Wiki Activity

Clean up flake8 related issues

Browse Source
This commit is contained in:
Matthew Jones
2016-02-23 15:30:07 -05:00
parent 4b1493f456
commit 41d5393af0
6 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
awx/api/serializers.py
View File

@@ -2108,7 +2108,7 @@ class NotifierSerializer(BaseSerializer):
if incorrect_type_fields: if incorrect_type_fields:
for type_field_error in incorrect_type_fields: for type_field_error in incorrect_type_fields:
error_list.append("Configuration field '{}' incorrect type, expected {}".format(type_field_error[0], error_list.append("Configuration field '{}' incorrect type, expected {}".format(type_field_error[0],
type_field_error[1])) type_field_error[1]))
if error_list: if error_list:
raise serializers.ValidationError(error_list) raise serializers.ValidationError(error_list)
return attrs return attrs

2
awx/main/models/notifications.py
View File

@@ -104,7 +104,7 @@ class Notifier(CommonModel):
def send(self, subject, body): def send(self, subject, body):
for field in filter(lambda x: self.notification_class.init_parameters[x]['type'] == "password", 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, self.notification_configuration[field] = decrypt_field(self,
'notification_configuration', 'notification_configuration',
subfield=field) subfield=field)

1
awx/main/models/projects.py
View File

@@ -10,7 +10,6 @@ import urlparse
# Django # Django
from django.conf import settings from django.conf import settings
from django.db import models from django.db import models
from django.db.models import Q
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
from django.utils.encoding import smart_str, smart_text from django.utils.encoding import smart_str, smart_text
from django.core.exceptions import ValidationError from django.core.exceptions import ValidationError

1
awx/main/models/unified_jobs.py
View File

@@ -30,7 +30,6 @@ from djcelery.models import TaskMeta
# AWX # AWX
from awx.main.models.base import * # noqa from awx.main.models.base import * # noqa
from awx.main.models.schedules import Schedule 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.utils import decrypt_field, emit_websocket_notification, _inventory_updates
from awx.main.redact import UriCleaner from awx.main.redact import UriCleaner

2
awx/main/notifications/email_backend.py
View File

@@ -1,7 +1,7 @@
# Copyright (c) 2016 Ansible, Inc. # Copyright (c) 2016 Ansible, Inc.
# All Rights Reserved. # All Rights Reserved.
import logging import pprint
from django.utils.encoding import smart_text from django.utils.encoding import smart_text
from django.core.mail.backends.smtp import EmailBackend from django.core.mail.backends.smtp import EmailBackend

2
awx/main/notifications/irc_backend.py
View File

@@ -88,7 +88,7 @@ class IrcBackend(TowerBaseEmailBackend):
self.connection.add_global_handler("join", self.on_join) self.connection.add_global_handler("join", self.on_join)
start_time = time.time() start_time = time.time()
process_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) self.reactor.process_once(0.1)
process_time = time.time() process_time = time.time()
self.reactor.disconnect_all() self.reactor.disconnect_all()