[Checkins] SVN: zope.app.container/trunk/src/zope/app/container/browser/tests/test_directive.py Strip noise from context actions.

Tres Seaver cvs-admin at zope.org
Fri Jun 29 17:04:13 UTC 2012


Log message for revision 127198:
  Strip noise from context actions.
  
  The output is now more meaningful, and hides irrelevant details which
  bork with the zope.component trunk.
  
  

Changed:
  U   zope.app.container/trunk/src/zope/app/container/browser/tests/test_directive.py

-=-
Modified: zope.app.container/trunk/src/zope/app/container/browser/tests/test_directive.py
===================================================================
--- zope.app.container/trunk/src/zope/app/container/browser/tests/test_directive.py	2012-06-29 16:34:16 UTC (rev 127197)
+++ zope.app.container/trunk/src/zope/app/container/browser/tests/test_directive.py	2012-06-29 17:04:10 UTC (rev 127198)
@@ -20,17 +20,24 @@
 import unittest
 
 from zope.interface import Interface
+from zope.component.interface import provideInterface
 from zope.publisher.interfaces.browser import IBrowserRequest
 from zope.app.container.browser.metaconfigure import containerViews
 
 atre = re.compile(' at [0-9a-fA-Fx]+')
 
 class Context(object):
-    actions = ()
     info = ''
 
+    def __init__(self):
+        self.actions = []
+
     def action(self, discriminator, callable, args):
-        self.actions += ((discriminator, callable, args), )
+        if discriminator is None:
+            if callable is provideInterface:
+                self.actions.append((callable, args[1])) #name is args[0]
+        else:
+            self.actions.append(discriminator)
         self.info = 'info'
 
     def __repr__(self):
@@ -61,108 +68,51 @@
     >>> containerViews(context, for_=I, contents='zope.ManageContent',
     ...                add='zope.ManageContent', index='zope.View')
     >>> context
-    ((('adapter',
-       (<InterfaceClass zope.app.container.browser.tests.test_directive.I>,
-        <InterfaceClass zope.publisher.interfaces.browser.IDefaultBrowserLayer>),
-       <InterfaceClass zope.app.menus.zmi_views>,
-       u'Contents'),
-      <function handler>,
-      ('registerAdapter',
-       <zope.browsermenu.metaconfigure.MenuItemFactory object>,
-       (<InterfaceClass zope.app.container.browser.tests.test_directive.I>,
-        <InterfaceClass zope.publisher.interfaces.browser.IDefaultBrowserLayer>),
-       <InterfaceClass zope.app.menus.zmi_views>,
-       u'Contents',
-       '')),
-     (None,
-      <function provideInterface>,
-      ('', <InterfaceClass zope.app.menus.zmi_views>)),
-     (None,
-      <function provideInterface>,
-      ('',
-       <InterfaceClass zope.app.container.browser.tests.test_directive.I>)),
-     (None,
-      <function provideInterface>,
-      ('',
-       <InterfaceClass zope.publisher.interfaces.browser.IDefaultBrowserLayer>)),
-     (None,
-      <function provideInterface>,
-      ('',
-       <InterfaceClass zope.app.container.browser.tests.test_directive.I>)),
-     (('view',
-       <InterfaceClass zope.app.container.browser.tests.test_directive.I>,
-       'contents.html',
-       <InterfaceClass zope.publisher.interfaces.browser.IBrowserRequest>,
+    [('adapter',
+      (<InterfaceClass zope.app.container.browser.tests.test_directive.I>,
        <InterfaceClass zope.publisher.interfaces.browser.IDefaultBrowserLayer>),
-      <function handler>,
-      ('registerAdapter',
-       <class 'zope.browserpage.metaconfigure.Contents'>,
-       (<InterfaceClass zope.app.container.browser.tests.test_directive.I>,
-        <InterfaceClass zope.publisher.interfaces.browser.IDefaultBrowserLayer>),
-       <InterfaceClass zope.interface.Interface>,
-       'contents.html',
-       'info')),
-     (None,
-      <function provideInterface>,
-      ('',
-       <InterfaceClass zope.app.container.browser.tests.test_directive.I>)),
-     (('view',
-       <InterfaceClass zope.app.container.browser.tests.test_directive.I>,
-       'index.html',
-       <InterfaceClass zope.publisher.interfaces.browser.IBrowserRequest>,
+      <InterfaceClass zope.app.menus.zmi_views>,
+      u'Contents'),
+     (<function provideInterface>,
+      <InterfaceClass zope.app.menus.zmi_views>),
+     (<function provideInterface>,
+      <InterfaceClass zope.app.container.browser.tests.test_directive.I>),
+     (<function provideInterface>,
+      <InterfaceClass zope.publisher.interfaces.browser.IDefaultBrowserLayer>),
+     (<function provideInterface>,
+      <InterfaceClass zope.app.container.browser.tests.test_directive.I>),
+     ('view',
+      (<InterfaceClass zope.app.container.browser.tests.test_directive.I>,
        <InterfaceClass zope.publisher.interfaces.browser.IDefaultBrowserLayer>),
-      <function handler>,
-      ('registerAdapter',
-       <class 'zope.browserpage.metaconfigure.Contents'>,
-       (<InterfaceClass zope.app.container.browser.tests.test_directive.I>,
-        <InterfaceClass zope.publisher.interfaces.browser.IDefaultBrowserLayer>),
-       <InterfaceClass zope.interface.Interface>,
-       'index.html',
-       'info')),
-     (('adapter',
-       (<InterfaceClass zope.app.container.browser.tests.test_directive.I>,
-        <InterfaceClass zope.publisher.interfaces.browser.IDefaultBrowserLayer>),
-       <InterfaceClass zope.app.menus.zmi_actions>,
-       u'Add'),
-      <function handler>,
-      ('registerAdapter',
-       <zope.browsermenu.metaconfigure.MenuItemFactory object>,
-       (<InterfaceClass zope.app.container.browser.tests.test_directive.I>,
-        <InterfaceClass zope.publisher.interfaces.browser.IDefaultBrowserLayer>),
-       <InterfaceClass zope.app.menus.zmi_actions>,
-       u'Add',
-       'info')),
-     (None,
-      <function provideInterface>,
-      ('', <InterfaceClass zope.app.menus.zmi_actions>)),
-     (None,
-      <function provideInterface>,
-      ('',
-       <InterfaceClass zope.app.container.browser.tests.test_directive.I>)),
-     (None,
-      <function provideInterface>,
-      ('',
-       <InterfaceClass zope.publisher.interfaces.browser.IDefaultBrowserLayer>)),
-     (None,
-      <function provideInterface>,
-      ('',
-       <InterfaceClass zope.app.container.browser.tests.test_directive.I>)),
-     (None,
-      <function provideInterface>,
-      ('', <InterfaceClass zope.interface.Interface>)),
-     (('view',
-       (<InterfaceClass zope.app.container.browser.tests.test_directive.I>,
-        <InterfaceClass zope.publisher.interfaces.browser.IDefaultBrowserLayer>),
-       '+',
-       <InterfaceClass zope.interface.Interface>),
-      <function handler>,
-      ('registerAdapter',
-       <class 'zope.browserpage.metaconfigure.+'>,
-       (<InterfaceClass zope.app.container.browser.tests.test_directive.I>,
-        <InterfaceClass zope.publisher.interfaces.browser.IDefaultBrowserLayer>),
-       <InterfaceClass zope.interface.Interface>,
-       '+',
-       'info')))
+      'contents.html',
+      <InterfaceClass zope.publisher.interfaces.browser.IBrowserRequest>),
+     (<function provideInterface>,
+      <InterfaceClass zope.app.container.browser.tests.test_directive.I>),
+     ('view',
+      (<InterfaceClass zope.app.container.browser.tests.test_directive.I>,
+       <InterfaceClass zope.publisher.interfaces.browser.IDefaultBrowserLayer>),
+      'index.html',
+      <InterfaceClass zope.publisher.interfaces.browser.IBrowserRequest>),
+     ('adapter',
+      (<InterfaceClass zope.app.container.browser.tests.test_directive.I>,
+       <InterfaceClass zope.publisher.interfaces.browser.IDefaultBrowserLayer>),
+      <InterfaceClass zope.app.menus.zmi_actions>,
+      u'Add'),
+     (<function provideInterface>,
+      <InterfaceClass zope.app.menus.zmi_actions>),
+     (<function provideInterface>,
+      <InterfaceClass zope.app.container.browser.tests.test_directive.I>),
+     (<function provideInterface>,
+      <InterfaceClass zope.publisher.interfaces.browser.IDefaultBrowserLayer>),
+     (<function provideInterface>,
+      <InterfaceClass zope.app.container.browser.tests.test_directive.I>),
+     (<function provideInterface>,
+      <InterfaceClass zope.interface.Interface>),
+     ('view',
+      (<InterfaceClass zope.app.container.browser.tests.test_directive.I>,
+       <InterfaceClass zope.publisher.interfaces.browser.IDefaultBrowserLayer>),
+      '+',
+      <InterfaceClass zope.interface.Interface>)]
     """
 
 def test_containerViews_layer():
@@ -178,108 +128,51 @@
     >>> containerViews(context, for_=I, contents='zope.ManageContent',
     ...                add='zope.ManageContent', index='zope.View', layer=ITestLayer)
     >>> context
-    ((('adapter',
-       (<InterfaceClass zope.app.container.browser.tests.test_directive.I>,
-        <InterfaceClass zope.app.container.browser.tests.test_directive.ITestLayer>),
-       <InterfaceClass zope.app.menus.zmi_views>,
-       u'Contents'),
-      <function handler>,
-      ('registerAdapter',
-       <zope.browsermenu.metaconfigure.MenuItemFactory object>,
-       (<InterfaceClass zope.app.container.browser.tests.test_directive.I>,
-        <InterfaceClass zope.app.container.browser.tests.test_directive.ITestLayer>),
-       <InterfaceClass zope.app.menus.zmi_views>,
-       u'Contents',
-       '')),
-     (None,
-      <function provideInterface>,
-      ('', <InterfaceClass zope.app.menus.zmi_views>)),
-     (None,
-      <function provideInterface>,
-      ('',
-       <InterfaceClass zope.app.container.browser.tests.test_directive.I>)),
-     (None,
-      <function provideInterface>,
-      ('',
-       <InterfaceClass zope.app.container.browser.tests.test_directive.ITestLayer>)),
-     (None,
-      <function provideInterface>,
-      ('',
-       <InterfaceClass zope.app.container.browser.tests.test_directive.I>)),
-     (('view',
-       <InterfaceClass zope.app.container.browser.tests.test_directive.I>,
-       'contents.html',
-       <InterfaceClass zope.publisher.interfaces.browser.IBrowserRequest>,
+    [('adapter',
+      (<InterfaceClass zope.app.container.browser.tests.test_directive.I>,
        <InterfaceClass zope.app.container.browser.tests.test_directive.ITestLayer>),
-      <function handler>,
-      ('registerAdapter',
-       <class 'zope.browserpage.metaconfigure.Contents'>,
-       (<InterfaceClass zope.app.container.browser.tests.test_directive.I>,
-        <InterfaceClass zope.app.container.browser.tests.test_directive.ITestLayer>),
-       <InterfaceClass zope.interface.Interface>,
-       'contents.html',
-       'info')),
-     (None,
-      <function provideInterface>,
-      ('',
-       <InterfaceClass zope.app.container.browser.tests.test_directive.I>)),
-     (('view',
-       <InterfaceClass zope.app.container.browser.tests.test_directive.I>,
-       'index.html',
-       <InterfaceClass zope.publisher.interfaces.browser.IBrowserRequest>,
+      <InterfaceClass zope.app.menus.zmi_views>,
+      u'Contents'),
+     (<function provideInterface>,
+      <InterfaceClass zope.app.menus.zmi_views>),
+     (<function provideInterface>,
+      <InterfaceClass zope.app.container.browser.tests.test_directive.I>),
+     (<function provideInterface>,
+      <InterfaceClass zope.app.container.browser.tests.test_directive.ITestLayer>),
+     (<function provideInterface>,
+      <InterfaceClass zope.app.container.browser.tests.test_directive.I>),
+     ('view',
+      (<InterfaceClass zope.app.container.browser.tests.test_directive.I>,
        <InterfaceClass zope.app.container.browser.tests.test_directive.ITestLayer>),
-      <function handler>,
-      ('registerAdapter',
-       <class 'zope.browserpage.metaconfigure.Contents'>,
-       (<InterfaceClass zope.app.container.browser.tests.test_directive.I>,
-        <InterfaceClass zope.app.container.browser.tests.test_directive.ITestLayer>),
-       <InterfaceClass zope.interface.Interface>,
-       'index.html',
-       'info')),
-     (('adapter',
-       (<InterfaceClass zope.app.container.browser.tests.test_directive.I>,
-        <InterfaceClass zope.app.container.browser.tests.test_directive.ITestLayer>),
-       <InterfaceClass zope.app.menus.zmi_actions>,
-       u'Add'),
-      <function handler>,
-      ('registerAdapter',
-       <zope.browsermenu.metaconfigure.MenuItemFactory object>,
-       (<InterfaceClass zope.app.container.browser.tests.test_directive.I>,
-        <InterfaceClass zope.app.container.browser.tests.test_directive.ITestLayer>),
-       <InterfaceClass zope.app.menus.zmi_actions>,
-       u'Add',
-       'info')),
-     (None,
-      <function provideInterface>,
-      ('', <InterfaceClass zope.app.menus.zmi_actions>)),
-     (None,
-      <function provideInterface>,
-      ('',
-       <InterfaceClass zope.app.container.browser.tests.test_directive.I>)),
-     (None,
-      <function provideInterface>,
-      ('',
-       <InterfaceClass zope.app.container.browser.tests.test_directive.ITestLayer>)),
-     (None,
-      <function provideInterface>,
-      ('',
-       <InterfaceClass zope.app.container.browser.tests.test_directive.I>)),
-     (None,
-      <function provideInterface>,
-      ('', <InterfaceClass zope.interface.Interface>)),
-     (('view',
-       (<InterfaceClass zope.app.container.browser.tests.test_directive.I>,
-        <InterfaceClass zope.app.container.browser.tests.test_directive.ITestLayer>),
-       '+',
-       <InterfaceClass zope.interface.Interface>),
-      <function handler>,
-      ('registerAdapter',
-       <class 'zope.browserpage.metaconfigure.+'>,
-       (<InterfaceClass zope.app.container.browser.tests.test_directive.I>,
-        <InterfaceClass zope.app.container.browser.tests.test_directive.ITestLayer>),
-       <InterfaceClass zope.interface.Interface>,
-       '+',
-       'info')))
+      'contents.html',
+      <InterfaceClass zope.publisher.interfaces.browser.IBrowserRequest>),
+     (<function provideInterface>,
+      <InterfaceClass zope.app.container.browser.tests.test_directive.I>),
+     ('view',
+      (<InterfaceClass zope.app.container.browser.tests.test_directive.I>,
+       <InterfaceClass zope.app.container.browser.tests.test_directive.ITestLayer>),
+      'index.html',
+      <InterfaceClass zope.publisher.interfaces.browser.IBrowserRequest>),
+     ('adapter',
+      (<InterfaceClass zope.app.container.browser.tests.test_directive.I>,
+       <InterfaceClass zope.app.container.browser.tests.test_directive.ITestLayer>),
+      <InterfaceClass zope.app.menus.zmi_actions>,
+      u'Add'),
+     (<function provideInterface>,
+      <InterfaceClass zope.app.menus.zmi_actions>),
+     (<function provideInterface>,
+      <InterfaceClass zope.app.container.browser.tests.test_directive.I>),
+     (<function provideInterface>,
+      <InterfaceClass zope.app.container.browser.tests.test_directive.ITestLayer>),
+     (<function provideInterface>,
+      <InterfaceClass zope.app.container.browser.tests.test_directive.I>),
+     (<function provideInterface>,
+      <InterfaceClass zope.interface.Interface>),
+     ('view',
+      (<InterfaceClass zope.app.container.browser.tests.test_directive.I>,
+       <InterfaceClass zope.app.container.browser.tests.test_directive.ITestLayer>),
+      '+',
+      <InterfaceClass zope.interface.Interface>)]
     """
 
 



More information about the checkins mailing list