zulip_bots: Move six imports.
MODIFY
zulip_bots/zulip_bots/bots/dialogflow/dialogflow.py
zulip_bots/zulip_bots/bots/dialogflow/dialogflow.py
# See readme.md for instructions on running this code.
import logging
-from six.moves.urllib import parse
+from urllib import parse
import json
import apiai

MODIFY
zulip_bots/zulip_bots/bots/giphy/giphy.py
zulip_bots/zulip_bots/bots/giphy/giphy.py
-from six.moves.configparser import SafeConfigParser
+from configparser import SafeConfigParser
from typing import Dict, Any, Union
import requests
import logging

MODIFY
zulip_bots/zulip_bots/bots/github_detail/github_detail.py
zulip_bots/zulip_bots/bots/github_detail/github_detail.py
@@ -2,7 +2,7 @@ import re
import os
import sys
import logging
-import six.moves.configparser
+import configparser
import requests

MODIFY
zulip_bots/zulip_bots/bots/google_search/google_search.py
zulip_bots/zulip_bots/bots/google_search/google_search.py
# See readme.md for instructions on running this code.
import logging
-from six.moves.urllib import parse
+from urllib import parse
import requests

MODIFY
zulip_bots/zulip_bots/bots/wikipedia/wikipedia.py
zulip_bots/zulip_bots/bots/wikipedia/wikipedia.py
import requests
import logging
import re
-from six.moves import urllib
+import urllib
from zulip_bots.lib import Any
from typing import Optional, Any, Dict

MODIFY
zulip_bots/zulip_bots/lib.py
zulip_bots/zulip_bots/lib.py
@@ -8,7 +8,7 @@ import sys
import time
import re
-from six.moves import configparser
+import configparser
from contextlib import contextmanager

MODIFY
zulip_bots/zulip_bots/test_run.py
zulip_bots/zulip_bots/test_run.py
@@ -5,7 +5,6 @@ import importlib
import os
import zulip_bots.run
from zulip_bots.lib import extract_query_without_mention
-import six
import unittest
import zulip
@@ -13,10 +12,6 @@ from importlib import import_module
from typing import Optional
from unittest import TestCase
-if six.PY2:
- import mock
- from unittest.mock import patch
-else:
from unittest import mock
from unittest.mock import patch

zulip_bots: Move six imports.