diff --git a/zerver/data_import/gitter.py b/zerver/data_import/gitter.py index b2e0cfab02..e93f8296a5 100644 --- a/zerver/data_import/gitter.py +++ b/zerver/data_import/gitter.py @@ -1,9 +1,6 @@ import os import dateutil.parser -import random -import requests import logging -import shutil import subprocess import ujson @@ -12,7 +9,7 @@ from django.forms.models import model_to_dict from django.utils.timezone import now as timezone_now from typing import Any, Dict, List, Set, Tuple -from zerver.models import Realm, UserProfile, Recipient +from zerver.models import UserProfile, Recipient from zerver.lib.export import MESSAGE_BATCH_CHUNK_SIZE from zerver.data_import.import_util import ZerverFieldsT, build_zerver_realm, \ build_avatar, build_subscription, build_recipient, build_usermessages, \ diff --git a/zerver/data_import/hipchat.py b/zerver/data_import/hipchat.py index 89c15a560b..0d0da83a72 100755 --- a/zerver/data_import/hipchat.py +++ b/zerver/data_import/hipchat.py @@ -12,7 +12,6 @@ import ujson from typing import Any, Callable, Dict, List, Optional, Set from django.conf import settings -from django.forms.models import model_to_dict from django.utils.timezone import now as timezone_now from zerver.lib.utils import ( @@ -22,7 +21,6 @@ from zerver.lib.utils import ( from zerver.models import ( RealmEmoji, Recipient, - UserProfile, ) from zerver.data_import.import_util import ( diff --git a/zerver/data_import/hipchat_subscriber.py b/zerver/data_import/hipchat_subscriber.py index f958a510f6..0a3a66e708 100644 --- a/zerver/data_import/hipchat_subscriber.py +++ b/zerver/data_import/hipchat_subscriber.py @@ -1,4 +1,4 @@ -from typing import Any, Dict, Set +from typing import Dict, Set class SubscriberHandler: def __init__(self) -> None: diff --git a/zerver/data_import/import_util.py b/zerver/data_import/import_util.py index fe237134fd..9eef8ac6d5 100644 --- a/zerver/data_import/import_util.py +++ b/zerver/data_import/import_util.py @@ -14,7 +14,7 @@ from zerver.models import Realm, RealmEmoji, Subscription, Recipient, \ from zerver.data_import.sequencer import NEXT_ID from zerver.lib.actions import STREAM_ASSIGNMENT_COLORS as stream_colors from zerver.lib.avatar_hash import user_avatar_path_from_ids -from zerver.lib.parallel import run_parallel, JobData +from zerver.lib.parallel import run_parallel # stubs ZerverFieldsT = Dict[str, Any] diff --git a/zerver/data_import/slack.py b/zerver/data_import/slack.py index d3fded8ab6..61c7408a98 100755 --- a/zerver/data_import/slack.py +++ b/zerver/data_import/slack.py @@ -1,11 +1,7 @@ import os import ujson -import hashlib -import sys -import argparse import shutil import subprocess -import re import logging import random import requests @@ -13,12 +9,10 @@ import requests from collections import defaultdict from django.conf import settings -from django.db import connection from django.utils.timezone import now as timezone_now from django.forms.models import model_to_dict from typing import Any, Dict, List, Optional, Tuple, Set, Iterator -from zerver.forms import check_subdomain_available -from zerver.models import Reaction, RealmEmoji, Realm, UserProfile, Recipient, \ +from zerver.models import Reaction, RealmEmoji, UserProfile, Recipient, \ CustomProfileField, CustomProfileFieldValue from zerver.data_import.slack_message_conversion import convert_to_zulip_markdown, \ get_user_full_name @@ -28,7 +22,6 @@ from zerver.data_import.import_util import ZerverFieldsT, build_zerver_realm, \ process_emojis, build_realm, build_stream, build_message, \ create_converted_data_files, make_subscriber_map from zerver.data_import.sequencer import NEXT_ID -from zerver.lib.parallel import run_parallel from zerver.lib.upload import random_name, sanitize_name from zerver.lib.export import MESSAGE_BATCH_CHUNK_SIZE from zerver.lib.emoji import NAME_TO_CODEPOINT_PATH diff --git a/zerver/lib/export.py b/zerver/lib/export.py index c4c8e2780c..956d5190e2 100644 --- a/zerver/lib/export.py +++ b/zerver/lib/export.py @@ -3,10 +3,8 @@ from boto.s3.connection import S3Connection from boto.s3.key import Key # for mypy from django.apps import apps from django.conf import settings -from django.db import connection from django.forms.models import model_to_dict from django.utils.timezone import make_aware as timezone_make_aware -from django.utils.timezone import utc as timezone_utc from django.utils.timezone import is_naive as timezone_is_naive import glob import logging @@ -27,7 +25,7 @@ from zerver.models import UserProfile, Realm, Client, Huddle, Stream, \ UserGroupMembership, BotStorageData, BotConfigData from zerver.lib.parallel import run_parallel from typing import Any, Callable, Dict, List, Optional, Set, Tuple, \ - Iterable, Union + Union # Custom mypy types follow: Record = Dict[str, Any]