Skip to content

Commit c07fded

Browse files
Merge pull request #1565 from sandrotosi/patch-1
Mapping is now in collections.abc
2 parents a723d16 + 34cad8a commit c07fded

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

SoftLayer/utils.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ def dict_merge(dct1, dct2):
6868

6969
dct = dct1.copy()
7070
for k, _ in dct2.items():
71-
if (k in dct1 and isinstance(dct1[k], dict) and isinstance(dct2[k], collections.Mapping)):
71+
if (k in dct1 and isinstance(dct1[k], dict) and isinstance(dct2[k], collections.abc.Mapping)):
7272
dct[k] = dict_merge(dct1[k], dct2[k])
7373
else:
7474
dct[k] = dct2[k]

0 commit comments

Comments
 (0)