X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/a4959ce78b69f1f4e0e59e2458af8d11bc1d5510..33e4f1574f5bd14784c65863739478ff864732d2:/services/fuse/arvados_fuse/fusefile.py diff --git a/services/fuse/arvados_fuse/fusefile.py b/services/fuse/arvados_fuse/fusefile.py index cedb4fb451..45d3db16fe 100644 --- a/services/fuse/arvados_fuse/fusefile.py +++ b/services/fuse/arvados_fuse/fusefile.py @@ -2,13 +2,15 @@ # # SPDX-License-Identifier: AGPL-3.0 +from __future__ import absolute_import +from builtins import bytes import json import llfuse import logging import re import time -from fresh import FreshBase, convertTime +from .fresh import FreshBase, convertTime _logger = logging.getLogger('arvados.arvados_fuse') @@ -48,11 +50,12 @@ class File(FreshBase): class FuseArvadosFile(File): """Wraps a ArvadosFile.""" - __slots__ = ('arvfile',) + __slots__ = ('arvfile', '_enable_write') - def __init__(self, parent_inode, arvfile, _mtime): + def __init__(self, parent_inode, arvfile, _mtime, enable_write): super(FuseArvadosFile, self).__init__(parent_inode, _mtime) self.arvfile = arvfile + self._enable_write = enable_write def size(self): with llfuse.lock_released: @@ -70,7 +73,7 @@ class FuseArvadosFile(File): return False def writable(self): - return self.arvfile.writable() + return self._enable_write and self.arvfile.writable() def flush(self): with llfuse.lock_released: @@ -88,7 +91,7 @@ class StringFile(File): return len(self.contents) def readfrom(self, off, size, num_retries=0): - return self.contents[off:(off+size)] + return bytes(self.contents[off:(off+size)], encoding='utf-8') class ObjectFile(StringFile):