From 066ec81e16c38199b6cbc7aa059c6c72c59d1e82 Mon Sep 17 00:00:00 2001 From: shaun Date: Tue, 1 Nov 2016 10:54:38 +1100 Subject: [PATCH] re thorw exception in wrapper --- addon.xml | 2 +- resources/lib/objects/_common.py | 4 ++-- resources/lib/utils.py | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/addon.xml b/addon.xml index e8ffd37a..b4476d57 100644 --- a/addon.xml +++ b/addon.xml @@ -1,7 +1,7 @@ diff --git a/resources/lib/objects/_common.py b/resources/lib/objects/_common.py index f683343e..4100cb30 100644 --- a/resources/lib/objects/_common.py +++ b/resources/lib/objects/_common.py @@ -22,7 +22,7 @@ ga = GoogleAnalytics() ################################################################################################## -def catch_except(errors=(Exception, ), default_value=False): +def catch_except(errors=(Exception, )): # Will wrap method with try/except and print parameters for easier debugging def decorator(func): def wrapper(*args, **kwargs): @@ -34,7 +34,7 @@ def catch_except(errors=(Exception, ), default_value=False): log.exception(error) log.error("function: %s \n args: %s \n kwargs: %s", func.__name__, args, kwargs) - return default_value + raise return wrapper return decorator diff --git a/resources/lib/utils.py b/resources/lib/utils.py index d1ac9859..73e0ca0a 100644 --- a/resources/lib/utils.py +++ b/resources/lib/utils.py @@ -307,7 +307,7 @@ def indent(elem, level=0): if level and (not elem.tail or not elem.tail.strip()): elem.tail = i -def catch_except(errors=(Exception, ), default_value=False): +def catch_except(errors=(Exception, )): # Will wrap method with try/except and print parameters for easier debugging def decorator(func): def wrapper(*args, **kwargs): @@ -317,7 +317,7 @@ def catch_except(errors=(Exception, ), default_value=False): log.exception(error) log.error("function: %s \n args: %s \n kwargs: %s", func.__name__, args, kwargs) - return default_value + raise return wrapper return decorator