Merge pull request #972 from public/padding-docs

Use AlreadyFinalized instead of ValueError

1 files changed, 9 insertions, 0 deletions

diff --git a/docs/hazmat/primitives/padding.rst b/docs/hazmat/primitives/padding.rst
index c0209446..3056eb92 100644
--- a/docs/hazmat/primitives/padding.rst
+++ b/docs/hazmat/primitives/padding.rst
@@ -66,7 +66,16 @@ multiple of the block size.
 
         :param bytes data: The data you wish to pass into the context.
         :return bytes: Returns the data that was padded or unpadded.
+        :raises cryptography.exceptions.AlreadyFinalized: See :meth:`finalize`.
 
     .. method:: finalize()
 
+        Finalize the current context and return the rest of the data.
+
+        After ``finalize`` has been called this object can no longer be used;
+        :meth:`update` and :meth:`finalize` will raise an
+        :class:`~cryptography.exceptions.AlreadyFinalized` exception.
+
         :return bytes: Returns the remainder of the data.
+        :raises ValueError: When trying to remove padding from incorrectly
+                            padded data.