Merge pull request #21624 from meeseeksmachine/auto-backport-of-pr-21621-on-v3.5.x

timhoffm · web-flow · commit 532f424e9096 · 2021-11-14T12:49:47.000+01:00
Backport PR #21621 on branch v3.5.x (Fix GhostScript error handling types)
diff --git a/lib/matplotlib/testing/compare.py b/lib/matplotlib/testing/compare.py
@@ -136,9 +136,7 @@ def encode_and_escape(name):
         self._proc.stdin.flush()
         # GS> if nothing left on the stack; GS<n> if n items left on the stack.
         err = self._read_until((b"GS<", b"GS>"))
-        stack = ""
-        if err.endswith(b"GS<"):
-            stack = self._read_until(b">")
+        stack = self._read_until(b">") if err.endswith(b"GS<") else b""
         if stack or not os.path.exists(dest):
             stack_size = int(stack[:-1]) if stack else 0
             self._proc.stdin.write(b"pop\n" * stack_size)
