| commit | 20815505e6008a33adec35bad46e589d4a8386cb | [log] [tgz] |
|---|---|---|
| author | Momo Sasaki <momosasaki@google.com> | Fri Mar 05 02:51:58 2021 +0000 |
| committer | LUCI CQ <infra-scoped@luci-project-accounts.iam.gserviceaccount.com> | Fri Mar 05 02:51:58 2021 +0000 |
| tree | ca242393b63ed4b663d4913af4c8d73e0fec3ef5 | |
| parent | 3f58a798a554db68a2e363850e6e5c09215f5ec5 [diff] [blame] |
Modify fix_encodng to make it use fix_win_sys_argv for python2 only and not for python3 on windows. The function works around <https://bugs.python.org/issue2128>, and the bug is fixed for python3 now. Bug: 1182016 Change-Id: I3880843b109d5b9779e5bbd1e39a3132f925ecc4 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2738234 Commit-Queue: Momo Sasaki <momosasaki@google.com> Reviewed-by: Dirk Pranke <dpranke@google.com> Reviewed-by: Junji Watanabe <jwata@google.com> Reviewed-by: Takuto Ikuta <tikuta@chromium.org>
diff --git a/fix_encoding.py b/fix_encoding.py index 1d84750..ce4bccc 100644 --- a/fix_encoding.py +++ b/fix_encoding.py
@@ -380,6 +380,7 @@ if sys.platform == 'win32': encoding = sys.getdefaultencoding() - ret &= fix_win_sys_argv(encoding) + if sys.version_info[0] == 2: + ret &= fix_win_sys_argv(encoding) ret &= fix_win_console(encoding) return ret