webkit-patch apply-watchlist command fails on python 3 e.g.: https://ews-build.webkit-uat.org/#/builders/2/builds/6/steps/9/logs/stdio Traceback (most recent call last): File "Tools/Scripts/webkit-patch", line 80, in <module> main() File "Tools/Scripts/webkit-patch", line 75, in main WebKitPatch(os.path.abspath(__file__)).main() File "/Volumes/Data/worker/Apply-WatchList-EWS/build/Tools/Scripts/webkitpy/tool/multicommandtool.py", line 305, in main result = command.check_arguments_and_execute(options, args, self) File "/Volumes/Data/worker/Apply-WatchList-EWS/build/Tools/Scripts/webkitpy/tool/multicommandtool.py", line 123, in check_arguments_and_execute return self.execute(options, args, tool) or 0 File "/Volumes/Data/worker/Apply-WatchList-EWS/build/Tools/Scripts/webkitpy/tool/commands/abstractsequencedcommand.py", line 55, in execute self._sequence.run_and_handle_errors(tool, options, state) File "/Volumes/Data/worker/Apply-WatchList-EWS/build/Tools/Scripts/webkitpy/tool/commands/stepsequence.py", line 73, in run_and_handle_errors self._run(tool, options, state) File "/Volumes/Data/worker/Apply-WatchList-EWS/build/Tools/Scripts/webkitpy/tool/commands/stepsequence.py", line 67, in _run step(tool, options).run(state) File "/Volumes/Data/worker/Apply-WatchList-EWS/build/Tools/Scripts/webkitpy/tool/steps/applywatchlist.py", line 48, in run cc_and_messages = self._tool.watch_list().determine_cc_and_messages(diff) File "/Volumes/Data/worker/Apply-WatchList-EWS/build/Tools/Scripts/webkitpy/common/watchlist/watchlist.py", line 71, in determine_cc_and_messages definitions = self.find_matching_definitions(diff) File "/Volumes/Data/worker/Apply-WatchList-EWS/build/Tools/Scripts/webkitpy/common/watchlist/watchlist.py", line 40, in find_matching_definitions patch_files = DiffParser(diff.splitlines()).files File "/Volumes/Data/worker/Apply-WatchList-EWS/build/Tools/Scripts/webkitpy/common/checkout/diff_parser.py", line 144, in __init__ self.files = self._parse_into_diff_files(diff_input) File "/Volumes/Data/worker/Apply-WatchList-EWS/build/Tools/Scripts/webkitpy/common/checkout/diff_parser.py", line 153, in _parse_into_diff_files transform_line = get_diff_converter(diff_input) File "/Volumes/Data/worker/Apply-WatchList-EWS/build/Tools/Scripts/webkitpy/common/checkout/diff_parser.py", line 90, in get_diff_converter if match(r"^diff --git \w/", line): File "/Volumes/Data/worker/Apply-WatchList-EWS/build/Tools/Scripts/webkitpy/common/checkout/diff_parser.py", line 47, in match return _regexp_compile_cache[pattern].match(string) TypeError: cannot use a string pattern on a bytes-like object
<rdar://problem/82691261>
Created attachment 437187 [details] Patch
Committed r281953 (241260@main): <https://commits.webkit.org/241260@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 437187 [details].
Still noticing this issue (on 241264@main), e.g.: https://ews-build.webkit-uat.org/#/builders/2/builds/13 https://ews-build.webkit-uat.org/#/builders/2/builds/17
Reopening to attach new patch.
Created attachment 437221 [details] Patch
Comment on attachment 437221 [details] Patch rs=me
Committed r281968 (241275@main): <https://commits.webkit.org/241275@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 437221 [details].