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

1 files changed, 120 insertions, 54 deletions

diff --git a/cyaml.py b/cyaml.py
index 3e5b90a..ed2c1da 100644
--- a/cyaml.py
+++ b/cyaml.py
@@ -2,7 +2,7 @@
 
 from __future__ import absolute_import
 
-from _ruamel_yaml import CParser, CEmitter   # type: ignore
+from _ruamel_yaml import CParser, CEmitter  # type: ignore
 
 from ruamel.yaml.constructor import Constructor, BaseConstructor, SafeConstructor
 from ruamel.yaml.representer import Representer, SafeRepresenter, BaseRepresenter
@@ -12,16 +12,16 @@ if False:  # MYPY
     from typing import Any, Union  # NOQA
     from ruamel.yaml.compat import StreamTextType, StreamType, VersionType  # NOQA
 
-__all__ = ['CBaseLoader', 'CSafeLoader', 'CLoader',
-           'CBaseDumper', 'CSafeDumper', 'CDumper']
+__all__ = ['CBaseLoader', 'CSafeLoader', 'CLoader', 'CBaseDumper', 'CSafeDumper', 'CDumper']
 
 
 # this includes some hacks to solve the  usage of resolver by lower level
 # parts of the parser
 
+
 class CBaseLoader(CParser, BaseConstructor, BaseResolver):  # type: ignore
     def __init__(self, stream, version=None, preserve_quotes=None):
-        # type: (StreamTextType, VersionType, bool) -> None
+        # type: (StreamTextType, Union[None, VersionType], Union[None, bool]) -> None
         CParser.__init__(self, stream)
         self._parser = self._composer = self
         BaseConstructor.__init__(self, loader=self)
@@ -33,7 +33,7 @@ class CBaseLoader(CParser, BaseConstructor, BaseResolver):  # type: ignore
 
 class CSafeLoader(CParser, SafeConstructor, Resolver):  # type: ignore
     def __init__(self, stream, version=None, preserve_quotes=None):
-        # type: (StreamTextType, VersionType, bool) -> None
+        # type: (StreamTextType, Union[None, VersionType], Union[None, bool]) -> None
         CParser.__init__(self, stream)
         self._parser = self._composer = self
         SafeConstructor.__init__(self, loader=self)
@@ -45,7 +45,7 @@ class CSafeLoader(CParser, SafeConstructor, Resolver):  # type: ignore
 
 class CLoader(CParser, Constructor, Resolver):  # type: ignore
     def __init__(self, stream, version=None, preserve_quotes=None):
-        # type: (StreamTextType, VersionType, bool) -> None
+        # type: (StreamTextType, Union[None, VersionType], Union[None, bool]) -> None
         CParser.__init__(self, stream)
         self._parser = self._composer = self
         Constructor.__init__(self, loader=self)
@@ -56,64 +56,130 @@ class CLoader(CParser, Constructor, Resolver):  # type: ignore
 
 
 class CBaseDumper(CEmitter, BaseRepresenter, BaseResolver):  # type: ignore
-    def __init__(self, stream,
-                 default_style=None, default_flow_style=None,
-                 canonical=None, indent=None, width=None,
-                 allow_unicode=None, line_break=None,
-                 encoding=None, explicit_start=None, explicit_end=None,
-                 version=None, tags=None, block_seq_indent=None,
-                 top_level_colon_align=None, prefix_colon=None):
-        # type: (StreamType, Any, Any, Any, bool, Union[None, int], Union[None, int], bool, Any, Any, Union[None, bool], Union[None, bool], Any, Any, Any, Any, Any) -> None   # NOQA
-        CEmitter.__init__(self, stream, canonical=canonical,
-                          indent=indent, width=width, encoding=encoding,
-                          allow_unicode=allow_unicode, line_break=line_break,
-                          explicit_start=explicit_start,
-                          explicit_end=explicit_end,
-                          version=version, tags=tags)
+    def __init__(
+        self,
+        stream,
+        default_style=None,
+        default_flow_style=None,
+        canonical=None,
+        indent=None,
+        width=None,
+        allow_unicode=None,
+        line_break=None,
+        encoding=None,
+        explicit_start=None,
+        explicit_end=None,
+        version=None,
+        tags=None,
+        block_seq_indent=None,
+        top_level_colon_align=None,
+        prefix_colon=None,
+    ):
+        # type: (StreamType, Any, Any, Any, Union[None, bool], Union[None, int], Union[None, int], Union[None, bool], Any, Any, Union[None, bool], Union[None, bool], Any, Any, Any, Any, Any) -> None   # NOQA
+        CEmitter.__init__(
+            self,
+            stream,
+            canonical=canonical,
+            indent=indent,
+            width=width,
+            encoding=encoding,
+            allow_unicode=allow_unicode,
+            line_break=line_break,
+            explicit_start=explicit_start,
+            explicit_end=explicit_end,
+            version=version,
+            tags=tags,
+        )
         self._emitter = self._serializer = self._representer = self
-        BaseRepresenter.__init__(self, default_style=default_style,
-                                 default_flow_style=default_flow_style, dumper=self)
+        BaseRepresenter.__init__(
+            self,
+            default_style=default_style,
+            default_flow_style=default_flow_style,
+            dumper=self,
+        )
         BaseResolver.__init__(self, loadumper=self)
 
 
 class CSafeDumper(CEmitter, SafeRepresenter, Resolver):  # type: ignore
-    def __init__(self, stream,
-                 default_style=None, default_flow_style=None,
-                 canonical=None, indent=None, width=None,
-                 allow_unicode=None, line_break=None,
-                 encoding=None, explicit_start=None, explicit_end=None,
-                 version=None, tags=None, block_seq_indent=None,
-                 top_level_colon_align=None, prefix_colon=None):
-        # type: (StreamType, Any, Any, Any, bool, Union[None, int], Union[None, int], bool, Any, Any, Union[None, bool], Union[None, bool], Any, Any, Any, Any, Any) -> None   # NOQA
+    def __init__(
+        self,
+        stream,
+        default_style=None,
+        default_flow_style=None,
+        canonical=None,
+        indent=None,
+        width=None,
+        allow_unicode=None,
+        line_break=None,
+        encoding=None,
+        explicit_start=None,
+        explicit_end=None,
+        version=None,
+        tags=None,
+        block_seq_indent=None,
+        top_level_colon_align=None,
+        prefix_colon=None,
+    ):
+        # type: (StreamType, Any, Any, Any, Union[None, bool], Union[None, int], Union[None, int], Union[None, bool], Any, Any, Union[None, bool], Union[None, bool], Any, Any, Any, Any, Any) -> None   # NOQA
         self._emitter = self._serializer = self._representer = self
-        CEmitter.__init__(self, stream, canonical=canonical,
-                          indent=indent, width=width, encoding=encoding,
-                          allow_unicode=allow_unicode, line_break=line_break,
-                          explicit_start=explicit_start,
-                          explicit_end=explicit_end,
-                          version=version, tags=tags)
+        CEmitter.__init__(
+            self,
+            stream,
+            canonical=canonical,
+            indent=indent,
+            width=width,
+            encoding=encoding,
+            allow_unicode=allow_unicode,
+            line_break=line_break,
+            explicit_start=explicit_start,
+            explicit_end=explicit_end,
+            version=version,
+            tags=tags,
+        )
         self._emitter = self._serializer = self._representer = self  # type: ignore
-        SafeRepresenter.__init__(self, default_style=default_style,
-                                 default_flow_style=default_flow_style)
+        SafeRepresenter.__init__(
+            self, default_style=default_style, default_flow_style=default_flow_style
+        )
         Resolver.__init__(self)
 
 
 class CDumper(CEmitter, Representer, Resolver):  # type: ignore
-    def __init__(self, stream,
-                 default_style=None, default_flow_style=None,
-                 canonical=None, indent=None, width=None,
-                 allow_unicode=None, line_break=None,
-                 encoding=None, explicit_start=None, explicit_end=None,
-                 version=None, tags=None, block_seq_indent=None,
-                 top_level_colon_align=None, prefix_colon=None):
-        # type: (StreamType, Any, Any, Any, bool, Union[None, int], Union[None, int], bool, Any, Any, Union[None, bool], Union[None, bool], Any, Any, Any, Any, Any) -> None   # NOQA
-        CEmitter.__init__(self, stream, canonical=canonical,
-                          indent=indent, width=width, encoding=encoding,
-                          allow_unicode=allow_unicode, line_break=line_break,
-                          explicit_start=explicit_start,
-                          explicit_end=explicit_end,
-                          version=version, tags=tags)
+    def __init__(
+        self,
+        stream,
+        default_style=None,
+        default_flow_style=None,
+        canonical=None,
+        indent=None,
+        width=None,
+        allow_unicode=None,
+        line_break=None,
+        encoding=None,
+        explicit_start=None,
+        explicit_end=None,
+        version=None,
+        tags=None,
+        block_seq_indent=None,
+        top_level_colon_align=None,
+        prefix_colon=None,
+    ):
+        # type: (StreamType, Any, Any, Any, Union[None, bool], Union[None, int], Union[None, int], Union[None, bool], Any, Any, Union[None, bool], Union[None, bool], Any, Any, Any, Any, Any) -> None   # NOQA
+        CEmitter.__init__(
+            self,
+            stream,
+            canonical=canonical,
+            indent=indent,
+            width=width,
+            encoding=encoding,
+            allow_unicode=allow_unicode,
+            line_break=line_break,
+            explicit_start=explicit_start,
+            explicit_end=explicit_end,
+            version=version,
+            tags=tags,
+        )
         self._emitter = self._serializer = self._representer = self
-        Representer.__init__(self, default_style=default_style,
-                             default_flow_style=default_flow_style)
+        Representer.__init__(
+            self, default_style=default_style, default_flow_style=default_flow_style
+        )
         Resolver.__init__(self)