[Zope3-checkins] CVS: Zope3/src/zope/app/content - folder.py:1.13

Steve Alexander steve@cat-box.net
Tue, 3 Jun 2003 10:21:45 -0400


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

Modified Files:
	folder.py 
Log Message:
Using modern implements()


=== Zope3/src/zope/app/content/folder.py 1.12 => 1.13 ===
--- Zope3/src/zope/app/content/folder.py:1.12	Tue May 27 08:56:08 2003
+++ Zope3/src/zope/app/content/folder.py	Tue Jun  3 10:21:44 2003
@@ -18,12 +18,12 @@
      ICloneWithoutChildren
 from zope.app.services.servicecontainer import ServiceManagerContainer
 from zope.exceptions import DuplicationError
-
+from zope.interface import implements
 
 class Folder(Persistent, ServiceManagerContainer):
     """The standard Zope Folder implementation."""
 
-    __implements__ = IFolder, ICloneWithoutChildren
+    implements(IFolder, ICloneWithoutChildren)
 
     def __init__(self):
         self.data = OOBTree()
@@ -107,7 +107,7 @@
 class RootFolder(Folder):
     """The standard Zope root Folder implementation."""
 
-    __implements__ = Folder.__implements__, IRootFolder
+    implements(IRootFolder)
 
 
 class RootDirectoryFactory:
@@ -159,6 +159,5 @@
         return [(key, get(key)) for key in self.keys()]
 
     def __contains__(self, key):
-        return self.get(key) is not None  
-    
+        return self.get(key) is not None