ident.pyx: Remove traces of bogus `failed' and `eof' callbacks.

[mLib-python] / bres.pyx

diff --git a/bres.pyx b/bres.pyx
index 162ff0268f9cdd3a31f98a77d79d26aaedbd79db..cd2d16c374e062f3b90cff21ec0fac4bb63e1239 100644 (file)
--- a/bres.pyx
+++ b/bres.pyx
@@ -1,29 +1,27 @@
-# -*-pyrex-*-
-#
-# $Id$
-#
-# Background name resolution
-#
-# (c) 2005 Straylight/Edgeware
-#
+### -*-pyrex-*-
+###
+### Background name resolution
+###
+### (c) 2005 Straylight/Edgeware
+###
 
-#----- Licensing notice -----------------------------------------------------
-#
-# This file is part of the Python interface to mLib.
-#
-# mLib/Python is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-# 
-# mLib/Python is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with mLib/Python; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+###----- Licensing notice ---------------------------------------------------
+###
+### This file is part of the Python interface to mLib.
+###
+### mLib/Python is free software; you can redistribute it and/or modify
+### it under the terms of the GNU General Public License as published by
+### the Free Software Foundation; either version 2 of the License, or
+### (at your option) any later version.
+###
+### mLib/Python is distributed in the hope that it will be useful,
+### but WITHOUT ANY WARRANTY; without even the implied warranty of
+### MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+### GNU General Public License for more details.
+###
+### You should have received a copy of the GNU General Public License
+### along with mLib/Python; if not, write to the Free Software Foundation,
+### Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 cdef class SelResolve:
   cdef bres_client r
@@ -32,6 +30,10 @@ cdef class SelResolve:
   cdef _failed
   def __init__(me, *hunoz, **hukairz):
     raise TypeError, 'abstract class'
+  def __dealloc__(me):
+    if me._activep:
+      me._dead()
+      bres_abort(&me.r)
   property activep:
     def __get__(me):
       return _tobool(me._activep)
@@ -66,25 +68,25 @@ cdef class SelResolve:
     return _maybecall(me._failed, ())
 
 cdef class SelResolveByName (SelResolve):
-  def __new__(me, char *name, resolvedproc = None, failedproc = None,
+  def __cinit__(me, char *name, resolvedproc = None, failedproc = None,
               *hunoz, **hukairz):
-    bres_byname(&me.r, name, _resfunc, <void *>me)
     me._resolved = _checkcallable(resolvedproc, 'resolved proc')
     me._failed = _checkcallable(failedproc, 'failed proc')
     me._activep = 1
+    bres_byname(&me.r, name, _resfunc, <void *>me)
   def __init__(me, name, resolvedproc = None, failedproc = None):
     pass
 
 cdef class SelResolveByAddr (SelResolve):
-  def __new__(me, char *addr, resolvedproc = None, failedproc = None,
+  def __cinit__(me, char *addr, resolvedproc = None, failedproc = None,
               *hunoz, **hukairz):
     cdef in_addr ia
     if not inet_aton(addr, &ia):
       raise TypeError, 'bad IP address'
-    bres_byaddr(&me.r, ia, _resfunc, <void *>me)
     me._resolved = _checkcallable(resolvedproc, 'resolved proc')
     me._failed = _checkcallable(failedproc, 'failed proc')
     me._activep = 1
+    bres_byaddr(&me.r, ia, _resfunc, <void *>me)
   def __init__(me, addr, resolvedproc = None, failedproc = None):
     pass
 
@@ -94,7 +96,7 @@ cdef void _resfunc(hostent *h, void *arg):
   r = <SelResolve>arg
   r._dead()
   if h is NULL:
-    r.failed(r)
+    r.failed()
   else:
     alias = []
     addr = []
@@ -111,4 +113,4 @@ cdef void _resfunc(hostent *h, void *arg):
 bres_exec(NULL)
 bres_init(&_sel)
 
-#----- That's all, folks ----------------------------------------------------
+###----- That's all, folks --------------------------------------------------