heckyel/mediagoblin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Catch import error when text is used as a reason instead of path

Browse Source 
fail_error was used in import, but due to some changes text could appear
there and it caused an error.

There is little sense now to remove these text messages because they are
probably in databases already, so just ignore import errors.
This commit is contained in:
Boris Bobrov 2016-02-23 03:57:00 +03:00
parent 1fe6f5d6d7
commit 7dcdc2dcc6
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
mediagoblin/db/mixin.py
View File

@ -330,7 +330,17 @@ class MediaEntryMixin(GenerateSlugMixin, GeneratePublicIDMixin):
Get the exception that's appropriate for this error
"""
if self.fail_error:
return common.import_component(self.fail_error)
try:
return common.import_component(self.fail_error)
except ImportError:
# TODO(breton): fail_error should give some hint about why it
# failed. fail_error is used as a path to import().
# Unfortunately, I didn't know about that and put general error
# message there. Maybe it's for the best, because for admin,
# we could show even some raw python things. Anyway, this
# should be properly resolved. Now we are in a freeze, that's
# why I simply catch ImportError.
return self.fail_error
def get_license_data(self):
"""Return license dict for requested license"""