cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Wrap some filters so they return unicode.

Browse source 
The rules are -- if the filter returns str type and the str may contain
non-ascii characters then wrap it to convert to unicode type.  Not
needed if the function already returns unicode type or only returns
ascii characters
This commit is contained in:
Toshio Kuratomi 2015-02-02 19:11:12 -08:00
parent a04138a887
commit 8fd7f4b121
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
lib/ansible/runner/filter_plugins/core.py
View file

@ -27,6 +27,7 @@ import collections
import crypt import crypt
import hashlib import hashlib
import string import string
from functools import partial
import operator as py_operator import operator as py_operator
from random import SystemRandom, shuffle from random import SystemRandom, shuffle
import uuid import uuid
@ -37,6 +38,7 @@ from distutils.version import LooseVersion, StrictVersion
from ansible import errors from ansible import errors
from ansible.utils.hashing import md5s, checksum_s from ansible.utils.hashing import md5s, checksum_s
from ansible.utils.unicode import unicode_wrap
UUID_NAMESPACE_ANSIBLE = uuid.UUID('361E6D51-FAEC-444A-9079-341386DA8E2E') UUID_NAMESPACE_ANSIBLE = uuid.UUID('361E6D51-FAEC-444A-9079-341386DA8E2E')
@ -310,8 +312,8 @@ class FilterModule(object):
def filters(self): def filters(self):
return { return {
# base 64 # base 64
'b64decode': base64.b64decode, 'b64decode': partial(unicode_wrap, base64.b64decode),
'b64encode': base64.b64encode, 'b64encode': partial(unicode_wrap, base64.b64encode),
# uuid # uuid
'to_uuid': to_uuid, 'to_uuid': to_uuid,
@ -327,11 +329,11 @@ class FilterModule(object):
'from_yaml': yaml.safe_load, 'from_yaml': yaml.safe_load,
# path # path
'basename': os.path.basename, 'basename': unicode_wrap(os.path.basename),
'dirname': os.path.dirname, 'dirname': unicode_wrap(os.path.dirname),
'expanduser': os.path.expanduser, 'expanduser': unicode_wrap(os.path.expanduser),
'realpath': os.path.realpath, 'realpath': unicode_wrap(os.path.realpath),
'relpath': os.path.relpath, 'relpath': unicode_wrap(os.path.relpath),
# failure testing # failure testing
'failed' : failed, 'failed' : failed,