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

1 files changed, 193 insertions, 89 deletions

diff --git a/dumper.py b/dumper.py
index b43260c..5f23c45 100644
--- a/dumper.py
+++ b/dumper.py
@@ -4,114 +4,218 @@ from __future__ import absolute_import
 
 from ruamel.yaml.emitter import Emitter
 from ruamel.yaml.serializer import Serializer
-from ruamel.yaml.representer import Representer, SafeRepresenter, BaseRepresenter, \
-    RoundTripRepresenter
+from ruamel.yaml.representer import (
+    Representer,
+    SafeRepresenter,
+    BaseRepresenter,
+    RoundTripRepresenter,
+)
 from ruamel.yaml.resolver import Resolver, BaseResolver, VersionedResolver
 
 if False:  # MYPY
-    from typing import Any, Dict, List, Union               # NOQA
+    from typing import Any, Dict, List, Union  # NOQA
     from ruamel.yaml.compat import StreamType, VersionType  # NOQA
 
 __all__ = ['BaseDumper', 'SafeDumper', 'Dumper', 'RoundTripDumper']
 
 
 class BaseDumper(Emitter, Serializer, BaseRepresenter, BaseResolver):
-    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: (Any, StreamType, 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
-        Emitter.__init__(self, stream, canonical=canonical,
-                         indent=indent, width=width,
-                         allow_unicode=allow_unicode, line_break=line_break,
-                         block_seq_indent=block_seq_indent,
-                         dumper=self)
-        Serializer.__init__(self, encoding=encoding,
-                            explicit_start=explicit_start,
-                            explicit_end=explicit_end,
-                            version=version, tags=tags,
-                            dumper=self)
-        BaseRepresenter.__init__(self, default_style=default_style,
-                                 default_flow_style=default_flow_style,
-                                 dumper=self)
+    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: (Any, StreamType, 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
+        Emitter.__init__(
+            self,
+            stream,
+            canonical=canonical,
+            indent=indent,
+            width=width,
+            allow_unicode=allow_unicode,
+            line_break=line_break,
+            block_seq_indent=block_seq_indent,
+            dumper=self,
+        )
+        Serializer.__init__(
+            self,
+            encoding=encoding,
+            explicit_start=explicit_start,
+            explicit_end=explicit_end,
+            version=version,
+            tags=tags,
+            dumper=self,
+        )
+        BaseRepresenter.__init__(
+            self,
+            default_style=default_style,
+            default_flow_style=default_flow_style,
+            dumper=self,
+        )
         BaseResolver.__init__(self, loadumper=self)
 
 
 class SafeDumper(Emitter, Serializer, SafeRepresenter, Resolver):
-    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: (Any, StreamType, 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
-        Emitter.__init__(self, stream, canonical=canonical,
-                         indent=indent, width=width,
-                         allow_unicode=allow_unicode, line_break=line_break,
-                         block_seq_indent=block_seq_indent,
-                         dumper=self)
-        Serializer.__init__(self, encoding=encoding,
-                            explicit_start=explicit_start,
-                            explicit_end=explicit_end,
-                            version=version, tags=tags,
-                            dumper=self)
-        SafeRepresenter.__init__(self, default_style=default_style,
-                                 default_flow_style=default_flow_style,
-                                 dumper=self)
+    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, 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
+        Emitter.__init__(
+            self,
+            stream,
+            canonical=canonical,
+            indent=indent,
+            width=width,
+            allow_unicode=allow_unicode,
+            line_break=line_break,
+            block_seq_indent=block_seq_indent,
+            dumper=self,
+        )
+        Serializer.__init__(
+            self,
+            encoding=encoding,
+            explicit_start=explicit_start,
+            explicit_end=explicit_end,
+            version=version,
+            tags=tags,
+            dumper=self,
+        )
+        SafeRepresenter.__init__(
+            self,
+            default_style=default_style,
+            default_flow_style=default_flow_style,
+            dumper=self,
+        )
         Resolver.__init__(self, loadumper=self)
 
 
 class Dumper(Emitter, Serializer, Representer, Resolver):
-    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: (Any, StreamType, 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
-        Emitter.__init__(self, stream, canonical=canonical,
-                         indent=indent, width=width,
-                         allow_unicode=allow_unicode, line_break=line_break,
-                         block_seq_indent=block_seq_indent,
-                         dumper=self)
-        Serializer.__init__(self, encoding=encoding,
-                            explicit_start=explicit_start,
-                            explicit_end=explicit_end,
-                            version=version, tags=tags,
-                            dumper=self)
-        Representer.__init__(self, default_style=default_style,
-                             default_flow_style=default_flow_style,
-                             dumper=self)
+    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, 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
+        Emitter.__init__(
+            self,
+            stream,
+            canonical=canonical,
+            indent=indent,
+            width=width,
+            allow_unicode=allow_unicode,
+            line_break=line_break,
+            block_seq_indent=block_seq_indent,
+            dumper=self,
+        )
+        Serializer.__init__(
+            self,
+            encoding=encoding,
+            explicit_start=explicit_start,
+            explicit_end=explicit_end,
+            version=version,
+            tags=tags,
+            dumper=self,
+        )
+        Representer.__init__(
+            self,
+            default_style=default_style,
+            default_flow_style=default_flow_style,
+            dumper=self,
+        )
         Resolver.__init__(self, loadumper=self)
 
 
 class RoundTripDumper(Emitter, Serializer, RoundTripRepresenter, VersionedResolver):
-    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: (Any, StreamType, Any, bool, Union[None, int], Union[None, int], bool, Any, Any, Union[None, bool], Union[None, bool], Any, Any, Any, Any, Any) -> None  # NOQA
-        Emitter.__init__(self, stream, canonical=canonical,
-                         indent=indent, width=width,
-                         allow_unicode=allow_unicode, line_break=line_break,
-                         block_seq_indent=block_seq_indent,
-                         top_level_colon_align=top_level_colon_align,
-                         prefix_colon=prefix_colon,
-                         dumper=self)
-        Serializer.__init__(self, encoding=encoding,
-                            explicit_start=explicit_start,
-                            explicit_end=explicit_end,
-                            version=version, tags=tags,
-                            dumper=self)
-        RoundTripRepresenter.__init__(self, default_style=default_style,
-                                      default_flow_style=default_flow_style,
-                                      dumper=self)
+    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, Union[None, bool], Union[None, int], Union[None, int], Union[None, int], Union[None, bool], Any, Any, Union[None, bool], Union[None, bool], Any, Any, Any, Any, Any) -> None  # NOQA
+        Emitter.__init__(
+            self,
+            stream,
+            canonical=canonical,
+            indent=indent,
+            width=width,
+            allow_unicode=allow_unicode,
+            line_break=line_break,
+            block_seq_indent=block_seq_indent,
+            top_level_colon_align=top_level_colon_align,
+            prefix_colon=prefix_colon,
+            dumper=self,
+        )
+        Serializer.__init__(
+            self,
+            encoding=encoding,
+            explicit_start=explicit_start,
+            explicit_end=explicit_end,
+            version=version,
+            tags=tags,
+            dumper=self,
+        )
+        RoundTripRepresenter.__init__(
+            self,
+            default_style=default_style,
+            default_flow_style=default_flow_style,
+            dumper=self,
+        )
         VersionedResolver.__init__(self, loader=self)