more pbar logic cleanup

International-BMP-Database · Mar 25, 2024 · 5ddb266 · 5ddb266
1 parent acd9cc1
commit 5ddb266
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/wqio/datacollections.py b/wqio/datacollections.py
@@ -131,6 +131,8 @@ def __init__(
             **{self.cencol: dataframe[self.qualcol].isin(self.ndval)}
         ).reset_index()
 
+        self.pbarfxn = tqdm if (self.showpbar and tqdm) else utils.misc.no_op
+
     @cache_readonly
     def tidy(self):
         if self.useros:
@@ -510,7 +512,7 @@ def comparison_stat_twoway(self, statfxn, statname=None, paired=False, **statopt
             rescol,
             statfxn,
             statname=statname,
-            pbarfxn=tqdm if self.showpbar else None,
+            pbarfxn=self.pbarfxn,
             **statopts,
         )
         return pandas.DataFrame.from_records(results).set_index(index_cols)
@@ -524,7 +526,7 @@ def comparison_stat_allway(self, statfxn, statname, control=None, **statopts):
             statfxn,
             statname=statname,
             control=control,
-            pbarfxn=tqdm if self.showpbar else None,
+            pbarfxn=self.pbarfxn,
             **statopts,
         )
         return pandas.DataFrame.from_records(results).set_index(self.groupcols_comparison)

diff --git a/wqio/utils/numutils.py b/wqio/utils/numutils.py
@@ -667,8 +667,6 @@ def _comp_stat_generator(
     comp_stats : pandas.DataFrame
 
     """
-    if not pbarfxn:
-        pbarfxn = misc.no_op
 
     groupcols = validate.at_least_empty_list(groupcols)
     if statname is None:
@@ -765,8 +763,6 @@ def _paired_stat_generator(
     comp_stats : pandsa.DataFrame
 
     """
-    if not pbarfxn:
-        pbarfxn = misc.no_op
 
     groupcols = validate.at_least_empty_list(groupcols)
     if statname is None: