[Zope3-checkins] CVS: Zope3/src/zope/app/catalog - catalog.py:1.25 tests.py:1.5

[Stephan Richter]

Update of /cvs-repository/Zope3/src/zope/app/catalog
In directory cvs.zope.org:/tmp/cvs-serv5873/src/zope/app/catalog

Modified Files:
	catalog.py tests.py 
Log Message:
Moved servicenames to zope.app.


=== Zope3/src/zope/app/catalog/catalog.py 1.24 => 1.25 ===
--- Zope3/src/zope/app/catalog/catalog.py:1.24	Sat Mar 13 18:00:47 2004
+++ Zope3/src/zope/app/catalog/catalog.py	Sat Mar 13 18:54:57 2004
@@ -23,7 +23,7 @@
 from zope.index.interfaces import ISimpleQuery
 
 from zope.app.zapi import getService
-from zope.app.services.servicenames import HubIds
+from zope.app.servicenames import HubIds
 from zope.app.event.interfaces import ISubscriber
 from zope.app.annotation.interfaces import IAttributeAnnotatable
 from zope.app.utility.interfaces import ILocalUtility


=== Zope3/src/zope/app/catalog/tests.py 1.4 => 1.5 ===
--- Zope3/src/zope/app/catalog/tests.py:1.4	Thu Mar 11 04:19:23 2004
+++ Zope3/src/zope/app/catalog/tests.py	Sat Mar 13 18:54:57 2004
@@ -30,7 +30,7 @@
 from zope.app.catalog.catalog import Catalog
 from zope.app.tests.placelesssetup import PlacelessSetup
 from zope.component import getServiceManager
-from zope.app.services.servicenames import HubIds
+from zope.app.servicenames import HubIds
 from BTrees.IIBTree import IISet
 
 from zope.app.index.tests.test_objectretrievingprocessor import FakeObjectHub