[Checkins] SVN: GenericSetup/trunk/ First test commit :) Made sure we register Acquisition free objects as utilities in the components handler.

[Hanno Schlichting]

Log message for revision 75035:
  First test commit :) Made sure we register Acquisition free objects as utilities in the components handler.
  

Changed:
  U   GenericSetup/trunk/CHANGES.txt
  U   GenericSetup/trunk/components.py

-=-
Modified: GenericSetup/trunk/CHANGES.txt
===================================================================
--- GenericSetup/trunk/CHANGES.txt	2007-05-02 22:52:53 UTC (rev 75034)
+++ GenericSetup/trunk/CHANGES.txt	2007-05-02 22:59:34 UTC (rev 75035)
@@ -2,6 +2,9 @@
 
   GenericSetup 1.3-beta (unreleased)
 
+    - Made sure we register Acquisition free objects as utilities in the
+      components handler.
+
     - No longer read the toolset xml and update the toolset regustry on
       import context change.  Doing this only during the toolset step import
       should be sufficient.

Modified: GenericSetup/trunk/components.py
===================================================================
--- GenericSetup/trunk/components.py	2007-05-02 22:52:53 UTC (rev 75034)
+++ GenericSetup/trunk/components.py	2007-05-02 22:59:34 UTC (rev 75035)
@@ -19,6 +19,8 @@
 from zope.component import getSiteManager
 from zope.component.interfaces import IComponentRegistry
 
+from Acquisition import aq_base
+
 from interfaces import ISetupEnviron
 from utils import XMLAdapterBase
 from utils import exportObjects
@@ -135,7 +137,7 @@
                     # support for nested folder
                     obj = self._recurseFolder(site, path)
                     if obj is not None:
-                        self.context.registerUtility(obj, provided, name)
+                        self.context.registerUtility(aq_base(obj), provided, name)
                 else:
                     # Log an error, not aq_wrapped
                     self._logger.warning("The object %s was not acquisition "