cubicweb/server/utils.py
branch3.25
changeset 12193 e4ee04d442be
parent 12014 116005b5fce9
child 12280 577e8d3896b4
--- a/cubicweb/server/utils.py	Mon Jul 10 11:41:20 2017 +0200
+++ b/cubicweb/server/utils.py	Wed May 10 15:07:18 2017 +0200
@@ -54,14 +54,15 @@
     def to_string(self):
         return to_hash_str(u'%s$%s' % (self.salt, self.checksum or u''))
 
-    # passlib 1.5 wants calc_checksum, 1.6 wants _calc_checksum
-    def calc_checksum(self, secret):
+    def _calc_checksum(self, secret):
         return md5crypt(secret, self.salt.encode('ascii')).decode('utf-8')
-    _calc_checksum = calc_checksum
 
 
 _CRYPTO_CTX = CryptContext(['sha512_crypt', CustomMD5Crypt, 'des_crypt', 'ldap_salted_sha1'],
                            deprecated=['cubicwebmd5crypt', 'des_crypt'])
+# for bw compat with passlib < 1.7
+if not hasattr(_CRYPTO_CTX, 'hash'):
+    _CRYPTO_CTX.hash = _CRYPTO_CTX.encrypt
 verify_and_update = _CRYPTO_CTX.verify_and_update