Do not load metadata from __init__.py

This commit is contained in:
Martin Dobias 2013-03-17 10:46:15 +01:00
parent 67f4c7290c
commit 41dc7544d0

View File

@ -155,14 +155,11 @@ def updateAvailablePlugins():
def pluginMetadata(packageName, fct):
""" fetch metadata from a plugin """
try:
# try to use values from metadata.txt if available
if plugins_metadata_parser.has_key(packageName):
return plugins_metadata_parser[packageName].get('general', fct)
# otherwise fall back to old method, using __init__.py
package = sys.modules[packageName]
return getattr(package, fct)()
except:
# use values from metadata.txt
if plugins_metadata_parser.has_key(packageName):
return plugins_metadata_parser[packageName].get('general', fct)
else:
return "__error__"
def loadPlugin(packageName):