openstack
/
oslo.utils
Code Issues Proposed changes

Merge "Switch to collections.abc.*"

This commit is contained in:
Zuul 2021-04-16 11:49:39 +00:00 committed by Gerrit Code Review
parent 02d1cd8b81 53e13b52a0
commit 73108fe295
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
oslo_utils/strutils.py
View File

@ -17,7 +17,7 @@
System-level utilities and helper functions.
"""
import collections
import collections.abc
import math
import re
import unicodedata
@ -399,12 +399,12 @@ def mask_dict_password(dictionary, secret="***"): # nosec
"""
if not isinstance(dictionary, collections.Mapping):
if not isinstance(dictionary, collections.abc.Mapping):
raise TypeError("Expected a Mapping, got %s instead."
% type(dictionary))
out = {}
for k, v in dictionary.items():
if isinstance(v, collections.Mapping):
if isinstance(v, collections.abc.Mapping):
out[k] = mask_dict_password(v, secret=secret)
continue
# NOTE(jlvillal): Check to see if anything in the dictionary 'key'

6
oslo_utils/tests/test_strutils.py
View File

@ -1,5 +1,3 @@
# -*- coding: utf-8 -*-
# Copyright 2011 OpenStack Foundation.
# All Rights Reserved.
#
@ -15,7 +13,7 @@
# License for the specific language governing permissions and limitations
# under the License.
import collections
import collections.abc
import copy
import math
from unittest import mock
@ -659,7 +657,7 @@ class MaskPasswordTestCase(test_base.BaseTestCase):
self.assertEqual(expected, strutils.mask_password(payload))
class TestMapping(collections.Mapping):
class TestMapping(collections.abc.Mapping):
"""Test class for non-dict mappings"""
def __init__(self):
super(TestMapping, self).__init__()