openstack/deb-cinder
Code Issues Proposed changes

Replace missed basestring by six for python3 compatability

Browse Source 
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
This commit is contained in:
lisali 2015-07-01 11:05:27 +08:00
parent 0330f251ce
commit 96438a6180
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cinder/volume/drivers/violin/v7000_common.py
View File

@ -430,7 +430,7 @@ class V7000Common(object):
start = time.time() start = time.time()
done = False done = False
if isinstance(success_msgs, basestring): if isinstance(success_msgs, six.string_types):
success_msgs = [success_msgs] success_msgs = [success_msgs]
while not done: while not done:
@ -486,7 +486,7 @@ class V7000Common(object):
request_needed = True request_needed = True
verify_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] request_success_msgs = [request_success_msgs]
rargs = rargs if rargs else [] rargs = rargs if rargs else []