openstack
/
keystone
Code Issues Proposed changes

Merge "Make try/except work for passlib 1.6 and 1.7"

This commit is contained in:
Jenkins 2016-11-28 23:43:18 +00:00 committed by Gerrit Code Review
parent 309b1adbfe 7e9039bf51
commit e41308668c
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
keystone/common/utils.py
View File

@ -136,9 +136,10 @@ def hash_password(password):
return passlib.hash.sha512_crypt.encrypt(
password_utf8, rounds=CONF.crypt_strength)
except DeprecationWarning:
# TODO(stevemar): Remove this warning once we switch over to passlib
# TODO(stevemar): Remove this try/except once we switch over to passlib
# version 1.7.0 and replace encrypt() with hash()
pass
return passlib.hash.sha512_crypt.hash(
password_utf8, rounds=CONF.crypt_strength)
def check_password(password, hashed):