Merge remote-tracking branch 'upstream/master'

Now using python3 and make IOCTL works again

Author: beg0

.gitignore

@@ -0,0 +1,3 @@
+build
+dist
+fuse_python.egg-info

.travis.yml

@@ -0,0 +1,19 @@
+language: python
+
+python:
+  - 2.7
+  - 3.5
+  - 3.6
+
+addons:
+  apt:
+    packages:
+    - libfuse-dev
+
+install:
+  - python setup.py build
+
+script:
+  - sudo modprobe fuse
+  - mkdir /tmp/foo
+  - python example/hello.py /tmp/foo

FAQ

@@ -2,7 +2,7 @@
 FUSE-Python_ bindings FAQ
 =========================
 
-.. _FUSE-Python: http://fuse.sourceforge.net/wiki/index.php/FusePython
+.. _FUSE-Python: https://github.com/libfuse/python-fuse
 
 :Author: Csaba Henk
 

README.1st

@@ -0,0 +1,12 @@
+# python-fuse #
+
+[![Build Status](https://travis-ci.org/libfuse/python-fuse.svg?branch=master)](https://travis-ci.org/libfuse/python-fuse)
+
+This is a Python interface to libfuse
+(https://github.com/libfuse/libfuse).
+
+* The API is described in ``README.new_fusepy_api``. It's an
+  informative description, not a reference. Apart from that, see the
+  examples and the actual code.
+
+* Project home page is https://github.com/libfuse/python-fuse

README.md

@@ -2,7 +2,7 @@
 FUSE-Python_ bindings new API
 =============================
 
-.. _FUSE-Python: http://fuse.sourceforge.net/wiki/index.php/FusePython
+.. _FUSE-Python: https://github.com/libfuse/python-fuse
 
 :Author: Csaba Henk
 

README.new_fusepy_api

@@ -2,21 +2,23 @@
 from os.path import realpath, dirname, join
 from traceback import format_exception
 
+PYTHON_MAJOR_MINOR = "%s.%s" % (sys.version_info[0], sys.version_info[1])
+
 ddd = realpath(join(dirname(sys.argv[0]), '..'))
 
 for d in [ddd, '.']: 
-    for p in glob.glob(join(d, 'build', 'lib.*')):
+    for p in glob.glob(join(d, 'build', 'lib.*%s' % PYTHON_MAJOR_MINOR)):
         sys.path.insert(0, p)
 
 try:
     import fuse
 except ImportError:
-    raise RuntimeError, """
+    raise RuntimeError("""
 
 ! Got exception:
 """ + "".join([ "> " + x for x in format_exception(*sys.exc_info()) ]) + """
 ! Have you ran `python setup.py build'?
 !
 ! We've done our best to find the necessary components of the FUSE bindings
 ! even if it's not installed, we've got no clue what went wrong for you...
-"""
+""")

example/_find_fuse_parts.py

@@ -16,8 +16,7 @@
 
 
 if not hasattr(fuse, '__version__'):
-    raise RuntimeError, \
-        "your fuse-py doesn't know of fuse.__version__, probably it's too old."
+    raise RuntimeError("your fuse-py doesn't know of fuse.__version__, probably it's too old.")
 
 fuse.fuse_python_api = (0, 2)
 
@@ -43,32 +42,32 @@ class IOCTL:
 	_IOC_WRITE = 1
 	_IOC_READ = 2
 
-        @classmethod
+	@classmethod
 	def _IOC(cls, d,t,nr,size):
-		return (((d)  << cls._IOC_DIRSHIFT) | 
+		return (((d)  << cls._IOC_DIRSHIFT) |
 			 ((t) << cls._IOC_TYPESHIFT) | \
 			 ((nr)   << cls._IOC_NRSHIFT) | \
 			 ((size) << cls._IOC_SIZESHIFT))
 
-        @classmethod
+	@classmethod
 	def _IO(cls, t,nr):
 		return cls._IOC(cls._IOC_NONE, t, nr, 0)
 
-        @classmethod
+	@classmethod
 	def _IOR(cls, t,nr,size):
 		return cls._IOC(cls._IOC_READ, t, nr, size)
 
-        @classmethod
+	@classmethod
 	def _IOW(cls, t,nr,size):
 		return cls._IOC(cls._IOC_WRITE, t, nr, size)
 
-        @classmethod
+	@classmethod
 	def _IOWR(cls,t,nr,size):
 		return cls._IOC(cls._IOC_WRITE|cls._IOC_READ, t, nr, size)
 
 
 # IOCTL (as defined in fioc.h)
-# Note: on my system, size_t is an unsigned long 
+# Note: on my system, size_t is an unsigned long
 FIOC_GET_SIZE = IOCTL._IOR(ord('E'),0, struct.calcsize("L"));
 FIOC_SET_SIZE = IOCTL._IOW(ord('E'),1, struct.calcsize("L"));
 
@@ -107,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 + str(bytearray(new_size - old_size))
+            self.buf = self.buf + "\x00" * (new_size - old_size)
 
         return 0
 
@@ -125,10 +124,10 @@ def getattr(self, path):
         st = MyStat()
         ft = self.file_type(path)
         if ft == FIOC_ROOT:
-            st.st_mode = stat.S_IFDIR | 0755
+            st.st_mode = stat.S_IFDIR | 0o755
             st.st_nlink = 2
         elif ft == FIOC_FILE:
-            st.st_mode = stat.S_IFREG | 0444
+            st.st_mode = stat.S_IFREG | 0o444
             st.st_nlink = 1
             st.st_size = len(self.buf)
         else:
@@ -158,13 +157,12 @@ def read(self, path, size, offset):
         return self.do_read(path, size, offset)
 
     def do_write(self, path, buf, size, offset):
-        
         self.buf = self.buf[0:offset-1] + buf + self.buf[offset+size+1:len(self.buf)]
 
     def write(self, path, buf, size, offset):
         if self.file_type(path) != FIOC_FILE:
             return -errno.EINVAL;
-        
+
         self.do_write(path, buf, size, offset)
 
     def trunate(self, path, size):
@@ -179,10 +177,10 @@ def readdir(self, path, offset):
 
     def ioctl(self, path, cmd, arg, flags):
         if cmd == FIOC_GET_SIZE:
-             data = struct.pack("L",len(self.buf))
-             return data
+            data = struct.pack("L",len(self.buf))
+            return data
         elif cmd == FIOC_SET_SIZE:
-            (l,) = struct.unpack("L",arg);    
+            (l,) = struct.unpack("L",arg);
             self.resize(l)
             return 0
 

example/fioc.py

@@ -17,8 +17,7 @@
 
 
 if not hasattr(fuse, '__version__'):
-    raise RuntimeError, \
-        "your fuse-py doesn't know of fuse.__version__, probably it's too old."
+    raise RuntimeError("your fuse-py doesn't know of fuse.__version__, probably it's too old.")
 
 fuse.fuse_python_api = (0, 2)
 
@@ -43,10 +42,10 @@ class HelloFS(Fuse):
     def getattr(self, path):
         st = MyStat()
         if path == '/':
-            st.st_mode = stat.S_IFDIR | 0755
+            st.st_mode = stat.S_IFDIR | 0o755
             st.st_nlink = 2
         elif path == hello_path:
-            st.st_mode = stat.S_IFREG | 0444
+            st.st_mode = stat.S_IFREG | 0o444
             st.st_nlink = 1
             st.st_size = len(hello_str)
         else:

example/hello.py

@@ -21,8 +21,7 @@
 
 
 if not hasattr(fuse, '__version__'):
-    raise RuntimeError, \
-        "your fuse-py doesn't know of fuse.__version__, probably it's too old."
+    raise RuntimeError("your fuse-py doesn't know of fuse.__version__, probably it's too old.")
 
 fuse.fuse_python_api = (0, 2)
 
@@ -269,7 +268,7 @@ def main():
         if server.fuse_args.mount_expected():
             os.chdir(server.root)
     except OSError:
-        print >> sys.stderr, "can't enter root of underlying filesystem"
+        print("can't enter root of underlying filesystem", file=sys.stderr)
         sys.exit(1)
 
     server.main()