ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-06-03 14:59:09 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

fix issues with older yaml lib versions

Browse source 
also added missing json import and removed unused ones
This commit is contained in:
Brian Coca 2016-03-03 18:13:36 -05:00
parent 6cad356b3b
commit cc3cb0f65e
1 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -21,10 +21,9 @@ __metaclass__ = type
import copy import copy
import os import os
import stat import json
import subprocess import subprocess
from yaml import YAMLError
from yaml import load, YAMLError
from ansible.compat.six import text_type, string_types from ansible.compat.six import text_type, string_types
from ansible.errors import AnsibleFileNotFound, AnsibleParserError, AnsibleError from ansible.errors import AnsibleFileNotFound, AnsibleParserError, AnsibleError
@ -145,7 +144,10 @@ class DataLoader():
try: try:
return loader.get_single_data() return loader.get_single_data()
finally: finally:
loader.dispose() try:
loader.dispose()
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):
''' '''