[Zope3-checkins] CVS: Zope3/src/zope/app/dublincore - creatorannotator.py:1.8 timeannotators.py:1.8

[Jim Fulton]

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

Modified Files:
	creatorannotator.py timeannotators.py 
Log Message:
Changed most calls to queryAdapter to use interface calls instead.


=== Zope3/src/zope/app/dublincore/creatorannotator.py 1.7 => 1.8 ===
--- Zope3/src/zope/app/dublincore/creatorannotator.py:1.7	Tue Mar  2 13:50:58 2004
+++ Zope3/src/zope/app/dublincore/creatorannotator.py	Sat Mar  6 12:48:48 2004
@@ -17,7 +17,6 @@
 """
 __metaclass__ = type
 
-from zope.component import queryAdapter
 from zope.app.dublincore.interfaces import IZopeDublinCore
 from zope.app.event.interfaces import ISubscriber
 from zope.security.management import getSecurityManager
@@ -29,7 +28,7 @@
     implements(ISubscriber)
 
     def notify(self, event):
-        dc = queryAdapter(event.object, IZopeDublinCore)
+        dc = IZopeDublinCore(event.object, None)
         if dc is None:
             return
 


=== Zope3/src/zope/app/dublincore/timeannotators.py 1.7 => 1.8 ===
--- Zope3/src/zope/app/dublincore/timeannotators.py:1.7	Tue Mar  2 13:50:58 2004
+++ Zope3/src/zope/app/dublincore/timeannotators.py	Sat Mar  6 12:48:48 2004
@@ -18,7 +18,6 @@
 __metaclass__ = type
 
 from datetime import datetime
-from zope.component import queryAdapter
 from zope.app.dublincore.interfaces import IZopeDublinCore
 from zope.app.event.interfaces import ISubscriber
 from zope.interface import implements
@@ -29,7 +28,7 @@
     implements(ISubscriber)
 
     def notify(self, event):
-        dc = queryAdapter(event.object, IZopeDublinCore)
+        dc = IZopeDublinCore(event.object, None)
         if dc is not None:
             self.annotate(dc)