Skip to content

Commit de4e6a4

Browse files
author
Matthew McClure
committed
Moved the api key to the header and changed integration and live to put requests.
1 parent e996cb0 commit de4e6a4

File tree

1 file changed

+13
-24
lines changed

1 file changed

+13
-24
lines changed

zencoder/core.py

Lines changed: 13 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,8 @@ def headers(self):
6868

6969
return {'Content-Type': 'application/' + content_type,
7070
'Accepts': 'application/' + content_type,
71-
'User-Agent': 'Zencoder-Py v' + str(lib_version)}
71+
'User-Agent': 'Zencoder-Py v' + str(lib_version),
72+
'Zencoder-Api-Key': self.api_key}
7273

7374
def encode(self, data):
7475
"""
@@ -243,25 +244,22 @@ def details(self):
243244
"""
244245
Gets your account details.
245246
"""
246-
data = {'api_key': self.api_key}
247247

248-
return self.get(self.base_url, data=data)
248+
return self.get(self.base_url)
249249

250250
def integration(self):
251251
"""
252252
Puts your account into integration mode.
253253
"""
254-
data = {'api_key': self.api_key}
255254

256-
return self.get(self.base_url + '/integration', data=data)
255+
return self.put(self.base_url + '/integration')
257256

258257
def live(self):
259258
"""
260259
Puts your account into live mode.
261260
"""
262-
data = {'api_key': self.api_key}
263261

264-
return self.get(self.base_url + '/live', data=data)
262+
return self.put(self.base_url + '/live')
265263

266264
class Output(HTTPBackend):
267265
""" Gets information regarding outputs """
@@ -276,17 +274,13 @@ def progress(self, output_id):
276274
"""
277275
Gets the given output id's progress.
278276
"""
279-
data = {'api_key': self.api_key}
280-
return self.get(self.base_url + '/%s/progress' % str(output_id),
281-
data=data)
277+
return self.get(self.base_url + '/%s/progress' % str(output_id))
282278

283279
def details(self, output_id):
284280
"""
285281
Gets the given output id's details
286282
"""
287-
data = {'api_key': self.api_key}
288-
return self.get(self.base_url + '/%s' % str(output_id),
289-
data=data)
283+
return self.get(self.base_url + '/%s' % str(output_id))
290284

291285
class Job(HTTPBackend):
292286
"""
@@ -309,7 +303,7 @@ def create(self, input, outputs=None, options=None):
309303
"""
310304
as_test = int(self.test)
311305

312-
data = {"api_key": self.api_key, "input": input, "test": as_test}
306+
data = {"input": input, "test": as_test}
313307
if outputs:
314308
data['outputs'] = outputs
315309

@@ -325,29 +319,25 @@ def list(self, page=1, per_page=50):
325319
@param page: <int> the page of results to return
326320
@param per_page: <int> the number of results per page
327321
"""
328-
data = {"api_key": self.api_key,
329-
"page": page,
322+
data = {"page": page,
330323
"per_page": per_page}
331324
return self.get(self.base_url, data=data)
332325

333326
def details(self, job_id):
334327
"""
335328
Gets details for the given job
336329
"""
337-
data = {'api_key': self.api_key}
338-
return self.get(self.base_url + '/%s' % str(job_id), data=data)
330+
return self.get(self.base_url + '/%s' % str(job_id))
339331

340332
def progress(self, job_id):
341-
data = {'api_key': self.api_key}
342-
return self.get(self.base_url + '/%s/progress' % str(job_id), data=data)
333+
return self.get(self.base_url + '/%s/progress' % str(job_id))
343334

344335
def resubmit(self, job_id):
345336
"""
346337
Resubmits the given `job_id`
347338
"""
348-
data = {'api_key': self.api_key}
349339
url = self.base_url + '/%s/resubmit' % str(job_id)
350-
return self.put(url, data=data)
340+
return self.put(url)
351341

352342
def cancel(self, job_id):
353343
"""
@@ -358,9 +348,8 @@ def cancel(self, job_id):
358348
else:
359349
verb = self.put
360350

361-
data = {'api_key': self.api_key}
362351
url = self.base_url + '/%s/cancel' % str(job_id)
363-
return verb(url, data=data)
352+
return verb(url)
364353

365354
def delete(self, job_id):
366355
"""

0 commit comments

Comments
 (0)