diff options
Diffstat (limited to '_test/lib')
| -rw-r--r-- | _test/lib/canonical.py | 12 | ||||
| -rw-r--r-- | _test/lib/test_constructor.py | 2 | ||||
| -rw-r--r-- | _test/lib/test_emitter.py | 27 | ||||
| -rw-r--r-- | _test/lib/test_resolver.py | 3 | ||||
| -rw-r--r-- | _test/lib/test_structure.py | 13 | ||||
| -rw-r--r-- | _test/lib/test_yaml_ext.py | 17 |
6 files changed, 42 insertions, 32 deletions
diff --git a/_test/lib/canonical.py b/_test/lib/canonical.py index 8a00772..31c9728 100644 --- a/_test/lib/canonical.py +++ b/_test/lib/canonical.py @@ -348,28 +348,32 @@ ruamel.yaml.canonical_scan = canonical_scan def canonical_parse(stream): - return ruamel.yaml.parse(stream, Loader=CanonicalLoader) + yaml = ruamel.yaml.YAML() + return yaml.parse(stream, Loader=CanonicalLoader) ruamel.yaml.canonical_parse = canonical_parse def canonical_compose(stream): - return ruamel.yaml.compose(stream, Loader=CanonicalLoader) + yaml = ruamel.yaml.YAML() + return yaml.compose(stream, Loader=CanonicalLoader) ruamel.yaml.canonical_compose = canonical_compose def canonical_compose_all(stream): - return ruamel.yaml.compose_all(stream, Loader=CanonicalLoader) + yaml = ruamel.yaml.YAML() + return yaml.compose_all(stream, Loader=CanonicalLoader) ruamel.yaml.canonical_compose_all = canonical_compose_all def canonical_load(stream): - return ruamel.yaml.load(stream, Loader=CanonicalLoader) + yaml = ruamel.yaml.YAML() + return yaml.load(stream, Loader=CanonicalLoader) ruamel.yaml.canonical_load = canonical_load diff --git a/_test/lib/test_constructor.py b/_test/lib/test_constructor.py index 738aaec..b38bf2f 100644 --- a/_test/lib/test_constructor.py +++ b/_test/lib/test_constructor.py @@ -121,7 +121,7 @@ def _make_objects(): else: return False - class AnObject(object): + class AnObject: def __new__(cls, foo=None, bar=None, baz=None): self = object.__new__(cls) self.foo = foo diff --git a/_test/lib/test_emitter.py b/_test/lib/test_emitter.py index fbdbb79..b1991e3 100644 --- a/_test/lib/test_emitter.py +++ b/_test/lib/test_emitter.py @@ -1,7 +1,8 @@ from __future__ import absolute_import from __future__ import print_function -import ruamel.yaml as yaml +import ruamel.yaml +from ruamel.yaml import YAML def _compare_events(events1, events2): @@ -20,8 +21,8 @@ def _compare_events(events1, events2): def test_emitter_on_data(data_filename, canonical_filename, verbose=False): with open(data_filename, 'rb') as fp0: - events = list(yaml.parse(fp0)) - output = yaml.emit(events) + events = list(YAML().parse(fp0)) + output = YAML().emit(events) if verbose: print('OUTPUT:') print(output) @@ -34,9 +35,9 @@ test_emitter_on_data.unittest = ['.data', '.canonical'] def test_emitter_on_canonical(canonical_filename, verbose=False): with open(canonical_filename, 'rb') as fp0: - events = list(yaml.parse(fp0)) + events = list(YAML().parse(fp0)) for canonical in [False, True]: - output = yaml.emit(events, canonical=canonical) + output = YAML().emit(events, canonical=canonical) if verbose: print('OUTPUT (canonical=%s):' % canonical) print(output) @@ -50,7 +51,7 @@ test_emitter_on_canonical.unittest = ['.canonical'] def test_emitter_styles(data_filename, canonical_filename, verbose=False): for filename in [data_filename, canonical_filename]: with open(filename, 'rb') as fp0: - events = list(yaml.parse(fp0)) + events = list(YAML().parse(fp0)) for flow_style in [False, True]: for style in ['|', '>', '"', "'", ""]: styled_events = [] @@ -68,23 +69,23 @@ def test_emitter_styles(data_filename, canonical_filename, verbose=False): event.anchor, event.tag, event.implicit, flow_style=flow_style ) styled_events.append(event) - output = yaml.emit(styled_events) + output = YAML().emit(styled_events) if verbose: print( 'OUTPUT (filename=%r, flow_style=%r, style=%r)' % (filename, flow_style, style) ) print(output) - new_events = list(yaml.parse(output)) + new_events = list(YAML().parse(output)) _compare_events(events, new_events) test_emitter_styles.unittest = ['.data', '.canonical'] -class EventsLoader(yaml.Loader): +class EventsLoader(ruamel.yaml.Loader): def construct_event(self, node): - if isinstance(node, yaml.ScalarNode): + if isinstance(node, ruamel.yaml.ScalarNode): mapping = {} else: mapping = self.construct_mapping(node) @@ -116,12 +117,12 @@ EventsLoader.add_constructor(None, EventsLoader.construct_event) def test_emitter_events(events_filename, verbose=False): with open(events_filename, 'rb') as fp0: - events = list(yaml.load(fp0, Loader=EventsLoader)) - output = yaml.emit(events) + events = list(YAML().load(fp0, Loader=EventsLoader)) + output = YAML().emit(events) if verbose: print('OUTPUT:') print(output) - new_events = list(yaml.parse(output)) + new_events = list(YAML().parse(output)) _compare_events(events, new_events) diff --git a/_test/lib/test_resolver.py b/_test/lib/test_resolver.py index 24373a7..b2b0839 100644 --- a/_test/lib/test_resolver.py +++ b/_test/lib/test_resolver.py @@ -1,5 +1,6 @@ -import ruamel.yaml as yaml +import ruamel.yaml +yaml = ruamel.yaml.YAML() import pprint diff --git a/_test/lib/test_structure.py b/_test/lib/test_structure.py index 470d267..8de24a3 100644 --- a/_test/lib/test_structure.py +++ b/_test/lib/test_structure.py @@ -84,9 +84,9 @@ def test_parser(data_filename, canonical_filename, verbose=False): events2 = None try: with open(data_filename, 'rb') as fp0: - events1 = list(ruamel.yaml.parse(fp0)) + events1 = list(ruamel.yaml.YAML().parse(fp0)) with open(canonical_filename, 'rb') as fp0: - events2 = list(ruamel.yaml.canonical_parse(fp0)) + events2 = list(ruamel.yaml.YAML().canonical_parse(fp0)) _compare_events(events1, events2) finally: if verbose: @@ -104,9 +104,9 @@ def test_parser_on_canonical(canonical_filename, verbose=False): events2 = None try: with open(canonical_filename, 'rb') as fp0: - events1 = list(ruamel.yaml.parse(fp0)) + events1 = list(ruamel.yaml.YAML().parse(fp0)) with open(canonical_filename, 'rb') as fp0: - events2 = list(ruamel.yaml.canonical_parse(fp0)) + events2 = list(ruamel.yaml.YAML().canonical_parse(fp0)) _compare_events(events1, events2, full=True) finally: if verbose: @@ -138,10 +138,11 @@ def test_composer(data_filename, canonical_filename, verbose=False): nodes1 = None nodes2 = None try: + yaml = ruamel.yaml.YAML() with open(data_filename, 'rb') as fp0: - nodes1 = list(ruamel.yaml.compose_all(fp0)) + nodes1 = list(yaml.compose_all(fp0)) with open(canonical_filename, 'rb') as fp0: - nodes2 = list(ruamel.yaml.canonical_compose_all(fp0)) + nodes2 = list(yaml.canonical_compose_all(fp0)) assert len(nodes1) == len(nodes2), (len(nodes1), len(nodes2)) for node1, node2 in zip(nodes1, nodes2): _compare_nodes(node1, node2) diff --git a/_test/lib/test_yaml_ext.py b/_test/lib/test_yaml_ext.py index 8cba7e5..a6fa287 100644 --- a/_test/lib/test_yaml_ext.py +++ b/_test/lib/test_yaml_ext.py @@ -110,7 +110,7 @@ def new_safe_dump(data, stream=None, **kwds): return old_dump(data, stream, ruamel.yaml.CSafeDumper, **kwds) -old_safe_dump_all = ruamel.yaml.safe_dump_all +# old_safe_dump_all = ruamel.yaml.safe_dump_all def new_safe_dump_all(documents, stream=None, **kwds): @@ -236,10 +236,12 @@ test_c_scanner.skip = ['.skip-ext'] def _compare_parsers(py_data, c_data, verbose): - py_events = list(ruamel.yaml.parse(py_data, Loader=ruamel.yaml.PyLoader)) + yaml = ruamel.yaml.YAML(typ='unsafe', pure=True) + py_events = list(yaml.parse(py_data, Loader=ruamel.yaml.PyLoader)) c_events = [] try: - for event in ruamel.yaml.parse(c_data, Loader=ruamel.yaml.CLoader): + yaml = ruamel.yaml.YAML(typ='unsafe', pure=False) + for event in yaml.parse(c_data, Loader=ruamel.yaml.CLoader): c_events.append(event) assert len(py_events) == len(c_events), (len(py_events), len(c_events)) for py_event, c_event in zip(py_events, c_events): @@ -284,12 +286,13 @@ test_c_parser.skip = ['.skip-ext'] def _compare_emitters(data, verbose): - events = list(ruamel.yaml.parse(data, Loader=ruamel.yaml.PyLoader)) - c_data = ruamel.yaml.emit(events, Dumper=ruamel.yaml.CDumper) + yaml = ruamel.yaml.YAML(typ='unsafe', pure=True) + events = list(yaml.parse(py_data, Loader=ruamel.yaml.PyLoader)) + c_data = yaml.emit(events, Dumper=ruamel.yaml.CDumper) if verbose: print(c_data) - py_events = list(ruamel.yaml.parse(c_data, Loader=ruamel.yaml.PyLoader)) - c_events = list(ruamel.yaml.parse(c_data, Loader=ruamel.yaml.CLoader)) + py_events = list(yaml.parse(c_data, Loader=ruamel.yaml.PyLoader)) + c_events = list(yaml.parse(c_data, Loader=ruamel.yaml.CLoader)) try: assert len(events) == len(py_events), (len(events), len(py_events)) assert len(events) == len(c_events), (len(events), len(c_events)) |