zulip_bots: Move from mock to unittest.mock in most files.

zulip_bots/zulip_bots/bots/connect_four/test_connect_four.py

@@ -1,7 +1,7 @@
 from zulip_bots.test_lib import BotTestCase
 
 from contextlib import contextmanager
-from mock import MagicMock
+from unittest.mock import MagicMock
 from zulip_bots.bots.connect_four.connect_four import *
 
 class TestConnectFourBot(BotTestCase):

zulip_bots/zulip_bots/bots/incrementor/test_incrementor.py

@@ -1,4 +1,4 @@
-import mock
+from unittest import mock
 
 from zulip_bots.test_lib import (
     get_bot_message_handler,

zulip_bots/zulip_bots/bots/jira/test_jira.py

@@ -1,4 +1,4 @@
-from mock import patch
+from unittest.mock import patch
 from zulip_bots.test_lib import BotTestCase
 
 class TestJiraBot(BotTestCase):

zulip_bots/zulip_bots/bots/tictactoe/test_tictactoe.py

@@ -1,6 +1,6 @@
 from zulip_bots.test_lib import BotTestCase
 
-from mock import patch
+from unittest.mock import patch
 
 class TestTictactoeBot(BotTestCase):
     bot_name = 'tictactoe'

zulip_bots/zulip_bots/bots/witai/test_witai.py

@@ -1,4 +1,4 @@
-from mock import patch
+from unittest.mock import patch
 import sys
 from typing import Dict, Any, Optional
 from zulip_bots.test_lib import BotTestCase, get_bot_message_handler, StubBotHandler

zulip_bots/zulip_bots/bots/xkcd/test_xkcd.py

@@ -1,5 +1,5 @@
-import mock
+from unittest import mock
-from mock import MagicMock, patch
+from unittest.mock import MagicMock, patch
 from zulip_bots.test_lib import BotTestCase
 
 class TestXkcdBot(BotTestCase):

zulip_bots/zulip_bots/lib_tests.py

@@ -1,5 +1,5 @@
 from unittest import TestCase
-from mock import MagicMock, patch, ANY
+from unittest.mock import MagicMock, patch, ANY
 from zulip_bots.lib import (
     ExternalBotHandler,
     StateHandler,

zulip_bots/zulip_bots/test_lib.py

@@ -1,4 +1,4 @@
-from mock import patch
+from unittest.mock import patch
 from unittest import TestCase
 
 from typing import List, Dict, Any, Tuple

zulip_bots/zulip_bots/test_run.py

@@ -15,7 +15,7 @@ from unittest import TestCase
 
 if six.PY2:
     import mock
-    from mock import patch
+    from unittest.mock import patch
 else:
     from unittest import mock
     from unittest.mock import patch