Use "a or b" not "a if a else b"

lsst · Jul 24, 2023 · 3c84fee · 3c84fee
1 parent aa637db
commit 3c84fee
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 11 deletions.
diff --git a/python/lsst/daf/butler/script/exportCalibs.py b/python/lsst/daf/butler/script/exportCalibs.py
@@ -118,8 +118,8 @@ def exportCalibs(
     """
     butler = Butler(repo, writeable=False)
 
-    dataset_type_query = dataset_type if dataset_type else ...
-    collections_query = collections if collections else ...
+    dataset_type_query = dataset_type or ...
+    collections_query = collections or ...
 
     calibTypes = [
         datasetType

diff --git a/python/lsst/daf/butler/script/queryDataIds.py b/python/lsst/daf/butler/script/queryDataIds.py
@@ -134,7 +134,7 @@ def queryDataIds(
 
     query_collections: Iterable[str] | EllipsisType | None = None
     if datasets:
-        query_collections = collections if collections else ...
+        query_collections = collections or ...
     results = butler.registry.queryDataIds(
         dimensions, datasets=datasets, where=where, collections=query_collections
     )

diff --git a/python/lsst/daf/butler/script/queryDatasetTypes.py b/python/lsst/daf/butler/script/queryDatasetTypes.py
@@ -56,7 +56,7 @@ def queryDatasetTypes(repo: str, verbose: bool, glob: Iterable[str], components:
         collection names.
     """
     butler = Butler(repo, without_datastore=True)
-    expression = glob if glob else ...
+    expression = glob or ...
     datasetTypes = butler.registry.queryDatasetTypes(components=components, expression=expression)
     if verbose:
         table = Table(

diff --git a/python/lsst/daf/butler/script/queryDatasets.py b/python/lsst/daf/butler/script/queryDatasets.py
@@ -176,8 +176,8 @@ def __init__(
     def _getDatasets(
         self, glob: Iterable[str], collections: Iterable[str], where: str, find_first: bool
     ) -> None:
-        datasetTypes = glob if glob else ...
-        query_collections: Iterable[str] | EllipsisType = collections if collections else ...
+        datasetTypes = glob or ...
+        query_collections: Iterable[str] | EllipsisType = collections or ...
 
         self.datasets = self.butler.registry.queryDatasets(
             datasetType=datasetTypes, collections=query_collections, where=where, findFirst=find_first

diff --git a/python/lsst/daf/butler/script/queryDimensionRecords.py b/python/lsst/daf/butler/script/queryDimensionRecords.py
@@ -52,7 +52,7 @@ def queryDimensionRecords(
 
     query_collections: Iterable[str] | EllipsisType | None = None
     if datasets:
-        query_collections = collections if collections else ...
+        query_collections = collections or ...
     query_results = butler.registry.queryDimensionRecords(
         element, datasets=datasets, collections=query_collections, where=where, check=not no_check
     )

diff --git a/python/lsst/daf/butler/script/retrieveArtifacts.py b/python/lsst/daf/butler/script/retrieveArtifacts.py
@@ -77,8 +77,8 @@ def retrieveArtifacts(
     transferred : `list` of `lsst.resources.ResourcePath`
         The destination URIs of every transferred artifact.
     """
-    query_types = dataset_type if dataset_type else ...
-    query_collections: tuple[str, ...] | EllipsisType = collections if collections else ...
+    query_types = dataset_type or ...
+    query_collections: tuple[str, ...] | EllipsisType = collections or ...
 
     butler = Butler(repo, writeable=False)
 

diff --git a/python/lsst/daf/butler/script/transferDatasets.py b/python/lsst/daf/butler/script/transferDatasets.py
@@ -71,8 +71,8 @@ def transferDatasets(
     source_butler = Butler(source, writeable=False)
     dest_butler = Butler(dest, writeable=True)
 
-    dataset_type_expr = dataset_type if dataset_type else ...
-    collections_expr: tuple[str, ...] | EllipsisType = collections if collections else ...
+    dataset_type_expr = dataset_type or ...
+    collections_expr: tuple[str, ...] | EllipsisType = collections or ...
 
     source_refs = source_butler.registry.queryDatasets(
         datasetType=dataset_type_expr, collections=collections_expr, where=where, findFirst=find_first