Changeset 281167 in webkit

Timestamp:

Aug 17, 2021, 3:16:18 PM (5 years ago)

Author:

Jonathan Bedard

Message:

[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.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/libraries/webkitcorepy/setup.py (modified) (1 diff)
• Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py (modified) (1 diff)
• Scripts/libraries/webkitcorepy/webkitcorepy/autoinstall.py (modified) (2 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+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.
+
 2021-08-17  Lauro Moura  <lmoura@igalia.com>
 

trunk/Tools/Scripts/libraries/webkitcorepy/setup.py

@@ -31 +31 @@
 setup(
     name='webkitcorepy',
-    version='0.8.2',
+    version='0.8.3',
     description='Library containing various Python support classes and functions.',
     long_description=readme(),

trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py

@@ -41 +41 @@
 from webkitcorepy.nested_fuzzy_dict import NestedFuzzyDict
 
-version = Version(0, 8, 2)
+version = Version(0, 8, 3)
 
 from webkitcorepy.autoinstall import Package, AutoInstall

trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/autoinstall.py

@@ -41 +41 @@
 
 if sys.version_info > (3, 0):
+    from html.parser import HTMLParser
+    from importlib import machinery as importmachinery
     from urllib.request import urlopen
     from urllib.error import URLError
-    from html.parser import HTMLParser
 else:
     from urllib2 import urlopen, URLError
@@ -592 +593 @@
     def find_module(cls, fullname, path=None):
         if not cls.enabled() or path is not None:
-            return
+            return None
 
         name = fullname.split('.')[0]
-        if cls.packages.get(name):
-            cls.install(name)
+        if not cls.packages.get(name) or not cls.directory:
+            return None
+
+        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)
 
     @classmethod