Merge branch 'master' into master

This commit is contained in:
Lorenz Diener 2017-09-08 13:44:30 +02:00 cometido por GitHub
commit 74cb10eeff

Veure arxiu

@ -965,9 +965,9 @@ class Mastodon:
response_object = None response_object = None
try: try:
if method == 'GET': if method == 'GET':
response_object = requests.get(self.api_base_url + endpoint, data=params, headers=headers, response_object = requests.get(self.api_base_url + endpoint, params=params,
files=files, timeout=self.request_timeout) headers=headers, files=files,
timeout=self.request_timeout)
if method == 'POST': if method == 'POST':
response_object = requests.post(self.api_base_url + endpoint, data=params, headers=headers, response_object = requests.post(self.api_base_url + endpoint, data=params, headers=headers,
files=files, timeout=self.request_timeout) files=files, timeout=self.request_timeout)