aboutsummaryrefslogtreecommitdiffstats
path: root/docs/exceptions.rst
diff options
context:
space:
mode:
authorPaul Kehrer <paul.l.kehrer@gmail.com>2014-03-06 19:43:53 -0430
committerPaul Kehrer <paul.l.kehrer@gmail.com>2014-03-06 19:43:53 -0430
commit792eef345d138a0d0eff5df923f8218376e78621 (patch)
tree479a7090ede017536fbb5ebb1dfe76ddb1917d7a /docs/exceptions.rst
parentd932f662d5e2659cb79a6aeb5aa1bdeffa2c067e (diff)
parent2a69b48f6a8e3a287a9fb1fa7728f01bde765a1b (diff)
downloadcryptography-792eef345d138a0d0eff5df923f8218376e78621.tar.gz
cryptography-792eef345d138a0d0eff5df923f8218376e78621.tar.bz2
cryptography-792eef345d138a0d0eff5df923f8218376e78621.zip
Merge pull request #747 from alex/exception-heirarchy-refactor
Try to use more specific exceptions in places.
Diffstat (limited to 'docs/exceptions.rst')
-rw-r--r--docs/exceptions.rst23
1 files changed, 16 insertions, 7 deletions
diff --git a/docs/exceptions.rst b/docs/exceptions.rst
index 7f9ae347..48c4bca8 100644
--- a/docs/exceptions.rst
+++ b/docs/exceptions.rst
@@ -25,11 +25,24 @@ Exceptions
This is raised when additional data is added to a context after update
has already been called.
+.. class:: UnsupportedCipher
-.. class:: UnsupportedAlgorithm
+ .. versionadded:: 0.3
- This is raised when a backend doesn't support the requested algorithm (or
- combination of algorithms).
+ This is raised when a backend doesn't support the requested cipher
+ algorithm and mode combination.
+
+.. class:: UnsupportedHash
+
+ .. versionadded:: 0.3
+
+ This is raised when a backend doesn't support the requested hash algorithm.
+
+.. class:: UnsupportedPadding
+
+ .. versionadded:: 0.3
+
+ This is raised when the requested padding is not supported by the backend.
.. class:: InvalidKey
@@ -43,7 +56,3 @@ Exceptions
This is raised when the verify method of a one time password function's
computed token does not match the expected token.
-
-.. class:: UnsupportedPadding
-
- This is raised when the chosen padding is not supported by the backend.