[Checkins] SVN: z3ext.controlpanel/trunk/ Do not inherit ContentContainerConfiglet from ContentContainer

[Nikolay Kim]

Log message for revision 98264:
  Do not inherit ContentContainerConfiglet from ContentContainer

Changed:
  U   z3ext.controlpanel/trunk/CHANGES.txt
  U   z3ext.controlpanel/trunk/src/z3ext/controlpanel/container.py

-=-
Modified: z3ext.controlpanel/trunk/CHANGES.txt
===================================================================
--- z3ext.controlpanel/trunk/CHANGES.txt	2009-03-19 09:56:05 UTC (rev 98263)
+++ z3ext.controlpanel/trunk/CHANGES.txt	2009-03-19 10:29:28 UTC (rev 98264)
@@ -2,7 +2,12 @@
 CHANGES
 =======
 
+1.4.1 (Unreleased)
+------------------
 
+- Do not inherit ContentContainerConfiglet from ContentContainer
+
+
 1.4.0 (2009-03-12)
 ------------------
 

Modified: z3ext.controlpanel/trunk/src/z3ext/controlpanel/container.py
===================================================================
--- z3ext.controlpanel/trunk/src/z3ext/controlpanel/container.py	2009-03-19 09:56:05 UTC (rev 98263)
+++ z3ext.controlpanel/trunk/src/z3ext/controlpanel/container.py	2009-03-19 10:29:28 UTC (rev 98264)
@@ -22,15 +22,16 @@
 from zope.security.decorator import DecoratedSecurityCheckerDescriptor
 from zope.location.interfaces import ILocation
 from zope.location.location import ClassAndInstanceDescr
+from zope.app.container.btree import BTreeContainer
 from zope.app.container.contained import uncontained
 
 from z3ext.content.type.order import Reordable
-from z3ext.content.type.interfaces import IOrder
-from z3ext.content.type.container import ContentContainer
 from z3ext.controlpanel.configlet import Configlet
+from z3ext.content.type.interfaces import IItem, IOrder, IContentContainer
 
 
-class ContentContainerConfiglet(ContentContainer, Configlet):
+class ContentContainerConfiglet(BTreeContainer, Configlet):
+    interface.implements(IItem, IContentContainer)
 
     def __init__(self, tests=()):
         Configlet.__init__(self, tests)