[Zope3-checkins] SVN: Zope3/trunk/src/zope/app/ Merged from Zope X3-3.0 branch:

[Jim Fulton]

Log message for revision 27411:
  Merged from Zope X3-3.0 branch:
  
    r27392 | jim | 2004-09-01 14:18:21 -0400 (Wed, 01 Sep 2004) | 4 lines
  
  Added a missing commit to a test set up.
  This exposed a security configuration problem for zptpages.
  Sigh.
  


Changed:
  U   Zope3/trunk/src/zope/app/ftests/test_functional.py
  U   Zope3/trunk/src/zope/app/zptpage/configure.zcml


-=-
Modified: Zope3/trunk/src/zope/app/ftests/test_functional.py
===================================================================
--- Zope3/trunk/src/zope/app/ftests/test_functional.py	2004-09-02 07:59:06 UTC (rev 27410)
+++ Zope3/trunk/src/zope/app/ftests/test_functional.py	2004-09-02 08:07:31 UTC (rev 27411)
@@ -18,6 +18,7 @@
 __docformat__ = 'restructuredtext'
 
 import unittest
+import transaction
 from zope.app.tests.functional import SampleFunctionalTest, BrowserTestCase
 from zope.app.tests.functional import FunctionalDocFileSuite
 
@@ -62,8 +63,8 @@
             </tal:tag>'''
 
         root['setcookie'] = page
+        transaction.commit()
 
-
     def tearDown(self):
         root = self.getRootFolder()
         del root['getcookies']

Modified: Zope3/trunk/src/zope/app/zptpage/configure.zcml
===================================================================
--- Zope3/trunk/src/zope/app/zptpage/configure.zcml	2004-09-02 07:59:06 UTC (rev 27410)
+++ Zope3/trunk/src/zope/app/zptpage/configure.zcml	2004-09-02 08:07:31 UTC (rev 27411)
@@ -58,6 +58,8 @@
       for=".interfaces.IZPTPage"
       provides="zope.app.size.interfaces.ISized"
       factory=".zptpage.Sized"
+      trusted="y"
+      permission="zope.ManageContent"
       />