[Checkins] SVN: z3ext.controlpanel/trunk/ Moved ContentContainerConfiglet implementation to z3ext.content.type package

[Nikolay Kim]

Log message for revision 99780:
  Moved ContentContainerConfiglet implementation to z3ext.content.type package

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

-=-
Modified: z3ext.controlpanel/trunk/CHANGES.txt
===================================================================
--- z3ext.controlpanel/trunk/CHANGES.txt	2009-05-05 14:45:38 UTC (rev 99779)
+++ z3ext.controlpanel/trunk/CHANGES.txt	2009-05-05 18:27:53 UTC (rev 99780)
@@ -2,6 +2,12 @@
 CHANGES
 =======
 
+1.4.2 (Unreleased)
+------------------
+
+- Moved ContentContainerConfiglet implementation to z3ext.content.type package
+
+
 1.4.1 (2009-04-23)
 ------------------
 

Deleted: z3ext.controlpanel/trunk/src/z3ext/controlpanel/container.py
===================================================================
--- z3ext.controlpanel/trunk/src/z3ext/controlpanel/container.py	2009-05-05 14:45:38 UTC (rev 99779)
+++ z3ext.controlpanel/trunk/src/z3ext/controlpanel/container.py	2009-05-05 18:27:53 UTC (rev 99780)
@@ -1,113 +0,0 @@
-##############################################################################
-#
-# Copyright (c) 2008 Zope Corporation and Contributors.
-# All Rights Reserved.
-#
-# This software is subject to the provisions of the Zope Public License,
-# Version 2.1 (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.
-#
-##############################################################################
-""" Use configlet as content container
-
-$Id:  2007-12-12 12:27:02Z fafhrd $
-"""
-from zope import interface, component
-from zope.proxy import removeAllProxies
-from zope.proxy import ProxyBase, getProxiedObject, non_overridable
-from zope.proxy.decorator import DecoratorSpecificationDescriptor
-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.controlpanel.configlet import Configlet
-from z3ext.content.type.interfaces import IItem, IOrder, IContentContainer
-
-
-class ContentContainerConfiglet(BTreeContainer, Configlet):
-    interface.implements(IItem, IContentContainer)
-
-    def __init__(self, tests=()):
-        Configlet.__init__(self, tests)
-
-    @property
-    def title(self):
-        return self.__title__
-
-    @property
-    def description(self):
-        return self.__description__
-
-    @property
-    def _SampleContainer__data(self):
-        return self.data
-
-    def keys(self):
-        return self.data.keys()
-
-    def items(self):
-        return [(name, self[name]) for name in self]
-
-    def get(self, key, default=None):
-        item = self.data.get(key, default)
-
-        if item is default:
-            return item
-
-        return ItemLocationProxy(removeAllProxies(item), self)
-
-    def __contains__(self, key):
-        return key in self.data
-
-    def __iter__(self):
-        return iter(self.data)
-
-    def __getitem__(self, key):
-        return ItemLocationProxy(removeAllProxies(self.data[key]), self)
-
-    def __delitem__(self, key):
-        uncontained(self[key], self, key)
-        del self.data[key]
-
-
-class ConfigletContainerOrder(Reordable):
-    @component.adapter(ContentContainerConfiglet)
-
-    def __init__(self, context):
-        context = removeAllProxies(context)
-        super(ConfigletContainerOrder, self).__init__(context.data)
-
-        self.context = context
-
-
-class ItemLocationProxy(ProxyBase):
-    interface.implements(ILocation)
-
-    __slots__ = '__parent__'
-    __safe_for_unpickling__ = True
-
-    def __new__(self, ob, container=None):
-        return ProxyBase.__new__(self, ob)
-
-    def __init__(self, ob, container=None):
-        ProxyBase.__init__(self, ob)
-        self.__parent__ = container
-
-    @non_overridable
-    def __reduce__(self, proto=None):
-        raise TypeError("Not picklable")
-
-    __doc__ = ClassAndInstanceDescr(
-        lambda inst: getProxiedObject(inst).__doc__,
-        lambda cls, __doc__ = __doc__: __doc__,
-        )
-
-    __reduce_ex__ = __reduce__
-    __providedBy__ = DecoratorSpecificationDescriptor()
-    __Security_checker__ = DecoratedSecurityCheckerDescriptor()