[Checkins] SVN: zope.app.intid/trunk/ Change dependencies from zope.app.container to zope.container.

[Martijn Faassen]

Log message for revision 95466:
  Change dependencies from zope.app.container to zope.container.
  

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

-=-
Modified: zope.app.intid/trunk/CHANGES.txt
===================================================================
--- zope.app.intid/trunk/CHANGES.txt	2009-01-29 18:10:06 UTC (rev 95465)
+++ zope.app.intid/trunk/CHANGES.txt	2009-01-29 18:10:45 UTC (rev 95466)
@@ -5,7 +5,7 @@
 3.6.0 (unreleased)
 ------------------
 
-- ...
+- Changed dependency from zope.app.container to zope.container.
 
 3.5.1 (2008-12-11)
 ------------------

Modified: zope.app.intid/trunk/setup.py
===================================================================
--- zope.app.intid/trunk/setup.py	2009-01-29 18:10:06 UTC (rev 95465)
+++ zope.app.intid/trunk/setup.py	2009-01-29 18:10:45 UTC (rev 95466)
@@ -54,7 +54,7 @@
       install_requires = ['setuptools',
                           'ZODB3',
                           'zope.app.component',
-                          'zope.app.container',
+                          'zope.container',
                           'zope.app.keyreference',
                           'zope.component',
                           'zope.event',

Modified: zope.app.intid/trunk/src/zope/app/intid/__init__.py
===================================================================
--- zope.app.intid/trunk/src/zope/app/intid/__init__.py	2009-01-29 18:10:06 UTC (rev 95465)
+++ zope.app.intid/trunk/src/zope/app/intid/__init__.py	2009-01-29 18:10:45 UTC (rev 95466)
@@ -33,9 +33,9 @@
 from zope.component import adapter, getAllUtilitiesRegisteredFor, queryUtility, subscribers
 from zope.component.interfaces import IFactory
 
-from zope.app.container.interfaces import IObjectRemovedEvent
-from zope.app.container.interfaces import IObjectAddedEvent
-from zope.app.container.contained import Contained
+from zope.container.interfaces import IObjectRemovedEvent
+from zope.container.interfaces import IObjectAddedEvent
+from zope.container.contained import Contained
 from zope.app.keyreference.interfaces import IKeyReference, NotYet
 
 from zope.app.intid.interfaces import IIntIds, IIntIdEvent

Modified: zope.app.intid/trunk/src/zope/app/intid/tests.py
===================================================================
--- zope.app.intid/trunk/src/zope/app/intid/tests.py	2009-01-29 18:10:06 UTC (rev 95465)
+++ zope.app.intid/trunk/src/zope/app/intid/tests.py	2009-01-29 18:10:45 UTC (rev 95466)
@@ -208,7 +208,7 @@
 
     def test_removeIntIdSubscriber(self):
         from zope.app.intid import removeIntIdSubscriber
-        from zope.app.container.contained import ObjectRemovedEvent
+        from zope.container.contained import ObjectRemovedEvent
         from zope.app.intid.interfaces import IIntIdRemovedEvent
         from zope.app.folder.interfaces import IFolder
         parent_folder = self.root['folder1']['folder1_1']
@@ -246,7 +246,7 @@
 
     def test_addIntIdSubscriber(self):
         from zope.app.intid import addIntIdSubscriber
-        from zope.app.container.contained import ObjectAddedEvent
+        from zope.container.contained import ObjectAddedEvent
         from zope.app.intid.interfaces import IIntIdAddedEvent
         from zope.app.folder.interfaces import IFolder
         parent_folder = self.root['folder1']['folder1_1']