Merge pull request #74 from carlwgeorge/stdlib-mock

Use mock from the standard library when available
datadriventests · Nov 25, 2019 · 39dcf41 · 39dcf41
2 parents 9a0c10d + fdf77e0
commit 39dcf41
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/requirements/test.txt b/requirements/test.txt
@@ -4,4 +4,4 @@ flake8
 nose
 six>=1.4.0
 PyYAML
-mock
+mock; python_version < '3.3'
diff --git a/test/test_functional.py b/test/test_functional.py
@@ -2,7 +2,10 @@
 import json
 
 import six
-import mock
+try:
+    from unittest import mock
+except ImportError:
+    import mock
 
 from ddt import ddt, data, file_data
 from nose.tools import (

diff --git a/tox.ini b/tox.ini
@@ -8,14 +8,14 @@ deps =
     flake8
     six>=1.4.0
     PyYAML
-    mock
 commands = 
     nosetests -s --with-coverage --cover-package=ddt --cover-html
     flake8 ddt.py test
 
 [testenv:py27]
 deps =
     {[testenv]deps}
+    mock
     Sphinx
     sphinxcontrib-programoutput
 commands =