Small "H302 check" cleanup

This patch set removes some commented out stuff that has been unintentially left in "H302 check" patch set. It also replaces a couple more method imports with module imports. Fixes bug 1215892 Change-Id: I35fd880154a4ea6d6d8d3b3615103c271aa4a005
openstack · Aug 23, 2013 · b4fc9b4 · b4fc9b4
1 parent 71ddcb0
commit b4fc9b4
Show file tree

Hide file tree

Showing 25 changed files with 89 additions and 122 deletions.
diff --git a/openstack_dashboard/api/keystone.py b/openstack_dashboard/api/keystone.py
@@ -28,7 +28,7 @@
 
 from keystoneclient.exceptions import ClientException  # noqa
 
-from openstack_auth.backend import KEYSTONE_CLIENT_ATTR  # noqa
+from openstack_auth import backend
 
 from horizon import exceptions
 from horizon import messages
@@ -154,7 +154,8 @@ def keystoneclient(request, admin=False):
 
     # Take care of client connection caching/fetching a new client.
     # Admin vs. non-admin clients are cached separately for token matching.
-    cache_attr = "_keystoneclient_admin" if admin else KEYSTONE_CLIENT_ATTR
+    cache_attr = "_keystoneclient_admin" if admin \
+        else backend.KEYSTONE_CLIENT_ATTR
     if hasattr(request, cache_attr) and (not user.token.id
             or getattr(request, cache_attr).auth_token == user.token.id):
         LOG.debug("Using cached client for token: %s" % user.token.id)

diff --git a/openstack_dashboard/dashboards/admin/domains/panel.py b/openstack_dashboard/dashboards/admin/domains/panel.py
@@ -18,7 +18,7 @@
 
 import horizon
 
-from openstack_dashboard.api.keystone import VERSIONS as IDENTITY_VERSIONS  # noqa
+from openstack_dashboard.api import keystone
 from openstack_dashboard.dashboards.admin import dashboard
 
 
@@ -27,5 +27,5 @@ class Domains(horizon.Panel):
     slug = 'domains'
 
 
-if IDENTITY_VERSIONS.active >= 3:
+if keystone.VERSIONS.active >= 3:
     dashboard.Admin.register(Domains)
diff --git a/openstack_dashboard/dashboards/admin/domains/tables.py b/openstack_dashboard/dashboards/admin/domains/tables.py
@@ -19,7 +19,7 @@
 from django.conf import settings  # noqa
 from django.utils.translation import ugettext_lazy as _  # noqa
 
-from keystoneclient.exceptions import ClientException  # noqa
+from keystoneclient import exceptions
 
 from horizon import messages
 from horizon import tables
@@ -66,7 +66,7 @@ def delete(self, request, obj_id):
             msg = _('Domain "%s" must be disabled before it can be deleted.') \
                 % domain.name
             messages.error(request, msg)
-            raise ClientException(409, msg)
+            raise exceptions.ClientException(409, msg)
         else:
             LOG.info('Deleting domain "%s".' % obj_id)
             api.keystone.domain_delete(request, obj_id)

diff --git a/openstack_dashboard/dashboards/admin/groups/panel.py b/openstack_dashboard/dashboards/admin/groups/panel.py
@@ -18,7 +18,7 @@
 
 import horizon
 
-from openstack_dashboard.api.keystone import VERSIONS as IDENTITY_VERSIONS  # noqa
+from openstack_dashboard.api import keystone
 from openstack_dashboard.dashboards.admin import dashboard
 
 
@@ -27,5 +27,5 @@ class Groups(horizon.Panel):
     slug = 'groups'
 
 
-if IDENTITY_VERSIONS.active >= 3:
+if keystone.VERSIONS.active >= 3:
     dashboard.Admin.register(Groups)
diff --git a/openstack_dashboard/dashboards/admin/instances/tables.py b/openstack_dashboard/dashboards/admin/instances/tables.py
@@ -22,49 +22,12 @@
 from django.utils.translation import ugettext_lazy as _  # noqa
 
 from horizon import tables
-from horizon.utils.filters import parse_isotime  # noqa
-from horizon.utils.filters import replace_underscores  # noqa
+from horizon.utils import filters
 
 from openstack_dashboard import api
 from openstack_dashboard.dashboards.project.instances \
     import tables as project_tables
-#        ACTIVE_STATES
-#from openstack_dashboard.dashboards.project.instances.tables import \
-#        ConfirmResize
-#from openstack_dashboard.dashboards.project.instances.tables import \
-#        ConsoleLink
-#from openstack_dashboard.dashboards.project.instances.tables import \
-#        CreateSnapshot
-#from openstack_dashboard.dashboards.project.instances.tables import \
-#        EditInstance
-#from openstack_dashboard.dashboards.project.instances.tables import \
-#        get_ips
-#from openstack_dashboard.dashboards.project.instances.tables import \
-#        get_power_state
-#from openstack_dashboard.dashboards.project.instances.tables import \
-#        get_size
-#from openstack_dashboard.dashboards.project.instances.tables import \
-#        is_deleting
-#from openstack_dashboard.dashboards.project.instances.tables import \
-#        LogLink
-#from openstack_dashboard.dashboards.project.instances.tables import \
-#        RebootInstance
-#from openstack_dashboard.dashboards.project.instances.tables import \
-#        RevertResize
-#from openstack_dashboard.dashboards.project.instances.tables import \
-#        SoftRebootInstance
-#from openstack_dashboard.dashboards.project.instances.tables import \
-#        STATUS_DISPLAY_CHOICES
-#from openstack_dashboard.dashboards.project.instances.tables import \
-#        TASK_DISPLAY_CHOICES
-#from openstack_dashboard.dashboards.project.instances.tables import \
-#        TerminateInstance
-#from openstack_dashboard.dashboards.project.instances.tables import \
-#        TogglePause
-#from openstack_dashboard.dashboards.project.instances.tables import \
-#        ToggleSuspend
-#from openstack_dashboard.dashboards.project.instances.tables import \
-#        UpdateRow
+
 LOG = logging.getLogger(__name__)
 
 
@@ -141,24 +104,24 @@ class AdminInstancesTable(tables.DataTable):
                          classes=('nowrap-col',),
                          attrs={'data-type': 'size'})
     status = tables.Column("status",
-                           filters=(title, replace_underscores),
+                           filters=(title, filters.replace_underscores),
                            verbose_name=_("Status"),
                            status=True,
                            status_choices=STATUS_CHOICES,
                            display_choices=
                                project_tables.STATUS_DISPLAY_CHOICES)
     task = tables.Column("OS-EXT-STS:task_state",
                          verbose_name=_("Task"),
-                         filters=(title, replace_underscores),
+                         filters=(title, filters.replace_underscores),
                          status=True,
                          status_choices=TASK_STATUS_CHOICES,
                          display_choices=project_tables.TASK_DISPLAY_CHOICES)
     state = tables.Column(project_tables.get_power_state,
-                          filters=(title, replace_underscores),
+                          filters=(title, filters.replace_underscores),
                           verbose_name=_("Power State"))
     created = tables.Column("created",
                             verbose_name=_("Uptime"),
-                            filters=(parse_isotime, timesince))
+                            filters=(filters.parse_isotime, timesince))
 
     class Meta:
         name = "instances"

diff --git a/openstack_dashboard/dashboards/admin/overview/tests.py b/openstack_dashboard/dashboards/admin/overview/tests.py
@@ -26,7 +26,7 @@
 
 from mox import IsA  # noqa
 
-from horizon.templatetags.sizeformat import mbformat  # noqa
+from horizon.templatetags import sizeformat
 
 from openstack_dashboard import api
 from openstack_dashboard.test import helpers as test
@@ -69,7 +69,7 @@ def test_usage(self):
                             '<td class="sortable normal_column">%.2f</td>' %
                             (usage_obj.vcpus,
                              usage_obj.disk_gb_hours,
-                             mbformat(usage_obj.memory_mb),
+                             sizeformat.mbformat(usage_obj.memory_mb),
                              usage_obj.vcpu_hours,
                              usage_obj.total_local_gb_usage))
 

diff --git a/openstack_dashboard/dashboards/admin/roles/panel.py b/openstack_dashboard/dashboards/admin/roles/panel.py
@@ -18,13 +18,13 @@
 
 import horizon
 
-from openstack_dashboard.api.keystone import VERSIONS as IDENTITY_VERSIONS  # noqa
+from openstack_dashboard.api import keystone
 from openstack_dashboard.dashboards.admin import dashboard
 
 
 class Roles(horizon.Panel):
     name = _("Roles")
     slug = 'roles'
 
-if IDENTITY_VERSIONS.active >= 3:
+if keystone.VERSIONS.active >= 3:
     dashboard.Admin.register(Roles)
diff --git a/openstack_dashboard/dashboards/project/access_and_security/security_groups/forms.py b/openstack_dashboard/dashboards/project/access_and_security/security_groups/forms.py
@@ -32,8 +32,7 @@
 from horizon import forms
 from horizon import messages
 from horizon.utils import fields
-from horizon.utils.validators import validate_ip_protocol  # noqa
-from horizon.utils.validators import validate_port_range  # noqa
+from horizon.utils import validators as utils_validators
 
 from openstack_dashboard import api
 from openstack_dashboard.utils import filters
@@ -96,7 +95,7 @@ class AddRule(forms.SelfHandlingForm):
         label=_('IP Protocol'), required=False,
         help_text=_("Enter an integer value between 0 and 255 "
                     "(or -1 which means wildcard)."),
-        validators=[validate_ip_protocol],
+        validators=[utils_validators.validate_ip_protocol],
         widget=forms.TextInput(attrs={
             'class': 'switched',
             'data-switch-on': 'rule_menu',
@@ -121,7 +120,8 @@ class AddRule(forms.SelfHandlingForm):
                                    'class': 'switched',
                                    'data-switch-on': 'range',
                                    'data-range-port': _('Port')}),
-                              validators=[validate_port_range])
+                              validators=[
+                                  utils_validators.validate_port_range])
 
     from_port = forms.IntegerField(label=_("From Port"),
                                    required=False,
@@ -131,7 +131,8 @@ class AddRule(forms.SelfHandlingForm):
                                         'class': 'switched',
                                         'data-switch-on': 'range',
                                         'data-range-range': _('From Port')}),
-                                   validators=[validate_port_range])
+                                   validators=[
+                                       utils_validators.validate_port_range])
 
     to_port = forms.IntegerField(label=_("To Port"),
                                  required=False,
@@ -141,7 +142,8 @@ class AddRule(forms.SelfHandlingForm):
                                         'class': 'switched',
                                         'data-switch-on': 'range',
                                         'data-range-range': _('To Port')}),
-                                 validators=[validate_port_range])
+                                 validators=[
+                                     utils_validators.validate_port_range])
 
     icmp_type = forms.IntegerField(label=_("Type"),
                                    required=False,
@@ -151,7 +153,8 @@ class AddRule(forms.SelfHandlingForm):
                                         'class': 'switched',
                                         'data-switch-on': 'rule_menu',
                                         'data-rule_menu-icmp': _('Type')}),
-                                   validators=[validate_port_range])
+                                   validators=[
+                                       utils_validators.validate_port_range])
 
     icmp_code = forms.IntegerField(label=_("Code"),
                                    required=False,
@@ -161,7 +164,8 @@ class AddRule(forms.SelfHandlingForm):
                                           'class': 'switched',
                                           'data-switch-on': 'rule_menu',
                                           'data-rule_menu-icmp': _('Code')}),
-                                   validators=[validate_port_range])
+                                   validators=[
+                                       utils_validators.validate_port_range])
 
     remote = forms.ChoiceField(label=_('Remote'),
                                choices=[('cidr', _('CIDR')),

diff --git a/openstack_dashboard/dashboards/project/access_and_security/security_groups/tests.py b/openstack_dashboard/dashboards/project/access_and_security/security_groups/tests.py
@@ -31,9 +31,6 @@
 
 from openstack_dashboard.dashboards.project.access_and_security.\
     security_groups import tables
-#     import RulesTable
-#from openstack_dashboard.dashboards.project.access_and_security.\
-#    security_groups.tables import SecurityGroupsTable
 
 
 INDEX_URL = reverse('horizon:project:access_and_security:index')

diff --git a/openstack_dashboard/dashboards/project/instances/tables.py b/openstack_dashboard/dashboards/project/instances/tables.py
@@ -26,13 +26,12 @@
 from django.utils.translation import string_concat  # noqa
 from django.utils.translation import ugettext_lazy as _  # noqa
 
-from horizon.conf import HORIZON_CONFIG  # noqa
+from horizon import conf
 from horizon import exceptions
 from horizon import messages
 from horizon import tables
 from horizon.templatetags import sizeformat
-from horizon.utils.filters import parse_isotime  # noqa
-from horizon.utils.filters import replace_underscores  # noqa
+from horizon.utils import filters
 
 from openstack_dashboard import api
 from openstack_dashboard.dashboards.project.access_and_security.floating_ips \
@@ -403,7 +402,7 @@ class SimpleDisassociateIP(tables.Action):
     classes = ("btn-danger", "btn-disassociate",)
 
     def allowed(self, request, instance):
-        if not HORIZON_CONFIG["simple_ip_management"]:
+        if not conf.HORIZON_CONFIG["simple_ip_management"]:
             return False
         return not is_deleting(instance)
 
@@ -557,23 +556,23 @@ class InstancesTable(tables.DataTable):
                          attrs={'data-type': 'size'})
     keypair = tables.Column(get_keyname, verbose_name=_("Keypair"))
     status = tables.Column("status",
-                           filters=(title, replace_underscores),
+                           filters=(title, filters.replace_underscores),
                            verbose_name=_("Status"),
                            status=True,
                            status_choices=STATUS_CHOICES,
                            display_choices=STATUS_DISPLAY_CHOICES)
     task = tables.Column("OS-EXT-STS:task_state",
                          verbose_name=_("Task"),
-                         filters=(title, replace_underscores),
+                         filters=(title, filters.replace_underscores),
                          status=True,
                          status_choices=TASK_STATUS_CHOICES,
                          display_choices=TASK_DISPLAY_CHOICES)
     state = tables.Column(get_power_state,
-                          filters=(title, replace_underscores),
+                          filters=(title, filters.replace_underscores),
                           verbose_name=_("Power State"))
     created = tables.Column("created",
                             verbose_name=_("Uptime"),
-                            filters=(parse_isotime, timesince))
+                            filters=(filters.parse_isotime, timesince))
 
     class Meta:
         name = "instances"

diff --git a/openstack_dashboard/dashboards/project/loadbalancers/workflows.py b/openstack_dashboard/dashboards/project/loadbalancers/workflows.py
@@ -21,7 +21,7 @@
 from horizon import exceptions
 from horizon import forms
 from horizon.utils import fields
-from horizon.utils.validators import validate_port_range  # noqa
+from horizon.utils import validators
 from horizon import workflows
 
 from openstack_dashboard import api
@@ -129,7 +129,7 @@ class AddVipAction(workflows.Action):
     protocol_port = forms.IntegerField(label=_("Protocol Port"), min_value=1,
                               help_text=_("Enter an integer value "
                                           "between 1 and 65535."),
-                              validators=[validate_port_range])
+                              validators=[validators.validate_port_range])
     protocol = forms.ChoiceField(label=_("Protocol"))
     session_persistence = forms.ChoiceField(
         required=False, initial={}, label=_("Session Persistence"))
@@ -265,7 +265,7 @@ class AddMemberAction(workflows.Action):
     protocol_port = forms.IntegerField(label=_("Protocol Port"), min_value=1,
                               help_text=_("Enter an integer value "
                                           "between 1 and 65535."),
-                              validators=[validate_port_range])
+                              validators=[validators.validate_port_range])
     admin_state_up = forms.BooleanField(label=_("Admin State"),
                                         initial=True, required=False)
 

diff --git a/openstack_dashboard/dashboards/project/stacks/mappings.py b/openstack_dashboard/dashboards/project/stacks/mappings.py
@@ -20,7 +20,7 @@
 from django.core.urlresolvers import reverse  # noqa
 from django.template.defaultfilters import register  # noqa
 
-from openstack_dashboard.api.swift import FOLDER_DELIMITER  # noqa
+from openstack_dashboard.api import swift
 
 LOG = logging.getLogger(__name__)
 
@@ -50,7 +50,7 @@
         'link': 'horizon:project:networks:subnets:detail'},
     "OS::Swift::Container": {
         'link': 'horizon:project:containers:index',
-        'format_pattern': '%s' + FOLDER_DELIMITER},
+        'format_pattern': '%s' + swift.FOLDER_DELIMITER},
 }
 
 

diff --git a/openstack_dashboard/dashboards/project/stacks/sro.py b/openstack_dashboard/dashboards/project/stacks/sro.py
@@ -1,14 +1,15 @@
 from django.template.defaultfilters import title  # noqa
 from django.template.loader import render_to_string  # noqa
 
-from horizon.utils.filters import replace_underscores  # noqa
+from horizon.utils import filters
 
 
 def stack_info(stack, stack_image):
-    stack.stack_status_desc = title(replace_underscores(stack.stack_status))
+    stack.stack_status_desc = title(
+        filters.replace_underscores(stack.stack_status))
     if stack.stack_status_reason:
         stack.stack_status_reason = title(
-            replace_underscores(stack.stack_status_reason)
+            filters.replace_underscores(stack.stack_status_reason)
         )
     context = {}
     context['stack'] = stack
@@ -19,11 +20,11 @@ def stack_info(stack, stack_image):
 
 def resource_info(resource):
     resource.resource_status_desc = title(
-        replace_underscores(resource.resource_status)
+        filters.replace_underscores(resource.resource_status)
     )
     if resource.resource_status_reason:
         resource.resource_status_reason = title(
-            replace_underscores(resource.resource_status_reason)
+            filters.replace_underscores(resource.resource_status_reason)
         )
     context = {}
     context['resource'] = resource