From 8052b04446c34f6d47c7c18c2bbd444fa7f1a1e3 Mon Sep 17 00:00:00 2001 From: Joel Gil Leon Date: Sat, 19 May 2018 16:04:15 +0300 Subject: update constructor to support access_token only --- mastodon/Mastodon.py | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/mastodon/Mastodon.py b/mastodon/Mastodon.py index b186344..5171d9b 100644 --- a/mastodon/Mastodon.py +++ b/mastodon/Mastodon.py @@ -174,7 +174,7 @@ class Mastodon: ### # 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, ratelimit_method="wait", ratelimit_pacefactor=1.1, request_timeout=__DEFAULT_TIMEOUT, mastodon_version=None, @@ -248,17 +248,20 @@ class Mastodon: raise MastodonIllegalArgumentError("Invalid ratelimit method.") # Token loading - if os.path.isfile(self.client_id): - with open(self.client_id, 'r') as secret_file: - self.client_id = secret_file.readline().rstrip() - 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.client_id is None and self.access_token is None: + raise MastodonIllegalArgumentError('No credentials were given.') + if self.client_id is not None: + if os.path.isfile(self.client_id): + with open(self.client_id, 'r') as secret_file: + self.client_id = secret_file.readline().rstrip() + 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): - with open(self.access_token, 'r') as token_file: - self.access_token = token_file.readline().rstrip() + if self.access_token is not None and os.path.isfile(self.access_token): + with open(self.access_token, 'r') as token_file: + self.access_token = token_file.readline().rstrip() def retrieve_mastodon_version(self): """ -- cgit v1.2.3