From ea3d878ef8635120354cd59a1f31b97b05a3e09b Mon Sep 17 00:00:00 2001
From: Anthon van der Neut <anthon@mnt.org>
Date: Mon, 31 May 2021 08:36:28 +0200
Subject: fix 385 (missing attribute) and mypy issues

---
 compat.py | 41 +++++++++++++++++++++--------------------
 1 file changed, 21 insertions(+), 20 deletions(-)

(limited to 'compat.py')

diff --git a/compat.py b/compat.py
index e88b433..87d5e35 100644
--- a/compat.py
+++ b/compat.py
@@ -19,30 +19,29 @@ if False:  # MYPY
 _DEFAULT_YAML_VERSION = (1, 2)
 
 try:
-    from ruamel.ordereddict import ordereddict
-except:  # NOQA
-    try:
-        from collections import OrderedDict
-    except ImportError:
-        from ordereddict import OrderedDict  # type: ignore
+    from collections import OrderedDict
+except ImportError:
+    from ordereddict import OrderedDict  # type: ignore
+
     # to get the right name import ... as ordereddict doesn't do that
 
-    class ordereddict(OrderedDict):  # type: ignore
-        if not hasattr(OrderedDict, 'insert'):
 
-            def insert(self, pos, key, value):
-                # type: (int, Any, Any) -> None
-                if pos >= len(self):
+class ordereddict(OrderedDict):  # type: ignore
+    if not hasattr(OrderedDict, 'insert'):
+
+        def insert(self, pos, key, value):
+            # type: (int, Any, Any) -> None
+            if pos >= len(self):
+                self[key] = value
+                return
+            od = ordereddict()
+            od.update(self)
+            for k in od:
+                del self[k]
+            for index, old_key in enumerate(od):
+                if pos == index:
                     self[key] = value
-                    return
-                od = ordereddict()
-                od.update(self)
-                for k in od:
-                    del self[k]
-                for index, old_key in enumerate(od):
-                    if pos == index:
-                        self[key] = value
-                    self[old_key] = od[old_key]
+                self[old_key] = od[old_key]
 
 
 PY2 = sys.version_info[0] == 2
@@ -54,6 +53,7 @@ PY3 = sys.version_info[0] == 3
 # assert _F('abc {ft!r}', ft=ft) == 'abc %r' % ft
 # 'abc %r' % ft -> _F('abc {ft!r}' -> f'abc {ft!r}'
 def _F(s, *superfluous, **kw):
+    # type: (Any, Any, Any) -> Any
     if superfluous:
         raise TypeError
     return s.format(**kw)
@@ -163,6 +163,7 @@ class Nprint:
         self._count = None
 
     def fp(self, mode='a'):
+        # type: (str) -> Any
         out = sys.stdout if self._file_name is None else open(self._file_name, mode)
         return out
 
-- 
cgit v1.2.1