openstack/python-keystoneclient
Code Issues Proposed changes

Extracting common code to private method

Browse Source 
Created a private method to build URL queries.

Change-Id: Iaa480443e34073fa39d13d2452cd13c267a2bdd5
This commit is contained in:
Rodrigo Duarte Sousa
2014-09-10 16:37:35 -03:00
parent 7684d95647
commit bc50c9e48f
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
keystoneclient/base.py
View File

@@ -337,15 +337,15 @@ class CrudManager(Manager):
def head(self, **kwargs): def head(self, **kwargs):
return self._head(self.build_url(dict_args_in_out=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 @filter_kwargs
def list(self, fallback_to_auth=False, **kwargs): def list(self, fallback_to_auth=False, **kwargs):
url = self.build_url(dict_args_in_out=kwargs) url = self.build_url(dict_args_in_out=kwargs)
try: try:
if kwargs: query = self._build_query(kwargs)
query = '?%s' % urllib.parse.urlencode(kwargs)
else:
query = ''
url_query = '%(url)s%(query)s' % {'url': url, 'query': query} url_query = '%(url)s%(query)s' % {'url': url, 'query': query}
return self._list( return self._list(
url_query, url_query,
@@ -385,10 +385,7 @@ class CrudManager(Manager):
"""Find a single item with attributes matching ``**kwargs``.""" """Find a single item with attributes matching ``**kwargs``."""
url = self.build_url(dict_args_in_out=kwargs) url = self.build_url(dict_args_in_out=kwargs)
if kwargs: query = self._build_query(kwargs)
query = '?%s' % urllib.parse.urlencode(kwargs)
else:
query = ''
rl = self._list( rl = self._list(
'%(url)s%(query)s' % { '%(url)s%(query)s' % {
'url': url, 'url': url,