From 9f69b9aa42112f0f53a09fa5ff830131cb99399c Mon Sep 17 00:00:00 2001 From: Michele Comitini Date: Tue, 24 Sep 2013 20:01:51 +0200 Subject: [PATCH] still support for python2.5 --- gluon/contrib/pbkdf2_ctypes.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/gluon/contrib/pbkdf2_ctypes.py b/gluon/contrib/pbkdf2_ctypes.py index 91ce1541..685ab5d1 100644 --- a/gluon/contrib/pbkdf2_ctypes.py +++ b/gluon/contrib/pbkdf2_ctypes.py @@ -182,7 +182,13 @@ if __name__ == '__main__': except: pass + import platform + if platform.python_version_tuple() < ('3', '0', '0'): + def bytes(*args): + return str(args[0]) + for h in [hashlib.sha1, hashlib.sha224, hashlib.sha256, hashlib.sha384, hashlib.sha512]: - print(binascii.hexlify(pkcs5_pbkdf2_hmac(b'secret' * 11, b'salt', + print(binascii.hexlify(pkcs5_pbkdf2_hmac(bytes('secret', 'utf-8') * 11, + bytes('salt', 'utf-8'), hashfunc=h)))