X-Git-Url: https://git.distorted.org.uk/~mdw/mLib-python/blobdiff_plain/b3c87d862e8f44754113ee9bf374e9fcfbc9e7ac..8546fc9dc62bd41d654b875f7d594cd06fa5dcfb:/sel-file.pyx

diff --git a/sel-file.pyx b/sel-file.pyx
index aba288f..53af55e 100644
--- a/sel-file.pyx
+++ b/sel-file.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.
@@ -43,7 +43,7 @@ cdef class SelFile:
     sel_initfile(&_sel, &me.f, _getfd(fd), mode, _filefunc, <void *>me)
     me._activep = 0
     me.mode = mode
-    me._ready = _checkcallable(readyproc, 'ready proc')
+    me._readyfunc = _checkcallable(readyproc, 'ready proc')
   def __dealloc__(me):
     if me._activep:
       sel_rmfile(&me.f)
@@ -55,11 +55,11 @@ cdef class SelFile:
       return _tobool(me._activep)
   property readyproc:
     def __get__(me):
-      return me._ready
+      return me._readyfunc
     def __set__(me, proc):
-      me._ready = _checkcallable(proc, 'ready proc')
+      me._readyfunc = _checkcallable(proc, 'ready proc')
     def __del__(me):
-      me._ready = None
+      me._readyfunc = None
   def enable(me):
     if me._activep:
       raise ValueError, 'already enabled'
@@ -86,15 +86,11 @@ cdef class SelFile:
   def disabled(me):
     pass
   def ready(me):
-    return _maybecall(me._ready, ())
+    return _maybecall(me._readyfunc, ())
 
-cdef void _filefunc2(void *arg):
+cdef void _filefunc(int fd, unsigned mode, void *arg):
   cdef SelFile sf
   sf = <SelFile>arg
   sf.ready()
-cdef void _filefunc(int fd, unsigned mode, void *arg):
-  PyEval_AcquireLock()
-  _filefunc2(arg)
-  PyEval_ReleaseLock()
 
 #----- That's all, folks ----------------------------------------------------