Apply oitnb and mypy 0.620, then make everything work again0.15.48

1 files changed, 19 insertions, 9 deletions

diff --git a/loader.py b/loader.py
index 725c326..d8cbe31 100644
--- a/loader.py
+++ b/loader.py
@@ -7,12 +7,16 @@ 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.constructor import (
+    BaseConstructor,
+    SafeConstructor,
+    Constructor,
+    RoundTripConstructor,
+)
 from ruamel.yaml.resolver import VersionedResolver
 
 if False:  # MYPY
-    from typing import Any, Dict, List                          # NOQA
+    from typing import Any, Dict, List, Union  # NOQA
     from ruamel.yaml.compat import StreamTextType, VersionType  # NOQA
 
 __all__ = ['BaseLoader', 'SafeLoader', 'Loader', 'RoundTripLoader']
@@ -20,7 +24,7 @@ __all__ = ['BaseLoader', 'SafeLoader', 'Loader', 'RoundTripLoader']
 
 class BaseLoader(Reader, Scanner, Parser, Composer, BaseConstructor, VersionedResolver):
     def __init__(self, stream, version=None, preserve_quotes=None):
-        # type: (StreamTextType, VersionType, bool) -> None
+        # type: (StreamTextType, Union[None, VersionType], Union[None, bool]) -> None
         Reader.__init__(self, stream, loader=self)
         Scanner.__init__(self, loader=self)
         Parser.__init__(self, loader=self)
@@ -31,7 +35,7 @@ class BaseLoader(Reader, Scanner, Parser, Composer, BaseConstructor, VersionedRe
 
 class SafeLoader(Reader, Scanner, Parser, Composer, SafeConstructor, VersionedResolver):
     def __init__(self, stream, version=None, preserve_quotes=None):
-        # type: (StreamTextType, VersionType, bool) -> None
+        # type: (StreamTextType, Union[None, VersionType], Union[None, bool]) -> None
         Reader.__init__(self, stream, loader=self)
         Scanner.__init__(self, loader=self)
         Parser.__init__(self, loader=self)
@@ -42,7 +46,7 @@ class SafeLoader(Reader, Scanner, Parser, Composer, SafeConstructor, VersionedRe
 
 class Loader(Reader, Scanner, Parser, Composer, Constructor, VersionedResolver):
     def __init__(self, stream, version=None, preserve_quotes=None):
-        # type: (StreamTextType, VersionType, bool) -> None
+        # type: (StreamTextType, Union[None, VersionType], Union[None, bool]) -> None
         Reader.__init__(self, stream, loader=self)
         Scanner.__init__(self, loader=self)
         Parser.__init__(self, loader=self)
@@ -51,10 +55,16 @@ class Loader(Reader, Scanner, Parser, Composer, Constructor, VersionedResolver):
         VersionedResolver.__init__(self, version, loader=self)
 
 
-class RoundTripLoader(Reader, RoundTripScanner, RoundTripParser, Composer,
-                      RoundTripConstructor, VersionedResolver):
+class RoundTripLoader(
+    Reader,
+    RoundTripScanner,
+    RoundTripParser,
+    Composer,
+    RoundTripConstructor,
+    VersionedResolver,
+):
     def __init__(self, stream, version=None, preserve_quotes=None):
-        # type: (StreamTextType, VersionType, bool) -> None
+        # type: (StreamTextType, Union[None, VersionType], Union[None, bool]) -> None
         # self.reader = Reader.__init__(self, stream)
         Reader.__init__(self, stream, loader=self)
         RoundTripScanner.__init__(self, loader=self)