[Zope3-checkins] CVS: Zope3/src/zope/app/container - zopecontainer.py:1.1.2.1 configure.zcml:1.1.2.2 zope.py:NONE

[Jim Fulton]

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

Modified Files:
      Tag: NameGeddon-branch
	configure.zcml 
Added Files:
      Tag: NameGeddon-branch
	zopecontainer.py 
Removed Files:
      Tag: NameGeddon-branch
	zope.py 
Log Message:
changes to get zope.component tests to pass

=== Added File Zope3/src/zope/app/container/zopecontainer.py ===
##############################################################################
#
# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
# All Rights Reserved.
# 
# This software is subject to the provisions of the Zope Public License,
# Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
# FOR A PARTICULAR PURPOSE.
# 
##############################################################################
"""

Revision information:
$Id: zopecontainer.py,v 1.1.2.1 2002/12/23 22:49:30 jim Exp $
"""

from zope.app.interfaces.container import IZopeContainer
from zope.app.interfaces.container import IOptionalNamesContainer
from zope.app.interfaces.container import IContainerNamesContainer
from zope.component import queryAdapter
from zope.proxy.context.context import ContextWrapper
from zope.event import publish
from zope.app.event.objectevent \
     import ObjectRemovedEvent, ObjectModifiedEvent, ObjectAddedEvent
from zope.app.interfaces.container import IAddNotifiable
from zope.app.interfaces.container import IDeleteNotifiable
from types import StringTypes
from zope.proxy.introspection import removeAllProxies

_marker = object()

class ZopeContainerAdapter:
    
    __implements__ =  IZopeContainer

    def __init__(self, container):
        self.context = container
        
    def __getitem__(self, key):
        "See Zope.App.OFS.Container.IZopeContainer.IZopeItemContainer"
        value = self.context[key]
        return ContextWrapper(value, self.context, name=key)

    def get(self, key, default=None):
        "See Zope.App.OFS.Container.IZopeContainer.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 Zope.App.OFS.Container.IZopeContainer.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 Zope.App.OFS.Container.IZopeContainer.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 Zope.App.OFS.Container.IZopeContainer.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.manage_afterAdd(object, container)

        publish(container, ObjectModifiedEvent(container))
        return key

    def __delitem__(self, key):
        "See Zope.App.OFS.Container.IZopeContainer.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.manage_beforeDelete(object, container)
            
            
        del container[key]

        publish(container, ObjectRemovedEvent(object))
        publish(container, ObjectModifiedEvent(container))

        return key


=== Zope3/src/zope/app/container/configure.zcml 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/app/container/configure.zcml:1.1.2.1	Mon Dec 23 14:31:27 2002
+++ Zope3/src/zope/app/container/configure.zcml	Mon Dec 23 17:49:30 2002
@@ -43,7 +43,7 @@
            provides="zope.app.interfaces.traversing.traversable.ITraversable"
            for="zope.app.interfaces.container.IReadContainer" />
 
-  <adapter factory="zope.app.container.zope.ZopeContainerAdapter"
+  <adapter factory="zope.app.container.zopecontainer.ZopeContainerAdapter"
            provides="zope.app.interfaces.container.IZopeContainer"
            for="zope.app.interfaces.container.IContainer" />
 

=== Removed File Zope3/src/zope/app/container/zope.py ===