Merge pull request #786 from DimitriPapadopoulos/lgtm_recommendations

LGTM.com recommendations

Author: effigies

bids/layout/db.py

@@ -3,14 +3,11 @@
 """
 
 from pathlib import Path
-import json
 import re
-import warnings
 import sqlite3
 from functools import lru_cache
 
 import sqlalchemy as sa
-from sqlalchemy.orm import joinedload
 
 from bids.utils import listify
 from .models import Base, Config, LayoutInfo
@@ -162,4 +159,4 @@ def layout_info(self):
 
     def reset_session(self):
         """Force a new session."""
-        self._session = self.sessionmaker()
+        self._session = self.sessionmaker()

bids/layout/index.py

@@ -8,7 +8,6 @@
 
 from bids_validator import BIDSValidator
 
-import bids.config
 from ..utils import listify, make_bidsfile
 from ..exceptions import BIDSConflictingValuesError
 

bids/layout/layout.py

@@ -1,13 +1,11 @@
 """BIDSLayout class."""
 import os
-import json
 import re
 from collections import defaultdict
 from io import open
 from functools import partial, lru_cache
 from itertools import chain
 import copy
-import warnings
 import enum
 import difflib
 from pathlib import Path
@@ -19,7 +17,6 @@
 from ..utils import listify, natural_sort
 from ..external import inflect
 from ..exceptions import (
-    BIDSDerivativesValidationError,
     BIDSEntityError,
     BIDSValidationError,
     NoMatchError,
@@ -30,20 +27,11 @@
                          absolute_path_deprecation_warning,
                          indexer_arg_deprecation_warning)
 from .writing import build_path, write_to_file
-from .models import (Base, Config, BIDSFile, Entity, Tag)
+from .models import (Config, BIDSFile, Entity, Tag)
 from .index import BIDSLayoutIndexer
 from .db import ConnectionManager
 from .utils import (BIDSMetadata, parse_file_entities)
 
-try:
-    from os.path import commonpath
-except ImportError:
-    def commonpath(paths):
-        prefix = os.path.commonprefix(paths)
-        if not os.path.isdir(prefix):
-            prefix = os.path.dirname(prefix)
-        return prefix
-
 __all__ = ['BIDSLayout']
 
 
@@ -276,7 +264,7 @@ def _sanitize_query_dtypes(self, entities):
                     entities[name] = [ents[name]._astype(v) for v in val]
                 else:
                     entities[name] = ents[name]._astype(val)
-            except:
+            except Exception:
                 pass
         return entities
 

bids/layout/writing.py

@@ -3,13 +3,12 @@
 """
 
 import warnings
-import os
 import re
 import sys
 import shutil
 from string import Formatter
 from itertools import product
-from ..utils import splitext, listify
+from ..utils import listify
 from pathlib import Path
 
 __all__ = ['build_path', 'write_to_file']

bids/modeling/statsmodels.py

@@ -10,8 +10,7 @@
 
 from bids.layout import BIDSLayout
 from bids.utils import matches_entities, convert_JSON, listify
-from bids.variables import (BIDSVariableCollection, SparseRunVariable,
-                            merge_collections)
+from bids.variables import (BIDSVariableCollection, merge_collections)
 from bids.modeling import transformations as tm
 from .model_spec import create_model_spec
 import warnings

bids/variables/collections.py

@@ -17,7 +17,7 @@
     merge_variables,
     BIDSVariable,
 )
-from bids.utils import listify, matches_entities
+from bids.utils import listify
 
 
 class BIDSVariableCollection(object):

bids/variables/variables.py

@@ -11,7 +11,6 @@
 import pandas as pd
 
 from bids.utils import listify
-from bids.utils import matches_entities
 
 class BIDSVariable(metaclass=ABCMeta):
     """Base representation of a column in a BIDS project. """