Merge "Replace missed basestring by six for python3 compatability"

This commit is contained in:
Jenkins 2015-07-01 22:16:35 +00:00 committed by Gerrit Code Review
commit 09197f46d5

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 []