fix issues with older yaml lib versions

also added missing json import and removed unused ones
pull/15204/head
Brian Coca 10 years ago committed by James Cammarata
parent 2fdcaa218f
commit df1ee5a15b

@ -22,10 +22,9 @@ __metaclass__ = type
import copy import copy
import json import json
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
@ -147,7 +146,10 @@ class DataLoader():
try: try:
return loader.get_single_data() return loader.get_single_data()
finally: finally:
try:
loader.dispose() 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):
''' '''

Loading…
Cancel
Save