From 4d3e97f304d3fa00b51ba5d1fc5cb016a9537090 Mon Sep 17 00:00:00 2001
From: Tim Abbott <tabbott@zulipchat.com>
Date: Sun, 29 Jan 2017 21:28:33 -0800
Subject: [PATCH] actions: Remove unnecessary do_create_stream function.

---
 zerver/lib/actions.py                       | 13 -------------
 zerver/management/commands/create_stream.py |  6 +++---
 zerver/management/commands/import.py        |  1 -
 3 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/zerver/lib/actions.py b/zerver/lib/actions.py
index 70ee4a1479..5308e1e3b8 100644
--- a/zerver/lib/actions.py
+++ b/zerver/lib/actions.py
@@ -1049,19 +1049,6 @@ def check_typing_notification(sender, notification_to, operator):
         raise ValueError('Forbidden recipient type')
     return {'sender': sender, 'recipient': recipient, 'op': operator}
 
-def do_create_stream(realm, stream_name):
-    # type: (Realm, Text) -> None
-    # This is used by a management command now, mostly to facilitate testing.  It
-    # doesn't simulate every single aspect of creating a subscription; for example,
-    # we don't send Zulips to users to tell them they have been subscribed.
-    stream = Stream()
-    stream.realm = realm
-    stream.name = stream_name
-    stream.save()
-    Recipient.objects.create(type_id=stream.id, type=Recipient.STREAM)
-    subscribers = UserProfile.objects.filter(realm=realm, is_active=True, is_bot=False)
-    bulk_add_subscriptions([stream], subscribers)
-
 def create_stream_if_needed(realm, stream_name, invite_only=False, stream_description = ""):
     # type: (Realm, Text, bool, Text) -> Tuple[Stream, bool]
     (stream, created) = Stream.objects.get_or_create(
diff --git a/zerver/management/commands/create_stream.py b/zerver/management/commands/create_stream.py
index e0b86bd711..2375df307a 100644
--- a/zerver/management/commands/create_stream.py
+++ b/zerver/management/commands/create_stream.py
@@ -5,7 +5,7 @@ from typing import Any
 
 from django.core.management.base import BaseCommand
 
-from zerver.lib.actions import do_create_stream
+from zerver.lib.actions import create_stream_if_needed
 from zerver.lib.str_utils import force_text
 from zerver.models import Realm, get_realm
 
@@ -35,5 +35,5 @@ the command."""
         if realm is None:
             print("Unknown string_id %s" % (string_id,))
             exit(1)
-        else:
-            do_create_stream(realm, force_text(stream_name, encoding))
+
+        create_stream_if_needed(realm, force_text(stream_name, encoding))
diff --git a/zerver/management/commands/import.py b/zerver/management/commands/import.py
index 1fda99ebe1..61253f5ef0 100644
--- a/zerver/management/commands/import.py
+++ b/zerver/management/commands/import.py
@@ -8,7 +8,6 @@ from django.core.management.base import BaseCommand, CommandParser
 from django.db import connection
 from django.conf import settings
 
-from zerver.lib.actions import do_create_stream
 from zerver.models import Realm, Stream, UserProfile, Recipient, Subscription, \
     Message, UserMessage, Huddle, DefaultStream, RealmAlias, RealmFilter, Client
 from zerver.lib.export import do_import_realm