]> review.fuel-infra Code Review - openstack-build/cinder-build.git/commitdiff
Replace missed basestring by six for python3 compatability
authorlisali <xiaoyan.li@intel.com>
Wed, 1 Jul 2015 03:05:27 +0000 (11:05 +0800)
committerlisali <xiaoyan.li@intel.com>
Wed, 1 Jul 2015 03:17:02 +0000 (11:17 +0800)
Basestring has been replaced by six.string_types in cinder except
the ones in the file v7000_common.py.

Change-Id: I43c0f4cd2e2a990df8d0cceea2f04ee33afe2104
Closes-Bug: #1470315

cinder/volume/drivers/violin/v7000_common.py

index e234706529a973c59a37f1801f1ad8312c4d1fe4..fba65080e1aa2517e519fb788d16f2925dc0e266 100644 (file)
@@ -430,7 +430,7 @@ class V7000Common(object):
         start = time.time()
         done = False
 
-        if isinstance(success_msgs, basestring):
+        if isinstance(success_msgs, six.string_types):
             success_msgs = [success_msgs]
 
         while not done:
@@ -486,7 +486,7 @@ class V7000Common(object):
         request_needed = True
         verify_needed = True
 
-        if isinstance(request_success_msgs, basestring):
+        if isinstance(request_success_msgs, six.string_types):
             request_success_msgs = [request_success_msgs]
 
         rargs = rargs if rargs else []