[Python-checkins] distutils2 (merge default -> python3): Merge default

Mon Nov 14 17:29:01 CET 2011

http://hg.python.org/distutils2/rev/7fe2f04a24cc
changeset: 1251:7fe2f04a24cc
branch: python3
parent: 1248:1c4fe27018fd
parent: 1250:7eb32e910b85
user: Éric Araujo <merwok at netwok.org>
date: Mon Nov 14 17:25:52 2011 +0100
summary:
 Merge default
files:
 CONTRIBUTORS.txt | 2 +-
 distutils2/metadata.py | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -32,7 +32,6 @@
 - Hallvard B Furuseth
 - Yannick Gingras
 - Filip Gruszczyński
-- guillermoo
 - Walker Hale IV
 - Alexandre Hamelin
 - Kelsey Hightower
@@ -46,6 +45,7 @@
 - Alain Leufroy
 - Martin von Löwis
 - Hugo Lopes Tavares
+- Guillermo López-Anglada
 - Justin Love
 - Simon Mathieu
 - Carl Meyer
diff --git a/distutils2/metadata.py b/distutils2/metadata.py
--- a/distutils2/metadata.py
+++ b/distutils2/metadata.py
@@ -229,8 +229,10 @@
 
 def __delitem__(self, name):
 field_name = self._convert_name(name)
- # we let a KeyError propagate
- del self._fields[field_name]
+ try:
+ del self._fields[field_name]
+ except KeyError:
+ raise KeyError(name)
 self._set_best_version()
 
 def __contains__(self, name):
-- 
Repository URL: http://hg.python.org/distutils2
