OpenStack Compute (nova)

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

  1. pylint-deprecations
  2. Merge into trunk
Proposed by Brian Lamar
Status: Merged
Approved by: Devin Carlen
Approved revision: 830
Merged at revision: 832
Proposed branch: lp:~blamar/nova/pylint-deprecations
Merge into: lp:~hudson-openstack/nova/trunk
Diff against target: 500 lines (+49/-49)
24 files modified
bin/nova-ajax-console-proxy (+1/-1)
bin/nova-api (+1/-1)
bin/nova-direct-api (+1/-1)
bin/nova-instancemonitor (+1/-1)
bin/nova-objectstore (+1/-1)
nova/auth/fakeldap.py (+5/-5)
nova/auth/ldapdriver.py (+1/-1)
nova/auth/manager.py (+1/-1)
nova/compute/manager.py (+2/-2)
nova/db/api.py (+1/-1)
nova/db/base.py (+1/-1)
nova/db/sqlalchemy/api.py (+1/-1)
nova/network/linux_net.py (+3/-3)
nova/network/manager.py (+2/-2)
nova/objectstore/handler.py (+7/-7)
nova/rpc.py (+3/-3)
nova/service.py (+1/-1)
nova/tests/api/test_wsgi.py (+1/-1)
nova/tests/hyperv_unittest.py (+1/-1)
nova/tests/objectstore_unittest.py (+5/-5)
nova/tests/test_api.py (+1/-1)
nova/tests/test_middleware.py (+2/-2)
po/nova.pot (+5/-5)
tools/euca-get-ajax-console (+1/-1)
To merge this branch: bzr merge lp:~blamar/nova/pylint-deprecations
Reviewer Review Type Date Requested Status
Devin Carlen (community) Approve
justinsb (community) Approve
Christian Berendt (community) Approve
Review via email: mp+53990@code.launchpad.net

Description of the change

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

To post a comment you must log in.
Revision history for this message
Brian Lamar (blamar) wrote :

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

Revision history for this message
Christian Berendt (berendt) wrote :

lgtm

review: Approve
Revision history for this message
justinsb (justin-fathomdb) wrote :

lgtm

Thanks for splitting it out into separate patches.

review: Approve
Revision history for this message
Devin Carlen (devcamcar) wrote :

lgtm

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bin/nova-ajax-console-proxy'
2--- bin/nova-ajax-console-proxy 2011-02-25 21:15:51 +0000
3+++ bin/nova-ajax-console-proxy 2011-03-18 13:59:32 +0000
4@@ -1,5 +1,5 @@
5 #!/usr/bin/env python
6-# pylint: disable-msg=C0103
7+# pylint: disable=C0103
8 # vim: tabstop=4 shiftwidth=4 softtabstop=4
9
10 # Copyright 2010 United States Government as represented by the
11
12=== modified file 'bin/nova-api'
13--- bin/nova-api 2011-03-10 06:23:13 +0000
14+++ bin/nova-api 2011-03-18 13:59:32 +0000
15@@ -1,5 +1,5 @@
16 #!/usr/bin/env python
17-# pylint: disable-msg=C0103
18+# pylint: disable=C0103
19 # vim: tabstop=4 shiftwidth=4 softtabstop=4
20
21 # Copyright 2010 United States Government as represented by the
22
23=== modified file 'bin/nova-direct-api'
24--- bin/nova-direct-api 2011-02-23 23:26:52 +0000
25+++ bin/nova-direct-api 2011-03-18 13:59:32 +0000
26@@ -1,5 +1,5 @@
27 #!/usr/bin/env python
28-# pylint: disable-msg=C0103
29+# pylint: disable=C0103
30 # vim: tabstop=4 shiftwidth=4 softtabstop=4
31
32 # Copyright 2010 United States Government as represented by the
33
34=== modified file 'bin/nova-instancemonitor'
35--- bin/nova-instancemonitor 2011-02-21 21:46:41 +0000
36+++ bin/nova-instancemonitor 2011-03-18 13:59:32 +0000
37@@ -50,7 +50,7 @@
38
39 if __name__ == '__builtin__':
40 LOG.warn(_('Starting instance monitor'))
41- # pylint: disable-msg=C0103
42+ # pylint: disable=C0103
43 monitor = monitor.InstanceMonitor()
44
45 # This is the parent service that twistd will be looking for when it
46
47=== modified file 'bin/nova-objectstore'
48--- bin/nova-objectstore 2010-12-14 23:22:03 +0000
49+++ bin/nova-objectstore 2011-03-18 13:59:32 +0000
50@@ -49,4 +49,4 @@
51 twistd.serve(__file__)
52
53 if __name__ == '__builtin__':
54- application = handler.get_application() # pylint: disable-msg=C0103
55+ application = handler.get_application() # pylint: disable=C0103
56
57=== modified file 'nova/auth/fakeldap.py'
58--- nova/auth/fakeldap.py 2010-12-22 23:47:31 +0000
59+++ nova/auth/fakeldap.py 2011-03-18 13:59:32 +0000
60@@ -90,12 +90,12 @@
61 MOD_REPLACE = 2
62
63
64-class NO_SUCH_OBJECT(Exception): # pylint: disable-msg=C0103
65+class NO_SUCH_OBJECT(Exception): # pylint: disable=C0103
66 """Duplicate exception class from real LDAP module."""
67 pass
68
69
70-class OBJECT_CLASS_VIOLATION(Exception): # pylint: disable-msg=C0103
71+class OBJECT_CLASS_VIOLATION(Exception): # pylint: disable=C0103
72 """Duplicate exception class from real LDAP module."""
73 pass
74
75@@ -268,7 +268,7 @@
76 # get the attributes from the store
77 attrs = store.hgetall(key)
78 # turn the values from the store into lists
79- # pylint: disable-msg=E1103
80+ # pylint: disable=E1103
81 attrs = dict([(k, _from_json(v))
82 for k, v in attrs.iteritems()])
83 # filter the objects by query
84@@ -277,12 +277,12 @@
85 attrs = dict([(k, v) for k, v in attrs.iteritems()
86 if not fields or k in fields])
87 objects.append((key[len(self.__prefix):], attrs))
88- # pylint: enable-msg=E1103
89+ # pylint: enable=E1103
90 if objects == []:
91 raise NO_SUCH_OBJECT()
92 return objects
93
94 @property
95- def __prefix(self): # pylint: disable-msg=R0201
96+ def __prefix(self): # pylint: disable=R0201
97 """Get the prefix to use for all keys."""
98 return 'ldap:'
99
100=== modified file 'nova/auth/ldapdriver.py'
101--- nova/auth/ldapdriver.py 2011-03-17 23:32:25 +0000
102+++ nova/auth/ldapdriver.py 2011-03-18 13:59:32 +0000
103@@ -634,6 +634,6 @@
104 class FakeLdapDriver(LdapDriver):
105 """Fake Ldap Auth driver"""
106
107- def __init__(self): # pylint: disable-msg=W0231
108+ def __init__(self): # pylint: disable=W0231
109 __import__('nova.auth.fakeldap')
110 self.ldap = sys.modules['nova.auth.fakeldap']
111
112=== modified file 'nova/auth/manager.py'
113--- nova/auth/manager.py 2011-01-19 02:00:28 +0000
114+++ nova/auth/manager.py 2011-03-18 13:59:32 +0000
115@@ -22,7 +22,7 @@
116
117 import os
118 import shutil
119-import string # pylint: disable-msg=W0402
120+import string # pylint: disable=W0402
121 import tempfile
122 import uuid
123 import zipfile
124
125=== modified file 'nova/compute/manager.py'
126--- nova/compute/manager.py 2011-03-15 21:56:00 +0000
127+++ nova/compute/manager.py 2011-03-18 13:59:32 +0000
128@@ -220,7 +220,7 @@
129 self.db.instance_update(context,
130 instance_id,
131 {'launched_at': now})
132- except Exception: # pylint: disable-msg=W0702
133+ except Exception: # pylint: disable=W0702
134 LOG.exception(_("instance %s: Failed to spawn"), instance_id,
135 context=context)
136 self.db.instance_set_state(context,
137@@ -692,7 +692,7 @@
138 volume_id,
139 instance_id,
140 mountpoint)
141- except Exception as exc: # pylint: disable-msg=W0702
142+ except Exception as exc: # pylint: disable=W0702
143 # NOTE(vish): The inline callback eats the exception info so we
144 # log the traceback here and reraise the same
145 # ecxception below.
146
147=== modified file 'nova/db/api.py'
148--- nova/db/api.py 2011-03-15 07:45:35 +0000
149+++ nova/db/api.py 2011-03-18 13:59:32 +0000
150@@ -608,7 +608,7 @@
151 return IMPL.network_get_all(context)
152
153
154-# pylint: disable-msg=C0103
155+# pylint: disable=C0103
156 def network_get_associated_fixed_ips(context, network_id):
157 """Get all network's ips that have been associated."""
158 return IMPL.network_get_associated_fixed_ips(context, network_id)
159
160=== modified file 'nova/db/base.py'
161--- nova/db/base.py 2010-12-01 17:24:39 +0000
162+++ nova/db/base.py 2011-03-18 13:59:32 +0000
163@@ -33,4 +33,4 @@
164 def __init__(self, db_driver=None):
165 if not db_driver:
166 db_driver = FLAGS.db_driver
167- self.db = utils.import_object(db_driver) # pylint: disable-msg=C0103
168+ self.db = utils.import_object(db_driver) # pylint: disable=C0103
169
170=== modified file 'nova/db/sqlalchemy/api.py'
171--- nova/db/sqlalchemy/api.py 2011-03-17 20:27:23 +0000
172+++ nova/db/sqlalchemy/api.py 2011-03-18 13:59:32 +0000
173@@ -1249,7 +1249,7 @@
174
175 # NOTE(vish): pylint complains because of the long method name, but
176 # it fits with the names of the rest of the methods
177-# pylint: disable-msg=C0103
178+# pylint: disable=C0103
179
180
181 @require_admin_context
182
183=== modified file 'nova/network/linux_net.py'
184--- nova/network/linux_net.py 2011-03-14 13:21:44 +0000
185+++ nova/network/linux_net.py 2011-03-18 13:59:32 +0000
186@@ -582,7 +582,7 @@
187 try:
188 _execute('sudo', 'kill', '-HUP', pid)
189 return
190- except Exception as exc: # pylint: disable-msg=W0703
191+ except Exception as exc: # pylint: disable=W0703
192 LOG.debug(_("Hupping dnsmasq threw %s"), exc)
193 else:
194 LOG.debug(_("Pid %d is stale, relaunching dnsmasq"), pid)
195@@ -626,7 +626,7 @@
196 if conffile in out:
197 try:
198 _execute('sudo', 'kill', pid)
199- except Exception as exc: # pylint: disable-msg=W0703
200+ except Exception as exc: # pylint: disable=W0703
201 LOG.debug(_("killing radvd threw %s"), exc)
202 else:
203 LOG.debug(_("Pid %d is stale, relaunching radvd"), pid)
204@@ -713,7 +713,7 @@
205 if pid:
206 try:
207 _execute('sudo', 'kill', '-TERM', pid)
208- except Exception as exc: # pylint: disable-msg=W0703
209+ except Exception as exc: # pylint: disable=W0703
210 LOG.debug(_("Killing dnsmasq threw %s"), exc)
211
212
213
214=== modified file 'nova/network/manager.py'
215--- nova/network/manager.py 2011-03-09 18:16:26 +0000
216+++ nova/network/manager.py 2011-03-18 13:59:32 +0000
217@@ -322,12 +322,12 @@
218 self._create_fixed_ips(context, network_ref['id'])
219
220 @property
221- def _bottom_reserved_ips(self): # pylint: disable-msg=R0201
222+ def _bottom_reserved_ips(self): # pylint: disable=R0201
223 """Number of reserved ips at the bottom of the range."""
224 return 2 # network, gateway
225
226 @property
227- def _top_reserved_ips(self): # pylint: disable-msg=R0201
228+ def _top_reserved_ips(self): # pylint: disable=R0201
229 """Number of reserved ips at the top of the range."""
230 return 1 # broadcast
231
232
233=== modified file 'nova/objectstore/handler.py'
234--- nova/objectstore/handler.py 2011-01-21 21:10:26 +0000
235+++ nova/objectstore/handler.py 2011-03-18 13:59:32 +0000
236@@ -167,7 +167,7 @@
237 def __init__(self):
238 ErrorHandlingResource.__init__(self)
239
240- def getChild(self, name, request): # pylint: disable-msg=C0103
241+ def getChild(self, name, request): # pylint: disable=C0103
242 """Returns either the image or bucket resource"""
243 request.context = get_context(request)
244 if name == '':
245@@ -177,7 +177,7 @@
246 else:
247 return BucketResource(name)
248
249- def render_GET(self, request): # pylint: disable-msg=R0201
250+ def render_GET(self, request): # pylint: disable=R0201
251 """Renders the GET request for a list of buckets as XML"""
252 LOG.debug(_('List of buckets requested'), context=request.context)
253 buckets = [b for b in bucket.Bucket.all()
254@@ -355,7 +355,7 @@
255 else:
256 return ImageResource(name)
257
258- def render_GET(self, request): # pylint: disable-msg=R0201
259+ def render_GET(self, request): # pylint: disable=R0201
260 """ returns a json listing of all images
261 that a user has permissions to see """
262
263@@ -384,7 +384,7 @@
264 request.finish()
265 return server.NOT_DONE_YET
266
267- def render_PUT(self, request): # pylint: disable-msg=R0201
268+ def render_PUT(self, request): # pylint: disable=R0201
269 """ create a new registered image """
270
271 image_id = get_argument(request, 'image_id', u'')
272@@ -413,7 +413,7 @@
273 p.start()
274 return ''
275
276- def render_POST(self, request): # pylint: disable-msg=R0201
277+ def render_POST(self, request): # pylint: disable=R0201
278 """Update image attributes: public/private"""
279
280 # image_id required for all requests
281@@ -441,7 +441,7 @@
282 image_object.update_user_editable_fields(clean_args)
283 return ''
284
285- def render_DELETE(self, request): # pylint: disable-msg=R0201
286+ def render_DELETE(self, request): # pylint: disable=R0201
287 """Delete a registered image"""
288 image_id = get_argument(request, "image_id", u"")
289 image_object = image.Image(image_id)
290@@ -471,7 +471,7 @@
291 application = service.Application("objectstore")
292 # Disabled because of lack of proper introspection in Twisted
293 # or possibly different versions of twisted?
294- # pylint: disable-msg=E1101
295+ # pylint: disable=E1101
296 objectStoreService = internet.TCPServer(FLAGS.s3_port, factory,
297 interface=FLAGS.s3_listen_host)
298 objectStoreService.setServiceParent(application)
299
300=== modified file 'nova/rpc.py'
301--- nova/rpc.py 2011-03-17 23:41:16 +0000
302+++ nova/rpc.py 2011-03-18 13:59:32 +0000
303@@ -62,7 +62,7 @@
304 params['backend_cls'] = fakerabbit.Backend
305
306 # NOTE(vish): magic is fun!
307- # pylint: disable-msg=W0142
308+ # pylint: disable=W0142
309 if new:
310 return cls(**params)
311 else:
312@@ -114,7 +114,7 @@
313 if self.failed_connection:
314 # NOTE(vish): connection is defined in the parent class, we can
315 # recreate it as long as we create the backend too
316- # pylint: disable-msg=W0201
317+ # pylint: disable=W0201
318 self.connection = Connection.recreate()
319 self.backend = self.connection.create_backend()
320 self.declare()
321@@ -125,7 +125,7 @@
322 # NOTE(vish): This is catching all errors because we really don't
323 # want exceptions to be logged 10 times a second if some
324 # persistent failure occurs.
325- except Exception: # pylint: disable-msg=W0703
326+ except Exception: # pylint: disable=W0703
327 if not self.failed_connection:
328 LOG.exception(_("Failed to fetch message from queue"))
329 self.failed_connection = True
330
331=== modified file 'nova/service.py'
332--- nova/service.py 2011-03-10 06:23:13 +0000
333+++ nova/service.py 2011-03-18 13:59:32 +0000
334@@ -217,7 +217,7 @@
335 logging.error(_("Recovered model server connection!"))
336
337 # TODO(vish): this should probably only catch connection errors
338- except Exception: # pylint: disable-msg=W0702
339+ except Exception: # pylint: disable=W0702
340 if not getattr(self, "model_disconnected", False):
341 self.model_disconnected = True
342 logging.exception(_("model server went away"))
343
344=== modified file 'nova/tests/api/test_wsgi.py'
345--- nova/tests/api/test_wsgi.py 2011-03-09 20:08:11 +0000
346+++ nova/tests/api/test_wsgi.py 2011-03-18 13:59:32 +0000
347@@ -80,7 +80,7 @@
348 "attributes": {
349 "test": ["id"]}}}
350
351- def show(self, req, id): # pylint: disable-msg=W0622,C0103
352+ def show(self, req, id): # pylint: disable=W0622,C0103
353 return {"test": {"id": id}}
354
355 def __init__(self):
356
357=== modified file 'nova/tests/hyperv_unittest.py'
358--- nova/tests/hyperv_unittest.py 2011-01-05 23:02:09 +0000
359+++ nova/tests/hyperv_unittest.py 2011-03-18 13:59:32 +0000
360@@ -51,7 +51,7 @@
361 instance_ref = db.instance_create(self.context, instance)
362
363 conn = hyperv.get_connection(False)
364- conn._create_vm(instance_ref) # pylint: disable-msg=W0212
365+ conn._create_vm(instance_ref) # pylint: disable=W0212
366 found = [n for n in conn.list_instances()
367 if n == instance_ref['name']]
368 self.assertTrue(len(found) == 1)
369
370=== modified file 'nova/tests/objectstore_unittest.py'
371--- nova/tests/objectstore_unittest.py 2011-02-23 19:56:37 +0000
372+++ nova/tests/objectstore_unittest.py 2011-03-18 13:59:32 +0000
373@@ -179,7 +179,7 @@
374 class TestHTTPChannel(http.HTTPChannel):
375 """Dummy site required for twisted.web"""
376
377- def checkPersistence(self, _, __): # pylint: disable-msg=C0103
378+ def checkPersistence(self, _, __): # pylint: disable=C0103
379 """Otherwise we end up with an unclean reactor."""
380 return False
381
382@@ -209,10 +209,10 @@
383
384 root = S3()
385 self.site = TestSite(root)
386- # pylint: disable-msg=E1101
387+ # pylint: disable=E1101
388 self.listening_port = reactor.listenTCP(0, self.site,
389 interface='127.0.0.1')
390- # pylint: enable-msg=E1101
391+ # pylint: enable=E1101
392 self.tcp_port = self.listening_port.getHost().port
393
394 if not boto.config.has_section('Boto'):
395@@ -231,11 +231,11 @@
396
397 self.conn.get_http_connection = get_http_connection
398
399- def _ensure_no_buckets(self, buckets): # pylint: disable-msg=C0111
400+ def _ensure_no_buckets(self, buckets): # pylint: disable=C0111
401 self.assertEquals(len(buckets), 0, "Bucket list was not empty")
402 return True
403
404- def _ensure_one_bucket(self, buckets, name): # pylint: disable-msg=C0111
405+ def _ensure_one_bucket(self, buckets, name): # pylint: disable=C0111
406 self.assertEquals(len(buckets), 1,
407 "Bucket list didn't have exactly one element in it")
408 self.assertEquals(buckets[0].name, name, "Wrong name")
409
410=== modified file 'nova/tests/test_api.py'
411--- nova/tests/test_api.py 2011-02-21 20:41:15 +0000
412+++ nova/tests/test_api.py 2011-03-18 13:59:32 +0000
413@@ -124,7 +124,7 @@
414 self.mox.StubOutWithMock(self.ec2, 'new_http_connection')
415 self.http = FakeHttplibConnection(
416 self.app, '%s:8773' % (self.host), False)
417- # pylint: disable-msg=E1103
418+ # pylint: disable=E1103
419 self.ec2.new_http_connection(host, is_secure).AndReturn(self.http)
420 return self.http
421
422
423=== modified file 'nova/tests/test_middleware.py'
424--- nova/tests/test_middleware.py 2011-01-15 01:48:48 +0000
425+++ nova/tests/test_middleware.py 2011-03-18 13:59:32 +0000
426@@ -40,12 +40,12 @@
427
428 class LockoutTestCase(test.TestCase):
429 """Test case for the Lockout middleware."""
430- def setUp(self): # pylint: disable-msg=C0103
431+ def setUp(self): # pylint: disable=C0103
432 super(LockoutTestCase, self).setUp()
433 utils.set_time_override()
434 self.lockout = ec2.Lockout(conditional_forbid)
435
436- def tearDown(self): # pylint: disable-msg=C0103
437+ def tearDown(self): # pylint: disable=C0103
438 utils.clear_time_override()
439 super(LockoutTestCase, self).tearDown()
440
441
442=== modified file 'po/nova.pot'
443--- po/nova.pot 2011-02-22 04:36:17 +0000
444+++ po/nova.pot 2011-03-18 13:59:32 +0000
445@@ -300,7 +300,7 @@
446 msgid "instance %s: starting..."
447 msgstr ""
448
449-#. pylint: disable-msg=W0702
450+#. pylint: disable=W0702
451 #: ../nova/compute/manager.py:219
452 #, python-format
453 msgid "instance %s: Failed to spawn"
454@@ -440,7 +440,7 @@
455 "instance %(instance_id)s: attaching volume %(volume_id)s to %(mountpoint)s"
456 msgstr ""
457
458-#. pylint: disable-msg=W0702
459+#. pylint: disable=W0702
460 #. NOTE(vish): The inline callback eats the exception info so we
461 #. log the traceback here and reraise the same
462 #. ecxception below.
463@@ -591,7 +591,7 @@
464 msgid "Starting Bridge interface for %s"
465 msgstr ""
466
467-#. pylint: disable-msg=W0703
468+#. pylint: disable=W0703
469 #: ../nova/network/linux_net.py:314
470 #, python-format
471 msgid "Hupping dnsmasq threw %s"
472@@ -602,7 +602,7 @@
473 msgid "Pid %d is stale, relaunching dnsmasq"
474 msgstr ""
475
476-#. pylint: disable-msg=W0703
477+#. pylint: disable=W0703
478 #: ../nova/network/linux_net.py:358
479 #, python-format
480 msgid "killing radvd threw %s"
481@@ -613,7 +613,7 @@
482 msgid "Pid %d is stale, relaunching radvd"
483 msgstr ""
484
485-#. pylint: disable-msg=W0703
486+#. pylint: disable=W0703
487 #: ../nova/network/linux_net.py:449
488 #, python-format
489 msgid "Killing dnsmasq threw %s"
490
491=== modified file 'tools/euca-get-ajax-console'
492--- tools/euca-get-ajax-console 2011-02-26 18:09:57 +0000
493+++ tools/euca-get-ajax-console 2011-03-18 13:59:32 +0000
494@@ -1,5 +1,5 @@
495 #!/usr/bin/env python
496-# pylint: disable-msg=C0103
497+# pylint: disable=C0103
498 # vim: tabstop=4 shiftwidth=4 softtabstop=4
499
500 # Copyright 2010 United States Government as represented by the