[Checkins] SVN: zope.testbrowser/branches/3.4/s backported fix for #149517 from r82106
Wolfgang Schnerring
wosc at wosc.de
Mon Oct 13 14:17:12 EDT 2008
Log message for revision 92137:
backported fix for #149517 from r82106
Changed:
U zope.testbrowser/branches/3.4/setup.py
U zope.testbrowser/branches/3.4/src/zope/testbrowser/browser.py
D zope.testbrowser/branches/3.4/src/zope/testbrowser/dummymodules.py
U zope.testbrowser/branches/3.4/src/zope/testbrowser/interfaces.py
-=-
Modified: zope.testbrowser/branches/3.4/setup.py
===================================================================
--- zope.testbrowser/branches/3.4/setup.py 2008-10-13 18:16:12 UTC (rev 92136)
+++ zope.testbrowser/branches/3.4/setup.py 2008-10-13 18:17:12 UTC (rev 92137)
@@ -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',
Modified: zope.testbrowser/branches/3.4/src/zope/testbrowser/browser.py
===================================================================
--- zope.testbrowser/branches/3.4/src/zope/testbrowser/browser.py 2008-10-13 18:16:12 UTC (rev 92136)
+++ zope.testbrowser/branches/3.4/src/zope/testbrowser/browser.py 2008-10-13 18:17:12 UTC (rev 92137)
@@ -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+")
Deleted: zope.testbrowser/branches/3.4/src/zope/testbrowser/dummymodules.py
===================================================================
--- zope.testbrowser/branches/3.4/src/zope/testbrowser/dummymodules.py 2008-10-13 18:16:12 UTC (rev 92136)
+++ zope.testbrowser/branches/3.4/src/zope/testbrowser/dummymodules.py 2008-10-13 18:17:12 UTC (rev 92137)
@@ -1,15 +0,0 @@
-class DummyInterfaceModule(object):
- Interface = object
-
- def __getattr__(self, name):
- return lambda *args, **kws: None
-
-interface = DummyInterfaceModule()
-
-class DummySchemaModule(object):
- def __getattr__(self, name):
- return lambda *args, **kws: interface.Attribute('')
-
-schema = DummySchemaModule()
-
-
Modified: zope.testbrowser/branches/3.4/src/zope/testbrowser/interfaces.py
===================================================================
--- zope.testbrowser/branches/3.4/src/zope/testbrowser/interfaces.py 2008-10-13 18:16:12 UTC (rev 92136)
+++ zope.testbrowser/branches/3.4/src/zope/testbrowser/interfaces.py 2008-10-13 18:17:12 UTC (rev 92137)
@@ -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):
More information about the Checkins
mailing list