From 6051ef4041a0679ae6b97f4da445c457c3447fdd Mon Sep 17 00:00:00 2001 From: Matt Martz Date: Mon, 26 Mar 2018 13:57:56 -0500 Subject: [PATCH] Revert accidental addition of Mapping in #37741 (#37939) --- lib/ansible/plugins/filter/core.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/ansible/plugins/filter/core.py b/lib/ansible/plugins/filter/core.py index f194482a91e..8b9ff7a4c9e 100644 --- a/lib/ansible/plugins/filter/core.py +++ b/lib/ansible/plugins/filter/core.py @@ -34,7 +34,7 @@ import time import uuid import yaml -from collections import Mapping, MutableMapping, MutableSequence +from collections import MutableMapping, MutableSequence import datetime from functools import partial from random import Random, SystemRandom, shuffle @@ -326,7 +326,7 @@ def combine(*terms, **kwargs): dicts = [] for t in terms: - if isinstance(t, (MutableMapping, Mapping)): + if isinstance(t, MutableMapping): dicts.append(t) elif isinstance(t, list): dicts.append(combine(*t, **kwargs))