mirror of
https://github.com/ansible-collections/community.general.git
synced 2024-09-14 20:13:21 +02:00
fix issues with older yaml lib versions
also added missing json import and removed unused ones
This commit is contained in:
parent
6cad356b3b
commit
cc3cb0f65e
1 changed files with 6 additions and 4 deletions
|
@ -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:
|
||||
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):
|
||||
'''
|
||||
|
|
Loading…
Reference in a new issue