[Checkins] SVN: Products.CMFCore/trunk/Products/CMFCore/ - removed support for missing REQUEST argument

[Yvo Schubbe]

Log message for revision 106387:
  - removed support for missing REQUEST argument

Changed:
  U   Products.CMFCore/trunk/Products/CMFCore/CHANGES.txt
  U   Products.CMFCore/trunk/Products/CMFCore/MembershipTool.py
  U   Products.CMFCore/trunk/Products/CMFCore/Skinnable.py

-=-
Modified: Products.CMFCore/trunk/Products/CMFCore/CHANGES.txt
===================================================================
--- Products.CMFCore/trunk/Products/CMFCore/CHANGES.txt	2009-12-10 12:17:35 UTC (rev 106386)
+++ Products.CMFCore/trunk/Products/CMFCore/CHANGES.txt	2009-12-10 12:21:42 UTC (rev 106387)
@@ -4,6 +4,10 @@
 2.3.0-alpha (unreleased)
 ------------------------
 
+- Skinnable and MembershipTool: Removed support for missing REQUEST argument.
+  'changeSkin', 'setupCurrentSkin' and 'credentialsChanged' will no longer
+  try to acquire the request if it is not passed in explicitly.
+
 - Tools and PortalFolder: Removed support for deprecated marker attributes.
   '_isDirectoryView', '_isPortalRoot', '_isTypeInformation' and '_isAWorkflow'
   are no longer supported.

Modified: Products.CMFCore/trunk/Products/CMFCore/MembershipTool.py
===================================================================
--- Products.CMFCore/trunk/Products/CMFCore/MembershipTool.py	2009-12-10 12:17:35 UTC (rev 106386)
+++ Products.CMFCore/trunk/Products/CMFCore/MembershipTool.py	2009-12-10 12:21:42 UTC (rev 106387)
@@ -330,14 +330,6 @@
         Note that this call should *not* cause any change at all to user
         databases.
         '''
-        # XXX: this method violates the rules for tools/utilities:
-        # it depends on self.REQUEST
-        if REQUEST is None:
-            REQUEST = self.REQUEST
-            warn("credentialsChanged should be called with 'REQUEST' as "
-                 "second argument. The BBB code will be removed in CMF 2.3.",
-                 DeprecationWarning, stacklevel=2)
-
         if not self.isAnonymousUser():
             user = _getAuthenticatedUser(self)
             name = user.getUserName()

Modified: Products.CMFCore/trunk/Products/CMFCore/Skinnable.py
===================================================================
--- Products.CMFCore/trunk/Products/CMFCore/Skinnable.py	2009-12-10 12:17:35 UTC (rev 106386)
+++ Products.CMFCore/trunk/Products/CMFCore/Skinnable.py	2009-12-10 12:21:42 UTC (rev 106387)
@@ -20,7 +20,6 @@
 
 import logging
 from thread import get_ident
-from warnings import warn
 
 from AccessControl.SecurityInfo import ClassSecurityInfo
 from Acquisition import aq_base
@@ -113,7 +112,7 @@
                 return REQUEST.get(sf.getRequestVarname(), None)
 
     security.declarePublic('changeSkin')
-    def changeSkin(self, skinname, REQUEST=_MARKER):
+    def changeSkin(self, skinname, REQUEST=None):
         '''Change the current skin.
 
         Can be called manually, allowing the user to change
@@ -123,11 +122,6 @@
         if skinobj is not None:
             tid = get_ident()
             SKINDATA[tid] = (skinobj, skinname, {}, {})
-            if REQUEST is _MARKER:
-                REQUEST = getattr(self, 'REQUEST', None)
-                warn("changeSkin should be called with 'REQUEST' as second "
-                     "argument. The BBB code will be removed in CMF 2.3.",
-                     DeprecationWarning, stacklevel=2)
             if REQUEST is not None:
                 REQUEST._hold(SkinDataCleanup(tid))
 
@@ -157,21 +151,14 @@
             del SKINDATA[tid]
 
     security.declarePublic('setupCurrentSkin')
-    def setupCurrentSkin(self, REQUEST=_MARKER):
+    def setupCurrentSkin(self, REQUEST=None):
         '''
         Sets up skindata so that __getattr__ can find it.
 
         Can NOT be called manually to change skins in the middle of a
         request! Use changeSkin for that.
         '''
-        if REQUEST is _MARKER:
-            REQUEST = getattr(self, 'REQUEST', None)
-            warn("setupCurrentSkin should be called with 'REQUEST' as "
-                 "argument. The BBB code will be removed in CMF 2.3.",
-                 DeprecationWarning, stacklevel=2)
         if REQUEST is None:
-            # self is not fully wrapped at the moment.  Don't
-            # change anything.
             return
         if SKINDATA.has_key(get_ident()):
             # Already set up for this request.