Fixing broken tests and linting

Author: fluzzywuzzy

src/pipx/animate.py

@@ -83,9 +83,9 @@ def print_animation(
 ) -> None:
     (term_cols, _) = shutil.get_terminal_size(fallback=(9999, 24))
     event.wait(delay)
-    last_received_stream = ""
     while not event.wait(0):
         for s in symbols:
+            last_received_stream = ""
             if stream is not None and not stream.empty():
                 last_received_stream = f": {stream.get_nowait().strip()}"
             if animate_at_beginning_of_line:
@@ -95,7 +95,7 @@ def print_animation(
                     cur_line += "..."
             else:
                 max_message_len = term_cols - len("... ")
-                cur_line = f"{f'{message}{last_received_stream}':.{max_message_len}} {s}"
+                cur_line = f"{f'{message}{last_received_stream}':.{max_message_len}}{s}"
 
             clear_line()
             sys.stderr.write(cur_line)

src/pipx/util.py

@@ -195,13 +195,6 @@ def run_subprocess(
         text=True,
         cwd=run_dir,
     ) as process:
-        try:
-            importlib.util.find_spec("msvcrt")
-        except ModuleNotFoundError:
-            _mswindows = False
-        else:
-            _mswindows = True
-
         try:
             stdout, stderr = "", ""
             while True:
@@ -211,14 +204,19 @@ def run_subprocess(
                     stdout += out
                     if stream is not None:
                         stream.put_nowait(out)
+                if err:
+                    stderr += err
                 if not out and not err:
                     break
-        except TimeoutExpired:
+        except TimeoutExpired as exc:
             process.kill()
-            if _mswindows:
-                process.communicate()
-            else:
+            try:
+                importlib.util.find_spec("msvcrt")
+            except ModuleNotFoundError:
                 process.wait()
+            else:
+                communication_result = process.communicate()
+                exc.stdout, exc.stderr = bytes(communication_result[0], "utf-8"), bytes(communication_result[1], "utf-8")
             raise
         except:
             process.kill()
@@ -227,6 +225,8 @@ def run_subprocess(
 
     if type(retcode) is int:
         completed_process = subprocess.CompletedProcess(process.args, retcode, stdout, stderr)
+    else:
+        completed_process = subprocess.CompletedProcess(process.args, 0, stdout, stderr)
 
     if capture_stdout and log_stdout:
         logger.debug(f"stdout: {completed_process.stdout}".rstrip())