From 380ca8f8805ee6bbdbb7c9de8a3c136c2614bab1 Mon Sep 17 00:00:00 2001 From: Anthony Sottile Date: Mon, 24 Jun 2019 11:24:03 -0700 Subject: [PATCH] Use new raise syntax in one case --- src/_pytest/outcomes.py | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/src/_pytest/outcomes.py b/src/_pytest/outcomes.py index 749e80f3c..fb4d471b5 100644 --- a/src/_pytest/outcomes.py +++ b/src/_pytest/outcomes.py @@ -149,7 +149,6 @@ def importorskip(modname, minversion=None, reason=None): __tracebackhide__ = True compile(modname, "", "eval") # to catch syntaxerrors - import_exc = None with warnings.catch_warnings(): # make sure to ignore ImportWarnings that might happen because @@ -159,12 +158,9 @@ def importorskip(modname, minversion=None, reason=None): try: __import__(modname) except ImportError as exc: - # Do not raise chained exception here(#1485) - import_exc = exc - if import_exc: - if reason is None: - reason = "could not import {!r}: {}".format(modname, import_exc) - raise Skipped(reason, allow_module_level=True) + if reason is None: + reason = "could not import {!r}: {}".format(modname, exc) + raise Skipped(reason, allow_module_level=True) from None mod = sys.modules[modname] if minversion is None: return mod