You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
5d284fdf48
In Python 3 byestrings and normal strings can't be concatenated.
To fix this we buffer as bytestrings in the Annotated wrapper.
We can't decode to a string because the output might come byte-by-byte, so it doesn't work with Unicode characters like ✔.
Also had to update gclient_test.py, where double-wrapping stdout with Annotated caused made output not work and include_zero=True working caused other unintended side-effects.
Example error from "fetch chromium":
Traceback (most recent call last):
File "C:\Google\depot_tools\gclient_scm.py", line 1045, in _Clone
self._Run(clone_cmd, options, cwd=self._root_dir, retry=True,
File "C:\Google\depot_tools\gclient_scm.py", line 1370, in _Run
gclient_utils.CheckCallAndFilter(cmd, env=env, **kwargs)
File "C:\Google\depot_tools\gclient_utils.py", line 583, in CheckCallAndFilter
show_header_if_necessary(needs_header, attempt)
File "C:\Google\depot_tools\gclient_utils.py", line 533, in show_header_if_necessary
stdout_write(header.encode())
File "C:\Google\depot_tools\gclient_utils.py", line 391, in write
obj[0] += out
TypeError: can only concatenate str (not "bytes") to str
Bug: 984182
Change-Id: If7037d30e9faf524f2405258281f6e6cd0bcdcae
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/1778745
Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>
Reviewed-by: Edward Lesmes <ehmaldonado@chromium.org>
Auto-Submit: Raul Tambre <raul@tambre.ee>
|
6 years ago | |
|---|---|---|
| .. | ||
| gstools | ||
| OWNERS | 7 years ago | |
| auth_test.py | ||
| bot_update_coverage_test.py | 6 years ago | |
| cipd_bootstrap_test.py | ||
| download_from_google_storage_unittest.py | 7 years ago | |
| fix_encoding_test.py | 7 years ago | |
| gclient_eval_unittest.py | 6 years ago | |
| gclient_scm_test.py | 6 years ago | |
| gclient_smoketest.py | 6 years ago | |
| gclient_test.py | 6 years ago | |
| gclient_utils_test.py | 6 years ago | |
| git_cache_test.py | 6 years ago | |
| git_cl_creds_check_report.txt | ||
| git_cl_test.py | 6 years ago | |
| git_common_test.py | 6 years ago | |
| git_dates_test.py | 6 years ago | |
| git_drover_test.py | ||
| git_footers_test.py | 6 years ago | |
| git_hyper_blame_test.py | 6 years ago | |
| git_number_test.py | ||
| git_rebase_update_test.py | 7 years ago | |
| gsutil_test.py | ||
| metrics_test.py | 6 years ago | |
| ninjalog_uploader_test.py | 7 years ago | |
| owners_finder_test.py | ||
| owners_unittest.py | 6 years ago | |
| presubmit_unittest.py | 6 years ago | |
| recipes_test.py | 7 years ago | |
| roll_dep_test.py | 7 years ago | |
| scm_unittest.py | 6 years ago | |
| subprocess2_test.py | 6 years ago | |
| upload_to_google_storage_unittest.py | 7 years ago | |
| watchlists_unittest.py | 6 years ago | |