Fix up zope.app according to new location of BrowserView.

zopefoundation · Apr 6, 2006 · f762a6c · f762a6c
1 parent bed2f66
commit f762a6c
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 8 deletions.
diff --git a/browser/adding.py b/browser/adding.py
@@ -26,6 +26,7 @@
 from zope.event import notify
 from zope.interface import implements
 from zope.publisher.interfaces import IPublishTraverse
+from zope.publisher.browser import BrowserView
 from zope.security.proxy import removeSecurityProxy
 from zope.exceptions.interfaces import UserError
 from zope.location import LocationProxy
@@ -38,7 +39,6 @@
 from zope.app.event.objectevent import ObjectCreatedEvent
 from zope.app.i18n import ZopeMessageFactory as _
 from zope.app.pagetemplate.viewpagetemplatefile import ViewPageTemplateFile
-from zope.app.publisher.browser import BrowserView
 from zope.app.publisher.browser.menu import getMenu
 
 

diff --git a/browser/contents.py b/browser/contents.py
@@ -24,23 +24,21 @@
 from zope.security import canWrite
 from zope.size.interfaces import ISized
 from zope.traversing.interfaces import TraversalError
+from zope.publisher.browser import BrowserView
 
 from zope.app import zapi
 from zope.app.pagetemplate.viewpagetemplatefile import ViewPageTemplateFile
-from zope.app.publisher.browser import BrowserView
 from zope.app.i18n import ZopeMessageFactory as _
 from zope.app.dublincore.interfaces import IZopeDublinCore
 from zope.app.dublincore.interfaces import IDCDescriptiveProperties
 from zope.app.copypastemove.interfaces import IPrincipalClipboard
-from zope.app.copypastemove.interfaces import IObjectCopier
-from zope.app.copypastemove.interfaces import IObjectMover
+from zope.app.copypastemove.interfaces import IObjectCopier, IObjectMover
 from zope.app.copypastemove.interfaces import IContainerItemRenamer
 from zope.app.principalannotation.interfaces import IPrincipalAnnotationUtility
 
 from zope.app.container.browser.adding import Adding
-from zope.app.container.interfaces import IContainer
+from zope.app.container.interfaces import IContainer, DuplicateIDError
 from zope.app.container.interfaces import IContainerNamesContainer
-from zope.app.container.interfaces import DuplicateIDError
 
 class Contents(BrowserView):
 

diff --git a/browser/find.py b/browser/find.py
@@ -19,10 +19,10 @@
 
 from zope.traversing.api import getName
 from zope.traversing.browser.absoluteurl import absoluteURL
+from zope.publisher.browser import BrowserView
 
 from zope.app.container.find import SimpleIdFindFilter
 from zope.app.container.interfaces import IFind
-from zope.app.publisher.browser import BrowserView
 
 # Very simple implementation right now
 class Find(BrowserView):

diff --git a/browser/tests/test_adding.py b/browser/tests/test_adding.py
@@ -24,6 +24,7 @@
 from zope.interface import implements, Interface, directlyProvides
 from zope.publisher.browser import TestRequest
 from zope.publisher.interfaces.browser import IBrowserRequest
+from zope.publisher.browser import BrowserView
 from zope.security.interfaces import ForbiddenAttribute
 from zope.testing.doctestunit import DocTestSuite
 from zope.exceptions.interfaces import UserError
@@ -34,7 +35,6 @@
 from zope.app import zapi
 from zope.app.testing import ztapi
 from zope.app.testing.placelesssetup import PlacelessSetup, setUp, tearDown
-from zope.app.publisher.browser import BrowserView
 from zope.app.publisher.interfaces.browser import AddMenu
 from zope.app.publisher.interfaces.browser import IMenuItemType, IBrowserMenu
 from zope.app.publisher.browser.menu import BrowserMenuItem, BrowserMenu