openstack/nova
Code Issues Proposed changes

disable-msg -> disable

Browse Source
This commit is contained in:
Brian Lamar
2011-03-18 09:56:05 -04:00
parent abe147f756
commit 6e9a95fe81
24 changed files with 47 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bin/nova-ajax-console-proxy
View File

@@ -1,5 +1,5 @@
#!/usr/bin/env python #!/usr/bin/env python
# pylint: disable-msg=C0103 # pylint: disable=C0103
# vim: tabstop=4 shiftwidth=4 softtabstop=4 # vim: tabstop=4 shiftwidth=4 softtabstop=4
# Copyright 2010 United States Government as represented by the # Copyright 2010 United States Government as represented by the

2
bin/nova-api
View File

@@ -1,5 +1,5 @@
#!/usr/bin/env python #!/usr/bin/env python
# pylint: disable-msg=C0103 # pylint: disable=C0103
# vim: tabstop=4 shiftwidth=4 softtabstop=4 # vim: tabstop=4 shiftwidth=4 softtabstop=4
# Copyright 2010 United States Government as represented by the # Copyright 2010 United States Government as represented by the

2
bin/nova-direct-api
View File

@@ -1,5 +1,5 @@
#!/usr/bin/env python #!/usr/bin/env python
# pylint: disable-msg=C0103 # pylint: disable=C0103
# vim: tabstop=4 shiftwidth=4 softtabstop=4 # vim: tabstop=4 shiftwidth=4 softtabstop=4
# Copyright 2010 United States Government as represented by the # Copyright 2010 United States Government as represented by the

2
bin/nova-instancemonitor
View File

@@ -50,7 +50,7 @@ if __name__ == '__main__':
if __name__ == '__builtin__': if __name__ == '__builtin__':
LOG.warn(_('Starting instance monitor')) LOG.warn(_('Starting instance monitor'))
# pylint: disable-msg=C0103 # pylint: disable=C0103
monitor = monitor.InstanceMonitor() monitor = monitor.InstanceMonitor()
# This is the parent service that twistd will be looking for when it # This is the parent service that twistd will be looking for when it

2
bin/nova-objectstore
View File

@@ -49,4 +49,4 @@ if __name__ == '__main__':
twistd.serve(__file__) twistd.serve(__file__)
if __name__ == '__builtin__': if __name__ == '__builtin__':
application = handler.get_application() # pylint: disable-msg=C0103 application = handler.get_application() # pylint: disable=C0103

8
nova/auth/fakeldap.py
View File

@@ -90,12 +90,12 @@ MOD_DELETE = 1
MOD_REPLACE = 2 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.""" """Duplicate exception class from real LDAP module."""
pass 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.""" """Duplicate exception class from real LDAP module."""
pass pass
@@ -268,7 +268,7 @@ class FakeLDAP(object):
# get the attributes from the store # get the attributes from the store
attrs = store.hgetall(key) attrs = store.hgetall(key)
# turn the values from the store into lists # turn the values from the store into lists
# pylint: disable-msg=E1103 # pylint: disable=E1103
attrs = dict([(k, _from_json(v)) attrs = dict([(k, _from_json(v))
for k, v in attrs.iteritems()]) for k, v in attrs.iteritems()])
# filter the objects by query # filter the objects by query
@@ -283,6 +283,6 @@ class FakeLDAP(object):
return objects return objects
@property @property
def __prefix(self): # pylint: disable-msg=R0201 def __prefix(self): # pylint: disable=R0201
"""Get the prefix to use for all keys.""" """Get the prefix to use for all keys."""
return 'ldap:' return 'ldap:'

2
nova/auth/ldapdriver.py
View File

@@ -634,6 +634,6 @@ class LdapDriver(object):
class FakeLdapDriver(LdapDriver): class FakeLdapDriver(LdapDriver):
"""Fake Ldap Auth driver""" """Fake Ldap Auth driver"""
def __init__(self): # pylint: disable-msg=W0231 def __init__(self): # pylint: disable=W0231
__import__('nova.auth.fakeldap') __import__('nova.auth.fakeldap')
self.ldap = sys.modules['nova.auth.fakeldap'] self.ldap = sys.modules['nova.auth.fakeldap']

2
nova/auth/manager.py
View File

@@ -22,7 +22,7 @@ Nova authentication management
import os import os
import shutil import shutil
import string # pylint: disable-msg=W0402 import string # pylint: disable=W0402
import tempfile import tempfile
import uuid import uuid
import zipfile import zipfile

4
nova/compute/manager.py
View File

@@ -220,7 +220,7 @@ class ComputeManager(manager.Manager):
self.db.instance_update(context, self.db.instance_update(context,
instance_id, instance_id,
{'launched_at': now}) {'launched_at': now})
except Exception: # pylint: disable-msg=W0702 except Exception: # pylint: disable=W0702
LOG.exception(_("instance %s: Failed to spawn"), instance_id, LOG.exception(_("instance %s: Failed to spawn"), instance_id,
context=context) context=context)
self.db.instance_set_state(context, self.db.instance_set_state(context,
@@ -692,7 +692,7 @@ class ComputeManager(manager.Manager):
volume_id, volume_id,
instance_id, instance_id,
mountpoint) 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 # NOTE(vish): The inline callback eats the exception info so we
# log the traceback here and reraise the same # log the traceback here and reraise the same
# ecxception below. # ecxception below.

2
nova/db/api.py
View File

@@ -608,7 +608,7 @@ def network_get_all(context):
return IMPL.network_get_all(context) return IMPL.network_get_all(context)
# pylint: disable-msg=C0103 # pylint: disable=C0103
def network_get_associated_fixed_ips(context, network_id): def network_get_associated_fixed_ips(context, network_id):
"""Get all network's ips that have been associated.""" """Get all network's ips that have been associated."""
return IMPL.network_get_associated_fixed_ips(context, network_id) return IMPL.network_get_associated_fixed_ips(context, network_id)

2
nova/db/base.py
View File

@@ -33,4 +33,4 @@ class Base(object):
def __init__(self, db_driver=None): def __init__(self, db_driver=None):
if not db_driver: if not db_driver:
db_driver = FLAGS.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

2
nova/db/sqlalchemy/api.py
View File

@@ -1249,7 +1249,7 @@ def network_get_all(context):
# NOTE(vish): pylint complains because of the long method name, but # NOTE(vish): pylint complains because of the long method name, but
# it fits with the names of the rest of the methods # it fits with the names of the rest of the methods
# pylint: disable-msg=C0103 # pylint: disable=C0103
@require_admin_context @require_admin_context

6
nova/network/linux_net.py
View File

@@ -582,7 +582,7 @@ def update_dhcp(context, network_id):
try: try:
_execute('sudo', 'kill', '-HUP', pid) _execute('sudo', 'kill', '-HUP', pid)
return return
except Exception as exc: # pylint: disable-msg=W0703 except Exception as exc: # pylint: disable=W0703
LOG.debug(_("Hupping dnsmasq threw %s"), exc) LOG.debug(_("Hupping dnsmasq threw %s"), exc)
else: else:
LOG.debug(_("Pid %d is stale, relaunching dnsmasq"), pid) LOG.debug(_("Pid %d is stale, relaunching dnsmasq"), pid)
@@ -626,7 +626,7 @@ interface %s
if conffile in out: if conffile in out:
try: try:
_execute('sudo', 'kill', pid) _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) LOG.debug(_("killing radvd threw %s"), exc)
else: else:
LOG.debug(_("Pid %d is stale, relaunching radvd"), pid) LOG.debug(_("Pid %d is stale, relaunching radvd"), pid)
@@ -713,7 +713,7 @@ def _stop_dnsmasq(network):
if pid: if pid:
try: try:
_execute('sudo', 'kill', '-TERM', pid) _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) LOG.debug(_("Killing dnsmasq threw %s"), exc)

4
nova/network/manager.py
View File

@@ -322,12 +322,12 @@ class NetworkManager(manager.Manager):
self._create_fixed_ips(context, network_ref['id']) self._create_fixed_ips(context, network_ref['id'])
@property @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.""" """Number of reserved ips at the bottom of the range."""
return 2 # network, gateway return 2 # network, gateway
@property @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.""" """Number of reserved ips at the top of the range."""
return 1 # broadcast return 1 # broadcast

14
nova/objectstore/handler.py
View File

@@ -167,7 +167,7 @@ class S3(ErrorHandlingResource):
def __init__(self): def __init__(self):
ErrorHandlingResource.__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""" """Returns either the image or bucket resource"""
request.context = get_context(request) request.context = get_context(request)
if name == '': if name == '':
@@ -177,7 +177,7 @@ class S3(ErrorHandlingResource):
else: else:
return BucketResource(name) 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""" """Renders the GET request for a list of buckets as XML"""
LOG.debug(_('List of buckets requested'), context=request.context) LOG.debug(_('List of buckets requested'), context=request.context)
buckets = [b for b in bucket.Bucket.all() buckets = [b for b in bucket.Bucket.all()
@@ -355,7 +355,7 @@ class ImagesResource(resource.Resource):
else: else:
return ImageResource(name) 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 """ returns a json listing of all images
that a user has permissions to see """ that a user has permissions to see """
@@ -384,7 +384,7 @@ class ImagesResource(resource.Resource):
request.finish() request.finish()
return server.NOT_DONE_YET 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 """ """ create a new registered image """
image_id = get_argument(request, 'image_id', u'') image_id = get_argument(request, 'image_id', u'')
@@ -413,7 +413,7 @@ class ImagesResource(resource.Resource):
p.start() p.start()
return '' return ''
def render_POST(self, request): # pylint: disable-msg=R0201 def render_POST(self, request): # pylint: disable=R0201
"""Update image attributes: public/private""" """Update image attributes: public/private"""
# image_id required for all requests # image_id required for all requests
@@ -441,7 +441,7 @@ class ImagesResource(resource.Resource):
image_object.update_user_editable_fields(clean_args) image_object.update_user_editable_fields(clean_args)
return '' return ''
def render_DELETE(self, request): # pylint: disable-msg=R0201 def render_DELETE(self, request): # pylint: disable=R0201
"""Delete a registered image""" """Delete a registered image"""
image_id = get_argument(request, "image_id", u"") image_id = get_argument(request, "image_id", u"")
image_object = image.Image(image_id) image_object = image.Image(image_id)
@@ -471,7 +471,7 @@ def get_application():
application = service.Application("objectstore") application = service.Application("objectstore")
# Disabled because of lack of proper introspection in Twisted # Disabled because of lack of proper introspection in Twisted
# or possibly different versions of twisted? # or possibly different versions of twisted?
# pylint: disable-msg=E1101 # pylint: disable=E1101
objectStoreService = internet.TCPServer(FLAGS.s3_port, factory, objectStoreService = internet.TCPServer(FLAGS.s3_port, factory,
interface=FLAGS.s3_listen_host) interface=FLAGS.s3_listen_host)
objectStoreService.setServiceParent(application) objectStoreService.setServiceParent(application)

6
nova/rpc.py
View File

@@ -62,7 +62,7 @@ class Connection(carrot_connection.BrokerConnection):
params['backend_cls'] = fakerabbit.Backend params['backend_cls'] = fakerabbit.Backend
# NOTE(vish): magic is fun! # NOTE(vish): magic is fun!
# pylint: disable-msg=W0142 # pylint: disable=W0142
if new: if new:
return cls(**params) return cls(**params)
else: else:
@@ -114,7 +114,7 @@ class Consumer(messaging.Consumer):
if self.failed_connection: if self.failed_connection:
# NOTE(vish): connection is defined in the parent class, we can # NOTE(vish): connection is defined in the parent class, we can
# recreate it as long as we create the backend too # recreate it as long as we create the backend too
# pylint: disable-msg=W0201 # pylint: disable=W0201
self.connection = Connection.recreate() self.connection = Connection.recreate()
self.backend = self.connection.create_backend() self.backend = self.connection.create_backend()
self.declare() self.declare()
@@ -125,7 +125,7 @@ class Consumer(messaging.Consumer):
# NOTE(vish): This is catching all errors because we really don't # NOTE(vish): This is catching all errors because we really don't
# want exceptions to be logged 10 times a second if some # want exceptions to be logged 10 times a second if some
# persistent failure occurs. # persistent failure occurs.
except Exception: # pylint: disable-msg=W0703 except Exception: # pylint: disable=W0703
if not self.failed_connection: if not self.failed_connection:
LOG.exception(_("Failed to fetch message from queue")) LOG.exception(_("Failed to fetch message from queue"))
self.failed_connection = True self.failed_connection = True

2
nova/service.py
View File

@@ -217,7 +217,7 @@ class Service(object):
logging.error(_("Recovered model server connection!")) logging.error(_("Recovered model server connection!"))
# TODO(vish): this should probably only catch connection errors # 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): if not getattr(self, "model_disconnected", False):
self.model_disconnected = True self.model_disconnected = True
logging.exception(_("model server went away")) logging.exception(_("model server went away"))

2
nova/tests/api/test_wsgi.py
View File

@@ -80,7 +80,7 @@ class ControllerTest(test.TestCase):
"attributes": { "attributes": {
"test": ["id"]}}} "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}} return {"test": {"id": id}}
def __init__(self): def __init__(self):

2
nova/tests/hyperv_unittest.py
View File

@@ -51,7 +51,7 @@ class HyperVTestCase(test.TestCase):
instance_ref = db.instance_create(self.context, instance) instance_ref = db.instance_create(self.context, instance)
conn = hyperv.get_connection(False) 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() found = [n for n in conn.list_instances()
if n == instance_ref['name']] if n == instance_ref['name']]
self.assertTrue(len(found) == 1) self.assertTrue(len(found) == 1)

8
nova/tests/objectstore_unittest.py
View File

@@ -179,7 +179,7 @@ class ObjectStoreTestCase(test.TestCase):
class TestHTTPChannel(http.HTTPChannel): class TestHTTPChannel(http.HTTPChannel):
"""Dummy site required for twisted.web""" """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.""" """Otherwise we end up with an unclean reactor."""
return False return False
@@ -209,7 +209,7 @@ class S3APITestCase(test.TestCase):
root = S3() root = S3()
self.site = TestSite(root) self.site = TestSite(root)
# pylint: disable-msg=E1101 # pylint: disable=E1101
self.listening_port = reactor.listenTCP(0, self.site, self.listening_port = reactor.listenTCP(0, self.site,
interface='127.0.0.1') interface='127.0.0.1')
# pylint: enable-msg=E1101 # pylint: enable-msg=E1101
@@ -231,11 +231,11 @@ class S3APITestCase(test.TestCase):
self.conn.get_http_connection = get_http_connection 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") self.assertEquals(len(buckets), 0, "Bucket list was not empty")
return True 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, self.assertEquals(len(buckets), 1,
"Bucket list didn't have exactly one element in it") "Bucket list didn't have exactly one element in it")
self.assertEquals(buckets[0].name, name, "Wrong name") self.assertEquals(buckets[0].name, name, "Wrong name")

2
nova/tests/test_api.py
View File

@@ -124,7 +124,7 @@ class ApiEc2TestCase(test.TestCase):
self.mox.StubOutWithMock(self.ec2, 'new_http_connection') self.mox.StubOutWithMock(self.ec2, 'new_http_connection')
self.http = FakeHttplibConnection( self.http = FakeHttplibConnection(
self.app, '%s:8773' % (self.host), False) 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) self.ec2.new_http_connection(host, is_secure).AndReturn(self.http)
return self.http return self.http

4
nova/tests/test_middleware.py
View File

@@ -40,12 +40,12 @@ def conditional_forbid(req):
class LockoutTestCase(test.TestCase): class LockoutTestCase(test.TestCase):
"""Test case for the Lockout middleware.""" """Test case for the Lockout middleware."""
def setUp(self): # pylint: disable-msg=C0103 def setUp(self): # pylint: disable=C0103
super(LockoutTestCase, self).setUp() super(LockoutTestCase, self).setUp()
utils.set_time_override() utils.set_time_override()
self.lockout = ec2.Lockout(conditional_forbid) self.lockout = ec2.Lockout(conditional_forbid)
def tearDown(self): # pylint: disable-msg=C0103 def tearDown(self): # pylint: disable=C0103
utils.clear_time_override() utils.clear_time_override()
super(LockoutTestCase, self).tearDown() super(LockoutTestCase, self).tearDown()

10
po/nova.pot
View File

@@ -300,7 +300,7 @@ msgstr ""
msgid "instance %s: starting..." msgid "instance %s: starting..."
msgstr "" msgstr ""
#. pylint: disable-msg=W0702 #. pylint: disable=W0702
#: ../nova/compute/manager.py:219 #: ../nova/compute/manager.py:219
#, python-format #, python-format
msgid "instance %s: Failed to spawn" msgid "instance %s: Failed to spawn"
@@ -440,7 +440,7 @@ msgid ""
"instance %(instance_id)s: attaching volume %(volume_id)s to %(mountpoint)s" "instance %(instance_id)s: attaching volume %(volume_id)s to %(mountpoint)s"
msgstr "" msgstr ""
#. pylint: disable-msg=W0702 #. pylint: disable=W0702
#. NOTE(vish): The inline callback eats the exception info so we #. NOTE(vish): The inline callback eats the exception info so we
#. log the traceback here and reraise the same #. log the traceback here and reraise the same
#. ecxception below. #. ecxception below.
@@ -591,7 +591,7 @@ msgstr ""
msgid "Starting Bridge interface for %s" msgid "Starting Bridge interface for %s"
msgstr "" msgstr ""
#. pylint: disable-msg=W0703 #. pylint: disable=W0703
#: ../nova/network/linux_net.py:314 #: ../nova/network/linux_net.py:314
#, python-format #, python-format
msgid "Hupping dnsmasq threw %s" msgid "Hupping dnsmasq threw %s"
@@ -602,7 +602,7 @@ msgstr ""
msgid "Pid %d is stale, relaunching dnsmasq" msgid "Pid %d is stale, relaunching dnsmasq"
msgstr "" msgstr ""
#. pylint: disable-msg=W0703 #. pylint: disable=W0703
#: ../nova/network/linux_net.py:358 #: ../nova/network/linux_net.py:358
#, python-format #, python-format
msgid "killing radvd threw %s" msgid "killing radvd threw %s"
@@ -613,7 +613,7 @@ msgstr ""
msgid "Pid %d is stale, relaunching radvd" msgid "Pid %d is stale, relaunching radvd"
msgstr "" msgstr ""
#. pylint: disable-msg=W0703 #. pylint: disable=W0703
#: ../nova/network/linux_net.py:449 #: ../nova/network/linux_net.py:449
#, python-format #, python-format
msgid "Killing dnsmasq threw %s" msgid "Killing dnsmasq threw %s"

2
tools/euca-get-ajax-console
View File

@@ -1,5 +1,5 @@
#!/usr/bin/env python #!/usr/bin/env python
# pylint: disable-msg=C0103 # pylint: disable=C0103
# vim: tabstop=4 shiftwidth=4 softtabstop=4 # vim: tabstop=4 shiftwidth=4 softtabstop=4
# Copyright 2010 United States Government as represented by the # Copyright 2010 United States Government as represented by the