Title: [281167] trunk/Tools
- Revision
- 281167
- Author
- jbed...@apple.com
- Date
- 2021-08-17 15:16:18 -0700 (Tue, 17 Aug 2021)
Log 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.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (281166 => 281167)
--- trunk/Tools/ChangeLog 2021-08-17 21:42:58 UTC (rev 281166)
+++ trunk/Tools/ChangeLog 2021-08-17 22:16:18 UTC (rev 281167)
@@ -1,3 +1,14 @@
+2021-08-17 Jonathan Bedard <jbed...@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 <lmo...@igalia.com>
[GLIB] Avoid getting stuck searching for revision in some cases
Modified: trunk/Tools/Scripts/libraries/webkitcorepy/setup.py (281166 => 281167)
--- 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)
@@ -30,7 +30,7 @@
setup(
name='webkitcorepy',
- version='0.8.2',
+ version='0.8.3',
description='Library containing various Python support classes and functions.',
long_description=readme(),
classifiers=[
Modified: trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py (281166 => 281167)
--- 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)
@@ -40,7 +40,7 @@
from webkitcorepy.measure_time import MeasureTime
from webkitcorepy.nested_fuzzy_dict import NestedFuzzyDict
-version = Version(0, 8, 2)
+version = Version(0, 8, 3)
from webkitcorepy.autoinstall import Package, AutoInstall
if sys.version_info > (3, 0):
Modified: trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/autoinstall.py (281166 => 281167)
--- 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)
@@ -40,9 +40,10 @@
from webkitcorepy.version import Version
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
from HTMLParser import HTMLParser
@@ -591,12 +592,32 @@
@classmethod
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
def tags(cls):
from packaging import tags
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
