xCAT/confluent
2
0
Fork 0
mirror of https://github.com/xcat2/confluent.git synced 2026-09-28 08:10:55 +00:00
Code Issues Projects Releases Wiki Activity

Stop the plugin loader from shadowing the plugin module (F402)

Browse Source 
load_plugins() used `plugin` as the loop variable for plugin file names,
which shadows `import confluent.plugin as plugin` for the whole function.
Nothing in the function needed the module, so this was latent rather than
broken, but the next line that does need it would have failed oddly.
This commit is contained in:
Markus Hilger
2026-08-09 07:09:46 +02:00
parent 9984bff909
commit 607845bacf
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
confluent_server/confluent/core.py
+11 -11
View File
@@ -131,24 +131,24 @@ def load_plugins():
continue
sys.path.insert(1, plugindir)
# two passes, to avoid adding both py and pyc files
for plugin in os.listdir(plugindir):
if plugin.startswith('.'):
for pluginname in os.listdir(plugindir):
if pluginname.startswith('.'):
continue
if '__pycache__' in plugin:
if '__pycache__' in pluginname:
continue
(plugin, plugtype) = os.path.splitext(plugin)
(pluginname, plugtype) = os.path.splitext(pluginname)
if plugtype == '.sh':
pluginmap[plugin] = shellmodule.Plugin(
os.path.join(plugindir, plugin + '.sh'))
elif "__init__" not in plugin:
plugins.add(plugin)
for plugin in plugins:
tmpmod = __import__(plugin)
pluginmap[pluginname] = shellmodule.Plugin(
os.path.join(plugindir, pluginname + '.sh'))
elif "__init__" not in pluginname:
plugins.add(pluginname)
for pluginname in plugins:
tmpmod = __import__(pluginname)
if 'plugin_names' in tmpmod.__dict__:
for name in tmpmod.plugin_names:
pluginmap[name] = tmpmod
else:
pluginmap[plugin] = tmpmod
pluginmap[pluginname] = tmpmod
_register_resource(tmpmod)
plugins.clear()
# restore path to not include the plugindir