[Checkins] SVN: z3c.etestbrowser/trunk/ updated to use zope.testbrowser 4.0 instead of zope.app.wsgi
Michael Howitz
mh at gocept.com
Wed Oct 12 03:12:02 EST 2011
Log message for revision 123058:
updated to use zope.testbrowser 4.0 instead of zope.app.wsgi
Changed:
U z3c.etestbrowser/trunk/CHANGES.txt
U z3c.etestbrowser/trunk/setup.py
U z3c.etestbrowser/trunk/src/z3c/etestbrowser/wsgi.py
U z3c.etestbrowser/trunk/src/z3c/etestbrowser/wsgi.txt
-=-
Modified: z3c.etestbrowser/trunk/CHANGES.txt
===================================================================
--- z3c.etestbrowser/trunk/CHANGES.txt 2011-10-11 21:02:53 UTC (rev 123057)
+++ z3c.etestbrowser/trunk/CHANGES.txt 2011-10-12 08:12:01 UTC (rev 123058)
@@ -5,8 +5,13 @@
1.5.1 (unreleased)
==================
-- Nothing changed yet.
+- No longer depending on ``zope.app.wsgi`` but on ``zope.testbrowser`` >= 4.0
+ for the WSGI flavor of testbrowser.
+- Added a `zope.app.testing` extra. You should use this extra if you want to
+ use the browser in ``z3c.etestbrowser.testing``. (The base testbrowser used
+ there has been moved from ``zope.testbrowser`` to ``zope.app.testing`` in
+ version 4.0.)
1.5.0 (2010-08-22)
==================
Modified: z3c.etestbrowser/trunk/setup.py
===================================================================
--- z3c.etestbrowser/trunk/setup.py 2011-10-11 21:02:53 UTC (rev 123057)
+++ z3c.etestbrowser/trunk/setup.py 2011-10-12 08:12:01 UTC (rev 123058)
@@ -46,21 +46,22 @@
'Operating System :: OS Independent',
'Topic :: Internet :: WWW/HTTP',
'Framework :: Zope3'],
- url='http://cheeseshop.python.org/pypi/z3c.etestbrowser',
+ url='http://pypi.python.org/pypi/z3c.etestbrowser',
license='ZPL 2.1',
packages=find_packages('src'),
package_dir = {'': 'src'},
namespace_packages=['z3c'],
- extras_require=dict(test=['zope.app.testing',
- 'zope.app.zcmlfiles',
- 'zope.app.securitypolicy',
- 'zope.app.server',
- 'zope.testbrowser[test]',
- ]),
+ extras_require={"test":['zope.app.testing',
+ 'zope.app.wsgi >= 3.8',
+ 'zope.app.zcmlfiles',
+ 'zope.app.server',
+ 'zope.testbrowser[test]',
+ ],
+ "zope.app.testing": ["zope.app.testing"],
+ },
install_requires=['setuptools',
'lxml>=2.2',
- 'zope.testbrowser',
- 'zope.app.wsgi >= 3.8',
+ 'zope.testbrowser >= 4.0',
],
include_package_data = True,
zip_safe = False,
Modified: z3c.etestbrowser/trunk/src/z3c/etestbrowser/wsgi.py
===================================================================
--- z3c.etestbrowser/trunk/src/z3c/etestbrowser/wsgi.py 2011-10-11 21:02:53 UTC (rev 123057)
+++ z3c.etestbrowser/trunk/src/z3c/etestbrowser/wsgi.py 2011-10-12 08:12:01 UTC (rev 123058)
@@ -11,16 +11,16 @@
# FOR A PARTICULAR PURPOSE.
#
##############################################################################
-"""z3c.etestbrowser for zope.app.wsgi.testlayer."""
+"""z3c.etestbrowser for zope.testbrowser.wsgi."""
import z3c.etestbrowser.browser
-import zope.app.wsgi.testlayer
+import zope.testbrowser.wsgi
-class ExtendedTestBrowser(zope.app.wsgi.testlayer.Browser,
+class ExtendedTestBrowser(zope.testbrowser.wsgi.Browser,
z3c.etestbrowser.browser.ExtendedTestBrowser):
"""An extended testbrowser implementation.
- Based on zope.app.wsgi.testlayer.Browser.
+ Based on zope.testbrowser.wsgi.Browser.
"""
Modified: z3c.etestbrowser/trunk/src/z3c/etestbrowser/wsgi.txt
===================================================================
--- z3c.etestbrowser/trunk/src/z3c/etestbrowser/wsgi.txt 2011-10-11 21:02:53 UTC (rev 123057)
+++ z3c.etestbrowser/trunk/src/z3c/etestbrowser/wsgi.txt 2011-10-12 08:12:01 UTC (rev 123058)
@@ -1,9 +1,8 @@
-Extended testbrowser using zope.app.wsgi.testlayer
---------------------------------------------------
+Extended testbrowser for zope.testbrowser.wsgi
+----------------------------------------------
-There is also a variant in ``z3c.etestbrowser.wsgi`` which can be used when
-the test layer was set up using ``zope.app.wsgi.testlayer`` instead of
-``zope.app.testing``:
+There is also a variant in ``z3c.etestbrowser.wsgi`` which can be used for
+the WSGI variant of ``zope.testbrowser``.
Example:
More information about the checkins
mailing list