[Checkins] SVN: Products.CMFCore/trunk/Products/CMFCore/ Deal with some deprecation warnings

[Hanno Schlichting]

Log message for revision 113181:
  Deal with some deprecation warnings
  

Changed:
  U   Products.CMFCore/trunk/Products/CMFCore/FSDTMLMethod.py
  U   Products.CMFCore/trunk/Products/CMFCore/testing.py
  U   Products.CMFCore/trunk/Products/CMFCore/tests/test_zcml.py

-=-
Modified: Products.CMFCore/trunk/Products/CMFCore/FSDTMLMethod.py
===================================================================
--- Products.CMFCore/trunk/Products/CMFCore/FSDTMLMethod.py	2010-06-06 13:06:05 UTC (rev 113180)
+++ Products.CMFCore/trunk/Products/CMFCore/FSDTMLMethod.py	2010-06-06 13:11:01 UTC (rev 113181)
@@ -15,7 +15,6 @@
 $Id$
 """
 
-from AccessControl.DTML import RestrictedDTML
 from AccessControl.Role import RoleManager
 from AccessControl.SecurityInfo import ClassSecurityInfo
 from AccessControl.SecurityManagement import getSecurityManager
@@ -34,6 +33,12 @@
 from Products.CMFCore.utils import _dtmldir
 from Products.CMFCore.utils import _setCacheHeaders
 
+# BBB for Zope 2.12
+try:
+    from DocumentTemplate.security import RestrictedDTML
+except ImportError:
+    from AccessControl.DTML import RestrictedDTML
+
 _marker = object()
 
 

Modified: Products.CMFCore/trunk/Products/CMFCore/testing.py
===================================================================
--- Products.CMFCore/trunk/Products/CMFCore/testing.py	2010-06-06 13:06:05 UTC (rev 113180)
+++ Products.CMFCore/trunk/Products/CMFCore/testing.py	2010-06-06 13:11:01 UTC (rev 113181)
@@ -14,7 +14,6 @@
 """
 
 from OFS.SimpleItem import SimpleItem
-from Products.Five import zcml
 from Testing.ZopeTestCase.layer import ZopeLite
 from zope.component import adapts
 from zope.i18n.interfaces import IUserPreferredLanguages
@@ -28,7 +27,13 @@
 from Products.CMFCore.interfaces import IWorkflowDefinition
 from Products.GenericSetup.utils import BodyAdapterBase
 
+# BBB for Zope 2.12
+try:
+    from Zope2.App import zcml
+except ImportError:
+    from Products.Five import zcml
 
+
 class ConformsToFolder:
 
     def test_folder_interfaces(self):

Modified: Products.CMFCore/trunk/Products/CMFCore/tests/test_zcml.py
===================================================================
--- Products.CMFCore/trunk/Products/CMFCore/tests/test_zcml.py	2010-06-06 13:06:05 UTC (rev 113180)
+++ Products.CMFCore/trunk/Products/CMFCore/tests/test_zcml.py	2010-06-06 13:11:01 UTC (rev 113181)
@@ -25,7 +25,12 @@
     Use the cmf:registerDirectory directive::
 
       >>> import Products.CMFCore
-      >>> from Products.Five import zcml
+      >>> # BBB for Zope 2.12
+      ... try:
+      ...    from Zope2.App import zcml
+      ... except ImportError:
+      ...    from Products.Five import zcml
+
       >>> configure_zcml = '''
       ... <configure xmlns:cmf="http://namespaces.zope.org/cmf">
       ...   <cmf:registerDirectory