diff --git a/zulip_bots/zulip_bots/bots/dialogflow/dialogflow.py b/zulip_bots/zulip_bots/bots/dialogflow/dialogflow.py index b3069be..b9acaf2 100644 --- a/zulip_bots/zulip_bots/bots/dialogflow/dialogflow.py +++ b/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 diff --git a/zulip_bots/zulip_bots/bots/giphy/giphy.py b/zulip_bots/zulip_bots/bots/giphy/giphy.py index ab0cad0..e2fd19c 100644 --- a/zulip_bots/zulip_bots/bots/giphy/giphy.py +++ b/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 diff --git a/zulip_bots/zulip_bots/bots/github_detail/github_detail.py b/zulip_bots/zulip_bots/bots/github_detail/github_detail.py index 42c5bca..45f1bd3 100644 --- a/zulip_bots/zulip_bots/bots/github_detail/github_detail.py +++ b/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 diff --git a/zulip_bots/zulip_bots/bots/google_search/google_search.py b/zulip_bots/zulip_bots/bots/google_search/google_search.py index 82a2b18..00ef3da 100644 --- a/zulip_bots/zulip_bots/bots/google_search/google_search.py +++ b/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 diff --git a/zulip_bots/zulip_bots/bots/wikipedia/wikipedia.py b/zulip_bots/zulip_bots/bots/wikipedia/wikipedia.py index c6a88cf..28a1f25 100644 --- a/zulip_bots/zulip_bots/bots/wikipedia/wikipedia.py +++ b/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 diff --git a/zulip_bots/zulip_bots/lib.py b/zulip_bots/zulip_bots/lib.py index b0f1393..4bf4494 100644 --- a/zulip_bots/zulip_bots/lib.py +++ b/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 diff --git a/zulip_bots/zulip_bots/test_run.py b/zulip_bots/zulip_bots/test_run.py index f8d95c6..6a58743 100644 --- a/zulip_bots/zulip_bots/test_run.py +++ b/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,12 +12,8 @@ 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 +from unittest import mock +from unittest.mock import patch class TestDefaultArguments(TestCase):