From 5bd083ced74eb8fa3553f380d1d820da77558f02 Mon Sep 17 00:00:00 2001 From: Karsten Hopp Date: Oct 22 2018 16:47:50 +0000 Subject: [PATCH 1/2] itsdangerous.int_to_bytest fails with attributeerror int_to_bytes got moved to itsdangerous.encoding.int_to_bytes in itsdangerous-1.0.0 Signed-off-by: Karsten Hopp --- diff --git a/tests/test_pagure_flask_form.py b/tests/test_pagure_flask_form.py index 7c9c028..90a799c 100644 --- a/tests/test_pagure_flask_form.py +++ b/tests/test_pagure_flask_form.py @@ -84,7 +84,7 @@ class PagureFlaskFormTests(tests.SimplePagureTest): ) >= (0,14,0): import itsdangerous timestamp = itsdangerous.base64_encode( - itsdangerous.int_to_bytes(int(expires))) + itsdangerous.encoding.int_to_bytes(int(expires))) timestamp = timestamp.decode("ascii") part1, _, part2 = data.split('.', 2) form.csrf_token.data = '.'.join([part1, timestamp, part2]) From 1ec5c04c0018c25360c1c55ee79ef00fd9413139 Mon Sep 17 00:00:00 2001 From: Karsten Hopp Date: Oct 23 2018 08:08:36 +0000 Subject: [PATCH 2/2] Fall back to ItsDangerous-0.24 if itsdangerous.encoding throws an attribute error Signed-off-by: Karsten Hopp --- diff --git a/tests/test_pagure_flask_form.py b/tests/test_pagure_flask_form.py index 90a799c..586aa5c 100644 --- a/tests/test_pagure_flask_form.py +++ b/tests/test_pagure_flask_form.py @@ -83,8 +83,12 @@ class PagureFlaskFormTests(tests.SimplePagureTest): tuple([int(e) for e in flask_wtf.__version__.split('.')] ) >= (0,14,0): import itsdangerous - timestamp = itsdangerous.base64_encode( - itsdangerous.encoding.int_to_bytes(int(expires))) + try: # ItsDangerous-1.0 + timestamp = itsdangerous.base64_encode( + itsdangerous.encoding.int_to_bytes(int(expires))) + except AttributeError: # ItsDangerous-0.24 + timestamp = itsdangerous.base64_encode( + itsdangerous.int_to_bytes(int(expires))) timestamp = timestamp.decode("ascii") part1, _, part2 = data.split('.', 2) form.csrf_token.data = '.'.join([part1, timestamp, part2])