From 56ec4bb3394ef8fa5f8391676b2f601b38ca9886 Mon Sep 17 00:00:00 2001 From: Michał Górny Date: Apr 25 2020 18:40:04 +0000 Subject: Prefer built-in unittest.mock over external mock Python has a built-in mocking library since 3.3, so use that when available instead of requiring everyone to install the external package. --- diff --git a/setup.py b/setup.py index ddad4bc..1a64df8 100644 --- a/setup.py +++ b/setup.py @@ -48,7 +48,7 @@ test_requirements = [ "unittest2 >=0.5.1", "testtools", "testscenarios >=0.4", - "mock >=1.3", + "mock >=1.3;python_version<'3.3'", "coverage", "docutils", ] diff --git a/test/test_daemon.py b/test/test_daemon.py index 6dfef86..883bbb8 100644 --- a/test/test_daemon.py +++ b/test/test_daemon.py @@ -25,7 +25,10 @@ import sys import tempfile from types import ModuleType -import mock +try: + from unittest import mock +except ImportError: + import mock from . import scaffold from .scaffold import unicode diff --git a/test/test_metadata.py b/test/test_metadata.py index 924f1d5..b464c4f 100644 --- a/test/test_metadata.py +++ b/test/test_metadata.py @@ -24,7 +24,11 @@ except ImportError: # Python 2 standard library. import urlparse -import mock +try: + from unittest import mock +except ImportError: + import mock + import pkg_resources import testtools.helpers import testtools.matchers diff --git a/test/test_pidfile.py b/test/test_pidfile.py index 961fcd5..6c126c3 100644 --- a/test/test_pidfile.py +++ b/test/test_pidfile.py @@ -26,7 +26,11 @@ import os import tempfile import lockfile -import mock + +try: + from unittest import mock +except ImportError: + import mock from . import scaffold diff --git a/test/test_runner.py b/test/test_runner.py index 10145ff..0bc559b 100644 --- a/test/test_runner.py +++ b/test/test_runner.py @@ -26,7 +26,11 @@ import signal import sys import lockfile -import mock + +try: + from unittest import mock +except ImportError: + import mock from . import scaffold from .scaffold import unicode diff --git a/test_version.py b/test_version.py index f23ba4b..3ebcf98 100644 --- a/test_version.py +++ b/test_version.py @@ -28,7 +28,12 @@ import textwrap import docutils import docutils.nodes import docutils.writers -import mock + +try: + from unittest import mock +except ImportError: + import mock + import setuptools import setuptools.command import testscenarios