diff options
| author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2015-04-14 14:21:21 -0400 |
|---|---|---|
| committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2015-04-14 14:21:21 -0400 |
| commit | d14dcc577ffc851eb32a2f77431f043fa5a7ce37 (patch) | |
| tree | 433311de1175bacbb3705d51111cd81bfb1e0d8f | |
| parent | b3f45e3b16990a9293f68faecde3da790e4a4216 (diff) | |
| download | cryptography-d14dcc577ffc851eb32a2f77431f043fa5a7ce37.tar.gz cryptography-d14dcc577ffc851eb32a2f77431f043fa5a7ce37.tar.bz2 cryptography-d14dcc577ffc851eb32a2f77431f043fa5a7ce37.zip | |
add changelog entry, set proper deprecation warning
| -rw-r--r-- | CHANGELOG.rst | 4 | ||||
| -rw-r--r-- | src/cryptography/utils.py | 2 |
2 files changed, 5 insertions, 1 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 ~~~~~~~~~~~~~~~~~~ diff --git a/src/cryptography/utils.py b/src/cryptography/utils.py index 31d72756..445554ec 100644 --- a/src/cryptography/utils.py +++ b/src/cryptography/utils.py @@ -11,7 +11,7 @@ import warnings DeprecatedIn08 = DeprecationWarning -DeprecatedIn09 = DeprecationWarning +DeprecatedIn09 = PendingDeprecationWarning def read_only_property(name): |