summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakashi Kajinami <tkajinam@redhat.com>2021-07-17 00:51:50 +0900
committerRabi Mishra <ramishra@redhat.com>2021-12-16 07:21:36 +0000
commit796a8f5a9642a8ee0a455f59bbabe94e038fac4f (patch)
treed8a14a560691f0df39b56a20184d571c680ae060
parent4753a47bbf1c31b907b21b3987dc4cc1b130990d (diff)
downloadpython-heatclient-796a8f5a9642a8ee0a455f59bbabe94e038fac4f.tar.gz
Replace deprecated import of ABCs from collections
ABCs in collections should be imported from collections.abc and direct import from collections is deprecated since Python 3.3. Closes-Bug: #1936667 Change-Id: Ie312cb884537ec541bf2111fe8a647e939b6519e
-rw-r--r--heatclient/common/template_utils.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/heatclient/common/template_utils.py b/heatclient/common/template_utils.py
index 2c66f2b..ebabc04 100644
--- a/heatclient/common/template_utils.py
+++ b/heatclient/common/template_utils.py
@@ -13,7 +13,7 @@
# License for the specific language governing permissions and limitations
# under the License.
-import collections
+from collections import abc
from oslo_serialization import jsonutils
import six
from six.moves.urllib import error
@@ -203,10 +203,10 @@ def deep_update(old, new):
old = {}
for k, v in new.items():
- if isinstance(v, collections.Mapping):
+ if isinstance(v, abc.Mapping):
r = deep_update(old.get(k, {}), v)
old[k] = r
- elif v is None and isinstance(old.get(k), collections.Mapping):
+ elif v is None and isinstance(old.get(k), abc.Mapping):
# Don't override empty data, to work around yaml syntax issue
pass
else: