summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRodrigo Duarte Sousa <rodrigods@lsd.ufcg.edu.br>2014-09-10 16:37:35 -0300
committerRodrigo Duarte Sousa <rodrigods@lsd.ufcg.edu.br>2014-09-24 21:22:29 -0300
commitbc50c9e48f4537d03d8c776652302de5c32250c5 (patch)
treecce60783e4aa9a6efc91bb0ed7c062b0309a0f4d
parent7684d956476254d4a297e62d5a3debe27c461d7c (diff)
downloadpython-keystoneclient-bc50c9e48f4537d03d8c776652302de5c32250c5.tar.gz
Extracting common code to private method
Created a private method to build URL queries. Change-Id: Iaa480443e34073fa39d13d2452cd13c267a2bdd5
-rw-r--r--keystoneclient/base.py13
1 files changed, 5 insertions, 8 deletions
diff --git a/keystoneclient/base.py b/keystoneclient/base.py
index a0618f9..2571a37 100644
--- a/keystoneclient/base.py
+++ b/keystoneclient/base.py
@@ -337,15 +337,15 @@ class CrudManager(Manager):
def head(self, **kwargs):
return self._head(self.build_url(dict_args_in_out=kwargs))
+ def _build_query(self, params):
+ return '?%s' % urllib.parse.urlencode(params) if params else ''
+
@filter_kwargs
def list(self, fallback_to_auth=False, **kwargs):
url = self.build_url(dict_args_in_out=kwargs)
try:
- if kwargs:
- query = '?%s' % urllib.parse.urlencode(kwargs)
- else:
- query = ''
+ query = self._build_query(kwargs)
url_query = '%(url)s%(query)s' % {'url': url, 'query': query}
return self._list(
url_query,
@@ -385,10 +385,7 @@ class CrudManager(Manager):
"""Find a single item with attributes matching ``**kwargs``."""
url = self.build_url(dict_args_in_out=kwargs)
- if kwargs:
- query = '?%s' % urllib.parse.urlencode(kwargs)
- else:
- query = ''
+ query = self._build_query(kwargs)
rl = self._list(
'%(url)s%(query)s' % {
'url': url,