Remove dependency on zope.app.testing

zopefoundation · Mar 22, 2013 · f01ac73 · f01ac73
1 parent 3057901
commit f01ac73
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 20 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -2,7 +2,7 @@
 CHANGES
 =======
 
-4.0.3 (unreleased)
+4.1.0 (unreleased)
 ------------------
 
 - Internal implementation now uses webtest instead of mechanize. Mechanize
@@ -26,6 +26,8 @@ CHANGES
 
 - Added support for Python-3.3
 
+- Removed dependency on deprecated zope.app.testing
+
 
 
 4.0.2 (2011-05-25)

diff --git a/setup.py b/setup.py
@@ -29,7 +29,7 @@
 
 setup(
     name='zope.testbrowser',
-    version='4.0.3dev',
+    version='4.1.0dev',
     url='http://pypi.python.org/pypi/zope.testbrowser',
     license='ZPL 2.1',
     description='Programmable browser for functional black-box tests',
@@ -65,10 +65,7 @@
     extras_require={
         'test': tests_require,
         'test_bbb': [
-            'zope.testbrowser [test,zope-functional-testing]',
-            ],
-        'zope-functional-testing': [
-            'zope.app.testing >= 3.9.0dev',
+            'zope.testbrowser [test]',
             ],
         'wsgi': [
                  # BBB

diff --git a/src/zope/testbrowser/testing.py b/src/zope/testbrowser/testing.py
@@ -16,20 +16,6 @@
 
 from wsgiref.simple_server import demo_app as wsgiref_demo_app
 
-try:
-    import zope.app.testing
-    have_zope_app_testing = True
-except ImportError:
-    have_zope_app_testing = False
-
-if have_zope_app_testing:
-    from zope.app.testing.testbrowser import (PublisherConnection,
-                                              PublisherHTTPHandler,
-                                              PublisherMechanizeBrowser,
-                                              Browser)
-
-del have_zope_app_testing
-
 def demo_app(environ, start_response):
     """PEP-3333 compatible demo app, that will never return unicode
     """

diff --git a/tox.ini b/tox.ini
@@ -14,3 +14,4 @@ deps =
     six
     zope.exceptions
     zope.testing
+	zope.cachedescriptors