[Zope3-checkins] CVS: Zope3/src/zope/app/container - zopecontainer.py:1.21

[Steve Alexander]

Update of /cvs-repository/Zope3/src/zope/app/container
In directory cvs.zope.org:/tmp/cvs-serv31245/src/zope/app/container

Modified Files:
	zopecontainer.py 
Log Message:
finally removed the last vestige of ZopeContainerAdapter


=== Zope3/src/zope/app/container/zopecontainer.py 1.20 => 1.21 ===
--- Zope3/src/zope/app/container/zopecontainer.py:1.20	Fri Jun 13 13:53:34 2003
+++ Zope3/src/zope/app/container/zopecontainer.py	Sat Jun 14 10:41:16 2003
@@ -35,158 +35,6 @@
 
 _marker = object()
 
-class xZopeContainerAdapter:
-
-    implements(IZopeContainer)
-
-    def __init__(self, container):
-        self.context = container
-
-    def __getitem__(self, key):
-        "See IZopeItemContainer"
-        value = self.context[key]
-        return ContextWrapper(value, self.context, name=key)
-
-    def get(self, key, default=None):
-        "See IZopeSimpleReadContainer"
-        value = self.context.get(key, _marker)
-        if value is not _marker:
-            return ContextWrapper(value, self.context, name=key)
-        else:
-            return default
-
-    def __contains__(self, key):
-        '''See interface IReadContainer'''
-        return key in self.context
-
-
-    def values(self):
-        "See IZopeReadContainer"
-        container = self.context
-        result = []
-        for key, value in container.items():
-            result.append(ContextWrapper(value, container, name=key))
-        return result
-
-    def keys(self):
-        '''See interface IReadContainer'''
-        return self.context.keys()
-
-    def __len__(self):
-        '''See interface IReadContainer'''
-        return len(self.context)
-
-    def items(self):
-        "See IZopeReadContainer"
-        container = self.context
-        result = []
-        for key, value in container.items():
-            result.append((key, ContextWrapper(value, container, name=key)))
-        return result
-
-
-    def setObject(self, key, object):
-        "See IZopeWriteContainer"
-
-        if not isinstance(key, StringTypes):
-            raise TypeError("Item name is not a string.")
-
-        container = self.context
-
-        if not key:
-            if not (IOptionalNamesContainer.isImplementedBy(container)
-                    or IContainerNamesContainer.isImplementedBy(container)):
-                raise ValueError("Empty names are not allowed")
-
-        # We remove the proxies from the object before adding it to
-        # the container, because we can't store proxies.
-        object = removeAllProxies(object)
-
-        # Add the object
-        key = container.setObject(key, object)
-
-        # Publish an added event
-        # We explicitly get the object back from the container with
-        # container[key], because some kinds of container may choose
-        # to store a different object than the exact one we added.
-        object = ContextWrapper(container[key], container, name=key)
-        publish(container, ObjectAddedEvent(object))
-
-        # Call the after add hook, if necessary
-        adapter = queryAdapter(object, IAddNotifiable)
-        if adapter is not None:
-            adapter.afterAddHook(object, container)
-
-        publish(container, ObjectModifiedEvent(container))
-        return key
-
-    def __delitem__(self, key):
-        "See IZopeWriteContainer"
-        container = self.context
-
-        object = container[key]
-        object = ContextWrapper(object, container, name=key)
-
-        # Call the before delete hook, if necessary
-        adapter = queryAdapter(object, IDeleteNotifiable)
-        if adapter is not None:
-            adapter.beforeDeleteHook(object, container)
-        elif hasattr(object, 'beforeDeleteHook'):
-            # XXX: Ideally, only do this in debug mode.
-            from warnings import warn
-            warn('Class %s has beforeDeleteHook but is not'
-                 ' IDeleteNotifiable' % object.__class__)
-
-        del container[key]
-
-        publish(container, ObjectRemovedEvent(object))
-        publish(container, ObjectModifiedEvent(container))
-
-        return key
-
-    def __iter__(self):
-        '''See interface IReadContainer'''
-        return iter(self.context)
-
-    def rename(self, currentKey, newKey):
-        """Put the object found at 'currentKey' under 'newKey' instead.
-
-        The container can choose different or modified 'newKey'. The
-        'newKey' that was used is returned.
-
-        If the object at 'currentKey' is IMoveNotifiable, its
-        beforeDeleteHook method is called, with a movingTo
-        argument of the container's path plus the 'newKey'.
-        Otherwise, if the object at 'currentKey' is IDeleteNotifiable,
-        its beforeDeleteHook method is called.
-
-        Then, the object is removed from the container using the
-        container's __del__ method.
-
-        Then, If the object is IMoveNotifiable, its afterAddHook
-        method is called, with a movedFrom argument of the container's
-        path plus the 'currentKey'.
-        Otherwise, if the object is IAddNotifiable, its afterAddHook
-        method is called.
-
-        Then, an IObjectMovedEvent is published.
-        """
-
-        object = self.get(currentKey)
-        if object is None:
-            raise NotFoundError(self.context, currentKey)
-        mover = getAdapter(object, IObjectMover)
-        target = self.context
-
-        if target.__contains__(newKey):
-            raise DuplicationError("name, %s, is already in use" % newKey)
-
-        if mover.moveable() and mover.moveableTo(target, newKey):
-            # the mover will call beforeDeleteHook hook for us
-            mover.moveTo(target, newKey)
-            # the mover will call the afterAddHook hook for us
-            # the mover will publish an ObjectMovedEvent for us
-
 class ZopeContainerDecorator(Wrapper):
     implements(IZopeContainer)