Skip to content

Commit

Permalink
Do not load metadata from __init__.py
Browse files Browse the repository at this point in the history
  • Loading branch information
wonder-sk committed Mar 18, 2013
1 parent 67f4c72 commit 41dc754
Showing 1 changed file with 5 additions and 8 deletions.
13 changes: 5 additions & 8 deletions python/utils.py
Expand Up @@ -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):
Expand Down

0 comments on commit 41dc754

Please sign in to comment.