Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Try to import "mock" before "unittest.mock" #54

Merged
merged 1 commit into from
Jun 10, 2016
Merged

Try to import "mock" before "unittest.mock" #54

merged 1 commit into from
Jun 10, 2016

Commits on Jun 10, 2016

  1. Try to import "mock" before "unittest.mock" 

    I have hit a bug in mock that is fixed in the version of mock included
with Python 3.5.1 but present in 3.3.5 (fixed indirectly in
testing-cabal/mock@eba505cf3e). I can install the fixed "mock" package from
PyPI, but because `pytest_mock` only uses `unittest.mock` for Python
3.3+, the fixed package has no effect.

Instead of trying to check versions, I take the EAFP approach and just
try to import `mock` and fall back to `unittest.mock`. It is possible
that an old version of "mock" could be installed with a newer Python,
but that seems easier to fix than the reverse.
    @wcooley
    wcooley committed Jun 10, 2016
    Configuration menu
    Copy the full SHA
    861f9e8 View commit details
    Browse the repository at this point in the history