diff options
| author | Lorenz Diener <[email protected]> | 2017-09-08 13:44:30 +0200 |
|---|---|---|
| committer | GitHub <[email protected]> | 2017-09-08 13:44:30 +0200 |
| commit | 74cb10eeff273c8ee66c0c0dcf43c5b60cd2eef1 (patch) | |
| tree | 8e3b5417e3abc626e2bfce0180a9f508db95d933 /mastodon | |
| parent | 6ef2724f66fbc9358c13e342a98f7385d25df4a1 (diff) | |
| parent | e56bf7b6e1c7c687b55fbe035f3492eb05eba2a1 (diff) | |
| download | mastodon.py-74cb10eeff273c8ee66c0c0dcf43c5b60cd2eef1.tar.gz | |
Merge branch 'master' into master
Diffstat (limited to 'mastodon')
| -rw-r--r-- | mastodon/Mastodon.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mastodon/Mastodon.py b/mastodon/Mastodon.py index 715da12..68f4914 100644 --- a/mastodon/Mastodon.py +++ b/mastodon/Mastodon.py | |||
| @@ -965,9 +965,9 @@ class Mastodon: | |||
| 965 | response_object = None | 965 | response_object = None |
| 966 | try: | 966 | try: |
| 967 | if method == 'GET': | 967 | if method == 'GET': |
| 968 | response_object = requests.get(self.api_base_url + endpoint, data=params, headers=headers, | 968 | response_object = requests.get(self.api_base_url + endpoint, params=params, |
| 969 | files=files, timeout=self.request_timeout) | 969 | headers=headers, files=files, |
| 970 | 970 | timeout=self.request_timeout) | |
| 971 | if method == 'POST': | 971 | if method == 'POST': |
| 972 | response_object = requests.post(self.api_base_url + endpoint, data=params, headers=headers, | 972 | response_object = requests.post(self.api_base_url + endpoint, data=params, headers=headers, |
| 973 | files=files, timeout=self.request_timeout) | 973 | files=files, timeout=self.request_timeout) |