diff options
| author | Bruno Oliveira <nicoddemus@gmail.com> | 2017-03-10 15:54:05 -0300 |
|---|---|---|
| committer | Bruno Oliveira <nicoddemus@gmail.com> | 2017-03-10 15:54:05 -0300 |
| commit | 1e0cf5ce4dcd8b110a45261595d69a502dd0226a (patch) | |
| tree | e5b7993a41db97332a15920f1fa7642ac31750e3 /_pytest/assertion | |
| parent | 0c94f517a18bc135fe80a07a64c8c74c27b41dcb (diff) | |
| parent | 906b40fbb209916ea13199d5391c2e64b3587103 (diff) | |
| download | pytest-1e0cf5ce4dcd8b110a45261595d69a502dd0226a.tar.gz | |
Merge remote-tracking branch 'upstream/master' into merge-master-into-features
# Conflicts:
# AUTHORS
# CHANGELOG.rst
# _pytest/pytester.py
Diffstat (limited to '_pytest/assertion')
| -rw-r--r-- | _pytest/assertion/rewrite.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/_pytest/assertion/rewrite.py b/_pytest/assertion/rewrite.py index abf5b491f..7408c4746 100644 --- a/_pytest/assertion/rewrite.py +++ b/_pytest/assertion/rewrite.py @@ -215,7 +215,8 @@ class AssertionRewritingHook(object): mod.__loader__ = self py.builtin.exec_(co, mod.__dict__) except: - del sys.modules[name] + if name in sys.modules: + del sys.modules[name] raise return sys.modules[name] |