Release 1.0.5.

[mLib-python] / fwatch.pyx

diff --git a/fwatch.pyx b/fwatch.pyx
index a9e4b97eaedf4b614cad7e7b0c50f381a642afb2..2e484cd5159f656846aa3588ccb55a0277b40cdb 100644 (file)
--- a/fwatch.pyx
+++ b/fwatch.pyx
@@ -1,37 +1,35 @@
-# -*-pyrex-*-
-#
-# $Id$
-#
-# Watching files for changes
-#
-# (c) 2007 Straylight/Edgeware
-#
+### -*-pyrex-*-
+###
+### Watching files for changes
+###
+### (c) 2007 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 FWatch:
   cdef fwatch fw
-  cdef file
-  def __new__(me, file):
-    _init(me, file)
+  cdef public file
+  def __cinit__(me, file):
+    me._init(file)
   def __init__(me, file):
-    _init(me, file)
+    me._init(file)
   cdef _init(me, file):
     if isinstance(file, str):
       fwatch_init(&me.fw, file)
@@ -39,9 +37,11 @@ cdef class FWatch:
       fwatch_initfd(&me.fw, _getfd(file))
     me.file = file
   def update(me):
+    cdef int rc
     if isinstance(me.file, str):
-      fwatch_update(&me.fw, me.file)
+      rc = fwatch_update(&me.fw, me.file)
     else:
-      fwatch_initfd(&me.fw, _getfd(me.file))
+      rc = fwatch_updatefd(&me.fw, _getfd(me.file))
+    return rc
 
-#----- That's all, folks ----------------------------------------------------
+###----- That's all, folks --------------------------------------------------