[Checkins] SVN: Products.CMFCore/branches/2.2/Products/CMFCore/tests/test_utils.py Backport c115434 from trunk

Hanno Schlichting hannosch at hannosch.eu
Sun Aug 8 06:34:20 EDT 2010


Log message for revision 115541:
  Backport c115434 from trunk
  

Changed:
  U   Products.CMFCore/branches/2.2/Products/CMFCore/tests/test_utils.py

-=-
Modified: Products.CMFCore/branches/2.2/Products/CMFCore/tests/test_utils.py
===================================================================
--- Products.CMFCore/branches/2.2/Products/CMFCore/tests/test_utils.py	2010-08-08 10:32:58 UTC (rev 115540)
+++ Products.CMFCore/branches/2.2/Products/CMFCore/tests/test_utils.py	2010-08-08 10:34:20 UTC (rev 115541)
@@ -82,7 +82,11 @@
 class CoreUtilsSecurityTests(SecurityTest):
 
     def _makeSite(self):
-        from AccessControl.Owned import Owned
+        try:
+            from OFS.owner import Owned
+        except ImportError:
+            # BBB: for Zope < 2.13
+            from AccessControl.Owned import Owned
         from Products.CMFCore.tests.base.dummy import DummySite
         from Products.CMFCore.tests.base.dummy import DummyUserFolder
         from Products.CMFCore.tests.base.dummy import DummyObject



More information about the checkins mailing list