diff options
| author | Steven Hardy <shardy@redhat.com> | 2014-10-29 16:51:15 +0000 |
|---|---|---|
| committer | Steven Hardy <shardy@redhat.com> | 2014-11-12 11:33:49 +0000 |
| commit | 5259f00827aa6e40dee38240762cb28d8f9c2cde (patch) | |
| tree | 022b52103a6d21ad6ad74d06b111909488f3553c /heatclient/shell.py | |
| parent | aea6e7dcbcbebfc5da869e220c5a1244368b3dd5 (diff) | |
| download | python-heatclient-5259f00827aa6e40dee38240762cb28d8f9c2cde.tar.gz | |
Convert strutils to oslo.utils.encodeutils
Convert the encode/decode functions from oslo-incubator to use
oslo.utils encodeutils, as the incubator functions are now
deprecated.
Also syncs oslo-incubator to 62394a3 to purge usage of strutils
from the openstack/common modules.
Note includes oslo fix https://review.openstack.org/#/c/133290/
which we need or the python3 tests won't pass.
Change-Id: I630fe3f3ce14ae745a8417bfe6552acd31341c9c
Partial-Bug: #1380629
Diffstat (limited to 'heatclient/shell.py')
| -rw-r--r-- | heatclient/shell.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/heatclient/shell.py b/heatclient/shell.py index c3733ae..7dcfcd0 100644 --- a/heatclient/shell.py +++ b/heatclient/shell.py @@ -23,6 +23,8 @@ import sys import six import six.moves.urllib.parse as urlparse +from oslo.utils import encodeutils + from keystoneclient.auth.identity import v2 as v2_auth from keystoneclient.auth.identity import v3 as v3_auth from keystoneclient import discover @@ -35,7 +37,6 @@ from heatclient.common import utils from heatclient import exc from heatclient.openstack.common.gettextutils import _ from heatclient.openstack.common import importutils -from heatclient.openstack.common import strutils logger = logging.getLogger(__name__) osprofiler_profiler = importutils.try_import("osprofiler.profiler") @@ -662,7 +663,7 @@ def main(args=None): if '--debug' in args or '-d' in args: raise else: - print(strutils.safe_encode(six.text_type(e)), file=sys.stderr) + print(encodeutils.safe_encode(six.text_type(e)), file=sys.stderr) sys.exit(1) if __name__ == "__main__": |