Merge pull request #320 from musicinmybrain/unittest-mock

Drop PyPI mock package dependency on Python 3.3+

Author: NathanielRN

tests/ext/aiohttp/test_middleware.py

@@ -5,7 +5,11 @@
 """
 import asyncio
 from aws_xray_sdk import global_sdk_config
-from unittest.mock import patch
+try:
+    from unittest.mock import patch
+except ImportError:
+    # NOTE: Python 2 dependency
+    from mock import patch
 
 from aiohttp import web
 from aiohttp.web_exceptions import HTTPUnauthorized

tests/ext/django/test_settings.py

@@ -1,4 +1,8 @@
-from unittest import mock
+try:
+    from unittest import mock
+except ImportError:
+    # NOTE: Python 2 dependency
+    import mock
 
 import django
 from aws_xray_sdk import global_sdk_config
@@ -13,4 +17,4 @@
 class XRayConfigurationTestCase(TestCase):
     def test_sampler_can_be_configured(self):
         assert isinstance(settings.XRAY_RECORDER['SAMPLER'], LocalSampler)
-        assert isinstance(xray_recorder.sampler, LocalSampler)
+        assert isinstance(xray_recorder.sampler, LocalSampler)

tests/test_plugins.py

@@ -1,5 +1,9 @@
 from aws_xray_sdk.core.plugins.utils import get_plugin_modules
-from mock import patch
+try:
+    from unittest.mock import patch
+except ImportError:
+    # NOTE: Python 2 dependency
+    from mock import patch
 
 supported_plugins = (
     'ec2_plugin',

tox.ini

@@ -36,10 +36,8 @@ deps =
     testing.postgresql
     testing.mysqld
     webtest
-    mock
-
     # Python2 only deps
-    py{27}: enum34
+    py{27}: enum34 mock
 
     # pymysql deps
     py{27,34,35}: pymysql < 1.0.0