PEP8 remove direct type comparisons

Fixes bug #910763

According to PEP8,
- Object type comparisons should always use isinstance() instead
      of comparing types directly.

        Yes: if isinstance(obj, int):

        No: if type(obj) is type(1):

      When checking if an object is a string, keep in mind that it might be a
      unicode string too! In Python 2.3, str and unicode have a common base
      class, basestring, so you can do:

        if isinstance(obj, basestring):

Change-Id: I7c0fdecf99872f5b8f72b2c2ed4f5c539c33def1

bin/nova-manage

@@ -1084,7 +1084,7 @@ class ServiceCommands(object):
                      {"method": "show_host_resources",
                       "args": {"host": host}})
 
-        if type(result) != dict:
+        if not isinstance(result, dict):
             print _('An unexpected error has occurred.')
             print _('[Result]'), result
         else:

nova/api/direct.py

@@ -285,7 +285,7 @@ class ServiceWrapper(object):
         params = dict([(str(k), v) for (k, v) in params.iteritems()])
         result = method(context, **params)
 
-        if result is None or type(result) is str or type(result) is unicode:
+        if result is None or isinstance(result, basestring):
             return result
 
         try:

nova/api/ec2/cloud.py

@@ -812,7 +812,7 @@ class CloudController(object):
         LOG.audit(_("Get console output for instance %s"), instance_id,
                   context=context)
         # instance_id may be passed in as a list of instances
-        if type(instance_id) == list:
+        if isinstance(instance_id, list):
             ec2_id = instance_id[0]
         else:
             ec2_id = instance_id

nova/api/openstack/wsgi.py

@@ -366,7 +366,7 @@ class XMLDictSerializer(DictSerializer):
             result.setAttribute('xmlns', xmlns)
 
         #TODO(bcwaldon): accomplish this without a type-check
-        if type(data) is list:
+        if isinstance(data, list):
             collections = metadata.get('list_collections', {})
             if nodename in collections:
                 metadata = collections[nodename]
@@ -385,7 +385,7 @@ class XMLDictSerializer(DictSerializer):
                 node = self._to_xml_node(doc, metadata, singular, item)
                 result.appendChild(node)
         #TODO(bcwaldon): accomplish this without a type-check
-        elif type(data) is dict:
+        elif isinstance(data, dict):
             collections = metadata.get('dict_collections', {})
             if nodename in collections:
                 metadata = collections[nodename]
@@ -573,7 +573,7 @@ class Resource(wsgi.Application):
             LOG.info(_("HTTP exception thrown: %s"), unicode(ex))
             action_result = Fault(ex)
 
-        if type(action_result) is dict or action_result is None:
+        if isinstance(action_result, dict) or action_result is None:
             response = self.serializer.serialize(request,
                                                  action_result,
                                                  accept,

nova/api/openstack/xmlutil.py

@@ -29,7 +29,7 @@ XMLNS_ATOM = 'http://www.w3.org/2005/Atom'
 
 
 def validate_schema(xml, schema_name):
-    if type(xml) is str:
+    if isinstance(xml, str):
         xml = etree.fromstring(xml)
     base_path = 'nova/api/openstack/v2/schemas/v1.1/'
     if schema_name in ('atom', 'atom-link'):

nova/auth/ldapdriver.py

@@ -85,7 +85,7 @@ def _clean(attr):
     """Clean attr for insertion into ldap"""
     if attr is None:
         return None
-    if type(attr) is unicode:
+    if isinstance(attr, unicode):
         return str(attr)
     return attr
 

nova/common/cfg.py

@@ -962,9 +962,9 @@ class ConfigOpts(object):
         :param value: the string value, or list of string values
         :returns: the substituted string(s)
         """
-        if type(value) is list:
+        if isinstance(value, list):
             return [self._substitute(i) for i in value]
-        elif type(value) is str:
+        elif isinstance(value, str):
             tmpl = string.Template(value)
             return tmpl.safe_substitute(self.StrSubWrapper(self))
         else:

nova/network/model.py

@@ -17,7 +17,6 @@
 
 import json
 import netaddr
-import types
 
 from nova import exception
 
@@ -247,7 +246,7 @@ class NetworkInfo(list):
 
     @classmethod
     def hydrate(cls, network_info):
-        if isinstance(network_info, types.StringTypes):
+        if isinstance(network_info, basestring):
             network_info = json.loads(network_info)
         return NetworkInfo([VIF.hydrate(vif) for vif in network_info])
 

nova/network/quantum/client.py

@@ -155,7 +155,7 @@ class Client(object):
         action = Client.action_prefix + action
         action = action.replace('{tenant_id}', self.tenant)
 
-        if type(params) is dict:
+        if isinstance(params, dict):
             action += '?' + urllib.urlencode(params)
 
         try:
@@ -219,7 +219,7 @@ class Client(object):
     def serialize(self, data):
         if not data:
             return None
-        elif type(data) is dict:
+        elif isinstance(data, dict):
             return JSONSerializer().serialize(data, self.content_type())
         else:
             raise Exception(_("unable to deserialize object of type = '%s'" %

nova/rpc/impl_carrot.py

@@ -24,11 +24,11 @@ No fan-out support yet.
 
 """
 
+import inspect
 import json
 import sys
 import time
 import traceback
-import types
 import uuid
 
 from carrot import connection as carrot_connection
@@ -284,7 +284,7 @@ class AdapterConsumer(Consumer):
         try:
             rval = node_func(context=ctxt, **node_args)
             # Check if the result was a generator
-            if isinstance(rval, types.GeneratorType):
+            if inspect.isgenerator(rval):
                 for x in rval:
                     ctxt.reply(x, None)
             else:

nova/rpc/impl_fake.py

@@ -17,9 +17,9 @@
 queues.  Casts will block, but this is very useful for tests.
 """
 
+import inspect
 import sys
 import traceback
-import types
 
 from nova import context
 from nova.rpc import common as rpc_common
@@ -60,7 +60,7 @@ class Consumer(object):
             # if ending not 'sent'...we might have more data to
             # return from the function itself
             if not ctxt._done:
-                if isinstance(rval, types.GeneratorType):
+                if inspect.isgenerator(rval):
                     for val in rval:
                         yield val
                 else:

nova/rpc/impl_kombu.py

@@ -18,11 +18,11 @@ import kombu
 import kombu.entity
 import kombu.messaging
 import kombu.connection
+import inspect
 import itertools
 import sys
 import time
 import traceback
-import types
 import uuid
 
 import eventlet
@@ -651,7 +651,7 @@ class ProxyCallback(object):
         try:
             rval = node_func(context=ctxt, **node_args)
             # Check if the result was a generator
-            if isinstance(rval, types.GeneratorType):
+            if inspect.isgenerator(rval):
                 for x in rval:
                     ctxt.reply(x, None)
             else:

nova/scheduler/distributed_scheduler.py

@@ -21,7 +21,6 @@ Weighing Functions.
 
 import json
 import operator
-import types
 
 import M2Crypto
 
@@ -358,7 +357,7 @@ class DistributedScheduler(driver.Scheduler):
             return getattr(filters, nm)
 
         return [get_itm(itm) for itm in dir(filters)
-                if (type(get_itm(itm)) is types.TypeType)
+                if isinstance(get_itm(itm), type)
                 and issubclass(get_itm(itm), filters.AbstractHostFilter)
                 and get_itm(itm) is not filters.AbstractHostFilter]
 

nova/scheduler/zone_manager.py

@@ -140,7 +140,7 @@ class ReadOnlyDict(UserDict.IterableUserDict):
             return
         elif isinstance(source, UserDict.UserDict):
             self.data = source.data
-        elif isinstance(source, type({})):
+        elif isinstance(source, dict):
             self.data = source
         else:
             raise TypeError

nova/tests/fake_utils.py

@@ -17,7 +17,6 @@
 """This modules stubs out functions in nova.utils."""
 
 import re
-import types
 
 from eventlet import greenthread
 

nova/utils.py

@@ -33,7 +33,6 @@ import socket
 import struct
 import sys
 import time
-import types
 import uuid
 import pyclbr
 from xml.sax import saxutils
@@ -176,11 +175,11 @@ def execute(*cmd, **kwargs):
     process_input = kwargs.pop('process_input', None)
     check_exit_code = kwargs.pop('check_exit_code', [0])
     ignore_exit_code = False
-    if type(check_exit_code) == int:
+    if isinstance(check_exit_code, bool):
-        check_exit_code = [check_exit_code]
-    elif type(check_exit_code) == bool:
         ignore_exit_code = not check_exit_code
         check_exit_code = [0]
+    elif isinstance(check_exit_code, int):
+        check_exit_code = [check_exit_code]
     delay_on_retry = kwargs.pop('delay_on_retry', True)
     attempts = kwargs.pop('attempts', 1)
     run_as_root = kwargs.pop('run_as_root', False)
@@ -569,7 +568,7 @@ class LazyPluggable(object):
                 raise exception.Error(_('Invalid backend: %s') % backend_name)
 
             backend = self.__backends[backend_name]
-            if type(backend) == type(tuple()):
+            if isinstance(backend, tuple):
                 name = backend[0]
                 fromlist = backend[1]
             else:
@@ -696,13 +695,13 @@ def to_primitive(value, convert_instances=False, level=0):
     # The try block may not be necessary after the class check above,
     # but just in case ...
     try:
-        if type(value) is type([]) or type(value) is type((None,)):
+        if isinstance(value, (list, tuple)):
             o = []
             for v in value:
                 o.append(to_primitive(v, convert_instances=convert_instances,
                                       level=level))
             return o
-        elif type(value) is type({}):
+        elif isinstance(value, dict):
             o = {}
             for k, v in value.iteritems():
                 o[k] = to_primitive(v, convert_instances=convert_instances,
@@ -858,7 +857,7 @@ def get_from_path(items, path):
     if items is None:
         return results
 
-    if not isinstance(items, types.ListType):
+    if not isinstance(items, list):
         # Wrap single objects in a list
         items = [items]
 
@@ -871,7 +870,7 @@ def get_from_path(items, path):
         child = get_method(first_token)
         if child is None:
             continue
-        if isinstance(child, types.ListType):
+        if isinstance(child, list):
             # Flatten intermediate lists
             for x in child:
                 results.append(x)

nova/virt/vmwareapi/vim.py

@@ -167,7 +167,7 @@ class Vim:
     def _request_managed_object_builder(self, managed_object):
         """Builds the request managed object."""
         # Request Managed Object Builder
-        if type(managed_object) == type(""):
+        if isinstance(managed_object, str):
             mo = suds.sudsobject.Property(managed_object)
             mo._type = managed_object
         else:

tools/ajaxterm/qweb.py

@@ -1035,7 +1035,7 @@ class QWebRequest:
                 name_dict = cgi.parse_header(sub['Content-Disposition'])[1]
                 if 'filename' in name_dict:
                     # Nested MIME Messages are not supported'
-                    if type([]) == type(sub.get_payload()):
+                    if isinstance(sub.get_payload(), list):
                         continue
                     if not name_dict['filename'].strip():
                         continue