9923: Fix instanceof() to check correct base class
authorPeter Amstutz <peter.amstutz@curoverse.com>
Thu, 1 Sep 2016 21:37:08 +0000 (17:37 -0400)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Thu, 1 Sep 2016 21:37:08 +0000 (17:37 -0400)
sdk/cwl/arvados_cwl/fsaccess.py

index ae4532bec8315ef26df9c46f7e431455167cf537..e44e7a928218c04e377b04373d7ec44ea59b04a0 100644 (file)
@@ -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: