14965: Fix for inflexible llfuse function parameter
authorEric Biagiotti <ebiagiotti@veritasgenetics.com>
Mon, 24 Jun 2019 15:34:18 +0000 (11:34 -0400)
committerEric Biagiotti <ebiagiotti@veritasgenetics.com>
Mon, 24 Jun 2019 15:34:18 +0000 (11:34 -0400)
Arvados-DCO-1.1-Signed-off-by: Eric Biagiotti <ebiagiotti@veritasgenetics.com>

llfuse.init expects the native str type in bother python 2 and 3, so the builtins.str type cannot be used.

services/fuse/arvados_fuse/command.py

index 14b1327d97747f2d9e514ce30d4b76a29999e249..76449729dbf9875a5bdae7efcea9b82eae2b860d 100644 (file)
@@ -2,8 +2,8 @@
 #
 # SPDX-License-Identifier: AGPL-3.0
 
+from future.utils import native_str
 from builtins import range
-from builtins import str
 from builtins import object
 import argparse
 import arvados
@@ -137,7 +137,7 @@ class Mount(object):
         if self.args.replace:
             unmount(path=self.args.mountpoint,
                     timeout=self.args.unmount_timeout)
-        llfuse.init(self.operations, self.args.mountpoint.encode('utf-8'), self._fuse_options())
+        llfuse.init(self.operations, native_str(self.args.mountpoint), self._fuse_options())
         if self.daemon:
             daemon.DaemonContext(
                 working_directory=os.path.dirname(self.args.mountpoint),