<!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>[162250] trunk/Source/JavaScriptCore</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/162250">162250</a></dd>
<dt>Author</dt> <dd>zandobersek@gmail.com</dd>
<dt>Date</dt> <dd>2014-01-18 01:04:36 -0800 (Sat, 18 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Inspector scripts are not compatible with Python v3
https://bugs.webkit.org/show_bug.cgi?id=127128
Reviewed by Benjamin Poulain.
* inspector/scripts/generate-combined-inspector-json.py: Turn print statements into print function calls.
* inspector/scripts/jsmin.py: Try importing the StringIO class from the StringIO module (which will work for
Python v2) or, on import error, import the class from the io module (which will work for Python v3).</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorscriptsgeneratecombinedinspectorjsonpy">trunk/Source/JavaScriptCore/inspector/scripts/generate-combined-inspector-json.py</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorscriptsjsminpy">trunk/Source/JavaScriptCore/inspector/scripts/jsmin.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (162249 => 162250)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-01-18 08:22:23 UTC (rev 162249)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-01-18 09:04:36 UTC (rev 162250)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2014-01-18 Zan Dobersek <zdobersek@igalia.com>
+
+ Inspector scripts are not compatible with Python v3
+ https://bugs.webkit.org/show_bug.cgi?id=127128
+
+ Reviewed by Benjamin Poulain.
+
+ * inspector/scripts/generate-combined-inspector-json.py: Turn print statements into print function calls.
+ * inspector/scripts/jsmin.py: Try importing the StringIO class from the StringIO module (which will work for
+ Python v2) or, on import error, import the class from the io module (which will work for Python v3).
+
</ins><span class="cx"> 2014-01-17 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> String::is8Bit() crashes if m_impl is null, handle this.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptsgeneratecombinedinspectorjsonpy"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/generate-combined-inspector-json.py (162249 => 162250)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/generate-combined-inspector-json.py 2014-01-18 08:22:23 UTC (rev 162249)
+++ trunk/Source/JavaScriptCore/inspector/scripts/generate-combined-inspector-json.py 2014-01-18 09:04:36 UTC (rev 162250)
</span><span class="lines">@@ -29,7 +29,7 @@
</span><span class="cx"> import sys
</span><span class="cx">
</span><span class="cx"> if len(sys.argv) < 2:
</span><del>- print "usage: %s [json files or directory of json files ...]" % os.path.basename(sys.argv[0])
</del><ins>+ print("usage: %s [json files or directory of json files ...]" % os.path.basename(sys.argv[0]))
</ins><span class="cx"> sys.exit(1)
</span><span class="cx">
</span><span class="cx"> files = []
</span><span class="lines">@@ -47,12 +47,12 @@
</span><span class="cx"> # Validate each file is valid JSON and that there is a "domain" key.
</span><span class="cx">
</span><span class="cx"> first = True
</span><del>-print "{\"domains\":["
</del><ins>+print("{\"domains\":[")
</ins><span class="cx"> for file in files:
</span><span class="cx"> if first:
</span><span class="cx"> first = False
</span><span class="cx"> else:
</span><del>- print ","
</del><ins>+ print(",")
</ins><span class="cx">
</span><span class="cx"> string = open(file).read()
</span><span class="cx">
</span><span class="lines">@@ -64,5 +64,5 @@
</span><span class="cx"> sys.stderr.write("File \"%s\" does not contain valid JSON:\n" % file)
</span><span class="cx"> raise
</span><span class="cx">
</span><del>- print string.rstrip()
-print "]}"
</del><ins>+ print(string.rstrip())
+print("]}")
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptsjsminpy"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/jsmin.py (162249 => 162250)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/jsmin.py 2014-01-18 08:22:23 UTC (rev 162249)
+++ trunk/Source/JavaScriptCore/inspector/scripts/jsmin.py 2014-01-18 09:04:36 UTC (rev 162250)
</span><span class="lines">@@ -30,7 +30,11 @@
</span><span class="cx"> # SOFTWARE.
</span><span class="cx"> # */
</span><span class="cx">
</span><del>-from StringIO import StringIO
</del><ins>+# Import StringIO from either the StringIO module (Python 2.x) or the io module (Python 3.x).
+try:
+ from StringIO import StringIO
+except ImportError:
+ from io import StringIO
</ins><span class="cx">
</span><span class="cx"> def jsmin(js):
</span><span class="cx"> ins = StringIO(js)
</span></span></pre>
</div>
</div>
</body>
</html>