[Zope-Checkins] SVN: Products.Five/trunk/ Merge from 1.4 branch:

[Philipp von Weitershausen]

Log message for revision 71820:
  Merge from 1.4 branch:
    Log message for revision 71811:
      Add an ftest that demonstrates zope.security.management.checkPermission() works in Zope 2.
      This is the reproduceability test case for http://www.zope.org/Collectors/Zope/2190.
    Log message for revision 71813:
      Also test for a permission that anonymous doesn't have.
  
  Merge from 1.5 branch:  
    Log message for revision 71815:
      Also, added support for the securityPolicy directive which will now be used by Zope 2.
  
  

Changed:
  A   Products.Five/trunk/browser/tests/test_zope3security.py
  A   Products.Five/trunk/browser/tests/zope3security.py
  U   Products.Five/trunk/meta.zcml
  U   Products.Five/trunk/viewlet/directives.txt
  U   Products.Five/trunk/viewlet/tests.py

-=-
Copied: Products.Five/trunk/browser/tests/test_zope3security.py (from rev 71815, Products.Five/branches/1.5/browser/tests/test_zope3security.py)

Copied: Products.Five/trunk/browser/tests/zope3security.py (from rev 71815, Products.Five/branches/1.5/browser/tests/zope3security.py)

Modified: Products.Five/trunk/meta.zcml
===================================================================
--- Products.Five/trunk/meta.zcml	2007-01-08 17:09:45 UTC (rev 71819)
+++ Products.Five/trunk/meta.zcml	2007-01-08 17:24:53 UTC (rev 71820)
@@ -82,12 +82,19 @@
         handler="zope.app.schema.metaconfigure.vocabulary"
         />
 
+    <!-- BBB 2006/02/24, to be removed after 12 months -->
     <meta:directive
         name="defaultLayer"
         schema="zope.app.component.metadirectives.IDefaultLayerDirective"
         handler="zope.app.component.metaconfigure.defaultLayer"
         />
 
+    <meta:directive
+        name="securityPolicy"
+        schema="zope.security.zcml.ISecurityPolicyDirective"
+        handler="zope.security.zcml.securityPolicy"
+        />
+
   </meta:directives>
 
   <meta:directives namespace="http://namespaces.zope.org/five">

Modified: Products.Five/trunk/viewlet/directives.txt
===================================================================
--- Products.Five/trunk/viewlet/directives.txt	2007-01-08 17:09:45 UTC (rev 71819)
+++ Products.Five/trunk/viewlet/directives.txt	2007-01-08 17:24:53 UTC (rev 71820)
@@ -530,3 +530,8 @@
 
   >>> import shutil
   >>> shutil.rmtree(temp_dir)
+
+Clear registries:
+
+  >>> from zope.testing.cleanup import cleanUp
+  >>> cleanUp()

Modified: Products.Five/trunk/viewlet/tests.py
===================================================================
--- Products.Five/trunk/viewlet/tests.py	2007-01-08 17:09:45 UTC (rev 71819)
+++ Products.Five/trunk/viewlet/tests.py	2007-01-08 17:24:53 UTC (rev 71820)
@@ -84,12 +84,10 @@
     setup.placefulTearDown()
 
 def test_suite():
-    return unittest.TestSuite((
+    return unittest.TestSuite([
         FunctionalDocFileSuite('README.txt'),
-        FunctionalDocFileSuite('directives.txt',
-                     setUp=setUp, tearDown=tearDown
-                     ),
-        ))
+        FunctionalDocFileSuite('directives.txt'),
+        ])
 
 if __name__ == '__main__':
     unittest.main(defaultTest='test_suite')