X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/9a7e2a24f5f3d261e554ac3815b7e2a4c2e24503..fbaa689841e77e152567775d64aaab743dbcdaf0:/sdk/cwl/arvados_cwl/fsaccess.py?ds=sidebyside diff --git a/sdk/cwl/arvados_cwl/fsaccess.py b/sdk/cwl/arvados_cwl/fsaccess.py index 252ca57d47..c1ea586b04 100644 --- a/sdk/cwl/arvados_cwl/fsaccess.py +++ b/sdk/cwl/arvados_cwl/fsaccess.py @@ -133,10 +133,10 @@ class CollectionFsAccess(cwltool.stdfsaccess.StdFsAccess): patternsegments = rest.split("/") return sorted(self._match(collection, patternsegments, "keep:" + collection.manifest_locator())) - def open(self, fn, mode): + def open(self, fn, mode, encoding=None): collection, rest = self.get_collection(fn) if collection is not None: - return collection.open(rest, mode) + return collection.open(rest, mode, encoding=encoding) else: return super(CollectionFsAccess, self).open(self._abs(fn), mode) @@ -225,7 +225,7 @@ class CollectionFetcher(DefaultFetcher): def fetch_text(self, url): if url.startswith("keep:"): - with self.fsaccess.open(url, "r") as f: + with self.fsaccess.open(url, "r", encoding="utf-8") as f: return f.read() if url.startswith("arvwf:"): record = self.api_client.workflows().get(uuid=url[6:]).execute(num_retries=self.num_retries)