[Checkins] SVN: zc.shortcut/trunk/src/zc/shortcut/ Get rid of unit test deprecations

[Gary Poster]

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

Changed:
  U   zc.shortcut/trunk/src/zc/shortcut/adapters.py
  U   zc.shortcut/trunk/src/zc/shortcut/adapters.txt
  U   zc.shortcut/trunk/src/zc/shortcut/adding.py
  U   zc.shortcut/trunk/src/zc/shortcut/adding.txt
  U   zc.shortcut/trunk/src/zc/shortcut/factory.py
  U   zc.shortcut/trunk/src/zc/shortcut/factory.txt
  U   zc.shortcut/trunk/src/zc/shortcut/proxy.py
  U   zc.shortcut/trunk/src/zc/shortcut/shortcut.py
  U   zc.shortcut/trunk/src/zc/shortcut/tests.py

-=-
Modified: zc.shortcut/trunk/src/zc/shortcut/adapters.py
===================================================================
--- zc.shortcut/trunk/src/zc/shortcut/adapters.py	2006-04-28 03:29:20 UTC (rev 67688)
+++ zc.shortcut/trunk/src/zc/shortcut/adapters.py	2006-04-28 03:29:55 UTC (rev 67689)
@@ -23,14 +23,13 @@
 from zope.publisher.interfaces.browser import IBrowserRequest
 from zope.publisher.interfaces.http import IHTTPRequest
 
-from zope.app.location.pickling import locationCopy
-from zope.app.dublincore.interfaces import IZopeDublinCore
-from zope.app.event.objectevent import ObjectCopiedEvent, ObjectCreatedEvent
-from zope.app.size.interfaces import ISized
-from zope.app.traversing.interfaces import ITraversable, IContainmentRoot
-from zope.app.publisher.browser import BrowserView
-from zope.app.traversing.interfaces import IContainmentRoot
-from zope.app import copypastemove
+from zope.location.pickling import locationCopy
+from zope.dublincore.interfaces import IZopeDublinCore
+from zope.lifecycleevent import ObjectCopiedEvent, ObjectCreatedEvent
+from zope.size.interfaces import ISized
+from zope.traversing.interfaces import ITraversable, IContainmentRoot
+from zope.publisher.browser import BrowserView
+from zope import copypastemove
 from zope.app.container.constraints import checkObject
 from zope.app.container.interfaces import INameChooser, IContainer
 

Modified: zc.shortcut/trunk/src/zc/shortcut/adapters.txt
===================================================================
--- zc.shortcut/trunk/src/zc/shortcut/adapters.txt	2006-04-28 03:29:20 UTC (rev 67688)
+++ zc.shortcut/trunk/src/zc/shortcut/adapters.txt	2006-04-28 03:29:55 UTC (rev 67689)
@@ -12,9 +12,9 @@
 
     >>> from zope.publisher.interfaces import IRequest
     >>> from zope.publisher.interfaces.browser import IBrowserPublisher
-    >>> from zope.app.traversing.interfaces import ITraversable
+    >>> from zope.traversing.interfaces import ITraversable
     >>> from zc.shortcut.interfaces import IShortcut
-    >>> from zope.app.location.interfaces import ILocation
+    >>> from zope.location.interfaces import ILocation
     >>> from zc.shortcut import interfaces
 
 If we have a target object with a root::
@@ -29,7 +29,7 @@
     ...         self.__parent__ = parent
     ...         self.__name__ = name
 
-    >>> from zope.app.traversing.interfaces import IContainmentRoot
+    >>> from zope.traversing.interfaces import IContainmentRoot
     >>> class DummyContainmentRoot(object):
     ...     __parent__ = __name__ = None
     ...     interface.implements(IContainmentRoot)
@@ -273,8 +273,8 @@
     >>> component.provideAdapter(zc.displayname.adapters.DefaultDisplayNameGenerator)
     >>> component.provideAdapter(zc.displayname.adapters.SiteDisplayNameGenerator)
     >>> from zope.publisher.interfaces.http import IHTTPRequest
-    >>> from zope.app.traversing.browser.interfaces import IAbsoluteURL
-    >>> from zope.app.traversing import browser
+    >>> from zope.traversing.browser.interfaces import IAbsoluteURL
+    >>> from zope.traversing import browser
     >>> component.provideAdapter(
     ...     browser.AbsoluteURL, adapts=(None, IHTTPRequest),
     ...     provides=IAbsoluteURL)
@@ -337,7 +337,7 @@
 Copy and Link
 =============
 
-The zope.app.copypastemove package provides a number of interfaces to provide
+The zope.copypastemove package provides a number of interfaces to provide
 copy, move, rename, and other similar operations.  The shortcut package
 provides a replacement implementation of copy for objects that looks up a
 repository and uses it if available; an implementation of
@@ -420,7 +420,7 @@
     >>> dummy.__parent__ = repo
     >>> dummy.__name__ = 'dummy'
     >>> dummy.id = 'foo'
-    >>> from zope.app import copypastemove
+    >>> from zope import copypastemove
     >>> copier = copypastemove.IObjectCopier(dummy)
     >>> verifyObject(copypastemove.IObjectCopier, copier)
     True

Modified: zc.shortcut/trunk/src/zc/shortcut/adding.py
===================================================================
--- zc.shortcut/trunk/src/zc/shortcut/adding.py	2006-04-28 03:29:20 UTC (rev 67688)
+++ zc.shortcut/trunk/src/zc/shortcut/adding.py	2006-04-28 03:29:55 UTC (rev 67689)
@@ -23,10 +23,10 @@
 from zope.app.component.hooks import getSite
 import zope.app.container.browser.adding
 from zope.app.container.constraints import checkObject
-from zope.app.event.objectevent import ObjectCreatedEvent
-from zope.app.exception.interfaces import UserError
-from zope.app.location.interfaces import ILocation
-from zope.app.location import LocationProxy
+from zope.lifecycleevent import ObjectCreatedEvent
+from zope.exceptions.interfaces import UserError
+from zope.location.interfaces import ILocation
+from zope.location import LocationProxy
 
 from zc.shortcut import Shortcut, traversedURL, interfaces
 

Modified: zc.shortcut/trunk/src/zc/shortcut/adding.txt
===================================================================
--- zc.shortcut/trunk/src/zc/shortcut/adding.txt	2006-04-28 03:29:20 UTC (rev 67688)
+++ zc.shortcut/trunk/src/zc/shortcut/adding.txt	2006-04-28 03:29:55 UTC (rev 67689)
@@ -19,7 +19,7 @@
 
     >>> from zc.shortcut import adding, interfaces
     >>> from zope import interface, component
-    >>> from zope.app.location.interfaces import ILocation
+    >>> from zope.location.interfaces import ILocation
     >>> class ISpam(interface.Interface):
     ...     pass
     ...
@@ -29,7 +29,7 @@
     ...         self.__parent__ = parent
     ...         self.__name__ = name
     ...
-    >>> from zope.app.traversing.interfaces import IContainmentRoot
+    >>> from zope.traversing.interfaces import IContainmentRoot
     >>> class DummyContainmentRoot(object):
     ...     interface.implements(IContainmentRoot)
     ...

Modified: zc.shortcut/trunk/src/zc/shortcut/factory.py
===================================================================
--- zc.shortcut/trunk/src/zc/shortcut/factory.py	2006-04-28 03:29:20 UTC (rev 67688)
+++ zc.shortcut/trunk/src/zc/shortcut/factory.py	2006-04-28 03:29:55 UTC (rev 67689)
@@ -16,7 +16,7 @@
 import zope.component.factory
 from zope.app.container.interfaces import INameChooser, IContainer
 from zope.app.container.constraints import checkObject
-from zope.app.event.objectevent import ObjectCreatedEvent
+from zope.lifecycleevent import ObjectCreatedEvent
 
 from zc.shortcut import interfaces, Shortcut
 

Modified: zc.shortcut/trunk/src/zc/shortcut/factory.txt
===================================================================
--- zc.shortcut/trunk/src/zc/shortcut/factory.txt	2006-04-28 03:29:20 UTC (rev 67688)
+++ zc.shortcut/trunk/src/zc/shortcut/factory.txt	2006-04-28 03:29:55 UTC (rev 67689)
@@ -11,7 +11,7 @@
     >>> class IDummy(interface.Interface):
     ...     pass
     ...
-    >>> from zope.app.location.interfaces import ILocation
+    >>> from zope.location.interfaces import ILocation
     >>> class Dummy(object):
     ...     interface.implements(IDummy, ILocation)
     ...     def __init__(self, *args, **kwargs):

Modified: zc.shortcut/trunk/src/zc/shortcut/proxy.py
===================================================================
--- zc.shortcut/trunk/src/zc/shortcut/proxy.py	2006-04-28 03:29:20 UTC (rev 67688)
+++ zc.shortcut/trunk/src/zc/shortcut/proxy.py	2006-04-28 03:29:55 UTC (rev 67689)
@@ -17,7 +17,7 @@
 """
 from zope import interface, proxy
 from zope.interface import declarations
-from zope.app.decorator import DecoratedSecurityCheckerDescriptor
+from zope.decorator import DecoratedSecurityCheckerDescriptor
 from zc.shortcut import interfaces
 
 class DecoratorSpecificationDescriptor(

Modified: zc.shortcut/trunk/src/zc/shortcut/shortcut.py
===================================================================
--- zc.shortcut/trunk/src/zc/shortcut/shortcut.py	2006-04-28 03:29:20 UTC (rev 67688)
+++ zc.shortcut/trunk/src/zc/shortcut/shortcut.py	2006-04-28 03:29:55 UTC (rev 67689)
@@ -17,7 +17,7 @@
 """
 import persistent
 from zope import interface
-from zope.app.location.interfaces import ILocation
+from zope.location.interfaces import ILocation
 
 from zc.shortcut import interfaces, proxy
 

Modified: zc.shortcut/trunk/src/zc/shortcut/tests.py
===================================================================
--- zc.shortcut/trunk/src/zc/shortcut/tests.py	2006-04-28 03:29:20 UTC (rev 67688)
+++ zc.shortcut/trunk/src/zc/shortcut/tests.py	2006-04-28 03:29:55 UTC (rev 67689)
@@ -20,7 +20,7 @@
 import zope.testing.module
 
 from zope.testing import doctest
-from zope.app.tests import placelesssetup
+from zope.app.testing import placelesssetup
 
 def adaptersSetUp(test):
     zope.testing.module.setUp(test, name='zc.shortcut.adapters_test')