diff options
author | Anthon van der Neut <anthon@mnt.org> | 2016-02-18 17:50:19 +0100 |
---|---|---|
committer | Anthon van der Neut <anthon@mnt.org> | 2016-02-18 17:50:19 +0100 |
commit | b8845506796879b1a756471a977ef60eb53f444e (patch) | |
tree | 7e6dcc6dc5939dfd78603a1590179d081dc50a63 /loader.py | |
parent | d588fa199a087020d1c1346d54f24b0972f1fbed (diff) | |
download | ruamel.yaml-b8845506796879b1a756471a977ef60eb53f444e.tar.gz |
- introducing version support and differentiation for RoundTripLoader0.11.0
1.2 no longer interprets sexagesimals, octals wihtout 0o, Yes/No/On/Off
by default
- added round_trip_load/round_trip_load_all
Diffstat (limited to 'loader.py')
-rw-r--r-- | loader.py | 18 |
1 files changed, 8 insertions, 10 deletions
@@ -18,9 +18,8 @@ except (ImportError, ValueError): # for Jython from ruamel.yaml.resolver import * # NOQA -class BaseLoader(Reader, Scanner, Parser, Composer, BaseConstructor, - BaseResolver): - def __init__(self, stream): +class BaseLoader(Reader, Scanner, Parser, Composer, BaseConstructor, BaseResolver): + def __init__(self, stream, version=None): Reader.__init__(self, stream) Scanner.__init__(self) Parser.__init__(self) @@ -30,7 +29,7 @@ class BaseLoader(Reader, Scanner, Parser, Composer, BaseConstructor, class SafeLoader(Reader, Scanner, Parser, Composer, SafeConstructor, Resolver): - def __init__(self, stream): + def __init__(self, stream, version=None): Reader.__init__(self, stream) Scanner.__init__(self) Parser.__init__(self) @@ -40,8 +39,7 @@ class SafeLoader(Reader, Scanner, Parser, Composer, SafeConstructor, Resolver): class Loader(Reader, Scanner, Parser, Composer, Constructor, Resolver): - - def __init__(self, stream): + def __init__(self, stream, version=None): Reader.__init__(self, stream) Scanner.__init__(self) Parser.__init__(self) @@ -50,12 +48,12 @@ class Loader(Reader, Scanner, Parser, Composer, Constructor, Resolver): Resolver.__init__(self) -class RoundTripLoader(Reader, RoundTripScanner, Parser, - Composer, RoundTripConstructor, Resolver): - def __init__(self, stream): +class RoundTripLoader(Reader, RoundTripScanner, Parser, Composer, + RoundTripConstructor, VersionedResolver): + def __init__(self, stream, version=None): Reader.__init__(self, stream) RoundTripScanner.__init__(self) Parser.__init__(self) Composer.__init__(self) RoundTripConstructor.__init__(self) - Resolver.__init__(self) + VersionedResolver.__init__(self, version) |