diff options
author | Anthon van der Neut <anthon@mnt.org> | 2016-11-15 09:13:53 +0100 |
---|---|---|
committer | Anthon van der Neut <anthon@mnt.org> | 2016-11-15 09:13:53 +0100 |
commit | 35f9d0338bb586ec9e3c7a04be64ad8faebc840d (patch) | |
tree | cbcd7fce307cb43664abad27489972aea28e28b8 /loader.py | |
parent | 5e9680a5930a1e3fa7d6208dec13b5b61b5b665e (diff) | |
download | ruamel.yaml-35f9d0338bb586ec9e3c7a04be64ad8faebc840d.tar.gz |
fix issue #74: YAML 1.2 support for non-round-trip loaders0.12.17
Diffstat (limited to 'loader.py')
-rw-r--r-- | loader.py | 14 |
1 files changed, 7 insertions, 7 deletions
@@ -8,39 +8,39 @@ from ruamel.yaml.parser import Parser, RoundTripParser from ruamel.yaml.composer import Composer from ruamel.yaml.constructor import BaseConstructor, SafeConstructor, Constructor, \ RoundTripConstructor -from ruamel.yaml.resolver import Resolver, BaseResolver, VersionedResolver +from ruamel.yaml.resolver import VersionedResolver __all__ = ['BaseLoader', 'SafeLoader', 'Loader', 'RoundTripLoader'] -class BaseLoader(Reader, Scanner, Parser, Composer, BaseConstructor, BaseResolver): +class BaseLoader(Reader, Scanner, Parser, Composer, BaseConstructor, VersionedResolver): def __init__(self, stream, version=None, preserve_quotes=None): Reader.__init__(self, stream) Scanner.__init__(self) Parser.__init__(self) Composer.__init__(self) BaseConstructor.__init__(self) - BaseResolver.__init__(self) + VersionedResolver.__init__(self) -class SafeLoader(Reader, Scanner, Parser, Composer, SafeConstructor, Resolver): +class SafeLoader(Reader, Scanner, Parser, Composer, SafeConstructor, VersionedResolver): def __init__(self, stream, version=None, preserve_quotes=None): Reader.__init__(self, stream) Scanner.__init__(self) Parser.__init__(self) Composer.__init__(self) SafeConstructor.__init__(self) - Resolver.__init__(self) + VersionedResolver.__init__(self) -class Loader(Reader, Scanner, Parser, Composer, Constructor, Resolver): +class Loader(Reader, Scanner, Parser, Composer, Constructor, VersionedResolver): def __init__(self, stream, version=None, preserve_quotes=None): Reader.__init__(self, stream) Scanner.__init__(self) Parser.__init__(self) Composer.__init__(self) Constructor.__init__(self) - Resolver.__init__(self) + VersionedResolver.__init__(self) class RoundTripLoader(Reader, RoundTripScanner, RoundTripParser, Composer, |