[registry] setdefault catch wrong exception. Closes #111010

2 files changed, 4 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 7ce11d3..4ce2512 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,9 @@ ChangeLog for logilab.common
 
     * other python3 code and test fixes (closes #104047)
 
+    * registry: setdefault shouldn't raise RegistryNotFound (closes #111010)
+
+
 2012-07-30  --  0.58.2
     * modutils: fixes (closes #100757 and #100935)
 
diff --git a/registry.py b/registry.py
index 64f59e4..86065c5 100644
--- a/registry.py
+++ b/registry.py
@@ -501,7 +501,7 @@ class RegistryStore(dict):
     def setdefault(self, regid):
         try:
             return self[regid]
-        except KeyError:
+        except RegistryNotFound:
             self[regid] = self.registry_class(regid)(self.debugmode)
             return self[regid]