[Zope3-checkins] CVS: Zope3/src/zope/app/content/tests - test_dtmlpage.py:1.4 test_zptpage.py:1.5

[Steve Alexander]

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

Modified Files:
	test_dtmlpage.py test_zptpage.py 
Log Message:
Compressed various independent modules in zope.app.traversing into 
far fewer modules.
Also, changed the place where the textindex lives to one level higher.


=== Zope3/src/zope/app/content/tests/test_dtmlpage.py 1.3 => 1.4 ===
--- Zope3/src/zope/app/content/tests/test_dtmlpage.py:1.3	Sat Dec 28 09:13:24 2002
+++ Zope3/src/zope/app/content/tests/test_dtmlpage.py	Sat Dec 28 12:49:25 2002
@@ -23,9 +23,8 @@
 
 # Wow, this is a lot of work. :(
 from zope.app.tests.placelesssetup import PlacelessSetup
-from zope.app.traversing.traverser import Traverser
+from zope.app.traversing.adapters import Traverser, DefaultTraversable
 from zope.app.interfaces.traversing import ITraverser, ITraversable
-from zope.app.traversing.defaulttraversable import DefaultTraversable
 from zope.component.adapter import provideAdapter
 from zope.proxy.context import Wrapper
 from zope.security.checker import NamesChecker, defineChecker


=== Zope3/src/zope/app/content/tests/test_zptpage.py 1.4 => 1.5 ===
--- Zope3/src/zope/app/content/tests/test_zptpage.py:1.4	Sat Dec 28 09:13:24 2002
+++ Zope3/src/zope/app/content/tests/test_zptpage.py	Sat Dec 28 12:49:25 2002
@@ -23,14 +23,13 @@
 
 from zope.app.content.zpt import ZPTPage, SearchableText
 from zope.app.interfaces.content.zpt import IZPTPage
-from zope.app.interfaces.index.text.interfaces import ISearchableText
+from zope.app.interfaces.index.text import ISearchableText
 from zope.component import getAdapter
 
 # Wow, this is a lot of work. :(
 from zope.app.tests.placelesssetup import PlacelessSetup
-from zope.app.traversing.traverser import Traverser
+from zope.app.traversing.adapters import Traverser, DefaultTraversable
 from zope.app.interfaces.traversing import ITraverser
-from zope.app.traversing.defaulttraversable import DefaultTraversable
 from zope.app.interfaces.traversing import ITraversable
 from zope.component.adapter import provideAdapter
 from zope.proxy.context import Wrapper