aboutsummaryrefslogtreecommitdiffstats
path: root/CHANGELOG.rst
diff options
context:
space:
mode:
authorPaul Kehrer <paul.l.kehrer@gmail.com>2015-04-14 14:21:21 -0400
committerPaul Kehrer <paul.l.kehrer@gmail.com>2015-04-14 14:21:21 -0400
commitd14dcc577ffc851eb32a2f77431f043fa5a7ce37 (patch)
tree433311de1175bacbb3705d51111cd81bfb1e0d8f /CHANGELOG.rst
parentb3f45e3b16990a9293f68faecde3da790e4a4216 (diff)
downloadcryptography-d14dcc577ffc851eb32a2f77431f043fa5a7ce37.tar.gz
cryptography-d14dcc577ffc851eb32a2f77431f043fa5a7ce37.tar.bz2
cryptography-d14dcc577ffc851eb32a2f77431f043fa5a7ce37.zip
add changelog entry, set proper deprecation warning
Diffstat (limited to 'CHANGELOG.rst')
-rw-r--r--CHANGELOG.rst4
1 files changed, 4 insertions, 0 deletions
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index fd92a56b..69eea525 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -27,6 +27,10 @@ Changelog
* Add support for parsing X.509 certificate signing requests (CSRs) with
:func:`~cryptography.x509.load_pem_x509_csr` and
:func:`~cryptography.x509.load_der_x509_csr`.
+* Moved ``cryptography.exceptions.InvalidToken`` to
+ :class:`cryptography.hazmat.primitives.twofactor.InvalidToken` and deprecated
+ the old location. This was moved to minimize confusion between this exception
+ and :class:`cryptography.fernet.InvalidToken`.
0.8.2 - 2015-04-10
~~~~~~~~~~~~~~~~~~