diff options
-rw-r--r-- | docs/index.rst | 7 | ||||
-rw-r--r-- | mastodon/Mastodon.py | 18 |
2 files changed, 19 insertions, 6 deletions
diff --git a/docs/index.rst b/docs/index.rst index 11b655a..fae8b2d 100644 --- a/docs/index.rst +++ b/docs/index.rst | |||
@@ -112,12 +112,17 @@ Error handling | |||
112 | When Mastodon.py encounters an error, it will raise an exception, generally with | 112 | When Mastodon.py encounters an error, it will raise an exception, generally with |
113 | some text included to tell you what went wrong. | 113 | some text included to tell you what went wrong. |
114 | 114 | ||
115 | The base class that all mastodon exceptions inherit from is the MastodonError | ||
116 | class. If you are only interested in the fact an error was raised somewhere in | ||
117 | Mastodon.py, and not the details, this is the exception you can catch. | ||
118 | |||
115 | MastodonIllegalArgumentError is generally a programming problem - you asked the | 119 | MastodonIllegalArgumentError is generally a programming problem - you asked the |
116 | API to do something obviously invalid (i.e. specify a privacy scope that does | 120 | API to do something obviously invalid (i.e. specify a privacy scope that does |
117 | not exist). | 121 | not exist). |
118 | 122 | ||
119 | MastodonFileNotFoundError and MastodonNetworkError are IO errors - could be you | 123 | MastodonFileNotFoundError and MastodonNetworkError are IO errors - could be you |
120 | specified a wrong URL, could be the internet is down or your hard drive is dying. | 124 | specified a wrong URL, could be the internet is down or your hard drive is |
125 | dying. They inherit from MastodonIOError, for easy catching. | ||
121 | 126 | ||
122 | MastodonAPIError is an error returned from the Mastodon instance - the server | 127 | MastodonAPIError is an error returned from the Mastodon instance - the server |
123 | has decided it can't fullfill your request (i.e. you requested info on a user that | 128 | has decided it can't fullfill your request (i.e. you requested info on a user that |
diff --git a/mastodon/Mastodon.py b/mastodon/Mastodon.py index e59bdb7..5b198a5 100644 --- a/mastodon/Mastodon.py +++ b/mastodon/Mastodon.py | |||
@@ -1263,21 +1263,29 @@ class Mastodon: | |||
1263 | ## | 1263 | ## |
1264 | # Exceptions | 1264 | # Exceptions |
1265 | ## | 1265 | ## |
1266 | class MastodonIllegalArgumentError(ValueError): | 1266 | class MastodonError(Exception): |
1267 | """Base class for Mastodon.py exceptions""" | ||
1268 | |||
1269 | |||
1270 | class MastodonIllegalArgumentError(ValueError, MastodonError): | ||
1267 | pass | 1271 | pass |
1268 | 1272 | ||
1269 | 1273 | ||
1270 | class MastodonFileNotFoundError(IOError): | 1274 | class MastodonIOError(IOError, MastodonError): |
1275 | """Base class for Mastodon.py I/O errors""" | ||
1276 | |||
1277 | |||
1278 | class MastodonFileNotFoundError(MastodonIOError): | ||
1271 | pass | 1279 | pass |
1272 | 1280 | ||
1273 | 1281 | ||
1274 | class MastodonNetworkError(IOError): | 1282 | class MastodonNetworkError(MastodonIOError): |
1275 | pass | 1283 | pass |
1276 | 1284 | ||
1277 | 1285 | ||
1278 | class MastodonAPIError(Exception): | 1286 | class MastodonAPIError(MastodonError): |
1279 | pass | 1287 | pass |
1280 | 1288 | ||
1281 | 1289 | ||
1282 | class MastodonRatelimitError(Exception): | 1290 | class MastodonRatelimitError(MastodonError): |
1283 | pass | 1291 | pass |