[Checkins] SVN: zope.app.publisher/trunk/ Adapt to the move of IDefaultViewName from zope.component.interfaces to zope.publisher.interfaces.

[Dan Korostelev]

Log message for revision 97662:
  Adapt to the move of IDefaultViewName from zope.component.interfaces to zope.publisher.interfaces.

Changed:
  U   zope.app.publisher/trunk/CHANGES.txt
  U   zope.app.publisher/trunk/src/zope/app/publisher/browser/__init__.py
  U   zope.app.publisher/trunk/src/zope/app/publisher/browser/metaconfigure.py
  U   zope.app.publisher/trunk/src/zope/app/publisher/browser/tests/test_directives.py

-=-
Modified: zope.app.publisher/trunk/CHANGES.txt
===================================================================
--- zope.app.publisher/trunk/CHANGES.txt	2009-03-08 10:04:28 UTC (rev 97661)
+++ zope.app.publisher/trunk/CHANGES.txt	2009-03-08 10:05:49 UTC (rev 97662)
@@ -9,8 +9,8 @@
 
 - Adapt to removal of deprecated interfaces from zope.component.interfaces.
   The IResource is now moved to zope.app.publisher.interfaces. The IView
-  is now in zope.publisher.interfaces. The IPresentation interface was
-  removed completely.
+  and IDefaultViewName is now in zope.publisher.interfaces. The IPresentation
+  interface was removed completely.
 
 3.6.0 (2009-01-31)
 ==================

Modified: zope.app.publisher/trunk/src/zope/app/publisher/browser/__init__.py
===================================================================
--- zope.app.publisher/trunk/src/zope/app/publisher/browser/__init__.py	2009-03-08 10:04:28 UTC (rev 97661)
+++ zope.app.publisher/trunk/src/zope/app/publisher/browser/__init__.py	2009-03-08 10:05:49 UTC (rev 97662)
@@ -15,12 +15,13 @@
 
 $Id$
 """
-from zope.component.interfaces import ComponentLookupError, IDefaultViewName
+from zope.component.interfaces import ComponentLookupError
 from zope.component import getSiteManager
 
 import zope.interface
 from zope.interface import implements
 from zope.publisher.browser import BrowserLanguages
+from zope.publisher.interfaces import IDefaultViewName
 from zope.i18n.interfaces import IUserPreferredLanguages
 from zope.i18n.interfaces import IModifiableUserPreferredLanguages
 
@@ -73,10 +74,10 @@
     Now we can will set a default view.
 
       >>> import zope.component
-      >>> import zope.component.interfaces
+      >>> import zope.publisher.interfaces
       >>> zope.component.provideAdapter('name',
       ...     adapts=(IMyObject, zope.interface.Interface),
-      ...     provides=zope.component.interfaces.IDefaultViewName)
+      ...     provides=zope.publisher.interfaces.IDefaultViewName)
       >>> queryDefaultViewName(MyObject(), object())
       'name'
 
@@ -84,7 +85,7 @@
 
       >>> zope.component.provideAdapter('',
       ...     adapts=(IMyObject, zope.interface.Interface),
-      ...     provides=zope.component.interfaces.IDefaultViewName)
+      ...     provides=zope.publisher.interfaces.IDefaultViewName)
       >>> queryDefaultViewName(MyObject(), object())
       ''
     """

Modified: zope.app.publisher/trunk/src/zope/app/publisher/browser/metaconfigure.py
===================================================================
--- zope.app.publisher/trunk/src/zope/app/publisher/browser/metaconfigure.py	2009-03-08 10:04:28 UTC (rev 97661)
+++ zope.app.publisher/trunk/src/zope/app/publisher/browser/metaconfigure.py	2009-03-08 10:05:49 UTC (rev 97662)
@@ -19,12 +19,12 @@
 
 import warnings
 from zope import component
-from zope.component.interfaces import IDefaultViewName
 from zope.component.interface import provideInterface
 from zope.component.zcml import handler
 from zope.configuration.exceptions import ConfigurationError
 from zope.interface import directlyProvides
 from zope.interface.interface import InterfaceClass
+from zope.publisher.interfaces import IDefaultViewName
 from zope.publisher.interfaces.browser import IBrowserRequest, IDefaultSkin
 from zope.publisher.interfaces.browser import IBrowserSkinType
 

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	2009-03-08 10:04:28 UTC (rev 97661)
+++ zope.app.publisher/trunk/src/zope/app/publisher/browser/tests/test_directives.py	2009-03-08 10:05:49 UTC (rev 97662)
@@ -25,10 +25,10 @@
 from zope.interface import Interface, implements, directlyProvides, providedBy
 
 import zope.security.management
-from zope.component.interfaces import IDefaultViewName
 from zope.configuration.xmlconfig import xmlconfig, XMLConfig
 from zope.configuration.exceptions import ConfigurationError
 from zope.publisher.browser import TestRequest
+from zope.publisher.interfaces import IDefaultViewName
 from zope.publisher.interfaces.browser import IBrowserPublisher
 from zope.publisher.interfaces.browser import IBrowserRequest
 from zope.publisher.interfaces.browser import IBrowserSkinType, IDefaultSkin