openstack/keystone
Code Issues Proposed changes

Make hash_algorithms order deterministic

Browse Source 
hashlib.algorithms_guaranteed is a set so the order is not guaranteed. This
means that the order could be different every time 'tox -e genconfig'
is run.

Change-Id: Iaa46604fccb382f174836fa6e248abf0bd7c3674
This commit is contained in:
David Stanek 2016-08-04 14:35:20 +00:00 committed by Steve Martinelli
parent 988069ef42
commit 3de3d71044
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/conf/token.py
View File

@ -125,11 +125,12 @@ request for a scoped token to avoid re-scoping altogether.
""")) """))
# This attribute only exists in Python 2.7.8+ or 3.2+ # This attribute only exists in Python 2.7.8+ or 3.2+
hash_algorithm_choices = getattr(hashlib, 'algorithms_guaranteed', None) hash_choices = getattr(hashlib, 'algorithms_guaranteed', None)
hash_choices = sorted(hash_choices) if hash_choices else None
hash_algorithm = cfg.StrOpt( hash_algorithm = cfg.StrOpt(
'hash_algorithm', 'hash_algorithm',
default='md5', default='md5',
choices=hash_algorithm_choices, choices=hash_choices,
deprecated_for_removal=True, deprecated_for_removal=True,
deprecated_reason=constants._DEPRECATE_PKI_MSG, deprecated_reason=constants._DEPRECATE_PKI_MSG,
help=utils.fmt(""" help=utils.fmt("""