[Zope-Checkins] SVN: Products.Five/branches/1.5/ Fixed breakage caused by backport of #2358 to Zope 2.10 branch.

[Stefan H. Holek]

Log message for revision 80396:
  Fixed breakage caused by backport of #2358 to Zope 2.10 branch.
  

Changed:
  U   Products.Five/branches/1.5/CHANGES.txt
  U   Products.Five/branches/1.5/fiveconfigure.py

-=-
Modified: Products.Five/branches/1.5/CHANGES.txt
===================================================================
--- Products.Five/branches/1.5/CHANGES.txt	2007-09-29 15:03:02 UTC (rev 80395)
+++ Products.Five/branches/1.5/CHANGES.txt	2007-09-29 15:05:32 UTC (rev 80396)
@@ -2,6 +2,12 @@
 Five Changes
 ============
 
+Five 1.5.6 (2007-09-29)
+=======================
+
+* Fixed breakage caused by backport of #2358 to Zope 2.10 branch.
+  This change requires Zope 2.10.5 or higher.
+
 Five 1.5.5 (2007-06-25)
 =======================
 

Modified: Products.Five/branches/1.5/fiveconfigure.py
===================================================================
--- Products.Five/branches/1.5/fiveconfigure.py	2007-09-29 15:03:02 UTC (rev 80395)
+++ Products.Five/branches/1.5/fiveconfigure.py	2007-09-29 15:05:32 UTC (rev 80396)
@@ -21,7 +21,6 @@
 import glob
 import warnings
 import logging
-import transaction
 
 import App.config
 from App.Product import initializeProduct
@@ -213,38 +212,14 @@
     registered_packages.append(module_)
     
     # Delay the actual setup until the usual product loading time in
-    # OFS.Application on versions of Zope that support this. 
-    # 
-    # Without this processing, we may get database write errors 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().
-    # 
-    # For older versions of Zope not aware of this variable, initialize
-    # immediately as before
     to_initialize = getattr(Products, '_packages_to_initialize', None)
     if to_initialize is None:
-        app = Zope2.app()
-        try:
-            try:
-                product = initializeProduct(module_,
-                                            module_.__name__,
-                                            module_.__path__[0],
-                                            app)
+        to_initialize = Products._packages_to_initialize = []
+    to_initialize.append((module_, init_func,))
 
-                product.package_name = module_.__name__
-
-                if init_func is not None:
-                    newContext = ProductContext(product, app, module_)
-                    init_func(newContext)
-            except:
-                raise
-            else:
-                transaction.commit()
-        finally:
-            app._p_jar.close()
-    else:
-        to_initialize.append((module_, init_func,))
-
 def registerPackage(_context, package, initialize=None):
     """ZCML directive function for registering a python package product
     """