Permalink
Browse files

remove superfluos

  • Loading branch information...
1 parent 1b547c4 commit 881c38f3feaf72b0c42276e1123e46300db647ad Robert Niederreiter committed May 18, 2012
Showing with 104 additions and 448 deletions.
  1. +23 −10 README.rst
  2. +12 −80 src/node/interfaces.py
  3. +21 −152 src/node/parts/alias.py
  4. +22 −148 src/node/parts/alias.rst
  5. +0 −4 src/node/parts/attributes.py
  6. +2 −22 src/node/parts/common.py
  7. +7 −0 src/node/parts/nodify.py
  8. +0 −11 src/node/utils.py
  9. +17 −21 src/node/utils.rst
View
@@ -215,6 +215,10 @@ node.parts.Reference
Plumbing part holding an index of all nodes contained in the tree.
See ``node.interfaces.IReference``.
+node.parts.Storage
+ Provide abstract storage access.
+ See ``node.interfaces.IStorage``.
+
node.parts.DictStorage
Provide dictionary storage.
See ``node.interfaces.IStorage``.
@@ -245,17 +249,17 @@ Summary of the test coverage report::
lines cov% module
52 100% node.base
14 100% node.events
- 141 100% node.interfaces
+ 125 100% node.interfaces
23 100% node.locking
11 100% node.parts.__init__
- 151 100% node.parts.alias
+ 107 100% node.parts.alias
38 100% node.parts.attributes
50 100% node.parts.cache
118 100% node.parts.common
51 100% node.parts.lifecycle
114 100% node.parts.mapping
31 100% node.parts.nodespace
- 74 100% node.parts.nodify
+ 79 100% node.parts.nodify
109 100% node.parts.order
81 100% node.parts.reference
26 100% node.parts.storage
@@ -264,7 +268,7 @@ Summary of the test coverage report::
19 100% node.testing.env
215 100% node.testing.fullmapping
29 100% node.tests
- 125 100% node.utils
+ 120 100% node.utils
Contributors
@@ -284,20 +288,29 @@ Changes
0.9.7dev
--------
-- Move aliaser objects from ``node.aliasing`` to ``node.parts.alias``.
+- ``node.parts.mapping.ClonableMapping`` now supports ``deepcopy``.
[rnix, 2012-05-18]
-- Remove ``composition`` module.
+- Use ``zope.interface.implementer`` instead of ``zope.interface.implements``
+ all over the place.
[rnix, 2012-05-18]
-- Remove ``bbb`` module.
+- Remove superfluos interfaces.
[rnix, 2012-05-18]
-- ``node.parts.mapping.ClonableMapping`` now supports deepcopy.
+- Remove ``Zodict`` from ``node.utils``.
[rnix, 2012-05-18]
-- use ``zope.interface.implementer`` instead of ``zope.interface.implements``
- all over the place.
+- Remove ``AliasedNodespace``, use ``Alias`` part instead.
+ [rnix, 2012-05-18]
+
+- Move aliaser objects from ``node.aliasing`` to ``node.parts.alias``.
+ [rnix, 2012-05-18]
+
+- Remove ``composition`` module.
+ [rnix, 2012-05-18]
+
+- Remove ``bbb`` module.
[rnix, 2012-05-18]
View
@@ -7,6 +7,12 @@
IWriteMapping,
IFullMapping,
)
+from zope.lifecycleevent import (
+ IObjectCreatedEvent,
+ IObjectAddedEvent,
+ IObjectModifiedEvent,
+ IObjectRemovedEvent,
+)
try:
from zope.location.interfaces import ILocation
except ImportError, e:
@@ -29,21 +35,6 @@ class ILocation(Interface):
__parent__ = Attribute('The parent in the location hierarchy.')
__name__ = Attribute('The name within the parent')
-try:
- from zope.lifecycleevent import (
- IObjectCreatedEvent,
- IObjectAddedEvent,
- IObjectModifiedEvent,
- IObjectRemovedEvent,
- )
-except ImportError, e: #pragma NO COVERAGE
- # BBB, XXX: remove this soon, relict from ``zodict``
- from zope.app.event.interfaces import IObjectEvent #pragma NO COVERAGE
- class IObjectCreatedEvent(IObjectEvent): pass #pragma NO COVERAGE
- class IObjectAddedEvent(IObjectEvent): pass #pragma NO COVERAGE
- class IObjectModifiedEvent(IObjectEvent): pass #pragma NO COVERAGE
- class IObjectRemovedEvent(IObjectEvent): pass #pragma NO COVERAGE
-
###############################################################################
# events
@@ -469,13 +460,11 @@ class IUUIDAware(IUUID):
copy
Set new uuid on copied obejct. Considers ``overwrite_recursiv_on_copy``.
"""
- overwrite_recursiv_on_copy = Attribute(u"Flag whether to set new UUID on "
- u"children as well when calling "
- u"``node.copy()``. This only makes "
- u"sence for nodes performing a "
- u"``deepcopy`` or anythin "
- u"equivalent also creating copies "
- u"of it's children.")
+ overwrite_recursiv_on_copy = Attribute(
+ u"Flag whether to set new UUID on children as well when calling "
+ u"``node.copy()``. This only makes sence for nodes performing a "
+ u"``deepcopy`` or anythin equivalent also creating copies "
+ u"of it's children.")
def set_uuid_for(node, override=False, recursiv=False):
"""Set ``uuid`` for node. If ``override`` is True, override existing
@@ -529,61 +518,4 @@ def __delitem__(key):
def __iter__():
"""Iter throught storage keys.
- """
-
-
-#class IWrap(Interface):
-# """
-# """
-
-
-###############################################################################
-# BBB Will be removed by node 1.0
-###############################################################################
-
-
-class INodeAttributes(IEnumerableMapping, IWriteMapping):
- """Interface describing the attributes of a (lifecycle) Node.
-
- Promise to throw modification related events when calling IWriteMapping
- related functions.
-
- You do not instanciate this kind of object directly. This is done due to
- ``LifecycleNode.attributes`` access. You can provide your own
- ``INodeAttributes`` implementation by setting
- ``LifecycleNode.attributes_factory``.
- """
- changed = Attribute(u"Flag indicating if attributes were changed or not.")
-
- def __init__(node):
- """Initialize object.
-
- Takes attributes refering node at creation time.
- """
-
-
-class ICallableNode(INode):
- """Node which implements the ``__call__`` function.
- """
-
- def __call__():
- """Expose the tree contents to an output channel.
- """
-
-
-class IAttributedNode(INode):
- """Node which care about its attributes.
- """
- attributes = Attribute(u"``INodeAttributes`` implementation.")
- attributes_factory = Attribute(u"``INodeAttributes`` implementation class")
-
-
-class ILifecycleNode(INode):
- """Node which care about its lifecycle.
- """
- events = Attribute(u"Dict with lifecycle event classes to use for "
- u"notification.")
-
-
-class IComposition(INode):
- pass
+ """
Oops, something went wrong.

0 comments on commit 881c38f

Please sign in to comment.