Merge pull request #14 from michel-slm/prefer-unittest-mock

setup.py

@@ -1,4 +1,11 @@
 from setuptools import setup
+from sys import version_info
+
+if version_info.major < 3 or \
+  (version_info.major == 3 and version_info.minor < 4):
+    tests_require=['mock']
+else:
+    tests_require=[]
 
 setup(
     author='Will Keeling',
@@ -26,7 +33,7 @@
     name='ratelimitingfilter',
     packages=['ratelimitingfilter'],
     test_suite='tests',
-    tests_require=['mock'],
+    tests_require=tests_require,
     url='https://github.com/wkeeling/ratelimitingfilter',
     version='1.5',
 )

tests/ratelimitingfilter_test.py

@@ -3,7 +3,10 @@
 import logging
 import os
 from unittest.case import TestCase
-from mock import Mock, patch
+try:
+    from unittest.mock import Mock, patch
+except ImportError:
+    from mock import Mock, patch
 
 from ratelimitingfilter import RateLimitingFilter
 

tox.ini

@@ -7,5 +7,5 @@ setenv =
 deps =
     coverage
     nose
-    mock
+    py27: mock
 commands = nosetests --with-coverage --cover-erase tests