Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/mono.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCalvin Buckley <calvin@cmpct.info>2020-01-07 19:28:06 +0300
committerAlexander Köplinger <alex.koeplinger@outlook.com>2020-01-07 19:28:06 +0300
commit524a8298d0c8cda332c17a743eaed69ce78f392d (patch)
treee89921ed346e3ab6eb16e9c9dd3e85e834d9398c /scripts/ci
parentec7f4c68f989d6ce037f7b03094826a131e40f46 (diff)
Force Python 3.x from env in shebang lines (#18285)
* Fix byte/string incompatiblity in Python 3
Diffstat (limited to 'scripts/ci')
-rwxr-xr-xscripts/ci/babysitter6
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/ci/babysitter b/scripts/ci/babysitter
index 8ec3579e0b9..90e5f965863 100755
--- a/scripts/ci/babysitter
+++ b/scripts/ci/babysitter
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
# Mimics GNU timeout, but has special modes which gather test result data and retry failed tests.
@@ -184,12 +184,12 @@ cygwin = platform.system().startswith("CYGWIN")
def outgoingPath(path):
if cygwin: # Invoke cygpath and strip newline
- return subprocess.check_output(["cygpath", "-w", path])[:-1]
+ return subprocess.check_output(["cygpath", "-w", path])[:-1].decode(sys.stdin.encoding)
return path
def incomingPath(path):
if cygwin:
- return subprocess.check_output(["cygpath", path])[:-1]
+ return subprocess.check_output(["cygpath", path])[:-1].decode(sys.stdin.encoding)
return path
# Some of the things we put in global_env are paths. If we're in cygwin, we have to keep separate