@@ -37,7 +37,7 @@ class SauceClient: timeout=30): if base_url.endswith('/'): base_url = base_url[:-1] - self.baseUrl = base_url + self.base_url = base_url self.http = httplib2.Http(timeout=timeout) self.account_name = name self.http.add_credentials(name, access_key) @@ -55,11 +55,11 @@ class SauceClient: parameters = "?%s" % (urllib.urlencode(kwargs)) else: parameters = "" - url = self.baseUrl + "/rest/%s/%s/%s%s%s" % (self.account_name, - type, - doc_id, - attachment, - parameters) + url = self.base_url + "/rest/%s/%s/%s%s%s" % (self.account_name, + type, + doc_id, + attachment, + parameters) response, content = self.http.request(url, 'GET', headers=headers) if attachment: return content @@ -68,13 +68,13 @@ class SauceClient: def list(self, type): headers = {"Content-Type": "application/json"} - url = self.baseUrl + "/rest/%s/%s" % (self.account_name, type) + url = self.base_url + "/rest/%s/%s" % (self.account_name, type) response, content = self.http.request(url, 'GET', headers=headers) return simplejson.loads(content) def create(self, type, body): headers = {"Content-Type": "application/json"} - url = self.baseUrl + "/rest/%s/%s" % (self.account_name, type) + url = self.base_url + "/rest/%s/%s" % (self.account_name, type) body = simplejson.dumps(body) response, content = self.http.request(url, 'POST', @@ -83,16 +83,16 @@ class SauceClient: return simplejson.loads(content) def attach(self, doc_id, name, body): - url = self.baseUrl + "/rest/%s/scripts/%s/%s" % (self.account_name, - doc_id, name) + url = self.base_url + "/rest/%s/scripts/%s/%s" % (self.account_name, + doc_id, name) response, content = self.http.request(url, 'PUT', body=body) return simplejson.loads(content) def delete(self, type, doc_id): headers = {"Content-Type": "application/json"} - url = self.baseUrl + "/rest/%s/%s/%s" % (self.account_name, - type, - doc_id) + url = self.base_url + "/rest/%s/%s/%s" % (self.account_name, + type, + doc_id) response, content = self.http.request(url, 'DELETE', headers=headers) return simplejson.loads(content) saucerest.py fdeecc833e5e1233e21190921ecc4b523680fb75 sah sah@awesame.org http://github.com/saucelabs/saucerest-python/commit/d34d38a09c3c1b17d0722150d483e51231b3488a d34d38a09c3c1b17d0722150d483e51231b3488a 2009-10-01T15:01:10-07:00 2009-10-01T15:01:10-07:00 consistent variable naming scheme f_t_w 93066f73e054e5f3df71a28ec9acb13e089865a0 sah sah@awesame.org