openstack
/
oslo.policy
Code Issues Proposed changes

Merge "Remove the conversion according to the comment of jdennis"

This commit is contained in:
Zuul 2020-04-20 23:31:29 +00:00 committed by Gerrit Code Review
parent 4692841b41 a846278b6d
commit 0eac6f16b1
1 changed files with 1 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
oslo_policy/policy.py
View File

@ -889,20 +889,7 @@ class Enforcer(object):
if LOG.isEnabledFor(logging.DEBUG):
try:
# NOTE(jdennis) Although a MutableMapping behaves like
# a dict oslo.strutils.mask_dict_password() requires a
# dict. Bug #1804528 was opened to fix this, once that
# bug is fixed the conversion to dict can be removed.
if isinstance(creds, dict):
creds_dict = creds
elif isinstance(creds, collections.MutableMapping):
creds_dict = dict(creds)
else:
raise TypeError('unexpected type %(creds_type)s' %
{'creds_type': type(creds)})
creds_dict = strutils.mask_dict_password(
copy.deepcopy(creds_dict)
)
creds_dict = strutils.mask_dict_password(copy.deepcopy(creds))
creds_msg = jsonutils.dumps(creds_dict,
skipkeys=True, sort_keys=True)
except Exception as e: