diff options
Diffstat (limited to 'oslo_utils')
| -rw-r--r-- | oslo_utils/strutils.py | 6 | ||||
| -rw-r--r-- | oslo_utils/tests/test_strutils.py | 6 |
2 files changed, 5 insertions, 7 deletions
diff --git a/oslo_utils/strutils.py b/oslo_utils/strutils.py index 6295bde..16f1935 100644 --- a/oslo_utils/strutils.py +++ b/oslo_utils/strutils.py @@ -17,7 +17,7 @@ System-level utilities and helper functions. """ -import collections +import collections.abc import math import re import unicodedata @@ -400,12 +400,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' diff --git a/oslo_utils/tests/test_strutils.py b/oslo_utils/tests/test_strutils.py index f43cef2..22dd692 100644 --- a/oslo_utils/tests/test_strutils.py +++ b/oslo_utils/tests/test_strutils.py @@ -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 @@ -665,7 +663,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__() |