[Checkins] SVN: zope.intid/trunk/ - Remove a dependency on ``zope.container.contained.Contained``

[Chris McDonough]

Log message for revision 99961:
  - Remove a dependency on ``zope.container.contained.Contained``
    (this is a dumb base class that defines __parent__ and __name__
    as None and declares that the class implements IContained).
  
  

Changed:
  U   zope.intid/trunk/CHANGES.txt
  U   zope.intid/trunk/src/zope/intid/__init__.py

-=-
Modified: zope.intid/trunk/CHANGES.txt
===================================================================
--- zope.intid/trunk/CHANGES.txt	2009-05-15 02:41:49 UTC (rev 99960)
+++ zope.intid/trunk/CHANGES.txt	2009-05-15 03:31:59 UTC (rev 99961)
@@ -5,7 +5,9 @@
 3.7.1 (unreleased)
 ------------------
 
-- ...
+- Remove a dependency on ``zope.container.contained.Contained``
+  (this is a dumb base class that defines __parent__ and __name__
+  as None and declares that the class implements IContained).
 
 3.7.0 (2009-02-01)
 ------------------

Modified: zope.intid/trunk/src/zope/intid/__init__.py
===================================================================
--- zope.intid/trunk/src/zope/intid/__init__.py	2009-05-15 02:41:49 UTC (rev 99960)
+++ zope.intid/trunk/src/zope/intid/__init__.py	2009-05-15 03:31:59 UTC (rev 99961)
@@ -24,10 +24,9 @@
 
 import BTrees
 from persistent import Persistent
-from ZODB.interfaces import IConnection
 from zope.component import adapter, getAllUtilitiesRegisteredFor, subscribers
 from zope.container.interfaces import IObjectAddedEvent, IObjectRemovedEvent
-from zope.container.contained import Contained
+from zope.container.interfaces import IContained
 from zope.event import notify
 from zope.interface import implements
 from zope.keyreference.interfaces import IKeyReference, NotYet
@@ -37,14 +36,16 @@
 from zope.intid.interfaces import IIntIds, IIntIdEvent
 from zope.intid.interfaces import IntIdAddedEvent, IntIdRemovedEvent
 
-class IntIds(Persistent, Contained):
+class IntIds(Persistent):
     """This utility provides a two way mapping between objects and
     integer ids.
 
     IKeyReferences to objects are stored in the indexes.
     """
-    implements(IIntIds)
+    implements(IIntIds, IContained)
 
+    __parent__ = __name__ = None
+
     _v_nextid = None
 
     _randrange = random.randrange