[Zope3-checkins] CVS: Zope3/src/zope/app/browser/services - adapter.py:1.14.6.1 cache.py:1.14.6.1 connection.py:1.18.6.1 view.py:1.24.6.1

[Jim Fulton]

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

Modified Files:
      Tag: parentgeddon-branch
	adapter.py cache.py connection.py view.py 
Log Message:
Checking in work in progress on parentgeddon-branch so Fred can help
me to get the tests passing.  Specific log entries will be provided
when we merge this into the head.


=== Zope3/src/zope/app/browser/services/adapter.py 1.14 => 1.14.6.1 ===
--- Zope3/src/zope/app/browser/services/adapter.py:1.14	Fri Aug 15 20:42:54 2003
+++ Zope3/src/zope/app/browser/services/adapter.py	Mon Sep  8 14:21:26 2003
@@ -31,7 +31,6 @@
 from zope.schema import getFieldNamesInOrder
 from zope.component import getView
 from zope.publisher.browser import BrowserView
-from zope.app.context import ContextWrapper
 
 from zope.app.i18n import ZopeMessageIDFactory as _
 from zope.app.interfaces.services.adapter import IAdapterRegistration
@@ -77,7 +76,6 @@
             providedInterface = (
                 providedInterface.__module__ +"."+ providedInterface.getName())
 
-            registry = ContextWrapper(registry, self.context)
             view = getView(registry, "ChangeRegistrations", self.request)
             prefix = md5.new('%s %s' %
                              (forInterface, providedInterface)).hexdigest()


=== Zope3/src/zope/app/browser/services/cache.py 1.14 => 1.14.6.1 ===
--- Zope3/src/zope/app/browser/services/cache.py:1.14	Tue Aug 19 19:10:55 2003
+++ Zope3/src/zope/app/browser/services/cache.py	Mon Sep  8 14:21:26 2003
@@ -56,4 +56,4 @@
             error.mapping['object'] = str(content)
             raise TypeError(error)
 
-        return zapi.ContextSuper(CacheAdding, self).add(content)
+        return super(CacheAdding, self).add(content)


=== Zope3/src/zope/app/browser/services/connection.py 1.18 => 1.18.6.1 ===
--- Zope3/src/zope/app/browser/services/connection.py:1.18	Tue Aug 19 19:10:55 2003
+++ Zope3/src/zope/app/browser/services/connection.py	Mon Sep  8 14:21:26 2003
@@ -56,4 +56,4 @@
             error = _("${object} is not a Zope database adapter.")
             error.mapping['object'] = str(content)
 
-        return zapi.ContextSuper(ConnectionAdding, self).add(content)
+        return super(ConnectionAdding, self).add(content)


=== Zope3/src/zope/app/browser/services/view.py 1.24 => 1.24.6.1 ===
--- 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	Mon Sep  8 14:21:26 2003
@@ -18,10 +18,9 @@
 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.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
@@ -74,7 +73,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 +172,8 @@
                 conf.status = UnregisteredStatus
                 parent = getParent(conf)
                 name = getName(conf)
-                container = getAdapter(parent, IZopeContainer)
-                del container[name]
+                remover = zapi.getAdapter(parent, IRemoveSource)
+                remover.removeObject(name)
 
         s = _("Deleted: ${cache_names}")
         s.mapping = {'cache_names': ", ".join(todo)}
@@ -212,7 +210,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' %