Merge "Nova-all: Replace basestring by six for python3 compatability"

nova/quota.py

@@ -21,6 +21,7 @@
 import datetime
 
 from oslo.config import cfg
+import six
 
 from nova import db
 from nova import exception
@@ -1057,7 +1058,7 @@ class QuotaEngine(object):
             return self.__driver
         if not self._driver_cls:
             self._driver_cls = CONF.quota_driver
-        if isinstance(self._driver_cls, basestring):
+        if isinstance(self._driver_cls, six.string_types):
             self._driver_cls = importutils.import_object(self._driver_cls)
         self.__driver = self._driver_cls
         return self.__driver

nova/scheduler/filters/affinity_filter.py

@@ -16,6 +16,7 @@
 
 
 import netaddr
+import six
 
 from nova.compute import api as compute
 from nova.openstack.common.gettextutils import _
@@ -41,7 +42,7 @@ class DifferentHostFilter(AffinityFilter):
         scheduler_hints = filter_properties.get('scheduler_hints') or {}
 
         affinity_uuids = scheduler_hints.get('different_host', [])
-        if isinstance(affinity_uuids, basestring):
+        if isinstance(affinity_uuids, six.string_types):
             affinity_uuids = [affinity_uuids]
         if affinity_uuids:
             return not self.compute_api.get_all(context,
@@ -65,7 +66,7 @@ class SameHostFilter(AffinityFilter):
         scheduler_hints = filter_properties.get('scheduler_hints') or {}
 
         affinity_uuids = scheduler_hints.get('same_host', [])
-        if isinstance(affinity_uuids, basestring):
+        if isinstance(affinity_uuids, six.string_types):
             affinity_uuids = [affinity_uuids]
         if affinity_uuids:
             return self.compute_api.get_all(context, {'host': host_state.host,

nova/scheduler/filters/json_filter.py

@@ -15,6 +15,7 @@
 
 
 import operator
+import six
 
 from nova.openstack.common import jsonutils
 from nova.scheduler import filters
@@ -117,7 +118,7 @@ class JsonFilter(filters.BaseHostFilter):
         for arg in query[1:]:
             if isinstance(arg, list):
                 arg = self._process_filter(arg, host_state)
-            elif isinstance(arg, basestring):
+            elif isinstance(arg, six.string_types):
                 arg = self._parse_string(arg, host_state)
             if arg is not None:
                 cooked_args.append(arg)

nova/utils.py

@@ -37,6 +37,7 @@ from xml.sax import saxutils
 import eventlet
 import netaddr
 from oslo.config import cfg
+import six
 
 from nova import exception
 from nova.openstack.common import excutils
@@ -948,7 +949,7 @@ def check_string_length(value, name, min_length=0, max_length=None):
     :param min_length: the min_length of the string
     :param max_length: the max_length of the string
     """
-    if not isinstance(value, basestring):
+    if not isinstance(value, six.string_types):
         msg = _("%s is not a string or unicode") % name
         raise exception.InvalidInput(message=msg)
 
@@ -1002,7 +1003,7 @@ def is_none_string(val):
     """
     Check if a string represents a None value.
     """
-    if not isinstance(val, basestring):
+    if not isinstance(val, six.string_types):
         return False
 
     return val.lower() == 'none'