[Zope-Checkins] CVS: Zope/lib/python/ZServer/medusa - resolver.py:1.12.8.1

[Chris McDonough]

Update of /cvs-repository/Zope/lib/python/ZServer/medusa
In directory cvs.zope.org:/tmp/cvs-serv17213/lib/python/ZServer/medusa

Modified Files:
      Tag: Zope-2_7-branch
	resolver.py 
Log Message:
Merge changes from HEAD since the release of Zope 2.7a1 into the Zope-2_7-branch in preparation for release of Zope 2.7b1.


=== Zope/lib/python/ZServer/medusa/resolver.py 1.12 => 1.12.8.1 ===
--- Zope/lib/python/ZServer/medusa/resolver.py:1.12	Tue Mar 18 16:15:17 2003
+++ Zope/lib/python/ZServer/medusa/resolver.py	Mon Jul 21 12:37:34 2003
@@ -303,15 +303,14 @@
         self.hook, self.callback = hook, callback
         
     def __call__ (self, *args):
-        apply (self.hook, args)
-        apply (self.callback, args)
+        self.hook(*args)
+        self.callback(*args)
         
 class caching_resolver (resolver):
     "Cache DNS queries.  Will need to honor the TTL value in the replies"
     
-    def __init__ (*args):
-        apply (resolver.__init__, args)
-        self = args[0]
+    def __init__(self, *args):
+        resolver.__init__(self, *args)
         self.cache = {}
         self.forward_requests = counter()
         self.reverse_requests = counter()