update for mypy --strict, prepare de-inheritance (Loader/Dumper)0.14.0

1 files changed, 33 insertions, 24 deletions

diff --git a/loader.py b/loader.py
index 661683d..a9b237f 100644
--- a/loader.py
+++ b/loader.py
@@ -2,6 +2,10 @@
 
 from __future__ import absolute_import
 
+from typing import Any, Dict, List                          # NOQA
+
+from ruamel.yaml.compat import StreamTextType, VersionType  # NOQA
+
 from ruamel.yaml.reader import Reader
 from ruamel.yaml.scanner import Scanner, RoundTripScanner
 from ruamel.yaml.parser import Parser, RoundTripParser
@@ -15,40 +19,45 @@ __all__ = ['BaseLoader', 'SafeLoader', 'Loader', 'RoundTripLoader']
 
 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)
-        VersionedResolver.__init__(self)
+        # type: (StreamTextType, VersionType, bool) -> None
+        Reader.__init__(self, stream, loader=self)
+        Scanner.__init__(self, loader=self)
+        Parser.__init__(self, loader=self)
+        Composer.__init__(self, loader=self)
+        BaseConstructor.__init__(self, loader=self)
+        VersionedResolver.__init__(self, version, loader=self)
 
 
 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)
-        VersionedResolver.__init__(self)
+        # type: (StreamTextType, VersionType, bool) -> None
+        Reader.__init__(self, stream, loader=self)
+        Scanner.__init__(self, loader=self)
+        Parser.__init__(self, loader=self)
+        Composer.__init__(self, loader=self)
+        SafeConstructor.__init__(self, loader=self)
+        VersionedResolver.__init__(self, version, loader=self)
 
 
 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)
-        VersionedResolver.__init__(self)
+        # type: (StreamTextType, VersionType, bool) -> None
+        Reader.__init__(self, stream, loader=self)
+        Scanner.__init__(self, loader=self)
+        Parser.__init__(self, loader=self)
+        Composer.__init__(self, loader=self)
+        Constructor.__init__(self, loader=self)
+        VersionedResolver.__init__(self, version, loader=self)
 
 
 class RoundTripLoader(Reader, RoundTripScanner, RoundTripParser, Composer,
                       RoundTripConstructor, VersionedResolver):
     def __init__(self, stream, version=None, preserve_quotes=None):
-        Reader.__init__(self, stream)
-        RoundTripScanner.__init__(self)
-        RoundTripParser.__init__(self)
-        Composer.__init__(self)
-        RoundTripConstructor.__init__(self, preserve_quotes=preserve_quotes)
-        VersionedResolver.__init__(self, version)
+        # type: (StreamTextType, VersionType, bool) -> None
+        # self.reader = Reader.__init__(self, stream)
+        Reader.__init__(self, stream, loader=self)
+        RoundTripScanner.__init__(self, loader=self)
+        RoundTripParser.__init__(self, loader=self)
+        Composer.__init__(self, loader=self)
+        RoundTripConstructor.__init__(self, preserve_quotes=preserve_quotes, loader=self)
+        VersionedResolver.__init__(self, version, loader=self)