From 69ab59e59670c3865fb8240aa81ca9195a96e003 Mon Sep 17 00:00:00 2001 From: Alex Gaynor Date: Thu, 31 Oct 2013 15:26:43 -0700 Subject: py3k uses a different exception here --- cryptography/fernet.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cryptography/fernet.py b/cryptography/fernet.py index ef64b7e9..f923911a 100644 --- a/cryptography/fernet.py +++ b/cryptography/fernet.py @@ -1,4 +1,5 @@ import base64 +import binascii import os import struct import time @@ -60,7 +61,7 @@ class Fernet(object): try: data = base64.urlsafe_b64decode(data) - except TypeError: + except (TypeError, binascii.Error): raise InvalidToken assert six.indexbytes(data, 0) == 0x80 -- cgit v1.2.3