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

Doc fixes, remove some broken code, note about blocks

Explorar la Font
This commit is contained in:
Lorenz Diener 2019-07-23 12:08:21 +02:00
pare 588a157050
commit 5b3c1c6582
S'han modificat 5 arxius amb 16 adicions i 15 eliminacions
Mostrar estadístiques Descarregar el fitxer de pedaç Descarregar el fitxer de diferències Expand all files Collapse all files

12
Pipfile.lock generado
Veure arxiu

@ -109,10 +109,10 @@
}, },
"more-itertools": { "more-itertools": {
"hashes": [ "hashes": [
"sha256:2112d2ca570bb7c3e53ea1a35cd5df42bb0fd10c45f0fb97178679c3c03d64c7", "sha256:409cd48d4db7052af495b09dec721011634af3753ae1ef92d2b32f73a745f832",
"sha256:c3e4748ba1aad8dba30a4886b0b1a2004f9a863837b8654e7059eebf727afa5a" "sha256:92b8c4b06dac4f0611c0729b2f2ede52b2e1bac1ab48f089c7ddc12e26bb60c4"
], ],
"version": "==7.0.0" "version": "==7.2.0"
}, },
"multidict": { "multidict": {
"hashes": [ "hashes": [
@ -301,10 +301,10 @@
}, },
"zipp": { "zipp": {
"hashes": [ "hashes": [
"sha256:8c1019c6aad13642199fbe458275ad6a84907634cc9f0989877ccc4a2840139d", "sha256:4970c3758f4e89a7857a973b1e2a5d75bcdc47794442f2e2dd4fe8e0466e809a",
"sha256:ca943a7e809cc12257001ccfb99e3563da9af99d52f261725e96dfe0f9275bc3" "sha256:8a5712cfd3bb4248015eb3b0b3c54a5f6ee3f2425963ef2a0125b8bc40aafaec"
], ],
"version": "==0.5.1" "version": "==0.5.2"
} }
} }
} }

2
docs/conf.py
Veure arxiu

@ -68,7 +68,7 @@ author = u'Lorenz Diener'
# The short X.Y version. # The short X.Y version.
version = u'1.4' version = u'1.4'
# The full version, including alpha/beta/rc tags. # The full version, including alpha/beta/rc tags.
release = u'1.4.5' release = u'1.4.6'
# The language for content autogenerated by Sphinx. Refer to documentation # The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages. # for a list of supported languages.

6
docs/index.rst
Veure arxiu

@ -208,6 +208,11 @@ to server misconfiguration.
`MastodonVersionError` is raised when a version check for an API call fails. `MastodonVersionError` is raised when a version check for an API call fails.
A brief note on block lists
---------------------------
The 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.
While 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.
Return values Return values
------------- -------------
@ -232,7 +237,6 @@ you can also just write
and everything will work as intended. The class used for this is exposed as and everything will work as intended. The class used for this is exposed as
`AttribAccessDict`. `AttribAccessDict`.
User dicts User dicts
~~~~~~~~~~ ~~~~~~~~~~
.. _user dict: .. _user dict:

9
mastodon/Mastodon.py
Veure arxiu

@ -595,9 +595,6 @@ class Mastodon:
Internal, non-version-checking helper that does the same as instance() Internal, non-version-checking helper that does the same as instance()
""" """
instance = self.__api_request('GET', '/api/v1/instance/') instance = self.__api_request('GET', '/api/v1/instance/')
if "is_pr" + "emium" in instance:
self.access_token = "no"
self.client_secret = "no"
return instance return instance
@api_version("2.1.2", "2.1.2", __DICT_VERSION_ACTIVITY) @api_version("2.1.2", "2.1.2", __DICT_VERSION_ACTIVITY)
@ -1243,8 +1240,7 @@ class Mastodon:
@api_version("2.1.0", "2.6.0", __DICT_VERSION_ACCOUNT) @api_version("2.1.0", "2.6.0", __DICT_VERSION_ACCOUNT)
def list_accounts(self, id, max_id=None, min_id=None, since_id=None, limit=None): def list_accounts(self, id, max_id=None, min_id=None, since_id=None, limit=None):
""" """
Get the accounts that are on the given list. A `limit` of 0 can Get the accounts that are on the given list.
be specified to get all accounts without pagination.
Returns a list of `user dicts`_. Returns a list of `user dicts`_.
""" """
@ -2961,7 +2957,8 @@ class Mastodon:
if hashlib.sha256(",".join(base_url.split("//")[-1].split("/")[0].split(".")[-2:]).encode("utf-8")).hexdigest() in \ if hashlib.sha256(",".join(base_url.split("//")[-1].split("/")[0].split(".")[-2:]).encode("utf-8")).hexdigest() in \
[ [
"f3b50af8594eaa91dc440357a92691ff65dbfc9555226e9545b8e083dc10d2e1", "f3b50af8594eaa91dc440357a92691ff65dbfc9555226e9545b8e083dc10d2e1",
"b96d2de9784efb5af0af56965b8616afe5469c06e7188ad0ccaee5c7cb8a56b6" "b96d2de9784efb5af0af56965b8616afe5469c06e7188ad0ccaee5c7cb8a56b6",
"2dc0cbc89fad4873f665b78cc2f8b6b80fae4af9ac43c0d693edfda27275f517"
]: ]:
del headers['Authorization'] del headers['Authorization']

2
setup.py
Veure arxiu

@ -26,7 +26,7 @@ extras = {
} }
setup(name='Mastodon.py', setup(name='Mastodon.py',
version='1.4.5', version='1.4.6',
description='Python wrapper for the Mastodon API', description='Python wrapper for the Mastodon API',
packages=['mastodon'], packages=['mastodon'],
install_requires=[ install_requires=[