[Zope3-checkins] CVS: Zope3/src/zope/app/event - subs.py:1.25

[Jim Fulton]

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

Modified Files:
	subs.py 
Log Message:
Converted most getAdapter calls to use interface calls instead.


=== Zope3/src/zope/app/event/subs.py 1.24 => 1.25 ===
--- Zope3/src/zope/app/event/subs.py:1.24	Tue Mar  2 13:50:59 2004
+++ Zope3/src/zope/app/event/subs.py	Sat Mar  6 11:50:22 2004
@@ -28,7 +28,7 @@
 from zope.app.event.interfaces import IEvent, ISubscriber, ISubscribable
 from zope.app.event.interfaces import ISubscribingAware
 
-from zope.component import getService, queryService, getAdapter, queryAdapter
+from zope.component import getService, queryService, queryAdapter
 from zope.app.services.servicenames import HubIds
 from zope.app.services.type import PersistentTypeRegistry
 from cPickle import dumps, PicklingError
@@ -82,7 +82,7 @@
 
         # Check that ISubscriber adapter exists for the wrapped object.
         # This will raise an error if there is no such adapter.
-        getAdapter(wrapped_object, ISubscriber)
+        ISubscriber(wrapped_object)
 
         # Optimisation
         if event_type is IEvent: