[Zope3-checkins] SVN: Zope3/branches/jim-adapter/ Move zope.app.copypastemove to zope.copypastemove, update zpkg metadata and convert all in-tree users. (Note, this temporarily will break the tests because I cannot make all changes in one commit)

Thu Apr 13 09:06:14 EDT 2006

Log message for revision 66930:
  Move zope.app.copypastemove to zope.copypastemove, update zpkg metadata and convert all in-tree users. (Note, this temporarily will break the tests because I cannot make all changes in one commit)

Changed:
  U   Zope3/branches/jim-adapter/releases/Zope/DEPENDENCIES.cfg
  U   Zope3/branches/jim-adapter/src/zope/app/PACKAGE.cfg
  U   Zope3/branches/jim-adapter/src/zope/app/authentication/browser/ftests.py
  U   Zope3/branches/jim-adapter/src/zope/app/configure.zcml
  U   Zope3/branches/jim-adapter/src/zope/app/container/browser/contents.py
  U   Zope3/branches/jim-adapter/src/zope/app/container/browser/ftests/test_contents.py
  U   Zope3/branches/jim-adapter/src/zope/app/container/browser/tests/test_contents.py
  U   Zope3/branches/jim-adapter/src/zope/app/container/tests/test_objectcopier.py
  U   Zope3/branches/jim-adapter/src/zope/app/container/tests/test_objectmover.py
  D   Zope3/branches/jim-adapter/src/zope/app/copypastemove/
  U   Zope3/branches/jim-adapter/src/zope/app/ftp/__init__.py
  U   Zope3/branches/jim-adapter/src/zope/app/ftp/tests/test_ftpview.py
  U   Zope3/branches/jim-adapter/src/zope/app/twisted/ftp/ftp.py
  U   Zope3/branches/jim-adapter/src/zope/app/twisted/ftp/tests/demofs.py
  U   Zope3/branches/jim-adapter/src/zope/app/zopeappgenerations/evolve3.py
  A   Zope3/branches/jim-adapter/src/zope/copypastemove/

-=-
Modified: Zope3/branches/jim-adapter/releases/Zope/DEPENDENCIES.cfg
===================================================================

--- Zope3/branches/jim-adapter/releases/Zope/DEPENDENCIES.cfg	2006-04-13 12:20:17 UTC (rev 66929)
+++ Zope3/branches/jim-adapter/releases/Zope/DEPENDENCIES.cfg	2006-04-13 13:06:12 UTC (rev 66930)
@@ -5,6 +5,7 @@
 # things once we're confident the core is working.
 
 zope.contentprovider
+zope.copypastemove
 zope.formlib
 zope.rdb
 zope.sendmail

Modified: Zope3/branches/jim-adapter/src/zope/app/PACKAGE.cfg
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/PACKAGE.cfg	2006-04-13 12:20:17 UTC (rev 66929)
+++ Zope3/branches/jim-adapter/src/zope/app/PACKAGE.cfg	2006-04-13 13:06:12 UTC (rev 66930)
@@ -40,7 +40,6 @@
 # We should include contenttypes via the dependency mechanism.
 contenttypes
 content_types.py
-copypastemove
 debug
 dependable
 error

Modified: Zope3/branches/jim-adapter/src/zope/app/authentication/browser/ftests.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/authentication/browser/ftests.py	2006-04-13 12:20:17 UTC (rev 66929)
+++ Zope3/branches/jim-adapter/src/zope/app/authentication/browser/ftests.py	2006-04-13 13:06:12 UTC (rev 66930)
@@ -18,10 +18,10 @@
 import unittest
 import transaction
 
+from zope import copypastemove
 from zope.interface import implements, Interface, directlyProvides
 from zope.exceptions.interfaces import UserError
 
-from zope.app import copypastemove
 from zope.app.testing import ztapi
 from zope.app.testing import functional
 from zope.app.authentication.principalfolder import PrincipalFolder

Modified: Zope3/branches/jim-adapter/src/zope/app/configure.zcml
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/configure.zcml	2006-04-13 12:20:17 UTC (rev 66929)
+++ Zope3/branches/jim-adapter/src/zope/app/configure.zcml	2006-04-13 13:06:12 UTC (rev 66930)
@@ -24,7 +24,7 @@
 
   <include file="menus.zcml" />
 
-  <include package="zope.app.copypastemove" />
+  <include package="zope.copypastemove" />
   <include package="zope.size" />
   <include package="zope.location" />
   <include package="zope.app.container" />

Modified: Zope3/branches/jim-adapter/src/zope/app/container/browser/contents.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/container/browser/contents.py	2006-04-13 12:20:17 UTC (rev 66929)
+++ Zope3/branches/jim-adapter/src/zope/app/container/browser/contents.py	2006-04-13 13:06:12 UTC (rev 66930)
@@ -27,13 +27,13 @@
 from zope.publisher.browser import BrowserView
 from zope.dublincore.interfaces import IZopeDublinCore
 from zope.dublincore.interfaces import IDCDescriptiveProperties
+from zope.copypastemove.interfaces import IPrincipalClipboard
+from zope.copypastemove.interfaces import IObjectCopier, IObjectMover
+from zope.copypastemove.interfaces import IContainerItemRenamer
 
 from zope.app import zapi
 from zope.app.pagetemplate.viewpagetemplatefile import ViewPageTemplateFile
 from zope.app.i18n import ZopeMessageFactory as _
-from zope.app.copypastemove.interfaces import IPrincipalClipboard
-from zope.app.copypastemove.interfaces import IObjectCopier, IObjectMover
-from zope.app.copypastemove.interfaces import IContainerItemRenamer
 from zope.app.principalannotation.interfaces import IPrincipalAnnotationUtility
 
 from zope.app.container.browser.adding import Adding

Modified: Zope3/branches/jim-adapter/src/zope/app/container/browser/ftests/test_contents.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/container/browser/ftests/test_contents.py	2006-04-13 12:20:17 UTC (rev 66929)
+++ Zope3/branches/jim-adapter/src/zope/app/container/browser/ftests/test_contents.py	2006-04-13 13:06:12 UTC (rev 66930)
@@ -20,11 +20,11 @@
 
 from persistent import Persistent
 import transaction
+from zope import copypastemove
 from zope.interface import implements, Interface
 from zope.annotation.interfaces import IAttributeAnnotatable
 from zope.dublincore.interfaces import IZopeDublinCore
 
-from zope.app import copypastemove
 from zope.app.container.interfaces import IReadContainer, IContained
 from zope.app.testing import ztapi
 from zope.app.testing.functional import BrowserTestCase

Modified: Zope3/branches/jim-adapter/src/zope/app/container/browser/tests/test_contents.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/container/browser/tests/test_contents.py	2006-04-13 12:20:17 UTC (rev 66929)
+++ Zope3/branches/jim-adapter/src/zope/app/container/browser/tests/test_contents.py	2006-04-13 13:06:12 UTC (rev 66930)
@@ -21,15 +21,15 @@
 from zope.security import checker
 from zope.traversing.api import traverse
 from zope.annotation.interfaces import IAnnotations
+from zope.copypastemove import ContainerItemRenamer
+from zope.copypastemove import ObjectMover, ObjectCopier
+from zope.copypastemove import PrincipalClipboard
+from zope.copypastemove.interfaces import IContainerItemRenamer
+from zope.copypastemove.interfaces import IObjectMover, IObjectCopier
+from zope.copypastemove.interfaces import IPrincipalClipboard
 
 from zope.app.component.testing import PlacefulSetup
 from zope.app.container.contained import contained
-from zope.app.copypastemove import ContainerItemRenamer
-from zope.app.copypastemove import ObjectMover, ObjectCopier
-from zope.app.copypastemove import PrincipalClipboard
-from zope.app.copypastemove.interfaces import IContainerItemRenamer
-from zope.app.copypastemove.interfaces import IObjectMover, IObjectCopier
-from zope.app.copypastemove.interfaces import IPrincipalClipboard
 from zope.app.principalannotation import PrincipalAnnotationUtility
 from zope.app.principalannotation.interfaces import IPrincipalAnnotationUtility
 from zope.app.testing import ztapi

Modified: Zope3/branches/jim-adapter/src/zope/app/container/tests/test_objectcopier.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/container/tests/test_objectcopier.py	2006-04-13 12:20:17 UTC (rev 66929)
+++ Zope3/branches/jim-adapter/src/zope/app/container/tests/test_objectcopier.py	2006-04-13 13:06:12 UTC (rev 66930)
@@ -21,10 +21,10 @@
 from zope.testing import doctest
 from zope.traversing.api import traverse
 from zope.component.testing import getEvents, clearEvents
+from zope.copypastemove import ObjectCopier
+from zope.copypastemove.interfaces import IObjectCopier
 
 from zope.app.component.testing import PlacefulSetup
-from zope.app.copypastemove import ObjectCopier
-from zope.app.copypastemove.interfaces import IObjectCopier
 from zope.app.testing import setup
 from zope.app.folder import Folder
 

Modified: Zope3/branches/jim-adapter/src/zope/app/container/tests/test_objectmover.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/container/tests/test_objectmover.py	2006-04-13 12:20:17 UTC (rev 66929)
+++ Zope3/branches/jim-adapter/src/zope/app/container/tests/test_objectmover.py	2006-04-13 13:06:12 UTC (rev 66930)
@@ -21,10 +21,10 @@
 from zope.testing import doctest
 from zope.traversing.api import traverse
 from zope.component.testing import getEvents, clearEvents
+from zope.copypastemove import ObjectMover
+from zope.copypastemove.interfaces import IObjectMover
 
 from zope.app.component.testing import PlacefulSetup
-from zope.app.copypastemove import ObjectMover
-from zope.app.copypastemove.interfaces import IObjectMover
 from zope.app.testing import setup
 from zope.app.folder import Folder
 

Modified: Zope3/branches/jim-adapter/src/zope/app/ftp/__init__.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/ftp/__init__.py	2006-04-13 12:20:17 UTC (rev 66929)
+++ Zope3/branches/jim-adapter/src/zope/app/ftp/__init__.py	2006-04-13 13:06:12 UTC (rev 66930)
@@ -31,8 +31,8 @@
 from zope.filerepresentation.interfaces import IWriteDirectory
 from zope.filerepresentation.interfaces import IFileFactory
 from zope.filerepresentation.interfaces import IDirectoryFactory
+from zope.copypastemove.interfaces import IContainerItemRenamer
 
-from zope.app.copypastemove.interfaces import IContainerItemRenamer
 from zope.app.container.interfaces import IContainer
 
 class FTPView(object):

Modified: Zope3/branches/jim-adapter/src/zope/app/ftp/tests/test_ftpview.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/ftp/tests/test_ftpview.py	2006-04-13 12:20:17 UTC (rev 66929)
+++ Zope3/branches/jim-adapter/src/zope/app/ftp/tests/test_ftpview.py	2006-04-13 13:06:12 UTC (rev 66930)
@@ -27,13 +27,13 @@
 from zope.filerepresentation.interfaces import IWriteDirectory
 from zope.filerepresentation.interfaces import IFileFactory
 from zope.filerepresentation.interfaces import IDirectoryFactory
+from zope.copypastemove.interfaces import IObjectMover
+from zope.copypastemove.interfaces import IContainerItemRenamer
+from zope.copypastemove import ContainerItemRenamer
 
 from zope.app.testing import ztapi
 from zope.app.ftp import FTPView
 from zope.app.testing.placelesssetup import PlacelessSetup
-from zope.app.copypastemove.interfaces import IObjectMover
-from zope.app.copypastemove.interfaces import IContainerItemRenamer
-from zope.app.copypastemove import ContainerItemRenamer
 from zope.app.container.contained import setitem, Contained
 from zope.app.container.interfaces import IContainer
 

Modified: Zope3/branches/jim-adapter/src/zope/app/twisted/ftp/ftp.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/twisted/ftp/ftp.py	2006-04-13 12:20:17 UTC (rev 66929)
+++ Zope3/branches/jim-adapter/src/zope/app/twisted/ftp/ftp.py	2006-04-13 13:06:12 UTC (rev 66930)
@@ -20,11 +20,10 @@
 from types import StringTypes
 
 from zope.interface import implements
-
 from zope.publisher.interfaces import NotFound
 from zope.security.interfaces import Unauthorized
 from zope.exceptions import DuplicationError
-from zope.app.copypastemove import ItemNotFoundError
+from zope.copypastemove import ItemNotFoundError
 
 from twisted.internet import threads, defer
 from twisted.protocols import ftp

Modified: Zope3/branches/jim-adapter/src/zope/app/twisted/ftp/tests/demofs.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/twisted/ftp/tests/demofs.py	2006-04-13 12:20:17 UTC (rev 66929)
+++ Zope3/branches/jim-adapter/src/zope/app/twisted/ftp/tests/demofs.py	2006-04-13 13:06:12 UTC (rev 66930)
@@ -14,14 +14,14 @@
 $Id: demofs.py 27459 2004-09-07 01:45:52Z shane $
 """
 import posixpath
+
+from zope.interface import implements
 from zope.security.interfaces import Unauthorized
 from zope.publisher.interfaces import NotFound
-
 from zope.exceptions import DuplicationError
-from zope.app.copypastemove import ItemNotFoundError
+from zope.copypastemove import ItemNotFoundError
 
 from zope.app.twisted.interfaces import IFileSystem
-from zope.interface import implements
 
 execute = 1
 read = 2

Modified: Zope3/branches/jim-adapter/src/zope/app/zopeappgenerations/evolve3.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/zopeappgenerations/evolve3.py	2006-04-13 12:20:17 UTC (rev 66929)
+++ Zope3/branches/jim-adapter/src/zope/app/zopeappgenerations/evolve3.py	2006-04-13 13:06:12 UTC (rev 66930)
@@ -29,7 +29,7 @@
 from zope.app.component import registration
 import zope.app.authentication.interfaces
 from zope.app.authentication import groupfolder
-from zope.app.copypastemove.interfaces import IObjectMover
+from zope.copypastemove.interfaces import IObjectMover
 
 generation = 3
 

Copied: Zope3/branches/jim-adapter/src/zope/copypastemove (from rev 66929, Zope3/branches/jim-adapter/src/zope/app/copypastemove)

