[Zope3-checkins] SVN: Zope3/branches/jim-index/src/zope/app/catalog/ Adjusted imports for the flattened interface struture.

[Gintautas Miliauskas]

Log message for revision 25385:
Adjusted imports for the flattened interface struture.



-=-
Modified: Zope3/branches/jim-index/src/zope/app/catalog/catalog.py
===================================================================
--- Zope3/branches/jim-index/src/zope/app/catalog/catalog.py	2004-06-12 10:51:53 UTC (rev 25384)
+++ Zope3/branches/jim-index/src/zope/app/catalog/catalog.py	2004-06-12 12:23:15 UTC (rev 25385)
@@ -31,7 +31,7 @@
 ### import zope.app.hub as Hub
 from zope.app.uniqueid.interfaces import IUniqueIdUtility
 from zope.app.container.sample import SampleContainer
-from zope.app.catalog.interfaces.catalog import ICatalog
+from zope.app.catalog.interfaces import ICatalog
 
 class ResultSet:
     "Lazily accessed set of objects"

Modified: Zope3/branches/jim-index/src/zope/app/catalog/tests.py
===================================================================
--- Zope3/branches/jim-index/src/zope/app/catalog/tests.py	2004-06-12 10:51:53 UTC (rev 25384)
+++ Zope3/branches/jim-index/src/zope/app/catalog/tests.py	2004-06-12 12:23:15 UTC (rev 25385)
@@ -23,7 +23,6 @@
 
 from zope.interface import implements
 from zope.app.index.interfaces.field import IUIFieldCatalogIndex
-from zope.app.catalog.interfaces.index import ICatalogIndex
 from zope.index.interfaces import IInjection, ISimpleQuery
 from zope.app.uniqueid.interfaces import IUniqueIdUtility
 from zope.app.site.interfaces import ISite