<!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>[56544] trunk/WebKitTools</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/56544">56544</a></dd>
<dt>Author</dt> <dd>cjerdonek@webkit.org</dd>
<dt>Date</dt> <dd>2010-03-25 07:46:36 -0700 (Thu, 25 Mar 2010)</dd>
</dl>

<h3>Log Message</h3>
<pre>Moved webkit_logging.py to common/system/deprecated_logging.py
inside webkitpy.

Reviewed by Adam Barth.

https://bugs.webkit.org/show_bug.cgi?id=36093

This is part of the master bug to reorganize webkitpy.

* Scripts/validate-committer-lists:
* Scripts/webkitpy/common/checkout/changelog.py:
* Scripts/webkitpy/common/checkout/scm.py:
* Scripts/webkitpy/common/net/bugzilla.py:
* Scripts/webkitpy/common/net/buildbot.py:
* Scripts/webkitpy/common/net/credentials.py:
* Scripts/webkitpy/common/net/irc/ircproxy.py:
* Scripts/webkitpy/common/net/networktransaction.py:
* Scripts/webkitpy/common/net/statusserver.py:
* Scripts/webkitpy/common/system/deprecated_logging.py: Copied from WebKitTools/Scripts/webkitpy/webkit_logging.py.
* Scripts/webkitpy/common/system/deprecated_logging_unittest.py: Copied from WebKitTools/Scripts/webkitpy/webkit_logging_unittest.py.
* Scripts/webkitpy/common/system/executive.py:
* Scripts/webkitpy/tool/bot/queueengine.py:
* Scripts/webkitpy/tool/commands/download.py:
* Scripts/webkitpy/tool/commands/earlywarningsystem_unittest.py:
* Scripts/webkitpy/tool/commands/openbugs.py:
* Scripts/webkitpy/tool/commands/queries.py:
* Scripts/webkitpy/tool/commands/queues.py:
* Scripts/webkitpy/tool/commands/sheriffbot.py:
* Scripts/webkitpy/tool/commands/stepsequence.py:
* Scripts/webkitpy/tool/commands/upload.py:
* Scripts/webkitpy/tool/main.py:
* Scripts/webkitpy/tool/mocktool.py:
* Scripts/webkitpy/tool/multicommandtool.py:
* Scripts/webkitpy/tool/steps/abstractstep.py:
* Scripts/webkitpy/tool/steps/applypatch.py:
* Scripts/webkitpy/tool/steps/build.py:
* Scripts/webkitpy/tool/steps/checkstyle.py:
* Scripts/webkitpy/tool/steps/closebug.py:
* Scripts/webkitpy/tool/steps/closebugforlanddiff.py:
* Scripts/webkitpy/tool/steps/confirmdiff.py:
* Scripts/webkitpy/tool/steps/ensurebuildersaregreen.py:
* Scripts/webkitpy/tool/steps/ensurelocalcommitifneeded.py:
* Scripts/webkitpy/tool/steps/obsoletepatches.py:
* Scripts/webkitpy/tool/steps/preparechangelog.py:
* Scripts/webkitpy/tool/steps/reopenbugafterrollout.py:
* Scripts/webkitpy/tool/steps/runtests.py:
* Scripts/webkitpy/tool/steps/update.py:
* Scripts/webkitpy/tool/steps/updatechangelogswithreviewer.py:
* Scripts/webkitpy/tool/steps/validatereviewer.py:
* Scripts/webkitpy/unittests.py:
* Scripts/webkitpy/webkit_logging.py: Removed.
* Scripts/webkitpy/webkit_logging_unittest.py: Removed.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkWebKitToolsChangeLog">trunk/WebKitTools/ChangeLog</a></li>
<li><a href="#trunkWebKitToolsScriptsvalidatecommitterlists">trunk/WebKitTools/Scripts/validate-committer-lists</a></li>
<li><a href="#trunkWebKitToolsScriptswebkitpycommoncheckoutchangelogpy">trunk/WebKitTools/Scripts/webkitpy/common/checkout/changelog.py</a></li>
<li><a href="#trunkWebKitToolsScriptswebkitpycommoncheckoutscmpy">trunk/WebKitTools/Scripts/webkitpy/common/checkout/scm.py</a></li>
<li><a href="#trunkWebKitToolsScriptswebkitpycommonnetbugzillapy">trunk/WebKitTools/Scripts/webkitpy/common/net/bugzilla.py</a></li>
<li><a href="#trunkWebKitToolsScriptswebkitpycommonnetbuildbotpy">trunk/WebKitTools/Scripts/webkitpy/common/net/buildbot.py</a></li>
<li><a href="#trunkWebKitToolsScriptswebkitpycommonnetcredentialspy">trunk/WebKitTools/Scripts/webkitpy/common/net/credentials.py</a></li>
<li><a href="#trunkWebKitToolsScriptswebkitpycommonnetircircproxypy">trunk/WebKitTools/Scripts/webkitpy/common/net/irc/ircproxy.py</a></li>
<li><a href="#trunkWebKitToolsScriptswebkitpycommonnetnetworktransactionpy">trunk/WebKitTools/Scripts/webkitpy/common/net/networktransaction.py</a></li>
<li><a href="#trunkWebKitToolsScriptswebkitpycommonnetstatusserverpy">trunk/WebKitTools/Scripts/webkitpy/common/net/statusserver.py</a></li>
<li><a href="#trunkWebKitToolsScriptswebkitpycommonsystemexecutivepy">trunk/WebKitTools/Scripts/webkitpy/common/system/executive.py</a></li>
<li><a href="#trunkWebKitToolsScriptswebkitpytoolbotqueueenginepy">trunk/WebKitTools/Scripts/webkitpy/tool/bot/queueengine.py</a></li>
<li><a href="#trunkWebKitToolsScriptswebkitpytoolcommandsdownloadpy">trunk/WebKitTools/Scripts/webkitpy/tool/commands/download.py</a></li>
<li><a href="#trunkWebKitToolsScriptswebkitpytoolcommandsearlywarningsystem_unittestpy">trunk/WebKitTools/Scripts/webkitpy/tool/commands/earlywarningsystem_unittest.py</a></li>
<li><a href="#trunkWebKitToolsScriptswebkitpytoolcommandsopenbugspy">trunk/WebKitTools/Scripts/webkitpy/tool/commands/openbugs.py</a></li>
<li><a href="#trunkWebKitToolsScriptswebkitpytoolcommandsqueriespy">trunk/WebKitTools/Scripts/webkitpy/tool/commands/queries.py</a></li>
<li><a href="#trunkWebKitToolsScriptswebkitpytoolcommandsqueuespy">trunk/WebKitTools/Scripts/webkitpy/tool/commands/queues.py</a></li>
<li><a href="#trunkWebKitToolsScriptswebkitpytoolcommandssheriffbotpy">trunk/WebKitTools/Scripts/webkitpy/tool/commands/sheriffbot.py</a></li>
<li><a href="#trunkWebKitToolsScriptswebkitpytoolcommandsstepsequencepy">trunk/WebKitTools/Scripts/webkitpy/tool/commands/stepsequence.py</a></li>
<li><a href="#trunkWebKitToolsScriptswebkitpytoolcommandsuploadpy">trunk/WebKitTools/Scripts/webkitpy/tool/commands/upload.py</a></li>
<li><a href="#trunkWebKitToolsScriptswebkitpytoolmainpy">trunk/WebKitTools/Scripts/webkitpy/tool/main.py</a></li>
<li><a href="#trunkWebKitToolsScriptswebkitpytoolmocktoolpy">trunk/WebKitTools/Scripts/webkitpy/tool/mocktool.py</a></li>
<li><a href="#trunkWebKitToolsScriptswebkitpytoolmulticommandtoolpy">trunk/WebKitTools/Scripts/webkitpy/tool/multicommandtool.py</a></li>
<li><a href="#trunkWebKitToolsScriptswebkitpytoolstepsabstractsteppy">trunk/WebKitTools/Scripts/webkitpy/tool/steps/abstractstep.py</a></li>
<li><a href="#trunkWebKitToolsScriptswebkitpytoolstepsapplypatchpy">trunk/WebKitTools/Scripts/webkitpy/tool/steps/applypatch.py</a></li>
<li><a href="#trunkWebKitToolsScriptswebkitpytoolstepsbuildpy">trunk/WebKitTools/Scripts/webkitpy/tool/steps/build.py</a></li>
<li><a href="#trunkWebKitToolsScriptswebkitpytoolstepscheckstylepy">trunk/WebKitTools/Scripts/webkitpy/tool/steps/checkstyle.py</a></li>
<li><a href="#trunkWebKitToolsScriptswebkitpytoolstepsclosebugpy">trunk/WebKitTools/Scripts/webkitpy/tool/steps/closebug.py</a></li>
<li><a href="#trunkWebKitToolsScriptswebkitpytoolstepsclosebugforlanddiffpy">trunk/WebKitTools/Scripts/webkitpy/tool/steps/closebugforlanddiff.py</a></li>
<li><a href="#trunkWebKitToolsScriptswebkitpytoolstepsconfirmdiffpy">trunk/WebKitTools/Scripts/webkitpy/tool/steps/confirmdiff.py</a></li>
<li><a href="#trunkWebKitToolsScriptswebkitpytoolstepsensurebuildersaregreenpy">trunk/WebKitTools/Scripts/webkitpy/tool/steps/ensurebuildersaregreen.py</a></li>
<li><a href="#trunkWebKitToolsScriptswebkitpytoolstepsensurelocalcommitifneededpy">trunk/WebKitTools/Scripts/webkitpy/tool/steps/ensurelocalcommitifneeded.py</a></li>
<li><a href="#trunkWebKitToolsScriptswebkitpytoolstepsobsoletepatchespy">trunk/WebKitTools/Scripts/webkitpy/tool/steps/obsoletepatches.py</a></li>
<li><a href="#trunkWebKitToolsScriptswebkitpytoolstepspreparechangelogpy">trunk/WebKitTools/Scripts/webkitpy/tool/steps/preparechangelog.py</a></li>
<li><a href="#trunkWebKitToolsScriptswebkitpytoolstepsreopenbugafterrolloutpy">trunk/WebKitTools/Scripts/webkitpy/tool/steps/reopenbugafterrollout.py</a></li>
<li><a href="#trunkWebKitToolsScriptswebkitpytoolstepsruntestspy">trunk/WebKitTools/Scripts/webkitpy/tool/steps/runtests.py</a></li>
<li><a href="#trunkWebKitToolsScriptswebkitpytoolstepsupdatepy">trunk/WebKitTools/Scripts/webkitpy/tool/steps/update.py</a></li>
<li><a href="#trunkWebKitToolsScriptswebkitpytoolstepsupdatechangelogswithreviewerpy">trunk/WebKitTools/Scripts/webkitpy/tool/steps/updatechangelogswithreviewer.py</a></li>
<li><a href="#trunkWebKitToolsScriptswebkitpytoolstepsvalidatereviewerpy">trunk/WebKitTools/Scripts/webkitpy/tool/steps/validatereviewer.py</a></li>
<li><a href="#trunkWebKitToolsScriptswebkitpyunittestspy">trunk/WebKitTools/Scripts/webkitpy/unittests.py</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkWebKitToolsScriptswebkitpycommonsystemdeprecated_loggingpy">trunk/WebKitTools/Scripts/webkitpy/common/system/deprecated_logging.py</a></li>
<li><a href="#trunkWebKitToolsScriptswebkitpycommonsystemdeprecated_logging_unittestpy">trunk/WebKitTools/Scripts/webkitpy/common/system/deprecated_logging_unittest.py</a></li>
</ul>

<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkWebKitToolsScriptswebkitpywebkit_loggingpy">trunk/WebKitTools/Scripts/webkitpy/webkit_logging.py</a></li>
<li><a href="#trunkWebKitToolsScriptswebkitpywebkit_logging_unittestpy">trunk/WebKitTools/Scripts/webkitpy/webkit_logging_unittest.py</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkWebKitToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebKitTools/ChangeLog (56543 => 56544)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKitTools/ChangeLog        2010-03-25 14:31:22 UTC (rev 56543)
+++ trunk/WebKitTools/ChangeLog        2010-03-25 14:46:36 UTC (rev 56544)
</span><span class="lines">@@ -1,3 +1,58 @@
</span><ins>+2010-03-25  Chris Jerdonek  &lt;cjerdonek@webkit.org&gt;
+
+        Reviewed by Adam Barth.
+
+        Moved webkit_logging.py to common/system/deprecated_logging.py
+        inside webkitpy.
+
+        https://bugs.webkit.org/show_bug.cgi?id=36093
+
+        This is part of the master bug to reorganize webkitpy.
+
+        * Scripts/validate-committer-lists:
+        * Scripts/webkitpy/common/checkout/changelog.py:
+        * Scripts/webkitpy/common/checkout/scm.py:
+        * Scripts/webkitpy/common/net/bugzilla.py:
+        * Scripts/webkitpy/common/net/buildbot.py:
+        * Scripts/webkitpy/common/net/credentials.py:
+        * Scripts/webkitpy/common/net/irc/ircproxy.py:
+        * Scripts/webkitpy/common/net/networktransaction.py:
+        * Scripts/webkitpy/common/net/statusserver.py:
+        * Scripts/webkitpy/common/system/deprecated_logging.py: Copied from WebKitTools/Scripts/webkitpy/webkit_logging.py.
+        * Scripts/webkitpy/common/system/deprecated_logging_unittest.py: Copied from WebKitTools/Scripts/webkitpy/webkit_logging_unittest.py.
+        * Scripts/webkitpy/common/system/executive.py:
+        * Scripts/webkitpy/tool/bot/queueengine.py:
+        * Scripts/webkitpy/tool/commands/download.py:
+        * Scripts/webkitpy/tool/commands/earlywarningsystem_unittest.py:
+        * Scripts/webkitpy/tool/commands/openbugs.py:
+        * Scripts/webkitpy/tool/commands/queries.py:
+        * Scripts/webkitpy/tool/commands/queues.py:
+        * Scripts/webkitpy/tool/commands/sheriffbot.py:
+        * Scripts/webkitpy/tool/commands/stepsequence.py:
+        * Scripts/webkitpy/tool/commands/upload.py:
+        * Scripts/webkitpy/tool/main.py:
+        * Scripts/webkitpy/tool/mocktool.py:
+        * Scripts/webkitpy/tool/multicommandtool.py:
+        * Scripts/webkitpy/tool/steps/abstractstep.py:
+        * Scripts/webkitpy/tool/steps/applypatch.py:
+        * Scripts/webkitpy/tool/steps/build.py:
+        * Scripts/webkitpy/tool/steps/checkstyle.py:
+        * Scripts/webkitpy/tool/steps/closebug.py:
+        * Scripts/webkitpy/tool/steps/closebugforlanddiff.py:
+        * Scripts/webkitpy/tool/steps/confirmdiff.py:
+        * Scripts/webkitpy/tool/steps/ensurebuildersaregreen.py:
+        * Scripts/webkitpy/tool/steps/ensurelocalcommitifneeded.py:
+        * Scripts/webkitpy/tool/steps/obsoletepatches.py:
+        * Scripts/webkitpy/tool/steps/preparechangelog.py:
+        * Scripts/webkitpy/tool/steps/reopenbugafterrollout.py:
+        * Scripts/webkitpy/tool/steps/runtests.py:
+        * Scripts/webkitpy/tool/steps/update.py:
+        * Scripts/webkitpy/tool/steps/updatechangelogswithreviewer.py:
+        * Scripts/webkitpy/tool/steps/validatereviewer.py:
+        * Scripts/webkitpy/unittests.py:
+        * Scripts/webkitpy/webkit_logging.py: Removed.
+        * Scripts/webkitpy/webkit_logging_unittest.py: Removed.
+
</ins><span class="cx"> 2010-03-25  Julien Chaffraix  &lt;jchaffraix@webkit.org&gt;
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Kenneth Rohde Christiansen.
</span></span></pre></div>
<a id="trunkWebKitToolsScriptsvalidatecommitterlists"></a>
<div class="modfile"><h4>Modified: trunk/WebKitTools/Scripts/validate-committer-lists (56543 => 56544)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKitTools/Scripts/validate-committer-lists        2010-03-25 14:31:22 UTC (rev 56543)
+++ trunk/WebKitTools/Scripts/validate-committer-lists        2010-03-25 14:46:36 UTC (rev 56544)
</span><span class="lines">@@ -37,7 +37,7 @@
</span><span class="cx"> import urllib2
</span><span class="cx"> from datetime import date, datetime, timedelta
</span><span class="cx"> from webkitpy.common.config.committers import CommitterList
</span><del>-from webkitpy.webkit_logging import log, error
</del><ins>+from webkitpy.common.system.deprecated_logging import log, error
</ins><span class="cx"> from webkitpy.scm import Git
</span><span class="cx"> 
</span><span class="cx"> # WebKit includes a built copy of BeautifulSoup in Scripts/webkitpy
</span></span></pre></div>
<a id="trunkWebKitToolsScriptswebkitpycommoncheckoutchangelogpy"></a>
<div class="modfile"><h4>Modified: trunk/WebKitTools/Scripts/webkitpy/common/checkout/changelog.py (56543 => 56544)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKitTools/Scripts/webkitpy/common/checkout/changelog.py        2010-03-25 14:31:22 UTC (rev 56543)
+++ trunk/WebKitTools/Scripts/webkitpy/common/checkout/changelog.py        2010-03-25 14:46:36 UTC (rev 56544)
</span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx"> import re
</span><span class="cx"> import textwrap
</span><span class="cx"> 
</span><del>-from webkitpy.webkit_logging import log
</del><ins>+from webkitpy.common.system.deprecated_logging import log
</ins><span class="cx"> from webkitpy.common.config.committers import CommitterList
</span><span class="cx"> 
</span><span class="cx"> def view_source_url(revision_number):
</span></span></pre></div>
<a id="trunkWebKitToolsScriptswebkitpycommoncheckoutscmpy"></a>
<div class="modfile"><h4>Modified: trunk/WebKitTools/Scripts/webkitpy/common/checkout/scm.py (56543 => 56544)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKitTools/Scripts/webkitpy/common/checkout/scm.py        2010-03-25 14:31:22 UTC (rev 56543)
+++ trunk/WebKitTools/Scripts/webkitpy/common/checkout/scm.py        2010-03-25 14:46:36 UTC (rev 56544)
</span><span class="lines">@@ -37,7 +37,7 @@
</span><span class="cx"> from webkitpy.common.checkout.changelog import ChangeLog, is_path_to_changelog
</span><span class="cx"> from webkitpy.common.system.executive import Executive, run_command, ScriptError
</span><span class="cx"> from webkitpy.common.system.user import User
</span><del>-from webkitpy.webkit_logging import error, log
</del><ins>+from webkitpy.common.system.deprecated_logging import error, log
</ins><span class="cx"> 
</span><span class="cx"> def detect_scm_system(path):
</span><span class="cx">     if SVN.in_working_directory(path):
</span></span></pre></div>
<a id="trunkWebKitToolsScriptswebkitpycommonnetbugzillapy"></a>
<div class="modfile"><h4>Modified: trunk/WebKitTools/Scripts/webkitpy/common/net/bugzilla.py (56543 => 56544)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKitTools/Scripts/webkitpy/common/net/bugzilla.py        2010-03-25 14:31:22 UTC (rev 56543)
+++ trunk/WebKitTools/Scripts/webkitpy/common/net/bugzilla.py        2010-03-25 14:46:36 UTC (rev 56544)
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx"> from datetime import datetime # used in timestamp()
</span><span class="cx"> 
</span><span class="cx"> # Import WebKit-specific modules.
</span><del>-from webkitpy.webkit_logging import error, log
</del><ins>+from webkitpy.common.system.deprecated_logging import error, log
</ins><span class="cx"> from webkitpy.common.config.committers import CommitterList
</span><span class="cx"> from webkitpy.common.net.credentials import Credentials
</span><span class="cx"> from webkitpy.common.system.user import User
</span></span></pre></div>
<a id="trunkWebKitToolsScriptswebkitpycommonnetbuildbotpy"></a>
<div class="modfile"><h4>Modified: trunk/WebKitTools/Scripts/webkitpy/common/net/buildbot.py (56543 => 56544)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKitTools/Scripts/webkitpy/common/net/buildbot.py        2010-03-25 14:31:22 UTC (rev 56543)
+++ trunk/WebKitTools/Scripts/webkitpy/common/net/buildbot.py        2010-03-25 14:46:36 UTC (rev 56544)
</span><span class="lines">@@ -34,7 +34,7 @@
</span><span class="cx"> import xmlrpclib
</span><span class="cx"> 
</span><span class="cx"> # Import WebKit-specific modules.
</span><del>-from webkitpy.webkit_logging import log
</del><ins>+from webkitpy.common.system.deprecated_logging import log
</ins><span class="cx"> 
</span><span class="cx"> # WebKit includes a built copy of BeautifulSoup in Scripts/webkitpy/thirdparty
</span><span class="cx"> # so this import should always succeed.
</span></span></pre></div>
<a id="trunkWebKitToolsScriptswebkitpycommonnetcredentialspy"></a>
<div class="modfile"><h4>Modified: trunk/WebKitTools/Scripts/webkitpy/common/net/credentials.py (56543 => 56544)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKitTools/Scripts/webkitpy/common/net/credentials.py        2010-03-25 14:31:22 UTC (rev 56543)
+++ trunk/WebKitTools/Scripts/webkitpy/common/net/credentials.py        2010-03-25 14:46:36 UTC (rev 56544)
</span><span class="lines">@@ -37,7 +37,7 @@
</span><span class="cx"> from webkitpy.common.checkout.scm import Git
</span><span class="cx"> from webkitpy.common.system.executive import Executive, ScriptError
</span><span class="cx"> from webkitpy.common.system.user import User
</span><del>-from webkitpy.webkit_logging import log
</del><ins>+from webkitpy.common.system.deprecated_logging import log
</ins><span class="cx"> 
</span><span class="cx"> 
</span><span class="cx"> class Credentials(object):
</span></span></pre></div>
<a id="trunkWebKitToolsScriptswebkitpycommonnetircircproxypy"></a>
<div class="modfile"><h4>Modified: trunk/WebKitTools/Scripts/webkitpy/common/net/irc/ircproxy.py (56543 => 56544)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKitTools/Scripts/webkitpy/common/net/irc/ircproxy.py        2010-03-25 14:31:22 UTC (rev 56543)
+++ trunk/WebKitTools/Scripts/webkitpy/common/net/irc/ircproxy.py        2010-03-25 14:46:36 UTC (rev 56544)
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx"> 
</span><span class="cx"> from webkitpy.common.net.irc.ircbot import IRCBot
</span><span class="cx"> from webkitpy.common.net.irc.threadedmessagequeue import ThreadedMessageQueue
</span><del>-from webkitpy.webkit_logging import log
</del><ins>+from webkitpy.common.system.deprecated_logging import log
</ins><span class="cx"> 
</span><span class="cx"> 
</span><span class="cx"> class _IRCThread(threading.Thread):
</span></span></pre></div>
<a id="trunkWebKitToolsScriptswebkitpycommonnetnetworktransactionpy"></a>
<div class="modfile"><h4>Modified: trunk/WebKitTools/Scripts/webkitpy/common/net/networktransaction.py (56543 => 56544)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKitTools/Scripts/webkitpy/common/net/networktransaction.py        2010-03-25 14:31:22 UTC (rev 56543)
+++ trunk/WebKitTools/Scripts/webkitpy/common/net/networktransaction.py        2010-03-25 14:46:36 UTC (rev 56544)
</span><span class="lines">@@ -29,7 +29,7 @@
</span><span class="cx"> import time
</span><span class="cx"> 
</span><span class="cx"> from webkitpy.thirdparty.autoinstalled import HTTPError
</span><del>-from webkitpy.webkit_logging import log
</del><ins>+from webkitpy.common.system.deprecated_logging import log
</ins><span class="cx"> 
</span><span class="cx"> 
</span><span class="cx"> class NetworkTimeout(Exception):
</span></span></pre></div>
<a id="trunkWebKitToolsScriptswebkitpycommonnetstatusserverpy"></a>
<div class="modfile"><h4>Modified: trunk/WebKitTools/Scripts/webkitpy/common/net/statusserver.py (56543 => 56544)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKitTools/Scripts/webkitpy/common/net/statusserver.py        2010-03-25 14:31:22 UTC (rev 56543)
+++ trunk/WebKitTools/Scripts/webkitpy/common/net/statusserver.py        2010-03-25 14:46:36 UTC (rev 56544)
</span><span class="lines">@@ -28,7 +28,7 @@
</span><span class="cx"> 
</span><span class="cx"> from webkitpy.common.net.networktransaction import NetworkTransaction
</span><span class="cx"> from webkitpy.thirdparty.autoinstalled import Browser
</span><del>-from webkitpy.webkit_logging import log
</del><ins>+from webkitpy.common.system.deprecated_logging import log
</ins><span class="cx"> 
</span><span class="cx"> # WebKit includes a built copy of BeautifulSoup in Scripts/webkitpy/thirdparty
</span><span class="cx"> # so this import should always succeed.
</span></span></pre></div>
<a id="trunkWebKitToolsScriptswebkitpycommonsystemdeprecated_loggingpyfromrev56543trunkWebKitToolsScriptswebkitpywebkit_loggingpy"></a>
<div class="copfile"><h4>Copied: trunk/WebKitTools/Scripts/webkitpy/common/system/deprecated_logging.py (from rev 56543, trunk/WebKitTools/Scripts/webkitpy/webkit_logging.py) (0 => 56544)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKitTools/Scripts/webkitpy/common/system/deprecated_logging.py                                (rev 0)
+++ trunk/WebKitTools/Scripts/webkitpy/common/system/deprecated_logging.py        2010-03-25 14:46:36 UTC (rev 56544)
</span><span class="lines">@@ -0,0 +1,85 @@
</span><ins>+# Copyright (c) 2009, Google Inc. All rights reserved.
+# Copyright (c) 2009 Apple Inc. All rights reserved.
+# 
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+# 
+#     * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#     * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+#     * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+# 
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# &quot;AS IS&quot; AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+# WebKit's Python module for logging
+# This module is now deprecated in favor of python's built-in logging.py.
+
+import os
+import sys
+
+def log(string):
+    print &gt;&gt; sys.stderr, string
+
+def error(string):
+    log(&quot;ERROR: %s&quot; % string)
+    exit(1)
+
+# Simple class to split output between multiple destinations
+class tee:
+    def __init__(self, *files):
+        self.files = files
+
+    def write(self, string):
+        for file in self.files:
+            file.write(string)
+
+class OutputTee:
+    def __init__(self):
+        self._original_stdout = None
+        self._original_stderr = None
+        self._files_for_output = []
+
+    def add_log(self, path):
+        log_file = self._open_log_file(path)
+        self._files_for_output.append(log_file)
+        self._tee_outputs_to_files(self._files_for_output)
+        return log_file
+
+    def remove_log(self, log_file):
+        self._files_for_output.remove(log_file)
+        self._tee_outputs_to_files(self._files_for_output)
+        log_file.close()
+
+    @staticmethod
+    def _open_log_file(log_path):
+        (log_directory, log_name) = os.path.split(log_path)
+        if log_directory and not os.path.exists(log_directory):
+            os.makedirs(log_directory)
+        return open(log_path, 'a+')
+
+    def _tee_outputs_to_files(self, files):
+        if not self._original_stdout:
+            self._original_stdout = sys.stdout
+            self._original_stderr = sys.stderr
+        if files and len(files):
+            sys.stdout = tee(self._original_stdout, *files)
+            sys.stderr = tee(self._original_stderr, *files)
+        else:
+            sys.stdout = self._original_stdout
+            sys.stderr = self._original_stderr
</ins></span></pre></div>
<a id="trunkWebKitToolsScriptswebkitpycommonsystemdeprecated_logging_unittestpyfromrev56543trunkWebKitToolsScriptswebkitpywebkit_logging_unittestpy"></a>
<div class="copfile"><h4>Copied: trunk/WebKitTools/Scripts/webkitpy/common/system/deprecated_logging_unittest.py (from rev 56543, trunk/WebKitTools/Scripts/webkitpy/webkit_logging_unittest.py) (0 => 56544)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKitTools/Scripts/webkitpy/common/system/deprecated_logging_unittest.py                                (rev 0)
+++ trunk/WebKitTools/Scripts/webkitpy/common/system/deprecated_logging_unittest.py        2010-03-25 14:46:36 UTC (rev 56544)
</span><span class="lines">@@ -0,0 +1,61 @@
</span><ins>+# Copyright (C) 2009 Google Inc. All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#    * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#    * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+#    * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# &quot;AS IS&quot; AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+import os
+import subprocess
+import StringIO
+import tempfile
+import unittest
+
+from webkitpy.common.system.executive import ScriptError
+from webkitpy.common.system.deprecated_logging import *
+
+class LoggingTest(unittest.TestCase):
+
+    def assert_log_equals(self, log_input, expected_output):
+        original_stderr = sys.stderr
+        test_stderr = StringIO.StringIO()
+        sys.stderr = test_stderr
+
+        try:
+            log(log_input)
+            actual_output = test_stderr.getvalue()
+        finally:
+            original_stderr = original_stderr
+
+        self.assertEquals(actual_output, expected_output, &quot;log(\&quot;%s\&quot;) expected: %s actual: %s&quot; % (log_input, expected_output, actual_output))
+
+    def test_log(self):
+        self.assert_log_equals(&quot;test&quot;, &quot;test\n&quot;)
+
+        # Test that log() does not throw an exception when passed an object instead of a string.
+        self.assert_log_equals(ScriptError(message=&quot;ScriptError&quot;), &quot;ScriptError\n&quot;)
+
+
+if __name__ == '__main__':
+    unittest.main()
</ins></span></pre></div>
<a id="trunkWebKitToolsScriptswebkitpycommonsystemexecutivepy"></a>
<div class="modfile"><h4>Modified: trunk/WebKitTools/Scripts/webkitpy/common/system/executive.py (56543 => 56544)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKitTools/Scripts/webkitpy/common/system/executive.py        2010-03-25 14:31:22 UTC (rev 56543)
+++ trunk/WebKitTools/Scripts/webkitpy/common/system/executive.py        2010-03-25 14:46:36 UTC (rev 56544)
</span><span class="lines">@@ -38,7 +38,7 @@
</span><span class="cx"> import subprocess
</span><span class="cx"> import sys
</span><span class="cx"> 
</span><del>-from webkitpy.webkit_logging import tee
</del><ins>+from webkitpy.common.system.deprecated_logging import tee
</ins><span class="cx"> 
</span><span class="cx"> 
</span><span class="cx"> class ScriptError(Exception):
</span></span></pre></div>
<a id="trunkWebKitToolsScriptswebkitpytoolbotqueueenginepy"></a>
<div class="modfile"><h4>Modified: trunk/WebKitTools/Scripts/webkitpy/tool/bot/queueengine.py (56543 => 56544)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKitTools/Scripts/webkitpy/tool/bot/queueengine.py        2010-03-25 14:31:22 UTC (rev 56543)
+++ trunk/WebKitTools/Scripts/webkitpy/tool/bot/queueengine.py        2010-03-25 14:46:36 UTC (rev 56544)
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx"> 
</span><span class="cx"> from webkitpy.common.net.statusserver import StatusServer
</span><span class="cx"> from webkitpy.common.system.executive import ScriptError
</span><del>-from webkitpy.webkit_logging import log, OutputTee
</del><ins>+from webkitpy.common.system.deprecated_logging import log, OutputTee
</ins><span class="cx"> 
</span><span class="cx"> class QueueEngineDelegate:
</span><span class="cx">     def queue_log_path(self):
</span></span></pre></div>
<a id="trunkWebKitToolsScriptswebkitpytoolcommandsdownloadpy"></a>
<div class="modfile"><h4>Modified: trunk/WebKitTools/Scripts/webkitpy/tool/commands/download.py (56543 => 56544)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKitTools/Scripts/webkitpy/tool/commands/download.py        2010-03-25 14:31:22 UTC (rev 56543)
+++ trunk/WebKitTools/Scripts/webkitpy/tool/commands/download.py        2010-03-25 14:46:36 UTC (rev 56544)
</span><span class="lines">@@ -41,7 +41,7 @@
</span><span class="cx"> from webkitpy.tool.comments import bug_comment_from_commit_text
</span><span class="cx"> from webkitpy.tool.grammar import pluralize
</span><span class="cx"> from webkitpy.tool.multicommandtool import AbstractDeclarativeCommand
</span><del>-from webkitpy.webkit_logging import error, log
</del><ins>+from webkitpy.common.system.deprecated_logging import error, log
</ins><span class="cx"> 
</span><span class="cx"> 
</span><span class="cx"> class Build(AbstractSequencedCommand):
</span></span></pre></div>
<a id="trunkWebKitToolsScriptswebkitpytoolcommandsearlywarningsystem_unittestpy"></a>
<div class="modfile"><h4>Modified: trunk/WebKitTools/Scripts/webkitpy/tool/commands/earlywarningsystem_unittest.py (56543 => 56544)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKitTools/Scripts/webkitpy/tool/commands/earlywarningsystem_unittest.py        2010-03-25 14:31:22 UTC (rev 56543)
+++ trunk/WebKitTools/Scripts/webkitpy/tool/commands/earlywarningsystem_unittest.py        2010-03-25 14:46:36 UTC (rev 56544)
</span><span class="lines">@@ -29,7 +29,7 @@
</span><span class="cx"> import os
</span><span class="cx"> 
</span><span class="cx"> from webkitpy.tool.commands_references import Mock
</span><del>-from webkitpy.tool.commands.early_warning_system import *
</del><ins>+from webkitpy.tool.commands.earlywarningsystem import *
</ins><span class="cx"> from webkitpy.tool.commands.queuestest import QueuesTest
</span><span class="cx"> 
</span><span class="cx"> class EarlyWarningSytemTest(QueuesTest):
</span></span></pre></div>
<a id="trunkWebKitToolsScriptswebkitpytoolcommandsopenbugspy"></a>
<div class="modfile"><h4>Modified: trunk/WebKitTools/Scripts/webkitpy/tool/commands/openbugs.py (56543 => 56544)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKitTools/Scripts/webkitpy/tool/commands/openbugs.py        2010-03-25 14:31:22 UTC (rev 56543)
+++ trunk/WebKitTools/Scripts/webkitpy/tool/commands/openbugs.py        2010-03-25 14:46:36 UTC (rev 56544)
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx"> import sys
</span><span class="cx"> 
</span><span class="cx"> from webkitpy.tool.multicommandtool import AbstractDeclarativeCommand
</span><del>-from webkitpy.webkit_logging import log
</del><ins>+from webkitpy.common.system.deprecated_logging import log
</ins><span class="cx"> 
</span><span class="cx"> 
</span><span class="cx"> class OpenBugs(AbstractDeclarativeCommand):
</span></span></pre></div>
<a id="trunkWebKitToolsScriptswebkitpytoolcommandsqueriespy"></a>
<div class="modfile"><h4>Modified: trunk/WebKitTools/Scripts/webkitpy/tool/commands/queries.py (56543 => 56544)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKitTools/Scripts/webkitpy/tool/commands/queries.py        2010-03-25 14:31:22 UTC (rev 56543)
+++ trunk/WebKitTools/Scripts/webkitpy/tool/commands/queries.py        2010-03-25 14:46:36 UTC (rev 56544)
</span><span class="lines">@@ -37,7 +37,7 @@
</span><span class="cx"> from webkitpy.common.net.buildbot import BuildBot
</span><span class="cx"> from webkitpy.tool.grammar import pluralize
</span><span class="cx"> from webkitpy.tool.multicommandtool import AbstractDeclarativeCommand
</span><del>-from webkitpy.webkit_logging import log
</del><ins>+from webkitpy.common.system.deprecated_logging import log
</ins><span class="cx"> 
</span><span class="cx"> 
</span><span class="cx"> class BugsToCommit(AbstractDeclarativeCommand):
</span></span></pre></div>
<a id="trunkWebKitToolsScriptswebkitpytoolcommandsqueuespy"></a>
<div class="modfile"><h4>Modified: trunk/WebKitTools/Scripts/webkitpy/tool/commands/queues.py (56543 => 56544)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKitTools/Scripts/webkitpy/tool/commands/queues.py        2010-03-25 14:31:22 UTC (rev 56543)
+++ trunk/WebKitTools/Scripts/webkitpy/tool/commands/queues.py        2010-03-25 14:46:36 UTC (rev 56544)
</span><span class="lines">@@ -38,7 +38,7 @@
</span><span class="cx"> from webkitpy.common.net.bugzilla import CommitterValidator
</span><span class="cx"> from webkitpy.common.net.statusserver import StatusServer
</span><span class="cx"> from webkitpy.common.system.executive import ScriptError
</span><del>-from webkitpy.webkit_logging import error, log
</del><ins>+from webkitpy.common.system.deprecated_logging import error, log
</ins><span class="cx"> from webkitpy.tool.commands.stepsequence import StepSequenceErrorHandler
</span><span class="cx"> from webkitpy.tool.bot.patchcollection import PersistentPatchCollection, PersistentPatchCollectionDelegate
</span><span class="cx"> from webkitpy.tool.bot.queueengine import QueueEngine, QueueEngineDelegate
</span></span></pre></div>
<a id="trunkWebKitToolsScriptswebkitpytoolcommandssheriffbotpy"></a>
<div class="modfile"><h4>Modified: trunk/WebKitTools/Scripts/webkitpy/tool/commands/sheriffbot.py (56543 => 56544)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKitTools/Scripts/webkitpy/tool/commands/sheriffbot.py        2010-03-25 14:31:22 UTC (rev 56543)
+++ trunk/WebKitTools/Scripts/webkitpy/tool/commands/sheriffbot.py        2010-03-25 14:46:36 UTC (rev 56544)
</span><span class="lines">@@ -29,7 +29,7 @@
</span><span class="cx"> import os
</span><span class="cx"> 
</span><span class="cx"> from webkitpy.tool.commands.queues import AbstractQueue
</span><del>-from webkitpy.webkit_logging import log
</del><ins>+from webkitpy.common.system.deprecated_logging import log
</ins><span class="cx"> from webkitpy.common.config.ports import WebKitPort
</span><span class="cx"> 
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkWebKitToolsScriptswebkitpytoolcommandsstepsequencepy"></a>
<div class="modfile"><h4>Modified: trunk/WebKitTools/Scripts/webkitpy/tool/commands/stepsequence.py (56543 => 56544)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKitTools/Scripts/webkitpy/tool/commands/stepsequence.py        2010-03-25 14:31:22 UTC (rev 56543)
+++ trunk/WebKitTools/Scripts/webkitpy/tool/commands/stepsequence.py        2010-03-25 14:46:36 UTC (rev 56544)
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx"> from webkitpy.common.system.executive import ScriptError
</span><span class="cx"> from webkitpy.common.checkout.scm import CheckoutNeedsUpdate
</span><span class="cx"> from webkitpy.tool.bot.queueengine import QueueEngine
</span><del>-from webkitpy.webkit_logging import log
</del><ins>+from webkitpy.common.system.deprecated_logging import log
</ins><span class="cx"> 
</span><span class="cx"> 
</span><span class="cx"> class StepSequenceErrorHandler():
</span></span></pre></div>
<a id="trunkWebKitToolsScriptswebkitpytoolcommandsuploadpy"></a>
<div class="modfile"><h4>Modified: trunk/WebKitTools/Scripts/webkitpy/tool/commands/upload.py (56543 => 56544)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKitTools/Scripts/webkitpy/tool/commands/upload.py        2010-03-25 14:31:22 UTC (rev 56543)
+++ trunk/WebKitTools/Scripts/webkitpy/tool/commands/upload.py        2010-03-25 14:46:36 UTC (rev 56544)
</span><span class="lines">@@ -45,7 +45,7 @@
</span><span class="cx"> from webkitpy.tool.grammar import pluralize, join_with_separators
</span><span class="cx"> from webkitpy.tool.comments import bug_comment_from_svn_revision
</span><span class="cx"> from webkitpy.tool.multicommandtool import AbstractDeclarativeCommand
</span><del>-from webkitpy.webkit_logging import error, log
</del><ins>+from webkitpy.common.system.deprecated_logging import error, log
</ins><span class="cx"> 
</span><span class="cx"> class CommitMessageForCurrentDiff(AbstractDeclarativeCommand):
</span><span class="cx">     name = &quot;commit-message&quot;
</span></span></pre></div>
<a id="trunkWebKitToolsScriptswebkitpytoolmainpy"></a>
<div class="modfile"><h4>Modified: trunk/WebKitTools/Scripts/webkitpy/tool/main.py (56543 => 56544)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKitTools/Scripts/webkitpy/tool/main.py        2010-03-25 14:31:22 UTC (rev 56543)
+++ trunk/WebKitTools/Scripts/webkitpy/tool/main.py        2010-03-25 14:46:36 UTC (rev 56544)
</span><span class="lines">@@ -46,7 +46,7 @@
</span><span class="cx"> from webkitpy.tool.commands.sheriffbot import *
</span><span class="cx"> from webkitpy.tool.commands.upload import *
</span><span class="cx"> from webkitpy.tool.multicommandtool import MultiCommandTool
</span><del>-from webkitpy.webkit_logging import log
</del><ins>+from webkitpy.common.system.deprecated_logging import log
</ins><span class="cx"> 
</span><span class="cx"> 
</span><span class="cx"> class WebKitPatch(MultiCommandTool):
</span></span></pre></div>
<a id="trunkWebKitToolsScriptswebkitpytoolmocktoolpy"></a>
<div class="modfile"><h4>Modified: trunk/WebKitTools/Scripts/webkitpy/tool/mocktool.py (56543 => 56544)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKitTools/Scripts/webkitpy/tool/mocktool.py        2010-03-25 14:31:22 UTC (rev 56543)
+++ trunk/WebKitTools/Scripts/webkitpy/tool/mocktool.py        2010-03-25 14:46:36 UTC (rev 56544)
</span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx"> from webkitpy.common.checkout.scm import CommitMessage
</span><span class="cx"> from webkitpy.common.net.bugzilla import Bug, Attachment
</span><span class="cx"> from webkitpy.thirdparty.mock import Mock
</span><del>-from webkitpy.webkit_logging import log
</del><ins>+from webkitpy.common.system.deprecated_logging import log
</ins><span class="cx"> 
</span><span class="cx"> 
</span><span class="cx"> def _id_to_object_dictionary(*objects):
</span></span></pre></div>
<a id="trunkWebKitToolsScriptswebkitpytoolmulticommandtoolpy"></a>
<div class="modfile"><h4>Modified: trunk/WebKitTools/Scripts/webkitpy/tool/multicommandtool.py (56543 => 56544)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKitTools/Scripts/webkitpy/tool/multicommandtool.py        2010-03-25 14:31:22 UTC (rev 56543)
+++ trunk/WebKitTools/Scripts/webkitpy/tool/multicommandtool.py        2010-03-25 14:46:36 UTC (rev 56544)
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx"> from optparse import OptionParser, IndentedHelpFormatter, SUPPRESS_USAGE, make_option
</span><span class="cx"> 
</span><span class="cx"> from webkitpy.tool.grammar import pluralize
</span><del>-from webkitpy.webkit_logging import log
</del><ins>+from webkitpy.common.system.deprecated_logging import log
</ins><span class="cx"> 
</span><span class="cx"> 
</span><span class="cx"> class Command(object):
</span></span></pre></div>
<a id="trunkWebKitToolsScriptswebkitpytoolstepsabstractsteppy"></a>
<div class="modfile"><h4>Modified: trunk/WebKitTools/Scripts/webkitpy/tool/steps/abstractstep.py (56543 => 56544)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKitTools/Scripts/webkitpy/tool/steps/abstractstep.py        2010-03-25 14:31:22 UTC (rev 56543)
+++ trunk/WebKitTools/Scripts/webkitpy/tool/steps/abstractstep.py        2010-03-25 14:46:36 UTC (rev 56544)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
</span><span class="cx"> # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> 
</span><del>-from webkitpy.webkit_logging import log
</del><ins>+from webkitpy.common.system.deprecated_logging import log
</ins><span class="cx"> from webkitpy.common.config.ports import WebKitPort
</span><span class="cx"> 
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkWebKitToolsScriptswebkitpytoolstepsapplypatchpy"></a>
<div class="modfile"><h4>Modified: trunk/WebKitTools/Scripts/webkitpy/tool/steps/applypatch.py (56543 => 56544)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKitTools/Scripts/webkitpy/tool/steps/applypatch.py        2010-03-25 14:31:22 UTC (rev 56543)
+++ trunk/WebKitTools/Scripts/webkitpy/tool/steps/applypatch.py        2010-03-25 14:46:36 UTC (rev 56544)
</span><span class="lines">@@ -28,7 +28,7 @@
</span><span class="cx"> 
</span><span class="cx"> from webkitpy.tool.steps.abstractstep import AbstractStep
</span><span class="cx"> from webkitpy.tool.steps.options import Options
</span><del>-from webkitpy.webkit_logging import log
</del><ins>+from webkitpy.common.system.deprecated_logging import log
</ins><span class="cx"> 
</span><span class="cx"> class ApplyPatch(AbstractStep):
</span><span class="cx">     @classmethod
</span></span></pre></div>
<a id="trunkWebKitToolsScriptswebkitpytoolstepsbuildpy"></a>
<div class="modfile"><h4>Modified: trunk/WebKitTools/Scripts/webkitpy/tool/steps/build.py (56543 => 56544)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKitTools/Scripts/webkitpy/tool/steps/build.py        2010-03-25 14:31:22 UTC (rev 56543)
+++ trunk/WebKitTools/Scripts/webkitpy/tool/steps/build.py        2010-03-25 14:46:36 UTC (rev 56544)
</span><span class="lines">@@ -28,7 +28,7 @@
</span><span class="cx"> 
</span><span class="cx"> from webkitpy.tool.steps.abstractstep import AbstractStep
</span><span class="cx"> from webkitpy.tool.steps.options import Options
</span><del>-from webkitpy.webkit_logging import log
</del><ins>+from webkitpy.common.system.deprecated_logging import log
</ins><span class="cx"> 
</span><span class="cx"> 
</span><span class="cx"> class Build(AbstractStep):
</span></span></pre></div>
<a id="trunkWebKitToolsScriptswebkitpytoolstepscheckstylepy"></a>
<div class="modfile"><h4>Modified: trunk/WebKitTools/Scripts/webkitpy/tool/steps/checkstyle.py (56543 => 56544)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKitTools/Scripts/webkitpy/tool/steps/checkstyle.py        2010-03-25 14:31:22 UTC (rev 56543)
+++ trunk/WebKitTools/Scripts/webkitpy/tool/steps/checkstyle.py        2010-03-25 14:46:36 UTC (rev 56544)
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx"> from webkitpy.common.system.executive import ScriptError
</span><span class="cx"> from webkitpy.tool.steps.abstractstep import AbstractStep
</span><span class="cx"> from webkitpy.tool.steps.options import Options
</span><del>-from webkitpy.webkit_logging import error
</del><ins>+from webkitpy.common.system.deprecated_logging import error
</ins><span class="cx"> 
</span><span class="cx"> class CheckStyle(AbstractStep):
</span><span class="cx">     @classmethod
</span></span></pre></div>
<a id="trunkWebKitToolsScriptswebkitpytoolstepsclosebugpy"></a>
<div class="modfile"><h4>Modified: trunk/WebKitTools/Scripts/webkitpy/tool/steps/closebug.py (56543 => 56544)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKitTools/Scripts/webkitpy/tool/steps/closebug.py        2010-03-25 14:31:22 UTC (rev 56543)
+++ trunk/WebKitTools/Scripts/webkitpy/tool/steps/closebug.py        2010-03-25 14:46:36 UTC (rev 56544)
</span><span class="lines">@@ -28,7 +28,7 @@
</span><span class="cx"> 
</span><span class="cx"> from webkitpy.tool.steps.abstractstep import AbstractStep
</span><span class="cx"> from webkitpy.tool.steps.options import Options
</span><del>-from webkitpy.webkit_logging import log
</del><ins>+from webkitpy.common.system.deprecated_logging import log
</ins><span class="cx"> 
</span><span class="cx"> 
</span><span class="cx"> class CloseBug(AbstractStep):
</span></span></pre></div>
<a id="trunkWebKitToolsScriptswebkitpytoolstepsclosebugforlanddiffpy"></a>
<div class="modfile"><h4>Modified: trunk/WebKitTools/Scripts/webkitpy/tool/steps/closebugforlanddiff.py (56543 => 56544)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKitTools/Scripts/webkitpy/tool/steps/closebugforlanddiff.py        2010-03-25 14:31:22 UTC (rev 56543)
+++ trunk/WebKitTools/Scripts/webkitpy/tool/steps/closebugforlanddiff.py        2010-03-25 14:46:36 UTC (rev 56544)
</span><span class="lines">@@ -29,7 +29,7 @@
</span><span class="cx"> from webkitpy.tool.comments import bug_comment_from_commit_text
</span><span class="cx"> from webkitpy.tool.steps.abstractstep import AbstractStep
</span><span class="cx"> from webkitpy.tool.steps.options import Options
</span><del>-from webkitpy.webkit_logging import log
</del><ins>+from webkitpy.common.system.deprecated_logging import log
</ins><span class="cx"> 
</span><span class="cx"> 
</span><span class="cx"> class CloseBugForLandDiff(AbstractStep):
</span></span></pre></div>
<a id="trunkWebKitToolsScriptswebkitpytoolstepsconfirmdiffpy"></a>
<div class="modfile"><h4>Modified: trunk/WebKitTools/Scripts/webkitpy/tool/steps/confirmdiff.py (56543 => 56544)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKitTools/Scripts/webkitpy/tool/steps/confirmdiff.py        2010-03-25 14:31:22 UTC (rev 56543)
+++ trunk/WebKitTools/Scripts/webkitpy/tool/steps/confirmdiff.py        2010-03-25 14:46:36 UTC (rev 56544)
</span><span class="lines">@@ -28,7 +28,7 @@
</span><span class="cx"> 
</span><span class="cx"> from webkitpy.tool.steps.abstractstep import AbstractStep
</span><span class="cx"> from webkitpy.tool.steps.options import Options
</span><del>-from webkitpy.webkit_logging import error
</del><ins>+from webkitpy.common.system.deprecated_logging import error
</ins><span class="cx"> 
</span><span class="cx"> 
</span><span class="cx"> class ConfirmDiff(AbstractStep):
</span></span></pre></div>
<a id="trunkWebKitToolsScriptswebkitpytoolstepsensurebuildersaregreenpy"></a>
<div class="modfile"><h4>Modified: trunk/WebKitTools/Scripts/webkitpy/tool/steps/ensurebuildersaregreen.py (56543 => 56544)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKitTools/Scripts/webkitpy/tool/steps/ensurebuildersaregreen.py        2010-03-25 14:31:22 UTC (rev 56543)
+++ trunk/WebKitTools/Scripts/webkitpy/tool/steps/ensurebuildersaregreen.py        2010-03-25 14:46:36 UTC (rev 56544)
</span><span class="lines">@@ -28,7 +28,7 @@
</span><span class="cx"> 
</span><span class="cx"> from webkitpy.tool.steps.abstractstep import AbstractStep
</span><span class="cx"> from webkitpy.tool.steps.options import Options
</span><del>-from webkitpy.webkit_logging import error
</del><ins>+from webkitpy.common.system.deprecated_logging import error
</ins><span class="cx"> 
</span><span class="cx"> 
</span><span class="cx"> class EnsureBuildersAreGreen(AbstractStep):
</span></span></pre></div>
<a id="trunkWebKitToolsScriptswebkitpytoolstepsensurelocalcommitifneededpy"></a>
<div class="modfile"><h4>Modified: trunk/WebKitTools/Scripts/webkitpy/tool/steps/ensurelocalcommitifneeded.py (56543 => 56544)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKitTools/Scripts/webkitpy/tool/steps/ensurelocalcommitifneeded.py        2010-03-25 14:31:22 UTC (rev 56543)
+++ trunk/WebKitTools/Scripts/webkitpy/tool/steps/ensurelocalcommitifneeded.py        2010-03-25 14:46:36 UTC (rev 56544)
</span><span class="lines">@@ -28,7 +28,7 @@
</span><span class="cx"> 
</span><span class="cx"> from webkitpy.tool.steps.abstractstep import AbstractStep
</span><span class="cx"> from webkitpy.tool.steps.options import Options
</span><del>-from webkitpy.webkit_logging import error
</del><ins>+from webkitpy.common.system.deprecated_logging import error
</ins><span class="cx"> 
</span><span class="cx"> 
</span><span class="cx"> class EnsureLocalCommitIfNeeded(AbstractStep):
</span></span></pre></div>
<a id="trunkWebKitToolsScriptswebkitpytoolstepsobsoletepatchespy"></a>
<div class="modfile"><h4>Modified: trunk/WebKitTools/Scripts/webkitpy/tool/steps/obsoletepatches.py (56543 => 56544)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKitTools/Scripts/webkitpy/tool/steps/obsoletepatches.py        2010-03-25 14:31:22 UTC (rev 56543)
+++ trunk/WebKitTools/Scripts/webkitpy/tool/steps/obsoletepatches.py        2010-03-25 14:46:36 UTC (rev 56544)
</span><span class="lines">@@ -29,7 +29,7 @@
</span><span class="cx"> from webkitpy.tool.grammar import pluralize
</span><span class="cx"> from webkitpy.tool.steps.abstractstep import AbstractStep
</span><span class="cx"> from webkitpy.tool.steps.options import Options
</span><del>-from webkitpy.webkit_logging import log
</del><ins>+from webkitpy.common.system.deprecated_logging import log
</ins><span class="cx"> 
</span><span class="cx"> 
</span><span class="cx"> class ObsoletePatches(AbstractStep):
</span></span></pre></div>
<a id="trunkWebKitToolsScriptswebkitpytoolstepspreparechangelogpy"></a>
<div class="modfile"><h4>Modified: trunk/WebKitTools/Scripts/webkitpy/tool/steps/preparechangelog.py (56543 => 56544)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKitTools/Scripts/webkitpy/tool/steps/preparechangelog.py        2010-03-25 14:31:22 UTC (rev 56543)
+++ trunk/WebKitTools/Scripts/webkitpy/tool/steps/preparechangelog.py        2010-03-25 14:46:36 UTC (rev 56544)
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx"> from webkitpy.common.system.executive import ScriptError
</span><span class="cx"> from webkitpy.tool.steps.abstractstep import AbstractStep
</span><span class="cx"> from webkitpy.tool.steps.options import Options
</span><del>-from webkitpy.webkit_logging import error
</del><ins>+from webkitpy.common.system.deprecated_logging import error
</ins><span class="cx"> 
</span><span class="cx"> 
</span><span class="cx"> class PrepareChangeLog(AbstractStep):
</span></span></pre></div>
<a id="trunkWebKitToolsScriptswebkitpytoolstepsreopenbugafterrolloutpy"></a>
<div class="modfile"><h4>Modified: trunk/WebKitTools/Scripts/webkitpy/tool/steps/reopenbugafterrollout.py (56543 => 56544)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKitTools/Scripts/webkitpy/tool/steps/reopenbugafterrollout.py        2010-03-25 14:31:22 UTC (rev 56543)
+++ trunk/WebKitTools/Scripts/webkitpy/tool/steps/reopenbugafterrollout.py        2010-03-25 14:46:36 UTC (rev 56544)
</span><span class="lines">@@ -28,7 +28,7 @@
</span><span class="cx"> 
</span><span class="cx"> from webkitpy.tool.comments import bug_comment_from_commit_text
</span><span class="cx"> from webkitpy.tool.steps.abstractstep import AbstractStep
</span><del>-from webkitpy.webkit_logging import log
</del><ins>+from webkitpy.common.system.deprecated_logging import log
</ins><span class="cx"> 
</span><span class="cx"> 
</span><span class="cx"> class ReopenBugAfterRollout(AbstractStep):
</span></span></pre></div>
<a id="trunkWebKitToolsScriptswebkitpytoolstepsruntestspy"></a>
<div class="modfile"><h4>Modified: trunk/WebKitTools/Scripts/webkitpy/tool/steps/runtests.py (56543 => 56544)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKitTools/Scripts/webkitpy/tool/steps/runtests.py        2010-03-25 14:31:22 UTC (rev 56543)
+++ trunk/WebKitTools/Scripts/webkitpy/tool/steps/runtests.py        2010-03-25 14:46:36 UTC (rev 56544)
</span><span class="lines">@@ -28,7 +28,7 @@
</span><span class="cx"> 
</span><span class="cx"> from webkitpy.tool.steps.abstractstep import AbstractStep
</span><span class="cx"> from webkitpy.tool.steps.options import Options
</span><del>-from webkitpy.webkit_logging import log
</del><ins>+from webkitpy.common.system.deprecated_logging import log
</ins><span class="cx"> 
</span><span class="cx"> class RunTests(AbstractStep):
</span><span class="cx">     @classmethod
</span></span></pre></div>
<a id="trunkWebKitToolsScriptswebkitpytoolstepsupdatepy"></a>
<div class="modfile"><h4>Modified: trunk/WebKitTools/Scripts/webkitpy/tool/steps/update.py (56543 => 56544)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKitTools/Scripts/webkitpy/tool/steps/update.py        2010-03-25 14:31:22 UTC (rev 56543)
+++ trunk/WebKitTools/Scripts/webkitpy/tool/steps/update.py        2010-03-25 14:46:36 UTC (rev 56544)
</span><span class="lines">@@ -28,7 +28,7 @@
</span><span class="cx"> 
</span><span class="cx"> from webkitpy.tool.steps.abstractstep import AbstractStep
</span><span class="cx"> from webkitpy.tool.steps.options import Options
</span><del>-from webkitpy.webkit_logging import log
</del><ins>+from webkitpy.common.system.deprecated_logging import log
</ins><span class="cx"> 
</span><span class="cx"> 
</span><span class="cx"> class Update(AbstractStep):
</span></span></pre></div>
<a id="trunkWebKitToolsScriptswebkitpytoolstepsupdatechangelogswithreviewerpy"></a>
<div class="modfile"><h4>Modified: trunk/WebKitTools/Scripts/webkitpy/tool/steps/updatechangelogswithreviewer.py (56543 => 56544)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKitTools/Scripts/webkitpy/tool/steps/updatechangelogswithreviewer.py        2010-03-25 14:31:22 UTC (rev 56543)
+++ trunk/WebKitTools/Scripts/webkitpy/tool/steps/updatechangelogswithreviewer.py        2010-03-25 14:46:36 UTC (rev 56544)
</span><span class="lines">@@ -32,7 +32,7 @@
</span><span class="cx"> from webkitpy.tool.grammar import pluralize
</span><span class="cx"> from webkitpy.tool.steps.abstractstep import AbstractStep
</span><span class="cx"> from webkitpy.tool.steps.options import Options
</span><del>-from webkitpy.webkit_logging import log, error
</del><ins>+from webkitpy.common.system.deprecated_logging import log, error
</ins><span class="cx"> 
</span><span class="cx"> class UpdateChangeLogsWithReviewer(AbstractStep):
</span><span class="cx">     @classmethod
</span></span></pre></div>
<a id="trunkWebKitToolsScriptswebkitpytoolstepsvalidatereviewerpy"></a>
<div class="modfile"><h4>Modified: trunk/WebKitTools/Scripts/webkitpy/tool/steps/validatereviewer.py (56543 => 56544)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKitTools/Scripts/webkitpy/tool/steps/validatereviewer.py        2010-03-25 14:31:22 UTC (rev 56543)
+++ trunk/WebKitTools/Scripts/webkitpy/tool/steps/validatereviewer.py        2010-03-25 14:46:36 UTC (rev 56544)
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx"> 
</span><span class="cx"> from webkitpy.common.checkout.changelog import ChangeLog
</span><span class="cx"> from webkitpy.tool.steps.abstractstep import AbstractStep
</span><del>-from webkitpy.webkit_logging import error
</del><ins>+from webkitpy.common.system.deprecated_logging import error
</ins><span class="cx"> 
</span><span class="cx"> 
</span><span class="cx"> class ValidateReviewer(AbstractStep):
</span></span></pre></div>
<a id="trunkWebKitToolsScriptswebkitpyunittestspy"></a>
<div class="modfile"><h4>Modified: trunk/WebKitTools/Scripts/webkitpy/unittests.py (56543 => 56544)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKitTools/Scripts/webkitpy/unittests.py        2010-03-25 14:31:22 UTC (rev 56543)
+++ trunk/WebKitTools/Scripts/webkitpy/unittests.py        2010-03-25 14:46:36 UTC (rev 56544)
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx"> from webkitpy.python24.unittests import *
</span><span class="cx"> from webkitpy.style.unittests import *
</span><span class="cx"> from webkitpy.tool.unittests import *
</span><del>-from webkitpy.webkit_logging_unittest import *
</del><ins>+from webkitpy.common.system.deprecated_logging_unittest import *
</ins><span class="cx"> 
</span><span class="cx"> # FIXME: This is a hack, but I'm tired of commenting out the test.
</span><span class="cx"> #        See https://bugs.webkit.org/show_bug.cgi?id=31818
</span></span></pre></div>
<a id="trunkWebKitToolsScriptswebkitpywebkit_loggingpy"></a>
<div class="delfile"><h4>Deleted: trunk/WebKitTools/Scripts/webkitpy/webkit_logging.py (56543 => 56544)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKitTools/Scripts/webkitpy/webkit_logging.py        2010-03-25 14:31:22 UTC (rev 56543)
+++ trunk/WebKitTools/Scripts/webkitpy/webkit_logging.py        2010-03-25 14:46:36 UTC (rev 56544)
</span><span class="lines">@@ -1,85 +0,0 @@
</span><del>-# Copyright (c) 2009, Google Inc. All rights reserved.
-# Copyright (c) 2009 Apple Inc. All rights reserved.
-# 
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-# 
-#     * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#     * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-# 
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# &quot;AS IS&quot; AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-# WebKit's Python module for logging
-# This module is now deprecated in favor of python's built-in logging.py.
-
-import os
-import sys
-
-def log(string):
-    print &gt;&gt; sys.stderr, string
-
-def error(string):
-    log(&quot;ERROR: %s&quot; % string)
-    exit(1)
-
-# Simple class to split output between multiple destinations
-class tee:
-    def __init__(self, *files):
-        self.files = files
-
-    def write(self, string):
-        for file in self.files:
-            file.write(string)
-
-class OutputTee:
-    def __init__(self):
-        self._original_stdout = None
-        self._original_stderr = None
-        self._files_for_output = []
-
-    def add_log(self, path):
-        log_file = self._open_log_file(path)
-        self._files_for_output.append(log_file)
-        self._tee_outputs_to_files(self._files_for_output)
-        return log_file
-
-    def remove_log(self, log_file):
-        self._files_for_output.remove(log_file)
-        self._tee_outputs_to_files(self._files_for_output)
-        log_file.close()
-
-    @staticmethod
-    def _open_log_file(log_path):
-        (log_directory, log_name) = os.path.split(log_path)
-        if log_directory and not os.path.exists(log_directory):
-            os.makedirs(log_directory)
-        return open(log_path, 'a+')
-
-    def _tee_outputs_to_files(self, files):
-        if not self._original_stdout:
-            self._original_stdout = sys.stdout
-            self._original_stderr = sys.stderr
-        if files and len(files):
-            sys.stdout = tee(self._original_stdout, *files)
-            sys.stderr = tee(self._original_stderr, *files)
-        else:
-            sys.stdout = self._original_stdout
-            sys.stderr = self._original_stderr
</del></span></pre></div>
<a id="trunkWebKitToolsScriptswebkitpywebkit_logging_unittestpy"></a>
<div class="delfile"><h4>Deleted: trunk/WebKitTools/Scripts/webkitpy/webkit_logging_unittest.py (56543 => 56544)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKitTools/Scripts/webkitpy/webkit_logging_unittest.py        2010-03-25 14:31:22 UTC (rev 56543)
+++ trunk/WebKitTools/Scripts/webkitpy/webkit_logging_unittest.py        2010-03-25 14:46:36 UTC (rev 56544)
</span><span class="lines">@@ -1,61 +0,0 @@
</span><del>-# Copyright (C) 2009 Google Inc. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#    * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#    * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#    * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# &quot;AS IS&quot; AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-import os
-import subprocess
-import StringIO
-import tempfile
-import unittest
-
-from webkitpy.common.system.executive import ScriptError
-from webkitpy.webkit_logging import *
-
-class LoggingTest(unittest.TestCase):
-
-    def assert_log_equals(self, log_input, expected_output):
-        original_stderr = sys.stderr
-        test_stderr = StringIO.StringIO()
-        sys.stderr = test_stderr
-
-        try:
-            log(log_input)
-            actual_output = test_stderr.getvalue()
-        finally:
-            original_stderr = original_stderr
-
-        self.assertEquals(actual_output, expected_output, &quot;log(\&quot;%s\&quot;) expected: %s actual: %s&quot; % (log_input, expected_output, actual_output))
-
-    def test_log(self):
-        self.assert_log_equals(&quot;test&quot;, &quot;test\n&quot;)
-
-        # Test that log() does not throw an exception when passed an object instead of a string.
-        self.assert_log_equals(ScriptError(message=&quot;ScriptError&quot;), &quot;ScriptError\n&quot;)
-
-
-if __name__ == '__main__':
-    unittest.main()
</del></span></pre>
</div>
</div>

</body>
</html>