Newest pylint supports 'disable=', not 'disable-msg='

3 files changed, 14 insertions, 14 deletions

diff --git a/bin/nova-rsapi b/bin/nova-rsapi
index e2722422e..9ad6f9e94 100755
--- a/bin/nova-rsapi
+++ b/bin/nova-rsapi
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# pylint: disable-msg=C0103
+# pylint: disable=C0103
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2010 United States Government as represented by the
diff --git a/nova/test.py b/nova/test.py
index c392c8a84..a75e0de1a 100644
--- a/nova/test.py
+++ b/nova/test.py
@@ -53,7 +53,7 @@ def skip_if_fake(func):
 
 class TrialTestCase(unittest.TestCase):
     """Test case base class for all unit tests"""
-    def setUp(self): # pylint: disable-msg=C0103
+    def setUp(self): # pylint: disable=C0103
         """Run before each test method to initialize test environment"""
         super(TrialTestCase, self).setUp()
 
@@ -63,7 +63,7 @@ class TrialTestCase(unittest.TestCase):
         self.stubs = stubout.StubOutForTesting()
         self.flag_overrides = {}
 
-    def tearDown(self): # pylint: disable-msg=C0103
+    def tearDown(self): # pylint: disable=C0103
         """Runs after each test method to finalize/tear down test environment"""
         super(TrialTestCase, self).tearDown()
         self.reset_flags()
@@ -94,7 +94,7 @@ class TrialTestCase(unittest.TestCase):
 class BaseTestCase(TrialTestCase):
     # TODO(jaypipes): Can this be moved into the TrialTestCase class?
     """Base test case class for all unit tests."""
-    def setUp(self): # pylint: disable-msg=C0103
+    def setUp(self): # pylint: disable=C0103
         """Run before each test method to initialize test environment"""
         super(BaseTestCase, self).setUp()
         # TODO(termie): we could possibly keep a more global registry of
@@ -106,7 +106,7 @@ class BaseTestCase(TrialTestCase):
         self._done_waiting = False
         self._timed_out = False
 
-    def tearDown(self):# pylint: disable-msg=C0103
+    def tearDown(self):# pylint: disable=C0103
         """Runs after each test method to finalize/tear down test environment"""
         super(BaseTestCase, self).tearDown()
         for x in self.injected:
@@ -137,7 +137,7 @@ class BaseTestCase(TrialTestCase):
         if self._waiting:
             try:
                 self.ioloop.remove_timeout(self._waiting)
-            except Exception: # pylint: disable-msg=W0703
+            except Exception: # pylint: disable=W0703
                 # TODO(jaypipes): This produces a pylint warning.  Should
                 # we really be catching Exception and then passing here?
                 pass
diff --git a/nova/tests/objectstore_unittest.py b/nova/tests/objectstore_unittest.py
index dece4b5d5..5b956fccf 100644
--- a/nova/tests/objectstore_unittest.py
+++ b/nova/tests/objectstore_unittest.py
@@ -56,7 +56,7 @@ os.makedirs(os.path.join(OSS_TEMPDIR, 'buckets'))
 class ObjectStoreTestCase(test.BaseTestCase):
     """Test objectstore API directly."""
 
-    def setUp(self): # pylint: disable-msg=C0103
+    def setUp(self): # pylint: disable=C0103
         """Setup users and projects."""
         super(ObjectStoreTestCase, self).setUp()
         self.flags(buckets_path=os.path.join(OSS_TEMPDIR, 'buckets'),
@@ -78,7 +78,7 @@ class ObjectStoreTestCase(test.BaseTestCase):
 
         self.context = Context()
 
-    def tearDown(self): # pylint: disable-msg=C0103
+    def tearDown(self): # pylint: disable=C0103
         """Tear down users and projects."""
         self.auth_manager.delete_project('proj1')
         self.auth_manager.delete_project('proj2')
@@ -168,7 +168,7 @@ class ObjectStoreTestCase(test.BaseTestCase):
 class TestHTTPChannel(http.HTTPChannel):
     """Dummy site required for twisted.web"""
 
-    def checkPersistence(self, _, __): # pylint: disable-msg=C0103
+    def checkPersistence(self, _, __): # pylint: disable=C0103
         """Otherwise we end up with an unclean reactor."""
         return False
 
@@ -181,7 +181,7 @@ class TestSite(server.Site):
 class S3APITestCase(test.TrialTestCase):
     """Test objectstore through S3 API."""
 
-    def setUp(self): # pylint: disable-msg=C0103
+    def setUp(self): # pylint: disable=C0103
         """Setup users, projects, and start a test server."""
         super(S3APITestCase, self).setUp()
 
@@ -198,7 +198,7 @@ class S3APITestCase(test.TrialTestCase):
 
         root = S3()
         self.site = TestSite(root)
-        # pylint: disable-msg=E1101
+        # pylint: disable=E1101
         self.listening_port = reactor.listenTCP(0, self.site,
                                                 interface='127.0.0.1')
         # pylint: enable-msg=E1101
@@ -221,11 +221,11 @@ class S3APITestCase(test.TrialTestCase):
 
         self.conn.get_http_connection = get_http_connection
 
-    def _ensure_no_buckets(self, buckets): # pylint: disable-msg=C0111
+    def _ensure_no_buckets(self, buckets): # pylint: disable=C0111
         self.assertEquals(len(buckets), 0, "Bucket list was not empty")
         return True
 
-    def _ensure_one_bucket(self, buckets, name): # pylint: disable-msg=C0111
+    def _ensure_one_bucket(self, buckets, name): # pylint: disable=C0111
         self.assertEquals(len(buckets), 1,
                           "Bucket list didn't have exactly one element in it")
         self.assertEquals(buckets[0].name, name, "Wrong name")
@@ -296,7 +296,7 @@ class S3APITestCase(test.TrialTestCase):
         deferred.addCallback(self._ensure_no_buckets)
         return deferred
 
-    def tearDown(self): # pylint: disable-msg=C0103
+    def tearDown(self): # pylint: disable=C0103
         """Tear down auth and test server."""
         self.auth_manager.delete_user('admin')
         self.auth_manager.delete_project('admin')