Move more directive handlers to the new registration API; fix some tests

that I broke by moving the elementary ones earlier.
zopefoundation · Apr 12, 2006 · 42168d0 · 42168d0
1 parent a082e4e
commit 42168d0
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 33 deletions.
diff --git a/browser/i18nresourcemeta.py b/browser/i18nresourcemeta.py
@@ -102,8 +102,8 @@ def __call__(self, require = None):
         self._context.action(
             discriminator = ('i18n-resource', self.name, self.type, self.layer),
             callable = handler,
-            args = ('provideAdapter',
-                    (self.layer,), Interface, self.name, factory,
+            args = ('registerAdapter',
+                    factory, (self.layer,), Interface, self.name,
                     self._context.info)
             )
 

diff --git a/browser/icon.py b/browser/icon.py
@@ -94,8 +94,8 @@ def IconDirective(_context, name, for_, file=None, resource=None,
     _context.action(
         discriminator = ('view', name, vfactory, layer),
         callable = handler,
-        args = ('provideAdapter',
-                (for_, layer), Interface, name, vfactory, _context.info)
+        args = ('registerAdapter',
+                vfactory, (for_, layer), Interface, name, _context.info)
         )
 
     _context.action(

diff --git a/browser/metaconfigure.py b/browser/metaconfigure.py
@@ -371,8 +371,8 @@ def setDefaultSkin(name, info=''):
     True
     """
     skin = zapi.getUtility(IBrowserSkinType, name)
-    handler('provideAdapter',
-            (IBrowserRequest,), IDefaultSkin, '', skin, info),
+    handler('registerAdapter',
+            skin, (IBrowserRequest,), IDefaultSkin, '', info),
 
 def defaultSkin(_context, name):
 
@@ -387,8 +387,8 @@ def defaultView(_context, name, for_=None, layer=IBrowserRequest):
     _context.action(
         discriminator = ('defaultViewName', for_, layer, name),
         callable = handler,
-        args = ('provideAdapter',
-                (for_, layer), IDefaultViewName, '', name, _context.info)
+        args = ('registerAdapter',
+                name, (for_, layer), IDefaultViewName, '', _context.info)
         )
 
     if for_ is not None:

diff --git a/browser/resourcemeta.py b/browser/resourcemeta.py
@@ -77,8 +77,8 @@ def resource(_context, name, layer=IDefaultBrowserLayer,
     _context.action(
         discriminator = ('resource', name, IBrowserRequest, layer),
         callable = handler,
-        args = ('provideAdapter',
-                (layer,), Interface, name, factory, _context.info),
+        args = ('registerAdapter',
+                factory, (layer,), Interface, name, _context.info),
         )
 
 def resourceDirectory(_context, name, directory, layer=IDefaultBrowserLayer,
@@ -98,6 +98,6 @@ def resourceDirectory(_context, name, directory, layer=IDefaultBrowserLayer,
     _context.action(
         discriminator = ('resource', name, IBrowserRequest, layer),
         callable = handler,
-        args = ('provideAdapter',
-                (layer,), Interface, name, factory, _context.info),
+        args = ('registerAdapter',
+                factory, (layer,), Interface, name, _context.info),
         )
diff --git a/browser/tests/test_addMenuItem.py b/browser/tests/test_addMenuItem.py
@@ -35,12 +35,12 @@
    <InterfaceClass zope.app.publisher.interfaces.browser.AddMenu>,
    'Add an X'),
   <function handler>,
-  ('provideAdapter',
+  ('registerAdapter',
+   <zope.app.publisher.browser.menumeta.MenuItemFactory object>,
    (<InterfaceClass zope.app.container.interfaces.IAdding>,
     <InterfaceClass zope.publisher.interfaces.browser.IDefaultBrowserLayer>),
    <InterfaceClass zope.app.publisher.interfaces.browser.AddMenu>,
    'Add an X',
-   <zope.app.publisher.browser.menumeta.MenuItemFactory object>,
    '')),
  (None,
   <function provideInterface>,
@@ -59,7 +59,7 @@
 """
 
 import unittest
-from zope.testing.doctestunit import DocTestSuite
+from zope.testing.doctest import DocTestSuite
 import re
 import pprint
 import cStringIO
@@ -110,12 +110,12 @@ def test_w_factory():
        <InterfaceClass zope.app.publisher.interfaces.browser.AddMenu>,
        'Add an X'),
       <function handler>,
-      ('provideAdapter',
+      ('registerAdapter',
+       <zope.app.publisher.browser.menumeta.MenuItemFactory object>,
        (<InterfaceClass zope.app.container.interfaces.IAdding>,
         <InterfaceClass zope.publisher.interfaces.browser.IDefaultBrowserLayer>),
        <InterfaceClass zope.app.publisher.interfaces.browser.AddMenu>,
        'Add an X',
-       <zope.app.publisher.browser.menumeta.MenuItemFactory object>,
        '')),
      (None,
       <function provideInterface>,
@@ -149,12 +149,12 @@ def test_w_factory_and_view():
        <InterfaceClass zope.app.publisher.interfaces.browser.AddMenu>,
        'Add an X'),
       <function handler>,
-      ('provideAdapter',
+      ('registerAdapter',
+       <zope.app.publisher.browser.menumeta.MenuItemFactory object>,
        (<InterfaceClass zope.app.container.interfaces.IAdding>,
         <InterfaceClass zope.publisher.interfaces.browser.IDefaultBrowserLayer>),
        <InterfaceClass zope.app.publisher.interfaces.browser.AddMenu>,
        'Add an X',
-       <zope.app.publisher.browser.menumeta.MenuItemFactory object>,
        '')),
      (None,
       <function provideInterface>,
@@ -201,12 +201,12 @@ def test_w_factory_class_view():
        <InterfaceClass zope.app.publisher.interfaces.browser.AddMenu>,
        'Add an X'),
       <function handler>,
-      ('provideAdapter',
+      ('registerAdapter',
+       <zope.app.publisher.browser.menumeta.MenuItemFactory object>,
        (<InterfaceClass zope.app.container.interfaces.IAdding>,
         <InterfaceClass zope.publisher.interfaces.browser.IDefaultBrowserLayer>),
        <InterfaceClass zope.app.publisher.interfaces.browser.AddMenu>,
        'Add an X',
-       <zope.app.publisher.browser.menumeta.MenuItemFactory object>,
        '')),
      (None,
       <function provideInterface>,
@@ -239,12 +239,12 @@ def test_w_for_factory():
        <InterfaceClass zope.app.publisher.interfaces.browser.AddMenu>,
        'Add an X'),
       <function handler>,
-      ('provideAdapter',
+      ('registerAdapter',
+       <zope.app.publisher.browser.menumeta.MenuItemFactory object>,
        (<InterfaceClass zope.app.publisher.browser.tests.test_addMenuItem.IX>,
         <InterfaceClass zope.publisher.interfaces.browser.IDefaultBrowserLayer>),
        <InterfaceClass zope.app.publisher.interfaces.browser.AddMenu>,
        'Add an X',
-       <zope.app.publisher.browser.menumeta.MenuItemFactory object>,
        '')),
      (None,
       <function provideInterface>,
@@ -273,12 +273,12 @@ def test_w_factory_layer():
        <InterfaceClass zope.app.publisher.interfaces.browser.AddMenu>,
        'Add an X'),
       <function handler>,
-      ('provideAdapter',
+      ('registerAdapter',
+       <zope.app.publisher.browser.menumeta.MenuItemFactory object>,
        (<InterfaceClass zope.app.container.interfaces.IAdding>,
         <InterfaceClass zope.app.publisher.browser.tests.test_addMenuItem.ILayerStub>),
        <InterfaceClass zope.app.publisher.interfaces.browser.AddMenu>,
        'Add an X',
-       <zope.app.publisher.browser.menumeta.MenuItemFactory object>,
        '')),
      (None,
       <function provideInterface>,
@@ -311,12 +311,12 @@ def test_w_for_menu_factory():
        <class 'zope.app.publisher.browser.tests.test_addMenuItem.MenuStub'>,
        'Add an X'),
       <function handler>,
-      ('provideAdapter',
+      ('registerAdapter',
+       <zope.app.publisher.browser.menumeta.MenuItemFactory object>,
        (<InterfaceClass zope.app.publisher.browser.tests.test_addMenuItem.IX>,
         <InterfaceClass zope.publisher.interfaces.browser.IDefaultBrowserLayer>),
        <class 'zope.app.publisher.browser.tests.test_addMenuItem.MenuStub'>,
        'Add an X',
-       <zope.app.publisher.browser.menumeta.MenuItemFactory object>,
        '')),
      (None,
       <function provideInterface>,
@@ -346,12 +346,12 @@ def test_w_factory_icon_extra_order():
        <InterfaceClass zope.app.publisher.interfaces.browser.AddMenu>,
        'Add an X'),
       <function handler>,
-      ('provideAdapter',
+      ('registerAdapter',
+       <zope.app.publisher.browser.menumeta.MenuItemFactory object>,
        (<InterfaceClass zope.app.container.interfaces.IAdding>,
         <InterfaceClass zope.publisher.interfaces.browser.IDefaultBrowserLayer>),
        <InterfaceClass zope.app.publisher.interfaces.browser.AddMenu>,
        'Add an X',
-       <zope.app.publisher.browser.menumeta.MenuItemFactory object>,
        '')),
      (None,
       <function provideInterface>,

diff --git a/browser/viewmeta.py b/browser/viewmeta.py
@@ -171,8 +171,8 @@ def page(_context, name, permission, for_,
     _context.action(
         discriminator = ('view', for_, name, IBrowserRequest, layer),
         callable = handler,
-        args = ('provideAdapter',
-                (for_, layer), Interface, name, new_class, _context.info),
+        args = ('registerAdapter',
+                new_class, (for_, layer), Interface, name, _context.info),
         )
 
 
@@ -348,8 +348,8 @@ def publishTraverse(self, request, name,
         _context.action(
             discriminator = ('view', (for_, layer), name, self.provides),
             callable = handler,
-            args = ('provideAdapter',
-                    (for_, layer), self.provides, name, newclass,
+            args = ('registerAdapter',
+                    newclass, (for_, layer), self.provides, name,
                     _context.info),
             )