Merge branch 'allow-local-mock'

Author: nicoddemus

CHANGELOG.rst

@@ -1,3 +1,14 @@
+1.2.dev
+-------
+
+* Try to import ``mock`` first instead of ``unittest.mock``. This gives the user flexibility
+  to install a newer ``mock`` version from PyPI instead of using the one available in the
+  Python distribution.
+  Thanks `@wcooley`_ for the PR (`#54`_).
+
+.. _@wcooley: https://github.com/wcooley
+.. _#54: https://github.com/pytest-dev/pytest-mock/issues/54  
+
 1.1
 ---
 

pytest_mock.py

@@ -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'