diff --git a/lower-constraints.txt b/lower-constraints.txt index c82300c..0e045f8 100644 --- a/lower-constraints.txt +++ b/lower-constraints.txt @@ -66,7 +66,6 @@ requests==2.14.2 requestsexceptions==1.2.0 rfc3986==0.3.1 simplejson==3.5.1 -six==1.10.0 snowballstemmer==1.2.1 Sphinx==1.8.0 sphinxcontrib-websupport==1.0.1 diff --git a/requirements.txt b/requirements.txt index 1caa6c0..a4676fa 100644 --- a/requirements.txt +++ b/requirements.txt @@ -13,4 +13,3 @@ python-keystoneclient>=3.8.0 # Apache-2.0 python-openstackclient>=3.12.0 # Apache-2.0 PyYAML>=3.12 # MIT requests>=2.14.2 # Apache-2.0 -six>=1.10.0 # MIT diff --git a/searchlightclient/common/base.py b/searchlightclient/common/base.py index 56e1a2d..8b6f4c4 100644 --- a/searchlightclient/common/base.py +++ b/searchlightclient/common/base.py @@ -41,8 +41,7 @@ import abc import copy from oslo_utils import strutils -import six -from six.moves.urllib import parse +from urllib import parse from searchlightclient.common import exceptions from searchlightclient.i18n import _ @@ -224,8 +223,7 @@ class BaseManager(HookableMixin): return self.client.delete(url) -@six.add_metaclass(abc.ABCMeta) -class ManagerWithFind(BaseManager): +class ManagerWithFind(BaseManager, metaclass=abc.ABCMeta): """Manager with additional `find()`/`findall()` methods.""" @abc.abstractmethod diff --git a/searchlightclient/common/exceptions.py b/searchlightclient/common/exceptions.py index 0ea912e..ee99642 100644 --- a/searchlightclient/common/exceptions.py +++ b/searchlightclient/common/exceptions.py @@ -36,8 +36,6 @@ Exception definitions. import inspect import sys -import six - from searchlightclient.i18n import _ @@ -463,7 +461,7 @@ def from_response(response, method, url): kwargs["message"] = (error.get("message") or error.get("faultstring")) kwargs["details"] = (error.get("details") or - six.text_type(body)) + str(body)) elif content_type.startswith("text/"): kwargs["details"] = getattr(response, 'text', '') diff --git a/searchlightclient/common/utils.py b/searchlightclient/common/utils.py index f7d6bcb..c2d000c 100644 --- a/searchlightclient/common/utils.py +++ b/searchlightclient/common/utils.py @@ -23,10 +23,9 @@ from oslo_serialization import jsonutils from oslo_utils import encodeutils from oslo_utils import importutils import prettytable -import six -from six.moves.urllib import error -from six.moves.urllib import parse -from six.moves.urllib import request +from urllib import error +from urllib import parse +from urllib import request import yaml from searchlightclient import exc @@ -149,10 +148,7 @@ def print_update_list(lst, fields, formatters=None): pt.add_row(row) - if six.PY3: - print(encodeutils.safe_encode(pt.get_string()).decode()) - else: - print(encodeutils.safe_encode(pt.get_string())) + print(encodeutils.safe_encode(pt.get_string()).decode()) def find_resource(manager, name_or_id): diff --git a/searchlightclient/v1/facets.py b/searchlightclient/v1/facets.py index c555798..c297eb4 100644 --- a/searchlightclient/v1/facets.py +++ b/searchlightclient/v1/facets.py @@ -10,7 +10,7 @@ # License for the specific language governing permissions and limitations # under the License. -from six.moves.urllib import parse +from urllib import parse from searchlightclient.common import base