<!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>[206441] 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/206441">206441</a></dd>
<dt>Author</dt> <dd>dbates@webkit.org</dd>
<dt>Date</dt> <dd>2016-09-27 10:18:55 -0700 (Tue, 27 Sep 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Cannot run dump-class-layout; dies with "global name 'lldb' is not defined"
https://bugs.webkit.org/show_bug.cgi?id=162585
Reviewed by Simon Fraser.
Import the lldb module into the global namespace.
Currently dump-class-layout imports the lldb Python module using the import statement
from the helper function import_lldb. The import statement imports the names of the
specified module into the scope of import_lldb(); => the names imported from this
module cannot be accessed outside the scope of import_lldb(). Other functions in
this script assume that the lldb module was imported into the global scope. We should
import the module lldb into the global scope, if it exists, so that these functions
can find it. Otherwise, we should emit a human readable error message that explains
that we failed to import the lldb module.
Also remove some unnecessary semicolon characters.
* Scripts/dump-class-layout:
(import_lldb):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptsdumpclasslayout">trunk/Tools/Scripts/dump-class-layout</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (206440 => 206441)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-09-27 17:14:32 UTC (rev 206440)
+++ trunk/Tools/ChangeLog 2016-09-27 17:18:55 UTC (rev 206441)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2016-09-27 Daniel Bates <dabates@apple.com>
+
+ Cannot run dump-class-layout; dies with "global name 'lldb' is not defined"
+ https://bugs.webkit.org/show_bug.cgi?id=162585
+
+ Reviewed by Simon Fraser.
+
+ Import the lldb module into the global namespace.
+
+ Currently dump-class-layout imports the lldb Python module using the import statement
+ from the helper function import_lldb. The import statement imports the names of the
+ specified module into the scope of import_lldb(); => the names imported from this
+ module cannot be accessed outside the scope of import_lldb(). Other functions in
+ this script assume that the lldb module was imported into the global scope. We should
+ import the module lldb into the global scope, if it exists, so that these functions
+ can find it. Otherwise, we should emit a human readable error message that explains
+ that we failed to import the lldb module.
+
+ Also remove some unnecessary semicolon characters.
+
+ * Scripts/dump-class-layout:
+ (import_lldb):
+
</ins><span class="cx"> 2016-09-27 Jer Noble <jer.noble@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove deprecated ENCRYPTED_MEDIA implementation.
</span></span></pre></div>
<a id="trunkToolsScriptsdumpclasslayout"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/dump-class-layout (206440 => 206441)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/dump-class-layout 2016-09-27 17:14:32 UTC (rev 206440)
+++ trunk/Tools/Scripts/dump-class-layout 2016-09-27 17:18:55 UTC (rev 206441)
</span><span class="lines">@@ -42,11 +42,17 @@
</span><span class="cx"> return subprocess.check_output(["xcode-select", "--print-path"])
</span><span class="cx">
</span><span class="cx"> def import_lldb():
</span><del>- xcode_contents_path = os.path.split(developer_dir())[0];
- lldb_framework_path = os.path.join(xcode_contents_path, "SharedFrameworks", "LLDB.framework", "Resources", "Python");
</del><ins>+ xcode_contents_path = os.path.split(developer_dir())[0]
+ lldb_framework_path = os.path.join(xcode_contents_path, "SharedFrameworks", "LLDB.framework", "Resources", "Python")
</ins><span class="cx"> sys.path.append(lldb_framework_path)
</span><del>- import lldb
</del><span class="cx">
</span><ins>+ LLDB_MODULE_NAME = "lldb"
+ try:
+ globals()[LLDB_MODULE_NAME] = __import__(LLDB_MODULE_NAME)
+ except ImportError:
+ print "Failed to import {} from {}".format(LLDB_MODULE_NAME, lldb_framework_path)
+ sys.exit(1)
+
</ins><span class="cx"> def find_build_directory():
</span><span class="cx"> return
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>