Bug 1259346 - Make delayed_getattr more resilient to failure. r=nalexander

This commit is contained in:
Mike Hommey 2016-03-24 14:39:49 +09:00
Родитель 6da499d398
Коммит b5c2226dba
1 изменённых файлов: 7 добавлений и 1 удалений

Просмотреть файл

@ -122,5 +122,11 @@ def delayed_getattr(func, key):
@depends(func)
@advanced
def result(value):
return getattr(value, key)
try:
return getattr(value, key)
except AttributeError:
# The @depends function we're being passed may have returned
# None, or an object that simply doesn't have the wanted key.
# In that case, just return None.
return None
return result