Merge pull request #45 from zopefoundation/thet-zope4

Fix two issues

CHANGES.rst

@@ -11,6 +11,14 @@ 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]
+
 - Skipped ipv6 test on Travis, because Travis no longer supports this.
 
 - LP #789863:  Ensure that Request objects cannot be published / traversed

src/App/FactoryDispatcher.py

@@ -79,8 +79,8 @@ class ProductDispatcher(Implicit):
         # 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)
 

src/Products/PageTemplates/ZopePageTemplate.py

@@ -83,8 +83,7 @@ class ZopePageTemplate(Script, PageTemplate, Historical, Cacheable,
                                        'www', 'default.html')
 
     manage_options = (
-        {'label':'Edit', 'action':'pt_editForm',
-         'help': ('PageTemplates', 'PageTemplate_Edit.stx')},
+        {'label':'Edit', 'action':'pt_editForm'},
         {'label':'Test', 'action':'ZScriptHTML_tryForm'},
         ) + PropertyManager.manage_options \
         + Historical.manage_options \