Make sure unicode params don't break logging in modules

0cfaabf9 · James Cammarata · 788ac511 · 0cfaabf9
Commit 0cfaabf9 authored Feb 17, 2014 by James Cammarata
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletions

lib/ansible/module_utils/basic.py
+4 -1

No files found.
--- a/lib/ansible/module_utils/basic.py
+++ b/lib/ansible/module_utils/basic.py
@@ -780,7 +780,10 @@ class AnsibleModule(object):
            else:
                found = False
                for filter in filter_re:
-                    m = filter.match(str(self.params[param]))
+                    if isinstance(self.params[param], unicode):
+                        m = filter.match(self.params[param])
+                    else:
+                        m = filter.match(str(self.params[param]))
                    if m:
                        d = m.groupdict()
                        log_args[param] = d['before'] + "********" + d['after']