[Checkins] SVN: zope.testbrowser/trunk/ Remove dependency on zope.app.publisher in favor of zope.browserpage, zope.browserresource and zope.ptresource.

[Hanno Schlichting]

Log message for revision 103382:
  Remove dependency on zope.app.publisher in favor of zope.browserpage, zope.browserresource and zope.ptresource.
  

Changed:
  U   zope.testbrowser/trunk/CHANGES.txt
  U   zope.testbrowser/trunk/buildout.cfg
  U   zope.testbrowser/trunk/setup.py
  U   zope.testbrowser/trunk/src/zope/testbrowser/README.txt
  U   zope.testbrowser/trunk/src/zope/testbrowser/ftests/controls.html
  U   zope.testbrowser/trunk/src/zope/testbrowser/ftests/forms.html
  U   zope.testbrowser/trunk/src/zope/testbrowser/ftests/ftesting.zcml

-=-
Modified: zope.testbrowser/trunk/CHANGES.txt
===================================================================
--- zope.testbrowser/trunk/CHANGES.txt	2009-08-29 15:07:06 UTC (rev 103381)
+++ zope.testbrowser/trunk/CHANGES.txt	2009-08-29 15:21:28 UTC (rev 103382)
@@ -5,6 +5,9 @@
 3.7.0 (unreleased)
 ------------------
 
+- Remove dependency on zope.app.publisher in favor of zope.browserpage,
+  zope.browserresource and zope.ptresource.
+
 - Remove dependencies on zope.app.principalannotation and zope.securitypolicy
   by using the simple PermissiveSecurityPolicy. We aren't testing security
   in our tests.

Modified: zope.testbrowser/trunk/buildout.cfg
===================================================================
--- zope.testbrowser/trunk/buildout.cfg	2009-08-29 15:07:06 UTC (rev 103381)
+++ zope.testbrowser/trunk/buildout.cfg	2009-08-29 15:21:28 UTC (rev 103382)
@@ -1,14 +1,7 @@
 [buildout]
 develop = .
 parts = test interpreter
-versions = versions
 
-[versions]
-zope.testbrowser =
-zope.container = 3.8.2
-zope.publisher = 3.8.0
-zope.app.publisher = 3.8.4
-
 [test]
 recipe = zc.recipe.testrunner
 defaults = ['--tests-pattern', '^f?tests$']

Modified: zope.testbrowser/trunk/setup.py
===================================================================
--- zope.testbrowser/trunk/setup.py	2009-08-29 15:07:06 UTC (rev 103381)
+++ zope.testbrowser/trunk/setup.py	2009-08-29 15:21:28 UTC (rev 103382)
@@ -59,15 +59,17 @@
         ],
     extras_require = {
         'test': [
+            'zope.browserpage',
+            'zope.browserresource',
             'zope.component',
             'zope.container',
             'zope.principalregistry',
+            'zope.ptresource',
             'zope.publisher',
             'zope.security',
             'zope.site',
             'zope.traversing',
             'zope.app.appsetup',
-            'zope.app.publisher',
             'zope.app.publication',
             'zope.app.testing',
             ],

Modified: zope.testbrowser/trunk/src/zope/testbrowser/README.txt
===================================================================
--- zope.testbrowser/trunk/src/zope/testbrowser/README.txt	2009-08-29 15:07:06 UTC (rev 103381)
+++ zope.testbrowser/trunk/src/zope/testbrowser/README.txt	2009-08-29 15:21:28 UTC (rev 103382)
@@ -1078,13 +1078,8 @@
   - The method (HTTP verb) used to transmit the form data:
 
     >>> form.method
-    'POST'
+    'GET'
 
-  - The encoding type of the form data:
-
-    >>> form.enctype
-    'multipart/form-data'
-
 Besides those attributes, you have also a couple of methods.  Like for the
 browser, you can get control objects, but limited to the current form...
 

Modified: zope.testbrowser/trunk/src/zope/testbrowser/ftests/controls.html
===================================================================
--- zope.testbrowser/trunk/src/zope/testbrowser/ftests/controls.html	2009-08-29 15:07:06 UTC (rev 103381)
+++ zope.testbrowser/trunk/src/zope/testbrowser/ftests/controls.html	2009-08-29 15:21:28 UTC (rev 103382)
@@ -3,7 +3,7 @@
 
     <h1>Controls Tests</h1>
 
-    <form action="controls.html" method="post">
+    <form action="controls.html" method="get">
 
       <div>
         <label for="text-value">Text Control</label>

Modified: zope.testbrowser/trunk/src/zope/testbrowser/ftests/forms.html
===================================================================
--- zope.testbrowser/trunk/src/zope/testbrowser/ftests/forms.html	2009-08-29 15:07:06 UTC (rev 103381)
+++ zope.testbrowser/trunk/src/zope/testbrowser/ftests/forms.html	2009-08-29 15:21:28 UTC (rev 103382)
@@ -6,8 +6,7 @@
     <em tal:condition="request/text-value|nothing"
         tal:content="request/text-value" />
 
-    <form id="1" name="one" action="forms.html"
-          enctype="multipart/form-data" method="post">
+    <form id="1" name="one" action="forms.html">
       <input type="text" name="text-value" value="First Text" />
       <input type="image" name="image-1" src="zope3logo.gif" />
       <input type="submit" name="submit-1" value="Submit" />

Modified: zope.testbrowser/trunk/src/zope/testbrowser/ftests/ftesting.zcml
===================================================================
--- zope.testbrowser/trunk/src/zope/testbrowser/ftests/ftesting.zcml	2009-08-29 15:07:06 UTC (rev 103381)
+++ zope.testbrowser/trunk/src/zope/testbrowser/ftests/ftesting.zcml	2009-08-29 15:21:28 UTC (rev 103382)
@@ -7,21 +7,24 @@
 
   <!-- This file is used for functional testing setup -->
 
+  <include package="zope.browserpage" file="meta.zcml" />
+  <include package="zope.browserresource" file="meta.zcml" />
   <include package="zope.component" file="meta.zcml" />
+  <include package="zope.publisher" file="meta.zcml" />
   <include package="zope.security" file="meta.zcml" />
-  <include package="zope.app.publisher" file="meta.zcml" />
   <include package="zope.app.publication" file="meta.zcml" />
 
+  <include package="zope.browserresource" />
   <include package="zope.component" />
   <include package="zope.container" />
   <include package="zope.principalregistry" />
+  <include package="zope.ptresource" />
   <include package="zope.publisher" />
   <include package="zope.security" />
   <include package="zope.site" />
   <include package="zope.traversing" />
 
   <include package="zope.app.appsetup" />
-  <include package="zope.app.publisher" />
   <include package="zope.app.publication" />
 
   <securityPolicy