.

wcfs/internal/_wcfs.pyx

@@ -37,11 +37,6 @@ cdef extern from "wcfs_misc.h" nogil:
         cbool operator==(const error&)  const
         cbool operator!=(const error&)  const
 
-cdef extern from "wcfs_misc.h" namespace "context" nogil:
-    cppclass IContext "Context":
-        pass
-
-
 cdef extern from "wcfs_watchlink.h" nogil:
     cppclass WatchLink:
         error close()
@@ -57,8 +52,6 @@ cdef extern from "wcfs.h" nogil:
         pair[pWatchLink, error] _openwatch()    # XXX pair instead of tuple
 
 
-from golang cimport topyexc
-
 cdef class PyWCFS:
     cdef WCFS wc
 
@@ -91,10 +84,9 @@ cdef class PyWatchLink:
 
     # XXX recvReq
 
-    #def sendReq(PyWatchLink pywlink, IContext *ctx, string req):  # -> reply(string)
-    def sendReq(PyWatchLink pywlink, ctx, string req):  # -> reply(string)
+    def sendReq(PyWatchLink pywlink, PyContext pyctx, string req):  # -> reply(string)
         with nogil:
-            _ = wlink_sendReq_pyexc(pywlink.wlink, ctx, req)
+            _ = wlink_sendReq_pyexc(pywlink.wlink, pyctx.ctx, req)
             reply = _.first
             err   = _.second
 
@@ -109,9 +101,19 @@ cdef class PyPinReq:
     pass
 
 
+cdef extern from "wcfs_misc.h" nogil:
+    cppclass IContext "context::Context":
+        pass
+
+cdef class PyContext:
+    cdef IContext *ctx
+
+
 
 # ---- misc ----
 
+from golang cimport topyexc
+
 cdef nogil:
 
     pair[pWatchLink, error] wcfs_openwatch_pyexc(WCFS *wcfs)    except +topyexc: