Fixed tests for 3.3

itsdangerous.py

@@ -25,11 +25,13 @@
     from itertools import izip
     text_type = unicode
     int_to_byte = chr
+    number_types = (int, long, float)
 else:
     from functools import reduce
     izip = zip
     text_type = str
     int_to_byte = operator.methodcaller('to_bytes', 1, 'big')
+    number_types = (int, float)
 
 
 try:
@@ -739,7 +741,7 @@ def loads(self, s, salt=None, return_header=False):
         if 'exp' not in header:
             raise BadSignature('Missing expiry date', payload=payload)
 
-        if not (isinstance(header['exp'], (int, long, float))
+        if not (isinstance(header['exp'], number_types)
                 and header['exp'] > 0):
             raise BadSignature('expiry date is not an IntDate',
                                payload=payload)
@@ -763,8 +765,8 @@ def dumps(self, obj, salt=None, header_fields=None):
 
     def get_issue_date(self, header):
         rv = header.get('iat')
-        if isinstance(rv, (int, long)):
-            return datetime.utcfromtimestamp(rv)
+        if isinstance(rv, number_types):
+            return datetime.utcfromtimestamp(int(rv))
 
     def now(self):
         return int(time.time())

tests.py

@@ -230,8 +230,8 @@ class TimedJSONWebSignatureSerializerTest(unittest.TestCase):
     def test_token_contains_issue_date_and_expiry_time(self):
         s = self.serializer_class('secret')
         result = s.dumps({'es': 'geht'})
-        self.assert_('exp' in s.loads(result, return_header=True)[1])
-        self.assert_('iat' in s.loads(result, return_header=True)[1])
+        self.assertTrue('exp' in s.loads(result, return_header=True)[1])
+        self.assertTrue('iat' in s.loads(result, return_header=True)[1])
 
     def test_token_expires_at_given_expiry_time(self):
         s = self.serializer_class('secret')