fix issue #74: YAML 1.2 support for non-round-trip loaders0.12.17

4 files changed, 13 insertions, 8 deletions

diff --git a/.hgignore b/.hgignore
index 303c646..4555465 100644
--- a/.hgignore
+++ b/.hgignore
@@ -26,3 +26,4 @@ cmd
 TODO.rst
 _doc/_build
 .dcw_alt.yml
+commit_message.txt
diff --git a/README.rst b/README.rst
index 4507ed4..78c4053 100644
--- a/README.rst
+++ b/README.rst
@@ -18,6 +18,10 @@ ChangeLog
 
 ::
 
+  0.12.17 (2016-11-15):
+   - only the RoundTripLoader included the Resolver that supports YAML 1.2
+     now all loaders do (reported by mixmastamyk)
+
   0.12.16 (2016-11-13):
    - allow dot char (and many others) in anchor name
      Fix issue 72 (reported by Shalon Wood)
diff --git a/__init__.py b/__init__.py
index cbc1163..fa7115e 100644
--- a/__init__.py
+++ b/__init__.py
@@ -9,7 +9,7 @@ from __future__ import absolute_import
 
 _package_data = dict(
     full_package_name="ruamel.yaml",
-    version_info=(0, 12, 16),
+    version_info=(0, 12, 17),
     author="Anthon van der Neut",
     author_email="a.van.der.neut@ruamel.eu",
     description="ruamel.yaml is a YAML parser/emitter that supports roundtrip preservation of comments, seq/map flow style, and map key order",  # NOQA
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,