Merge pull request #1049 from alperkent/master

Handling FileNotFoundError in BIDSLayout Initialization when is_derivative=True and validate=False, also resolves #1050

bids/layout/index.py

@@ -270,11 +270,11 @@ def _index_metadata(self):
             # ensure we are returning objects
             filters['return_type'] = 'object'
 
-            if filters.get(ext_key):
-                filters[ext_key] = listify(filters[ext_key])
+            if filters.get('extension'):
+                filters['extension'] = listify(filters['extension'])
                 # ensure json files are being indexed
-                if '.json' not in filters[ext_key]:
-                    filters[ext_key].append('.json')
+                if '.json' not in filters['extension']:
+                    filters['extension'].append('.json')
 
         # Process JSON files first if we're indexing metadata
         all_files = self._layout.get(absolute_paths=True, **filters)

bids/layout/layout.py

@@ -139,7 +139,7 @@ def __init__(self, root=None, validate=True, absolute_paths=True,
         ]):
             try:
                 self.source_pipeline = validate_derivative_path(root)
-            except BIDSValidationError as err:
+            except (BIDSValidationError, FileNotFoundError) as err:
                 if validate:
                     raise err
                 self.source_pipeline = None