diff --git a/venusclient/common/base.py b/venusclient/common/base.py index 9fe5cc5..3f76106 100644 --- a/venusclient/common/base.py +++ b/venusclient/common/base.py @@ -21,7 +21,7 @@ Base utilities to build API operation managers and objects on top of. import copy -import six.moves.urllib.parse as urlparse +import urllib.parse as urlparse from venusclient.common.apiclient import base diff --git a/venusclient/common/http.py b/venusclient/common/http.py index f34bc4c..2e432eb 100644 --- a/venusclient/common/http.py +++ b/venusclient/common/http.py @@ -24,8 +24,7 @@ from oslo_serialization import jsonutils from oslo_utils import encodeutils from oslo_utils import importutils import requests -import six -from six.moves.urllib import parse +from urllib import parse from venusclient.common import exceptions as exc from venusclient.common import utils @@ -137,7 +136,7 @@ class HTTPClient(object): dump.append('') if resp.content: content = resp.content - if isinstance(content, six.binary_type): + if isinstance(content, bytes): content = content.decode() dump.extend([content, '']) LOG.debug('\n'.join(dump))