spla/Mastodonplus.py
1
0
Fork 0
Codi Incidències Sol·licituds Pull repo.project Llançaments Paquets Wiki Activitat

Switch to using requests Session objects

Explorar la Font
This commit is contained in:
Lorenz Diener 2018-05-06 01:36:48 +02:00
pare b9ffcd58c5
commit ad6b8eeb04
S'han modificat 1 arxius amb 4 adicions i 3 eliminacions
Mostrar estadístiques Descarregar el fitxer de pedaç Descarregar el fitxer de diferències Expand all files Collapse all files

7
mastodon/Mastodon.py
Veure arxiu

@ -194,6 +194,8 @@ class Mastodon:
self.request_timeout = request_timeout self.request_timeout = request_timeout
self.session = requests.Session()
# Versioning # Versioning
if mastodon_version == None: if mastodon_version == None:
self.retrieve_mastodon_version() self.retrieve_mastodon_version()
@ -1585,7 +1587,7 @@ class Mastodon:
else: else:
kwargs['data'] = params kwargs['data'] = params
response_object = requests.request( response_object = self.session.request(
method, self.api_base_url + endpoint, **kwargs) method, self.api_base_url + endpoint, **kwargs)
except Exception as e: except Exception as e:
raise MastodonNetworkError("Could not complete request: %s" % e) raise MastodonNetworkError("Could not complete request: %s" % e)
@ -1739,8 +1741,7 @@ class Mastodon:
# Connect function (called and then potentially passed to async handler) # Connect function (called and then potentially passed to async handler)
def connect_func(): def connect_func():
headers = {"Authorization": "Bearer " + self.access_token} headers = {"Authorization": "Bearer " + self.access_token}
connection = requests.get(url + endpoint, headers = headers, data = params, stream = True) connection = self.session.get(url + endpoint, headers = headers, data = params, stream = True)
if connection.status_code != 200: if connection.status_code != 200:
raise MastodonNetworkError("Could not connect to streaming server: %s" % connection.reason) raise MastodonNetworkError("Could not connect to streaming server: %s" % connection.reason)
return connection return connection