ansible/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00
Code Releases Activity

Python 3: there's no 'unicode'

Browse source
This commit is contained in:
Marius Gedminas 2015-09-24 12:52:51 +03:00
parent 6d4618f46f
commit 56f2a25bff
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lib/ansible/template/__init__.py
View file

@ -22,7 +22,7 @@ __metaclass__ = type
import ast
import re
from six import string_types
from six import string_types, text_type, binary_type
from jinja2 import Environment
from jinja2.loaders import FileSystemLoader
from jinja2.exceptions import TemplateSyntaxError, UndefinedError
@ -217,10 +217,10 @@ class Templar:
# Don't template unsafe variables, instead drop them back down to
# their constituent type.
if hasattr(variable, '__UNSAFE__'):
if isinstance(variable, unicode):
return unicode(variable)
elif isinstance(variable, str):
return str(variable)
if isinstance(variable, text_type):
return text_type(variable)
elif isinstance(variable, binary_type):
return bytes(variable)
else:
return variable