backported fix for #149517 from r82106

zopefoundation · Oct 13, 2008 · ee4a9f0 · ee4a9f0
1 parent fb10b5e
commit ee4a9f0
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 29 deletions.
diff --git a/setup.py b/setup.py
@@ -29,7 +29,7 @@
 
 setup(
     name = 'zope.testbrowser',
-    version = '3.4.2',
+    version = '3.4.3dev',
     url = 'http://pypi.python.org/pypi/zope.testbrowser',
     license = 'ZPL 2.1',
     description = 'Programmable browser for functional black-box tests',
@@ -50,11 +50,11 @@
     tests_require = ['zope.testing'],
     install_requires = ['setuptools',
                         'mechanize',
-                        'ClientForm'],
+                        'ClientForm',
+                        'zope.interface',
+                        'zope.schema'],
     extras_require = dict(
-        test = ['zope.interface',
-                'zope.schema',
-                'zope.app.component',
+        test = ['zope.app.component',
                 'zope.app.folder',
                 'zope.app.testing',
                 'zope.app.zcmlfiles',

diff --git a/src/zope/testbrowser/browser.py b/src/zope/testbrowser/browser.py
@@ -26,10 +26,7 @@
 import time
 import urllib2
 
-try:
-    from zope import interface
-except ImportError:
-    from dummymodules import interface
+from zope import interface
 
 RegexType = type(re.compile(''))
 _compress_re = re.compile(r"\s+")

diff --git a/src/zope/testbrowser/dummymodules.py b/src/zope/testbrowser/dummymodules.py
diff --git a/src/zope/testbrowser/interfaces.py b/src/zope/testbrowser/interfaces.py
@@ -17,11 +17,7 @@
 """
 __docformat__ = "reStructuredText"
 
-try:
-    # zope.interface and zope.schema aren't included in the stand-alone version
-    from zope import interface, schema
-except ImportError:
-    from dummymodules import interface, schema
+from zope import interface, schema
 
 
 class IBrowser(interface.Interface):