From 39bf8d3f7b893e57bfc97ac31670d5872609eb13 Mon Sep 17 00:00:00 2001 From: Luong Anh Tuan Date: Fri, 30 Sep 2016 16:04:52 +0700 Subject: [PATCH] Fix Old style classes are deprecated and no longer available in Python 3 [H238] Old style classes are deprecated and no longer available in Python 3 (they are converted to new style classes). In order to avoid any unwanted side effects all classes should be declared using new style. See the new-style class documentation for reference on the differences. http://docs.openstack.org/developer/hacking/#python-3-x-compatibility Change-Id: I79e2f0d7d53d398fcf5ba18cefc8318ee6e07426 --- tox.ini | 2 +- trove/tests/api/backups.py | 2 +- trove/tests/api/instances.py | 2 +- trove/tests/fakes/taskmanager.py | 2 +- trove/tests/unittests/backup/test_backupagent.py | 2 +- trove/tests/unittests/cluster/test_cluster.py | 2 +- trove/tests/unittests/cluster/test_galera_cluster.py | 4 ++-- trove/tests/unittests/cluster/test_redis_cluster.py | 4 ++-- trove/tests/unittests/cluster/test_vertica_cluster.py | 4 ++-- trove/tests/unittests/common/test_template.py | 2 +- trove/tests/unittests/guestagent/test_dbaas.py | 4 ++-- trove/tests/unittests/taskmanager/test_models.py | 8 ++++---- 12 files changed, 19 insertions(+), 19 deletions(-) diff --git a/tox.ini b/tox.ini index 6472f2e40a..85d5f69f2c 100644 --- a/tox.ini +++ b/tox.ini @@ -71,7 +71,7 @@ commands = {posargs} show-source = True # H301 is ignored on purpose. # The rest of the ignores are TODOs. -ignore = F821,H237,H238,H301,H404,H405,H501 +ignore = F821,H237,H301,H404,H405,H501 builtins = _ exclude=.venv,.tox,.git,dist,doc,*egg,tools,etc,build,*.po,*.pot filename=*.py,trove-* diff --git a/trove/tests/api/backups.py b/trove/tests/api/backups.py index 61b88ad137..36897fce12 100644 --- a/trove/tests/api/backups.py +++ b/trove/tests/api/backups.py @@ -144,7 +144,7 @@ class AfterBackupCreation(object): assert_unprocessable(instance_info.dbaas.backups.delete, backup.id) -class BackupRestoreMixin(): +class BackupRestoreMixin(object): def verify_backup(self, backup_id): def result_is_active(): diff --git a/trove/tests/api/instances.py b/trove/tests/api/instances.py index d9afeecf2b..6cacbb911d 100644 --- a/trove/tests/api/instances.py +++ b/trove/tests/api/instances.py @@ -1610,7 +1610,7 @@ class CheckInstance(AttrCheck): @test(groups=[GROUP]) -class BadInstanceStatusBug(): +class BadInstanceStatusBug(object): @before_class() def setUp(self): diff --git a/trove/tests/fakes/taskmanager.py b/trove/tests/fakes/taskmanager.py index 8b8a1e94a4..132de2757b 100644 --- a/trove/tests/fakes/taskmanager.py +++ b/trove/tests/fakes/taskmanager.py @@ -54,7 +54,7 @@ class FakeRpcClient(object): return self -class FakeNotifier: +class FakeNotifier(object): def info(self, ctxt, event_type, payload): usage.notify(event_type, payload) diff --git a/trove/tests/unittests/backup/test_backupagent.py b/trove/tests/unittests/backup/test_backupagent.py index d08a61eb55..e0644653a2 100644 --- a/trove/tests/unittests/backup/test_backupagent.py +++ b/trove/tests/unittests/backup/test_backupagent.py @@ -159,7 +159,7 @@ class MockRestoreRunner(RestoreRunner): return False -class MockStats: +class MockStats(object): f_blocks = 1024 ** 2 f_bsize = 4096 f_bfree = 512 * 1024 diff --git a/trove/tests/unittests/cluster/test_cluster.py b/trove/tests/unittests/cluster/test_cluster.py index 67ab7ee4f0..74ad14d347 100644 --- a/trove/tests/unittests/cluster/test_cluster.py +++ b/trove/tests/unittests/cluster/test_cluster.py @@ -118,7 +118,7 @@ class ClusterTest(trove_testtools.TestCase): @patch.object(remote, 'create_nova_client') def test_create_storage_not_specified(self, mock_client): - class FakeFlavor: + class FakeFlavor(object): def __init__(self, flavor_id): self.flavor_id = flavor_id diff --git a/trove/tests/unittests/cluster/test_galera_cluster.py b/trove/tests/unittests/cluster/test_galera_cluster.py index c42111bdbe..b2f1cdde03 100644 --- a/trove/tests/unittests/cluster/test_galera_cluster.py +++ b/trove/tests/unittests/cluster/test_galera_cluster.py @@ -158,7 +158,7 @@ class ClusterTest(trove_testtools.TestCase): def test_create_storage_not_specified_and_no_ephemeral_flavor(self, mock_conf, mock_client): - class FakeFlavor: + class FakeFlavor(object): def __init__(self, flavor_id): self.flavor_id = flavor_id @@ -255,7 +255,7 @@ class ClusterTest(trove_testtools.TestCase): mock_task_api, mock_db_create, mock_ins_create, mock_conf, mock_find_all): - class FakeFlavor: + class FakeFlavor(object): def __init__(self, flavor_id): self.flavor_id = flavor_id diff --git a/trove/tests/unittests/cluster/test_redis_cluster.py b/trove/tests/unittests/cluster/test_redis_cluster.py index 2cdd863a32..134b450c37 100644 --- a/trove/tests/unittests/cluster/test_redis_cluster.py +++ b/trove/tests/unittests/cluster/test_redis_cluster.py @@ -129,7 +129,7 @@ class ClusterTest(trove_testtools.TestCase): def test_create_storage_not_specified_and_no_ephemeral_flavor(self, mock_conf, mock_client): - class FakeFlavor: + class FakeFlavor(object): def __init__(self, flavor_id): self.flavor_id = flavor_id @@ -180,7 +180,7 @@ class ClusterTest(trove_testtools.TestCase): def test_create_with_ephemeral_flavor(self, mock_client, mock_check_quotas, mock_task_api, mock_ins_create, mock_conf): - class FakeFlavor: + class FakeFlavor(object): def __init__(self, flavor_id): self.flavor_id = flavor_id diff --git a/trove/tests/unittests/cluster/test_vertica_cluster.py b/trove/tests/unittests/cluster/test_vertica_cluster.py index e89766fb9f..396bac93db 100644 --- a/trove/tests/unittests/cluster/test_vertica_cluster.py +++ b/trove/tests/unittests/cluster/test_vertica_cluster.py @@ -174,7 +174,7 @@ class ClusterTest(trove_testtools.TestCase): mock_client, m_find_all, mock_create): - class FakeFlavor: + class FakeFlavor(object): def __init__(self, flavor_id): self.flavor_id = flavor_id @@ -253,7 +253,7 @@ class ClusterTest(trove_testtools.TestCase): mock_task_api, mock_db_create, mock_ins_create, mock_conf, mock_find_all): - class FakeFlavor: + class FakeFlavor(object): def __init__(self, flavor_id): self.flavor_id = flavor_id diff --git a/trove/tests/unittests/common/test_template.py b/trove/tests/unittests/common/test_template.py index 3c904ead64..1ab46f2c2b 100644 --- a/trove/tests/unittests/common/test_template.py +++ b/trove/tests/unittests/common/test_template.py @@ -107,7 +107,7 @@ class TemplateTest(trove_testtools.TestCase): class HeatTemplateLoadTest(trove_testtools.TestCase): - class FakeTemplate(): + class FakeTemplate(object): def __init__(self): self.name = 'mysql/heat.template' diff --git a/trove/tests/unittests/guestagent/test_dbaas.py b/trove/tests/unittests/guestagent/test_dbaas.py index 455c5d876b..63f131545c 100644 --- a/trove/tests/unittests/guestagent/test_dbaas.py +++ b/trove/tests/unittests/guestagent/test_dbaas.py @@ -105,7 +105,7 @@ FAKE_USER = [{"_name": "random", "_password": "guesswhat", "_host": "%", "_databases": [FAKE_DB]}] -class FakeTime: +class FakeTime(object): COUNTER = 0 @classmethod @@ -1669,7 +1669,7 @@ class MySqlRootStatusTest(trove_testtools.TestCase): enable_root_mock.assert_called_once_with(root_password=None) -class MockStats: +class MockStats(object): f_blocks = 1024 ** 2 f_bsize = 4096 f_bfree = 512 * 1024 diff --git a/trove/tests/unittests/taskmanager/test_models.py b/trove/tests/unittests/taskmanager/test_models.py index 36315d3a77..4729719917 100644 --- a/trove/tests/unittests/taskmanager/test_models.py +++ b/trove/tests/unittests/taskmanager/test_models.py @@ -67,7 +67,7 @@ class FakeOptGroup(object): self.icmp = icmp -class fake_Server: +class fake_Server(object): def __init__(self): self.id = None self.name = None @@ -80,7 +80,7 @@ class fake_Server: self.status = 'ACTIVE' -class fake_ServerManager: +class fake_ServerManager(object): def create(self, name, image_id, flavor_id, files, userdata, security_groups, block_device_mapping, availability_zone=None, nics=None, config_drive=False, @@ -99,7 +99,7 @@ class fake_ServerManager: return server -class fake_nova_client: +class fake_nova_client(object): def __init__(self): self.servers = fake_ServerManager() @@ -510,7 +510,7 @@ class ResizeVolumeTest(trove_testtools.TestCase): self.old_vol_size, self.new_vol_size) - class FakeGroup(): + class FakeGroup(object): def __init__(self): self.mount_point = 'var/lib/mysql' self.device_path = '/dev/vdb'