[gentoo-commits] proj/pkgcore/snakeoil:master commit in: src/snakeoil/

["Arthur Zamarin" <arthurzam@gentoo.org>]

commit:     379bf7a6cd7fb7b7c3684c834e20b8d4fe1170ae
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 30 04:20:08 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Wed Aug 30 04:20:08 2023 +0000
URL:        https://gitweb.gentoo.org/proj/pkgcore/snakeoil.git/commit/?id=379bf7a6

mappings: small refactor

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 src/snakeoil/mappings.py | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/snakeoil/mappings.py b/src/snakeoil/mappings.py
index d4ac221d..f3663571 100644
--- a/src/snakeoil/mappings.py
+++ b/src/snakeoil/mappings.py
@@ -298,7 +298,7 @@ class ProtectedDict(DictMixin):
         raise KeyError(key)
 
     def keys(self):
-        for k in self.new.keys():
+        for k in self.new:
             yield k
         for k in self.orig.keys():
             if k not in self.blacklist and k not in self.new:
@@ -320,14 +320,14 @@ class ImmutableDict(Mapping):
         elif isinstance(data, Mapping):
             mapping = data
         elif isinstance(data, DictMixin):
-            mapping = {k: v for k, v in data.items()}
+            mapping = dict(data.items())
         elif data is None:
             mapping = {}
         else:
             try:
-                mapping = {k: v for k, v in data}
-            except TypeError as e:
-                raise TypeError(f"unsupported data format: {e}")
+                mapping = dict(data)
+            except TypeError as exc:
+                raise TypeError(f"unsupported data format: {exc}")
         object.__setattr__(self, "_dict", mapping)
 
     def __getitem__(self, key):
@@ -362,8 +362,8 @@ class OrderedFrozenSet(Set):
     def __init__(self, iterable=()):
         try:
             self._dict = ImmutableDict({x: None for x in iterable})
-        except TypeError as e:
-            raise TypeError("not iterable") from e
+        except TypeError as exc:
+            raise TypeError("not iterable") from exc
 
     def __contains__(self, key):
         return key in self._dict
@@ -419,8 +419,8 @@ class OrderedSet(OrderedFrozenSet, MutableSet):
     def __init__(self, iterable=()):
         try:
             self._dict = {x: None for x in iterable}
-        except TypeError as e:
-            raise TypeError("not iterable") from e
+        except TypeError as exc:
+            raise TypeError("not iterable") from exc
 
     def add(self, value):
         self._dict[value] = None