Commit 3211ae9

jmcgill298Byron

authored and

committed

Revert compiling GitCommand shell messages

1 parent d0fb22b commit 3211ae9Copy full SHA for 3211ae9

File tree

-5

lines changed

-5

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@`
`18`	`18`
`19`	`19`	`# typing --------------------------------------------------------------------`
`20`	`20`
`21`		`-from typing import Any, AnyStr, Dict, Optional, Type`
	`21`	`+from typing import IO, Any, AnyStr, Dict, Optional, Type, Union`
`22`	`22`	`from git.types import TBD`
`23`	`23`
`24`	`24`	`# ---------------------------------------------------------------------------`
`@@ -30,7 +30,7 @@`
`30`	`30`	`defenc = sys.getfilesystemencoding()`
`31`	`31`
`32`	`32`
`33`		`-def safe_decode(s: Optional[AnyStr]) -> Optional[str]:`
	`33`	`+def safe_decode(s: Union[IO[str], AnyStr, None]) -> Optional[str]:`
`34`	`34`	`"""Safely decodes a binary string to unicode"""`
`35`	`35`	`if isinstance(s, str):`
`36`	`36`	`return s`

Lines changed: 5 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -65,10 +65,12 @@ def __init__(self, command: Union[List[str], Tuple[str, ...], str],`
`65`	`65`	`status = "'%s'" % s if isinstance(status, str) else s`
`66`	`66`
`67`	`67`	`self._cmd = safe_decode(command[0])`
`68`		`- self._cmdline = ' '.join(str(safe_decode(i)) for i in command)`
	`68`	`+ self._cmdline = ' '.join(safe_decode(i) for i in command)`
`69`	`69`	`self._cause = status and " due to: %s" % status or "!"`
`70`		`- self.stdout = stdout and "\n stdout: '%s'" % safe_decode(str(stdout)) or ''`
`71`		`- self.stderr = stderr and "\n stderr: '%s'" % safe_decode(str(stderr)) or ''`
	`70`	`+ stdout_decode = safe_decode(stdout)`
	`71`	`+ stderr_decode = safe_decode(stderr)`
	`72`	`+ self.stdout = stdout_decode and "\n stdout: '%s'" % stdout_decode or ''`
	`73`	`+ self.stderr = stderr_decode and "\n stderr: '%s'" % stderr_decode or ''`
`72`	`74`
`73`	`75`	`def __str__(self) -> str:`
`74`	`76`	`return (self._msg + "\n cmdline: %s%s%s") % (`

Comments

(0)