From a635fd21999a3886987043b7e9890d5d84f3c6ac Mon Sep 17 00:00:00 2001 From: dineshbhor Date: Fri, 5 Aug 2016 17:23:03 +0530 Subject: [PATCH] Use 'six' instead of oslo_utils.strutils.six 'six' is an independent third party module so it doesn't need to be imported and used from oslo_utils.strutils. TrivialFix Change-Id: Icb3232bb1ebae0e8332e66c5806474d7f9dfd6df --- cinderclient/shell.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cinderclient/shell.py b/cinderclient/shell.py index 3938bacca..cb2d496c4 100644 --- a/cinderclient/shell.py +++ b/cinderclient/shell.py @@ -43,7 +43,7 @@ from keystoneauth1.exceptions import DiscoveryFailure import six.moves.urllib.parse as urlparse from oslo_utils import encodeutils from oslo_utils import importutils -from oslo_utils import strutils +import six osprofiler_profiler = importutils.try_import("osprofiler.profiler") @@ -884,7 +884,7 @@ def main(): sys.exit(130) except Exception as e: logger.debug(e, exc_info=1) - print("ERROR: %s" % strutils.six.text_type(e), file=sys.stderr) + print("ERROR: %s" % six.text_type(e), file=sys.stderr) sys.exit(1)