fix issues with older yaml lib versions

also added missing json import and removed unused ones
pull/14793/head
Brian Coca 9 years ago
parent 6cad356b3b
commit cc3cb0f65e

@ -21,10 +21,9 @@ __metaclass__ = type
import copy
import os
import stat
import json
import subprocess
from yaml import load, YAMLError
from yaml import YAMLError
from ansible.compat.six import text_type, string_types
from ansible.errors import AnsibleFileNotFound, AnsibleParserError, AnsibleError
@ -145,7 +144,10 @@ class DataLoader():
try:
return loader.get_single_data()
finally:
try:
loader.dispose()
except AttributeError:
pass # older versions of yaml don't have dispose function, ignore
def _get_file_contents(self, file_name):
'''

Loading…
Cancel
Save