[Checkins] SVN: zope.testbrowser/trunk/s Make zope.interface and zope.schema real dependencies; fixes

[Benji York]

Log message for revision 82106:
  Make zope.interface and zope.schema real dependencies; fixes
  https://bugs.launchpad.net/bugs/149517 and removes need for conditional imports
  that originated before zope.schema was available seperately
  

Changed:
  U   zope.testbrowser/trunk/setup.py
  U   zope.testbrowser/trunk/src/zope/testbrowser/browser.py
  D   zope.testbrowser/trunk/src/zope/testbrowser/dummymodules.py
  U   zope.testbrowser/trunk/src/zope/testbrowser/interfaces.py

-=-
Modified: zope.testbrowser/trunk/setup.py
===================================================================
--- zope.testbrowser/trunk/setup.py	2007-12-03 18:54:04 UTC (rev 82105)
+++ zope.testbrowser/trunk/setup.py	2007-12-03 18:54:42 UTC (rev 82106)
@@ -53,11 +53,11 @@
         'setuptools',
         #'mechanize', XXX uncomment when we can use a released mechanize again
         'ClientForm',
+        'zope.interface',
+        'zope.schema',
         ],
     extras_require = dict(
         test = [
-            'zope.interface',
-            'zope.schema',
             'zope.app.component',
             'zope.app.folder',
             'zope.app.testing',

Modified: zope.testbrowser/trunk/src/zope/testbrowser/browser.py
===================================================================
--- zope.testbrowser/trunk/src/zope/testbrowser/browser.py	2007-12-03 18:54:04 UTC (rev 82105)
+++ zope.testbrowser/trunk/src/zope/testbrowser/browser.py	2007-12-03 18:54:42 UTC (rev 82106)
@@ -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/trunk/src/zope/testbrowser/dummymodules.py
===================================================================
--- zope.testbrowser/trunk/src/zope/testbrowser/dummymodules.py	2007-12-03 18:54:04 UTC (rev 82105)
+++ zope.testbrowser/trunk/src/zope/testbrowser/dummymodules.py	2007-12-03 18:54:42 UTC (rev 82106)
@@ -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/trunk/src/zope/testbrowser/interfaces.py
===================================================================
--- zope.testbrowser/trunk/src/zope/testbrowser/interfaces.py	2007-12-03 18:54:04 UTC (rev 82105)
+++ zope.testbrowser/trunk/src/zope/testbrowser/interfaces.py	2007-12-03 18:54:42 UTC (rev 82106)
@@ -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):