py3: Remove "from six.moves import range".

This is no longer required, since in Python 3, this is what the range
built-in does.

analytics/lib/fixtures.py

@@ -8,7 +8,7 @@ from math import sqrt
 from random import gauss, random, seed
 from typing import List
 
-from six.moves import range, zip
+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,

analytics/management/commands/user_stats.py

@@ -7,7 +7,6 @@ from django.core.management.base import BaseCommand
 from django.utils.timezone import now as timezone_now
 
 from zerver.models import UserProfile, Realm, Stream, Message, get_realm
-from six.moves import range
 
 class Command(BaseCommand):
     help = "Generate statistics on user activity."

analytics/tests/test_counts.py

@@ -22,7 +22,6 @@ from zerver.models import Realm, UserProfile, Message, Stream, Recipient, \
 from datetime import datetime, timedelta
 import ujson
 
-from six.moves import range
 from typing import Any, Dict, List, Optional, Text, Tuple, Type, Union
 
 class AnalyticsTestCase(TestCase):

analytics/tests/test_views.py

@@ -15,7 +15,6 @@ from datetime import datetime, timedelta
 import mock
 import ujson
 
-from six.moves import range
 from typing import List, Dict, Optional
 
 class TestStatsEndpoint(ZulipTestCase):

confirmation/models.py

@@ -20,7 +20,6 @@ from zerver.lib.send_email import send_email
 from zerver.lib.utils import generate_random_token
 from zerver.models import PreregistrationUser, EmailChangeStatus, MultiuseInvite
 from random import SystemRandom
-from six.moves import range
 import string
 from typing import Any, Dict, Optional, Text, Union
 

static/assets/favicon/generate

@@ -1,12 +1,11 @@
 #!/usr/bin/env python3
 import xml.etree.ElementTree as ET
 import subprocess
-from six.moves import range
 
 # Generates the favicon images containing unread message counts.
 
 # Open the SVG and find the number text elements using XPath
-tree  = ET.parse('orig.svg')
+tree = ET.parse('orig.svg')
 elems = [tree.getroot().findall(
     ".//*[@id='%s']/{http://www.w3.org/2000/svg}tspan" % (name,))[0]
     for name in ('number_back', 'number_front')]

tools/lib/css_parser.py

@@ -1,4 +1,3 @@
-from six.moves import range
 from typing import Callable, List, Tuple, Union
 
 ####### Helpers

tools/lib/html_grep.py

@@ -1,5 +1,4 @@
 from collections import defaultdict
-from six.moves import range
 from typing import Dict, List, Set
 
 from .html_branches import html_branches, HtmlTreeBranch

tools/lib/pretty_print.py

@@ -6,7 +6,6 @@ from .template_parser import (
     Token,
     is_django_block_tag,
 )
-from six.moves import range
 import subprocess
 
 def pretty_print_html(html, num_spaces=4):

tools/lib/template_parser.py

@@ -1,5 +1,4 @@
 from typing import Callable, List, Optional
-from six.moves import range
 
 class TemplateParserException(Exception):
     def __init__(self, message):

tools/setup/emoji/emoji_setup_utils.py

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

tools/test-queue-worker-reload

@@ -8,7 +8,6 @@ import signal
 import subprocess
 import re
 
-from six.moves import range
 # check for the venv
 from lib import sanity_check
 sanity_check.check_venv(__file__)

tools/test-run-dev

@@ -7,7 +7,6 @@ import time
 import signal
 import subprocess
 
-from six.moves import range
 # check for the venv
 from lib import sanity_check
 sanity_check.check_venv(__file__)

tools/update-authors-json

@@ -16,7 +16,6 @@ import argparse
 from datetime import date
 import subprocess
 
-from six.moves import range
 import requests
 import json
 

zerver/lib/actions.py

@@ -74,7 +74,6 @@ from django.utils.timezone import now as timezone_now
 from confirmation.models import Confirmation, create_confirmation_link
 from six.moves import filter
 from six.moves import map
-from six.moves import range
 from six import unichr
 
 from zerver.lib.create_user import random_api_key

zerver/lib/bugdown/__init__.py

@@ -55,7 +55,7 @@ import zerver.lib.alert_words as alert_words
 import zerver.lib.mention as mention
 from zerver.lib.str_utils import force_str, force_text
 from zerver.lib.tex import render_tex
-from six.moves import range, html_parser
+from six.moves import html_parser
 
 FullNameInfo = TypedDict('FullNameInfo', {
     'id': int,

zerver/lib/create_user.py

@@ -6,7 +6,6 @@ import base64
 import ujson
 import os
 import string
-from six.moves import range
 
 from typing import Optional, Text
 

zerver/lib/export.py

@@ -24,7 +24,6 @@ from zerver.models import UserProfile, Realm, Client, Huddle, Stream, \
     get_display_recipient, Attachment, get_system_bot
 from zerver.lib.parallel import run_parallel
 from zerver.lib.utils import mkdir_p
-from six.moves import range
 from typing import Any, Callable, Dict, List, Optional, Set, Tuple
 
 # Custom mypy types follow:

zerver/lib/generate_test_data.py

@@ -2,7 +2,6 @@ import itertools
 import ujson
 import random
 from typing import List, Dict, Any, Text, Optional
-from six.moves import range
 
 def load_config():
     # type: () -> Dict [str, Any]

zerver/lib/timeout.py

@@ -6,7 +6,6 @@ import sys
 import time
 import ctypes
 import threading
-from six.moves import range
 
 # Based on http://code.activestate.com/recipes/483752/
 

zerver/lib/utils.py

@@ -13,7 +13,7 @@ from time import sleep
 
 from django.conf import settings
 from django.http import HttpRequest
-from six.moves import range, map, zip_longest
+from six.moves import map, zip_longest
 from zerver.lib.str_utils import force_text
 
 T = TypeVar('T')

zerver/migrations/0037_disallow_null_string_id.py

@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-from six.moves import range
-
 from django.db.utils import IntegrityError
 
 from django.db.backends.postgresql_psycopg2.schema import DatabaseSchemaEditor

zerver/tests/test_events.py

@@ -104,7 +104,6 @@ from collections import OrderedDict
 import mock
 import time
 import ujson
-from six.moves import range
 
 
 class LogEventsTest(ZulipTestCase):

zerver/tests/test_export.py

@@ -8,7 +8,6 @@ import shutil
 import ujson
 
 from mock import patch, MagicMock
-from six.moves import range
 from typing import Any, Dict, List, Set
 
 from zerver.lib.actions import (

zerver/tests/test_external.py

@@ -22,7 +22,6 @@ import mock
 import time
 
 from six.moves import urllib
-from six.moves import range
 from typing import Text
 
 class MITNameTest(ZulipTestCase):

zerver/tests/test_messages.py

@@ -69,7 +69,6 @@ import DNS
 import mock
 import time
 import ujson
-from six.moves import range
 from typing import Any, Dict, List, Optional, Text
 
 from collections import namedtuple

zerver/tests/test_narrow.py

@@ -41,7 +41,6 @@ from zerver.views.messages import (
 )
 
 from typing import Dict, List, Mapping, Sequence, Tuple, Generic, Union, Any, Optional, Text
-from six.moves import range
 import os
 import re
 import ujson

zerver/tests/test_notifications.py

@@ -10,7 +10,6 @@ from django.http import HttpResponse
 from django.test import override_settings
 from email.utils import formataddr
 from mock import patch, MagicMock
-from six.moves import range
 from typing import Any, Dict, List, Text
 
 from zerver.lib.notifications import fix_emojis, \

zerver/tests/test_retention.py

@@ -11,8 +11,6 @@ from zerver.lib.retention import get_expired_messages, move_message_to_archive
 
 from typing import Any, List
 
-from six.moves import range
-
 
 class TestRetentionLib(ZulipTestCase):
     """

zerver/tests/test_subs.py

@@ -57,7 +57,7 @@ from django.http import HttpResponse
 import mock
 import random
 import ujson
-from six.moves import range, urllib, zip
+from six.moves import urllib, zip
 
 class TestCreateStreams(ZulipTestCase):
     def test_creating_streams(self):

zilencer/management/commands/populate_db.py

@@ -20,7 +20,6 @@ import random
 import os
 import ujson
 import itertools
-from six.moves import range
 from typing import Any, Callable, Dict, List, Iterable, Mapping, Optional, Sequence, Set, Tuple, Text
 
 settings.TORNADO_SERVER = None