Skip to content

Commit 41dc754

Browse files
committedMar 18, 2013
Do not load metadata from __init__.py
1 parent 67f4c72 commit 41dc754

File tree

1 file changed

+5
-8
lines changed

1 file changed

+5
-8
lines changed
 

‎python/utils.py

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -155,14 +155,11 @@ def updateAvailablePlugins():
155155

156156
def pluginMetadata(packageName, fct):
157157
""" fetch metadata from a plugin """
158-
try:
159-
# try to use values from metadata.txt if available
160-
if plugins_metadata_parser.has_key(packageName):
161-
return plugins_metadata_parser[packageName].get('general', fct)
162-
# otherwise fall back to old method, using __init__.py
163-
package = sys.modules[packageName]
164-
return getattr(package, fct)()
165-
except:
158+
159+
# use values from metadata.txt
160+
if plugins_metadata_parser.has_key(packageName):
161+
return plugins_metadata_parser[packageName].get('general', fct)
162+
else:
166163
return "__error__"
167164

168165
def loadPlugin(packageName):

0 commit comments

Comments
 (0)
Please sign in to comment.