diff --git a/openstack_dashboard/dashboards/admin/info/tables.py b/openstack_dashboard/dashboards/admin/info/tables.py index 952da9967..b5de08ebc 100644 --- a/openstack_dashboard/dashboards/admin/info/tables.py +++ b/openstack_dashboard/dashboards/admin/info/tables.py @@ -1,7 +1,7 @@ import logging -from django.utils.translation import ugettext_lazy as _ from django import template +from django.utils.translation import ugettext_lazy as _ from horizon import tables diff --git a/openstack_dashboard/dashboards/admin/instances/urls.py b/openstack_dashboard/dashboards/admin/instances/urls.py index adbe4cd48..d31762688 100644 --- a/openstack_dashboard/dashboards/admin/instances/urls.py +++ b/openstack_dashboard/dashboards/admin/instances/urls.py @@ -21,10 +21,10 @@ from django.conf.urls.defaults import patterns from django.conf.urls.defaults import url -from openstack_dashboard.dashboards.project.instances.views import \ - DetailView from .views import AdminIndexView from .views import AdminUpdateView +from openstack_dashboard.dashboards.project.instances.views import \ + DetailView INSTANCES = r'^(?P[^/]+)/%s$' diff --git a/openstack_dashboard/dashboards/project/loadbalancers/urls.py b/openstack_dashboard/dashboards/project/loadbalancers/urls.py index d5661edfb..ab1cfba10 100644 --- a/openstack_dashboard/dashboards/project/loadbalancers/urls.py +++ b/openstack_dashboard/dashboards/project/loadbalancers/urls.py @@ -21,12 +21,12 @@ from openstack_dashboard.dashboards.project.loadbalancers.views import \ AddMemberView from openstack_dashboard.dashboards.project.loadbalancers.views import \ AddMonitorView +from openstack_dashboard.dashboards.project.loadbalancers.views import \ + AddPMAssociationView from openstack_dashboard.dashboards.project.loadbalancers.views import \ AddPoolView from openstack_dashboard.dashboards.project.loadbalancers.views import \ AddVipView -from openstack_dashboard.dashboards.project.loadbalancers.views import \ - AddPMAssociationView from openstack_dashboard.dashboards.project.loadbalancers.views import \ DeletePMAssociationView from openstack_dashboard.dashboards.project.loadbalancers.views import \ diff --git a/openstack_dashboard/dashboards/project/overview/views.py b/openstack_dashboard/dashboards/project/overview/views.py index ae16a3cef..1b427b3cf 100644 --- a/openstack_dashboard/dashboards/project/overview/views.py +++ b/openstack_dashboard/dashboards/project/overview/views.py @@ -18,8 +18,9 @@ # License for the specific language governing permissions and limitations # under the License. -from django.template.defaultfilters import floatformat + from django.template.defaultfilters import capfirst +from django.template.defaultfilters import floatformat from django.utils.translation import ugettext as _ from django.views.generic import TemplateView diff --git a/openstack_dashboard/usage/base.py b/openstack_dashboard/usage/base.py index 5acfd0252..002207a8d 100644 --- a/openstack_dashboard/usage/base.py +++ b/openstack_dashboard/usage/base.py @@ -7,11 +7,11 @@ import datetime import logging from StringIO import StringIO -from django import template as django_template -from django import VERSION from django.http import HttpResponse +from django import template as django_template from django.utils import timezone from django.utils.translation import ugettext_lazy as _ +from django import VERSION from horizon import exceptions from horizon import forms diff --git a/tox.ini b/tox.ini index 2d05e80de..341bf3e52 100644 --- a/tox.ini +++ b/tox.ini @@ -44,8 +44,7 @@ exclude = .venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,build,p # H302 import only modules.'from optparse import make_option' does not import a module # H303 No wildcard (*) import. # H304 No relative imports. 'from .views import IndexView' is a relative import -# H306 imports not in alphabetical order (horizon.loaders, horizon.conf) # H4xx docstrings # H701 empty localization string # H702 Formatting operation should be outside of localization method call -ignore = E121,E126,E127,E128,F403,F841,F999,H201,H302,H303,H304,H306,H4,H701,H702 +ignore = E121,E126,E127,E128,F403,F841,F999,H201,H302,H303,H304,H4,H701,H702