summaryrefslogtreecommitdiff
path: root/troveclient/shell.py
diff options
context:
space:
mode:
authorwangzihao <wangzihao@yovole.com>2020-10-12 19:30:57 +0800
committerwangzihao <wangzihao@yovole.com>2020-10-13 11:02:06 +0800
commit17d2d5175e322519da96c41c761027e49c10c766 (patch)
treef8b336d26b6699f0069d5eea70126a02ae2a24fa /troveclient/shell.py
parentdfb45e2b663008e4c4901417ff8d3e9966bae11d (diff)
downloadpython-troveclient-17d2d5175e322519da96c41c761027e49c10c766.tar.gz
Remove six
Remove all usages of six. Change-Id: I6ea8d1cdc3060d5c2a4311c7454b66ba75109b0c
Diffstat (limited to 'troveclient/shell.py')
-rw-r--r--troveclient/shell.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/troveclient/shell.py b/troveclient/shell.py
index 9d1b683..ef3aa43 100644
--- a/troveclient/shell.py
+++ b/troveclient/shell.py
@@ -34,7 +34,6 @@ from keystoneauth1 import loading
from oslo_utils import encodeutils
from oslo_utils import importutils
import pkg_resources
-import six
from troveclient.apiclient import exceptions as exc
import troveclient.auth_plugin
@@ -758,8 +757,8 @@ def main():
sys.exit(130)
except Exception as e:
LOG.debug(e, exc_info=1)
- message = six.text_type(e)
- if not isinstance(message, six.string_types):
+ message = str(e)
+ if not isinstance(message, str):
message = str(message)
print(_("ERROR: %s") % encodeutils.safe_encode(message),
file=sys.stderr)