[Zope3-checkins] CVS: Zope3/src/zope/app/services - configuration.py:1.3 event.py:1.4 zpt.py:1.3

[Steve Alexander]

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

Modified Files:
	configuration.py event.py zpt.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/services/configuration.py 1.2 => 1.3 ===
--- Zope3/src/zope/app/services/configuration.py:1.2	Wed Dec 25 09:13:19 2002
+++ Zope3/src/zope/app/services/configuration.py	Sat Dec 28 12:49:31 2002
@@ -18,11 +18,11 @@
 __metaclass__ = type
 
 from persistence import Persistent
-from zope.app.interfaces.services.configuration import IConfigurationRegistry, IConfiguration
-from zope.app.interfaces.services.configuration import INamedConfiguration
-from zope.app.interfaces.services.configuration import INamedComponentConfiguration
-from zope.app.interfaces.services.configuration import INameConfigurable
-from zope.app.interfaces.services.configuration import INameComponentConfigurable
+from zope.app.interfaces.services.configuration import IConfigurationRegistry
+from zope.app.interfaces.services.configuration \
+    import INamedComponentConfiguration, INameConfigurable
+from zope.app.interfaces.services.configuration \
+    import INameComponentConfigurable, INamedConfiguration, IConfiguration
 from zope.component import getService, queryService
 from zope.component import getServiceManager
 from zope.component import getAdapter


=== Zope3/src/zope/app/services/event.py 1.3 => 1.4 ===
--- Zope3/src/zope/app/services/event.py:1.3	Sat Dec 28 09:13:27 2002
+++ Zope3/src/zope/app/services/event.py	Sat Dec 28 12:49:31 2002
@@ -18,28 +18,20 @@
 
 from persistence import Persistent
 
-from zope.app.component.nextservice import getNextService
+from zope.app.component.nextservice import getNextService, queryNextService
 from zope.app.event.globaleventservice import eventService
 from zope.app.interfaces.services.event import IPathSubscriber
 from zope.app.interfaces.traversing import ITraverser
-from zope.app.traversing import getPhysicalPathString
-from zope.component import getAdapter
-from zope.component import getService
+from zope.app.traversing import getPhysicalPathString, traverse
+from zope.component import getAdapter, getService
 from zope.event.subscribable import Subscribable
 from zope.exceptions import NotFoundError
-from zope.interface import Attribute
-from zope.interfaces.event import IEvent
-from zope.interfaces.event import IEventChannel
-from zope.interfaces.event import IEventService
+from zope.interfaces.event import IEvent, IEventChannel, IEventService
 from zope.interfaces.event import ISubscriptionAware
-from zope.proxy.context import ContextWrapper
-from zope.proxy.context import isWrapper
-from zope.proxy.context import ContextMethod
+from zope.proxy.context import ContextWrapper, ContextMethod, isWrapper
 from zope.proxy.introspection import removeAllProxies
 
-from zope.app.component.nextservice import getNextService, queryNextService
 from zope.app.interfaces.services.service import IBindingAware
-from zope.app.traversing import getPhysicalPathString, traverse
 
 
 class LocalSubscribable(Persistent, Subscribable):


=== Zope3/src/zope/app/services/zpt.py 1.2 => 1.3 ===
--- Zope3/src/zope/app/services/zpt.py:1.2	Wed Dec 25 09:13:19 2002
+++ Zope3/src/zope/app/services/zpt.py	Sat Dec 28 12:49:31 2002
@@ -63,7 +63,7 @@
 
 # Adapter for ISearchableText
 
-from zope.app.interfaces.index.text.interfaces import ISearchableText
+from zope.app.interfaces.index.text import ISearchableText
 
 tag = re.compile(r"<[^>]+>")
 class SearchableText: