[27561] in Source-Commits
pyhesiodfs commit: Drop support for python-fuse < 0.2
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Tue Dec 31 12:27:31 2013
Date: Tue, 31 Dec 2013 12:27:23 -0500
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201312311727.rBVHRN15027094@drugstore.mit.edu>
To: source-commits@MIT.EDU
https://github.com/mit-athena/pyhesiodfs/commit/a04a5756a3bf89c3f65233a522cb72b3aab02b4a
commit a04a5756a3bf89c3f65233a522cb72b3aab02b4a
Author: Jonathan Reed <jdreed@mit.edu>
Date: Thu Nov 14 14:45:20 2013 -0500
Drop support for python-fuse < 0.2
- We no longer need to support ancient versions of python-fuse, which
required Stats to be returned as tuples
- Also, remove the try/except around the constructor. The code will no
longer throw AttributeError because fuse.__version__ will always exist
pyHesiodFS.py | 35 +++++++----------------------------
1 files changed, 7 insertions(+), 28 deletions(-)
diff --git a/pyHesiodFS.py b/pyHesiodFS.py
index d9ed131..6d51f77 100644
--- a/pyHesiodFS.py
+++ b/pyHesiodFS.py
@@ -49,13 +49,9 @@ class negcache(dict):
del self[k]
return False
-new_fuse = hasattr(fuse, '__version__')
-
+# Use the "new" API
fuse.fuse_python_api = (0, 2)
-if not hasattr(fuse, 'Stat'):
- fuse.Stat = object
-
class MyStat(fuse.Stat):
def __init__(self):
self.st_mode = 0
@@ -69,11 +65,6 @@ class MyStat(fuse.Stat):
self.st_mtime = 0
self.st_ctime = 0
- def toTuple(self):
- return (self.st_mode, self.st_ino, self.st_dev, self.st_nlink,
- self.st_uid, self.st_gid, self.st_size, self.st_atime,
- self.st_mtime, self.st_ctime)
-
class PyHesiodFS(Fuse):
def __init__(self, *args, **kwargs):
@@ -122,10 +113,7 @@ class PyHesiodFS(Fuse):
return -errno.ENOENT
else:
return -errno.ENOENT
- if new_fuse:
- return st
- else:
- return st.toTuple()
+ return st
def getCachedLockers(self):
return self.mounts[self._uid()].keys()
@@ -189,20 +177,11 @@ class PyHesiodFS(Fuse):
return -errno.EPERM
def main():
- try:
- usage = Fuse.fusage
- server = PyHesiodFS(version="%prog " + fuse.__version__,
- usage=usage,
- dash_s_do='setsingle')
- server.parse(errex=1)
- except AttributeError:
- usage="""
-pyHesiodFS [mountpath] [options]
-
-"""
- if sys.argv[1] == '-f':
- sys.argv.pop(1)
- server = PyHesiodFS()
+ usage = Fuse.fusage
+ server = PyHesiodFS(version="%prog " + fuse.__version__,
+ usage=usage,
+ dash_s_do='setsingle')
+ server.parse(errex=1)
try:
server.main()
