[Checkins] SVN: zope.principalannotation/trunk/ removed dependency on zope.container by no longer using the Contained mix-in class
Thomas Lotze
tl at gocept.com
Mon Oct 5 11:01:13 EDT 2009
Log message for revision 104798:
removed dependency on zope.container by no longer using the Contained mix-in class
Changed:
U zope.principalannotation/trunk/CHANGES.txt
U zope.principalannotation/trunk/setup.py
U zope.principalannotation/trunk/src/zope/principalannotation/utility.py
-=-
Modified: zope.principalannotation/trunk/CHANGES.txt
===================================================================
--- zope.principalannotation/trunk/CHANGES.txt 2009-10-05 14:49:10 UTC (rev 104797)
+++ zope.principalannotation/trunk/CHANGES.txt 2009-10-05 15:01:13 UTC (rev 104798)
@@ -5,7 +5,7 @@
3.6.1 (unreleased)
------------------
-- ...
+- Removed dependency on zope.container.
3.6.0 (2009-03-09)
------------------
Modified: zope.principalannotation/trunk/setup.py
===================================================================
--- zope.principalannotation/trunk/setup.py 2009-10-05 14:49:10 UTC (rev 104797)
+++ zope.principalannotation/trunk/setup.py 2009-10-05 15:01:13 UTC (rev 104798)
@@ -53,7 +53,6 @@
'ZODB3',
'zope.annotation',
'zope.component',
- 'zope.container',
'zope.interface',
'zope.location',
'zope.security',
Modified: zope.principalannotation/trunk/src/zope/principalannotation/utility.py
===================================================================
--- zope.principalannotation/trunk/src/zope/principalannotation/utility.py 2009-10-05 14:49:10 UTC (rev 104797)
+++ zope.principalannotation/trunk/src/zope/principalannotation/utility.py 2009-10-05 15:01:13 UTC (rev 104798)
@@ -21,8 +21,8 @@
from persistent.dict import PersistentDict
from zope import interface, component
from zope.annotation.interfaces import IAnnotations
-from zope.container.contained import Contained
from zope.location import Location
+from zope.location.interfaces import IContained
from zope.security.interfaces import IPrincipal
from zope.site.next import queryNextUtility
@@ -30,14 +30,17 @@
# TODO: register utility as adapter for IAnnotations on utility activation.
-class PrincipalAnnotationUtility(Persistent, Contained):
+class PrincipalAnnotationUtility(Persistent):
"""Stores `IAnnotations` for `IPrinicipals`.
The utility ID is 'PrincipalAnnotation'.
"""
- interface.implements(IPrincipalAnnotationUtility)
-
+ interface.implements(IPrincipalAnnotationUtility, IContained)
+
+ __parent__ = None
+ __name__ = None
+
def __init__(self):
self.annotations = OOBTree()
More information about the checkins
mailing list