Re-separated component and event setup. It would be nice to combine

these, but if we do, we need to put them in an entirely new API,
deprecating the old apis.  Existing software may use the component
setup and then new it's own setup for objectEventNotify. If the
component setup sets up this handler, then it will be doubly setup,
causing tests to fail.

contained.py

@@ -406,7 +406,7 @@ def setitem(container, setitemf, name, object):
     If we run this using the testing framework, we'll use `getEvents` to
     track the events generated:
 
-    >>> from zope.component.testing import getEvents
+    >>> from zope.component.eventtesting import getEvents
     >>> from zope.lifecycleevent.interfaces import IObjectModifiedEvent
 
     We have an added event:
@@ -601,7 +601,7 @@ def uncontained(object, container, name=None):
     If we run this using the testing framework, we'll use `getEvents` to
     track the events generated:
 
-    >>> from zope.component.testing import getEvents
+    >>> from zope.component.eventtesting import getEvents
     >>> from zope.lifecycleevent.interfaces import IObjectModifiedEvent
     >>> from zope.app.container.interfaces import IObjectRemovedEvent
 

tests/test_objectcopier.py

@@ -20,7 +20,7 @@
 import zope.component
 from zope.testing import doctest
 from zope.traversing.api import traverse
-from zope.component.testing import getEvents, clearEvents
+from zope.component.eventtesting import getEvents, clearEvents
 from zope.copypastemove import ObjectCopier
 from zope.copypastemove.interfaces import IObjectCopier
 

tests/test_objectmover.py

@@ -20,7 +20,7 @@
 import zope.component
 from zope.testing import doctest
 from zope.traversing.api import traverse
-from zope.component.testing import getEvents, clearEvents
+from zope.component.eventtesting import getEvents, clearEvents
 from zope.copypastemove import ObjectMover
 from zope.copypastemove.interfaces import IObjectMover
 

tests/test_ordered.py

@@ -17,7 +17,7 @@
 """
 import unittest
 from zope.testing.doctestunit import DocTestSuite
-from zope.component.testing import getEvents, clearEvents
+from zope.component.eventtesting import getEvents, clearEvents
 from zope.app.testing import placelesssetup, setup
 
 def test_order_events():