Merge pull request #2143 from lukassnoek/master

ENH: Speed up S3DataGrabber using prefix arg
nipy · Aug 4, 2017 · 3164602 · 3164602
2 parents a84f10f + e762c3b
commit 3164602
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/.zenodo.json b/.zenodo.json
@@ -518,6 +518,11 @@
       "affiliation": "MIT, HMS",
       "name": "Ghosh, Satrajit",
       "orcid": "0000-0002-5312-6729"
+    },
+    {
+      "affiliation": "University of Amsterdam",
+      "name": "Lukas Snoek",
+      "orcid": "0000-0001-8972-204X"
     }
   ],
   "keywords": [

diff --git a/nipype/interfaces/io.py b/nipype/interfaces/io.py
@@ -869,7 +869,7 @@ def _list_outputs(self):
         # get list of all files in s3 bucket
         conn = boto.connect_s3(anon=self.inputs.anon)
         bkt = conn.get_bucket(self.inputs.bucket)
-        bkt_files = list(k.key for k in bkt.list())
+        bkt_files = list(k.key for k in bkt.list(prefix=self.inputs.bucket_path))
 
         # keys are outfields, args are template args for the outfield
         for key, args in list(self.inputs.template_args.items()):