[Zope3-checkins] SVN: Zope3/branches/jim-adapter/src/zope/copypastemove/ Convert users inside zope.copypastemove.

[Brian Sutherland]

Log message for revision 66931:
  Convert users inside zope.copypastemove.

Changed:
  U   Zope3/branches/jim-adapter/src/zope/copypastemove/__init__.py
  U   Zope3/branches/jim-adapter/src/zope/copypastemove/tests/test_clipboard.py
  U   Zope3/branches/jim-adapter/src/zope/copypastemove/tests/test_rename.py

-=-
Modified: Zope3/branches/jim-adapter/src/zope/copypastemove/__init__.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/copypastemove/__init__.py	2006-04-13 13:06:12 UTC (rev 66930)
+++ Zope3/branches/jim-adapter/src/zope/copypastemove/__init__.py	2006-04-13 13:07:39 UTC (rev 66931)
@@ -28,18 +28,18 @@
 from zope.annotation.interfaces import IAnnotations
 from zope.lifecycleevent import ObjectCopiedEvent
 
+from zope.copypastemove.interfaces import IObjectMover
+from zope.copypastemove.interfaces import IObjectCopier
+from zope.copypastemove.interfaces import IContainerItemRenamer
+from zope.copypastemove.interfaces import IPrincipalClipboard
+from zope.copypastemove.interfaces import IItemNotFoundError
+
 from zope.app.container.sample import SampleContainer
 from zope.app.container.interfaces import IContainer, IOrderedContainer
 from zope.app.container.interfaces import IContained
 from zope.app.container.interfaces import INameChooser
 from zope.app.container.constraints import checkObject
 
-from zope.app.copypastemove.interfaces import IObjectMover
-from zope.app.copypastemove.interfaces import IObjectCopier
-from zope.app.copypastemove.interfaces import IContainerItemRenamer
-from zope.app.copypastemove.interfaces import IPrincipalClipboard
-from zope.app.copypastemove.interfaces import IItemNotFoundError
-
 import warnings # BBB (remove in 3.3)
 
 class ItemNotFoundError(LookupError):

Modified: Zope3/branches/jim-adapter/src/zope/copypastemove/tests/test_clipboard.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/copypastemove/tests/test_clipboard.py	2006-04-13 13:06:12 UTC (rev 66930)
+++ Zope3/branches/jim-adapter/src/zope/copypastemove/tests/test_clipboard.py	2006-04-13 13:07:39 UTC (rev 66931)
@@ -18,14 +18,13 @@
 import unittest
 import zope.component
 from zope.annotation.interfaces import IAnnotations
+from zope.copypastemove.interfaces import IPrincipalClipboard
+from zope.copypastemove import PrincipalClipboard
 
 from zope.app.component.testing import PlacefulSetup
 from zope.app.principalannotation import PrincipalAnnotationUtility
 from zope.app.principalannotation.interfaces import IPrincipalAnnotationUtility
 
-from zope.app.copypastemove.interfaces import IPrincipalClipboard
-from zope.app.copypastemove import PrincipalClipboard
-
 class PrincipalStub(object):
 
     def __init__(self, id):

Modified: Zope3/branches/jim-adapter/src/zope/copypastemove/tests/test_rename.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/copypastemove/tests/test_rename.py	2006-04-13 13:06:12 UTC (rev 66930)
+++ Zope3/branches/jim-adapter/src/zope/copypastemove/tests/test_rename.py	2006-04-13 13:07:39 UTC (rev 66931)
@@ -29,7 +29,7 @@
 
 def test_suite():
     return unittest.TestSuite((
-        DocTestSuite('zope.app.copypastemove',
+        DocTestSuite('zope.copypastemove',
                      setUp=setUp, tearDown=tearDownCA),
         ))