X wcfs/client: Move EOF -> pygolang

wcfs/client/_wcfs.pxd

@@ -35,11 +35,6 @@ from libcpp.utility cimport pair
 from libcpp.vector cimport vector
 
 
-# XXX -> pygolang
-cdef extern from "wcfs/client/wcfs_misc.h" namespace "io" nogil:
-    error EOF "io::EOF_"
-    error ErrUnexpectedEOF
-
 cdef extern from "wcfs/client/wcfs_misc.h" namespace "zodb" nogil:
     ctypedef uint64_t Tid
     ctypedef uint64_t Oid

wcfs/client/_wcfs.pyx

@@ -26,6 +26,7 @@
 # See _wcfs.pxd for package overview.
 
 from golang cimport pychan, pyerror, nil
+from golang cimport io
 
 cdef extern from *:
     ctypedef bint cbool "bool"
@@ -202,7 +203,7 @@ cdef class PyWatchLink:
         with nogil:
             err = wlink_recvReq_pyexc(pywlink.wlink, pyctx.ctx, &pyreq.pinreq)
 
-        if err.eq(EOF):
+        if err.eq(io.EOF):
             return None
         if err != nil:
             raise pyerr(err)

wcfs/client/wcfs.cpp

@@ -54,6 +54,7 @@
 
 #include <golang/errors.h>
 #include <golang/fmt.h>
+#include <golang/io.h>
 
 #include <algorithm>
 #include <string>

wcfs/client/wcfs_misc.cpp

@@ -24,6 +24,7 @@
 #include <golang/libgolang.h>
 #include <golang/errors.h>
 #include <golang/fmt.h>
+#include <golang/io.h>
 using namespace golang;
 
 #include <inttypes.h>
@@ -35,14 +36,6 @@ using namespace golang;
 
 #include <memory>
 
-// io::
-namespace io {
-
-const global<error> EOF_                = errors::New("EOF");
-const global<error> ErrUnexpectedEOF    = errors::New("unexpected EOF");
-
-}   // io::
-
 // os::
 namespace os {
 

wcfs/client/wcfs_misc.h

@@ -51,16 +51,6 @@ using std::tie;
 using std::vector;
 
 
-// io::     XXX -> pygolang
-namespace io {
-
-extern const global<error> EOF_;
-extern const global<error> ErrUnexpectedEOF;
-
-
-}   // io::
-
-
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>

wcfs/client/wcfs_watchlink.cpp

@@ -23,6 +23,7 @@
 
 #include <golang/errors.h>
 #include <golang/fmt.h>
+#include <golang/io.h>
 #include <golang/strings.h>
 #include <string.h>