Ye olde merge.

I broke test_mixin2to3 somehow; distutils2-default is okay and packaging too,
so I don?t see an obvious reason right now, I?ll investigate later.

1 files changed, 6 insertions, 6 deletions

diff --git a/distutils2/metadata.py b/distutils2/metadata.py
index 8db86e2..a08322a 100644
--- a/distutils2/metadata.py
+++ b/distutils2/metadata.py
@@ -28,8 +28,9 @@ try:
         def __init__(self, source, report_level, halt_level, stream=None,
                      debug=0, encoding='ascii', error_handler='replace'):
             self.messages = []
-            Reporter.__init__(self, source, report_level, halt_level, stream,
-                              debug, encoding, error_handler)
+            super(SilentReporter, self).__init__(
+                source, report_level, halt_level, stream,
+                debug, encoding, error_handler)
 
         def system_message(self, level, message, *children, **kwargs):
             self.messages.append((level, message, children, kwargs))
@@ -184,6 +185,7 @@ _MISSING = object()
 
 _FILESAFE = re.compile('[^A-Za-z0-9.]+')
 
+
 class Metadata:
     """The metadata of a release.
 
@@ -227,10 +229,8 @@ class Metadata:
 
     def __delitem__(self, name):
         field_name = self._convert_name(name)
-        try:
-            del self._fields[field_name]
-        except KeyError:
-            raise KeyError(name)
+        # we let a KeyError propagate
+        del self._fields[field_name]
         self._set_best_version()
 
     def __contains__(self, name):