[Checkins] SVN: zope.locking/trunk/src/zope/locking/ Get rid of unit test deprecations

[Gary Poster]

Log message for revision 67688:
  Get rid of unit test deprecations
  

Changed:
  U   zope.locking/trunk/src/zope/locking/README.txt
  U   zope.locking/trunk/src/zope/locking/interfaces.py
  U   zope.locking/trunk/src/zope/locking/tests.py
  U   zope.locking/trunk/src/zope/locking/utility.py

-=-
Modified: zope.locking/trunk/src/zope/locking/README.txt
===================================================================
--- zope.locking/trunk/src/zope/locking/README.txt	2006-04-28 03:29:04 UTC (rev 67687)
+++ zope.locking/trunk/src/zope/locking/README.txt	2006-04-28 03:29:20 UTC (rev 67688)
@@ -679,13 +679,15 @@
 demonstration we are simplifying the regsitration.
 
     >>> component.provideUtility(util, provides=interfaces.ITokenUtility)
+
     >>> import zope.component.interfaces
-    >>> @interface.implementer(zope.component.interfaces.ISiteManager)
+    >>> @interface.implementer(zope.component.interfaces.IComponentLookup)
     ... @component.adapter(interface.Interface)
     ... def siteManager(obj):
     ...     return component.getGlobalSiteManager()
     ...
     >>> component.provideAdapter(siteManager)
+
     >>> from zope.locking import adapters
     >>> component.provideAdapter(adapters.TokenBroker)
     >>> broker = interfaces.ITokenBroker(demo)

Modified: zope.locking/trunk/src/zope/locking/interfaces.py
===================================================================
--- zope.locking/trunk/src/zope/locking/interfaces.py	2006-04-28 03:29:04 UTC (rev 67687)
+++ zope.locking/trunk/src/zope/locking/interfaces.py	2006-04-28 03:29:20 UTC (rev 67688)
@@ -18,9 +18,9 @@
 """
 from zope import interface, schema
 
-from zope.app.event.interfaces import IObjectEvent
+from zope.component.interfaces import IObjectEvent
 from zope.interface.common.mapping import IMapping
-from zope.app.event.objectevent import ObjectEvent
+from zope.component.interfaces import ObjectEvent
 from zope.locking.i18n import _
 
 ##############################################################################

Modified: zope.locking/trunk/src/zope/locking/tests.py
===================================================================
--- zope.locking/trunk/src/zope/locking/tests.py	2006-04-28 03:29:04 UTC (rev 67687)
+++ zope.locking/trunk/src/zope/locking/tests.py	2006-04-28 03:29:20 UTC (rev 67688)
@@ -1,5 +1,5 @@
 import unittest
-from zope.app.tests import placelesssetup
+from zope.app.testing import placelesssetup
 from zope.testing import doctest 
 
 def setUp(test):

Modified: zope.locking/trunk/src/zope/locking/utility.py
===================================================================
--- zope.locking/trunk/src/zope/locking/utility.py	2006-04-28 03:29:04 UTC (rev 67687)
+++ zope.locking/trunk/src/zope/locking/utility.py	2006-04-28 03:29:20 UTC (rev 67688)
@@ -5,7 +5,7 @@
 
 from zope.app.keyreference.interfaces import IKeyReference
 
-from zope.app.location import Location
+from zope.location import Location
 
 from zope.locking import interfaces, utils
 from zope.locking.i18n import _