Skip to content

Commit a466271

Browse files
committed
Remove dependency of pyfakefs on pytest
- see #565
1 parent 341c326 commit a466271

File tree

2 files changed

+13
-4
lines changed

2 files changed

+13
-4
lines changed

CHANGES.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@ The released versions correspond to PyPi releases.
33

44
## Version 4.3.0 (as yet unreleased)
55

6+
### Fixes
7+
* remove dependency of pyfakefs on `pytest` (regression,
8+
see [#565](../../issues/565))
9+
610
## [Version 4.2.0](https://pypi.python.org/pypi/pyfakefs/4.2.0)
711

812
#### New Features

pyfakefs/fake_filesystem_unittest.py

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,6 @@
4646
import unittest
4747
import warnings
4848

49-
import py
50-
import pytest
51-
5249
from pyfakefs.deprecator import Deprecator
5350
from pyfakefs.fake_filesystem import set_uid, set_gid, reset_ids, PatchMode
5451
from pyfakefs.helpers import IS_PYPY
@@ -354,8 +351,16 @@ class Patcher:
354351
'''
355352
SKIPMODULES = {
356353
None, fake_filesystem, fake_filesystem_shutil,
357-
sys, linecache, tokenize, py, pytest
354+
sys, linecache, tokenize
358355
}
356+
try:
357+
import py
358+
import pytest
359+
SKIPMODULES.add(py)
360+
SKIPMODULES.add(pytest)
361+
except ImportError:
362+
pass
363+
359364
assert None in SKIPMODULES, ("sys.modules contains 'None' values;"
360365
" must skip them.")
361366

0 commit comments

Comments
 (0)