[Zope-Checkins] CVS: Zope3/lib/python/Zope/Publisher/Browser - metaConfigure.py:1.1.2.12

[Steve Alexander]

Update of /cvs-repository/Zope3/lib/python/Zope/Publisher/Browser
In directory cvs.zope.org:/tmp/cvs-serv32291/lib/python/Zope/Publisher/Browser

Modified Files:
      Tag: Zope-3x-branch
	metaConfigure.py 
Log Message:
changed manky data structures into use of Action convenience class.


=== Zope3/lib/python/Zope/Publisher/Browser/metaConfigure.py 1.1.2.11 => 1.1.2.12 ===
 
     return [
-        (('view', for_, name, IBrowserPublisher, layer),
-        provideView, (for_, name, IBrowserPublisher, factory, layer)),
+        Action(
+            discriminator = ('view', for_, name, IBrowserPublisher, layer),
+            callable = provideView,
+            args = (for_, name, IBrowserPublisher, factory, layer),
+            )
         ]
 
 def skin(name, layers):
     layers = [layer.strip() for layer in layers.split(',')]
-    return [(
-        ('skin', name, IBrowserPublisher),
-        defineSkin, (name, IBrowserPublisher, layers)
-        )]
+    return [
+        Action(
+            discriminator = ('skin', name, IBrowserPublisher),
+            callable = defineSkin,
+            args = (name, IBrowserPublisher, layers),
+            )
+        ]
 
 def resource(component, name, layer=''):
     type = IBrowserPublisher
     component = resolve(component)
-    return [(
-        ('resource', name, type,layer),
-        provideResource, (name, type, component, layer)
-        )]
+    return [
+        Action(
+            discriminator = ('resource', name, type, layer),
+            callable = provideResource,
+            args = (name, type, component, layer),
+            )
+        ]