Blob Blame History Raw
From c7b9af7d248285dcd86fb3de2733c79e4afa74dd Mon Sep 17 00:00:00 2001
From: Fabrice Bauzac <noon@mykolab.com>
Date: Sun, 21 Feb 2021 01:19:20 +0100
Subject: [PATCH] Do not use mock (the PyPI backport library) when possible

---
 opentracing/harness/api_check.py   | 6 +++++-
 opentracing/harness/scope_check.py | 5 ++++-
 setup.py                           | 2 +-
 tests/test_globaltracer.py         | 5 ++++-
 tests/test_noop_span.py            | 5 ++++-
 tests/test_scope.py                | 5 ++++-
 6 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/opentracing/harness/api_check.py b/opentracing/harness/api_check.py
index f917620..de90e1e 100644
--- a/opentracing/harness/api_check.py
+++ b/opentracing/harness/api_check.py
@@ -14,7 +14,11 @@
 
 from __future__ import absolute_import
 
-import mock
+try:
+    from unittest import mock
+except ImportError:
+    import mock
+
 import time
 import pytest
 
diff --git a/opentracing/harness/scope_check.py b/opentracing/harness/scope_check.py
index b70df48..ede172a 100644
--- a/opentracing/harness/scope_check.py
+++ b/opentracing/harness/scope_check.py
@@ -19,7 +19,10 @@
 # THE SOFTWARE.
 from __future__ import absolute_import
 
-import mock
+try:
+    from unittest import mock
+except ImportError:
+    import mock
 
 from opentracing.span import Span
 
diff --git a/setup.py b/setup.py
index 4415ac0..630bf79 100644
--- a/setup.py
+++ b/setup.py
@@ -34,7 +34,7 @@ setup(
             'doubles',
             'flake8',
             'flake8-quotes',
-            'mock',
+            'mock;python_version<"3.3"',
             'pytest',
             'pytest-cov',
             'pytest-mock',
diff --git a/tests/test_globaltracer.py b/tests/test_globaltracer.py
index aa0227c..61dec6a 100644
--- a/tests/test_globaltracer.py
+++ b/tests/test_globaltracer.py
@@ -14,8 +14,11 @@
 
 from __future__ import absolute_import
 import pytest
-import mock
 import opentracing
+try:
+    from unittest import mock
+except ImportError:
+    import mock
 
 
 def teardown_function(function):
diff --git a/tests/test_noop_span.py b/tests/test_noop_span.py
index 0753d32..cc36e8d 100644
--- a/tests/test_noop_span.py
+++ b/tests/test_noop_span.py
@@ -13,9 +13,12 @@
 # limitations under the License.
 
 from __future__ import absolute_import
-import mock
 import time
 import types
+try:
+    from unittest import mock
+except ImportError:
+    import mock
 from opentracing import child_of
 from opentracing import Format
 from opentracing import Tracer
diff --git a/tests/test_scope.py b/tests/test_scope.py
index 5db33b1..01c3496 100644
--- a/tests/test_scope.py
+++ b/tests/test_scope.py
@@ -20,8 +20,11 @@
 
 from __future__ import absolute_import
 
-import mock
 import types
+try:
+    from unittest import mock
+except ImportError:
+    import mock
 
 from opentracing.scope_manager import ScopeManager
 from opentracing.tracer import Tracer
-- 
2.30.0