diff options
Diffstat (limited to 'python')
| -rw-r--r-- | python/servo/bootstrap.py | 3 | ||||
| -rw-r--r-- | python/servo/command_base.py | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/python/servo/bootstrap.py b/python/servo/bootstrap.py index eb4cc84f36b..fc3e53bf871 100644 --- a/python/servo/bootstrap.py +++ b/python/servo/bootstrap.py @@ -271,7 +271,8 @@ def windows_msvc(context, force=False): cmake_path = find_executable("cmake") if cmake_path: cmake = subprocess.Popen([cmake_path, "--version"], stdout=PIPE) - cmake_version = cmake.stdout.read().splitlines()[0].replace("cmake version ", "") + cmake_version_output = six.ensure_str(cmake.stdout.read()).splitlines()[0] + cmake_version = cmake_version_output.replace("cmake version ", "") if LooseVersion(cmake_version) >= LooseVersion(version): return True return False diff --git a/python/servo/command_base.py b/python/servo/command_base.py index db9f550e61d..726afd0d0c7 100644 --- a/python/servo/command_base.py +++ b/python/servo/command_base.py @@ -216,7 +216,7 @@ def is_linux(): def append_to_path_env(string, env, name): variable = "" if name in env: - variable = env[name] + variable = six.ensure_str(env[name]) if len(variable) > 0: variable += os.pathsep variable += string |