[ARVADOS] updated: 1.3.0-1171-g479e9a251

[Git user]

Summary of changes:
 services/fuse/arvados_fuse/__init__.py | 3 ++-
 services/fuse/arvados_fuse/fusefile.py | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

       via  479e9a2511d9b54f1631de33027f6cdb4c576128 (commit)
      from  3aad6008d82058864e680e34837519213a239293 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 479e9a2511d9b54f1631de33027f6cdb4c576128
Author: Eric Biagiotti <ebiagiotti at veritasgenetics.com>
Date:   Wed Jul 3 14:42:56 2019 -0400

    14865: Reverts change to read op and fixes StringFile
    
    Changed the StringFile readfrom function to return utf-8 encoded bytes. This is what the fuse read op is expecting in Pyhton 3.
    
    Arvados-DCO-1.1-Signed-off-by:  <ebiagiotti at veritasgenetics.com>

diff --git a/services/fuse/arvados_fuse/__init__.py b/services/fuse/arvados_fuse/__init__.py
index 745889c75..41134e2ee 100644
--- a/services/fuse/arvados_fuse/__init__.py
+++ b/services/fuse/arvados_fuse/__init__.py
@@ -59,6 +59,7 @@ standard_library.install_aliases()
 from builtins import next
 from builtins import str
 from builtins import object
+from builtins import bytes
 import os
 import sys
 import llfuse
@@ -662,7 +663,7 @@ class Operations(llfuse.Operations):
         r = handle.obj.readfrom(off, size, self.num_retries)
         if r:
             self.read_counter.add(len(r))
-        return r.encode('utf-8')
+        return r
 
     @write_time.time()
     @catch_exceptions
diff --git a/services/fuse/arvados_fuse/fusefile.py b/services/fuse/arvados_fuse/fusefile.py
index 1b12d7e41..116b5462b 100644
--- a/services/fuse/arvados_fuse/fusefile.py
+++ b/services/fuse/arvados_fuse/fusefile.py
@@ -3,6 +3,7 @@
 # SPDX-License-Identifier: AGPL-3.0
 
 from __future__ import absolute_import
+from builtins import bytes
 import json
 import llfuse
 import logging
@@ -89,7 +90,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):

-----------------------------------------------------------------------


hooks/post-receive
--