[Zope3-checkins] SVN: Zope3/branches/jim-adapter/src/zope/ Fix up zope.traversing, zope.formlib and zope.viewlet according to new

[Philipp von Weitershausen]

Log message for revision 66592:
  Fix up zope.traversing, zope.formlib and zope.viewlet according to new
  BrowserView location
  

Changed:
  U   Zope3/branches/jim-adapter/src/zope/formlib/page.py
  U   Zope3/branches/jim-adapter/src/zope/traversing/browser/absoluteurl.py
  U   Zope3/branches/jim-adapter/src/zope/viewlet/README.txt
  U   Zope3/branches/jim-adapter/src/zope/viewlet/directives.txt
  U   Zope3/branches/jim-adapter/src/zope/viewlet/metaconfigure.py
  U   Zope3/branches/jim-adapter/src/zope/viewlet/viewlet.py

-=-
Modified: Zope3/branches/jim-adapter/src/zope/formlib/page.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/formlib/page.py	2006-04-06 15:51:09 UTC (rev 66591)
+++ Zope3/branches/jim-adapter/src/zope/formlib/page.py	2006-04-06 15:53:30 UTC (rev 66592)
@@ -14,10 +14,9 @@
 
 $Id$
 """
-
 from zope import interface
 from zope.publisher.interfaces import NotFound
-from zope.app.publisher.browser import BrowserView
+from zope.publisher.browser import BrowserView
 from zope.formlib.interfaces import IPage
 
 class Page(BrowserView):

Modified: Zope3/branches/jim-adapter/src/zope/traversing/browser/absoluteurl.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/traversing/browser/absoluteurl.py	2006-04-06 15:51:09 UTC (rev 66591)
+++ Zope3/branches/jim-adapter/src/zope/traversing/browser/absoluteurl.py	2006-04-06 15:53:30 UTC (rev 66592)
@@ -19,13 +19,12 @@
 import zope.component
 from zope.interface import implements
 from zope.proxy import sameProxiedObjects
-from zope.publisher.browser import IBrowserRequest
+from zope.publisher.interfaces.browser import IBrowserRequest
+from zope.publisher.browser import BrowserView
 from zope.traversing.browser.interfaces import IAbsoluteURL
 from zope.i18nmessageid import MessageFactory
 _ = MessageFactory('zope')
 
-from zope.app.publisher.browser import BrowserView
-
 _insufficientContext = _("There isn't enough context to get URL information. "
                        "This is probably due to a bug in setting up location "
                        "information.")

Modified: Zope3/branches/jim-adapter/src/zope/viewlet/README.txt
===================================================================
--- Zope3/branches/jim-adapter/src/zope/viewlet/README.txt	2006-04-06 15:51:09 UTC (rev 66591)
+++ Zope3/branches/jim-adapter/src/zope/viewlet/README.txt	2006-04-06 15:53:30 UTC (rev 66592)
@@ -56,7 +56,7 @@
   >>> from zope.publisher.browser import TestRequest
   >>> request = TestRequest()
 
-  >>> from zope.app.publisher.interfaces.browser import IBrowserView
+  >>> from zope.publisher.interfaces.browser import IBrowserView
   >>> class View(object):
   ...     zope.interface.implements(IBrowserView)
   ...     def __init__(self, context, request):

Modified: Zope3/branches/jim-adapter/src/zope/viewlet/directives.txt
===================================================================
--- Zope3/branches/jim-adapter/src/zope/viewlet/directives.txt	2006-04-06 15:51:09 UTC (rev 66591)
+++ Zope3/branches/jim-adapter/src/zope/viewlet/directives.txt	2006-04-06 15:53:30 UTC (rev 66592)
@@ -37,7 +37,7 @@
   >>> from zope.publisher.browser import TestRequest
   >>> request = TestRequest()
 
-  >>> from zope.app.publisher.browser import BrowserView
+  >>> from zope.publisher.browser import BrowserView
   >>> view = BrowserView(content, request)
 
 Now let's lookup the manager. This particular registration is pretty boring:

Modified: Zope3/branches/jim-adapter/src/zope/viewlet/metaconfigure.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/viewlet/metaconfigure.py	2006-04-06 15:51:09 UTC (rev 66591)
+++ Zope3/branches/jim-adapter/src/zope/viewlet/metaconfigure.py	2006-04-06 15:53:30 UTC (rev 66592)
@@ -24,11 +24,11 @@
 from zope.configuration.exceptions import ConfigurationError
 from zope.interface import Interface, classImplements
 from zope.publisher.interfaces.browser import IDefaultBrowserLayer
+from zope.publisher.interfaces.browser import IBrowserView
 
 from zope.app.component.interface import provideInterface
 from zope.app.component import metaconfigure
 from zope.app.publisher.browser import viewmeta
-from zope.app.publisher.interfaces.browser import IBrowserView
 
 from zope.viewlet import viewlet, manager, interfaces
 

Modified: Zope3/branches/jim-adapter/src/zope/viewlet/viewlet.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/viewlet/viewlet.py	2006-04-06 15:51:09 UTC (rev 66591)
+++ Zope3/branches/jim-adapter/src/zope/viewlet/viewlet.py	2006-04-06 15:53:30 UTC (rev 66592)
@@ -21,11 +21,11 @@
 import sys
 import zope.interface
 from zope.traversing import api
+from zope.publisher.browser import BrowserView
 from zope.viewlet import interfaces
 
 from zope.app.pagetemplate import simpleviewclass
 from zope.app.pagetemplate.viewpagetemplatefile import ViewPageTemplateFile
-from zope.app.publisher.browser import BrowserView
 
 class ViewletBase(BrowserView):
     """Viewlet adapter class used in meta directive as a mixin class."""