aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Pipfile.lock12
-rw-r--r--docs/conf.py2
-rw-r--r--docs/index.rst6
-rw-r--r--mastodon/Mastodon.py9
-rw-r--r--setup.py2
5 files changed, 16 insertions, 15 deletions
diff --git a/Pipfile.lock b/Pipfile.lock
index afe5399..5f4b544 100644
--- a/Pipfile.lock
+++ b/Pipfile.lock
@@ -109,10 +109,10 @@
109 }, 109 },
110 "more-itertools": { 110 "more-itertools": {
111 "hashes": [ 111 "hashes": [
112 "sha256:2112d2ca570bb7c3e53ea1a35cd5df42bb0fd10c45f0fb97178679c3c03d64c7", 112 "sha256:409cd48d4db7052af495b09dec721011634af3753ae1ef92d2b32f73a745f832",
113 "sha256:c3e4748ba1aad8dba30a4886b0b1a2004f9a863837b8654e7059eebf727afa5a" 113 "sha256:92b8c4b06dac4f0611c0729b2f2ede52b2e1bac1ab48f089c7ddc12e26bb60c4"
114 ], 114 ],
115 "version": "==7.0.0" 115 "version": "==7.2.0"
116 }, 116 },
117 "multidict": { 117 "multidict": {
118 "hashes": [ 118 "hashes": [
@@ -301,10 +301,10 @@
301 }, 301 },
302 "zipp": { 302 "zipp": {
303 "hashes": [ 303 "hashes": [
304 "sha256:8c1019c6aad13642199fbe458275ad6a84907634cc9f0989877ccc4a2840139d", 304 "sha256:4970c3758f4e89a7857a973b1e2a5d75bcdc47794442f2e2dd4fe8e0466e809a",
305 "sha256:ca943a7e809cc12257001ccfb99e3563da9af99d52f261725e96dfe0f9275bc3" 305 "sha256:8a5712cfd3bb4248015eb3b0b3c54a5f6ee3f2425963ef2a0125b8bc40aafaec"
306 ], 306 ],
307 "version": "==0.5.1" 307 "version": "==0.5.2"
308 } 308 }
309 } 309 }
310} 310}
diff --git a/docs/conf.py b/docs/conf.py
index d957bf3..2705ce6 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -68,7 +68,7 @@ author = u'Lorenz Diener'
68# The short X.Y version. 68# The short X.Y version.
69version = u'1.4' 69version = u'1.4'
70# The full version, including alpha/beta/rc tags. 70# The full version, including alpha/beta/rc tags.
71release = u'1.4.5' 71release = u'1.4.6'
72 72
73# The language for content autogenerated by Sphinx. Refer to documentation 73# The language for content autogenerated by Sphinx. Refer to documentation
74# for a list of supported languages. 74# for a list of supported languages.
diff --git a/docs/index.rst b/docs/index.rst
index 3ce98de..399927c 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -208,6 +208,11 @@ to server misconfiguration.
208 208
209`MastodonVersionError` is raised when a version check for an API call fails. 209`MastodonVersionError` is raised when a version check for an API call fails.
210 210
211A brief note on block lists
212---------------------------
213The default distribution of Mastodon.py prevents you from logging in to instances on a very short list of domains. The purpose of this is to disassociate the developers of Mastodon.py from these instances and to disavow the ideology of violence that they represent. You could, of course, take that part out - Mastodon.py is free software, and you have the right to modify it to suit your needs.
214
215While you take the extra step of removing the code, please take a moment to consider why reasonable people whose work you build and depend on every day thought it was necessary to put it in to begin with.
211 216
212Return values 217Return values
213------------- 218-------------
@@ -232,7 +237,6 @@ you can also just write
232and everything will work as intended. The class used for this is exposed as 237and everything will work as intended. The class used for this is exposed as
233`AttribAccessDict`. 238`AttribAccessDict`.
234 239
235
236User dicts 240User dicts
237~~~~~~~~~~ 241~~~~~~~~~~
238.. _user dict: 242.. _user dict:
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
diff --git a/setup.py b/setup.py
index b6d21d1..7eb3df8 100644
--- a/setup.py
+++ b/setup.py
@@ -26,7 +26,7 @@ extras = {
26} 26}
27 27
28setup(name='Mastodon.py', 28setup(name='Mastodon.py',
29 version='1.4.5', 29 version='1.4.6',
30 description='Python wrapper for the Mastodon API', 30 description='Python wrapper for the Mastodon API',
31 packages=['mastodon'], 31 packages=['mastodon'],
32 install_requires=[ 32 install_requires=[
Powered by cgit v1.2.3 (git 2.41.0)