diff options
author | RĂ©mi Verschelde <rverschelde@gmail.com> | 2020-03-26 09:28:11 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-03-26 09:28:11 +0100 |
commit | 24fa0d871d51a7927027b7a1cc013d8681a53929 (patch) | |
tree | e2fbb7d2f84aad8c919f0997d7e063660be6e3ea /modules/mono/build_scripts/mono_reg_utils.py | |
parent | fafff6b37922b27d1f573f36220a6b9d91a8ea33 (diff) | |
parent | 3d2dd79ecd2c8456ba9401f6b12333d01f61e13e (diff) |
Merge pull request #37294 from akien-mga/scons-drop-python2
SCons: Drop support for Python 2
Diffstat (limited to 'modules/mono/build_scripts/mono_reg_utils.py')
-rw-r--r-- | modules/mono/build_scripts/mono_reg_utils.py | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/modules/mono/build_scripts/mono_reg_utils.py b/modules/mono/build_scripts/mono_reg_utils.py index b2c48f0a61..3bae11b167 100644 --- a/modules/mono/build_scripts/mono_reg_utils.py +++ b/modules/mono/build_scripts/mono_reg_utils.py @@ -1,14 +1,9 @@ import os import platform -from compat import decode_utf8 - if os.name == 'nt': import sys - if sys.version_info < (3,): - import _winreg as winreg - else: - import winreg + import winreg def _reg_open_key(key, subkey): @@ -81,7 +76,7 @@ def find_msbuild_tools_path_reg(): lines = subprocess.check_output([vswhere] + vswhere_args).splitlines() for line in lines: - parts = decode_utf8(line).split(':', 1) + parts = line.decode("utf-8").split(':', 1) if len(parts) < 2 or parts[0] != 'installationPath': continue |