Changes for issue 2358

Changes made in wacth.py to print Empty newlines that are skipped when watching pod logs.

Author: p172913

kubernetes/base/watch/watch.py

@@ -71,13 +71,19 @@ def iter_resp_lines(resp):
 
         # Split by newline (safe for utf-8 because multi-byte sequences cannot contain the newline byte)
         next_newline = buffer.find(b'\n')
+        last_was_empty = False  # Set empty-line flag
         while next_newline != -1:
             # Convert bytes to a valid utf-8 string, replacing any invalid utf-8 with the '�' character
             line = buffer[:next_newline].decode(
                 "utf-8", errors="replace")
             buffer = buffer[next_newline+1:]
             if line:
                 yield line
+                last_was_empty = False  # Reset empty-line flag
+            else:
+                if not last_was_empty:
+                    yield '\n'  # Only print one empty line
+                last_was_empty = True  # Mark that we handled an empty line
             next_newline = buffer.find(b'\n')
 
 
@@ -175,6 +181,7 @@ def stream(self, func, *args, **kwargs):
         while True:
             resp = func(*args, **kwargs)
             try:
+                last_was_empty = False # Set empty line false
                 for line in iter_resp_lines(resp):
                     # unmarshal when we are receiving events from watch,
                     # return raw string when we are streaming log
@@ -198,7 +205,12 @@ def stream(self, func, *args, **kwargs):
                             retry_after_410 = False
                             yield event
                     else:
-                        yield line
+                        if line:  
+                            yield line  # Normal non-empty line
+                            last_was_empty = False  
+                        elif not last_was_empty:  
+                            yield '/n'  # Only yield one empty line  
+                            last_was_empty = True
                     if self._stop:
                         break
             finally: