<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[198310] trunk/Tools</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/198310">198310</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2016-03-16 17:13:30 -0700 (Wed, 16 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unreviewed, rolling out <a href="http://trac.webkit.org/projects/webkit/changeset/198187">r198187</a>.
https://bugs.webkit.org/show_bug.cgi?id=155564
Potentially break testing on iOS (Requested by Guest23 on
#webkit).
Reverted changeset:
"Add twisted-15.5.0 module to
webkitpy.thirdparty.autoinstalled."
https://bugs.webkit.org/show_bug.cgi?id=154667
http://trac.webkit.org/changeset/198187
Patch by Commit Queue <commit-queue@webkit.org> on 2016-03-16</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptswebkitpybenchmark_runnerhttp_server_driverhttp_servertwisted_http_serverpy">trunk/Tools/Scripts/webkitpy/benchmark_runner/http_server_driver/http_server/twisted_http_server.py</a></li>
<li><a href="#trunkToolsScriptswebkitpythirdparty__init__py">trunk/Tools/Scripts/webkitpy/thirdparty/__init__.py</a></li>
<li><a href="#trunkToolsScriptswebkitpythirdparty__init___unittestpy">trunk/Tools/Scripts/webkitpy/thirdparty/__init___unittest.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (198309 => 198310)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-03-17 00:07:58 UTC (rev 198309)
+++ trunk/Tools/ChangeLog 2016-03-17 00:13:30 UTC (rev 198310)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2016-03-16 Commit Queue <commit-queue@webkit.org>
+
+ Unreviewed, rolling out r198187.
+ https://bugs.webkit.org/show_bug.cgi?id=155564
+
+ Potentially break testing on iOS (Requested by Guest23 on
+ #webkit).
+
+ Reverted changeset:
+
+ "Add twisted-15.5.0 module to
+ webkitpy.thirdparty.autoinstalled."
+ https://bugs.webkit.org/show_bug.cgi?id=154667
+ http://trac.webkit.org/changeset/198187
+
</ins><span class="cx"> 2016-03-16 David Kilzer <ddkilzer@apple.com>
</span><span class="cx">
</span><span class="cx"> check-webkit-style: should warn about blank lines after #include "config.h" in TestWebKitAPI
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpybenchmark_runnerhttp_server_driverhttp_servertwisted_http_serverpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/benchmark_runner/http_server_driver/http_server/twisted_http_server.py (198309 => 198310)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/benchmark_runner/http_server_driver/http_server/twisted_http_server.py 2016-03-17 00:07:58 UTC (rev 198309)
+++ trunk/Tools/Scripts/webkitpy/benchmark_runner/http_server_driver/http_server/twisted_http_server.py 2016-03-17 00:13:30 UTC (rev 198310)
</span><span class="lines">@@ -9,7 +9,7 @@
</span><span class="cx"> import twisted
</span><span class="cx"> except ImportError:
</span><span class="cx"> sys.path.append(os.path.abspath(os.path.join(os.path.dirname(os.path.abspath(__file__)), '../../../..')))
</span><del>- from webkitpy.thirdparty.autoinstalled.twisted_15_5_0 import twisted
</del><ins>+ from webkitpy.thirdparty.autoinstalled.twisted import twisted
</ins><span class="cx">
</span><span class="cx"> from twisted.web import static, server
</span><span class="cx"> from twisted.web.resource import Resource
</span><span class="lines">@@ -29,6 +29,7 @@
</span><span class="cx"> _log.info("Serving request %s" % request)
</span><span class="cx"> sys.stdout.write(request.content.getvalue())
</span><span class="cx"> sys.stdout.flush()
</span><ins>+ reactor.stop()
</ins><span class="cx"> return 'OK'
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpythirdparty__init__py"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/thirdparty/__init__.py (198309 => 198310)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/thirdparty/__init__.py 2016-03-17 00:07:58 UTC (rev 198309)
+++ trunk/Tools/Scripts/webkitpy/thirdparty/__init__.py 2016-03-17 00:13:30 UTC (rev 198310)
</span><span class="lines">@@ -91,8 +91,6 @@
</span><span class="cx"> self._install_buildbot()
</span><span class="cx"> elif '.keyring' in fullname:
</span><span class="cx"> self._install_keyring()
</span><del>- elif '.twisted_15_5_0' in fullname:
- self._install_twisted_15_5_0()
</del><span class="cx"> elif '.twisted' in fullname:
</span><span class="cx"> self._install_twisted()
</span><span class="cx">
</span><span class="lines">@@ -157,11 +155,6 @@
</span><span class="cx"> installer = AutoInstaller(prepend_to_search_path=True, target_dir=twisted_dir)
</span><span class="cx"> installer.install(url="https://pypi.python.org/packages/source/T/Twisted/Twisted-12.1.0.tar.bz2#md5=f396f1d6f5321e869c2f89b2196a9eb5", url_subpath="Twisted-12.1.0/twisted")
</span><span class="cx">
</span><del>- def _install_twisted_15_5_0(self):
- twisted_dir = self._fs.join(_AUTOINSTALLED_DIR, "twisted_15_5_0")
- installer = AutoInstaller(prepend_to_search_path=True, target_dir=twisted_dir)
- installer.install(url="https://pypi.python.org/packages/source/T/Twisted/Twisted-15.5.0.tar.bz2#md5=0831d7c90d0020062de0f7287530a285", url_subpath="Twisted-15.5.0/twisted")
-
</del><span class="cx"> def _install(self, url, url_subpath=None, target_name=None):
</span><span class="cx"> installer = AutoInstaller(target_dir=_AUTOINSTALLED_DIR)
</span><span class="cx"> installer.install(url=url, url_subpath=url_subpath, target_name=target_name)
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpythirdparty__init___unittestpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/thirdparty/__init___unittest.py (198309 => 198310)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/thirdparty/__init___unittest.py 2016-03-17 00:07:58 UTC (rev 198309)
+++ trunk/Tools/Scripts/webkitpy/thirdparty/__init___unittest.py 2016-03-17 00:13:30 UTC (rev 198310)
</span><span class="lines">@@ -64,5 +64,3 @@
</span><span class="cx"> import webkitpy.thirdparty.autoinstalled.mechanize
</span><span class="cx"> import webkitpy.thirdparty.autoinstalled.pylint
</span><span class="cx"> import webkitpy.thirdparty.autoinstalled.pep8
</span><del>- import webkitpy.thirdparty.autoinstalled.twisted
- import webkitpy.thirdparty.autoinstalled.twisted_15_5_0
</del></span></pre>
</div>
</div>
</body>
</html>