<!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>[160085] 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/160085">160085</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2013-12-04 03:19:56 -0800 (Wed, 04 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove codecs and os dependencies from filereader.py in webkitpy/style.
https://bugs.webkit.org/show_bug.cgi?id=124719
Although TextFileReader requires a FileSystem it circumvents it in two places!
We should use the FileSystem only and remove codecs and os imports.
Patch by László Langó <lango@inf.u-szeged.hu> on 2013-12-04
Reviewed by Zoltan Herczeg.
* Scripts/webkitpy/common/system/filesystem.py:
(FileSystem.open_stdin): Moved from TextFileReader
* Scripts/webkitpy/style/filereader.py:
(TextFileReader._read_lines): use FileSystem instead of calling codecs.open directly
(TextFileReader._process_directory): use FileSystem instead of calling os.walk directly</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptswebkitpycommonsystemfilesystempy">trunk/Tools/Scripts/webkitpy/common/system/filesystem.py</a></li>
<li><a href="#trunkToolsScriptswebkitpystylefilereaderpy">trunk/Tools/Scripts/webkitpy/style/filereader.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (160084 => 160085)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2013-12-04 11:11:33 UTC (rev 160084)
+++ trunk/Tools/ChangeLog 2013-12-04 11:19:56 UTC (rev 160085)
</span><span class="lines">@@ -1,5 +1,21 @@
</span><span class="cx"> 2013-12-04 László Langó <lango@inf.u-szeged.hu>
</span><span class="cx">
</span><ins>+ Remove codecs and os dependencies from filereader.py in webkitpy/style.
+ https://bugs.webkit.org/show_bug.cgi?id=124719
+
+ Although TextFileReader requires a FileSystem it circumvents it in two places!
+ We should use the FileSystem only and remove codecs and os imports.
+
+ Reviewed by Zoltan Herczeg.
+
+ * Scripts/webkitpy/common/system/filesystem.py:
+ (FileSystem.open_stdin): Moved from TextFileReader
+ * Scripts/webkitpy/style/filereader.py:
+ (TextFileReader._read_lines): use FileSystem instead of calling codecs.open directly
+ (TextFileReader._process_directory): use FileSystem instead of calling os.walk directly
+
+2013-12-04 László Langó <lango@inf.u-szeged.hu>
+
</ins><span class="cx"> check-webkit-style should check member initialization indentation.
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=124820
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpycommonsystemfilesystempy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/common/system/filesystem.py (160084 => 160085)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/common/system/filesystem.py 2013-12-04 11:11:33 UTC (rev 160084)
+++ trunk/Tools/Scripts/webkitpy/common/system/filesystem.py 2013-12-04 11:19:56 UTC (rev 160085)
</span><span class="lines">@@ -206,6 +206,12 @@
</span><span class="cx"> def open_text_file_for_writing(self, path):
</span><span class="cx"> return codecs.open(path, 'w', 'utf8')
</span><span class="cx">
</span><ins>+ def open_stdin(self):
+ return codecs.StreamReaderWriter(sys.stdin,
+ codecs.getreader('utf8'),
+ codecs.getwriter('utf8'),
+ 'replace')
+
</ins><span class="cx"> def read_text_file(self, path):
</span><span class="cx"> """Return the contents of the file at the given path as a Unicode string.
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpystylefilereaderpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/style/filereader.py (160084 => 160085)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/style/filereader.py 2013-12-04 11:11:33 UTC (rev 160084)
+++ trunk/Tools/Scripts/webkitpy/style/filereader.py 2013-12-04 11:19:56 UTC (rev 160085)
</span><span class="lines">@@ -30,9 +30,7 @@
</span><span class="cx">
</span><span class="cx"> """Supports reading and processing text files."""
</span><span class="cx">
</span><del>-import codecs
</del><span class="cx"> import logging
</span><del>-import os
</del><span class="cx"> import sys
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -76,17 +74,13 @@
</span><span class="cx"> """
</span><span class="cx"> # Support the UNIX convention of using "-" for stdin.
</span><span class="cx"> if file_path == '-':
</span><del>- file = codecs.StreamReaderWriter(sys.stdin,
- codecs.getreader('utf8'),
- codecs.getwriter('utf8'),
- 'replace')
</del><ins>+ file = self.filesystem.open_stdin()
</ins><span class="cx"> else:
</span><span class="cx"> # We do not open the file with universal newline support
</span><span class="cx"> # (codecs does not support it anyway), so the resulting
</span><span class="cx"> # lines contain trailing "\r" characters if we are reading
</span><span class="cx"> # a file with CRLF endings.
</span><del>- # FIXME: This should use self.filesystem
- file = codecs.open(file_path, 'r', 'utf8', 'replace')
</del><ins>+ file = self.filesystem.open_text_file_for_reading(file_path)
</ins><span class="cx">
</span><span class="cx"> try:
</span><span class="cx"> contents = file.read()
</span><span class="lines">@@ -131,11 +125,8 @@
</span><span class="cx">
</span><span class="cx"> def _process_directory(self, directory):
</span><span class="cx"> """Process all files in the given directory, recursively."""
</span><del>- # FIXME: We should consider moving to self.filesystem.files_under() (or adding walk() to FileSystem)
- for dir_path, dir_names, file_names in os.walk(directory):
- for file_name in file_names:
- file_path = self.filesystem.join(dir_path, file_name)
- self.process_file(file_path)
</del><ins>+ for file_path in self.filesystem.files_under(directory):
+ self.process_file(file_path)
</ins><span class="cx">
</span><span class="cx"> def process_paths(self, paths):
</span><span class="cx"> for path in paths:
</span></span></pre>
</div>
</div>
</body>
</html>