[Checkins] SVN: Products.CMFCore/branches/global-request-container/Products/CMFCore/ Remove RequestContainer utility wrapping for five.localsitemanager/branches/global-request-container

[Lawrence Rowe]

Log message for revision 127724:
  Remove RequestContainer utility wrapping for five.localsitemanager/branches/global-request-container

Changed:
  U   Products.CMFCore/branches/global-request-container/Products/CMFCore/MembershipTool.py
  U   Products.CMFCore/branches/global-request-container/Products/CMFCore/URLTool.py

-=-
Modified: Products.CMFCore/branches/global-request-container/Products/CMFCore/MembershipTool.py
===================================================================
--- Products.CMFCore/branches/global-request-container/Products/CMFCore/MembershipTool.py	2012-09-05 18:27:16 UTC (rev 127723)
+++ Products.CMFCore/branches/global-request-container/Products/CMFCore/MembershipTool.py	2012-09-05 18:29:18 UTC (rev 127724)
@@ -31,9 +31,7 @@
 from ZODB.POSException import ConflictError
 from zope.component import getUtility
 from zope.component import queryUtility
-from zope.globalrequest import getRequest
 from zope.interface import implements
-from ZPublisher.BaseRequest import RequestContainer
 
 from Products.CMFCore.exceptions import AccessControl_Unauthorized
 from Products.CMFCore.exceptions import BadRequest
@@ -205,10 +203,7 @@
         """
         parent = aq_parent(aq_inner(self))
         members_folder = getattr(parent, 'Members', None)
-        if members_folder is None:
-            return None
-        request_container = RequestContainer(REQUEST=getRequest())
-        return members_folder.__of__(request_container)
+        return members_folder
 
     security.declareProtected(ManagePortal, 'getMemberareaCreationFlag')
     def getMemberareaCreationFlag(self):

Modified: Products.CMFCore/branches/global-request-container/Products/CMFCore/URLTool.py
===================================================================
--- Products.CMFCore/branches/global-request-container/Products/CMFCore/URLTool.py	2012-09-05 18:27:16 UTC (rev 127723)
+++ Products.CMFCore/branches/global-request-container/Products/CMFCore/URLTool.py	2012-09-05 18:29:18 UTC (rev 127724)
@@ -20,9 +20,7 @@
 from App.special_dtml import DTMLFile
 from OFS.SimpleItem import SimpleItem
 from zope.component import queryUtility
-from zope.globalrequest import getRequest
 from zope.interface import implements
-from ZPublisher.BaseRequest import RequestContainer
 
 from Products.CMFCore.ActionProviderBase import ActionProviderBase
 from Products.CMFCore.interfaces import ISiteRoot
@@ -74,12 +72,11 @@
     def getPortalObject(self):
         """ Get the portal object itself.
         """
-        request_container = RequestContainer(REQUEST=getRequest())
         portal_obj = queryUtility(ISiteRoot)
         if portal_obj is None:
             # fallback for bootstrap
             portal_obj = aq_parent(aq_inner(self))
-        return portal_obj.__of__(request_container)
+        return portal_obj
 
     security.declarePublic('getRelativeContentPath')
     def getRelativeContentPath(self, content):