Update for Python 2.7. This is release 1.0.3.

[mLib-python] / conn.pyx

diff --git a/conn.pyx b/conn.pyx
index 0bb0ee7673cb6db6b15de9824f986143f3384390..7313303156df1021f63ae605614028a3c79defb0 100644 (file)
--- a/conn.pyx
+++ b/conn.pyx
@@ -15,12 +15,12 @@
 # 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.
@@ -31,7 +31,7 @@ cdef class SelConnect:
   cdef readonly object socket
   cdef _connected
   cdef _error
-  def __new__(me, sk, connectedproc = None, errorproc = None,
+  def __cinit__(me, sk, connectedproc = None, errorproc = None,
               *hunoz, **hukairz):
     conn_fd(&me.c, &_sel, sk.fileno(), _connfunc, <void *>me)
     me._activep = 1
@@ -74,7 +74,7 @@ cdef class SelConnect:
   def error(me, errno, strerror):
     return _maybecall(me._error, ())
 
-cdef void _connfunc2(int fd, void *arg):
+cdef void _connfunc(int fd, void *arg):
   cdef SelConnect c
   c = <SelConnect>arg
   c._dead()
@@ -83,9 +83,5 @@ cdef void _connfunc2(int fd, void *arg):
     c.error(errno, strerror(errno))
   else:
     c.connected()
-cdef void _connfunc(int fd, void *arg):
-  PyEval_AcquireLock()
-  _connfunc2(fd, arg)
-  PyEval_ReleaseLock()
 
 #----- That's all, folks ----------------------------------------------------