From e8897a9b917be47431df68141c3977f3ab57942e Mon Sep 17 00:00:00 2001 From: Alvaro Aleman Date: Fri, 9 Sep 2016 19:21:58 +0200 Subject: [PATCH] Fix from_yaml for non-string_types. This resolves #17397 (#17398) --- lib/ansible/plugins/filter/core.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/lib/ansible/plugins/filter/core.py b/lib/ansible/plugins/filter/core.py index 2ec50f4980..79b6c22d78 100644 --- a/lib/ansible/plugins/filter/core.py +++ b/lib/ansible/plugins/filter/core.py @@ -193,6 +193,11 @@ def regex_escape(string): '''Escape all regular expressions special characters from STRING.''' return re.escape(string) +def from_yaml(data): + if isinstance(data, string_types): + return yaml.safe_load(data) + return data + @environmentfilter def rand(environment, end, start=None, step=None): r = SystemRandom() @@ -402,7 +407,7 @@ class FilterModule(object): # yaml 'to_yaml': to_yaml, 'to_nice_yaml': to_nice_yaml, - 'from_yaml': yaml.safe_load, + 'from_yaml': from_yaml, #date 'to_datetime': to_datetime,