Skip to content

Commit

Permalink
Merge pull request #29 from mailjet/develop
Browse files Browse the repository at this point in the history
Add action_id to get
  • Loading branch information
mskochev committed Nov 19, 2018
2 parents 3a6b8bb + 01f17fe commit 49a1a72
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion mailjet_rest/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ def get_many(self, filters=None, action_id=None, **kwargs):
return self._get(filters=filters, action_id=action_id **kwargs)

def get(self, id=None, filters=None, action_id=None, **kwargs):
return self._get(id=id, filters=filters, **kwargs)
return self._get(id=id, filters=filters, action_id=action_id, **kwargs)

def create(self, data=None, filters=None, id=None, action_id=None, **kwargs):
if self.headers['Content-type'] == 'application/json':
Expand Down
2 changes: 1 addition & 1 deletion mailjet_rest/utils/version.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
VERSION = (1, 3, 1)
VERSION = (1, 3, 2)


def get_version(version=None):
Expand Down
2 changes: 1 addition & 1 deletion test.py
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ def test_user_agent(self):
auth=self.auth,
version='v3.1'
)
self.assertEqual(self.client.config.user_agent, 'mailjet-apiv3-python/v1.3.1')
self.assertEqual(self.client.config.user_agent, 'mailjet-apiv3-python/v1.3.2')


if __name__ == '__main__':
Expand Down

0 comments on commit 49a1a72

Please sign in to comment.