aboutsummaryrefslogtreecommitdiffstats
path: root/docs/hazmat/primitives/padding.rst
diff options
context:
space:
mode:
authorAyrx <terrycwk1994@gmail.com>2014-05-17 16:59:31 +0800
committerAyrx <terrycwk1994@gmail.com>2014-05-17 16:59:31 +0800
commit6d69eab6caff7b87d32fab3c7178296e481eb8a4 (patch)
treeb421709339ac20068fba14dc64cc062031b9ed1f /docs/hazmat/primitives/padding.rst
parent60437c370d079d55db2c284e2f241ecde3b61cbf (diff)
downloadcryptography-6d69eab6caff7b87d32fab3c7178296e481eb8a4.tar.gz
cryptography-6d69eab6caff7b87d32fab3c7178296e481eb8a4.tar.bz2
cryptography-6d69eab6caff7b87d32fab3c7178296e481eb8a4.zip
Fixed TypeError and added documentation
Diffstat (limited to 'docs/hazmat/primitives/padding.rst')
-rw-r--r--docs/hazmat/primitives/padding.rst3
1 files changed, 3 insertions, 0 deletions
diff --git a/docs/hazmat/primitives/padding.rst b/docs/hazmat/primitives/padding.rst
index 4092ac00..72378e1f 100644
--- a/docs/hazmat/primitives/padding.rst
+++ b/docs/hazmat/primitives/padding.rst
@@ -70,6 +70,9 @@ multiple of the block size.
:return bytes: Returns the data that was padded or unpadded.
:raises TypeError: Raised if data is not bytes.
:raises cryptography.exceptions.AlreadyFinalized: See :meth:`finalize`.
+ :raises TypeError: This exception is raised if ``data`` is not a binary
+ type. This is ``str`` in Python 2 and ``bytes`` in
+ Python 3.
.. method:: finalize()