Merge pull request #17 from dlech/rwbytes

use bytes objects for read and write data

Author: sdelafond

example/fioc.py

@@ -96,7 +96,7 @@ class FiocFS(Fuse):
 
     def __init__(self, *args, **kw):
         Fuse.__init__(self, *args, **kw)
-        self.buf =  ""
+        self.buf =  b""
 
     def resize(self, new_size):
         old_size = len(self.buf)
@@ -106,7 +106,7 @@ def resize(self, new_size):
         if new_size < old_size:
             self.buf = self.buf[0:new_size]
         else:
-            self.buf = self.buf + "\x00" * (new_size - old_size)
+            self.buf = self.buf + b"\x00" * (new_size - old_size)
 
         return 0
 

example/hello.py

@@ -22,7 +22,7 @@
 fuse.fuse_python_api = (0, 2)
 
 hello_path = '/hello'
-hello_str = 'Hello World!\n'
+hello_str = b'Hello World!\n'
 
 class MyStat(fuse.Stat):
     def __init__(self):
@@ -72,7 +72,7 @@ def read(self, path, size, offset):
                 size = slen - offset
             buf = hello_str[offset:offset+size]
         else:
-            buf = ''
+            buf = b''
         return buf
 
 def main():

example/xmp.py

@@ -29,7 +29,7 @@
 
 
 def flag2mode(flags):
-    md = {os.O_RDONLY: 'r', os.O_WRONLY: 'w', os.O_RDWR: 'w+'}
+    md = {os.O_RDONLY: 'rb', os.O_WRONLY: 'wb', os.O_RDWR: 'wb+'}
     m = md[flags & (os.O_RDONLY | os.O_WRONLY | os.O_RDWR)]
 
     if flags | os.O_APPEND:

fuseparts/_fusemodule.c

@@ -518,12 +518,22 @@ read_func(const char *path, char *buf, size_t s, off_t off)
 	PROLOGUE( PYO_CALLWITHFI(fi, read_cb, snK, path, s, off) )
 #endif
 
+
+#if PY_MAJOR_VERSION >= 3
+	if(PyBytes_Check(v)) {
+		if(PyBytes_Size(v) > s)
+			goto OUT_DECREF;
+		memcpy(buf, PyBytes_AsString(v), PyBytes_Size(v));
+		ret = PyBytes_Size(v);
+	}
+#else
 	if(PyString_Check(v)) {
 		if(PyString_Size(v) > s)
 			goto OUT_DECREF;
 		memcpy(buf, PyString_AsString(v), PyString_Size(v));
 		ret = PyString_Size(v);
 	}
+#endif
 
 	EPILOGUE
 }
@@ -537,7 +547,11 @@ static int
 write_func(const char *path, const char *buf, size_t t, off_t off)
 #endif
 {
+#if PY_MAJOR_VERSION >= 3
+	PROLOGUE( PYO_CALLWITHFI(fi, write_cb, sy#K, path, buf, t, off) )
+#else
 	PROLOGUE( PYO_CALLWITHFI(fi, write_cb, ss#K, path, buf, t, off) )
+#endif
 	EPILOGUE
 }