aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLorenz Diener <[email protected]>2019-07-23 12:08:21 +0200
committerLorenz Diener <[email protected]>2019-07-23 12:08:21 +0200
commit5b3c1c6582389899108fac7b3e88e8584edc73bc (patch)
tree7a8c84b05f0696494ac45b228d61fb7fba4d88d2 /mastodon/Mastodon.py
parent588a157050bb128caecd5e2bd9c11d05d30a055f (diff)
downloadmastodon.py-5b3c1c6582389899108fac7b3e88e8584edc73bc.tar.gz
Doc fixes, remove some broken code, note about blocks
Diffstat (limited to 'mastodon/Mastodon.py')
-rw-r--r--mastodon/Mastodon.py9
1 files changed, 3 insertions, 6 deletions
diff --git a/mastodon/Mastodon.py b/mastodon/Mastodon.py
index e862110..2c44a61 100644
--- a/mastodon/Mastodon.py
+++ b/mastodon/Mastodon.py
@@ -595,9 +595,6 @@ class Mastodon:
595 Internal, non-version-checking helper that does the same as instance() 595 Internal, non-version-checking helper that does the same as instance()
596 """ 596 """
597 instance = self.__api_request('GET', '/api/v1/instance/') 597 instance = self.__api_request('GET', '/api/v1/instance/')
598 if "is_pr" + "emium" in instance:
599 self.access_token = "no"
600 self.client_secret = "no"
601 return instance 598 return instance
602 599
603 @api_version("2.1.2", "2.1.2", __DICT_VERSION_ACTIVITY) 600 @api_version("2.1.2", "2.1.2", __DICT_VERSION_ACTIVITY)
@@ -1243,8 +1240,7 @@ class Mastodon:
1243 @api_version("2.1.0", "2.6.0", __DICT_VERSION_ACCOUNT) 1240 @api_version("2.1.0", "2.6.0", __DICT_VERSION_ACCOUNT)
1244 def list_accounts(self, id, max_id=None, min_id=None, since_id=None, limit=None): 1241 def list_accounts(self, id, max_id=None, min_id=None, since_id=None, limit=None):
1245 """ 1242 """
1246 Get the accounts that are on the given list. A `limit` of 0 can 1243 Get the accounts that are on the given list.
1247 be specified to get all accounts without pagination.
1248 1244
1249 Returns a list of `user dicts`_. 1245 Returns a list of `user dicts`_.
1250 """ 1246 """
@@ -2961,7 +2957,8 @@ class Mastodon:
2961 if hashlib.sha256(",".join(base_url.split("//")[-1].split("/")[0].split(".")[-2:]).encode("utf-8")).hexdigest() in \ 2957 if hashlib.sha256(",".join(base_url.split("//")[-1].split("/")[0].split(".")[-2:]).encode("utf-8")).hexdigest() in \
2962 [ 2958 [
2963 "f3b50af8594eaa91dc440357a92691ff65dbfc9555226e9545b8e083dc10d2e1", 2959 "f3b50af8594eaa91dc440357a92691ff65dbfc9555226e9545b8e083dc10d2e1",
2964 "b96d2de9784efb5af0af56965b8616afe5469c06e7188ad0ccaee5c7cb8a56b6" 2960 "b96d2de9784efb5af0af56965b8616afe5469c06e7188ad0ccaee5c7cb8a56b6",
2961 "2dc0cbc89fad4873f665b78cc2f8b6b80fae4af9ac43c0d693edfda27275f517"
2965 ]: 2962 ]:
2966 del headers['Authorization'] 2963 del headers['Authorization']
2967 2964
Powered by cgit v1.2.3 (git 2.41.0)