From 1dd4aa3154bd00f2f853e1c7d0325be689d5bb83 Mon Sep 17 00:00:00 2001 From: Radomir Dopieralski Date: Tue, 2 Dec 2014 14:59:36 +0100 Subject: [PATCH] Fix pep8 warnings Change-Id: Icd648746ea0296bbb5f89042b1c0ae8b80d3a515 --- tuskar_boxes/overview/forms.py | 4 ++-- tuskar_boxes/overview/panel.py | 6 ++---- tuskar_boxes/overview/urls.py | 2 +- tuskar_boxes/overview/views.py | 8 ++++---- tuskar_sat_ui/nodes/panel.py | 5 ++--- tuskar_sat_ui/nodes/tabs.py | 17 +++++++++++------ tuskar_sat_ui/nodes/urls.py | 2 +- tuskar_sat_ui/nodes/views.py | 1 + 8 files changed, 24 insertions(+), 21 deletions(-) diff --git a/tuskar_boxes/overview/forms.py b/tuskar_boxes/overview/forms.py index 0d52997..7efbf1d 100644 --- a/tuskar_boxes/overview/forms.py +++ b/tuskar_boxes/overview/forms.py @@ -43,12 +43,12 @@ class EditPlan(forms.EditPlan): fields['%s-flavor' % role.id] = field return fields - def handle(self, request, data): result = super(EditPlan, self).handle(request, data) parameters = dict( (field.role.flavor_parameter_name, data[name]) - for (name, field) in self.fields.items() if name.endswith('-flavor') + for (name, field) in self.fields.items() + if name.endswith('-flavor') ) try: self.plan = self.plan.patch(request, self.plan.uuid, parameters) diff --git a/tuskar_boxes/overview/panel.py b/tuskar_boxes/overview/panel.py index 844f938..b46f7ab 100644 --- a/tuskar_boxes/overview/panel.py +++ b/tuskar_boxes/overview/panel.py @@ -13,11 +13,9 @@ # under the License. from django.utils.translation import ugettext_lazy as _ - import horizon - import tuskar_ui.infrastructure.dashboard as tuskar_dashboard -from tuskar_ui.infrastructure.overview.panel import Overview as TuskarOverview +from tuskar_ui.infrastructure.overview import panel class Overview(horizon.Panel): @@ -25,5 +23,5 @@ class Overview(horizon.Panel): slug = "overview" -tuskar_dashboard.Infrastructure.unregister(TuskarOverview) +tuskar_dashboard.Infrastructure.unregister(panel.Overview) tuskar_dashboard.Infrastructure.register(Overview) diff --git a/tuskar_boxes/overview/urls.py b/tuskar_boxes/overview/urls.py index cea9be2..9f395ac 100644 --- a/tuskar_boxes/overview/urls.py +++ b/tuskar_boxes/overview/urls.py @@ -13,8 +13,8 @@ # under the License. from django.conf import urls - from tuskar_ui.infrastructure.overview import urls as tuskar_urls + import tuskar_boxes.overview.views as views diff --git a/tuskar_boxes/overview/views.py b/tuskar_boxes/overview/views.py index ad194b6..0a70ff6 100644 --- a/tuskar_boxes/overview/views.py +++ b/tuskar_boxes/overview/views.py @@ -13,9 +13,9 @@ # under the License. import django.utils.text - from tuskar_ui import api from tuskar_ui.infrastructure.overview import views + from tuskar_boxes.overview import forms @@ -62,7 +62,7 @@ class IndexView(views.IndexView): flavors = api.flavor.Flavor.list(self.request) flavors.sort(key=lambda np: (np.vcpus, np.ram, np.disk)) for role in context['roles']: - flavor = role['role'].flavor(context['plan']) + flavor = role['role'].flavor(context['plan']) role['flavor_name'] = flavor.name if flavor else '' if not context['stack']: context['flavors'] = [] @@ -94,8 +94,8 @@ class IndexView(views.IndexView): nodes.append({ 'uuid': node.uuid, 'role_name': role.name if role else '', - 'role_slug': django.utils.text.slugify(role.name) - if role else '', + 'role_slug': ( + django.utils.text.slugify(role.name) if role else ''), 'state': node.state, 'state_slug': django.utils.text.slugify( unicode(node.state)), diff --git a/tuskar_sat_ui/nodes/panel.py b/tuskar_sat_ui/nodes/panel.py index 0a1c02e..2ad2278 100644 --- a/tuskar_sat_ui/nodes/panel.py +++ b/tuskar_sat_ui/nodes/panel.py @@ -14,9 +14,8 @@ from django.utils.translation import ugettext_lazy as _ import horizon - from tuskar_ui.infrastructure import dashboard -from tuskar_ui.infrastructure.nodes.panel import Nodes as TuskarNodes +from tuskar_ui.infrastructure.nodes import panel class Nodes(horizon.Panel): @@ -24,5 +23,5 @@ class Nodes(horizon.Panel): slug = "nodes" -dashboard.Infrastructure.unregister(TuskarNodes) +dashboard.Infrastructure.unregister(panel.Nodes) dashboard.Infrastructure.register(Nodes) diff --git a/tuskar_sat_ui/nodes/tabs.py b/tuskar_sat_ui/nodes/tabs.py index 81ef263..80be470 100644 --- a/tuskar_sat_ui/nodes/tabs.py +++ b/tuskar_sat_ui/nodes/tabs.py @@ -11,16 +11,21 @@ # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # License for the specific language governing permissions and limitations # under the License. -import requests -import urllib +import collections -from collections import namedtuple from horizon import tabs +import requests from tuskar_ui.infrastructure.nodes import tabs as nodes_tabs -from .tables import ErrataTable + +from tuskar_sat_ui.nodes import tables -ErrataItem = namedtuple('ErrataItem', ['title', 'type', 'id', 'issued']) +ErrataItem = collections.namedtuple('ErrataItem', [ + 'title', + 'type', + 'id', + 'issued', +]) class DetailOverviewTab(nodes_tabs.DetailOverviewTab): @@ -67,7 +72,7 @@ class DetailOverviewTab(nodes_tabs.DetailOverviewTab): else: data = [ErrataItem(x['title'], x['type'], x['id'], x['issued']) for x in errata] - result['errata'] = ErrataTable(request, data=data) + result['errata'] = tables.ErrataTable(request, data=data) return result diff --git a/tuskar_sat_ui/nodes/urls.py b/tuskar_sat_ui/nodes/urls.py index 81f9c25..1257ffe 100644 --- a/tuskar_sat_ui/nodes/urls.py +++ b/tuskar_sat_ui/nodes/urls.py @@ -13,8 +13,8 @@ # under the License. from django.conf import urls - from tuskar_ui.infrastructure.nodes import views + from tuskar_sat_ui.nodes import views as sat_views diff --git a/tuskar_sat_ui/nodes/views.py b/tuskar_sat_ui/nodes/views.py index df975a2..e89ea43 100644 --- a/tuskar_sat_ui/nodes/views.py +++ b/tuskar_sat_ui/nodes/views.py @@ -13,6 +13,7 @@ # under the License. from tuskar_ui.infrastructure.nodes import views + from tuskar_sat_ui.nodes import tabs