Merge with mastersetuptools-scm

1 files changed, 6 insertions, 10 deletions

diff --git a/setuptools/tests/fixtures.py b/setuptools/tests/fixtures.py
index c70c38cb..5204c8d1 100644
--- a/setuptools/tests/fixtures.py
+++ b/setuptools/tests/fixtures.py
@@ -1,24 +1,20 @@
-try:
-    from unittest import mock
-except ImportError:
-    import mock
 import pytest
 
 from . import contexts
 
 
 @pytest.yield_fixture
-def user_override():
+def user_override(monkeypatch):
     """
     Override site.USER_BASE and site.USER_SITE with temporary directories in
     a context.
     """
     with contexts.tempdir() as user_base:
-        with mock.patch('site.USER_BASE', user_base):
-            with contexts.tempdir() as user_site:
-                with mock.patch('site.USER_SITE', user_site):
-                    with contexts.save_user_site_setting():
-                        yield
+        monkeypatch.setattr('site.USER_BASE', user_base)
+        with contexts.tempdir() as user_site:
+            monkeypatch.setattr('site.USER_SITE', user_site)
+            with contexts.save_user_site_setting():
+                yield
 
 
 @pytest.yield_fixture