mirror of
https://github.com/ansible-collections/community.general.git
synced 2024-09-14 20:13:21 +02:00
Fixup unicode varReplace templating.
The original patches should have conflicted? 53bde0bf517d1302c80f80180f85995efa36a00e vs efde61e53729964f3e740dcbb9c52f889186719d
This commit is contained in:
parent
262b35e7d3
commit
74e21e6154
2 changed files with 23 additions and 1 deletions
|
@ -235,7 +235,7 @@ def varReplace(raw, vars):
|
|||
# original)
|
||||
varname = m.group(2).lower()
|
||||
|
||||
replacement = str(varLookup(varname, vars) or m.group())
|
||||
replacement = unicode(varLookup(varname, vars) or m.group())
|
||||
|
||||
start, end = m.span()
|
||||
done.append(raw[:start]) # Keep stuff leading up to token
|
||||
|
|
|
@ -1,3 +1,5 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
|
||||
import os
|
||||
import unittest
|
||||
|
||||
|
@ -131,6 +133,16 @@ class TestUtils(unittest.TestCase):
|
|||
|
||||
assert res == 'hello 2'
|
||||
|
||||
def test_varReplace_unicode(self):
|
||||
template = 'hello $who'
|
||||
vars = {
|
||||
'who': u'wórld',
|
||||
}
|
||||
|
||||
res = ansible.utils.varReplace(template, vars)
|
||||
|
||||
assert res == u'hello wórld'
|
||||
|
||||
#####################################
|
||||
### Template function tests
|
||||
|
||||
|
@ -153,3 +165,13 @@ class TestUtils(unittest.TestCase):
|
|||
res = ansible.utils.template(template, vars, {}, no_engine=False)
|
||||
|
||||
assert res == 'hello world\n'
|
||||
|
||||
def test_template_unicode(self):
|
||||
template = 'hello {{ who }}'
|
||||
vars = {
|
||||
'who': u'wórld',
|
||||
}
|
||||
|
||||
res = ansible.utils.template(template, vars, {}, no_engine=False)
|
||||
|
||||
assert res == u'hello wórld'
|
||||
|
|
Loading…
Reference in a new issue