Adding tests for new yaml parsing stuff and adjusting imports

This commit is contained in:
James Cammarata 2014-10-07 15:52:58 -05:00
commit 93e273333d
6 changed files with 75 additions and 4 deletions

View file

@ -1,5 +1,5 @@
from yaml import load
from parsing.yaml.loader import AnsibleLoader
from ansible.parsing.yaml.loader import AnsibleLoader
def safe_load(stream):
''' implements yaml.safe_load(), except using our custom loader class '''

View file

@ -1,5 +1,5 @@
from yaml.constructor import Constructor
from parsing.yaml.objects import AnsibleMapping
from ansible.parsing.yaml.objects import AnsibleMapping
class AnsibleConstructor(Constructor):
def construct_yaml_map(self, node):

View file

@ -3,8 +3,8 @@ from yaml.scanner import Scanner
from yaml.parser import Parser
from yaml.resolver import Resolver
from parsing.yaml.composer import AnsibleComposer
from parsing.yaml.constructor import AnsibleConstructor
from ansible.parsing.yaml.composer import AnsibleComposer
from ansible.parsing.yaml.constructor import AnsibleConstructor
class AnsibleLoader(Reader, Scanner, Parser, AnsibleComposer, AnsibleConstructor, Resolver):
def __init__(self, stream):