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

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions pytest_mock.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
import inspect
import sys

import pytest

if sys.version_info >= (3, 3): # pragma: no cover
import unittest.mock as mock_module
else:
try:
import mock as mock_module
except ImportError:
import unittest.mock as mock_module

version = '1.1'

Expand Down