From a6417439afac078f7855d15094db45319f31421c Mon Sep 17 00:00:00 2001
From: Rudi Grinberg <rudi.grinberg@gmail.com>
Date: Tue, 30 Oct 2012 00:29:35 -0400
Subject: [PATCH] Fixed a few simple bugs
---
python_apps/api_clients/api_client.py | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/python_apps/api_clients/api_client.py b/python_apps/api_clients/api_client.py
index 6c2d1cf36..e09ce870b 100644
--- a/python_apps/api_clients/api_client.py
+++ b/python_apps/api_clients/api_client.py
@@ -67,7 +67,7 @@ class ApcUrl(object):
for k, v in params.iteritems():
wrapped_param = "%%" + k + "%%"
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)
return ApcUrl(temp_url)
@@ -97,10 +97,11 @@ class RequestProvider(object):
# Now we must discover the possible actions
actions = dict( (k,v) for k,v in cfg.iteritems() if '%%api_key%%' in v)
for action_name, action_value in actions.iteritems():
- new_url = self.url.params(action=action_value)
- self.requests[action_name] = new_url
+ new_url = self.url.params(action=action_value).params(
+ 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 __getattr__(self, attr):