construct/lib/container: Remove unneeded methods

`collections.abc.MutableMapping` already implements `keys()`,
`update()`, `__eq__()`, `__ne__()` and `__contains__()` – most
importantly correctly, e.g. `update()` has many variants which the
current implementation does not handle.

Signed-off-by: Philipp Hahn <[email protected]>

Author: pmhahn

elftools/construct/core.py

@@ -881,7 +881,7 @@ def _parse(self, stream, context):
             except ConstructError:
                 stream.seek(pos)
             else:
-                context.__update__(context2)
+                context.update(context2)
                 if self.include_name:
                     return sc.name, obj
                 else:
@@ -903,7 +903,7 @@ def _build(self, obj, stream, context):
                 except Exception:
                     pass
                 else:
-                    context.__update__(context2)
+                    context.update(context2)
                     stream.write(stream2.getvalue())
                     return
         raise SelectError("no subconstruct matched", obj)

elftools/construct/debug.py

@@ -81,7 +81,7 @@ def printout(self, stream, context):
             frames.reverse()
             for f in frames:
                 a = Container()
-                a.__update__(f.f_locals)
+                a.update(f.f_locals)
                 obj.stack.append(a)
 
         print("=" * 80)

elftools/construct/lib/container.py

@@ -40,45 +40,19 @@ def __delitem__(self, name):
     def __setitem__(self, name, value):
         self.__dict__[name] = value
 
-    def keys(self):
-        return self.__dict__.keys()
+    def __iter__(self):
+        return iter(self.__dict__)
 
     def __len__(self):
         return len(self.__dict__.keys())
 
-    # Extended dictionary interface.
-
-    def update(self, other):
-        self.__dict__.update(other)
-
-    __update__ = update
-
-    def __contains__(self, value):
-        return value in self.__dict__
-
-    # Rich comparisons.
-
-    def __eq__(self, other):
-        try:
-            return self.__dict__ == other.__dict__
-        except AttributeError:
-            return False
-
-    def __ne__(self, other):
-        return not self == other
-
     # Copy interface.
 
     def copy(self):
         return self.__class__(**self.__dict__)
 
     __copy__ = copy
 
-    # Iterator interface.
-
-    def __iter__(self):
-        return iter(self.__dict__)
-
     def __repr__(self):
         return "%s(%s)" % (self.__class__.__name__, repr(self.__dict__))