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

Jim Fulton jim@zope.com
Tue, 26 Mar 2002 19:47:15 -0500


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

Modified Files:
      Tag: Zope-3x-branch
	metaConfigure.py 
Log Message:
Merged in changes from contextual-directives branch.

Now, a leading dot in a dotted name implies the package the include
file was included from. It still defaults to ZopeProducts if a file 
was not included via a package.

A few of the config files have been convered to use the
shorthand. The rest still can be converted.

I also checked this against Step 6 in the tutorial, which I will check
in in a moment.


=== Zope3/lib/python/Zope/ComponentArchitecture/metaConfigure.py 1.1.2.18 => 1.1.2.19 ===
 from ResourceService import provideResource
 from SkinService import defineSkin
-from Zope.Configuration.name import resolve
 from Zope.Configuration import namespace
 from Service import defineService, provideService
 from Zope.Configuration.Action import Action
 
 
-def adapter(factory, provides, for_=None):
-    if for_ is not None: for_ = resolve(for_)
-    provides = resolve(provides)
+def adapter(_context, factory, provides, for_=None):
+    if for_ is not None: for_ = _context.resolve(for_)
+    provides = _context.resolve(provides)
     return [
         Action(
             discriminator = ('adapter', for_, provides),
             callable = provideAdapter,
-            args = (for_, provides, resolve(factory)),
+            args = (for_, provides, _context.resolve(factory)),
             )
         ]
 
-def utility(component, provides):
-    provides = resolve(provides)
-    component = resolve(component)
+def utility(_context, component, provides):
+    provides = _context.resolve(provides)
+    component = _context.resolve(component)
     return [
         Action(
             discriminator = ('utility', provides),
@@ -37,11 +36,11 @@
             )
         ]
 
-def factory(component, factory_id=None):
+def factory(_context, component, factory_id=None):
     if factory_id is None:
         factory_id = component
         
-    component = resolve(component)
+    component = _context.resolve(component)
 
     return [
         Action(
@@ -51,10 +50,10 @@
             )
         ]
 
-def view(factory, type, name, for_=None, layer=''):
-    if for_ is not None: for_ = resolve(for_)
-    type = resolve(type)
-    factory = resolve(factory)
+def view(_context, factory, type, name, for_=None, layer=''):
+    if for_ is not None: for_ = _context.resolve(for_)
+    type = _context.resolve(type)
+    factory = _context.resolve(factory)
     return [
         Action(
             discriminator = ('view', for_, name, type, layer),
@@ -63,10 +62,10 @@
             )
         ]
 
-def defaultView(factory, type, name, for_=None, layer=''):
-    if for_ is not None: for_ = resolve(for_)
-    type = resolve(type)
-    factory = resolve(factory)
+def defaultView(_context, factory, type, name, for_=None, layer=''):
+    if for_ is not None: for_ = _context.resolve(for_)
+    type = _context.resolve(type)
+    factory = _context.resolve(factory)
     return [
         Action(
             discriminator = ('view', for_, name, type),
@@ -81,9 +80,9 @@
         ]
 
 
-def resource(component, type, name, layer=''):
-    type = resolve(type)
-    component = resolve(component)
+def resource(_context, component, type, name, layer=''):
+    type = _context.resolve(type)
+    component = _context.resolve(component)
     return [
         Action(
             discriminator = ('resource', name, type, layer),
@@ -92,17 +91,17 @@
             )
         ]
 
-def serviceType(name, interface):
+def serviceType(_context, name, interface):
     return [
         Action(
             discriminator = ('serviceType', name),        
             callable = defineService,
-            args = (name, resolve(interface)),
+            args = (name, _context.resolve(interface)),
             )
         ]
 
-def service(name, component):
-    component = resolve(component)
+def service(_context, name, component):
+    component = _context.resolve(component)
     return [
         Action(
             discriminator = ('service', name),        
@@ -111,8 +110,8 @@
             )
         ]
 
-def skin(name, type, layers):
-    type = resolve(type)
+def skin(_context, name, type, layers):
+    type = _context.resolve(type)
     layers = [layer.strip() for layer in layers.split(',')]
     return [
         Action(