Title: [281953] trunk/Tools
- Revision
- 281953
- Author
- [email protected]
- Date
- 2021-09-02 14:17:21 -0700 (Thu, 02 Sep 2021)
Log Message
[webkit-patch] apply-watchlist command fails on python 3
https://bugs.webkit.org/show_bug.cgi?id=229822
<rdar://problem/82691261>
Reviewed by Aakash Jain.
* Scripts/webkitpy/common/checkout/diff_parser.py:
(DiffParser._parse_into_diff_files): Ensure all diff lines are strings.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (281952 => 281953)
--- trunk/Tools/ChangeLog 2021-09-02 21:09:15 UTC (rev 281952)
+++ trunk/Tools/ChangeLog 2021-09-02 21:17:21 UTC (rev 281953)
@@ -1,5 +1,16 @@
2021-09-02 Jonathan Bedard <[email protected]>
+ [webkit-patch] apply-watchlist command fails on python 3
+ https://bugs.webkit.org/show_bug.cgi?id=229822
+ <rdar://problem/82691261>
+
+ Reviewed by Aakash Jain.
+
+ * Scripts/webkitpy/common/checkout/diff_parser.py:
+ (DiffParser._parse_into_diff_files): Ensure all diff lines are strings.
+
+2021-09-02 Jonathan Bedard <[email protected]>
+
[webkitpy] WrappedPopen breaks process returncode
https://bugs.webkit.org/show_bug.cgi?id=229824
Modified: trunk/Tools/Scripts/webkitpy/common/checkout/diff_parser.py (281952 => 281953)
--- trunk/Tools/Scripts/webkitpy/common/checkout/diff_parser.py 2021-09-02 21:09:15 UTC (rev 281952)
+++ trunk/Tools/Scripts/webkitpy/common/checkout/diff_parser.py 2021-09-02 21:17:21 UTC (rev 281953)
@@ -31,6 +31,8 @@
import logging
import re
+from webkitcorepy import string_utils
+
_log = logging.getLogger(__name__)
@@ -152,7 +154,7 @@
new_diff_line = None
transform_line = get_diff_converter(diff_input)
for line in diff_input:
- line = line.rstrip("\n")
+ line = string_utils.decode(line).rstrip("\n")
line = transform_line(line)
file_declaration = match(r"^Index: (?P<FilePath>.+)", line)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
