diff options
author | Jia Dong <jiadong.jia@huawei.com> | 2014-02-14 15:04:14 +0800 |
---|---|---|
committer | joey5678 <jiadong.jia@huawei.com> | 2014-02-21 15:22:53 +0800 |
commit | f75c253650a8a36005c325eb5fdce7c7f6a3eceb (patch) | |
tree | f71e2a75284336f6bae669cedb90f69d6b10cb2c /ceilometerclient/openstack/common/apiclient/base.py | |
parent | 97957eae219a44cd31567e8987f01618f51d9e6a (diff) | |
download | python-ceilometerclient-f75c253650a8a36005c325eb5fdce7c7f6a3eceb.tar.gz |
py3kcompat: remove in python-ceilometerclient
Everything is already in six>=1.4.0 and we already depend on such a
version. There's no reason to keep this file. So remove py3kcompat
from python-ceilometerclient.
Change-Id: Ide6876e7a60377cb3843816d1d9ab2c589bc8f1b
Closes-Bug: #1280033
Diffstat (limited to 'ceilometerclient/openstack/common/apiclient/base.py')
-rw-r--r-- | ceilometerclient/openstack/common/apiclient/base.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ceilometerclient/openstack/common/apiclient/base.py b/ceilometerclient/openstack/common/apiclient/base.py index 1920b86..f8531f8 100644 --- a/ceilometerclient/openstack/common/apiclient/base.py +++ b/ceilometerclient/openstack/common/apiclient/base.py @@ -26,9 +26,9 @@ Base utilities to build API operation managers and objects on top of. import abc import six +from six.moves.urllib import parse from ceilometerclient.openstack.common.apiclient import exceptions -from ceilometerclient.openstack.common.py3kcompat import urlutils from ceilometerclient.openstack.common import strutils @@ -327,7 +327,7 @@ class CrudManager(BaseManager): return self._list( '%(base_url)s%(query)s' % { 'base_url': self.build_url(base_url=base_url, **kwargs), - 'query': '?%s' % urlutils.urlencode(kwargs) if kwargs else '', + 'query': '?%s' % parse.urlencode(kwargs) if kwargs else '', }, self.collection_key) @@ -366,7 +366,7 @@ class CrudManager(BaseManager): rl = self._list( '%(base_url)s%(query)s' % { 'base_url': self.build_url(base_url=base_url, **kwargs), - 'query': '?%s' % urlutils.urlencode(kwargs) if kwargs else '', + 'query': '?%s' % parse.urlencode(kwargs) if kwargs else '', }, self.collection_key) num = len(rl) |