fix cache-invalidation in ProductDispatcher. Fixes all tests that use…

… late-initialized products in test-profiles
zopefoundation · Feb 2, 2016 · ef457af · ef457af
1 parent cff7b4d
commit ef457af
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -11,6 +11,11 @@ http://docs.zope.org/zope2/
 Bugs Fixed
 ++++++++++
 
+- bobo_traverse of ProductDispatcher did not correctly invalidate cache
+  when a product was not initializes after first access of the cache. Types
+  that were added in test-profiles were not useable.
+  [pbauer, jensens]
+
 - Fix pt_editForm after the help-system was removed.
   [pbauer]
 

diff --git a/src/App/FactoryDispatcher.py b/src/App/FactoryDispatcher.py
@@ -79,8 +79,8 @@ def __bobo_traverse__(self, REQUEST, name):
         # Try to get a custom dispatcher from a Python product
         global _packages
         try:
-            package = _packages.get(name, None)
-        except NameError:
+            package = _packages[name]
+        except (NameError, KeyError):
             _packages = _product_packages()
             package = _packages.get(name, None)