From 66bf6670f3ce10106d57a77ff634a8e5c9c3a39a Mon Sep 17 00:00:00 2001

From: Eli Schwartz <eschwartz@archlinux.org>

Date: Wed, 27 Jan 2021 21:57:33 -0500

Subject: [PATCH] use stdlib unittest.mock on python 3

---

 pytest-shutil/pytest_shutil/run.py                      | 7 ++++++-

 pytest-shutil/setup.py                                  | 2 +-

 pytest-shutil/tests/integration/test_run_integration.py | 5 ++++-

 pytest-shutil/tests/unit/test_run.py                    | 8 +++++++-

 4 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/pytest-shutil/pytest_shutil/run.py b/pytest-shutil/pytest_shutil/run.py

index c5b421d..7d46aea 100644

--- a/pytest-shutil/pytest_shutil/run.py

+++ b/pytest-shutil/pytest_shutil/run.py

@@ -11,7 +11,12 @@ import textwrap

 from contextlib import closing

 import subprocess

-from mock import patch

+try:

+    from unittest.mock import patch

+except ImportError:

+    # python 2

+    from mock import patch

+

 import execnet

 from six.moves import cPickle  # @UnresolvedImport

diff --git a/pytest-shutil/setup.py b/pytest-shutil/setup.py

index fbe3a34..93c9be5 100644

--- a/pytest-shutil/setup.py

+++ b/pytest-shutil/setup.py

@@ -26,7 +26,7 @@ install_requires = ['six',

                     'contextlib2;python_version<"3"',

                     'pytest',

                     'path',

-                    'mock',

+                    'mock; python_version<"3.3"',

                     'termcolor'

                     ]

diff --git a/pytest-shutil/tests/integration/test_run_integration.py b/pytest-shutil/tests/integration/test_run_integration.py

index d92c9da..bf20f3a 100644

--- a/pytest-shutil/tests/integration/test_run_integration.py

+++ b/pytest-shutil/tests/integration/test_run_integration.py

@@ -8,7 +8,10 @@ import inspect

 import textwrap

 from uuid import uuid4

-import mock

+try:

+    from unittest import mock

+except ImportError:

+    import mock

 from pytest_shutil import run, workspace

 from pytest_shutil.env import no_cov

diff --git a/pytest-shutil/tests/unit/test_run.py b/pytest-shutil/tests/unit/test_run.py

index 612d20d..c520e85 100644

--- a/pytest-shutil/tests/unit/test_run.py

+++ b/pytest-shutil/tests/unit/test_run.py

@@ -3,7 +3,13 @@ from uuid import uuid4

 from subprocess import PIPE, STDOUT

 import pytest

-from mock import Mock, patch, sentinel, DEFAULT, call

+

+try:

+    from unittest.mock import Mock, patch, sentinel, DEFAULT, call

+except ImportError:

+    # python 2

+    from mock import Mock, patch, sentinel, DEFAULT, call

+

 from six.moves import cPickle

 from pytest_shutil import run

-- 

2.33.8