Merge lp:~blamar/nova/pylint-deprecations into lp:~hudson-openstack/nova/trunk

[Brian Lamar]

Replaced all pylint "disable-msg=" with "disable=" and "enable-msg=" with "enable=".

[Brian Lamar (blamar)]

Removed my old proposal which had a bunch of different pylint fixes in favor of a couple smaller ones as per community suggestion.

[Christian Berendt (berendt)]

lgtm

review: Approve

[justinsb (justin-fathomdb)]

lgtm

Thanks for splitting it out into separate patches.

review: Approve

[Devin Carlen (devcamcar)]

lgtm

review: Approve

=== modified file 'bin/nova-ajax-console-proxy'
--- bin/nova-ajax-console-proxy	2011-02-25 21:15:51 +0000
+++ bin/nova-ajax-console-proxy	2011-03-18 13:59:32 +0000
@@ -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
 
=== modified file 'bin/nova-api'
--- bin/nova-api	2011-03-10 06:23:13 +0000
+++ bin/nova-api	2011-03-18 13:59:32 +0000
@@ -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
 
=== modified file 'bin/nova-direct-api'
--- bin/nova-direct-api	2011-02-23 23:26:52 +0000
+++ bin/nova-direct-api	2011-03-18 13:59:32 +0000
@@ -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
 
=== modified file 'bin/nova-instancemonitor'
--- bin/nova-instancemonitor	2011-02-21 21:46:41 +0000
+++ bin/nova-instancemonitor	2011-03-18 13:59:32 +0000
@@ -50,7 +50,7 @@
 
 if __name__ == '__builtin__':
     LOG.warn(_('Starting instance monitor'))
-    # pylint: disable-msg=C0103
+    # pylint: disable=C0103
     monitor = monitor.InstanceMonitor()
 
     # This is the parent service that twistd will be looking for when it
 
=== modified file 'bin/nova-objectstore'
--- bin/nova-objectstore	2010-12-14 23:22:03 +0000
+++ bin/nova-objectstore	2011-03-18 13:59:32 +0000
@@ -49,4 +49,4 @@
     twistd.serve(__file__)
 
 if __name__ == '__builtin__':
-    application = handler.get_application()  # pylint: disable-msg=C0103
+    application = handler.get_application()  # pylint: disable=C0103
 
=== modified file 'nova/auth/fakeldap.py'
--- nova/auth/fakeldap.py	2010-12-22 23:47:31 +0000
+++ nova/auth/fakeldap.py	2011-03-18 13:59:32 +0000
@@ -90,12 +90,12 @@
 MOD_REPLACE = 2
 
 
-class NO_SUCH_OBJECT(Exception):  # pylint: disable-msg=C0103
+class NO_SUCH_OBJECT(Exception):  # pylint: disable=C0103
     """Duplicate exception class from real LDAP module."""
     pass
 
 
-class OBJECT_CLASS_VIOLATION(Exception):  # pylint: disable-msg=C0103
+class OBJECT_CLASS_VIOLATION(Exception):  # pylint: disable=C0103
     """Duplicate exception class from real LDAP module."""
     pass
 
@@ -268,7 +268,7 @@
             # get the attributes from the store
             attrs = store.hgetall(key)
             # turn the values from the store into lists
-            # pylint: disable-msg=E1103
+            # pylint: disable=E1103
             attrs = dict([(k, _from_json(v))
                           for k, v in attrs.iteritems()])
             # filter the objects by query
@@ -277,12 +277,12 @@
                 attrs = dict([(k, v) for k, v in attrs.iteritems()
                               if not fields or k in fields])
                 objects.append((key[len(self.__prefix):], attrs))
-            # pylint: enable-msg=E1103
+            # pylint: enable=E1103
         if objects == []:
             raise NO_SUCH_OBJECT()
         return objects
 
     @property
-    def __prefix(self):  # pylint: disable-msg=R0201
+    def __prefix(self):  # pylint: disable=R0201
         """Get the prefix to use for all keys."""
         return 'ldap:'
 
=== modified file 'nova/auth/ldapdriver.py'
--- nova/auth/ldapdriver.py	2011-03-17 23:32:25 +0000
+++ nova/auth/ldapdriver.py	2011-03-18 13:59:32 +0000
@@ -634,6 +634,6 @@
 class FakeLdapDriver(LdapDriver):
     """Fake Ldap Auth driver"""
 
-    def __init__(self):  # pylint: disable-msg=W0231
+    def __init__(self):  # pylint: disable=W0231
         __import__('nova.auth.fakeldap')
         self.ldap = sys.modules['nova.auth.fakeldap']
 
=== modified file 'nova/auth/manager.py'
--- nova/auth/manager.py	2011-01-19 02:00:28 +0000
+++ nova/auth/manager.py	2011-03-18 13:59:32 +0000
@@ -22,7 +22,7 @@
 
 import os
 import shutil
-import string  # pylint: disable-msg=W0402
+import string  # pylint: disable=W0402
 import tempfile
 import uuid
 import zipfile
 
=== modified file 'nova/compute/manager.py'
--- nova/compute/manager.py	2011-03-15 21:56:00 +0000
+++ nova/compute/manager.py	2011-03-18 13:59:32 +0000
@@ -220,7 +220,7 @@
             self.db.instance_update(context,
                                     instance_id,
                                     {'launched_at': now})
-        except Exception:  # pylint: disable-msg=W0702
+        except Exception:  # pylint: disable=W0702
             LOG.exception(_("instance %s: Failed to spawn"), instance_id,
                           context=context)
             self.db.instance_set_state(context,
@@ -692,7 +692,7 @@
                                     volume_id,
                                     instance_id,
                                     mountpoint)
-        except Exception as exc:  # pylint: disable-msg=W0702
+        except Exception as exc:  # pylint: disable=W0702
             # NOTE(vish): The inline callback eats the exception info so we
             #             log the traceback here and reraise the same
             #             ecxception below.
 
=== modified file 'nova/db/api.py'
--- nova/db/api.py	2011-03-15 07:45:35 +0000
+++ nova/db/api.py	2011-03-18 13:59:32 +0000
@@ -608,7 +608,7 @@
     return IMPL.network_get_all(context)
 
 
-# pylint: disable-msg=C0103
+# pylint: disable=C0103
 def network_get_associated_fixed_ips(context, network_id):
     """Get all network's ips that have been associated."""
     return IMPL.network_get_associated_fixed_ips(context, network_id)
 
=== modified file 'nova/db/base.py'
--- nova/db/base.py	2010-12-01 17:24:39 +0000
+++ nova/db/base.py	2011-03-18 13:59:32 +0000
@@ -33,4 +33,4 @@
     def __init__(self, db_driver=None):
         if not db_driver:
             db_driver = FLAGS.db_driver
-        self.db = utils.import_object(db_driver)  # pylint: disable-msg=C0103
+        self.db = utils.import_object(db_driver)  # pylint: disable=C0103
 
=== modified file 'nova/db/sqlalchemy/api.py'
--- nova/db/sqlalchemy/api.py	2011-03-17 20:27:23 +0000
+++ nova/db/sqlalchemy/api.py	2011-03-18 13:59:32 +0000
@@ -1249,7 +1249,7 @@
 
 # NOTE(vish): pylint complains because of the long method name, but
 #             it fits with the names of the rest of the methods
-# pylint: disable-msg=C0103
+# pylint: disable=C0103
 
 
 @require_admin_context
 
=== modified file 'nova/network/linux_net.py'
--- nova/network/linux_net.py	2011-03-14 13:21:44 +0000
+++ nova/network/linux_net.py	2011-03-18 13:59:32 +0000
@@ -582,7 +582,7 @@
             try:
                 _execute('sudo', 'kill', '-HUP', pid)
                 return
-            except Exception as exc:  # pylint: disable-msg=W0703
+            except Exception as exc:  # pylint: disable=W0703
                 LOG.debug(_("Hupping dnsmasq threw %s"), exc)
         else:
             LOG.debug(_("Pid %d is stale, relaunching dnsmasq"), pid)
@@ -626,7 +626,7 @@
         if conffile in out:
             try:
                 _execute('sudo', 'kill', pid)
-            except Exception as exc:  # pylint: disable-msg=W0703
+            except Exception as exc:  # pylint: disable=W0703
                 LOG.debug(_("killing radvd threw %s"), exc)
         else:
             LOG.debug(_("Pid %d is stale, relaunching radvd"), pid)
@@ -713,7 +713,7 @@
     if pid:
         try:
             _execute('sudo', 'kill', '-TERM', pid)
-        except Exception as exc:  # pylint: disable-msg=W0703
+        except Exception as exc:  # pylint: disable=W0703
             LOG.debug(_("Killing dnsmasq threw %s"), exc)
 
 
 
=== modified file 'nova/network/manager.py'
--- nova/network/manager.py	2011-03-09 18:16:26 +0000
+++ nova/network/manager.py	2011-03-18 13:59:32 +0000
@@ -322,12 +322,12 @@
                 self._create_fixed_ips(context, network_ref['id'])
 
     @property
-    def _bottom_reserved_ips(self):  # pylint: disable-msg=R0201
+    def _bottom_reserved_ips(self):  # pylint: disable=R0201
         """Number of reserved ips at the bottom of the range."""
         return 2  # network, gateway
 
     @property
-    def _top_reserved_ips(self):  # pylint: disable-msg=R0201
+    def _top_reserved_ips(self):  # pylint: disable=R0201
         """Number of reserved ips at the top of the range."""
         return 1  # broadcast
 
 
=== modified file 'nova/objectstore/handler.py'
--- nova/objectstore/handler.py	2011-01-21 21:10:26 +0000
+++ nova/objectstore/handler.py	2011-03-18 13:59:32 +0000
@@ -167,7 +167,7 @@
     def __init__(self):
         ErrorHandlingResource.__init__(self)
 
-    def getChild(self, name, request):  # pylint: disable-msg=C0103
+    def getChild(self, name, request):  # pylint: disable=C0103
         """Returns either the image or bucket resource"""
         request.context = get_context(request)
         if name == '':
@@ -177,7 +177,7 @@
         else:
             return BucketResource(name)
 
-    def render_GET(self, request):  # pylint: disable-msg=R0201
+    def render_GET(self, request):  # pylint: disable=R0201
         """Renders the GET request for a list of buckets as XML"""
         LOG.debug(_('List of buckets requested'), context=request.context)
         buckets = [b for b in bucket.Bucket.all()
@@ -355,7 +355,7 @@
         else:
             return ImageResource(name)
 
-    def render_GET(self, request):  # pylint: disable-msg=R0201
+    def render_GET(self, request):  # pylint: disable=R0201
         """ returns a json listing of all images
             that a user has permissions to see """
 
@@ -384,7 +384,7 @@
         request.finish()
         return server.NOT_DONE_YET
 
-    def render_PUT(self, request):  # pylint: disable-msg=R0201
+    def render_PUT(self, request):  # pylint: disable=R0201
         """ create a new registered image """
 
         image_id = get_argument(request, 'image_id', u'')
@@ -413,7 +413,7 @@
         p.start()
         return ''
 
-    def render_POST(self, request):  # pylint: disable-msg=R0201
+    def render_POST(self, request):  # pylint: disable=R0201
         """Update image attributes: public/private"""
 
         # image_id required for all requests
@@ -441,7 +441,7 @@
             image_object.update_user_editable_fields(clean_args)
         return ''
 
-    def render_DELETE(self, request):  # pylint: disable-msg=R0201
+    def render_DELETE(self, request):  # pylint: disable=R0201
         """Delete a registered image"""
         image_id = get_argument(request, "image_id", u"")
         image_object = image.Image(image_id)
@@ -471,7 +471,7 @@
     application = service.Application("objectstore")
     # Disabled because of lack of proper introspection in Twisted
     # or possibly different versions of twisted?
-    # pylint: disable-msg=E1101
+    # pylint: disable=E1101
     objectStoreService = internet.TCPServer(FLAGS.s3_port, factory,
                                             interface=FLAGS.s3_listen_host)
     objectStoreService.setServiceParent(application)
 
=== modified file 'nova/rpc.py'
--- nova/rpc.py	2011-03-17 23:41:16 +0000
+++ nova/rpc.py	2011-03-18 13:59:32 +0000
@@ -62,7 +62,7 @@
                 params['backend_cls'] = fakerabbit.Backend
 
             # NOTE(vish): magic is fun!
-            # pylint: disable-msg=W0142
+            # pylint: disable=W0142
             if new:
                 return cls(**params)
             else:
@@ -114,7 +114,7 @@
             if self.failed_connection:
                 # NOTE(vish): connection is defined in the parent class, we can
                 #             recreate it as long as we create the backend too
-                # pylint: disable-msg=W0201
+                # pylint: disable=W0201
                 self.connection = Connection.recreate()
                 self.backend = self.connection.create_backend()
                 self.declare()
@@ -125,7 +125,7 @@
         # NOTE(vish): This is catching all errors because we really don't
         #             want exceptions to be logged 10 times a second if some
         #             persistent failure occurs.
-        except Exception:  # pylint: disable-msg=W0703
+        except Exception:  # pylint: disable=W0703
             if not self.failed_connection:
                 LOG.exception(_("Failed to fetch message from queue"))
                 self.failed_connection = True
 
=== modified file 'nova/service.py'
--- nova/service.py	2011-03-10 06:23:13 +0000
+++ nova/service.py	2011-03-18 13:59:32 +0000
@@ -217,7 +217,7 @@
                 logging.error(_("Recovered model server connection!"))
 
         # TODO(vish): this should probably only catch connection errors
-        except Exception:  # pylint: disable-msg=W0702
+        except Exception:  # pylint: disable=W0702
             if not getattr(self, "model_disconnected", False):
                 self.model_disconnected = True
                 logging.exception(_("model server went away"))
 
=== modified file 'nova/tests/api/test_wsgi.py'
--- nova/tests/api/test_wsgi.py	2011-03-09 20:08:11 +0000
+++ nova/tests/api/test_wsgi.py	2011-03-18 13:59:32 +0000
@@ -80,7 +80,7 @@
                     "attributes": {
                         "test": ["id"]}}}
 
-            def show(self, req, id):  # pylint: disable-msg=W0622,C0103
+            def show(self, req, id):  # pylint: disable=W0622,C0103
                 return {"test": {"id": id}}
 
         def __init__(self):
 
=== modified file 'nova/tests/hyperv_unittest.py'
--- nova/tests/hyperv_unittest.py	2011-01-05 23:02:09 +0000
+++ nova/tests/hyperv_unittest.py	2011-03-18 13:59:32 +0000
@@ -51,7 +51,7 @@
         instance_ref = db.instance_create(self.context, instance)
 
         conn = hyperv.get_connection(False)
-        conn._create_vm(instance_ref)  # pylint: disable-msg=W0212
+        conn._create_vm(instance_ref)  # pylint: disable=W0212
         found = [n  for n in conn.list_instances()
                       if n == instance_ref['name']]
         self.assertTrue(len(found) == 1)
 
=== modified file 'nova/tests/objectstore_unittest.py'
--- nova/tests/objectstore_unittest.py	2011-02-23 19:56:37 +0000
+++ nova/tests/objectstore_unittest.py	2011-03-18 13:59:32 +0000
@@ -179,7 +179,7 @@
 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
 
@@ -209,10 +209,10 @@
 
         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
+        # pylint: enable=E1101
         self.tcp_port = self.listening_port.getHost().port
 
         if not boto.config.has_section('Boto'):
@@ -231,11 +231,11 @@
 
         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")
 
=== modified file 'nova/tests/test_api.py'
--- nova/tests/test_api.py	2011-02-21 20:41:15 +0000
+++ nova/tests/test_api.py	2011-03-18 13:59:32 +0000
@@ -124,7 +124,7 @@
         self.mox.StubOutWithMock(self.ec2, 'new_http_connection')
         self.http = FakeHttplibConnection(
                 self.app, '%s:8773' % (self.host), False)
-        # pylint: disable-msg=E1103
+        # pylint: disable=E1103
         self.ec2.new_http_connection(host, is_secure).AndReturn(self.http)
         return self.http
 
 
=== modified file 'nova/tests/test_middleware.py'
--- nova/tests/test_middleware.py	2011-01-15 01:48:48 +0000
+++ nova/tests/test_middleware.py	2011-03-18 13:59:32 +0000
@@ -40,12 +40,12 @@
 
 class LockoutTestCase(test.TestCase):
     """Test case for the Lockout middleware."""
-    def setUp(self):  # pylint: disable-msg=C0103
+    def setUp(self):  # pylint: disable=C0103
         super(LockoutTestCase, self).setUp()
         utils.set_time_override()
         self.lockout = ec2.Lockout(conditional_forbid)
 
-    def tearDown(self):  # pylint: disable-msg=C0103
+    def tearDown(self):  # pylint: disable=C0103
         utils.clear_time_override()
         super(LockoutTestCase, self).tearDown()
 
 
=== modified file 'po/nova.pot'
--- po/nova.pot	2011-02-22 04:36:17 +0000
+++ po/nova.pot	2011-03-18 13:59:32 +0000
@@ -300,7 +300,7 @@
 msgid "instance %s: starting..."
 msgstr ""
 
-#. pylint: disable-msg=W0702
+#. pylint: disable=W0702
 #: ../nova/compute/manager.py:219
 #, python-format
 msgid "instance %s: Failed to spawn"
@@ -440,7 +440,7 @@
 "instance %(instance_id)s: attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#. pylint: disable-msg=W0702
+#. pylint: disable=W0702
 #. NOTE(vish): The inline callback eats the exception info so we
 #. log the traceback here and reraise the same
 #. ecxception below.
@@ -591,7 +591,7 @@
 msgid "Starting Bridge interface for %s"
 msgstr ""
 
-#. pylint: disable-msg=W0703
+#. pylint: disable=W0703
 #: ../nova/network/linux_net.py:314
 #, python-format
 msgid "Hupping dnsmasq threw %s"
@@ -602,7 +602,7 @@
 msgid "Pid %d is stale, relaunching dnsmasq"
 msgstr ""
 
-#. pylint: disable-msg=W0703
+#. pylint: disable=W0703
 #: ../nova/network/linux_net.py:358
 #, python-format
 msgid "killing radvd threw %s"
@@ -613,7 +613,7 @@
 msgid "Pid %d is stale, relaunching radvd"
 msgstr ""
 
-#. pylint: disable-msg=W0703
+#. pylint: disable=W0703
 #: ../nova/network/linux_net.py:449
 #, python-format
 msgid "Killing dnsmasq threw %s"
 
=== modified file 'tools/euca-get-ajax-console'
--- tools/euca-get-ajax-console	2011-02-26 18:09:57 +0000
+++ tools/euca-get-ajax-console	2011-03-18 13:59:32 +0000
@@ -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