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

Merge pull request #96 from ragingscholar/master

Explorar la Font 
Use urlparse instead of urllib.parse for python2.7
This commit is contained in:
Lorenz Diener 2017-10-16 11:19:05 +02:00 cometido por GitHub
commit 186b7135ff
S'han modificat 1 arxius amb 18 adicions i 15 eliminacions
Mostrar estadístiques Descarregar el fitxer de pedaç Descarregar el fitxer de diferències Expand all files Collapse all files

33
mastodon/Mastodon.py
Veure arxiu

@ -16,7 +16,10 @@ import dateutil.parser
import re import re
import copy import copy
import threading import threading
from urllib.parse import urlparse try:
from urllib.parse import urlparse
except ImportError:
from urlparse import urlparse
class Mastodon: class Mastodon:
@ -569,7 +572,7 @@ class Mastodon:
def toot(self, status): def toot(self, status):
""" """
Synonym for status_post that only takes the status text as input. Synonym for status_post that only takes the status text as input.
Usage in production code is not recommended. Usage in production code is not recommended.
Returns a toot dict with the new status. Returns a toot dict with the new status.
@ -901,7 +904,7 @@ class Mastodon:
If async is False, this method blocks forever. If async is False, this method blocks forever.
If async is True, 'listener' will listen on another thread and this method If async is True, 'listener' will listen on another thread and this method
will return a handle corresponding to the open connection. The will return a handle corresponding to the open connection. The
connection may be closed at any time by calling its close() method. connection may be closed at any time by calling its close() method.
""" """
@ -914,7 +917,7 @@ class Mastodon:
If async is False, this method blocks forever. If async is False, this method blocks forever.
If async is True, 'listener' will listen on another thread and this method If async is True, 'listener' will listen on another thread and this method
will return a handle corresponding to the open connection. The will return a handle corresponding to the open connection. The
connection may be closed at any time by calling its close() method. connection may be closed at any time by calling its close() method.
""" """
@ -927,7 +930,7 @@ class Mastodon:
If async is False, this method blocks forever. If async is False, this method blocks forever.
If async is True, 'listener' will listen on another thread and this method If async is True, 'listener' will listen on another thread and this method
will return a handle corresponding to the open connection. The will return a handle corresponding to the open connection. The
connection may be closed at any time by calling its close() method. connection may be closed at any time by calling its close() method.
""" """
@ -941,12 +944,12 @@ class Mastodon:
If async is False, this method blocks forever. If async is False, this method blocks forever.
If async is True, 'listener' will listen on another thread and this method If async is True, 'listener' will listen on another thread and this method
will return a handle corresponding to the open connection. The will return a handle corresponding to the open connection. The
connection may be closed at any time by calling its close() method. connection may be closed at any time by calling its close() method.
""" """
return self.__stream("/api/v1/streaming/hashtag?tag={}".format(tag), listener) return self.__stream("/api/v1/streaming/hashtag?tag={}".format(tag), listener)
### ###
# Internal helpers, dragons probably # Internal helpers, dragons probably
### ###
@ -982,7 +985,7 @@ class Mastodon:
except: except:
raise MastodonAPIError('Encountered invalid date.') raise MastodonAPIError('Encountered invalid date.')
return json_object return json_object
def __api_request(self, method, endpoint, params={}, files={}, do_ratelimiting=True): def __api_request(self, method, endpoint, params={}, files={}, do_ratelimiting=True):
""" """
Internal API request helper. Internal API request helper.
@ -1027,8 +1030,8 @@ 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, params=params, response_object = requests.get(self.api_base_url + endpoint, params=params,
headers=headers, files=files, headers=headers, files=files,
timeout=self.request_timeout) 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,
@ -1058,13 +1061,13 @@ class Mastodon:
response = response_object.json() response = response_object.json()
except: except:
raise MastodonAPIError('Endpoint not found.') raise MastodonAPIError('Endpoint not found.')
if isinstance(response, dict) and 'error' in response: if isinstance(response, dict) and 'error' in response:
raise MastodonAPIError("Mastodon API returned error: " + str(response['error'])) raise MastodonAPIError("Mastodon API returned error: " + str(response['error']))
else: else:
raise MastodonAPIError('Endpoint not found.') raise MastodonAPIError('Endpoint not found.')
if response_object.status_code == 500: if response_object.status_code == 500:
raise MastodonAPIError('General API problem.') raise MastodonAPIError('General API problem.')
@ -1075,11 +1078,11 @@ class Mastodon:
"Could not parse response as JSON, response code was %s, " "Could not parse response as JSON, response code was %s, "
"bad json content was '%s'" % (response_object.status_code, "bad json content was '%s'" % (response_object.status_code,
response_object.content)) response_object.content))
# See if the returned dict is an error dict even though status is 200 # See if the returned dict is an error dict even though status is 200
if isinstance(response, dict) and 'error' in response: if isinstance(response, dict) and 'error' in response:
raise MastodonAPIError("Mastodon API returned error: " + str(response['error'])) raise MastodonAPIError("Mastodon API returned error: " + str(response['error']))
# Parse link headers # Parse link headers
if isinstance(response, list) and \ if isinstance(response, list) and \
'Link' in response_object.headers and \ 'Link' in response_object.headers and \