[Checkins] SVN: zope.intid/trunk/ - Remove dependencies on ``zope.container``. Instead import

[Chris McDonough]

Log message for revision 100049:
  - Remove dependencies on ``zope.container``.  Instead import
    ``Object*Event`` classes from ``zope.lifecycleevent`` and import
    ``IContained`` from ``zope.location``.  In order to be able to do
    this, depend on ``zope.lifecycleevent``>=3.5.2 and
    ``zope.location``>=3.5.4.
  
  

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

-=-
Modified: zope.intid/trunk/CHANGES.txt
===================================================================
--- zope.intid/trunk/CHANGES.txt	2009-05-17 17:44:26 UTC (rev 100048)
+++ zope.intid/trunk/CHANGES.txt	2009-05-17 17:53:56 UTC (rev 100049)
@@ -5,6 +5,12 @@
 3.7.1 (unreleased)
 ------------------
 
+- Remove dependencies on ``zope.container``.  Instead import
+  ``Object*Event`` classes from ``zope.lifecycleevent`` and import
+  ``IContained`` from ``zope.location``.  In order to be able to do
+  this, depend on ``zope.lifecycleevent``>=3.5.2 and
+  ``zope.location``>=3.5.4.
+
 - 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).

Modified: zope.intid/trunk/setup.py
===================================================================
--- zope.intid/trunk/setup.py	2009-05-17 17:44:26 UTC (rev 100048)
+++ zope.intid/trunk/setup.py	2009-05-17 17:53:56 UTC (rev 100049)
@@ -51,12 +51,12 @@
                                   'zope.site']),
       install_requires = ['setuptools',
                           'ZODB3',
-                          'zope.container',
+                          'zope.lifecycleevent>=3.5.2',
                           'zope.component',
                           'zope.event',
                           'zope.interface',
                           'zope.keyreference',
-                          'zope.location',
+                          'zope.location>=3.5.4',
                           'zope.security',
                           ],
       include_package_data = True,

Modified: zope.intid/trunk/src/zope/intid/__init__.py
===================================================================
--- zope.intid/trunk/src/zope/intid/__init__.py	2009-05-17 17:44:26 UTC (rev 100048)
+++ zope.intid/trunk/src/zope/intid/__init__.py	2009-05-17 17:53:56 UTC (rev 100049)
@@ -25,12 +25,13 @@
 import BTrees
 from persistent import Persistent
 from zope.component import adapter, getAllUtilitiesRegisteredFor, subscribers
-from zope.container.interfaces import IObjectAddedEvent, IObjectRemovedEvent
-from zope.container.interfaces import IContained
 from zope.event import notify
 from zope.interface import implements
 from zope.keyreference.interfaces import IKeyReference, NotYet
+from zope.lifecycleevent.interfaces import IObjectAddedEvent
+from zope.lifecycleevent.interfaces import IObjectRemovedEvent
 from zope.location.interfaces import ILocation
+from zope.location.interfaces import IContained
 from zope.security.proxy import removeSecurityProxy
 
 from zope.intid.interfaces import IIntIds, IIntIdEvent

Modified: zope.intid/trunk/src/zope/intid/tests.py
===================================================================
--- zope.intid/trunk/src/zope/intid/tests.py	2009-05-17 17:44:26 UTC (rev 100048)
+++ zope.intid/trunk/src/zope/intid/tests.py	2009-05-17 17:53:56 UTC (rev 100049)
@@ -196,7 +196,7 @@
         provideHandler(intIdEventNotify)
 
     def test_removeIntIdSubscriber(self):
-        from zope.container.contained import ObjectRemovedEvent
+        from zope.lifecycleevent import ObjectRemovedEvent
         from zope.intid import removeIntIdSubscriber
         from zope.intid.interfaces import IIntIdRemovedEvent
         from zope.site.interfaces import IFolder
@@ -234,7 +234,7 @@
         self.assertEquals(objevents[0][1].original_event.object, parent_folder)
 
     def test_addIntIdSubscriber(self):
-        from zope.container.contained import ObjectAddedEvent
+        from zope.lifecycleevent import ObjectAddedEvent
         from zope.intid import addIntIdSubscriber
         from zope.intid.interfaces import IIntIdAddedEvent
         from zope.site.interfaces import IFolder