[Zope-Checkins] CVS: Zope3/lib/python/Zope/ComponentArchitecture - metaConfigure.py:1.1.2.17

[Steve Alexander]

Update of /cvs-repository/Zope3/lib/python/Zope/ComponentArchitecture
In directory cvs.zope.org:/tmp/cvs-serv2851/lib/python/Zope/ComponentArchitecture

Modified Files:
      Tag: Zope-3x-branch
	metaConfigure.py 
Log Message:
Changed metaConfigure.py files to use Action rather than messy data structures.



=== Zope3/lib/python/Zope/ComponentArchitecture/metaConfigure.py 1.1.2.16 => 1.1.2.17 ===
     if for_ is not None: for_ = resolve(for_)
     provides = resolve(provides)
-    return [(
-        ('adapter', for_, provides),
-        provideAdapter, (for_, provides, resolve(factory))
-        )]
+    return [
+        Action(
+            discriminator = ('adapter', for_, provides),
+            callable = provideAdapter,
+            args = (for_, provides, resolve(factory)),
+            )
+        ]
 
 def utility(component, provides):
     provides = resolve(provides)
     component = resolve(component)
-    return [(
-        ('utility', provides),
-        provideUtility,(provides, component)
-        )]
+    return [
+        Action(
+            discriminator = ('utility', provides),
+            callable = provideUtility,
+            args = (provides, component),
+            )
+        ]
 
 def view(factory, type, name, for_=None, layer=''):
     if for_ is not None: for_ = resolve(for_)
     type = resolve(type)
     factory = resolve(factory)
-    return [(
-        ('view', for_, name, type,layer),
-        provideView, (for_, name, type, factory, layer)
-        )]
+    return [
+        Action(
+            discriminator = ('view', for_, name, type, layer),
+            callable = provideView,
+            args = (for_, name, type, factory, layer),
+            )
+        ]
 
 def defaultView(factory, type, name, for_=None, layer=''):
     if for_ is not None: for_ = resolve(for_)
@@ -61,29 +70,41 @@
 def resource(component, type, name, layer=''):
     type = resolve(type)
     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),
+            )
+        ]
 
 def serviceType(name, interface):
-    return [(
-        ('serviceType', name),        
-        defineService, (name, resolve(interface))
-        )]
+    return [
+        Action(
+            discriminator = ('serviceType', name),        
+            callable = defineService,
+            args = (name, resolve(interface)),
+            )
+        ]
 
 def service(name, component):
     component = resolve(component)
-    return [(
-        ('service', name),        
-        provideService, (name, component)
-        )]
+    return [
+        Action(
+            discriminator = ('service', name),        
+            callable = provideService,
+            args = (name, component),
+            )
+        ]
 
 def skin(name, type, layers):
     type = resolve(type)
     layers = [layer.strip() for layer in layers.split(',')]
-    return [(
-        ('skin', name, type),
-        defineSkin, (name, type, layers)
-        )]
+    return [
+        Action(
+            discriminator = ('skin', name, type),
+            callable = defineSkin,
+            args = (name, type, layers)
+            )
+        ]