From c3cb4e11318057d2b1bf1d8eda3169a565652372 Mon Sep 17 00:00:00 2001 From: Laurent Monin Date: Fri, 5 Apr 2019 13:05:24 +0200 Subject: [PATCH] PluginManager.load_plugin() -> _load_plugin_from_directory() --- picard/plugin.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/picard/plugin.py b/picard/plugin.py index e75aa9c83..f1106be74 100644 --- a/picard/plugin.py +++ b/picard/plugin.py @@ -341,11 +341,11 @@ class PluginManager(QtCore.QObject): len(names)) for name in sorted(names): try: - self.load_plugin(name, plugindir) + self._load_plugin_from_directory(name, plugindir) except Exception as e: log.error('Unable to load plugin: %s.\nError occured: %s', name, e) - def load_plugin(self, name, plugindir): + def _load_plugin_from_directory(self, name, plugindir): module_file = None (importer, module_name, manifest_data) = zip_import(os.path.join(plugindir, name + '.zip')) if importer: @@ -518,7 +518,7 @@ class PluginManager(QtCore.QObject): if not update: try: - installed_plugin = self.load_plugin(plugin_name, self.plugins_directory) + installed_plugin = self._load_plugin_from_directory(plugin_name, self.plugins_directory) except Exception as e: log.error('Unable to load plugin: %s.\nError occured: %s', plugin_name, e) installed_plugin = None