Merge branch 'master' into master

pull/80/head
Lorenz Diener 2017-09-08 13:44:30 +02:00 zatwierdzone przez GitHub
commit 74cb10eeff
1 zmienionych plików z 3 dodań i 3 usunięć

Wyświetl plik

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