[Checkins] SVN: Products.CMFCore/branches/2.2/Products/CMFCore/ Backport c113181, c113182 from trunk

[Hanno Schlichting]

Log message for revision 113197:
  Backport c113181, c113182 from trunk
  

Changed:
  U   Products.CMFCore/branches/2.2/Products/CMFCore/CHANGES.txt
  U   Products.CMFCore/branches/2.2/Products/CMFCore/FSDTMLMethod.py
  U   Products.CMFCore/branches/2.2/Products/CMFCore/testing.py
  U   Products.CMFCore/branches/2.2/Products/CMFCore/tests/test_zcml.py

-=-
Modified: Products.CMFCore/branches/2.2/Products/CMFCore/CHANGES.txt
===================================================================
--- Products.CMFCore/branches/2.2/Products/CMFCore/CHANGES.txt	2010-06-06 13:46:20 UTC (rev 113196)
+++ Products.CMFCore/branches/2.2/Products/CMFCore/CHANGES.txt	2010-06-06 13:47:47 UTC (rev 113197)
@@ -4,6 +4,8 @@
 2.2.2 (unreleased)
 ------------------
 
+- Use the standard libraries doctest module.
+
 - Updated setDefaultRoles to use the addPermission API if available.
 
 - Updated test to work with zope.contenttype >= 3.4.3.

Modified: Products.CMFCore/branches/2.2/Products/CMFCore/FSDTMLMethod.py
===================================================================
--- Products.CMFCore/branches/2.2/Products/CMFCore/FSDTMLMethod.py	2010-06-06 13:46:20 UTC (rev 113196)
+++ Products.CMFCore/branches/2.2/Products/CMFCore/FSDTMLMethod.py	2010-06-06 13:47:47 UTC (rev 113197)
@@ -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/branches/2.2/Products/CMFCore/testing.py
===================================================================
--- Products.CMFCore/branches/2.2/Products/CMFCore/testing.py	2010-06-06 13:46:20 UTC (rev 113196)
+++ Products.CMFCore/branches/2.2/Products/CMFCore/testing.py	2010-06-06 13:47:47 UTC (rev 113197)
@@ -16,7 +16,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
@@ -30,7 +29,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/branches/2.2/Products/CMFCore/tests/test_zcml.py
===================================================================
--- Products.CMFCore/branches/2.2/Products/CMFCore/tests/test_zcml.py	2010-06-06 13:46:20 UTC (rev 113196)
+++ Products.CMFCore/branches/2.2/Products/CMFCore/tests/test_zcml.py	2010-06-06 13:47:47 UTC (rev 113197)
@@ -15,9 +15,8 @@
 $Id$
 """
 
+import doctest
 import unittest
-import Testing
-from zope.testing import doctest
 
 
 def test_registerDirectory():
@@ -25,7 +24,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
@@ -68,6 +72,3 @@
     return unittest.TestSuite((
         doctest.DocTestSuite(),
         ))
-
-if __name__ == '__main__':
-    unittest.main(defaultTest='test_suite')