Use new style classes

Change a couple of old style classes into the newer styled ones.

Change-Id: Ide3bbcd2d24f949a2a550fcc2210617f34c8cd0b

diff --git a/heat/api/cfn/v1/waitcondition.py b/heat/api/cfn/v1/waitcondition.py
index 7780c631b43764e11c8e49e425efafb247453e0c..1be0d6c45a13cf321fcb87f8e117f24dc624e16d 100644 (file)
--- a/heat/api/cfn/v1/waitcondition.py
+++ b/heat/api/cfn/v1/waitcondition.py
@@ -20,7 +20,7 @@ from heat.api.aws import exception
 import heat.openstack.common.rpc.common as rpc_common
 
 
-class WaitConditionController:
+class WaitConditionController(object):
     def __init__(self, options):
         self.options = options
         self.engine = rpc_client.EngineClient()

diff --git a/heat/cloudinit/loguserdata.py b/heat/cloudinit/loguserdata.py
index 6676d240345975c223bea3d35d3bb8ea08a9289c..3a398d2b5dd3eff5cd3a593faaf4d694e4b6fd67 100755 (executable)
--- a/heat/cloudinit/loguserdata.py
+++ b/heat/cloudinit/loguserdata.py
@@ -42,7 +42,7 @@ def init_logging():
 
 def call(args):
 
-    class LogStream:
+    class LogStream(object):
 
         def write(self, data):
             LOG.info(data)

diff --git a/heat/tests/fakes.py b/heat/tests/fakes.py
index 0833f2fe060c58521269aaa8b0e95f8bfacd94e3..17c754a54b6d4fcf2b3440d9f4786d86682a56c0 100644 (file)
--- a/heat/tests/fakes.py
+++ b/heat/tests/fakes.py
@@ -97,7 +97,7 @@ class FakeClient(object):
         pass
 
 
-class FakeKeystoneClient():
+class FakeKeystoneClient(object):
     def __init__(self, username='test_user', user_id='1234', access='4567',
                  secret='8901'):
         self.username = username
@@ -116,7 +116,7 @@ class FakeKeystoneClient():
     def get_ec2_keypair(self, user_id):
         if user_id == self.user_id:
             if not self.creds:
-                class FakeCred:
+                class FakeCred(object):
                     access = self.access
                     secret = self.secret
                 self.creds = FakeCred()

diff --git a/heat/tests/test_api_ec2token.py b/heat/tests/test_api_ec2token.py
index 96e9308ed6d4477acf989a719c70f90c8829ba11..373b18f3dbe5deffe185662673430b4d7a2042a5 100644 (file)
--- a/heat/tests/test_api_ec2token.py
+++ b/heat/tests/test_api_ec2token.py
@@ -174,7 +174,7 @@ class Ec2TokenTest(HeatTestCase):
 
     def _stub_http_connection(self, headers={}, params={}, response=None):
 
-        class DummyHTTPResponse:
+        class DummyHTTPResponse(object):
             resp = response
 
             def read(self):

diff --git a/heat/tests/test_dbinstance.py b/heat/tests/test_dbinstance.py
index 1a8eaeb74ec785ec7e217c5c1ee742ed5aa42137..d75621c7a200292743910f7875bfc71945fbe836 100644 (file)
--- a/heat/tests/test_dbinstance.py
+++ b/heat/tests/test_dbinstance.py
@@ -72,11 +72,11 @@ class DBInstanceTest(HeatTestCase):
 
     def test_dbinstance(self):
 
-        class FakeDatabaseInstance:
+        class FakeDatabaseInstance(object):
             def _ipaddress(self):
                 return '10.0.0.1'
 
-        class FakeNested:
+        class FakeNested(object):
             resources = {'DatabaseInstance': FakeDatabaseInstance()}
 
         params = {'DBSecurityGroups': '',

diff --git a/heat/tests/test_engine_service.py b/heat/tests/test_engine_service.py
index 182bf1e3579feda9bba770437846626c2e23d8c4..0ef899815d8ef0c8deeedd4e8bdf0d7185099f60 100644 (file)
--- a/heat/tests/test_engine_service.py
+++ b/heat/tests/test_engine_service.py
@@ -1262,7 +1262,7 @@ class StackServiceTest(HeatTestCase):
                                       state='NORMAL')
         self.wr.store()
 
-        class DummyAction:
+        class DummyAction(object):
             alarm = "dummyfoo"
 
         dummy_action = DummyAction()

diff --git a/heat/tests/test_loguserdata.py b/heat/tests/test_loguserdata.py
index 299863085480f241cb7e2ec6e0c1001750a69b5e..1bbbb6a001d38d71ab39a03fae257a8ee5884ab0 100644 (file)
--- a/heat/tests/test_loguserdata.py
+++ b/heat/tests/test_loguserdata.py
@@ -22,12 +22,12 @@ from heat.cloudinit import loguserdata
 from heat.tests.common import HeatTestCase
 
 
-class FakeCiVersion():
+class FakeCiVersion(object):
     def __init__(self, version=None):
         self.version = version
 
 
-class FakePOpen():
+class FakePOpen(object):
     def __init__(self, returncode=0):
         self.returncode = returncode
 

diff --git a/heat/tests/test_parser.py b/heat/tests/test_parser.py
index 5316be8dc1b1f4a80c22b4f4719e3f268a73c329..b4306bbc328b7d264fcab0c3b06f30d42b030329 100644 (file)
--- a/heat/tests/test_parser.py
+++ b/heat/tests/test_parser.py
@@ -467,7 +467,7 @@ Mappings:
         deletion_policy_snippet = {'Fn::ResourceFacade': 'DeletionPolicy'}
         update_policy_snippet = {'Fn::ResourceFacade': 'UpdatePolicy'}
 
-        class DummyClass:
+        class DummyClass(object):
             pass
         parent_resource = DummyClass()
         parent_resource.metadata = '{"foo": "bar"}'
@@ -497,7 +497,7 @@ Mappings:
     def test_resource_facade_missing_key(self):
         snippet = {'Fn::ResourceFacade': 'DeletionPolicy'}
 
-        class DummyClass:
+        class DummyClass(object):
             pass
         parent_resource = DummyClass()
         parent_resource.metadata = '{"foo": "bar"}'

diff --git a/heat/tests/test_volume.py b/heat/tests/test_volume.py
index c289b69fd9a970bebba9160f2e555acdcd3f5c43..4ee12265d8c5afc67c68c045d623a72ce9cb6ea6 100644 (file)
--- a/heat/tests/test_volume.py
+++ b/heat/tests/test_volume.py
@@ -676,7 +676,7 @@ class VolumeTest(HeatTestCase):
         self.m.VerifyAll()
 
 
-class FakeVolume:
+class FakeVolume(object):
     status = 'attaching'
     id = 'vol-123'
 

diff --git a/heat/tests/test_watch.py b/heat/tests/test_watch.py
index 4ba6e44f6c0c5dc22949a64b84c644c79dd3e0c7..e0732cab4d44b07ee62caeb0eacbdff0b9997d99 100644 (file)
--- a/heat/tests/test_watch.py
+++ b/heat/tests/test_watch.py
@@ -26,14 +26,14 @@ from heat.tests import utils
 from heat.tests.utils import dummy_context
 
 
-class WatchData:
+class WatchData(object):
     def __init__(self, data, created_at):
         self.created_at = created_at
         self.data = {'test_metric': {'Value': data,
                                      'Unit': 'Count'}}
 
 
-class DummyAction:
+class DummyAction(object):
     alarm = "DummyAction"