ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-07-25 06:10:22 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Revert "Revert "Allow ini plugin to load file using other encoding than utf8." (#27407)"

Browse source 
This reverts commit 520696fb39.
This commit is contained in:
Matt Clay 2017-07-27 18:15:56 -07:00
commit 51bd07204b
9 changed files with 78 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/ansible/parsing/dataloader.py
View file

@ -179,7 +179,7 @@ class DataLoader:
except AttributeError:
pass # older versions of yaml don't have dispose function, ignore
def _get_file_contents(self, file_name):
def _get_file_contents(self, file_name, encoding='utf-8'):
'''
Reads the file contents from the given file name, and will decrypt them
if they are found to be vault-encrypted.
@ -194,7 +194,7 @@ class DataLoader:
show_content = True
try:
with open(b_file_name, 'rb') as f:
data = f.read()
data = to_text(f.read(), encoding=encoding)
if is_encrypted(data):
data = self._vault.decrypt(data, filename=b_file_name)
show_content = False