diff options
| author | Anthon van der Neut <anthon@mnt.org> | 2017-08-05 14:58:39 +0200 |
|---|---|---|
| committer | Anthon van der Neut <anthon@mnt.org> | 2017-08-05 14:58:39 +0200 |
| commit | f9ce843b3f2342998fff0f053d4dfb51c049ebdd (patch) | |
| tree | b82a955eeaa8764b6a6ca065a8ed3c731d98d8b0 /resolver.py | |
| parent | ea1cd43722d6e8cc6ddf9190b09a5ad818313be6 (diff) | |
| download | ruamel.yaml-f9ce843b3f2342998fff0f053d4dfb51c049ebdd.tar.gz | |
no sexagesimal floats in 1.2
Diffstat (limited to 'resolver.py')
| -rw-r--r-- | resolver.py | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/resolver.py b/resolver.py index cbbda62..85e640d 100644 --- a/resolver.py +++ b/resolver.py @@ -31,13 +31,22 @@ implicit_resolvers = [ |true|True|TRUE|false|False|FALSE |on|On|ON|off|Off|OFF)$''', re.X), list(u'yYnNtTfFoO')), - ([(1, 2), (1, 1)], + ([(1, 2)], + u'tag:yaml.org,2002:float', + re.compile(u'''^(?: + [-+]?(?:[0-9][0-9_]*)\\.[0-9_]*(?:[eE][-+]?[0-9]+)? + |[-+]?(?:[0-9][0-9_]*)(?:[eE][-+]?[0-9]+) + |\\.[0-9_]+(?:[eE][-+][0-9]+)? + |[-+]?\\.(?:inf|Inf|INF) + |\\.(?:nan|NaN|NAN))$''', re.X), + list(u'-+0123456789.')), + ([(1, 1)], u'tag:yaml.org,2002:float', re.compile(u'''^(?: [-+]?(?:[0-9][0-9_]*)\\.[0-9_]*(?:[eE][-+]?[0-9]+)? |[-+]?(?:[0-9][0-9_]*)(?:[eE][-+]?[0-9]+) |\\.[0-9_]+(?:[eE][-+][0-9]+)? - |[-+]?[0-9][0-9_]*(?::[0-5]?[0-9])+\\.[0-9_]* + |[-+]?[0-9][0-9_]*(?::[0-5]?[0-9])+\\.[0-9_]* # sexagesimal float |[-+]?\\.(?:inf|Inf|INF) |\\.(?:nan|NaN|NAN))$''', re.X), list(u'-+0123456789.')), @@ -54,7 +63,7 @@ implicit_resolvers = [ |[-+]?0?[0-7_]+ |[-+]?(?:0|[1-9][0-9_]*) |[-+]?0x[0-9a-fA-F_]+ - |[-+]?[1-9][0-9_]*(?::[0-5]?[0-9])+)$''', re.X), + |[-+]?[1-9][0-9_]*(?::[0-5]?[0-9])+)$''', re.X), # sexagesimal int list(u'-+0123456789')), ([(1, 2), (1, 1)], u'tag:yaml.org,2002:merge', |