Delay registration of python packages until a moment when a ZODB connection is...

Delay registration of python packages until a moment when a ZODB connection is available http://www.zope.org/Collectors/Zope/2293

lib/python/OFS/Application.py

@@ -633,6 +633,24 @@ def install_products(app):
         install_product(app, product_dir, product_name, meta_types,
                         folder_permissions, raise_exc=debug_mode)
 
+    # Delayed install of products-as-packages
+    for module_, init_func in getattr(Products, '_packages_to_initialize', []):
+        try:
+            product = App.Product.initializeProduct(module_, 
+                                                    module_.__name__, 
+                                                    module_.__path__[0],
+                                                    app)
+
+            product.package_name = module_.__name__
+
+            if init_func is not None:
+                newContext = ProductContext(product, app, module_)
+                init_func(newContext)
+        finally:
+            transaction.commit()
+    if hasattr(Products, '_packages_to_initialize'):
+        del Products._packages_to_initialize
+
     Products.meta_types=Products.meta_types+tuple(meta_types)
     InitializeClass(Folder.Folder)
 

lib/python/OFS/ObjectManager.py

@@ -705,6 +705,7 @@ class ObjectManager(
                 out=out+((k,stat),)
         return marshal.dumps(out)
 
+    security.declareProtected(access_contents_information, 'manage_hasId')
     def manage_hasId(self, REQUEST):
         """ check if the folder has an object with REQUEST['id'] """
 

lib/python/OFS/tests/testObjectManager.py

@@ -411,6 +411,16 @@ class ObjectManagerTests(PlacelessSetup, unittest.TestCase):
             self.failUnless(filename.endswith('.zexp') or
                             filename.endswith('.xml'))
 
+    def test_hasId(self):
+        om = self._makeOne()
+        request={'id' : 'test'}
+        self.assertRaises(KeyError, om.manage_hasId, request)
+
+        si = SimpleItem('test')
+        om._setObject('test', si)
+        om.manage_hasId(request)
+
+
 def test_suite():
     suite = unittest.TestSuite()
     suite.addTest( unittest.makeSuite( ObjectManagerTests ) )

lib/python/Products/Five/fiveconfigure.py

@@ -206,29 +206,19 @@ def _registerPackage(module_, init_func=None):
         raise ValueError("Must be a package and the " \
                          "package must be filesystem based")
     
-    app = Zope2.app()
-    try:
-        product = initializeProduct(module_, 
-                                    module_.__name__, 
-                                    module_.__path__[0],
-                                    app)
-
-        product.package_name = module_.__name__
-
-        if init_func is not None:
-            newContext = ProductContext(product, app, module_)
-            init_func(newContext)
-
     registered_packages = getattr(Products, '_registered_packages', None)
     if registered_packages is None:
         registered_packages = Products._registered_packages = []
     registered_packages.append(module_)
-    finally:
-        try:
-            import transaction
-            transaction.commit()
-        finally:
-            app._p_jar.close()
+    
+    # Delay the actual setup until the usual product loading time in
+    # OFS.Application. Otherwise, we may get database write errors in
+    # ZEO, when there's no connection with which to write an entry to
+    # Control_Panel. We would also get multiple calls to initialize().
+    to_initialize = getattr(Products, '_packages_to_initialize', None)
+    if to_initialize is None:
+        to_initialize = Products._packages_to_initialize = []
+    to_initialize.append((module_, init_func,))
 
 def registerPackage(_context, package, initialize=None):
     """ZCML directive function for registering a python package product

lib/python/Products/Five/tests/test_registerpackage.py

@@ -49,15 +49,21 @@ def test_registerPackage():
       ...       />
       ... </configure>'''
       >>> zcml.load_string(configure_zcml)
-      pythonproduct2 initialized
       
+    We need to load the product as well. This would normally happen during 
+    Zope startup, but in the test, we're already too late.
+    
+      >>> import Zope2
+      >>> from OFS.Application import install_products
+      
+      >>> app = Zope2.app()
+      >>> install_products(app)
+      pythonproduct2 initialized
       
     Test to see if the pythonproduct2 python package actually gets setup
     as a zope2 product in the Control Panel.
 
       >>> product_listing = []
-      >>> import Zope2
-      >>> app = Zope2.app()
       >>> try:
       ...    product_listing = app.Control_Panel.Products.objectIds()
       ... finally:

lib/python/Testing/ZopeTestCase/ZopeLite.py

@@ -26,6 +26,7 @@ $Id$
 """
 
 import os, sys, time
+import transaction
 
 # Allow code to tell it is run by the test framework
 os.environ['ZOPETESTCASE'] = '1'
@@ -143,11 +144,36 @@ def hasProduct(name):
     '''Checks if a product can be found along Products.__path__'''
     return name in [n[1] for n in get_products()]
 
-def installProduct(name, quiet=0):
+def installProduct(name, quiet=0, package=False):
     '''Installs a Zope product.'''
     start = time.time()
     meta_types = []
     if _patched and not _installedProducts.has_key(name):
+        if package:
+            # Processing of products-as-packages can be simpler; also check
+            # whether this has been registered with <five:registerPackage />
+            # and has not been loaded.
+            for module_, init_func in getattr(Products, '_packages_to_initialize', []):
+                if module_.__name__ == name:
+                    if not quiet: _print('Installing %s ... ' % name)
+                    try:
+                        product = App.Product.initializeProduct(module_, 
+                                                                module_.__name__, 
+                                                                module_.__path__[0],
+                                                                _theApp)
+
+                        product.package_name = module_.__name__
+
+                        if init_func is not None:
+                            newContext = App.ProductContext.ProductContext(product, app, module_)
+                            init_func(newContext)
+                    finally:
+                        transaction.commit()
+                    
+                    Globals.InitializeClass(Folder)
+                    if not quiet: _print('done (%.3fs)\n' % (time.time() - start))
+                    break
+        else:
             for priority, product_name, index, product_dir in get_products():
                 if product_name == name:
                     if not quiet: _print('Installing %s ... ' % product_name)