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

Barry Warsaw barry@wooz.org
Thu, 21 Mar 2002 19:26:58 -0500


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

Modified Files:
      Tag: contextual-directives
	metaConfigure.py 
Log Message:
This is work to pass context to zcml directives, so that directives
know where they live.  This is inspired by some suggested changes to
the naming syntax that Stephan and I discussed with Jim.
Specifically, a leading dot, as in

    .JobBoardEx.JobList.

would signify a name relative to the current package, instead of
relative to ZopeProducts.  Also, we'd like to change the trailing dot
to a `+' for signifying "look-the-last-name-up-recursively-until-you-
can't-anymore".  E.g.:

    .JobBoardEx.JobList+

I'm committing this on a branch because it breaks the unit tests and
I'm not sure of the best way to fix the remaining 10 failures.  Jim
suggests that we commit these to the branch so that he can work on
them too.


=== Zope3/lib/python/Zope/Publisher/Browser/metaConfigure.py 1.1.2.12 => 1.1.2.12.6.1 ===
 from Zope.ComponentArchitecture import provideView, defineSkin, provideResource
 from Zope.ComponentArchitecture import setDefaultViewName
-from Zope.Configuration.name import resolve
 from Zope.Configuration.Action import Action
 from IBrowserPublisher import IBrowserPublisher
 
-def defaultView(name, factory, for_=None, layer=''):
+def defaultView(_context, name, factory, for_=None, layer=''):
     if for_ is not None:
-        for_ = resolve(for_)
-    factory = map(resolve, factory.split(' '))
+        for_ = _context.resolve(for_)
+    factory = map(_context.resolve, factory.split(' '))
     
     return [
         Action(
@@ -30,10 +29,10 @@
             )
         ]
     
-def view(name, factory, for_=None, layer=''):
+def view(_context, name, factory, for_=None, layer=''):
     if for_ is not None:
-        for_ = resolve(for_)
-    factory = map(resolve, factory.split(' '))
+        for_ = _context.resolve(for_)
+    factory = map(_context.resolve, factory.split(' '))
 
     return [
         Action(
@@ -43,7 +42,7 @@
             )
         ]
 
-def skin(name, layers):
+def skin(_context, name, layers):
     layers = [layer.strip() for layer in layers.split(',')]
     return [
         Action(
@@ -53,9 +52,9 @@
             )
         ]
 
-def resource(component, name, layer=''):
+def resource(_context, component, name, layer=''):
     type = IBrowserPublisher
-    component = resolve(component)
+    component = _context.resolve(component)
     return [
         Action(
             discriminator = ('resource', name, type, layer),