[Checkins] SVN: Products.DCWorkflow/trunk/Products/DCWorkflow/ - removed support for deprecated '_isPortalRoot' marker

[Yvo Schubbe]

Log message for revision 120431:
  - removed support for deprecated '_isPortalRoot' marker

Changed:
  U   Products.DCWorkflow/trunk/Products/DCWorkflow/CHANGES.txt
  UU  Products.DCWorkflow/trunk/Products/DCWorkflow/Expression.py

-=-
Modified: Products.DCWorkflow/trunk/Products/DCWorkflow/CHANGES.txt
===================================================================
--- Products.DCWorkflow/trunk/Products/DCWorkflow/CHANGES.txt	2011-02-18 23:24:23 UTC (rev 120430)
+++ Products.DCWorkflow/trunk/Products/DCWorkflow/CHANGES.txt	2011-02-19 09:56:55 UTC (rev 120431)
@@ -4,6 +4,8 @@
 2.3.0-alpha (unreleased)
 ------------------------
 
+- StateChangeInfo: Removed support for deprecated '_isPortalRoot' marker.
+
 - Hardened XML import parsing against missing boolean attributes.
   (https://bugs.launchpad.net/zope-cmf/+bug/707927)
 

Modified: Products.DCWorkflow/trunk/Products/DCWorkflow/Expression.py
===================================================================
--- Products.DCWorkflow/trunk/Products/DCWorkflow/Expression.py	2011-02-18 23:24:23 UTC (rev 120430)
+++ Products.DCWorkflow/trunk/Products/DCWorkflow/Expression.py	2011-02-19 09:56:55 UTC (rev 120431)
@@ -11,12 +11,8 @@
 # 
 ##############################################################################
 """ Expressions in a web-configurable workflow.
-
-$Id$
 """
 
-from warnings import warn
-
 from AccessControl.SecurityInfo import ClassSecurityInfo
 from AccessControl.SecurityManagement import getSecurityManager
 from Acquisition import aq_inner
@@ -26,9 +22,10 @@
 from Products.PageTemplates.Expressions import getEngine
 from Products.PageTemplates.Expressions import SecureModuleImporter
 
-from Products.CMFCore.WorkflowCore import ObjectDeleted, ObjectMoved
 from Products.CMFCore.Expression import Expression # BBB: old location
 from Products.CMFCore.interfaces import ISiteRoot
+from Products.CMFCore.WorkflowCore import ObjectDeleted
+from Products.CMFCore.WorkflowCore import ObjectMoved
 
 
 # We don't import SafeMapping from Products.PageTemplates.TALES
@@ -103,14 +100,6 @@
         while ob is not None:
             if ISiteRoot.providedBy(ob):
                 return ob
-            if getattr(ob, '_isPortalRoot', None) is not None:
-                # BBB
-                warn("The '_isPortalRoot' marker attribute for site "
-                     "roots is deprecated and will be removed in "
-                     "CMF 2.3;  please mark the root object with "
-                     "'ISiteRoot' instead.",
-                     DeprecationWarning, stacklevel=2)
-                return ob
             ob = aq_parent(ob)
         return None
 
@@ -148,4 +137,3 @@
         'scripts':      wf.scripts,
         }
     return getEngine().getContext(data)
-


Property changes on: Products.DCWorkflow/trunk/Products/DCWorkflow/Expression.py
___________________________________________________________________
Deleted: svn:keywords
   - Author Date Id Revision