[Zope-Checkins] CVS: Zope3/lib/python/Zope/App/OFS/Folder - Folder.py:1.1.2.4

[Paul Everitt]

Update of /cvs-repository/Zope3/lib/python/Zope/App/OFS/Folder
In directory cvs.zope.org:/tmp/cvs-serv11794

Modified Files:
      Tag: Zope-3x-branch
	Folder.py 
Log Message:
Refactored Folder to use mixin from ServiceManagerContainer and added service manager container to tests

=== Zope3/lib/python/Zope/App/OFS/Folder/Folder.py 1.1.2.3 => 1.1.2.4 ===
 from Zope.App.Security.IAttributeRolePermissionManageable \
      import IAttributeRolePermissionManageable
+from Zope.ComponentArchitecture.ServiceManagerContainer \
+     import ServiceManagerContainer
 
 from Zope.ComponentArchitecture.IServiceManagerContainer import \
      IServiceManagerContainer
 
+_marker = object()
+
 class IFolder(IContainer, IServiceManagerContainer):
     """The standard Zope Folder object interface."""
 
 _RAISE_KEYERROR = []
 
-class Folder(Persistence.Persistent):
+class Folder(Persistence.Persistent, ServiceManagerContainer):
     """The standard Zope Folder implementation."""
 
     __implements__ = (
@@ -78,12 +82,5 @@
            if the object is not found."""
         del self.data[name]
 
-    def getServiceManager(self):
-        """Returns the service manager contained in this object."""
-        return self._service_manager
-
-    def setServiceManager(self, sm):
-        """Sets the service manager for this object."""
-        self._service_manager = sm
-
+