diff options
| author | Anthon van der Neut <anthon@mnt.org> | 2018-10-06 19:34:28 +0200 |
|---|---|---|
| committer | Anthon van der Neut <anthon@mnt.org> | 2018-10-06 19:34:28 +0200 |
| commit | ffaab93d8964e7fbcbc2efe3399ae128fb4c5756 (patch) | |
| tree | 3f76d9322d1edfc8ca66e4bbe98cfed8c3cf7a11 /resolver.py | |
| parent | 334c992703b2093a26b59d2cac403375b568c617 (diff) | |
| download | ruamel.yaml-ffaab93d8964e7fbcbc2efe3399ae128fb4c5756.tar.gz | |
fix issue #245 regression on C parsing of explicit 1.1 source0.15.72
*When this change indeed resolves your problem, please **Close** this issue*.
*(You can do so using the WorkFlow pull-down (close to the top right of this page))*
Diffstat (limited to 'resolver.py')
| -rw-r--r-- | resolver.py | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/resolver.py b/resolver.py index 2641a54..5da1fe3 100644 --- a/resolver.py +++ b/resolver.py @@ -316,8 +316,10 @@ class VersionedResolver(BaseResolver): and Yes/No/On/Off booleans. """ - def __init__(self, version=None, loader=None): - # type: (Optional[VersionType], Any) -> None + def __init__(self, version=None, loader=None, loadumper=None): + # type: (Optional[VersionType], Any, Any) -> None + if loader is None and loadumper is not None: + loader = loadumper BaseResolver.__init__(self, loader) self._loader_version = self.get_loader_version(version) self._version_implicit_resolver = {} # type: Dict[Any, Any] @@ -383,10 +385,13 @@ class VersionedResolver(BaseResolver): try: version = self.parser.yaml_version except AttributeError: - if hasattr(self.loadumper, 'typ'): - version = self.loadumper.version - else: - version = self.loadumper._serializer.use_version # dumping + try: + if hasattr(self.loadumper, 'typ'): + version = self.loadumper.version + else: + version = self.loadumper._serializer.use_version # dumping + except AttributeError: + version = None if version is None: version = self._loader_version if version is None: |