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

Merge pull request #134 from keponk/dev

Explorar la Font 
update constructor to support access_token only
This commit is contained in:
Lorenz Diener 2018-05-19 18:47:57 +02:00 cometido por GitHub
commit f8ba37b42e
No se encontró ninguna clave conocida en la base de datos para esta firma
ID de clave GPG: 4AEE18F83AFDEB23
S'han modificat 1 arxius amb 14 adicions i 11 eliminacions
Mostrar estadístiques Descarregar el fitxer de pedaç Descarregar el fitxer de diferències Expand all files Collapse all files

25
mastodon/Mastodon.py
Veure arxiu

@ -174,7 +174,7 @@ class Mastodon:
### ###
# Authentication, including constructor # Authentication, including constructor
### ###
def __init__(self, client_id, client_secret=None, access_token=None, def __init__(self, client_id=None, client_secret=None, access_token=None,
api_base_url=__DEFAULT_BASE_URL, debug_requests=False, api_base_url=__DEFAULT_BASE_URL, debug_requests=False,
ratelimit_method="wait", ratelimit_pacefactor=1.1, ratelimit_method="wait", ratelimit_pacefactor=1.1,
request_timeout=__DEFAULT_TIMEOUT, mastodon_version=None, request_timeout=__DEFAULT_TIMEOUT, mastodon_version=None,
@ -248,17 +248,20 @@ class Mastodon:
raise MastodonIllegalArgumentError("Invalid ratelimit method.") raise MastodonIllegalArgumentError("Invalid ratelimit method.")
# Token loading # Token loading
if os.path.isfile(self.client_id): if self.client_id is None and self.access_token is None:
with open(self.client_id, 'r') as secret_file: raise MastodonIllegalArgumentError('No credentials were given.')
self.client_id = secret_file.readline().rstrip() if self.client_id is not None:
self.client_secret = secret_file.readline().rstrip() if os.path.isfile(self.client_id):
else: with open(self.client_id, 'r') as secret_file:
if self.client_secret is None: self.client_id = secret_file.readline().rstrip()
raise MastodonIllegalArgumentError('Specified client id directly, but did not supply secret') self.client_secret = secret_file.readline().rstrip()
else:
if self.client_secret is None:
raise MastodonIllegalArgumentError('Specified client id directly, but did not supply secret')
if self.access_token is not None and os.path.isfile(self.access_token): if self.access_token is not None and os.path.isfile(self.access_token):
with open(self.access_token, 'r') as token_file: with open(self.access_token, 'r') as token_file:
self.access_token = token_file.readline().rstrip() self.access_token = token_file.readline().rstrip()
def retrieve_mastodon_version(self): def retrieve_mastodon_version(self):
""" """