refactor: Remove six.moves.zip import.

analytics/lib/fixtures.py

@@ -8,8 +8,6 @@ from math import sqrt
 from random import gauss, random, seed
 from typing import List
 
-from six.moves import zip
-
 def generate_time_series_data(days=100, business_hours_base=10, non_business_hours_base=10,
                               growth=1, autocorrelation=0, spikiness=1, holiday_rate=0,
                               frequency=CountStat.DAY, partial_sum=False, random_seed=26):

analytics/management/commands/populate_analytics_db.py

@@ -15,7 +15,6 @@ from zerver.models import Realm, UserProfile, Stream, Message, Client, \
 
 from datetime import datetime, timedelta
 
-from six.moves import zip
 from typing import Any, Dict, List, Optional, Text, Type, Union, Mapping
 
 class Command(BaseCommand):

analytics/views.py

@@ -35,7 +35,7 @@ import pytz
 import re
 import time
 
-from six.moves import filter, map, range, zip
+from six.moves import filter, map, range
 from typing import Any, Callable, Dict, List, Optional, Set, Text, \
     Tuple, Type, Union
 

tools/setup/emoji/emoji_setup_utils.py

@@ -10,7 +10,6 @@
 from collections import defaultdict
 from itertools import permutations, chain
 
-from six.moves import zip
 from typing import Any, Dict, List, Text
 
 # Emojisets that we currently support.

zerver/decorator.py

@@ -28,7 +28,6 @@ import datetime
 import ujson
 import logging
 from io import BytesIO
-from six.moves import zip
 import urllib
 
 from typing import Union, Any, Callable, Sequence, Dict, Optional, TypeVar, Text, Tuple, cast

zerver/lib/i18n.py

@@ -6,7 +6,7 @@ from django.utils import translation
 from django.utils.translation import ugettext as _
 from django.utils.lru_cache import lru_cache
 
-from six.moves import zip_longest, zip, range
+from six.moves import zip_longest, range
 from typing import Any, List, Dict, Optional, Text
 
 import os

zerver/lib/mobile_auth_otp.py

@@ -9,7 +9,6 @@
 # have it here as part of testing the overall library.
 
 import binascii
-from six.moves import zip
 from zerver.lib.str_utils import force_str
 from zerver.models import UserProfile
 

zerver/lib/rate_limiter.py

@@ -5,7 +5,6 @@ from typing import Any, Iterator, List, Optional, Tuple, Text
 
 from django.conf import settings
 from zerver.lib.redis_utils import get_redis_client
-from six.moves import zip
 
 from zerver.models import UserProfile
 

zerver/lib/request.py

@@ -7,7 +7,6 @@
 # mostly not processed by mypy.
 from functools import wraps
 import ujson
-from six.moves import zip
 
 from django.utils.translation import ugettext as _
 

zerver/management/commands/makemessages.py

@@ -36,7 +36,6 @@ import os
 import re
 import glob
 import json
-from six.moves import zip
 
 import django
 from django.core.management.commands import makemessages

zerver/tests/test_signup.py

@@ -63,7 +63,7 @@ import ujson
 
 from typing import Any, Dict, List, Optional, Set, Text
 
-from six.moves import range, zip
+from six.moves import range
 import urllib
 import os
 

zerver/tests/test_subs.py

@@ -62,7 +62,6 @@ from django.http import HttpResponse
 import mock
 import random
 import ujson
-from six.moves import zip
 import urllib
 
 class TestCreateStreams(ZulipTestCase):

zerver/tests/test_timestamp.py

@@ -10,8 +10,6 @@ from datetime import datetime, timedelta
 from dateutil import parser
 import pytz
 
-from six.moves import zip
-
 class TestTimestamp(ZulipTestCase):
     def test_datetime_and_timestamp_conversions(self):
         # type: () -> None

zerver/views/home.py

@@ -6,7 +6,7 @@ from django.http import HttpResponseRedirect, HttpResponse, HttpRequest
 from django.shortcuts import redirect, render
 from django.utils import translation
 from django.utils.cache import patch_cache_control
-from six.moves import zip_longest, zip, range
+from six.moves import zip_longest, range
 
 from zerver.decorator import zulip_login_required, process_client
 from zerver.forms import ToSForm

zerver/webhooks/bitbucket2/view.py

@@ -1,7 +1,6 @@
 # Webhooks for external integrations.
 import re
 from functools import partial
-from six.moves import zip
 from typing import Any, Callable, Dict, List, Optional, Text
 from django.http import HttpRequest, HttpResponse
 from django.utils.translation import ugettext as _

zerver/webhooks/librato/view.py

@@ -1,6 +1,5 @@
 from datetime import datetime
 from typing import Any, Dict, List, Optional, Callable, Tuple, Text
-from six.moves import zip
 
 from django.utils.timezone import utc as timezone_utc
 from django.utils.translation import ugettext as _

zilencer/management/commands/compare_messages.py

@@ -1,5 +1,4 @@
 from typing import Any
-from six.moves import zip
 
 import ijson