From 6fc17e3bb293b97799d2f72941bd0d15a84cb2d4 Mon Sep 17 00:00:00 2001 From: Garrett Holmstrom Date: Sat, 2 Feb 2013 22:42:26 -0800 Subject: [PATCH] Rename make_request -> send_request --- requestbuilder/request.py | 2 +- requestbuilder/service.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requestbuilder/request.py b/requestbuilder/request.py index 1b48186..be6830e 100644 --- a/requestbuilder/request.py +++ b/requestbuilder/request.py @@ -252,7 +252,7 @@ class BaseRequest(BaseCommand): headers = dict(self.headers or {}) headers.setdefault('User-Agent', self.user_agent) self.log.info('parameters: %s', params) - self.response = self.service.make_request(self.name, + self.response = self.service.send_request(self.name, method=self.method, headers=headers, params=params, data=self.post_data, api_version=self.API_VERSION) try: diff --git a/requestbuilder/service.py b/requestbuilder/service.py index 1a1592f..c09ba3f 100644 --- a/requestbuilder/service.py +++ b/requestbuilder/service.py @@ -127,7 +127,7 @@ class BaseService(object): ## TODO: nuke Action; the request should make it a param instead ## TODO: the same should probably happen with API versions, but the ## request would have to deal with service.API_VERSION, too - def make_request(self, action, method='GET', path=None, params=None, + def send_request(self, action, method='GET', path=None, params=None, headers=None, data=None, api_version=None): params = params or {} if action: