Skip to content

Commit

Permalink
Merge pull request #5481 from asottile/minor_py3_cleanup
Browse files Browse the repository at this point in the history
Use new raise syntax in one case
  • Loading branch information
asottile committed Jun 24, 2019
2 parents 61dcb84 + 380ca8f commit a24933b
Showing 1 changed file with 3 additions and 7 deletions.
10 changes: 3 additions & 7 deletions src/_pytest/outcomes.py
Expand Up @@ -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
Expand All @@ -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
Expand Down

0 comments on commit a24933b

Please sign in to comment.