[Zope3-checkins] CVS: Zope3/lib/python/Zope/App/Caching/tests - testAnnotationCacheable.py:1.2.2.1 testCaching.py:1.1.2.1
Jim Fulton
jim@zope.com
Fri, 4 Oct 2002 13:30:34 -0400
Update of /cvs-repository/Zope3/lib/python/Zope/App/Caching/tests
In directory cvs.zope.org:/tmp/cvs-serv10951/lib/python/Zope/App/Caching/tests
Modified Files:
Tag: ZopeDublinCore-branch
testAnnotationCacheable.py testCaching.py
Log Message:
Commiting branch prior to merge
=== Zope3/lib/python/Zope/App/Caching/tests/testAnnotationCacheable.py 1.2 => 1.2.2.1 ===
--- Zope3/lib/python/Zope/App/Caching/tests/testAnnotationCacheable.py:1.2 Thu Oct 3 06:37:50 2002
+++ Zope3/lib/python/Zope/App/Caching/tests/testAnnotationCacheable.py Fri Oct 4 13:30:03 2002
@@ -17,7 +17,7 @@
"""
from unittest import TestCase, TestSuite, main, makeSuite
-from Zope.ComponentArchitecture.tests.PlacelessSetup import PlacelessSetup
+from Zope.App.tests.PlacelessSetup import PlacelessSetup
from Zope.ComponentArchitecture import getService
from Zope.App.OFS.Annotation.IAnnotations import IAnnotations
from Zope.App.OFS.Annotation.IAttributeAnnotatable import IAttributeAnnotatable
=== Zope3/lib/python/Zope/App/Caching/tests/testCaching.py 1.1 => 1.1.2.1 ===
--- Zope3/lib/python/Zope/App/Caching/tests/testCaching.py:1.1 Thu Oct 3 06:37:50 2002
+++ Zope3/lib/python/Zope/App/Caching/tests/testCaching.py Fri Oct 4 13:30:03 2002
@@ -27,7 +27,7 @@
from Zope.App.OFS.Annotation.AttributeAnnotations import AttributeAnnotations
from Zope.ComponentArchitecture import getAdapter
from Zope.ComponentArchitecture import getService
-from Zope.ComponentArchitecture.tests.PlacelessSetup import PlacelessSetup
+from Zope.App.tests.PlacelessSetup import PlacelessSetup
from Zope.ComponentArchitecture.GlobalServiceManager import \
serviceManager as sm