From 2d4468af5484ab96dbee42837ba03e3d91ee7828 Mon Sep 17 00:00:00 2001 From: Kali Kaneko Date: Mon, 24 Apr 2017 00:57:50 +0200 Subject: [bug] fix improper re-raising of exception it was passing way too many arguments in py2. - Resolves: #8843 --- client/src/leap/soledad/client/adbapi.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/client/src/leap/soledad/client/adbapi.py b/client/src/leap/soledad/client/adbapi.py index a60970c0..b002055e 100644 --- a/client/src/leap/soledad/client/adbapi.py +++ b/client/src/leap/soledad/client/adbapi.py @@ -25,6 +25,7 @@ from functools import partial from twisted.enterprise import adbapi from twisted.internet.defer import DeferredSemaphore +from twisted.python import compat from zope.proxy import ProxyBase, setProxiedObject from leap.soledad.common.log import getLogger @@ -279,7 +280,7 @@ class U1DBConnectionPool(adbapi.ConnectionPool): conn.rollback() except: logger.error(None, "Rollback failed") - raise excType(excValue, excTraceback) + compat.reraise(excValue, excTraceback) def finalClose(self): """ -- cgit v1.2.3