summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormathieui <mathieui@mathieui.net>2019-08-23 12:31:20 +0200
committerMaxime “pep” Buquet <pep@bouah.net>2019-12-27 18:57:33 +0100
commit5a1a2e6c18280cf505bacc051e9b539bdd5fcf0c (patch)
tree0bfbb596b78af79d631f8bf77e12e3bfa970cd42
parent33a1519a3914906566de656daa63a5a778cf3a5b (diff)
downloadpoezio-5a1a2e6c18280cf505bacc051e9b539bdd5fcf0c.tar.gz
poezio-5a1a2e6c18280cf505bacc051e9b539bdd5fcf0c.tar.bz2
poezio-5a1a2e6c18280cf505bacc051e9b539bdd5fcf0c.tar.xz
poezio-5a1a2e6c18280cf505bacc051e9b539bdd5fcf0c.zip
Add a "passthrough" parameter for calls through the safetymetaclass
So errors don’t get caught
-rw-r--r--poezio/plugin.py6
-rw-r--r--poezio/plugin_e2ee.py4
2 files changed, 8 insertions, 2 deletions
diff --git a/poezio/plugin.py b/poezio/plugin.py
index c3d10b38..61e0ea87 100644
--- a/poezio/plugin.py
+++ b/poezio/plugin.py
@@ -75,9 +75,12 @@ class SafetyMetaclass(type):
@staticmethod
def safe_func(f):
def helper(*args, **kwargs):
+ passthrough = kwargs.pop('passthrough', False)
try:
return f(*args, **kwargs)
except:
+ if passthrough:
+ raise
if inspect.stack()[1][1] == inspect.getfile(f):
raise
elif SafetyMetaclass.core:
@@ -86,9 +89,12 @@ class SafetyMetaclass(type):
'Error')
return None
async def async_helper(*args, **kwargs):
+ passthrough = kwargs.pop('passthrough', False)
try:
return await f(*args, **kwargs)
except:
+ if passthrough:
+ raise
if inspect.stack()[1][1] == inspect.getfile(f):
raise
elif SafetyMetaclass.core:
diff --git a/poezio/plugin_e2ee.py b/poezio/plugin_e2ee.py
index 75ce6fd0..ab644f7a 100644
--- a/poezio/plugin_e2ee.py
+++ b/poezio/plugin_e2ee.py
@@ -245,9 +245,9 @@ class E2EEPlugin(BasePlugin):
# Call the enabled encrypt method
func = self._enabled_tabs[jid]
if iscoroutinefunction(func):
- await func(message, tab)
+ await func(message, tab, passthrough=True)
else:
- func(message, tab)
+ func(message, tab, passthrough=True)
if has_body:
# Only add EME tag if the message has a body.