Merge "Remove six from SandStone driver"
This commit is contained in:
commit
d3fa11028a
@ -21,7 +21,6 @@ import time
|
|||||||
|
|
||||||
from oslo_log import log as logging
|
from oslo_log import log as logging
|
||||||
import requests
|
import requests
|
||||||
import six
|
|
||||||
|
|
||||||
from cinder import exception
|
from cinder import exception
|
||||||
from cinder.i18n import _
|
from cinder.i18n import _
|
||||||
@ -98,7 +97,7 @@ class RestCmd(object):
|
|||||||
raise exception.VolumeBackendAPIException(msg)
|
raise exception.VolumeBackendAPIException(msg)
|
||||||
else:
|
else:
|
||||||
return {"error": {"code": exc.response.status_code,
|
return {"error": {"code": exc.response.status_code,
|
||||||
"description": six.text_type(exc)}}
|
"description": str(exc)}}
|
||||||
|
|
||||||
if not filter_flag:
|
if not filter_flag:
|
||||||
LOG.info('''
|
LOG.info('''
|
||||||
|
Loading…
x
Reference in New Issue
Block a user