revert 18559 and 18560

svn: r18578
This commit is contained in:
Paul Franklin 2011-12-11 19:09:19 +00:00
parent 4409f30bc2
commit 1ee2a4ec30

View File

@ -251,15 +251,9 @@ class BasePluginManager(object):
module = __import__(pdata.mod_name)
sys.path.pop(0)
else:
print _("WARNING: module cannot be loaded")
print "WARNING: module cannot be loaded"
else:
try:
module = __import__(pdata.mod_name)
except:
import traceback
traceback.print_exc()
print _("WARNING: module '%s' cannot be loaded; "
"continuing...") % pdata.mod_name
module = __import__(pdata.mod_name)
return module
def empty_managed_plugins(self):