aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--LICENSE2
-rw-r--r--docs/index.rst1
-rw-r--r--mastodon/__init__.py2
-rw-r--r--setup.py2
4 files changed, 4 insertions, 3 deletions
diff --git a/LICENSE b/LICENSE
index ac4074f..d313c04 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
1MIT License 1MIT License
2 2
3Copyright (c) 2016 Lorenz Diener 3Copyright (c) 2016 Lorenz Diener / Mastodon.py contributors
4 4
5Permission is hereby granted, free of charge, to any person obtaining a copy 5Permission is hereby granted, free of charge, to any person obtaining a copy
6of this software and associated documentation files (the "Software"), to deal 6of this software and associated documentation files (the "Software"), to deal
diff --git a/docs/index.rst b/docs/index.rst
index 4e95bbb..a7bdbca 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -555,6 +555,7 @@ Media dicts
555 # Note that a video may have an image as preview. 555 # Note that a video may have an image as preview.
556 # May also contain a 'focus' dict. 556 # May also contain a 'focus' dict.
557 'blurhash': # The blurhash for the image, used for preview / placeholder generation 557 'blurhash': # The blurhash for the image, used for preview / placeholder generation
558 'description': # If set, the user-provided description for this media.
558 } 559 }
559 560
560 # Metadata dicts (image) - all fields are optional: 561 # Metadata dicts (image) - all fields are optional:
diff --git a/mastodon/__init__.py b/mastodon/__init__.py
index 1b2103f..1be4aba 100644
--- a/mastodon/__init__.py
+++ b/mastodon/__init__.py
@@ -1,4 +1,4 @@
1from mastodon.Mastodon import Mastodon, AttribAccessDict, MastodonError, MastodonVersionError, MastodonIllegalArgumentError, MastodonIOError, MastodonFileNotFoundError, MastodonNetworkError, MastodonAPIError, MastodonNotFoundError, MastodonUnauthorizedError, MastodonRatelimitError, MastodonMalformedEventError 1from mastodon.Mastodon import Mastodon, AttribAccessDict, MastodonError, MastodonVersionError, MastodonIllegalArgumentError, MastodonIOError, MastodonFileNotFoundError, MastodonNetworkError, MastodonAPIError, MastodonNotFoundError, MastodonUnauthorizedError, MastodonRatelimitError, MastodonMalformedEventError, MastodonServerError
2from mastodon.streaming import StreamListener, CallbackStreamListener 2from mastodon.streaming import StreamListener, CallbackStreamListener
3 3
4__all__ = ['Mastodon', 'AttribAccessDict', 'StreamListener', 'CallbackStreamListener', 'MastodonError', 'MastodonVersionError', 'MastodonIllegalArgumentError', 'MastodonIOError', 'MastodonFileNotFoundError', 'MastodonNetworkError', 'MastodonAPIError', 'MastodonNotFoundError', 'MastodonUnauthorizedError', 'MastodonRatelimitError', 'MastodonMalformedEventError', 4__all__ = ['Mastodon', 'AttribAccessDict', 'StreamListener', 'CallbackStreamListener', 'MastodonError', 'MastodonVersionError', 'MastodonIllegalArgumentError', 'MastodonIOError', 'MastodonFileNotFoundError', 'MastodonNetworkError', 'MastodonAPIError', 'MastodonNotFoundError', 'MastodonUnauthorizedError', 'MastodonRatelimitError', 'MastodonMalformedEventError',
diff --git a/setup.py b/setup.py
index 3987010..6b8c682 100644
--- a/setup.py
+++ b/setup.py
@@ -18,7 +18,7 @@ setup(name='Mastodon.py',
18 'decorator>=4.0.0', 18 'decorator>=4.0.0',
19 'http_ece>=1.0.5', 19 'http_ece>=1.0.5',
20 'cryptography>=1.6.0', 20 'cryptography>=1.6.0',
21 'blurhash>=1.1.0', 21 'blurhash>=1.1.3',
22 ], 22 ],
23 tests_require=test_deps, 23 tests_require=test_deps,
24 extras_require=extras, 24 extras_require=extras,
Powered by cgit v1.2.3 (git 2.41.0)