Congegni
/
libretime
mirror of https://github.com/libretime/libretime.git
7
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed a few simple bugs

This commit is contained in:
Rudi Grinberg 2012-10-30 00:29:35 -04:00
parent a71bebc35b
commit a6417439af
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
python_apps/api_clients/api_client.py
View File

@ -67,7 +67,7 @@ class ApcUrl(object):
for k, v in params.iteritems(): for k, v in params.iteritems():
wrapped_param = "%%" + k + "%%" wrapped_param = "%%" + k + "%%"
if wrapped_param in temp_url: if wrapped_param in temp_url:
temp_url = temp_url.replace(wrapped_param, v) temp_url = temp_url.replace(wrapped_param, str(v))
else: raise UrlBadParam(self.base_url, k) else: raise UrlBadParam(self.base_url, k)
return ApcUrl(temp_url) return ApcUrl(temp_url)
@ -97,10 +97,11 @@ class RequestProvider(object):
# Now we must discover the possible actions # Now we must discover the possible actions
actions = dict( (k,v) for k,v in cfg.iteritems() if '%%api_key%%' in v) actions = dict( (k,v) for k,v in cfg.iteritems() if '%%api_key%%' in v)
for action_name, action_value in actions.iteritems(): for action_name, action_value in actions.iteritems():
new_url = self.url.params(action=action_value) new_url = self.url.params(action=action_value).params(
self.requests[action_name] = new_url api_key=self.config['api_key'])
self.requests[action_name] = ApiRequest(action_name, new_url)
def available_requests(self) : return self.requests.keys def available_requests(self) : return self.requests.keys()
def __contains__(self, request) : return request in self.requests def __contains__(self, request) : return request in self.requests
def __getattr__(self, attr): def __getattr__(self, attr):