zulip_bots: Move six imports.

zulip_bots/zulip_bots/bots/dialogflow/dialogflow.py

@@ -1,6 +1,6 @@
 # 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

zulip_bots/zulip_bots/bots/giphy/giphy.py

@@ -1,4 +1,4 @@
-from six.moves.configparser import SafeConfigParser
+from configparser import SafeConfigParser
 from typing import Dict, Any, Union
 import requests
 import logging

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
 

zulip_bots/zulip_bots/bots/google_search/google_search.py

@@ -1,6 +1,6 @@
 # See readme.md for instructions on running this code.
 import logging
-from six.moves.urllib import parse
+from urllib import parse
 
 import requests
 

zulip_bots/zulip_bots/bots/wikipedia/wikipedia.py

@@ -1,7 +1,7 @@
 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

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
 

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