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

zopefoundation · Apr 6, 2006 · 0bbd770 · 0bbd770
1 parent 5d7b025
commit 0bbd770
Show file tree

Hide file tree

Showing 4 changed files with 509 additions and 14 deletions.
diff --git a/browser/editview.py b/browser/editview.py
@@ -23,6 +23,7 @@
 from zope.interface import Interface
 from zope.schema import getFieldNamesInOrder
 from zope.publisher.interfaces.browser import IDefaultBrowserLayer
+from zope.publisher.browser import BrowserView
 from zope.security.checker import defineChecker, NamesChecker
 
 from zope.app import zapi
@@ -33,7 +34,6 @@
 from zope.app.form.interfaces import WidgetsError
 from zope.app.pagetemplate.viewpagetemplatefile import ViewPageTemplateFile
 from zope.app.pagetemplate.simpleviewclass import SimpleViewClass
-from zope.app.publisher.browser import BrowserView
 
 from zope.app.form.utility import setUpEditWidgets, applyWidgetsChanges
 from zope.app.form.browser.submit import Update

diff --git a/browser/schemadisplay.py b/browser/schemadisplay.py
@@ -17,14 +17,13 @@
 """
 __docformat__ = 'restructuredtext'
 
+import zope.component
 from zope.interface import Interface
 from zope.publisher.interfaces.browser import IDefaultBrowserLayer
+from zope.publisher.browser import BrowserView
 from zope.schema import getFieldNamesInOrder
 from zope.security.checker import defineChecker, NamesChecker
 
-from zope.app import zapi
-from zope.app.publisher.browser import BrowserView
-
 from zope.app.form.utility import setUpDisplayWidgets
 from zope.app.pagetemplate.viewpagetemplatefile import ViewPageTemplateFile
 from zope.app.pagetemplate.simpleviewclass import SimpleViewClass
@@ -81,5 +80,5 @@ def DisplayViewFactory(name, schema, label, permission, layer,
     if layer is None:
         layer = IDefaultBrowserLayer
 
-    sm = zapi.getGlobalSiteManager()
+    sm = zope.component.getGlobalSiteManager()
     sm.registerAdapter(class_, (for_, layer), Interface, name)