@@ -88,13 +88,14 @@ def delete(self, url, params=None):
88
88
headers = self .headers )
89
89
return self .process (response , content )
90
90
91
- def get (self , url , params = None ):
91
+ def get (self , url , data = None ):
92
92
"""
93
93
Executes an HTTP GET request for the given URL
94
94
95
- params should be a urllib.urlencoded string
95
+ data should be a dictionary of url parameters
96
96
"""
97
- if params :
97
+ if data :
98
+ params = urlencode (data )
98
99
url = '?' .join ([url , params ])
99
100
100
101
response , content = self .http .request (url , method = "GET" ,
@@ -182,25 +183,23 @@ def details(self):
182
183
"""
183
184
data = {'api_key' : self .api_key }
184
185
185
- return self .get (self .base_url , params = urlencode ( data ) )
186
+ return self .get (self .base_url , data = data )
186
187
187
188
def integration (self ):
188
189
"""
189
190
Puts your account into integration mode.
190
191
"""
191
192
data = {'api_key' : self .api_key }
192
193
193
- return self .get (self .base_url + '/integration' ,
194
- params = urlencode (data ))
194
+ return self .get (self .base_url + '/integration' , data = data )
195
195
196
196
def live (self ):
197
197
"""
198
198
Puts your account into live mode."
199
199
"""
200
200
data = {'api_key' : self .api_key }
201
201
202
- return self .get (self .base_url + '/live' ,
203
- params = urlencode (data ))
202
+ return self .get (self .base_url + '/live' , data = data )
204
203
205
204
class Output (HTTPBackend ):
206
205
""" Gets information regarding outputs """
@@ -216,7 +215,7 @@ def progress(self, output_id):
216
215
"""
217
216
data = {'api_key' : self .api_key }
218
217
return self .get (self .base_url + '/%s/progress' % str (output_id ),
219
- params = urlencode ( data ) )
218
+ data = data )
220
219
221
220
class Job (HTTPBackend ):
222
221
"""
@@ -252,31 +251,28 @@ def list(self, page=1, per_page=50):
252
251
data = {"api_key" : self .api_key ,
253
252
"page" : page ,
254
253
"per_page" : per_page }
255
- return self .get (self .base_url , params = urlencode ( data ) )
254
+ return self .get (self .base_url , data = data )
256
255
257
256
def details (self , job_id ):
258
257
"""
259
258
Gets details for the given job
260
259
"""
261
260
data = {'api_key' : self .api_key }
262
- return self .get (self .base_url + '/%s' % str (job_id ),
263
- params = urlencode (data ))
261
+ return self .get (self .base_url + '/%s' % str (job_id ), data = data )
264
262
265
263
def resubmit (self , job_id ):
266
264
"""
267
265
Resubmits a job
268
266
"""
269
267
data = {'api_key' : self .api_key }
270
- return self .get (self .base_url + '/%s/resubmit' % str (job_id ),
271
- params = urlencode (data ))
268
+ return self .get (self .base_url + '/%s/resubmit' % str (job_id ), data = data )
272
269
273
270
def cancel (self , job_id ):
274
271
"""
275
272
Cancels a job
276
273
"""
277
274
data = {'api_key' : self .api_key }
278
- return self .get (self .base_url + '/%s/cancel' % str (job_id ),
279
- params = urlencode (data ))
275
+ return self .get (self .base_url + '/%s/cancel' % str (job_id ), data = data )
280
276
281
277
def delete (self , job_id ):
282
278
"""
0 commit comments