[Zope3-checkins] SVN: Zope3/trunk/src/zope/app/publisher/browser/ Oops, forgot to fix tests.

[Stephan Richter]

Log message for revision 29267:
  Oops, forgot to fix tests.
  

Changed:
  U   Zope3/trunk/src/zope/app/publisher/browser/metaconfigure.py
  U   Zope3/trunk/src/zope/app/publisher/browser/tests/test_addMenuItem.py
  U   Zope3/trunk/src/zope/app/publisher/browser/tests/test_directives.py

-=-
Modified: Zope3/trunk/src/zope/app/publisher/browser/metaconfigure.py
===================================================================
--- Zope3/trunk/src/zope/app/publisher/browser/metaconfigure.py	2005-02-23 21:46:47 UTC (rev 29266)
+++ Zope3/trunk/src/zope/app/publisher/browser/metaconfigure.py	2005-02-23 21:56:07 UTC (rev 29267)
@@ -141,9 +141,9 @@
     if interface and not interface.extends(IBrowserRequest):
         raise ConfigurationError(
             "The layer interface must extend `IBrowserRequest`.")
-    if base is not IBrowserRequest and not IBrowserRequest.extends(base):
+    if base is not IBrowserRequest and not base.extends(IBrowserRequest):
         raise ConfigurationError(
-            "The base interface must extend `IBRowserRequest`.")
+            "The base interface must extend `IBrowserRequest`.")
     if interface is not None and base is not IBrowserRequest:
         raise ConfigurationError(
             "You cannot specify the 'interface' and 'base' together.")

Modified: Zope3/trunk/src/zope/app/publisher/browser/tests/test_addMenuItem.py
===================================================================
--- Zope3/trunk/src/zope/app/publisher/browser/tests/test_addMenuItem.py	2005-02-23 21:46:47 UTC (rev 29266)
+++ Zope3/trunk/src/zope/app/publisher/browser/tests/test_addMenuItem.py	2005-02-23 21:56:07 UTC (rev 29267)
@@ -23,7 +23,7 @@
   <function handler>,
   ('provideUtility',
    <InterfaceClass zope.component.interfaces.IFactory>,
-   <zope.component.factory.Factory object>,
+   <Factory for <class 'zope.app.publisher.browser.tests.test_addMenuItem.X'>>,
    'BrowserAdd__zope.app.publisher.browser.tests.test_addMenuItem.X')),
  (None,
   <function provideInterface>,
@@ -167,7 +167,7 @@
       <function handler>,
       ('provideUtility',
        <InterfaceClass zope.component.interfaces.IFactory>,
-       <zope.component.factory.Factory object>,
+       <Factory for <class 'zope.app.publisher.browser.tests.test_addMenuItem.X'>>,
        'BrowserAdd__zope.app.publisher.browser.tests.test_addMenuItem.X')),
      (None,
       <function provideInterface>,

Modified: Zope3/trunk/src/zope/app/publisher/browser/tests/test_directives.py
===================================================================
--- Zope3/trunk/src/zope/app/publisher/browser/tests/test_directives.py	2005-02-23 21:46:47 UTC (rev 29266)
+++ Zope3/trunk/src/zope/app/publisher/browser/tests/test_directives.py	2005-02-23 21:56:07 UTC (rev 29267)
@@ -95,9 +95,10 @@
 
 directlyProvides(ITestMenu, IMenuItemType)
 
-class ITestLayer(ILayer):
+class ITestLayer(IBrowserRequest):
     """Test Layer."""
 
+directlyProvides(ITestLayer, ILayer)
 
 
 class Test(placelesssetup.PlacelessSetup, unittest.TestCase):