zulip_bots: Move from mock to unittest.mock in most files.
MODIFY
zulip_bots/zulip_bots/bots/connect_four/test_connect_four.py
zulip_bots/zulip_bots/bots/connect_four/test_connect_four.py
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):

MODIFY
zulip_bots/zulip_bots/bots/incrementor/test_incrementor.py
zulip_bots/zulip_bots/bots/incrementor/test_incrementor.py
-import mock
+from unittest import mock
from zulip_bots.test_lib import (
get_bot_message_handler,

MODIFY
zulip_bots/zulip_bots/bots/jira/test_jira.py
zulip_bots/zulip_bots/bots/jira/test_jira.py
-from mock import patch
+from unittest.mock import patch
from zulip_bots.test_lib import BotTestCase
class TestJiraBot(BotTestCase):

MODIFY
zulip_bots/zulip_bots/bots/tictactoe/test_tictactoe.py
zulip_bots/zulip_bots/bots/tictactoe/test_tictactoe.py
from zulip_bots.test_lib import BotTestCase
-from mock import patch
+from unittest.mock import patch
class TestTictactoeBot(BotTestCase):
bot_name = 'tictactoe'

MODIFY
zulip_bots/zulip_bots/bots/witai/test_witai.py
zulip_bots/zulip_bots/bots/witai/test_witai.py
-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

MODIFY
zulip_bots/zulip_bots/bots/xkcd/test_xkcd.py
zulip_bots/zulip_bots/bots/xkcd/test_xkcd.py
-import mock
-from mock import MagicMock, patch
+from unittest import mock
+from unittest.mock import MagicMock, patch
from zulip_bots.test_lib import BotTestCase
class TestXkcdBot(BotTestCase):

MODIFY
zulip_bots/zulip_bots/lib_tests.py
zulip_bots/zulip_bots/lib_tests.py
from unittest import TestCase
-from mock import MagicMock, patch, ANY
+from unittest.mock import MagicMock, patch, ANY
from zulip_bots.lib import (
ExternalBotHandler,
StateHandler,

MODIFY
zulip_bots/zulip_bots/test_lib.py
zulip_bots/zulip_bots/test_lib.py
-from mock import patch
+from unittest.mock import patch
from unittest import TestCase
from typing import List, Dict, Any, Tuple

MODIFY
zulip_bots/zulip_bots/test_run.py
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

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