[Zope3-checkins] SVN: Zope3/trunk/ Fix #332 : Death to IContentContainer

[Julien Anguenot]

Log message for revision 30851:
  Fix #332 : Death to IContentContainer

Changed:
  U   Zope3/trunk/doc/CHANGES.txt
  U   Zope3/trunk/doc/TODO.txt
  U   Zope3/trunk/src/zope/app/folder/browser/configure.zcml
  U   Zope3/trunk/src/zope/app/folder/interfaces.py

-=-
Modified: Zope3/trunk/doc/CHANGES.txt
===================================================================
--- Zope3/trunk/doc/CHANGES.txt	2005-06-18 16:40:52 UTC (rev 30850)
+++ Zope3/trunk/doc/CHANGES.txt	2005-06-18 17:02:06 UTC (rev 30851)
@@ -648,6 +648,8 @@
 
     Bug Fixes
 
+      - Fix #332 : Death to IContentContainer
+
       - Fix #356 : Copy and Paste does not handle exceptions raised by
         ``__setitem__``
 

Modified: Zope3/trunk/doc/TODO.txt
===================================================================
--- Zope3/trunk/doc/TODO.txt	2005-06-18 16:40:52 UTC (rev 30850)
+++ Zope3/trunk/doc/TODO.txt	2005-06-18 17:02:06 UTC (rev 30851)
@@ -33,8 +33,6 @@
 
   * 316: Zope3X test.py truncates path with dir=
 
-  * 332: Death to IContentContainer
-
   * 336: zpkg: defining 'zpkgsetup' resource shouldn't be necessary
 
   * 344: PAU registration error

Modified: Zope3/trunk/src/zope/app/folder/browser/configure.zcml
===================================================================
--- Zope3/trunk/src/zope/app/folder/browser/configure.zcml	2005-06-18 16:40:52 UTC (rev 30850)
+++ Zope3/trunk/src/zope/app/folder/browser/configure.zcml	2005-06-18 17:02:06 UTC (rev 30851)
@@ -21,6 +21,7 @@
       for="zope.app.folder.interfaces.IFolder"
       contents="zope.ManageContent"
       index="zope.View"
+      add="zope.ManageContent"
       />
 
   <!-- Preview view - requires zope.app.preview -->

Modified: Zope3/trunk/src/zope/app/folder/interfaces.py
===================================================================
--- Zope3/trunk/src/zope/app/folder/interfaces.py	2005-06-18 16:40:52 UTC (rev 30850)
+++ Zope3/trunk/src/zope/app/folder/interfaces.py	2005-06-18 17:02:06 UTC (rev 30851)
@@ -17,13 +17,12 @@
 """
 __docformat__ = 'restructuredtext'
 
-from zope.app.container.interfaces import IContainer, IContentContainer
+from zope.app.container.interfaces import IContainer
 from zope.app.traversing.interfaces import IContainmentRoot
 from zope.app.component.interfaces import IPossibleSite
 from zope.app.annotation.interfaces import IAttributeAnnotatable
 
-class IFolder(IContainer, IContentContainer, IPossibleSite,
-              IAttributeAnnotatable):
+class IFolder(IContainer, IPossibleSite, IAttributeAnnotatable):
     """The standard Zope Folder object interface."""
 
 class IRootFolder(IFolder, IContainmentRoot):