[Checkins] SVN: zope.copypastemove/trunk/ Use zope.principalannotation in favor of its app variant.

[Hanno Schlichting]

Log message for revision 106679:
  Use zope.principalannotation in favor of its app variant.
  

Changed:
  U   zope.copypastemove/trunk/CHANGES.txt
  U   zope.copypastemove/trunk/setup.py
  U   zope.copypastemove/trunk/src/zope/copypastemove/tests/test_clipboard.py

-=-
Modified: zope.copypastemove/trunk/CHANGES.txt
===================================================================
--- zope.copypastemove/trunk/CHANGES.txt	2009-12-16 23:22:04 UTC (rev 106678)
+++ zope.copypastemove/trunk/CHANGES.txt	2009-12-16 23:25:52 UTC (rev 106679)
@@ -5,6 +5,8 @@
 3.6.0 (unreleased)
 ------------------
 
+- Use zope.principalannotation in favor of its app variant.
+
 - Avoid zope.app.component and testing dependencies.
 
 3.5.2 (2009-08-15)

Modified: zope.copypastemove/trunk/setup.py
===================================================================
--- zope.copypastemove/trunk/setup.py	2009-12-16 23:22:04 UTC (rev 106678)
+++ zope.copypastemove/trunk/setup.py	2009-12-16 23:25:52 UTC (rev 106679)
@@ -45,7 +45,7 @@
       namespace_packages=['zope',],
       extras_require=dict(
           test=['zope.testing',
-                'zope.app.principalannotation']),
+                'zope.principalannotation']),
       install_requires=['setuptools',
                         'zope.annotation',
                         'zope.component',

Modified: zope.copypastemove/trunk/src/zope/copypastemove/tests/test_clipboard.py
===================================================================
--- zope.copypastemove/trunk/src/zope/copypastemove/tests/test_clipboard.py	2009-12-16 23:22:04 UTC (rev 106678)
+++ zope.copypastemove/trunk/src/zope/copypastemove/tests/test_clipboard.py	2009-12-16 23:25:52 UTC (rev 106679)
@@ -16,14 +16,16 @@
 $Id$
 """
 import unittest
+
 import zope.component
 from zope.annotation.interfaces import IAnnotations
+from zope.component.testing import PlacelessSetup
+from zope.principalannotation.utility import PrincipalAnnotationUtility
+from zope.principalannotation.interfaces import IPrincipalAnnotationUtility
+
+from zope.copypastemove import PrincipalClipboard
 from zope.copypastemove.interfaces import IPrincipalClipboard
-from zope.copypastemove import PrincipalClipboard
 
-from zope.component.testing import PlacelessSetup
-from zope.app.principalannotation import PrincipalAnnotationUtility
-from zope.app.principalannotation.interfaces import IPrincipalAnnotationUtility
 
 class PrincipalStub(object):