File pytest-fixtures-pr171-remove-mock.patch of Package python-pytest-shutil

Overview Repositories Revisions Requests Users Attributes Meta

File pytest-fixtures-pr171-remove-mock.patch of Package python-pytest-shutil (Revision c94a046550ad6c1a2444c47c35b922c7)

Currently displaying revision c94a046550ad6c1a2444c47c35b922c7 , Show latest

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 @@
 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 4126831..3513d3e 100644
--- a/pytest-shutil/setup.py
+++ b/pytest-shutil/setup.py
@@ -24,10 +24,11 @@
 
 install_requires = ['six',
                     'execnet',
-                    'contextlib2',
+                    'contextlib2;python_version<"3"',
                     'pytest',
-                    'path.py',
-                    'mock',
+                    'path; python_version >= "3.7"',
+                    'path.py; python_version < "3.7"',
+                    '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 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 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

Places

File pytest-fixtures-pr171-remove-mock.patch of Package python-pytest-shutil (Revision c94a046550ad6c1a2444c47c35b922c7)

Places