Merge pull request #1388 from girder/fix-b026

Fix a bugbear B026 linting error.
girder · Nov 28, 2023 · a8882a8 · a8882a8
2 parents 8600b72 + 41e5523
commit a8882a8
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/girder_annotation/girder_large_image_annotation/__init__.py b/girder_annotation/girder_large_image_annotation/__init__.py
@@ -40,9 +40,10 @@ def metadataSearchHandler(*args, **kwargs):
     import girder_large_image
 
     return girder_large_image.metadataSearchHandler(
+        *args,
         models=['item'],
         searchModels={('annotation', 'large_image'): {'model': 'item', 'reference': 'itemId'}},
-        metakey='annotation.attributes', *args, **kwargs)
+        metakey='annotation.attributes', **kwargs)
 
 
 # Validators

diff --git a/girder_annotation/girder_large_image_annotation/models/annotation.py b/girder_annotation/girder_large_image_annotation/models/annotation.py
@@ -1189,7 +1189,7 @@ def getVersion(self, annotationId, version, user=None, force=False, *args, **kwa
         }, fields=['_id'])
         if not entry:
             return None
-        result = self.load(entry['_id'], user=user, force=force, *args, **kwargs)
+        result = self.load(entry['_id'], *args, user=user, force=force, **kwargs)
         result['_versionId'] = result['_id']
         result['_id'] = result.pop('annotationId', result['_id'])
         return result

diff --git a/large_image/tilesource/base.py b/large_image/tilesource/base.py
@@ -1041,7 +1041,7 @@ def histogram(self, dtype=None, onlyMinMax=False, bins=256,  # noqa
         kwargs = kwargs.copy()
         histRange = kwargs.pop('range', None)
         results = None
-        for tile in self.tileIterator(format=TILE_FORMAT_NUMPY, *args, **kwargs):
+        for tile in self.tileIterator(format=TILE_FORMAT_NUMPY, **kwargs):
             if time.time() - lastlog > 10:
                 self.logger.info(
                     'Calculating histogram min/max %d/%d',
@@ -1105,7 +1105,7 @@ def histogram(self, dtype=None, onlyMinMax=False, bins=256,  # noqa
                     rbins = int(math.ceil((record['range'][1] - record['range'][0]) / step))
                     record['range'] = (record['range'][0], record['range'][0] + step * rbins)
                     record['bins'] = rbins
-        for tile in self.tileIterator(format=TILE_FORMAT_NUMPY, *args, **kwargs):
+        for tile in self.tileIterator(format=TILE_FORMAT_NUMPY, **kwargs):
             if time.time() - lastlog > 10:
                 self.logger.info(
                     'Calculating histogram %d/%d',

diff --git a/utilities/tasks/large_image_tasks/tasks.py b/utilities/tasks/large_image_tasks/tasks.py
@@ -80,7 +80,7 @@ def create_tiff(self, inputFile, outputName=None, outputDir=None, quality=90,
 class JobLogger(logging.Handler):
     def __init__(self, level=logging.NOTSET, job=None, *args, **kwargs):
         self._job = job
-        super().__init__(level=level, *args, **kwargs)
+        super().__init__(level=level, **kwargs)
 
     def emit(self, record):
         from girder_jobs.models.job import Job