summaryrefslogtreecommitdiff
path: root/loader.py
diff options
context:
space:
mode:
authorAnthon van der Neut <anthon@mnt.org>2016-11-15 09:13:53 +0100
committerAnthon van der Neut <anthon@mnt.org>2016-11-15 09:13:53 +0100
commit35f9d0338bb586ec9e3c7a04be64ad8faebc840d (patch)
treecbcd7fce307cb43664abad27489972aea28e28b8 /loader.py
parent5e9680a5930a1e3fa7d6208dec13b5b61b5b665e (diff)
downloadruamel.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.py14
1 files changed, 7 insertions, 7 deletions
diff --git a/loader.py b/loader.py
index 93f0a16..661683d 100644
--- a/loader.py
+++ b/loader.py
@@ -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,