Skip to content

Commit

Permalink
Extract subaccount on all transmissions calls
Browse files Browse the repository at this point in the history
  • Loading branch information
Rich Leland committed May 24, 2017
1 parent eeed74a commit b16c468
Showing 1 changed file with 14 additions and 8 deletions.
22 changes: 14 additions & 8 deletions sparkpost/transmissions.py
Original file line number Diff line number Diff line change
Expand Up @@ -251,15 +251,18 @@ def send(self, **kwargs):
"""

payload = self._translate_keys(**kwargs)
results = self.request('POST', self.uri, data=json.dumps(payload))
subaccount = kwargs.pop('subaccount', 0)
results = self.request('POST', self.uri, data=json.dumps(payload),
subaccount=subaccount)
return results

def _fetch_get(self, transmission_id):
def _fetch_get(self, transmission_id, **kwargs):
uri = "%s/%s" % (self.uri, transmission_id)
results = self.request('GET', uri)
subaccount = kwargs.pop('subaccount', 0)
results = self.request('GET', uri, subaccount=subaccount)
return results

def get(self, transmission_id):
def get(self, transmission_id, **kwargs):
"""
Get a transmission by ID
Expand All @@ -268,7 +271,7 @@ def get(self, transmission_id):
:returns: the requested transmission if found
:raises: :exc:`SparkPostAPIException` if transmission is not found
"""
results = self._fetch_get(transmission_id)
results = self._fetch_get(transmission_id, **kwargs)
return results['transmission']

def list(self, **kwargs):
Expand All @@ -285,9 +288,11 @@ def list(self, **kwargs):
'check https://sparkpo.st/5qcj4.'

warnings.warn(warn_msg, DeprecationWarning)
return self.request('GET', self.uri, params=kwargs)
subaccount = kwargs.pop('subaccount', 0)
return self.request('GET', self.uri, params=kwargs,
subaccount=subaccount)

def delete(self, transmission_id):
def delete(self, transmission_id, **kwargs):
"""
Delete a transmission by ID
Expand All @@ -298,5 +303,6 @@ def delete(self, transmission_id):
or Canceled
"""
uri = "%s/%s" % (self.uri, transmission_id)
results = self.request('DELETE', uri)
subaccount = kwargs.pop('subaccount', 0)
results = self.request('DELETE', uri, subaccount=subaccount)
return results

0 comments on commit b16c468

Please sign in to comment.