Address progress review cleanup issues

Author: wolph

progressbar/bar.py

@@ -1166,7 +1166,8 @@ def start(
                 StdRedirectMixin.finish(self, end='')
             with contextlib.suppress(Exception):
                 ResizableMixin.finish(self)
-            ProgressBarBase.finish(self)
+            with contextlib.suppress(Exception):
+                ProgressBarBase.finish(self)
             raise
 
         return self

progressbar/utils.py

@@ -342,7 +342,7 @@ def wrap_logging(self) -> None:
 
         seen: set[int] = set()
         for logger_ in self._iter_loggers():
-            for handler in logger_.handlers:
+            for handler in tuple(logger_.handlers):
                 if id(handler) in seen:
                     continue
                 seen.add(id(handler))

progressbar/widgets.py

@@ -1266,7 +1266,9 @@ def __init__(
 
     def __call__(self, progress: ProgressBarMixinBase, data: Data) -> str:
         value = data['variables'].get(self.name)
-        if not value:
+        if value is None or (
+            isinstance(value, (str, dict, list, set, tuple)) and not value
+        ):
             return ''
         if isinstance(value, str):
             rendered = value

tests/test_progressbar.py

@@ -11,7 +11,10 @@
 import pytest
 
 import progressbar
-from progressbar import utils
+from progressbar import (
+    bar as bar_module,
+    utils,
+)
 
 # Import hack to allow for parallel Tox
 try:
@@ -262,6 +265,23 @@ def test_start_cleans_stream_listener_when_validation_fails() -> None:
     assert bar not in utils.streams.listeners
 
 
+def test_start_preserves_original_error_when_base_cleanup_fails(
+    monkeypatch,
+) -> None:
+    def fail_start(self, max_value=None):
+        raise ValueError('resize start failed')
+
+    def fail_finish(self):
+        raise RuntimeError('base cleanup failed')
+
+    monkeypatch.setattr(bar_module.ResizableMixin, 'start', fail_start)
+    monkeypatch.setattr(bar_module.ProgressBarBase, 'finish', fail_finish)
+
+    bar = progressbar.ProgressBar(max_value=5, fd=io.StringIO())
+    with pytest.raises(ValueError, match='resize start failed'):
+        bar.start()
+
+
 @pytest.mark.skipif(os.name == 'nt', reason='SIGWINCH is POSIX-only')
 def test_sigwinch_restored_with_overlapping_bars() -> None:
     # Regression: A5 - with two live bars, finishing them in creation

tests/test_stream.py

@@ -240,6 +240,48 @@ def setStream(self, stream):  # noqa: N802
         logger.handlers = []
 
 
+def test_wrap_logging_uses_handler_snapshot(monkeypatch) -> None:
+    reset_wrapped_streams()
+
+    stream = io.StringIO()
+    monkeypatch.setattr(sys, 'stderr', stream)
+    monkeypatch.setattr(progressbar.streams, 'original_stderr', stream)
+    monkeypatch.setattr(progressbar.streams, 'stderr', stream)
+
+    logger = logging.getLogger('progressbar-test-mutating-handlers')
+    logger.handlers = []
+    logger.propagate = False
+    first_handler = logging.StreamHandler(sys.stderr)
+    late_handler = logging.StreamHandler(sys.stderr)
+    logger.addHandler(first_handler)
+
+    wrapped_handlers: list[logging.StreamHandler] = []
+    original_wrap_handler = progressbar.streams._wrap_logging_handler
+
+    def mutating_wrap_handler(handler, wrapped_streams, restore_streams):
+        wrapped_handlers.append(handler)
+        if handler is first_handler:
+            logger.addHandler(late_handler)
+        original_wrap_handler(handler, wrapped_streams, restore_streams)
+
+    monkeypatch.setattr(
+        progressbar.streams,
+        '_wrap_logging_handler',
+        mutating_wrap_handler,
+    )
+
+    progressbar.streams.wrap_stderr()
+    try:
+        progressbar.streams.wrap_logging()
+        assert first_handler in wrapped_handlers
+        assert late_handler not in wrapped_handlers
+        assert late_handler.stream is stream
+    finally:
+        progressbar.streams.unwrap_logging()
+        progressbar.streams.unwrap(stderr=True)
+        logger.handlers = []
+
+
 def test_unwrap_logging_ignores_dynamic_stderr_handler(monkeypatch) -> None:
     reset_wrapped_streams()
 

tests/test_widgets.py

@@ -101,6 +101,26 @@ def test_postfix_widget_renders_other_values() -> None:
     assert output == ' 3'
 
 
+@pytest.mark.parametrize(
+    ('value', 'expected'),
+    [
+        (0, ' 0'),
+        (0.0, ' 0.0'),
+        (False, ' False'),
+    ],
+)
+def test_postfix_widget_renders_falsy_values(value, expected) -> None:
+    bar = progressbar.ProgressBar(
+        widgets=[progressbar.Postfix()],
+        variables={'postfix': value},
+        fd=io.StringIO(),
+        term_width=80,
+    )
+    bar.start()
+    output = ''.join(bar._format_widgets())
+    assert output == expected
+
+
 def test_postfix_widget_omits_empty_values() -> None:
     bar = progressbar.ProgressBar(
         widgets=[progressbar.Postfix()],