ProjectHentai/nonebot2
6
0
Fork 0
mirror of https://github.com/nonebot/nonebot2.git synced 2025-07-27 08:11:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

🐛 fix import recursion when same plugin and file name (fix #401)

Browse Source
This commit is contained in:
yanyongyu
2021-06-15 01:13:05 +08:00
parent ddd96271b0
commit 8e6f8fada8
3 changed files with 6 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
nonebot/plugin/manager.py
View File

@ -93,7 +93,7 @@ class PluginManager:
if not prefix.startswith(_internal_space.__name__):
prefix = _internal_space.__name__
module = _InternalModule(prefix, self)
sys.modules[module.__name__] = module
sys.modules[module.__name__] = module # type: ignore
setattr(_internal_space, internal_id, module)
return module
@ -177,11 +177,11 @@ class PluginFinder(MetaPathFinder):
newname = manager._rewrite_module_name(fullname)
if newname:
spec = PathFinder.find_spec(
newname, [*manager.search_path, *(path or sys.path)],
newname, path or [*manager.search_path, *sys.path],
target)
if spec:
spec.loader = PluginLoader(manager, newname,
spec.origin)
spec.loader = PluginLoader( # type: ignore
manager, newname, spec.origin)
return spec
index -= 1
return None