[Zope3-checkins] CVS: Zope3/src/zope/app/cache/tests - test_annotationcacheable.py:1.15 test_cachename.py:1.12 test_caching.py:1.16

[Stephan Richter]

Update of /cvs-repository/Zope3/src/zope/app/cache/tests
In directory cvs.zope.org:/tmp/cvs-serv24548/src/zope/app/cache/tests

Modified Files:
	test_annotationcacheable.py test_cachename.py test_caching.py 
Log Message:


Created annotation package in zope.app.



Moved annotation interfaces to zope.app.annotation.interfaces.



Moved attributeannotations to zope.app.annotation.attribute.


=== Zope3/src/zope/app/cache/tests/test_annotationcacheable.py 1.14 => 1.15 ===
--- Zope3/src/zope/app/cache/tests/test_annotationcacheable.py:1.14	Wed Mar 10 14:41:02 2004
+++ Zope3/src/zope/app/cache/tests/test_annotationcacheable.py	Sat Mar 13 18:00:46 2004
@@ -20,8 +20,8 @@
 
 from zope.app.tests import ztapi
 from zope.app.tests.placelesssetup import PlacelessSetup
-from zope.app.interfaces.annotation import IAnnotations, IAttributeAnnotatable
-from zope.app.attributeannotations import AttributeAnnotations
+from zope.app.annotation.interfaces import IAnnotations, IAttributeAnnotatable
+from zope.app.annotation.attribute import AttributeAnnotations
 from zope.app.cache.annotationcacheable import AnnotationCacheable
 from zope.app.cache.interfaces import ICache
 


=== Zope3/src/zope/app/cache/tests/test_cachename.py 1.11 => 1.12 ===
--- Zope3/src/zope/app/cache/tests/test_cachename.py:1.11	Sat Mar 13 10:21:11 2004
+++ Zope3/src/zope/app/cache/tests/test_cachename.py	Sat Mar 13 18:00:46 2004
@@ -23,7 +23,7 @@
 from zope.app.tests import setup
 from zope.app.cache.interfaces import CacheName, ICache
 from zope.app.site.tests.placefulsetup import PlacefulSetup
-from zope.app.interfaces.annotation import IAttributeAnnotatable
+from zope.app.annotation.interfaces import IAttributeAnnotatable
 from zope.app.utility import LocalUtilityService
 
 class CacheStub(object):


=== Zope3/src/zope/app/cache/tests/test_caching.py 1.15 => 1.16 ===
--- Zope3/src/zope/app/cache/tests/test_caching.py:1.15	Wed Mar 10 14:41:02 2004
+++ Zope3/src/zope/app/cache/tests/test_caching.py	Sat Mar 13 18:00:46 2004
@@ -20,9 +20,9 @@
 
 from zope.app.tests import ztapi, setup
 from zope.app.tests.placelesssetup import PlacelessSetup
-from zope.app.interfaces.annotation import IAnnotatable, IAnnotations
-from zope.app.interfaces.annotation import IAttributeAnnotatable
-from zope.app.attributeannotations import AttributeAnnotations
+from zope.app.annotation.interfaces import IAnnotatable, IAnnotations
+from zope.app.annotation.interfaces import IAttributeAnnotatable
+from zope.app.annotation.attribute import AttributeAnnotations
 from zope.app.cache.interfaces import ICacheable, ICache
 from zope.app.cache.caching import getCacheForObject
 from zope.app.cache.annotationcacheable import AnnotationCacheable