@@@ cython and python 3 wip

[mLib-python] / fwatch.pyx

diff --git a/fwatch.pyx b/fwatch.pyx
index eedb872..086526b 100644 (file)
--- a/fwatch.pyx
+++ b/fwatch.pyx
@@ -30,24 +30,38 @@ cdef class FWatch:
   FILE may be a string, file descriptor, or an object with a `fileno' method.
   """
   cdef fwatch fw
-  cdef public file
-  def __cinit__(me, file):
-    me._init(file)
-  def __init__(me, file):
-    me._init(file)
-  cdef _init(me, file):
-    if isinstance(file, str):
-      fwatch_init(&me.fw, file)
+  cdef fobj
+  cdef const char *fname
+  cdef int fd
+  def __cinit__(me):
+    me.fname = NULL
+    me.fd = -1
+  cdef _setfile(me, object file):
+    if TEXT_CHECK(file):
+      me.fname = TEXT_PTR(file)
+      me.fd = -1
     else:
-      fwatch_initfd(&me.fw, _getfd(file))
-    me.file = file
+      me.fd = _getfd(file)
+      me.fname = NULL
+    me.fobj = file
+  def __init__(me, object file):
+    me._setfile(file)
+    if me.fname:
+      fwatch_init(&me.fw, me.fname)
+    else:
+      fwatch_initfd(&me.fw, me.fd)
+  @property
+  def file(me):
+    return me.fobj
+  @file.setter
+  def file(me, file):
+    me._setfile(file)
   def update(me):
     """FW.update() -> RC: nonzero if the file has changed state"""
     cdef int rc
-    if isinstance(me.file, str):
-      rc = fwatch_update(&me.fw, me.file)
+    if me.fname:
+      return fwatch_update(&me.fw, me.fname)
     else:
-      rc = fwatch_updatefd(&me.fw, _getfd(me.file))
-    return rc
+      return fwatch_updatefd(&me.fw, me.fd)
 
 ###----- That's all, folks --------------------------------------------------