From 438db3b9b29e997a6fc2674c95a2c76192b5a567 Mon Sep 17 00:00:00 2001 From: Anthon van der Neut Date: Mon, 15 Aug 2016 22:46:12 +0200 Subject: initial type info, drop 2.6 --- loader.py | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-) (limited to 'loader.py') diff --git a/loader.py b/loader.py index b5ba20a..93f0a16 100644 --- a/loader.py +++ b/loader.py @@ -2,22 +2,15 @@ from __future__ import absolute_import -__all__ = ['BaseLoader', 'SafeLoader', 'Loader', 'RoundTripLoader'] +from ruamel.yaml.reader import Reader +from ruamel.yaml.scanner import Scanner, RoundTripScanner +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 -try: - from .reader import * # NOQA - from .scanner import * # NOQA - from .parser import * # NOQA - from .composer import * # NOQA - from .constructor import * # NOQA - from .resolver import * # NOQA -except (ImportError, ValueError): # for Jython - from ruamel.yaml.reader import * # NOQA - from ruamel.yaml.scanner import * # NOQA - from ruamel.yaml.parser import * # NOQA - from ruamel.yaml.composer import * # NOQA - from ruamel.yaml.constructor import * # NOQA - from ruamel.yaml.resolver import * # NOQA +__all__ = ['BaseLoader', 'SafeLoader', 'Loader', 'RoundTripLoader'] class BaseLoader(Reader, Scanner, Parser, Composer, BaseConstructor, BaseResolver): -- cgit v1.2.1