Simplification: only use special-case token retrieval logic when magic trailing comma...

[etc/vim.git] / src / black_primer / lib.py

diff --git a/src/black_primer/lib.py b/src/black_primer/lib.py
index 5c5576e1ff334f8b8d22f2d58d704438914c6f25..39ae93ba516c09a7e532760610120bbd68bb3827 100644 (file)
--- a/src/black_primer/lib.py
+++ b/src/black_primer/lib.py
@@ -21,7 +21,7 @@ import click
 
 WINDOWS = system() == "Windows"
 BLACK_BINARY = "black.exe" if WINDOWS else "black"
 
 WINDOWS = system() == "Windows"
 BLACK_BINARY = "black.exe" if WINDOWS else "black"

-GIT_BIANRY = "git.exe" if WINDOWS else "git"
+GIT_BINARY = "git.exe" if WINDOWS else "git"

 LOG = logging.getLogger(__name__)
 
 
 LOG = logging.getLogger(__name__)
 
 


@@ -58,13 +58,16 @@ async def _gen_check_output(
         await process.wait()
         raise
 
         await process.wait()
         raise
 

-    if process.returncode != 0:
-        returncode = process.returncode
-        if returncode is None:
-            returncode = 69
+    # A non-optional timeout was supplied to asyncio.wait_for, guaranteeing
+    # a timeout or completed process.  A terminated Python process will have a
+    # non-empty returncode value.
+    assert process.returncode is not None

 
 

+    if process.returncode != 0:

         cmd_str = " ".join(cmd)
         cmd_str = " ".join(cmd)

-        raise CalledProcessError(returncode, cmd_str, output=stdout, stderr=stderr)
+        raise CalledProcessError(
+            process.returncode, cmd_str, output=stdout, stderr=stderr
+        )

 
     return (stdout, stderr)
 
 
     return (stdout, stderr)
 


@@ -160,7 +163,7 @@ async def git_checkout_or_rebase(
     depth: int = 1,
 ) -> Optional[Path]:
     """git Clone project or rebase"""
     depth: int = 1,
 ) -> Optional[Path]:
     """git Clone project or rebase"""

-    git_bin = str(which(GIT_BIANRY))
+    git_bin = str(which(GIT_BINARY))

     if not git_bin:
         LOG.error("No git binary found")
         return None
     if not git_bin:
         LOG.error("No git binary found")
         return None