From: Peter Amstutz <peter.amstutz@curoverse.com>
Date: Thu, 1 Sep 2016 21:37:08 +0000 (-0400)
Subject: 9923: Fix instanceof() to check correct base class
X-Git-Tag: 1.1.0~757^2
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/9e1586545c360ccf8a0a24d2715b4c2250c8cda0

9923: Fix instanceof() to check correct base class
---

diff --git a/sdk/cwl/arvados_cwl/fsaccess.py b/sdk/cwl/arvados_cwl/fsaccess.py
index ae4532bec8..e44e7a9282 100644
--- a/sdk/cwl/arvados_cwl/fsaccess.py
+++ b/sdk/cwl/arvados_cwl/fsaccess.py
@@ -84,7 +84,7 @@ class CollectionFsAccess(cwltool.stdfsaccess.StdFsAccess):
         collection, rest = self.get_collection(fn)
         if collection:
             if rest:
-                return isinstance(collection.find(rest), arvados.collection.Collection)
+                return isinstance(collection.find(rest), arvados.collection.RichCollectionBase)
             else:
                 return True
         else:
@@ -99,7 +99,7 @@ class CollectionFsAccess(cwltool.stdfsaccess.StdFsAccess):
                 dir = collection
             if dir is None:
                 raise IOError(errno.ENOENT, "Directory '%s' in '%s' not found" % (rest, collection.portable_data_hash()))
-            if not isinstance(dir, arvados.collection.Collection):
+            if not isinstance(dir, arvados.collection.RichCollectionBase):
                 raise IOError(errno.ENOENT, "Path '%s' in '%s' is not a Directory" % (rest, collection.portable_data_hash()))
             return [abspath(l, fn) for l in dir.keys()]
         else: