Title: [252475] trunk/Tools
- Revision
- 252475
- Author
- [email protected]
- Date
- 2019-11-14 18:56:43 -0800 (Thu, 14 Nov 2019)
Log Message
Python 3: Add support in webkitpy.layout_tests.servers
https://bugs.webkit.org/show_bug.cgi?id=204209
Reviewed by Stephanie Lewis.
* Scripts/test-webkitpy-python3: Add webkitpy.layout_tests.servers.
* Scripts/webkitpy/layout_tests/servers/apache_http_server.py:
(LayoutTestApacheHttpd.__init__): Use compatible iteritems.
* Scripts/webkitpy/layout_tests/servers/http_server.py:
(Lighttpd._prepare_config): Ditto.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (252474 => 252475)
--- trunk/Tools/ChangeLog 2019-11-15 02:55:49 UTC (rev 252474)
+++ trunk/Tools/ChangeLog 2019-11-15 02:56:43 UTC (rev 252475)
@@ -1,3 +1,16 @@
+2019-11-14 Jonathan Bedard <[email protected]>
+
+ Python 3: Add support in webkitpy.layout_tests.servers
+ https://bugs.webkit.org/show_bug.cgi?id=204209
+
+ Reviewed by Stephanie Lewis.
+
+ * Scripts/test-webkitpy-python3: Add webkitpy.layout_tests.servers.
+ * Scripts/webkitpy/layout_tests/servers/apache_http_server.py:
+ (LayoutTestApacheHttpd.__init__): Use compatible iteritems.
+ * Scripts/webkitpy/layout_tests/servers/http_server.py:
+ (Lighttpd._prepare_config): Ditto.
+
2019-11-14 Megan Gardner <[email protected]>
Fix another build error from r252449
Modified: trunk/Tools/Scripts/test-webkitpy-python3 (252474 => 252475)
--- trunk/Tools/Scripts/test-webkitpy-python3 2019-11-15 02:55:49 UTC (rev 252474)
+++ trunk/Tools/Scripts/test-webkitpy-python3 2019-11-15 02:56:43 UTC (rev 252475)
@@ -37,6 +37,7 @@
'webkitpy.common',
'webkitpy.layout_tests.controllers',
'webkitpy.layout_tests.models',
+ 'webkitpy.layout_tests.servers',
'webkitpy.port',
'webkitpy.results',
'webkitpy.style',
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/servers/apache_http_server.py (252474 => 252475)
--- trunk/Tools/Scripts/webkitpy/layout_tests/servers/apache_http_server.py 2019-11-15 02:55:49 UTC (rev 252474)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/servers/apache_http_server.py 2019-11-15 02:56:43 UTC (rev 252475)
@@ -35,6 +35,7 @@
import re
import socket
+from webkitpy.common.iteration_compatibility import iteritems
from webkitpy.layout_tests.servers import http_server_base
@@ -134,7 +135,7 @@
start_cmd += ['-C', 'Listen [::1]:%d' % port]
if additional_dirs:
- for alias, path in additional_dirs.iteritems():
+ for alias, path in iteritems(additional_dirs):
start_cmd += ['-c', 'Alias %s "%s"' % (alias, path),
# Disable CGI handler for additional dirs.
'-c', '<Location %s>' % alias,
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/servers/http_server.py (252474 => 252475)
--- trunk/Tools/Scripts/webkitpy/layout_tests/servers/http_server.py 2019-11-15 02:55:49 UTC (rev 252474)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/servers/http_server.py 2019-11-15 02:56:43 UTC (rev 252475)
@@ -32,6 +32,7 @@
import os
import time
+from webkitpy.common.iteration_compatibility import iteritems
from webkitpy.layout_tests.servers import http_server_base
@@ -129,7 +130,7 @@
operator = "+="
if self._additional_dirs:
- for alias, path in self._additional_dirs.iteritems():
+ for alias, path in iteritems(self._additional_dirs):
f.write(('alias.url += ( "%s" => "%s" )\n\n') % (alias, path))
# dump out of virtual host config at the bottom.
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
