Initial 2to3 pass

Author: sdelafond

example/_find_fuse_parts.py

@@ -11,12 +11,12 @@
 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/hello.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/xmp.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()

fuse.py

@@ -56,7 +56,7 @@ def __getenv__(var, pattern = '.', trans = lambda x: x):
         rpat = re.compile(rpat)
     if not rpat.search(val):
         raise RuntimeError("env var %s doesn't match required pattern %s" % \
-                           (var, `pattern`))
+                           (var, repr(pattern)))
     return trans(val)
 
 def get_fuse_python_api():
@@ -134,12 +134,12 @@ def assemble(self):
         args = [sys.argv and sys.argv[0] or "python"]
         if self.mountpoint:
             args.append(self.mountpoint)
-        for m, v in self.modifiers.iteritems():
+        for m, v in self.modifiers.items():
             if v:
                 args.append(self.fuse_modifiers[m])
 
         opta = []
-        for o, v in self.optdict.iteritems():
+        for o, v in self.optdict.items():
                 opta.append(o + '=' + v)
         opta.extend(self.optlist)
 
@@ -283,15 +283,15 @@ def __init__(self, *args, **kw):
 
         if dsd == 'whine':
             def dsdcb(option, opt_str, value, parser):
-                raise RuntimeError, """
+                raise RuntimeError("""
 
 ! If you want the "-s" option to work, pass
 !
 !   dash_s_do='setsingle'
 !
 ! to the Fuse constructor. See docstring of the FuseOptParse class for an
 ! explanation why is it not set by default.
-"""
+""")
 
         elif dsd == 'setsingle':
             def dsdcb(option, opt_str, value, parser):
@@ -300,7 +300,7 @@ def dsdcb(option, opt_str, value, parser):
         elif dsd == 'undef':
             dsdcb = None
         else:
-            raise ArgumentError, "key `dash_s_do': uninterpreted value " + str(dsd)
+            raise ArgumentError("key `dash_s_do': uninterpreted value " + str(dsd))
 
         if dsdcb:
             self.add_option('-s', action='callback', callback=dsdcb,
@@ -313,11 +313,11 @@ def exit(self, status=0, msg=None):
 
     def error(self, msg):
         SubbedOptParse.error(self, msg)
-        raise OptParseError, msg
+        raise OptParseError(msg)
 
     def print_help(self, file=sys.stderr):
         SubbedOptParse.print_help(self, file)
-        print >> file
+        print(file=file)
         self.fuse_args.setmod('showhelp')
 
     def print_version(self, file=sys.stderr):
@@ -359,8 +359,8 @@ def __init__(self, func):
 
     def __call__(self, *args, **kw):
         try:
-            return apply(self.func, args, kw)
-        except (IOError, OSError), detail:
+            return self.func(*args, **kw)
+        except (IOError, OSError) as detail:
             # Sometimes this is an int, sometimes an instance...
             if hasattr(detail, "errno"): detail = detail.errno
             return -detail
@@ -578,7 +578,7 @@ def resolve(args, maxva):
                     mag = ma.groups()
                     fp = re.compile(mag[1])
                     neg = bool(mag[0])
-                for f in fmap.keys() + [ 'has_' + a for a in Fuse._attrs ]:
+                for f in list(fmap.keys()) + [ 'has_' + a for a in Fuse._attrs ]:
                     if neg != bool(re.search(fp, f)):
                         yield f
                 continue
@@ -663,11 +663,11 @@ def __init__(self, *args, **kw):
         """
 
         if not fuse_python_api:
-            raise RuntimeError, __name__ + """.fuse_python_api not defined.
+            raise RuntimeError(__name__ + """.fuse_python_api not defined.
 
 ! Please define """ + __name__ + """.fuse_python_api internally (eg.
 ! 
-! (1)  """ + __name__ + """.fuse_python_api = """ + `FUSE_PYTHON_API_VERSION` + """
+! (1)  """ + __name__ + """.fuse_python_api = """ + repr(FUSE_PYTHON_API_VERSION) + """
 ! 
 ! ) or in the enviroment (eg. 
 ! 
@@ -678,22 +678,21 @@ def __init__(self, *args, **kw):
 ! If you are actually developing a filesystem, probably (1) is the way to go.
 ! If you are using a filesystem written before 2007 Q2, probably (2) is what
 ! you want."
-"""
+""")
 
         def malformed():
-            raise RuntimeError, \
-                  "malformatted fuse_python_api value " + `fuse_python_api`
+            raise RuntimeError("malformatted fuse_python_api value " + repr(fuse_python_api))
         if not isinstance(fuse_python_api, tuple):
             malformed()
         for i in fuse_python_api:
             if not isinstance(i, int) or i < 0:
                 malformed() 
 
         if fuse_python_api > FUSE_PYTHON_API_VERSION:
-            raise RuntimeError, """
-! You require FUSE-Python API version """ + `fuse_python_api` + """.
-! However, the latest available is """ + `FUSE_PYTHON_API_VERSION` + """.
-"""
+            raise RuntimeError("""
+! You require FUSE-Python API version """ + repr(fuse_python_api) + """.
+! However, the latest available is """ + repr(FUSE_PYTHON_API_VERSION) + """.
+""")
 
         self.fuse_args = \
             'fuse_args' in kw and kw.pop('fuse_args') or FuseArgs()
@@ -719,7 +718,7 @@ def parse(self, *args, **kw):
 
         ev = 'errex' in kw and kw.pop('errex')
         if ev and not isinstance(ev, int):
-            raise TypeError, "error exit value should be an integer"
+            raise TypeError("error exit value should be an integer")
 
         try:
             self.cmdline = self.parser.parse_args(*args, **kw)
@@ -893,7 +892,7 @@ def __getattr__(self, meth):
         if m:
             return m
 
-        raise AttributeError, "Fuse instance has no attribute '%s'" % meth
+        raise AttributeError("Fuse instance has no attribute '%s'" % meth)
 
 
 

fuseparts/subbedopts.py

@@ -30,7 +30,7 @@ def __init__(self):
     def _str_core(self):
 
         sa = []
-        for k, v in self.optdict.iteritems():
+        for k, v in self.optdict.items():
              sa.append(str(k) + '=' + str(v))
 
         ra = (list(self.optlist) + sa) or ["(none)"]
@@ -47,7 +47,7 @@ def canonify(self):
         with True value to optlist, stringify other values.
         """
 
-        for k, v in self.optdict.iteritems():
+        for k, v in self.optdict.items():
             if v == False:
                 self.optdict.pop(k)
             elif v == True:
@@ -84,7 +84,7 @@ def add(self, opt, val=None):
 
         if (v):
             if val != None:
-                raise AttributeError, "ambiguous option value"
+                raise AttributeError("ambiguous option value")
             val = v
 
         if val == False:

setup.py

@@ -36,8 +36,8 @@ def run_command(self, command):
         if command == 'sdist':
             for f in ('Changelog', 'README.new_fusepy_api.html'):
                  if not os.path.exists(f):
-                     raise RuntimeError, 'file ' + `f` + \
-                           " doesn't exist, please generate it before creating a source distribution"
+                     raise RuntimeError('file ' + repr(f) + \
+                           " doesn't exist, please generate it before creating a source distribution")
 
         return Distribution.run_command(self, command)
 
@@ -57,12 +57,12 @@ def run_command(self, command):
 
 else:
     if os.system('pkg-config --usage 2> /dev/null') == 0:
-        print """pkg-config could not find fuse:
+        print("""pkg-config could not find fuse:
 you might need to adjust PKG_CONFIG_PATH or your 
-FUSE installation is very old (older than 2.1-pre1)"""
+FUSE installation is very old (older than 2.1-pre1)""")
 
     else:
-        print "pkg-config unavailable, build terminated"
+        print("pkg-config unavailable, build terminated")
         sys.exit(1)
 
 # there must be an easier way to set up these flags!
@@ -72,7 +72,7 @@ def run_command(self, command):
 libsonly = [x[2:] for x in libs.split() if x[0:2] == '-l']
 
 try:
-    import thread
+    import _thread
 except ImportError:
     # if our Python doesn't have thread support, we enforce
     # linking against libpthread so that libfuse's pthread
@@ -93,13 +93,13 @@ def run_command(self, command):
 if sys.version_info < (2, 3):
     _setup = setup
     def setup(**kwargs):
-        if kwargs.has_key("classifiers"):
+        if "classifiers" in kwargs:
             del kwargs["classifiers"]
         _setup(**kwargs)
 setup (name = 'fuse-python',
        version = __version__,
        description = 'Bindings for FUSE',
-       classifiers = filter(None, classifiers.split("\n")),
+       classifiers = [_f for _f in classifiers.split("\n") if _f],
        license = 'LGPL',
        platforms = ['posix'],
        url = 'http://fuse.sourceforge.net/wiki/index.php/FusePython',