merging...

wolph · wolph · commit 951f7760e22f · 2019-09-30T23:47:46.000+02:00
diff --git a/examples.py b/examples.py
@@ -460,9 +460,9 @@ def increment_bar_with_output_redirection():
         ' ', progressbar.ETA(),
         ' ', progressbar.FileTransferSpeed(),
     ]
-    bar = progressbar.ProgressBar(widgets=widgets, max_value=1000,
+    bar = progressbar.ProgressBar(widgets=widgets, max_value=100,
                                   redirect_stdout=True).start()
-    for i in range(100):
+    for i in range(10):
         # do something
         time.sleep(0.01)
         bar += 10
diff --git a/progressbar/bar.py b/progressbar/bar.py
@@ -173,10 +173,10 @@ def start(self, *args, **kwargs):
         DefaultFdMixin.start(self, *args, **kwargs)
 
     def update(self, value=None):
-        if utils.streams.needs_flush():
-            if not self.line_breaks:
-                self.fd.write('\r' + ' ' * self.term_width + '\r')
-            utils.streams.flush()
+        if not self.line_breaks and utils.streams.needs_clear():
+            self.fd.write('\r' + ' ' * self.term_width + '\r')
+
+        utils.streams.flush()
         DefaultFdMixin.update(self, value=value)
 
     def finish(self, end='\n'):
diff --git a/progressbar/utils.py b/progressbar/utils.py
@@ -138,22 +138,22 @@ def __init__(self, target, capturing=False, listeners=set()):
         self.target = target
         self.capturing = capturing
         self.listeners = listeners
+        self.needs_clear = False
 
     def write(self, value):
         if self.capturing:
             self.buffer.write(value)
             if '\n' in value:
+                self.needs_clear = True
                 for listener in self.listeners:  # pragma: no branch
                     listener.update()
         else:
             self.target.write(value)
 
     def flush(self):
+        self.needs_clear = False
         self.buffer.flush()
 
-    def _needs_flush(self):
-        return bool(self.buffer.getvalue())
-
     def _flush(self):
         value = self.buffer.getvalue()
         if value:
@@ -268,14 +268,10 @@ def unwrap_stderr(self):
             sys.stderr = self.original_stderr
             self.wrapped_stderr = 0
 
-    def needs_flush(self):
-        if self.wrapped_stdout:
-            if self.stdout._needs_flush():
-                return True
-        if self.wrapped_stderr:
-            if self.stderr._needs_flush():
-              return True
-        return False
+    def needs_clear(self):  # pragma: no cover
+        stdout_needs_clear = getattr(self.stdout, 'needs_clear', False)
+        stderr_needs_clear = getattr(self.stderr, 'needs_clear', False)
+        return stderr_needs_clear or stdout_needs_clear
 
     def flush(self):
         if self.wrapped_stdout:  # pragma: no branch
diff --git a/tests/test_monitor_progress.py b/tests/test_monitor_progress.py
@@ -172,32 +172,18 @@ def test_no_line_breaks(testdir):
         line_breaks=False,
         items=list(range(5)),
     )))
-    pprint.pprint(result.stderr.str(), width=70)
-    assert result.stderr.str() == u'\n'.join((
-        u'',
-        u'                                                            ',
+    pprint.pprint(result.stderr.lines, width=70)
+    assert result.stderr.lines == [
         u'',
         u'N/A%|                                                      |',
-        u'                                                            ',
-        u'',
         u' 20%|##########                                            |',
-        u'                                                            ',
-        u'',
         u' 40%|#####################                                 |',
-        u'                                                            ',
-        u'',
         u' 60%|################################                      |',
-        u'                                                            ',
-        u'',
         u' 80%|###########################################           |',
-        u'                                                            ',
-        u'',
         u'100%|######################################################|',
         u'',
-        u'                                                            ',
-        u'',
         u'100%|######################################################|'
-    ))
+    ]
 
 
 def test_colors(testdir):
diff --git a/tests/test_stream.py b/tests/test_stream.py
@@ -1,4 +1,5 @@
 import io
+import time
 import sys
 import pytest
 import progressbar
@@ -74,6 +75,21 @@ def test_fd_as_io_stream():
     stream.close()
 
 
+def test_no_newlines():
+    kwargs = dict(
+        redirect_stderr=True,
+        redirect_stdout=True,
+        line_breaks=False,
+        is_terminal=True,
+    )
+
+    with progressbar.ProgressBar(**kwargs) as pb:
+        for i in range(10):
+            print('%d\n\n\n' % i, file=progressbar.streams.stdout)
+            print('%d\n\n\n' % i, file=progressbar.streams.stderr)
+            pb.update(i)
+
+
 @pytest.mark.parametrize('stream', [sys.__stdout__, sys.__stderr__])
 def test_fd_as_standard_streams(stream):
     with progressbar.ProgressBar(fd=stream) as pb:
