[Zope-Checkins] CVS: Zope3/lib/python/Zope/ComponentArchitecture - ViewService.py:1.1.2.12 metaConfigure.py:1.1.2.16

[Steve Alexander]

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

Modified Files:
      Tag: Zope-3x-branch
	ViewService.py metaConfigure.py 
Log Message:
Corrected bugs in defaultViewName registration. Added defaultViewName registration to Publisher/Browser.
Added test for browser:defaultView directive.
TODO: add test for defaultViewDirective in ComponentArchitecture/tests



=== Zope3/lib/python/Zope/ComponentArchitecture/ViewService.py 1.1.2.11 => 1.1.2.12 ===
     def getDefaultViewName(self, object, type, default=_marker):
         '''See interface IViewService'''
-        
         name = self.__default_view_names.getForObject(object, type)
         if name is None:
             if default is not _marker:


=== Zope3/lib/python/Zope/ComponentArchitecture/metaConfigure.py 1.1.2.15 => 1.1.2.16 ===
         )]
 
-def defaultView(factory, type, name, for_=None):
+def defaultView(factory, type, name, for_=None, layer=''):
     if for_ is not None: for_ = resolve(for_)
     type = resolve(type)
     factory = resolve(factory)
@@ -48,12 +48,12 @@
         Action(
             discriminator = ('view', for_, name, type),
             callable = provideView, 
-            args = (for_, name, type, factory),
+            args = (for_, name, type, factory, layer),
             ),
         Action(
-            discrimnator = ('defaultViewName', for_, name, type),
+            discriminator = ('defaultViewName', for_, name, type),
             callable = setDefaultViewName,
-            args = (for_, name, type),
+            args = (for_, type, name),
             )
         ]