Title: [278570] trunk/Tools
- Revision
- 278570
- Author
- [email protected]
- Date
- 2021-06-07 13:09:48 -0700 (Mon, 07 Jun 2021)
Log Message
Windows Python 2.7 fails to install tblib-1.7.0 due to "TypeError: environment can only contain strings"
https://bugs.webkit.org/show_bug.cgi?id=226707
Reviewed by Jonathan Bedard.
WinCairo port is still using Python 2.7 that has ascii strings and
unicode strings. WinPort.setup_crash_log_saving modifies
_NT_SYMBOL_PATH env var to have a unicode string. So, after
setup_crash_log_saving, AutoInstall failed due to the unicode
string in os.environ.
* Scripts/webkitpy/port/win.py:
(WinPort.setup_crash_log_saving): Convert self._build_path() to a
ascii string with str().
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (278569 => 278570)
--- trunk/Tools/ChangeLog 2021-06-07 20:05:53 UTC (rev 278569)
+++ trunk/Tools/ChangeLog 2021-06-07 20:09:48 UTC (rev 278570)
@@ -1,5 +1,22 @@
2021-06-07 Fujii Hironori <[email protected]>
+ Windows Python 2.7 fails to install tblib-1.7.0 due to "TypeError: environment can only contain strings"
+ https://bugs.webkit.org/show_bug.cgi?id=226707
+
+ Reviewed by Jonathan Bedard.
+
+ WinCairo port is still using Python 2.7 that has ascii strings and
+ unicode strings. WinPort.setup_crash_log_saving modifies
+ _NT_SYMBOL_PATH env var to have a unicode string. So, after
+ setup_crash_log_saving, AutoInstall failed due to the unicode
+ string in os.environ.
+
+ * Scripts/webkitpy/port/win.py:
+ (WinPort.setup_crash_log_saving): Convert self._build_path() to a
+ ascii string with str().
+
+2021-06-07 Fujii Hironori <[email protected]>
+
run-webkit-test should use python2 for wpt serve until the latest will be imported
https://bugs.webkit.org/show_bug.cgi?id=226703
Modified: trunk/Tools/Scripts/webkitpy/port/win.py (278569 => 278570)
--- trunk/Tools/Scripts/webkitpy/port/win.py 2021-06-07 20:05:53 UTC (rev 278569)
+++ trunk/Tools/Scripts/webkitpy/port/win.py 2021-06-07 20:09:48 UTC (rev 278570)
@@ -324,7 +324,7 @@
os.environ['_NT_SYMBOL_PATH'] = 'SRV*http://msdl.microsoft.com/download/symbols'
# Add build path to symbol path
- os.environ['_NT_SYMBOL_PATH'] += ";" + self._build_path()
+ os.environ['_NT_SYMBOL_PATH'] += ";" + str(self._build_path())
ntsd_path = self._ntsd_location()
if not ntsd_path:
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
