Release 1.0.5.

[mLib-python] / sig.pyx

diff --git a/sig.pyx b/sig.pyx
index 937f29bd0d16f51129f8409d635e8812ebd3e788..17d52fe5d7156bd77b66a2e33dddad0f2d7c7fb3 100644 (file)
--- a/sig.pyx
+++ b/sig.pyx
@@ -1,29 +1,27 @@
-# -*-pyrex-*-
-#
-# $Id$
-#
-# In-band signals
-#
-# (c) 2005 Straylight/Edgeware
-#
+### -*-pyrex-*-
+###
+### In-band signals
+###
+### (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.
 
 import signal
 
@@ -32,11 +30,11 @@ cdef class SelSignal:
   cdef int _activep
   cdef readonly int signal
   cdef _signalled
-  def __new__(me, int sig, signalledproc = None, *hunoz, **hukairz):
+  def __cinit__(me, int sig, signalledproc = None, *hunoz, **hukairz):
     if sig < 0 or sig >= signal.NSIG:
       raise ValueError, 'signal number out of range'
     me.signal = sig
-    me._signalledproc = _checkcallable(signalledproc, 'signalled proc')
+    me._signalled = _checkcallable(signalledproc, 'signalled proc')
     me._activep = 0
   def __dealloc__(me):
     if me._activep:
@@ -76,15 +74,11 @@ cdef class SelSignal:
   def signalled(me):
     return _maybecall(me._signalled, ())
 
-cdef void _sigfunc2(void *arg):
+cdef void _sigfunc(int sig, void *arg):
   cdef SelSignal s
   s = <SelSignal>arg
   s.signalled()
-cdef void _sigfunc(int sig, void *arg):
-  PyEval_AcquireLock()
-  _sigfunc2(arg)
-  PyEval_ReleaseLock()
 
 sig_init(&_sel)
 
-#----- That's all, folks ----------------------------------------------------
+###----- That's all, folks --------------------------------------------------