Title: [281968] trunk/Tools
- Revision
- 281968
- Author
- [email protected]
- Date
- 2021-09-02 17:57:14 -0700 (Thu, 02 Sep 2021)
Log Message
[webkit-patch] apply-watchlist command fails on python 3 (Follow-up fix)
https://bugs.webkit.org/show_bug.cgi?id=229822
<rdar://problem/82691261>
Reviewed by Aakash Jain.
* Scripts/webkitpy/common/checkout/diff_parser.py:
(get_diff_converter): Potentially decode bytes.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (281967 => 281968)
--- trunk/Tools/ChangeLog 2021-09-02 23:54:29 UTC (rev 281967)
+++ trunk/Tools/ChangeLog 2021-09-03 00:57:14 UTC (rev 281968)
@@ -1,3 +1,14 @@
+2021-09-02 Jonathan Bedard <[email protected]>
+
+ [webkit-patch] apply-watchlist command fails on python 3 (Follow-up fix)
+ https://bugs.webkit.org/show_bug.cgi?id=229822
+ <rdar://problem/82691261>
+
+ Reviewed by Aakash Jain.
+
+ * Scripts/webkitpy/common/checkout/diff_parser.py:
+ (get_diff_converter): Potentially decode bytes.
+
2021-09-02 Lauro Moura <[email protected]>
[GLIB] run-gtk-tests does not require GI outside the sandbox
Modified: trunk/Tools/Scripts/webkitpy/common/checkout/diff_parser.py (281967 => 281968)
--- trunk/Tools/Scripts/webkitpy/common/checkout/diff_parser.py 2021-09-02 23:54:29 UTC (rev 281967)
+++ trunk/Tools/Scripts/webkitpy/common/checkout/diff_parser.py 2021-09-03 00:57:14 UTC (rev 281968)
@@ -86,6 +86,8 @@
converter from git to SVN.
"""
for i, line in enumerate(lines[:-1]):
+ line = string_utils.decode(line)
+
# Stop when we find the first patch
if line[:3] == "+++" and lines[i + 1] == "---":
break
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
