diff options
| author | llg8212 <lilinguo@huawei.com> | 2014-02-24 09:32:52 +0800 |
|---|---|---|
| committer | llg8212 <lilinguo@huawei.com> | 2014-03-18 10:27:55 +0800 |
| commit | 9d3d26d903d269a3bbaabde4ddcc411c28fe3f01 (patch) | |
| tree | c89e7c491f6c1df5a517ad659f0a84008b4a0e2f /heatclient/v1/resources.py | |
| parent | 7e265ec757f26bce5038bdcc7fa81abd823e328f (diff) | |
| download | python-heatclient-9d3d26d903d269a3bbaabde4ddcc411c28fe3f01.tar.gz | |
Remove dependent module py3kcompat
Module py3kcompat was removed from oslo-incubator, we can use
six directly.
* Sync commit of removing py3kcompat from oslo
* use six replace usage of py3kcompat
Change-Id: If0f9397588b2180fe198e804cbbb5b5c8420fe76
Closes-Bug: #1280033
Diffstat (limited to 'heatclient/v1/resources.py')
| -rw-r--r-- | heatclient/v1/resources.py | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/heatclient/v1/resources.py b/heatclient/v1/resources.py index 10dd5f4..a51fb0f 100644 --- a/heatclient/v1/resources.py +++ b/heatclient/v1/resources.py @@ -13,8 +13,9 @@ # License for the specific language governing permissions and limitations # under the License. +from six.moves.urllib import parse + from heatclient.openstack.common.apiclient import base -from heatclient.openstack.common.py3kcompat import urlutils from heatclient.openstack.common import strutils from heatclient.v1 import stacks @@ -52,10 +53,9 @@ class ResourceManager(stacks.StackChildManager): :param resource_name: ID of resource to get the details for """ stack_id = self._resolve_stack_id(stack_id) - # Use urlutils for python2/python3 compatibility url_str = '/stacks/%s/resources/%s' % ( - urlutils.quote(stack_id, ''), - urlutils.quote(strutils.safe_encode(resource_name), '')) + parse.quote(stack_id, ''), + parse.quote(strutils.safe_encode(resource_name), '')) resp, body = self.client.json_request('GET', url_str) return Resource(self, body['resource']) @@ -66,10 +66,9 @@ class ResourceManager(stacks.StackChildManager): :param resource_name: ID of resource to get metadata for """ stack_id = self._resolve_stack_id(stack_id) - # Use urlutils for python2/python3 compatibility url_str = '/stacks/%s/resources/%s/metadata' % ( - urlutils.quote(stack_id, ''), - urlutils.quote(strutils.safe_encode(resource_name), '')) + parse.quote(stack_id, ''), + parse.quote(strutils.safe_encode(resource_name), '')) resp, body = self.client.json_request('GET', url_str) return body['metadata'] @@ -81,14 +80,13 @@ class ResourceManager(stacks.StackChildManager): """ stack_id = self._resolve_stack_id(stack_id) url_str = '/stacks/%s/resources/%s/signal' % ( - urlutils.quote(stack_id, ''), - urlutils.quote(strutils.safe_encode(resource_name), '')) + parse.quote(stack_id, ''), + parse.quote(strutils.safe_encode(resource_name), '')) resp, body = self.client.json_request('POST', url_str, data=data) return body def generate_template(self, resource_name): - # Use urlutils for python2/python3 compatibility url_str = '/resource_types/%s/template' % ( - urlutils.quote(strutils.safe_encode(resource_name), '')) + parse.quote(strutils.safe_encode(resource_name), '')) resp, body = self.client.json_request('GET', url_str) return body |