[Checkins] SVN: Products.CMFCore/trunk/Products/CMFCore/testing.py Do layer setup as required by current Zope2 trunk.

Tres Seaver tseaver at palladion.com
Wed Mar 31 12:13:33 EDT 2010


Log message for revision 110372:
  Do layer setup as required by current Zope2 trunk.

Changed:
  U   Products.CMFCore/trunk/Products/CMFCore/testing.py

-=-
Modified: Products.CMFCore/trunk/Products/CMFCore/testing.py
===================================================================
--- Products.CMFCore/trunk/Products/CMFCore/testing.py	2010-03-31 16:11:55 UTC (rev 110371)
+++ Products.CMFCore/trunk/Products/CMFCore/testing.py	2010-03-31 16:13:33 UTC (rev 110372)
@@ -204,14 +204,27 @@
 
     @classmethod
     def testSetUp(cls):
+        import Zope2.App
+        import AccessControl
         import Products.Five
         import Products.GenericSetup
         import Products.CMFCore
         import Products.CMFCore.exportimport
 
+        try:
+            zcml.load_config('meta.zcml', Zope2.App)
+        except IOError:  # Zope <= 2.12.x
+            pass
+
         zcml.load_config('meta.zcml', Products.Five)
-        zcml.load_config('meta.zcml', Products.GenericSetup)
+
+        try:
+            zcml.load_config('permissions.zcml', AccessControl)
+        except IOError:  # Zope <= 2.12.x
+            pass
+
         zcml.load_config('permissions.zcml', Products.Five)
+
         zcml.load_config('meta.zcml', Products.GenericSetup)
         zcml.load_config('configure.zcml', Products.GenericSetup)
         zcml.load_config('permissions.zcml', Products.CMFCore)



More information about the checkins mailing list