diff options
author | Armin Ronacher <armin.ronacher@active-4.com> | 2018-10-26 22:53:24 +0200 |
---|---|---|
committer | Armin Ronacher <armin.ronacher@active-4.com> | 2018-10-26 22:53:24 +0200 |
commit | e569397e31892d7ddadfaa16997b732cddb79e2b (patch) | |
tree | 103b415d136d2d9158ff1519ee53f3156b5e3655 | |
parent | c30eec084aee113614bc8d933868fc085411d0f0 (diff) | |
download | itsdangerous-e569397e31892d7ddadfaa16997b732cddb79e2b.tar.gz |
Stylecheckfeature/sha1
-rw-r--r-- | src/itsdangerous/timed.py | 4 | ||||
-rw-r--r-- | tests/test_itsdangerous/test_serializer.py | 23 | ||||
-rw-r--r-- | tests/test_itsdangerous/test_timed.py | 2 |
3 files changed, 14 insertions, 15 deletions
diff --git a/src/itsdangerous/timed.py b/src/itsdangerous/timed.py index 8141a74..b106c5a 100644 --- a/src/itsdangerous/timed.py +++ b/src/itsdangerous/timed.py @@ -127,9 +127,7 @@ class TimedSerializer(Serializer): last_exception = None for signer in self.iter_unsigners(salt): try: - base64d, timestamp = signer.unsign( - s, max_age, return_timestamp=True - ) + base64d, timestamp = signer.unsign(s, max_age, return_timestamp=True) payload = self.load_payload(base64d) if return_timestamp: return payload, timestamp diff --git a/tests/test_itsdangerous/test_serializer.py b/tests/test_itsdangerous/test_serializer.py index 46b4893..485dcca 100644 --- a/tests/test_itsdangerous/test_serializer.py +++ b/tests/test_itsdangerous/test_serializer.py @@ -147,20 +147,21 @@ class TestSerializer(object): def test_digests(self): default_value = Serializer( - secret_key='dev key', - salt='dev salt', - signer_kwargs={} + secret_key="dev key", salt="dev salt", signer_kwargs={} ).dumps([42]) sha1_value = Serializer( - secret_key='dev key', - salt='dev salt', - signer_kwargs={'digest_method': hashlib.sha1} + secret_key="dev key", + salt="dev salt", + signer_kwargs={"digest_method": hashlib.sha1}, ).dumps([42]) sha512_value = Serializer( - secret_key='dev key', - salt='dev salt', - signer_kwargs={'digest_method': hashlib.sha512} + secret_key="dev key", + salt="dev salt", + signer_kwargs={"digest_method": hashlib.sha512}, ).dumps([42]) assert default_value == sha1_value - assert sha1_value == '[42].-9cNi0CxsSB3hZPNCe9a2eEs1ZM' - assert sha512_value == '[42].MKCz_0nXQqv7wKpfHZcRtJRmpT2T5uvs9YQsJEhJimqxc9bCLxG31QzS5uC8OVBI1i6jyOLAFNoKaF5ckO9L5Q' + assert sha1_value == "[42].-9cNi0CxsSB3hZPNCe9a2eEs1ZM" + assert sha512_value == ( + "[42].MKCz_0nXQqv7wKpfHZcRtJRmpT2T5uvs9YQsJEhJimqxc" + "9bCLxG31QzS5uC8OVBI1i6jyOLAFNoKaF5ckO9L5Q" + ) diff --git a/tests/test_itsdangerous/test_timed.py b/tests/test_itsdangerous/test_timed.py index a9832fb..69eb6f8 100644 --- a/tests/test_itsdangerous/test_timed.py +++ b/tests/test_itsdangerous/test_timed.py @@ -1,9 +1,9 @@ +import hashlib from datetime import datetime from datetime import timedelta from functools import partial import pytest -import hashlib from freezegun import freeze_time from test_itsdangerous.test_serializer import TestSerializer from test_itsdangerous.test_signer import TestSigner |