Submitter | Manuel Jacob |
---|---|
Date | July 5, 2020, 2:51 a.m. |
Message ID | <7fb9114235241b6d4354.1593917501@tmp.fritz.box> |
Download | mbox | patch |
Permalink | /patch/46623/ |
State | Accepted |
Headers | show |
Comments
Patch
diff --git a/mercurial/utils/procutil.py b/mercurial/utils/procutil.py --- a/mercurial/utils/procutil.py +++ b/mercurial/utils/procutil.py @@ -37,6 +37,11 @@ osutil = policy.importmod('osutil') +if pycompat.iswindows: + from .. import windows as platform +else: + from .. import posix as platform + def isatty(fp): try: @@ -94,11 +99,8 @@ stdout = os.fdopen(stdout.fileno(), 'wb', 1) if pycompat.iswindows: - from .. import windows as platform + stdout = platform.winstdout(stdout) - stdout = platform.winstdout(stdout) -else: - from .. import posix as platform findexe = platform.findexe _gethgcmd = platform.gethgcmd