From 8d154f84f1a552c290a1ccd802f20940c8cab066 Mon Sep 17 00:00:00 2001 From: Scott Dugas Date: Mon, 3 Nov 2014 15:24:31 -0500 Subject: [PATCH] It now calls raise_from_cause master was updated to call util.raise_from_cause which is better than what I had --- lib/sqlalchemy/testing/exclusions.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/lib/sqlalchemy/testing/exclusions.py b/lib/sqlalchemy/testing/exclusions.py index e3d91300dc..f94724608a 100644 --- a/lib/sqlalchemy/testing/exclusions.py +++ b/lib/sqlalchemy/testing/exclusions.py @@ -12,7 +12,6 @@ from ..util import decorator from . import config from .. import util import inspect -import sys import contextlib @@ -121,18 +120,17 @@ class compound(object): try: return_value = fn(*args, **kw) - except Exception: - exc_type, exc_value, exc_traceback = sys.exc_info() - self._expect_failure(config, exc_type, exc_value, exc_traceback, name=fn.__name__) + except Exception as ex: + self._expect_failure(config, ex, name=fn.__name__) else: self._expect_success(config, name=fn.__name__) return return_value - def _expect_failure(self, config, exc_type, exc_value, exc_traceback, name='block'): + def _expect_failure(self, config, ex, name='block'): for fail in self.fails: if fail(config): print(("%s failed as expected (%s): %s " % ( - name, fail._as_string(config), str(exc_value)))) + name, fail._as_string(config), str(ex)))) break else: util.raise_from_cause(ex) -- 2.47.3