[Zope3-checkins] CVS: Zope3/src/zope/app/browser/services/utility - __init__.py:1.10.6.2

[Jim Fulton]

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

Modified Files:
      Tag: parentgeddon-branch
	__init__.py 
Log Message:
Can't have the tests passing, can we?

=== Zope3/src/zope/app/browser/services/utility/__init__.py 1.10.6.1 => 1.10.6.2 ===
--- Zope3/src/zope/app/browser/services/utility/__init__.py:1.10.6.1	Mon Sep  8 14:21:31 2003
+++ Zope3/src/zope/app/browser/services/utility/__init__.py	Fri Sep 12 15:15:17 2003
@@ -18,7 +18,6 @@
 from zope.app.browser.component.interfacewidget import InterfaceWidget
 from zope.app.browser.services.registration import AddComponentRegistration
 from zope.app.form.widget import CustomWidget
-from zope.app.interfaces.container import IRemoveSource
 from zope.app.interfaces.services.registration import ActiveStatus
 from zope.app.interfaces.services.registration import RegisteredStatus
 from zope.app.interfaces.services.registration import UnregisteredStatus
@@ -151,15 +150,13 @@
                 conf.status = UnregisteredStatus
                 parent = zapi.getParent(conf)
                 name = zapi.getName(conf)
-                remover = zapi.getAdapter(parent, IRemoveSource)
-                remover.removeObject(name)
+                del parent[name]
 
         # 2) Delete the service objects
         for path, obj in services.items():
             parent = zapi.getParent(obj)
             name = zapi.getName(obj)
-            remover = zapi.getAdapter(parent, IRemoveSource)
-            remover.removeObject(name)
+            del parent[name]
             
         s = _("Deleted: ${utility_names}")
         s.mapping = {'utility_names': ", ".join(todo)}