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

Merge pull request #135 from goldensuneur/fix_update_credentials

Explorar la Font 
Fix update credentials
This commit is contained in:
Lorenz Diener 2018-06-04 10:34:36 +02:00 cometido por GitHub
pare f8ba37b42e 1090d7476f
commit be77f4e8ab
No se encontró ninguna clave conocida en la base de datos para esta firma
ID de clave GPG: 4AEE18F83AFDEB23
S'han modificat 2 arxius amb 35 adicions i 13 eliminacions
Mostrar estadístiques Descarregar el fitxer de pedaç Descarregar el fitxer de diferències Expand all files Collapse all files

28
mastodon/Mastodon.py
Veure arxiu

@ -1226,20 +1226,22 @@ class Mastodon:
params_initial = locals()
# Load avatar, if specified
if avatar_mime_type is None and os.path.isfile(avatar):
avatar_mime_type = mimetypes.guess_type(avatar)[0]
avatar = open(avatar, 'rb')
if (not avatar is None and avatar_mime_type is None):
raise MastodonIllegalArgumentError('Could not determine mime type or data passed directly without mime type.')
if not avatar is None:
if avatar_mime_type is None and os.path.isfile(avatar):
avatar_mime_type = mimetypes.guess_type(avatar)[0]
avatar = open(avatar, 'rb')
if avatar_mime_type is None:
raise MastodonIllegalArgumentError('Could not determine mime type or data passed directly without mime type.')
# Load header, if specified
if header_mime_type is None and os.path.isfile(header):
header_mime_type = mimetypes.guess_type(header)[0]
header = open(header, 'rb')
if (not header is None and header_mime_type is None):
raise MastodonIllegalArgumentError('Could not determine mime type or data passed directly without mime type.')
if not header is None:
if header_mime_type is None and os.path.isfile(header):
header_mime_type = mimetypes.guess_type(header)[0]
header = open(header, 'rb')
if header_mime_type is None:
raise MastodonIllegalArgumentError('Could not determine mime type or data passed directly without mime type.')
# Clean up params
for param in ["avatar", "avatar_mime_type", "header", "header_mime_type"]:
@ -1252,7 +1254,7 @@ class Mastodon:
avatar_file_name = "mastodonpyupload_" + mimetypes.guess_extension(avatar_mime_type)
files["avatar"] = (avatar_file_name, avatar, avatar_mime_type)
if not header is None:
header_file_name = "mastodonpyupload_" + mimetypes.guess_extension(avatar_mime_type)
header_file_name = "mastodonpyupload_" + mimetypes.guess_extension(header_mime_type)
files["header"] = (header_file_name, header, header_mime_type)
params = self.__generate_params(params_initial)

20
tests/test_account.py
Veure arxiu

@ -92,3 +92,23 @@ def test_account_update_credentials(api):
header = image,
header_mime_type = "image/jpeg")
assert account
@pytest.mark.vcr(match_on=['path'])
def test_account_update_credentials_no_header(api):
account = api.account_update_credentials(
display_name='John Lennon',
note='I walk funny',
avatar = "tests/image.jpg")
assert account
@pytest.mark.vcr(match_on=['path'])
def test_account_update_credentials_no_avatar(api):
with open('tests/image.jpg', 'rb') as f:
image = f.read()
account = api.account_update_credentials(
display_name='John Lennon',
note='I walk funny',
header = image,
header_mime_type = "image/jpeg")
assert account