diff --git a/zerver/lib/actions.py b/zerver/lib/actions.py index 605c283b7c..496fa711f0 100644 --- a/zerver/lib/actions.py +++ b/zerver/lib/actions.py @@ -51,7 +51,7 @@ from zerver.lib.addressee import Addressee from zerver.lib.alert_words import get_alert_word_automaton from zerver.lib.avatar import avatar_url, avatar_url_from_dict from zerver.lib.bot_config import ConfigError, get_bot_config, get_bot_configs, set_bot_config -from zerver.lib.bulk_create import bulk_create_users +from zerver.lib.bulk_create import create_users from zerver.lib.cache import ( bot_dict_fields, cache_delete, @@ -519,15 +519,6 @@ def notify_created_bot(user_profile: UserProfile) -> None: send_event(user_profile.realm, event, bot_owner_user_ids(user_profile)) -def create_users( - realm: Realm, name_list: Iterable[Tuple[str, str]], bot_type: Optional[int] = None -) -> None: - user_set = set() - for full_name, email in name_list: - user_set.add((email, full_name, True)) - bulk_create_users(realm, user_set, bot_type) - - def do_create_user( email: str, password: Optional[str], diff --git a/zerver/lib/bulk_create.py b/zerver/lib/bulk_create.py index e24f201def..f6dbced416 100644 --- a/zerver/lib/bulk_create.py +++ b/zerver/lib/bulk_create.py @@ -171,3 +171,12 @@ def bulk_create_streams(realm: Realm, stream_dict: Dict[str, Dict[str, Any]]) -> Recipient.objects.bulk_create(recipients_to_create) bulk_set_users_or_streams_recipient_fields(Stream, streams_to_create, recipients_to_create) + + +def create_users( + realm: Realm, name_list: Iterable[Tuple[str, str]], bot_type: Optional[int] = None +) -> None: + user_set = set() + for full_name, email in name_list: + user_set.add((email, full_name, True)) + bulk_create_users(realm, user_set, bot_type) diff --git a/zerver/tests/test_users.py b/zerver/tests/test_users.py index c8d5dcc348..d4db667f70 100644 --- a/zerver/tests/test_users.py +++ b/zerver/tests/test_users.py @@ -15,7 +15,6 @@ from confirmation.models import Confirmation from zerver.actions.invites import do_create_multiuse_invite_link, do_invite_users from zerver.lib.actions import ( change_user_is_active, - create_users, do_change_can_create_users, do_change_user_role, do_create_user, @@ -27,6 +26,7 @@ from zerver.lib.actions import ( get_recipient_info, ) from zerver.lib.avatar import avatar_url, get_gravatar_url +from zerver.lib.bulk_create import create_users from zerver.lib.create_user import copy_default_settings from zerver.lib.events import do_events_register from zerver.lib.exceptions import JsonableError