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/v1/resource_types.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/v1/resource_types.py')
| -rw-r--r-- | heatclient/v1/resource_types.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/heatclient/v1/resource_types.py b/heatclient/v1/resource_types.py index 9ffb80b..527e3bf 100644 --- a/heatclient/v1/resource_types.py +++ b/heatclient/v1/resource_types.py @@ -13,8 +13,9 @@ from six.moves.urllib import parse +from oslo.utils import encodeutils + from heatclient.openstack.common.apiclient import base -from heatclient.openstack.common import strutils class ResourceType(base.Resource): @@ -43,12 +44,12 @@ class ResourceTypeManager(base.BaseManager): :param resource_type: name of the resource type to get the details for """ url_str = '/resource_types/%s' % ( - parse.quote(strutils.safe_encode(resource_type), '')) + parse.quote(encodeutils.safe_encode(resource_type), '')) resp, body = self.client.json_request('GET', url_str) return body def generate_template(self, resource_type): url_str = '/resource_types/%s/template' % ( - parse.quote(strutils.safe_encode(resource_type), '')) + parse.quote(encodeutils.safe_encode(resource_type), '')) resp, body = self.client.json_request('GET', url_str) return body |