<!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>[281167] 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/281167">281167</a></dd>
<dt>Author</dt> <dd>jbedard@apple.com</dd>
<dt>Date</dt> <dd>2021-08-17 15:16:18 -0700 (Tue, 17 Aug 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>[webkitcorepy] Return SourceFileLoader in find_module
https://bugs.webkit.org/show_bug.cgi?id=229172
<rdar://problem/82006256>

Reviewed by Stephanie Lewis.

* Scripts/libraries/webkitcorepy/webkitcorepy/autoinstall.py:
(AutoInstall.find_module): Return SourceFileLoader object in Python 3.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptslibrarieswebkitcorepysetuppy">trunk/Tools/Scripts/libraries/webkitcorepy/setup.py</a></li>
<li><a href="#trunkToolsScriptslibrarieswebkitcorepywebkitcorepy__init__py">trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py</a></li>
<li><a href="#trunkToolsScriptslibrarieswebkitcorepywebkitcorepyautoinstallpy">trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/autoinstall.py</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (281166 => 281167)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog    2021-08-17 21:42:58 UTC (rev 281166)
+++ trunk/Tools/ChangeLog       2021-08-17 22:16:18 UTC (rev 281167)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2021-08-17  Jonathan Bedard  <jbedard@apple.com>
+
+        [webkitcorepy] Return SourceFileLoader in find_module
+        https://bugs.webkit.org/show_bug.cgi?id=229172
+        <rdar://problem/82006256>
+
+        Reviewed by Stephanie Lewis.
+
+        * Scripts/libraries/webkitcorepy/webkitcorepy/autoinstall.py:
+        (AutoInstall.find_module): Return SourceFileLoader object in Python 3.
+
</ins><span class="cx"> 2021-08-17  Lauro Moura  <lmoura@igalia.com>
</span><span class="cx"> 
</span><span class="cx">         [GLIB] Avoid getting stuck searching for revision in some cases
</span></span></pre></div>
<a id="trunkToolsScriptslibrarieswebkitcorepysetuppy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/libraries/webkitcorepy/setup.py (281166 => 281167)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/libraries/webkitcorepy/setup.py      2021-08-17 21:42:58 UTC (rev 281166)
+++ trunk/Tools/Scripts/libraries/webkitcorepy/setup.py 2021-08-17 22:16:18 UTC (rev 281167)
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx"> 
</span><span class="cx"> setup(
</span><span class="cx">     name='webkitcorepy',
</span><del>-    version='0.8.2',
</del><ins>+    version='0.8.3',
</ins><span class="cx">     description='Library containing various Python support classes and functions.',
</span><span class="cx">     long_description=readme(),
</span><span class="cx">     classifiers=[
</span></span></pre></div>
<a id="trunkToolsScriptslibrarieswebkitcorepywebkitcorepy__init__py"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py (281166 => 281167)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py      2021-08-17 21:42:58 UTC (rev 281166)
+++ trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py 2021-08-17 22:16:18 UTC (rev 281167)
</span><span class="lines">@@ -40,7 +40,7 @@
</span><span class="cx"> from webkitcorepy.measure_time import MeasureTime
</span><span class="cx"> from webkitcorepy.nested_fuzzy_dict import NestedFuzzyDict
</span><span class="cx"> 
</span><del>-version = Version(0, 8, 2)
</del><ins>+version = Version(0, 8, 3)
</ins><span class="cx"> 
</span><span class="cx"> from webkitcorepy.autoinstall import Package, AutoInstall
</span><span class="cx"> if sys.version_info > (3, 0):
</span></span></pre></div>
<a id="trunkToolsScriptslibrarieswebkitcorepywebkitcorepyautoinstallpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/autoinstall.py (281166 => 281167)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/autoinstall.py   2021-08-17 21:42:58 UTC (rev 281166)
+++ trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/autoinstall.py      2021-08-17 22:16:18 UTC (rev 281167)
</span><span class="lines">@@ -40,9 +40,10 @@
</span><span class="cx"> from webkitcorepy.version import Version
</span><span class="cx"> 
</span><span class="cx"> if sys.version_info > (3, 0):
</span><ins>+    from html.parser import HTMLParser
+    from importlib import machinery as importmachinery
</ins><span class="cx">     from urllib.request import urlopen
</span><span class="cx">     from urllib.error import URLError
</span><del>-    from html.parser import HTMLParser
</del><span class="cx"> else:
</span><span class="cx">     from urllib2 import urlopen, URLError
</span><span class="cx">     from HTMLParser import HTMLParser
</span><span class="lines">@@ -591,12 +592,32 @@
</span><span class="cx">     @classmethod
</span><span class="cx">     def find_module(cls, fullname, path=None):
</span><span class="cx">         if not cls.enabled() or path is not None:
</span><del>-            return
</del><ins>+            return None
</ins><span class="cx"> 
</span><span class="cx">         name = fullname.split('.')[0]
</span><del>-        if cls.packages.get(name):
-            cls.install(name)
</del><ins>+        if not cls.packages.get(name) or not cls.directory:
+            return None
</ins><span class="cx"> 
</span><ins>+        cls.install(name)
+        if sys.version_info < (3, 0):
+            # Python 2 works fine with the default module finder, once we've installed the module in question
+            return None
+
+        path = cls.directory
+        for part in fullname.split('.'):
+            path = os.path.join(path, part)
+            for ext in ('', '.py', '.pyc', '.py3', '.pyo'):
+                candidate = '{}{}'.format(path, ext)
+                if os.path.exists(candidate):
+                    path = candidate
+                    break
+            if not os.path.isdir(path):
+                break
+        if os.path.isdir(path):
+            path = os.path.join(path, '__init__.py')
+
+        return importmachinery.SourceFileLoader(name, path)
+
</ins><span class="cx">     @classmethod
</span><span class="cx">     def tags(cls):
</span><span class="cx">         from packaging import tags
</span></span></pre>
</div>
</div>

</body>
</html>