[CMF-checkins] CVS: CMF/CMFCore - TypesTool.py:1.53.2.2

[Yvo Schubbe]

Update of /cvs-repository/CMF/CMFCore
In directory cvs.zope.org:/tmp/cvs-serv2074/CMFCore

Modified Files:
      Tag: CMF-1_4-branch
	TypesTool.py 
Log Message:
Merged yuppie-collector165-branch:
- Fixed ownership of STI constructor scripts. (Collector #165)
- Added and refactored tests.

=== CMF/CMFCore/TypesTool.py 1.53.2.1 => 1.53.2.2 ===
--- CMF/CMFCore/TypesTool.py:1.53.2.1	Fri May  9 17:31:38 2003
+++ CMF/CMFCore/TypesTool.py	Wed Jun 11 07:10:42 2003
@@ -16,14 +16,14 @@
 """
 import sys
 
-from Globals import InitializeClass
 from Globals import DTMLFile
-from AccessControl import getSecurityManager
+from Globals import InitializeClass
 from AccessControl import ClassSecurityInfo
+from AccessControl import getSecurityManager
 from AccessControl import Unauthorized
 from Acquisition import aq_base
+from Acquisition import aq_get
 from zLOG import LOG, WARNING, ERROR
-
 from OFS.Folder import Folder
 import Products
 
@@ -31,8 +31,6 @@
 from interfaces.portal_types import portal_types as ITypesTool
 
 from ActionProviderBase import ActionProviderBase
-from ActionInformation import ActionInformation
-from Expression import Expression
 
 from CMFCorePermissions import View
 from CMFCorePermissions import ManagePortal
@@ -458,6 +456,10 @@
             raise Unauthorized
 
         constructor = self.restrictedTraverse( self.constructor_path )
+        # make sure ownership is explicit before switching the context
+        if not hasattr( aq_base(constructor), '_owner' ):
+            constructor._owner = aq_get(constructor, '_owner')
+
         #   Rewrap to get into container's context.
         constructor = aq_base(constructor).__of__( container )