Merge pull request #2775 from pre-commit/called-process-error-trailing-whitespace

asottile · web-flow · commit cdd360645a10 · 2023-02-21T13:02:50.000-05:00
fix trailing whitespace in CalledProcessError output
diff --git a/pre_commit/util.py b/pre_commit/util.py
@@ -62,7 +62,7 @@ def __init__(
     def __bytes__(self) -> bytes:
         def _indent_or_none(part: bytes | None) -> bytes:
             if part:
-                return b'\n    ' + part.replace(b'\n', b'\n    ')
+                return b'\n    ' + part.replace(b'\n', b'\n    ').rstrip()
             else:
                 return b' (none)'
 
diff --git a/tests/staged_files_only_test.py b/tests/staged_files_only_test.py
@@ -425,9 +425,7 @@ def test_failed_diff_does_not_discard_changes(in_git_dir, patch_dir):
         r'stdout: \(none\)\n'
         r'stderr:\n'
         r'    error: open\("1"\): Permission denied\n'
-        r'    fatal: cannot hash 1\n'
-        # TODO: not sure why there's weird whitespace here
-        r'    $',
+        r'    fatal: cannot hash 1$',
     ).assert_matches(msg)
 
     # even though it errored, the unstaged changes should still be present
diff --git a/tests/util_test.py b/tests/util_test.py
@@ -16,7 +16,7 @@
 
 
 def test_CalledProcessError_str():
-    error = CalledProcessError(1, ('exe',), b'output', b'errors')
+    error = CalledProcessError(1, ('exe',), b'output\n', b'errors\n')
     assert str(error) == (
         "command: ('exe',)\n"
         'return code: 1\n'
