]> git.madduck.net Git - etc/vim.git/commitdiff

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

Don't write back stdin to stdout when --check is passed
authorŁukasz Langa <lukasz@langa.pl>
Wed, 21 Mar 2018 01:20:20 +0000 (18:20 -0700)
committerŁukasz Langa <lukasz@langa.pl>
Wed, 21 Mar 2018 01:54:55 +0000 (18:54 -0700)
black.py
tests/test_black.py

index 203fbfa9055be595a358e94bd1c16b9a3911f23f..54044a5f564630289d7236e95fa0548d0049342b 100644 (file)
--- a/black.py
+++ b/black.py
@@ -102,7 +102,9 @@ def main(
         report = Report()
         try:
             if not p.is_file() and str(p) == '-':
         report = Report()
         try:
             if not p.is_file() and str(p) == '-':
-                changed = format_stdin_to_stdout(line_length=line_length, fast=fast)
+                changed = format_stdin_to_stdout(
+                    line_length=line_length, fast=fast, write_back=not check
+                )
             else:
                 changed = format_file_in_place(
                     p, line_length=line_length, fast=fast, write_back=not check
             else:
                 changed = format_file_in_place(
                     p, line_length=line_length, fast=fast, write_back=not check
@@ -178,7 +180,9 @@ def format_file_in_place(
     return True
 
 
     return True
 
 
-def format_stdin_to_stdout(line_length: int, fast: bool) -> bool:
+def format_stdin_to_stdout(
+    line_length: int, fast: bool, write_back: bool = False
+) -> bool:
     """Format file on stdin and pipe output to stdout. Return True if changed."""
     contents = sys.stdin.read()
     try:
     """Format file on stdin and pipe output to stdout. Return True if changed."""
     contents = sys.stdin.read()
     try:
@@ -189,7 +193,8 @@ def format_stdin_to_stdout(line_length: int, fast: bool) -> bool:
         return False
 
     finally:
         return False
 
     finally:
-        sys.stdout.write(contents)
+        if write_back:
+            sys.stdout.write(contents)
 
 
 def format_file_contents(
 
 
 def format_file_contents(
index ee883ec011d1be2ea9015cc48fdbe95843a358e4..7dba611141c099e9054421f55bd371ac242fced3 100644 (file)
@@ -89,7 +89,7 @@ class BlackTestCase(unittest.TestCase):
         try:
             sys.stdin, sys.stdout = StringIO(source), StringIO()
             sys.stdin.name = '<stdin>'
         try:
             sys.stdin, sys.stdout = StringIO(source), StringIO()
             sys.stdin.name = '<stdin>'
-            black.format_stdin_to_stdout(line_length=ll, fast=True)
+            black.format_stdin_to_stdout(line_length=ll, fast=True, write_back=True)
             sys.stdout.seek(0)
             actual = sys.stdout.read()
         finally:
             sys.stdout.seek(0)
             actual = sys.stdout.read()
         finally: