Title: [254944] trunk/Tools
- Revision
- 254944
- Author
- [email protected]
- Date
- 2020-01-22 13:58:37 -0800 (Wed, 22 Jan 2020)
Log Message
webkitpy: WebSocket server doesn't support Python 3 (Workaround)
https://bugs.webkit.org/show_bug.cgi?id=206546
Reviewed by Alexey Proskuryakov.
websocket_server.py doesn't support Python 3, and needs to be run with
Python 2.
* Scripts/webkitpy/layout_tests/servers/websocket_server.py:
(PyWebSocket._prepare_config): Use Python 2 explicitly.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (254943 => 254944)
--- trunk/Tools/ChangeLog 2020-01-22 21:42:58 UTC (rev 254943)
+++ trunk/Tools/ChangeLog 2020-01-22 21:58:37 UTC (rev 254944)
@@ -1,3 +1,16 @@
+2020-01-22 Jonathan Bedard <[email protected]>
+
+ webkitpy: WebSocket server doesn't support Python 3 (Workaround)
+ https://bugs.webkit.org/show_bug.cgi?id=206546
+
+ Reviewed by Alexey Proskuryakov.
+
+ websocket_server.py doesn't support Python 3, and needs to be run with
+ Python 2.
+
+ * Scripts/webkitpy/layout_tests/servers/websocket_server.py:
+ (PyWebSocket._prepare_config): Use Python 2 explicitly.
+
2020-01-22 Basuke Suzuki <[email protected]>
[build-webkit] Add option for toggling unified build
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/servers/websocket_server.py (254943 => 254944)
--- trunk/Tools/Scripts/webkitpy/layout_tests/servers/websocket_server.py 2020-01-22 21:42:58 UTC (rev 254943)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/servers/websocket_server.py 2020-01-22 21:58:37 UTC (rev 254944)
@@ -118,7 +118,11 @@
output_log = self._filesystem.join(self._output_dir, log_file_name + "-out.txt")
self._wsout = self._filesystem.open_text_file_for_writing(output_log)
+ # FIXME https://bugs.webkit.org/show_bug.cgi?id=206546: Should be using the same version of Python run-webkit-tests is
python_interp = sys.executable
+ if sys.version_info > (3, 0):
+ python_interp = 'python2'
+
wpt_tools_base = self._filesystem.join(self._layout_tests, "imported", "w3c", "web-platform-tests", "tools")
pywebsocket_base = self._filesystem.join(wpt_tools_base, "pywebsocket")
pywebsocket_deps = [self._filesystem.join(wpt_tools_base, "third_party", "six")]
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
