Use unittest.mock from the stdlib

It was added to the stdlib in py3.3 and we already require 3.5.

18 files changed, 18 insertions, 32 deletions

diff --git a/tests/addressbook/test_external.py b/tests/addressbook/test_external.py
index ca76cc50..e38ec9e5 100644
--- a/tests/addressbook/test_external.py
+++ b/tests/addressbook/test_external.py
@@ -2,8 +2,7 @@
 # This file is released under the GNU GPL, version 3 or a later revision.
 # For further details see the COPYING file
 import unittest
-
-import mock
+from unittest import mock
 
 from alot.addressbook import external
 
diff --git a/tests/commands/test_envelope.py b/tests/commands/test_envelope.py
index 76aa7e88..a5d86d94 100644
--- a/tests/commands/test_envelope.py
+++ b/tests/commands/test_envelope.py
@@ -21,8 +21,7 @@ import os
 import tempfile
 import textwrap
 import unittest
-
-import mock
+from unittest import mock
 
 from alot.commands import envelope
 from alot.db.envelope import Envelope
diff --git a/tests/commands/test_global.py b/tests/commands/test_global.py
index 9ef3d957..23c216ab 100644
--- a/tests/commands/test_global.py
+++ b/tests/commands/test_global.py
@@ -20,8 +20,7 @@ import logging
 import os
 import tempfile
 import unittest
-
-import mock
+from unittest import mock
 
 from alot.commands import globals as g_commands
 
diff --git a/tests/commands/test_init.py b/tests/commands/test_init.py
index a2b358ff..29828b9a 100644
--- a/tests/commands/test_init.py
+++ b/tests/commands/test_init.py
@@ -4,8 +4,7 @@
 
 import argparse
 import unittest
-
-import mock
+from unittest import mock
 
 from alot import commands
 from alot.commands import thread
diff --git a/tests/commands/test_thread.py b/tests/commands/test_thread.py
index 3d4268aa..335ca388 100644
--- a/tests/commands/test_thread.py
+++ b/tests/commands/test_thread.py
@@ -6,8 +6,7 @@
 """Test suite for alot.commands.thread module."""
 import email
 import unittest
-
-import mock
+from unittest import mock
 
 from alot.commands import thread
 from alot.account import Account
diff --git a/tests/commands/utils_tests.py b/tests/commands/utils_tests.py
index 0642ad32..63863db8 100644
--- a/tests/commands/utils_tests.py
+++ b/tests/commands/utils_tests.py
@@ -18,9 +18,9 @@ import tempfile
 import os
 import shutil
 import unittest
+from unittest import mock
 
 import gpg
-import mock
 
 from alot import crypto
 from alot import errors
diff --git a/tests/db/test_envelope.py b/tests/db/test_envelope.py
index f14b8594..873f0927 100644
--- a/tests/db/test_envelope.py
+++ b/tests/db/test_envelope.py
@@ -19,8 +19,7 @@ import email.policy
 import os
 import tempfile
 import unittest
-
-import mock
+from unittest import mock
 
 from alot.db import envelope
 
diff --git a/tests/db/test_message.py b/tests/db/test_message.py
index 6322a77e..2f7a6b8c 100644
--- a/tests/db/test_message.py
+++ b/tests/db/test_message.py
@@ -15,8 +15,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import unittest
-
-import mock
+from unittest import mock
 
 from alot import account
 from alot.db import message
diff --git a/tests/db/test_thread.py b/tests/db/test_thread.py
index e3e398eb..8c78a026 100644
--- a/tests/db/test_thread.py
+++ b/tests/db/test_thread.py
@@ -17,8 +17,7 @@
 """Tests for the alot.db.thread module."""
 import datetime
 import unittest
-
-import mock
+from unittest import mock
 
 from alot.db import thread
 
diff --git a/tests/db/test_utils.py b/tests/db/test_utils.py
index 59a8e5b6..ac6555c0 100644
--- a/tests/db/test_utils.py
+++ b/tests/db/test_utils.py
@@ -17,9 +17,9 @@ import os.path
 import shutil
 import tempfile
 import unittest
+from unittest import mock
 
 import gpg
-import mock
 
 from alot import crypto
 from alot.db import utils
diff --git a/tests/settings/test_manager.py b/tests/settings/test_manager.py
index 9b1cff34..aa2e1e8d 100644
--- a/tests/settings/test_manager.py
+++ b/tests/settings/test_manager.py
@@ -9,8 +9,7 @@ import re
 import tempfile
 import textwrap
 import unittest
-
-import mock
+from unittest import mock
 
 from alot.settings.manager import SettingsManager
 from alot.settings.errors import ConfigError, NoMatchingAccount
diff --git a/tests/settings/test_utils.py b/tests/settings/test_utils.py
index 869054ce..65ee9537 100644
--- a/tests/settings/test_utils.py
+++ b/tests/settings/test_utils.py
@@ -5,8 +5,7 @@
 """Tests for the alot.setting.utils module."""
 
 import unittest
-
-import mock
+from unittest import mock
 
 from alot.settings import utils
 
diff --git a/tests/test_completion.py b/tests/test_completion.py
index cf94d0eb..1dca1b08 100644
--- a/tests/test_completion.py
+++ b/tests/test_completion.py
@@ -5,8 +5,7 @@
 
 """Tests for the alot.completion module."""
 import unittest
-
-import mock
+from unittest import mock
 
 from alot import completion
 
diff --git a/tests/test_crypto.py b/tests/test_crypto.py
index 334fcd56..885750b5 100644
--- a/tests/test_crypto.py
+++ b/tests/test_crypto.py
@@ -8,9 +8,9 @@ import signal
 import subprocess
 import tempfile
 import unittest
+from unittest import mock
 
 import gpg
-import mock
 import urwid
 
 from alot import crypto
diff --git a/tests/test_helper.py b/tests/test_helper.py
index 2aff842d..d56b57b1 100644
--- a/tests/test_helper.py
+++ b/tests/test_helper.py
@@ -23,8 +23,7 @@ import errno
 import os
 import random
 import unittest
-
-import mock
+from unittest import mock
 
 from alot import helper
 
diff --git a/tests/utilities.py b/tests/utilities.py
index 43f37d35..35937d09 100644
--- a/tests/utilities.py
+++ b/tests/utilities.py
@@ -19,9 +19,9 @@
 import asyncio
 import functools
 import unittest
+from unittest import mock
 
 import gpg
-import mock
 
 
 def _tear_down_class_wrapper(original, cls):
diff --git a/tests/utils/test_argparse.py b/tests/utils/test_argparse.py
index a793d5cf..eb087902 100644
--- a/tests/utils/test_argparse.py
+++ b/tests/utils/test_argparse.py
@@ -22,8 +22,7 @@ import os
 import shutil
 import tempfile
 import unittest
-
-import mock
+from unittest import mock
 
 from alot.utils import argparse as cargparse
 
diff --git a/tests/widgets/test_globals.py b/tests/widgets/test_globals.py
index a52a721c..72e6f77e 100644
--- a/tests/widgets/test_globals.py
+++ b/tests/widgets/test_globals.py
@@ -17,8 +17,7 @@
 """Tests for the alot.widgets.globals module."""
 
 import unittest
-
-import mock
+from unittest import mock
 
 from alot.widgets import globals as globals_