From acb6daef0385997b0609f84f2264ca614c38895f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Lalinsk=C3=BD?= Date: Thu, 27 Nov 2008 11:31:16 +0100 Subject: [PATCH] Make API version independant of Picard version --- picard/__init__.py | 4 +++- picard/plugin.py | 11 ++++++++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/picard/__init__.py b/picard/__init__.py index eb2a0af7d..5957c778b 100644 --- a/picard/__init__.py +++ b/picard/__init__.py @@ -17,7 +17,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -version_info = (0, 10, 0, 'final', 0) +version_info = (0, 11, 0, 'dev', 0) if version_info[3] == 'final': if version_info[2] == 0: @@ -27,3 +27,5 @@ if version_info[3] == 'final': else: version_string = '%d.%d.%d%s%d' % version_info __version__ = version_string + +api_versions = ["0.10.0", "0.11.0"] diff --git a/picard/plugin.py b/picard/plugin.py index 465b26000..ae62bf228 100644 --- a/picard/plugin.py +++ b/picard/plugin.py @@ -135,9 +135,14 @@ class PluginManager(QtCore.QObject): plugin_module = imp.load_module('picard.plugins.' + name, *info) plugin = PluginWrapper(plugin_module) for version in list(plugin.api_versions): - if picard.version_string.startswith(version): - setattr(picard.plugins, name, plugin_module) - self.plugins.append(plugin) + found = False + for api_version in picard.api_versions: + if api_version.startswith(version): + setattr(picard.plugins, name, plugin_module) + self.plugins.append(plugin) + found = True + break + if found: break else: self.log.info("Plugin '%s' from '%s' is not compatible "