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

Lawrence Rowe cvs-admin at zope.org
Wed Sep 5 18:33:02 UTC 2012


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

Changed:
  U   Products.CMFDefault/branches/global-request-container/Products/CMFDefault/MembershipTool.py
  U   Products.CMFDefault/branches/global-request-container/Products/CMFDefault/RegistrationTool.py

-=-
Modified: Products.CMFDefault/branches/global-request-container/Products/CMFDefault/MembershipTool.py
===================================================================
--- Products.CMFDefault/branches/global-request-container/Products/CMFDefault/MembershipTool.py	2012-09-05 18:32:04 UTC (rev 127725)
+++ Products.CMFDefault/branches/global-request-container/Products/CMFDefault/MembershipTool.py	2012-09-05 18:32:59 UTC (rev 127726)
@@ -19,9 +19,7 @@
 from Acquisition import aq_parent
 from App.class_init import InitializeClass
 from App.special_dtml import DTMLFile
-from zope.globalrequest import getRequest
 from zope.interface import implements
-from ZPublisher.BaseRequest import RequestContainer
 
 from Products.CMFCore.MembershipTool import MembershipTool as BaseTool
 from Products.CMFCore.utils import _checkPermission
@@ -110,8 +108,7 @@
             members_folder = parent.restrictedTraverse(self.membersfolder_id)
         except (AttributeError, KeyError):
             return None
-        request_container = RequestContainer(REQUEST=getRequest())
-        return members_folder.__of__(request_container)
+        return members_folder
 
     security.declarePublic('createMemberArea')
     def createMemberArea(self, member_id=''):

Modified: Products.CMFDefault/branches/global-request-container/Products/CMFDefault/RegistrationTool.py
===================================================================
--- Products.CMFDefault/branches/global-request-container/Products/CMFDefault/RegistrationTool.py	2012-09-05 18:32:04 UTC (rev 127725)
+++ Products.CMFDefault/branches/global-request-container/Products/CMFDefault/RegistrationTool.py	2012-09-05 18:32:59 UTC (rev 127726)
@@ -21,7 +21,6 @@
 from Products.MailHost.interfaces import IMailHost
 from zope.component import getUtility
 from zope.schema import ValidationError
-from ZPublisher.BaseRequest import RequestContainer
 
 from Products.CMFCore.interfaces import IMembershipTool
 from Products.CMFCore.RegistrationTool import RegistrationTool as BaseTool
@@ -121,7 +120,7 @@
         return None
 
     security.declarePublic('mailPassword')
-    def mailPassword(self, forgotten_userid, REQUEST):
+    def mailPassword(self, forgotten_userid, REQUEST=None):
         """ Email a forgotten password to a member.
 
         o Raise an exception if user ID is not found.
@@ -138,12 +137,7 @@
         # Rather than have the template try to use the mailhost, we will
         # render the message ourselves and send it from here (where we
         # don't need to worry about 'UseMailHost' permissions).
-        if getattr(self, 'REQUEST', None) is None:
-            context = RequestContainer(REQUEST=REQUEST)
-            for item in reversed(aq_chain(self)):
-                context = aq_base(item).__of__(context)
-        else:
-            context = self
+        context = self
         method = context.unrestrictedTraverse('password_email')
         kw = {'member': member, 'password': member.getPassword()}
 



More information about the checkins mailing list