diff options
Diffstat (limited to '_test/lib')
| -rw-r--r-- | _test/lib/canonical.py | 4 | ||||
| -rw-r--r-- | _test/lib/test_tokens.py | 42 | ||||
| -rw-r--r-- | _test/lib/test_yaml_ext.py | 6 |
3 files changed, 29 insertions, 23 deletions
diff --git a/_test/lib/canonical.py b/_test/lib/canonical.py index 1cab1ff..8a00772 100644 --- a/_test/lib/canonical.py +++ b/_test/lib/canonical.py @@ -339,7 +339,9 @@ ruamel.yaml.CanonicalLoader = CanonicalLoader def canonical_scan(stream): - return ruamel.yaml.scan(stream, Loader=CanonicalLoader) + yaml = ruamel.yaml.YAML() + yaml.scanner = CanonicalScanner + return yaml.scan(stream) ruamel.yaml.canonical_scan = canonical_scan diff --git a/_test/lib/test_tokens.py b/_test/lib/test_tokens.py index 1483db8..575e95c 100644 --- a/_test/lib/test_tokens.py +++ b/_test/lib/test_tokens.py @@ -1,5 +1,5 @@ -import ruamel.yaml as yaml +import ruamel.yaml import pprint # Tokens mnemonic: @@ -22,24 +22,24 @@ import pprint # value: : _replaces = { - yaml.DirectiveToken: '%', - yaml.DocumentStartToken: '---', - yaml.DocumentEndToken: '...', - yaml.AliasToken: '*', - yaml.AnchorToken: '&', - yaml.TagToken: '!', - yaml.ScalarToken: '_', - yaml.BlockSequenceStartToken: '[[', - yaml.BlockMappingStartToken: '{{', - yaml.BlockEndToken: ']}', - yaml.FlowSequenceStartToken: '[', - yaml.FlowSequenceEndToken: ']', - yaml.FlowMappingStartToken: '{', - yaml.FlowMappingEndToken: '}', - yaml.BlockEntryToken: ',', - yaml.FlowEntryToken: ',', - yaml.KeyToken: '?', - yaml.ValueToken: ':', + ruamel.yaml.DirectiveToken: '%', + ruamel.yaml.DocumentStartToken: '---', + ruamel.yaml.DocumentEndToken: '...', + ruamel.yaml.AliasToken: '*', + ruamel.yaml.AnchorToken: '&', + ruamel.yaml.TagToken: '!', + ruamel.yaml.ScalarToken: '_', + ruamel.yaml.BlockSequenceStartToken: '[[', + ruamel.yaml.BlockMappingStartToken: '{{', + ruamel.yaml.BlockEndToken: ']}', + ruamel.yaml.FlowSequenceStartToken: '[', + ruamel.yaml.FlowSequenceEndToken: ']', + ruamel.yaml.FlowMappingStartToken: '{', + ruamel.yaml.FlowMappingEndToken: '}', + ruamel.yaml.BlockEntryToken: ',', + ruamel.yaml.FlowEntryToken: ',', + ruamel.yaml.KeyToken: '?', + ruamel.yaml.ValueToken: ':', } @@ -48,9 +48,10 @@ def test_tokens(data_filename, tokens_filename, verbose=False): with open(tokens_filename, 'r') as fp: tokens2 = fp.read().split() try: + yaml = ruamel.yaml.YAML(typ='unsafe', pure=True) with open(data_filename, 'rb') as fp1: for token in yaml.scan(fp1): - if not isinstance(token, (yaml.StreamStartToken, yaml.StreamEndToken)): + if not isinstance(token, (ruamel.yaml.StreamStartToken, ruamel.yaml.StreamEndToken)): tokens1.append(_replaces[token.__class__]) finally: if verbose: @@ -68,6 +69,7 @@ def test_scanner(data_filename, canonical_filename, verbose=False): for filename in [data_filename, canonical_filename]: tokens = [] try: + yaml = ruamel.yaml.YAML(typ='unsafe', pure=False) with open(filename, 'rb') as fp: for token in yaml.scan(fp): tokens.append(token.__class__.__name__) diff --git a/_test/lib/test_yaml_ext.py b/_test/lib/test_yaml_ext.py index fd2d4ed..8cba7e5 100644 --- a/_test/lib/test_yaml_ext.py +++ b/_test/lib/test_yaml_ext.py @@ -176,10 +176,12 @@ def test_c_version(verbose=False): def _compare_scanners(py_data, c_data, verbose): - py_tokens = list(ruamel.yaml.scan(py_data, Loader=ruamel.yaml.PyLoader)) + yaml = ruamel.yaml.YAML(typ='unsafe', pure=True) + py_tokens = list(yaml.scan(py_data, Loader=ruamel.yaml.PyLoader)) c_tokens = [] try: - for token in ruamel.yaml.scan(c_data, Loader=ruamel.yaml.CLoader): + yaml = ruamel.yaml.YAML(typ='unsafe', pure=False) + for token in yaml.scan(c_data, Loader=ruamel.yaml.CLoader): c_tokens.append(token) assert len(py_tokens) == len(c_tokens), (len(py_tokens), len(c_tokens)) for py_token, c_token in zip(py_tokens, c_tokens): |