Merge pull request #7576 from deliangyang/main

Import plugins relative to the module
This commit is contained in:
Andrew Murray 2023-12-14 18:28:22 +11:00 committed by GitHub
commit ac1f10fa82
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -355,10 +355,11 @@ def init():
if _initialized >= 2: if _initialized >= 2:
return 0 return 0
parent_name = __name__.rpartition(".")[0]
for plugin in _plugins: for plugin in _plugins:
try: try:
logger.debug("Importing %s", plugin) logger.debug("Importing %s", plugin)
__import__(f"PIL.{plugin}", globals(), locals(), []) __import__(f"{parent_name}.{plugin}", globals(), locals(), [])
except ImportError as e: except ImportError as e:
logger.debug("Image: failed to import %s: %s", plugin, e) logger.debug("Image: failed to import %s: %s", plugin, e)