Merge lp:~rackspace-titan/nova/pylint-issues-ameade into lp:~hudson-openstack/nova/trunk

[Alex Meade]

Cleaned up some of the larger pylint errors. Set to ignore some lines that pylint just couldn't understand.

[Brian Lamar (blamar)]

Can you give a brief explanation on why the move from super() calls to explicit __init__ calls? Also, remove commented code. Thanks!

review: Needs Fixing

[Todd Willey (xtoddx)]

No reason to keep old code around but commented out (line 34, 44).

I also like keeping the NotImplementedError methods around. Grep is nicer than having to read code to find what is missing.

[lp:~rackspace-titan/nova/pylint-issues-ameade]

1155. By Alex Meade on 2011-06-06

Removed commented code

[Alex Meade (alex-meade)]

@Brian pylint complains when using super with old style classes because Python's Super is considered harmful.

@Todd the functions that were not implemented got implemented and the old stub methods that returned NotImplementedError were not removed. Take a look at the file in trunk if I'm not making sense.

Thanks for the quick reviews guys :)

[Josh Kearney (jk0)]

You're going to want to use 2 spaces for inline pylint comments (ex: foo # bar), otherwise this merge will not pass PEP8.

review: Needs Fixing

[lp:~rackspace-titan/nova/pylint-issues-ameade]

1156. By Alex Meade on 2011-06-07

pep8

[Alex Meade (alex-meade)]

Fixed pep8

[Josh Kearney (jk0)]

Looks good to me.

review: Approve

[Devin Carlen (devcamcar)]

lgtm

review: Approve

[Brian Lamar (blamar)]

review: Approve

=== modified file 'nova/api/direct.py'
--- nova/api/direct.py	2011-05-19 20:16:06 +0000
+++ nova/api/direct.py	2011-06-07 19:19:28 +0000
@@ -324,7 +324,7 @@
 
     def __init__(self, proxy):
         self._proxy = proxy
-        if not self.__doc__:
+        if not self.__doc__:  # pylint: disable=E0203
             self.__doc__ = proxy.__doc__
         if not self._allowed:
             self._allowed = []

=== modified file 'nova/api/ec2/admin.py'
--- nova/api/ec2/admin.py	2011-06-02 21:23:05 +0000
+++ nova/api/ec2/admin.py	2011-06-07 19:19:28 +0000
@@ -324,7 +324,3 @@
             rv.append(host_dict(host, compute, instances, volume, volumes,
                                 now))
         return {'hosts': rv}
-
-    def describe_host(self, _context, name, **_kwargs):
-        """Returns status info for single node."""
-        return host_dict(db.host_get(name))

=== modified file 'nova/api/openstack/extensions.py'
--- nova/api/openstack/extensions.py	2011-05-20 19:29:23 +0000
+++ nova/api/openstack/extensions.py	2011-06-07 19:19:28 +0000
@@ -137,7 +137,7 @@
 
     def __init__(self, application):
         controller = ActionExtensionController(application)
-        super(ActionExtensionResource, self).__init__(controller)
+        wsgi.Resource.__init__(self, controller)
 
     def add_action(self, action_name, handler):
         self.controller.add_action(action_name, handler)
@@ -164,7 +164,7 @@
 
     def __init__(self, application):
         controller = RequestExtensionController(application)
-        super(RequestExtensionResource, self).__init__(controller)
+        wsgi.Resource.__init__(self, controller)
 
     def add_handler(self, handler):
         self.controller.add_handler(handler)

=== modified file 'nova/api/openstack/views/limits.py'
--- nova/api/openstack/views/limits.py	2011-05-23 15:23:40 +0000
+++ nova/api/openstack/views/limits.py	2011-06-07 19:19:28 +0000
@@ -29,9 +29,6 @@
     def _build_rate_limit(self, rate_limit):
         raise NotImplementedError()
 
-    def _build_absolute_limits(self, absolute_limit):
-        raise NotImplementedError()
-
     def build(self, rate_limits, absolute_limits):
         rate_limits = self._build_rate_limits(rate_limits)
         absolute_limits = self._build_absolute_limits(absolute_limits)
@@ -67,12 +64,6 @@
                     limits[name] = value
         return limits
 
-    def _build_rate_limits(self, rate_limits):
-        raise NotImplementedError()
-
-    def _build_rate_limit(self, rate_limit):
-        raise NotImplementedError()
-
 
 class ViewBuilderV10(ViewBuilder):
     """Openstack API v1.0 limits view builder."""

=== modified file 'nova/db/sqlalchemy/api.py'
--- nova/db/sqlalchemy/api.py	2011-06-06 20:08:58 +0000
+++ nova/db/sqlalchemy/api.py	2011-06-07 19:19:28 +0000
@@ -743,7 +743,7 @@
                  filter_by(instance_id=instance_id).\
                  filter_by(deleted=False)
     if not rv:
-        raise exception.NoFloatingIpsFoundForInstance(instance_id=instance_id)
+        raise exception.NoFixedIpsFoundForInstance(instance_id=instance_id)
     return rv
 
 

=== modified file 'nova/db/sqlalchemy/models.py'
--- nova/db/sqlalchemy/models.py	2011-06-03 15:11:01 +0000
+++ nova/db/sqlalchemy/models.py	2011-06-07 19:19:28 +0000
@@ -46,6 +46,7 @@
     updated_at = Column(DateTime, onupdate=utils.utcnow)
     deleted_at = Column(DateTime)
     deleted = Column(Boolean, default=False)
+    metadata = None
 
     def save(self, session=None):
         """Save this object."""

=== modified file 'nova/tests/xenapi/stubs.py'
--- nova/tests/xenapi/stubs.py	2011-05-26 19:27:27 +0000
+++ nova/tests/xenapi/stubs.py	2011-06-07 19:19:28 +0000
@@ -42,20 +42,6 @@
 
     stubs.Set(vm_utils.VMHelper, 'fetch_image', fake_fetch_image)
 
-    def fake_wait_for_vhd_coalesce(session, instance_id, sr_ref, vdi_ref,
-                              original_parent_uuid):
-        from nova.virt.xenapi.fake import create_vdi
-        name_label = "instance-%s" % instance_id
-        #TODO: create fake SR record
-        sr_ref = "fakesr"
-        vdi_ref = create_vdi(name_label=name_label, read_only=False,
-                             sr_ref=sr_ref, sharable=False)
-        vdi_rec = session.get_xenapi().VDI.get_record(vdi_ref)
-        vdi_uuid = vdi_rec['uuid']
-        return vdi_uuid
-
-    stubs.Set(vm_utils.VMHelper, 'fetch_image', fake_fetch_image)
-
     def fake_parse_xmlrpc_value(val):
         return val
 
@@ -251,10 +237,10 @@
     def __init__(self, uri):
         super(FakeSessionForMigrationTests, self).__init__(uri)
 
-    def VDI_get_by_uuid(*args):
+    def VDI_get_by_uuid(self, *args):
         return 'hurr'
 
-    def VDI_resize_online(*args):
+    def VDI_resize_online(self, *args):
         pass
 
     def VM_start(self, _1, ref, _2, _3):

=== modified file 'nova/twistd.py'
--- nova/twistd.py	2011-02-21 21:46:41 +0000
+++ nova/twistd.py	2011-06-07 19:19:28 +0000
@@ -78,7 +78,7 @@
             self._absorbParameters()
             self._absorbHandlers()
 
-            super(TwistedOptionsToFlags, self).__init__()
+            wrapped.__init__(self)
 
         def _absorbFlags(self):
             twistd_flags = []
@@ -163,12 +163,12 @@
         def parseArgs(self, *args):
             # TODO(termie): figure out a decent way of dealing with args
             #return
-            super(TwistedOptionsToFlags, self).parseArgs(*args)
+            wrapped.parseArgs(self, *args)
 
         def postOptions(self):
             self._doHandlers()
 
-            super(TwistedOptionsToFlags, self).postOptions()
+            wrapped.postOptions(self)
 
         def __getitem__(self, key):
             key = key.replace('-', '_')

=== modified file 'nova/utils.py'
--- nova/utils.py	2011-06-03 15:11:01 +0000
+++ nova/utils.py	2011-06-07 19:19:28 +0000
@@ -142,24 +142,26 @@
             env = os.environ.copy()
             if addl_env:
                 env.update(addl_env)
+            _PIPE = subprocess.PIPE  # pylint: disable=E1101
             obj = subprocess.Popen(cmd,
-                                   stdin=subprocess.PIPE,
-                                   stdout=subprocess.PIPE,
-                                   stderr=subprocess.PIPE,
+                                   stdin=_PIPE,
+                                   stdout=_PIPE,
+                                   stderr=_PIPE,
                                    env=env)
             result = None
             if process_input is not None:
                 result = obj.communicate(process_input)
             else:
                 result = obj.communicate()
-            obj.stdin.close()
-            if obj.returncode:
-                LOG.debug(_('Result was %s') % obj.returncode)
+            obj.stdin.close()  # pylint: disable=E1101
+            _returncode = obj.returncode  # pylint: disable=E1101
+            if _returncode:
+                LOG.debug(_('Result was %s') % _returncode)
                 if type(check_exit_code) == types.IntType \
-                        and obj.returncode != check_exit_code:
+                        and _returncode != check_exit_code:
                     (stdout, stderr) = result
                     raise exception.ProcessExecutionError(
-                            exit_code=obj.returncode,
+                            exit_code=_returncode,
                             stdout=stdout,
                             stderr=stderr,
                             cmd=' '.join(cmd))

=== modified file 'nova/virt/xenapi/fake.py'
--- nova/virt/xenapi/fake.py	2011-06-02 21:23:05 +0000
+++ nova/virt/xenapi/fake.py	2011-06-07 19:19:28 +0000
@@ -340,10 +340,6 @@
             return
         db_ref['xenstore_data'][key] = None
 
-    def network_get_all_records_where(self, _1, _2):
-        # TODO (salvatore-orlando): filter table on _2
-        return _db_content['network']
-
     def VM_add_to_xenstore_data(self, _1, vm_ref, key, value):
         db_ref = _db_content['VM'][vm_ref]
         if not 'xenstore_data' in db_ref:
@@ -354,7 +350,7 @@
         #Always return 12GB available
         return 12 * 1024 * 1024 * 1024
 
-    def host_call_plugin(*args):
+    def host_call_plugin(self, *args):
         return 'herp'
 
     def network_get_all_records_where(self, _1, filter):