From ecaa2dc3ff91924ebdccc228a36af73f517c2b44 Mon Sep 17 00:00:00 2001 From: Radomir Dopieralski Date: Fri, 13 Feb 2015 13:48:13 +0100 Subject: [PATCH] Use the newest and greatest Hacking Change-Id: If4de550fc0a914340e3854bc4b6dccbceb7757d5 --- test-requirements.txt | 2 +- tuskar_ui/infrastructure/flavors/tables.py | 6 +++--- tuskar_ui/infrastructure/flavors/workflows.py | 2 +- tuskar_ui/infrastructure/history/tables.py | 2 +- tuskar_ui/infrastructure/images/tables.py | 2 +- tuskar_ui/infrastructure/nodes/tables.py | 10 +++++----- tuskar_ui/infrastructure/roles/tables.py | 4 ++-- tuskar_ui/infrastructure/roles/workflows.py | 2 +- tuskar_ui/test/formset_table_tests.py | 2 +- 9 files changed, 16 insertions(+), 16 deletions(-) diff --git a/test-requirements.txt b/test-requirements.txt index ba30ff061..0aa4eac7f 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -2,7 +2,7 @@ # of appearance. Changing the order has an impact on the overall integration # process, which may cause wedges in the gate later. # Hacking already pins down pep8, pyflakes and flake8 -hacking>=0.9.2,<0.10 +hacking==0.10.1 # Testing Requirements http://tarballs.openstack.org/horizon/horizon-master.tar.gz#egg=horizon http://tarballs.openstack.org/python-tuskarclient/python-tuskarclient-master.tar.gz#egg=python-tuskarclient diff --git a/tuskar_ui/infrastructure/flavors/tables.py b/tuskar_ui/infrastructure/flavors/tables.py index c730812e6..76a3face8 100644 --- a/tuskar_ui/infrastructure/flavors/tables.py +++ b/tuskar_ui/infrastructure/flavors/tables.py @@ -94,7 +94,7 @@ class FlavorsTable(horizon.tables.DataTable): verbose_name=_('Disk'), attrs={'data-type': 'size'}) - class Meta: + class Meta(object): name = "flavors" verbose_name = _("Available") table_actions = ( @@ -126,7 +126,7 @@ class FlavorRolesTable(horizon.tables.DataTable): ) super(FlavorRolesTable, self).__init__(request, *args, **kwargs) - class Meta: + class Meta(object): name = "flavor_roles" verbose_name = _("Overcloud Roles") table_actions = () @@ -146,7 +146,7 @@ class FlavorSuggestionsTable(horizon.tables.DataTable): verbose_name=_('Disk'), attrs={'data-type': 'size'}) - class Meta: + class Meta(object): name = "suggested_flavors" verbose_name = _("Suggested") row_actions = ( diff --git a/tuskar_ui/infrastructure/flavors/workflows.py b/tuskar_ui/infrastructure/flavors/workflows.py index 3440198c9..bfdacbb0b 100644 --- a/tuskar_ui/infrastructure/flavors/workflows.py +++ b/tuskar_ui/infrastructure/flavors/workflows.py @@ -66,7 +66,7 @@ class CreateFlavorAction(flavor_workflows.CreateFlavorInfoAction): # No idea why Horizon exposes this database detail del self.fields['flavor_id'] - class Meta: + class Meta(object): name = _("Flavor") help_text = _("Flavors define the sizes for RAM, disk, number of " "cores, and other resources. Flavors should be " diff --git a/tuskar_ui/infrastructure/history/tables.py b/tuskar_ui/infrastructure/history/tables.py index d009b97a9..4e0b789e1 100644 --- a/tuskar_ui/infrastructure/history/tables.py +++ b/tuskar_ui/infrastructure/history/tables.py @@ -28,7 +28,7 @@ class HistoryTable(tables.DataTable): resource_status_reason = tables.Column('resource_status_reason', verbose_name=_("Reason")) - class Meta: + class Meta(object): name = "log" verbose_name = _("Deployment Log") multi_select = False diff --git a/tuskar_ui/infrastructure/images/tables.py b/tuskar_ui/infrastructure/images/tables.py index 6cba74086..e6cb439f0 100644 --- a/tuskar_ui/infrastructure/images/tables.py +++ b/tuskar_ui/infrastructure/images/tables.py @@ -61,7 +61,7 @@ class ImagesTable(tables.DataTable): image.role.name if image.role else '-', verbose_name=_("Deployment Role")) - class Meta: + class Meta(object): name = "images" row_class = UpdateRow verbose_name = _("Provisioning Images") diff --git a/tuskar_ui/infrastructure/nodes/tables.py b/tuskar_ui/infrastructure/nodes/tables.py index 196c5ab7f..1a4022563 100644 --- a/tuskar_ui/infrastructure/nodes/tables.py +++ b/tuskar_ui/infrastructure/nodes/tables.py @@ -173,7 +173,7 @@ class BaseNodesTable(tables.DataTable): state = tables.Column(get_state_string, verbose_name=_("Status")) - class Meta: + class Meta(object): name = "nodes_table" verbose_name = _("Nodes") table_actions = (NodeFilterAction, SetPowerStateOn, SetPowerStateOff, @@ -190,7 +190,7 @@ class BaseNodesTable(tables.DataTable): class AllNodesTable(BaseNodesTable): - class Meta: + class Meta(object): name = "all_nodes_table" verbose_name = _("All") hidden_title = False @@ -204,7 +204,7 @@ class AllNodesTable(BaseNodesTable): class ProvisionedNodesTable(BaseNodesTable): - class Meta: + class Meta(object): name = "provisioned_nodes_table" verbose_name = _("Provisioned") hidden_title = False @@ -216,7 +216,7 @@ class ProvisionedNodesTable(BaseNodesTable): class FreeNodesTable(BaseNodesTable): - class Meta: + class Meta(object): name = "free_nodes_table" verbose_name = _("Free") hidden_title = False @@ -229,7 +229,7 @@ class FreeNodesTable(BaseNodesTable): class MaintenanceNodesTable(BaseNodesTable): - class Meta: + class Meta(object): name = "maintenance_nodes_table" verbose_name = _("Maintenance") hidden_title = False diff --git a/tuskar_ui/infrastructure/roles/tables.py b/tuskar_ui/infrastructure/roles/tables.py index b7c10c6bd..8da446ca4 100644 --- a/tuskar_ui/infrastructure/roles/tables.py +++ b/tuskar_ui/infrastructure/roles/tables.py @@ -47,7 +47,7 @@ class RolesTable(tables.DataTable): def get_object_id(self, datum): return datum.uuid - class Meta: + class Meta(object): name = "roles" verbose_name = _("Deployment Roles") table_actions = () @@ -57,7 +57,7 @@ class RolesTable(tables.DataTable): class NodeTable(nodes_tables.ProvisionedNodesTable): - class Meta: + class Meta(object): name = "nodetable" verbose_name = _("Nodes") hidden_title = False diff --git a/tuskar_ui/infrastructure/roles/workflows.py b/tuskar_ui/infrastructure/roles/workflows.py index 45067dd4c..e925448e9 100644 --- a/tuskar_ui/infrastructure/roles/workflows.py +++ b/tuskar_ui/infrastructure/roles/workflows.py @@ -45,7 +45,7 @@ class UpdateRoleInfoAction(workflows.Action): label=_("Image"), ) - class Meta: + class Meta(object): name = _("Role Information") help_text = _("helptext here") slug = 'update_role_info' diff --git a/tuskar_ui/test/formset_table_tests.py b/tuskar_ui/test/formset_table_tests.py index 6e9ea103b..d50eb6af1 100644 --- a/tuskar_ui/test/formset_table_tests.py +++ b/tuskar_ui/test/formset_table_tests.py @@ -44,7 +44,7 @@ class FormsetTableTests(test.TestCase): name = tables.Column('name') value = tables.Column('value') - class Meta: + class Meta(object): name = 'table' table = Table(self.request)