diff --git a/glance/common/wsme_utils.py b/glance/common/wsme_utils.py index bcca895782..82f4cbd0cd 100644 --- a/glance/common/wsme_utils.py +++ b/glance/common/wsme_utils.py @@ -18,7 +18,7 @@ from oslo_utils import timeutils from wsme import types as wsme_types -class WSMEModelTransformer(): +class WSMEModelTransformer(object): def to_dict(self): # Return the wsme_attributes names:values as a dict diff --git a/glance/tests/functional/__init__.py b/glance/tests/functional/__init__.py index a02f0530fe..78b42b23ac 100644 --- a/glance/tests/functional/__init__.py +++ b/glance/tests/functional/__init__.py @@ -143,7 +143,8 @@ class Server(object): self.create_database() cmd = ("%(server_module)s --config-file %(conf_file_name)s" - % self.__dict__) + % {"server_module": self.server_module, + "conf_file_name": self.conf_file_name}) cmd = "%s -m %s" % (sys.executable, cmd) # close the sock and release the unused port closer to start time if self.exec_env: diff --git a/glance/tests/unit/common/test_utils.py b/glance/tests/unit/common/test_utils.py index 59b4da5720..e16ced904b 100644 --- a/glance/tests/unit/common/test_utils.py +++ b/glance/tests/unit/common/test_utils.py @@ -229,11 +229,11 @@ class TestUtils(test_utils.BaseTestCase): self.assertEqual("test", result) def test_mutating(self): - class FakeContext(): + class FakeContext(object): def __init__(self): self.read_only = False - class Fake(): + class Fake(object): def __init__(self): self.context = FakeContext() diff --git a/glance/tests/unit/common/test_wsgi.py b/glance/tests/unit/common/test_wsgi.py index f317471ce0..f548a9045b 100644 --- a/glance/tests/unit/common/test_wsgi.py +++ b/glance/tests/unit/common/test_wsgi.py @@ -500,7 +500,7 @@ class TestHelpers(test_utils.BaseTestCase): 'properties': {'distro': 'Ubuntu 10.04 LTS'}} headers = utils.image_meta_to_http_headers(fixture) - class FakeResponse(): + class FakeResponse(object): pass response = FakeResponse() diff --git a/glance/tests/unit/test_store_location.py b/glance/tests/unit/test_store_location.py index ae527ae55c..1d9dbdd7d0 100644 --- a/glance/tests/unit/test_store_location.py +++ b/glance/tests/unit/test_store_location.py @@ -32,7 +32,7 @@ CONF = {'default_store': 'file', class TestStoreLocation(base.StoreClearingUnitTest): - class FakeImageProxy(): + class FakeImageProxy(object): size = None context = None store_api = mock.Mock() diff --git a/glance/tests/unit/v1/test_registry_client.py b/glance/tests/unit/v1/test_registry_client.py index 3844bf4ca5..f824148979 100644 --- a/glance/tests/unit/v1/test_registry_client.py +++ b/glance/tests/unit/v1/test_registry_client.py @@ -910,7 +910,7 @@ class TestRegistryV1ClientApi(base.IsolatedUnitTest): self.assertEqual(expected, rapi._CLIENT_CREDS) -class FakeResponse(): +class FakeResponse(object): status = 202 def getheader(*args, **kwargs): diff --git a/test-requirements.txt b/test-requirements.txt index d7b063456b..62280c9614 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -3,7 +3,7 @@ # 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.0,<0.11 # For translations processing Babel>=1.3