[Checkins] SVN: zope.app.publisher/trunk/src/zope/app/publisher/browser/ Merge from 3.4 branch:

[Philipp von Weitershausen]

Log message for revision 79182:
  Merge from 3.4 branch:
  
  ------------------------------------------------------------------------
  r79176 | philikon | 2007-08-23 23:05:22 +0200 (Thu, 23 Aug 2007) | 2 lines
  
  Fix bug: <browser:defaultView> now accepts classes as well as interfaces.
  
  ------------------------------------------------------------------------
  
  

Changed:
  U   zope.app.publisher/trunk/src/zope/app/publisher/browser/metadirectives.py
  U   zope.app.publisher/trunk/src/zope/app/publisher/browser/tests/test_directives.py

-=-
Modified: zope.app.publisher/trunk/src/zope/app/publisher/browser/metadirectives.py
===================================================================
--- zope.app.publisher/trunk/src/zope/app/publisher/browser/metadirectives.py	2007-08-23 21:26:07 UTC (rev 79181)
+++ zope.app.publisher/trunk/src/zope/app/publisher/browser/metadirectives.py	2007-08-23 21:28:15 UTC (rev 79182)
@@ -166,7 +166,7 @@
         required=True
         )
 
-    for_ = GlobalInterface(
+    for_ = GlobalObject(
         title=u"The interface this view is the default for.",
         description=u"""Specifies the interface for which the view is
         registered. All objects implementing this interface can make use of

Modified: zope.app.publisher/trunk/src/zope/app/publisher/browser/tests/test_directives.py
===================================================================
--- zope.app.publisher/trunk/src/zope/app/publisher/browser/tests/test_directives.py	2007-08-23 21:26:07 UTC (rev 79181)
+++ zope.app.publisher/trunk/src/zope/app/publisher/browser/tests/test_directives.py	2007-08-23 21:28:15 UTC (rev 79182)
@@ -309,7 +309,25 @@
             zope.app.publisher.browser.getDefaultViewName(ob, request),
             'test')
 
+    def testDefaultViewForClass(self):
+        self.assertEqual(
+            component.queryMultiAdapter((ob, request), IDefaultViewName),
+            None)
 
+        xmlconfig(StringIO(template % (
+            '''
+            <browser:defaultView
+                for="zope.app.publisher.browser.tests.test_directives.Ob"
+                name="test"
+                />
+            '''
+            )))
+
+        self.assertEqual(
+            zope.app.publisher.browser.getDefaultViewName(ob, request),
+            'test')
+
+
     def testSkinResource(self):
         self.assertEqual(
             component.queryAdapter(Request(IV), name='test'), None)