From 96438a6180066d0f3073e16744d61d75271da3d5 Mon Sep 17 00:00:00 2001 From: lisali Date: Wed, 1 Jul 2015 11:05:27 +0800 Subject: [PATCH] Replace missed basestring by six for python3 compatability 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 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cinder/volume/drivers/violin/v7000_common.py b/cinder/volume/drivers/violin/v7000_common.py index e23470652..fba65080e 100644 --- a/cinder/volume/drivers/violin/v7000_common.py +++ b/cinder/volume/drivers/violin/v7000_common.py @@ -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 [] -- 2.45.2