[Zope3-checkins] CVS: Zope3/src/zope/app/browser/services - view.py:1.25

[Jim Fulton]

Update of /cvs-repository/Zope3/src/zope/app/browser/services
In directory cvs.zope.org:/tmp/cvs-serv12467/src/zope/app/browser/services

Modified Files:
	view.py 
Log Message:
No longer use IZopeContainer adapters and no longer use context wrappers.


=== Zope3/src/zope/app/browser/services/view.py 1.24 => 1.25 ===
--- Zope3/src/zope/app/browser/services/view.py:1.24	Fri Aug 15 20:42:54 2003
+++ Zope3/src/zope/app/browser/services/view.py	Sun Sep 21 13:30:52 2003
@@ -18,10 +18,8 @@
 import md5
 
 from zope.app.component.interfacefield import InterfaceField
-from zope.app.context import ContextWrapper
 from zope.app.form.utility import setUpWidgets
 from zope.app.i18n import ZopeMessageIDFactory as _
-from zope.app.interfaces.container import IZopeContainer
 from zope.app.interfaces.services.registration import ActiveStatus
 from zope.app.interfaces.services.registration import RegisteredStatus
 from zope.app.interfaces.services.registration import UnregisteredStatus
@@ -74,7 +72,6 @@
         infos = [info for info in infos if info[0] == forInterface]
         assert len(infos) == 1
         registry = infos[0][2]
-        registry = ContextWrapper(registry, self.context)
         assert registry
         return registry
 
@@ -174,8 +171,7 @@
                 conf.status = UnregisteredStatus
                 parent = getParent(conf)
                 name = getName(conf)
-                container = getAdapter(parent, IZopeContainer)
-                del container[name]
+                del parent[name]
 
         s = _("Deleted: ${cache_names}")
         s.mapping = {'cache_names': ", ".join(todo)}
@@ -212,7 +208,6 @@
             presentationType = (
                 presentationType.__module__ +"."+ presentationType.getName())
 
-            registry = ContextWrapper(registry, self.context)
             view = getView(registry, "ChangeRegistrations", self.request)
             # XXX Why are we setting this unique prefix?
             prefix = md5.new('%s %s' %